Merge branch '3.8-dev'
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index d465ec7..0ecf9b0 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -3,80 +3,84 @@
- package-ecosystem: "nuget"
directory: "/gremlin-dotnet"
schedule:
- interval: "daily"
- target-branch: "3.5-dev"
+ interval: "monthly"
+ target-branch: "master"
labels:
- ".NET"
- "dependencies"
+ ignore:
+ - update-types: [ "version-update:semver-patch", "version-update:semver-minor" ]
+ dependency-name: "*"
- package-ecosystem: "pip"
directory: "/gremlin-python/src/main/python"
schedule:
- interval: "daily"
- target-branch: "3.5-dev"
+ interval: "monthly"
+ target-branch: "master"
labels:
- "python"
- "dependencies"
+ ignore:
+ - update-types: [ "version-update:semver-patch", "version-update:semver-minor" ]
+ dependency-name: "*"
- package-ecosystem: "npm"
directory: "/gremlin-javascript/src/main/javascript/gremlin-javascript"
schedule:
- interval: "daily"
- target-branch: "3.5-dev"
+ interval: "monthly"
+ target-branch: "master"
labels:
- "javascript"
- "dependencies"
ignore:
- - dependency-name: "prettier"
- update-types: ["version-update:semver-patch"]
+ - update-types: ["version-update:semver-patch", "version-update:semver-minor"]
+ dependency-name: "*"
- package-ecosystem: "npm"
directory: "/gremlint"
schedule:
- interval: "daily"
- target-branch: "3.5-dev"
- labels:
- - "gremlint"
- - "dependencies"
- ignore:
- - dependency-name: "prettier"
- update-types: [ "version-update:semver-patch" ]
- - dependency-name: "@types/node"
- update-types: [ "version-update:semver-patch" ]
- - package-ecosystem: "npm"
- directory: "/docs/gremlint"
- schedule:
- interval: "daily"
+ interval: "monthly"
target-branch: "master"
labels:
- "gremlint"
- "dependencies"
ignore:
- - dependency-name: "prettier"
- update-types: [ "version-update:semver-patch" ]
- - dependency-name: "@types/*"
- update-types: [ "version-update:semver-patch" ]
- - dependency-name: "styled-components"
- update-types: [ "version-update:semver-patch" ]
- - dependency-name: "@testing-library/jest-dom"
- update-types: [ "version-update:semver-patch" ]
+ - update-types: [ "version-update:semver-patch", "version-update:semver-minor" ]
+ dependency-name: "*"
+ - package-ecosystem: "npm"
+ directory: "/docs/gremlint"
+ schedule:
+ interval: "monthly"
+ target-branch: "master"
+ labels:
+ - "site"
+ - "dependencies"
+ ignore:
+ - update-types: [ "version-update:semver-patch", "version-update:semver-minor" ]
+ dependency-name: "*"
- package-ecosystem: "gomod"
directory: "/gremlin-go"
schedule:
- interval: "daily"
- target-branch: "3.5-dev"
+ interval: "monthly"
+ target-branch: "master"
labels:
- "go"
- "dependencies"
+ ignore:
+ - update-types: [ "version-update:semver-patch", "version-update:semver-minor" ]
+ dependency-name: "*"
- package-ecosystem: "maven"
directory: "/"
schedule:
- interval: "daily"
- target-branch: "3.5-dev"
+ interval: "monthly"
+ target-branch: "master"
labels:
- "java"
- "dependencies"
+ ignore:
+ - update-types: [ "version-update:semver-patch", "version-update:semver-minor" ]
+ dependency-name: "*"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
- target-branch: "3.5-dev"
+ target-branch: "3.7-dev"
labels:
- "dependencies"
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index e777290..c85e477 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -192,45 +192,45 @@
run: |
mvn clean install -pl -:gremlin-javascript,-gremlin-dotnet,-:gremlin-dotnet-source,-:gremlin-dotnet-tests,-:gremlint -q -DskipTests -Dci
mvn verify -pl gremlin-driver -DskipIntegrationTests=false
- javascript:
- name: javascript
- timeout-minutes: 15
- needs: cache-gremlin-server-docker-image
- runs-on: ${{ matrix.os }}
- strategy:
- matrix:
- # Windows Disabled until Linux containers are supported on Windows runners: https://github.com/actions/virtual-environments/issues/252
- # os: [ubuntu-latest, windows-latest]
- os: [ubuntu-latest]
- steps:
- - uses: actions/checkout@v5
- - name: Set up JDK 11
- uses: actions/setup-java@v5
- with:
- java-version: '11'
- distribution: 'temurin'
- - name: Get Cached Server Base Image
- if: matrix.os == 'ubuntu-latest'
- uses: actions/cache@v4
- id: gremlin-server-test-docker-image
- with:
- path: |
- ./gremlin-server/*
- ~/.m2/repository/org/apache/tinkerpop/*
- key: ${{ github.sha }}
-# - name: Download Server Base Image
-# if: matrix.os == 'windows-latest'
-# uses: actions/download-artifact@v3
+# javascript:
+# name: javascript
+# timeout-minutes: 15
+# needs: cache-gremlin-server-docker-image
+# runs-on: ${{ matrix.os }}
+# strategy:
+# matrix:
+# # Windows Disabled until Linux containers are supported on Windows runners: https://github.com/actions/virtual-environments/issues/252
+# # os: [ubuntu-latest, windows-latest]
+# os: [ubuntu-latest]
+# steps:
+# - uses: actions/checkout@v5
+# - name: Set up JDK 11
+# uses: actions/setup-java@v5
# with:
-# name: ${{ github.sha }}
-# path: ./gremlin-server
- - name: Load Docker Image
- working-directory: ./gremlin-server
- run: docker load --input gremlin-server.tar
- - name: Build with Maven
- run: |
- mvn clean install -pl -:gremlin-python,-gremlin-dotnet,-:gremlin-dotnet-source,-:gremlin-dotnet-tests -q -DskipTests -Dci
- mvn verify -pl :gremlin-javascript,:gremlint
+# java-version: '11'
+# distribution: 'temurin'
+# - name: Get Cached Server Base Image
+# if: matrix.os == 'ubuntu-latest'
+# uses: actions/cache@v4
+# id: gremlin-server-test-docker-image
+# with:
+# path: |
+# ./gremlin-server/*
+# ~/.m2/repository/org/apache/tinkerpop/*
+# key: ${{ github.sha }}
+## - name: Download Server Base Image
+## if: matrix.os == 'windows-latest'
+## uses: actions/download-artifact@v3
+## with:
+## name: ${{ github.sha }}
+## path: ./gremlin-server
+# - name: Load Docker Image
+# working-directory: ./gremlin-server
+# run: docker load --input gremlin-server.tar
+# - name: Build with Maven
+# run: |
+# mvn clean install -pl -:gremlin-python,-gremlin-dotnet,-:gremlin-dotnet-source,-:gremlin-dotnet-tests -q -DskipTests -Dci
+# mvn verify -pl :gremlin-javascript,:gremlint
python:
name: python
timeout-minutes: 20
@@ -252,39 +252,39 @@
touch gremlin-python/.glv
mvn clean install -pl -:gremlin-javascript,-gremlin-dotnet,-:gremlin-dotnet-source,-:gremlin-dotnet-tests,-:gremlint -q -DskipTests -Dci
mvn verify -pl gremlin-python
- dotnet:
- name: .NET
- timeout-minutes: 20
- needs: cache-gremlin-server-docker-image
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v5
- - name: Set up JDK11
- uses: actions/setup-java@v5
- with:
- java-version: '11'
- distribution: 'temurin'
- - name: Set up .NET 8.0.x
- uses: actions/setup-dotnet@v4
- with:
- dotnet-version: '8.0.x'
- - name: Get Cached Server Base Image
- uses: actions/cache@v4
- id: gremlin-server-test-docker-image
- with:
- path: |
- ./gremlin-server/*
- ~/.m2/repository/org/apache/tinkerpop/*
- key: ${{ github.sha }}
- - name: Load Docker Image
- working-directory: ./gremlin-server
- run: docker load --input gremlin-server.tar
- - name: Build with Maven
- run: |
- touch gremlin-dotnet/src/.glv
- touch gremlin-dotnet/test/.glv
- mvn clean install -pl -:gremlin-javascript,-:gremlin-python,-:gremlint -q -DskipTests -Dci
- mvn verify -pl :gremlin-dotnet,:gremlin-dotnet-tests -P gremlin-dotnet
+# dotnet:
+# name: .NET
+# timeout-minutes: 20
+# needs: cache-gremlin-server-docker-image
+# runs-on: ubuntu-latest
+# steps:
+# - uses: actions/checkout@v5
+# - name: Set up JDK11
+# uses: actions/setup-java@v5
+# with:
+# java-version: '11'
+# distribution: 'temurin'
+# - name: Set up .NET 8.0.x
+# uses: actions/setup-dotnet@v4
+# with:
+# dotnet-version: '8.0.x'
+# - name: Get Cached Server Base Image
+# uses: actions/cache@v4
+# id: gremlin-server-test-docker-image
+# with:
+# path: |
+# ./gremlin-server/*
+# ~/.m2/repository/org/apache/tinkerpop/*
+# key: ${{ github.sha }}
+# - name: Load Docker Image
+# working-directory: ./gremlin-server
+# run: docker load --input gremlin-server.tar
+# - name: Build with Maven
+# run: |
+# touch gremlin-dotnet/src/.glv
+# touch gremlin-dotnet/test/.glv
+# mvn clean install -pl -:gremlin-javascript,-:gremlin-python,-:gremlint -q -DskipTests -Dci
+# mvn verify -pl :gremlin-dotnet,:gremlin-dotnet-tests -P gremlin-dotnet
neo4j-gremlin:
name: neo4j-gremlin
timeout-minutes: 20
@@ -301,39 +301,39 @@
run: |
mvn clean install -pl -:gremlin-javascript,-:gremlin-python,-gremlin-dotnet,-:gremlin-dotnet-source,-:gremlin-dotnet-tests -q -DskipTests -Dci
mvn verify -pl :neo4j-gremlin -DincludeNeo4j
- go:
- name: go
- timeout-minutes: 20
- needs: cache-gremlin-server-docker-image
- runs-on: ubuntu-latest
- steps:
- - name: Checkout
- uses: actions/checkout@v5
- - name: Setup Go
- uses: actions/setup-go@v5
- with:
- go-version: '1.22'
- - name: Get Cached Server Base Image
- uses: actions/cache@v4
- id: gremlin-server-test-docker-image
- with:
- path: |
- ./gremlin-server/*
- ~/.m2/repository/org/apache/tinkerpop/*
- key: ${{ github.sha }}
- - name: Load Docker Image
- working-directory: ./gremlin-server
- run: docker load --input gremlin-server.tar
- - name: Build with Maven
- working-directory: .
- run: |
- touch gremlin-go/.glv
- mvn clean install -pl -:gremlin-python,-:gremlin-javascript,-:gremlin-dotnet,-:gremlin-dotnet-source,-:gremlin-dotnet-tests -q -DskipTests -Dci
- mvn verify -pl :gremlin-go
- - name: Upload to Codecov
- uses: codecov/codecov-action@v5
- with:
- working-directory: ./gremlin-go
- - name: Go-Vet
- working-directory: ./gremlin-go
- run: go vet ./...
+# go:
+# name: go
+# timeout-minutes: 20
+# needs: cache-gremlin-server-docker-image
+# runs-on: ubuntu-latest
+# steps:
+# - name: Checkout
+# uses: actions/checkout@v5
+# - name: Setup Go
+# uses: actions/setup-go@v5
+# with:
+# go-version: '1.22'
+# - name: Get Cached Server Base Image
+# uses: actions/cache@v4
+# id: gremlin-server-test-docker-image
+# with:
+# path: |
+# ./gremlin-server/*
+# ~/.m2/repository/org/apache/tinkerpop/*
+# key: ${{ github.sha }}
+# - name: Load Docker Image
+# working-directory: ./gremlin-server
+# run: docker load --input gremlin-server.tar
+# - name: Build with Maven
+# working-directory: .
+# run: |
+# touch gremlin-go/.glv
+# mvn clean install -pl -:gremlin-python,-:gremlin-javascript,-:gremlin-dotnet,-:gremlin-dotnet-source,-:gremlin-dotnet-tests -q -DskipTests -Dci
+# mvn verify -pl :gremlin-go
+# - name: Upload to Codecov
+# uses: codecov/codecov-action@v5
+# with:
+# working-directory: ./gremlin-go
+# - name: Go-Vet
+# working-directory: ./gremlin-go
+# run: go vet ./...
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 8243534..f1eda73 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -2,10 +2,10 @@
on:
push:
- branches: [ "master", "3.5-dev", "3.6-dev", "3.7-dev" ]
+ branches: [ "master", "3.7-dev", "3.8-dev" ]
pull_request:
# The branches below must be a subset of the branches above
- branches: [ "master", "3.5-dev", "3.6-dev", "3.7-dev" ]
+ branches: [ "master", "3.7-dev", "3.8-dev" ]
schedule:
- cron: '22 8 * * 1'
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 26bf36c..e3c2a46 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -14,7 +14,73 @@
See the License for the specific language governing permissions and
limitations under the License.
////
-= TinkerPop3 CHANGELOG
+= TinkerPop CHANGELOG
+
+== TinkerPop 4.0.0 (Gremlin's Wildest Dreams)
+
+image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/images/gremlins-wildest-dreams.png[width=185]
+
+[[release-4-0-0]]
+=== TinkerPop 4.0.0 (NOT OFFICIALLY RELEASED YET)
+
+* Bumped SLF4j to 2.0.16.
+* Modified grammar to make `discard()` usage more consistent as a filter step where it can now be used to chain additional traversal steps and be used anonymously.
+* Bumped GMavenPlus to 4.1.1
+
+[[release-4-0-0-beta-1]]
+=== TinkerPop 4.0.0-beta.1 (January 17, 2025)
+
+* Added support for deserialization of `Set` for `gremlin-javascript`.
+* Added grammar-based `Translator` for all languages including explicit ones for Java and anonymization.
+* Removed old `Translator` infrastructure.
+* Removed grammar support for enums to be used as variables.
+* Changed `valueMap` in grammar to disallow the `boolean` argument as a variable to avoid ambiguous step calls.
+* Added integer overflow checks for `sum()`.
+* Modified Gremlin Server to only support instantiation of `authentication.authenticationHandler` with three-arg constructor.
+* Removed previously deprecated two-arg constructors for `authentication.authenticationHandler` implementations.
+* Removed previously deprecated one-arg constructor for `AbstractAuthenticationHandler`.
+* Renamed the traversal discarding `none()` step to `discard()`.
+* Added new list filtering step `none()`.
+* Replaced `gremlin-groovy` with `gremlin-lang` as the default language in `gremlin-server`.
+* Changed `sum()` to retain the type common to the stream rather than always promoting to `long` given the need for it to multiple by the `long` bulk value for the traverser.
+* Added support for `Set` in GraphSON and GraphBinary serialization for `gremlin-javascript`, where it previously just converted to array.
+* Added `Set` syntax in `gremlin-language`.
+* Modified RequestInterceptor to be a `UnaryOperator<HttpRequest>` to abstract the underlying implementation.
+* Removed the `gremlin-archetype` module in favor of newer sample applications in each GLV's `examples` folder.
+* Bumped to `commons-collection4`.
+* Switched to HTTP protocol in `gremlin-python` and replaced GraphSONV2, GraphSONV2 & GraphBinaryV1 with GraphBinaryV4
+* Added support for chunked transfer in `gremlin-python`
+* Added TypeScript & ECMAScript module support.
+* Improved graph structures type definitions in TypeScript.
+* Removed usage of `Bytecode` for Gremlin Server and Java GLV, script engines and `GremlinExecutor` will not be able to handle `Bytecode`.
+* Removed `Bytecode` based authorization.
+* Added `GremlinLang` which allows to generate gremlin-lang compatible string based on Traversal.
+* Removed serialization support for `Bindings` and `Bytecode`.
+* Changed `EmbeddedRemoteConnection` to prefer the grammar-based translator.
+* Removed `Client.submit(Traversal)` as a mechanism for submitting traversal, prefer `DriverRemoteConnection` instead.
+* Removed usage of `Bytecode` from `gremlin-python`.
+* Added `auth` module in `gremlin-python` for pluggable authentication.
+* Fixed `GremlinLangScriptEngine` handling for some strategies.
+* Updated Docker test suite set-up in `gremlin-python` to work with HTTP driver/server.
+* Updated `DateTime` serializers for Java and Python according to GraphBinaryV4.
+* Defined GraphBinaryV4 specification.
+* Defined GraphSONV4 specification.
+* Update serializers for `label` of an `Element` as a singleton list of string for GraphBinaryV4.
+* Added `bulked` byte to `Response Message` serialization for GraphBinaryV4.
+* Added a `bulked` header set by cluster setting, as well as a with `bulked` request option to turn on the bulking of result data.
+* Updated `List` and `BulkSet` serializers to implement `bulk` value flag for `List`.
+* Renamed `maxContentLength` setting for Gremlin Driver to `maxResponseContentLength` and blocked incoming responses that are too large based on total response size.
+* Renamed `maxContentLength` setting for Gremlin Server to `maxRequestContentLength`.
+* Added missing strategies to the `TraversalStrategies` global cache as well as `CoreImports` in `gremlin-groovy`.
+* Added missing strategies to `strategies.py` in `gremlin-python`.
+* Updated `OptionsStrategy` in `gremlin-python` to take options directly as keyword arguments.
+* Added static `instance()` method to `ElementIdStrategy` to an instance with the default configuration.
+* Updated `ElementIdStrategy.getConfiguration()` to help with serialization.
+* Updated `TraversalStrategyProxy` to utilize strategy names instead of strategy classes
+* Established mechanism for using customer strategies in remote context by using `TraversalStrategyProxy` in Java, or `TraversalStrategy` in GLVs.
+* Removed `minSize` setting for Gremlin Driver connection pool since connections are now short-lived HTTP connections
+* Added `idleConnectionTimeout` setting for Gremlin Driver and automatic closing of idle connections
+* Enabled TCP Keep-Alive in GremlinServer.
== TinkerPop 3.8.0 (NOT OFFICIALLY NAMED YET)
@@ -103,8 +169,8 @@
* Added optional traversal cache to `GremlinLangScriptEngine`
* Introduced step interfaces for all parameterizable steps
* Removed auto-unfold of singleton collections from `range()`, `limit()`, and `tail()` local scope steps to improve consistency of output.
-* Renamed `MergeElementStep` to `MergeElementStep` as it is a base class to `mergeV()` and `mergeE()`.
-* Renamed `MergeStep` of `merge()` to `MergeElementStep` for consistency.
+* Renamed `MergeStep` to `MergeElementStep` as it is a base class to `mergeV()` and `mergeE()`.
+* Renamed `TraversalMergeStep` of `merge()` to `MergeStep` for consistency.
== TinkerPop 3.7.0 (Gremfir Master of the Pan Flute)
@@ -547,496 +613,47 @@
[[release-3-6-8]]
=== TinkerPop 3.6.8 (Release Date: October 23, 2024)
-* Fixed a bug in GremlinServer not properly propagating arguments when authentication is enabled.
-* Fixed bug in Java driver where connection pool was not removing dead connections under certain error conditions.
-* Raised handshake exceptions for Java driver for `NoHostAvailableException` situations.
-* The default logging level for Gremlin Console in Windows is set to the same WARN level as for Linux.
-* Updated to Docker Compose V2 with `docker-compose` changed to `docker compose` in pom and script files.
-* Add command line option `-l` to change logging level for Gremlin Console in Windows.
-* Add `enableCompression` connection setting to Java, Python, and JS GLVs.
-* Increased minimum python version from 3.8 to 3.9
-* Upgraded `gremlin-go` to Go 1.22.
-* Bump Netty to 4.1.100
-* Bump Logback to 1.2.13
-* Bump Ivy to 2.5.2
-* Fixed a memory leak in the Javascript driver when there is a server error response.
-* Throw more descriptive error in `gremlin-go` when request size exceeds `WriteBufferSize`
-* Fixed a missing runtime dependency in `gremlin-python`
-
-==== Bugs
-
-* TINKERPOP-3035 Add explicit property(IDictionary) for .NET
-* TINKERPOP-3050 security vulnerability in logback-core
-* TINKERPOP-3051 security vulnerability in logback-classic
-* TINKERPOP-3052 security vulnerability in ivy
-* TINKERPOP-3053 security vulnerability in netty-codec-http2
-* TINKERPOP-3076 Incorrect handling of large requests in Go GLV
-* TINKERPOP-3077 Javascript translator incorrectly handle quotes, null and undefined values
-* TINKERPOP-3079 The test `TraversalStrategiesTest#shouldAllowUserManipulationOfGlobalCache` is not idempotent, as it passes in the first run and fails in repeated runs in the same environment.
-* TINKERPOP-3081 When using authentication, evaluationTimeout is ignored
-* TINKERPOP-3116 async_timeout not declared in gremlinpython dependencies
-
-==== Improvements
-
-* TINKERPOP-2700 WebSocket compression may lead to attacks (CRIME / BREACH)
-* TINKERPOP-3086 Upgrade gremlin-python to newer Python interpreter
-* TINKERPOP-3098 Gremlin Console bat file is missing log level configuration option
+Please see the archived <<./docs/archive/changelogs/changelog-3.6.x.asciidoc#release-3-6-8, 3.6.8 changelog>>.
[[release-3-6-7]]
=== TinkerPop 3.6.7 (Release Date: April 8, 2024)
-* Fixed a bug in Gremlin.Net for .NET 8 that led to exceptions: `InvalidOperationException: Enumeration has not started. Call MoveNext.`
-* Fixed message requestId serialization in `gremlin-python`.
-* Improved performance of `PathRetractionStrategy` for traversals that carry many children, but don't hold many labels to propogate.
-* Fixed bug in bytecode translation of `g.tx().commit()` and `g.tx().rollback()` in all languages.
-* Improved error message from `JavaTranslator` by including exception source.
-* Added missing `short` serialization (`gx:Int16`) to GraphSONV2 and GraphSONV3 in `gremlin-python`.
-* Added tests for error handling for GLV's if `tx.commit()` is called remotely for graphs without transactions support.
-* Introduced multi-architecture AMD64/ARM64 docker images for gremlin-console.
-* Fixed bug in `JavaTranslator` where `has(String, null)` could call `has(String, Traversal)` to generate an error.
-* Fixed issue where server errors weren't being properly parsed when sending bytecode over HTTP.
-* Improved `Bulkset` contains check for elements if all elements in `Bulkset` are of the same type.
-* Fixed bug in `EarlyLimitStrategy` which was too aggressive when promoting `limit()` before `map()`.
-* Prevented mid-traversal `mergeE()` and `mergeV()` from operating on an incoming `Traverser` that contains an `Element`.
-* Improved performance of the application of `FilterRankingStrategy` for large traversals with deeply nested traversals by improving the cache operation.
-* Updated aliased client to pass along options via `with()` when submitting traversals.
-* Upgraded `gremlin-go` to Go 1.21.
-* Upgraded `gremlin-javascript` and `gremlint` to Node 18.17.0.
-* Allowed public access for `serviceName` and `mergedParams` in `CallStep`, and checks on `PartitionStrategy` usage in `MergeElementStep`.
-
-==== Bugs
-
-* TINKERPOP-2359 onShutDown not being called when docker container stopped
-* TINKERPOP-2913 Ensure that if tx.commit() is called remotely it does not hang for graphs without transactions
-* TINKERPOP-3022 JavaTranslator failing for has(String, null)
-* TINKERPOP-3027 Pick.any should be any_()
-* TINKERPOP-3029 Gremlin.Net: Traversal enumeration fails on .NET 8
-* TINKERPOP-3031 Bad translation for g.tx()
-* TINKERPOP-3039 Java driver won't propagate with args when using aliased client directly
-* TINKERPOP-3045 EarlyLimitStrategy is too aggresive to promote Limit and thus causing incorrect results
-* TINKERPOP-3054 RequestId serialization broken in Python GLV
-* TINKERPOP-3056 mergeE is updating vertices in certain conditions
-
-==== Improvements
-
-* TINKERPOP-2995 Create Sample Applications in each GLV
-* TINKERPOP-3021 Publish ARM64 Gremlin Console Images
-* TINKERPOP-3030 Update to .NET 8
-* TINKERPOP-3068 Make serviceName and mergedParams public for provider usage in CallStep
+Please see the archived <<./docs/archive/changelogs/changelog-3.6.x.asciidoc#release-3-6-7, 3.6.7 changelog>>.
[[release-3-6-6]]
=== TinkerPop 3.6.6 (Release Date: November 20, 2023)
-This release also includes changes from <<release-3-5-8, 3.5.8>>.
-
-* Fixed a javadoc comment in `GraphTraversal.not()` method.
-* Allowed `gremlin-driver` to be used over HTTP for experimental purposes.
-* Added user agent handling to gremlin-server for HTTP requests.
-* Allowed `io()` to automatically detect ".graphml" as a file extension.
-* Deprecated the `HandshakeInterceptor` in favor of a more generic `RequestInterceptor`.
-* Allowed `gremlin-python` to be used over HTTP for experimental purposes.
-* Fixed translation of `P`, `TraversalStrategy` and Enums, and added translation for `Vertex`, `Edge`, `VertexProperty`, list, set, dict, number, binding and lambda in Groovy Translator for Python.
-* Fixed a bug in `StarGraph` where `EdgeFilter` did not remove associated Edge Properties.
-* Added Gremlin translator implementation to the Go GLV.
-* Fixed Go translator to handle array arguments.
-* In Go GLV `P.Within` and `P.Without` extended to accept array arguments similar to other GLV's
-* Improved `SubgraphStrategy` by reducing chance for redundant filtering of adjacent vertices.
-* Fixed bug with filtering for `group()` when the side-effect label was defined for it.
-* ProjectStep now throws exception when a duplicate key is provided in a query.
-* Fixed bug in `replaceLocalChild` where child traversal was not correctly integrated.
-* Fixed bug in `ElementIdStrategy` where the order of `hasId` was impacting proper filters.
-* Fixed bug in the Java driver configuration for serialization when reading settings from an `InputStream`.
-* Fixed bug in `DotNetTranslator` where `PartitionStrategy` usage was not translating properly when specifying the `readPartitions`.
-* Fixed bug in `PythonTranslator` where `Set` syntax was not being generated properly.
-* Fixed bug in configuration object given to `PartitionStrategy` for Go that prevented `readPartitions` from behing set properly.
-* Fixed bug where the `partitionKey` was not being written when using `PartitionStrategy` with `mergeV()` and `mergeE()`
-* Added checking for valid UUID requestIds in `gremlin-python` and `gremlin-javascript`.
-* Do not use `XOR` for hashCode computation of Step when only simple keys are used and duplicate keys are allowed.
-
-==== Bugs
-
-* TINKERPOP-2423 hashCode collision for steps with different attributes
-* TINKERPOP-2811 ElementIdStrategy doesn't replace all references of an element's id with the specified custom id property
-* TINKERPOP-2921 Filters not working when side-effect is used with group()
-* TINKERPOP-2976 InvalidOperationException: Collection was modified in GraphBinary serialization
-* TINKERPOP-2983 Upgrade Netty for Security Reasons
-* TINKERPOP-2996 Golang Translator in core does not properly translate list arguments
-* TINKERPOP-3001 Gremlin Console complains about missing serializers field
-* TINKERPOP-3009 SubgraphStrategy produces excessive filtering when multiple labels are filtered upon
-
-==== Improvements
-
-* TINKERPOP-2802 Support Adding Custom Serializer for Gremlin Go
-* TINKERPOP-2830 Handle User-Agent from HTTP Requests to server
-* TINKERPOP-2951 Add translator to the Go GLV
-* TINKERPOP-2964 Many TraversalParent's steps have a replaceLocalChild logic that can result in a new ChildTraversal having an ID that already exists.
-* TINKERPOP-2982 Allow gremlin-driver usage over HTTP
-* TINKERPOP-2984 Replace Moq mocking library in .NET tests
-* TINKERPOP-2986 StarGraph shall drop edge properties when dropping edges
-* TINKERPOP-2988 Serialization error throws an Invalid OpProcessor exception when using stream() API
-* TINKERPOP-2991 Reformat Javadoc link in reference docs
-* TINKERPOP-2994 PartitionStrategy does not work with mergeV() and mergeE()
-* TINKERPOP-3006 Allow gremlin-python usage over HTTP
+Please see the archived <<./docs/archive/changelogs/changelog-3.6.x.asciidoc#release-3-6-6, 3.6.6 changelog>>.
[[release-3-6-5]]
=== TinkerPop 3.6.5 (Release Date: July 31, 2023)
-This release also includes changes from <<release-3-5-7, 3.5.7>>.
-
-* Added `text/plain` MIME type to the HTTP endpoint to return a Gremlin Console-like representation of the data.
-* Added GraphBinary serialization option to the HTTP endpoint.
-* Fixed bug with `fail` step not working with a `VertexProgram` running on the server.
-* Introduced mime type `application/vnd.gremlin-v1.0+json;typed=false` to allow direct specification of GraphSON 1.0 without types.
-* Introduced mime type `application/vnd.gremlin-v2.0+json;typed=false` to allow direct specification of GraphSON 2.0 without types.
-* Removed `final` class declaration for `LabelStep`.
-* Fixed MergeE/MergeV steps to always throw exception for invalid `onMatch` option.
-* TINKERPOP-2802: Add support for custom deserializers to the Gremlin-Go Driver
-
-==== Bugs
-
-* TINKERPOP-2920 SubgraphStrategy failure when property key not present on vertex in by()
-* TINKERPOP-2937 Throw an error when trying to use a closed connection
-* TINKERPOP-2948 PRISMA security vulnerabilty for jackson-databind 2.14.0 *(breaking)*
-* TINKERPOP-2953 Static import for __.values() overriden by Column.values()
-* TINKERPOP-2958 ScheduledExecutorService for timeouts are never cancelled
-* TINKERPOP-2965 FilterRankingStrategy removing labels it shouldn't in certain conditions
-
-==== Improvements
-
-* TINKERPOP-1403 Provide support for GraphFilter.vertexProperties() *(breaking)*
-* TINKERPOP-2938 Revisit merge step feature tests
-* TINKERPOP-2939 The Merge onMatch map validation is during execution instead of construction
-* TINKERPOP-2941 DO NOT purge the output location if it has content in SparkGraphComputer
-* TINKERPOP-2947 Provide a plain text serializer for HTTP
-* TINKERPOP-2954 Pass Gremlin Version from Maven to Java Without Manifests
-* TINKERPOP-2955 Support SSL in WebSocketClient
-* TINKERPOP-2956 Update gremlint version for the published application
-* TINKERPOP-2963 Introduce new mimeType to return GraphSon-1.0 in text format
-* TINKERPOP-2977 Deprecate Neo4j-Gremlin
+Please see the archived <<./docs/archive/changelogs/changelog-3.6.x.asciidoc#release-3-6-5, 3.6.5 changelog>>.
[[release-3-6-4]]
=== TinkerPop 3.6.4 (Release Date: May 12, 2023)
-* Fixed bug in `TextP.regex` and `TextP.notRegex` serialization for Java GLV.
-* Fixed a memory leak in the Gremlin.Net driver that only occurred if a `CancellationToken` was provided.
-
-==== Bugs
-
-* TINKERPOP-2945 TextP.regex() Serialization Failing in Java driver
-* TINKERPOP-2944 Memory leak in Gremlin.Net driver if CancellationToken is used
+Please see the archived <<./docs/archive/changelogs/changelog-3.6.x.asciidoc#release-3-6-4, 3.6.4 changelog>>.
[[release-3-6-3]]
=== TinkerPop 3.6.3 (Release Date: May 1, 2023)
-This release also includes changes from <<release-3-5-6, 3.5.6>>.
-
-* Fixed bug in `element()` when traversing from edges where bulking was enabled.
-* Refactored `PropertyMapStep` to improve extensibility by providers. Removed `final` class declaration for `ProjectStep` and `CoalesceStep`.
-* Fixed bug in grammar that prevented declaration of a `Map` key named `new` without quotes.
-* Fixed bug in grammar that prevented parsing of `Map` key surrounded by parenthesis which is allowable in Groovy.
-* Fixed bug in `GroovyTranslator` that surrounded `String` keys with parenthesis for `Map` when not necessary.
-* Added support to the grammar allowing `List` and `Map` key declarations for `Map` entries.
-* Fixed `Direction` enum bug in `gremlin-javascript` where `Direction.from_` and `Direction.to` was not properly aliased to `Direction.OUT` and `Direction.IN`
-* Fixed `Direction` enum in `gremlin-python` where `Direction.from_` and `Direction.to` were not added, and they can now be used instead of defining `from_=Direction.OUT` and `to=Direction.IN`
-* Improved performance of comparison (equals) between not compatible types and nulls.
-* Fixed `mergeV()` and `mergeE()` steps to work when `onCreate` is immutable map.
-* Introduced `Writing` and `Deleting` marker interfaces to identify whether a step can perform write or delete or both on Graph.
-* For `mergeV()` and `mergeE()`, added checks for illegal hidden keys and refactored `searchVertices` to allow subclasses to override search criteria.
-* Added static map capturing possible `Traversal` steps that shall be added to traversal for a given operator.
-* Fixed bug which caused some traversals to throw `GremlinTypeErrorException` to users.
-
-==== Bugs
-
-* TINKERPOP-2526 Gremlin Console performance with incomplete multi-line scripts
-* TINKERPOP-2767 Repeat Out Times traversal hangs indefinitely on first execution
-* TINKERPOP-2820 gremlin-python _close_session race condition/FD leak
-* TINKERPOP-2855 Performance degradation in TinkerGraph 3.5.4 and 3.5.5
-* TINKERPOP-2856 math() step fails if variable name contains a keyword
-* TINKERPOP-2861 Fix incorrect symlinks in source release zip
-* TINKERPOP-2863 HasId Step generates incorrect results when given a list of IDs mid-traversal
-* TINKERPOP-2870 mergeV requires key of 'new' to be quoted
-* TINKERPOP-2878 Incorrect handling of local operations when there are duplicate elements
-* TINKERPOP-2888 DefaultTraversal's applyStrategies performance decrease
-* TINKERPOP-2891 Inconsistent behavior when comparing a counted value with a negative value
-* TINKERPOP-2893 Incorrectly comparing a counted value with multiple predicates
-* TINKERPOP-2901 Incorrect result caused by has(key, predicate)
-* TINKERPOP-2902 Critical security vulnerability in snakeyaml
-* TINKERPOP-2905 gremlin-go gorillaTransporter.logHandler is not initialized correctly and leads to panic
-* TINKERPOP-2911 CountStrategy converts count().is(0) wrongly under ConnectiveStrategy
-* TINKERPOP-2918 Utils.GenerateUserAgent assumes Gremlin.Net.dll to be present when, in some environments, it is not.
-* TINKERPOP-2922 GroovyTranslator produces a Map not parseable by the grammar
-* TINKERPOP-2925 mergeE() in javascript producing an error
-* TINKERPOP-2926 Gremlin-Java > An UnsupportedOperationException occurs on calling next() after a merge step with the option step modulator if the element does not exist
-* TINKERPOP-2928 element() not working in conjunction with edge properties
-
-==== Improvements
-
-* TINKERPOP-2841 Test and Fix Per Request Settings in Go
-* TINKERPOP-2852 Update Maven plugin for docker-images building for M1 compatibility
-* TINKERPOP-2857 GraphSONRecordReader does not allow configure a GraphFilter during deserialization
-* TINKERPOP-2865 Add has steps injected by PartitionStrategy at the end of the filter
-* TINKERPOP-2890 Avoid exceptions on local scope based steps where possible
-* TINKERPOP-2899 SampleGlobalStep samples inefficiently with TraverserSet running into hash collisions
-* TINKERPOP-2912 Improve error message for addE() when traverser is incorrect
-* TINKERPOP-2919 Improve performance of FilterRankingStrategy for deeply nested traversals
-* TINKERPOP-2924 Refactor PropertyMapStep to be able to overwrite map method
-* TINKERPOP-2929 Introduce new marker interfaces to identify whether a step can perform write or delete or both
-* TINKERPOP-2931 Fix a few minor mergeV/E issues
-* TINKERPOP-2934 Optimize ObjectWritable for displaying content of Java Collection or Map to reduce OOM
+Please see the archived <<./docs/archive/changelogs/changelog-3.6.x.asciidoc#release-3-6-3, 3.6.3 changelog>>.
[[release-3-6-2]]
=== TinkerPop 3.6.2 (Release Date: January 16, 2023)
-This release also includes changes from <<release-3-5-5, 3.5.5>>.
-
-* Fixed bug in the Gremlin grammar for parsing of empty queries.
-* Provided mechanism for provider plugins to get notified on script/query processing via `GraphManager`.
-* Fixed bug in `select()` when using multiple labels.
-* Moved Gherkin feature tests to `gremlin-test` resources so that they are more easily referenced by providers.
-* Made quality of life changes to semantics for `mergeV/E` based on initial feedback.
-
-==== Bugs
-
-* TINKERPOP-2765 Race condition during script creation when using UnifiedChannelizer
-* TINKERPOP-2769 gremlin-server does not reply with a timeout response to all timed out requests
-* TINKERPOP-2771 Critical severity security vulnerabilty in commons-configuration 2.7
-* TINKERPOP-2796 High severity security vulnerability found in snakeyaml
-* TINKERPOP-2801 Incorrect deprecation notice on gremlin-python
-* TINKERPOP-2803 Incorrect count() with sample() in TinkerGraph
-* TINKERPOP-2805 No results returned for multiple labels to select()
-* TINKERPOP-2809 High severity security vulnerability found in jackson databind
-* TINKERPOP-2815 Critical security vulnerability for apache commons-text
-* TINKERPOP-2816 Gherkin test issues for implementers
-* TINKERPOP-2817 "Could not find a type identifier for the class : class java.lang.Byte" occurs when dumping graph to graphson format
-* TINKERPOP-2826 Critical security vulnerability in ivy
-* TINKERPOP-2836 Github actions do not run java driver integration tests
-* TINKERPOP-2840 Test Failures on NonDex
-* TINKERPOP-2843 Security vulnerabilities found in netty version 4.1.77
-* TINKERPOP-2849 Incorrect implementation for GraphTraversalSource.With in gremlin-go
-
-==== Improvements
-
-* TINKERPOP-2471 Add logging to Gremlin.Net driver
-* TINKERPOP-2480 User agent for Gremlin drivers
-* TINKERPOP-2622 Enforce ordering semantics in feature tests
-* TINKERPOP-2696 Refactor Gherkin test framework to better handle bindings
-* TINKERPOP-2737 Dockerized Build and Test Environments
-* TINKERPOP-2772 Add Spark utility to load vertices as RDD
-* TINKERPOP-2779 Floating ConnectedComponent Feature Failures for GitHub Actions on windows
-* TINKERPOP-2785 Inability to Mock Returned Result Types in Gremlin-Go Driver
-* TINKERPOP-2792 Better exception when JavaTranslator finds a method but not the overload
-* TINKERPOP-2794 Allow cancellation of Gremlin.Net async methods
-* TINKERPOP-2804 gherkin feature files should be on the classpath
-* TINKERPOP-2806 Provide method for provider plugins to get notified on script/query processing
-* TINKERPOP-2808 Improve Compatibility on ARM machines
-* TINKERPOP-2813 Improve driver usability for cases where NoHostAvailableException is currently thrown
-* TINKERPOP-2814 Add a SSL handshake timeout configuration to the driver
-* TINKERPOP-2818 exclude mockito-core in gremlin-core [compile scope] (import by jcabi-manifests)
-* TINKERPOP-2833 TestSupport loads files too slow
-* TINKERPOP-2834 CloneVertexProgram optimization on SparkGraphComputer
-* TINKERPOP-2842 Expand GremlinScriptChecker to include request id overrides
-* TINKERPOP-2850 Modifications to mergeV/E semantics
+Please see the archived <<./docs/archive/changelogs/changelog-3.6.x.asciidoc#release-3-6-2, 3.6.2 changelog>>.
[[release-3-6-1]]
=== TinkerPop 3.6.1 (Release Date: July 18, 2022)
-This release also includes changes from <<release-3-5-4, 3.5.4>>.
-
-* Made GraphBinary the default serialization format for .NET and Python.
-* Added missing `ResponseStatusCodeEnum` entry for 595 for .NET.
-* Fix a javadoc comment in `Cluster.Builder` regarding maxInProcessPerConnection.
-
-==== Bugs
-
-* TINKERPOP-2734 NullPointerException when calling Client chooseConnection()
-* TINKERPOP-2736 PluginAcceptor interface no more available in 3.5.3+ but referred in documentation
-* TINKERPOP-2741 GraphMLWriter error message is not properly formatted
-* TINKERPOP-2746 Medium security vulnerabilities on logback-core
-* TINKERPOP-2751 Transaction: tx.commit() hangs up in javascript client-lib
-* TINKERPOP-2754 Javascript client hangs if the server restarts
-* TINKERPOP-2768 BranchStep pickToken should be integrated when added as a child option
-
-==== Improvements
-
-* TINKERPOP-2229 JavaScript GLV: Add GraphBinary Support
-* TINKERPOP-2631 GraphSON float serialization when ujson is used is imprecise
-* TINKERPOP-2693 Complete GraphBinary support in Python
-* TINKERPOP-2715 remove log4jv1 dependency
-* TINKERPOP-2723 Make GraphBinary the default serialization format for .NET and Python *(breaking)*
-* TINKERPOP-2740 first request suspend more than 9s when using gremlin-java-driver
-* TINKERPOP-2748 Medium security vulnerability on netty-all and netty-codec
-* TINKERPOP-2762 getScopeKeys should respect the order of keys passed in Step
-* TINKERPOP-2764 AWS Neptune returns an inaccessible structured error response
+Please see the archived <<./docs/archive/changelogs/changelog-3.6.x.asciidoc#release-3-6-1, 3.6.1 changelog>>.
[[release-3-6-0]]
=== TinkerPop 3.6.0 (Release Date: April 4, 2022)
-This release also includes changes from <<release-3-5-3, 3.5.3>>.
-
-* Added parser support for `NaN` and `Infinity`.
-* Implemented comparability/orderability semantics defined in the Graph Provider documentation.
-* Added `TextP.regex` and `TextP.notRegex`.
-* Changed TinkerGraph to allow identifiers to be heterogeneous when filtering.
-* Prevented values of `T` to `property()` from being `null`.
-* Added throwing `ArithmeticException` when arithmetic operations overflow for byte, short, int and long arguments.
-* Added `element()` step.
-* Added `call()` step.
-* Added `fail()` step.
-* Added `mergeV()` and `mergeE()` steps.
-* Added `Direction` aliases of `from` and `to`.
-* Moved `TraversalOptionParent.Pick` to its own class as `Pick`.
-* Introduced Pythonic Gremlin step names using snake case and deprecated camel case naming.
-* Improved Gherkin test framework to allow for asserting traversal exceptions as a behavior.
-* Fixed query indentation for profile metrics where indent levels were not being respected.
-* `TraversalOpProcessor` no longer accepts a `String` representation of `Bytecode` for the "gremlin" argument which was left to support older versions of the drivers.
-* Removed requirement that "ids" used to filter vertices and edges need to be all of a single type.
-* Created `gremlin-annotations` module where the `@GremlinDsl` annotation and related code has been moved.
-* Moved `GremlinScriptChecker` to `gremlin-core` from `gremlin-groovy` since it is not Groovy dependent.
-* Removed `groovy` and `groovy-json` dependencies from `gremlin-driver` as well as related `JsonBuilder` serialization support.
-* Replaced log4j usage with logback where builds rely on and packaged distributions now contain the latter.
-* Improved behavior of `V()` and `E()` when `null` is an argument producing a filtering behavior rather than an exception.
-* Prevented metrics computation unless the traversal is in a locked state.
-* Added syntax to Gremlin grammar to explicitly define `byte`, `short` and `BigInteger`.
-* Added syntax to Gremlin grammar to allow construction of a reference `Vertex`.
-* Changed Gremlin grammar to allow for Groovy-like syntax when parsing a `Map` literal.
-* Created a way to produce a corpus of Gremlin traversals via `FeatureReader` and `DocumentationReader` in `gremlin-language`.
-* Changed mechanism for determining if `id` equality with `toString()` is used by validating that elements of the predicate collection are all `String` rather than enforcing homogenous collections in the process.
-* Exposed Gherkin tests as part of the provider test suite.
-* Packaged Gherkin tests and data as standalone package as a convenience distribution.
-* Removed `ProductiveByStrategy` as a strategy that is applied by default.
-* Changed `by()` modulator semantics to consistently filter.
-* Removed previously deprecated Gryo `MessageSerializer` implementations.
-* Removed previously deprecated `AuthenticationSettings.enableAuditLog`.
-* Removed previously deprecated `GroovyTranslator` from `gremlin-groovy` module.
-* Removed previously deprecated Gremlin steps that conflicted with Python keywords.
-* Removed the dependency on `six` from `gremlin-python`.
-* Bumped to Apache Hadoop 3.3.1.
-* Bumped to Apache Spark 3.2.0.
-* Bumped node.js in `gremlin-javascript` to v16.13.0.
-* Changed `NumberHelper` to properly cast to `byte` and `short` rather than default coercing to `Integer`.
-* Modified some driver defaults (maximum content length, pool size, maximum in process) to be more consistent with one another.
-* Fixed a potential connection load balancing issue due to a race condition not updating the usage count.
-* Extended `property()` to allow for setting a `Map` of property values.
-
-==== Bugs
-
-* TINKERPOP-2358 Potential connection leak on client disposing
-* TINKERPOP-2486 Client does not load balance requests across available connections
-* TINKERPOP-2507 Remove requirement that Graph implementations must filter on homogeneous identifiers *(breaking)*
-* TINKERPOP-2522 DefaultTraversalMetrics::toString does not indent annotations correctly
-* TINKERPOP-2554 Extracting step metrics from ProfileStep throws NPE if the step was not triggered
-* TINKERPOP-2565 GraphMLWriter does not check vertexLabelKey conflict
-* TINKERPOP-2566 Incomplete error message in bytecode step generation
-* TINKERPOP-2568 Graph instance not set for child traversals
-* TINKERPOP-2569 Reconnect to server if Java driver fails to initialize
-* TINKERPOP-2578 Set arguments to P within/without are wrapped in List
-* TINKERPOP-2579 EventStrategy doesn't work with anonymous traversal
-* TINKERPOP-2580 Update the custom DSL documentation
-* TINKERPOP-2585 Traversal failed for different strategies order
-* TINKERPOP-2589 XML External Entity (XXE) vulnerability
-* TINKERPOP-2597 NullPointerException while initializing connection pool
-* TINKERPOP-2598 within(null) NPE
-* TINKERPOP-2603 TinkerGraph sometimes could not query float values.
-* TINKERPOP-2604 TinkerGraph could not order vertex/edge without specified property.
-* TINKERPOP-2606 Neo4j-Gremlin could not order vertex/edge without specified property
-* TINKERPOP-2609 HTTP returns serialization exceptions for the GraphTraversalSource
-* TINKERPOP-2610 NumberHelper can return values in the form of their original type smaller than int *(breaking)*
-* TINKERPOP-2621 toString for traversals such as within with empty array returns empty string as argument instead of brackets
-* TINKERPOP-2626 RangeGlobalStep closes traversal prematurely
-* TINKERPOP-2649 Unable to translate gremlin query to java
-* TINKERPOP-2658 Translator in gremlin-javascript has trouble with array arguments
-* TINKERPOP-2661 GremlinGroovyScriptEngine handling of null arguments
-* TINKERPOP-2662 Unclosed client session and stacktrace pops up when cleanup is missed
-* TINKERPOP-2670 JavaDocs do not build when using JDK 11
-* TINKERPOP-2694 Bug of TinkerGraph gremlin api "has()"
-* TINKERPOP-2702 property(null) throws NPE
-* TINKERPOP-2706 Traversal clone() not resetting the close state
-* TINKERPOP-2712 PropertyChangedEvent is triggered before Property is actually changed
-* TINKERPOP-2717 Gremlin.NET : WebSocketConnection does not check for MessageType.Close, causing error InvalidOperationException: "Received data deserialized into null object message. Cannot operate on it."
-* TINKERPOP-2719 hasNext is called on TraverserIterator after transaction is committed
-* TINKERPOP-2726 Python's GroovyTranslator translates boolean wrong
-
-==== Improvements
-
-* TINKERPOP-2367 Gremlin Translators for .NET
-* TINKERPOP-2379 Consistent defaults and initialization APIs for drivers
-* TINKERPOP-2411 Move GremlinDslProcessor to its own artifact *(breaking)*
-* TINKERPOP-2467 Follow python naming conventions for Gremlin syntax
-* TINKERPOP-2504 Intermittently failing server/driver integration tests
-* TINKERPOP-2518 Enhance .NET gherkin framework to deal with more advanced assertions
-* TINKERPOP-2524 Expand support for number types in grammar
-* TINKERPOP-2525 Extend Gherkin tests to cover strategies
-* TINKERPOP-2534 Log4j flagged as critical security violation
-* TINKERPOP-2548 Add getter for indexer used in IndexStep
-* TINKERPOP-2551 Setup scripts to publish Gremint to npm
-* TINKERPOP-2555 Support for remote transactions in Python
-* TINKERPOP-2556 Support remote transactions in .NET
-* TINKERPOP-2557 Support remote transactions in Javascript
-* TINKERPOP-2559 Stop sending the close message for .NET
-* TINKERPOP-2560 Stop sending close message for Python
-* TINKERPOP-2561 Stop sending close message in Javascript
-* TINKERPOP-2562 Remove GraphSON 2 option in TraversalOpProcessor *(breaking)*
-* TINKERPOP-2570 Support custom type in GraphBinary for .NET
-* TINKERPOP-2576 Setup automatic updates via Dependabot for Gremlin.NET
-* TINKERPOP-2577 Remove unused test coverage dependencies from Gremlin.NET
-* TINKERPOP-2582 Construct traversals from gremlin-language
-* TINKERPOP-2583 Make gremlin-groovy processing optional in Gremlin Server
-* TINKERPOP-2591 Administrative adjustments to gremlint site
-* TINKERPOP-2592 Align the style guides
-* TINKERPOP-2593 Remove Groovy as a dependency from gremlin-driver *(breaking)*
-* TINKERPOP-2596 datetime function
-* TINKERPOP-2601 Unify Gremlin testing behind Gherkin
-* TINKERPOP-2605 Further enforce and refine null semantics
-* TINKERPOP-2608 Enhance sample().by() semantics when by produces a null *(breaking)*
-* TINKERPOP-2611 Prevent property(id,null) and addV(null) *(breaking)*
-* TINKERPOP-2613 Improve behavior of V/E(null)
-* TINKERPOP-2615 Expand testing of path() with null values
-* TINKERPOP-2616 Provide better exceptions with SSL related failures *(breaking)*
-* TINKERPOP-2620 Clean up NullPointerExceptions related to null arguments on property related steps
-* TINKERPOP-2630 Clarify that a server cannot support Graphson1.0 over HTTP
-* TINKERPOP-2632 Netty 4.1.61 flagged with two high severity security violations
-* TINKERPOP-2635 Consistent by() behavior *(breaking)*
-* TINKERPOP-2636 Remove ProductiveByStrategy as a default *(breaking)*
-* TINKERPOP-2637 Enhance logging in the Python
-* TINKERPOP-2639 Remove previously deprecated GryoMessageSerializer infrastructure *(breaking)*
-* TINKERPOP-2640 Remove previously deprecated AuthenticationSettings.enableAuditLog setting *(breaking)*
-* TINKERPOP-2641 Allow orderability on any type
-* TINKERPOP-2645 Improve behavior of hasId(null)
-* TINKERPOP-2646 Make .NET StreamExtensions public for GraphBinary
-* TINKERPOP-2650 Remove deprecated Gremlin step overloads of python keywords *(breaking)*
-* TINKERPOP-2651 Update to .NET 6
-* TINKERPOP-2652 Add TextP.regex to the text predicate set
-* TINKERPOP-2656 Provide a no syntax sugar translator for python
-* TINKERPOP-2657 Remove GroovyTranslator from gremlin-groovy *(breaking)*
-* TINKERPOP-2659 Bump javascript runtimes to node v16
-* TINKERPOP-2660 Bring back close message for drivers
-* TINKERPOP-2663 Support Vertex references in grammar
-* TINKERPOP-2665 Add the ability for property() to take a map
-* TINKERPOP-2666 Create an anonymizing Translator for logging traversals without user data
-* TINKERPOP-2667 Allow fold() with addAll to work on Map
-* TINKERPOP-2668 Updating aiohttp requirements at germin-python due to vulnerability
-* TINKERPOP-2669 Netty 4.1.61 flagged with medium severity security violations
-* TINKERPOP-2671 Add tx() support to grammar
-* TINKERPOP-2676 Refactor GremlinScript checker out of groovy package *(breaking)*
-* TINKERPOP-2678 jackson-databind medium security issue identified
-* TINKERPOP-2679 Update JavaScript driver to support processing messages as a stream
-* TINKERPOP-2680 Create call() step to allow for calling procedures
-* TINKERPOP-2681 Create merge() step to codify best practice for upsert pattern
-* TINKERPOP-2682 Enable WebSocket compression in .NET by default
-* TINKERPOP-2687 Gremlin Boolean Value Expressions 2.0 with Ternary Boolean Logics
-* TINKERPOP-2688 Investigate two .NET test failures
-* TINKERPOP-2689 VertexProperty Gherkin support for .NET
-* TINKERPOP-2690 VertexProperty Gherkin support for Javascript
-* TINKERPOP-2691 VertexProperty Gherkin support for Python
-* TINKERPOP-2695 Support NaN/Inf in Parser and Gherkin
-* TINKERPOP-2705 Support null as an argument where it makes sense in Gremlin.NET
-* TINKERPOP-2707 Closing parent connection in python should close tx() connections
-* TINKERPOP-2711 Make gremlin-language optional as it brings in CDDL/GPL dependencies
-* TINKERPOP-2713 Create an element() step that maps a Property to its Element.
-* TINKERPOP-2716 Enable eslint for gremlin-javascript project
-* TINKERPOP-2725 Traversal Strategy Mix Up In Gremlin-Python
-* TINKERPOP-2727 HasContainer should allow a null key
-* TINKERPOP-2728 jackson-databind high security issue identified
+Please see the archived <<./docs/archive/changelogs/changelog-3.6.x.asciidoc#release-3-6-0, 3.6.0 changelog>>.
== TinkerPop 3.5.0 (The Sleeping Gremlin: No. 18 Entr'acte Symphonique)
@@ -1045,731 +662,47 @@
[[release-3-5-8]]
=== TinkerPop 3.5.8 (Release Date: November 20, 2023)
-* Fixed a bug in Gremlin.Net that can lead to an `InvalidOperationException` due to modifying a collection while iterating over it in the serializers.
-* Bumped Netty to 4.1.96
-
-==== Bugs
-
-* TINKERPOP-2976 InvalidOperationException: Collection was modified in GraphBinary serialization
-* TINKERPOP-2983 Upgrade Netty for Security Reasons
-
-==== Improvements
-
-* TINKERPOP-2984 Replace Moq mocking library in .NET tests
-* TINKERPOP-2991 Reformat Javadoc link in reference docs
-
+Please see the archived <<./docs/archive/changelogs/changelog-3.5.x.asciidoc#release-3-5-8, 3.5.8 changelog>>.
[[release-3-5-7]]
=== TinkerPop 3.5.7 (Release Date: July 31, 2023)
-* Bumped `jackson-databind` to 2.15.2 to fix security vulnerability.
-* Introduced `maxNumberLength`, `maxStringLength`, and `maxNestingDepth` configs for `GraphSON` serializers.
-* Fixed a memory leak in the Gremlin.Net driver that only occurred if a `CancellationToken` was provided.
-* Fixed gremlin-python `Client` problem where calling `submit()` after` `close()` would hang the system.
-* Added `gremlin.spark.dontDeleteNonEmptyOutput` to stop deleting the output folder if it is not empty in `spark-gremlin`.
-* Fixed a bug in `SubgraphStrategy` where the vertex property filter produced errors if a `Vertex` was missing the key provided to `by()` as a token.
-* Upgraded `gremlin-javascript` and `gremlint` to Node 16.20.0.
-* Upgraded `gremlin-go` to Go 1.20.
-* Improved the python `Translator` class with better handling for `P`, `None` and subclasses of `str`.
-* Fixed bug in `FilterRankingStrategy` that was preventing certain traversals from recognizing labels in child traversals.
-* Added `gremlin-java8.bat` file as a workaround to allow loading the console using Java 8 on Windows.
-* Fixed a bug in `gremlin-server` where timeout tasks were not cancelled and could cause very large memory usage when timeout is large.
-* Removed `jcabi-manifests` dependency from `gremlin-core`, `gremlin-driver`, and `gremlin-server`.
-* Fixed a bug that caused the `GremlinGroovyScriptEngine` to throw a `MissingMethodException` when calling a static method in __ with the same name as an enum.
-* Deprecated Neo4j-Gremlin
-* Added `VertexPropertyFilter` to `GraphComputer`
-
-==== Bugs
-
-* TINKERPOP-2920 SubgraphStrategy failure when property key not present on vertex in by()
-* TINKERPOP-2937 Throw an error when trying to use a closed connection
-* TINKERPOP-2944 Memory leak in Gremlin.Net driver if CancellationToken is used
-* TINKERPOP-2948 PRISMA security vulnerabilty for jackson-databind 2.14.0 *(breaking)*
-* TINKERPOP-2953 Static import for __.values() overriden by Column.values()
-* TINKERPOP-2958 ScheduledExecutorService for timeouts are never cancelled
-* TINKERPOP-2965 FilterRankingStrategy removing labels it shouldn't in certain conditions
-
-==== Improvements
-
-* TINKERPOP-1403 Provide support for GraphFilter.vertexProperties() *(breaking)*
-* TINKERPOP-2941 DO NOT purge the output location if it has content in SparkGraphComputer
-* TINKERPOP-2954 Pass Gremlin Version from Maven to Java Without Manifests
-* TINKERPOP-2955 Support SSL in WebSocketClient
-* TINKERPOP-2977 Deprecate Neo4j-Gremlin
+Please see the archived <<./docs/archive/changelogs/changelog-3.5.x.asciidoc#release-3-5-7, 3.5.7 changelog>>.
[[release-3-5-6]]
=== TinkerPop 3.5.6 (Release Date: May 1, 2023)
-* Added `GraphFilter` support to `GraphSONRecordReader`.
-* gremlin-python aiohttp dependency requirement upper bound relaxed to <4.0.0.
-* Fixed network connection closing for sessions and transactions in `gremlin-python`.
-* Fixed memory cleanup for sessions and transactions in `gremlin-python` and `gremlin-go`.
-* Fixed bug in `CountStrategy` where `or()` and `and()` filters were not being rewritten properly for some patterns.
-* Changed `PartitionStrategy` to force its filters to the end of the chain for `Vertex` and `Edge` read steps, thus preserving order of the `has()`.
-* Added `RequestOptions` and `RequestOptionsBuilder` types to Go GLV to encapsulate per-request settings and bindings.
-* Improved `addE()` error messaging when traverser is not a `Vertex`.
-* Added `SubmitWithOptions()` methods to `Client` and `DriverRemoteConnection` in Go GLV to pass `RequestOptions` to the server.
-* Fixed bug in which `gremlin-server` would not respond to clients if an `Error` was thrown during bytecode traversals.
-* Added ability to deploy multi-arch Docker images for server and console. Server image now supports AMD64 and ARM64.
-* Changed `with()` configuration for `ARGS_BATCH_SIZE` and `ARGS_EVAL_TIMEOUT` to be more forgiving on the type of `Number` used for the value.
-* Changed `gremlin-console` to add imports via an ImportCustomizer to reduce time spent resolving imports.
-* Bumped to Groovy 2.5.22.
-* Fixed `generateUserAgent()` in `gremlin-javascript` and `gremlin-dotnet` to handle null and undefined properly, and updated Java UserAgent error handling
-* Fixed bug in parsing of `math()` expressions where variables were not being identified if they contained a text associated with a function.
-* Refactored `FilterRankingStrategy` to improve performance for deeply nested traversals.
-* Refactored strategy application to improve performance by avoiding some excessive recursion.
-* Added `Traversal.lock()` to provide an explicit way to finalize a traversal object.
-* Changed `Traversal.getGraph()` to get its `Graph` object from itself or, if not available, its parent.
-* Added `AuthInfoProvider` interface and `NewDynamicAuth()` to gremlin-go for dynamic authentication support.
-* Fixed bug where `hasId()` unrolls ids in Java arrays to put into `P.within` but not ids in lists, this also aligned behavior of start-step and mid-traversal hasId().
-* Bumped to `snakeyaml` 2.0 to fix security vulnerability.
-* Bumped to Apache `commons-configuration` 2.9.0 to fix security vulnerability.
-* Fixed `CountStrategy` bug for cases where predicates contain negative numbers by disabling the optimization.
-* Improved `count` step optimization for negative values in input for 'eq' comparison.
-* Fixed performance issue when using `SampleGlobalStep` with a traverser that has either a `LABELED_PATH` or `PATH` requirement.
-* Reduce the `toString()` of `ObjectWritable` to avoid OOM for running OLAP queries on Spark.
-
-==== Bugs
-
-* TINKERPOP-2526 Gremlin Console performance with incomplete multi-line scripts
-* TINKERPOP-2767 Repeat Out Times traversal hangs indefinitely on first execution
-* TINKERPOP-2820 gremlin-python _close_session race condition/FD leak
-* TINKERPOP-2855 Performance degradation in TinkerGraph 3.5.4 and 3.5.5
-* TINKERPOP-2856 math() step fails if variable name contains a keyword
-* TINKERPOP-2861 Fix incorrect symlinks in source release zip
-* TINKERPOP-2863 HasId Step generates incorrect results when given a list of IDs mid-traversal
-* TINKERPOP-2878 Incorrect handling of local operations when there are duplicate elements
-* TINKERPOP-2888 DefaultTraversal's applyStrategies performance decrease
-* TINKERPOP-2891 Inconsistent behavior when comparing a counted value with a negative value
-* TINKERPOP-2893 Incorrectly comparing a counted value with multiple predicates
-* TINKERPOP-2902 Critical security vulnerability in snakeyaml
-* TINKERPOP-2905 gremlin-go gorillaTransporter.logHandler is not initialized correctly and leads to panic
-* TINKERPOP-2911 CountStrategy converts count().is(0) wrongly under ConnectiveStrategy
-* TINKERPOP-2918 Utils.GenerateUserAgent assumes Gremlin.Net.dll to be present when, in some environments, it is not.
-
-==== Improvements
-
-* TINKERPOP-2841 Test and Fix Per Request Settings in Go
-* TINKERPOP-2852 Update Maven plugin for docker-images building for M1 compatibility
-* TINKERPOP-2857 GraphSONRecordReader does not allow configure a GraphFilter during deserialization
-* TINKERPOP-2865 Add has steps injected by PartitionStrategy at the end of the filter
-* TINKERPOP-2890 Avoid exceptions on local scope based steps where possible
-* TINKERPOP-2899 SampleGlobalStep samples inefficiently with TraverserSet running into hash collisions
-* TINKERPOP-2912 Improve error message for addE() when traverser is incorrect
-* TINKERPOP-2919 Improve performance of FilterRankingStrategy for deeply nested traversals
-* TINKERPOP-2934 Optimize ObjectWritable for displaying content of Java Collection or Map to reduce OOM
+Please see the archived <<./docs/archive/changelogs/changelog-3.5.x.asciidoc#release-3-5-6, 3.5.6 changelog>>.
[[release-3-5-5]]
=== TinkerPop 3.5.5 (Release Date: January 16, 2023)
-* Changed the `Result` struct in gremlin-go to make it more suitable for mocking in tests.
-* Changed label generation in `PathProcessorStrategy` to be more deterministic.
-* Bumped to Apache `commons-configuration` 2.8.0 to fix security vulnerability.
-* Fixed issue where the `GremlinGroovyScriptEngine` reused the same translator concurrently which lead to incorrect translations.
-* Fixed bug where tasks that haven't started running yet time out due to `evaluationTimeout` and never send a response back to the client.
-* Set the exact exception in `initializationFailure` on the Java driver instead of the root cause.
-* Improved error message for when `from()` and `to()` are unproductive for `addE()`.
-* Added `SparkIOUtil` utility to load graph into Spark RDD.
-* Improved performance of `CloneVertexProgram` by bypassing the shuffle state of `SparkGraphComputer`.
-* Changed `JavaTranslator` exception handling so that an `IllegalArgumentException` is used for cases where the method exists but the signature can't be discerned given the arguments supplied.
-* Dockerized all test environment for .NET, JavaScript, Python, Go, and Python-based tests for Console, and added Docker as a build requirement.
-* Async operations in .NET can now be cancelled. This however does not cancel work that is already happening on the server.
-* Bumped to `snakeyaml` 1.32 to fix security vulnerability.
-* Update docker/build.sh to work with docker-compose dockerized tests changes.
-* Fix permission issues with Docker generated files by setting permission to current user, so sudo isn't needed for maven operations.
-* Updated base images for gremlin-server and gremlin-console docker images to support arm64.
-* Use Go embed for error/logger resources for `gremlin-go` to avoid missing resource files when using binaries.
-* Added user agent to web socket handshake in java driver. Can be controlled by a new enableUserAgentOnConnect configuration. It is enabled by default.
-* Added user agent to web socket handshake in Gremlin.Net driver. Can be controlled by `EnableUserAgentOnConnect` in `ConnectionPoolSettings`. It is enabled by default.
-* Added user agent to web socket handshake in go driver. Can be controlled by a new `EnableUserAgentOnConnect` setting. It is enabled by default.
-* Added user agent to web socket handshake in python driver. Can be controlled by a new `enable_user_agent_on_connect` setting. It is enabled by default.
-* Added user agent to web socket handshake in javascript driver. Can be controlled by a new `enableUserAgentOnConnect` option. It is enabled by default.
-* Added logging in .NET.
-* Added `addDefaultXModule` to `GraphSONMapper` as a shortcut for including a version matched GraphSON extension module.
-* Modified `GraphSONRecordReader` and `GraphSONRecordWriter` to include the GraphSON extension module by default.
-* Bumped `jackson-databind` to 2.14.0 to fix security vulnerability.
-* Bumped to Groovy 2.5.15.
-* Bumped to Netty 4.1.86.
-* Bumped `ivy` to 2.5.1 to fix security vulnerability
-* Removed default SSL handshake timeout. The SSL handshake timeout will instead be capped by setting `connectionSetupTimeoutMillis`.
-* Improved logging for `gremlin-driver`.
-* Modified `Connection` and `Host` job scheduling in `gremlin-driver` by dividing their work to two different thread pools and sparing work from the primary pool responsible for submitting requests and reading results.
-* Prevented usage of the fork-join pool for `gremlin-driver` job scheduling.
-* Modified `GremlinScriptChecker` to extract the `Tokens.REQUEST_ID` from Gremlin scripts.
-* Changed `Host` initialization within a `Client` to be parallel again in `gremlin-driver`.
-* Changed mechanism for determining `Host` health which should make the driver more resilient to intermittent network failures.
-* Removed the delay for reconnecting to a potentially unhealthy `Host` only marking it as unavailable after that initial retry fails.
-* Prevented fast `NoHostAvailableException` in favor of more direct exceptions when borrowing connections from the `ConnectionPool`.
-* Improved Gherkin tests for more consistent results.
-* Provides users with potentially more information to driver TimeoutExceptions.
-* Fixed an issue in Go and Python GLVs where modifying per request settings to override request_id's was not working correctly.
-* Fixed incorrect implementation for `GraphTraversalSource.With` in `gremlin-go`.
-* Changed `Gremlin.version()` to return "VersionNotFound" if the version is missing from the manifest.
-* Fixed local steps to avoid throwing an exception for non-iterable input.
-* Fixed a case sensitivity issue when comparing request UUIDs in `gremlin-javascript`.
-
-==== Bugs
-
-* TINKERPOP-2765 Race condition during script creation when using UnifiedChannelizer
-* TINKERPOP-2769 gremlin-server does not reply with a timeout response to all timed out requests
-* TINKERPOP-2771 Critical severity security vulnerabilty in commons-configuration 2.7
-* TINKERPOP-2796 High severity security vulnerability found in snakeyaml
-* TINKERPOP-2803 Incorrect count() with sample() in TinkerGraph
-* TINKERPOP-2809 High severity security vulnerability found in jackson databind
-* TINKERPOP-2815 Critical security vulnerability for apache commons-text
-* TINKERPOP-2816 Gherkin test issues for implementers
-* TINKERPOP-2817 Support java.lang.Byte in hadoop GraphSONRecordWriter/GraphSONRecordReader
-* TINKERPOP-2826 Critical security vulnerability in ivy
-* TINKERPOP-2836 Github actions do not run java driver integration tests
-* TINKERPOP-2840 Test Failures on NonDex
-* TINKERPOP-2843 Security vulnerabilities found in netty version 4.1.77
-* TINKERPOP-2849 Incorrect implementation for GraphTraversalSource.With in gremlin-go
-
-==== Improvements
-
-* TINKERPOP-2471 Add logging to Gremlin.Net driver
-* TINKERPOP-2480 User agent for Gremlin drivers
-* TINKERPOP-2737 Dockerized Build and Test Environments
-* TINKERPOP-2772 Add Spark utility to load vertices as RDD
-* TINKERPOP-2779 Floating ConnectedComponent Feature Failures for GitHub Actions on windows
-* TINKERPOP-2785 Inability to Mock Returned Result Types in Gremlin-Go Driver
-* TINKERPOP-2792 Better exception when JavaTranslator finds a method but not the overload
-* TINKERPOP-2794 Allow cancellation of Gremlin.Net async methods
-* TINKERPOP-2808 Improve Compatibility on ARM machines
-* TINKERPOP-2813 Improve driver usability for cases where NoHostAvailableException is currently thrown
-* TINKERPOP-2814 Add a SSL handshake timeout configuration to the driver
-* TINKERPOP-2833 TestSupport loads files too slow
-* TINKERPOP-2834 CloneVertexProgram optimization on SparkGraphComputer
-* TINKERPOP-2842 Expand GremlinScriptChecker to include request id overrides
+Please see the archived <<./docs/archive/changelogs/changelog-3.5.x.asciidoc#release-3-5-5, 3.5.5 changelog>>.
[[release-3-5-4]]
=== TinkerPop 3.5.4 (Release Date: July 18, 2022)
-* Added exception to Gremlin Server that is thrown when using a transaction on a non-transaction graph.
-* Exposed error message sent by the server as a property on `GremlinServerError` for gremlin-python
-* Allowed `datetime()` syntax to accept zone offset with colon separators and seconds.
-* Fixed a minor problem in the Gremlin parser where a `GraphTraversalSource` may not have been initialized.
-* Added getters to high and low properties in `RangeLocalStep`.
-* Added `Pick` traversal to the return from `getGlobalChildren()` for `BranchStep`.
-* Ensured `Pick` traversal was an integrated child.
-* Added GraphBinary serialization support to gremlin-javascript.
-* Improved startup time by removing unnecessary DNS lookup.
-* Bumped to logback 1.2.9.
-* Bumped to netty 4.1.77.
-* Fixed bug in `submitAsync()` in gremlin-python where the deprecated version was not returning its result.
-* Added missing `ResponseStatusCodeEnum` entries for 403, 429, 497, and 596 for .NET.
-* Added GraphBinary support in gremlin-python for short, bigdecimal and biginteger.
-* Fixed bug in `PartitionStrategy` where the use of `AbstractLambdaTraversal` caused an unexpected exception.
-* Fixed bug where close requests for sessions were improperly validating the request in the `UnifiedChannelizer`.
-* Deprecated and removed functionality of the `connectOnStartup` option in `gremlin-javascript` to resolve potential `unhandledRejection` and race conditions.
-* Ensured `Graph` instance was set between `TraversalStrategy` executions.
-* Fixed potential `NullPointerException` in `gremlin-driver` where initialization of a `ConnectionPool` would fail but not throw an exception due to centralized error check being satisfied by a different process.
-* Fixed a bug where the JavaScript client would hang indefinitely on traversals if the connection to the server was terminated.
-* Fix a javadoc comment in Cluster.Builder regarding maxInProcessPerConnection.
-* Added a getter for selectKeys in SelectStep
-
-==== Bugs
-
-* TINKERPOP-2734 NullPointerException when calling Client chooseConnection()
-* TINKERPOP-2735 IllegalStateException: Unrecognized content of the 'gremlin' argument... on connection close
-* TINKERPOP-2736 PluginAcceptror interface no more available in 3.5.3+ but referred in documentation
-* TINKERPOP-2741 GraphMLWriter error message is not properly formatted
-* TINKERPOP-2751 Transaction: tx.commit() hangs up in javascript client-lib
-* TINKERPOP-2754 Javascript client hangs if the server restarts
-* TINKERPOP-2763 client.submitAsync returns None value
-* TINKERPOP-2768 BranchStep pickToken should be integrated when added as a child option
-
-==== Improvements
-
-* TINKERPOP-2229 JavaScript GLV: Add GraphBinary Support
-* TINKERPOP-2631 GraphSON float serialization when ujson is used is imprecise
-* TINKERPOP-2693 Complete GraphBinary support in Python
-* TINKERPOP-2740 first request suspend more than 9s when using gremlin-java-driver
-* TINKERPOP-2748 Medium security vulnerability on netty-all and netty-codec
-* TINKERPOP-2762 getScopeKeys should respect the order of keys passed in Step
-* TINKERPOP-2764 AWS Neptune returns an inaccessible structured error response
+Please see the archived <<./docs/archive/changelogs/changelog-3.5.x.asciidoc#release-3-5-4, 3.5.4 changelog>>.
[[release-3-5-3]]
=== TinkerPop 3.5.3 (Release Date: April 4, 2022)
-* Added support for using a readable stream when submitting scripts through the JavaScript driver which allows processing each batch of result sets as they come in, rather than waiting for the entire result set to complete before allowing processing.
-* Fixed issue with implicit conversion of `Infinity` number instances into `BigDecimal`.
-* Ensured that new properties are added before triggering the associated event.
-* Added support for WebSocket compression in the .NET driver. (Only available on .NET 6.)
-* Added Groovy `Translator` for .NET.
-* Bumped to `jackson-databind` 2.13.2.2.
-* Fixed bug in `DefaultTraversal.clone()` where the resulting `Traversal` copy could not be re-iterated.
-* Fixed bug in `JavaTranslator` that did not handle `has()` well where `null` was the first argument.
-* Renamed `GremlinBaseVisitor` to `DefaultGremlinBaseVisitor` in `gremlin-core` to prevent conflict with the generated `GremlinBaseVisitor` in `gremlin-language`.
-* Tracked transaction spawned connections and closed them when the parent connection was closed for `gremlin-python`.
-* Prevented unintentionally opening another transaction in `TraversalOpProcessor`` and `SessionOpProcessor` of Gremlin Server.
-* Fixed bug in `Translator` of `gremlin-python` around translation of Booleans.
-
-==== Bugs
-
-* TINKERPOP-2694 Bug of TinkerGraph gremlin api "has()"
-* TINKERPOP-2706 Traversal clone() not resetting the close state
-* TINKERPOP-2712 PropertyChangedEvent is triggered before Property is actually changed
-* TINKERPOP-2717 Gremlin.NET : WebSocketConnection does not check for MessageType.Close, causing error InvalidOperationException: "Received data deserialized into null object message. Cannot operate on it."
-* TINKERPOP-2719 hasNext is called on TraverserIterator after transaction is committed
-* TINKERPOP-2726 Python's GroovyTranslator translates boolean wrong
-
-==== Improvements
-
-* TINKERPOP-2367 Gremlin Translators for .NET
-* TINKERPOP-2518 Enhance .NET gherkin framework to deal with more advanced assertions
-* TINKERPOP-2651 Update to .NET 6
-* TINKERPOP-2679 Update JavaScript driver to support processing messages as a stream
-* TINKERPOP-2682 Enable WebSocket compression in .NET by default
-* TINKERPOP-2707 Closing parent connection in python should close tx() connections
-* TINKERPOP-2711 Make gremlin-language optional as it brings in CDDL/GPL dependencies
-* TINKERPOP-2716 Enable eslint for gremlin-javascript project
-* TINKERPOP-2725 Traversal Strategy Mix Up In Gremlin-Python
-* TINKERPOP-2727 HasContainer should allow a null key
-* TINKERPOP-2728 jackson-databind high security issue identified
+Please see the archived <<./docs/archive/changelogs/changelog-3.5.x.asciidoc#release-3-5-3, 3.5.3 changelog>>.
[[release-3-5-2]]
=== TinkerPop 3.5.2 (Release Date: January 10, 2022)
-This release also includes changes from <<release-3-4-13, 3.4.13>>.
-
-* Added an `AnonymizingTypeTranslator` for use with `GroovyTranslator` which strips PII (anonymizes any String, Numeric, Date, Timestamp, or UUID data)
-* Added support for `g.tx()` in Python.
-* Added logging in in Python.
-* Added `tx()` syntax to `gremlin-language`.
-* Fixed shutdown cleanup issue in Python aiohttp transport layer.
-* Added a `NoSugarTranslator` translator to `PythonTranslator` which translates Gremlin queries to Python without syntactic sugar (ex `g.V().limit(1)` instead of `g.V()[0:1]`)
-* Added support for `g.Tx()` in .NET.
-* Added support for `with()` constant options to `io()`.
-* Changed `GroovyTranslator` to generate code more compatible to Java with `Date` and `Timestamp`.
-* Fixed bug in the processing of the `io()` step when constructing a `Traversal` from the grammar.
-* Added the `ConnectedComponent` tokens required to properly process the `with()` of the `connectedComponent()` step.
-* Fixed `DotNetTranslator` bugs where translations produced Gremlin that failed due to ambiguous step calls to `has()`.
-* Fixed bug where `RepeatUnrollStrategy`, `InlineFilterStrategy` and `MessagePassingReductionStrategy` were all being applied more than necessary.
-* Modified grammar to accept the `datetime()` function so that Gremlin scripts have a way to natively construct a `Date`.
-* Ensured `PathRetractionStrategy` is applied after `InlineFilterStrategy` which prevents an error in traverser mapping in certain conditions.
-* Deprecated `JsonBuilder` serialization for GraphSON and Gryo.
-* Added `ProductiveByStrategy` to ensure consistency of `by()` modulator behaviors when child traversal arguments contained no elements.
-* Changed drivers to once again send the previously deprecated and removed "close" message for sessions.
-* Modified `fold()` to merge `Map` instances with `addAll`.
-* Allowed `null` string values in the Gremlin grammar.
-* Fixed support for `SeedStrategy` in the Gremlin Grammar.
-* Fixed bug in `Translator` of `gremlin-javascript` around array translation.
-* Fixed bugs in `PythonTranslator`, `JavascriptTranslator` and `DotNetTranslator` when translating `TraversalStrategy` objects to Javascript.
-* Prevented exception with `hasLabel(null)` and `hasKey(null)` and instead filter away traversers as these structural components can't ever be null.
-* Improved handling of `null` when passed to `P` predicates.
-* Handled `null` for mathematical reducing operations of `sum()`, `mean()`, `max()` and `min()`.
-* Allowed `null` values in `Memory` for `GraphComputer`.
-* Allowed `null` assignment in `withSideEffect()`.
-* Allowed labelling of steps that emit a traverser carrying `null`.
-* Fixed bug in filtering for `null` property key arguments to `valueMap()`, `elementMap()`, `properties()` and `values()`.
-* Modified grammar to allow a call to `within()` and `without()` with no arguments.
-* Fixed problems with `inject(null)` variations where `null` was the only value being submitted.
-* Fixed problem with `GroovyTranslator` and `inject(null,null)` which could be interpreted as the Groovy JDK extension `inject(Object,Closure)`.
-* Fixed error where certain variants of `inject()` with `null` might not properly construct a traversal in .NET.
-* Prevented exception with `hasValue(null)` and allowed filtering as expected.
-* Refined `DotNetTranslator` to be more explicit with `null` arguments to ensure that the right overloads are called.
-* Created `GremlinParser` to construct `Traversal` objects from `gremlin-language`.
-* Added `GremlinLangScriptEngine` as a `GremlinScriptEngine` implementation that users the grammar and `JavaTranslator` to evaluate Gremlin.
-* Added getter method for `bypassTraversal` in `AbstractLambdaTraversal`.
-* Added support for custom GraphBinary types in .NET.
-* Removed some unnecessary exception wrapping around `gremlin-driver` errors now producing a more immediate view of the actual error cause.
-
-==== Bugs
-
-* TINKERPOP-2569 Reconnect to server if Java driver fails to initialize
-* TINKERPOP-2585 Traversal failed for different strategies order
-* TINKERPOP-2589 XML External Entity (XXE) vulnerability
-* TINKERPOP-2597 NullPointerException while initializing connection pool
-* TINKERPOP-2598 within(null) NPE
-* TINKERPOP-2603 TinkerGraph sometimes could not query float values.
-* TINKERPOP-2609 HTTP returns serialization exceptions for the GraphTraversalSource
-* TINKERPOP-2621 toString for traversals such as within with empty array returns empty string as argument instead of brackets
-* TINKERPOP-2626 RangeGlobalStep closes traversal prematurely
-* TINKERPOP-2649 Unable to translate gremlin query to java
-* TINKERPOP-2658 Translator in gremlin-javascript has trouble with array arguments
-* TINKERPOP-2662 Unclosed client session and stacktrace pops up when cleanup is missed
-* TINKERPOP-2670 JavaDocs do not build when using JDK 11
-
-==== Improvements
-
-* TINKERPOP-2504 Intermittently failing server/driver integration tests
-* TINKERPOP-2555 Support for remote transactions in Python
-* TINKERPOP-2556 Support remote transactions in .NET
-* TINKERPOP-2570 Support custom type in GraphBinary for .NET
-* TINKERPOP-2582 Construct traversals from gremlin-language
-* TINKERPOP-2583 Make gremlin-groovy processing optional in Gremlin Server
-* TINKERPOP-2591 Administrative adjustments to gremlint site
-* TINKERPOP-2592 Align the style guides
-* TINKERPOP-2596 datetime function
-* TINKERPOP-2605 Further enforce and refine null semantics
-* TINKERPOP-2615 Expand testing of path() with null values
-* TINKERPOP-2616 Provide better exceptions with SSL related failures *(breaking)*
-* TINKERPOP-2620 Clean up NullPointerExceptions related to null arguments on property related steps
-* TINKERPOP-2630 Clarify that a server cannot support Graphson1.0 over HTTP
-* TINKERPOP-2632 Netty 4.1.61 flagged with two high severity security violations
-* TINKERPOP-2637 Enhance logging in the Python
-* TINKERPOP-2646 Make .NET StreamExtensions public for GraphBinary
-* TINKERPOP-2656 Provide a no syntax sugar translator for python
-* TINKERPOP-2660 Bring back close message for drivers
-* TINKERPOP-2666 Create an anonymizing Translator for logging traversals without user data
-* TINKERPOP-2667 Allow fold() with addAll to work on Map
-* TINKERPOP-2668 Updating aiohttp requirements at germin-python due to vulnerability
-* TINKERPOP-2669 Netty 4.1.61 flagged with medium severity security violations
-* TINKERPOP-2671 Add tx() support to grammar
+Please see the archived <<./docs/archive/changelogs/changelog-3.5.x.asciidoc#release-3-5-2, 3.5.2 changelog>>.
[[release-3-5-1]]
=== TinkerPop 3.5.1 (Release Date: July 19, 2021)
-This release also includes changes from <<release-3-4-12, 3.4.12>>.
-
-* Added support for `g.tx()` in Javascript.
-* Fixed bug in Javascript error message related to validating anonymous traversal spawns.
-* Changed close of Python and Javascript connections to no longer send a "close message" as the server no longer acknowledges it as of 3.5.0.
-* Fixed bug where the `Graph` instance was not being assigned to child traversals.
-* Removed sending of deprecated session close message from Gremlin.Net driver.
-
-==== Bugs
-
-* TINKERPOP-2358 Potential connection leak on client disposing
-* TINKERPOP-2554 Extracting step metrics from ProfileStep throws NPE if the step was not triggered
-* TINKERPOP-2565 GraphMLWriter does not check vertexLabelKey conflict
-* TINKERPOP-2566 Incomplete error message in bytecode step generation
-* TINKERPOP-2568 Graph instance not set for child traversals
-* TINKERPOP-2578 Set arguments to P within/without are wrapped in List
-* TINKERPOP-2579 EventStrategy doesn't work with anonymous traversal
-* TINKERPOP-2580 Update the custom DSL documentation
-
-==== Improvements
-
-* TINKERPOP-2548 Add getter for indexer used in IndexStep
-* TINKERPOP-2551 Setup scripts to publish Gremint to npm
-* TINKERPOP-2557 Support remote transactions in Javascript
-* TINKERPOP-2559 Stop sending the close message for .NET
-* TINKERPOP-2560 Stop sending close message for Python
-* TINKERPOP-2561 Stop sending close message in Javascript
-* TINKERPOP-2576 Setup automatic updates via Dependabot for Gremlin.NET
-* TINKERPOP-2577 Remove unused test coverage dependencies from Gremlin.NET
+Please see the archived <<./docs/archive/changelogs/changelog-3.5.x.asciidoc#release-3-5-1, 3.5.1 changelog>>.
[[release-3-5-0]]
=== TinkerPop 3.5.0 (Release Date: May 3, 2021)
-This release also includes changes from <<release-3-4-11, 3.4.11>>.
-
-* Changed transport implementation to use AIOHTTP instead of Tornado for gremlin-python.
-* Added max_content_length and unit test for it in gremlin-python.
-* Removed compression_option support for transport in gremlin-python.
-* Fixed event loop issues and added unit test for it in gremlin-python.
-* Fixed DriverRemoteConnection multithreading issues and added unit test for it in gremlin-python.
-* Fixed heartbeat timeout issues and tested with local server manually for gremlin-python.
-* Fixed build errors emitted for gremlin-python (asyncio task destroyed but is pending error).
-* Added `gremlin-language` module.
-* Allowed the possibility for the propagation of `null` as a `Traverser` in Gremlin.
-* Added a fully shaded version of `gremlin-driver`.
-* Exposed websocket connection status in JavaScript driver.
-* Fixed a bug where spark-gremlin was not re-attaching properties when using `dedup()`.
-* Fixed a bug in `WsAndHttpChannelizer` pipeline configuration where failed object aggregation could not write back HTTP responses.
-* Ensured better consistency of the use of `null` as arguments to mutation steps.
-* Added a `ResponseStatusCode` to indicate that a client should retry its request.
-* Added `TemporaryException` interface to indicate that a transaction can be retried.
-* Prevented `TraversalStrategy` instances from being added more than once, where the new instance replaces the old.
-* Improved error message for `addE()` when the `from()` or `to()` does not resolve to a `Vertex`.
-* Improved error message for `addE()` when cardinality is specified on `property()` assignments.
-* Allowed `property(T.label,Object)` to be used if no value was supplied to `addV(String)`.
-* Dropped support for .NET Standard 1.3 in Gremlin.Net. Only .NET Standard 2.0 is supported starting with this version.
-* Added GraphBinary support for .NET.
-* Added `UnifiedChannelizer` which exposes HTTP and Websockets connections and processes both sessionless and in-session requests with the same `gremlinPool`.
-* Bounded the `gremlinPool` in Gremlin Server to enforce rate limiting which will then produce a `TOO_MANY_REQUESTS` response status code.
-* Switched from `Newtonsoft.Json` to `System.Text.Json` as the JSON library for Gremlin.Net.
-* Allowed additional arguments to `Client.submit()` in Javascript driver to enable setting of parameters like `scriptEvaluationTimeout`.
-* Gremlin.Net driver no longer supports skipping deserialization by default. Users can however create their own `IMessageSerializer` if they need this functionality.
-* Supported deserialization of `dict` and `list` as a key in a `dict` for Python.
-* Changed the aliased `Client` to proxy `close()` methods to its underlying client.
-* Added support for remote `g.tx()` usage.
-* Added support for bytecode-based sessions.
-* Added a `Graph.Feature` for `supportsNullPropertyValues`.
-* Modified `TokenTraversal` to support `Property` thus `by(key)` and `by(value)` can now apply to `Edge` and meta-properties.
-* Added `SeedStrategy` to allow deterministic behavior for `coin()`, `sample()` and `Order.shuffle`.
-* Added `Grouping` step interface.
-* Added `TraversalParent.replaceTraversal()` which can replace a direct child traversal.
-* Added `ByModulatorOptimizationStrategy` which replaces certain standard traversals w/ optimized traversals (e.g. `TokenTraversal`).
-* Improved `IdentityRemovalStrategy` by accounting for `EndStep` situations.
-* Added `IdentityRemovalStrategy` to the standard list of `TraversalStrategies`.
-* Modified `PathRetractionStrategy` to leave labels more often with `match()` cases to return more consistent results.
-* Refactored `MapStep` to move its logic to `ScalarMapStep` so that the old behavior could be preserved while allow other implementations to have more flexibility.
-* Modified TinkerGraph to support `null` property values and can be configured to disable that feature.
-* Modified `null` handling in mutations to be consistent for a new `Vertex` as well as update to an existing one.
-* Enforced use of anonymous child traversals.
-* Removed support for Python 2.x in gremlinpython.
-* Upgraded to Apache Commons Configuration2.
-* Renamed `StoreStep` to `AggregateLocalStep`.
-* Renamed `AggregateStep` to `AggregateGlobalStep`.
-* Renamed `SERVER_ERROR_SCRIPT_EVALUATION` to `SERVER_ERROR_EVALUATION` given that this response code applies to remote traversals as well as scripts.
-* Refactored `TraversalStrategies` to implement `Iterable`.
-* Refactored `Traversal` semantics to always expect `EmptyStep` as a parent if it is meant to be the root `Traversal`.
-* Configured GraphBinary as the default binary serialization format for the Java Driver.
-* Configured GraphSON 3.0 as the default text serialization format when no serializer can be determined.
-* Configured GraphSON 3.0 as the default setting for the `GraphSONMapper`.
-* Added `JavascriptTranslator` for Java.
-* Added `DotNetTranslator` for Java.
-* Added Groovy `Translator` for Python.
-* Fixed bug in `PythonTranslator` for processing `TraversalStrategy` instances in GraphBinary.
-* Fixed bug in bytecode `Bindings` where calling `of()` prior to calling a child traversal in the same parent would cause the initial binding to be lost.
-* Migrated from Tornado to AIOHTTP for gremlinpython.
-* Bumped to Neo4j 3.4.11.
-* Bumped to Spark 3.0.0.
-* Bumped to Jackson 2.11.x.
-* Supported build for Java 11.
-* Added `MessageSerializer.getMapper()` to return the underlying object that handles serialization for a particular implementation.
-* Added a parameterized `TypeTranslator` for use with `GroovyTranslator` that should produce more cache hits.
-* Added support for `TextP` in Neo4j using its string search functions.
-* Added a kerberos KDC to the docker container for testing GLV's.
-* Added kerberos authentication to Gremlin-Python.
-* Added audit logging to bytecode-based traversals.
-* Changed `TraversalStrategy` application methodology to apply each strategy in turn to each level of the traversal hierarchy starting from root down to children.
-* Added a VertexProgramRestrictionStrategy.
-* Prevented more than one `Client` from connecting to the same Gremlin Server session.
-* Changed the Groovy to an optional dependency in `gremlin-driver`.
-* Added support for configuring an `Authorizer` implementation to Gremlin Server, allowing for authorization of individual gremlin requests.
-* Added `gremlint` module to house the Gremlin query formatting JavaScript library powering gremlint.com.
-* Removed internal functionality for the session close message in Gremlin Server - the message is accepted but ignored if sent.
-* Removed `Property.Exceptions.propertyValueCanNotBeNull` exception type as `null` now has meaning in Gremlin.
-* Removed the "experimental" support for multi/meta-properties in Neo4j.
-* Removed Gryo serialization configurations from Gremlin Server sample configurations and default configurations.
-* Removed previously deprecated custom keep-alive functionality in the Java driver.
-* Removed previously deprecated `BytecodeUtil`.
-* Removed previously deprecated `Cluster.maxWaitForSessionClose` configuration option.
-* Removed previously deprecated `TraversalStrategies.applyStrategies()`.
-* Removed previously deprecated `scriptEvaluationTimeout`.
-* Removed previously deprecated `NioChannelizer` and related classes.
-* Removed previously deprecated remote traversal side-effects and related infrastructure.
-* Removed previously deprecated `Serializers.DEFAULT_RESULT_SERIALIZER` and `Serializers.DEFAULT_REQUEST_SERIALIZER`.
-* Removed previously deprecated `decr` and `incr` from `Order`.
-* Removed previously deprecated `TraversalSource.withRemote()`.
-* Removed previously deprecated `ResponseHandlerContext` infrastructure.
-* Removed previously deprecated `VertexProgram` related infrastructure.
-* Removed previously deprecated SSL settings: `keyCertChainFile`, `keyFile`, `keyPassword` and `trustCertChainFile` and related infrastructure.
-* Removed previously deprecated `PropertyMapStep` constructor and `isIncludeTokens`.
-* Removed previously deprecated `StarGraph.builder()` and `StarGraph.Builder.create()`.
-* Removed previously deprecated `AbstractOpProcessor.generateMetaData(ChannelHandlerContext, RequestMessage, ResponseStatusCode, Iterator)`
-* Removed previously deprecated `BulkDumperVertexProgram` and `BulkLoaderVertexProgram`.
-
-==== Bugs
-
-* TINKERPOP-1619 TinkerGraphComputer worker count affects OptionalStep query results
-* TINKERPOP-2107 Spark fails to reattach properties
-* TINKERPOP-2157 SparkStarBarrierInterceptor injects (Byte) 0
-* TINKERPOP-2159 EventStrategy doesn't handle multi-valued properties
-* TINKERPOP-2175 Executor thread is not returned on channel close
-* TINKERPOP-2185 Use commons-configuration2 instead of commons-configuration *(breaking)*
-* TINKERPOP-2192 Gremlin.Net.Driver.Connection.Parse throws a NullReferenceException
-* TINKERPOP-2224 Detect and fix resource leak
-* TINKERPOP-2230 match() step unexpected behaviours
-* TINKERPOP-2232 RemoteStrategy does not call parent class TraversalStrategy __init__
-* TINKERPOP-2238 Fix remaining iterator leaks marked by @IgnoreIteratorLeak
-* TINKERPOP-2241 Client exception don't match Server exception when server throw StackOverflowError
-* TINKERPOP-2248 Instability of driver for blocked requests
-* TINKERPOP-2257 transaction itty may still be visited after commit
-* TINKERPOP-2264 Gremlin Python should deserialize g:Date to UTC
-* TINKERPOP-2266 Keep alive not started at connection creation
-* TINKERPOP-2274 Test of TinkerGraph Gremlin fail on Windows and non EN locale
-* TINKERPOP-2276 No constructor for remote connection in DSL generated traversal source
-* TINKERPOP-2283 GraphStep's ids null exception
-* TINKERPOP-2285 Error object is unreachable
-* TINKERPOP-2288 Get ConnectionPoolBusyException and then ServerUnavailableExceptions
-* TINKERPOP-2289 Use address instead of hostname for connection
-* TINKERPOP-2290 Javascript GLV connection refused error handling
-* TINKERPOP-2291 TraversalExplanation deserialization in GraphSON
-* TINKERPOP-2298 Bytecode.java flattenArguments throw exception when null
-* TINKERPOP-2303 GremlinDsl generate addV instead of addE
-* TINKERPOP-2318 Edge properties dedup() not work with spark-gremlin *(breaking)*
-* TINKERPOP-2337 In upgrade guide for 3.4.2, the option RemoteConnection.PER_REQUEST_TIMEOUT does not exist
-* TINKERPOP-2338 drop() not removing all edge/meta properties
-* TINKERPOP-2341 GremlinClientExtensions.SubmitAsync hangs as it tries to dispose connection
-* TINKERPOP-2345 NullPointerException when Map key is not found for math()
-* TINKERPOP-2347 Remove invalid service descriptors from gremlin-shaded
-* TINKERPOP-2350 clone() is not deep copying Traversal internals
-* TINKERPOP-2351 Local Map ordering of keys can generate cast errors
-* TINKERPOP-2352 Gremlin Python driver default pool size makes Gremlin keep-alive difficult
-* TINKERPOP-2353 Error while Shutting Down Gremlin Server
-* TINKERPOP-2360 failed to deserializer int32 when gremlin-python submit bytecode with a big int value
-* TINKERPOP-2364 Injected ProfileStep should not be displayed in child traversals
-* TINKERPOP-2365 LazyBarrierStrategy adds a NoOpBarrierStep when profile() is present
-* TINKERPOP-2368 JAVA_OPTIONS are not properly expanded in gremlin-console
-* TINKERPOP-2369 Connections in ConnectionPool are not replaced in background when underlying channel is closed
-* TINKERPOP-2374 SaslAndHttpBasicAuthenticationHandler can't extract authorization
-* TINKERPOP-2383 has(T,Traversal) does not return results
-* TINKERPOP-2384 Inject and withSideEffect causing different outcomes in order step
-* TINKERPOP-2388 gremlinpython: Can't close DriverRemoteConnection
-* TINKERPOP-2403 Gremlin javascript Translator does not handle child traversals
-* TINKERPOP-2405 gremlinpython: traversal hangs when the connection is established but the servers stops responding later
-* TINKERPOP-2408 Iterator leak in HasContainer
-* TINKERPOP-2409 js: DriverRemoteConnection never times out if server uri not available.
-* TINKERPOP-2410 Free up server threads when client is closed
-* TINKERPOP-2425 Server closes HTTP connection for keepAlive as true
-* TINKERPOP-2432 Generate correct toString() representation of bytecode in Javascript
-* TINKERPOP-2433 typo in javadocs match() Type Parameters
-* TINKERPOP-2435 Gremlin Python sugar syntax for values() can lead to unexpected problems
-* TINKERPOP-2437 gremlin-driver hangs if ResultSet.statusAttributes().get() is called when the request throws
-* TINKERPOP-2439 P and TextP toString() is broken
-* TINKERPOP-2458 Bytecode Bindings lost when followed by a child traversal
-* TINKERPOP-2465 TestHelper.generateTempFileFromResource file handling is invalid on windows
-* TINKERPOP-2475 Barrier step touches one more element of next loop
-* TINKERPOP-2478 Console byte code translator has issues with "new Date()"
-* TINKERPOP-2496 GremlinDslProcessor fails when SocialTraversalSourceDsl overrides close
-* TINKERPOP-2505 Gremlin Python Client Query Times out at 30 seconds instead of the server timeout
-* TINKERPOP-2512 Duplicate jars in classpath when running gremlin-server.sh
-* TINKERPOP-2513 Generics insufficiently strict on property()
-* TINKERPOP-2514 Java client driver requests with same request ids hang
-* TINKERPOP-2516 Property folding has trouble with coalesce
-* TINKERPOP-2529 Global dedup() in reducing by() of group() detaches elements for OLTP
-* TINKERPOP-2531 Gremlin .NET driver ConnectionPool can remain without connections if server is down for 1-2 minutes
-
-==== Improvements
-
-* TINKERPOP-709 Consider Bounding Gremlin Pool Queue Size
-* TINKERPOP-1084 Branch option tokens should be allowed to be traversals.
-* TINKERPOP-1553 Deprecate store() in favor of aggregate(Scope)
-* TINKERPOP-1568 Change strategy application order *(breaking)*
-* TINKERPOP-1641 Kerberos authentication for gremlin-python
-* TINKERPOP-1682 by-modulator optimization strategy
-* TINKERPOP-1733 hasKey, hasValues should work on Element and Property
-* TINKERPOP-1810 Add Lambda.binaryOperator and Lambda.unaryOperator
-* TINKERPOP-1838 Python sample script
-* TINKERPOP-1886 Gremlin Python driver to periodically issue ping / heartbeat to gremlin server
-* TINKERPOP-1921 Support hasNext terminal step in GLVs
-* TINKERPOP-1994 LazyBarrierStrategy fully responsible for barrier() additions
-* TINKERPOP-2001 Support lambdas in Javascript
-* TINKERPOP-2014 Allow an ability to specify seeding for random methods such as coin, sample and Order.shuffle
-* TINKERPOP-2020 Support withComputer() for javascript
-* TINKERPOP-2046 Gremlin-Python: Support custom request headers in WebSocket request
-* TINKERPOP-2054 Support TraversalStrategy specification in gremlin-javascript
-* TINKERPOP-2076 Build with Java 11
-* TINKERPOP-2080 Remove deprecated TraversalSource.withRemote() *(breaking)*
-* TINKERPOP-2099 Property setting with null has different behavior between add and update *(breaking)*
-* TINKERPOP-2133 Use neo4j index lookup in Neo4jGraphStep with HasContainers containing TextP predicates
-* TINKERPOP-2168 GraphSON: P deserialization should be optimized
-* TINKERPOP-2213 Replace scriptEvaluationTimeout in favor of something more suitable to bytecode
-* TINKERPOP-2215 Better exception message for connection problems
-* TINKERPOP-2223 Update jackson databind to 2.9.9
-* TINKERPOP-2231 Remove deprecated bulk dumping/loading VertexPrograms *(breaking)*
-* TINKERPOP-2233 Remove deprecated Order decr/incr *(breaking)*
-* TINKERPOP-2235 Better handle the concept of null in traversals *(breaking)*
-* TINKERPOP-2236 Improve error messaging for TinkerGraph IdManagers that fail on conversions
-* TINKERPOP-2237 Prevent error when closing sessions that don't exist *(breaking)*
-* TINKERPOP-2239 Remove previously deprecated SSL configuration options *(breaking)*
-* TINKERPOP-2242 Bump to netty 4.1.36
-* TINKERPOP-2243 Add user-agent to RequestOptions
-* TINKERPOP-2245 Consolidate the executor for bytecode & string based client
-* TINKERPOP-2246 Consolidate the error propagation to the client
-* TINKERPOP-2250 Support toString serialization in GraphBinary
-* TINKERPOP-2251 Remove deprecated VertexProgram-related methods *(breaking)*
-* TINKERPOP-2252 A meaningful way to support session based byteCode interaction through gremlin-driver
-* TINKERPOP-2254 Rename AggregateStep and StoreStep given aggregate(Scope,String) *(breaking)*
-* TINKERPOP-2256 processAllStarts of AggregateStep should only be called when barrier is empty
-* TINKERPOP-2259 Default Java based driver and server operations to GraphBinary and remove Gryo *(breaking)*
-* TINKERPOP-2260 Update jackson databind 2.9.9.1
-* TINKERPOP-2262 Improve Netty protocol handling
-* TINKERPOP-2265 Deprecate Traversal.getSideEffects() functionality for remoting purposes
-* TINKERPOP-2269 Remove remote side-effect related infrastructure *(breaking)*
-* TINKERPOP-2270 Deprecate multi/metaproperty support in Neo4j
-* TINKERPOP-2271 Add console preference to control server-originated warning display
-* TINKERPOP-2272 Rename steps and tokens that conflict with standard python functions
-* TINKERPOP-2273 Remove deprecated ResponseHandlerContext infrastructure *(breaking)*
-* TINKERPOP-2277 Python sdk postpone the timing to create transport
-* TINKERPOP-2279 GraphBinary support in Python
-* TINKERPOP-2280 Prevent use of T values as property key overloads
-* TINKERPOP-2284 Make it easier to return more structure of graph elements
-* TINKERPOP-2295 Remove deprecated scriptEvaluationTimeout *(breaking)*
-* TINKERPOP-2296 Per query timeout not working from Python
-* TINKERPOP-2302 Add isOnGraphComputer() field accessor to ElementMapStep
-* TINKERPOP-2307 Add better error message for badly configured Channelizer
-* TINKERPOP-2310 Reduce Traversal.isRoot() to a check of EmptyStep *(breaking)*
-* TINKERPOP-2311 TraversalStrategies implementing Iterable *(breaking)*
-* TINKERPOP-2312 Empty keys to group() should group to null
-* TINKERPOP-2314 Employ by(String) for Map when possible and improve errors around incorrect types
-* TINKERPOP-2315 Implement some form of clone() or reset() for Traversal in GLVs
-* TINKERPOP-2317 Remove Python 2 support *(breaking)*
-* TINKERPOP-2320 [SECURITY] XMLInputFactory initialization in GraphMLReader introduces
-* TINKERPOP-2325 Generate traversals that will better yield index lookups with SPARQL
-* TINKERPOP-2327 Remove deprecated NIO protocol support *(breaking)*
-* TINKERPOP-2328 Do not close all connections if just one has became closed
-* TINKERPOP-2335 Drop support for older GLV runtimes
-* TINKERPOP-2336 Allow close of channel without having to wait for server
-* TINKERPOP-2349 Switch from Newtonsoft.Json to System.Text.Json *(breaking)*
-* TINKERPOP-2354 Document recommendation to reuse graph traversal source
-* TINKERPOP-2356 Bump to Jackson 2.10.x
-* TINKERPOP-2357 Add a command to clear the Gremlin Console screen
-* TINKERPOP-2361 Prevent using GraphTraversalSource spawned traversals as children *(breaking)*
-* TINKERPOP-2371 Add possibility to import constants with ImportGremlinPlugin
-* TINKERPOP-2376 Probability distribution controlled by weight when using sample step
-* TINKERPOP-2377 Investigate intermittent .NET GLV test failures
-* TINKERPOP-2389 Authorization support in TinkerPop
-* TINKERPOP-2391 Drop GLV Templating System
-* TINKERPOP-2392 Improve module level documentation for GLVs
-* TINKERPOP-2394 Unable to use __ class of a custom DSL when passing a script even if this class is imported *(breaking)*
-* TINKERPOP-2395 Gremlin Python doesn't support list as keys in groupCount
-* TINKERPOP-2396 TraverserSet should be extendable for GraphDB provider
-* TINKERPOP-2397 Don't create the default Gyro serializer if the caller specifies a different one
-* TINKERPOP-2401 Upgrade Jackson-databind to 2.11.x
-* TINKERPOP-2406 Delegate processing from event loop to worker threads
-* TINKERPOP-2407 Support deserialization of a dict that has a dict as a key
-* TINKERPOP-2412 Add missing query tests
-* TINKERPOP-2413 Prefer withEmbedded() to withGraph() on AnonymousTraversalSource
-* TINKERPOP-2415 Avoid unnecessary detached objects if not required
-* TINKERPOP-2416 MultiIterator should implement AutoCloseable
-* TINKERPOP-2418 Store authenticated user on server pipeline
-* TINKERPOP-2420 Support per query request options in .NET
-* TINKERPOP-2421 Support per query options in javascript
-* TINKERPOP-2426 Use Netty's WebSocketClientProtocolHandler
-* TINKERPOP-2427 Simplify Netty reference counting
-* TINKERPOP-2430 Looping Recipies
-* TINKERPOP-2431 Operating on Dropped Elements Recipes
-* TINKERPOP-2436 The gremlin server starts even if all graphs instantiation has failed
-* TINKERPOP-2438 Provide a way for scripts to respect with() specification of timeout
-* TINKERPOP-2440 Simplify driver by delegating keepAlive logic to Netty
-* TINKERPOP-2441 Add compression to WebSocket frames sent from client
-* TINKERPOP-2442 Make Translators that work in Java part of gremlin-core
-* TINKERPOP-2443 Improve testing of Translator instances for non-JVM languages with focus on Python as a model
-* TINKERPOP-2445 Speed up client initialization *(breaking)*
-* TINKERPOP-2446 Add Recipe for Optional Looping
-* TINKERPOP-2447 Improve handling of StackOverflowError for long traversals
-* TINKERPOP-2451 JavascriptTranslator for Java
-* TINKERPOP-2452 DotNetTranslator for Java
-* TINKERPOP-2453 Add WebSocket compression to gremlin-python
-* TINKERPOP-2455 Remove deprecated custom keep-alive functionality in the Java driver Channelizer *(breaking)*
-* TINKERPOP-2457 Add a max_content_length parameter to DriverRemoteConnection in the Python client
-* TINKERPOP-2460 Change groovy to provided scope in gremlin-driver *(breaking)*
-* TINKERPOP-2461 Align CoreImports with GroovyTranslator
-* TINKERPOP-2462 Duplicated BytecodeUtil and BytecodeHelper classes
-* TINKERPOP-2466 Improve syntax for Groovy scripts that use withStrategies()
-* TINKERPOP-2468 Stabilize shouldProcessSessionRequestsInOrder() test
-* TINKERPOP-2469 KrbException - Principal does not exist in test
-* TINKERPOP-2470 Bump gremlinpython to tornado 6.x
-* TINKERPOP-2472 GraphBinary support in .NET
-* TINKERPOP-2473 Prevent TraversalStrategy instances of the same type to be added to a TraversalSource
-* TINKERPOP-2474 withSack() Groovy translation output could be simplified
-* TINKERPOP-2476 Provide fully shaded version of Java driver
-* TINKERPOP-2479 Provide a way to set a custom GraphSONMapper for :bytecode command
-* TINKERPOP-2481 IdentityRemovalStrategy not installed *(breaking)*
-* TINKERPOP-2482 Rename wsConnectionTimeout to connectionSetupTimeout
-* TINKERPOP-2484 Python IOLoop close errors
-* TINKERPOP-2485 Invalid http tests with ?gremlin=1-1
-* TINKERPOP-2494 Document Translator parameter extraction functionality
-* TINKERPOP-2499 PathRetractionStrategy returns inconsistent results when match() is not detected as the final step *(breaking)*
-* TINKERPOP-2500 Add none() step for all GLVs
-* TINKERPOP-2506 Expose client WebSocket connection status
-* TINKERPOP-2517 Introduce a retry status code to the server protocol
-* TINKERPOP-2527 Add a GroovyTranslator equivalent method to the Python client
-* TINKERPOP-2530 Transfer OyvindSabo/gremlint and OyvindSabo/gremlint.com to apache/tinkerpop/gremlint
-* TINKERPOP-2532 MaxBarrierSize of NoOpBarrierStep should be accessible
-* TINKERPOP-2533 Develop a grammar for Gremlin
-* TINKERPOP-2535 Netty 4.1.52 flagged as medium security violation
-* TINKERPOP-2537 Support bytecode based requests in sessions and remote tx()
-* TINKERPOP-2544 Modify site publishing scripts to include gremlint
-* TINKERPOP-2546 Change transport layer to use AIOHTTP instead of Tornado
-* TINKERPOP-2547 Provide an option to supply a callback before handshake submission
-* TINKERPOP-2550 Deadlock on Client initialization
+Please see the archived <<./docs/archive/changelogs/changelog-3.5.x.asciidoc#release-3-5-0, 3.5.0 changelog>>.
== TinkerPop 3.4.0 (Avant-Gremlin Construction #3 for Theremin and Flowers)
@@ -1778,783 +711,72 @@
[[release-3-4-13]]
=== TinkerPop 3.4.13 (Release Date: January 10, 2022)
-* Fixed `RangeGlobalStep` which was prematurely closing the iterator.
-* Added explicit state to `DefaultTraversal` to track whether or not it was fully iterated and closed to ensure it released resources properly.
-* Prevented XML External Entity (XXE) style attacks via `GraphMLReader` by disabling DTD and external entities by default.
-* Improved error message for failed serialization for HTTP-based requests.
-* Fixed a `NullPointerException` that could occur during a failed `Connection` initialization due to uninstantiated `AtomicInteger`.
-* Minor changes to the initialization of Java driver `Cluster` and `Client` such that hosts are marked as available only after successfully initializing connection pools.
-* `NoHostAvailableException` now contains a cause for the failure.
-* Bumped to Netty 4.1.72.
-* Added user-friendly message in Gremlin console for unavailable hosts upon initiation and fixed possible leak in `RemoteCommand.groovy` upon `RemoteException`.
-
-==== Bugs
-
-* TINKERPOP-2569 Reconnect to server if Java driver fails to initialize
-* TINKERPOP-2589 XML External Entity (XXE) vulnerability
-* TINKERPOP-2597 NullPointerException while initializing connection pool
-* TINKERPOP-2603 TinkerGraph sometimes could not query float values.
-* TINKERPOP-2609 HTTP returns serialization exceptions for the GraphTraversalSource
-* TINKERPOP-2626 RangeGlobalStep closes traversal prematurely
-
-==== Improvements
-
-* TINKERPOP-2504 Intermittently failing server/driver integration tests
-* TINKERPOP-2616 Provide better exceptions with SSL related failures *(breaking)*
-* TINKERPOP-2630 Clarify that a server cannot support Graphson1.0 over HTTP
-* TINKERPOP-2632 Netty 4.1.61 flagged with two high severity security violations
-* TINKERPOP-2669 Netty 4.1.61 flagged with medium severity security violations
+Please see the archived <<./docs/archive/changelogs/changelog-3.4.x.asciidoc#release-3-4-13, 3.4.13 changelog>>.
[[release-3-4-12]]
=== TinkerPop 3.4.12 (Release Date: July 19, 2021)
-* Coerced single `set` arguments to `P.within` and `P.without` to `list` in Python which serializes to a more expected form for `P` instances.
-* Fixed bug in the `vertexLabelKey` validation for `GraphMLWriter` which was inadvertently validating the `edgeLabelKey`.
-* Changed `IndexStep` to make it easier for providers to determine the type of indexer being used.
-* Allowed Javascript `Translator` to take `Bytecode` or a `Traversal`.
-* Addressed CVE-2021-32640 for gremlin-javascript.
-* Allowed construction of `DriverRemoteConnection` in .NET to use host and port specification similar to Java syntax.
-* Defaulted `DriverRemoteConnection` to "g" if it the `TraversalSource` binding isn't supplied in Python.
-* Initialized metrics in `ProfileStep` even if the step hasn't iterated.
-
-==== Bugs
-
-* TINKERPOP-2358 Potential connection leak on client disposing
-* TINKERPOP-2554 Extracting step metrics from ProfileStep throws NPE if the step was not triggered
-* TINKERPOP-2565 GraphMLWriter does not check vertexLabelKey conflict
-* TINKERPOP-2578 Set arguments to P within/without are wrapped in List
-* TINKERPOP-2580 Update the custom DSL documentation
-
-==== Improvements
-
-* TINKERPOP-2548 Add getter for indexer used in IndexStep
-* TINKERPOP-2577 Remove unused test coverage dependencies from Gremlin.NET
+Please see the archived <<./docs/archive/changelogs/changelog-3.4.x.asciidoc#release-3-4-12, 3.4.12 changelog>>.
[[release-3-4-11]]
=== TinkerPop 3.4.11 (Release Date: May 3, 2021)
-* Prevented Java driver from sending multiple request messages with the same identifier.
-* Improved error message for `property(T,Object)` when mutating graph elements.
-* Added method caching for GraphSON 3.0 deserialization of `P` and `TextP` instances.
-* Allowed setting `ssl_options` for gremlin-python.
-* Fixed bug with global `dedup()` when used in reducing `by()` of `group()`.
-* Fixed bug with Javascript Groovy `Translator` when generating Gremlin with multiple embedded traversals.
-* Modified Gremlin Server `Settings` to be more extensible allowing for custom options with the YAML parser.
-* Fixed `toString()` representation of `P` when string values are present in Javascript.
-* Exposed barrier size with getter for `NoOpBarrierStep`.
-* Bumped to Netty 4.1.61.
-* Added `max_content_length` as a Python driver setting.
-* Fixed bug in Java `Client` initialization, reconnect and shutdown where certain thread pool configurations might produce a deadlock.
-* Ensured that `barrier()` additions by strategies were controlled solely by `LazyBarrierStrategy`.
-* Fixed `NullPointerException` in `ResponseMessage` deserialization for GraphSON.
-* Enabled the Gremlin.Net driver to repair its connection pool after the server was temporarily unavailable.
-* Added the ability to supply a `HandshakeInterceptor` to a `Cluster` which will provide access to the initial HTTP request that establishes the websocket.
-* Fixed a possible leakage of connections in the Gremlin.NET driver that could happen if `Dispose()` was called while the pool was creating connections.
-
-==== Bugs
-
-* TINKERPOP-2512 Duplicate jars in classpath when running gremlin-server.sh
-* TINKERPOP-2514 Java client driver requests with same request ids hang
-* TINKERPOP-2516 Property folding has trouble with coalesce
-* TINKERPOP-2529 Global dedup() in reducing by() of group() detaches elements for OLTP
-* TINKERPOP-2531 Gremlin .NET driver ConnectionPool can remain without connections if server is down for 1-2 minutes
-
-==== Improvements
-
-* TINKERPOP-1994 LazyBarrierStrategy fully responsible for barrier() additions
-* TINKERPOP-2168 GraphSON: P deserialization should be optimized
-* TINKERPOP-2457 Add a max_content_length parameter to DriverRemoteConnection in the Python client
-* TINKERPOP-2532 MaxBarrierSize of NoOpBarrierStep should be accessible
-* TINKERPOP-2535 Netty 4.1.52 flagged as medium security violation
-* TINKERPOP-2547 Provide an option to supply a callback before handshake submission
-* TINKERPOP-2550 Deadlock on Client initialization
+Please see the archived <<./docs/archive/changelogs/changelog-3.4.x.asciidoc#release-3-4-11, 3.4.11 changelog>>.
[[release-3-4-10]]
=== TinkerPop 3.4.10 (Release Date: January 18, 2021)
-* Added `GremlinScriptChecker` to provide a way to extract properties of scripts before doing an actual `eval()`.
-* Added `none()` step for all language variants.
-* Fixed bug in `PythonTranslator` which was improperly translating `Lambda` scripts.
-* Fixed bug in `GremlinDslProcessor` where certain return types in `TraversalSource` definitions were not generating code that would compile.
-* Changed the default read and write timeout values for the `TornadoTransport` to `None` to disable it.
-* Bumped to Groovy 2.5.14.
-
-==== Bugs
-
-* TINKERPOP-2496 GremlinDslProcessor fails when SocialTraversalSourceDsl overrides close
-* TINKERPOP-2505 Gremlin Python Client Query Times out at 30 seconds instead of the server timeout
-
-==== Improvements
-
-* TINKERPOP-2447 Improve handling of StackOverflowError for long traversals
-* TINKERPOP-2485 Invalid http tests with ?gremlin=1-1
-* TINKERPOP-2500 Add none() step for all GLVs
+Please see the archived <<./docs/archive/changelogs/changelog-3.4.x.asciidoc#release-3-4-10, 3.4.10 changelog>>.
[[release-3-4-9]]
=== TinkerPop 3.4.9 (Release Date: December 7, 2020)
-* Modified the text of `profile()` output to hide step instances injected for purpose of collecting metrics.
-* Bumped to Jackson 2.11.x.
-* Bumped Netty 4.1.52.
-* Added lambda support for `gremlin-javascript`.
-* Provided a more concise syntax for constructing strategies in Groovy.
-* Aligned `CoreImports` with `GroovyTranslator` to generate more succinct syntax.
-* Improved `gremlin-groovy` understanding of `withSack()` overloads to avoid forced casts.
-* Moved `Translator` instances to `gremlin-core`.
-* Prevented barriers from over-reaching their limits by one.
-* Added `CheckedGraphManager` to prevent Gremlin Server from starting if there are no graphs configured.
-* Fixed bug in bytecode `Bindings` where calling `of()` prior to calling a child traversal in the same parent would cause the initial binding to be lost.
-* Established a default read and write timeout for the `TornadoTransport` in Python, allowing it to be configurable.
-* Delegated handling of erroneous response to the worker thread pool instead of event loop thread pool in Java Driver.
-* Removed `Connection` from `Connection Pool` when server closes a connection with no pending requests in Java Driver.
-* Improved initialization time of Java Driver if the default serializer is replaced.
-* Deprecated `withGraph()` in favor of `withEmbedded()` on `AnonymousTraversalSource`.
-* Added support for per-request level configurations, like timeouts, in .NET, Python and Javascript.
-* Fixed bug in Javascript `Translator` that wasn't handling child traversals well.
-* Prevented Gremlin Python sugar from being confused by Python magic methods.
-* Allowed Gremlin Python sugar calls from anonymous context.
-* Implemented `AutoCloseable` on `MultiIterator`.
-* Fixed an iterator leak in `HasContainer`.
-* Fixed bug in `:bytecode` command preventing translations with whitespace from working properly.
-* Added `reset` and `config` options to the `:bytecode` command to allow for greater customization options.
-* Added GraphSON extension module and the `TinkerIoRegistry` to the default `GraphSONMapper` configuration used by the `:bytecode` command.
-* Added `GremlinASTChecker` to provide a way to extract properties of scripts before doing an actual `eval()`.
-* Avoided creating unnecessary detached objects in JVM.
-* Added support for `TraversalStrategy` usage in Javascript.
-* Added `Traversal.getTraverserSetSupplier()` to allow providers to supply their own `TraverserSet` instances.
-* Release server threads waiting on connection if the connection is dead.
-* Fixed bug where server closes HTTP connection on request error even if keep alive is set to true.
-* Deprecated driver `Channelizer` keep-alive related methods.
-* Delegate handling of WebSocket handshake to Netty instead of custom code in Java Driver.
-* Delegate detection of idle connection to Netty instead of custom keep alive logic for `WebSocketChannelizer`.
-* Added support for WebSocket frame compression extension ( [RFC7692](https://tools.ietf.org/html/rfc7692) ) for `WebSocketChannelizer` in Java/Python driver.
-* Added server support for WebSocket compression extension ( [RFC7692](https://tools.ietf.org/html/rfc7692) ).
-* Fixed bug with Bytecode serialization when `Bytecode.toString()` is used in Javascript.
-* Fixed "toString" for P and TextP to produce valid script representation from bytecode glv steps containing a string predicate in Javascript.
-* Fixed a bug which could cause Java driver to hang when using `ResultSet.statusAttributes()`
-* Added a listener to javascript's `DriverRemoteConnection` to find note errors from websocket connection setup.
-* Fixed bug with `ReservedVerificationStrategy.getConfiguration()` which was omitting the reserved `keys` value.
-* Changed all configuration keys on `AbstractWarningVerificationStrategy` implementations to `public`.
-* Deprecated `BytecodeUtil` and merged its functionality to the existing `BytecodeHelper`.
-* Added configuring implementation in HasStep
-* Remove static initialization for `GraphSONMessageSerializerV1d0` and `GraphSONMessageSerializerV1d0` in Java driver.
-* Connections to the server in a connection pool are created in parallel instead of serially in Java Driver.
-* Connection pools for multiple endpoints are created in parallel instead of serially in Java Driver.
-* Introduced new HostNotAvailable exception to represent cases when no server with active connection is available.
-* Don't wait for new requests during shutdown of event loop group in Java Driver.
-
-==== Bugs
-
-* TINKERPOP-2364 Injected ProfileStep should not be displayed in child traversals
-* TINKERPOP-2369 Connections in ConnectionPool are not replaced in background when underlying channel is closed
-* TINKERPOP-2403 Gremlin javascript Translator does not handle child traversals
-* TINKERPOP-2405 gremlinpython: traversal hangs when the connection is established but the servers stops responding later
-* TINKERPOP-2408 Iterator leak in HasContainer
-* TINKERPOP-2409 js: DriverRemoteConnection never times out if server uri not available.
-* TINKERPOP-2410 Free up server threads when client is closed
-* TINKERPOP-2425 Server closes HTTP connection for keepAlive as true
-* TINKERPOP-2432 Generate correct toString() representation of bytecode in Javascript
-* TINKERPOP-2433 typo in javadocs match() Type Parameters
-* TINKERPOP-2435 Gremlin Python sugar syntax for values() can lead to unexpected problems
-* TINKERPOP-2437 gremlin-driver hangs if ResultSet.statusAttributes().get() is called when the request throws
-* TINKERPOP-2439 P and TextP toString() is broken
-* TINKERPOP-2458 Bytecode Bindings lost when followed by a child traversal
-* TINKERPOP-2465 TestHelper.generateTempFileFromResource file handling is invalid on windows
-* TINKERPOP-2475 Barrier step touches one more element of next loop
-* TINKERPOP-2478 Console byte code translator has issues with "new Date()"
-
-==== Improvements
-
-* TINKERPOP-2001 Support lambdas in Javascript
-* TINKERPOP-2054 Support TraversalStrategy specification in gremlin-javascript
-* TINKERPOP-2296 Per query timeout not working from Python
-* TINKERPOP-2392 Improve module level documentation for GLVs
-* TINKERPOP-2396 TraverserSet should be extendable for GraphDB provider
-* TINKERPOP-2397 Don't create the default Gyro serializer if the caller specifies a different one
-* TINKERPOP-2401 Upgrade Jackson-databind to 2.11.x
-* TINKERPOP-2406 Delegate processing from event loop to worker threads
-* TINKERPOP-2412 Add missing query tests
-* TINKERPOP-2413 Prefer withEmbedded() to withGraph() on AnonymousTraversalSource
-* TINKERPOP-2415 Avoid unnecessary detached objects if not required
-* TINKERPOP-2416 MultiIterator should implement AutoCloseable
-* TINKERPOP-2420 Support per query request options in .NET
-* TINKERPOP-2421 Support per query options in javascript
-* TINKERPOP-2426 Use Netty's WebSocketClientProtocolHandler
-* TINKERPOP-2427 Simplify Netty reference counting
-* TINKERPOP-2430 Looping Recipies
-* TINKERPOP-2431 Operating on Dropped Elements Recipes
-* TINKERPOP-2436 The gremlin server starts even if all graphs instantiation has failed
-* TINKERPOP-2438 Provide a way for scripts to respect with() specification of timeout
-* TINKERPOP-2440 Simplify driver by delegating keepAlive logic to Netty
-* TINKERPOP-2441 Add compression to WebSocket frames sent from client
-* TINKERPOP-2442 Make Translators that work in Java part of gremlin-core
-* TINKERPOP-2445 Speed up client initialization *(breaking)*
-* TINKERPOP-2446 Add Recipe for Optional Looping
-* TINKERPOP-2453 Add WebSocket compression to gremlin-python
-* TINKERPOP-2461 Align CoreImports with GroovyTranslator
-* TINKERPOP-2462 Duplicated BytecodeUtil and BytecodeHelper classes
-* TINKERPOP-2466 Improve syntax for Groovy scripts that use withStrategies()
-* TINKERPOP-2468 Stabilize shouldProcessSessionRequestsInOrder() test
-* TINKERPOP-2469 KrbException - Principal does not exist in test
-* TINKERPOP-2474 withSack() Groovy translation output could be simplified
-* TINKERPOP-2479 Provide a way to set a custom GraphSONMapper for :bytecode command
-* TINKERPOP-2482 Rename wsConnectionTimeout to connectionSetupTimeout
+Please see the archived <<./docs/archive/changelogs/changelog-3.4.x.asciidoc#release-3-4-9, 3.4.9 changelog>>.
[[release-3-4-8]]
=== TinkerPop 3.4.8 (Release Date: August 3, 2020)
-* Fixed bug in `has(T,Traversal)` where results were not being returned.
-* Fixed bug in `select(Traversal)` where side-effects were getting lost if accessed from the child traversal.
-* Fixed authorization bug when using `WsAndHttpChannelizerHandler` with keep-alive enabled.
-* Fixed bug in option-less construction of `DriverRemoteConnection` in Javascript.
-* Bumped Jackson to 2.9.10.5.
-* Improved sampling distribution for global scope `sample()` operations.
-
-==== Bugs
-
-* TINKERPOP-2288 Get ConnectionPoolBusyException and then ServerUnavailableExceptions
-* TINKERPOP-2352 Gremlin Python driver default pool size makes Gremlin keep-alive difficult
-* TINKERPOP-2374 SaslAndHttpBasicAuthenticationHandler can't extract authorization
-* TINKERPOP-2383 has(T,Traversal) does not return results
-* TINKERPOP-2384 Inject and withSideEffect causing different outcomes in order step
-
-==== Improvements
-
-* TINKERPOP-2328 Do not close all connections if just one has became closed
-* TINKERPOP-2376 Probability distribution controlled by weight when using sample step
+Please see the archived <<./docs/archive/changelogs/changelog-3.4.x.asciidoc#release-3-4-8, 3.4.8 changelog>>.
[[release-3-4-7]]
=== TinkerPop 3.4.7 (Release Date: June 1, 2020)
-This release also includes changes from <<release-3-3-11, 3.3.11>>.
-
-* Gremlin.NET driver: Fixed a `NullReferenceException` and throw clear exception if received message is empty.
-* Bumped to Groovy 2.5.11.
-* Modified `ImportGremlinPlugin` to allow for field imports.
-* Improved error message for `math()` when the selected key in a `Map` is `null` or not a `Number`.
-* Added `:cls` command to Gremlin Console to clear the screen.
-* Bumped Netty 4.1.49.
-
-==== Bugs
-
-* TINKERPOP-2192 Gremlin.Net.Driver.Connection.Parse throws a NullReferenceException
-* TINKERPOP-2345 NullPointerException when Map key is not found for math()
-* TINKERPOP-2347 Remove invalid service descriptors from gremlin-shaded
-* TINKERPOP-2350 clone() is not deep copying Traversal internals
-* TINKERPOP-2351 Local Map ordering of keys can generate cast errors
-* TINKERPOP-2353 Error while Shutting Down Gremlin Server
-* TINKERPOP-2355 Jackson-databind version in Gremlin shaded dependency needs to be increased - introduces vulnerability issues
-* TINKERPOP-2360 failed to deserializer int32 when gremlin-python submit bytecode with a big int value
-* TINKERPOP-2365 LazyBarrierStrategy adds a NoOpBarrierStep when profile() is present
-* TINKERPOP-2368 JAVA_OPTIONS are not properly expanded in gremlin-console
-
-==== Improvements
-
-* TINKERPOP-2215 Better exception message for connection problems
-* TINKERPOP-2336 Allow close of channel without having to wait for server
-* TINKERPOP-2339 Gremlin.Net: Update System.Net.WebSockets.Client dependency
-* TINKERPOP-2354 Document recommendation to reuse graph traversal source
-* TINKERPOP-2357 Add a command to clear the Gremlin Console screen
-* TINKERPOP-2371 Add possibility to import constants with ImportGremlinPlugin
+Please see the archived <<./docs/archive/changelogs/changelog-3.4.x.asciidoc#release-3-4-7, 3.4.7 changelog>>.
[[release-3-4-6]]
=== TinkerPop 3.4.6 (Release Date: February 20, 2020)
-* Fixed bug in `drop()` of properties which was introduced in 3.4.5.
-
-==== Bugs
-
-* TINKERPOP-2338 drop() not removing all edge/meta properties
+Please see the archived <<./docs/archive/changelogs/changelog-3.4.x.asciidoc#release-3-4-6, 3.4.6 changelog>>.
[[release-3-4-5]]
=== TinkerPop 3.4.5 (Release Date: February 3, 2020)
-This release also includes changes from <<release-3-3-10, 3.3.10>>.
-
-* Expanded the use of `by(String)` modulator so that it can work on `Map` as well as `Element`.
-* Improved error messaging for `by(String)` so that it is more clear as to what the problem is
-* Bumped to Netty 4.1.42
-* Improved SPARQL query translation to better allow for index optimizations during execution.
-* Improved Gremlin Server websocket handling preventing automatic server close of the channel for protocol errors.
-* Introduced internal `Buffer` API as a way to wrap Netty's Buffer API and moved `GraphBinaryReader`, `GraphBinaryWriter` and `TypeSerializer<T>` to `gremlin-core`.
-* Unified the behavior of property comparison: only compare key&value.
-* Supported `hasKey()` and `hasValue()` step for edge property and meta property, like `g.E().properties().hasKey('xx')`.
-* Modified driver to send `overrideRequestId` and `userAgent` to server when they are present in `RequestOptions` for bytecode requests.
-
-==== Bugs
-
-* TINKERPOP-2175 Executor thread is not returned on channel close
-* TINKERPOP-2266 Keep alive not started at connection creation
-* TINKERPOP-2274 Test of TinkerGraph Gremlin fail on Windows and non EN locale
-* TINKERPOP-2318 Edge properties dedup() not work with spark-gremlin *(breaking)*
-* TINKERPOP-2332 JavaScript GLV: structure element toString() should internally call toString()
-* TINKERPOP-2333 JavaScript GLV: GraphSON2/3 Edge deserialization is invalid
-
-==== Improvements
-
-* TINKERPOP-1733 hasKey, hasValues should work on Element and Property
-* TINKERPOP-2262 Improve Netty protocol handling
-* TINKERPOP-2305 GraphBinary: Wrap Buffer API
-* TINKERPOP-2307 Add better error message for badly configured Channelizer
-* TINKERPOP-2309 Bump gremlinpython to Tornado 5.x
-* TINKERPOP-2314 Employ by(String) for Map when possible and improve errors around incorrect types
-* TINKERPOP-2315 Implement some form of clone() or reset() for Traversal in GLVs
-* TINKERPOP-2320 [SECURITY] XMLInputFactory initialization in GraphMLReader introduces
-* TINKERPOP-2322 Deprecate Jython support
-* TINKERPOP-2324 Deprecate the raw NIO support in the Java driver
-* TINKERPOP-2325 Generate traversals that will better yield index lookups with SPARQL
-* TINKERPOP-2329 JavaScript GLV: Update websocket library dependency
-* TINKERPOP-2330 JavaScript GLV should expose GraphSON2Writer and GraphSONReader
+Please see the archived <<./docs/archive/changelogs/changelog-3.4.x.asciidoc#release-3-4-5, 3.4.5 changelog>>.
[[release-3-4-4]]
=== TinkerPop 3.4.4 (Release Date: October 14, 2019)
-This release also includes changes from <<release-3-3-9, 3.3.9>>.
-
-* Provided support for DSLs by way of remote connections through `AnonymousTraversalSource`.
-* Added `elementMap()` step.
-* Added GraphBinary support for Python.
-* Allowed for embedded map assertions in GLV tests.
-* Added `Direction` deserialization support in GLVs.
-
-==== Bugs
-
-* TINKERPOP-2159 EventStrategy doesn't handle multi-valued properties
-* TINKERPOP-2276 No constructor for remote connection in DSL generated traversal source
-* TINKERPOP-2283 GraphStep's ids null exception
-* TINKERPOP-2285 Error object is unreachable
-* TINKERPOP-2289 Use address instead of hostname for connection
-* TINKERPOP-2290 Javascript GLV connection refused error handling
-* TINKERPOP-2291 TraversalExplanation deserialization in GraphSON
-* TINKERPOP-2298 Bytecode.java flattenArguments throw exception when null
-* TINKERPOP-2303 GremlinDsl generate addV instead of addE
-
-==== Improvements
-
-* TINKERPOP-1810 Add Lambda.binaryOperator and Lambda.unaryOperator
-* TINKERPOP-1838 Python sample script
-* TINKERPOP-2046 Gremlin-Python: Support custom request headers in WebSocket request
-* TINKERPOP-2213 Replace scriptEvaluationTimeout in favor of something more suitable to bytecode
-* TINKERPOP-2275 Update jackson databind 2.9.9.3+
-* TINKERPOP-2277 Python sdk postpone the timing to create transport
-* TINKERPOP-2279 GraphBinary support in Python
-* TINKERPOP-2280 Prevent use of T values as property key overloads
-* TINKERPOP-2284 Make it easier to return more structure of graph elements
-* TINKERPOP-2302 Add isOnGraphComputer() field accessor to ElementMapStep
+Please see the archived <<./docs/archive/changelogs/changelog-3.4.x.asciidoc#release-3-4-4, 3.4.4 changelog>>.
[[release-3-4-3]]
=== TinkerPop 3.4.3 (Release Date: August 5, 2019)
-This release also includes changes from <<release-3-3-8, 3.3.8>>.
-
-* Improved error messaging on timeouts returned to the console from `:>`.
-* Added a `toString()` serializer for GraphBinary.
-* Configured the Gremlin Console to use GraphBinary by default.
-* Fixed transaction management for empty iterators in Gremlin Server.
-* Deprecated `MessageSerializer` implementations for Gryo in Gremlin Server.
-* Deprecated `Serializers` enum values of `GRYO_V1D0` and `GRYO_V3D0`.
-* Deprecated `SerTokens` values of `MIME_GRYO_V1D0` and `MIME_GRYO_V3D0`.
-* Added a Docker command to start Gremlin Server with the standard GLV test configurations.
-* Added `aggregate(Scope,String)` and deprecated `store()` in favor of `aggregate(local)`.
-* Modified `NumberHelper` to better ignore `Double.NaN` in `min()` and `max()` comparisons.
-* Bumped to Netty 4.1.36.
-* Bumped to Groovy 2.5.7.
-* Added `userAgent` to RequestOptions. Gremlin Console sends `Gremlin Console/<version>` as the `userAgent`.
-* Fixed DriverRemoteConnection ignoring `with` `Token` options when multiple were set.
-* Added `:set warnings <true|false>` to Gremlin Console.
-
-==== Bugs
-
-* TINKERPOP-1619 TinkerGraphComputer worker count affects OptionalStep query results
-* TINKERPOP-2157 SparkStarBarrierInterceptor injects (Byte) 0
-* TINKERPOP-2224 Detect and fix resource leak
-* TINKERPOP-2230 match() step unexpected behaviours
-* TINKERPOP-2232 RemoteStrategy does not call parent class TraversalStrategy __init__
-* TINKERPOP-2238 Fix remaining iterator leaks marked by @IgnoreIteratorLeak
-* TINKERPOP-2241 Client exception don't match Server exception when server throw StackOverflowError
-* TINKERPOP-2248 Instability of driver for blocked requests
-* TINKERPOP-2257 transaction itty may still be visited after commit
-* TINKERPOP-2264 Gremlin Python should deserialize g:Date to UTC
-
-==== Improvements
-
-* TINKERPOP-1084 Branch option tokens should be allowed to be traversals.
-* TINKERPOP-1553 Deprecate store() in favor of aggregate(Scope)
-* TINKERPOP-1921 Support hasNext terminal step in GLVs
-* TINKERPOP-2020 Support withComputer() for javascript
-* TINKERPOP-2223 Update jackson databind to 2.9.9
-* TINKERPOP-2236 Improve error messaging for TinkerGraph IdManagers that fail on conversions
-* TINKERPOP-2237 Prevent error when closing sessions that don't exist *(breaking)*
-* TINKERPOP-2242 Bump to netty 4.1.36
-* TINKERPOP-2243 Add user-agent to RequestOptions
-* TINKERPOP-2246 Consolidate the error propagation to the client
-* TINKERPOP-2250 Support toString serialization in GraphBinary
-* TINKERPOP-2256 processAllStarts of AggregateStep should only be called when barrier is empty
-* TINKERPOP-2260 Update jackson databind 2.9.9.1
-* TINKERPOP-2265 Deprecate Traversal.getSideEffects() functionality for remoting purposes
-* TINKERPOP-2270 Deprecate multi/metaproperty support in Neo4j
-* TINKERPOP-2271 Add console preference to control server-originated warning display
-* TINKERPOP-2272 Rename steps and tokens that conflict with standard python functions
+Please see the archived <<./docs/archive/changelogs/changelog-3.4.x.asciidoc#release-3-4-3, 3.4.3 changelog>>.
[[release-3-4-2]]
=== TinkerPop 3.4.2 (Release Date: May 28, 2019)
-This release also includes changes from <<release-3-3-7, 3.3.7>>.
-
-* Allow a `Traversal` to know what `TraversalSource` it spawned from.
-* Fixed problem with connection pool sizing and retry.
-* Added status attribute for warnings to be returned to the client.
-* Modified Gremlin Console to report warning status attributes.
-* Changed `:>` in Gremlin Console to submit the client-side timeout on each request.
-* Provided method to override the request identifier with `RequestOptions`.
-* Added option to set per-request settings on a `Traversal` submitted via `Bytecode`.
-* Fixed the Gryo registration for `OptionsStrategy` as it was not serializing state properly.
-
-==== Bugs
-
-* TINKERPOP-2090 After running backend for a day or so System.IO.IOException keep throwing
-* TINKERPOP-2112 Folding in property() step is not being optimally performed
-* TINKERPOP-2180 gremlin.sh doesn't work when directories contain spaces
-* TINKERPOP-2183 InterpreterModeASTTransformation needs to be more specific about what it transforms
-* TINKERPOP-2189 ConnectedComponent test assumes fixed order of vertices
-* TINKERPOP-2194 Enforcing an order on properties in one test method of ChooseTest
-* TINKERPOP-2196 PartitionStrategy with includeMetaProperties(true) can't add labeled vertex
-* TINKERPOP-2198 Documentation for Store contradicts itself
-* TINKERPOP-2199 within step does not work with more than two parameters with python
-* TINKERPOP-2200 AddEdgeStartStep used DetachedFactory.detach instead of EventStrategy.detach
-* TINKERPOP-2204 Client receives no response on failed request
-* TINKERPOP-2206 Certain types in javascript don't appear to serialize with a GraphSON type
-* TINKERPOP-2212 Path is not detaching properly under certain conditions
-* TINKERPOP-2217 Race condition in Gremlin.net driver connection
-
-==== Improvements
-
-* TINKERPOP-2089 Javascript DSL support
-* TINKERPOP-2179 Have o.a.t.g.driver.ser.SerializationException extend IOException
-* TINKERPOP-2181 Allow ctrl+c to break out of a long running process in Gremlin Console
-* TINKERPOP-2182 Remove gperfutils from Gremlin Console *(breaking)*
-* TINKERPOP-2190 Document Gremlin sanitization best practices
-* TINKERPOP-2191 Implement EdgeLabelVerificationStrategy
-* TINKERPOP-2193 Allow a Traversal to know what TraversalSource it spawned from
-* TINKERPOP-2203 Bind the console timeout to the request timeout
-* TINKERPOP-2208 Include inject() in DSLs generated with Java annotation processor
-* TINKERPOP-2211 Provide API to add per request option for a bytecode
-* TINKERPOP-2216 Consider adding conventional status attribute key for warnings
-* TINKERPOP-2219 Upgrade Netty version
+Please see the archived <<./docs/archive/changelogs/changelog-3.4.x.asciidoc#release-3-4-2, 3.4.2 changelog>>.
[[release-3-4-1]]
=== TinkerPop 3.4.1 (Release Date: March 18, 2019)
-This release also includes changes from <<release-3-3-6, 3.3.6>>.
-
-* Gremlin.NET driver: Fixed removal of closed connections and added round-robin scheduling.
-* Added GraphBinary serializer for TraversalMetrics
-* Added registration for `SparqlStrategy` for GraphSON.
-* Fixed up `SparqlStrategy` so that it could be used properly with `RemoteStrategy`.
-* Fixed `ByteBuffer` serialization for GraphBinary.
-* Fixed `Path.toString()` in `gremlin-javascript` which was referencing an invalid object.
-* Fixed potential for an infinite loop in connection creation for `gremlin-dotnet`.
-* Added fallback resolver to `TypeSerializerRegistry` for GraphBinary.
-* Added easier to understand exceptions for connection problems in the Gremlin.Net driver.
-* Support configuring the type registry builder for GraphBinary.
-* Bumped to Groovy 2.5.6.
-* Release working buffers in case of failure for GraphBinary.
-* GraphBinary: Use the same `ByteBuf` instance to write during serialization. Changed signature of write methods in type serializers.
-* Remove unused parameter in GraphBinary's `ResponseMessageSerializer`.
-* Changed `SparqlTraversalSource` so as to enable Gremlin steps to be used to process results from the `sparql()` step.
-* GraphBinary: Cache expression to obtain the method in `PSerializer`.
-
-==== Bugs
-
-* TINKERPOP-1992 count has negative time in profile
-* TINKERPOP-2126 toString() methods not thread-safe
-* TINKERPOP-2135 Gremlin.Net ConnectionPool doesn't handle closed idle connections properly
-* TINKERPOP-2139 Errors during request serialization in WebSocketGremlinRequestEncoder/NioGremlinRequestEncoder are not reported to the client
-* TINKERPOP-2141 ByteBufferSerializer modifies buffer's position
-* TINKERPOP-2148 "no connection available!" is being thrown despite lots of free connections
-* TINKERPOP-2152 Path toString fails in Gremlin JavaScript
-* TINKERPOP-2153 Remove unused parameter from ResponseMessageSerializer *(breaking)*
-* TINKERPOP-2154 GraphBinary: Serializers should release resources in case of failures
-* TINKERPOP-2155 Situation can occur that causes infinite amount of connection to be opened, causing System.Net.WebSockets.WebSocketException
-* TINKERPOP-2161 GraphBinary: Write serialization performance issue
-* TINKERPOP-2169 Responses exceeding maxContentLength cause subsequent queries to hang
-* TINKERPOP-2172 PartitionStrategy doesn't apply to AddEdgeStartStep
-* TINKERPOP-2173 Incorrect reset of log level in integration test
-* TINKERPOP-2177 Streaming response immediately after authentication stops after first partial response
-
-==== Improvements
-
-* TINKERPOP-1435 Support for extended GraphSON in gremlin-python
-* TINKERPOP-1882 Apply range and limit steps as early as possible
-* TINKERPOP-1998 IoGraphTest use different schemas for standard and readGraph configurations
-* TINKERPOP-2088 Enable SourceLink for Gremlin.Net
-* TINKERPOP-2098 Improve gremlin-server.sh help output
-* TINKERPOP-2122 Expose status codes from server errors
-* TINKERPOP-2124 InlineFilterStrategy produces wrong result
-* TINKERPOP-2125 Extend release validation script
-* TINKERPOP-2127 Add g:TraversalMetrics and g:Metrics deserializers for gremlinpython
-* TINKERPOP-2129 Mask security secret or password in logs
-* TINKERPOP-2130 Cannot instantiate DriverRemoteConnection without passing an options object
-* TINKERPOP-2131 NoConnectionAvailableException doesn't reveal the reason
-* TINKERPOP-2134 Bump to Groovy 2.5.6
-* TINKERPOP-2136 Inside lower bound inclusion (documentation)
-* TINKERPOP-2138 Provide a configuration to disable the global closure cache
-* TINKERPOP-2140 Test build with Docker automatically
-* TINKERPOP-2144 Better handle Authenticator instance failures
-* TINKERPOP-2147 Add GraphBinary serializer for TraversalMetrics
-* TINKERPOP-2149 GraphBinary: Make type serializer resolution pluggable
-* TINKERPOP-2150 GraphBinary: Support configuring the TypeSerializerRegistry builder class in config
-* TINKERPOP-2163 JavaTranslator performance enhancements
-* TINKERPOP-2164 Bytecode's hashCode impl (and its inner classes) can produce hash collisions
-* TINKERPOP-2165 Prefer commons-lang3 to commons-lang
-* TINKERPOP-2166 GraphBinary: P deserialization should be optimized
-* TINKERPOP-2167 Gremlin Javascript Traversal as async iterable
-* TINKERPOP-2171 Allow SPARQL to be extended with Gremlin steps
-* TINKERPOP-2174 Improve Docker Image Security
+Please see the archived <<./docs/archive/changelogs/changelog-3.4.x.asciidoc#release-3-4-1, 3.4.1 changelog>>.
[[release-3-4-0]]
=== TinkerPop 3.4.0 (Release Date: January 2, 2019)
-This release also includes changes from <<release-3-3-4, 3.3.4>> and <<release-3-3-5, 3.3.5>>.
-
-* Changed Python "bindings" to use an actual `Bindings` object rather than a 2-tuple.
-* Improved the Gremlin.NET driver: It now uses request pipelining and its `ConnectionPool` has a fixed size.
-* Implemented `IndexStep` which allows to transform local collections into indexed collections or maps.
-* Made `valueMap()` aware of `by` and `with` modulators and deprecated `valueMap(boolean)` overloads.
-* Use `Compare.eq` in `Contains` predicates to ensure the same filter behavior for numeric values.
-* Added `OptionsStrategy` to allow traversals to take arbitrary traversal-wide configurations.
-* Added text predicates.
-* Added `BulkSet` as a GraphSON type with support in all language variants.
-* Added `ReferenceElementStrategy` to auto-detach elements to "reference" from a traversal.
-* Added initial release of the GraphBinary serialization format with Java support.
-* Allowed `ImportCustomizer` to accept fields.
-* Removed groovy-sql dependency.
-* Modified `Mutating` steps so that they are no longer marked as `final`.
-* Rewrote `ConnectiveStrategy` to support an arbitrary number of infix notations in a single traversal.
-* GraphSON `MessageSerializer` s will automatically register the GremlinServerModule to a provided GraphSONMapper.
-* Removed support for `-i` option in Gremlin Server which was previously deprecated.
-* Implemented `ShortestPathVertexProgram` and the `shortestPath()` step.
-* `AbstractGraphProvider` uses `g.io()` for loading test data.
-* Added the `io()` start step and `read()` and `write()` termination steps to the Gremlin language.
-* Added `GraphFeatures.supportsIoRead()` and `GraphFeatures.supportsIoWrite()`.
-* Deprecated `Graph.io()` and related infrastructure.
-* `GraphMLReader` better handles edge and vertex properties with the same name.
-* Maintained order of annotations in metrics returned from `profile()`-step.
-* Refactored `TypeTranslator` to be directly extensible for `ScriptTranslator` functions.
-* Bumped to Netty 4.1.25.
-* Bumped to Spark 2.4.0.
-* Bumped to Groovy 2.5.4.
-* Modified Gremlin Server to return a "host" status attribute on responses.
-* Added ability to the Java, .NET, Python and JavaScript drivers to retrieve status attributes returned from the server.
-* Modified Java and Gremlin.Net `ResponseException` to include status code and status attributes.
-* Modified Python `GremlinServerError` to include status attributes.
-* Modified the return type for `IGremlinClient.SubmitAsync()` to be a `ResultSet` rather than an `IReadOnlyCollection`.
-* Deprecated two `submit()`-related methods on the Java driver `Client` class.
-* Added `Client.submit()` overloads that accept per-request `RequestOptions`.
-* Added sparql-gremlin.
-* Fixed a bug in dynamic Gryo registration where registrations that did not have serializers would fail.
-* Moved `Parameterizing` interface to the `org.apache.tinkerpop.gremlin.process.traversal.step` package with other marker interfaces of its type.
-* Replaced `Parameterizing.addPropertyMutations()` with `Configuring.configure()`.
-* Changed interface hierarchy for `Parameterizing` and `Mutating` interfaces as they are tightly related.
-* Introduced the `with(k,v)` and `with(k)` step modulators which can supply configuration options to `Configuring` steps.
-* Added `OptionsStrategy` to allow traversals to take arbitrary traversal-wide configurations.
-* Introduced the `with(k,v)` and `with(k)` traveral source configuration options which can supply configuration options to the traversal.
-* Added `connectedComponent()` step and related `VertexProgram`.
-* Added `supportsUpsert()` option to `VertexFeatures` and `EdgeFeatures`.
-* `min()` and `max()` now support all types implementing `Comparable`.
-* Change the `toString()` of `Path` to be standardized as other graph elements are.
-* `hadoop-gremlin` no longer generates a test artifact.
-* Allowed `GraphProvider` to expose a cached `Graph.Feature` object so that the test suite could re-use them to speed test runs.
-* Fixed a bug in `ReducingBarrierStep`, that returned the provided seed value despite no elements being available.
-* Changed the order of `select()` scopes. The order is now: maps, side-effects, paths.
-* Moved `TraversalEngine` to `gremlin-test` as it has long been only used in testing infrastructure.
-* Nested loop support added allowing `repeat()` steps to be nested.
-* Events from `EventStrategy` raised from "new" mutations will now return a `KeyedVertexProperty` or `KeyedProperty` as is appropriate.
-* `MutationListener#vertexPropertyChanged(Vertex, VertexProperty, Object, Object...)` no longer has a default implementation.
-* Deprecated `GraphSONMessageSerializerV2d0` as it is now analogous to `GraphSONMessageSerializerGremlinV2d0`.
-* Moved previously deprecated `RemoteGraph` to `gremlin-test` as it is now just a testing component.
-* Removed previously deprecated `RemoteStrategy.instance()` and the strategy no longer has any connection to `RemoteGraph`.
-* Removed previously deprecated methods in `SubgraphStrategy` and `PartitionStrategy` builders.
-* Removed previously deprecated Credentials DSL infrastructure.
-* Removed previously deprecated `RemoteConnection#submit(Traversal)` and `RemoteConnection#submit(Bytecode)` methods.
-* Removed previously deprecated `MutationListener#vertexPropertyChanged(Vertex, Property, Object, Object...)`.
-* Removed previously deprecated `OpSelectorHandler` constructor.
-* Removed previously deprecated `close()` from `GremlinGroovyScriptEngine` which no longer implements `AutoCloseable`.
-* Removed previously deprecated `getGraphInputFormat()` and `getGraphOutputFormat()` from `HadoopConfiguration`.
-* Removed previously deprecated `AbstractOpProcessor#makeFrame()` method.
-* Removed previously deprecated `AuthenticationSettings.className` configuration option in Gremlin Server.
-* Removed previously deprecated `GraphManager` methods `getGraphs()` and `getTraversalSources()`.
-* Removed previously deprecated Gremlin Server setting for `serializedResponseTimeout`.
-* Removed previously deprecated Structure API exceptions related to "element not found" situations.
-* Removed previously deprecated `rebindings` options from the Java driver API.
-* Removed previously deprecated `LambdaCollectingBarrierStep.Consumers` enum.
-* Removed previously deprecated `HasContainer#makeHasContainers(String, P)`
-* Removed support for Giraph.
-* Removed previously deprecated JavaScript Driver property `traversers` of the `ResultSet`.
-* gremlin-python: use explicit Bindings object for python instead of a 2-tuple
-
-==== Bugs
-
-* TINKERPOP-1777 Gremlin .max step returns -2147483648 for empty result sets *(breaking)*
-* TINKERPOP-1869 Profile step and iterate do not play nicely with each other
-* TINKERPOP-1898 Issue with bindings in strategies and lambdas
-* TINKERPOP-1927 Gherkin scenario expects list with duplicates, but receives g:Set
-* TINKERPOP-1933 gremlin-python maximum recursion depth exceeded on large responses
-* TINKERPOP-1947 Path history isn't preserved for keys in mutations
-* TINKERPOP-1949 Formatting error on website
-* TINKERPOP-1958 TinkerGraphCountStrategy can return wrong counts
-* TINKERPOP-1961 Duplicate copies of images directory in docs
-* TINKERPOP-1962 GroovyTranslator doesn't handle empty maps
-* TINKERPOP-1963 Use of reducing step in choose()
-* TINKERPOP-1972 inject() tests are throwing exceptions in .NET GLV tests
-* TINKERPOP-1978 Check for Websocket connection state when retrieved from Connection Pool missing
-* TINKERPOP-1979 Several OLAP issues in MathStep
-* TINKERPOP-1988 minor error in documentation
-* TINKERPOP-1999 [Java][gremlin-driver] Query to a remote server via the websocket client hangs indefinitely if the server becomes unavailable
-* TINKERPOP-2005 Intermittent NullPointerException in response handling
-* TINKERPOP-2006 GraphML serialization invalid if a vertex and edge have similar named property
-* TINKERPOP-2009 Pick.any and Pick.none should be exposed in Gremlin-JavaScript
-* TINKERPOP-2021 Prevent maximum recursion depth failure
-* TINKERPOP-2028 AbstractGraphSONMessageSerializerV2d0 should register GremlinServerModule when mapper is provided
-* TINKERPOP-2029 ConcurrentModificationException for InlineFilterStrategy
-* TINKERPOP-2030 KeepAlive task executed for every Connection.write call
-* TINKERPOP-2032 Update jython-standalone
-* TINKERPOP-2044 Cannot reconnect to Azure cosmos host that becomes available again
-* TINKERPOP-2058 Contains predicates should rely on Compare predicates *(breaking)*
-* TINKERPOP-2081 PersistedOutputRDD materialises rdd lazily with Spark 2.x
-* TINKERPOP-2091 Wrong/Missing feature requirements in StructureStandardTestSuite
-* TINKERPOP-2094 Gremlin Driver Cluster Builder serializer method does not use mimeType as suggested
-* TINKERPOP-2095 GroupStep looks for irrelevant barrier steps
-* TINKERPOP-2096 gremlinpython: AttributeError when connection is closed before result is received
-* TINKERPOP-2100 coalesce() creating unexpected results when used with order()
-* TINKERPOP-2113 P.Within() doesn't work when given a List argument
-
-==== Improvements
-
-* TINKERPOP-550 Gremlin IO needs to support both OLTP and OLAP naturally.
-* TINKERPOP-967 Support nested-repeat() structures
-* TINKERPOP-1113 GraphComputer subclasses should support native methods
-* TINKERPOP-1143 Remove deprecated TraversalSource.Builder and TraversalEngine. *(breaking)*
-* TINKERPOP-1296 Remove deprecated serializedResponseTimeout from Gremlin Server *(breaking)*
-* TINKERPOP-1342 Allow setting scriptEvaluationTimeout in driver
-* TINKERPOP-1365 Log the seed used to initialize Random in tests
-* TINKERPOP-1410 mvn install -Dmaven.test.skip=true doesn't work on a clean machine *(breaking)*
-* TINKERPOP-1446 Add a StringFactory for Path which prefixes with type.
-* TINKERPOP-1447 Add some JavaScript intelligence to the documentation so that comments and output are not copied in a copy paste
-* TINKERPOP-1494 Means of exposing execution information from a result produced by RemoteConnection
-* TINKERPOP-1518 Provide a way for providers to expose static Graph.Features to tests
-* TINKERPOP-1522 Order of select() scopes *(breaking)*
-* TINKERPOP-1595 Go through TraversalVertexProgram with a profile and optimize.
-* TINKERPOP-1628 Implement TraversalSelectStep
-* TINKERPOP-1685 Introduce optional feature to allow for upserts without read-before-write
-* TINKERPOP-1705 Remove deprecated rebindings option *(breaking)*
-* TINKERPOP-1707 Remove deprecated AuthenticationSettings.className option *(breaking)*
-* TINKERPOP-1755 No docs for ReferenceElements
-* TINKERPOP-1769 Python graph[empty] string representation is confusing
-* TINKERPOP-1774 Gremlin .NET: Support min and max sizes in Connection pool
-* TINKERPOP-1775 Gremlin .NET: Implement a Connection write queue to support request pipelining
-* TINKERPOP-1778 Do not promote timedInterrupt option for Gremlin Server script processing
-* TINKERPOP-1780 Add authentication tests for gremlin-python
-* TINKERPOP-1831 Refactor EventStrategy *(breaking)*
-* TINKERPOP-1836 .NET sample project
-* TINKERPOP-1841 Include Python GLV tests on TravisCI
-* TINKERPOP-1849 Provide a way to fold() with an index
-* TINKERPOP-1864 Gremlin Python tests for GraphSON 2.0 and 3.0
-* TINKERPOP-1878 Sparql to Gremlin Compiler
-* TINKERPOP-1888 Extend max and min to all Comparable properties, not just Numbers *(breaking)*
-* TINKERPOP-1889 JavaScript GLV: Use heartbeat to prevent connection timeout
-* TINKERPOP-1897 Provide Docker images of Gremlin Server and Console
-* TINKERPOP-1906 Make ResponseException explorable
-* TINKERPOP-1912 Remove MD5 checksums
-* TINKERPOP-1913 Expose metadata from Gremlin Server to Clients
-* TINKERPOP-1930 Drop support for Giraph *(breaking)*
-* TINKERPOP-1934 Bump to latest version of httpclient
-* TINKERPOP-1936 Performance enhancement to Bytecode deserialization
-* TINKERPOP-1941 Remove deprecated Structure API exception methods *(breaking)*
-* TINKERPOP-1942 Binary serialization format
-* TINKERPOP-1945 Add support for extended GraphSon types to Gremlin.net
-* TINKERPOP-1946 Remove the deprecated Credentials DSL infrastructure *(breaking)*
-* TINKERPOP-1950 Traversal construction performance enhancements
-* TINKERPOP-1951 gremlin-server.bat doesn't support paths containing spaces
-* TINKERPOP-1953 Bump to Groovy 2.4.15
-* TINKERPOP-1954 Remove deprecated GraphManager methods *(breaking)*
-* TINKERPOP-1959 Provide a way to submit scripts to the server in gremlin-javascript
-* TINKERPOP-1967 Add a connectedComponent() step
-* TINKERPOP-1968 Refactor elements of Gremlin Server testing
-* TINKERPOP-1975 Introduce with() step modulator *(breaking)*
-* TINKERPOP-1976 Include Computer tests for GLVs
-* TINKERPOP-1977 Gremlin-JavaScript: Support SASL authentication
-* TINKERPOP-1984 Allow support for multiple serializer versions in Gremlin Server HTTP *(breaking)*
-* TINKERPOP-1985 Update position on bulk loading
-* TINKERPOP-1986 Remove deprecation from PartitionStrategy, SubgraphStrategy and GremlinScriptEngine *(breaking)*
-* TINKERPOP-1987 Bump to Netty 4.1.x
-* TINKERPOP-1989 Preserve order that plugins are applied in Gremlin Console
-* TINKERPOP-1990 Add a shortestPath() step
-* TINKERPOP-1993 Bump to Spark 2.3.1
-* TINKERPOP-1995 DriverRemoteConnection close() method returns undefined
-* TINKERPOP-1996 Introduce read() and write() steps
-* TINKERPOP-2002 Create a blog post explaining the value of using TinkerPop
-* TINKERPOP-2010 Generate jsdoc for gremlin-javascript
-* TINKERPOP-2011 Use NumberHelper on choose()
-* TINKERPOP-2012 Target .NET Standard 2.0 for Gremlin.Net
-* TINKERPOP-2013 Process tests that are auto-ignored stink
-* TINKERPOP-2015 Allow users to configure the WebSocket connections
-* TINKERPOP-2016 Upgrade Jackson FasterXML to 2.9.5 or later to fix security vulnerability
-* TINKERPOP-2017 Check for Column in by()
-* TINKERPOP-2018 Generate API docs for Gremlin.Net
-* TINKERPOP-2022 Cluster SSL should trust default ca certs by default
-* TINKERPOP-2023 Gremlin Server should not create self-signed certs *(breaking)*
-* TINKERPOP-2024 Gremlin Server Application archetype should connect via withRemote
-* TINKERPOP-2025 Change to SHA-256/512 and drop SHA-1 for releases
-* TINKERPOP-2026 Gremlin.Net.Driver should check ClientWebSocket.State before closing
-* TINKERPOP-2031 Remove support for -i in gremlin-server.sh *(breaking)*
-* TINKERPOP-2033 Maintain order of profile() annotations
-* TINKERPOP-2034 Register synchronizedMap() with Gryo
-* TINKERPOP-2037 Remove unused groovy-sql dependency
-* TINKERPOP-2038 Make groovy script cache size configurable
-* TINKERPOP-2039 Bump to Groovy 2.5.2 *(breaking)*
-* TINKERPOP-2040 Improve flexibility of GroovyTranslator to handle custom types
-* TINKERPOP-2041 Text Predicates
-* TINKERPOP-2045 Remove non-indy groovy dependencies
-* TINKERPOP-2049 Single argument with() overload
-* TINKERPOP-2050 Add a :bytecode command to Gremlin Console
-* TINKERPOP-2053 Provider OptionsStrategy for traversal configurations
-* TINKERPOP-2055 Provide support for special number cases like Infinity in GraphSON
-* TINKERPOP-2056 Use NumberHelper in Compare
-* TINKERPOP-2059 Modulation of valueMap() *(breaking)*
-* TINKERPOP-2060 Make Mutating steps non-final
-* TINKERPOP-2061 Add with() configuration as global to a traversal
-* TINKERPOP-2062 Add Traversal class to CoreImports
-* TINKERPOP-2064 Add status attributes to results for gremlin-javascript
-* TINKERPOP-2065 Optimize iterate() for remote traversals
-* TINKERPOP-2066 Bump to Groovy 2.5.3
-* TINKERPOP-2067 Allow getting raw data from Gremlin.Net.Driver.IGremlinClient
-* TINKERPOP-2068 Bump Jackson Databind 2.9.7
-* TINKERPOP-2069 Document configuration of Gremlin.Net
-* TINKERPOP-2070 gremlin-javascript: Introduce Connection representation
-* TINKERPOP-2071 gremlin-python: the graphson deserializer for g:Set should return a python set
-* TINKERPOP-2072 Refactor custom type translation for ScriptTranslators *(breaking)*
-* TINKERPOP-2073 Generate tabs for static code blocks
-* TINKERPOP-2074 Ensure that only NuGet packages for the current version are pushed
-* TINKERPOP-2075 Introduce ReferenceElementStrategy
-* TINKERPOP-2077 VertexProgram.Builder should have a default create() method with no Graph
-* TINKERPOP-2078 Hide use of EmptyGraph or RemoteGraph behind a more unified method for TraversalSource construction
-* TINKERPOP-2079 Move RemoteGraph to test package *(breaking)*
-* TINKERPOP-2084 For remote requests in console display the remote stack trace
-* TINKERPOP-2092 Deprecate default GraphSON serializer fields
-* TINKERPOP-2093 Bump to Groovy 2.5.4
-* TINKERPOP-2097 Create a DriverRemoteConnection with an initialized Client
-* TINKERPOP-2101 Support Spark 2.4
-* TINKERPOP-2103 Remove deprecated submit() options on RemoteConnection *(breaking)*
-* TINKERPOP-2104 Allow ImportCustomizer to handle fields
-* TINKERPOP-2106 When gremlin executes timeout, throw TimeoutException instead of TraversalInterruptedException/InterruptedIOException
-* TINKERPOP-2110 Allow Connection on Different Path (from /gremlin)
-* TINKERPOP-2111 Add BulkSet as a GraphSON type *(breaking)*
-* TINKERPOP-2114 Document common Gremlin anti-patterns
-* TINKERPOP-2116 Explicit Bindings object for Python *(breaking)*
-* TINKERPOP-2117 gremlin-python: Provide a better data structure for a Binding
-* TINKERPOP-2119 Validate C# code samples in docs
-* TINKERPOP-2121 Bump Jackson Databind 2.9.8
+Please see the archived <<./docs/archive/changelogs/changelog-3.4.x.asciidoc#release-3-4-0, 3.4.0 changelog>>.
== TinkerPop 3.3.0 (Gremlin Symphony #40 in G Minor)
@@ -2563,760 +785,62 @@
[[release-3-3-11]]
=== TinkerPop 3.3.11 (Release Date: June 1, 2020)
-* Added `trustStoreType` such that keystore and truststore can be of different types in the Java driver.
-* Added session support to all GLVs: Javascript, .NET and Python.
-* Fixed bug in Gremlin Server shutdown if failures occurred during `GraphManager` initialization.
-* Modified Gremlin Server to close the session when the channel itself is closed.
-* Fixed bug in `Order` where comparisons of `enum` types wouldn't compare with `String` values.
-* Added `maxWaitForClose` configuration option to the Java driver.
-* Deprecated `maxWaitForSessionClose` in the Java driver.
-* Bumped to Jackson 2.9.10.4.
-* Remove invalid service descriptors from gremlin-shaded.
-* Fixed bug in Python and .NET traversal `clone()` where deep copies of bytecode were not occurring.
-* Fixed bug where `profile()` was forcing `LazyBarrierStrategy` to add an extra `barrier()` to the end of traversals.
-* Fixed bug in Python about integer serializer which was out of range of `g:Int32`
-* Bumped commons-codec 1.14
-
-==== Bugs
-
-* TINKERPOP-2347 Remove invalid service descriptors from gremlin-shaded
-* TINKERPOP-2350 clone() is not deep copying Traversal internals
-* TINKERPOP-2351 Local Map ordering of keys can generate cast errors
-* TINKERPOP-2353 Error while Shutting Down Gremlin Server
-* TINKERPOP-2355 Jackson-databind version in Gremlin shaded dependency needs to be increased - introduces vulnerability issues
-* TINKERPOP-2360 failed to deserializer int32 when gremlin-python submit bytecode with a big int value
-* TINKERPOP-2365 LazyBarrierStrategy adds a NoOpBarrierStep when profile() is present
-
-==== Improvements
-
-* TINKERPOP-2336 Allow close of channel without having to wait for server
-* TINKERPOP-2339 Gremlin.Net: Update System.Net.WebSockets.Client dependency
-* TINKERPOP-2354 Document recommendation to reuse graph traversal source
+Please see the archived <<./docs/archive/changelogs/changelog-3.3.x.asciidoc#release-3-3-11, 3.3.11 changelog>>.
[[release-3-3-10]]
=== TinkerPop 3.3.10 (Release Date: February 3, 2020)
-* Improved error messaging for a `Cluster` with a bad `Channelizer` configuration in the Java driver.
-* Made `Cluster` be able to open configuration file on resources directory.
-* Implemented `Traversal.clone()` operations for all language variants.
-* Refactored `PathProcessorStrategy` to use the marker model.
-* Bumped to Tornado 5.x for gremlin-python.
-* Started keep-alive polling on `Connection` construction to ensure that a `Connection` doesn't die in the pool.
-* Deprecated `TraversalStrategies.applyStrategies()`.
-* Deprecated Jython support in `gremlin-python`.
-* Deprecated `NioChannelizer` and related classes in `gremlin-driver` and `gremlin-server`.
-* Fixed a bug in the `ClassCacheRequestCount` metric for `GremlinGroovyScriptEngine` which wasn't including the cache hit count, only the misses.
-* Improved Gremlin Server executor thread handling on client close requests.
-* Reverted: Modified Java driver to use IP address rather than hostname to create connections.
-* Allow custom XMLInputFactory to be used with GraphMLReader.
-
-==== Bugs
-
-* TINKERPOP-2175 Executor thread is not returned on channel close
-* TINKERPOP-2266 Keep alive not started at connection creation
-* TINKERPOP-2274 Test of TinkerGraph Gremlin fail on Windows and non EN locale
-* TINKERPOP-2332 JavaScript GLV: structure element toString() should internally call toString()
-* TINKERPOP-2333 JavaScript GLV: GraphSON2/3 Edge deserialization is invalid
-
-==== Improvements
-
-* TINKERPOP-2307 Add better error message for badly configured Channelizer
-* TINKERPOP-2309 Bump gremlinpython to Tornado 5.x
-* TINKERPOP-2315 Implement some form of clone() or reset() for Traversal in GLVs
-* TINKERPOP-2320 [SECURITY] XMLInputFactory initialization in GraphMLReader introduces
-* TINKERPOP-2322 Deprecate Jython support
-* TINKERPOP-2324 Deprecate the raw NIO support in the Java driver
-* TINKERPOP-2329 JavaScript GLV: Update websocket library dependency
-* TINKERPOP-2330 JavaScript GLV should expose GraphSON2Writer and GraphSONReader
+Please see the archived <<./docs/archive/changelogs/changelog-3.3.x.asciidoc#release-3-3-10, 3.3.10 changelog>>.
[[release-3-3-9]]
=== TinkerPop 3.3.9 (Release Date: October 14, 2019)
-* Exposed response status attributes in a `ResponseError` in gremlin-javascript.
-* Added `ImmutableExplanation` for a `TraversalExplanation` that just contains data.
-* Added support for `UnaryOperator` and `BinaryOperator` for `Lambda` instances.
-* Fixed `TraversalExplanation` deserialization in GraphSON 2 and 3 which was not supported before in Java.
-* Added support for custom request headers in Python.
-* Fixed Java DSL annotation for generation of `addE()` which was formerly calling the wrong step.
-* Deprecated `scriptEvaluationTimeout` in favor of the more generic `evaluationTimeout`.
-* Bumped jackson-databind to 2.9.10 due to CVE-2019-14379, CVE-2019-14540, CVE-2019-16335.
-* Added `ReservedKeysVerificationStrategy` to allow warnings or exceptions when certain keys are used for properties.
-* Added the `AbstractWarningVerificationStrategy` base class for "warning" style `VerificationStrategy` implementations.
-* Refactored `EdgeLabelVerificationStrategy` to use `AbstractWarningVerificationStrategy`.
-* Added `EdgeLabelVerificationStrategy` to Python.
-* Improved handling of `null` values in bytecode construction.
-* Fixed Java driver authentication problems when calling the driver from multiple threads.
-* Modified Java driver to use IP address rather than hostname to create connections.
-* Fixed potential for `NullPointerException` with empty identifiers in `GraphStep`.
-* Postponed the timing of transport creation to `connection.write` in Gremlin Python.
-* Made `EventStrategy` compatible with multi-valued properties.
-* Changed `TraversalOpProcessor` to throw a `SERVER_ERROR_SCRIPT_EVALUATION` (597) if lambdas don't compile.
-* Bumped `commons-compress` to 1.19 due to CVE-2018-11771.
-* gremlin-javascript: Use `socketError` Connection event to prevent exit on error and expose Connection events.
-
-==== Bugs
-
-* TINKERPOP-2159 EventStrategy doesn't handle multi-valued properties
-* TINKERPOP-2283 GraphStep's ids null exception
-* TINKERPOP-2285 Error object is unreachable
-* TINKERPOP-2289 Use address instead of hostname for connection
-* TINKERPOP-2290 Javascript GLV connection refused error handling
-* TINKERPOP-2291 TraversalExplanation deserialization in GraphSON
-* TINKERPOP-2298 Bytecode.java flattenArguments throw exception when null
-* TINKERPOP-2303 GremlinDsl generate addV instead of addE
-
-==== Improvements
-
-* TINKERPOP-1810 Add Lambda.binaryOperator and Lambda.unaryOperator
-* TINKERPOP-1838 Python sample script
-* TINKERPOP-2046 Gremlin-Python: Support custom request headers in WebSocket request
-* TINKERPOP-2213 Replace scriptEvaluationTimeout in favor of something more suitable to bytecode
-* TINKERPOP-2275 Update jackson databind 2.9.9.3+
-* TINKERPOP-2277 Python sdk postpone the timing to create transport
-* TINKERPOP-2280 Prevent use of T values as property key overloads
+Please see the archived <<./docs/archive/changelogs/changelog-3.3.x.asciidoc#release-3-3-9, 3.3.9 changelog>>.
[[release-3-3-8]]
=== TinkerPop 3.3.8 (Release Date: August 5, 2019)
-* Provided support for `withComputer()` in gremlin-javascript.
-* Deprecated remote traversal side-effect retrieval and related infrastructure.
-* Bumped to Groovy 2.4.17.
-* Bumped to Jackson Databind 2.9.9.1.
-* Fixed bug with Python in `g:Date` of GraphSON where local time zone was being used during serialization/deserialization.
-* Improved error messaging when an attempt is made to serialize multi-properties to GraphML.
-* Deprecated multi/meta-property support in `Neo4jGraph`.
-* Improved exception and messaging for gt/gte/lt/lte when one of the object isn't a `Comparable`.
-* Added test infrastructure to check for storage iterator leak.
-* Fixed multiple iterator leaks in query processor.
-* Fixed `optional()` so that the child traversal is treated as local.
-* Changed default keep-alive time for driver to 3 minutes.
-* Fixed bug where server-side keep-alive was not always disabled when its setting was zero.
-* Added support for `hasNext()` in Javascript and .NET.
-* Improved error messaging for invalid inputs to the TinkerGraph `IdManager` instances.
-* Forced replacement of connections in Java driver for certain exception types that seem to ultimately kill the connection.
-* Changed the `reverse()` of `desc` and `asc` on `Order` to not use the deprecated `decr` and `incr`.
-* Fixed bug in `MatchStep` where the correct was not properly determined.
-* Fixed bug where client/server exception mismatch when server throw StackOverflowError
-* Added underscore suffixed steps and tokens in Gremlin-Python that conflict with global function names.
-* Prevent exception when closing a session that doesn't exist.
-* Allow predicates and traversals to be used as options in `BranchStep`.
-* Ensure only a single final response is sent to the client with Gremlin Server.
-* Deprecated `ResponseHandlerContext` with related infrastructure and folded its functionality into `Context` in Gremlin Server.
-* Improved performance of `aggregate()` by avoiding excessive calls to `hasNext()` when the barrier is empty.
-
-==== Bugs
-
-* TINKERPOP-1619 TinkerGraphComputer worker count affects OptionalStep query results
-* TINKERPOP-2224 Detect and fix resource leak
-* TINKERPOP-2230 match() step unexpected behaviours
-* TINKERPOP-2232 RemoteStrategy does not call parent class TraversalStrategy __init__
-* TINKERPOP-2238 Fix remaining iterator leaks marked by @IgnoreIteratorLeak
-* TINKERPOP-2241 Client exception don't match Server exception when server throw StackOverflowError
-* TINKERPOP-2248 Instability of driver for blocked requests
-* TINKERPOP-2264 Gremlin Python should deserialize g:Date to UTC
-
-==== Improvements
-
-* TINKERPOP-1084 Branch option tokens should be allowed to be traversals.
-* TINKERPOP-1921 Support hasNext terminal step in GLVs
-* TINKERPOP-2020 Support withComputer() for javascript
-* TINKERPOP-2223 Update jackson databind to 2.9.9
-* TINKERPOP-2236 Improve error messaging for TinkerGraph IdManagers that fail on conversions
-* TINKERPOP-2237 Prevent error when closing sessions that don't exist *(breaking)*
-* TINKERPOP-2246 Consolidate the error propagation to the client
-* TINKERPOP-2256 processAllStarts of AggregateStep should only be called when barrier is empty
-* TINKERPOP-2260 Update jackson databind 2.9.9.1
-* TINKERPOP-2265 Deprecate Traversal.getSideEffects() functionality for remoting purposes
-* TINKERPOP-2270 Deprecate multi/metaproperty support in Neo4j
-* TINKERPOP-2272 Rename steps and tokens that conflict with standard python functions
+Please see the archived <<./docs/archive/changelogs/changelog-3.3.x.asciidoc#release-3-3-8, 3.3.8 changelog>>.
[[release-3-3-7]]
=== TinkerPop 3.3.7 (Release Date: May 28, 2019)
-* Developed DSL pattern for gremlin-javascript.
-* Generated uberjar artifact for Gremlin Console.
-* Improved folding of `property()` step into related mutating steps.
-* Added `inject()` to steps generated on the DSL `TraversalSource`.
-* Removed `gperfutils` dependencies from Gremlin Console.
-* Fixed `PartitionStrategy` when setting vertex label and having `includeMetaProperties` configured to `true`.
-* Ensure `gremlin.sh` works when directories contain spaces.
-* Prevented client-side hangs if metadata generation fails on the server.
-* Fixed bug with `EventStrategy` in relation to `addE()` where detachment was not happening properly.
-* Ensured that `gremlin.sh` works when directories contain spaces.
-* Fixed bug in detachment of `Path` where embedded collection objects would prevent that process.
-* Enabled `ctrl+c` to interrupt long running processes in Gremlin Console.
-* Quieted "host unavailable" warnings for both the driver and Gremlin Console.
-* Fixed construction of `g:List` from arrays in gremlin-javascript.
-* Fixed bug in `GremlinGroovyScriptEngine` interpreter mode around class definitions.
-* Implemented `EdgeLabelVerificationStrategy`.
-* Fixed behavior of `P` for `within()` and `without()` in GLVs to be consistent with Java when using varargs.
-* Cleared the input buffer after exceptions in Gremlin Console.
-* Added parameter to configure the `processor` in the gremlin-javascript `client` constructor.
-* Bumped `Netty` to 4.1.32.
-
-==== Bugs
-
-* TINKERPOP-2112 Folding in property() step is not being optimally performed
-* TINKERPOP-2180 gremlin.sh doesn't work when directories contain spaces
-* TINKERPOP-2183 InterpreterModeASTTransformation needs to be more specific about what it transforms
-* TINKERPOP-2194 Enforcing an order on properties in one test method of ChooseTest
-* TINKERPOP-2196 PartitionStrategy with includeMetaProperties(true) can't add labeled vertex
-* TINKERPOP-2198 Documentation for Store contradicts itself
-* TINKERPOP-2199 within step does not work with more than two parameters with python
-* TINKERPOP-2200 AddEdgeStartStep used DetachedFactory.detach instead of EventStrategy.detach
-* TINKERPOP-2204 Client receives no response on failed request
-* TINKERPOP-2206 Certain types in javascript don't appear to serialize with a GraphSON type
-* TINKERPOP-2212 Path is not detaching properly under certain conditions
-
-==== Improvements
-
-* TINKERPOP-2089 Javascript DSL support
-* TINKERPOP-2179 Have o.a.t.g.driver.ser.SerializationException extend IOException
-* TINKERPOP-2181 Allow ctrl+c to break out of a long running process in Gremlin Console
-* TINKERPOP-2182 Remove gperfutils from Gremlin Console *(breaking)*
-* TINKERPOP-2191 Implement EdgeLabelVerificationStrategy
-* TINKERPOP-2211 Provide API to add per request option for a bytecode
+Please see the archived <<./docs/archive/changelogs/changelog-3.3.x.asciidoc#release-3-3-7, 3.3.7 changelog>>.
[[release-3-3-6]]
=== TinkerPop 3.3.6 (Release Date: March 18, 2019)
-* Docker images use user `gremlin` instead of `root`
-* Added a new `ResponseStatusCode` for client-side serialization errors.
-* Refactored use of `commons-lang` to use `common-lang3` only, though dependencies may still use `commons-lang`.
-* Bumped `commons-lang3` to 3.8.1.
-* Improved handling of client-side serialization errors that were formerly just being logged rather than being raised.
-* Add Python `TraversalMetrics` and `Metrics` deserializers.
-* Masked sensitive configuration options in the logs of `KryoShimServiceLoader`.
-* Added `globalFunctionCacheEnabled` to the `GroovyCompilerGremlinPlugin` to allow that cache to be disabled.
-* Added `globalFunctionCacheEnabled` override to `SessionOpProcessor` configuration.
-* Added status code to `GremlinServerError` so that it would be more directly accessible during failures.
-* Added GraphSON serialization support for `Duration`, `Char`, `ByteBuffer`, `Byte`, `BigInteger` and `BigDecimal` in `gremlin-python`.
-* Added `ProfilingAware` interface to allow steps to be notified that `profile()` was being called.
-* Fixed bug where `profile()` could produce negative timings when `group()` contained a reducing barrier.
-* Improved logic determining the dead or alive state of a Java driver `Connection`.
-* Improved handling of dead connections and the availability of hosts.
-* Bumped `httpclient` to 4.5.7.
-* Bumped `slf4j` to 1.7.25.
-* Bumped `commons-codec` to 1.12.
-* Bumped to Groovy 2.5.6.
-* Bumped to Hadoop 2.7.7.
-* Fixed partial response failures when using authentication in `gremlin-python`.
-* Fixed concurrency issues in `TraverserSet.toString()` and `ObjectWritable.toString()`.
-* Fixed a bug in `InlineFilterStrategy` that mixed up and's and or's when folding merging conditions together.
-* Fixed a bug in `PartitionStrategy` where `addE()` as a start step was not applying the partition.
-* Improved handling of failing `Authenticator` instances thus improving server responses to drivers.
-* Improved performance of `JavaTranslator` by reducing calls to `Method.getParameters()`.
-* Implemented `EarlyLimitStrategy` which is supposed to significantly reduce backend operations for queries that use `range()`.
-* Reduced chance of hash collisions in `Bytecode` and its inner classes.
-* Added `Symbol.asyncIterator` member to the `Traversal` class to provide support for `await ... of` loops (async iterables).
-
-==== Bugs
-
-* TINKERPOP-2081 PersistedOutputRDD materialises rdd lazily with Spark 2.x
-* TINKERPOP-2091 Wrong/Missing feature requirements in StructureStandardTestSuite
-* TINKERPOP-2094 Gremlin Driver Cluster Builder serializer method does not use mimeType as suggested
-* TINKERPOP-2095 GroupStep looks for irrelevant barrier steps
-* TINKERPOP-2096 gremlinpython: AttributeError when connection is closed before result is received
-* TINKERPOP-2100 coalesce() creating unexpected results when used with order()
-* TINKERPOP-2105 Gremlin-Python connection not returned back to the pool on exception from gremlin server
-* TINKERPOP-2113 P.Within() doesn't work when given a List argument
-
-==== Improvements
-
-* TINKERPOP-1889 JavaScript GLV: Use heartbeat to prevent connection timeout
-* TINKERPOP-2010 Generate jsdoc for gremlin-javascript
-* TINKERPOP-2013 Process tests that are auto-ignored stink
-* TINKERPOP-2018 Generate API docs for Gremlin.Net
-* TINKERPOP-2038 Make groovy script cache size configurable
-* TINKERPOP-2050 Add a :bytecode command to Gremlin Console
-* TINKERPOP-2062 Add Traversal class to CoreImports
-* TINKERPOP-2065 Optimize iterate() for remote traversals
-* TINKERPOP-2067 Allow getting raw data from Gremlin.Net.Driver.IGremlinClient
-* TINKERPOP-2068 Bump Jackson Databind 2.9.7
-* TINKERPOP-2069 Document configuration of Gremlin.Net
-* TINKERPOP-2070 gremlin-javascript: Introduce Connection representation
-* TINKERPOP-2071 gremlin-python: the graphson deserializer for g:Set should return a python set
-* TINKERPOP-2073 Generate tabs for static code blocks
-* TINKERPOP-2074 Ensure that only NuGet packages for the current version are pushed
-* TINKERPOP-2077 VertexProgram.Builder should have a default create() method with no Graph
-* TINKERPOP-2078 Hide use of EmptyGraph or RemoteGraph behind a more unified method for TraversalSource construction
-* TINKERPOP-2084 For remote requests in console display the remote stack trace
-* TINKERPOP-2092 Deprecate default GraphSON serializer fields
-* TINKERPOP-2097 Create a DriverRemoteConnection with an initialized Client
-* TINKERPOP-2102 Deprecate static fields on TraversalSource related to remoting
-* TINKERPOP-2106 When gremlin executes timeout, throw TimeoutException instead of TraversalInterruptedException/InterruptedIOException
-* TINKERPOP-2110 Allow Connection on Different Path (from /gremlin)
-* TINKERPOP-2114 Document common Gremlin anti-patterns
-* TINKERPOP-2118 Bump to Groovy 2.4.16
-* TINKERPOP-2121 Bump Jackson Databind 2.9.8
+Please see the archived <<./docs/archive/changelogs/changelog-3.3.x.asciidoc#release-3-3-6, 3.3.6 changelog>>.
[[release-3-3-5]]
=== TinkerPop 3.3.5 (Release Date: January 2, 2019)
-This release also includes changes from <<release-3-2-11, 3.2.11>>.
-
-* Fixed and/or folding in `InlineFilterStrategy`.
-* Fixed configuration and serialization of `SubgraphStrategy` which was missing the `checkAdjacentVertices` flag.
-* Captured `TraversalInterruptionException` and converted to `TimeoutException` for `GremlinExecutor`.
-* Fixed a bug in `CoalesceStep` which squared the bulk if the step followed a `Barrier` step.
-* Fixed a bug in `GroupStep` that assigned wrong reducing bi-operators
-* Added `:bytecode` command to help developers debugging `Bytecode`-based traversals.
-* Added option to set the path for the URI on the Java driver.
-* Fixed `PersistedOutputRDD` to eager persist RDD by adding `count()` action calls.
-* Deserialized `g:Set` to a Python `Set` in GraphSON in `gremlin-python`.
-* Deprecated `StarGraph.builder()` and `StarGraph.Builder.build()` in favor of the more common "builder" patterns of `build()` and `create()` respectively.
-* Deprecated `Serializers.DEFAULT_RESULT_SERIALIZER` and `DEFAULT_REQUEST_SERIALIZER`.
-* Deprecated `TraversalSource#GREMLIN_REMOTE` and `TraversalSource#GREMLIN_REMOTE_CONNECTION_CLASS` moving them to `RemoteConnection`.
-* Fixed the setting of the default label for a `ReferenceVertex` when the original vertex was of type `ComputerAdjacentVertex`.
-* Changed Java driver to expect a generic `RemoteTraverser` object rather than the specific `DefaultRemoteTraverser`.
-* Better handled server disconnect condition for the `gremlin-python` driver by throwing a clear exception.
-* Display the remote stack trace in the Gremlin Console when scripts sent to the server fail.
-* Added `AnonymousTraversalSource` which provides a more unified means of constructing a `TraversalSource`.
-* Added `DriverRemoteConnection.using(Client)` to provide users better control over the number of connections being created.
-* Changed behavior of GraphSON deserializer in gremlin-python such that `g:Set` returns a Python `Set`.
-* Bumped to Groovy 2.4.16.
-* Fixed bug that prevented `TraversalExplanation` from serializing properly with GraphSON.
-* Changed behavior of `iterate()` in Python, Javascript and .NET to send `none()` thus avoiding unnecessary results being returned.
-* Provided for a configurable class map cache in the `GremlinGroovyScriptEngine` and exposed that in Gremlin Server.
-* `GraphProvider` instances can be annotated with `OptOut` configurations that will be applied in addition to the `OptOut` instances on a `Graph`.
-
-==== Bugs
-
-* TINKERPOP-2081 PersistedOutputRDD materialises rdd lazily with Spark 2.x
-* TINKERPOP-2091 Wrong/Missing feature requirements in StructureStandardTestSuite
-* TINKERPOP-2094 Gremlin Driver Cluster Builder serializer method does not use mimeType as suggested
-* TINKERPOP-2095 GroupStep looks for irrelevant barrier steps
-* TINKERPOP-2096 gremlinpython: AttributeError when connection is closed before result is received
-* TINKERPOP-2100 coalesce() creating unexpected results when used with order()
-* TINKERPOP-2113 P.Within() doesn't work when given a List argument
-
-==== Improvements
-
-* TINKERPOP-1889 JavaScript GLV: Use heartbeat to prevent connection timeout
-* TINKERPOP-2010 Generate jsdoc for gremlin-javascript
-* TINKERPOP-2013 Process tests that are auto-ignored stink
-* TINKERPOP-2018 Generate API docs for Gremlin.Net
-* TINKERPOP-2038 Make groovy script cache size configurable
-* TINKERPOP-2050 Add a :bytecode command to Gremlin Console
-* TINKERPOP-2062 Add Traversal class to CoreImports
-* TINKERPOP-2065 Optimize iterate() for remote traversals
-* TINKERPOP-2067 Allow getting raw data from Gremlin.Net.Driver.IGremlinClient
-* TINKERPOP-2069 Document configuration of Gremlin.Net
-* TINKERPOP-2070 gremlin-javascript: Introduce Connection representation
-* TINKERPOP-2071 gremlin-python: the graphson deserializer for g:Set should return a python set
-* TINKERPOP-2073 Generate tabs for static code blocks
-* TINKERPOP-2074 Ensure that only NuGet packages for the current version are pushed
-* TINKERPOP-2077 VertexProgram.Builder should have a default create() method with no Graph
-* TINKERPOP-2078 Hide use of EmptyGraph or RemoteGraph behind a more unified method for TraversalSource construction
-* TINKERPOP-2084 For remote requests in console display the remote stack trace
-* TINKERPOP-2092 Deprecate default GraphSON serializer fields
-* TINKERPOP-2097 Create a DriverRemoteConnection with an initialized Client
-* TINKERPOP-2102 Deprecate static fields on TraversalSource related to remoting
-* TINKERPOP-2106 When gremlin executes timeout, throw TimeoutException instead of TraversalInterruptedException/InterruptedIOException
-* TINKERPOP-2110 Allow Connection on Different Path (from /gremlin)
-* TINKERPOP-2114 Document common Gremlin anti-patterns
-* TINKERPOP-2118 Bump to Groovy 2.4.16
-* TINKERPOP-2121 Bump Jackson Databind 2.9.8
+Please see the archived <<./docs/archive/changelogs/changelog-3.3.x.asciidoc#release-3-3-5, 3.3.5 changelog>>.
[[release-3-3-4]]
=== TinkerPop 3.3.4 (Release Date: October 15, 2018)
-This release also includes changes from <<release-3-2-10, 3.2.10>>.
-
-* Added synchronized `Map` to Gryo 3.0 registrations.
-* Removed `timedInterrupt` from documentation as a way to timeout.
-* Deprecated `Order` for `incr` and `decr` in favor of `asc` and `desc`.
-* Fixed bug in `math()` for OLAP where `ComputerVerificationStrategy` was incorrectly detecting path label access and preventing execution.
-
-==== Bugs
-
-* TINKERPOP-1898 Issue with bindings in strategies and lambdas
-* TINKERPOP-1933 gremlin-python maximum recursion depth exceeded on large responses
-* TINKERPOP-1958 TinkerGraphCountStrategy can return wrong counts
-* TINKERPOP-1961 Duplicate copies of images directory in docs
-* TINKERPOP-1962 GroovyTranslator doesn't handle empty maps
-* TINKERPOP-1963 Use of reducing step in choose()
-* TINKERPOP-1972 inject() tests are throwing exceptions in .NET GLV tests
-* TINKERPOP-1978 Check for Websocket connection state when retrieved from Connection Pool missing
-* TINKERPOP-1979 Several OLAP issues in MathStep
-* TINKERPOP-1988 minor error in documentation
-* TINKERPOP-1999 [Java][gremlin-driver] Query to a remote server via the websocket client hangs indefinitely if the server becomes unavailable
-* TINKERPOP-2005 Intermittent NullPointerException in response handling
-* TINKERPOP-2009 Pick.any and Pick.none should be exposed in Gremlin-JavaScript
-* TINKERPOP-2021 Prevent maximum recursion depth failure
-* TINKERPOP-2030 KeepAlive task executed for every Connection.write call
-* TINKERPOP-2032 Update jython-standalone
-* TINKERPOP-2044 Cannot reconnect to Azure cosmos host that becomes available again
-
-==== Improvements
-
-* TINKERPOP-1113 GraphComputer subclasses should support native methods
-* TINKERPOP-1365 Log the seed used to initialize Random in tests
-* TINKERPOP-1447 Add some JavaScript intelligence to the documentation so that comments and output are not copied in a copy paste
-* TINKERPOP-1595 Go through TraversalVertexProgram with a profile and optimize.
-* TINKERPOP-1778 Do not promote timedInterrupt option for Gremlin Server script processing
-* TINKERPOP-1780 Add authentication tests for gremlin-python
-* TINKERPOP-1836 .NET sample project
-* TINKERPOP-1841 Include Python GLV tests on TravisCI
-* TINKERPOP-1864 Gremlin Python tests for GraphSON 2.0 and 3.0
-* TINKERPOP-1897 Provide Docker images of Gremlin Server and Console
-* TINKERPOP-1945 Add support for extended GraphSon types to Gremlin.net
-* TINKERPOP-1951 gremlin-server.bat doesn't support paths containing spaces
-* TINKERPOP-1956 Deprecate Order incr/decr for asc/desc
-* TINKERPOP-1959 Provide a way to submit scripts to the server in gremlin-javascript
-* TINKERPOP-1968 Refactor elements of Gremlin Server testing
-* TINKERPOP-1976 Include Computer tests for GLVs
-* TINKERPOP-1977 Gremlin-JavaScript: Support SASL authentication
-* TINKERPOP-1985 Update position on bulk loading
-* TINKERPOP-1989 Preserve order that plugins are applied in Gremlin Console
-* TINKERPOP-1995 DriverRemoteConnection close() method returns undefined
-* TINKERPOP-2011 Use NumberHelper on choose()
-* TINKERPOP-2012 Target .NET Standard 2.0 for Gremlin.Net
-* TINKERPOP-2015 Allow users to configure the WebSocket connections
-* TINKERPOP-2016 Upgrade Jackson FasterXML to 2.9.5 or later to fix security vulnerability
-* TINKERPOP-2017 Check for Column in by()
-* TINKERPOP-2022 Cluster SSL should trust default ca certs by default
-* TINKERPOP-2023 Gremlin Server should not create self-signed certs *(breaking)*
-* TINKERPOP-2024 Gremlin Server Application archetype should connect via withRemote
-* TINKERPOP-2025 Change to SHA-256/512 and drop SHA-1 for releases
-* TINKERPOP-2026 Gremlin.Net.Driver should check ClientWebSocket.State before closing
-* TINKERPOP-2034 Register synchronizedMap() with Gryo
-* TINKERPOP-2035 Gremlin-JavaScript: Pass custom headers to the websocket connection
-* TINKERPOP-2040 Improve flexibility of GroovyTranslator to handle custom types
-* TINKERPOP-2045 Remove non-indy groovy dependencies
-* TINKERPOP-2055 Provide support for special number cases like Infinity in GraphSON
-* TINKERPOP-2056 Use NumberHelper in Compare
+Please see the archived <<./docs/archive/changelogs/changelog-3.3.x.asciidoc#release-3-3-4, 3.3.4 changelog>>.
[[release-3-3-3]]
=== TinkerPop 3.3.3 (Release Date: May 8, 2018)
-This release also includes changes from <<release-3-2-9, 3.2.9>>.
-
-* Implemented `TraversalSelectStep` which allows to `select()` runtime-generated keys.
-* Coerced `BulkSet` to `g:List` in GraphSON 3.0.
-* Deprecated `CredentialsGraph` DSL in favor of `CredentialsTraversalDsl` which uses the recommended method for Gremlin DSL development.
-* Allowed `iterate()` to be called after `profile()`.
-
-==== Bugs
-
-* TINKERPOP-1869 Profile step and iterate do not play nicely with each other
-* TINKERPOP-1927 Gherkin scenario expects list with duplicates, but receives g:Set
-* TINKERPOP-1947 Path history isn't preserved for keys in mutations
-
-==== Improvements
-
-* TINKERPOP-1628 Implement TraversalSelectStep
-* TINKERPOP-1755 No docs for ReferenceElements
-* TINKERPOP-1903 Credentials DSL should use the Java annotation processor
-* TINKERPOP-1912 Remove MD5 checksums
-* TINKERPOP-1934 Bump to latest version of httpclient
-* TINKERPOP-1936 Performance enhancement to Bytecode deserialization
-* TINKERPOP-1943 JavaScript GLV: Support GraphSON3
-* TINKERPOP-1944 JavaScript GLV: DriverRemoteConnection is not exported in the root module
-* TINKERPOP-1950 Traversal construction performance enhancements
-* TINKERPOP-1953 Bump to Groovy 2.4.15
+Please see the archived <<./docs/archive/changelogs/changelog-3.3.x.asciidoc#release-3-3-3, 3.3.3 changelog>>.
[[release-3-3-2]]
=== TinkerPop 3.3.2 (Release Date: April 2, 2018)
-This release also includes changes from <<release-3-2-8, 3.2.8>>.
-
-* Fixed regression issue where the HTTPChannelizer doesn't instantiate the specified AuthenticationHandler.
-* Defaulted GLV tests for gremlin-python to run for GraphSON 3.0.
-* Fixed a bug with `Tree` serialization in GraphSON 3.0.
-* In gremlin-python, the GraphSON 3.0 `g:Set` type is now deserialized to `List`.
-
-==== Bugs
-
-* TINKERPOP-1053 installed plugins are placed in a directory relative to where gremlin.sh is started
-* TINKERPOP-1509 Failing test case for tree serialization
-* TINKERPOP-1738 Proper functioning of GraphSONReader depends on order of elements in String representation
-* TINKERPOP-1758 RemoteStrategy should be before all other DecorationStrategies.
-* TINKERPOP-1855 Update Rexster links
-* TINKERPOP-1858 HttpChannelizer regression: Does not create specified AuthenticationHandler
-* TINKERPOP-1859 Complex instance of P not serializing to bytecode properly
-* TINKERPOP-1860 valueMap(True) result in error in gremlin-python
-* TINKERPOP-1862 TinkerGraph VertexProgram message passing doesn't work properly when using Direction.BOTH
-* TINKERPOP-1867 union() can produce extra traversers
-* TINKERPOP-1872 Apply edgeFunction in SparkMessenger
-* TINKERPOP-1873 min() and max() work only in the range of Integer values
-* TINKERPOP-1874 P does not appear to be serialized consistently in GraphSON
-* TINKERPOP-1875 Gremlin-Python only aggregates to list when using GraphSON3
-* TINKERPOP-1879 Gremlin Console does not resepect equal sign for flag argument assignments
-* TINKERPOP-1880 Gremlin.NET Strong name signature could not be verified. (HRESULT: 0x80131045)
-* TINKERPOP-1883 gremlinpython future will never return
-* TINKERPOP-1890 getAnonymousTraversalClass() is not being generated for Java DSLs
-* TINKERPOP-1891 Serialization of P.not() for gremlin-javascript
-* TINKERPOP-1892 GLV test failures for .NET
-* TINKERPOP-1894 GraphSONMessageSerializerV2d0 fails to deserialize valid P.not()
-* TINKERPOP-1896 gremlin-python lambdas error
-* TINKERPOP-1907 Fix failing GLV test for withSack() in .NET
-* TINKERPOP-1917 gx:BigDecimal serialization broken in Gremlin.Net on systems with ',' as decimal separator
-* TINKERPOP-1918 Scenarios fail because of wrong numerical types
-* TINKERPOP-1919 Gherkin runner doesn't work with P.And() and P.Or() in Gremlin.Net
-* TINKERPOP-1920 Tests fail because P.Within() arguments are wrapped in an array in Gremlin.Net
-* TINKERPOP-1922 Gherkin features fail that contain P.not() in Gremlin.Net
-
-==== Improvements
-
-* TINKERPOP-1357 Centrality Recipes should mention pageRank and OLAP.
-* TINKERPOP-1489 Provide a Javascript Gremlin Language Variant
-* TINKERPOP-1586 SubgraphStrategy in OLAP
-* TINKERPOP-1726 Support WebSockets ping/pong keep-alive in Gremlin server
-* TINKERPOP-1842 iterate() missing in terminal steps documentation
-* TINKERPOP-1844 Python GLV test should run for GraphSON 3.0 *(breaking)*
-* TINKERPOP-1850 Range step has undocumented special values
-* TINKERPOP-1854 Support lambdas in Gremlin.Net
-* TINKERPOP-1857 GLV test suite consistency and completeness
-* TINKERPOP-1863 Delaying the setting of requestId till the RequestMessage instantiation time
-* TINKERPOP-1865 Run Gremlin .NET GLV tests with GraphSON 3.0
-* TINKERPOP-1866 Support g:T for .NET
-* TINKERPOP-1868 Support inject source step in Gremlin.Net
-* TINKERPOP-1870 n^2 synchronious operation in OLAP WorkerExecutor.execute() method
-* TINKERPOP-1871 Exception handling is slow in element ReferenceElement creation
-* TINKERPOP-1877 Add new graph data for specialized testing scenarios
-* TINKERPOP-1884 Bump to Netty 4.0.56.Final
-* TINKERPOP-1885 Various Gremlin.Net documentation updates
-* TINKERPOP-1901 Enable usage of enums in more steps in Gremlin.Net
-* TINKERPOP-1908 Bump to Groovy 2.4.14
-* TINKERPOP-1911 Refactor JavaTranslator to cache all reflective calls
-* TINKERPOP-1914 Support construct a GremlinServer instance from gremlin executor service
+Please see the archived <<./docs/archive/changelogs/changelog-3.3.x.asciidoc#release-3-3-2, 3.3.2 changelog>>.
[[release-3-3-1]]
=== TinkerPop 3.3.1 (Release Date: December 17, 2017)
-This release also includes changes from <<release-3-2-7, 3.2.7>>.
-
-* Added `NoneStep` and `Traversal.none()` for full filtering integration with `iterate()`.
-* Fixed bug in serialization of `Path` for GraphSON 3.0 in `gremlin-python`.
-* Added support for GraphSON 3.0 in Gremlin.Net.
-* Added `math()`-step which supports scientific calculator capabilities for numbers within a traversal.
-* Added missing `GraphTraversalSource.addE()`-method to `GremlinDslProcessor`.
-* Changed `to()` and `from()` traversal-based steps to take a wildcard `?` instead of of `E`.
-* Added `addV(traversal)` and `addE(traversal)` so that created element labels can be determined dynamically.
-* `PageRankVertexProgram` supports `maxIterations` but will break out early if epsilon-based convergence occurs.
-* Added support for epsilon-based convergence in `PageRankVertexProgram`.
-* Fixed two major bugs in how PageRank was being calculated in `PageRankVertexProgram`.
-* Added `Io.requiresVersion(Object)` to allow graph providers a way to check the `Io` type and version being constructed.
-* Defaulted `IoCore.gryo()` and `IoCore.graphson()` to both use their 3.0 formats which means that `Graph.io()` will use those by default.
-* Bumped Neo4j 3.2.3
-
-==== Bugs
-
-* TINKERPOP-1773 Lop should be created as a "software" and not a "person"
-* TINKERPOP-1783 PageRank gives incorrect results for graphs with sinks *(breaking)*
-* TINKERPOP-1799 Failure to serialize path() in gremlin-python
-* TINKERPOP-1847 tinkergraph-gremlin dependency on gremlin-test, bad scope?
-
-==== Improvements
-
-* TINKERPOP-1632 Create a set of default functions
-* TINKERPOP-1692 Bump to Neo4j 3.2.3
-* TINKERPOP-1717 Update name and link of DynamoDB storage backend in landing page
-* TINKERPOP-1730 Gremlin .NET support for GraphSON 3.0
-* TINKERPOP-1767 Method for graph providers to check an IO version and type
-* TINKERPOP-1793 addE() should allow dynamic edge labels
-* TINKERPOP-1834 Consider iterate() as a first class step
+Please see the archived <<./docs/archive/changelogs/changelog-3.3.x.asciidoc#release-3-3-1, 3.3.1 changelog>>.
[[release-3-3-0]]
=== TinkerPop 3.3.0 (Release Date: August 21, 2017)
-This release also includes changes from <<release-3-2-6, 3.2.6>>.
-
-* Removed previously deprecated `ScriptElementFactory`.
-* Added `GraphTraversalSource.addE(String)` in support of `g.addE().from().to()`.
-* Added support for `to(Vertex)` and `from(Vertex)` as a shorthand for `to(V(a))` and `from(V(b))`.
-* Bumped to support Spark 2.2.0.
-* Detected if type checking was required in `GremlinGroovyScriptEngine` and disabled related infrastructure if not.
-* Removed previously deprecated `GraphTraversal.selectV3d0()` step.
-* Removed previously deprecated `DetachedEdge(Object,String,Map,Pair,Pair)` constructor.
-* Removed previously deprecated `Bindings` constructor. It is now a private constructor.
-* Removed previously deprecated `TraversalSource.withBindings()`.
-* Removed previously deprecated `GraphTraversal.sack(BiFunction,String)`.
-* `TraversalMetrics` and `Metrics` Gryo 1.0 formats changed given internal changes to their implementations.
-* Made `TraversalMetrics` safe to write to from multiple threads.
-* Removed previously deprecated `TraversalSideEffects` methods.
-* Removed previously deprecated `finalization.LazyBarrierStrategy` (moved to `optimization.LazyBarrierStrategy`).
-* Removed previously deprecated `Constants` in Hadoop.
-* Removed previously deprecated `VertexComputing.generateComputer(Graph)`.
-* Removed previously deprecated `ConfigurationTraversal`.
-* Established the Gryo 3.0 format.
-* `GryoVersion` now includes a default `ClassResolver` to supply to the `GryoMapper`.
-* `GryoClassResolver` renamed to `GryoClassResolverV1d0` which has an abstract class that for providers to extend in `AbstractGryoClassResolver`.
-* Removed previously deprecated `Order` enums of `keyIncr`, `keyDecr`, `valueIncr`, and `valueDecr.`
-* Removed previously deprecated `GraphTraversal.mapKeys()` step.
-* Removed previously deprecated `GraphTraversal.mapValues()` step.
-* Removed previously deprecated `GraphTraversal#addV(Object...)`.
-* Removed previously deprecated `GraphTraversal#addE(Direction, String, String, Object...)`.
-* Removed previously deprecated `GraphTraversal#addOutE(String, String, Object...)`.
-* Removed previously deprecated `GraphTraversal#addInV(String, String, Object...)`.
-* Removed previously deprecated `GraphTraversal.groupV3d0()` and respective `GroupSideEffectStepV3d0` and `GroupStepV3d0`.
-* Removed previously deprecated `TraversalSource.Builder` class.
-* Removed previously deprecated `ConnectiveP`, `AndP`, `OrP` constructors.
-* Removed previously deprecated `TraversalScriptFunction` class.
-* Removed previously deprecated `TraversalScriptHelper` class.
-* Removed previously deprecated `ScriptEngineCache` class.
-* Removed previously deprecated `CoreImports` class.
-* Removed previously deprecated `GremlinJythonScriptEngine#()` constructor.
-* Removed access to previously deprecated `CoreGremlinPlugin#INSTANCE` field.
-* `gremlin.sh` and `gremln.bat` no longer support the option to pass a script as an argument for execution mode without using the `-i` option.
-* Graphite and Ganglia are no longer packaged with the Gremlin Server distribution.
-* `TransactionException` is no longer a class of `AbstractTransaction` and it extends `RuntimeException`.
-* Included an ellipse on long property names that are truncated.
-* Renamed `RangeByIsCountStrategy` to `CountStrategy`.
-* Added more specific typing to various `__` traversal steps. E.g. `<A,Vertex>out()` is `<Vertex,Vertex>out()`.
-* Updated Docker build scripts to include Python dependencies (NOTE: users should remove any previously generated TinkerPop Docker images).
-* Added "attachment requisite" `VertexProperty.element()` and `Property.element()` data in GraphSON serialization.
-* GraphSON 3.0 is now the default serialization format in TinkerGraph and Gremlin Server.
-* Changed `ServerGremlinExecutor` to not use generics since there really is no flexibility in the kind of `ScheduledExecutorService` that will be used.
-* Removed support for passing a byte array on the `sasl` parameter.
-* Removed previously deprecated `GraphSONMapper$Builder#embedTypes` option.
-* Removed previously deprecated `:remote config timeout max`.
-* Removed previously deprecated `ConnectionPoolSettings.sessionId` and `ConnectionPoolSettings.optionalSessionId()`.
-* Removed previously deprecated `reconnectInitialDelay` setting from the Java driver.
-* Removed previously deprecated `useMapperFromGraph` option.
-* Established the GraphSON 3.0 format with new `g:Map`, `g:List` and `g:Set` types.
-* Removed previously deprecated `Io.Builder#registry(IoRegistry)` method.
-* Removed previously deprecated `GryoMessageSerializerV1d0(GryoMapper)` constructor.
-* Removed previously deprecated `TinkerIoRegistry`.
-* Removed previously deprecated `getInstance()` methods on all TinkerPop classes.
-* Removed previously deprecated `VertexPropertyFeatures.supportsAddProperty()`.
-* Removed previously deprecated TinkerGraph configuration member variables.
-* Removed previously deprecated `Transaction.submit(Function)`.
-* Removed previously deprecated `OpSelectorHandler.errorMeter` and `AbstractEvalOpProcessor.errorMeter` fields.
-* Removed previously deprecated `AbstractEvalOpProcessor.validBindingName` field.
-* Removed previously deprecated `SimpleAuthenticator.CONFIG_CREDENTIALS_LOCATION` field.
-* Removed previously deprecated `IteratorHandler`, `NioGremlinResponseEncoder` and `WsGremlinResponseEncoder` classes.
-* Removed previously deprecated `Session.kill()` and `Session.manualKill()`.
-* Removed previously deprecated `Authenticator.newSaslNegotiator()` and its method implementations in classes that were assignable to that interface.
-* Removed `gremlin-groovy-test`.
-* Removed previously deprecated "G" functions in `gremlin-groovy` (i.e. `GFunction`).
-* Removed references to the old `GremlinPlugin` system that was in `gremlin-groovy` - the revised `GremlinPlugin` system in `gremlin-core` is the only one now in use.
-* `GremlinGroovyScriptEngine` no longer implements the now removed `DependencyManager`.
-* Added `Vertex`, `Edge`, `VertexProperty`, and `Property` serializers to Gremlin-Python and exposed tests that use graph object arguments.
-* `Bytecode.getSourceInstructions()` and `Bytecode.getStepInstructions()` now returns `List<Instruction>` instead of `Iterable<Instruction>`.
-* Added various `TraversalStrategy` registrations with `GryoMapper`.
-* Fixed a naming mistake in Gremlin-Python: `IdentityRemoveStrategy` is now called `IdentityRemovalStrategy`.
-* Added `TranslationStrategy` test infrastructure that verifies `Bytecode` generated from a translation is equal to the original `Bytecode`.
-* Moved `NumberHelper` into the `org.apache.tinkerpop.gremlin.util` package.
-* Added `Pop.mixed` instead of using `null` to represent such semantics.
-* `select()`-step now defaults to using `Pop.last` instead of `Pop.mixed`.
-* Added `gremlin-io-test` module to validate IO formats.
-* `RequestMessage` and `ResponseMessage` are now registered with `GryoMapper` as part of the TinkerPop range of type identifiers.
-* Removed previously deprecated `Console` constructor that took a `String` as an argument from `gremlin-console`.
-* Removed previously deprecated `ConcurrentBindings` from `gremlin-groovy`.
-* Removed previously deprecated `ScriptExecutor` from `gremlin-groovy`.
-* Removed previously deprecated `SandboxExtension` from `gremlin-groovy`.
-* Removed previously deprecated `GremlinGroovyScriptEngine` constructor that took `ImportCustomizerProvider` as an argument from `gremlin-groovy`.
-* Removed previously deprecated `GremlinGroovyScriptEngine#plugins()` from `gremlin-groovy`.
-* Added `OptionalStep` for use with `optional()` to better handle issues associated with branch side-effects.
-* `UnfoldStep` now supports unfolding of arrays.
-* Removed all performance tests that were not part of `gremlin-benchmark`.
-* Removed dependency on `junit-benchmarks` and it's related reference to `h2`.
-* Moved the source for the "home page" into the repository under `/site` so that it easier to accept contributions.
-* Added `UnshadedKryoShimService` as the new default serializer model for `SparkGraphComputer`.
-* `GryoRegistrator` is more efficient than the previous `GryoSerializer` model in `SparkGraphComputer`.
-* Added support for `IoRegistry` custom serialization in Spark/Giraph and provided a general `hadoop-gremlin` test suite.
-* Replaced term `REST` with `HTTP` to remove any confusion as to the design of the API.
-* Moved `gremlin-benchmark` under `gremlin-tools` module.
-* Added `gremlin-tools` and its submodule `gremlin-coverage`.
-* Removed `tryRandomCommit()` from `AbstractGremlinTest`.
-* Changed `gremlin-benchmark` system property for the report location to `benchmarkReportDir` for consistency.
-* Added SysV and systemd init scripts.
-* `GraphTraversal.valueMap(includeTokens,propertyKeys...)` now returns a `Map<Object,E>` since keys could be `T.id` or `T.label`.
-* Added `skip(long)` and `skip((Scope,long)` which call the `range(low,high)` equivalents with -1 as the high.
-* Added Kerberos authentication to `gremlin-server` for websockets and nio transport.
-* Added audit logging of authenticated users and gremlin queries to `gremlin-server`.
-
-==== Bugs
-
-* TINKERPOP-1211 UnfoldStep should unfold arrays. *(breaking)*
-* TINKERPOP-1426 GryoSerializer should implement Java serialization interface
-* TINKERPOP-1465 Remove deprecated newSaslNegotiator *(breaking)*
-* TINKERPOP-1483 PropertyMapStep returns Map<String,E> but puts non String keys in it!
-* TINKERPOP-1520 Difference between 'has' step generated graphson2.0 in java and python glv implementation
-* TINKERPOP-1533 Storage and IoRegistry
-* TINKERPOP-1597 PathRetractionStrategy messing up certain traversals
-* TINKERPOP-1635 gremlin-python: Duplicate serialization of element property in PropertySerializer
-* TINKERPOP-1658 Graphson2 map keys are serialised as strings
-* TINKERPOP-1716 Traversal strategies are not applied with remote in Gremlin Console
-
-==== Improvements
-
-* TINKERPOP-832 Remove deprecated addV/E/InE/OutE methods *(breaking)*
-* TINKERPOP-833 Remove deprecated GremlinGroovyScriptEngine constructor and plugins() *(breaking)*
-* TINKERPOP-834 Remove deprecated sack() method *(breaking)*
-* TINKERPOP-880 Remove deprecated GroupStepV3d0 and GroupSideEffectStepV3d0 *(breaking)*
-* TINKERPOP-929 Remove Deprecated TinkerGraph public static methods. *(breaking)*
-* TINKERPOP-980 Add a service script or daemon mode in the distribution *(breaking)*
-* TINKERPOP-999 ServerGremlinExecutor construction need not use generics for ExecutorService *(breaking)*
-* TINKERPOP-1004 Make Transaction.commit() failures consistent across implementations. *(breaking)*
-* TINKERPOP-1010 Remove deprecated credentialsDbLocation for SimpleAuthenticator *(breaking)*
-* TINKERPOP-1024 Remove deprecated tryRandomCommit() *(breaking)*
-* TINKERPOP-1028 Remove deprecated ConnectionPoolSettings session settings *(breaking)*
-* TINKERPOP-1040 Remove deprecated SandboxExtension *(breaking)*
-* TINKERPOP-1046 Remove deprecated Gremlin Server handler implementations *(breaking)*
-* TINKERPOP-1049 Remove deprecated error meter member variables in Gremlin Server handlers *(breaking)*
-* TINKERPOP-1094 Remove deprecated VertexPropertyFeatures.FEATURE_ADD_PROPERTY *(breaking)*
-* TINKERPOP-1116 Some anonymous traversal steps can be hard typed. *(breaking)*
-* TINKERPOP-1130 Each release should store Kryo/GraphSON/GraphML versions to ensure future compatibility *(breaking)*
-* TINKERPOP-1142 Remove deprecated valueIncr, valueDecr, keyIncr, keyDecr. *(breaking)*
-* TINKERPOP-1169 Remove deprecated TraversalScriptFunction and TraversalScriptHelper *(breaking)*
-* TINKERPOP-1170 Remove deprecated ConfigurationTraversal. *(breaking)*
-* TINKERPOP-1171 Remove deprecated TraversalSource.Builder *(breaking)*
-* TINKERPOP-1235 Remove deprecated ProcessPerformanceSuite and TraversalPerformanceTest *(breaking)*
-* TINKERPOP-1275 Remove deprecated max setting for :remote *(breaking)*
-* TINKERPOP-1283 Remove deprecated ScriptExecutor *(breaking)*
-* TINKERPOP-1289 Remove deprecated ConnectiveP, AndP, and OrP constructors. *(breaking)*
-* TINKERPOP-1291 Remove deprecated mapValues and mapKeys methods *(breaking)*
-* TINKERPOP-1313 Rename RangeByIsCountStrategy *(breaking)*
-* TINKERPOP-1316 Remove deprecated constructor from GryoMessageSerializers *(breaking)*
-* TINKERPOP-1327 Bring GryoRegistrator to the forefront and deprecate GryoSerializer *(breaking)*
-* TINKERPOP-1363 Cleanup Docker build script for next major release *(breaking)*
-* TINKERPOP-1369 Replace REST API with HTTP API
-* TINKERPOP-1389 Support Spark 2.0.0
-* TINKERPOP-1399 NumberHelper needs to go into util and have a private constructor *(breaking)*
-* TINKERPOP-1404 Path/label optimization
-* TINKERPOP-1408 Remove Deprecated Io.Builder.registry() *(breaking)*
-* TINKERPOP-1414 Change default GraphSON version to 3.0 *(breaking)*
-* TINKERPOP-1420 Remove deprecated ConcurrentBindings in gremlin-groovy *(breaking)*
-* TINKERPOP-1421 Remove deprecated ControlOps *(breaking)*
-* TINKERPOP-1427 GraphSON 3.0 needs collection types and consistent number typing.
-* TINKERPOP-1443 Use an API checker during build
-* TINKERPOP-1445 Large nested VertexProperties and Properties do not get printed well
-* TINKERPOP-1454 Create Serializers for Graph objects in Gremlin-Python
-* TINKERPOP-1481 Remove deprecated reconnectInitialDelay in Java driver *(breaking)*
-* TINKERPOP-1485 Move source for TinkerPop site to source code repo
-* TINKERPOP-1506 Optional/Coalesce should not allow sideEffect traversals.
-* TINKERPOP-1514 Restructure for gremlin-tools module *(breaking)*
-* TINKERPOP-1524 Bytecode.getXXXInstructions should return a List, not Iterable.
-* TINKERPOP-1526 Remove deprecated Session kill() overloads *(breaking)*
-* TINKERPOP-1536 Include GLVs in Docker build
-* TINKERPOP-1541 Select should default to Pop.last semantics *(breaking)*
-* TINKERPOP-1549 Implement skip()
-* TINKERPOP-1550 Make Graphite and Ganglia optional dependencies
-* TINKERPOP-1563 Remove deprecated getInstance() methods *(breaking)*
-* TINKERPOP-1565 Setup GraphSON 3.0
-* TINKERPOP-1566 Kerberos authentication for gremlin-server
-* TINKERPOP-1574 Get rid of untyped GraphSON in 3.0
-* TINKERPOP-1603 Remove support for SASL byte array in protocol *(breaking)*
-* TINKERPOP-1612 Remove gremlin-groovy-test module *(breaking)*
-* TINKERPOP-1621 Remove deprecated GremlnPlugin and related infrastructure *(breaking)*
-* TINKERPOP-1622 Remove deprecated G functions in gremlin-groovy *(breaking)*
-* TINKERPOP-1651 Remove deprecated gremlin.sh init syntax *(breaking)*
-* TINKERPOP-1686 Make TraversalMetrics thread safe *(breaking)*
-* TINKERPOP-1698 Gryo 3.0
-* TINKERPOP-1699 Remove deprecated userMapperFromGraph *(breaking)*
-* TINKERPOP-1700 Remove deprecated embedTypes option
-* TINKERPOP-1706 Remove deprecated ScriptEngineCache and related dead code *(breaking)*
-* TINKERPOP-1715 Bump to Spark 2.2
-* TINKERPOP-1719 Remove deprecated Traversal related code *(breaking)*
-* TINKERPOP-1720 Remove deprecated Hadoop code *(breaking)*
-* TINKERPOP-1721 Remove deprecated Bindings related code *(breaking)*
-* TINKERPOP-1724 Remove deprecated ScriptElementFactory
-* TINKERPOP-1729 Remove deprecated select steps.
-* TINKERPOP-1740 Add vertex parameter overload to to() and from()
-* TINKERPOP-1747 Streamline inheritance for gremlin-python GraphSON serializer classes
+Please see the archived <<./docs/archive/changelogs/changelog-3.3.x.asciidoc#release-3-3-0, 3.3.0 changelog>>.
== TinkerPop 3.2.0 (Nine Inch Gremlins)
@@ -3325,1119 +849,62 @@
[[release-3-2-11]]
=== TinkerPop 3.2.11 (Release Date: January 2, 2019)
-* Bumped to Jackson Databind 2.9.8
-
-==== Improvements
-
-* TINKERPOP-2074 Ensure that only NuGet packages for the current version are pushed
-* TINKERPOP-2121 Bump Jackson Databind 2.9.8
+Please see the archived <<./docs/archive/changelogs/changelog-3.2.x.asciidoc#release-3-2-11, 3.2.11 changelog>>.
[[release-3-2-10]]
=== TinkerPop 3.2.10 (Release Date: October 15, 2018)
-* Removed conflicting non-indy groovy core dependency
-* Bumped jython-standalone 2.7.1
-* Added a delegate to the Gremlin.Net driver that can be used to configure the WebSocket connection.
-* SSL security enhancements
-* Added Gremlin version to Gremlin Server startup logging output.
-* Fixed problem with Gremlin Server sometimes returning an additional message after a failure.
-* Allowed spaces in classpath for `gremlin-server.bat`.
-* Fixed bug in traversals that used Python lambdas with strategies in `gremlin-python`.
-* Modified Maven archetype for Gremlin Server to use remote traversals rather than scripts.
-* Added an system error code for failed plugin installs for Gremlin Server `-i` option.
-* Fixed bug in keep-alive requests from over-queuing cancelled jobs.
-* Match numbers in `choose()` options using `NumberHelper` (match values, ignore data type).
-* Added support for GraphSON serialization of `Date` in Javascript.
-* Added synchronized `Map` to Gryo 1.0 registrations.
-* Added `Triple` to Gryo 1.0 registrations.
-* Added support for `Double.NaN`, `Double.POSITIVE_INFINITY` and `Double.NEGATIVE_INFINITY`.
-* Improved escaping of special characters in strings passed to the `GroovyTranslator`.
-* Added `Cluster` configuration option to set a custom validation script to use to test server connectivity in the Java driver.
-* Improved ability of `GroovyTranslator` to handle more types supported by GraphSON.
-* Improved ability of `GroovyTranslator` to handle custom types.
-* Added better internal processing of `Column` in `by(Function)`.
-* Added `hasNext()` support on `Traversal` for `gremlin-python`.
-* Added support for additional extended types in Gremlin.Net with `decimal`, `TimeSpan`, `BigInteger`, `byte`, `byte[]`, `char` and `short`.
-* Fixed bug in Java driver where an disorderly shutdown of the server would cause the client to hang.
-* Added a dotnet template project that should make it easier to get started with Gremlin.Net.
-* Removed `ThreadInterruptCustomizerProvider` from documentation as a way to timeout.
-* Changed behavior of `withRemote()` if called multiple times so as to simply throw an exception and not perform the side-effect of auto-closing.
-* Added Docker images for Gremlin Console and Gremlin Server.
-* Fixed bug in `branch()` where reducing steps as options would produce incorrect results.
-* Removed recursive handling of streaming results from Gremlin-Python driver to avoid max recursion depth errors.
-* Improved performance of `TraversalVertexProgram` and related infrastructure.
-* Checked web socket state before closing connection in the .NET driver.
-* Deprecated `BulkLoaderVertexProgram` and related infrastructure.
-* Deprecated `BulkDumperVertexProgram` with the more aptly named `CloneVertexProgram`.
-* Added `createGratefulDead()` to `TinkerFactory` to help make it easier to try to instantiate that toy graph.
-* Added identifiers to edges in the Kitchen Sink toy graph.
-* Ordered the loading of plugins in the Gremlin Console by their position in the configuration file.
-* Refactored the Gremlin Server integration testing framework and streamlined that infrastructure.
-* Logged the seed used in initializing `Random` for tests.
-* Fixed bug in `GroovyTranslator` that didn't properly handle empty `Map` objects.
-* Added concrete configuration methods to `SparkGraphComputer` to make a more clear API for configuring it.
-* Fixed a bug in `TinkerGraphCountStrategy`, which didn't consider that certain map steps may not emit an element.
-* Fixed a bug in JavaScript GLV where DriverRemoteConnection close() method didn't returned a Promise instance.
-* Bumped to Jackson 2.9.6.
-* Sasl Plain Text Authentication added to Gremlin Javascript.
-* Ability to send scripts to server added to Gremlin Javascript.
-* Translator class added to Gremlin Javascript to translate bytecode to script clientside.
-
-==== Bugs
-
-* TINKERPOP-1898 Issue with bindings in strategies and lambdas
-* TINKERPOP-1933 gremlin-python maximum recursion depth exceeded on large responses
-* TINKERPOP-1958 TinkerGraphCountStrategy can return wrong counts
-* TINKERPOP-1961 Duplicate copies of images directory in docs
-* TINKERPOP-1962 GroovyTranslator doesn't handle empty maps
-* TINKERPOP-1963 Use of reducing step in choose()
-* TINKERPOP-1972 inject() tests are throwing exceptions in .NET GLV tests
-* TINKERPOP-1978 Check for Websocket connection state when retrieved from Connection Pool missing
-* TINKERPOP-1988 minor error in documentation
-* TINKERPOP-1999 [Java][gremlin-driver] Query to a remote server via the websocket client hangs indefinitely if the server becomes unavailable
-* TINKERPOP-2005 Intermittent NullPointerException in response handling
-* TINKERPOP-2009 Pick.any and Pick.none should be exposed in Gremlin-JavaScript
-* TINKERPOP-2030 KeepAlive task executed for every Connection.write call
-* TINKERPOP-2032 Update jython-standalone
-* TINKERPOP-2044 Cannot reconnect to Azure cosmos host that becomes available again
-
-==== Improvements
-
-* TINKERPOP-1113 GraphComputer subclasses should support native methods
-* TINKERPOP-1365 Log the seed used to initialize Random in tests
-* TINKERPOP-1595 Go through TraversalVertexProgram with a profile and optimize.
-* TINKERPOP-1778 Do not promote timedInterrupt option for Gremlin Server script processing
-* TINKERPOP-1780 Add authentication tests for gremlin-python
-* TINKERPOP-1836 .NET sample project
-* TINKERPOP-1841 Include Python GLV tests on TravisCI
-* TINKERPOP-1897 Provide Docker images of Gremlin Server and Console
-* TINKERPOP-1945 Add support for extended GraphSon types to Gremlin.net
-* TINKERPOP-1951 gremlin-server.bat doesn't support paths containing spaces
-* TINKERPOP-1959 Provide a way to submit scripts to the server in gremlin-javascript
-* TINKERPOP-1968 Refactor elements of Gremlin Server testing
-* TINKERPOP-1976 Include Computer tests for GLVs
-* TINKERPOP-1977 Gremlin-JavaScript: Support SASL authentication
-* TINKERPOP-1985 Update position on bulk loading
-* TINKERPOP-1989 Preserve order that plugins are applied in Gremlin Console
-* TINKERPOP-1995 DriverRemoteConnection close() method returns undefined
-* TINKERPOP-2011 Use NumberHelper on choose()
-* TINKERPOP-2012 Target .NET Standard 2.0 for Gremlin.Net
-* TINKERPOP-2015 Allow users to configure the WebSocket connections
-* TINKERPOP-2016 Upgrade Jackson FasterXML to 2.9.5 or later to fix security vulnerability
-* TINKERPOP-2017 Check for Column in by()
-* TINKERPOP-2022 Cluster SSL should trust default ca certs by default
-* TINKERPOP-2023 Gremlin Server should not create self-signed certs *(breaking)*
-* TINKERPOP-2024 Gremlin Server Application archetype should connect via withRemote
-* TINKERPOP-2025 Change to SHA-256/512 and drop SHA-1 for releases
-* TINKERPOP-2026 Gremlin.Net.Driver should check ClientWebSocket.State before closing
-* TINKERPOP-2034 Register synchronizedMap() with Gryo
-* TINKERPOP-2035 Gremlin-JavaScript: Pass custom headers to the websocket connection
-* TINKERPOP-2040 Improve flexibility of GroovyTranslator to handle custom types
-* TINKERPOP-2045 Remove non-indy groovy dependencies
-* TINKERPOP-2055 Provide support for special number cases like Infinity in GraphSON
-* TINKERPOP-2056 Use NumberHelper in Compare
+Please see the archived <<./docs/archive/changelogs/changelog-3.2.x.asciidoc#release-3-2-10, 3.2.10 changelog>>.
[[release-3-2-9]]
=== TinkerPop 3.2.9 (Release Date: May 8, 2018)
-* Fixed bug where path history was not being preserved for keys in mutations.
-* Bumped to httpclient 4.5.5.
-* Bumped to Groovy 2.4.15 - fixes bug with `Lambda` construction.
-* Improved performance of GraphSON deserialization of `Bytecode`.
-* Improved performance of traversal construction.
-
-==== Bugs
-
-* TINKERPOP-1947 Path history isn't preserved for keys in mutations
-
-==== Improvements
-
-* TINKERPOP-1755 No docs for ReferenceElements
-* TINKERPOP-1912 Remove MD5 checksums
-* TINKERPOP-1934 Bump to latest version of httpclient
-* TINKERPOP-1936 Performance enhancement to Bytecode deserialization
-* TINKERPOP-1944 JavaScript GLV: DriverRemoteConnection is not exported in the root module
-* TINKERPOP-1950 Traversal construction performance enhancements
-* TINKERPOP-1953 Bump to Groovy 2.4.15
+Please see the archived <<./docs/archive/changelogs/changelog-3.2.x.asciidoc#release-3-2-9, 3.2.9 changelog>>.
[[release-3-2-8]]
=== TinkerPop 3.2.8 (Release Date: April 2, 2018)
-* Added a `Lambda` class to Gremlin.Net that makes it possible to use Groovy and Python lambdas with Gremlin.Net.
-* Enums are now represented as classes in Gremlin.Net which allows to use them as arguments in more steps.
-* Bumped to Groovy 2.4.14.
-* Added `checkAdjacentVertices` option to `SubgraphStrategy`.
-* Modified `GremlinDslProcessor` so that it generated the `getAnonymousTraversalClass()` method to return the DSL version of `__`.
-* Added the "Kitchen Sink" test data set.
-* Fixed deserialization of `P.not()` for GraphSON.
-* Bumped to Jackson 2.9.4.
-* Improved performance of `JavaTranslator` by caching reflected methods required for traversal construction.
-* Ensure that `RemoteStrategy` is applied before all other `DecorationStrategy` instances.
-* Added `idleConnectionTimeout` and `keepAliveInterval` to Gremlin Server that enables a "ping" and auto-close for seemingly dead clients.
-* Fixed a bug where lambdas in `gremlin-python` would trigger a failure if steps using python-only symbols were present (such as `as_()`).
-* Fixed a bug in `NumberHelper` that led to wrong min/max results if numbers exceeded the Integer limits.
-* Delayed setting of the request identifier until `RequestMessage` construction by the builder.
-* `ReferenceElement` avoids `UnsupportedOperationException` handling in construction thus improving performance.
-* Improved error messaging for failed serialization and deserialization of request/response messages.
-* Fixed handling of `Direction.BOTH` in `Messenger` implementations to pass the message to the opposite side of the `StarGraph`.
-* Removed hardcoded expectation in metrics serialization test suite as different providers may have different outputs.
-* Added `IndexedTraverserSet` which indexes on the value of a `Traverser` thus improving performance when used.
-* Utilized `IndexedTraverserSet` in `TraversalVertexProgram` to avoid extra iteration when doing `Vertex` lookups.
-* Bumped to Netty 4.0.56.Final.
-* Fixed .NET GraphSON serialization of `P.Within()` and `P.without()` when passing a `Collection` as an argument.
-* Fixed a bug in Gremlin Console which prevented handling of `gremlin.sh` flags that had an "=" between the flag and its arguments.
-* Fixed bug where `SparkMessenger` was not applying the `edgeFunction` from `MessageScope`.
-* Fixed a bug in `ComputerAwareStep` that didn't handle `reset()` properly and thus occasionally produced some extra traversers.
-* Removed `TraversalPredicate` class in Gremlin.Net. It is now included in the `P` class instead.
-
-==== Bugs
-
-* TINKERPOP-1053 installed plugins are placed in a directory relative to where gremlin.sh is started
-* TINKERPOP-1509 Failing test case for tree serialization
-* TINKERPOP-1738 Proper functioning of GraphSONReader depends on order of elements in String representation
-* TINKERPOP-1758 RemoteStrategy should be before all other DecorationStrategies.
-* TINKERPOP-1855 Update Rexster links
-* TINKERPOP-1859 Complex instance of P not serializing to bytecode properly
-* TINKERPOP-1860 valueMap(True) result in error in gremlin-python
-* TINKERPOP-1862 TinkerGraph VertexProgram message passing doesn't work properly when using Direction.BOTH
-* TINKERPOP-1867 union() can produce extra traversers
-* TINKERPOP-1872 Apply edgeFunction in SparkMessenger
-* TINKERPOP-1873 min() and max() work only in the range of Integer values
-* TINKERPOP-1874 P does not appear to be serialized consistently in GraphSON
-* TINKERPOP-1879 Gremlin Console does not resepect equal sign for flag argument assignments
-* TINKERPOP-1880 Gremlin.NET Strong name signature could not be verified. (HRESULT: 0x80131045)
-* TINKERPOP-1883 gremlinpython future will never return
-* TINKERPOP-1890 getAnonymousTraversalClass() is not being generated for Java DSLs
-* TINKERPOP-1891 Serialization of P.not() for gremlin-javascript
-* TINKERPOP-1892 GLV test failures for .NET
-* TINKERPOP-1894 GraphSONMessageSerializerV2d0 fails to deserialize valid P.not()
-* TINKERPOP-1896 gremlin-python lambdas error
-* TINKERPOP-1907 Fix failing GLV test for withSack() in .NET
-* TINKERPOP-1917 gx:BigDecimal serialization broken in Gremlin.Net on systems with ',' as decimal separator
-* TINKERPOP-1918 Scenarios fail because of wrong numerical types
-* TINKERPOP-1919 Gherkin runner doesn't work with P.And() and P.Or() in Gremlin.Net
-* TINKERPOP-1920 Tests fail because P.Within() arguments are wrapped in an array in Gremlin.Net
-* TINKERPOP-1922 Gherkin features fail that contain P.not() in Gremlin.Net
-
-==== Improvements
-
-* TINKERPOP-1357 Centrality Recipes should mention pageRank and OLAP.
-* TINKERPOP-1489 Provide a Javascript Gremlin Language Variant
-* TINKERPOP-1586 SubgraphStrategy in OLAP
-* TINKERPOP-1726 Support WebSockets ping/pong keep-alive in Gremlin server
-* TINKERPOP-1842 iterate() missing in terminal steps documentation
-* TINKERPOP-1850 Range step has undocumented special values
-* TINKERPOP-1854 Support lambdas in Gremlin.Net
-* TINKERPOP-1857 GLV test suite consistency and completeness
-* TINKERPOP-1863 Delaying the setting of requestId till the RequestMessage instantiation time
-* TINKERPOP-1868 Support inject source step in Gremlin.Net
-* TINKERPOP-1870 n^2 synchronious operation in OLAP WorkerExecutor.execute() method
-* TINKERPOP-1877 Add new graph data for specialized testing scenarios
-* TINKERPOP-1884 Bump to Netty 4.0.56.Final
-* TINKERPOP-1885 Various Gremlin.Net documentation updates
-* TINKERPOP-1901 Enable usage of enums in more steps in Gremlin.Net
-* TINKERPOP-1908 Bump to Groovy 2.4.14
-* TINKERPOP-1911 Refactor JavaTranslator to cache all reflective calls
+Please see the archived <<./docs/archive/changelogs/changelog-3.2.x.asciidoc#release-3-2-8, 3.2.8 changelog>>.
[[release-3-2-7]]
=== TinkerPop 3.2.7 (Release Date: December 17, 2017)
-* Added core GraphSON classes for Gremlin-Python: `UUID`, `Date`, and `Timestamp`.
-* Documented the recommended method for constructing DSLs with Gremlin.Net.
-* Provided a method to configure detachment options with `EventStrategy`.
-* Fixed a race condition in `TinkerIndex`.
-* Fixed bug in handling of the long forms of `-e` and `-i` (`--execute` and `--interactive` respectively) for Gremlin Console.
-* Fixed bug in `LambdaRestrictionStrategy` where traversals using `Lambda` scripts weren't causing the strategy to trigger.
-* Improved error messaging for bytecode deserialization errors in Gremlin Server.
-* Fixed an `ArrayOutOfBoundsException` in `hasId()` for the rare situation when the provided collection is empty.
-* Bumped to Netty 4.0.53
-* `TraversalVertexProgram` `profile()` now accounts for worker iteration in `GraphComputer` OLAP.
-* Returned the `Builder` instance from the `DetachedEdge.Builder` methods of `setOutE` and `setOutV`.
-* Added test framework for GLVs.
-* Fixed bug in `TraversalHelper.replaceStep()` where the step being replaced needed to be removed prior to the new one being added.
-* Added alias support in the .NET `DriverRemoteConnection`.
-* Added a test for self-edges and fixed `Neo4jVertex` to provided repeated self-edges on `BOTH`.
-* Better respected permissions on the `plugins.txt` file and prevented writing if marked as read-only.
-* Added getters for the lambdas held by `LambdaCollectingBarrierStep`, `LambdaFlatMapStep` and `LambdaSideEffectStep`.
-* Fixed an old hack in `GroovyTranslator` and `PythonTranslator` where `Elements` were being mapped to their id only.
-* Fixed an "attachement"-bug in `InjectStep` with a solution generalized to `StartStep`.
-* Truncate the script in error logs and error return messages for "Method code too large" errors in Gremlin Server.
-* Fixed a bug in `LambdaRestrictionStrategy` where it was too eager to consider a step as being a lambda step.
-* `ReferenceVertex` was missing its `label()` string. `ReferenceElement` now supports all label handling.
-* Fixed a bug where bytecode containing lambdas would randomly select a traversal source from bindings.
-* Deprecated `GremlinScriptEngine.eval()` methods and replaced them with new overloads that include the specific `TraversalSource` to bind to.
-* Added `GraphHelper.cloneElements(Graph original, Graph clone)` to the `gremlin-test` module to quickly clone a graph.
-* Added `GremlinDsl.AnonymousMethod` annotation to help provide explicit types for anonymous methods when the types are not easily inferred.
-* Bumped to GMavenPlus 1.6.
-* Added better error message for illegal use of `repeat()`-step.
-* Fixed a bug in `RangeByIsCountStrategy` that led to unexpected behaviors when predicates were used with floating point numbers.
-* Bumped to Jackson 2.8.10.
-* Deprecated `MutationListener.vertexPropertyChanged()` method that did not use `VertexProperty` and added a new method that does.
-* Added an `EmbeddedRemoteConnection` so that it's possible to mimic a remote connection within the same JVM.
-* Supported interruption for remote traversals.
-* Allow the `:remote` command to accept a `Cluster` object defined in the console itself.
-* The Console's `plugin.txt` file is only updated if there were manually uninstalled plugins.
-* Fixed a bug in `MatchStep` where mid-traversal `where()` variables were not being considered in start-scope.
-* Generalized `MatchStep` to locally compute all clauses with barriers (not just reducing barriers).
-* Ensured that plugins were applied in the order they were configured.
-* Fixed a bug in `Neo4jGremlinPlugin` that prevented it from loading properly in the `GremlinPythonScriptEngine`.
-* Fixed a bug in `ComputerVerificationStrategy` where child traversals were being analyzed prior to compilation.
-* Fixed a bug that prevented Gremlin from ordering lists and streams made of mixed number types.
-* Fixed a bug where `keepLabels` were being corrupted because a defensive copy was not being made when they were being set by `PathRetractionStrategy`.
-* Cancel script evaluation timeout in `GremlinExecutor` when script evaluation finished.
-* Added a recipe for OLAP traversals with Spark on YARN.
-* Added `spark-yarn` dependencies to the manifest of `spark-gremlin`.
-
-==== Bugs
-
-* TINKERPOP-1650 PathRetractionStrategy makes Match steps unsolvable
-* TINKERPOP-1731 Docker build does not appear to work for gremlin-dotnet
-* TINKERPOP-1745 Gremlin .NET: Use DateTimeOffset instead of DateTime to represent g:Date
-* TINKERPOP-1753 OrderStep not able to order by non-integer numbers
-* TINKERPOP-1760 OLAP compilation failing around ConnectiveStrategy
-* TINKERPOP-1761 GremlinExecutor: Timeout future not cancelled on successful script evaluation
-* TINKERPOP-1762 Make MatchStep analyze mid-clause variables for executing ordering purposes.
-* TINKERPOP-1764 Generalize MatchStep to localize all barriers, not just reducing barriers.
-* TINKERPOP-1766 Gremlin.Net: Closed connections should not be re-used
-* TINKERPOP-1782 RangeByIsCountStrategy doesn't handle floating point numbers properly
-* TINKERPOP-1789 Reference elements should be represented by id and label *(breaking)*
-* TINKERPOP-1790 GraphSON 3.0 doc updates
-* TINKERPOP-1791 GremlinDsl custom step with generic end type produces invalid code in __.java
-* TINKERPOP-1792 Random TraversalSource Selection in GremlinScriptEngine
-* TINKERPOP-1795 Getting Lambda comparator message for .profile() step
-* TINKERPOP-1796 Driver connection pool SSL properties missing
-* TINKERPOP-1797 LambdaRestrictionStrategy and LambdaMapStep in `by()`-modulation.
-* TINKERPOP-1798 MutationListener.vertexPropertyChanged oldValue should be a VertexProperty
-* TINKERPOP-1801 OLAP profile() step return incorrect timing
-* TINKERPOP-1802 hasId() fails for empty collections
-* TINKERPOP-1803 inject() doesn't re-attach with remote traversals
-* TINKERPOP-1819 documentation query and description mismatch
-* TINKERPOP-1821 Consistent behavior of self-referencing edges
-* TINKERPOP-1825 Gremlin .NET: Constant() step has incorrect parameter defined
-* TINKERPOP-1830 Race condition in Tinkergraph index creation
-* TINKERPOP-1832 TraversalHelper.replaceStep sets previousStep to the wrong step
-* TINKERPOP-1846 LambdaRestrictionStrategy not triggering for Lambda scripts
-* TINKERPOP-1848 Fix g:Date assertion in python tests
-* TINKERPOP-1851 Gremlin long options for -e and -i are not working properly
-
-==== Improvements
-
-* TINKERPOP-1661 Docker-built documentation does not always point locally
-* TINKERPOP-1725 DotNet GLV: Make traversal generation deterministic
-* TINKERPOP-1734 DSL for Gremlin .NET
-* TINKERPOP-1746 Better error message on wrong ordering of emit()/until()/has()
-* TINKERPOP-1752 Gremlin.Net: Generate completely type-safe methods
-* TINKERPOP-1756 Provide a way to easily mock a RemoteConnection for tests
-* TINKERPOP-1759 Improve hashcode and equals for Traverser implementations
-* TINKERPOP-1768 Bump to Jackson 2.8.10
-* TINKERPOP-1770 Remote traversal timeout
-* TINKERPOP-1771 gremlin.bat doesn't support paths containing spaces
-* TINKERPOP-1779 Bump to GMavenPlus 1.6
-* TINKERPOP-1784 Gremlin Language Test Suite
-* TINKERPOP-1785 Gremlin.Net should be strong-name signed
-* TINKERPOP-1786 Recipe and missing manifest items for Spark on Yarn
-* TINKERPOP-1787 Allow :remote command to accept a user defined Cluster instance
-* TINKERPOP-1806 Consistently use Gremlin.Net instead of Gremlin-DotNet
-* TINKERPOP-1807 Gremlin-Python doesn't support GraphSON types g:Date, g:Timestamp and g:UUID
-* TINKERPOP-1808 Add ability to get the consumer in LambdaSideEffectStep
-* TINKERPOP-1811 Improve error reporting for serialization errors between gremlin-python and gremlin-server
-* TINKERPOP-1812 ProfileTest assumes that graph implementations will not add their own steps
-* TINKERPOP-1813 Subgraph step requires the graph API
-* TINKERPOP-1814 Some process tests require the graph API
-* TINKERPOP-1820 Include .NET GLV tests on TravisCI
-* TINKERPOP-1824 Update netty version to 4.0.52
-* TINKERPOP-1827 Gremlin .NET: Test Suite Runner
-* TINKERPOP-1829 Improve flexibility of detachment for EventStrategy
-* TINKERPOP-1833 DetachedEdge.Builder#setInV and setOutV doesn't return the builder
-* TINKERPOP-1835 Bump Netty 4.0.53
-* TINKERPOP-1837 Gremlin .NET: Provide type coercion between IDictionary<K, V> instances
+Please see the archived <<./docs/archive/changelogs/changelog-3.2.x.asciidoc#release-3-2-7, 3.2.7 changelog>>.
[[release-3-2-6]]
=== TinkerPop 3.2.6 (Release Date: August 21, 2017)
-This release also includes changes from <<release-3-1-8, 3.1.8>>.
-
-* Bumped to Netty 4.0.50
-* Registered `HashMap$TreeNode` to Gryo.
-* Fixed a lambda-leak in `SackValueStep` where `BiFunction` must be tested for true lambda status.
-* Fixed a bug in `RangeByIsCountStrategy` that broke any `ConnectiveStep` that included a child traversal with an optimizable pattern.
-* Allowed access to `InjectStep.injections` for `TraversalStrategy` analysis.
-* Exceptions that occur during result iteration in Gremlin Server will now return `SCRIPT_EVALUATION_EXCEPTION` rather than `SERVER_ERROR`.
-* `AddEdgeStep` attaches detached vertices prior to edge creation.
-* Added graph element GraphSON serializers in Gremlin-Python.
-* Initialization scripts for Gremlin Server will not timeout.
-* Added Gremlin.Net.
-* `ProfileTest` is now less stringent about assertions which will reduce burdens on providers.
-* `GremlinExecutor` begins timeout of script evaluation at the time the script was submitted and not from the time it began evaluation.
-* Added Gremlin.Net.
-* `ReferenceFactory` and `DetachedFactory` now detach elements in collections accordingly.
-* Deprecated `GryoLiteMessageSerializerV1d0` in favor of `HaltedTraverserStrategy`.
-* Deprecated the `useMapperFromGraph` configuration option for Gremlin Server serializers.
-* `JavaTranslator` is now smart about handling `BulkSet` and `Tree`.
-* Added annotations to the traversal metrics pretty print.
-* `EdgeOtherVertexStep` is no longer final and can be extended by providers.
-* `EdgeVertexStep` is no longer final and can be extended by providers.
-* Deprecated `Transaction.submit(Function)`.
-* Fixed `HADOOP_GREMLIN_LIBS` parsing for Windows.
-* Improved GraphSON serialization performance around `VertexProperty`.
-* Changed some tests in `EventStrategyProcessTest` which were enforcing some unintended semantics around transaction state.
-* Added WsAndHttpChannelizer and SaslAndHttpBasicAuthenticationHandler to be allow for servicing Http and Websocket requests to the same server
-* Added deep copy of `Bytecode` to `DefaultTraversal.clone()`.
-
-==== Bugs
-
-* TINKERPOP-1385 Refactor Profiling test cases
-* TINKERPOP-1679 Detached side-effects aren't attached when remoted
-* TINKERPOP-1683 AbstractHadoopGraphComputer on Windows
-* TINKERPOP-1691 Some EventStrategyProcessTest assume element state is synced in memory
-* TINKERPOP-1704 XXXTranslators are not being respective of BulkSet and Tree.
-* TINKERPOP-1727 Bytecode object shallow copied when traversals are cloned
-* TINKERPOP-1742 RangeByIsCountStrategy fails for ConnectiveSteps
-* TINKERPOP-1743 LambdaRestrictionStrategy does not catch lambdas passed to sack()
-* TINKERPOP-1744 Gremlin .NET: Exception from sync execution gets wrapped in AggregateException
-
-==== Improvements
-
-* TINKERPOP-741 Remove Options For Transaction Retry
-* TINKERPOP-915 Gremlin Server supports REST and Websockets simultanteously
-* TINKERPOP-920 Test case needed for ensuring same cardinality for key.
-* TINKERPOP-1552 C# Gremlin Language Variant
-* TINKERPOP-1669 EdgeVertexStep should be designed for extension
-* TINKERPOP-1676 Improve GraphSON 2.0 Performance *(breaking)*
-* TINKERPOP-1688 Include TraversalMetrics annotation in pretty print
-* TINKERPOP-1694 Deprecate useMapperFromGraph
-* TINKERPOP-1701 HaltedTraverserStrategy should recurse into collections for detachment.
-* TINKERPOP-1703 Make EdgeOtherVertexStep non-final
-* TINKERPOP-1708 Add a "Note on Scopes" document
-* TINKERPOP-1709 Add a list of all the steps that support by()/from()/to()/as()/option()
-* TINKERPOP-1710 Add a note on tree() by-modulation and uniqueness of tree branches.
-* TINKERPOP-1714 Gremlin Server scriptEvaluationTimeout should take into account request arrival time
-* TINKERPOP-1718 Deprecate GryoLiteMessageSerializerV1d0
-* TINKERPOP-1748 Callout comments break code snippets
-* TINKERPOP-1749 Bump to Netty 4.0.50
+Please see the archived <<./docs/archive/changelogs/changelog-3.2.x.asciidoc#release-3-2-6, 3.2.6 changelog>>.
[[release-3-2-5]]
=== TinkerPop 3.2.5 (Release Date: June 12, 2017)
-This release also includes changes from <<release-3-1-7, 3.1.7>>.
-
-* Fixed folding of multiple `hasId()` steps into `GraphStep`.
-* Added string performance options to `StarGraph`.
-* Fixed a bug in `until(predicate)` where it was actually calling `emit(predicate)`.
-* Fixed inconsistency in GraphSON serialization of `Path` where properties of graph elements were being included when serialized.
-* Improved performance and memory usage of GraphSON when serializing `TinkerGraph` and graph elements.
-* Removed use of `stream()` in `DetachedEdge` and `DetachedVertex`.
-* Deprecated a constructor in `DetachedEdge` that made use of `Pair` in favor of a new one that just uses the objects that were in the `Pair`.
-* Improved error messaging on the `g.addV(Object...)` when passing an invalid arguments.
-* Reduced memory usage for TinkerGraph deserialization in GraphSON by streaming vertices and edges.
-* Added the `gremlin-archetype-dsl` to demonstrate how to structure a Maven project for a DSL.
-* Developed and documented patterns for Domain Specific Language implementations.
-* Removed the Groovy dependency from `gremlin-python` and used Groovy Templates and the `gmavenplus-plugin` to generate the python GLV classes.
-* Now using Groovy `[...]` map notation in `GroovyTranslator` instead of `new LinkedHashMap(){{ }}`.
-* Maintained type information on `Traversal.promise()`.
-* Propagated exception to `Future` instead of calling thread in `RemoteConnection`.
-* Fixed a bug in `RepeatUnrollStrategy` where `LoopsStep` and `LambdaHolder` should invalidate the strategy's application.
-* Deprecated `authentication.className` setting in favor of using `authentication.authenticator`.
-* Added `authentication.authenticationHandler` setting.
-* Added abstraction to authentication to allow users to plug in their own `AbstractAuthenticationHandler` implementations.
-* Fixed a `NullPointerException` bug in `B_LP_O_S_SE_SL_Traverser`.
-* `PathRetractionStrategy` now uses the marker-model to reduce recursive lookups of invalidating steps.
-* `ProfileStrategy` now uses the marker-model to reduce recursive lookups of `ProfileSideEffectStep`.
-* `Mutating` steps now implement `Scoping` interface.
-* Fixed a step id compilation bug in `AddVertexStartStep`, `AddVertexStep`, `AddEdgeStep`, and `AddPropertyStep`.
-* Added more details to Gremlin Server client side messages - exception hierarchy and stack trace.
-* Deprecated "Exception-Class" in the Gremlin Server HTTP protocol in favor of the new "exceptions" field.
-* De-registered metrics on Gremlin Server shutdown.
-* Added "help" command option on `:remote config` for plugins that support that feature in the Gremlin Console.
-* Allowed for multiple scripts and related arguments to be passed to `gremlin.sh` via `-i` and `-e`.
-* `LABELED_PATH` requirement is now set if any step in the traversal is labeled.
-* Updated `PathRetractionStrategy` to not run if the provided traversal contains a `VertexProgramStep` that has a `LABELED_PATH` requirement.
-* Added various metrics to the `GremlinGroovyScriptEngine` around script compilation and exposed them in Gremlin Server.
-* Moved the `caffeine` dependency down to `gremlin-groovy` and out of `gremlin-server`.
-* Improved script compilation in `GremlinGroovyScriptEngine` to use better caching, log long compile times and prevent failed compilations from recompiling on future requests.
-* Synchronized script compilation.
-* Logged Script compilation times.
-* Prevented failed scripts from recompiling.
-* Logged warnings for scripts that take "too long" to compile.
-* Improved memory usage of the `GremlinGroovyScriptEngine`.
-* Added `cyclicPath().from().to().by()` support to `GraphTraversal`.
-* Added `simplePath().from().to().by()` support to `GraphTraversal`.
-* Added `path().from().to()` support to `GraphTraversal` so sub-paths can be isolated from the current path.
-* Added `FromToModulating` interface for use with `to()`- and `from()`-based step modulators.
-* Added `Path.subPath()` which supports isolating a sub-path from `Path` via to/from-labels.
-* Fixed `NullPointerException` in `GraphMLReader` that occurred when an `<edge>` didn't have an ID field and the base graph supported ID assignment.
-* Added `ScopingStrategy` which will computer and provide all `Scoping` steps with the path labels of the global `Traversal`.
-* Split `ComputerVerificationStrategy` into two strategies: `ComputerVerificationStrategy` and `ComputerFinalizationStrategy`.
-* Removed `HasTest.g_V_hasId_compilationEquality` from process test suite as it makes too many assumptions about provider compilation.
-* Deprecated `CustomizerProvider` infrastructure.
-* Deprecated `PluginAcceptor` infrastructure.
-* Improved consistency of the application of bindings to `GremlinScriptEngine` implementations in the `BindingsGremlinPlugin`.
-* Fixed a bug in OLAP `ComputerAwareStep` where end-step labels were not being appended to the traverser correctly.
-* Refactor `SparkContext` handler to support external kill and stop operations.
-* Fixed an optimization bug in `LazyBarrierStrategy` around appending barriers to the end of a `Traversal`.
-* Fixed an optimization bug in `PathRetractionStrategy` around appending barriers to the end of a `Traversal`.
-* `TraverserIterator` in GremlinServer is smart to try and bulk traversers prior to network I/O.
-* Improved error handling of compilation failures for very large or highly parameterized script sent to Gremlin Server.
-* Fixed a bug in `RangeByIsCountStrategy` that changed the meaning of inner traversals.
-* Improved Gremlin-Python Driver implementation by adding a threaded client with basic connection pooling and support for pluggable websocket clients.
-* Changed `GraphManager` from a final class implementation to an interface.
-* Updated `GraphManager` interface to include methods for opening/instantiating a graph and closing a graph.
-* Implemented `DefaultGraphManager` to include previous `GraphManager` functionality and adhere to updated interface.
-* Deprecated `GraphManager.getGraphs()` and added `GraphManager.getGraphNames()`.
-* Deprecated `GraphManager.getTraversalSources()` and added `GraphManager.getTraversalSourceNames()`.
-* Fixed a bug so now users can supply a YAML with an empty `staticVariableTypes` to be used by the `FileSandboxExtension`
-
-==== Bugs
-
-* TINKERPOP-1258 HasTest.g_V_hasId_compilationEquality makes GraphStep assumptions
-* TINKERPOP-1528 CountByIsRangeStrategy fails for a particular query
-* TINKERPOP-1626 choose() is buggy in OLAP
-* TINKERPOP-1638 count() is optimized away in where()
-* TINKERPOP-1640 ComputerVerificationStrategy gives false errors
-* TINKERPOP-1652 Disable PathRetractionStrategy strategy if VertexProgramStep has LABELLED_PATH requirement
-* TINKERPOP-1660 Documentation links should not link to TINKERPOP-xxxx branches
-* TINKERPOP-1666 NPE in FileSandboxExtension if staticVariableTypes is empty in supplied YAML file
-* TINKERPOP-1668 RepeatUnrollStrategy should not execute if there is a LoopStep used.
-* TINKERPOP-1670 End type lost when using promise()
-* TINKERPOP-1673 GroovyTranslator produces Gremlin that can't execute on :remote
-* TINKERPOP-1675 RemoteStep#processNextStart() throws CompletionException instead of underlying exception
-* TINKERPOP-1681 Multiple hasId's are or'd into GraphStep
-
-==== Improvements
-
-* TINKERPOP-761 Some basic mathematical functions / steps
-* TINKERPOP-786 Patterns for DSL Development
-* TINKERPOP-1044 ResponseMessage should contain server-side exception name.
-* TINKERPOP-1095 Create a custom ScriptContext
-* TINKERPOP-1266 Make memory available to benchmarks configurable
-* TINKERPOP-1303 add help for :remote config for Gephi Plugin
-* TINKERPOP-1340 docs do not state at what version an API was introduced (or deprecated)
-* TINKERPOP-1387 from and to modulators for path steps
-* TINKERPOP-1438 Consider GraphManager as an interface*(breaking)*
-* TINKERPOP-1453 Allow Gremlin-Python to handle asynchronous failure
-* TINKERPOP-1577 Provide support for Python3 or Python2 in the Docker builds.
-* TINKERPOP-1599 implement real gremlin-python driver
-* TINKERPOP-1614 Improve documentation for Graph.V() and Graph.E() on main docs page
-* TINKERPOP-1618 Remove groovy dependency from gremlin-python
-* TINKERPOP-1627 LazyBarrierStrategy should not append an end barrier.
-* TINKERPOP-1631 Fix visibility issues with the BindingsGremlinPlugin
-* TINKERPOP-1634 Deprecate old methods of GremlinGroovyScriptEngine customization
-* TINKERPOP-1642 Improve performance of mutating traversals
-* TINKERPOP-1644 Improve script compilation process and include metrics
-* TINKERPOP-1653 Allow multiple scripts with arguments to be passed to the Console
-* TINKERPOP-1657 Provide abstraction to easily allow different HttpAuth schemes
-* TINKERPOP-1663 Validate a maximum for the number of parameters passed to Gremlin Server
-* TINKERPOP-1665 Remove unittest from Gremlin-Python tests
-* TINKERPOP-1671 Default method for RemoteConnection.submitAsync throws exception from submit on calling thread instead of failing the future
-* TINKERPOP-1677 Bump Groovy to 2.4.11
-* TINKERPOP-1680 Add string performance options to StarGraph
+Please see the archived <<./docs/archive/changelogs/changelog-3.2.x.asciidoc#release-3-2-5, 3.2.5 changelog>>.
[[release-3-2-4]]
=== TinkerPop 3.2.4 (Release Date: February 8, 2017)
-This release also includes changes from <<release-3-1-6, 3.1.6>>.
-
-* Fixed a bug where `PathProcessor.keepLabels` were not being pushed down into child traversals by `PathRetractionStrategy`.
-* Added default `MessagePassingReductionStrategy` for `GraphComputer` that can reduce the number of message passing iterations.
-* Fixed a bug associated with user-provided maps and `GroupSideEffectStep`.
-* `GroupBiOperator` no longer maintains a detached traversal and thus, no more side-effect related OLAP inconsistencies.
-* Added `ProjectedTraverser` which wraps a traverser with a `List<Object>` of projected data.
-* Fixed an optimization bug in `CollectingBarrierSteps` where the barrier was being consumed on each `addBarrier()`.
-* `OrderGlobalStep` and `SampleGlobalStep` use `ProjectedTraverser` and now can work up to the local star graph in OLAP.
-* SASL negotiation supports both a byte array and Base64 encoded bytes as a string for authentication to Gremlin Server.
-* Deprecated all test suites in `gremlin-groovy-test` - Graph Providers no longer need to implement these.
-* Deprecated `TinkerIoRegistry` replacing it with the more consistently named `TinkerIoRegistryV1d0`.
-* Made error messaging more consistent during result iteration timeouts in Gremlin Server.
-* Fixed a memory leak in the classloader for the `GremlinGroovyScriptEngine` where classes in the loader were not releasing from memory as a strong reference was always maintained.
-* `PathRetractionStrategy` does not add a `NoOpBarrierStep` to the end of local children as its wasted computation in 99% of traversals.
-* Fixed a bug in `AddVertexStartStep` where if a side-effect was being used in the parametrization, an NPE occurred.
-* Fixed a bug in `LazyBarrierStrategy` where `profile()` was deactivating it accidentally.
-* Fixed a bug in `RepeatUnrollStrategy` where stateful `DedupGlobalStep` was cloned and thus, maintained two deduplication sets.
-* Added documentation around "terminal steps" in Gremlin: `hasNext()`, `next()`, `toList()`, etc.
-* Added specific GraphSON serializers for `RequestMessage` and `ResponseMessage` in GraphSON 2.0.
-* Added `CloseableIterator` to allow `Graph` providers who open expensive resources a way to let users release them.
-* Fixed minor bug in `gremlin-driver` where closing a session-based `Client` without initializing it could generate an error.
-* Relieved synchronization pressure in various areas of `TinkerGraphComputer`.
-* Fixed an optimization bug in OLAP-based `DedupGlobalStep` where deduping occurred twice.
-* `MemoryComputeKey` now implements `Cloneable` which is useful for `BiOperator` reducers that maintain thread-unsafe state.
-* `TinkerGraphComputer` now supports distributed `Memory` with lock-free partition aggregation.
-* `TinkerGraph` Gryo and GraphSON deserialization is now configured to use multi-properties.
-* Changed behavior of `ElementHelper.areEqual(Property, Property)` to not throw exceptions with `null` arguments.
-* Added `GryoVersion` for future flexibility when introducing a new verison of Gryo and moved serializer registrations to it.
-* Fixed Gryo serialization of `ConnectiveP` instances.
-* Lessened the severity of Gremlin Server logging when it encounters two or more serializers addressing the same mime type.
-* Bumped to Netty 4.0.42.final.
-* Added `ByteBuffer`, `InetAddress`, `Timestamp` to the list of Gryo supported classes.
-* Fixed Gryo serialization of `Class`.
-* Fixed GraphSON serialization of enums like `T`, `P`, etc. where values were overriding each other in the GraphSON type registry.
-* Fixed a bug in Gremlin-Python around `__.__()` and `__.start()`.
-* Fixed a bug around long serialization in Gremlin-Python when using Python3.
-* Deprecated `TraversalSource.withBindings()` as it is no longer needed in Gremlin-Java and never was needed for other variants.
-* Fixed a bug in Gremlin-Java `Bytecode` where anonymous traversals were not aware of parent bindings.
-* Fixed a bug in Gremlin-Java GraphSON deserialization around `P.within()` and `P.without()`.
-* Converted Spark process suite tests to "integration" tests.
-* Fixed a bug in `InlineFilterStrategy` having to do with folding `HasContainers` into `VertexStep`.
-* Deprecated `HasContainer.makeHasContainers()` which was used to dissect `AndP` and shouldn't be used at the TinkerPop-level.
-* `GraphTraversal.has()` now will try and fold-left `HasContainer` if end step is a `HasContainerHolder`.
-* Created explicit `P`-predicate methods for `GraphTraversal.hasXXX()`.
-* Fixed a bug in `FilterRankStrategy` around `where().by()` ordering.
-* Added another optimization in `RangeByIsCountStrategy`, that removes `count().is()` altogether if it's not needed.
-* Fixed a OLAP `MatchStep.clone()`-bug that occurs when the `match()` is in a local child.
-* Added another optimization in `RangeByIsCountStrategy`, that removes `count().is()` altogether if it's not needed.
-* Fixed a bug in `RangeByIsCountStrategy` where labeled parents shouldn't have the strategy applied to their children.
-* Fixed a bug in `PathRetractionStrategy` where `MatchEndStep` labels were being dropped when they shouldn't be.
-* Added `TinkerGraphCountStrategy` which translates `g.V().map*.count()` patterns into direct `Map.size()` calls in `TinkerGraph`.
-* Added `Path.head()` and `Path.isEmpty()` with default method implementations.
-* Fixed a `NoSuchElementException` bug with `GroupXXXStep` where if the reduced `TraverserSet` is empty, don't add the key/value.
-* Fixed a `NullPointerException` bug with profiling `GroupSideEffectStep` in OLTP.
-* Improved ability to release resources in `GraphProvider` instances in the test suite.
-* Factored `GremlinPlugin` functionality out of gremlin-groovy and into gremlin-core - related classes were deprecated.
-* Added a `force` option for killing sessions without waiting for transaction close or timeout of a currently running job or multiple jobs.
-* Deprecated `Session.kill()` and `Session.manualKill()`.
-* Added `Traversal.promise()` method to allow for asynchronous traversal processing on "remote" traversals.
-* Deprecated `RemoteConnection.submit(Bytecode)` in favor of `submitAsync(Bytecode)`.
-* Added `choose(predicate,traversal)` and `choose(traversal,traversal)` to effect if/then-semantics (no else). Equivalent to `choose(x,y,identity())`.
-* Removed `ImmutablePath.TailPath` as it is no longer required with new recursion model.
-* Removed call stack recursion in `ImmutablePath`.
-* Gremlin-Python serializes `Bytecode` as an object (instead of a JSON string) when submit over the `RemoteConnection`.
-* Fixed the handling of the `DriverRemoteConnection` pass-through configurations to the driver.
-* `IncidentToAdjacentStrategy` now uses a hidden label marker model to avoid repeated recursion for invalidating steps.
-* `PathProcessorStrategy` can inline certain `where(traversal)`-steps in order to increase the likelihood of star-local children.
-* `SparkGraphComputer` no longer starts a worker iteration if the worker's partition is empty.
-* Added `ProjectStep.getProjectKeys()` for strategies that rely on such information.
-* Added `VertexFeatures.supportsDuplicateMultiProperties()` for graphs that only support unique values in multi-properties.
-* Deprecated the "performance" tests in `OptIn`.
-* Deprecated `getInstance()` methods in favor of `instance()` for better consistency with the rest of the API.
-* Block calls to "remote" traversal side-effects until the traversal read is complete which signifies an end to iteration.
-* Added `Pick.none` and `Pick.any` to the serializers and importers.
-* Added a class loader to `TraversalStrategies.GlobalCache` which guarantees strategies are registered prior to `GlobalCache.getStrategies()`.
-* Fixed a severe bug where `GraphComputer` strategies are not being loaded until the second use of the traversal source.
-* The root traversal now throws regular `NoSuchElementException` instead of `FastNoSuchElementException`. (*breaking*)
-* Added a short sleep to prevent traversal from finishing before it can be interrupted during `TraversalInterruptionComputerTest`.
-* Added support for SSL client authentication
-
-==== Bugs
-
-* TINKERPOP-1380 dedup() doesn't dedup in rare cases
-* TINKERPOP-1384 Description of filter function in traversal documentation
-* TINKERPOP-1428 profile() throws NPE for union(group, group)
-* TINKERPOP-1521 Mutating steps don't recognize side-effects
-* TINKERPOP-1525 Plug VertexProgram iteration leak on empty Spark RDD partitions
-* TINKERPOP-1534 Gremlin Server instances leaking in tests
-* TINKERPOP-1537 Python tests should not use hard-coded number of workers
-* TINKERPOP-1547 Two bugs found associated with MatchStep: Path retraction and range count.
-* TINKERPOP-1548 Traversals can complete before interrupted in TraversalInterruptionComputerTest
-* TINKERPOP-1560 Cache in GroovyClassLoader may continue to grow
-* TINKERPOP-1561 gremiln-python GraphSONWriter doesn't properly serialize long in Python 3.5
-* TINKERPOP-1567 GraphSON deserialization fails with within('a')
-* TINKERPOP-1573 Bindings don't work in coalesce
-* TINKERPOP-1576 gremlin-python calls non-existent methods
-* TINKERPOP-1581 Gremlin-Python driver connection is not thread safe.
-* TINKERPOP-1583 PathRetractionStrategy retracts keys that are actually needed
-* TINKERPOP-1585 OLAP dedup over non elements
-* TINKERPOP-1587 Gremlin Server Subgraph Cardinality Not Respected
-* TINKERPOP-1594 LazyBarrierStrategy does not activate with ProfileStep
-* TINKERPOP-1605 gremlin-console 3.2.3 -e can no longer take paths relative to current working directory
-
-==== Improvements
-
-* TINKERPOP-887 FastNoSuchElementException hides stack trace in client code
-* TINKERPOP-919 Features needs to specify whether 2 vertex properties with same key/value is allowed.
-* TINKERPOP-932 Add ability to cancel script execution associated with a Gremlin Server Session
-* TINKERPOP-1248 OrderGlobalStep should use local star graph to compute sorts, prior to reduction.
-* TINKERPOP-1261 Side-effect group().by() can't handle user-defined maps
-* TINKERPOP-1292 TinkerGraphComputer VertexProgramInterceptors
-* TINKERPOP-1372 ImmutablePath should not use Java recursion (call stacks are wack)
-* TINKERPOP-1433 Add steps to dev docs to help committers get their keys in order
-* TINKERPOP-1434 Block calls to traversal side-effects until read is complete
-* TINKERPOP-1471 IncidentToAdjacentStrategy use hidden marker to avoid repeated recursion.
-* TINKERPOP-1473 Given PathRetractionStrategy, PathProcessorStrategy can be extended to support partial where() inlining.
-* TINKERPOP-1482 has(x).has(y) chains should be has(x.and(y))
-* TINKERPOP-1490 Provider a Future based Traversal.async(Function<Traversal,V>) terminal step
-* TINKERPOP-1502 Chained has()-steps should simply left-append HasContainers in Gremlin-Java.
-* TINKERPOP-1507 Pick.any and Pick.none are not in GraphSON or Gremlin-Python
-* TINKERPOP-1508 Add choose(predicate,trueTraversal)
-* TINKERPOP-1527 Do not override registered strategies in TraversalStrategies.GlobalCache
-* TINKERPOP-1530 Consistent use of instance()
-* TINKERPOP-1539 Create a ComplexTraversalTest with crazy nested gnarly traversals.
-* TINKERPOP-1542 Add Path.isEmpty() with a default implementation.
-* TINKERPOP-1562 Migrate ScriptEngine-related code to gremlin-core
-* TINKERPOP-1570 Bump to Netty 4.0.42
-* TINKERPOP-1582 TraversalOpProcessor does not support custom serializers
-* TINKERPOP-1584 Add gryo serializers to support types covered in GraphSON
-* TINKERPOP-1588 Added Terminal Steps section to the docs
-* TINKERPOP-1589 Re-Introduce CloseableIterator
-* TINKERPOP-1590 Create TinkerWorkerMemory and Partitioned Vertices
-* TINKERPOP-1600 Consistent use of base 64 encoded bytes for SASL negotiation
-* TINKERPOP-1602 Support SSL client certificate authentication
-* TINKERPOP-1606 Refactor GroupStep to not have the reduction traversal included in its BiOperator.
-* TINKERPOP-1610 Deprecate gremlin-groovy-test provider based tests
-* TINKERPOP-1617 Create a SingleIterationStrategy which will do its best to rewrite OLAP traversals to not message pass.
+Please see the archived <<./docs/archive/changelogs/changelog-3.2.x.asciidoc#release-3-2-4, 3.2.4 changelog>>.
[[release-3-2-3]]
=== TinkerPop 3.2.3 (Release Date: October 17, 2016)
-This release also includes changes from <<release-3-1-5, 3.1.5>>.
-
-* Restructured Gremlin-Python's GraphSON I/O package to make it easier for users to register serializers/deserializers. (*breaking*)
-* Fixed a bug with `TraversalOpProcessor` that was returning a final result prior to committing the transaction.
-* Fixed a bug in `ConnectiveStrategy` where infix and/or was not correctly reasoning on `choose()` `HasNextStep` injections.
-* Increased performance of `CredentialGraph` authentication.
-* Removed Java 8 stream usage from `TraversalHelper` for performance reasons.
-* Fixed a bug in `RepeatStep` where `emit().as('x')` wasn't adding the step labels to the emit-traverser.
-* Added `GraphComputing.atMaster(boolean)` to allow steps to know whether they are executing at master or distributed at workers.
-* Fixed a bug in OLAP where `DedupGlobalStep` wasn't de-duping local master traversers.
-* Added `HasContainerHolder.removeHasContainer()`-method with default `UnsupportedOperationException` implementation.
-* `TraversalSource.withComputer()` is simplified to add a `VertexProgramStrategy`. Easier for language variants.
-* Fixed a `Set`, `List`, `Map` bug in the various `Translators` where such collections were not being internally translated.
-* Fixed a `Bytecode` bug where nested structures (map, list, set) were not being analyzed for bindings and bytecode conversions.
-* Fixed a `String` bug in `GroovyTranslator` and `PythonTranslator` where if the string has double-quotes it now uses """ """.
-* Added a default `TraversalStrategy.getConfiguration()` which returns the configuration needed to construct the strategy.
-* `Computer` instances can be created with `Computer.create(Configuration)` and accessed via `Computer.getConf()`.
-* Every `TraversalStrategy` can be created via a `Configuration` and a static `MyStrategy.create(Configuration)`.
-* Added language-agnostic `TraversalStrategy` support in `Bytecode`.
-* Added `PartitionStrategy.Builder.readPartitions()` and deprecated `PartitionStrategy.Builder.addPartition()`.
-* A new version of `LazyBarrierStrategy` has been created and added to the default strategies.
-* `FilterRankStrategy` now propagates labels "right" over non-`Scoping` filters.
-* Fixed a bug in `ConnectiveP` where nested equivalent connectives should be inlined.
-* Fixed a bug in `IncidentToAdjacentStrategy` where `TreeStep` traversals were allowed.
-* Fixed a end-step label bug in `MatchPredicateStrategy`.
-* Fixed a bug in `MatchPredicateStrategy` where inlined traversals did not have strategies applied to it.
-* Fixed a bug in `RepeatUnrollStrategy` where inlined traversal did not have strategies applied to it.
-* Fixed padding of prompt in Gremlin Console when the number of lines went beyond a single digit.
-* Fixed GraphSON 2.0 namespace for `TinkerGraph` to be "tinker" instead of "gremlin".
-* Dropped serialization support in GraphSON 2.0 for `Calendar`, `TimeZone`, and `Timestamp`.
-* Added `TraversalHelper.copyLabels()` for copying (or moving) labels form one step to another.
-* Added `TraversalHelper.applySingleLevelStrategies()` which will apply a subset of strategies but not walk the child tree.
-* Added the concept that hidden labels using during traversal compilation are removed at the end during `StandardVerificationStrategy`. (*breaking*)
-* Added `InlineFilterStrategy` which will determine if various `TraversalParent` children are filters and if so, inline them.
-* Removed `IdentityRemovalStrategy` from the default listing as its not worth the clock cycles.
-* Removed the "!" symbol in `NotStep.toString()` as it is confusing and the `NotStep`-name is sufficient.
-* Fixed a bug in `TraversalVertexProgram` (OLAP) around ordering and connectives (i.e. `and()` and `or()`).
-* Added `AbstractGremlinProcessTest.checkOrderedResults()` to make testing ordered results easier.
-* `AbstractLambdaTraversal` now supports a `bypassTraversal` where it is possible for strategies to redefine such lambda traversals.
-* Added an internal utility `ClassFilterStep` which determines if the traverser object's class is an instance of the provided class.
-* `ConnectiveStep` extends `FilterStep` and thus, is more appropriately categorized in the step hierarchy.
-* `PropertyMapStep` supports a provided traversal for accessing the properties of the element. (*breaking*)
-* `SubgraphStrategy` now supports vertex property filtering.
-* Fixed a bug in Gremlin-Python `P` where predicates reversed the order of the predicates.
-* Added tests to `DedupTest` for the `dedup(Scope, String...)` overload.
-* Added more detailed reference documentation for IO formats.
-* Fixed a bug in serialization of `Lambda` instances in GraphSON, which prevented their use in remote traversals.
-* Fixed a naming bug in Gremlin-Python where `P._and` and `P._or` should be `P.and_` and `P.or_`. (*breaking*)
-* `where()` predicate-based steps now support `by()`-modulation.
-* Added Gryo serialization for `Bytecode`.
-* Moved utility-based serializers to `UtilSerializers` for Gryo - these classes were private and hence this change is non-breaking.
-* `TraversalRing` returns a `null` if it does not contain traversals (previously `IdentityTraversal`).
-* Deprecated `Graph.Exceptions.elementNotFoundException()` as it was not used in the code base outside of the test suite.
-* Fixed a `JavaTranslator` bug where `Bytecode` instructions were being mutated during translation.
-* Added `Path` to Gremlin-Python with respective GraphSON 2.0 deserializer.
-* `Traversal` and `TraversalSource` now implement `AutoCloseable`.
-* Added "keep-alive" functionality to the Java driver, which will send a heartbeat to the server when normal request activity on a connection stops for a period of time.
-* Renamed the `empty.result.indicator` preference to `result.indicator.null` in Gremlin Console
-* If `result.indicator.null` is set to an empty string, then no "result line" is printed in Gremlin Console.
-* Deprecated `reconnectInitialDelay` on the Java driver.
-* Added some validations to `Cluster` instance building.
-* Produced better errors in `readGraph` of `GryoReader` and `GraphSONReader` if a `Vertex` cannot be found in the cache on edge loading.
-* VertexPrograms can now declare traverser requirements, e.g. to have access to the path when used with `.program()`.
-* New build options for `gremlin-python` where `-DglvPython` is no longer required.
-* Added missing `InetAddress` to GraphSON extension module.
-* Added new recipe for "Pagination".
-* Added new recipe for "Recommendation".
-* Added functionality to Gremlin-Server REST endpoint to forward Exception Messages and Class in HTTP Response
-* Gremlin Server `TraversalOpProcessor` now returns confirmation upon `Op` `close`.
-* Added `close` method Java driver and Python driver `DriverRemoteTraversalSideEffects`.
-
-==== Bugs
-
-* TINKERPOP-1423 IncidentToAdjacentStrategy should be disabled for tree steps
-* TINKERPOP-1440 g:Path needs a GraphSON deserializer in Gremlin-Python
-* TINKERPOP-1457 Groovy Lambdas for remote traversals not serializable
-* TINKERPOP-1458 Gremlin Server doesn't return confirmation upon Traversal OpProcessor "close" op
-* TINKERPOP-1466 PeerPressureTest has been failing recently
-* TINKERPOP-1472 RepeatUnrollStrategy does not semi-compile inlined repeat traversal
-* TINKERPOP-1476 TinkerGraph does not get typed with the right type name in GraphSON
-* TINKERPOP-1495 Global list deduplication doesn't work in OLAP
-* TINKERPOP-1500 and/or infix and choose() do not work correctly.
-* TINKERPOP-1511 Remote client addV, V()
-
-==== Improvements
-
-* TINKERPOP-790 Implement AutoCloseable on TraversalSource
-* TINKERPOP-944 Deprecate Graph.Exceptions.elementNotFound
-* TINKERPOP-1189 SimpleAuthenticator over HttpChannelizer makes Gremlin Server pretty slow and consumes more CPU
-* TINKERPOP-1249 Gremlin driver to periodically issue ping / heartbeat to gremlin server
-* TINKERPOP-1280 VertexPrograms should declare traverser requirements
-* TINKERPOP-1330 by()-modulation for where()
-* TINKERPOP-1409 Make the "null" return in the gremlin console into something more understandable *(breaking)*
-* TINKERPOP-1431 Documentation generation requires tests to execute on gremlin-python
-* TINKERPOP-1437 Add tests for dedup(Scope) in DedupTest
-* TINKERPOP-1444 Benchmark bytecode->Traversal creation and implement GremlinServer cache if necessary.
-* TINKERPOP-1448 gremlin-python should be Python 2/3 compatible
-* TINKERPOP-1449 Streamline gremlin-python build
-* TINKERPOP-1455 Provide String-based withStrategy()/withoutStrategy() for language variant usage
-* TINKERPOP-1456 Support SubgraphStrategy.vertexProperties().
-* TINKERPOP-1460 Deprecate reconnectInitialDelay in Java driver
-* TINKERPOP-1464 Gryo Serialization for Bytecode
-* TINKERPOP-1469 Get rid of Stream-usage in TraversalHelper
-* TINKERPOP-1470 InlineFilterStrategy should try and P.or() has() children in OrSteps.
-* TINKERPOP-1486 Improve API of RemoteConnection
-* TINKERPOP-1487 Reference Documentation for IO
-* TINKERPOP-1488 Make LazyBarrierStrategy part of the default TraversalStrategies *(breaking)*
-* TINKERPOP-1492 RemoteStrategy or the RemoteConnection should append a lazy barrier().
-* TINKERPOP-1423 IncidentToAdjacentStrategy should be disabled for tree steps
-* TINKERPOP-1440 g:Path needs a GraphSON deserializer in Gremlin-Python
-* TINKERPOP-1457 Groovy Lambdas for remote traversals not serializable
-* TINKERPOP-1458 Gremlin Server doesn't return confirmation upon Traversal OpProcessor "close" op
-* TINKERPOP-1466 PeerPressureTest has been failing recently
-* TINKERPOP-1472 RepeatUnrollStrategy does not semi-compile inlined repeat traversal
-* TINKERPOP-1495 Global list deduplication doesn't work in OLAP
-* TINKERPOP-1500 and/or infix and choose() do not work correctly.
-* TINKERPOP-1511 Remote client addV, V()
+Please see the archived <<./docs/archive/changelogs/changelog-3.2.x.asciidoc#release-3-2-3, 3.2.3 changelog>>.
[[release-3-2-2]]
=== TinkerPop 3.2.2 (Release Date: September 6, 2016)
-This release also includes changes from <<release-3-1-4, 3.1.4>>.
-
-* Included GraphSON as a default serializer (in addition to Gryo, which was already present) in Gremlin Server if none are defined.
-* Added `gremlin-python` package as a Gremlin language variant in Python.
-* Added `Bytecode` which specifies the instructions and arguments used to construct a traversal.
-* Created an experimental GraphSON representation of `Bytecode` that will be considered unstable until 3.3.0.
-* Added `Translator` which allows from the translation of `Bytecode` into some other form (e.g. script, `Traversal`, etc.).
-* Added `JavaTranslator`, `GroovyTranslator`, `PythonTranslator`, and `JythonTranslator` for translating `Bytecode` accordingly.
-* Added `TranslationStrategy` to `gremlin-test` so translators can be tested against the process test suite.
-* Added `Traversal.Admin.nextTraverser()` to get the next result in bulk-form (w/ default implementation).
-* Added `TraversalSource.getAnonymousTraversalClass()` (w/ default implementation).
-* Added `GremlinScriptEngine` interface which specifies a `eval(Bytecode, Bindings)` method.
-* Deprecated `RemoteGraph` in favor of `TraversalSource.withRemote()` as it is more technically correct to tie a remote traversal to the `TraversalSource` than a `Graph` instance.
-* `GremlinGroovyScriptEngine` implements `GremlinScriptEngine`.
-* Added `GremlinJythonScriptEngine` which implements `GremlinScriptEngine`.
-* Removed support for submitting a Java serialized `Traversal` to Gremlin Server.
-* Removed a largely internal feature that supported automatic unrolling of traversers in the Gremlin Driver.
-* Made it possible to directly initialize `OpProcessor` implementations with server `Settings`.
-* Included GraphSON as a default serializer (in addition to Gryo, which was already present) in Gremlin Server if none are defined
-* Introduced GraphSON 2.0.
-* Deprecated `embedTypes` on the builder for `GraphSONMapper`.
-* Bumped to Netty 4.0.40.final.
-* Defaulted the `gremlinPool` setting in Gremlin Server to be zero, which will instructs it to use `Runtime.availableProcessors()` for that settings.
-* Changed scope of log4j dependencies so that they would only be used in tests and the binary distributions of Gremlin Console and Server.
-* Deprecated `Io.Builder.registry()` in favor of the newly introduced `Io.Builder.onMapper()`.
-* Added new recipe for "Traversal Induced Values".
-* Fixed a potential leak of a `ReferenceCounted` resource in Gremlin Server.
-* Added class registrations for `Map.Entry` implementations to `GryoMapper`.
-* Added methods to retrieve `Cluster` settings in `gremlin-driver`.
-* Fixed a severe bug in `SubgraphStrategy`.
-* Deprecated `SubgraphStrategy.Builder.vertexCriterion()/edgeCriterion()` in favor of `vertices()/edges()`.
-* Fixed a small bug in `StandardVerificationStrategy` that caused verification to fail when `withPath` was used in conjunction with `ProfileStep`.
-* Added color preferences
-* Added input, result prompt preferences
-* Added multi-line indicator in Gremlin Console
-
-==== Bugs
-
-* TINKERPOP-810 store not visible
-* TINKERPOP-1151 slf4j-log4j12 / log4j is only required for testing *(breaking)*
-* TINKERPOP-1383 publish-docs.sh might publish to current too early
-* TINKERPOP-1390 IdentityRemoveStrategyTest fails randomly
-* TINKERPOP-1400 SubgraphStrategy introduces infinite recursion if filter has Vertex/Edge steps.
-* TINKERPOP-1405 profile() doesn't like withPath()
-
-==== Improvements
-
-* TINKERPOP-1037 Gremlin shell output coloring
-* TINKERPOP-1226 Gremlin Console should :clear automagically after "Display stack trace."
-* TINKERPOP-1230 Serialising lambdas for RemoteGraph
-* TINKERPOP-1274 GraphSON Version 2.0
-* TINKERPOP-1278 Implement Gremlin-Python and general purpose language variant test infrastructure
-* TINKERPOP-1285 Gremline console does not differentiate between multi-line and single-line input
-* TINKERPOP-1334 Provide a way to pull gremlin.driver.Cluster connection settings.
-* TINKERPOP-1347 RemoteConnection needs to provide TraversalSideEffects. *(breaking)*
-* TINKERPOP-1373 Default gremlinPool to number of cores
-* TINKERPOP-1386 Bump to Netty 4.0.40.Final
-* TINKERPOP-1392 Remove support for java serialized Traversal *(breaking)*
-* TINKERPOP-1394 Fix links in Recipes doc
-* TINKERPOP-1396 Traversal Induced Values Recipe
-* TINKERPOP-1402 Impossible for graph implementations to provide a class resolver for Gryo IO
-* TINKERPOP-1407 Default serializers for Gremlin Server
-* TINKERPOP-1425 Use trailing underscores in gremlin-python
+Please see the archived <<./docs/archive/changelogs/changelog-3.2.x.asciidoc#release-3-2-2, 3.2.2 changelog>>.
[[release-3-2-1]]
=== TinkerPop 3.2.1 (Release Date: July 18, 2016)
-This release also includes changes from <<release-3-1-3, 3.1.3>>.
-
-* `PathProcessor` steps now have the ability (if configured through a strategy) to drop `Traverser` path segments.
-* `MatchStep` in OLTP has a lazy barrier to increase the probability of bulking.
-* Added `PathRetractionStrategy` which will remove labeled path segments that will no longer be referenced.
-* Added `Path.retract()` to support retracting paths based on labels.
-* Optimized `ImmutablePath` and `MutablePath` equality code removing significant unnecessary object creation code.
-* Bumped to Groovy 2.4.7.
-* Added `RepeatUnrollStrategy` to linearize a `repeat()`-traversal if loop amount is known at compile time.
-* Fixed a bug in `BranchStep` around child integration during `clone()`.
-* Fixed a bug in `AbstractStep` around label set cloning.
-* Added `TraversalStrategyPerformanceTest` for verifying the performance gains of optimization-based traversal strategies.
-* `TraversalExplanation.prettyPrint()` exists which provides word wrapping and GremlinConsole is smart to use console width to control `toString()`.
-* `TraversalOpProcessor` (`RemoteConnection`) uses `HaltedTraverserStrategy` metadata to determine detachment procedure prior to returning results.
-* Allow DFS paths in `HADOOP_GREMLIN_LIBS`.
-* Added a safer serializer infrastructure for use with `SparkGraphComputer` that uses `KryoSerializer` and the new `GryoRegistrator`.
-* Added `HaltedTraverserStrategy` to allow users to get back different element detachments in OLAP.
-* Fixed a `NullPointerException` bug around nested `group()`-steps in OLAP.
-* Fixed a severe bug around halted traversers in a multi-job OLAP traversal chain.
-* Ensure a separation of `GraphComputer` and `VertexProgram` configurations in `SparkGraphComputer` and `GiraphGraphComputer`.
-* `PeerPressureVertexProgram` now supports dynamic initial vote strength calculations.
-* Added `EmptyMemory` for ease of use when no memory exists.
-* Updated `VertexComputing.generateProgram()` API to include `Memory`. *(breaking)*
-* `ImmutablePath.TailPath` is now serializable like `ImmutablePath`.
-* Added `ConfigurationCompilerProvider` which allows fine-grained control of some of the internal `GremlinGroovyScriptEngine` settings at the Groovy compilation level.
-* Introduced the `application/vnd.gremlin-v1.0+gryo-lite` serialization type to Gremlin Server which users "reference" elements rather than "detached".
-* `GryoMapper` allows overrides of existing serializers on calls to `addCustom` on the builder.
-* Added a traversal style guide to the recipes cookbook.
-* Fixed a bug in master-traversal traverser propagation.
-* Added useful methods for custom `VertexPrograms` to be used with `program()`-step.
-* Increased the test coverage around traverser propagation within a multi-job OLAP traversal.
-* Added tests to validate the status of a transaction immediately following calls to close.
-* Added tests to ensure that threaded transactions cannot be re-used.
-* `GraphFilter` helper methods are now more intelligent when determining edge direction/label legality.
-* Added `GraphFilterStrategy` to automatically construct `GraphFilters` via traversal introspection in OLAP.
-* Updated the Gephi Plugin to support Gephi 0.9.x.
-* Increased the testing and scope of `TraversalHelper.isLocalStarGraph()`.
-* Changed signature of `get_g_VXlistXv1_v2_v3XX_name` and `get_g_VXlistX1_2_3XX_name` of `VertexTest` to take arguments for the `Traversal` to be constructed by extending classes.
-* Added `VertexProgramInterceptor` interface as a general pattern for `GraphComputer` providers to use for bypassing `GraphComputer` semantics where appropriate.
-* Added `SparkStarBarrierInterceptor` that uses Spark DSL for local star graph traversals that end with a `ReducingBarrierStep`.
-* Added `SparkInterceptorStrategy` which identifies which interceptor to use (if any) given the submitted `VertexProgram`.
-* Added `SparkSingleIterationStrategy` that does not partition nor cache the graph RDD if the traversal does not message pass.
-* Added more helper methods to `TraversalHelper` for handling scoped traversal children.
-* Deprecated all "performance" tests based on "JUnit Benchmarks".
-* `SparkGraphComputer` no longer shuffles empty views or empty outgoing messages in order to save time and space.
-* `TraversalVertexProgram` no longer maintains empty halted traverser properties in order to save space.
-* Added `List<P<V>>` constructors to `ConnectiveP`, `AndP`, and `OrP` for ease of use.
-* Added support for interactive (`-i`) and execute (`-e`) modes for Gremlin Console.
-* Displayed line numbers for script execution failures of `-e` and `-i`.
-* Improved messaging around script execution errors in Gremlin Console.
-* Added "help" support to Gremlin Console with the `-h` flag.
-* Added options to better control verbosity of Gremlin Console output with `-Q`, `-V` and `-D`.
-* Deprecated the `ScriptExecutor` - the `-e` option to `gremlin.sh` is now handled by `Console`.
-* `Traversal` now allows cancellation with `Thread.interrupt()`.
-* Added a Gremlin language variant tutorial teaching people how to embed Gremlin in a host programming language.
-
-==== Bugs
-
-* TINKERPOP-1281 Memory.HALTED_TRAVERSER transience is not sound.
-* TINKERPOP-1305 HALTED_TRAVERSERS hold wrong information
-* TINKERPOP-1307 NPE with OLTP nested group() in an OLAP group() traversal
-* TINKERPOP-1323 ComputerVerificationStrategy fails for nested match() steps
-* TINKERPOP-1341 UnshadedKryoAdapter fails to deserialize StarGraph when SparkConf sets spark.rdd.compress=true whereas GryoSerializer works
-* TINKERPOP-1348 TraversalInterruptionTest success dependent on iteration order
-
-==== Improvements
-
-* TINKERPOP-818 Consider a P.type()
-* TINKERPOP-946 Traversal respecting Thread.interrupt()
-* TINKERPOP-947 Enforce semantics of threaded transactions as manual *(breaking)*
-* TINKERPOP-1059 Add test to ensure transaction opening happens at read/write and not on close *(breaking)*
-* TINKERPOP-1071 Enhance pre-processor output
-* TINKERPOP-1091 Get KryoSerializer to work natively. *(breaking)*
-* TINKERPOP-1120 If there is no view nor messages, don't create empty views/messages in SparkExecutor
-* TINKERPOP-1144 Improve ScriptElementFactory
-* TINKERPOP-1155 gremlin.sh -e doesn't log line numbers for errors
-* TINKERPOP-1156 gremlin.sh could use a help text
-* TINKERPOP-1157 gremlin.sh should allow you to execute a script and go interactive on error or completion
-* TINKERPOP-1232 Write a tutorial demonstrating the 3 ways to write a Gremlin language variant.
-* TINKERPOP-1254 Support dropping traverser path information when it is no longer needed.
-* TINKERPOP-1268 Improve script execution options for console *(breaking)*
-* TINKERPOP-1273 Deprecate old performance tests
-* TINKERPOP-1276 Deprecate serializedResponseTimeout
-* TINKERPOP-1279 Add Iterable<V> parameter constructor to ConnectiveP subclasses
-* TINKERPOP-1282 Add more compliance tests around how memory and vertex compute keys are propagated in chained OLAP.
-* TINKERPOP-1286 Add Recipes documentation
-* TINKERPOP-1288 Support gremlin.spark.skipPartitioning configuration.
-* TINKERPOP-1290 Create VertexProgramInterceptor as a pattern for GraphComputer strategies.
-* TINKERPOP-1293 Implement GraphFilterStrategy as a default registration for GraphComputer
-* TINKERPOP-1294 Deprecate use of junit-benchmarks
-* TINKERPOP-1297 Gephi plugin on Gephi 0.9.x *(breaking)*
-* TINKERPOP-1299 Refactor TraversalVertexProgram to make it easier to understand.
-* TINKERPOP-1308 Serialize to "reference" for Gremlin Server
-* TINKERPOP-1310 Allow OLAP to return properties as Detached
-* TINKERPOP-1321 Loosen coupling between TinkerPop serialization logic and shaded Kryo
-* TINKERPOP-1322 Provide fine-grained control of CompilerConfiguration
-* TINKERPOP-1328 Provide [gremlin-python] as an code executor in docs
-* TINKERPOP-1331 HADOOP_GREMLIN_LIBS can only point to local file system
-* TINKERPOP-1332 Improve .explain() Dialogue
-* TINKERPOP-1338 Bump to Groovy 2.4.7
-* TINKERPOP-1349 RepeatUnrollStrategy should unroll loops while maintaining equivalent semantics.
-* TINKERPOP-1355 Design HasContainer for extension
+Please see the archived <<./docs/archive/changelogs/changelog-3.2.x.asciidoc#release-3-2-1, 3.2.1 changelog>>.
[[release-3-2-0-incubating]]
=== TinkerPop 3.2.0 (Release Date: April 8, 2016)
-This release also includes changes from <<release-3-1-2-incubating, 3.1.2-incubating>>.
-
-* Bumped to Neo4j 2.3.3.
-* Renamed variable `local` to `fs` in `HadoopGremlinPlugin` to avoid a naming conflict with `Scope.local`. *(breaking)*
-* Added `GraphTraversal.optional()` which will use the inner traversal if it returns results, else it won't.
-* `GroupStep` and `GroupSideEffectStep` make use of mid-traversal reducers to limit memory consumption in OLAP.
-* Added `GraphTraversal.program(VertexProgram)` to allow arbitrary user vertex programs in OLAP.
-* Added `GraphTraversal.project()` for creating a `Map<String,E>` given the current traverser and an arbitrary number of `by()`-modulators.
-* `HADOOP_GREMLIN_LIBS` can now reference a directory in HDFS and will be used if the directory does not exist locally.
-* Added `gremlin-benchmark` module with JMH benchmarking base classes that can be used for further benchmark development.
-* `TraversalStrategies.GlobalCache` supports both `Graph` and `GraphComputer` strategy registrations.
-* `select("a","b").by("name").by("age")`-style traversals now work in OLAP with new `PathProcessorStrategy`.
-* `DedupGlobalStep` can now handle star-bound `by()`-modulators and scoped keys on `GraphComputer`.
-* Added `Computer` which is a builder for `GraphComputers` that is serializable.
-* `PersistedOutputRDD` now implements `PersistResultGraphAware` and thus, no more unneeded warnings when using it.
-* Renamed `StandardTraversalMetrics` to `DefaultTraversalMetrics` given the `DefaultXXX`-convention throughout. *(breaking)*
-* Bumped to Apache Hadoop 2.7.2.
-* Fixed a bug around profiling and nested traversals.
-* Added `gremlin.hadoop.defaultGraphComputer` so users can use `graph.compute()` with `HadoopGraph`.
-* Added `gremlin.hadoop.graphReader` and `gremlin.hadoop.graphWriter` which can handled `XXXFormats` and `XXXRDDs`.
-* Deprecated `gremlin.hadoop.graphInputFormat`, `gremlin.hadoop.graphOutputFormat`, `gremlin.spark.graphInputRDD`, and `gremlin.spark.graphOutputRDD`.
-* If no configuration is provided to `HadoopPools` it uses the default configuration to create a pool once and only once per JVM.
-* Implemented `RemoteGraph`, `RemoteConnection`, and `RemoteStrategy`.
-* Added validation to `GryoMapper` Kryo identifiers before construction to prevent accidental duplicates.
-* Added `GraphStep.addIds()` which is useful for `HasContainer` "fold ins."
-* Added a static `GraphStep.processHashContainerIds()` helper for handling id-based `HasContainers`.
-* `GraphStep` implementations should have `g.V().hasId(x)` and `g.V(x)` compile equivalently. *(breaking)*
-* Optimized `ExpandableStepIterator` with simpler logic and increased the likelihood of bulking.
-* Optimized `TraverserRequirement` calculations.
-* `Step.addStart()` and `Step.addStarts()` now take `Traverser.Admin<S>` and `Traverser.Admin<S>`, respectively. *(breaking)*
-* `Step.processNextStart()` and `Step.next()` now return `Traverser.Admin<E>`. *(breaking)*
-* `Traversal.addTraverserRequirement()` method removed. *(breaking)*
-* Fixed a `hashCode()` bug in `OrderGlobalStep` and `OrderLocalStep`.
-* Added `OrderLimitStrategy` which will ensure that partitions are limited before being merged in OLAP.
-* `ComparatorHolder` now separates the traversal from the comparator. *(breaking)*
-* Bumped to Apache Spark 1.6.1.
-* If no Spark serializer is provided then `GryoSerializer` is the default, not `JavaSerializer`.
-* Added `Operator.sumLong` as a optimized binary operator intended to be used by `Memory` reducers that know they are dealing with longs.
-* Traversers from `ComputerResultStep` are no longer attached. Attaching is only used in TinkerPop's test suite via `System.getProperties()`.
-* Fixed a `hashCode()`/`equals()` bug in `MessageScope`.
-* Fixed a severe `Traversal` cloning issue that caused inconsistent `TraversalSideEffects`.
-* `TraversalSideEffects` remain consistent and usable across multiple chained OLAP jobs.
-* Added `MemoryTraversalSideEffects` which wraps `Memory` in a `TraversalSideEffects` for use in OLAP.
-* `TraversalSideEffects` are now fully functional in OLAP save that an accurate global view is possible at the start of an iteration (not during).
-* Updated the `TraversalSideEffects` API to support registered reducers and updated `get()`-semantics. *(breaking)*
-* Split existing `profile()` into `ProfileStep` and `ProfileSideEffectStep`.
-* The `profile()`-step acts like a reducing barrier and emits `TraversalMetrics` without the need for `cap()`. *(breaking)*
-* Added `LocalBarrier` interface to allow traversers to remain distributed during an iteration so as to reduce cluster traffic.
-* Added `NoOpBarrierStep` as a `LocalBarrier` implementation of `LambdaCollectingBarrierStep(noOp)`.
-* `AggregateStep` implements `LocalBarrier` and thus, doesn't needlessly communicate its barrier traversers.
-* Fixed an OLAP-based `Barrier` synchronization bug.
-* Fixed a semantic bug in `BranchStep` (and inheriting steps) where barriers reacted locally. *(breaking)*
-* Added `MemoryComputeKey` for specification of `Memory` keys in `VertexProgram`. *(breaking)*
-* Added `VertexComputeKey` for specification of vertex compute properties in `VertexProgram`. *(breaking)*
-* Added `and`, `or`, and `addAll` to `Operator`.
-* `Memory` API changed to support setting and adding values for reduction. *(breaking)*
-* `Memory` keys can be marked as broadcast and only those values are sent to workers on each iterator.
-* `Memory` keys can be marked transient and thus deleted at the end of the OLAP job.
-* Vertex compute keys can be marked transient and thus deleted at the end of the OLAP job.
-* `VertexProgram` API changed to support `MemoryComputeKey` and `VertexComputeKey`. *(breaking)*
-* `TraversalVertexProgram` able to execute OLAP and OLTP traversal sections dynamically within the same job.
-* Removed `FinalGet` interface as all post processing of reductions should be handled by the reducing step explicitly. *(breaking)*
-* Simplified all `SupplyingBarrierStep` implementations as they no longer require `MapReduce` in OLAP.
-* Simplified all `CollectingBarrierStep` implementations as they no longer require `MapReduce` in OLAP.
-* Simplified all `ReducingBarrierStep` implementations as they no longer require `MapReduce` in OLAP.
-* All steps in OLAP that used `MapReduce` now use `Memory` to do their reductions which expands the list of legal traversals.
-* `GroupStep` simplified with `GroupHelper.GroupMap` no longer being needed. Related to the removal of `FinalGet`.
-* OLAP side-effects that are no longer generated by `MapReduce` are simply stored in `ComputerResult.Memory` w/ no disk persistence needed. *(breaking)*
-* Added `Generate` step interface which states that there could be a final generating phase to a side-effect or reduction (e.g. `GroupStep`).
-* `Barrier` step interface is now the means by which non-parallel steps communicate with their counterparts in OLAP.
-* Added `MemoryComputing` step interface which states that the step uses `MemoryComputeKeys` for its computation in OLAP.
-* Added `PeerPressureVertexProgramStep` and `GraphTraversal.peerPressure()`.
-* Added `PureTraversal` for handling pure and compiled versions of a `Traversal`. Useful in OLAP.
-* Added `ScriptTraversal` which allows for delayed compilation of script-based `Traversals`.
-* Simplified `VertexProgram` implementations with a `PureTraversal`-model and deprecated `ConfigurationTraversal`.
-* Simplified script-based `Traversals` via `ScriptTraversal` and deprecated `TraversalScriptFunction` and `TraversalScriptHelper`.
-* Added `TimesModulating` interface which allows the `Step` to decide how a `times()`-modulation should be handled.
-* Added `ByModulating` interface which allows the `Step` to decide how a `by()`-modulation should be handled. *(breaking)*
-* Simplified the `by()`-modulation patterns of `OrderGlobalStep` and `OrderLocalStep`.
-* Added `GraphComputerTest.shouldSupportPreExistingComputeKeys()` to ensure existing compute keys are "revived." *(breaking)*
-* Added `GraphComputerTest.shouldSupportJobChaining()` to ensure OLAP jobs can be linearly chained. *(breaking)*
-* Fixed a bug in both `SparkGraphComputer` and `GiraphGraphComputer` regarding source data access in job chains.
-* Expanded job chaining test coverage for `GraphComputer` providers.
-* Added `TraversalHelper.onGraphComputer(traversal)`.
-* `MapReduce.map()` no longer has a default implementation. This method must be implemented. *(breaking)*
-* `TraversalVertexProgram` can work without a `GraphStep` start.
-* Added `PageRankVertexProgramStep` and `GraphTraversal.pageRank()`.
-* Added `TraversalVertexProgramStep` to support OLAP traversal job chaining.
-* Added `VertexProgramStrategy` which compiles multiple OLAP jobs into a single traversal.
-* Simplified the comparator model in `OrderGlobalStep` and `OrderLocalStep`.
-* Refactored `TraversalSource` model to allow fluent-method construction of `TraversalSources`.
-* Deprecated the concept of a `TraversalSource.Builder`.
-* Removed the concept of a `TraversalEngine`. All `Traversal` modulations are now mediated by `TraversalStrategies`. *(breaking)*
-* Added `SideEffectStrategy` for registering sideEffects in a spawned `Traversal`.
-* Added `SackStrategy` for registering a sack for a spawned `Traversal`.
-* Added `RequirementsStrategy` and `RequirementsStep` for adding dynamic `TraverserRequirements` to a `Traversal`.
-* Removed `EngineDependentStrategy`.
-* Renamed step interface `EngineDependent` to `GraphComputing` with method `onGraphComputer()`. *(breaking)*
-* Cleaned up various `TraversalStrategy` tests now that `TraversalEngine` no longer exists.
-* Added `GraphFilter` to support filtering out vertices and edges that won't be touched by an OLAP job.
-* Added `GraphComputer.vertices()` and `GraphComputer.edges()` for `GraphFilter` construction. *(breaking)*
-* `SparkGraphComputer`, `GiraphGraphComputer`, and `TinkerGraphComputer` all support `GraphFilter`.
-* Added `GraphComputerTest.shouldSupportGraphFilter()` which verifies all filtered graphs have the same topology.
-* Added `GraphFilterAware` interface to `hadoop-gremlin/` which tells the OLAP engine that the `InputFormat` handles filtering.
-* `GryoInputFormat` and `ScriptInputFormat` implement `GraphFilterAware`.
-* Added `GraphFilterInputFormat` which handles graph filtering for `InputFormats` that are not `GraphFilterAware`.
-* Fixed a bug in `TraversalHelper.isLocalStarGraph()` which allowed certain illegal traversals to pass.
-* Added `TraversalHelper.isLocalProperties()` to verify that the traversal does not touch incident edges.
-* `GraphReader` I/O interface now has `Optional<Vertex> readGraph(InputStream, GraphFilter)`. Default `UnsupportedOperationException`.
-* `GryoReader` does not materialize edges that will be filtered out and this greatly reduces GC and load times.
-* Created custom `Serializers` for `SparkGraphComputer` message-passing classes which reduce graph sizes significantly.
-
-==== Bugs
-
-* TINKERPOP-951 Barrier steps provide unexpected results in Gremlin OLAP
-* TINKERPOP-1057 GroupSideEffectStep doesn't use provided maps
-* TINKERPOP-1103 Two objects fighting for local variable name in Gremlin Console *(breaking)*
-* TINKERPOP-1149 TraversalXXXSteps Aren't Providing SideEffects
-* TINKERPOP-1181 select(Column) should not use a LambdaMapStep
-* TINKERPOP-1188 Semantics of BarrierSteps in TraversalParent global traversals is wrong. *(breaking)*
-* TINKERPOP-1194 explain() seems broken
-* TINKERPOP-1217 Repeated Logging of "The HadoopPools has not been initialized, using the default pool"
-
-==== Improvements
-
-* TINKERPOP-570 [Proposal] Provide support for OLAP to OLTP to OLAP to OLTP
-* TINKERPOP-575 Implement RemoteGraph
-* TINKERPOP-813 [Proposal] Make the Gremlin Graph Traversal Machine and Instruction Set Explicit
-* TINKERPOP-872 Remove GroupCountStep in favor of new Reduce-based GroupStep
-* TINKERPOP-890 Remove the concept of branch/ package. *(breaking)*
-* TINKERPOP-958 Improve usability of .profile() step.
-* TINKERPOP-962 Provide "vertex query" selectivity when importing data in OLAP. *(breaking)*
-* TINKERPOP-968 Add first class support for an optional traversal
-* TINKERPOP-971 TraversalSource should be fluent like GraphComputer *(breaking)*
-* TINKERPOP-1016 Replace junit-benchmarks with JMH
-* TINKERPOP-1021 Deprecate Order.valueIncr, Order.valueDecr, Order.keyIncr, and Order.keyDecr *(breaking)*
-* TINKERPOP-1032 Clean up the conf/hadoop configurations
-* TINKERPOP-1034 Bump to support Spark 1.5.2
-* TINKERPOP-1069 Support Spark 1.6.0
-* TINKERPOP-1082 INPUT_RDD and INPUT_FORMAT are bad, we should just have one key.
-* TINKERPOP-1112 Create GryoSerializers for the Spark Payload classes.
-* TINKERPOP-1121 FileSystemStorage needs to be smart about /.
-* TINKERPOP-1132 Messenger.receiveMessages() Iterator should .remove().
-* TINKERPOP-1140 TraversalVertexProgramStep in support of OLAP/OLTP conversions.
-* TINKERPOP-1153 Add ByModulating and TimesModulating interfaces.
-* TINKERPOP-1154 Create a ScriptTraversal which is Serializable and auto-compiles.
-* TINKERPOP-1162 Add VertexProgram.getTransientComputeKeys() for removing scratch-data. *(breaking)*
-* TINKERPOP-1163 GraphComputer's can have TraversalStrategies.
-* TINKERPOP-1164 ReducingBarriersSteps should use ComputerMemory, not MapReduce.
-* TINKERPOP-1166 Add Memory.reduce() as option to Memory implementations. *(breaking)*
-* TINKERPOP-1173 If no Serializer is provided in Configuration, use GryoSerializer by default (Spark)
-* TINKERPOP-1180 Add more optimized binary operators to Operator.
-* TINKERPOP-1192 TraversalSideEffects should support registered reducers (binary operators).
-* TINKERPOP-1193 Add a LocalBarrier interface.
-* TINKERPOP-1199 Use "MicroMetrics" as the mutator of the TraversalMetrics.
-* TINKERPOP-1206 ExpandableIterator can take a full TraverserSet at once -- Barriers.
-* TINKERPOP-1209 ComparatorHolder should returns a Pair<Traversal,Comparator>. *(breaking)*
-* TINKERPOP-1210 Provide an OrderLimitStep as an optimization.
-* TINKERPOP-1219 Create a test case that ensures the provider's compilation of g.V(x) and g.V().hasId(x) is identical *(breaking)*
-* TINKERPOP-1222 Allow default GraphComputer configuration
-* TINKERPOP-1223 Allow jars in gremlin.distributedJars to be read from HDFS
-* TINKERPOP-1225 Do a "rolling reduce" for GroupXXXStep in OLAP.
-* TINKERPOP-1227 Add Metrics for the TraversalOpProcessor
-* TINKERPOP-1234 program() step that takes arbitrary vertex programs
-* TINKERPOP-1236 SelectDenormalizationStrategy for select().by(starGraph) in OLAP.
-* TINKERPOP-1237 ProjectMap: For the Love of Die Faterland
-* TINKERPOP-1238 Re-use Client instances in RemoteGraph tests
+Please see the archived <<./docs/archive/changelogs/changelog-3.2.x.asciidoc#release-3-2-0, 3.2.0 changelog>>.
== TinkerPop 3.1.0 (A 187 On The Undercover Gremlinz)
@@ -4446,610 +913,47 @@
[[release-3-1-8]]
=== TinkerPop 3.1.8 (Release Date: August 21, 2017)
-* Fixed a `MessageScope` bug in `TinkerGraphComputer`.
-* Fixed a bug in `BigDecimal` divisions in `NumberHelper` that potentially threw an `ArithmeticException`.
-* Non-deserializable exceptions no longer added to ScriptRecordReader IOExceptions.
-
-==== Bugs
-
-* TINKERPOP-1519 TinkerGraphComputer doesn't handle multiple MessageScopes in single iteration
-* TINKERPOP-1736 Sack step evaluated by Groovy interprets numbers in an unexpected way
-* TINKERPOP-1754 Spark can not deserialise some ScriptRecordReader parse exceptions
+Please see the archived <<./docs/archive/changelogs/changelog-3.1.x.asciidoc#release-3-1-8, 3.1.8 changelog>>.
[[release-3-1-7]]
=== TinkerPop 3.1.7 (Release Date: June 12, 2017)
-* Configured Modern and The Crew graphs to work with a integer `IdManager` when `TinkerFactory.createXXX()` is called.
-* Added XSLT transform option to convert TinkerPop 2.x GraphML to 3.x GraphML.
-* Added validation to `StarVertexProperty`.
-* Bumped to Jackson 2.8.7.
-* Fixed `EventStrategy` so that newly added properties trigger events with the name of the key that was added.
-* Drop use of jitpack for the jbcrypt artifact - using the official one in Maven Central.
-* Bumped to Groovy 2.4.11.
-
-==== Improvements
-
-* TINKERPOP-1504 MutationListener doesn't provide property key on property additions
-* TINKERPOP-1608 TP2-to-TP3 GraphML XSLT
-* TINKERPOP-1633 Use org.mindrot:jbcrypt v0.4
-* TINKERPOP-1645 Bump to Groovy 2.4.9
-* TINKERPOP-1654 Upgrade to jackson-databind 2.8.6+ in gremlin-shaded
-* TINKERPOP-1659 Docker build should use maven settings.xml
-* TINKERPOP-1664 StarVertexProperty#property should throw an NPE if the value is null
+Please see the archived <<./docs/archive/changelogs/changelog-3.1.x.asciidoc#release-3-1-7, 3.1.7 changelog>>.
[[release-3-1-6]]
=== TinkerPop 3.1.6 (Release Date: February 3, 2017)
-* Fixed bug in `IncidentToAdjacentStrategy`, it was missing some invalidating steps.
-* Returned a confirmation on session close from Gremlin Server.
-* Use non-default port for running tests on Gremlin Server.
-* Fully shutdown metrics services in Gremlin Server on shutdown.
-* Deprecated `tryRandomCommit()` in `AbstractGremlinTest` - the annotation was never added in 3.1.1, and was only deprecated via javadoc.
-* Minor fixes to various test feature requirements in `gremlin-test`.
-* Allow developers to pass options to `docker run` with TINKERPOP_DOCKER_OPTS environment variable
-
-==== Bugs
-
-* TINKERPOP-1493 Groovy project doesn't build on Windows
-* TINKERPOP-1545 IncidentToAdjacentStrategy is buggy
-
-==== Improvements
-
-* TINKERPOP-1538 Gremlin Server spawned by test suites should use a different port
-* TINKERPOP-1544 Return a confirmation of session close
-* TINKERPOP-1556 Allow Hadoop to run on IPv6 systems
-* TINKERPOP-1557 Improve docker build time with this one weird trick!
-* TINKERPOP-1598 Bump to Grovy 2.4.8
+Please see the archived <<./docs/archive/changelogs/changelog-3.1.x.asciidoc#release-3-1-6, 3.1.6 changelog>>.
[[release-3-1-5]]
=== TinkerPop 3.1.5 (Release Date: October 17, 2016)
-* Improved handling of `Cluster.close()` and `Client.close()` to prevent the methods from hanging.
-* Fixed a bug in `NotStep` where child requirements were not being analyzed.
-* Fixed output redirection and potential memory leak in `GremlinGroovyScriptEngine`.
-* Corrected naming of `g_withPath_V_asXaX_out_out_mapXa_name_it_nameX` and `g_withPath_V_asXaX_out_mapXa_nameX` in `MapTest`.
-* Improved session cleanup when a close is triggered by the client.
-* Removed the `appveyor.yml` file as the AppVeyor build is no longer enabled by Apache Infrastructure.
-* Fixed TinkerGraph which was not saving on `close()` if the path only consisted of the file name.
-* Fixed a bug in `RangeByIsCountStrategy` which didn't use the `NotStep` properly.
-
-==== Bugs
-
-* TINKERPOP-1158 gremlin.sh -v emits log4j initialization errors
-* TINKERPOP-1391 issue with where filter
-* TINKERPOP-1442 Killing session should make better attempt to cleanup
-* TINKERPOP-1451 TinkerGraph persistence cannot handle a single file name as the graph location
-* TINKERPOP-1467 Improve close() operations on the Java driver
-* TINKERPOP-1478 Propogate ScriptEngine fixes from groovy to GremlinGroovyScriptEngine
-* TINKERPOP-1512 gremlin-server-classic.yaml is broken
-
-==== Improvements
-
-* TINKERPOP-927 bin/publish-docs.sh should only upload diffs.
-* TINKERPOP-1264 Improve BLVP docs
-* TINKERPOP-1477 Make DependencyGrabberTest an integration test
+Please see the archived <<./docs/archive/changelogs/changelog-3.1.x.asciidoc#release-3-1-5, 3.1.5 changelog>>.
[[release-3-1-4]]
=== TinkerPop 3.1.4 (Release Date: September 6, 2016)
-* Improved the error provided by a client-side session if no hosts were available.
-* Fixed a bug in `PropertiesTest` which assumed long id values.
-* Fixed a bug in `StarGraph` around self-edges.
-* Fixed a potential leak of a `ReferenceCounted` resource in Gremlin Server.
-* Renamed distributions to make the prefix "apache-tinkerpop-" as opposed to just "apache-".
-* Fixed a problem (previously thought resolved on 3.1.3) causing Gremlin Server to lock up when parallel requests were submitted on the same session if those parallel requests included a script that blocked indefinitely.
-* Fixed bug in `TailGlobalStep` where excess bulk was not accounted for correctly.
-
-==== Bugs
-
-* TINKERPOP-1350 Server locks when submitting parallel requests on session
-* TINKERPOP-1375 Possible ByteBuf leak for certain transactional scenarios
-* TINKERPOP-1377 Closing a remote in "console mode" has bad message
-* TINKERPOP-1379 unaccounted excess in TailGlobalStep
-* TINKERPOP-1397 StarVertex self edge has buggy interaction with graph filters
-* TINKERPOP-1419 Wrong exception when a SessionedClient is initialized with no available host
-
-==== Improvements
-
-* TINKERPOP-989 Default documentation should be reference/index.html
-* TINKERPOP-1376 Rename TinkerPop artifacts
-* TINKERPOP-1413 PropertiesTest#g_V_hasXageX_propertiesXnameX assumes that ids are longs
-* TINKERPOP-1416 Write Gremlin Server log files somewhere during doc generation
-* TINKERPOP-1418 CoreTraversalTests depend on missing functionality
+Please see the archived <<./docs/archive/changelogs/changelog-3.1.x.asciidoc#release-3-1-4, 3.1.4 changelog>>.
[[release-3-1-3]]
=== TinkerPop 3.1.3 (Release Date: July 18, 2016)
-* Fixed bug in `SubgraphStep` where features were not being checked properly prior to reading meta-properties.
-* Ensured calls to `Result.hasNext()` were idempotent.
-* Avoid hamcrest conflict by using mockito-core instead of mockito-all dependency in `gremlin-test`.
-* Fixed bug in `GremlinExecutor` causing Gremlin Server to lock up when parallel requests were submitted on the same session if those parallel requests included a script that blocked indefinitely.
-* Changed `GremlinExecutor` timeout scheduling so that the timer would not start until a time closer to the actual start of script evaluation.
-* Fixed bug in `SubgraphStrategy` where step labels were not being propogated properly to new steps injected by the strategy.
-* Fix incorrect test `FeatureRequirement` annotations.
-* Defaulted to `Edge.DEFAULT` if no edge label was supplied in GraphML.
-* Fixed bug in `IoGraphTest` causing IllegalArgumentException: URI is not hierarchical error for external graph implementations.
-* Fixed bug in `GremlinGroovyScriptEngineFileSandboxTest` resource loading
-* Improved `TinkerGraph` performance when iterating vertices and edges.
-* Fixed a bug where timeout functions provided to the `GremlinExecutor` were not executing in the same thread as the script evaluation.
-* Fixed a bug in the driver where many parallel requests over a session would sometimes force a connection to close and replace itself.
-* Graph providers should no longer rely on the test suite to validate that hyphens work for property keys.
-* Optimized a few special cases in `RangeByIsCountStrategy`.
-* Added more "invalid" variable bindings to the list used by Gremlin Server to validate incoming bindings on requests.
-* Fixed a bug where the `ConnectionPool` in the driver would not grow with certain configuration options.
-* Fixed a bug where pauses in Gremlin Server writing to an overtaxed client would generate unexpected `FastNoSuchElementException` errors.
-* Named the thread pool used by Gremlin Server sessions: "gremlin-server-session-$n".
-* Fixed a bug in `BulkSet.equals()` which made itself apparent when using `store()` and `aggregate()` with labeled `cap()`.
-* Fixed a bug where `Result.one()` could potentially block indefinitely under certain circumstances.
-* Ensured that all asserts of vertex and edge counts were being applied properly in the test suite.
-* Fixed bug in `gremlin-driver` where certain channel-level errors would not allow the driver to reconnect.
-* `SubgraphStep` now consults the parent graph features to determine cardinality of a property.
-* Use of `Ctrl-C` in Gremlin Console now triggers closing of open remotes.
-* Bumped SLF4J to 1.7.21 as previous versions suffered from a memory leak.
-* Fixed a bug in `Neo4jGraphStepStrategy` where it wasn't defined properly as a `ProviderOptimizationStrategy`.
-* Renamed `AndTest.get_g_V_andXhasXage_gt_27X__outE_count_gt_2X_name` to `get_g_V_andXhasXage_gt_27X__outE_count_gte_2X_name` to match the traversal being tested.
-* Fixed a self-loop bug in `StarGraph`.
-* Added configuration option for disabling `:remote` timeout with `:remote config timeout none`.
-* Added `init-tp-spark.sh` to Gremlin Console binary distribution.
-* Fixed bug where use of `:x` in a Gremlin Console initialization script would generate a stack trace.
-* Added configuration options to Gremlin Driver and Server to override the SSL configuration with an `SslContext`.
-* Added driver configuration settings for SSL: `keyCertChainFile`, `keyFile` and `keyPassword`.
-* Fixed bug where transaction managed sessions were not properly rolling back transactions for exceptions encountered during script evaluation.
-* Fixed bug in `:uninstall` command if the default `/ext` directory was not used.
-* Added support to Gremlin Driver to allow either plain text or GSSAPI SASL authentication allowing the client to pass the SASL mechanism in the request.
-* Improved dryRun functionality for the docs processor. It's now possible to dry run (or full run) only specific files.
-* Added precompile of `ScriptInputFormat` scripts to `ScriptRecordReader` to improve performance.
-
-==== Bugs
-
-* TINKERPOP-906 Install plugin always fails after first unresolved dependency
-* TINKERPOP-1088 Preserve Cardinality in Subgraph
-* TINKERPOP-1092 Gremlin Console init script with :x throws exception
-* TINKERPOP-1139 [Neo4JGraph] GraphTraversal with SubgraphStrategy removes addLabelStep (as("b"))
-* TINKERPOP-1196 Calls to Result.one() might block indefinitely
-* TINKERPOP-1215 Labeled a SideEffectCapStep cause problems.
-* TINKERPOP-1242 ScriptEngineTest randomly hangs indefinately.
-* TINKERPOP-1257 Bad SackTest variable use.
-* TINKERPOP-1265 Managed Session Eval Exceptions Rollback
-* TINKERPOP-1272 Gremlin Console distribution needs bin/init-tp-spark.sh
-* TINKERPOP-1284 StarGraph does not handle self-loops correctly.
-* TINKERPOP-1300 Many asserts around vertex/edge counts on graphs not applied
-* TINKERPOP-1317 IoGraphTest throws error: URI is not hierarchical
-* TINKERPOP-1318 java.lang.NoSuchMethodError: org/hamcrest/Matcher.describeMismatch
-* TINKERPOP-1319 several FeatureRequirement annotations are incorrect in gremlin-test
-* TINKERPOP-1320 GremlinGroovyScriptEngineFileSandboxTest throws error: URI is not hierarchical
-* TINKERPOP-1324 Better error for invalid args to addV()
-* TINKERPOP-1350 Server locks when submitting parallel requests on session
-* TINKERPOP-1351 Number of connections going beyond the pool max size
-* TINKERPOP-1352 Connection Pool doesn't always grow
-* TINKERPOP-1359 Exception thrown when calling subgraph() on Neo4jGraph
-* TINKERPOP-1360 intermittent error in spark-gremlin integration test
-
-==== Improvements
-
-* TINKERPOP-939 Neo4jGraph should support HighAvailability (Neo4jHA).
-* TINKERPOP-1003 Setting up latest/current links for bins and docs.
-* TINKERPOP-1020 Provide --dryRun selectivity for "half publishing" docs.
-* TINKERPOP-1063 TinkerGraph performance enhancements
-* TINKERPOP-1229 More Descriptive Messaging for :remote console
-* TINKERPOP-1260 Log for validate-distribution.sh
-* TINKERPOP-1263 Pass SASL mechanism name through with initial SASL response
-* TINKERPOP-1267 Configure Console for no timeout on remote requests
-* TINKERPOP-1269 More SSL settings for driver
-* TINKERPOP-1295 Precompile ScriptInputFormat scripts once during initialization of ScriptRecordReader
-* TINKERPOP-1301 Provide Javadoc for ScriptInput/OutputFormat's
-* TINKERPOP-1302 Ctrl-C should kill open remotes in Console
-* TINKERPOP-1312 .count().is(0) is not properly optimized
-* TINKERPOP-1314 Improve error detection in docs preprocessor
-* TINKERPOP-1354 Include all static enum imports in request validation for bindings *(breaking)*
+Please see the archived <<./docs/archive/changelogs/changelog-3.1.x.asciidoc#release-3-1-3, 3.1.3 changelog>>.
[[release-3-1-2-incubating]]
=== TinkerPop 3.1.2 (Release Date: April 8, 2016)
-* Fixed two `NullPointerException`-potential situations in `ObjectWritable`.
-* Provided Docker script that allows the execution of several build tasks within a Docker container.
-* Added a per-request `scriptEvaluationTimeout` option to the Gremlin Server protocol.
-* Changed `DriverRemoteAcceptor` to send scripts as multi-line.
-* Fixed a bug in `gremlin-driver` where connections were not returning to the pool after many consecutive errors.
-* Fixed a bug where `tree()` did not serialize into GraphSON.
-* Bumped to SLF4j 1.7.19.
-* Bumped to Apache Hadoop 2.7.2.
-* Fixed a bug in `gremlin-driver` where a really fast call to get a `Future` to wait for a result might not register an error raised from the server.
-* Fixed a severe bug where `LP_O_OB_P_S_SE_SL_Traverser` was not registered with `GryoMapper`.
-* The future from `GremlinExecutor.eval()` is completed after the entire evaluation lifecyle is completed.
-* Spark `Memory` uses `collect().iterator()` instead of `toLocalIterator()` to reduce noise in Spark UI.
-* Added the `:remote console` option which flips the Gremlin Console into a remote-only mode where all script evaluation is routed to the currently configured remote, which removes the need to use the `:>` command.
-* Added `allowRemoteConsole()` to the `RemoteAcceptor` interface.
-* The `:remote` for `tinkerpop.server` now includes an option to establish the connection as a "session".
-* Provided an implementation for calls to `SessionedClient.alias()`, which formerly threw an `UnsupportedOperationException`.
-* Bumped to commons-collections 3.2.2.
-* Fixed a bug where `OrderGlobalStep` and `OrderLocalStep` were not incorporating their children's traverser requirements.
-* Fixed a compilation bug in `TraversalExplanation`.
-* Fixed bug where a session explicitly closed was being closed again by session expiration.
-* Improved the recovery options for `gremlin-driver` after failed requests to Gremlin Server.
-* Added `maxWaitForSessionClose` to the settings for `gremlin-driver`.
-* Bumped to Netty 4.0.34.Final.
-* Added "interpreter mode" for the `ScriptEngine` and Gremlin Server which allows variables defined with `def` or a type to be recognized as "global".
-* Bumped to Apache Groovy 2.4.6.
-* Added the `gremlin-archetype-server` archetype that demonstrates
-* Added the `gremlin-archetype-tinkergraph` archetype that demonstrates a basic project that uses TinkerGraph.
-* Added `gremlin-archetype` module to house TinkerPop "examples".
-* Fixed a condition where `ConnectionPool` initialization in the driver would present a `NullPointerException` on initialization if there were errors constructing the pool in full.
-* Fixed a bug in the round-robin load balancing strategy in the driver would waste requests potentially sending messages to dead hosts.
-* Added new Provider Documentation book - content for this book was extracted from the reference documentation.
-* Fixed a bug where multiple "close" requests were being sent by the driver on `Client.close()`.
-* Fixed an `Property` attach bug that shows up in serialization-based `GraphComputer` implementations.
-* Fixed a pom.xml bug where Gremlin Console/Server were not pulling the latest Neo4j 2.3.2.
-* Fixed bug in "round robin" load balancing in `gremlin-driver` where requests were wrongly being sent to the same host.
-* Prevented the spawning of unneeded reconnect tasks in `gremlin-driver` when a host goes offline.
-* Fixed bug preventing `gremlin-driver` from reconnecting to Gremlin Server when it was restarted.
-* Better handled errors that occurred on commits and serialization in Gremlin Server to first break the result iteration loop and to ensure commit errors were reported to the client.
-* Added GraphSON serializers for the `java.time.*` classes.
-* Improved the logging of the Gremlin Server REST endpoint as it pertained to script execution failures.
-* `TraversalExplanation` is now `Serializable` and compatible with GraphSON and Gryo serialization.
-* Fixed a problem with global bindings in Gremlin Server which weren't properly designed to handle concurrent modification.
-* Deprecated `ScriptElementFactory` and made the local `StarGraph` globally available for ``ScriptInputFormat``'s `parse()` method.
-* Improved reusability of unique test directory creation in `/target` for `AbstractGraphProvider`, which was formerly only available to Neo4j, by adding `makeTestDirectory()`.
-* Optimized memory-usage in `TraversalVertexProgram`.
-* `Graph` instances are not merely "closed" at the end of tests, they are "cleared" via `GraphProvider.clear()`, which should in turn cleans up old data for an implementation.
-* Expanded the Gremlin Server protocol to allow for transaction management on in-session requests and updated the `gremlin-driver` to take advantage of that.
-* Greatly reduced the amount of objects required in OLAP for the `ReducingBarrierStep` steps.
-* Improved messages for the different distinct "timeouts" that a user can encounter with Gremlin Server.
-
-==== Bugs
-
-* TINKERPOP-1041 StructureStandardTestSuite has file I/O issues on Windows
-* TINKERPOP-1105 SparkGraphComputer / Null Pointer Exceptions for properties traversals
-* TINKERPOP-1106 Errors on commit in Gremlin Server don't register as exception on driver
-* TINKERPOP-1125 RoundRobin load balancing always uses the second Host when size = 2
-* TINKERPOP-1126 A single Host spawns many reconnect tasks
-* TINKERPOP-1127 client fails to reconnect to restarted server
-* TINKERPOP-1146 IoTest are not clearing the db after the test run
-* TINKERPOP-1148 ConcurrentModificationException with bindings in Gremlin Server
-* TINKERPOP-1150 Update pom file dependencies to work with Neo4j 2.3.2
-* TINKERPOP-1159 Client sends multiple session close messages per host
-* TINKERPOP-1168 Switch plugins in docs preprocessor
-* TINKERPOP-1172 Reconnect to Gremlin Server previously marked as dead
-* TINKERPOP-1175 Anonymous traversals can't be explained
-* TINKERPOP-1184 Sessions not being closed properly
-* TINKERPOP-1216 OrderStep or O_Traverser is broken
-* TINKERPOP-1239 Excessive continual failure for requests can cause TimeoutException in driver
-* TINKERPOP-1245 Gremlin shell starts incorrectly on OS X due to awk difference
-* TINKERPOP-1251 NPE in ObjectWritable.toString
-* TINKERPOP-1252 Failed Neo4j transaction can leave Neo4jTransaction in inconsistent state
-
-==== Improvements
-
-* TINKERPOP-732 gremlin-server GraphSON serializer issue with tree()
-* TINKERPOP-916 Develop a better "simple" driver for testing and example purposes
-* TINKERPOP-937 Extract the implementations sections of the primary documentation to its own book
-* TINKERPOP-956 Connection errors tend to force a complete close of the channel
-* TINKERPOP-1039 Enable auto-commit for session'd requests.
-* TINKERPOP-1068 Bump to support jbcrypt-0.4m.jar
-* TINKERPOP-1080 Bump Netty version - 4.0.34.Final
-* TINKERPOP-1085 Establish TinkerPop "example" projects
-* TINKERPOP-1096 Support aliasing for sessions in Gremlin Server
-* TINKERPOP-1097 Gremlin Console supporting sessions
-* TINKERPOP-1107 Provide a way to support global variables with sandboxing enabled
-* TINKERPOP-1109 Make Gremlin Console better suited for system level installs
-* TINKERPOP-1131 TraversalVertexProgram traverser management is inefficient memory-wise.
-* TINKERPOP-1135 Improve GraphSON representation of java.time.* classes
-* TINKERPOP-1137 Deprecate ScriptElementFactory and make star graph globally available
-* TINKERPOP-1138 Improve messaging on server timeouts
-* TINKERPOP-1147 Add serialization for TraversalExplanation
-* TINKERPOP-1160 Add timeout configuration for time to wait for connection close
-* TINKERPOP-1165 Tooling Support: Compile with -parameters
-* TINKERPOP-1176 Bump Groovy version - 2.4.6
-* TINKERPOP-1177 Improve documentation around Spark's storage levels
-* TINKERPOP-1197 Document Gremlin Server available metrics
-* TINKERPOP-1198 Bump commons-collections to 3.2.2
-* TINKERPOP-1213 missing docs for has(label, key, value)
-* TINKERPOP-1218 Usage of toLocalIterator Produces large amount of Spark Jobs
+Please see the archived <<./docs/archive/changelogs/changelog-3.1.x.asciidoc#release-3-1-2-incubating, 3.1.2 changelog>>.
[[release-3-1-1-incubating]]
=== TinkerPop 3.1.1 (Release Date: February 8, 2016)
-* Made `GryoRecordReader` more robust to 0 byte record splits.
-* Fixed a constructor/serialization bug in `LP_O_OB_S_SE_SL_Traverser`.
-* Added a lazy iterator, memory safe implementation of MapReduce to `SparkGraphComputer`.
-* Added `MapReduce.combine()` support to `SparkGraphComputer`.
-* Bumped to Neo4j 2.3.2.
-* Fixed Java comparator contract issue around `Order.shuffle`.
-* Optimized a very inefficient implementation of `SampleLocalStep`.
-* Reduced the complexity and execution time of all `AbstractLambdaTraversal` instances.
-* `DefaultTraversal` has a well defined `hashCode()` and `equals()`.
-* Added serializers to Gryo for `java.time` related classes.
-* Integrated `NumberHelper` in `SackFunctions`.
-* Deprecated `VertexPropertyFeatures.supportsAddProperty()` which effectively was a duplicate of `VertexFeatures.supportsMetaProperties`.
-* The Spark persistence `StorageLevel` can now be set for both job graphs and `PersistedOutputRDD` data.
-* Added to the list of "invalid binding keys" allowed by Gremlin Server to cover the private fields of `T` which get exposed in the `ScriptEngine` on static imports.
-* Added `BulkDumperVertexProgram` that allows to dump a whole graph in any of the supported IO formats (GraphSON, Gryo, Script).
-* Fixed a bug around duration calculations of `cap()`-step during profiling.
-* It is possible to completely avoid using HDFS with Spark if `PersistedInputRDD` and `PersistedOutpuRDD` are leveraged.
-* `InputRDD` and `OutputRDD` can now process both graphs and memory (i.e. sideEffects).
-* Removed Groovy specific meta-programming overloads for handling Hadoop `FileSystem` (instead, its all accessible via `FileSystemStorage`).
-* Added `FileSystemStorage` and `SparkContextStorage` which both implement the new `Storage` API.
-* Added `Storage` to the gremlin-core io-package which providers can implement to allow conventional access to data sources (e.g. `ls()`, `rm()`, `cp()`, etc.).
-* Bumped to Spark 1.5.2.
-* Bumped to Groovy 2.4.5.
-* Added `--noClean` option in `bin/process-docs.sh` to prevent the script from cleaning Grapes and HDFS.
-* Execute the `LifeCycle.beforeEval()` in the same thread that `eval()` is executed in for `GremlinExecutor`.
-* Improved error handling of Gremlin Console initialization scripts to better separate errors in initialization script I/O versus execution of the script itself.
-* Fixed a bug in `Graph.OptOut` when trying to opt-out of certain test cases with the `method` property set to "*".
-* Added another `BulkLoader` implementation (`OneTimeBulkLoader`) that doesn't store temporary properties in the target graph.
-* Added option to allow for a custom `ClassResolver` to be assigned to a `GryoMapper` instance.
-* Fixed a `SparkGraphComputer` sorting bug in MapReduce that occurred when there was more than one partition.
-* Added `strictTransactionManagement` to the Gremlin Server settings to indicate that the `aliases` parameter must be passed on requests and that transaction management will be scoped to the graphs provided in that argument.
-* Fixed a `NullPointerException` bug in `PeerPressureVertexProgram` that occurred when an adjacency traversal was not provided.
-* Standardized "test data directories" across all tests as generated by `TestHelper`.
-* Fixed a bug in Gremlin Server where error messages were not always being passed back in the `statusMessage` field of the `ResponseMessage`.
-* Added validation for parameter `bindings` to ensure that keys were `String` values.
-* Improved Transaction Management consistency in Gremlin Server.
-* Added `FileSandboxExtension` which takes a configuration file to white list methods and classes that can be used in `ScriptEngine` execution.
-* Deprecated `SandboxExtension` and `SimpleSandboxExtension` in favor of `AbstractSandboxExtension` which provides better abstractions for those writing sandboxes.
-* Fixed a long standing "view merge" issue requiring `reduceByKey()` on input data to Spark. It is no longer required.
-* Added `Spark` static object to allow "file system" control of persisted RDDs in Spark.
-* Added a Spark "job server" to ensure that persisted RDDs are not garbage collected by Spark.
-* Improved logging control during builds with Maven.
-* Fixed settings that weren't being passed to the Gremlin Driver `Cluster` through configuration file.
-* `Column` now implements `Function`. The modulator `by(valueDecr)` can be replaced by `by(values,decr)` and thus, projection and order are separated.
-* Added `InputRDDFormat` which wraps an `InputRDD` to make it accessible to Hadoop and not just Spark.
-* Added `AbstractSparkTest` which handles closing `SparkContext` instances between tests now that we support persisted contexts.
-* Fixed a serialization bug in `GryoSerializer` that made it difficult for graph providers to yield `InputRDDs` for `SparkGraphComputer`.
-* `SparkGraphComputer` is now tested against Gryo, GraphSON, and `InputRDD` data sources.
-* `HadoopElementIterator` (for Hadoop-Gremlin OLTP) now works for any `InputFormat`, not just `FileInputFormats`.
-* Added `Traverser.Admin.getTags()` which are used to mark branches in a traversal (useful in `match()` and related future steps).
-* Fixed the `Future` model for `GiraphGraphComputer` and `SparkGraphComputer` so that class loaders are preserved.
-* Added support for arbitrary vertex ID types in `BulkLoaderVertexProgram`.
-* Deprecated `credentialsDbLocation` from `SimpleAuthenticator` in Gremlin Server.
-* `TinkerGraph` has "native" serialization in GraphSON, which enables it to be a return value from Gremlin Server.
-* Improved the ability to embed Gremlin Server by providing a way to get the `ServerGremlinExecutor` and improve reusability of `AbstractEvalOpProcessor` and related classes.
-* Added `Authenticator.newSaslNegotiator(InetAddress)` and deprecated the zero-arg version of that method.
-* `ProfileStep` is now available off of `Traversal` via `profile()`. To be consistent with `Traversal.explain()`.
-* If no comparator is provided to `order()`, `Order.incr` is assumed (previously, an exception occurred).
-* Fixed various Gremlin-Groovy tests that assumed `toString()`-able ids.
-* Split TinkerPop documentation into different directories.
-* Added `explain()`-step which yields a `TraversalExplanation` with a pretty `toString()` detailing the compilation process.
-* Fixed a traversal strategy ordering bug in `AdjacentToIncidentStrategy` and `IncidentToAdjacentStrategy`.
-* Made a number of changes to improve traversal startup and execution performance.
-* Added support for 'gremlin.tinkergraph.graphLocation' to accept a fully qualified class name that implements `Io.Builder` interface.
-
-==== Bugs
-
-* TINKERPOP-763 IsStep broken when profiling is enabled.
-* TINKERPOP-972 Cluster::close does not shut down its executor
-* TINKERPOP-973 BLVP shouldn't clear configuration properties
-* TINKERPOP-976 Fail earlier if invalid version is supplied in validate-distribution.sh
-* TINKERPOP-977 Dead link to traversal javadocs
-* TINKERPOP-979 ComputerVerificationStrategy not picking up Order local traversal
-* TINKERPOP-985 shouldPersistDataOnClose makes incorrect feature check
-* TINKERPOP-990 Mixed types in VertexPropertyTest
-* TINKERPOP-993 cyclicPath is not(simplePath)
-* TINKERPOP-997 FeatureRequirementSet.SIMPLE should not require multi-property *(breaking)*
-* TINKERPOP-1000 GremlinGroovyScriptEngineOverGraphTest failures
-* TINKERPOP-1001 SugarLoaderPerformanceTest contains hardcoded vertex ids
-* TINKERPOP-1002 Should rollback transaction after catching on close
-* TINKERPOP-1006 Random error during builds: shouldReloadClassLoaderWhileDoingEvalInSeparateThread()
-* TINKERPOP-1011 HadoopGraph can't re-attach when the InputFormat is not a FileInputFormat
-* TINKERPOP-1012 BulkLoaderVertexProgram shouldn't assume vertex IDs of type Long
-* TINKERPOP-1025 Solve SparkContext Persistence Issues with BulkLoaderVertexProgram
-* TINKERPOP-1027 Merge view prior to writing graphRDD to output format/rdd
-* TINKERPOP-1036 Support self-looping edges in IO
-* TINKERPOP-1052 @Graph.OptOut causes Exception during Suite setup
-* TINKERPOP-1060 LambdaRestrictionStrategy too restrictive
-* TINKERPOP-1075 Profile duration of cap step seems broken.
-* TINKERPOP-1083 Traversal needs a hashCode() and equals() definition.
-* TINKERPOP-1089 Order.shuffle implementation is too fragile
-* TINKERPOP-1119 LP_O_OB_S_SE_SL_Traverser doesn't have a protected constructor().
-
-==== Improvements
-
-* TINKERPOP-320 BulkDumperVertexProgram
-* TINKERPOP-379 MessageScope.Local.setStaticMessage(M msg)
-* TINKERPOP-824 Do we need runtime BigDecimal in more places?
-* TINKERPOP-859 Provide a more general way to set log levels in plugins
-* TINKERPOP-860 Bindings applied to the PluginAcceptor should appear to Gremlin Server
-* TINKERPOP-886 Allow any GraphReader/Writer to be persistence engine for TinkerGraph
-* TINKERPOP-891 Re-examine Sandboxing Abstractions
-* TINKERPOP-912 Improve the ability to embed Gremlin Server with Channelizer injection
-* TINKERPOP-928 Use directories to separate different books
-* TINKERPOP-930 Tie Alias to Transaction Manager in Gremlin Server
-* TINKERPOP-938 Add a "clear SNAPSHOT jars" section to the process-docs.sh.
-* TINKERPOP-941 Improve error message for wrong order().by() arguments
-* TINKERPOP-943 Warn if Gremlin Server is running prior to generating docs
-* TINKERPOP-945 Exceptions should allow me to include root cause if/when available
-* TINKERPOP-952 Include Cardinality.list example in VertexProperty section of main docs.
-* TINKERPOP-954 Consistent test directory usage
-* TINKERPOP-957 Improve speed of addV()
-* TINKERPOP-964 Test XXXGraphComputer on a Hadoop2 cluster (non-pseudocluster).
-* TINKERPOP-970 ProfileStep should be off Traversal, not GraphTraversal
-* TINKERPOP-978 Native TinkerGraph Serializers for GraphSON
-* TINKERPOP-981 Deprecate support for credentialsDbLocation in Gremlin Server Config
-* TINKERPOP-982 valuesDecr, valuesIncr, keysDecr, and valuesDecr is lame.
-* TINKERPOP-983 Provide a way to track open Graph instances in tests
-* TINKERPOP-984 Use GraphProvider for id conversion in Groovy Environment test suite
-* TINKERPOP-987 Use tinkerpop.apache.org URL in all documentation and homepage
-* TINKERPOP-988 SparkGraphComputer.submit shouldn't use ForkJoinPool.commonPool
-* TINKERPOP-992 Better support for schema driven Graphs in IO related tests
-* TINKERPOP-994 Driver using deprecated Rebindings Still
-* TINKERPOP-995 Add Authenticator.newSaslNegotiator(InetAddress)
-* TINKERPOP-996 Please delete old releases from mirroring system
-* TINKERPOP-998 Deprecate VertexPropertyFeatures.FEATURE_ADD_PROPERTY
-* TINKERPOP-1009 Add a CAUTION to documentation about HadoopGraph and getting back elements
-* TINKERPOP-1013 Traverser tags as a safer way of using path labels
-* TINKERPOP-1018 Allow setting for maxContentLength to be set from yaml in driver
-* TINKERPOP-1019 Convert println in test to SLF4j
-* TINKERPOP-1022 Automatically warm up ops handlers
-* TINKERPOP-1023 Add a spark variable in SparkGremlinPlugin like we do hdfs for HadoopGremlinPlugin
-* TINKERPOP-1026 BVLP should store vertex IDs as String
-* TINKERPOP-1033 Store sideEffects as a persisted RDD
-* TINKERPOP-1035 Better Consistency in Gremlin Server Transaction Management
-* TINKERPOP-1045 Client-Side Hangs when attempting to access a HashMap with Keys of type Integer
-* TINKERPOP-1047 TinkerGraph GraphSON storage format broken
-* TINKERPOP-1051 Add note in best practice docs about gremlin server heap setting
-* TINKERPOP-1055 Gremlin Console FileNotFoundException can be misleading
-* TINKERPOP-1062 Make LifeCycle beforeEval execute in same thread as eval operation
-* TINKERPOP-1064 Allow a ClassResolver to be added to GryoMapper construction
-* TINKERPOP-1065 Fix some typos and clarify some wording in the TinkerPop documentation
-* TINKERPOP-1066 Add ioRegistries configuration to GraphSON MessageSerializer
-* TINKERPOP-1067 Update Groovy to 2.4.5
-* TINKERPOP-1072 Allow the user to set persistence options using StorageLevel.valueOf()
-* TINKERPOP-1073 HadoopGraph toString() is weird for Spark PersitedRDD data.
-* TINKERPOP-1086 Include gryo serializers for java.time related classes
-* TINKERPOP-1087 Add has()/order() to FilterRankStrategy
-* TINKERPOP-1093 Add Spark init.sh script and update dev documentation.
-* TINKERPOP-1100 Look deeply into adding combine()-support in Spark MapReduce.
-* TINKERPOP-1117 InputFormatRDD.readGraphRDD requires a valid gremlin.hadoop.inputLocation, breaking InputFormats (Cassandra, HBase) that don't need one
+Please see the archived <<./docs/archive/changelogs/changelog-3.1.x.asciidoc#release-3-1-1-incubating, 3.1.1 changelog>>.
[[release-3-1-0-incubating]]
=== TinkerPop 3.1.0 (Release Date: November 16, 2015)
-This release also includes changes from <<release-3-0-1-incubating, 3.0.1-incubating>> and <<release-3-0-2-incubating, 3.0.2-incubating>>.
-
-* Fixed bug in Gryo and GraphSON (with embedded types) serialization for serialization of results returned from `Map.entrySet()`.
-* `Transaction` settings for `onReadWrite` and `onClose` are now `ThreadLocal` in nature of standard transactions.
-* Optimized `BulkLoaderVertexProgram`. It now uses `EventStrategy` to monitor what the underlying `BulkLoader` implementation does (e.g. whether it creates a new vertex or returns an existing).
-* Integrated `NumberHelper` in `SumStep`, `MinStep`, `MaxStep` and `MeanStep` (local and global step variants).
-* Gremlin Console remoting to Gremlin Server now supports a configuration option for assigning aliases.
-* `CountMatchAlgorithm`, in OLAP, now biases traversal selection towards those traversals that start at the current traverser location to reduce message passing.
-* Fixed a file stream bug in Hadoop OLTP that showed up if the streamed file was more than 2G of data.
-* Added the ability to set thread local properties in `SparkGraphComputer` when using a persistent context.
-* Bumped to Neo4j 2.3.0.
-* Deprecated "rebindings" as an argument to Gremlin Server and replaced it with "aliases".
-* Added `PersistedInputRDD` and `PersistedOutputRDD` which enables `SparkGraphComputer` to store the graph RDD in the context between jobs (no HDFS serialization required).
-* Renamed the `public static String` configuration variable names of TinkerGraph (deprecated old variables).
-* Added `GraphComputer.configure(key,value)` to allow engine-specific configurations.
-* `GraphStep` is no longer in the `sideEffect`-package and is now in `map`-package (breaking change).
-* Added support for mid-traversal `V()`-steps (`GraphStep` semantics updated).
-* Fixed `Number` handling in `Operator` enums. Prior this change a lot of operations on mixed `Number` types returned a wrong result (wrong data type).
-* Fixed a bug in Gremlin Server/Driver serializer where empty buffers were getting returned in certain cases.
-* Renamed `ConjunctionX` to `ConnectiveX` because "conjunction" is assumed "and" (disjunction "or"), where "connective" is the parent concept.
-* Removed `PathIdentityStep` as it was a hack that is now solved by `Traversal.Admin.addTraverserRequirement()`.
-* Added `Traversal.Admin.addTraverserRequirement()` to allow a traversal strategy or source to add requirements (not only step determined anymore).
-* Added `TraverserRequirement.ONE_BULK` to state the traverser does not handle bulk.
-* Added `GraphTraversalSource.withBulk(boolean)` to enabled users to compute only using `bulk=1`.
-* Gremlin Server supports Netty native transport on linux.
-* Removed the need for `GFunction` (etc.) closure wrappers in Gremlin-Groovy as `as Function` can be used to convert closures accordingly.
-* Added `SelectColumnStep` (`select(keys)` and `select(values)`). Deprecated `mapKeys()` and `mapValues()`.
-* Renamed `gremlin.hadoop.graphInputRDD` and `gremlin.hadoop.graphOutputRDD` to `gremlin.spark.graphInputRDD` and `gremlin.spark.graphOutputRDD`, respectively.
-* Fixed a bug in `FoldStep` around bulking. This could be a breaking change, but it is the correct semantics.
-* Previous `group()`-behavior steps are accessible via the deprecated `groupV3d0()`-steps.
-* `GroupStep` and `GroupSideEffectStep` now do lazy reductions to reduce memory footprint. Breaking change for `group()` semantics.
-* Added `GroupStepHelper` with various static methods and classes that are used by both `GroupStep` and `GroupSideEffectStep`.
-* Added `BarrierStep` interface with `processAllStarts()` method which process all starts up to yielding the barrier result.
-* Fixed a severe threading issue in `TinkerGraphComputer`.
-* The location of the jars in HDFS is now `hadoop-gremlin-x.y.z-libs` to ensure multiple TinkerPop versions don't clash.
-* `GiraphGraphComputer` will only upload the jars to HDFS if it doesn't already exist (to help speed up startup time).
-* `GiraphGraphComputer.workers()` is smart about using threads and machines to load balance TinkerPop workers across cluster.
-* `GraphComputer.workers(int)` allows the user to programmatically set the number of workers to spawn.
-* Added `GryoSerializer` as the new recommended Spark `Serializer`. Handles `Graph` and `GryoMapper` registries.
-* `GryoPool` now makes use of `GryoPool.Builder` for its construction.
-* Bumped to Apache Hadoop 2.7.1.
-* Bumped to Apache Giraph 1.1.0.
-* Bumped to Apache Spark 1.5.1.
-* Split Hadoop-Gremlin apart such there is now `hadoop-gremlin`, `spark-gremlin`, and `giraph-gremlin` (and respective `GremlinPlugins`).
-* Added `LambdaCollectingBarrierStep` which generalizes `NoOpBarrierStep` and allows for `barrier(normSack)`-type operations.
-* Fixed bugs in the Gremlin Server's NIO protocol both on the server and driver side.
-* Added `Path.popEquals(Pop,Object)` to check for path equality based on `Pop` (useful for `TraverserRequirement.LABELED_PATH`).
-* Added `Operator.assign` to allow setting a direct value.
-* `Operator` is now a `BinaryOperator<Object>` with appropriate typecasting for respective number operators.
-* Simplified `SackValueStep` so it now supports both `sack(function)` and `sack(function).by()`. Deprecated `sack(function,string)` .
-* Added `Parameters` object to allow for the parameters of a step to be retrieved at runtime via a traversal.
-* Redesigned (though backwards compatible) `AddEdgeStep`, `AddVertexStep`, and `AddPropertyStep` (and respective `GraphTraversal` API).
-* Added `GraphTraversalSource.inject()` so users can spawn a traverser with non-graph objects.
-* `GraphStep` can now take a single argument `Collection` which is either elements or element ids (i.e. `g.V([1,2,3])` is supported now).
-* Added `LoopsStep` to make the loop counter accessible within `repeat()`, `until()` and `emit()`.
-* Gephi Plugin no longer requires manual insert of `store` steps to visualize a traversal.
-* Added a `TinkerIoRegistry` that registers a custom serializer for Gryo that will serialize an entire `TinkerGraph` instance.
-* Added configuration options to Gephi Plugin for setting the size of nodes visualized.
-* Replaced `DedupBijectionStrategy` with the more effective `FilterRankingStrategy`.
-* `ComputerAwareSteps` must not only handle step ids, but also step labels.
-* Renamed `B_O_P_SE_SL_Traverser` to `B_LP_O_P_SE_SL_Traverser` as it now supports `TraverserRequirement.LABELED_PATH`.
-* Added `B_LP_O_S_SE_SL_Traverser` in support of `TraverserRequirement.LABELED_PATH`.
-* Added `TraverserRequirement.LABELED_PATH` which only generates path data for steps that are labeled (greatly increases the likelihood of bulking).
-* Fixed a bug in `Path` usage that required an API update: `Path.addLabel()` is now `Path.extend(Set<String>)` and `Traverser.addLabels(Set<String>)`.
-* Made `Path` iterable, so that it can be ``unfold()``'ed and used by local steps like `min(local)`, `max(local)`, etc.
-* `WhereTraversalStep` and `WherePredicateStep` are now the only "special" `Scoping` steps after `MatchStartStep` in `match()`.
-
-==== Bugs
-
-* TINKERPOP-774 order / dedup issues
-* TINKERPOP-799 [Proposal] with()-modulator for stream level variable binding.
-* TINKERPOP-801 groupCount() fails for vertices (elements?) (using Spark)
-* TINKERPOP-811 AddPropertyStepTest fails "all of a sudden"
-* TINKERPOP-823 addV() broken for multi-value properties
-* TINKERPOP-843 Misspecified HADOOP_GREMLIN_LIBS generates NullPointerException
-* TINKERPOP-857 Add GraphComputer.config(key,value)
-* TINKERPOP-895 Use "as BinaryOperator" and remove GBinaryOperator
-* TINKERPOP-903 Fix empty buffer return upon buffer capacity exceeded
-* TINKERPOP-910 In session transaction opened from sessionless request
-* TINKERPOP-918 ComputerVerificationStrategy is too restrictive
-* TINKERPOP-926 Renamed TinkerGraph public statics to common pattern used for other statics.
-* TINKERPOP-948 AbstractGremlinProcessTest.checkMap not asserted in GroupTest
-* TINKERPOP-953 Artifact equality is not evaluating properly
-* TINKERPOP-955 HashMap$Node not serializable
-
-==== Improvements
-
-* TINKERPOP-297 Ensure Consistent Behavior Over Deleted Elements *(breaking)*
-* TINKERPOP-333 Support VertexProperty in PartitionStrategy
-* TINKERPOP-391 More fluency in GraphComputer for parameterization.
-* TINKERPOP-616 Use Spark 1.3.0 in Hadoop-Gremlin.
-* TINKERPOP-624 Passing Detached/Referenced to Graph.vertices/edge()
-* TINKERPOP-680 Configurable Channelizer for Gremlin Driver
-* TINKERPOP-728 Improve Remote Graph Object Treatment in Console
-* TINKERPOP-756 Provide a strict parsing option for GraphMLReader
-* TINKERPOP-760 Make loop counter accessible within repeat()
-* TINKERPOP-762 Allow mid-traversal V() (and E())
-* TINKERPOP-765 Decompose AbstractTransaction for different transactional contexts *(breaking)*
-* TINKERPOP-767 Path should play well with "local" steps.
-* TINKERPOP-768 MatchStep in OLAP should be smart about current vertex.
-* TINKERPOP-769 Make the introduction of the TP3 docs story better.
-* TINKERPOP-772 TraverserRequirement.LABELED_PATH
-* TINKERPOP-796 Support merge binary operator for Gremlin sacks *(breaking)*
-* TINKERPOP-798 [Proposal] Rename mapKeys()/mapValues() to select(keys) and select(values).
-* TINKERPOP-802 Provide sack(object) so that the sack can be directly set.
-* TINKERPOP-803 A better solution to g.V(someCollection.toArray())
-* TINKERPOP-805 Enforce AutoCloseable Semantics on Transaction *(breaking)*
-* TINKERPOP-821 Improve testing around TraversalHelper around recursive methods
-* TINKERPOP-825 [Proposal] SetBulkStep (sideEffectStep)
-* TINKERPOP-826 OneToManyBarrierStrategy
-* TINKERPOP-827 Add a console session to the PageRank section of the docs.
-* TINKERPOP-829 TinkerGraphComputer should support the user specified thread/worker count.
-* TINKERPOP-835 Shade Jackson Dependencies *(breaking)*
-* TINKERPOP-836 Support Hadoop2 in place of Hadoop1
-* TINKERPOP-850 Reduce Graph.addVertex overload ambiguity *(breaking)*
-* TINKERPOP-851 GroupCountStep needs a by() for the count.
-* TINKERPOP-861 Solve "The Number Problem" for Operator (and follow on operators)
-* TINKERPOP-863 [Proposal] Turn off bulking -- or is there something more general? (hope not).
-* TINKERPOP-866 GroupStep and Traversal-Based Reductions *(breaking)*
-* TINKERPOP-868 Allow Spark Gremlin Computer to Reuse Spark Contexts
-* TINKERPOP-874 Rename Gremlin-Spark properties using gremlin.spark prefix. *(breaking)*
-* TINKERPOP-876 Rename VendorOptimizationStrategy XXXOptimizationStrategy *(breaking)*
-* TINKERPOP-879 Remove deprecated promoteBindings from GremlinExecutor *(breaking)*
-* TINKERPOP-885 Change Transaction.onReadWrite() to be a ThreadLocal setting *(breaking)*
-* TINKERPOP-888 GraphTraversal.property overloads *(breaking)*
-* TINKERPOP-896 Simplify the {{withSack}} methods of {{GraphTraversalSource}}. *(breaking)*
-* TINKERPOP-897 Remove deprecated GSupplier, GFunction, GConsumer, etc. methods. *(breaking)*
-* TINKERPOP-898 Rename ConjuctionP and ConjuctionStep to ConnectiveP and ConnectiveStep *(breaking)*
-* TINKERPOP-899 Bump to the latest version of Neo4j.
-* TINKERPOP-900 Provide by(object) which compiles to by(constant(object))
-* TINKERPOP-901 Option for use of Netty epoll on Linux to reduce GC pressure
-* TINKERPOP-904 BulkLoaderVertexProgram optimizations
-* TINKERPOP-905 Harden time oriented tests in ResultQueueTest
-* TINKERPOP-907 getters for RepeatStep.untilTraversal and RepeatStep.emitTraversal
-* TINKERPOP-908 Use line breaks in documentation
-* TINKERPOP-909 Improve steps that handle numeric data
-* TINKERPOP-911 Allow setting Thread Specific Spark JobGroup/Custom Properties based on hadoop conf
-* TINKERPOP-913 Rename Gremlin Server arguments rebinding to alias
-* TINKERPOP-914 DriverRemoteAcceptor in Gremlin Console supports aliases
-* TINKERPOP-917 Add HadoopGraph.open(String)
-* TINKERPOP-922 Add a book for Developer Documentation
-* TINKERPOP-923 Add a book for Tutorials
-* TINKERPOP-925 Use persisted SparkContext to persist an RDD across Spark jobs.
-* TINKERPOP-931 Make it possible to extend the core OpProcessor implementations
-* TINKERPOP-933 Improve release process to get files named properly
-* TINKERPOP-935 Add missing "close" operation to the session opProcessor docs
+Please see the archived <<./docs/archive/changelogs/changelog-3.1.x.asciidoc#release-3-1-0-incubating, 3.1.0 changelog>>.
== TinkerPop 3.0.0 (A Gremlin Rāga in 7/16 Time)
@@ -5058,761 +962,48 @@
[[release-3-0-2-incubating]]
=== TinkerPop 3.0.2 (Release Date: October 19, 2015)
-* Cleaned up `ext/` directory when plugin installation fails for `gremlin-server` and `gremlin-console`.
-* Fixed issues in `gremlin-server` when configured for HTTP basic authentication.
-* Made `BulkLoaderVertexProgram` work for any persistent TP3-supporting graph (input and output).
-* `TreeSideEffectStep` now implements `PathProcessor` which fixed a `ComputerVerificationStrategy` issue.
-* Added a shell script that verifies source and binary distributions.
-* Fixed a bulk related bug in `GroupStep` when used on `GraphComputer` (OLAP).
-* Gremlin Server binary distribution now packages `tinkergraph-gremlin` and `gremlin-groovy` as plugins to be consistent with Gremlin Console's packaging.
-* The `RepeatStep` clauses (`until()`,`emit()`,`repeat()`) can only be set at most one time in order to prevent user confusion.
-* Fixed a `clone()` bug in `RepeatStep`, `TreeStep`, `GroupCountStep`, `GroupStep`, and `TraversalRing`.
-* Fixed a thread context bug in `TinkerGraphComputer`.
-* Fixed issues with the `gremlin-driver` related to hanging connections in certain conditions.
-* TinkerGraph now has an option for persistence where the data is saved on `close()` and, if present, loaded on `open()`.
-* Added an overload for `GremlinExecutor.eval()` that takes a `Lifecycle` object to override some default settings from `GremlinExecutor.Builder`.
-* Improved session closing for transactional graphs during shutdown of Gremlin Server.
-* Fixed id parameter used in tests for `GroovyStoreTest` and `GroovyRepeatTest` to not be treated as an embedded string.
-* `GraphStep` will convert any `Vertex` or `Edge` ids to their id `Object` prior to submission to `GraphComputer` (OLAP).
-
-==== Bugs
-
-* TINKERPOP-814 ConnectionPool can fill with dead Connections
-* TINKERPOP-816 Gryo deserialization of error response with null message causes NPE and protocol desync
-* TINKERPOP-817 Gryo serialization of large responses fails and causes protocol desync
-* TINKERPOP-840 TreeTest Is not being ignored via ComputerVerificationStrategy
-* TINKERPOP-849 gremlin-server doesn't close sessions on 'close' opcode
-* TINKERPOP-855 sasl authentication type error due to Json format
-* TINKERPOP-865 Errors with HTTP REST basic auth
-* TINKERPOP-867 TinkerGraphProvider does not initialize temp dir
-* TINKERPOP-870 Rebound client requires a connection to occur on the underlying client.
-* TINKERPOP-877 Driver hangs if SSL enabled on server but not on client
-
-==== Improvements
-
-* TINKERPOP-828 TinkerGraph can supportPersistence(), should we allow it.
-* TINKERPOP-830 process-docs.sh introduces extra white space dependent on console width
-* TINKERPOP-839 Docs should have a ${version.number} under the logo.
-* TINKERPOP-852 A shell script that validates the distribution artifacts at release time
-* TINKERPOP-853 TinkerPop Logo in JavaDoc index.html
-* TINKERPOP-858 Cleanup after failed :install
+Please see the archived <<./docs/archive/changelogs/changelog-3.0.x.asciidoc#release-3-0-2-incubating, 3.0.2 changelog>>.
[[release-3-0-1-incubating]]
=== TinkerPop 3.0.1 (Release Date: September 2, 2015)
-* `Compare` now uses `BigDecimal` internally to ensure that precision is not lost on standard number comparisons.
-* Renamed `ComputerVerificationStrategy` to `VerificationStrategy` so all the verification strategies can use it.
-* Added `StandardVerificationStrategy` that throws exceptions for illegal traversal patterns on the standard engine (which extends to `GraphComputer`).
-* Added `GraphFeatures.supportsConcurrentAccess()` to allows `Graph` implementations to signify if multiple instances can access the same data.
-* Clarified semantics of `Transaction.close()` in unit tests - now refers only to closing the current transaction in the current thread.
-* `Neo4jGraph` no longer uses `OptOut` on `TransactionTest.shouldRollbackOnCloseWhenConfigured` (formerly `shouldRollbackOnShutdownWhenConfigured`)
-* Gremlin Server initialization scripts can now return a `Map` of values that will become global bindings for the server.
-* Introduced the `--dryRun` option to the document generation process which ignores actual script execution in the Gremlin Console.
-* Fixed bug in `EventStrategy` around property changed events when calling `property` without cardinality or meta-property values.
-* Improved support for the `Accept` header for REST-based requests in Gremlin Server.
-* `GraphFactory` now allows specification of the class to use to instantiate the `Graph` through the `GraphFactoryClass` annotation.
-* Added `wrapAdjacencyList` and `unwrapAdjacencyList` options to `GraphSONWriter` and `GraphSONReader` respectively, thus allowing valid JSON to be written/read if the user desires.
-* Added Gremlin Server/Driver authentication support via SASL.
-* Added Basic HTTP authentication support for REST in Gremlin Server.
-* Added Gremlin Server plugin to help with "credential graph" management (used in conjunction with authentication features of Gremlin Server).
-* Added "secure" Gremlin Server/Driver example configuration files.
-* Adjusted configuration for javadoc generation to eliminate error messages.
-* Removed "reserved" graph concept names from tests (e.g. "label", "edge", "value") to support the convention of avoiding these strings for property names.
-* Introduced `GraphProvider.Descriptor` which annotates a `GraphProvider` implementation to describe what `GraphComputer` implementation will be used.
-* Modified `OptOut` to include a `computers` attribute which allows the `Graph` to opt-out of computer-based tests for specific computation engines.
-* Added a `SandboxExtension` that can be plugged into `TypeCheckedCustomizerProvider` and `CompileStaticCustomizerProvider` to control classes and methods that can be used in the `GremlinGroovyScriptEngine`.
-* Added a number of new `ImportCustomizerProvider` implementations such as, `TimedInterruptCustomizerProvider`, `TypeCheckedCustomizerProvider` and others.
-* Refactored `GremlinGroovyScriptEngine` to make more general use of `ImportCustomizerProvider` implementations.
-* Removed `SecurityCustomizerProvider` class and the "sandbox" configuration on the `ScriptEngines` class - this was an experimental feature and not meant for public use.
-* Removed dependency on `groovy-sandbox` from the `gremlin-groovy` module.
-
-==== Bugs
-
-* TINKERPOP-770 Exception while AddPropertyStep tries to detach vertex property
-* TINKERPOP-780 Use of fold() in repeat()
-* TINKERPOP-782 map(Traversal) should declare requirements of child
-* TINKERPOP-785 Gremlin Server Not Properly Reporting Port Conflict
-* TINKERPOP-792 select at start of match traversal on Map can fail
-* TINKERPOP-794 IncidentToAdjecentStrategy malfunction
-* TINKERPOP-804 Failed installing neo4j-gremlin extension on Windows 7
-* TINKERPOP-822 Neo4j GraphStep with element arguments ignores has *(breaking)*
-
-==== Improvements
-
-* TINKERPOP-576 Gremlin Server Authentication
-* TINKERPOP-582 Remove Groovy Sandbox Dependency
-* TINKERPOP-610 General graph concept names in test schema
-* TINKERPOP-656 IoRegistry Chaining
-* TINKERPOP-690 Be able to OPT_OUT for Standard, but not Computer *(breaking)*
-* TINKERPOP-699 GraphSON writeGraph not producing valid json object
-* TINKERPOP-750 Compare should not have special case for Number
-* TINKERPOP-752 Make Gremlin Server Better Respect ACCEPT
-* TINKERPOP-764 Unify semantics of Transaction.close() in tests and documentation *(breaking)*
-* TINKERPOP-771 IoRegistry Instantiation With GryoPool
-* TINKERPOP-778 Support GraphFactory location via annotation.
-* TINKERPOP-791 Document rules for committers
-* TINKERPOP-797 order() seems to only like List? *(breaking)*
-* TINKERPOP-808 TraversalComparator.comparator needs a getter
+Please see the archived <<./docs/archive/changelogs/changelog-3.0.x.asciidoc#release-3-0-1-incubating, 3.0.1 changelog>>.
=== TinkerPop 3.0.0 (Release Date: July 9, 2015)
-* Modified the `GremlinExecutor` to catch `Throwable` as opposed to `Exception` so as to properly handle `Error` based exceptions.
-* Modified the `GremlinGroovyScriptEngine` compilation configuration to prevent inappropriate script evaluation timeouts on standalone functions.
-* Added a custom configuration for "timed interrupt" in the `ScriptEngines` instantiation of the `GremlinGroovyScriptEngine`.
-* Added `mapKeys()` (`MapKeyStep`) and `mapValues()` (`MapValueStep`) to get the keys and values of a map, respectively.
-* `select()` no longer supports empty arguments. The user must specify the keys they are selecting.
-* `MatchStep` and `match()` no longer have a "start label" parameter -- it is computed if the incoming traverser does not have requisite labels.
-* Turned transactional testing back on in Gremlin Server using Neo4j.
-* Renamed `Transaction.create()` to `Transaction.createThreadedTx()`.
-* Added `TraversalParent.removeGlobalChild()` and `TraversalParent.removeLocalChild()`.
-* Added a `clear` option to the Gephi Plugin to empty the Gephi workspace.
-* Refactored `ResultSet` and related classes to stop polling for results.
-* `AbstractStep` now guarantees that bulk-less and null-valued traversers are never propagated.
-* Added `dedup(string...)` which allows for the deduplication of a stream based on unique scope values.
-* Fixed multiple bugs in the Gephi Plugin related to refactoring of traversal side-effects.
-* Split `WhereStep` into `WherePredicateStep` and `WhereTraversalStep` to simplify internals.
-* Prevent the driver from attempting to reconnect on a dead host if the `Cluster.close()` method has been called.
-* Renamed the "deactivate" option on `:plugin` command to "unuse" to be symmetric with the "use" option.
-* Added `Traversal.toStream()` to turn the `Traversal<S,E>` into a `Stream<E>`.
-* Added `Scoping.Variable` enum of `START` and `END` which allows the `Scoping` step to specify where its bindings are.
-* `ComputerVerificationStrategy` is smart about not allowing `WhereXXXStep` with a start-variable to run in OLAP as it selects the value from the path.
-* Rewrote `MatchStep` where it now works on `GraphComputer`, solves more patterns, provides plugable execution plans, supports nested AND/OR, `not()`-patterns, etc.
-* Renamed `Graphs` in Gremlin Server to `GraphManager`.
-* Fixed bug in Gremlin Driver where client-side serialization errors would not bubble up properly.
-* Fixed problem in Gremlin Server to ensure that a final `SUCCESS` or `NO_CONTENT` message assured that the transaction was successful in sessionless requests.
-* Arrow keys for cycling through command history now work in Gremlin Console when being used on Windows.
-* Added `NotStep` and `not(traversal)` for not'ing a traversal (integrates like `ConjunctionStep`).
-* Removed `TraversalP`. Traversals and `P`-predicates are completely separate concepts.
-* `has(key,traversal)` is now an alias for `filter(__.values(key).traversal)` using `TraversalFilterStep`.
-* Simplified `SubgraphStrategy` by using `TraversalFilterStep` instead of the more complex `WhereStep`.
-* Added `TraversalMapStep`, `TraversalFlatMapStep`, `TraversalFilterStep`, and `TraversalSideEffectStep` which all leverage an internal traversal.
-* Added `Path.get(pop,label)` as default helpers in `Path`.
-* Added `Pop.first`, `Pop.last`, and `Pop.all` as enums for getting single items from a collection or a list of said items.
-* Changed `GremlinServer.start()` to return a `CompletableFuture` that contains the constructed `ServerGremlinExecutor`.
-* Restructured `IoTest` breaking it up into smaller and more logically grouped test cases.
-* Gremlin Server `Settings` now has sensible defaults thus allowing the server to be started with no additional configuration.
-* Fixed garbled characters in Gremlin Console that notably showed up in `:help`
-* Replaced dependency on `groovy-all` with individual Groovy dependencies as needed.
-* Bumped `org.gperfutils:gbench` to the `0.4.3` and a version explicitly compatible with Groovy 2.4.x.
-* Renamed `KeyStep` to `PropertyKeyStep` to be consistent with `PropertyValueStep`.
-* Added `Gremlin-Lib-Paths` to modify paths in plugin `lib` directory.
-* Modified the capabilities of `Gremlin-Plugin-Paths` to delete paths that have no value on the right-hand-side of the equals sign.
-* The REST API in Gremlin Server now requires parameters to be defined with a "bindings." prefix.
-* Modified the REST API in Gremlin Server to accept rebindings.
-* Added `rebindings` optional argument to sessionless requests to allow global bindings to be rebound as needed.
-* Added `LazyBarrierStrategy` which "stalls" a traversal of a particular form in order to gain a bulking optimization.
-* `CollectingBarrierStep` supports `maxBarrierSize` for "lazy barrier," memory conservation.
-* `Scoping` now has `getScopeKeys()` to get the keys desired by the scoping step.
-* Refactored SSL support in the Gremlin Server/Driver.
-* Factored out `ServerGremlinExecutor` which contains the core elements of server-side script execution in Gremlin Server.
-* Bumped to netty 4.0.28.Final.
-* Refactored the `Mutating` interface and introduce `CallbackRegistry` interface around `EventStrategy`.
-* Changed `onReadWrite` and `onClose` of `AbstractTransaction` to be synchronized.
-* Added `LabelP` to support index lookups and `has()` filtering on `Neo4jGraph` multi-label vertices.
-* `AddEdgeStep` is now a `Scoping` step.
-* Added a fully defined set of `Graph.Feature` implementations to `EmptyGraph`.
-* Dropped dependency on `org.json:json` - used existing Jackson dependency.
-* Added back neo4j-gremlin as the licensing of the Neo4j API is now Apache2.
-* Added `willAllowId` method to features related to vertices, edges and vertex properties to test if an identifier can be use when `supportsUserSuppliedIds` is `true`.
-* Fixed a bug in `GraphTraversal.choose(predicate,trueTraversal,falseTraversal)`.
-* Removed `MapTraversal`, `MapTraverserTraversal`, `FilterTraversal`, and `FilterTraverserTraversal` as these are simply `__.map(function)` and `__.filter(predicate)`.
-* Include `hadoop-gremlin` Hadoop configuration sample files in Gremlin Console distribution.
-* Iteration of results in Gremlin Server occur in the same thread as evaluation and prior to transaction close.
-* TinkerGraphComputer now supports every `ResultGraph`/`Persist` combination.
-* `GraphComputerTest` extended with validation of the semantics of all `ResultGraph`/`Persist` combinations.
-* GiraphGraphComputer no longer requires an extra iteration and MapReduce job to derive the full `Memory` result.
-* SparkGraphComputer now supports `InputRDD` and `OutputRDD` to allow vendors/users to use a `SparkContext` to read/write the graph adjacency list.
-* Added `Scoping.getScopeValue()` method so all "selecting" steps use the same pattern for map, path, and sideEffect data retrieval.
+Please see the archived <<./docs/archive/changelogs/changelog-3.0.x.asciidoc#release-3-0-0, 3.0.0 changelog>>.
=== TinkerPop 3.0.0.M9 (Release Date: May 26, 2015)
-* Removed `GraphComputer.isolation()` as all implementations use standard BSP.
-* Added a Gremlin Server `LifeCycleHook` to ensure that certain scripts execute once at startup and once at shutdown.
-* `has(key)` and `hasNot(key)` are now aliases for `where(values(key))` and `where(not(values(key)))`, respectively.
-* TinkerGraph classes are now final to restrict user and vendor extension.
-* Added `TraversalStrategy.VendorOptimization` to ensure that all TinkerPop optimizations execute first on the known TinkerPop steps.
-* Added `TailGlobalStep` and `TailLocalStep` (`tail()`) which gets objects from the end of the traversal stream.
-* `AndStep` and `OrStep` are now simply markers where `WhereStep(a.and(b).and(c)...and(z))` is the compilation.
-* Moved `Compare`, `Contains`, `Order`, `Operator`, and `P` to `process/traversal` from `structure/` as they are process-based objects.
-* `HasContainer` now uses `P` predicate as helper methods and tests are more thorough on `P`.
-* Changed Gremlin Server integration/performance tests to be runnable from within the `gremlin-server` directory or from the project root.
-* Moved the string methods of `TraversalHelper` to `StringFactory`.
-* Renamed JSON-related serializers for Gremlin Server to be more consistent with GraphSON naming.
-* Removed `HasTraversalStep` in favor of new `P.traversal` model with `HasStep`.
-* Fixed bug in `WsGremlinTextRequestDecoder` where custom serializers from graphs were not being used.
-* Added `AndP` which allows for the `and()`-ing of `P` predicates.
-* `Order.opposite()` is now `reversed()` as that is a `Comparator` interface method with the same semantics.
-* `Compare/Contains/P.opposite()` are now `negate()` as that is a `BiPredicate` interface method with the same semantics.
-* `has(traversal)` is replaced by `where(traversal)` and `has(key,traversal)`. `HasXXX` is always with respects to an element property.
-* Added `TraversalScriptHelper` with static methods for dynamically creating a `Traversal` from a JSR 223 `ScriptEngine`.
-* Changed `SubgraphStrategy` to take `Traversal` rather than `Predicate` for filtering.
-* Improved `SubgraphStrategy` to only modify the `Traversal` if filtering was required.
-* Improved logging of errors in the `HttpGremlinEndpointHandler` to include a stracktrace if one was present.
-* Moved `AbstractGremlinSuite.GraphProviderClass` to `org.apache.tinkerpop.gremlin.GraphProviderClass`.
-* Simplified the Gremlin-Groovy test suite where there is now no distinction between `STANDARD` and `COMPUTER` tests.
-* `VertexProgram` and `MapReduce` now add a `Graph` parameter to `loadState(Graph, Configuration)`.
-* Added `ScopingStrategy` which auto-scopes `select()` and `where()` so the language looks clean.
-* Added `Scoping` as a marker interface to state that a step desires a particular `Scope`.
-* `SelectStep`, `SelectOneStep`, and `WhereStep` support both `Scope.local` and `Scope.global` for `Map<String,Object>` or `Path` analysis, respectively.
-* Fixed a bug in the `TraversalStrategies` sort algorithm.
-* Removed numerous unused static utility methods in `TraversalHelper`.
-* TinkerGraph process suite tests are now running with and without strategies in place.
-* Added `IncidentToAdjacentStrategy` which rewrites `outE().inV()`, `inE().outV()` and `bothE().otherV()` to `out()`, `in()` and `both()` respectively.
-* Renamed `ComparatorHolderRemovalStrategy` to `OrderGlobalRemovalStrategy` as it now only applies to `OrderGlobalStep`.
-* Anonymous traversal no longer have `EmptyGraph` as their graph, but instead use `Optional<Graph>.isPresent() == false`.
-* Added `Traversal.Admin.setGraph(Graph)` as strategies that need reference to the graph, need it across all nested traversals.
-* `AbstractLambdaTraversal` is now smart about `TraversalParent` and `TraversalStrategies`.
-* Fixed bug in `GraphML` reader that was not allowing `<edge>` elements to come before `<node>` elements as allowable by the GraphML specification.
-* Added `VertexFeature.getCardinality`.
-* Added `AdjacentToIncidentStrategy` which rewrites `out().count()` to `outE().count()` (and similar such patterns).
-* `GryoPool` now takes a `Configuration` object which allows setting the size of the pool and the `IoRegistry` instance.
-* Added `PersistResultGraphAware` interface which is used by `OutputFormats` to specify persistence possibilities for a Hadoop `GraphComputer`.
-* `ElementIdStrategy` now allows the identifier property to be set directly (and not only by specifying `T.id`).
-* Added sample configuration files for registering a `TraversalStrategy` in Gremlin Server.
-* Added response status code for `NO_CONTENT` to represent output for a successful script execution without a result (e.g. an empty `Iterator`).
-* Removed the notion of a "terminator" message from the Gremlin Server protocol - new response status code for `PARTIAL_CONTENT`.
-* `Path` and `Step` labels are ordered by the order in which the respective `addLabel()` calls were made.
-* A `Step` now has a `Set<String>` of labels. Updated `as()` to take a var args of labels.
-* Dropped `BatchGraph` from the code base - it will be replaced by bulk loader functionality over OLAP.
-* `TraversalSideEffects` now implements `Optional` semantics. Less code as Java8 provides the helper methods.
-* `TraversalScriptSupplier` now takes an `Object` var args for setting `ScriptEngine` bindings if needed.
-* `Compare` is now more lenient on `Number`-types.
-* Removed `Compare.inside` and `Compare.outside` as they are not primitive comparators and should be composed from primitives.
-* Introduced `P` (predicate) for cleaner looking `is()`, `has()`, and `where()` calls -- e.g. `has('age',eq(32))`.
-* `GraphTraversalSource` is now the location for `withXXX()` operations. No longer do they exist at `GraphTraversal`.
-* All `Traverser` objects now extend from `AbstractTraverser` or a child that ultimately extends from `AbstractTraverser`.
-* OLTP `select()` now returns a list for traversals with duplicate labels (as this was a unintended side-effect of `SparsePath`).
-* Removed the `SparsePath` optimization as it led to numerous corner-case inconsistencies.
-* `VertexWritable` serializes and deserializes the `StarGraph` object -- no more intermediate `DetachedXXX` objects.
-* Gremlin Server better supports the settings for the high and low watermark that will slow writes to clients that are lagging.
-* Added `GraphReader.readObject()` and `GraphWriter.writeObject` abstractions for those implementations that can support them.
-* Altered `GraphWriter.writeVertices()` method to take an `Iterator` of vertices rather than a `Traversal`.
-* GraphSON format for output from `GraphWriter.writeVertex`, `GraphWriter.writeVertices`, and `GraphWriter.writeGraph` have all changed now that they use `StarGraph` serialization.
-* Gryo format for output from `GraphWriter.writeVertex`, `GraphWriter.writeVertices`, and `GraphWriter.writeGraph` have all changed now that they use `StarGraph` serialization.
-* Added read and write methods to `GraphReader` and `GraphWriter` for `Property` and `VertexProperty`.
-* Reduced object creation in GraphSON during serialization.
-* Moved `T` tokens to the `structure/` package as its more general than `process/`.
-* `Attachable.attach()` now takes a `Method` to determine whether to attach via `GET`, `CREATE`, or `GET_OR_CREATE`.
-* Decreased size of Gremlin Server `RequestMessage` and `ResponseMessage` serialization payloads and reduced object creation.
-* `Graph.empty()` no longer required with the introduction of `ShellGraph` which is a placeholder for a graph class and computer.
-* `VertexProperty.Cardinality` default is now vendor chosen. If the vendor has not preference, they should use `Cardinality.single`.
-* `Messenger.receiveMessages()` no longer takes a `MessageScope` and thus, consistent behavior between message-passing and message-pulling systems.
-* Changed the `gremlin.tests` environment variable for test filtering to the more standard convention of `GREMLIN_TESTS` and made it work for all test suites.
-* Removed `back()`-step as `select()`-step provides the same behavior with more intelligent optimizations and `by()`-modulation.
-* Removed `Graph.Helper` method annotation and related infrastructure in tests.
-* Modified header of Gryo to be 16 bytes instead of 32 (and removed the version stamp).
-* Removed the concept of handling version in Gryo via the builder as it wasn't really accomplishing the capability of ensuring backward compatibility.
-* Moved `Exceptions.propertyRemovalNotSupported` from `Element` to `Property` for consistency.
-* Provided a method for Gremlin Server to bind `TraversalSource` objects for use in scripts.
-* Modified the reference implementation for dealing with "custom" identifier serialization in GraphSON - See `IoTest.CustomId` for the example.
-* Modified `g.vertices/edges` and related methods and tests to support non-type specific querying (e.g. `g.V(1)` and `g.V(1L)` should both return the same result now).
-* `TinkerGraph` supports an `IdManager` which helps enforce identifier types and improve flexibility in terms of how it will respond to queries around identifiers.
-* `DetachedXXX` now uses the standard `structure/` exceptions for unsupported operations.
-* Added private constructors to all `Exceptions` inner classes in the respective `structure/` interfaces.
-* Re-introduced `ReferenceXXX` to ensure a smaller data footprint in OLAP situation (`DetachedXXX` uses too much data).
-* `Attachable` now has a set of static exception messages in an `Exceptions` inner class.
-* Added `StarGraph` which is a heap efficient representation of a vertex and its incident edges (useful for `GraphComputer` implementations).
-* `TraverserSet` uses a `FastNoSuchElementException` on `remove()` for increased performance.
-* Add `Profiling` interface to enable vendors to receive a `Step's MutableMetrics`.
+Please see the archived <<./docs/archive/changelogs/changelog-3.0.x.asciidoc#release-3-0-0-m9, 3.0.0.M9 changelog>>.
=== TinkerPop 3.0.0.M8 (Release Date: April 6, 2015)
-* Removed Neo4j-Gremlin from this distribution due to GPL licensing. Working with Neo4j team to reintroduce by M9.
-* Altered structure of plugin directories for Gremlin Server and Gremlin Console to allow for the full `lib` directory with all dependencies and the lighter `plugin` directory which contains filtered dependencies given the path.
-* Improved `OptOut` to allow for exclusion of a group of tests by specifying a base test class.
-* `GraphComputerTest` is now Java8 specific and much easier to extend with new test cases.
-* Merged the `gremlin-algorithm` module into `gremlin-test`.
-* Removed `LambdaVertexProgram` and `LambdaMapReduce` as it will be one less thing to maintain.
-* Gremlin Console accepts a `max-iteration` configuration via the standard `:set` command to limit result iteration.
-* `Vertex.property()` default behavior is now `Cardinality.single`.
-* Added `ElementIdStrategy` as a `TraversalStrategy`.
-* Introduce `AbstractTransaction` to simplify implementation of standard transactional features for vendors.
-* Added `EventStrategy` to generate `Graph` modification events to listeners.
-* Added test to enforce return of an empty `Property` on `VertexProperty.property(k)` if no meta properties exist.
-* Added methods to registered transaction completion listeners on `Transaction` and provided a default implementation.
-* Fixed bug in Neo4j where return of an empty meta property was returning a `NullPointerException`.
-* Refactored step API -- the TinkerPop3 steps are the foundation for any domain specific language (including graph).
-* `MapReduce` now has `workerStart(Stage)` and `workerEnd(Stage)` methods with analagous semantics to `VertexProgram`.
-* Hadoop-Gremlin `ObjectWritable` now leverages Kryo for data serialization.
-* `GiraphGraphComputer` supports arbitrary objects as the vertex id -- previously, only long ids were supported.
-* Added `VertexProgramPool` to support thread safe pooling of vertex programs for graph computers that provide threaded workers.
-* Added `GryoPool` to support thread safe pooling of Gryo readers and writers.
-* Added `TraversalSource` which contextualizes a traversal to a graph, DSL, execution engine, and runtime strategies.
-* Added `AddVertexStep` (`addV`), `AddPropertyStep` (`property`), and changed `AddEdgeStep` to a map-step instead of a sideEffect-step.
-* Added `compile` method to `GremlinExecutor` and related classes.
-* Fixed bug in Gremlin Server that was generating extra response messages on script evaluation errors.
-* Changed the `Memory` API to not return the mutated value on `or`, `and`, `incr` as it is too difficult to implement faithfully in a distributed system.
-* Added `SparkGraphComputer` to Hadoop-Gremlin which uses Apache Spark as the underlying computing engine.
-* Renamed "Gremlin Kryo" to "Gryo".
-* Refactored `TinkerWorkerPool` to use `ExecutorService` so as to reuse threads when executing graph computer functions.
-* Removed `Reducing.Reducer` and `ReducingStrategy`. Previous `Reducing` classes are now `MapReducer` classes.
-* Refactored the "process" test suite to allow for better test configuration with respect to different `TraversalEngine` implementations.
-* Added `hasNot(traversal)` which is a faster way of doing `has(traversal.count().is(0L))`.
-* `TraversalStrategy.apply(traversal)` is the new method signature as the `TraversalEngine` can be retrieved from the `Traversal`.
-* `TraversalEngine` is now an interface and provided to the traversal by the graph. `Graph` methods added to set the desired traversal engine to use.
-* Added `count(local)`, `sum(local)`, `max(local)`, `min(local)`, `mean(local)`, `dedup(local)`, `sample(local)` and `range(local)` for operating on the local object (e.g. collection, map, etc.).
-* `TraversalComparator` exists which allows for `order().by(outE().count(),decr)`.
-* Added Apache Rat plugin to detect the proper inclusion of license headers in files.
-* A `Traversal` now respects thread interruption during iteration, throwing a `TraversalInterruptionException` if it encounters interruption on the current thread.
-* Apache refactoring: `com.tinkerpop` -> `org.apache.tinkerpop`.
-* `Traversal` is now `Serializable` and with most queries no longer needing lambdas, Gremlin-Java works over the wire.
-* Added `VertexProperty.Cardinality` with `list`, `set`, and `single`. No more `Vertex.singleProperty()` method.
-* Added `RangeByIsCountStrategy` that adds a `RangeStep` in front of `.count().is(<predicate>, <value>)` to minimize the amount of fetched elements.
-* Added `CoalesceStep` / `coalesce()` that emits the first traversal which emits at least one element.
-* Added more syntactic sugar tricks to the Gremlin sugar plugin -- `&`, `|`, `select from`, `gt`, etc.
-* `Traversal.Admin` is consistent internal to steps, traversals, strategies, etc. For the user, `Traversal` is all they see.
-* `TraversalHolder` is now called `TraversalParent` with the child/parent terminology used throughout.
-* Added `GroovyEnvironmentPerformanceSuite`.
-* Provided more robust shutdown capabilities for the thread pools used in `GremlinExecutor`.
-* A massive `process/` package reorganization -- class names are still the same, just in new packages.
-* Bumped `neo4j-graph` to Neo4j 2.1.6.
-* Bumped to Groovy 2.4.1.
-* Added a new "performance" test suite for Gremlin Process.
-* Steps now only operate with traversals -- no more lambdas. Lambda-> `Traversal` conversion utilities added.
-* `SideEffectStep` always requires a `Consumer`. Steps that were consumer-less simply extends `AbstractStep`.
-* Simplified the `Neo4jGraph` implementation by now allowing `cypher()` mid-traversal. Only available via `g.cypher()`.
-* Moved `clock()` out of the Utility plugin. It is now available to both Groovy and Java.
-* Changed the `OptOut` annotation to allow for ignoring an entire test case using a wildcard.
-* Added `AndStep` and `OrStep` filters to support arbitrary conjunction of traversals.
-* `__` is now a class with static `GraphTraversal` methods and thus `repeat(out())` is possible.
-* Added `IsStep` / `.is()` that supports filtering scalar values.
-* `Neo4jGraph` and `TinkerGraph` no longer create new `Feature` instances on each feature check.
-* Added `Compare.inside` and `Compare.outside` for testing ranges. Removed `between()` as now its `has('age',inside,[10,30])`.
-* `GraphTraversal.has()` no longer requires the element type to be cast in the traversal definition.
-* Fixed a `ConcurrentModificationException` bug in TinkerGraph that occurred when doing full vertex/edge scans and removing elements along the way.
-* Added `Scope.local` and `Scope.global` in support of `OrderLocalStep` and `OrderGlobalStep` via `order(scope)`.
-* Added `Order.keyIncr`, `Order.keyDecr`, `Order.valueIncr`, and `Order.valueDecr` in support of `Map` sorting.
-* Added `Order.shuffle` and removed `shuffle()` in favor of `order().by(shuffle)`.
-* Changed `Order implements Comparator<Comparable>` to `Order implements Comparator<Object>` as its now generalized to multiple types of objects.
-* The `maxContentLength` setting in Gremlin Server is now respected by the HTTP/REST Gremlin endpoint.
-* Fixed resource leak in the HTTP/REST Gremlin endpoint of Gremlin Server.
-* Refactored Gremlin Server `start` and `stop` functions to return `CompletableFuture`.
-* HTTP REST error response JSON objects from Gremlin Server should no longer have issues with control characters, line feeds, etc.
-* Added `MeanStep`, `mean()`, and `MeanNumber` for calculating number averages in a traversal.
-* Greatly simplified all the traversal `MapReduce` implementations due to the introduction of `VertexTraversalSideEffects`.
-* Added `VertexTraversalSideEffects` as a cheap, static way to get a sideEffect-view of a vertex in OLAP.
-* Added `TraversalHelper.isLocalStarGraph()` which determines if a traversal is contained within the local star graph.
-* Added `TraversalVerificationStrategy` to verify if the traversal can be executed on respective engine.
-* Refactored `GraphTraversal.cap()` to `GraphTraversal.cap(String...)` to support multi-sideEffect grabs.
-* Added GraphSON serialization for `Path`.
-* Added `Traversal.Admin.getTraverserRequirements()` and removed `TraversalHelper.getTraverserRequirements(Traversal)`.
-* `Traversal.equals()` is no longer computed by determining if the objects returned are equal.
-* Altered messaging in Gremlin Console when using a remote that is not yet activated.
-* Fixed potential for deadlock in Gremlin Driver when waiting for results from the server.
-* Added the `useMapperFromGraph` serializer option to the Gremlin Server configuration file to allow auto-registration of serialization classes.
-* Refactored Netty pipeline structure to not have a second "Gremlin" executor group and instead used a standard `ExecutorService`.
-* Refactored the `GremlinExecutor` to take an optional transformation function so as to allow manipulation of results from `eval` in the same thread of execution.
-* Fixed issue with the `HttpGremlinEndpointHandler` where requests were getting blocked when `keep-alive` was on.
-* Added `MinStep` and `MaxStep` with respective `min()` and `max()`.
-* `CountStep` and `SumStep` now extend `ReducingBarrierStep` and no longer are sideEffect steps.
-* `SideEffectCapStep` now extends `SupplyingBarrier` and is much simpler than before.
-* Added `SupplyingBarrier` which simply drains the traversal and emits the value of a provided supplier.
-* Added `TraversalLambda` which implements function, predicate, and consumer over a provided traversal.
-* Any non-core `Step` that takes a function or predicate can now take a traversal which maps to `traversal.next()` (function) and `traversal.hasNext()` (predicate).
-* `CollectingBarrierStep` is no longer abstract and added `GraphTraversal.barrier()` which is analogous to `fold().unfold()`, though cheaper.
-* Added `TraversalOptionHolder` for branching steps to index works with corresponding `GraphTraversal.option()`.
-* `BranchStep` is now a proper generalization of `UnionStep` and `ChooseStep`.
-* `SubgraphStep` has changed in support of in-traversal filtering and removing the need for path-based traversers.
-* Added `HasTraversalStep` which takes an anonymous traversal to determine whether or not to filter the current object.
-* Added `Traversal.Admin.getStartStep()` and `Traversal.Admin.getEndStep()`. Removed `TraversalHelper.getStart()` and `TraversalHelper.getEnd()`.
-* Refactored `profile()` to use injected steps. `ProfileStep` can now be used without any special JVM command line parameters.
-* Added `ReducingBarrierStep` which acts like `CollectingBarrierStep` but operates on a seed with a bi-function.
-* Added a preprocessor for AsciiDocs. Documentation code examples are executed and the results are dynamically inserted into the doc file.
-* `LocalStep` traversal is treated as a branch, not an isolated traversal. Moreover, moved `LocalStep` to `branch/`.
-* Traversal strategies are now applied when the `TraversalVertexProgram` state is loaded, not when submitted. Less error prone as it guarantees strategy application.
-* Reworked `TraversalHolder` where there are "local traversals" and "global traversals". Local traversals are not subject to OLAP message passing.
-* Fixed a bug in `DedupStep` that made itself apparent in `DedupOptimizerStrategy`.
-* Added `RepeatStep.RepeatEndStep` in order to reduce the complexity of the code on OLAP when the predicates are not at the start of `RepeatStep`.
+Please see the archived <<./docs/archive/changelogs/changelog-3.0.x.asciidoc#release-3-0-0-m8, 3.0.0.M8 changelog>>.
=== TinkerPop 3.0.0.M7 (Release Date: January 19, 2015)
-* Added `SideEffectRegistrar` interface and `SideEffectRegistrationStrategy` for allowing steps to register sideEffects at strategy application time.
-* Renamed `Traverser.Admin.setFuture()` and `Traverser.Admin.getFuture()` to `setStepId()` and `getStepId()`, respectively.
-* Added `TraversalMatrix` for random access to steps in a traversal by their step id. Used by `TraversalVertexProgram`.
-* Added unique identifies to `Step` that are not the user provided labels. `Step.getLabel()` now returns an `Optional<String>`.
-* Removed `UnionLinearStrategy`, `ChooseLinearStrategy`, and `RepeatLinearStrategy` as nested traversals are now natively supported in OLAP.
-* Fixed `Neo4jGraph` around manual transaction behavior on `commit` and `rollback` such that they would throw exceptions if a transaction was not open.
-* Redesigned the hidden step labeling mechanism so its consistent across a cluster, easier for rewrite strategies, and will enable nested OLAP traversals.
-* `Traverser.incrLoops()` now takes a string step label to enable nested looping constructs (i.e. loop stacks).
-* Added `Traversal.tryNext()` which returns an `Optional`, where the provided default method should be sufficient for all vendors.
-* Removed `PathConsumer` in favor of `TraverserRequirement.PATH`-model via `Step.getRequirements()`.
-* `Step.getRequirements()` returns a `Set<TraverserRequirement>` which is what is required of the `Traverser` by the `Step`.
-* `Traverser` now extends `Cloneable` and `Traverser.clone()` is used to good effect in `Traverser.split()`.
-* Added `AbstractTraverser` for which all traversers extend.
-* Moved `Traversal.SideEffects` to `TraversalSideEffects` as sideEffects are not necessarily tied to the traversal.
-* Removed `Graph.of()` for generating anonymous graph traversals -- replaced by `__`-model.
-* Removed `Graph` being stored in `Traversal.SideEffects`. Too dangerous when moving between OLTP and OLAP and its limited uses were worked around easily.
-* No need for `DefaultXXXGraphTraversal` unless the vendor is extending with new methods (e.g. `DefaultNeo4jGraphTraversal`).
-* Reworked `TraversalStrategies` such that the are "emanating object class"-dependant, not `Traversal` dependent.
-* Moved `Traverser.sideEffects()` to `Traverser.asAdmin().getSideEffects()`. Users should use `Traverser.sideEffects(key)` and `Traverser.sideEffects(key,value)`.
-* Added `SerializationTest` to the `StructureStandardSuite` in `gremlin-test` which validates serialization at a lower level than `IoTest`.
-* Removed `IntervalStep` and renamed `interval()` to `between()` which is simply an alias to a `has().has()` chain.
-* Added `__` static interface which allows for `__.out().out()`-style construction of anonymous traversals (instead of `g.of()`).
-* The only `GraphTraversal` steps that operate on `Traverser` are the base lambdas and `repeat()` (i.e. `emit()` and `until()`).
-* Removed dependency on the `reflections` library in `gremlin-test` which removed the default implementation of `GraphProvider.getImplementations()` - vendors now need to implement this method themselves.
-* Relaxed the `<S>` typing requirement for anonymous traversals when applied to `choose()`, `repeat()`, `union()`, etc.
-* Removed `LoopStep` and `UntilStep` in favor of the new `RepeatStep` model of looping in Gremlin3.
-* `BranchStep` is now exposed in `GraphTraversal` via `branch(function)`.
-* `UnionStep` now implements `TraversalHolder`.
-* Added `RepeatStep` as the new looping construct supporting do/while, while/do, and emit semantics.
-* Moved `Traversal.sideEffects()` to `Traversal.Admin.getSideEffects()` as `cap()` should be used to access the sideEffect data of a traversal.
-* Renamed vendor `XXXTraversal` to `XXXGraphTraversal` (interface) and `XXXGraphTraversal` to `DefaultXXXGraphTraversal` (implementation class).
-* Modified packaging for console plugins to be more consistent by moving them to the `com.tinkerpop.gremlin.console.groovy.plugin` namespace.
-* Removed all TinkerPop specific dependencies to Guava to avoid user version conflicts.
-* Added support for `-e` (script file execution) and `-v` (version display) options on `gremlin.sh`.
-* GraphSON supports the assignment of multiple custom serialization modules.
-* `Traverser.get(stepLabel/sideEffectKey)` no longer exists. There now exists: `Traverser.path(stepLabel)` and `Traverser.sideEffects(sideEffectKey)`.
-* `SimpleTraverser` now supports "path" but in a very loose, global cache way. Added `SparsePath` as a `Map`-backed `Path` implementation.
-* Provided Neo4j multi-label support in Neo4j-Gremlin. Added three `Neo4jVertex`-specific methods: `addLabel()`, `removeLabel()`, `labels()`.
-* Bumped to Groovy 2.3.9.
-* Added `Graph.Io` interface which allows for simplified helper methods for end users and a way for vendors to override `GraphReader` and `GraphWriter` initial construction when custom serializers are needed.
-* Removed methods from `GraphProvider` related to customizing serializers in `IoTest` from the test suite as the new `Graph.Io` interface now serves that purpose.
-* Added `Neo4jGraph.checkElementsInTransaction(boolean)` which will (or not) verify whether elements retrieved via Neo4j global graph operations are transactionally consistent.
-* Added `ScriptInputFormat` and `ScriptOutputFormat` to Hadoop-Gremlin for reading and writing a file according to an arbitrary parsing script.
-* Added `TimeLimitStep.getTimedOut()` to determine if the step timed out or there were no more objects to process.
-* `Graph.System` is now `Graph.Hidden` with "hidden" being the vendor namespace and the key prefix being `~`.
-* Much better `toString()` handling in `Step` and `Traversal`.
-* `ComparatorHolder<V>` interface returns a `List<Comparator<V>>` instead of a `Comparator<V>[]`.
-* `T` now implements `Function<Element,Object>`.
-* Added `ElementValueComparator` and `ElementFunctionComparator` in support of vendor introspection on `ComparatorHolder`-steps.
-* Renamed `Comparing` marker interface to `ComparatorHolder`.
-* `FunctionHolder` interface provides vendor introspection via `ElementValueFunction`.
-* Removed `OrderByStep` as it is now just `order()` with a `by()`-based comparator.
-* Added `SampleStep` (`sample()`) to allow for sampling the set of previous objects. Useful for doing random walks with `local()`.
-* Renamed `random()` to `coin()` to better express that the filter is a random coin toss.
-* Added `by()`-projection to modulate the meaning of post-processing steps like `aggregate()`, `groupCount()`, `path()`, `order()`, etc.
-* Removed the `Strategy` interface and gave `StrategyGraph` direct access to the `GraphStrategy`.
-* Added `Graph.strategy()` to help instantiate `StrategyGraph` instances.
-* Modified the signature of all `GraphStrategy` methods to include an parameter that contains a reference to the "composing strategy".
-* `PartitionStrategy` hides the specified partition key from view when iterating properties, keys, etc.
-* Change construction of `GraphStrategy` implementations to be consistent with singleton instances and builder pattern.
-* Added `Graph.Helper` annotation to "protected" certain default interface methods from implementation by vendors.
-* Transaction retry functions now work with "manual" transactions.
-* Improved error messaging when importing "legacy" GraphSON that was not generated with "extended" properties.
-* Renamed "iterator" related methods in the `GraphStrategy` interface to be consistent with the method names they represent.
-* `PropertyMapStep` (`valueMap()`) now takes a boolean to state if the tokens of the element are desired along with its properties.
-* `HadoopGraph` now connected to the `StructureProcessSuite`.
-* `HadoopGraph` no longer supports `Graph.Variables` as they were in-memory. A persistence mechanism can be introduced in the future.
-* Hidden properties removed in favor of using `GraphStrategy` for such features.
-* `Edge.iterators().vertexIterator(BOTH)` now guarantees `OUT` then `IN` vertex iterator order.
-* `Graph.v(Object)` and `Graph.e(Object)` no longer exist. Instead, use `Graph.V(Object... ids)` and `Graph.E(Object... ids)`.
-* Added `Graph.Iterators` to allow access to vertex and edge iterators based on element ids and bypassing `GraphTraversal`.
-* Renamed `GraphStrategy` implementations to be less verbose - removed the word "Graph" from their names (e.g. `IdGraphStrategy` simply changed to `IdStrategy`).
-* Removed `Step.NO_OBJECT` as the problem is solves can be solved with proper use of `flatMap` and `EmptyTraverser`.
-* `Path` is now part of `GraphSerializer` and thus, not specific to a particular implementation of `Path`.
-* Added messaging to show files being downloaded when using the Gremlin Server "install" command.
-* Added test name and class arguments to the `GraphProvider.loadGraphWith` method.
-* Merged `ReferencedXXX` and `DetachedXXX` so that all migration of graph element data is via `DetachedXXX`.
-* Added `StaticVertexProgram` and `StaticMapReduce` which simply return `this` on `clone()`.
-* `VertexProgram` and `MapReduce` now implement `Cloneable` and is used for fast copying across workers within the same machine.
-* Added `TraversalHolder` interface which extends `PathConsumer` to determine recursively if nested traversals require path calculations turned on.
-* Reworked how a `TraverserGenerator` is retrieved and utilized.
-* Added `Traversal.toBulkSet()` to make getting resultant data more efficiently for traversals with repeated data.
-* Provided a helper `LocalStep.isLocalStarGraph()` so `GraphComputer` implementers know the requisite data boundaries.
-* Created `Traversal.Admin` to hide administrative methods. Added `Traversal.asAdmin()` to get at `Traversal.Admin`.
-* Fixed up all `Step` cloning operations realizing that Java8 lambdas are always bound to the calling class (no delegates).
-* Usage of `:remote close` without configured remotes shows a reasonable message rather than a stack trace.
-* Provided `LocalStep` to signify that the internal traversal is locally bound to the incoming object.
-* Failed script evaluation in Gremlin Server now triggers the cancel of the process attempting to timeout the script if it were to run too long.
-* Greatly increased the speed of `ScriptEngineLambda` by making use of a static `ScriptEngine` cache.
-* Fixed a general bug in all sideEffect using steps where the sideEffect should be accessed via the `Traverser` not `Traversal`.
-* `GremlinPlugin` interface no longer has the `additionalDependencies` method - those dependencies are now defined by an entry in the manifest file for the jar called `Gremlin-Plugin-Dependencies`.
-* Added `TinkerWorkerPool` which is used for resource efficient threading in `TinkerGraphComputer`.
-* `MapReduce.createMapReduce(Configuration)` now exists and serves the same purpose as `VertexProgram.createVertexProgram(Configuration)`.
-* Enabled SessionOps to be extended. Added eval handler hook.
-* Setting a property with an unsupported data type throw `IllegalArgumentException` instead of `UnsupportedOperationException` as the operation is supported, but the argument is not.
+Please see the archived <<./docs/archive/changelogs/changelog-3.0.x.asciidoc#release-3-0-0-m7, 3.0.0.M7 changelog>>.
=== TinkerPop 3.0.0.M6 (Release Date: December 2, 2014)
-* `javatuples.Pair` avoided on `MapReduce` API in favor of a new `KeyValue` class.
-* Renamed `Gremlin-Plugin` manifest entry for plugins to `Gremlin-Plugin-Paths`.
-* Added `Gremlin-Plugin-Dependencies` manifest entry to list other dependencies that should be retrieved with a plugin jar.
-* `Memory.Admin.asImmutable()` yields an immutable representation of the GraphComputer `Memory`.
-* Fixed host selection in `gremlin-driver` by properly accounting for all hosts being marked unavailable at the instantiation of a `Client`.
-* Removed Giraph-Gremlin in favor of new Hadoop-Gremlin with `GiraphGraphComputer` support. Future support for `MapReduceGraphComputer`.
-* Greatly simplified the `InputFormat` and `OutputFormat` model for working with Giraph (and Hadoop).
-* Added a serializer for `Property` for GraphSON correcting format of serialization of a single `Property` on an `Edge`.
-* Fixed bug in Gremlin Console that prevented assignments to empty `List` objects.
-* Added `VertexProgram.getMessageScopes()` to allow vendors to know which `MessageScopes` at a particular `Memory` state.
-* Reduced the number of methods in `MessageScope.Local` as its up to vendors to inspect provided incident `Traversal` accordingly.
-* Renamed `MessagesType` to `MessageScope` to make it less ambiguous regarding the class of the messages being sent.
-* Changed the message type of `TraversalVertexProgram` to `TraverserSet` to support message combining.
-* Added `VertexProgram.getMessageCombiner()` to support the combining of messages in route to a vertex.
-* Reduced object creation in `TraversalVertexProgram` around vertex-local traversal sideEffects.
-* Renamed `Traverser.Admin.makeChild()` and `Traverser.Admin.makeSibling()` to `Traverser.Admin.split()` to correspond with `merge()`.
-* Added `Traverser.Admin.merge(Traverser)` method so that the merging algorithm is with the `Traverser`.
-* Added `Operator` enum that contains sack-helpful `BinaryOperators`: sum, minus, mult, div, max, min, etc.
-* Added `GraphTraversal.withSack()` and renamed `trackPaths()` and `with()` to `withPath()` and `withSideEffect()`, respectively.
-* Added the "Gremlin Sacks" feature to allow a `Traverser` to carry local information along its walk.
-* GraphSON format no longer makes use of `hiddens` JSON key. Its all just `properties`.
-* Added `DoubleIterator` to make vendor implementations of `Edge.iterators().vertexIterator()` efficient.
-* `PropertiesStep` is smart about hiddens vs. properties.
-* `Element.iterators().hiddenProperties()` no longer exists. For vendors, simply provide an iterator of properties.
-* `GIRAPH_GREMLIN_LIBS` supports colon separated directories for loading jars from multiple paths.
-* Introduced method to control the location of dependencies dynamically loaded to the Gremlin Console as part of the `:install` command.
-* Fixed problem with the Neo4j Gremlin Plugin not loading properly after Gremlin Console restart.
-* Removed the "use" configuration from Gremlin Server.
-* Moved `SugarGremlinPlugin` from `gremlin-console` to `gremlin-groovy` so that it could be shared with Gremlin Server.
-* Fixed bug in serialization of `null` results returned to the Gremlin Console when serializing to strings.
-* Moved the `GremlinPlugin` for `TinkerGraph` to `tinkergraph-gremlin` module (it is no longer in `gremlin-console`).
-* Added a `plugin-info.txt` file to Gremlin Console `/ext/{module}` subdirectories to identify the module that was originally requested.
-* Gremlin Server now allows for the explicit configuration of plugin activation.
-* Refactored `GremlinPlugin` and `AbstractGremlinPlugin` to better account for plugins that run on the server and those that run in the console.
-* Added a `plugins` configuration to Gremlin Server to control the plugins that are enabled on initialization.
-* Added a builder option to `GremlinExecutor` to control the plugins that are enabled on initialization.
-* Added `RemoteException` for usage with `RemoteAcceptor` implementations for the Gremlin Console so as to better standardize their development.
-* Standardized all text being written to the Gremlin Console using starting upper case letter.
-* Prevented error in the Console when `:submit` is called but no remotes were configured.
-* Provided a way to clean the `grapes` directory as part of a standard build with `mvn clean install`.
+Please see the archived <<./docs/archive/changelogs/changelog-3.0.x.asciidoc#release-3-0-0-m6, 3.0.0.M6 changelog>>.
=== TinkerPop 3.0.0.M5 (Release Date: November 7, 2014)
-* Removed `PropertyFilterIterator` as using Java8 streams was just as efficient for the use case.
-* Renamed `KryoWritable` to `GremlinWritable` as it is not necessarily Kryo that is the serialization mechanism.
-* Fixed an input split bug in Giraph that was making it so that splits were not always at vertex boundaries.
-* Fixed a combiner bug in `GirapGraphComputer`. Combiners were always calling `MapReduce.reduce()`, not `MapReduce.combine()`.
-* Greatly simplified `SubgraphStrategy` by removing requirements for `Traversal` introspection.
-* `StrategyWrappedGraph` mimics vendor use of `GraphStep` and `GraphTraversal` and no longer requires dynamic strategy application.
-* `TraversalStrategies` make use of a dependency tree sorting algorithm to ensure proper sorts prior to application.
-* `TraversalStrategies` are now immutable and are bound to the `Traversal` class.
-* Fixed bug in Gephi Plugin that prevented it from communicating with the Gephi Streaming Server.
-* Renamed `MessageType.XXX.to()` to `MessageType.XXX.of()` so it makes sense in both the sending and receiving context.
-* Improved messaging with respect to tests that are ignored due to features to make it clear that those tests are not in error.
-* Relaxed exception consistency checks in the test suite to only check that a thrown exception from an implementation extends the expected exception class (but no longer validates that it is the exact class or that the message text).
-* `VertexProgram` now has `workerIterationStart()` and `workerIterationEnd()` to allow developers to control vertex split static data structures.
-* `TraversalVertexProgram` startup time greatly reduced due to being smart about `loadState()` behavior.
-* Gremlin Server sessions now allow serialization of results that were part of an open transaction.
-* Refactor `OpProcessors` implementations in Gremlin Server for better reusability.
-* `Vertex.iterators()` no longer have a `branchFactor`. This is now at the query language level with `localLimit()`.
-* Added `limit(long)` and `localLimit(int,int)` which simply call the range equivalents with 0 as the low.
-* Added `LocalRangeStep` which supports ranging the edges and properties of an element -- `localRange(int,int)`.
-* `GraphTraversal.value(String)` no longer exists. Instead, use `GraphTraversal.values(String)`.
-* `HiddenXXXStep` and `ValueXXXStep` no longer exist. `PropertyXXXStep` takes a `PropertyType` to denote value and hidden access.
-* Added `PropertyType` to the structure-package which provide markers for denoting property types (vs. property classes).
-* Renamed `setWorkingDirectory` to `workingDirectory` in the `KryoReader` builder.
-* `Path.get(String)` returns the object if only one object is referenced by label, else it returns a `List` of referenced objects.
-* Added overload to `GremlinKryo` to allow a serializer to be configured as a `Function<Kryo,Serializer>` to allow better flexibility in serializer creation.
-* Added method to `GraphProvider` to allow implementers to provide a mechanism to convert GraphSON serialized identifiers back to custom identifiers as needed.
-* Added methods to `GraphProvider` so that implementers could specify a custom built `GremlinKryo` class and/or `SimpleModule` class in case their implementation had custom classes to be serialized.
-* Added `Traversal.forEachRemaining(class,consumer)` for those traversals whose end type is different from declared due to strategy rewriting.
-* Removed `Traversal.forEach()` as traversal implements `Iterator` and users should use `forEachRemaining()`.
-* `RangeStep` now has an inclusive low and an exclusive high -- a change from Gremlin2.
-* `DriverGremlinPlugin` returns raw results with driver results available via the `result` variable.
-* Removed test enforcement of `private` constructor for a `Graph` instance.
-* `RemoteAcceptor` now supports `@` prefixed lines that will grab the script string from the Gremlin Console shell.
-* Modified the signature of `Property.element()` to simply return `Element`
-* Added `Reducing` marker and `ReducingStrategy` which supports reduction-functions as a final step in Gremlin OLAP (e.g. `fold()`).
-* Once strategies are `complete()`, no more steps can be added to a `Traversal`.
-* Renamed `Traversal.strategies()` to `Traversal.getStrategies()` as it is not a "query language"-method.
-* Added test to enforce that a `label` on a `VertexProperty` is always set to the key of the owning property.
-* Fixed bug with multi-property removal in `Neo4jGraph`.
-* Bumped to Neo4j 2.1.5.
-* Used standard `UUIDSerializer` from the `kryo-serializers` library for serialization of `UUID` objects.
-* Changed GraphSON serialization to only use `iterators()` - there were still remnants of `Traversal` usage from previous refactoring.
-* Added overload for `detach` method to allow for the `Element` to be detached as a "reference" only (i.e. without properties).
-* Renamed `Item` in `gremlin-driver` to `Result`.
-* Renamed `strategy` to `getStrategy` in `StrategyWrappedGraph`.
-* Renamed `baseGraph` to `getBaseGraph` in `Neo4jGraph`.
-* `Neo4jGraph` now returns an empty property `Vertex.property(k)` when the key is non-existent (a problem only visible when meta/multi property configuration was turned off).
-* `Traversal.Strategies.apply()` now takes a `TraversalEngine`. Greatly simplifies strategy application for `STANDARD` or `COMPUTER`.
-* Renamed `IdentityReductionStrategy` to `IdentityRemovalStrategy` for reasons of clarity.
-* Added `ComparingRemovalStrategy` that removes `Comparing`-marked steps unless they are the end step of the traversal.
-* `OrderStep` now works in OLAP, but only makes sense as a traversal end step.
-* `MapReduce` API extended to include `getMapKeySort()` and `getReduceKeySort()` to sort outputs accordingly.
-* Renamed `TraversalResultMapReduce` to `TraverserMapReduce`. Shorter and makes more sense.
-* Improved build automation to package javadocs and asciidoc documentation in the distribution files.
-* Improved build automation with a script to automatically bump release versions in the various files that needed it such as the `pom.xml` files.
-* The identifier on `VertexProperty` is now read properly to those graphs that can support identifier assignment.
-* `GraphSONReader.readGraph()` now properly reads vertex properties.
-* Removed `Neo4jGraph.getCypher()` as users should use `Neo4jGraph.cypher()` and get back TinkerPop3 graph objects.
-* `GiraphGraph.variables().getConfiguration()` is now replaced by `GiraphGraph.configuration()`.
-* Added `Graph.configuration()` which returns the `Configuration` object of `Graph.open()`.
-* Removed `TraverserTracker` as now there is only a `TraverserSet` for all halted traversers. A nice simplification of `TraversalVertexProgram`.
-* Renamed `Traverser.isDone()` to `Traverser.isHalted()` and `DONE` to `HALT`. Consistent with automata terminology.
-* Removed `PathTraverserExecutor` and `SimpleTraverserExecutor` as a single `TraverserExecutor` correctly executes both types of traversers.
-* `TraversalVertexProgram` does "reflexive message passing" to reduce the total number of iterations required to execute a traversal.
-* `MapReduce` no-argument constructors are private and thus, only for reflection and `loadState()` usage.
-* MapReducers for `TraversalVertexProgram` are now smart about `with()` declared data structures.
-* Updated `Traversal.SideEffects` to use "registered suppliers" and it now works accordingly in both OLTP and OLAP environments.
-* Increased the speed of `FlatMapStep` by approximately 1.5x.
+Please see the archived <<./docs/archive/changelogs/changelog-3.0.x.asciidoc#release-3-0-0-m5, 3.0.0.M5 changelog>>.
=== TinkerPop 3.0.0.M4 (Release Date: October 21, 2014)
-* Added features for `VertexProperty` user supplied ids and related data types.
-* Removed `SideEffectCap` marker interface as there is only one `SideEffectCapStep` and thus, `instanceof` is sufficient.
-* `Path.getObjects()`/`Path.getLabels()` renamed to `Path.objects()`/`Path.labels()` to be in line with "query language" naming convention.
-* Greatly simplified `GiraphInternalVertex` due to `Element.graph()` -- 1/2 the memory footprint and reduced construction time.
-* Renamed `Property.getElement()` to `Property.element()` given the "query language" naming convention.
-* `Element.graph()` added which returns the `Graph` that the element is contained within.
-* Added tests for greater consistency around iterating hidden properties.
-* Simplified `TraversalVertexProgram` where only a single `TraverserTracker` exists for both path- and simple-traversers.
-* Fixed a major bug where `Arrays.binarySearch` was being used on an unsorted array in TinkerGraph and Neo4jGraph.
-* Changed `ComputerResult.getXXX()` to `graph()` and `memory()` to be consistent with "query language" naming convention.
-* `Traverser.getXXX()` changed to `loops()`, `bulk()`, `path()`, `sideEffects()` to be consistent with "query language" naming convention.
-* Optimization to reduce the number of empty lists created due to no step class existing for respective `TraversalStrategy.apply()`.
-* Added `CapTraversal` as a marker interface for the `cap()` method.
-* Added `union()` with GraphComputer `UnionLinearStrategy`.
-* `TimeLimitStep` was moved to `filter/` package. It was a mistake that it was in `sideEffect/`.
-* Provided the configuration for generating both a "full" and "core" set of javadocs, where "full" represents all classes in all projects and "core" is the "user" subset.
-* Validated bindings passed to Gremlin Server to ensure that they do not match the most common statically imported values.
-* If no script engine name is provided to a `LambdaHolder` it is assumed to be Gremlin-Groovy.
-* `MapEmitter` and `ReduceEmitter` have an `emit(value)` default method where the key is the `MapReduce.NullObject` singleton.
-* `Traverser.Admin` now implements `Attachable` as the `Traversal.SideEffects` can be generated from the `Vertex`.
-* Made a solid effort to ensure that all TinkerPop keys are `Graph.System` to leave `Graph.Key` for users.
-* The `Graph.System` prefix is now `^` instead of `%&%`. Simpler and easier on the `toString()`-eyes.
-* Added `Traversal.SideEffects.ifPresent(Consumer)` as a default helper method.
-* Added `profile()`-step which provides detailed information about the performance of each step in a traversal.
-* No more `CountCapStep` and `CountStep`, there is only `CountStep` and it is elegant.
-* Created a `AbstractTraversalStrategy` with good `toString()`, `hasCode()`, and `equals()` implementations.
-* Added `CountTraversal` as a marker-interface stating that the `Traversal` has a `count() -> Long` method.
-* `Traversal` no longer has any step methods as its not required for DSL implementers to have "core steps."
-* Added "linearization" strategy for `ChooseStep` so it is executed correctly on GraphComputer.
-* Added `GraphTraversalStrategyRegistry` which has respective global strategies to make turning on/off strategies easier.
-* Added a generic `BranchStep` to be used for re-writing "meta-steps" for execution on GraphComputer.
-* Moved `JumpStep`, `UntilStep`, and `ChooseStep` to a new `branch/` package.
-* Added test cases to the Structure Suite to enforce consistent operations of reading properties after removal of their owning `Element`.
-* GraphSON format change for full `Graph` serialization - Graph variables are now serialized with the key "variables" as opposed to "properties".
-* Relaxed `Graph.toString()` test requirements for implementers.
-* Made the `toString` operations in `GraphStrategy` consistent.
-* Added `VertexFeatures.supportsRemoveProperty`.
-* Added `VertexPropertyFeatures.supportsRemoveProperty`.
-* Added `EdgeFeatures.supportsRemoveProperty`.
-* Added `VertexFeatures.supportsRemoveVertices`.
-* Added `EdgeFeatures.supportsRemoveEdges`.
-* Vendors should now get a clear error when mis-spelling something in an `@OptOut` (or more likely if a test name changes) and it now works all the test suites.
-* All plugins now have a default prefix of "tinkerpop." as a namespace.
-* `GraphComputer` now executes a `Set<MapReduce>` and `hashCode()`/`equals()` were implemented for existing `MapReduce` implementations.
-* Changed `Contains.in/notin` to `Contains.within/without` as `in` is a reserved term in most languages (including Java and Groovy).
-* Added helper methods for loading data into collections in `TraversalHelper`.
-* Core `Traversal` methods are smart about bulking -- e.g. `iterate()`, `fill()`, `remove()`, etc.
-* `GroupByStep` and `GroupByMapReduce` leverage `BulkSet` as the default group data structure.
-* `Element.Iterator` has renamed methods so implementers can do `MyElement implements Element, Element.Iterators`.
-* Renamed `MessageType.Global` and `MessageType.Local` creators from `of()` to `to()` as it makes more sense to send messages `to()`.
-* With `Traverser.get/setBulk()` there is no need for a `TraverserMessage`. The `Traverser` is now the message in `TraversalVertexProgram`.
-* Provided static `make()` methods for constructing `Path` implementations.
-* Provided a more space/time efficient algorithm for `Path.isSimple()`.
-* The `JumpStep` GraphComputer algorithm `Queue` is now a `TraverserSet`.
-* `AggregateStep` and `StoreStep` now use `BulkSet` as their default backing `Collection` (much more space/time efficient).
-* Added `BulkSet` which is like `TraverserSet` but for arbitrary objects (i.e. a weighted set).
-* `UnrollJumpStrategy` is no longer a default strategy as it is less efficient with the inclusion of `TraverserSet`.
-* Introduced `TraverserSet` with bulk updating capabilities. Like OLAP, OLTP looping is now linear space/time complexity.
-* TinkerGraph's MapReduce framework is now thread safe with a parallel execution implementation.
-* Added a default `Traverser.asAdmin()` method as a typecast convenience to `Traverser.Admin`.
-* Renamed `Traverser.System` to `Traverser.Admin` as to not cause `java.lang.System` reference issues.
-* Renamed `Memory.Administrative` to `Memory.Admin` to make it shorter and consistent with `Traverser.Admin`.
-* Fixed a TinkerGraph bug around user supplied vertex property ids.
-* Most `Step` classes are now defined as `public final class` to prevent inheritance.
-* `ShuffleStep` now extends `BarrierStep` which enables semantically correct step-sideEffects.
-* Leveraged `Traverser.getBulk()` consistently throughout all steps.
+Please see the archived <<./docs/archive/changelogs/changelog-3.0.x.asciidoc#release-3-0-0-m4, 3.0.0.M4 changelog>>.
=== TinkerPop 3.0.0.M3 (Release Date: October 6, 2014)
-* All `Step` fields are now `private`/`protected` with respective getters as currently needed and will be added to as needed.
-* Gremlin Server no longer has the `traverse` operation as lambdas aren't really serialized.
-* `Path` is now an interface with `ImmutablePath` and `MutablePath` as implementations (2x speedup on path calculations).
-* `Traverser` now implements `Comparable`. If the underlying object doesn't implement `Comparable`, then a runtime exception.
-* Added abstract `BarrierStep` which greatly simplifies implementing barriers like `AggregateStep`, `OrderStep`, etc.
-* `SelectStep` is now intelligent about when to trigger path computations based on label selectors and barriers.
-* `T` no longer has `eq`, `neq`, `lt`, `in`, etc. Renamed all respective enums and with `static import`, good in console (e.g. `Compare.eq`).
-* Added `Order` enum which provides `Order.decr` and `Order.incr`.
-* `Traverser.loops` and `Jump.loops` are now shorts (`32767` max-loops is probably sufficient for 99.9999% of use cases).
-* `Traverser.bulk` exists which is how many instances does the traverser represent. For use in grouping with bulk computations.
-* Greatly simplified sideEffect steps where there is no distinction between OLAP vs. OLTP (from the `Step` perspective).
-* Removed the need for `Bulkable` and `VertexCentric` marker interfaces in process API.
-* Renamed configuration parameters in Giraph-Gremlin to be consistent with a `giraph.gremlin`-prefix.
-* Made it possible to pass a `ScriptEngine` name and string script in `TraversalVertexProgram` and `LambdaVertexProgram`.
-* Made `TinkerGraph` a plugin for the Console as it is no longer a direct dependency in `gremlin-groovy`.
-* Added features for supporting the addition of properties via `Element.property(String,Object)`.
-* `GiraphGraph` OLTP tested against Gremlin-Java8 and Gremlin-Groovy -- OLAP tested against Gremlin-Groovy.
-* `Neo4jGraph` is now tested against both Gremlin-Java8 and Gremlin-Groovy.
-* Renamed the test cases in `ProcessTestSuite` to be consistent with other Gremlin language variants.
-* Added a `gremlin-groovy-test` suite that can be used to validate implementations against the Groovy variant of Gremlin.
-* `TinkerGraph` is no longer serializable, use a `GraphReader`/`GraphWriter` to serialize the graph data.
-* Removed `implements Serializable` on numerous classes to ensure safety and proper usage of utilities for cloning.
-* `Traversal` now implements `Cloneable` as this is the means that inter-JVM threads are able to get sibling `Traversals`.
-* Created "integration" test for `Neo4jGraph` that runs the test suite with multi/meta property features turned off.
-* Added `GraphStrategy` methods for `VertexProperty`.
-* Converted the `id` data type from string to integer in the Grateful Dead sample data.
-* Removed all notions of serializable lambdas as this is a misconception and should not be part of TinkerPop.
-* Greatly simplified `TraversalVertexProgram` with three arguments: a `Traversal<Supplier>`, `Class<Traversal<Supplier>>`, or a script string with `ScriptEngine` name.
-* Added `TraversalScript` interface with `GroovyTraversalScript` as an instance. To be used by OLAP engines and any language variant (e.g. gremlin-scala, gremlin-js, etc.).
-* `UntilStep` now leverages `UnrollJumpStrategy` accordingly.
-* Fixed a bug where the `toString()` of `Traversal` was being hijacked by `SugarGremlinPlugin`.
-* Fixed compilation bug in `UntilStep` that is realized when used in multi-machine OLAP.
-* Simplified `Enumerator` and implementations for `MatchStep`.
+Please see the archived <<./docs/archive/changelogs/changelog-3.0.x.asciidoc#release-3-0-0-m3, 3.0.0.M3 changelog>>.
=== TinkerPop 3.0.0.M2 (Release Date: September 23, 2014)
-* Added an exhaust `InnerJoinEnumerator` fix in `MatchStep` to get all solutions correctly.
-* `Neo4jGraph` can be configured to allow or disallow meta- and multi-properties.
-* Added `until()`-step as a simpler way to express while-do looping which compiles down to a `jump()`-step equivalent.
-* Added "The Crew" (`CREW`) toy graph which contains multi-properties, meta-properties, graph variables, hiddens, etc.
-* If the Giraph job fails, then the subsequent `MapReduce` jobs will not execute.
-* Added `Graph.System` class which generates keys prefixed with `%&%` which is considered the vendor namespace and not allowed by users.
-* Added `ReferencedVertex` (etc. for all graph object types) for lightweight message passing of graph object ids.
-* `T.*` now has `label`, `id`, `key`, `value` and no longer are these `String` representations reserved in TinkerPop.
-* `Traverser` now has a transient reference to `Traversal.SideEffects`.
-* "Detached" classes are now tested by the standard test suite.
-* Compartmentalized `Traverser` interface so there is now a `Traverser.System` sub-interface with methods that users shouldn't call.
-* Added `OrderByStep` which orders `Elements` according to the value of a provided key.
-* 2x speed increase on steps that rely heavily on `ExpandableStepIterator` with massive memory footprint reduction as well.
-* Added `VertexProperty<V>` as the property type for vertices -- provides multi-properties and properties on properties for vertices.
-* Changed `VertexProgram` such that `getElementComputeKeys()` is simply a `Set<String>`.
-* Significant changes to the format of the `ResponseMessage` for Gremlin Server - these changes break existing clients.
-* Close any open transactions on any configured `Graph` when a session in Gremlin Server is killed.
-* Grateful Dead Graph now uses vertex labels instead of "type" properties.
-* There is now a `GraphComputerStrategy` and `EngineDependent` marker interface to allow steps to decide their algorithm depending if they are OLAP or OLTP.
-* A labeled step now stores its current traverser value in `Traversal.SideEffects` (no longer can sideEffectKeys and step labels be the same).
-* `GraphFactory` support for opening a `Graph` with multiple `GraphStrategy` instances - if there are multiple strategies they are wrapped in order via `SequenceGraphStrategy`.
-* The result type for result termination messages returned from Gremlin Server is now set to "no content".
-* The `maxContentLength` setting for Gremlin Driver now blocks incoming frames that are too large.
-* After initialization scripts are executed in Gremlin Server, the `Graph` instances are re-bound back to their global references, thus allowing `GraphStrategy` initialization or even dynamic `Graph` creation through scripts.
-* Added "Modern" graph back which is basically the "Classic" graph with double values for the "weight" property on edges and non-default vertex labels.
-* `Traversal.addStep()` is now hard typed so type casting isn't required and traversal APIs look clean.
-* Changed the hidden key prefix from `%$%` to `~` in `Graph.Key.hide()`.
-* Added `has(label,key,predicate,value)` to allow for `has('person','name','marko')`. Various overloaded methods provided.
-* Update to traversal API where if a `SFunction<S,?>` was required, but can process a `Traverser<S>`, then the function is `SFunction<Traverser<S>,?>`.
-* Added `WhereStep` as a way to further constrain `select()` and `match()`.
-* Extensive work on `GiraphMemory` and its interaction with Giraph aggregators.
-* If the input path of a `GiraphGraphComputer` does not exist, failure happens prior to job submission.
-* `SugarPlugin` now has all inefficient methods and Gremlin-Groovy proper is only efficient Groovy techniques.
-* Prevented concurrency problems by only modifying bindings within the same thread of execution in the `GremlinExecutor`.
-* Calls to `use` on the `DependencyManager` now return the list of `GremlinPlugin` instances to initialize instead of just initializing them automatically because it causes problems with `ScriptEngine` setup if a plugin requires a script to be evaluated and a required dependency is not yet loaded.
-* `Traversal.SideEffects` has `getGraph()`, `setGraph()`, and `removeGraph()` default helpers.
-* `Traversal.Memory` -> `Traversal.SideEffects` and `GraphComputer.SideEffects` -> `GraphComputer.Memory`.
-* `StrategyWrappedVertex` and `StrategyWrappedEdge` properly wrap `Element` objects returned from non-traversal based methods.
-* Gremlin-Server now sends a single write with status 200 for Object and empty response messages.
-* `GremlinGroovyScriptEngine` allows imports to re-import dependencies added via "use".
-* Changed order in which the `GremlinExecutor` is initialized such that dependency loading via "use" are handled first which fixes problems with starting Gremlin Server with `gremlin-server-neo4j.yaml`.
-* Corrected issues with the "branch factor" related traversals under `SubgraphStrategy`. This change also altered the semantics of the `SubgraphStrategy` a bit as it became more restrictive around `Edge` inclusion (requires both vertices to be in the subgraph).
-* The Gephi Plugin now visualizes traversals and has numerous configuration options.
-* Added more specific features around the types of "identifiers" a graph can support.
-* Added a new test graph called `MODERN` that is copy of the `CLASSIC` graph, but represents floats as doubles. This graph will be the default graph for testing going forward.
-* Fix bug in `Neo4jGraph` that was not processing multiple vertex labels properly when doing a `has()` step with `IN`.
-* Changed semantics of `@LoadGraphWith` in gremlin-test to only refer to the ability of a test implementation to process the data types of the test graph (not to actually load it).
-* `StartStep` is a `SideEffect` as it is a process to get data into the stream (like a keyboard) and more efficient as such.
-* Greatly simplified the implementations of `Map`, `FlatMap`, `Filter`, and `SideEffect`.
-* `Path` data structure changed to an ordered list of objects with each associated to a `Set<String>` of as-labels.
-* All sideEffect-based steps no longer extend `FilterStep` with predicate equal true, but a more efficient `SideEffectStep`.
-* `TreeStep` now has `TreeMapReduce` for executing on `GraphComputer`.
-* `Neo4jTraversal.cypher()` is fluent throughout.
-* Reverted back to TP2 model of `as()` referring to step names, not variable names of sideEffects.
-* Updated `AddEdge`-step to support property key/value pairs for appending to newly created edges.
-* Renamed `Graph.getFeatures()` to `Graph.features()` to be consistent with other API methods.
-* `Vertex` and `Edge` now implement all `GraphTraversal` methods to ensure consistency throughout stack.
-* `Neo4jTraversal` is auto-generated from `Neo4jTraversalStub` with technique generalizable to other vendors.
-* Added test suite to ensure that all traversals are of the same type: `g.V`, `g.E`, `g.of()`, `v.identity()`, `e.identity()`, v-, e-methods.
-* Giraph HDFS helpers now support `hdfs.mkdir(string)` and `local.mkdir(string)`
-* Added `@OptIn` and `@OptOut` for implementers to specify on their `Graph` implementations for test compliance information.
-* `GraphComputer` `Memory` now immutable after computation is complete.
-* Dependency grabbing for plugins filter out slf4j logging dependencies so as to avoid multiple bindings with the standard TinkerPop distributions.
-* Fixed `GiraphMemory` to be fully consistent with GraphComputer specification.
-* Removed fatJar assembly from Giraph-Graph as it is no longed needed with distributed cache model.
-* Reworked `GiraphRemoteAcceptor` to provide a `result` variable back to the console with `ComputerResult`.
-* `VertexProgram` is no longer `Serializable` (use `loadState` and `storeState` for wire-propagation).
-* Moved `GiraphGraph.getOutputGraph()` to `GiraphHelper`.
-* Changed `GIRAPH_GREMLIN_HOME` to `GIRAPH_GREMLIN_LIB` to reference directory where jars are to be loaded.
-* Updated README with release instructions.
+Please see the archived <<./docs/archive/changelogs/changelog-3.0.x.asciidoc#release-3-0-0-m2, 3.0.0.M2 changelog>>.
=== TinkerPop 3.0.0.M1 (Release Date: August 12, 2014)
diff --git a/LICENSE b/LICENSE
index 56d9bf7..236e252 100644
--- a/LICENSE
+++ b/LICENSE
@@ -208,7 +208,7 @@
The Apache TinkerPop project bundles the following components under the MIT License:
bootstrap 5.0.0 (http://getbootstrap.com/) - for details, see licenses/bootstrap
- jquery 1.11.0 (https://jquery.com/) - for details, see licenses/jquery
+ jquery 1.12.4 (https://jquery.com/) - for details, see licenses/jquery
normalize.css 2.1.2 (https://necolas.github.io/normalize.css/) - for details, see licenses/normalize
prism.css/js 1.27.0 (https://prismjs.com/) - for details, see licenses/prism
wow.js 1.1.2 (https://wowjs.uk/) - for details, see licenses/wow
diff --git a/README.asciidoc b/README.asciidoc
index 5f1219a..b0c4dc8 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -60,7 +60,7 @@
\,,,/
(o o)
------oOOo-(3)-oOOo-----
+-----oOOo-(4)-oOOo-----
plugin activated: tinkerpop.server
plugin activated: tinkerpop.utilities
plugin activated: tinkerpop.tinkergraph
diff --git a/docker/gremlin-server/docker-entrypoint.sh b/docker/gremlin-server/docker-entrypoint.sh
index fa87baf..4662211 100644
--- a/docker/gremlin-server/docker-entrypoint.sh
+++ b/docker/gremlin-server/docker-entrypoint.sh
@@ -43,9 +43,9 @@
echo IP is $IP
echo
echo Available Gremlin Server instances:
-echo "ws://${IP}:45940/gremlin with anonymous access"
-echo "ws://${IP}:45941/gremlin with basic authentication (stephen/password)"
-echo "ws://${IP}:45942/gremlin with kerberos authentication (stephen/password)"
+echo "http://${IP}:45940/gremlin with anonymous access"
+echo "http://${IP}:45941/gremlin with basic authentication (stephen/password)"
+echo "http://${IP}:45942/gremlin with kerberos authentication (stephen/password)"
echo
echo "See docker/gremlin-server/docker-entrypoints.sh for transcripts per GLV."
echo "#############################################################################"
@@ -59,14 +59,7 @@
/opt/gremlin-server/bin/gremlin-server.sh ${TINKERPOP_HOME}/conf/gremlin-server-integration.yaml &
-/opt/gremlin-server/bin/gremlin-server.sh ${TINKERPOP_HOME}/conf/gremlin-server-integration-secure.yaml &
-
-java -cp /opt/gremlin-test/apache-tinkerpop-gremlin-test-${GREMLIN_SERVER_VERSION}-jar-with-dependencies.jar \
- -Dlogback.configurationFile="file:/opt/gremlin-server/conf/logback.xml" \
- org.apache.tinkerpop.gremlin.server.KdcFixture /opt/gremlin-server &
-
-export JAVA_OPTIONS="-Xms512m -Xmx4096m -Djava.security.krb5.conf=/opt/gremlin-server/target/kdc/krb5.conf"
-/opt/gremlin-server/bin/gremlin-server.sh ${TINKERPOP_HOME}/conf/gremlin-server-integration-krb5.yaml
+/opt/gremlin-server/bin/gremlin-server.sh ${TINKERPOP_HOME}/conf/gremlin-server-integration-secure.yaml
#######################################################################
diff --git a/docker/gremlin-server/gremlin-server-integration-krb5.yaml b/docker/gremlin-server/gremlin-server-integration-krb5.yaml
index e2ca7f0..6dfd94d 100644
--- a/docker/gremlin-server/gremlin-server-integration-krb5.yaml
+++ b/docker/gremlin-server/gremlin-server-integration-krb5.yaml
@@ -41,9 +41,6 @@
- { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV1, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1] }}
- { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1 }
- { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1, config: { serializeResultToString: true }}
-processors:
- - { className: org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: { sessionTimeout: 28800000 }}
- - { className: org.apache.tinkerpop.gremlin.server.op.standard.StandardOpProcessor, config: {}}
metrics: {
slf4jReporter: {enabled: true, interval: 180000}}
gremlinPool: 8
@@ -53,7 +50,7 @@
maxInitialLineLength: 4096
maxHeaderSize: 8192
maxChunkSize: 8192
-maxContentLength: 10485760
+maxRequestContentLength: 10485760
maxAccumulationBufferComponents: 1024
resultIterationBatchSize: 64
writeBufferLowWaterMark: 32768
diff --git a/docker/gremlin-server/gremlin-server-integration-secure.yaml b/docker/gremlin-server/gremlin-server-integration-secure.yaml
index 09776d1..6528551 100644
--- a/docker/gremlin-server/gremlin-server-integration-secure.yaml
+++ b/docker/gremlin-server/gremlin-server-integration-secure.yaml
@@ -36,14 +36,9 @@
org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin: {classImports: [java.lang.Math], methodImports: [java.lang.Math#*]},
org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin: {files: [scripts/generate-all.groovy]}}}}
serializers:
- - { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3] }}
- - { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV2, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2] }}
- - { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV1, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1] }}
- - { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1 }
- - { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1, config: { serializeResultToString: true }}
-processors:
- - { className: org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: { sessionTimeout: 28800000 }}
- - { className: org.apache.tinkerpop.gremlin.server.op.standard.StandardOpProcessor, config: {}}
+ - { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV4, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3] }} # application/json
+ - { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV4 } # application/vnd.graphbinary-v1.0
+ - { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV4, config: { serializeResultToString: true }}
metrics: {
slf4jReporter: {enabled: true, interval: 180000}}
gremlinPool: 8
@@ -53,7 +48,7 @@
maxInitialLineLength: 4096
maxHeaderSize: 8192
maxChunkSize: 8192
-maxContentLength: 10485760
+maxRequestContentLength: 10485760
maxAccumulationBufferComponents: 1024
resultIterationBatchSize: 64
writeBufferLowWaterMark: 32768
diff --git a/docker/gremlin-server/gremlin-server-integration.yaml b/docker/gremlin-server/gremlin-server-integration.yaml
index d039479..8f5d2f7 100644
--- a/docker/gremlin-server/gremlin-server-integration.yaml
+++ b/docker/gremlin-server/gremlin-server-integration.yaml
@@ -18,7 +18,7 @@
host: 0.0.0.0
port: 45940
evaluationTimeout: 30000
-channelizer: org.apache.tinkerpop.gremlin.server.channel.WsAndHttpChannelizer
+channelizer: org.apache.tinkerpop.gremlin.server.channel.HttpChannelizer
graphs: {
graph: conf/tinkergraph-service.properties,
immutable: conf/tinkergraph-service.properties,
@@ -38,14 +38,9 @@
org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin: {classImports: [java.lang.Math], methodImports: [java.lang.Math#*]},
org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin: {files: [scripts/generate-all.groovy]}}}}
serializers:
- - { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3] }}
- - { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV2, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2] }}
- - { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV1, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1] }}
- - { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1 }
- - { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1, config: { serializeResultToString: true }}
-processors:
- - { className: org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: { sessionTimeout: 28800000 }}
- - { className: org.apache.tinkerpop.gremlin.server.op.standard.StandardOpProcessor, config: {}}
+ - { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV4, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3] }} # application/json
+ - { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV4 } # application/vnd.graphbinary-v1.0
+ - { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV4, config: { serializeResultToString: true }}
metrics: {
slf4jReporter: {enabled: true, interval: 180000}}
gremlinPool: 8
@@ -55,7 +50,7 @@
maxInitialLineLength: 4096
maxHeaderSize: 8192
maxChunkSize: 8192
-maxContentLength: 10485760
+maxRequestContentLength: 10485760
maxAccumulationBufferComponents: 1024
resultIterationBatchSize: 64
writeBufferLowWaterMark: 32768
diff --git a/docs/archive/changelogs/changelog-3.0.x.asciidoc b/docs/archive/changelogs/changelog-3.0.x.asciidoc
new file mode 100644
index 0000000..bec970c
--- /dev/null
+++ b/docs/archive/changelogs/changelog-3.0.x.asciidoc
@@ -0,0 +1,791 @@
+////
+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.
+////
+== TinkerPop 3.0.0 (A Gremlin Rāga in 7/16 Time)
+
+image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/images/gremlin-hindu.png[width=225]
+
+[[release-3-0-2-incubating]]
+=== TinkerPop 3.0.2 (Release Date: October 19, 2015)
+
+* Cleaned up `ext/` directory when plugin installation fails for `gremlin-server` and `gremlin-console`.
+* Fixed issues in `gremlin-server` when configured for HTTP basic authentication.
+* Made `BulkLoaderVertexProgram` work for any persistent TP3-supporting graph (input and output).
+* `TreeSideEffectStep` now implements `PathProcessor` which fixed a `ComputerVerificationStrategy` issue.
+* Added a shell script that verifies source and binary distributions.
+* Fixed a bulk related bug in `GroupStep` when used on `GraphComputer` (OLAP).
+* Gremlin Server binary distribution now packages `tinkergraph-gremlin` and `gremlin-groovy` as plugins to be consistent with Gremlin Console's packaging.
+* The `RepeatStep` clauses (`until()`,`emit()`,`repeat()`) can only be set at most one time in order to prevent user confusion.
+* Fixed a `clone()` bug in `RepeatStep`, `TreeStep`, `GroupCountStep`, `GroupStep`, and `TraversalRing`.
+* Fixed a thread context bug in `TinkerGraphComputer`.
+* Fixed issues with the `gremlin-driver` related to hanging connections in certain conditions.
+* TinkerGraph now has an option for persistence where the data is saved on `close()` and, if present, loaded on `open()`.
+* Added an overload for `GremlinExecutor.eval()` that takes a `Lifecycle` object to override some default settings from `GremlinExecutor.Builder`.
+* Improved session closing for transactional graphs during shutdown of Gremlin Server.
+* Fixed id parameter used in tests for `GroovyStoreTest` and `GroovyRepeatTest` to not be treated as an embedded string.
+* `GraphStep` will convert any `Vertex` or `Edge` ids to their id `Object` prior to submission to `GraphComputer` (OLAP).
+
+==== Bugs
+
+* TINKERPOP-814 ConnectionPool can fill with dead Connections
+* TINKERPOP-816 Gryo deserialization of error response with null message causes NPE and protocol desync
+* TINKERPOP-817 Gryo serialization of large responses fails and causes protocol desync
+* TINKERPOP-840 TreeTest Is not being ignored via ComputerVerificationStrategy
+* TINKERPOP-849 gremlin-server doesn't close sessions on 'close' opcode
+* TINKERPOP-855 sasl authentication type error due to Json format
+* TINKERPOP-865 Errors with HTTP REST basic auth
+* TINKERPOP-867 TinkerGraphProvider does not initialize temp dir
+* TINKERPOP-870 Rebound client requires a connection to occur on the underlying client.
+* TINKERPOP-877 Driver hangs if SSL enabled on server but not on client
+
+==== Improvements
+
+* TINKERPOP-828 TinkerGraph can supportPersistence(), should we allow it.
+* TINKERPOP-830 process-docs.sh introduces extra white space dependent on console width
+* TINKERPOP-839 Docs should have a ${version.number} under the logo.
+* TINKERPOP-852 A shell script that validates the distribution artifacts at release time
+* TINKERPOP-853 TinkerPop Logo in JavaDoc index.html
+* TINKERPOP-858 Cleanup after failed :install
+
+[[release-3-0-1-incubating]]
+=== TinkerPop 3.0.1 (Release Date: September 2, 2015)
+
+* `Compare` now uses `BigDecimal` internally to ensure that precision is not lost on standard number comparisons.
+* Renamed `ComputerVerificationStrategy` to `VerificationStrategy` so all the verification strategies can use it.
+* Added `StandardVerificationStrategy` that throws exceptions for illegal traversal patterns on the standard engine (which extends to `GraphComputer`).
+* Added `GraphFeatures.supportsConcurrentAccess()` to allows `Graph` implementations to signify if multiple instances can access the same data.
+* Clarified semantics of `Transaction.close()` in unit tests - now refers only to closing the current transaction in the current thread.
+* `Neo4jGraph` no longer uses `OptOut` on `TransactionTest.shouldRollbackOnCloseWhenConfigured` (formerly `shouldRollbackOnShutdownWhenConfigured`)
+* Gremlin Server initialization scripts can now return a `Map` of values that will become global bindings for the server.
+* Introduced the `--dryRun` option to the document generation process which ignores actual script execution in the Gremlin Console.
+* Fixed bug in `EventStrategy` around property changed events when calling `property` without cardinality or meta-property values.
+* Improved support for the `Accept` header for REST-based requests in Gremlin Server.
+* `GraphFactory` now allows specification of the class to use to instantiate the `Graph` through the `GraphFactoryClass` annotation.
+* Added `wrapAdjacencyList` and `unwrapAdjacencyList` options to `GraphSONWriter` and `GraphSONReader` respectively, thus allowing valid JSON to be written/read if the user desires.
+* Added Gremlin Server/Driver authentication support via SASL.
+* Added Basic HTTP authentication support for REST in Gremlin Server.
+* Added Gremlin Server plugin to help with "credential graph" management (used in conjunction with authentication features of Gremlin Server).
+* Added "secure" Gremlin Server/Driver example configuration files.
+* Adjusted configuration for javadoc generation to eliminate error messages.
+* Removed "reserved" graph concept names from tests (e.g. "label", "edge", "value") to support the convention of avoiding these strings for property names.
+* Introduced `GraphProvider.Descriptor` which annotates a `GraphProvider` implementation to describe what `GraphComputer` implementation will be used.
+* Modified `OptOut` to include a `computers` attribute which allows the `Graph` to opt-out of computer-based tests for specific computation engines.
+* Added a `SandboxExtension` that can be plugged into `TypeCheckedCustomizerProvider` and `CompileStaticCustomizerProvider` to control classes and methods that can be used in the `GremlinGroovyScriptEngine`.
+* Added a number of new `ImportCustomizerProvider` implementations such as, `TimedInterruptCustomizerProvider`, `TypeCheckedCustomizerProvider` and others.
+* Refactored `GremlinGroovyScriptEngine` to make more general use of `ImportCustomizerProvider` implementations.
+* Removed `SecurityCustomizerProvider` class and the "sandbox" configuration on the `ScriptEngines` class - this was an experimental feature and not meant for public use.
+* Removed dependency on `groovy-sandbox` from the `gremlin-groovy` module.
+
+==== Bugs
+
+* TINKERPOP-770 Exception while AddPropertyStep tries to detach vertex property
+* TINKERPOP-780 Use of fold() in repeat()
+* TINKERPOP-782 map(Traversal) should declare requirements of child
+* TINKERPOP-785 Gremlin Server Not Properly Reporting Port Conflict
+* TINKERPOP-792 select at start of match traversal on Map can fail
+* TINKERPOP-794 IncidentToAdjecentStrategy malfunction
+* TINKERPOP-804 Failed installing neo4j-gremlin extension on Windows 7
+* TINKERPOP-822 Neo4j GraphStep with element arguments ignores has *(breaking)*
+
+==== Improvements
+
+* TINKERPOP-576 Gremlin Server Authentication
+* TINKERPOP-582 Remove Groovy Sandbox Dependency
+* TINKERPOP-610 General graph concept names in test schema
+* TINKERPOP-656 IoRegistry Chaining
+* TINKERPOP-690 Be able to OPT_OUT for Standard, but not Computer *(breaking)*
+* TINKERPOP-699 GraphSON writeGraph not producing valid json object
+* TINKERPOP-750 Compare should not have special case for Number
+* TINKERPOP-752 Make Gremlin Server Better Respect ACCEPT
+* TINKERPOP-764 Unify semantics of Transaction.close() in tests and documentation *(breaking)*
+* TINKERPOP-771 IoRegistry Instantiation With GryoPool
+* TINKERPOP-778 Support GraphFactory location via annotation.
+* TINKERPOP-791 Document rules for committers
+* TINKERPOP-797 order() seems to only like List? *(breaking)*
+* TINKERPOP-808 TraversalComparator.comparator needs a getter
+
+[[release-3-0-0]]
+=== TinkerPop 3.0.0 (Release Date: July 9, 2015)
+
+* Modified the `GremlinExecutor` to catch `Throwable` as opposed to `Exception` so as to properly handle `Error` based exceptions.
+* Modified the `GremlinGroovyScriptEngine` compilation configuration to prevent inappropriate script evaluation timeouts on standalone functions.
+* Added a custom configuration for "timed interrupt" in the `ScriptEngines` instantiation of the `GremlinGroovyScriptEngine`.
+* Added `mapKeys()` (`MapKeyStep`) and `mapValues()` (`MapValueStep`) to get the keys and values of a map, respectively.
+* `select()` no longer supports empty arguments. The user must specify the keys they are selecting.
+* `MatchStep` and `match()` no longer have a "start label" parameter -- it is computed if the incoming traverser does not have requisite labels.
+* Turned transactional testing back on in Gremlin Server using Neo4j.
+* Renamed `Transaction.create()` to `Transaction.createThreadedTx()`.
+* Added `TraversalParent.removeGlobalChild()` and `TraversalParent.removeLocalChild()`.
+* Added a `clear` option to the Gephi Plugin to empty the Gephi workspace.
+* Refactored `ResultSet` and related classes to stop polling for results.
+* `AbstractStep` now guarantees that bulk-less and null-valued traversers are never propagated.
+* Added `dedup(string...)` which allows for the deduplication of a stream based on unique scope values.
+* Fixed multiple bugs in the Gephi Plugin related to refactoring of traversal side-effects.
+* Split `WhereStep` into `WherePredicateStep` and `WhereTraversalStep` to simplify internals.
+* Prevent the driver from attempting to reconnect on a dead host if the `Cluster.close()` method has been called.
+* Renamed the "deactivate" option on `:plugin` command to "unuse" to be symmetric with the "use" option.
+* Added `Traversal.toStream()` to turn the `Traversal<S,E>` into a `Stream<E>`.
+* Added `Scoping.Variable` enum of `START` and `END` which allows the `Scoping` step to specify where its bindings are.
+* `ComputerVerificationStrategy` is smart about not allowing `WhereXXXStep` with a start-variable to run in OLAP as it selects the value from the path.
+* Rewrote `MatchStep` where it now works on `GraphComputer`, solves more patterns, provides plugable execution plans, supports nested AND/OR, `not()`-patterns, etc.
+* Renamed `Graphs` in Gremlin Server to `GraphManager`.
+* Fixed bug in Gremlin Driver where client-side serialization errors would not bubble up properly.
+* Fixed problem in Gremlin Server to ensure that a final `SUCCESS` or `NO_CONTENT` message assured that the transaction was successful in sessionless requests.
+* Arrow keys for cycling through command history now work in Gremlin Console when being used on Windows.
+* Added `NotStep` and `not(traversal)` for not'ing a traversal (integrates like `ConjunctionStep`).
+* Removed `TraversalP`. Traversals and `P`-predicates are completely separate concepts.
+* `has(key,traversal)` is now an alias for `filter(__.values(key).traversal)` using `TraversalFilterStep`.
+* Simplified `SubgraphStrategy` by using `TraversalFilterStep` instead of the more complex `WhereStep`.
+* Added `TraversalMapStep`, `TraversalFlatMapStep`, `TraversalFilterStep`, and `TraversalSideEffectStep` which all leverage an internal traversal.
+* Added `Path.get(pop,label)` as default helpers in `Path`.
+* Added `Pop.first`, `Pop.last`, and `Pop.all` as enums for getting single items from a collection or a list of said items.
+* Changed `GremlinServer.start()` to return a `CompletableFuture` that contains the constructed `ServerGremlinExecutor`.
+* Restructured `IoTest` breaking it up into smaller and more logically grouped test cases.
+* Gremlin Server `Settings` now has sensible defaults thus allowing the server to be started with no additional configuration.
+* Fixed garbled characters in Gremlin Console that notably showed up in `:help`
+* Replaced dependency on `groovy-all` with individual Groovy dependencies as needed.
+* Bumped `org.gperfutils:gbench` to the `0.4.3` and a version explicitly compatible with Groovy 2.4.x.
+* Renamed `KeyStep` to `PropertyKeyStep` to be consistent with `PropertyValueStep`.
+* Added `Gremlin-Lib-Paths` to modify paths in plugin `lib` directory.
+* Modified the capabilities of `Gremlin-Plugin-Paths` to delete paths that have no value on the right-hand-side of the equals sign.
+* The REST API in Gremlin Server now requires parameters to be defined with a "bindings." prefix.
+* Modified the REST API in Gremlin Server to accept rebindings.
+* Added `rebindings` optional argument to sessionless requests to allow global bindings to be rebound as needed.
+* Added `LazyBarrierStrategy` which "stalls" a traversal of a particular form in order to gain a bulking optimization.
+* `CollectingBarrierStep` supports `maxBarrierSize` for "lazy barrier," memory conservation.
+* `Scoping` now has `getScopeKeys()` to get the keys desired by the scoping step.
+* Refactored SSL support in the Gremlin Server/Driver.
+* Factored out `ServerGremlinExecutor` which contains the core elements of server-side script execution in Gremlin Server.
+* Bumped to netty 4.0.28.Final.
+* Refactored the `Mutating` interface and introduce `CallbackRegistry` interface around `EventStrategy`.
+* Changed `onReadWrite` and `onClose` of `AbstractTransaction` to be synchronized.
+* Added `LabelP` to support index lookups and `has()` filtering on `Neo4jGraph` multi-label vertices.
+* `AddEdgeStep` is now a `Scoping` step.
+* Added a fully defined set of `Graph.Feature` implementations to `EmptyGraph`.
+* Dropped dependency on `org.json:json` - used existing Jackson dependency.
+* Added back neo4j-gremlin as the licensing of the Neo4j API is now Apache2.
+* Added `willAllowId` method to features related to vertices, edges and vertex properties to test if an identifier can be use when `supportsUserSuppliedIds` is `true`.
+* Fixed a bug in `GraphTraversal.choose(predicate,trueTraversal,falseTraversal)`.
+* Removed `MapTraversal`, `MapTraverserTraversal`, `FilterTraversal`, and `FilterTraverserTraversal` as these are simply `__.map(function)` and `__.filter(predicate)`.
+* Include `hadoop-gremlin` Hadoop configuration sample files in Gremlin Console distribution.
+* Iteration of results in Gremlin Server occur in the same thread as evaluation and prior to transaction close.
+* TinkerGraphComputer now supports every `ResultGraph`/`Persist` combination.
+* `GraphComputerTest` extended with validation of the semantics of all `ResultGraph`/`Persist` combinations.
+* GiraphGraphComputer no longer requires an extra iteration and MapReduce job to derive the full `Memory` result.
+* SparkGraphComputer now supports `InputRDD` and `OutputRDD` to allow vendors/users to use a `SparkContext` to read/write the graph adjacency list.
+* Added `Scoping.getScopeValue()` method so all "selecting" steps use the same pattern for map, path, and sideEffect data retrieval.
+
+[[release-3-0-0-m9]]
+=== TinkerPop 3.0.0.M9 (Release Date: May 26, 2015)
+
+* Removed `GraphComputer.isolation()` as all implementations use standard BSP.
+* Added a Gremlin Server `LifeCycleHook` to ensure that certain scripts execute once at startup and once at shutdown.
+* `has(key)` and `hasNot(key)` are now aliases for `where(values(key))` and `where(not(values(key)))`, respectively.
+* TinkerGraph classes are now final to restrict user and vendor extension.
+* Added `TraversalStrategy.VendorOptimization` to ensure that all TinkerPop optimizations execute first on the known TinkerPop steps.
+* Added `TailGlobalStep` and `TailLocalStep` (`tail()`) which gets objects from the end of the traversal stream.
+* `AndStep` and `OrStep` are now simply markers where `WhereStep(a.and(b).and(c)...and(z))` is the compilation.
+* Moved `Compare`, `Contains`, `Order`, `Operator`, and `P` to `process/traversal` from `structure/` as they are process-based objects.
+* `HasContainer` now uses `P` predicate as helper methods and tests are more thorough on `P`.
+* Changed Gremlin Server integration/performance tests to be runnable from within the `gremlin-server` directory or from the project root.
+* Moved the string methods of `TraversalHelper` to `StringFactory`.
+* Renamed JSON-related serializers for Gremlin Server to be more consistent with GraphSON naming.
+* Removed `HasTraversalStep` in favor of new `P.traversal` model with `HasStep`.
+* Fixed bug in `WsGremlinTextRequestDecoder` where custom serializers from graphs were not being used.
+* Added `AndP` which allows for the `and()`-ing of `P` predicates.
+* `Order.opposite()` is now `reversed()` as that is a `Comparator` interface method with the same semantics.
+* `Compare/Contains/P.opposite()` are now `negate()` as that is a `BiPredicate` interface method with the same semantics.
+* `has(traversal)` is replaced by `where(traversal)` and `has(key,traversal)`. `HasXXX` is always with respects to an element property.
+* Added `TraversalScriptHelper` with static methods for dynamically creating a `Traversal` from a JSR 223 `ScriptEngine`.
+* Changed `SubgraphStrategy` to take `Traversal` rather than `Predicate` for filtering.
+* Improved `SubgraphStrategy` to only modify the `Traversal` if filtering was required.
+* Improved logging of errors in the `HttpGremlinEndpointHandler` to include a stracktrace if one was present.
+* Moved `AbstractGremlinSuite.GraphProviderClass` to `org.apache.tinkerpop.gremlin.GraphProviderClass`.
+* Simplified the Gremlin-Groovy test suite where there is now no distinction between `STANDARD` and `COMPUTER` tests.
+* `VertexProgram` and `MapReduce` now add a `Graph` parameter to `loadState(Graph, Configuration)`.
+* Added `ScopingStrategy` which auto-scopes `select()` and `where()` so the language looks clean.
+* Added `Scoping` as a marker interface to state that a step desires a particular `Scope`.
+* `SelectStep`, `SelectOneStep`, and `WhereStep` support both `Scope.local` and `Scope.global` for `Map<String,Object>` or `Path` analysis, respectively.
+* Fixed a bug in the `TraversalStrategies` sort algorithm.
+* Removed numerous unused static utility methods in `TraversalHelper`.
+* TinkerGraph process suite tests are now running with and without strategies in place.
+* Added `IncidentToAdjacentStrategy` which rewrites `outE().inV()`, `inE().outV()` and `bothE().otherV()` to `out()`, `in()` and `both()` respectively.
+* Renamed `ComparatorHolderRemovalStrategy` to `OrderGlobalRemovalStrategy` as it now only applies to `OrderGlobalStep`.
+* Anonymous traversal no longer have `EmptyGraph` as their graph, but instead use `Optional<Graph>.isPresent() == false`.
+* Added `Traversal.Admin.setGraph(Graph)` as strategies that need reference to the graph, need it across all nested traversals.
+* `AbstractLambdaTraversal` is now smart about `TraversalParent` and `TraversalStrategies`.
+* Fixed bug in `GraphML` reader that was not allowing `<edge>` elements to come before `<node>` elements as allowable by the GraphML specification.
+* Added `VertexFeature.getCardinality`.
+* Added `AdjacentToIncidentStrategy` which rewrites `out().count()` to `outE().count()` (and similar such patterns).
+* `GryoPool` now takes a `Configuration` object which allows setting the size of the pool and the `IoRegistry` instance.
+* Added `PersistResultGraphAware` interface which is used by `OutputFormats` to specify persistence possibilities for a Hadoop `GraphComputer`.
+* `ElementIdStrategy` now allows the identifier property to be set directly (and not only by specifying `T.id`).
+* Added sample configuration files for registering a `TraversalStrategy` in Gremlin Server.
+* Added response status code for `NO_CONTENT` to represent output for a successful script execution without a result (e.g. an empty `Iterator`).
+* Removed the notion of a "terminator" message from the Gremlin Server protocol - new response status code for `PARTIAL_CONTENT`.
+* `Path` and `Step` labels are ordered by the order in which the respective `addLabel()` calls were made.
+* A `Step` now has a `Set<String>` of labels. Updated `as()` to take a var args of labels.
+* Dropped `BatchGraph` from the code base - it will be replaced by bulk loader functionality over OLAP.
+* `TraversalSideEffects` now implements `Optional` semantics. Less code as Java8 provides the helper methods.
+* `TraversalScriptSupplier` now takes an `Object` var args for setting `ScriptEngine` bindings if needed.
+* `Compare` is now more lenient on `Number`-types.
+* Removed `Compare.inside` and `Compare.outside` as they are not primitive comparators and should be composed from primitives.
+* Introduced `P` (predicate) for cleaner looking `is()`, `has()`, and `where()` calls -- e.g. `has('age',eq(32))`.
+* `GraphTraversalSource` is now the location for `withXXX()` operations. No longer do they exist at `GraphTraversal`.
+* All `Traverser` objects now extend from `AbstractTraverser` or a child that ultimately extends from `AbstractTraverser`.
+* OLTP `select()` now returns a list for traversals with duplicate labels (as this was a unintended side-effect of `SparsePath`).
+* Removed the `SparsePath` optimization as it led to numerous corner-case inconsistencies.
+* `VertexWritable` serializes and deserializes the `StarGraph` object -- no more intermediate `DetachedXXX` objects.
+* Gremlin Server better supports the settings for the high and low watermark that will slow writes to clients that are lagging.
+* Added `GraphReader.readObject()` and `GraphWriter.writeObject` abstractions for those implementations that can support them.
+* Altered `GraphWriter.writeVertices()` method to take an `Iterator` of vertices rather than a `Traversal`.
+* GraphSON format for output from `GraphWriter.writeVertex`, `GraphWriter.writeVertices`, and `GraphWriter.writeGraph` have all changed now that they use `StarGraph` serialization.
+* Gryo format for output from `GraphWriter.writeVertex`, `GraphWriter.writeVertices`, and `GraphWriter.writeGraph` have all changed now that they use `StarGraph` serialization.
+* Added read and write methods to `GraphReader` and `GraphWriter` for `Property` and `VertexProperty`.
+* Reduced object creation in GraphSON during serialization.
+* Moved `T` tokens to the `structure/` package as its more general than `process/`.
+* `Attachable.attach()` now takes a `Method` to determine whether to attach via `GET`, `CREATE`, or `GET_OR_CREATE`.
+* Decreased size of Gremlin Server `RequestMessage` and `ResponseMessage` serialization payloads and reduced object creation.
+* `Graph.empty()` no longer required with the introduction of `ShellGraph` which is a placeholder for a graph class and computer.
+* `VertexProperty.Cardinality` default is now vendor chosen. If the vendor has not preference, they should use `Cardinality.single`.
+* `Messenger.receiveMessages()` no longer takes a `MessageScope` and thus, consistent behavior between message-passing and message-pulling systems.
+* Changed the `gremlin.tests` environment variable for test filtering to the more standard convention of `GREMLIN_TESTS` and made it work for all test suites.
+* Removed `back()`-step as `select()`-step provides the same behavior with more intelligent optimizations and `by()`-modulation.
+* Removed `Graph.Helper` method annotation and related infrastructure in tests.
+* Modified header of Gryo to be 16 bytes instead of 32 (and removed the version stamp).
+* Removed the concept of handling version in Gryo via the builder as it wasn't really accomplishing the capability of ensuring backward compatibility.
+* Moved `Exceptions.propertyRemovalNotSupported` from `Element` to `Property` for consistency.
+* Provided a method for Gremlin Server to bind `TraversalSource` objects for use in scripts.
+* Modified the reference implementation for dealing with "custom" identifier serialization in GraphSON - See `IoTest.CustomId` for the example.
+* Modified `g.vertices/edges` and related methods and tests to support non-type specific querying (e.g. `g.V(1)` and `g.V(1L)` should both return the same result now).
+* `TinkerGraph` supports an `IdManager` which helps enforce identifier types and improve flexibility in terms of how it will respond to queries around identifiers.
+* `DetachedXXX` now uses the standard `structure/` exceptions for unsupported operations.
+* Added private constructors to all `Exceptions` inner classes in the respective `structure/` interfaces.
+* Re-introduced `ReferenceXXX` to ensure a smaller data footprint in OLAP situation (`DetachedXXX` uses too much data).
+* `Attachable` now has a set of static exception messages in an `Exceptions` inner class.
+* Added `StarGraph` which is a heap efficient representation of a vertex and its incident edges (useful for `GraphComputer` implementations).
+* `TraverserSet` uses a `FastNoSuchElementException` on `remove()` for increased performance.
+* Add `Profiling` interface to enable vendors to receive a `Step's MutableMetrics`.
+
+[[release-3-0-0-m8]]
+=== TinkerPop 3.0.0.M8 (Release Date: April 6, 2015)
+
+* Removed Neo4j-Gremlin from this distribution due to GPL licensing. Working with Neo4j team to reintroduce by M9.
+* Altered structure of plugin directories for Gremlin Server and Gremlin Console to allow for the full `lib` directory with all dependencies and the lighter `plugin` directory which contains filtered dependencies given the path.
+* Improved `OptOut` to allow for exclusion of a group of tests by specifying a base test class.
+* `GraphComputerTest` is now Java8 specific and much easier to extend with new test cases.
+* Merged the `gremlin-algorithm` module into `gremlin-test`.
+* Removed `LambdaVertexProgram` and `LambdaMapReduce` as it will be one less thing to maintain.
+* Gremlin Console accepts a `max-iteration` configuration via the standard `:set` command to limit result iteration.
+* `Vertex.property()` default behavior is now `Cardinality.single`.
+* Added `ElementIdStrategy` as a `TraversalStrategy`.
+* Introduce `AbstractTransaction` to simplify implementation of standard transactional features for vendors.
+* Added `EventStrategy` to generate `Graph` modification events to listeners.
+* Added test to enforce return of an empty `Property` on `VertexProperty.property(k)` if no meta properties exist.
+* Added methods to registered transaction completion listeners on `Transaction` and provided a default implementation.
+* Fixed bug in Neo4j where return of an empty meta property was returning a `NullPointerException`.
+* Refactored step API -- the TinkerPop3 steps are the foundation for any domain specific language (including graph).
+* `MapReduce` now has `workerStart(Stage)` and `workerEnd(Stage)` methods with analagous semantics to `VertexProgram`.
+* Hadoop-Gremlin `ObjectWritable` now leverages Kryo for data serialization.
+* `GiraphGraphComputer` supports arbitrary objects as the vertex id -- previously, only long ids were supported.
+* Added `VertexProgramPool` to support thread safe pooling of vertex programs for graph computers that provide threaded workers.
+* Added `GryoPool` to support thread safe pooling of Gryo readers and writers.
+* Added `TraversalSource` which contextualizes a traversal to a graph, DSL, execution engine, and runtime strategies.
+* Added `AddVertexStep` (`addV`), `AddPropertyStep` (`property`), and changed `AddEdgeStep` to a map-step instead of a sideEffect-step.
+* Added `compile` method to `GremlinExecutor` and related classes.
+* Fixed bug in Gremlin Server that was generating extra response messages on script evaluation errors.
+* Changed the `Memory` API to not return the mutated value on `or`, `and`, `incr` as it is too difficult to implement faithfully in a distributed system.
+* Added `SparkGraphComputer` to Hadoop-Gremlin which uses Apache Spark as the underlying computing engine.
+* Renamed "Gremlin Kryo" to "Gryo".
+* Refactored `TinkerWorkerPool` to use `ExecutorService` so as to reuse threads when executing graph computer functions.
+* Removed `Reducing.Reducer` and `ReducingStrategy`. Previous `Reducing` classes are now `MapReducer` classes.
+* Refactored the "process" test suite to allow for better test configuration with respect to different `TraversalEngine` implementations.
+* Added `hasNot(traversal)` which is a faster way of doing `has(traversal.count().is(0L))`.
+* `TraversalStrategy.apply(traversal)` is the new method signature as the `TraversalEngine` can be retrieved from the `Traversal`.
+* `TraversalEngine` is now an interface and provided to the traversal by the graph. `Graph` methods added to set the desired traversal engine to use.
+* Added `count(local)`, `sum(local)`, `max(local)`, `min(local)`, `mean(local)`, `dedup(local)`, `sample(local)` and `range(local)` for operating on the local object (e.g. collection, map, etc.).
+* `TraversalComparator` exists which allows for `order().by(outE().count(),decr)`.
+* Added Apache Rat plugin to detect the proper inclusion of license headers in files.
+* A `Traversal` now respects thread interruption during iteration, throwing a `TraversalInterruptionException` if it encounters interruption on the current thread.
+* Apache refactoring: `com.tinkerpop` -> `org.apache.tinkerpop`.
+* `Traversal` is now `Serializable` and with most queries no longer needing lambdas, Gremlin-Java works over the wire.
+* Added `VertexProperty.Cardinality` with `list`, `set`, and `single`. No more `Vertex.singleProperty()` method.
+* Added `RangeByIsCountStrategy` that adds a `RangeStep` in front of `.count().is(<predicate>, <value>)` to minimize the amount of fetched elements.
+* Added `CoalesceStep` / `coalesce()` that emits the first traversal which emits at least one element.
+* Added more syntactic sugar tricks to the Gremlin sugar plugin -- `&`, `|`, `select from`, `gt`, etc.
+* `Traversal.Admin` is consistent internal to steps, traversals, strategies, etc. For the user, `Traversal` is all they see.
+* `TraversalHolder` is now called `TraversalParent` with the child/parent terminology used throughout.
+* Added `GroovyEnvironmentPerformanceSuite`.
+* Provided more robust shutdown capabilities for the thread pools used in `GremlinExecutor`.
+* A massive `process/` package reorganization -- class names are still the same, just in new packages.
+* Bumped `neo4j-graph` to Neo4j 2.1.6.
+* Bumped to Groovy 2.4.1.
+* Added a new "performance" test suite for Gremlin Process.
+* Steps now only operate with traversals -- no more lambdas. Lambda-> `Traversal` conversion utilities added.
+* `SideEffectStep` always requires a `Consumer`. Steps that were consumer-less simply extends `AbstractStep`.
+* Simplified the `Neo4jGraph` implementation by now allowing `cypher()` mid-traversal. Only available via `g.cypher()`.
+* Moved `clock()` out of the Utility plugin. It is now available to both Groovy and Java.
+* Changed the `OptOut` annotation to allow for ignoring an entire test case using a wildcard.
+* Added `AndStep` and `OrStep` filters to support arbitrary conjunction of traversals.
+* `__` is now a class with static `GraphTraversal` methods and thus `repeat(out())` is possible.
+* Added `IsStep` / `.is()` that supports filtering scalar values.
+* `Neo4jGraph` and `TinkerGraph` no longer create new `Feature` instances on each feature check.
+* Added `Compare.inside` and `Compare.outside` for testing ranges. Removed `between()` as now its `has('age',inside,[10,30])`.
+* `GraphTraversal.has()` no longer requires the element type to be cast in the traversal definition.
+* Fixed a `ConcurrentModificationException` bug in TinkerGraph that occurred when doing full vertex/edge scans and removing elements along the way.
+* Added `Scope.local` and `Scope.global` in support of `OrderLocalStep` and `OrderGlobalStep` via `order(scope)`.
+* Added `Order.keyIncr`, `Order.keyDecr`, `Order.valueIncr`, and `Order.valueDecr` in support of `Map` sorting.
+* Added `Order.shuffle` and removed `shuffle()` in favor of `order().by(shuffle)`.
+* Changed `Order implements Comparator<Comparable>` to `Order implements Comparator<Object>` as its now generalized to multiple types of objects.
+* The `maxContentLength` setting in Gremlin Server is now respected by the HTTP/REST Gremlin endpoint.
+* Fixed resource leak in the HTTP/REST Gremlin endpoint of Gremlin Server.
+* Refactored Gremlin Server `start` and `stop` functions to return `CompletableFuture`.
+* HTTP REST error response JSON objects from Gremlin Server should no longer have issues with control characters, line feeds, etc.
+* Added `MeanStep`, `mean()`, and `MeanNumber` for calculating number averages in a traversal.
+* Greatly simplified all the traversal `MapReduce` implementations due to the introduction of `VertexTraversalSideEffects`.
+* Added `VertexTraversalSideEffects` as a cheap, static way to get a sideEffect-view of a vertex in OLAP.
+* Added `TraversalHelper.isLocalStarGraph()` which determines if a traversal is contained within the local star graph.
+* Added `TraversalVerificationStrategy` to verify if the traversal can be executed on respective engine.
+* Refactored `GraphTraversal.cap()` to `GraphTraversal.cap(String...)` to support multi-sideEffect grabs.
+* Added GraphSON serialization for `Path`.
+* Added `Traversal.Admin.getTraverserRequirements()` and removed `TraversalHelper.getTraverserRequirements(Traversal)`.
+* `Traversal.equals()` is no longer computed by determining if the objects returned are equal.
+* Altered messaging in Gremlin Console when using a remote that is not yet activated.
+* Fixed potential for deadlock in Gremlin Driver when waiting for results from the server.
+* Added the `useMapperFromGraph` serializer option to the Gremlin Server configuration file to allow auto-registration of serialization classes.
+* Refactored Netty pipeline structure to not have a second "Gremlin" executor group and instead used a standard `ExecutorService`.
+* Refactored the `GremlinExecutor` to take an optional transformation function so as to allow manipulation of results from `eval` in the same thread of execution.
+* Fixed issue with the `HttpGremlinEndpointHandler` where requests were getting blocked when `keep-alive` was on.
+* Added `MinStep` and `MaxStep` with respective `min()` and `max()`.
+* `CountStep` and `SumStep` now extend `ReducingBarrierStep` and no longer are sideEffect steps.
+* `SideEffectCapStep` now extends `SupplyingBarrier` and is much simpler than before.
+* Added `SupplyingBarrier` which simply drains the traversal and emits the value of a provided supplier.
+* Added `TraversalLambda` which implements function, predicate, and consumer over a provided traversal.
+* Any non-core `Step` that takes a function or predicate can now take a traversal which maps to `traversal.next()` (function) and `traversal.hasNext()` (predicate).
+* `CollectingBarrierStep` is no longer abstract and added `GraphTraversal.barrier()` which is analogous to `fold().unfold()`, though cheaper.
+* Added `TraversalOptionHolder` for branching steps to index works with corresponding `GraphTraversal.option()`.
+* `BranchStep` is now a proper generalization of `UnionStep` and `ChooseStep`.
+* `SubgraphStep` has changed in support of in-traversal filtering and removing the need for path-based traversers.
+* Added `HasTraversalStep` which takes an anonymous traversal to determine whether or not to filter the current object.
+* Added `Traversal.Admin.getStartStep()` and `Traversal.Admin.getEndStep()`. Removed `TraversalHelper.getStart()` and `TraversalHelper.getEnd()`.
+* Refactored `profile()` to use injected steps. `ProfileStep` can now be used without any special JVM command line parameters.
+* Added `ReducingBarrierStep` which acts like `CollectingBarrierStep` but operates on a seed with a bi-function.
+* Added a preprocessor for AsciiDocs. Documentation code examples are executed and the results are dynamically inserted into the doc file.
+* `LocalStep` traversal is treated as a branch, not an isolated traversal. Moreover, moved `LocalStep` to `branch/`.
+* Traversal strategies are now applied when the `TraversalVertexProgram` state is loaded, not when submitted. Less error prone as it guarantees strategy application.
+* Reworked `TraversalHolder` where there are "local traversals" and "global traversals". Local traversals are not subject to OLAP message passing.
+* Fixed a bug in `DedupStep` that made itself apparent in `DedupOptimizerStrategy`.
+* Added `RepeatStep.RepeatEndStep` in order to reduce the complexity of the code on OLAP when the predicates are not at the start of `RepeatStep`.
+
+[[release-3-0-0-m7]]
+=== TinkerPop 3.0.0.M7 (Release Date: January 19, 2015)
+
+* Added `SideEffectRegistrar` interface and `SideEffectRegistrationStrategy` for allowing steps to register sideEffects at strategy application time.
+* Renamed `Traverser.Admin.setFuture()` and `Traverser.Admin.getFuture()` to `setStepId()` and `getStepId()`, respectively.
+* Added `TraversalMatrix` for random access to steps in a traversal by their step id. Used by `TraversalVertexProgram`.
+* Added unique identifies to `Step` that are not the user provided labels. `Step.getLabel()` now returns an `Optional<String>`.
+* Removed `UnionLinearStrategy`, `ChooseLinearStrategy`, and `RepeatLinearStrategy` as nested traversals are now natively supported in OLAP.
+* Fixed `Neo4jGraph` around manual transaction behavior on `commit` and `rollback` such that they would throw exceptions if a transaction was not open.
+* Redesigned the hidden step labeling mechanism so its consistent across a cluster, easier for rewrite strategies, and will enable nested OLAP traversals.
+* `Traverser.incrLoops()` now takes a string step label to enable nested looping constructs (i.e. loop stacks).
+* Added `Traversal.tryNext()` which returns an `Optional`, where the provided default method should be sufficient for all vendors.
+* Removed `PathConsumer` in favor of `TraverserRequirement.PATH`-model via `Step.getRequirements()`.
+* `Step.getRequirements()` returns a `Set<TraverserRequirement>` which is what is required of the `Traverser` by the `Step`.
+* `Traverser` now extends `Cloneable` and `Traverser.clone()` is used to good effect in `Traverser.split()`.
+* Added `AbstractTraverser` for which all traversers extend.
+* Moved `Traversal.SideEffects` to `TraversalSideEffects` as sideEffects are not necessarily tied to the traversal.
+* Removed `Graph.of()` for generating anonymous graph traversals -- replaced by `__`-model.
+* Removed `Graph` being stored in `Traversal.SideEffects`. Too dangerous when moving between OLTP and OLAP and its limited uses were worked around easily.
+* No need for `DefaultXXXGraphTraversal` unless the vendor is extending with new methods (e.g. `DefaultNeo4jGraphTraversal`).
+* Reworked `TraversalStrategies` such that the are "emanating object class"-dependant, not `Traversal` dependent.
+* Moved `Traverser.sideEffects()` to `Traverser.asAdmin().getSideEffects()`. Users should use `Traverser.sideEffects(key)` and `Traverser.sideEffects(key,value)`.
+* Added `SerializationTest` to the `StructureStandardSuite` in `gremlin-test` which validates serialization at a lower level than `IoTest`.
+* Removed `IntervalStep` and renamed `interval()` to `between()` which is simply an alias to a `has().has()` chain.
+* Added `__` static interface which allows for `__.out().out()`-style construction of anonymous traversals (instead of `g.of()`).
+* The only `GraphTraversal` steps that operate on `Traverser` are the base lambdas and `repeat()` (i.e. `emit()` and `until()`).
+* Removed dependency on the `reflections` library in `gremlin-test` which removed the default implementation of `GraphProvider.getImplementations()` - vendors now need to implement this method themselves.
+* Relaxed the `<S>` typing requirement for anonymous traversals when applied to `choose()`, `repeat()`, `union()`, etc.
+* Removed `LoopStep` and `UntilStep` in favor of the new `RepeatStep` model of looping in Gremlin3.
+* `BranchStep` is now exposed in `GraphTraversal` via `branch(function)`.
+* `UnionStep` now implements `TraversalHolder`.
+* Added `RepeatStep` as the new looping construct supporting do/while, while/do, and emit semantics.
+* Moved `Traversal.sideEffects()` to `Traversal.Admin.getSideEffects()` as `cap()` should be used to access the sideEffect data of a traversal.
+* Renamed vendor `XXXTraversal` to `XXXGraphTraversal` (interface) and `XXXGraphTraversal` to `DefaultXXXGraphTraversal` (implementation class).
+* Modified packaging for console plugins to be more consistent by moving them to the `com.tinkerpop.gremlin.console.groovy.plugin` namespace.
+* Removed all TinkerPop specific dependencies to Guava to avoid user version conflicts.
+* Added support for `-e` (script file execution) and `-v` (version display) options on `gremlin.sh`.
+* GraphSON supports the assignment of multiple custom serialization modules.
+* `Traverser.get(stepLabel/sideEffectKey)` no longer exists. There now exists: `Traverser.path(stepLabel)` and `Traverser.sideEffects(sideEffectKey)`.
+* `SimpleTraverser` now supports "path" but in a very loose, global cache way. Added `SparsePath` as a `Map`-backed `Path` implementation.
+* Provided Neo4j multi-label support in Neo4j-Gremlin. Added three `Neo4jVertex`-specific methods: `addLabel()`, `removeLabel()`, `labels()`.
+* Bumped to Groovy 2.3.9.
+* Added `Graph.Io` interface which allows for simplified helper methods for end users and a way for vendors to override `GraphReader` and `GraphWriter` initial construction when custom serializers are needed.
+* Removed methods from `GraphProvider` related to customizing serializers in `IoTest` from the test suite as the new `Graph.Io` interface now serves that purpose.
+* Added `Neo4jGraph.checkElementsInTransaction(boolean)` which will (or not) verify whether elements retrieved via Neo4j global graph operations are transactionally consistent.
+* Added `ScriptInputFormat` and `ScriptOutputFormat` to Hadoop-Gremlin for reading and writing a file according to an arbitrary parsing script.
+* Added `TimeLimitStep.getTimedOut()` to determine if the step timed out or there were no more objects to process.
+* `Graph.System` is now `Graph.Hidden` with "hidden" being the vendor namespace and the key prefix being `~`.
+* Much better `toString()` handling in `Step` and `Traversal`.
+* `ComparatorHolder<V>` interface returns a `List<Comparator<V>>` instead of a `Comparator<V>[]`.
+* `T` now implements `Function<Element,Object>`.
+* Added `ElementValueComparator` and `ElementFunctionComparator` in support of vendor introspection on `ComparatorHolder`-steps.
+* Renamed `Comparing` marker interface to `ComparatorHolder`.
+* `FunctionHolder` interface provides vendor introspection via `ElementValueFunction`.
+* Removed `OrderByStep` as it is now just `order()` with a `by()`-based comparator.
+* Added `SampleStep` (`sample()`) to allow for sampling the set of previous objects. Useful for doing random walks with `local()`.
+* Renamed `random()` to `coin()` to better express that the filter is a random coin toss.
+* Added `by()`-projection to modulate the meaning of post-processing steps like `aggregate()`, `groupCount()`, `path()`, `order()`, etc.
+* Removed the `Strategy` interface and gave `StrategyGraph` direct access to the `GraphStrategy`.
+* Added `Graph.strategy()` to help instantiate `StrategyGraph` instances.
+* Modified the signature of all `GraphStrategy` methods to include an parameter that contains a reference to the "composing strategy".
+* `PartitionStrategy` hides the specified partition key from view when iterating properties, keys, etc.
+* Change construction of `GraphStrategy` implementations to be consistent with singleton instances and builder pattern.
+* Added `Graph.Helper` annotation to "protected" certain default interface methods from implementation by vendors.
+* Transaction retry functions now work with "manual" transactions.
+* Improved error messaging when importing "legacy" GraphSON that was not generated with "extended" properties.
+* Renamed "iterator" related methods in the `GraphStrategy` interface to be consistent with the method names they represent.
+* `PropertyMapStep` (`valueMap()`) now takes a boolean to state if the tokens of the element are desired along with its properties.
+* `HadoopGraph` now connected to the `StructureProcessSuite`.
+* `HadoopGraph` no longer supports `Graph.Variables` as they were in-memory. A persistence mechanism can be introduced in the future.
+* Hidden properties removed in favor of using `GraphStrategy` for such features.
+* `Edge.iterators().vertexIterator(BOTH)` now guarantees `OUT` then `IN` vertex iterator order.
+* `Graph.v(Object)` and `Graph.e(Object)` no longer exist. Instead, use `Graph.V(Object... ids)` and `Graph.E(Object... ids)`.
+* Added `Graph.Iterators` to allow access to vertex and edge iterators based on element ids and bypassing `GraphTraversal`.
+* Renamed `GraphStrategy` implementations to be less verbose - removed the word "Graph" from their names (e.g. `IdGraphStrategy` simply changed to `IdStrategy`).
+* Removed `Step.NO_OBJECT` as the problem is solves can be solved with proper use of `flatMap` and `EmptyTraverser`.
+* `Path` is now part of `GraphSerializer` and thus, not specific to a particular implementation of `Path`.
+* Added messaging to show files being downloaded when using the Gremlin Server "install" command.
+* Added test name and class arguments to the `GraphProvider.loadGraphWith` method.
+* Merged `ReferencedXXX` and `DetachedXXX` so that all migration of graph element data is via `DetachedXXX`.
+* Added `StaticVertexProgram` and `StaticMapReduce` which simply return `this` on `clone()`.
+* `VertexProgram` and `MapReduce` now implement `Cloneable` and is used for fast copying across workers within the same machine.
+* Added `TraversalHolder` interface which extends `PathConsumer` to determine recursively if nested traversals require path calculations turned on.
+* Reworked how a `TraverserGenerator` is retrieved and utilized.
+* Added `Traversal.toBulkSet()` to make getting resultant data more efficiently for traversals with repeated data.
+* Provided a helper `LocalStep.isLocalStarGraph()` so `GraphComputer` implementers know the requisite data boundaries.
+* Created `Traversal.Admin` to hide administrative methods. Added `Traversal.asAdmin()` to get at `Traversal.Admin`.
+* Fixed up all `Step` cloning operations realizing that Java8 lambdas are always bound to the calling class (no delegates).
+* Usage of `:remote close` without configured remotes shows a reasonable message rather than a stack trace.
+* Provided `LocalStep` to signify that the internal traversal is locally bound to the incoming object.
+* Failed script evaluation in Gremlin Server now triggers the cancel of the process attempting to timeout the script if it were to run too long.
+* Greatly increased the speed of `ScriptEngineLambda` by making use of a static `ScriptEngine` cache.
+* Fixed a general bug in all sideEffect using steps where the sideEffect should be accessed via the `Traverser` not `Traversal`.
+* `GremlinPlugin` interface no longer has the `additionalDependencies` method - those dependencies are now defined by an entry in the manifest file for the jar called `Gremlin-Plugin-Dependencies`.
+* Added `TinkerWorkerPool` which is used for resource efficient threading in `TinkerGraphComputer`.
+* `MapReduce.createMapReduce(Configuration)` now exists and serves the same purpose as `VertexProgram.createVertexProgram(Configuration)`.
+* Enabled SessionOps to be extended. Added eval handler hook.
+* Setting a property with an unsupported data type throw `IllegalArgumentException` instead of `UnsupportedOperationException` as the operation is supported, but the argument is not.
+
+[[release-3-0-0-m6]]
+=== TinkerPop 3.0.0.M6 (Release Date: December 2, 2014)
+
+* `javatuples.Pair` avoided on `MapReduce` API in favor of a new `KeyValue` class.
+* Renamed `Gremlin-Plugin` manifest entry for plugins to `Gremlin-Plugin-Paths`.
+* Added `Gremlin-Plugin-Dependencies` manifest entry to list other dependencies that should be retrieved with a plugin jar.
+* `Memory.Admin.asImmutable()` yields an immutable representation of the GraphComputer `Memory`.
+* Fixed host selection in `gremlin-driver` by properly accounting for all hosts being marked unavailable at the instantiation of a `Client`.
+* Removed Giraph-Gremlin in favor of new Hadoop-Gremlin with `GiraphGraphComputer` support. Future support for `MapReduceGraphComputer`.
+* Greatly simplified the `InputFormat` and `OutputFormat` model for working with Giraph (and Hadoop).
+* Added a serializer for `Property` for GraphSON correcting format of serialization of a single `Property` on an `Edge`.
+* Fixed bug in Gremlin Console that prevented assignments to empty `List` objects.
+* Added `VertexProgram.getMessageScopes()` to allow vendors to know which `MessageScopes` at a particular `Memory` state.
+* Reduced the number of methods in `MessageScope.Local` as its up to vendors to inspect provided incident `Traversal` accordingly.
+* Renamed `MessagesType` to `MessageScope` to make it less ambiguous regarding the class of the messages being sent.
+* Changed the message type of `TraversalVertexProgram` to `TraverserSet` to support message combining.
+* Added `VertexProgram.getMessageCombiner()` to support the combining of messages in route to a vertex.
+* Reduced object creation in `TraversalVertexProgram` around vertex-local traversal sideEffects.
+* Renamed `Traverser.Admin.makeChild()` and `Traverser.Admin.makeSibling()` to `Traverser.Admin.split()` to correspond with `merge()`.
+* Added `Traverser.Admin.merge(Traverser)` method so that the merging algorithm is with the `Traverser`.
+* Added `Operator` enum that contains sack-helpful `BinaryOperators`: sum, minus, mult, div, max, min, etc.
+* Added `GraphTraversal.withSack()` and renamed `trackPaths()` and `with()` to `withPath()` and `withSideEffect()`, respectively.
+* Added the "Gremlin Sacks" feature to allow a `Traverser` to carry local information along its walk.
+* GraphSON format no longer makes use of `hiddens` JSON key. Its all just `properties`.
+* Added `DoubleIterator` to make vendor implementations of `Edge.iterators().vertexIterator()` efficient.
+* `PropertiesStep` is smart about hiddens vs. properties.
+* `Element.iterators().hiddenProperties()` no longer exists. For vendors, simply provide an iterator of properties.
+* `GIRAPH_GREMLIN_LIBS` supports colon separated directories for loading jars from multiple paths.
+* Introduced method to control the location of dependencies dynamically loaded to the Gremlin Console as part of the `:install` command.
+* Fixed problem with the Neo4j Gremlin Plugin not loading properly after Gremlin Console restart.
+* Removed the "use" configuration from Gremlin Server.
+* Moved `SugarGremlinPlugin` from `gremlin-console` to `gremlin-groovy` so that it could be shared with Gremlin Server.
+* Fixed bug in serialization of `null` results returned to the Gremlin Console when serializing to strings.
+* Moved the `GremlinPlugin` for `TinkerGraph` to `tinkergraph-gremlin` module (it is no longer in `gremlin-console`).
+* Added a `plugin-info.txt` file to Gremlin Console `/ext/{module}` subdirectories to identify the module that was originally requested.
+* Gremlin Server now allows for the explicit configuration of plugin activation.
+* Refactored `GremlinPlugin` and `AbstractGremlinPlugin` to better account for plugins that run on the server and those that run in the console.
+* Added a `plugins` configuration to Gremlin Server to control the plugins that are enabled on initialization.
+* Added a builder option to `GremlinExecutor` to control the plugins that are enabled on initialization.
+* Added `RemoteException` for usage with `RemoteAcceptor` implementations for the Gremlin Console so as to better standardize their development.
+* Standardized all text being written to the Gremlin Console using starting upper case letter.
+* Prevented error in the Console when `:submit` is called but no remotes were configured.
+* Provided a way to clean the `grapes` directory as part of a standard build with `mvn clean install`.
+
+[[release-3-0-0-m5]]
+=== TinkerPop 3.0.0.M5 (Release Date: November 7, 2014)
+
+* Removed `PropertyFilterIterator` as using Java8 streams was just as efficient for the use case.
+* Renamed `KryoWritable` to `GremlinWritable` as it is not necessarily Kryo that is the serialization mechanism.
+* Fixed an input split bug in Giraph that was making it so that splits were not always at vertex boundaries.
+* Fixed a combiner bug in `GirapGraphComputer`. Combiners were always calling `MapReduce.reduce()`, not `MapReduce.combine()`.
+* Greatly simplified `SubgraphStrategy` by removing requirements for `Traversal` introspection.
+* `StrategyWrappedGraph` mimics vendor use of `GraphStep` and `GraphTraversal` and no longer requires dynamic strategy application.
+* `TraversalStrategies` make use of a dependency tree sorting algorithm to ensure proper sorts prior to application.
+* `TraversalStrategies` are now immutable and are bound to the `Traversal` class.
+* Fixed bug in Gephi Plugin that prevented it from communicating with the Gephi Streaming Server.
+* Renamed `MessageType.XXX.to()` to `MessageType.XXX.of()` so it makes sense in both the sending and receiving context.
+* Improved messaging with respect to tests that are ignored due to features to make it clear that those tests are not in error.
+* Relaxed exception consistency checks in the test suite to only check that a thrown exception from an implementation extends the expected exception class (but no longer validates that it is the exact class or that the message text).
+* `VertexProgram` now has `workerIterationStart()` and `workerIterationEnd()` to allow developers to control vertex split static data structures.
+* `TraversalVertexProgram` startup time greatly reduced due to being smart about `loadState()` behavior.
+* Gremlin Server sessions now allow serialization of results that were part of an open transaction.
+* Refactor `OpProcessors` implementations in Gremlin Server for better reusability.
+* `Vertex.iterators()` no longer have a `branchFactor`. This is now at the query language level with `localLimit()`.
+* Added `limit(long)` and `localLimit(int,int)` which simply call the range equivalents with 0 as the low.
+* Added `LocalRangeStep` which supports ranging the edges and properties of an element -- `localRange(int,int)`.
+* `GraphTraversal.value(String)` no longer exists. Instead, use `GraphTraversal.values(String)`.
+* `HiddenXXXStep` and `ValueXXXStep` no longer exist. `PropertyXXXStep` takes a `PropertyType` to denote value and hidden access.
+* Added `PropertyType` to the structure-package which provide markers for denoting property types (vs. property classes).
+* Renamed `setWorkingDirectory` to `workingDirectory` in the `KryoReader` builder.
+* `Path.get(String)` returns the object if only one object is referenced by label, else it returns a `List` of referenced objects.
+* Added overload to `GremlinKryo` to allow a serializer to be configured as a `Function<Kryo,Serializer>` to allow better flexibility in serializer creation.
+* Added method to `GraphProvider` to allow implementers to provide a mechanism to convert GraphSON serialized identifiers back to custom identifiers as needed.
+* Added methods to `GraphProvider` so that implementers could specify a custom built `GremlinKryo` class and/or `SimpleModule` class in case their implementation had custom classes to be serialized.
+* Added `Traversal.forEachRemaining(class,consumer)` for those traversals whose end type is different from declared due to strategy rewriting.
+* Removed `Traversal.forEach()` as traversal implements `Iterator` and users should use `forEachRemaining()`.
+* `RangeStep` now has an inclusive low and an exclusive high -- a change from Gremlin2.
+* `DriverGremlinPlugin` returns raw results with driver results available via the `result` variable.
+* Removed test enforcement of `private` constructor for a `Graph` instance.
+* `RemoteAcceptor` now supports `@` prefixed lines that will grab the script string from the Gremlin Console shell.
+* Modified the signature of `Property.element()` to simply return `Element`
+* Added `Reducing` marker and `ReducingStrategy` which supports reduction-functions as a final step in Gremlin OLAP (e.g. `fold()`).
+* Once strategies are `complete()`, no more steps can be added to a `Traversal`.
+* Renamed `Traversal.strategies()` to `Traversal.getStrategies()` as it is not a "query language"-method.
+* Added test to enforce that a `label` on a `VertexProperty` is always set to the key of the owning property.
+* Fixed bug with multi-property removal in `Neo4jGraph`.
+* Bumped to Neo4j 2.1.5.
+* Used standard `UUIDSerializer` from the `kryo-serializers` library for serialization of `UUID` objects.
+* Changed GraphSON serialization to only use `iterators()` - there were still remnants of `Traversal` usage from previous refactoring.
+* Added overload for `detach` method to allow for the `Element` to be detached as a "reference" only (i.e. without properties).
+* Renamed `Item` in `gremlin-driver` to `Result`.
+* Renamed `strategy` to `getStrategy` in `StrategyWrappedGraph`.
+* Renamed `baseGraph` to `getBaseGraph` in `Neo4jGraph`.
+* `Neo4jGraph` now returns an empty property `Vertex.property(k)` when the key is non-existent (a problem only visible when meta/multi property configuration was turned off).
+* `Traversal.Strategies.apply()` now takes a `TraversalEngine`. Greatly simplifies strategy application for `STANDARD` or `COMPUTER`.
+* Renamed `IdentityReductionStrategy` to `IdentityRemovalStrategy` for reasons of clarity.
+* Added `ComparingRemovalStrategy` that removes `Comparing`-marked steps unless they are the end step of the traversal.
+* `OrderStep` now works in OLAP, but only makes sense as a traversal end step.
+* `MapReduce` API extended to include `getMapKeySort()` and `getReduceKeySort()` to sort outputs accordingly.
+* Renamed `TraversalResultMapReduce` to `TraverserMapReduce`. Shorter and makes more sense.
+* Improved build automation to package javadocs and asciidoc documentation in the distribution files.
+* Improved build automation with a script to automatically bump release versions in the various files that needed it such as the `pom.xml` files.
+* The identifier on `VertexProperty` is now read properly to those graphs that can support identifier assignment.
+* `GraphSONReader.readGraph()` now properly reads vertex properties.
+* Removed `Neo4jGraph.getCypher()` as users should use `Neo4jGraph.cypher()` and get back TinkerPop3 graph objects.
+* `GiraphGraph.variables().getConfiguration()` is now replaced by `GiraphGraph.configuration()`.
+* Added `Graph.configuration()` which returns the `Configuration` object of `Graph.open()`.
+* Removed `TraverserTracker` as now there is only a `TraverserSet` for all halted traversers. A nice simplification of `TraversalVertexProgram`.
+* Renamed `Traverser.isDone()` to `Traverser.isHalted()` and `DONE` to `HALT`. Consistent with automata terminology.
+* Removed `PathTraverserExecutor` and `SimpleTraverserExecutor` as a single `TraverserExecutor` correctly executes both types of traversers.
+* `TraversalVertexProgram` does "reflexive message passing" to reduce the total number of iterations required to execute a traversal.
+* `MapReduce` no-argument constructors are private and thus, only for reflection and `loadState()` usage.
+* MapReducers for `TraversalVertexProgram` are now smart about `with()` declared data structures.
+* Updated `Traversal.SideEffects` to use "registered suppliers" and it now works accordingly in both OLTP and OLAP environments.
+* Increased the speed of `FlatMapStep` by approximately 1.5x.
+
+[[release-3-0-0-m4]]
+=== TinkerPop 3.0.0.M4 (Release Date: October 21, 2014)
+
+* Added features for `VertexProperty` user supplied ids and related data types.
+* Removed `SideEffectCap` marker interface as there is only one `SideEffectCapStep` and thus, `instanceof` is sufficient.
+* `Path.getObjects()`/`Path.getLabels()` renamed to `Path.objects()`/`Path.labels()` to be in line with "query language" naming convention.
+* Greatly simplified `GiraphInternalVertex` due to `Element.graph()` -- 1/2 the memory footprint and reduced construction time.
+* Renamed `Property.getElement()` to `Property.element()` given the "query language" naming convention.
+* `Element.graph()` added which returns the `Graph` that the element is contained within.
+* Added tests for greater consistency around iterating hidden properties.
+* Simplified `TraversalVertexProgram` where only a single `TraverserTracker` exists for both path- and simple-traversers.
+* Fixed a major bug where `Arrays.binarySearch` was being used on an unsorted array in TinkerGraph and Neo4jGraph.
+* Changed `ComputerResult.getXXX()` to `graph()` and `memory()` to be consistent with "query language" naming convention.
+* `Traverser.getXXX()` changed to `loops()`, `bulk()`, `path()`, `sideEffects()` to be consistent with "query language" naming convention.
+* Optimization to reduce the number of empty lists created due to no step class existing for respective `TraversalStrategy.apply()`.
+* Added `CapTraversal` as a marker interface for the `cap()` method.
+* Added `union()` with GraphComputer `UnionLinearStrategy`.
+* `TimeLimitStep` was moved to `filter/` package. It was a mistake that it was in `sideEffect/`.
+* Provided the configuration for generating both a "full" and "core" set of javadocs, where "full" represents all classes in all projects and "core" is the "user" subset.
+* Validated bindings passed to Gremlin Server to ensure that they do not match the most common statically imported values.
+* If no script engine name is provided to a `LambdaHolder` it is assumed to be Gremlin-Groovy.
+* `MapEmitter` and `ReduceEmitter` have an `emit(value)` default method where the key is the `MapReduce.NullObject` singleton.
+* `Traverser.Admin` now implements `Attachable` as the `Traversal.SideEffects` can be generated from the `Vertex`.
+* Made a solid effort to ensure that all TinkerPop keys are `Graph.System` to leave `Graph.Key` for users.
+* The `Graph.System` prefix is now `^` instead of `%&%`. Simpler and easier on the `toString()`-eyes.
+* Added `Traversal.SideEffects.ifPresent(Consumer)` as a default helper method.
+* Added `profile()`-step which provides detailed information about the performance of each step in a traversal.
+* No more `CountCapStep` and `CountStep`, there is only `CountStep` and it is elegant.
+* Created a `AbstractTraversalStrategy` with good `toString()`, `hasCode()`, and `equals()` implementations.
+* Added `CountTraversal` as a marker-interface stating that the `Traversal` has a `count() -> Long` method.
+* `Traversal` no longer has any step methods as its not required for DSL implementers to have "core steps."
+* Added "linearization" strategy for `ChooseStep` so it is executed correctly on GraphComputer.
+* Added `GraphTraversalStrategyRegistry` which has respective global strategies to make turning on/off strategies easier.
+* Added a generic `BranchStep` to be used for re-writing "meta-steps" for execution on GraphComputer.
+* Moved `JumpStep`, `UntilStep`, and `ChooseStep` to a new `branch/` package.
+* Added test cases to the Structure Suite to enforce consistent operations of reading properties after removal of their owning `Element`.
+* GraphSON format change for full `Graph` serialization - Graph variables are now serialized with the key "variables" as opposed to "properties".
+* Relaxed `Graph.toString()` test requirements for implementers.
+* Made the `toString` operations in `GraphStrategy` consistent.
+* Added `VertexFeatures.supportsRemoveProperty`.
+* Added `VertexPropertyFeatures.supportsRemoveProperty`.
+* Added `EdgeFeatures.supportsRemoveProperty`.
+* Added `VertexFeatures.supportsRemoveVertices`.
+* Added `EdgeFeatures.supportsRemoveEdges`.
+* Vendors should now get a clear error when mis-spelling something in an `@OptOut` (or more likely if a test name changes) and it now works all the test suites.
+* All plugins now have a default prefix of "tinkerpop." as a namespace.
+* `GraphComputer` now executes a `Set<MapReduce>` and `hashCode()`/`equals()` were implemented for existing `MapReduce` implementations.
+* Changed `Contains.in/notin` to `Contains.within/without` as `in` is a reserved term in most languages (including Java and Groovy).
+* Added helper methods for loading data into collections in `TraversalHelper`.
+* Core `Traversal` methods are smart about bulking -- e.g. `iterate()`, `fill()`, `remove()`, etc.
+* `GroupByStep` and `GroupByMapReduce` leverage `BulkSet` as the default group data structure.
+* `Element.Iterator` has renamed methods so implementers can do `MyElement implements Element, Element.Iterators`.
+* Renamed `MessageType.Global` and `MessageType.Local` creators from `of()` to `to()` as it makes more sense to send messages `to()`.
+* With `Traverser.get/setBulk()` there is no need for a `TraverserMessage`. The `Traverser` is now the message in `TraversalVertexProgram`.
+* Provided static `make()` methods for constructing `Path` implementations.
+* Provided a more space/time efficient algorithm for `Path.isSimple()`.
+* The `JumpStep` GraphComputer algorithm `Queue` is now a `TraverserSet`.
+* `AggregateStep` and `StoreStep` now use `BulkSet` as their default backing `Collection` (much more space/time efficient).
+* Added `BulkSet` which is like `TraverserSet` but for arbitrary objects (i.e. a weighted set).
+* `UnrollJumpStrategy` is no longer a default strategy as it is less efficient with the inclusion of `TraverserSet`.
+* Introduced `TraverserSet` with bulk updating capabilities. Like OLAP, OLTP looping is now linear space/time complexity.
+* TinkerGraph's MapReduce framework is now thread safe with a parallel execution implementation.
+* Added a default `Traverser.asAdmin()` method as a typecast convenience to `Traverser.Admin`.
+* Renamed `Traverser.System` to `Traverser.Admin` as to not cause `java.lang.System` reference issues.
+* Renamed `Memory.Administrative` to `Memory.Admin` to make it shorter and consistent with `Traverser.Admin`.
+* Fixed a TinkerGraph bug around user supplied vertex property ids.
+* Most `Step` classes are now defined as `public final class` to prevent inheritance.
+* `ShuffleStep` now extends `BarrierStep` which enables semantically correct step-sideEffects.
+* Leveraged `Traverser.getBulk()` consistently throughout all steps.
+
+[[release-3-0-0-m3]]
+=== TinkerPop 3.0.0.M3 (Release Date: October 6, 2014)
+
+* All `Step` fields are now `private`/`protected` with respective getters as currently needed and will be added to as needed.
+* Gremlin Server no longer has the `traverse` operation as lambdas aren't really serialized.
+* `Path` is now an interface with `ImmutablePath` and `MutablePath` as implementations (2x speedup on path calculations).
+* `Traverser` now implements `Comparable`. If the underlying object doesn't implement `Comparable`, then a runtime exception.
+* Added abstract `BarrierStep` which greatly simplifies implementing barriers like `AggregateStep`, `OrderStep`, etc.
+* `SelectStep` is now intelligent about when to trigger path computations based on label selectors and barriers.
+* `T` no longer has `eq`, `neq`, `lt`, `in`, etc. Renamed all respective enums and with `static import`, good in console (e.g. `Compare.eq`).
+* Added `Order` enum which provides `Order.decr` and `Order.incr`.
+* `Traverser.loops` and `Jump.loops` are now shorts (`32767` max-loops is probably sufficient for 99.9999% of use cases).
+* `Traverser.bulk` exists which is how many instances does the traverser represent. For use in grouping with bulk computations.
+* Greatly simplified sideEffect steps where there is no distinction between OLAP vs. OLTP (from the `Step` perspective).
+* Removed the need for `Bulkable` and `VertexCentric` marker interfaces in process API.
+* Renamed configuration parameters in Giraph-Gremlin to be consistent with a `giraph.gremlin`-prefix.
+* Made it possible to pass a `ScriptEngine` name and string script in `TraversalVertexProgram` and `LambdaVertexProgram`.
+* Made `TinkerGraph` a plugin for the Console as it is no longer a direct dependency in `gremlin-groovy`.
+* Added features for supporting the addition of properties via `Element.property(String,Object)`.
+* `GiraphGraph` OLTP tested against Gremlin-Java8 and Gremlin-Groovy -- OLAP tested against Gremlin-Groovy.
+* `Neo4jGraph` is now tested against both Gremlin-Java8 and Gremlin-Groovy.
+* Renamed the test cases in `ProcessTestSuite` to be consistent with other Gremlin language variants.
+* Added a `gremlin-groovy-test` suite that can be used to validate implementations against the Groovy variant of Gremlin.
+* `TinkerGraph` is no longer serializable, use a `GraphReader`/`GraphWriter` to serialize the graph data.
+* Removed `implements Serializable` on numerous classes to ensure safety and proper usage of utilities for cloning.
+* `Traversal` now implements `Cloneable` as this is the means that inter-JVM threads are able to get sibling `Traversals`.
+* Created "integration" test for `Neo4jGraph` that runs the test suite with multi/meta property features turned off.
+* Added `GraphStrategy` methods for `VertexProperty`.
+* Converted the `id` data type from string to integer in the Grateful Dead sample data.
+* Removed all notions of serializable lambdas as this is a misconception and should not be part of TinkerPop.
+* Greatly simplified `TraversalVertexProgram` with three arguments: a `Traversal<Supplier>`, `Class<Traversal<Supplier>>`, or a script string with `ScriptEngine` name.
+* Added `TraversalScript` interface with `GroovyTraversalScript` as an instance. To be used by OLAP engines and any language variant (e.g. gremlin-scala, gremlin-js, etc.).
+* `UntilStep` now leverages `UnrollJumpStrategy` accordingly.
+* Fixed a bug where the `toString()` of `Traversal` was being hijacked by `SugarGremlinPlugin`.
+* Fixed compilation bug in `UntilStep` that is realized when used in multi-machine OLAP.
+* Simplified `Enumerator` and implementations for `MatchStep`.
+
+[[release-3-0-0-m2]]
+=== TinkerPop 3.0.0.M2 (Release Date: September 23, 2014)
+
+* Added an exhaust `InnerJoinEnumerator` fix in `MatchStep` to get all solutions correctly.
+* `Neo4jGraph` can be configured to allow or disallow meta- and multi-properties.
+* Added `until()`-step as a simpler way to express while-do looping which compiles down to a `jump()`-step equivalent.
+* Added "The Crew" (`CREW`) toy graph which contains multi-properties, meta-properties, graph variables, hiddens, etc.
+* If the Giraph job fails, then the subsequent `MapReduce` jobs will not execute.
+* Added `Graph.System` class which generates keys prefixed with `%&%` which is considered the vendor namespace and not allowed by users.
+* Added `ReferencedVertex` (etc. for all graph object types) for lightweight message passing of graph object ids.
+* `T.*` now has `label`, `id`, `key`, `value` and no longer are these `String` representations reserved in TinkerPop.
+* `Traverser` now has a transient reference to `Traversal.SideEffects`.
+* "Detached" classes are now tested by the standard test suite.
+* Compartmentalized `Traverser` interface so there is now a `Traverser.System` sub-interface with methods that users shouldn't call.
+* Added `OrderByStep` which orders `Elements` according to the value of a provided key.
+* 2x speed increase on steps that rely heavily on `ExpandableStepIterator` with massive memory footprint reduction as well.
+* Added `VertexProperty<V>` as the property type for vertices -- provides multi-properties and properties on properties for vertices.
+* Changed `VertexProgram` such that `getElementComputeKeys()` is simply a `Set<String>`.
+* Significant changes to the format of the `ResponseMessage` for Gremlin Server - these changes break existing clients.
+* Close any open transactions on any configured `Graph` when a session in Gremlin Server is killed.
+* Grateful Dead Graph now uses vertex labels instead of "type" properties.
+* There is now a `GraphComputerStrategy` and `EngineDependent` marker interface to allow steps to decide their algorithm depending if they are OLAP or OLTP.
+* A labeled step now stores its current traverser value in `Traversal.SideEffects` (no longer can sideEffectKeys and step labels be the same).
+* `GraphFactory` support for opening a `Graph` with multiple `GraphStrategy` instances - if there are multiple strategies they are wrapped in order via `SequenceGraphStrategy`.
+* The result type for result termination messages returned from Gremlin Server is now set to "no content".
+* The `maxContentLength` setting for Gremlin Driver now blocks incoming frames that are too large.
+* After initialization scripts are executed in Gremlin Server, the `Graph` instances are re-bound back to their global references, thus allowing `GraphStrategy` initialization or even dynamic `Graph` creation through scripts.
+* Added "Modern" graph back which is basically the "Classic" graph with double values for the "weight" property on edges and non-default vertex labels.
+* `Traversal.addStep()` is now hard typed so type casting isn't required and traversal APIs look clean.
+* Changed the hidden key prefix from `%$%` to `~` in `Graph.Key.hide()`.
+* Added `has(label,key,predicate,value)` to allow for `has('person','name','marko')`. Various overloaded methods provided.
+* Update to traversal API where if a `SFunction<S,?>` was required, but can process a `Traverser<S>`, then the function is `SFunction<Traverser<S>,?>`.
+* Added `WhereStep` as a way to further constrain `select()` and `match()`.
+* Extensive work on `GiraphMemory` and its interaction with Giraph aggregators.
+* If the input path of a `GiraphGraphComputer` does not exist, failure happens prior to job submission.
+* `SugarPlugin` now has all inefficient methods and Gremlin-Groovy proper is only efficient Groovy techniques.
+* Prevented concurrency problems by only modifying bindings within the same thread of execution in the `GremlinExecutor`.
+* Calls to `use` on the `DependencyManager` now return the list of `GremlinPlugin` instances to initialize instead of just initializing them automatically because it causes problems with `ScriptEngine` setup if a plugin requires a script to be evaluated and a required dependency is not yet loaded.
+* `Traversal.SideEffects` has `getGraph()`, `setGraph()`, and `removeGraph()` default helpers.
+* `Traversal.Memory` -> `Traversal.SideEffects` and `GraphComputer.SideEffects` -> `GraphComputer.Memory`.
+* `StrategyWrappedVertex` and `StrategyWrappedEdge` properly wrap `Element` objects returned from non-traversal based methods.
+* Gremlin-Server now sends a single write with status 200 for Object and empty response messages.
+* `GremlinGroovyScriptEngine` allows imports to re-import dependencies added via "use".
+* Changed order in which the `GremlinExecutor` is initialized such that dependency loading via "use" are handled first which fixes problems with starting Gremlin Server with `gremlin-server-neo4j.yaml`.
+* Corrected issues with the "branch factor" related traversals under `SubgraphStrategy`. This change also altered the semantics of the `SubgraphStrategy` a bit as it became more restrictive around `Edge` inclusion (requires both vertices to be in the subgraph).
+* The Gephi Plugin now visualizes traversals and has numerous configuration options.
+* Added more specific features around the types of "identifiers" a graph can support.
+* Added a new test graph called `MODERN` that is copy of the `CLASSIC` graph, but represents floats as doubles. This graph will be the default graph for testing going forward.
+* Fix bug in `Neo4jGraph` that was not processing multiple vertex labels properly when doing a `has()` step with `IN`.
+* Changed semantics of `@LoadGraphWith` in gremlin-test to only refer to the ability of a test implementation to process the data types of the test graph (not to actually load it).
+* `StartStep` is a `SideEffect` as it is a process to get data into the stream (like a keyboard) and more efficient as such.
+* Greatly simplified the implementations of `Map`, `FlatMap`, `Filter`, and `SideEffect`.
+* `Path` data structure changed to an ordered list of objects with each associated to a `Set<String>` of as-labels.
+* All sideEffect-based steps no longer extend `FilterStep` with predicate equal true, but a more efficient `SideEffectStep`.
+* `TreeStep` now has `TreeMapReduce` for executing on `GraphComputer`.
+* `Neo4jTraversal.cypher()` is fluent throughout.
+* Reverted back to TP2 model of `as()` referring to step names, not variable names of sideEffects.
+* Updated `AddEdge`-step to support property key/value pairs for appending to newly created edges.
+* Renamed `Graph.getFeatures()` to `Graph.features()` to be consistent with other API methods.
+* `Vertex` and `Edge` now implement all `GraphTraversal` methods to ensure consistency throughout stack.
+* `Neo4jTraversal` is auto-generated from `Neo4jTraversalStub` with technique generalizable to other vendors.
+* Added test suite to ensure that all traversals are of the same type: `g.V`, `g.E`, `g.of()`, `v.identity()`, `e.identity()`, v-, e-methods.
+* Giraph HDFS helpers now support `hdfs.mkdir(string)` and `local.mkdir(string)`
+* Added `@OptIn` and `@OptOut` for implementers to specify on their `Graph` implementations for test compliance information.
+* `GraphComputer` `Memory` now immutable after computation is complete.
+* Dependency grabbing for plugins filter out slf4j logging dependencies so as to avoid multiple bindings with the standard TinkerPop distributions.
+* Fixed `GiraphMemory` to be fully consistent with GraphComputer specification.
+* Removed fatJar assembly from Giraph-Graph as it is no longed needed with distributed cache model.
+* Reworked `GiraphRemoteAcceptor` to provide a `result` variable back to the console with `ComputerResult`.
+* `VertexProgram` is no longer `Serializable` (use `loadState` and `storeState` for wire-propagation).
+* Moved `GiraphGraph.getOutputGraph()` to `GiraphHelper`.
+* Changed `GIRAPH_GREMLIN_HOME` to `GIRAPH_GREMLIN_LIB` to reference directory where jars are to be loaded.
+* Updated README with release instructions.
+
+=== TinkerPop 3.0.0.M1 (Release Date: August 12, 2014)
+
+* First official release of TinkerPop3 and thus, no changes.
\ No newline at end of file
diff --git a/docs/archive/changelogs/changelog-3.1.x.asciidoc b/docs/archive/changelogs/changelog-3.1.x.asciidoc
new file mode 100644
index 0000000..41c29b9
--- /dev/null
+++ b/docs/archive/changelogs/changelog-3.1.x.asciidoc
@@ -0,0 +1,627 @@
+////
+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.
+////
+== TinkerPop 3.1.0 (A 187 On The Undercover Gremlinz)
+
+image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/images/gremlin-gangster.png[width=185]
+
+[[release-3-1-8]]
+=== TinkerPop 3.1.8 (Release Date: August 21, 2017)
+
+* Fixed a `MessageScope` bug in `TinkerGraphComputer`.
+* Fixed a bug in `BigDecimal` divisions in `NumberHelper` that potentially threw an `ArithmeticException`.
+* Non-deserializable exceptions no longer added to ScriptRecordReader IOExceptions.
+
+==== Bugs
+
+* TINKERPOP-1519 TinkerGraphComputer doesn't handle multiple MessageScopes in single iteration
+* TINKERPOP-1736 Sack step evaluated by Groovy interprets numbers in an unexpected way
+* TINKERPOP-1754 Spark can not deserialise some ScriptRecordReader parse exceptions
+
+[[release-3-1-7]]
+=== TinkerPop 3.1.7 (Release Date: June 12, 2017)
+
+* Configured Modern and The Crew graphs to work with a integer `IdManager` when `TinkerFactory.createXXX()` is called.
+* Added XSLT transform option to convert TinkerPop 2.x GraphML to 3.x GraphML.
+* Added validation to `StarVertexProperty`.
+* Bumped to Jackson 2.8.7.
+* Fixed `EventStrategy` so that newly added properties trigger events with the name of the key that was added.
+* Drop use of jitpack for the jbcrypt artifact - using the official one in Maven Central.
+* Bumped to Groovy 2.4.11.
+
+==== Improvements
+
+* TINKERPOP-1504 MutationListener doesn't provide property key on property additions
+* TINKERPOP-1608 TP2-to-TP3 GraphML XSLT
+* TINKERPOP-1633 Use org.mindrot:jbcrypt v0.4
+* TINKERPOP-1645 Bump to Groovy 2.4.9
+* TINKERPOP-1654 Upgrade to jackson-databind 2.8.6+ in gremlin-shaded
+* TINKERPOP-1659 Docker build should use maven settings.xml
+* TINKERPOP-1664 StarVertexProperty#property should throw an NPE if the value is null
+
+[[release-3-1-6]]
+=== TinkerPop 3.1.6 (Release Date: February 3, 2017)
+
+* Fixed bug in `IncidentToAdjacentStrategy`, it was missing some invalidating steps.
+* Returned a confirmation on session close from Gremlin Server.
+* Use non-default port for running tests on Gremlin Server.
+* Fully shutdown metrics services in Gremlin Server on shutdown.
+* Deprecated `tryRandomCommit()` in `AbstractGremlinTest` - the annotation was never added in 3.1.1, and was only deprecated via javadoc.
+* Minor fixes to various test feature requirements in `gremlin-test`.
+* Allow developers to pass options to `docker run` with TINKERPOP_DOCKER_OPTS environment variable
+
+==== Bugs
+
+* TINKERPOP-1493 Groovy project doesn't build on Windows
+* TINKERPOP-1545 IncidentToAdjacentStrategy is buggy
+
+==== Improvements
+
+* TINKERPOP-1538 Gremlin Server spawned by test suites should use a different port
+* TINKERPOP-1544 Return a confirmation of session close
+* TINKERPOP-1556 Allow Hadoop to run on IPv6 systems
+* TINKERPOP-1557 Improve docker build time with this one weird trick!
+* TINKERPOP-1598 Bump to Grovy 2.4.8
+
+[[release-3-1-5]]
+=== TinkerPop 3.1.5 (Release Date: October 17, 2016)
+
+* Improved handling of `Cluster.close()` and `Client.close()` to prevent the methods from hanging.
+* Fixed a bug in `NotStep` where child requirements were not being analyzed.
+* Fixed output redirection and potential memory leak in `GremlinGroovyScriptEngine`.
+* Corrected naming of `g_withPath_V_asXaX_out_out_mapXa_name_it_nameX` and `g_withPath_V_asXaX_out_mapXa_nameX` in `MapTest`.
+* Improved session cleanup when a close is triggered by the client.
+* Removed the `appveyor.yml` file as the AppVeyor build is no longer enabled by Apache Infrastructure.
+* Fixed TinkerGraph which was not saving on `close()` if the path only consisted of the file name.
+* Fixed a bug in `RangeByIsCountStrategy` which didn't use the `NotStep` properly.
+
+==== Bugs
+
+* TINKERPOP-1158 gremlin.sh -v emits log4j initialization errors
+* TINKERPOP-1391 issue with where filter
+* TINKERPOP-1442 Killing session should make better attempt to cleanup
+* TINKERPOP-1451 TinkerGraph persistence cannot handle a single file name as the graph location
+* TINKERPOP-1467 Improve close() operations on the Java driver
+* TINKERPOP-1478 Propogate ScriptEngine fixes from groovy to GremlinGroovyScriptEngine
+* TINKERPOP-1512 gremlin-server-classic.yaml is broken
+
+==== Improvements
+
+* TINKERPOP-927 bin/publish-docs.sh should only upload diffs.
+* TINKERPOP-1264 Improve BLVP docs
+* TINKERPOP-1477 Make DependencyGrabberTest an integration test
+
+[[release-3-1-4]]
+=== TinkerPop 3.1.4 (Release Date: September 6, 2016)
+
+* Improved the error provided by a client-side session if no hosts were available.
+* Fixed a bug in `PropertiesTest` which assumed long id values.
+* Fixed a bug in `StarGraph` around self-edges.
+* Fixed a potential leak of a `ReferenceCounted` resource in Gremlin Server.
+* Renamed distributions to make the prefix "apache-tinkerpop-" as opposed to just "apache-".
+* Fixed a problem (previously thought resolved on 3.1.3) causing Gremlin Server to lock up when parallel requests were submitted on the same session if those parallel requests included a script that blocked indefinitely.
+* Fixed bug in `TailGlobalStep` where excess bulk was not accounted for correctly.
+
+==== Bugs
+
+* TINKERPOP-1350 Server locks when submitting parallel requests on session
+* TINKERPOP-1375 Possible ByteBuf leak for certain transactional scenarios
+* TINKERPOP-1377 Closing a remote in "console mode" has bad message
+* TINKERPOP-1379 unaccounted excess in TailGlobalStep
+* TINKERPOP-1397 StarVertex self edge has buggy interaction with graph filters
+* TINKERPOP-1419 Wrong exception when a SessionedClient is initialized with no available host
+
+==== Improvements
+
+* TINKERPOP-989 Default documentation should be reference/index.html
+* TINKERPOP-1376 Rename TinkerPop artifacts
+* TINKERPOP-1413 PropertiesTest#g_V_hasXageX_propertiesXnameX assumes that ids are longs
+* TINKERPOP-1416 Write Gremlin Server log files somewhere during doc generation
+* TINKERPOP-1418 CoreTraversalTests depend on missing functionality
+
+[[release-3-1-3]]
+=== TinkerPop 3.1.3 (Release Date: July 18, 2016)
+
+* Fixed bug in `SubgraphStep` where features were not being checked properly prior to reading meta-properties.
+* Ensured calls to `Result.hasNext()` were idempotent.
+* Avoid hamcrest conflict by using mockito-core instead of mockito-all dependency in `gremlin-test`.
+* Fixed bug in `GremlinExecutor` causing Gremlin Server to lock up when parallel requests were submitted on the same session if those parallel requests included a script that blocked indefinitely.
+* Changed `GremlinExecutor` timeout scheduling so that the timer would not start until a time closer to the actual start of script evaluation.
+* Fixed bug in `SubgraphStrategy` where step labels were not being propogated properly to new steps injected by the strategy.
+* Fix incorrect test `FeatureRequirement` annotations.
+* Defaulted to `Edge.DEFAULT` if no edge label was supplied in GraphML.
+* Fixed bug in `IoGraphTest` causing IllegalArgumentException: URI is not hierarchical error for external graph implementations.
+* Fixed bug in `GremlinGroovyScriptEngineFileSandboxTest` resource loading
+* Improved `TinkerGraph` performance when iterating vertices and edges.
+* Fixed a bug where timeout functions provided to the `GremlinExecutor` were not executing in the same thread as the script evaluation.
+* Fixed a bug in the driver where many parallel requests over a session would sometimes force a connection to close and replace itself.
+* Graph providers should no longer rely on the test suite to validate that hyphens work for property keys.
+* Optimized a few special cases in `RangeByIsCountStrategy`.
+* Added more "invalid" variable bindings to the list used by Gremlin Server to validate incoming bindings on requests.
+* Fixed a bug where the `ConnectionPool` in the driver would not grow with certain configuration options.
+* Fixed a bug where pauses in Gremlin Server writing to an overtaxed client would generate unexpected `FastNoSuchElementException` errors.
+* Named the thread pool used by Gremlin Server sessions: "gremlin-server-session-$n".
+* Fixed a bug in `BulkSet.equals()` which made itself apparent when using `store()` and `aggregate()` with labeled `cap()`.
+* Fixed a bug where `Result.one()` could potentially block indefinitely under certain circumstances.
+* Ensured that all asserts of vertex and edge counts were being applied properly in the test suite.
+* Fixed bug in `gremlin-driver` where certain channel-level errors would not allow the driver to reconnect.
+* `SubgraphStep` now consults the parent graph features to determine cardinality of a property.
+* Use of `Ctrl-C` in Gremlin Console now triggers closing of open remotes.
+* Bumped SLF4J to 1.7.21 as previous versions suffered from a memory leak.
+* Fixed a bug in `Neo4jGraphStepStrategy` where it wasn't defined properly as a `ProviderOptimizationStrategy`.
+* Renamed `AndTest.get_g_V_andXhasXage_gt_27X__outE_count_gt_2X_name` to `get_g_V_andXhasXage_gt_27X__outE_count_gte_2X_name` to match the traversal being tested.
+* Fixed a self-loop bug in `StarGraph`.
+* Added configuration option for disabling `:remote` timeout with `:remote config timeout none`.
+* Added `init-tp-spark.sh` to Gremlin Console binary distribution.
+* Fixed bug where use of `:x` in a Gremlin Console initialization script would generate a stack trace.
+* Added configuration options to Gremlin Driver and Server to override the SSL configuration with an `SslContext`.
+* Added driver configuration settings for SSL: `keyCertChainFile`, `keyFile` and `keyPassword`.
+* Fixed bug where transaction managed sessions were not properly rolling back transactions for exceptions encountered during script evaluation.
+* Fixed bug in `:uninstall` command if the default `/ext` directory was not used.
+* Added support to Gremlin Driver to allow either plain text or GSSAPI SASL authentication allowing the client to pass the SASL mechanism in the request.
+* Improved dryRun functionality for the docs processor. It's now possible to dry run (or full run) only specific files.
+* Added precompile of `ScriptInputFormat` scripts to `ScriptRecordReader` to improve performance.
+
+==== Bugs
+
+* TINKERPOP-906 Install plugin always fails after first unresolved dependency
+* TINKERPOP-1088 Preserve Cardinality in Subgraph
+* TINKERPOP-1092 Gremlin Console init script with :x throws exception
+* TINKERPOP-1139 [Neo4JGraph] GraphTraversal with SubgraphStrategy removes addLabelStep (as("b"))
+* TINKERPOP-1196 Calls to Result.one() might block indefinitely
+* TINKERPOP-1215 Labeled a SideEffectCapStep cause problems.
+* TINKERPOP-1242 ScriptEngineTest randomly hangs indefinately.
+* TINKERPOP-1257 Bad SackTest variable use.
+* TINKERPOP-1265 Managed Session Eval Exceptions Rollback
+* TINKERPOP-1272 Gremlin Console distribution needs bin/init-tp-spark.sh
+* TINKERPOP-1284 StarGraph does not handle self-loops correctly.
+* TINKERPOP-1300 Many asserts around vertex/edge counts on graphs not applied
+* TINKERPOP-1317 IoGraphTest throws error: URI is not hierarchical
+* TINKERPOP-1318 java.lang.NoSuchMethodError: org/hamcrest/Matcher.describeMismatch
+* TINKERPOP-1319 several FeatureRequirement annotations are incorrect in gremlin-test
+* TINKERPOP-1320 GremlinGroovyScriptEngineFileSandboxTest throws error: URI is not hierarchical
+* TINKERPOP-1324 Better error for invalid args to addV()
+* TINKERPOP-1350 Server locks when submitting parallel requests on session
+* TINKERPOP-1351 Number of connections going beyond the pool max size
+* TINKERPOP-1352 Connection Pool doesn't always grow
+* TINKERPOP-1359 Exception thrown when calling subgraph() on Neo4jGraph
+* TINKERPOP-1360 intermittent error in spark-gremlin integration test
+
+==== Improvements
+
+* TINKERPOP-939 Neo4jGraph should support HighAvailability (Neo4jHA).
+* TINKERPOP-1003 Setting up latest/current links for bins and docs.
+* TINKERPOP-1020 Provide --dryRun selectivity for "half publishing" docs.
+* TINKERPOP-1063 TinkerGraph performance enhancements
+* TINKERPOP-1229 More Descriptive Messaging for :remote console
+* TINKERPOP-1260 Log for validate-distribution.sh
+* TINKERPOP-1263 Pass SASL mechanism name through with initial SASL response
+* TINKERPOP-1267 Configure Console for no timeout on remote requests
+* TINKERPOP-1269 More SSL settings for driver
+* TINKERPOP-1295 Precompile ScriptInputFormat scripts once during initialization of ScriptRecordReader
+* TINKERPOP-1301 Provide Javadoc for ScriptInput/OutputFormat's
+* TINKERPOP-1302 Ctrl-C should kill open remotes in Console
+* TINKERPOP-1312 .count().is(0) is not properly optimized
+* TINKERPOP-1314 Improve error detection in docs preprocessor
+* TINKERPOP-1354 Include all static enum imports in request validation for bindings *(breaking)*
+
+[[release-3-1-2-incubating]]
+=== TinkerPop 3.1.2 (Release Date: April 8, 2016)
+
+* Fixed two `NullPointerException`-potential situations in `ObjectWritable`.
+* Provided Docker script that allows the execution of several build tasks within a Docker container.
+* Added a per-request `scriptEvaluationTimeout` option to the Gremlin Server protocol.
+* Changed `DriverRemoteAcceptor` to send scripts as multi-line.
+* Fixed a bug in `gremlin-driver` where connections were not returning to the pool after many consecutive errors.
+* Fixed a bug where `tree()` did not serialize into GraphSON.
+* Bumped to SLF4j 1.7.19.
+* Bumped to Apache Hadoop 2.7.2.
+* Fixed a bug in `gremlin-driver` where a really fast call to get a `Future` to wait for a result might not register an error raised from the server.
+* Fixed a severe bug where `LP_O_OB_P_S_SE_SL_Traverser` was not registered with `GryoMapper`.
+* The future from `GremlinExecutor.eval()` is completed after the entire evaluation lifecyle is completed.
+* Spark `Memory` uses `collect().iterator()` instead of `toLocalIterator()` to reduce noise in Spark UI.
+* Added the `:remote console` option which flips the Gremlin Console into a remote-only mode where all script evaluation is routed to the currently configured remote, which removes the need to use the `:>` command.
+* Added `allowRemoteConsole()` to the `RemoteAcceptor` interface.
+* The `:remote` for `tinkerpop.server` now includes an option to establish the connection as a "session".
+* Provided an implementation for calls to `SessionedClient.alias()`, which formerly threw an `UnsupportedOperationException`.
+* Bumped to commons-collections 3.2.2.
+* Fixed a bug where `OrderGlobalStep` and `OrderLocalStep` were not incorporating their children's traverser requirements.
+* Fixed a compilation bug in `TraversalExplanation`.
+* Fixed bug where a session explicitly closed was being closed again by session expiration.
+* Improved the recovery options for `gremlin-driver` after failed requests to Gremlin Server.
+* Added `maxWaitForSessionClose` to the settings for `gremlin-driver`.
+* Bumped to Netty 4.0.34.Final.
+* Added "interpreter mode" for the `ScriptEngine` and Gremlin Server which allows variables defined with `def` or a type to be recognized as "global".
+* Bumped to Apache Groovy 2.4.6.
+* Added the `gremlin-archetype-server` archetype that demonstrates
+* Added the `gremlin-archetype-tinkergraph` archetype that demonstrates a basic project that uses TinkerGraph.
+* Added `gremlin-archetype` module to house TinkerPop "examples".
+* Fixed a condition where `ConnectionPool` initialization in the driver would present a `NullPointerException` on initialization if there were errors constructing the pool in full.
+* Fixed a bug in the round-robin load balancing strategy in the driver would waste requests potentially sending messages to dead hosts.
+* Added new Provider Documentation book - content for this book was extracted from the reference documentation.
+* Fixed a bug where multiple "close" requests were being sent by the driver on `Client.close()`.
+* Fixed an `Property` attach bug that shows up in serialization-based `GraphComputer` implementations.
+* Fixed a pom.xml bug where Gremlin Console/Server were not pulling the latest Neo4j 2.3.2.
+* Fixed bug in "round robin" load balancing in `gremlin-driver` where requests were wrongly being sent to the same host.
+* Prevented the spawning of unneeded reconnect tasks in `gremlin-driver` when a host goes offline.
+* Fixed bug preventing `gremlin-driver` from reconnecting to Gremlin Server when it was restarted.
+* Better handled errors that occurred on commits and serialization in Gremlin Server to first break the result iteration loop and to ensure commit errors were reported to the client.
+* Added GraphSON serializers for the `java.time.*` classes.
+* Improved the logging of the Gremlin Server REST endpoint as it pertained to script execution failures.
+* `TraversalExplanation` is now `Serializable` and compatible with GraphSON and Gryo serialization.
+* Fixed a problem with global bindings in Gremlin Server which weren't properly designed to handle concurrent modification.
+* Deprecated `ScriptElementFactory` and made the local `StarGraph` globally available for ``ScriptInputFormat``'s `parse()` method.
+* Improved reusability of unique test directory creation in `/target` for `AbstractGraphProvider`, which was formerly only available to Neo4j, by adding `makeTestDirectory()`.
+* Optimized memory-usage in `TraversalVertexProgram`.
+* `Graph` instances are not merely "closed" at the end of tests, they are "cleared" via `GraphProvider.clear()`, which should in turn cleans up old data for an implementation.
+* Expanded the Gremlin Server protocol to allow for transaction management on in-session requests and updated the `gremlin-driver` to take advantage of that.
+* Greatly reduced the amount of objects required in OLAP for the `ReducingBarrierStep` steps.
+* Improved messages for the different distinct "timeouts" that a user can encounter with Gremlin Server.
+
+==== Bugs
+
+* TINKERPOP-1041 StructureStandardTestSuite has file I/O issues on Windows
+* TINKERPOP-1105 SparkGraphComputer / Null Pointer Exceptions for properties traversals
+* TINKERPOP-1106 Errors on commit in Gremlin Server don't register as exception on driver
+* TINKERPOP-1125 RoundRobin load balancing always uses the second Host when size = 2
+* TINKERPOP-1126 A single Host spawns many reconnect tasks
+* TINKERPOP-1127 client fails to reconnect to restarted server
+* TINKERPOP-1146 IoTest are not clearing the db after the test run
+* TINKERPOP-1148 ConcurrentModificationException with bindings in Gremlin Server
+* TINKERPOP-1150 Update pom file dependencies to work with Neo4j 2.3.2
+* TINKERPOP-1159 Client sends multiple session close messages per host
+* TINKERPOP-1168 Switch plugins in docs preprocessor
+* TINKERPOP-1172 Reconnect to Gremlin Server previously marked as dead
+* TINKERPOP-1175 Anonymous traversals can't be explained
+* TINKERPOP-1184 Sessions not being closed properly
+* TINKERPOP-1216 OrderStep or O_Traverser is broken
+* TINKERPOP-1239 Excessive continual failure for requests can cause TimeoutException in driver
+* TINKERPOP-1245 Gremlin shell starts incorrectly on OS X due to awk difference
+* TINKERPOP-1251 NPE in ObjectWritable.toString
+* TINKERPOP-1252 Failed Neo4j transaction can leave Neo4jTransaction in inconsistent state
+
+==== Improvements
+
+* TINKERPOP-732 gremlin-server GraphSON serializer issue with tree()
+* TINKERPOP-916 Develop a better "simple" driver for testing and example purposes
+* TINKERPOP-937 Extract the implementations sections of the primary documentation to its own book
+* TINKERPOP-956 Connection errors tend to force a complete close of the channel
+* TINKERPOP-1039 Enable auto-commit for session'd requests.
+* TINKERPOP-1068 Bump to support jbcrypt-0.4m.jar
+* TINKERPOP-1080 Bump Netty version - 4.0.34.Final
+* TINKERPOP-1085 Establish TinkerPop "example" projects
+* TINKERPOP-1096 Support aliasing for sessions in Gremlin Server
+* TINKERPOP-1097 Gremlin Console supporting sessions
+* TINKERPOP-1107 Provide a way to support global variables with sandboxing enabled
+* TINKERPOP-1109 Make Gremlin Console better suited for system level installs
+* TINKERPOP-1131 TraversalVertexProgram traverser management is inefficient memory-wise.
+* TINKERPOP-1135 Improve GraphSON representation of java.time.* classes
+* TINKERPOP-1137 Deprecate ScriptElementFactory and make star graph globally available
+* TINKERPOP-1138 Improve messaging on server timeouts
+* TINKERPOP-1147 Add serialization for TraversalExplanation
+* TINKERPOP-1160 Add timeout configuration for time to wait for connection close
+* TINKERPOP-1165 Tooling Support: Compile with -parameters
+* TINKERPOP-1176 Bump Groovy version - 2.4.6
+* TINKERPOP-1177 Improve documentation around Spark's storage levels
+* TINKERPOP-1197 Document Gremlin Server available metrics
+* TINKERPOP-1198 Bump commons-collections to 3.2.2
+* TINKERPOP-1213 missing docs for has(label, key, value)
+* TINKERPOP-1218 Usage of toLocalIterator Produces large amount of Spark Jobs
+
+[[release-3-1-1-incubating]]
+=== TinkerPop 3.1.1 (Release Date: February 8, 2016)
+
+* Made `GryoRecordReader` more robust to 0 byte record splits.
+* Fixed a constructor/serialization bug in `LP_O_OB_S_SE_SL_Traverser`.
+* Added a lazy iterator, memory safe implementation of MapReduce to `SparkGraphComputer`.
+* Added `MapReduce.combine()` support to `SparkGraphComputer`.
+* Bumped to Neo4j 2.3.2.
+* Fixed Java comparator contract issue around `Order.shuffle`.
+* Optimized a very inefficient implementation of `SampleLocalStep`.
+* Reduced the complexity and execution time of all `AbstractLambdaTraversal` instances.
+* `DefaultTraversal` has a well defined `hashCode()` and `equals()`.
+* Added serializers to Gryo for `java.time` related classes.
+* Integrated `NumberHelper` in `SackFunctions`.
+* Deprecated `VertexPropertyFeatures.supportsAddProperty()` which effectively was a duplicate of `VertexFeatures.supportsMetaProperties`.
+* The Spark persistence `StorageLevel` can now be set for both job graphs and `PersistedOutputRDD` data.
+* Added to the list of "invalid binding keys" allowed by Gremlin Server to cover the private fields of `T` which get exposed in the `ScriptEngine` on static imports.
+* Added `BulkDumperVertexProgram` that allows to dump a whole graph in any of the supported IO formats (GraphSON, Gryo, Script).
+* Fixed a bug around duration calculations of `cap()`-step during profiling.
+* It is possible to completely avoid using HDFS with Spark if `PersistedInputRDD` and `PersistedOutpuRDD` are leveraged.
+* `InputRDD` and `OutputRDD` can now process both graphs and memory (i.e. sideEffects).
+* Removed Groovy specific meta-programming overloads for handling Hadoop `FileSystem` (instead, its all accessible via `FileSystemStorage`).
+* Added `FileSystemStorage` and `SparkContextStorage` which both implement the new `Storage` API.
+* Added `Storage` to the gremlin-core io-package which providers can implement to allow conventional access to data sources (e.g. `ls()`, `rm()`, `cp()`, etc.).
+* Bumped to Spark 1.5.2.
+* Bumped to Groovy 2.4.5.
+* Added `--noClean` option in `bin/process-docs.sh` to prevent the script from cleaning Grapes and HDFS.
+* Execute the `LifeCycle.beforeEval()` in the same thread that `eval()` is executed in for `GremlinExecutor`.
+* Improved error handling of Gremlin Console initialization scripts to better separate errors in initialization script I/O versus execution of the script itself.
+* Fixed a bug in `Graph.OptOut` when trying to opt-out of certain test cases with the `method` property set to "*".
+* Added another `BulkLoader` implementation (`OneTimeBulkLoader`) that doesn't store temporary properties in the target graph.
+* Added option to allow for a custom `ClassResolver` to be assigned to a `GryoMapper` instance.
+* Fixed a `SparkGraphComputer` sorting bug in MapReduce that occurred when there was more than one partition.
+* Added `strictTransactionManagement` to the Gremlin Server settings to indicate that the `aliases` parameter must be passed on requests and that transaction management will be scoped to the graphs provided in that argument.
+* Fixed a `NullPointerException` bug in `PeerPressureVertexProgram` that occurred when an adjacency traversal was not provided.
+* Standardized "test data directories" across all tests as generated by `TestHelper`.
+* Fixed a bug in Gremlin Server where error messages were not always being passed back in the `statusMessage` field of the `ResponseMessage`.
+* Added validation for parameter `bindings` to ensure that keys were `String` values.
+* Improved Transaction Management consistency in Gremlin Server.
+* Added `FileSandboxExtension` which takes a configuration file to white list methods and classes that can be used in `ScriptEngine` execution.
+* Deprecated `SandboxExtension` and `SimpleSandboxExtension` in favor of `AbstractSandboxExtension` which provides better abstractions for those writing sandboxes.
+* Fixed a long standing "view merge" issue requiring `reduceByKey()` on input data to Spark. It is no longer required.
+* Added `Spark` static object to allow "file system" control of persisted RDDs in Spark.
+* Added a Spark "job server" to ensure that persisted RDDs are not garbage collected by Spark.
+* Improved logging control during builds with Maven.
+* Fixed settings that weren't being passed to the Gremlin Driver `Cluster` through configuration file.
+* `Column` now implements `Function`. The modulator `by(valueDecr)` can be replaced by `by(values,decr)` and thus, projection and order are separated.
+* Added `InputRDDFormat` which wraps an `InputRDD` to make it accessible to Hadoop and not just Spark.
+* Added `AbstractSparkTest` which handles closing `SparkContext` instances between tests now that we support persisted contexts.
+* Fixed a serialization bug in `GryoSerializer` that made it difficult for graph providers to yield `InputRDDs` for `SparkGraphComputer`.
+* `SparkGraphComputer` is now tested against Gryo, GraphSON, and `InputRDD` data sources.
+* `HadoopElementIterator` (for Hadoop-Gremlin OLTP) now works for any `InputFormat`, not just `FileInputFormats`.
+* Added `Traverser.Admin.getTags()` which are used to mark branches in a traversal (useful in `match()` and related future steps).
+* Fixed the `Future` model for `GiraphGraphComputer` and `SparkGraphComputer` so that class loaders are preserved.
+* Added support for arbitrary vertex ID types in `BulkLoaderVertexProgram`.
+* Deprecated `credentialsDbLocation` from `SimpleAuthenticator` in Gremlin Server.
+* `TinkerGraph` has "native" serialization in GraphSON, which enables it to be a return value from Gremlin Server.
+* Improved the ability to embed Gremlin Server by providing a way to get the `ServerGremlinExecutor` and improve reusability of `AbstractEvalOpProcessor` and related classes.
+* Added `Authenticator.newSaslNegotiator(InetAddress)` and deprecated the zero-arg version of that method.
+* `ProfileStep` is now available off of `Traversal` via `profile()`. To be consistent with `Traversal.explain()`.
+* If no comparator is provided to `order()`, `Order.incr` is assumed (previously, an exception occurred).
+* Fixed various Gremlin-Groovy tests that assumed `toString()`-able ids.
+* Split TinkerPop documentation into different directories.
+* Added `explain()`-step which yields a `TraversalExplanation` with a pretty `toString()` detailing the compilation process.
+* Fixed a traversal strategy ordering bug in `AdjacentToIncidentStrategy` and `IncidentToAdjacentStrategy`.
+* Made a number of changes to improve traversal startup and execution performance.
+* Added support for 'gremlin.tinkergraph.graphLocation' to accept a fully qualified class name that implements `Io.Builder` interface.
+
+==== Bugs
+
+* TINKERPOP-763 IsStep broken when profiling is enabled.
+* TINKERPOP-972 Cluster::close does not shut down its executor
+* TINKERPOP-973 BLVP shouldn't clear configuration properties
+* TINKERPOP-976 Fail earlier if invalid version is supplied in validate-distribution.sh
+* TINKERPOP-977 Dead link to traversal javadocs
+* TINKERPOP-979 ComputerVerificationStrategy not picking up Order local traversal
+* TINKERPOP-985 shouldPersistDataOnClose makes incorrect feature check
+* TINKERPOP-990 Mixed types in VertexPropertyTest
+* TINKERPOP-993 cyclicPath is not(simplePath)
+* TINKERPOP-997 FeatureRequirementSet.SIMPLE should not require multi-property *(breaking)*
+* TINKERPOP-1000 GremlinGroovyScriptEngineOverGraphTest failures
+* TINKERPOP-1001 SugarLoaderPerformanceTest contains hardcoded vertex ids
+* TINKERPOP-1002 Should rollback transaction after catching on close
+* TINKERPOP-1006 Random error during builds: shouldReloadClassLoaderWhileDoingEvalInSeparateThread()
+* TINKERPOP-1011 HadoopGraph can't re-attach when the InputFormat is not a FileInputFormat
+* TINKERPOP-1012 BulkLoaderVertexProgram shouldn't assume vertex IDs of type Long
+* TINKERPOP-1025 Solve SparkContext Persistence Issues with BulkLoaderVertexProgram
+* TINKERPOP-1027 Merge view prior to writing graphRDD to output format/rdd
+* TINKERPOP-1036 Support self-looping edges in IO
+* TINKERPOP-1052 @Graph.OptOut causes Exception during Suite setup
+* TINKERPOP-1060 LambdaRestrictionStrategy too restrictive
+* TINKERPOP-1075 Profile duration of cap step seems broken.
+* TINKERPOP-1083 Traversal needs a hashCode() and equals() definition.
+* TINKERPOP-1089 Order.shuffle implementation is too fragile
+* TINKERPOP-1119 LP_O_OB_S_SE_SL_Traverser doesn't have a protected constructor().
+
+==== Improvements
+
+* TINKERPOP-320 BulkDumperVertexProgram
+* TINKERPOP-379 MessageScope.Local.setStaticMessage(M msg)
+* TINKERPOP-824 Do we need runtime BigDecimal in more places?
+* TINKERPOP-859 Provide a more general way to set log levels in plugins
+* TINKERPOP-860 Bindings applied to the PluginAcceptor should appear to Gremlin Server
+* TINKERPOP-886 Allow any GraphReader/Writer to be persistence engine for TinkerGraph
+* TINKERPOP-891 Re-examine Sandboxing Abstractions
+* TINKERPOP-912 Improve the ability to embed Gremlin Server with Channelizer injection
+* TINKERPOP-928 Use directories to separate different books
+* TINKERPOP-930 Tie Alias to Transaction Manager in Gremlin Server
+* TINKERPOP-938 Add a "clear SNAPSHOT jars" section to the process-docs.sh.
+* TINKERPOP-941 Improve error message for wrong order().by() arguments
+* TINKERPOP-943 Warn if Gremlin Server is running prior to generating docs
+* TINKERPOP-945 Exceptions should allow me to include root cause if/when available
+* TINKERPOP-952 Include Cardinality.list example in VertexProperty section of main docs.
+* TINKERPOP-954 Consistent test directory usage
+* TINKERPOP-957 Improve speed of addV()
+* TINKERPOP-964 Test XXXGraphComputer on a Hadoop2 cluster (non-pseudocluster).
+* TINKERPOP-970 ProfileStep should be off Traversal, not GraphTraversal
+* TINKERPOP-978 Native TinkerGraph Serializers for GraphSON
+* TINKERPOP-981 Deprecate support for credentialsDbLocation in Gremlin Server Config
+* TINKERPOP-982 valuesDecr, valuesIncr, keysDecr, and valuesDecr is lame.
+* TINKERPOP-983 Provide a way to track open Graph instances in tests
+* TINKERPOP-984 Use GraphProvider for id conversion in Groovy Environment test suite
+* TINKERPOP-987 Use tinkerpop.apache.org URL in all documentation and homepage
+* TINKERPOP-988 SparkGraphComputer.submit shouldn't use ForkJoinPool.commonPool
+* TINKERPOP-992 Better support for schema driven Graphs in IO related tests
+* TINKERPOP-994 Driver using deprecated Rebindings Still
+* TINKERPOP-995 Add Authenticator.newSaslNegotiator(InetAddress)
+* TINKERPOP-996 Please delete old releases from mirroring system
+* TINKERPOP-998 Deprecate VertexPropertyFeatures.FEATURE_ADD_PROPERTY
+* TINKERPOP-1009 Add a CAUTION to documentation about HadoopGraph and getting back elements
+* TINKERPOP-1013 Traverser tags as a safer way of using path labels
+* TINKERPOP-1018 Allow setting for maxContentLength to be set from yaml in driver
+* TINKERPOP-1019 Convert println in test to SLF4j
+* TINKERPOP-1022 Automatically warm up ops handlers
+* TINKERPOP-1023 Add a spark variable in SparkGremlinPlugin like we do hdfs for HadoopGremlinPlugin
+* TINKERPOP-1026 BVLP should store vertex IDs as String
+* TINKERPOP-1033 Store sideEffects as a persisted RDD
+* TINKERPOP-1035 Better Consistency in Gremlin Server Transaction Management
+* TINKERPOP-1045 Client-Side Hangs when attempting to access a HashMap with Keys of type Integer
+* TINKERPOP-1047 TinkerGraph GraphSON storage format broken
+* TINKERPOP-1051 Add note in best practice docs about gremlin server heap setting
+* TINKERPOP-1055 Gremlin Console FileNotFoundException can be misleading
+* TINKERPOP-1062 Make LifeCycle beforeEval execute in same thread as eval operation
+* TINKERPOP-1064 Allow a ClassResolver to be added to GryoMapper construction
+* TINKERPOP-1065 Fix some typos and clarify some wording in the TinkerPop documentation
+* TINKERPOP-1066 Add ioRegistries configuration to GraphSON MessageSerializer
+* TINKERPOP-1067 Update Groovy to 2.4.5
+* TINKERPOP-1072 Allow the user to set persistence options using StorageLevel.valueOf()
+* TINKERPOP-1073 HadoopGraph toString() is weird for Spark PersitedRDD data.
+* TINKERPOP-1086 Include gryo serializers for java.time related classes
+* TINKERPOP-1087 Add has()/order() to FilterRankStrategy
+* TINKERPOP-1093 Add Spark init.sh script and update dev documentation.
+* TINKERPOP-1100 Look deeply into adding combine()-support in Spark MapReduce.
+* TINKERPOP-1117 InputFormatRDD.readGraphRDD requires a valid gremlin.hadoop.inputLocation, breaking InputFormats (Cassandra, HBase) that don't need one
+
+[[release-3-1-0-incubating]]
+=== TinkerPop 3.1.0 (Release Date: November 16, 2015)
+
+This release also includes changes from <<./changelog-3.0.x.asciidoc#release-3-0-1-incubating, 3.0.1-incubating>> and <<./changelog-3.0.x.asciidoc#release-3-0-2-incubating, 3.0.2-incubating>>.
+
+* Fixed bug in Gryo and GraphSON (with embedded types) serialization for serialization of results returned from `Map.entrySet()`.
+* `Transaction` settings for `onReadWrite` and `onClose` are now `ThreadLocal` in nature of standard transactions.
+* Optimized `BulkLoaderVertexProgram`. It now uses `EventStrategy` to monitor what the underlying `BulkLoader` implementation does (e.g. whether it creates a new vertex or returns an existing).
+* Integrated `NumberHelper` in `SumStep`, `MinStep`, `MaxStep` and `MeanStep` (local and global step variants).
+* Gremlin Console remoting to Gremlin Server now supports a configuration option for assigning aliases.
+* `CountMatchAlgorithm`, in OLAP, now biases traversal selection towards those traversals that start at the current traverser location to reduce message passing.
+* Fixed a file stream bug in Hadoop OLTP that showed up if the streamed file was more than 2G of data.
+* Added the ability to set thread local properties in `SparkGraphComputer` when using a persistent context.
+* Bumped to Neo4j 2.3.0.
+* Deprecated "rebindings" as an argument to Gremlin Server and replaced it with "aliases".
+* Added `PersistedInputRDD` and `PersistedOutputRDD` which enables `SparkGraphComputer` to store the graph RDD in the context between jobs (no HDFS serialization required).
+* Renamed the `public static String` configuration variable names of TinkerGraph (deprecated old variables).
+* Added `GraphComputer.configure(key,value)` to allow engine-specific configurations.
+* `GraphStep` is no longer in the `sideEffect`-package and is now in `map`-package (breaking change).
+* Added support for mid-traversal `V()`-steps (`GraphStep` semantics updated).
+* Fixed `Number` handling in `Operator` enums. Prior this change a lot of operations on mixed `Number` types returned a wrong result (wrong data type).
+* Fixed a bug in Gremlin Server/Driver serializer where empty buffers were getting returned in certain cases.
+* Renamed `ConjunctionX` to `ConnectiveX` because "conjunction" is assumed "and" (disjunction "or"), where "connective" is the parent concept.
+* Removed `PathIdentityStep` as it was a hack that is now solved by `Traversal.Admin.addTraverserRequirement()`.
+* Added `Traversal.Admin.addTraverserRequirement()` to allow a traversal strategy or source to add requirements (not only step determined anymore).
+* Added `TraverserRequirement.ONE_BULK` to state the traverser does not handle bulk.
+* Added `GraphTraversalSource.withBulk(boolean)` to enabled users to compute only using `bulk=1`.
+* Gremlin Server supports Netty native transport on linux.
+* Removed the need for `GFunction` (etc.) closure wrappers in Gremlin-Groovy as `as Function` can be used to convert closures accordingly.
+* Added `SelectColumnStep` (`select(keys)` and `select(values)`). Deprecated `mapKeys()` and `mapValues()`.
+* Renamed `gremlin.hadoop.graphInputRDD` and `gremlin.hadoop.graphOutputRDD` to `gremlin.spark.graphInputRDD` and `gremlin.spark.graphOutputRDD`, respectively.
+* Fixed a bug in `FoldStep` around bulking. This could be a breaking change, but it is the correct semantics.
+* Previous `group()`-behavior steps are accessible via the deprecated `groupV3d0()`-steps.
+* `GroupStep` and `GroupSideEffectStep` now do lazy reductions to reduce memory footprint. Breaking change for `group()` semantics.
+* Added `GroupStepHelper` with various static methods and classes that are used by both `GroupStep` and `GroupSideEffectStep`.
+* Added `BarrierStep` interface with `processAllStarts()` method which process all starts up to yielding the barrier result.
+* Fixed a severe threading issue in `TinkerGraphComputer`.
+* The location of the jars in HDFS is now `hadoop-gremlin-x.y.z-libs` to ensure multiple TinkerPop versions don't clash.
+* `GiraphGraphComputer` will only upload the jars to HDFS if it doesn't already exist (to help speed up startup time).
+* `GiraphGraphComputer.workers()` is smart about using threads and machines to load balance TinkerPop workers across cluster.
+* `GraphComputer.workers(int)` allows the user to programmatically set the number of workers to spawn.
+* Added `GryoSerializer` as the new recommended Spark `Serializer`. Handles `Graph` and `GryoMapper` registries.
+* `GryoPool` now makes use of `GryoPool.Builder` for its construction.
+* Bumped to Apache Hadoop 2.7.1.
+* Bumped to Apache Giraph 1.1.0.
+* Bumped to Apache Spark 1.5.1.
+* Split Hadoop-Gremlin apart such there is now `hadoop-gremlin`, `spark-gremlin`, and `giraph-gremlin` (and respective `GremlinPlugins`).
+* Added `LambdaCollectingBarrierStep` which generalizes `NoOpBarrierStep` and allows for `barrier(normSack)`-type operations.
+* Fixed bugs in the Gremlin Server's NIO protocol both on the server and driver side.
+* Added `Path.popEquals(Pop,Object)` to check for path equality based on `Pop` (useful for `TraverserRequirement.LABELED_PATH`).
+* Added `Operator.assign` to allow setting a direct value.
+* `Operator` is now a `BinaryOperator<Object>` with appropriate typecasting for respective number operators.
+* Simplified `SackValueStep` so it now supports both `sack(function)` and `sack(function).by()`. Deprecated `sack(function,string)` .
+* Added `Parameters` object to allow for the parameters of a step to be retrieved at runtime via a traversal.
+* Redesigned (though backwards compatible) `AddEdgeStep`, `AddVertexStep`, and `AddPropertyStep` (and respective `GraphTraversal` API).
+* Added `GraphTraversalSource.inject()` so users can spawn a traverser with non-graph objects.
+* `GraphStep` can now take a single argument `Collection` which is either elements or element ids (i.e. `g.V([1,2,3])` is supported now).
+* Added `LoopsStep` to make the loop counter accessible within `repeat()`, `until()` and `emit()`.
+* Gephi Plugin no longer requires manual insert of `store` steps to visualize a traversal.
+* Added a `TinkerIoRegistry` that registers a custom serializer for Gryo that will serialize an entire `TinkerGraph` instance.
+* Added configuration options to Gephi Plugin for setting the size of nodes visualized.
+* Replaced `DedupBijectionStrategy` with the more effective `FilterRankingStrategy`.
+* `ComputerAwareSteps` must not only handle step ids, but also step labels.
+* Renamed `B_O_P_SE_SL_Traverser` to `B_LP_O_P_SE_SL_Traverser` as it now supports `TraverserRequirement.LABELED_PATH`.
+* Added `B_LP_O_S_SE_SL_Traverser` in support of `TraverserRequirement.LABELED_PATH`.
+* Added `TraverserRequirement.LABELED_PATH` which only generates path data for steps that are labeled (greatly increases the likelihood of bulking).
+* Fixed a bug in `Path` usage that required an API update: `Path.addLabel()` is now `Path.extend(Set<String>)` and `Traverser.addLabels(Set<String>)`.
+* Made `Path` iterable, so that it can be ``unfold()``'ed and used by local steps like `min(local)`, `max(local)`, etc.
+* `WhereTraversalStep` and `WherePredicateStep` are now the only "special" `Scoping` steps after `MatchStartStep` in `match()`.
+
+==== Bugs
+
+* TINKERPOP-774 order / dedup issues
+* TINKERPOP-799 [Proposal] with()-modulator for stream level variable binding.
+* TINKERPOP-801 groupCount() fails for vertices (elements?) (using Spark)
+* TINKERPOP-811 AddPropertyStepTest fails "all of a sudden"
+* TINKERPOP-823 addV() broken for multi-value properties
+* TINKERPOP-843 Misspecified HADOOP_GREMLIN_LIBS generates NullPointerException
+* TINKERPOP-857 Add GraphComputer.config(key,value)
+* TINKERPOP-895 Use "as BinaryOperator" and remove GBinaryOperator
+* TINKERPOP-903 Fix empty buffer return upon buffer capacity exceeded
+* TINKERPOP-910 In session transaction opened from sessionless request
+* TINKERPOP-918 ComputerVerificationStrategy is too restrictive
+* TINKERPOP-926 Renamed TinkerGraph public statics to common pattern used for other statics.
+* TINKERPOP-948 AbstractGremlinProcessTest.checkMap not asserted in GroupTest
+* TINKERPOP-953 Artifact equality is not evaluating properly
+* TINKERPOP-955 HashMap$Node not serializable
+
+==== Improvements
+
+* TINKERPOP-297 Ensure Consistent Behavior Over Deleted Elements *(breaking)*
+* TINKERPOP-333 Support VertexProperty in PartitionStrategy
+* TINKERPOP-391 More fluency in GraphComputer for parameterization.
+* TINKERPOP-616 Use Spark 1.3.0 in Hadoop-Gremlin.
+* TINKERPOP-624 Passing Detached/Referenced to Graph.vertices/edge()
+* TINKERPOP-680 Configurable Channelizer for Gremlin Driver
+* TINKERPOP-728 Improve Remote Graph Object Treatment in Console
+* TINKERPOP-756 Provide a strict parsing option for GraphMLReader
+* TINKERPOP-760 Make loop counter accessible within repeat()
+* TINKERPOP-762 Allow mid-traversal V() (and E())
+* TINKERPOP-765 Decompose AbstractTransaction for different transactional contexts *(breaking)*
+* TINKERPOP-767 Path should play well with "local" steps.
+* TINKERPOP-768 MatchStep in OLAP should be smart about current vertex.
+* TINKERPOP-769 Make the introduction of the TP3 docs story better.
+* TINKERPOP-772 TraverserRequirement.LABELED_PATH
+* TINKERPOP-796 Support merge binary operator for Gremlin sacks *(breaking)*
+* TINKERPOP-798 [Proposal] Rename mapKeys()/mapValues() to select(keys) and select(values).
+* TINKERPOP-802 Provide sack(object) so that the sack can be directly set.
+* TINKERPOP-803 A better solution to g.V(someCollection.toArray())
+* TINKERPOP-805 Enforce AutoCloseable Semantics on Transaction *(breaking)*
+* TINKERPOP-821 Improve testing around TraversalHelper around recursive methods
+* TINKERPOP-825 [Proposal] SetBulkStep (sideEffectStep)
+* TINKERPOP-826 OneToManyBarrierStrategy
+* TINKERPOP-827 Add a console session to the PageRank section of the docs.
+* TINKERPOP-829 TinkerGraphComputer should support the user specified thread/worker count.
+* TINKERPOP-835 Shade Jackson Dependencies *(breaking)*
+* TINKERPOP-836 Support Hadoop2 in place of Hadoop1
+* TINKERPOP-850 Reduce Graph.addVertex overload ambiguity *(breaking)*
+* TINKERPOP-851 GroupCountStep needs a by() for the count.
+* TINKERPOP-861 Solve "The Number Problem" for Operator (and follow on operators)
+* TINKERPOP-863 [Proposal] Turn off bulking -- or is there something more general? (hope not).
+* TINKERPOP-866 GroupStep and Traversal-Based Reductions *(breaking)*
+* TINKERPOP-868 Allow Spark Gremlin Computer to Reuse Spark Contexts
+* TINKERPOP-874 Rename Gremlin-Spark properties using gremlin.spark prefix. *(breaking)*
+* TINKERPOP-876 Rename VendorOptimizationStrategy XXXOptimizationStrategy *(breaking)*
+* TINKERPOP-879 Remove deprecated promoteBindings from GremlinExecutor *(breaking)*
+* TINKERPOP-885 Change Transaction.onReadWrite() to be a ThreadLocal setting *(breaking)*
+* TINKERPOP-888 GraphTraversal.property overloads *(breaking)*
+* TINKERPOP-896 Simplify the {{withSack}} methods of {{GraphTraversalSource}}. *(breaking)*
+* TINKERPOP-897 Remove deprecated GSupplier, GFunction, GConsumer, etc. methods. *(breaking)*
+* TINKERPOP-898 Rename ConjuctionP and ConjuctionStep to ConnectiveP and ConnectiveStep *(breaking)*
+* TINKERPOP-899 Bump to the latest version of Neo4j.
+* TINKERPOP-900 Provide by(object) which compiles to by(constant(object))
+* TINKERPOP-901 Option for use of Netty epoll on Linux to reduce GC pressure
+* TINKERPOP-904 BulkLoaderVertexProgram optimizations
+* TINKERPOP-905 Harden time oriented tests in ResultQueueTest
+* TINKERPOP-907 getters for RepeatStep.untilTraversal and RepeatStep.emitTraversal
+* TINKERPOP-908 Use line breaks in documentation
+* TINKERPOP-909 Improve steps that handle numeric data
+* TINKERPOP-911 Allow setting Thread Specific Spark JobGroup/Custom Properties based on hadoop conf
+* TINKERPOP-913 Rename Gremlin Server arguments rebinding to alias
+* TINKERPOP-914 DriverRemoteAcceptor in Gremlin Console supports aliases
+* TINKERPOP-917 Add HadoopGraph.open(String)
+* TINKERPOP-922 Add a book for Developer Documentation
+* TINKERPOP-923 Add a book for Tutorials
+* TINKERPOP-925 Use persisted SparkContext to persist an RDD across Spark jobs.
+* TINKERPOP-931 Make it possible to extend the core OpProcessor implementations
+* TINKERPOP-933 Improve release process to get files named properly
+* TINKERPOP-935 Add missing "close" operation to the session opProcessor docs
\ No newline at end of file
diff --git a/docs/archive/changelogs/changelog-3.2.x.asciidoc b/docs/archive/changelogs/changelog-3.2.x.asciidoc
new file mode 100644
index 0000000..40b0f71
--- /dev/null
+++ b/docs/archive/changelogs/changelog-3.2.x.asciidoc
@@ -0,0 +1,1136 @@
+////
+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.
+////
+== TinkerPop 3.2.0 (Nine Inch Gremlins)
+
+image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/images/nine-inch-gremlins.png[width=185]
+
+[[release-3-2-11]]
+=== TinkerPop 3.2.11 (Release Date: January 2, 2019)
+
+* Bumped to Jackson Databind 2.9.8
+
+==== Improvements
+
+* TINKERPOP-2074 Ensure that only NuGet packages for the current version are pushed
+* TINKERPOP-2121 Bump Jackson Databind 2.9.8
+
+[[release-3-2-10]]
+=== TinkerPop 3.2.10 (Release Date: October 15, 2018)
+
+* Removed conflicting non-indy groovy core dependency
+* Bumped jython-standalone 2.7.1
+* Added a delegate to the Gremlin.Net driver that can be used to configure the WebSocket connection.
+* SSL security enhancements
+* Added Gremlin version to Gremlin Server startup logging output.
+* Fixed problem with Gremlin Server sometimes returning an additional message after a failure.
+* Allowed spaces in classpath for `gremlin-server.bat`.
+* Fixed bug in traversals that used Python lambdas with strategies in `gremlin-python`.
+* Modified Maven archetype for Gremlin Server to use remote traversals rather than scripts.
+* Added an system error code for failed plugin installs for Gremlin Server `-i` option.
+* Fixed bug in keep-alive requests from over-queuing cancelled jobs.
+* Match numbers in `choose()` options using `NumberHelper` (match values, ignore data type).
+* Added support for GraphSON serialization of `Date` in Javascript.
+* Added synchronized `Map` to Gryo 1.0 registrations.
+* Added `Triple` to Gryo 1.0 registrations.
+* Added support for `Double.NaN`, `Double.POSITIVE_INFINITY` and `Double.NEGATIVE_INFINITY`.
+* Improved escaping of special characters in strings passed to the `GroovyTranslator`.
+* Added `Cluster` configuration option to set a custom validation script to use to test server connectivity in the Java driver.
+* Improved ability of `GroovyTranslator` to handle more types supported by GraphSON.
+* Improved ability of `GroovyTranslator` to handle custom types.
+* Added better internal processing of `Column` in `by(Function)`.
+* Added `hasNext()` support on `Traversal` for `gremlin-python`.
+* Added support for additional extended types in Gremlin.Net with `decimal`, `TimeSpan`, `BigInteger`, `byte`, `byte[]`, `char` and `short`.
+* Fixed bug in Java driver where an disorderly shutdown of the server would cause the client to hang.
+* Added a dotnet template project that should make it easier to get started with Gremlin.Net.
+* Removed `ThreadInterruptCustomizerProvider` from documentation as a way to timeout.
+* Changed behavior of `withRemote()` if called multiple times so as to simply throw an exception and not perform the side-effect of auto-closing.
+* Added Docker images for Gremlin Console and Gremlin Server.
+* Fixed bug in `branch()` where reducing steps as options would produce incorrect results.
+* Removed recursive handling of streaming results from Gremlin-Python driver to avoid max recursion depth errors.
+* Improved performance of `TraversalVertexProgram` and related infrastructure.
+* Checked web socket state before closing connection in the .NET driver.
+* Deprecated `BulkLoaderVertexProgram` and related infrastructure.
+* Deprecated `BulkDumperVertexProgram` with the more aptly named `CloneVertexProgram`.
+* Added `createGratefulDead()` to `TinkerFactory` to help make it easier to try to instantiate that toy graph.
+* Added identifiers to edges in the Kitchen Sink toy graph.
+* Ordered the loading of plugins in the Gremlin Console by their position in the configuration file.
+* Refactored the Gremlin Server integration testing framework and streamlined that infrastructure.
+* Logged the seed used in initializing `Random` for tests.
+* Fixed bug in `GroovyTranslator` that didn't properly handle empty `Map` objects.
+* Added concrete configuration methods to `SparkGraphComputer` to make a more clear API for configuring it.
+* Fixed a bug in `TinkerGraphCountStrategy`, which didn't consider that certain map steps may not emit an element.
+* Fixed a bug in JavaScript GLV where DriverRemoteConnection close() method didn't returned a Promise instance.
+* Bumped to Jackson 2.9.6.
+* Sasl Plain Text Authentication added to Gremlin Javascript.
+* Ability to send scripts to server added to Gremlin Javascript.
+* Translator class added to Gremlin Javascript to translate bytecode to script clientside.
+
+==== Bugs
+
+* TINKERPOP-1898 Issue with bindings in strategies and lambdas
+* TINKERPOP-1933 gremlin-python maximum recursion depth exceeded on large responses
+* TINKERPOP-1958 TinkerGraphCountStrategy can return wrong counts
+* TINKERPOP-1961 Duplicate copies of images directory in docs
+* TINKERPOP-1962 GroovyTranslator doesn't handle empty maps
+* TINKERPOP-1963 Use of reducing step in choose()
+* TINKERPOP-1972 inject() tests are throwing exceptions in .NET GLV tests
+* TINKERPOP-1978 Check for Websocket connection state when retrieved from Connection Pool missing
+* TINKERPOP-1988 minor error in documentation
+* TINKERPOP-1999 [Java][gremlin-driver] Query to a remote server via the websocket client hangs indefinitely if the server becomes unavailable
+* TINKERPOP-2005 Intermittent NullPointerException in response handling
+* TINKERPOP-2009 Pick.any and Pick.none should be exposed in Gremlin-JavaScript
+* TINKERPOP-2030 KeepAlive task executed for every Connection.write call
+* TINKERPOP-2032 Update jython-standalone
+* TINKERPOP-2044 Cannot reconnect to Azure cosmos host that becomes available again
+
+==== Improvements
+
+* TINKERPOP-1113 GraphComputer subclasses should support native methods
+* TINKERPOP-1365 Log the seed used to initialize Random in tests
+* TINKERPOP-1595 Go through TraversalVertexProgram with a profile and optimize.
+* TINKERPOP-1778 Do not promote timedInterrupt option for Gremlin Server script processing
+* TINKERPOP-1780 Add authentication tests for gremlin-python
+* TINKERPOP-1836 .NET sample project
+* TINKERPOP-1841 Include Python GLV tests on TravisCI
+* TINKERPOP-1897 Provide Docker images of Gremlin Server and Console
+* TINKERPOP-1945 Add support for extended GraphSon types to Gremlin.net
+* TINKERPOP-1951 gremlin-server.bat doesn't support paths containing spaces
+* TINKERPOP-1959 Provide a way to submit scripts to the server in gremlin-javascript
+* TINKERPOP-1968 Refactor elements of Gremlin Server testing
+* TINKERPOP-1976 Include Computer tests for GLVs
+* TINKERPOP-1977 Gremlin-JavaScript: Support SASL authentication
+* TINKERPOP-1985 Update position on bulk loading
+* TINKERPOP-1989 Preserve order that plugins are applied in Gremlin Console
+* TINKERPOP-1995 DriverRemoteConnection close() method returns undefined
+* TINKERPOP-2011 Use NumberHelper on choose()
+* TINKERPOP-2012 Target .NET Standard 2.0 for Gremlin.Net
+* TINKERPOP-2015 Allow users to configure the WebSocket connections
+* TINKERPOP-2016 Upgrade Jackson FasterXML to 2.9.5 or later to fix security vulnerability
+* TINKERPOP-2017 Check for Column in by()
+* TINKERPOP-2022 Cluster SSL should trust default ca certs by default
+* TINKERPOP-2023 Gremlin Server should not create self-signed certs *(breaking)*
+* TINKERPOP-2024 Gremlin Server Application archetype should connect via withRemote
+* TINKERPOP-2025 Change to SHA-256/512 and drop SHA-1 for releases
+* TINKERPOP-2026 Gremlin.Net.Driver should check ClientWebSocket.State before closing
+* TINKERPOP-2034 Register synchronizedMap() with Gryo
+* TINKERPOP-2035 Gremlin-JavaScript: Pass custom headers to the websocket connection
+* TINKERPOP-2040 Improve flexibility of GroovyTranslator to handle custom types
+* TINKERPOP-2045 Remove non-indy groovy dependencies
+* TINKERPOP-2055 Provide support for special number cases like Infinity in GraphSON
+* TINKERPOP-2056 Use NumberHelper in Compare
+
+[[release-3-2-9]]
+=== TinkerPop 3.2.9 (Release Date: May 8, 2018)
+
+* Fixed bug where path history was not being preserved for keys in mutations.
+* Bumped to httpclient 4.5.5.
+* Bumped to Groovy 2.4.15 - fixes bug with `Lambda` construction.
+* Improved performance of GraphSON deserialization of `Bytecode`.
+* Improved performance of traversal construction.
+
+==== Bugs
+
+* TINKERPOP-1947 Path history isn't preserved for keys in mutations
+
+==== Improvements
+
+* TINKERPOP-1755 No docs for ReferenceElements
+* TINKERPOP-1912 Remove MD5 checksums
+* TINKERPOP-1934 Bump to latest version of httpclient
+* TINKERPOP-1936 Performance enhancement to Bytecode deserialization
+* TINKERPOP-1944 JavaScript GLV: DriverRemoteConnection is not exported in the root module
+* TINKERPOP-1950 Traversal construction performance enhancements
+* TINKERPOP-1953 Bump to Groovy 2.4.15
+
+[[release-3-2-8]]
+=== TinkerPop 3.2.8 (Release Date: April 2, 2018)
+
+* Added a `Lambda` class to Gremlin.Net that makes it possible to use Groovy and Python lambdas with Gremlin.Net.
+* Enums are now represented as classes in Gremlin.Net which allows to use them as arguments in more steps.
+* Bumped to Groovy 2.4.14.
+* Added `checkAdjacentVertices` option to `SubgraphStrategy`.
+* Modified `GremlinDslProcessor` so that it generated the `getAnonymousTraversalClass()` method to return the DSL version of `__`.
+* Added the "Kitchen Sink" test data set.
+* Fixed deserialization of `P.not()` for GraphSON.
+* Bumped to Jackson 2.9.4.
+* Improved performance of `JavaTranslator` by caching reflected methods required for traversal construction.
+* Ensure that `RemoteStrategy` is applied before all other `DecorationStrategy` instances.
+* Added `idleConnectionTimeout` and `keepAliveInterval` to Gremlin Server that enables a "ping" and auto-close for seemingly dead clients.
+* Fixed a bug where lambdas in `gremlin-python` would trigger a failure if steps using python-only symbols were present (such as `as_()`).
+* Fixed a bug in `NumberHelper` that led to wrong min/max results if numbers exceeded the Integer limits.
+* Delayed setting of the request identifier until `RequestMessage` construction by the builder.
+* `ReferenceElement` avoids `UnsupportedOperationException` handling in construction thus improving performance.
+* Improved error messaging for failed serialization and deserialization of request/response messages.
+* Fixed handling of `Direction.BOTH` in `Messenger` implementations to pass the message to the opposite side of the `StarGraph`.
+* Removed hardcoded expectation in metrics serialization test suite as different providers may have different outputs.
+* Added `IndexedTraverserSet` which indexes on the value of a `Traverser` thus improving performance when used.
+* Utilized `IndexedTraverserSet` in `TraversalVertexProgram` to avoid extra iteration when doing `Vertex` lookups.
+* Bumped to Netty 4.0.56.Final.
+* Fixed .NET GraphSON serialization of `P.Within()` and `P.without()` when passing a `Collection` as an argument.
+* Fixed a bug in Gremlin Console which prevented handling of `gremlin.sh` flags that had an "=" between the flag and its arguments.
+* Fixed bug where `SparkMessenger` was not applying the `edgeFunction` from `MessageScope`.
+* Fixed a bug in `ComputerAwareStep` that didn't handle `reset()` properly and thus occasionally produced some extra traversers.
+* Removed `TraversalPredicate` class in Gremlin.Net. It is now included in the `P` class instead.
+
+==== Bugs
+
+* TINKERPOP-1053 installed plugins are placed in a directory relative to where gremlin.sh is started
+* TINKERPOP-1509 Failing test case for tree serialization
+* TINKERPOP-1738 Proper functioning of GraphSONReader depends on order of elements in String representation
+* TINKERPOP-1758 RemoteStrategy should be before all other DecorationStrategies.
+* TINKERPOP-1855 Update Rexster links
+* TINKERPOP-1859 Complex instance of P not serializing to bytecode properly
+* TINKERPOP-1860 valueMap(True) result in error in gremlin-python
+* TINKERPOP-1862 TinkerGraph VertexProgram message passing doesn't work properly when using Direction.BOTH
+* TINKERPOP-1867 union() can produce extra traversers
+* TINKERPOP-1872 Apply edgeFunction in SparkMessenger
+* TINKERPOP-1873 min() and max() work only in the range of Integer values
+* TINKERPOP-1874 P does not appear to be serialized consistently in GraphSON
+* TINKERPOP-1879 Gremlin Console does not resepect equal sign for flag argument assignments
+* TINKERPOP-1880 Gremlin.NET Strong name signature could not be verified. (HRESULT: 0x80131045)
+* TINKERPOP-1883 gremlinpython future will never return
+* TINKERPOP-1890 getAnonymousTraversalClass() is not being generated for Java DSLs
+* TINKERPOP-1891 Serialization of P.not() for gremlin-javascript
+* TINKERPOP-1892 GLV test failures for .NET
+* TINKERPOP-1894 GraphSONMessageSerializerV2d0 fails to deserialize valid P.not()
+* TINKERPOP-1896 gremlin-python lambdas error
+* TINKERPOP-1907 Fix failing GLV test for withSack() in .NET
+* TINKERPOP-1917 gx:BigDecimal serialization broken in Gremlin.Net on systems with ',' as decimal separator
+* TINKERPOP-1918 Scenarios fail because of wrong numerical types
+* TINKERPOP-1919 Gherkin runner doesn't work with P.And() and P.Or() in Gremlin.Net
+* TINKERPOP-1920 Tests fail because P.Within() arguments are wrapped in an array in Gremlin.Net
+* TINKERPOP-1922 Gherkin features fail that contain P.not() in Gremlin.Net
+
+==== Improvements
+
+* TINKERPOP-1357 Centrality Recipes should mention pageRank and OLAP.
+* TINKERPOP-1489 Provide a Javascript Gremlin Language Variant
+* TINKERPOP-1586 SubgraphStrategy in OLAP
+* TINKERPOP-1726 Support WebSockets ping/pong keep-alive in Gremlin server
+* TINKERPOP-1842 iterate() missing in terminal steps documentation
+* TINKERPOP-1850 Range step has undocumented special values
+* TINKERPOP-1854 Support lambdas in Gremlin.Net
+* TINKERPOP-1857 GLV test suite consistency and completeness
+* TINKERPOP-1863 Delaying the setting of requestId till the RequestMessage instantiation time
+* TINKERPOP-1868 Support inject source step in Gremlin.Net
+* TINKERPOP-1870 n^2 synchronious operation in OLAP WorkerExecutor.execute() method
+* TINKERPOP-1877 Add new graph data for specialized testing scenarios
+* TINKERPOP-1884 Bump to Netty 4.0.56.Final
+* TINKERPOP-1885 Various Gremlin.Net documentation updates
+* TINKERPOP-1901 Enable usage of enums in more steps in Gremlin.Net
+* TINKERPOP-1908 Bump to Groovy 2.4.14
+* TINKERPOP-1911 Refactor JavaTranslator to cache all reflective calls
+
+[[release-3-2-7]]
+=== TinkerPop 3.2.7 (Release Date: December 17, 2017)
+
+* Added core GraphSON classes for Gremlin-Python: `UUID`, `Date`, and `Timestamp`.
+* Documented the recommended method for constructing DSLs with Gremlin.Net.
+* Provided a method to configure detachment options with `EventStrategy`.
+* Fixed a race condition in `TinkerIndex`.
+* Fixed bug in handling of the long forms of `-e` and `-i` (`--execute` and `--interactive` respectively) for Gremlin Console.
+* Fixed bug in `LambdaRestrictionStrategy` where traversals using `Lambda` scripts weren't causing the strategy to trigger.
+* Improved error messaging for bytecode deserialization errors in Gremlin Server.
+* Fixed an `ArrayOutOfBoundsException` in `hasId()` for the rare situation when the provided collection is empty.
+* Bumped to Netty 4.0.53
+* `TraversalVertexProgram` `profile()` now accounts for worker iteration in `GraphComputer` OLAP.
+* Returned the `Builder` instance from the `DetachedEdge.Builder` methods of `setOutE` and `setOutV`.
+* Added test framework for GLVs.
+* Fixed bug in `TraversalHelper.replaceStep()` where the step being replaced needed to be removed prior to the new one being added.
+* Added alias support in the .NET `DriverRemoteConnection`.
+* Added a test for self-edges and fixed `Neo4jVertex` to provided repeated self-edges on `BOTH`.
+* Better respected permissions on the `plugins.txt` file and prevented writing if marked as read-only.
+* Added getters for the lambdas held by `LambdaCollectingBarrierStep`, `LambdaFlatMapStep` and `LambdaSideEffectStep`.
+* Fixed an old hack in `GroovyTranslator` and `PythonTranslator` where `Elements` were being mapped to their id only.
+* Fixed an "attachement"-bug in `InjectStep` with a solution generalized to `StartStep`.
+* Truncate the script in error logs and error return messages for "Method code too large" errors in Gremlin Server.
+* Fixed a bug in `LambdaRestrictionStrategy` where it was too eager to consider a step as being a lambda step.
+* `ReferenceVertex` was missing its `label()` string. `ReferenceElement` now supports all label handling.
+* Fixed a bug where bytecode containing lambdas would randomly select a traversal source from bindings.
+* Deprecated `GremlinScriptEngine.eval()` methods and replaced them with new overloads that include the specific `TraversalSource` to bind to.
+* Added `GraphHelper.cloneElements(Graph original, Graph clone)` to the `gremlin-test` module to quickly clone a graph.
+* Added `GremlinDsl.AnonymousMethod` annotation to help provide explicit types for anonymous methods when the types are not easily inferred.
+* Bumped to GMavenPlus 1.6.
+* Added better error message for illegal use of `repeat()`-step.
+* Fixed a bug in `RangeByIsCountStrategy` that led to unexpected behaviors when predicates were used with floating point numbers.
+* Bumped to Jackson 2.8.10.
+* Deprecated `MutationListener.vertexPropertyChanged()` method that did not use `VertexProperty` and added a new method that does.
+* Added an `EmbeddedRemoteConnection` so that it's possible to mimic a remote connection within the same JVM.
+* Supported interruption for remote traversals.
+* Allow the `:remote` command to accept a `Cluster` object defined in the console itself.
+* The Console's `plugin.txt` file is only updated if there were manually uninstalled plugins.
+* Fixed a bug in `MatchStep` where mid-traversal `where()` variables were not being considered in start-scope.
+* Generalized `MatchStep` to locally compute all clauses with barriers (not just reducing barriers).
+* Ensured that plugins were applied in the order they were configured.
+* Fixed a bug in `Neo4jGremlinPlugin` that prevented it from loading properly in the `GremlinPythonScriptEngine`.
+* Fixed a bug in `ComputerVerificationStrategy` where child traversals were being analyzed prior to compilation.
+* Fixed a bug that prevented Gremlin from ordering lists and streams made of mixed number types.
+* Fixed a bug where `keepLabels` were being corrupted because a defensive copy was not being made when they were being set by `PathRetractionStrategy`.
+* Cancel script evaluation timeout in `GremlinExecutor` when script evaluation finished.
+* Added a recipe for OLAP traversals with Spark on YARN.
+* Added `spark-yarn` dependencies to the manifest of `spark-gremlin`.
+
+==== Bugs
+
+* TINKERPOP-1650 PathRetractionStrategy makes Match steps unsolvable
+* TINKERPOP-1731 Docker build does not appear to work for gremlin-dotnet
+* TINKERPOP-1745 Gremlin .NET: Use DateTimeOffset instead of DateTime to represent g:Date
+* TINKERPOP-1753 OrderStep not able to order by non-integer numbers
+* TINKERPOP-1760 OLAP compilation failing around ConnectiveStrategy
+* TINKERPOP-1761 GremlinExecutor: Timeout future not cancelled on successful script evaluation
+* TINKERPOP-1762 Make MatchStep analyze mid-clause variables for executing ordering purposes.
+* TINKERPOP-1764 Generalize MatchStep to localize all barriers, not just reducing barriers.
+* TINKERPOP-1766 Gremlin.Net: Closed connections should not be re-used
+* TINKERPOP-1782 RangeByIsCountStrategy doesn't handle floating point numbers properly
+* TINKERPOP-1789 Reference elements should be represented by id and label *(breaking)*
+* TINKERPOP-1790 GraphSON 3.0 doc updates
+* TINKERPOP-1791 GremlinDsl custom step with generic end type produces invalid code in __.java
+* TINKERPOP-1792 Random TraversalSource Selection in GremlinScriptEngine
+* TINKERPOP-1795 Getting Lambda comparator message for .profile() step
+* TINKERPOP-1796 Driver connection pool SSL properties missing
+* TINKERPOP-1797 LambdaRestrictionStrategy and LambdaMapStep in `by()`-modulation.
+* TINKERPOP-1798 MutationListener.vertexPropertyChanged oldValue should be a VertexProperty
+* TINKERPOP-1801 OLAP profile() step return incorrect timing
+* TINKERPOP-1802 hasId() fails for empty collections
+* TINKERPOP-1803 inject() doesn't re-attach with remote traversals
+* TINKERPOP-1819 documentation query and description mismatch
+* TINKERPOP-1821 Consistent behavior of self-referencing edges
+* TINKERPOP-1825 Gremlin .NET: Constant() step has incorrect parameter defined
+* TINKERPOP-1830 Race condition in Tinkergraph index creation
+* TINKERPOP-1832 TraversalHelper.replaceStep sets previousStep to the wrong step
+* TINKERPOP-1846 LambdaRestrictionStrategy not triggering for Lambda scripts
+* TINKERPOP-1848 Fix g:Date assertion in python tests
+* TINKERPOP-1851 Gremlin long options for -e and -i are not working properly
+
+==== Improvements
+
+* TINKERPOP-1661 Docker-built documentation does not always point locally
+* TINKERPOP-1725 DotNet GLV: Make traversal generation deterministic
+* TINKERPOP-1734 DSL for Gremlin .NET
+* TINKERPOP-1746 Better error message on wrong ordering of emit()/until()/has()
+* TINKERPOP-1752 Gremlin.Net: Generate completely type-safe methods
+* TINKERPOP-1756 Provide a way to easily mock a RemoteConnection for tests
+* TINKERPOP-1759 Improve hashcode and equals for Traverser implementations
+* TINKERPOP-1768 Bump to Jackson 2.8.10
+* TINKERPOP-1770 Remote traversal timeout
+* TINKERPOP-1771 gremlin.bat doesn't support paths containing spaces
+* TINKERPOP-1779 Bump to GMavenPlus 1.6
+* TINKERPOP-1784 Gremlin Language Test Suite
+* TINKERPOP-1785 Gremlin.Net should be strong-name signed
+* TINKERPOP-1786 Recipe and missing manifest items for Spark on Yarn
+* TINKERPOP-1787 Allow :remote command to accept a user defined Cluster instance
+* TINKERPOP-1806 Consistently use Gremlin.Net instead of Gremlin-DotNet
+* TINKERPOP-1807 Gremlin-Python doesn't support GraphSON types g:Date, g:Timestamp and g:UUID
+* TINKERPOP-1808 Add ability to get the consumer in LambdaSideEffectStep
+* TINKERPOP-1811 Improve error reporting for serialization errors between gremlin-python and gremlin-server
+* TINKERPOP-1812 ProfileTest assumes that graph implementations will not add their own steps
+* TINKERPOP-1813 Subgraph step requires the graph API
+* TINKERPOP-1814 Some process tests require the graph API
+* TINKERPOP-1820 Include .NET GLV tests on TravisCI
+* TINKERPOP-1824 Update netty version to 4.0.52
+* TINKERPOP-1827 Gremlin .NET: Test Suite Runner
+* TINKERPOP-1829 Improve flexibility of detachment for EventStrategy
+* TINKERPOP-1833 DetachedEdge.Builder#setInV and setOutV doesn't return the builder
+* TINKERPOP-1835 Bump Netty 4.0.53
+* TINKERPOP-1837 Gremlin .NET: Provide type coercion between IDictionary<K, V> instances
+
+[[release-3-2-6]]
+=== TinkerPop 3.2.6 (Release Date: August 21, 2017)
+
+This release also includes changes from <<./changelog-3.1.x.asciidoc#release-3-1-8, 3.1.8>>.
+
+* Bumped to Netty 4.0.50
+* Registered `HashMap$TreeNode` to Gryo.
+* Fixed a lambda-leak in `SackValueStep` where `BiFunction` must be tested for true lambda status.
+* Fixed a bug in `RangeByIsCountStrategy` that broke any `ConnectiveStep` that included a child traversal with an optimizable pattern.
+* Allowed access to `InjectStep.injections` for `TraversalStrategy` analysis.
+* Exceptions that occur during result iteration in Gremlin Server will now return `SCRIPT_EVALUATION_EXCEPTION` rather than `SERVER_ERROR`.
+* `AddEdgeStep` attaches detached vertices prior to edge creation.
+* Added graph element GraphSON serializers in Gremlin-Python.
+* Initialization scripts for Gremlin Server will not timeout.
+* Added Gremlin.Net.
+* `ProfileTest` is now less stringent about assertions which will reduce burdens on providers.
+* `GremlinExecutor` begins timeout of script evaluation at the time the script was submitted and not from the time it began evaluation.
+* Added Gremlin.Net.
+* `ReferenceFactory` and `DetachedFactory` now detach elements in collections accordingly.
+* Deprecated `GryoLiteMessageSerializerV1d0` in favor of `HaltedTraverserStrategy`.
+* Deprecated the `useMapperFromGraph` configuration option for Gremlin Server serializers.
+* `JavaTranslator` is now smart about handling `BulkSet` and `Tree`.
+* Added annotations to the traversal metrics pretty print.
+* `EdgeOtherVertexStep` is no longer final and can be extended by providers.
+* `EdgeVertexStep` is no longer final and can be extended by providers.
+* Deprecated `Transaction.submit(Function)`.
+* Fixed `HADOOP_GREMLIN_LIBS` parsing for Windows.
+* Improved GraphSON serialization performance around `VertexProperty`.
+* Changed some tests in `EventStrategyProcessTest` which were enforcing some unintended semantics around transaction state.
+* Added WsAndHttpChannelizer and SaslAndHttpBasicAuthenticationHandler to be allow for servicing Http and Websocket requests to the same server
+* Added deep copy of `Bytecode` to `DefaultTraversal.clone()`.
+
+==== Bugs
+
+* TINKERPOP-1385 Refactor Profiling test cases
+* TINKERPOP-1679 Detached side-effects aren't attached when remoted
+* TINKERPOP-1683 AbstractHadoopGraphComputer on Windows
+* TINKERPOP-1691 Some EventStrategyProcessTest assume element state is synced in memory
+* TINKERPOP-1704 XXXTranslators are not being respective of BulkSet and Tree.
+* TINKERPOP-1727 Bytecode object shallow copied when traversals are cloned
+* TINKERPOP-1742 RangeByIsCountStrategy fails for ConnectiveSteps
+* TINKERPOP-1743 LambdaRestrictionStrategy does not catch lambdas passed to sack()
+* TINKERPOP-1744 Gremlin .NET: Exception from sync execution gets wrapped in AggregateException
+
+==== Improvements
+
+* TINKERPOP-741 Remove Options For Transaction Retry
+* TINKERPOP-915 Gremlin Server supports REST and Websockets simultanteously
+* TINKERPOP-920 Test case needed for ensuring same cardinality for key.
+* TINKERPOP-1552 C# Gremlin Language Variant
+* TINKERPOP-1669 EdgeVertexStep should be designed for extension
+* TINKERPOP-1676 Improve GraphSON 2.0 Performance *(breaking)*
+* TINKERPOP-1688 Include TraversalMetrics annotation in pretty print
+* TINKERPOP-1694 Deprecate useMapperFromGraph
+* TINKERPOP-1701 HaltedTraverserStrategy should recurse into collections for detachment.
+* TINKERPOP-1703 Make EdgeOtherVertexStep non-final
+* TINKERPOP-1708 Add a "Note on Scopes" document
+* TINKERPOP-1709 Add a list of all the steps that support by()/from()/to()/as()/option()
+* TINKERPOP-1710 Add a note on tree() by-modulation and uniqueness of tree branches.
+* TINKERPOP-1714 Gremlin Server scriptEvaluationTimeout should take into account request arrival time
+* TINKERPOP-1718 Deprecate GryoLiteMessageSerializerV1d0
+* TINKERPOP-1748 Callout comments break code snippets
+* TINKERPOP-1749 Bump to Netty 4.0.50
+
+[[release-3-2-5]]
+=== TinkerPop 3.2.5 (Release Date: June 12, 2017)
+
+This release also includes changes from <<./changelog-3.1.x.asciidoc#release-3-1-7, 3.1.7>>.
+
+* Fixed folding of multiple `hasId()` steps into `GraphStep`.
+* Added string performance options to `StarGraph`.
+* Fixed a bug in `until(predicate)` where it was actually calling `emit(predicate)`.
+* Fixed inconsistency in GraphSON serialization of `Path` where properties of graph elements were being included when serialized.
+* Improved performance and memory usage of GraphSON when serializing `TinkerGraph` and graph elements.
+* Removed use of `stream()` in `DetachedEdge` and `DetachedVertex`.
+* Deprecated a constructor in `DetachedEdge` that made use of `Pair` in favor of a new one that just uses the objects that were in the `Pair`.
+* Improved error messaging on the `g.addV(Object...)` when passing an invalid arguments.
+* Reduced memory usage for TinkerGraph deserialization in GraphSON by streaming vertices and edges.
+* Added the `gremlin-archetype-dsl` to demonstrate how to structure a Maven project for a DSL.
+* Developed and documented patterns for Domain Specific Language implementations.
+* Removed the Groovy dependency from `gremlin-python` and used Groovy Templates and the `gmavenplus-plugin` to generate the python GLV classes.
+* Now using Groovy `[...]` map notation in `GroovyTranslator` instead of `new LinkedHashMap(){{ }}`.
+* Maintained type information on `Traversal.promise()`.
+* Propagated exception to `Future` instead of calling thread in `RemoteConnection`.
+* Fixed a bug in `RepeatUnrollStrategy` where `LoopsStep` and `LambdaHolder` should invalidate the strategy's application.
+* Deprecated `authentication.className` setting in favor of using `authentication.authenticator`.
+* Added `authentication.authenticationHandler` setting.
+* Added abstraction to authentication to allow users to plug in their own `AbstractAuthenticationHandler` implementations.
+* Fixed a `NullPointerException` bug in `B_LP_O_S_SE_SL_Traverser`.
+* `PathRetractionStrategy` now uses the marker-model to reduce recursive lookups of invalidating steps.
+* `ProfileStrategy` now uses the marker-model to reduce recursive lookups of `ProfileSideEffectStep`.
+* `Mutating` steps now implement `Scoping` interface.
+* Fixed a step id compilation bug in `AddVertexStartStep`, `AddVertexStep`, `AddEdgeStep`, and `AddPropertyStep`.
+* Added more details to Gremlin Server client side messages - exception hierarchy and stack trace.
+* Deprecated "Exception-Class" in the Gremlin Server HTTP protocol in favor of the new "exceptions" field.
+* De-registered metrics on Gremlin Server shutdown.
+* Added "help" command option on `:remote config` for plugins that support that feature in the Gremlin Console.
+* Allowed for multiple scripts and related arguments to be passed to `gremlin.sh` via `-i` and `-e`.
+* `LABELED_PATH` requirement is now set if any step in the traversal is labeled.
+* Updated `PathRetractionStrategy` to not run if the provided traversal contains a `VertexProgramStep` that has a `LABELED_PATH` requirement.
+* Added various metrics to the `GremlinGroovyScriptEngine` around script compilation and exposed them in Gremlin Server.
+* Moved the `caffeine` dependency down to `gremlin-groovy` and out of `gremlin-server`.
+* Improved script compilation in `GremlinGroovyScriptEngine` to use better caching, log long compile times and prevent failed compilations from recompiling on future requests.
+* Synchronized script compilation.
+* Logged Script compilation times.
+* Prevented failed scripts from recompiling.
+* Logged warnings for scripts that take "too long" to compile.
+* Improved memory usage of the `GremlinGroovyScriptEngine`.
+* Added `cyclicPath().from().to().by()` support to `GraphTraversal`.
+* Added `simplePath().from().to().by()` support to `GraphTraversal`.
+* Added `path().from().to()` support to `GraphTraversal` so sub-paths can be isolated from the current path.
+* Added `FromToModulating` interface for use with `to()`- and `from()`-based step modulators.
+* Added `Path.subPath()` which supports isolating a sub-path from `Path` via to/from-labels.
+* Fixed `NullPointerException` in `GraphMLReader` that occurred when an `<edge>` didn't have an ID field and the base graph supported ID assignment.
+* Added `ScopingStrategy` which will computer and provide all `Scoping` steps with the path labels of the global `Traversal`.
+* Split `ComputerVerificationStrategy` into two strategies: `ComputerVerificationStrategy` and `ComputerFinalizationStrategy`.
+* Removed `HasTest.g_V_hasId_compilationEquality` from process test suite as it makes too many assumptions about provider compilation.
+* Deprecated `CustomizerProvider` infrastructure.
+* Deprecated `PluginAcceptor` infrastructure.
+* Improved consistency of the application of bindings to `GremlinScriptEngine` implementations in the `BindingsGremlinPlugin`.
+* Fixed a bug in OLAP `ComputerAwareStep` where end-step labels were not being appended to the traverser correctly.
+* Refactor `SparkContext` handler to support external kill and stop operations.
+* Fixed an optimization bug in `LazyBarrierStrategy` around appending barriers to the end of a `Traversal`.
+* Fixed an optimization bug in `PathRetractionStrategy` around appending barriers to the end of a `Traversal`.
+* `TraverserIterator` in GremlinServer is smart to try and bulk traversers prior to network I/O.
+* Improved error handling of compilation failures for very large or highly parameterized script sent to Gremlin Server.
+* Fixed a bug in `RangeByIsCountStrategy` that changed the meaning of inner traversals.
+* Improved Gremlin-Python Driver implementation by adding a threaded client with basic connection pooling and support for pluggable websocket clients.
+* Changed `GraphManager` from a final class implementation to an interface.
+* Updated `GraphManager` interface to include methods for opening/instantiating a graph and closing a graph.
+* Implemented `DefaultGraphManager` to include previous `GraphManager` functionality and adhere to updated interface.
+* Deprecated `GraphManager.getGraphs()` and added `GraphManager.getGraphNames()`.
+* Deprecated `GraphManager.getTraversalSources()` and added `GraphManager.getTraversalSourceNames()`.
+* Fixed a bug so now users can supply a YAML with an empty `staticVariableTypes` to be used by the `FileSandboxExtension`
+
+==== Bugs
+
+* TINKERPOP-1258 HasTest.g_V_hasId_compilationEquality makes GraphStep assumptions
+* TINKERPOP-1528 CountByIsRangeStrategy fails for a particular query
+* TINKERPOP-1626 choose() is buggy in OLAP
+* TINKERPOP-1638 count() is optimized away in where()
+* TINKERPOP-1640 ComputerVerificationStrategy gives false errors
+* TINKERPOP-1652 Disable PathRetractionStrategy strategy if VertexProgramStep has LABELLED_PATH requirement
+* TINKERPOP-1660 Documentation links should not link to TINKERPOP-xxxx branches
+* TINKERPOP-1666 NPE in FileSandboxExtension if staticVariableTypes is empty in supplied YAML file
+* TINKERPOP-1668 RepeatUnrollStrategy should not execute if there is a LoopStep used.
+* TINKERPOP-1670 End type lost when using promise()
+* TINKERPOP-1673 GroovyTranslator produces Gremlin that can't execute on :remote
+* TINKERPOP-1675 RemoteStep#processNextStart() throws CompletionException instead of underlying exception
+* TINKERPOP-1681 Multiple hasId's are or'd into GraphStep
+
+==== Improvements
+
+* TINKERPOP-761 Some basic mathematical functions / steps
+* TINKERPOP-786 Patterns for DSL Development
+* TINKERPOP-1044 ResponseMessage should contain server-side exception name.
+* TINKERPOP-1095 Create a custom ScriptContext
+* TINKERPOP-1266 Make memory available to benchmarks configurable
+* TINKERPOP-1303 add help for :remote config for Gephi Plugin
+* TINKERPOP-1340 docs do not state at what version an API was introduced (or deprecated)
+* TINKERPOP-1387 from and to modulators for path steps
+* TINKERPOP-1438 Consider GraphManager as an interface*(breaking)*
+* TINKERPOP-1453 Allow Gremlin-Python to handle asynchronous failure
+* TINKERPOP-1577 Provide support for Python3 or Python2 in the Docker builds.
+* TINKERPOP-1599 implement real gremlin-python driver
+* TINKERPOP-1614 Improve documentation for Graph.V() and Graph.E() on main docs page
+* TINKERPOP-1618 Remove groovy dependency from gremlin-python
+* TINKERPOP-1627 LazyBarrierStrategy should not append an end barrier.
+* TINKERPOP-1631 Fix visibility issues with the BindingsGremlinPlugin
+* TINKERPOP-1634 Deprecate old methods of GremlinGroovyScriptEngine customization
+* TINKERPOP-1642 Improve performance of mutating traversals
+* TINKERPOP-1644 Improve script compilation process and include metrics
+* TINKERPOP-1653 Allow multiple scripts with arguments to be passed to the Console
+* TINKERPOP-1657 Provide abstraction to easily allow different HttpAuth schemes
+* TINKERPOP-1663 Validate a maximum for the number of parameters passed to Gremlin Server
+* TINKERPOP-1665 Remove unittest from Gremlin-Python tests
+* TINKERPOP-1671 Default method for RemoteConnection.submitAsync throws exception from submit on calling thread instead of failing the future
+* TINKERPOP-1677 Bump Groovy to 2.4.11
+* TINKERPOP-1680 Add string performance options to StarGraph
+
+[[release-3-2-4]]
+=== TinkerPop 3.2.4 (Release Date: February 8, 2017)
+
+This release also includes changes from <<./changelog-3.1.x.asciidoc#release-3-1-6, 3.1.6>>.
+
+* Fixed a bug where `PathProcessor.keepLabels` were not being pushed down into child traversals by `PathRetractionStrategy`.
+* Added default `MessagePassingReductionStrategy` for `GraphComputer` that can reduce the number of message passing iterations.
+* Fixed a bug associated with user-provided maps and `GroupSideEffectStep`.
+* `GroupBiOperator` no longer maintains a detached traversal and thus, no more side-effect related OLAP inconsistencies.
+* Added `ProjectedTraverser` which wraps a traverser with a `List<Object>` of projected data.
+* Fixed an optimization bug in `CollectingBarrierSteps` where the barrier was being consumed on each `addBarrier()`.
+* `OrderGlobalStep` and `SampleGlobalStep` use `ProjectedTraverser` and now can work up to the local star graph in OLAP.
+* SASL negotiation supports both a byte array and Base64 encoded bytes as a string for authentication to Gremlin Server.
+* Deprecated all test suites in `gremlin-groovy-test` - Graph Providers no longer need to implement these.
+* Deprecated `TinkerIoRegistry` replacing it with the more consistently named `TinkerIoRegistryV1d0`.
+* Made error messaging more consistent during result iteration timeouts in Gremlin Server.
+* Fixed a memory leak in the classloader for the `GremlinGroovyScriptEngine` where classes in the loader were not releasing from memory as a strong reference was always maintained.
+* `PathRetractionStrategy` does not add a `NoOpBarrierStep` to the end of local children as its wasted computation in 99% of traversals.
+* Fixed a bug in `AddVertexStartStep` where if a side-effect was being used in the parametrization, an NPE occurred.
+* Fixed a bug in `LazyBarrierStrategy` where `profile()` was deactivating it accidentally.
+* Fixed a bug in `RepeatUnrollStrategy` where stateful `DedupGlobalStep` was cloned and thus, maintained two deduplication sets.
+* Added documentation around "terminal steps" in Gremlin: `hasNext()`, `next()`, `toList()`, etc.
+* Added specific GraphSON serializers for `RequestMessage` and `ResponseMessage` in GraphSON 2.0.
+* Added `CloseableIterator` to allow `Graph` providers who open expensive resources a way to let users release them.
+* Fixed minor bug in `gremlin-driver` where closing a session-based `Client` without initializing it could generate an error.
+* Relieved synchronization pressure in various areas of `TinkerGraphComputer`.
+* Fixed an optimization bug in OLAP-based `DedupGlobalStep` where deduping occurred twice.
+* `MemoryComputeKey` now implements `Cloneable` which is useful for `BiOperator` reducers that maintain thread-unsafe state.
+* `TinkerGraphComputer` now supports distributed `Memory` with lock-free partition aggregation.
+* `TinkerGraph` Gryo and GraphSON deserialization is now configured to use multi-properties.
+* Changed behavior of `ElementHelper.areEqual(Property, Property)` to not throw exceptions with `null` arguments.
+* Added `GryoVersion` for future flexibility when introducing a new verison of Gryo and moved serializer registrations to it.
+* Fixed Gryo serialization of `ConnectiveP` instances.
+* Lessened the severity of Gremlin Server logging when it encounters two or more serializers addressing the same mime type.
+* Bumped to Netty 4.0.42.final.
+* Added `ByteBuffer`, `InetAddress`, `Timestamp` to the list of Gryo supported classes.
+* Fixed Gryo serialization of `Class`.
+* Fixed GraphSON serialization of enums like `T`, `P`, etc. where values were overriding each other in the GraphSON type registry.
+* Fixed a bug in Gremlin-Python around `__.__()` and `__.start()`.
+* Fixed a bug around long serialization in Gremlin-Python when using Python3.
+* Deprecated `TraversalSource.withBindings()` as it is no longer needed in Gremlin-Java and never was needed for other variants.
+* Fixed a bug in Gremlin-Java `Bytecode` where anonymous traversals were not aware of parent bindings.
+* Fixed a bug in Gremlin-Java GraphSON deserialization around `P.within()` and `P.without()`.
+* Converted Spark process suite tests to "integration" tests.
+* Fixed a bug in `InlineFilterStrategy` having to do with folding `HasContainers` into `VertexStep`.
+* Deprecated `HasContainer.makeHasContainers()` which was used to dissect `AndP` and shouldn't be used at the TinkerPop-level.
+* `GraphTraversal.has()` now will try and fold-left `HasContainer` if end step is a `HasContainerHolder`.
+* Created explicit `P`-predicate methods for `GraphTraversal.hasXXX()`.
+* Fixed a bug in `FilterRankStrategy` around `where().by()` ordering.
+* Added another optimization in `RangeByIsCountStrategy`, that removes `count().is()` altogether if it's not needed.
+* Fixed a OLAP `MatchStep.clone()`-bug that occurs when the `match()` is in a local child.
+* Added another optimization in `RangeByIsCountStrategy`, that removes `count().is()` altogether if it's not needed.
+* Fixed a bug in `RangeByIsCountStrategy` where labeled parents shouldn't have the strategy applied to their children.
+* Fixed a bug in `PathRetractionStrategy` where `MatchEndStep` labels were being dropped when they shouldn't be.
+* Added `TinkerGraphCountStrategy` which translates `g.V().map*.count()` patterns into direct `Map.size()` calls in `TinkerGraph`.
+* Added `Path.head()` and `Path.isEmpty()` with default method implementations.
+* Fixed a `NoSuchElementException` bug with `GroupXXXStep` where if the reduced `TraverserSet` is empty, don't add the key/value.
+* Fixed a `NullPointerException` bug with profiling `GroupSideEffectStep` in OLTP.
+* Improved ability to release resources in `GraphProvider` instances in the test suite.
+* Factored `GremlinPlugin` functionality out of gremlin-groovy and into gremlin-core - related classes were deprecated.
+* Added a `force` option for killing sessions without waiting for transaction close or timeout of a currently running job or multiple jobs.
+* Deprecated `Session.kill()` and `Session.manualKill()`.
+* Added `Traversal.promise()` method to allow for asynchronous traversal processing on "remote" traversals.
+* Deprecated `RemoteConnection.submit(Bytecode)` in favor of `submitAsync(Bytecode)`.
+* Added `choose(predicate,traversal)` and `choose(traversal,traversal)` to effect if/then-semantics (no else). Equivalent to `choose(x,y,identity())`.
+* Removed `ImmutablePath.TailPath` as it is no longer required with new recursion model.
+* Removed call stack recursion in `ImmutablePath`.
+* Gremlin-Python serializes `Bytecode` as an object (instead of a JSON string) when submit over the `RemoteConnection`.
+* Fixed the handling of the `DriverRemoteConnection` pass-through configurations to the driver.
+* `IncidentToAdjacentStrategy` now uses a hidden label marker model to avoid repeated recursion for invalidating steps.
+* `PathProcessorStrategy` can inline certain `where(traversal)`-steps in order to increase the likelihood of star-local children.
+* `SparkGraphComputer` no longer starts a worker iteration if the worker's partition is empty.
+* Added `ProjectStep.getProjectKeys()` for strategies that rely on such information.
+* Added `VertexFeatures.supportsDuplicateMultiProperties()` for graphs that only support unique values in multi-properties.
+* Deprecated the "performance" tests in `OptIn`.
+* Deprecated `getInstance()` methods in favor of `instance()` for better consistency with the rest of the API.
+* Block calls to "remote" traversal side-effects until the traversal read is complete which signifies an end to iteration.
+* Added `Pick.none` and `Pick.any` to the serializers and importers.
+* Added a class loader to `TraversalStrategies.GlobalCache` which guarantees strategies are registered prior to `GlobalCache.getStrategies()`.
+* Fixed a severe bug where `GraphComputer` strategies are not being loaded until the second use of the traversal source.
+* The root traversal now throws regular `NoSuchElementException` instead of `FastNoSuchElementException`. (*breaking*)
+* Added a short sleep to prevent traversal from finishing before it can be interrupted during `TraversalInterruptionComputerTest`.
+* Added support for SSL client authentication
+
+==== Bugs
+
+* TINKERPOP-1380 dedup() doesn't dedup in rare cases
+* TINKERPOP-1384 Description of filter function in traversal documentation
+* TINKERPOP-1428 profile() throws NPE for union(group, group)
+* TINKERPOP-1521 Mutating steps don't recognize side-effects
+* TINKERPOP-1525 Plug VertexProgram iteration leak on empty Spark RDD partitions
+* TINKERPOP-1534 Gremlin Server instances leaking in tests
+* TINKERPOP-1537 Python tests should not use hard-coded number of workers
+* TINKERPOP-1547 Two bugs found associated with MatchStep: Path retraction and range count.
+* TINKERPOP-1548 Traversals can complete before interrupted in TraversalInterruptionComputerTest
+* TINKERPOP-1560 Cache in GroovyClassLoader may continue to grow
+* TINKERPOP-1561 gremiln-python GraphSONWriter doesn't properly serialize long in Python 3.5
+* TINKERPOP-1567 GraphSON deserialization fails with within('a')
+* TINKERPOP-1573 Bindings don't work in coalesce
+* TINKERPOP-1576 gremlin-python calls non-existent methods
+* TINKERPOP-1581 Gremlin-Python driver connection is not thread safe.
+* TINKERPOP-1583 PathRetractionStrategy retracts keys that are actually needed
+* TINKERPOP-1585 OLAP dedup over non elements
+* TINKERPOP-1587 Gremlin Server Subgraph Cardinality Not Respected
+* TINKERPOP-1594 LazyBarrierStrategy does not activate with ProfileStep
+* TINKERPOP-1605 gremlin-console 3.2.3 -e can no longer take paths relative to current working directory
+
+==== Improvements
+
+* TINKERPOP-887 FastNoSuchElementException hides stack trace in client code
+* TINKERPOP-919 Features needs to specify whether 2 vertex properties with same key/value is allowed.
+* TINKERPOP-932 Add ability to cancel script execution associated with a Gremlin Server Session
+* TINKERPOP-1248 OrderGlobalStep should use local star graph to compute sorts, prior to reduction.
+* TINKERPOP-1261 Side-effect group().by() can't handle user-defined maps
+* TINKERPOP-1292 TinkerGraphComputer VertexProgramInterceptors
+* TINKERPOP-1372 ImmutablePath should not use Java recursion (call stacks are wack)
+* TINKERPOP-1433 Add steps to dev docs to help committers get their keys in order
+* TINKERPOP-1434 Block calls to traversal side-effects until read is complete
+* TINKERPOP-1471 IncidentToAdjacentStrategy use hidden marker to avoid repeated recursion.
+* TINKERPOP-1473 Given PathRetractionStrategy, PathProcessorStrategy can be extended to support partial where() inlining.
+* TINKERPOP-1482 has(x).has(y) chains should be has(x.and(y))
+* TINKERPOP-1490 Provider a Future based Traversal.async(Function<Traversal,V>) terminal step
+* TINKERPOP-1502 Chained has()-steps should simply left-append HasContainers in Gremlin-Java.
+* TINKERPOP-1507 Pick.any and Pick.none are not in GraphSON or Gremlin-Python
+* TINKERPOP-1508 Add choose(predicate,trueTraversal)
+* TINKERPOP-1527 Do not override registered strategies in TraversalStrategies.GlobalCache
+* TINKERPOP-1530 Consistent use of instance()
+* TINKERPOP-1539 Create a ComplexTraversalTest with crazy nested gnarly traversals.
+* TINKERPOP-1542 Add Path.isEmpty() with a default implementation.
+* TINKERPOP-1562 Migrate ScriptEngine-related code to gremlin-core
+* TINKERPOP-1570 Bump to Netty 4.0.42
+* TINKERPOP-1582 TraversalOpProcessor does not support custom serializers
+* TINKERPOP-1584 Add gryo serializers to support types covered in GraphSON
+* TINKERPOP-1588 Added Terminal Steps section to the docs
+* TINKERPOP-1589 Re-Introduce CloseableIterator
+* TINKERPOP-1590 Create TinkerWorkerMemory and Partitioned Vertices
+* TINKERPOP-1600 Consistent use of base 64 encoded bytes for SASL negotiation
+* TINKERPOP-1602 Support SSL client certificate authentication
+* TINKERPOP-1606 Refactor GroupStep to not have the reduction traversal included in its BiOperator.
+* TINKERPOP-1610 Deprecate gremlin-groovy-test provider based tests
+* TINKERPOP-1617 Create a SingleIterationStrategy which will do its best to rewrite OLAP traversals to not message pass.
+
+[[release-3-2-3]]
+=== TinkerPop 3.2.3 (Release Date: October 17, 2016)
+
+This release also includes changes from <<./changelog-3.1.x.asciidoc#release-3-1-5, 3.1.5>>.
+
+* Restructured Gremlin-Python's GraphSON I/O package to make it easier for users to register serializers/deserializers. (*breaking*)
+* Fixed a bug with `TraversalOpProcessor` that was returning a final result prior to committing the transaction.
+* Fixed a bug in `ConnectiveStrategy` where infix and/or was not correctly reasoning on `choose()` `HasNextStep` injections.
+* Increased performance of `CredentialGraph` authentication.
+* Removed Java 8 stream usage from `TraversalHelper` for performance reasons.
+* Fixed a bug in `RepeatStep` where `emit().as('x')` wasn't adding the step labels to the emit-traverser.
+* Added `GraphComputing.atMaster(boolean)` to allow steps to know whether they are executing at master or distributed at workers.
+* Fixed a bug in OLAP where `DedupGlobalStep` wasn't de-duping local master traversers.
+* Added `HasContainerHolder.removeHasContainer()`-method with default `UnsupportedOperationException` implementation.
+* `TraversalSource.withComputer()` is simplified to add a `VertexProgramStrategy`. Easier for language variants.
+* Fixed a `Set`, `List`, `Map` bug in the various `Translators` where such collections were not being internally translated.
+* Fixed a `Bytecode` bug where nested structures (map, list, set) were not being analyzed for bindings and bytecode conversions.
+* Fixed a `String` bug in `GroovyTranslator` and `PythonTranslator` where if the string has double-quotes it now uses """ """.
+* Added a default `TraversalStrategy.getConfiguration()` which returns the configuration needed to construct the strategy.
+* `Computer` instances can be created with `Computer.create(Configuration)` and accessed via `Computer.getConf()`.
+* Every `TraversalStrategy` can be created via a `Configuration` and a static `MyStrategy.create(Configuration)`.
+* Added language-agnostic `TraversalStrategy` support in `Bytecode`.
+* Added `PartitionStrategy.Builder.readPartitions()` and deprecated `PartitionStrategy.Builder.addPartition()`.
+* A new version of `LazyBarrierStrategy` has been created and added to the default strategies.
+* `FilterRankStrategy` now propagates labels "right" over non-`Scoping` filters.
+* Fixed a bug in `ConnectiveP` where nested equivalent connectives should be inlined.
+* Fixed a bug in `IncidentToAdjacentStrategy` where `TreeStep` traversals were allowed.
+* Fixed a end-step label bug in `MatchPredicateStrategy`.
+* Fixed a bug in `MatchPredicateStrategy` where inlined traversals did not have strategies applied to it.
+* Fixed a bug in `RepeatUnrollStrategy` where inlined traversal did not have strategies applied to it.
+* Fixed padding of prompt in Gremlin Console when the number of lines went beyond a single digit.
+* Fixed GraphSON 2.0 namespace for `TinkerGraph` to be "tinker" instead of "gremlin".
+* Dropped serialization support in GraphSON 2.0 for `Calendar`, `TimeZone`, and `Timestamp`.
+* Added `TraversalHelper.copyLabels()` for copying (or moving) labels form one step to another.
+* Added `TraversalHelper.applySingleLevelStrategies()` which will apply a subset of strategies but not walk the child tree.
+* Added the concept that hidden labels using during traversal compilation are removed at the end during `StandardVerificationStrategy`. (*breaking*)
+* Added `InlineFilterStrategy` which will determine if various `TraversalParent` children are filters and if so, inline them.
+* Removed `IdentityRemovalStrategy` from the default listing as its not worth the clock cycles.
+* Removed the "!" symbol in `NotStep.toString()` as it is confusing and the `NotStep`-name is sufficient.
+* Fixed a bug in `TraversalVertexProgram` (OLAP) around ordering and connectives (i.e. `and()` and `or()`).
+* Added `AbstractGremlinProcessTest.checkOrderedResults()` to make testing ordered results easier.
+* `AbstractLambdaTraversal` now supports a `bypassTraversal` where it is possible for strategies to redefine such lambda traversals.
+* Added an internal utility `ClassFilterStep` which determines if the traverser object's class is an instance of the provided class.
+* `ConnectiveStep` extends `FilterStep` and thus, is more appropriately categorized in the step hierarchy.
+* `PropertyMapStep` supports a provided traversal for accessing the properties of the element. (*breaking*)
+* `SubgraphStrategy` now supports vertex property filtering.
+* Fixed a bug in Gremlin-Python `P` where predicates reversed the order of the predicates.
+* Added tests to `DedupTest` for the `dedup(Scope, String...)` overload.
+* Added more detailed reference documentation for IO formats.
+* Fixed a bug in serialization of `Lambda` instances in GraphSON, which prevented their use in remote traversals.
+* Fixed a naming bug in Gremlin-Python where `P._and` and `P._or` should be `P.and_` and `P.or_`. (*breaking*)
+* `where()` predicate-based steps now support `by()`-modulation.
+* Added Gryo serialization for `Bytecode`.
+* Moved utility-based serializers to `UtilSerializers` for Gryo - these classes were private and hence this change is non-breaking.
+* `TraversalRing` returns a `null` if it does not contain traversals (previously `IdentityTraversal`).
+* Deprecated `Graph.Exceptions.elementNotFoundException()` as it was not used in the code base outside of the test suite.
+* Fixed a `JavaTranslator` bug where `Bytecode` instructions were being mutated during translation.
+* Added `Path` to Gremlin-Python with respective GraphSON 2.0 deserializer.
+* `Traversal` and `TraversalSource` now implement `AutoCloseable`.
+* Added "keep-alive" functionality to the Java driver, which will send a heartbeat to the server when normal request activity on a connection stops for a period of time.
+* Renamed the `empty.result.indicator` preference to `result.indicator.null` in Gremlin Console
+* If `result.indicator.null` is set to an empty string, then no "result line" is printed in Gremlin Console.
+* Deprecated `reconnectInitialDelay` on the Java driver.
+* Added some validations to `Cluster` instance building.
+* Produced better errors in `readGraph` of `GryoReader` and `GraphSONReader` if a `Vertex` cannot be found in the cache on edge loading.
+* VertexPrograms can now declare traverser requirements, e.g. to have access to the path when used with `.program()`.
+* New build options for `gremlin-python` where `-DglvPython` is no longer required.
+* Added missing `InetAddress` to GraphSON extension module.
+* Added new recipe for "Pagination".
+* Added new recipe for "Recommendation".
+* Added functionality to Gremlin-Server REST endpoint to forward Exception Messages and Class in HTTP Response
+* Gremlin Server `TraversalOpProcessor` now returns confirmation upon `Op` `close`.
+* Added `close` method Java driver and Python driver `DriverRemoteTraversalSideEffects`.
+
+==== Bugs
+
+* TINKERPOP-1423 IncidentToAdjacentStrategy should be disabled for tree steps
+* TINKERPOP-1440 g:Path needs a GraphSON deserializer in Gremlin-Python
+* TINKERPOP-1457 Groovy Lambdas for remote traversals not serializable
+* TINKERPOP-1458 Gremlin Server doesn't return confirmation upon Traversal OpProcessor "close" op
+* TINKERPOP-1466 PeerPressureTest has been failing recently
+* TINKERPOP-1472 RepeatUnrollStrategy does not semi-compile inlined repeat traversal
+* TINKERPOP-1476 TinkerGraph does not get typed with the right type name in GraphSON
+* TINKERPOP-1495 Global list deduplication doesn't work in OLAP
+* TINKERPOP-1500 and/or infix and choose() do not work correctly.
+* TINKERPOP-1511 Remote client addV, V()
+
+==== Improvements
+
+* TINKERPOP-790 Implement AutoCloseable on TraversalSource
+* TINKERPOP-944 Deprecate Graph.Exceptions.elementNotFound
+* TINKERPOP-1189 SimpleAuthenticator over HttpChannelizer makes Gremlin Server pretty slow and consumes more CPU
+* TINKERPOP-1249 Gremlin driver to periodically issue ping / heartbeat to gremlin server
+* TINKERPOP-1280 VertexPrograms should declare traverser requirements
+* TINKERPOP-1330 by()-modulation for where()
+* TINKERPOP-1409 Make the "null" return in the gremlin console into something more understandable *(breaking)*
+* TINKERPOP-1431 Documentation generation requires tests to execute on gremlin-python
+* TINKERPOP-1437 Add tests for dedup(Scope) in DedupTest
+* TINKERPOP-1444 Benchmark bytecode->Traversal creation and implement GremlinServer cache if necessary.
+* TINKERPOP-1448 gremlin-python should be Python 2/3 compatible
+* TINKERPOP-1449 Streamline gremlin-python build
+* TINKERPOP-1455 Provide String-based withStrategy()/withoutStrategy() for language variant usage
+* TINKERPOP-1456 Support SubgraphStrategy.vertexProperties().
+* TINKERPOP-1460 Deprecate reconnectInitialDelay in Java driver
+* TINKERPOP-1464 Gryo Serialization for Bytecode
+* TINKERPOP-1469 Get rid of Stream-usage in TraversalHelper
+* TINKERPOP-1470 InlineFilterStrategy should try and P.or() has() children in OrSteps.
+* TINKERPOP-1486 Improve API of RemoteConnection
+* TINKERPOP-1487 Reference Documentation for IO
+* TINKERPOP-1488 Make LazyBarrierStrategy part of the default TraversalStrategies *(breaking)*
+* TINKERPOP-1492 RemoteStrategy or the RemoteConnection should append a lazy barrier().
+* TINKERPOP-1423 IncidentToAdjacentStrategy should be disabled for tree steps
+* TINKERPOP-1440 g:Path needs a GraphSON deserializer in Gremlin-Python
+* TINKERPOP-1457 Groovy Lambdas for remote traversals not serializable
+* TINKERPOP-1458 Gremlin Server doesn't return confirmation upon Traversal OpProcessor "close" op
+* TINKERPOP-1466 PeerPressureTest has been failing recently
+* TINKERPOP-1472 RepeatUnrollStrategy does not semi-compile inlined repeat traversal
+* TINKERPOP-1495 Global list deduplication doesn't work in OLAP
+* TINKERPOP-1500 and/or infix and choose() do not work correctly.
+* TINKERPOP-1511 Remote client addV, V()
+
+[[release-3-2-2]]
+=== TinkerPop 3.2.2 (Release Date: September 6, 2016)
+
+This release also includes changes from <<./changelog-3.1.x.asciidoc#release-3-1-4, 3.1.4>>.
+
+* Included GraphSON as a default serializer (in addition to Gryo, which was already present) in Gremlin Server if none are defined.
+* Added `gremlin-python` package as a Gremlin language variant in Python.
+* Added `Bytecode` which specifies the instructions and arguments used to construct a traversal.
+* Created an experimental GraphSON representation of `Bytecode` that will be considered unstable until 3.3.0.
+* Added `Translator` which allows from the translation of `Bytecode` into some other form (e.g. script, `Traversal`, etc.).
+* Added `JavaTranslator`, `GroovyTranslator`, `PythonTranslator`, and `JythonTranslator` for translating `Bytecode` accordingly.
+* Added `TranslationStrategy` to `gremlin-test` so translators can be tested against the process test suite.
+* Added `Traversal.Admin.nextTraverser()` to get the next result in bulk-form (w/ default implementation).
+* Added `TraversalSource.getAnonymousTraversalClass()` (w/ default implementation).
+* Added `GremlinScriptEngine` interface which specifies a `eval(Bytecode, Bindings)` method.
+* Deprecated `RemoteGraph` in favor of `TraversalSource.withRemote()` as it is more technically correct to tie a remote traversal to the `TraversalSource` than a `Graph` instance.
+* `GremlinGroovyScriptEngine` implements `GremlinScriptEngine`.
+* Added `GremlinJythonScriptEngine` which implements `GremlinScriptEngine`.
+* Removed support for submitting a Java serialized `Traversal` to Gremlin Server.
+* Removed a largely internal feature that supported automatic unrolling of traversers in the Gremlin Driver.
+* Made it possible to directly initialize `OpProcessor` implementations with server `Settings`.
+* Included GraphSON as a default serializer (in addition to Gryo, which was already present) in Gremlin Server if none are defined
+* Introduced GraphSON 2.0.
+* Deprecated `embedTypes` on the builder for `GraphSONMapper`.
+* Bumped to Netty 4.0.40.final.
+* Defaulted the `gremlinPool` setting in Gremlin Server to be zero, which will instructs it to use `Runtime.availableProcessors()` for that settings.
+* Changed scope of log4j dependencies so that they would only be used in tests and the binary distributions of Gremlin Console and Server.
+* Deprecated `Io.Builder.registry()` in favor of the newly introduced `Io.Builder.onMapper()`.
+* Added new recipe for "Traversal Induced Values".
+* Fixed a potential leak of a `ReferenceCounted` resource in Gremlin Server.
+* Added class registrations for `Map.Entry` implementations to `GryoMapper`.
+* Added methods to retrieve `Cluster` settings in `gremlin-driver`.
+* Fixed a severe bug in `SubgraphStrategy`.
+* Deprecated `SubgraphStrategy.Builder.vertexCriterion()/edgeCriterion()` in favor of `vertices()/edges()`.
+* Fixed a small bug in `StandardVerificationStrategy` that caused verification to fail when `withPath` was used in conjunction with `ProfileStep`.
+* Added color preferences
+* Added input, result prompt preferences
+* Added multi-line indicator in Gremlin Console
+
+==== Bugs
+
+* TINKERPOP-810 store not visible
+* TINKERPOP-1151 slf4j-log4j12 / log4j is only required for testing *(breaking)*
+* TINKERPOP-1383 publish-docs.sh might publish to current too early
+* TINKERPOP-1390 IdentityRemoveStrategyTest fails randomly
+* TINKERPOP-1400 SubgraphStrategy introduces infinite recursion if filter has Vertex/Edge steps.
+* TINKERPOP-1405 profile() doesn't like withPath()
+
+==== Improvements
+
+* TINKERPOP-1037 Gremlin shell output coloring
+* TINKERPOP-1226 Gremlin Console should :clear automagically after "Display stack trace."
+* TINKERPOP-1230 Serialising lambdas for RemoteGraph
+* TINKERPOP-1274 GraphSON Version 2.0
+* TINKERPOP-1278 Implement Gremlin-Python and general purpose language variant test infrastructure
+* TINKERPOP-1285 Gremline console does not differentiate between multi-line and single-line input
+* TINKERPOP-1334 Provide a way to pull gremlin.driver.Cluster connection settings.
+* TINKERPOP-1347 RemoteConnection needs to provide TraversalSideEffects. *(breaking)*
+* TINKERPOP-1373 Default gremlinPool to number of cores
+* TINKERPOP-1386 Bump to Netty 4.0.40.Final
+* TINKERPOP-1392 Remove support for java serialized Traversal *(breaking)*
+* TINKERPOP-1394 Fix links in Recipes doc
+* TINKERPOP-1396 Traversal Induced Values Recipe
+* TINKERPOP-1402 Impossible for graph implementations to provide a class resolver for Gryo IO
+* TINKERPOP-1407 Default serializers for Gremlin Server
+* TINKERPOP-1425 Use trailing underscores in gremlin-python
+
+[[release-3-2-1]]
+=== TinkerPop 3.2.1 (Release Date: July 18, 2016)
+
+This release also includes changes from <<./changelog-3.1.x.asciidoc#release-3-1-3, 3.1.3>>.
+
+* `PathProcessor` steps now have the ability (if configured through a strategy) to drop `Traverser` path segments.
+* `MatchStep` in OLTP has a lazy barrier to increase the probability of bulking.
+* Added `PathRetractionStrategy` which will remove labeled path segments that will no longer be referenced.
+* Added `Path.retract()` to support retracting paths based on labels.
+* Optimized `ImmutablePath` and `MutablePath` equality code removing significant unnecessary object creation code.
+* Bumped to Groovy 2.4.7.
+* Added `RepeatUnrollStrategy` to linearize a `repeat()`-traversal if loop amount is known at compile time.
+* Fixed a bug in `BranchStep` around child integration during `clone()`.
+* Fixed a bug in `AbstractStep` around label set cloning.
+* Added `TraversalStrategyPerformanceTest` for verifying the performance gains of optimization-based traversal strategies.
+* `TraversalExplanation.prettyPrint()` exists which provides word wrapping and GremlinConsole is smart to use console width to control `toString()`.
+* `TraversalOpProcessor` (`RemoteConnection`) uses `HaltedTraverserStrategy` metadata to determine detachment procedure prior to returning results.
+* Allow DFS paths in `HADOOP_GREMLIN_LIBS`.
+* Added a safer serializer infrastructure for use with `SparkGraphComputer` that uses `KryoSerializer` and the new `GryoRegistrator`.
+* Added `HaltedTraverserStrategy` to allow users to get back different element detachments in OLAP.
+* Fixed a `NullPointerException` bug around nested `group()`-steps in OLAP.
+* Fixed a severe bug around halted traversers in a multi-job OLAP traversal chain.
+* Ensure a separation of `GraphComputer` and `VertexProgram` configurations in `SparkGraphComputer` and `GiraphGraphComputer`.
+* `PeerPressureVertexProgram` now supports dynamic initial vote strength calculations.
+* Added `EmptyMemory` for ease of use when no memory exists.
+* Updated `VertexComputing.generateProgram()` API to include `Memory`. *(breaking)*
+* `ImmutablePath.TailPath` is now serializable like `ImmutablePath`.
+* Added `ConfigurationCompilerProvider` which allows fine-grained control of some of the internal `GremlinGroovyScriptEngine` settings at the Groovy compilation level.
+* Introduced the `application/vnd.gremlin-v1.0+gryo-lite` serialization type to Gremlin Server which users "reference" elements rather than "detached".
+* `GryoMapper` allows overrides of existing serializers on calls to `addCustom` on the builder.
+* Added a traversal style guide to the recipes cookbook.
+* Fixed a bug in master-traversal traverser propagation.
+* Added useful methods for custom `VertexPrograms` to be used with `program()`-step.
+* Increased the test coverage around traverser propagation within a multi-job OLAP traversal.
+* Added tests to validate the status of a transaction immediately following calls to close.
+* Added tests to ensure that threaded transactions cannot be re-used.
+* `GraphFilter` helper methods are now more intelligent when determining edge direction/label legality.
+* Added `GraphFilterStrategy` to automatically construct `GraphFilters` via traversal introspection in OLAP.
+* Updated the Gephi Plugin to support Gephi 0.9.x.
+* Increased the testing and scope of `TraversalHelper.isLocalStarGraph()`.
+* Changed signature of `get_g_VXlistXv1_v2_v3XX_name` and `get_g_VXlistX1_2_3XX_name` of `VertexTest` to take arguments for the `Traversal` to be constructed by extending classes.
+* Added `VertexProgramInterceptor` interface as a general pattern for `GraphComputer` providers to use for bypassing `GraphComputer` semantics where appropriate.
+* Added `SparkStarBarrierInterceptor` that uses Spark DSL for local star graph traversals that end with a `ReducingBarrierStep`.
+* Added `SparkInterceptorStrategy` which identifies which interceptor to use (if any) given the submitted `VertexProgram`.
+* Added `SparkSingleIterationStrategy` that does not partition nor cache the graph RDD if the traversal does not message pass.
+* Added more helper methods to `TraversalHelper` for handling scoped traversal children.
+* Deprecated all "performance" tests based on "JUnit Benchmarks".
+* `SparkGraphComputer` no longer shuffles empty views or empty outgoing messages in order to save time and space.
+* `TraversalVertexProgram` no longer maintains empty halted traverser properties in order to save space.
+* Added `List<P<V>>` constructors to `ConnectiveP`, `AndP`, and `OrP` for ease of use.
+* Added support for interactive (`-i`) and execute (`-e`) modes for Gremlin Console.
+* Displayed line numbers for script execution failures of `-e` and `-i`.
+* Improved messaging around script execution errors in Gremlin Console.
+* Added "help" support to Gremlin Console with the `-h` flag.
+* Added options to better control verbosity of Gremlin Console output with `-Q`, `-V` and `-D`.
+* Deprecated the `ScriptExecutor` - the `-e` option to `gremlin.sh` is now handled by `Console`.
+* `Traversal` now allows cancellation with `Thread.interrupt()`.
+* Added a Gremlin language variant tutorial teaching people how to embed Gremlin in a host programming language.
+
+==== Bugs
+
+* TINKERPOP-1281 Memory.HALTED_TRAVERSER transience is not sound.
+* TINKERPOP-1305 HALTED_TRAVERSERS hold wrong information
+* TINKERPOP-1307 NPE with OLTP nested group() in an OLAP group() traversal
+* TINKERPOP-1323 ComputerVerificationStrategy fails for nested match() steps
+* TINKERPOP-1341 UnshadedKryoAdapter fails to deserialize StarGraph when SparkConf sets spark.rdd.compress=true whereas GryoSerializer works
+* TINKERPOP-1348 TraversalInterruptionTest success dependent on iteration order
+
+==== Improvements
+
+* TINKERPOP-818 Consider a P.type()
+* TINKERPOP-946 Traversal respecting Thread.interrupt()
+* TINKERPOP-947 Enforce semantics of threaded transactions as manual *(breaking)*
+* TINKERPOP-1059 Add test to ensure transaction opening happens at read/write and not on close *(breaking)*
+* TINKERPOP-1071 Enhance pre-processor output
+* TINKERPOP-1091 Get KryoSerializer to work natively. *(breaking)*
+* TINKERPOP-1120 If there is no view nor messages, don't create empty views/messages in SparkExecutor
+* TINKERPOP-1144 Improve ScriptElementFactory
+* TINKERPOP-1155 gremlin.sh -e doesn't log line numbers for errors
+* TINKERPOP-1156 gremlin.sh could use a help text
+* TINKERPOP-1157 gremlin.sh should allow you to execute a script and go interactive on error or completion
+* TINKERPOP-1232 Write a tutorial demonstrating the 3 ways to write a Gremlin language variant.
+* TINKERPOP-1254 Support dropping traverser path information when it is no longer needed.
+* TINKERPOP-1268 Improve script execution options for console *(breaking)*
+* TINKERPOP-1273 Deprecate old performance tests
+* TINKERPOP-1276 Deprecate serializedResponseTimeout
+* TINKERPOP-1279 Add Iterable<V> parameter constructor to ConnectiveP subclasses
+* TINKERPOP-1282 Add more compliance tests around how memory and vertex compute keys are propagated in chained OLAP.
+* TINKERPOP-1286 Add Recipes documentation
+* TINKERPOP-1288 Support gremlin.spark.skipPartitioning configuration.
+* TINKERPOP-1290 Create VertexProgramInterceptor as a pattern for GraphComputer strategies.
+* TINKERPOP-1293 Implement GraphFilterStrategy as a default registration for GraphComputer
+* TINKERPOP-1294 Deprecate use of junit-benchmarks
+* TINKERPOP-1297 Gephi plugin on Gephi 0.9.x *(breaking)*
+* TINKERPOP-1299 Refactor TraversalVertexProgram to make it easier to understand.
+* TINKERPOP-1308 Serialize to "reference" for Gremlin Server
+* TINKERPOP-1310 Allow OLAP to return properties as Detached
+* TINKERPOP-1321 Loosen coupling between TinkerPop serialization logic and shaded Kryo
+* TINKERPOP-1322 Provide fine-grained control of CompilerConfiguration
+* TINKERPOP-1328 Provide [gremlin-python] as an code executor in docs
+* TINKERPOP-1331 HADOOP_GREMLIN_LIBS can only point to local file system
+* TINKERPOP-1332 Improve .explain() Dialogue
+* TINKERPOP-1338 Bump to Groovy 2.4.7
+* TINKERPOP-1349 RepeatUnrollStrategy should unroll loops while maintaining equivalent semantics.
+* TINKERPOP-1355 Design HasContainer for extension
+
+[[release-3-2-0-incubating]]
+=== TinkerPop 3.2.0 (Release Date: April 8, 2016)
+
+This release also includes changes from <<./changelog-3.1.x.asciidoc#release-3-1-2-incubating, 3.1.2-incubating>>.
+
+* Bumped to Neo4j 2.3.3.
+* Renamed variable `local` to `fs` in `HadoopGremlinPlugin` to avoid a naming conflict with `Scope.local`. *(breaking)*
+* Added `GraphTraversal.optional()` which will use the inner traversal if it returns results, else it won't.
+* `GroupStep` and `GroupSideEffectStep` make use of mid-traversal reducers to limit memory consumption in OLAP.
+* Added `GraphTraversal.program(VertexProgram)` to allow arbitrary user vertex programs in OLAP.
+* Added `GraphTraversal.project()` for creating a `Map<String,E>` given the current traverser and an arbitrary number of `by()`-modulators.
+* `HADOOP_GREMLIN_LIBS` can now reference a directory in HDFS and will be used if the directory does not exist locally.
+* Added `gremlin-benchmark` module with JMH benchmarking base classes that can be used for further benchmark development.
+* `TraversalStrategies.GlobalCache` supports both `Graph` and `GraphComputer` strategy registrations.
+* `select("a","b").by("name").by("age")`-style traversals now work in OLAP with new `PathProcessorStrategy`.
+* `DedupGlobalStep` can now handle star-bound `by()`-modulators and scoped keys on `GraphComputer`.
+* Added `Computer` which is a builder for `GraphComputers` that is serializable.
+* `PersistedOutputRDD` now implements `PersistResultGraphAware` and thus, no more unneeded warnings when using it.
+* Renamed `StandardTraversalMetrics` to `DefaultTraversalMetrics` given the `DefaultXXX`-convention throughout. *(breaking)*
+* Bumped to Apache Hadoop 2.7.2.
+* Fixed a bug around profiling and nested traversals.
+* Added `gremlin.hadoop.defaultGraphComputer` so users can use `graph.compute()` with `HadoopGraph`.
+* Added `gremlin.hadoop.graphReader` and `gremlin.hadoop.graphWriter` which can handled `XXXFormats` and `XXXRDDs`.
+* Deprecated `gremlin.hadoop.graphInputFormat`, `gremlin.hadoop.graphOutputFormat`, `gremlin.spark.graphInputRDD`, and `gremlin.spark.graphOutputRDD`.
+* If no configuration is provided to `HadoopPools` it uses the default configuration to create a pool once and only once per JVM.
+* Implemented `RemoteGraph`, `RemoteConnection`, and `RemoteStrategy`.
+* Added validation to `GryoMapper` Kryo identifiers before construction to prevent accidental duplicates.
+* Added `GraphStep.addIds()` which is useful for `HasContainer` "fold ins."
+* Added a static `GraphStep.processHashContainerIds()` helper for handling id-based `HasContainers`.
+* `GraphStep` implementations should have `g.V().hasId(x)` and `g.V(x)` compile equivalently. *(breaking)*
+* Optimized `ExpandableStepIterator` with simpler logic and increased the likelihood of bulking.
+* Optimized `TraverserRequirement` calculations.
+* `Step.addStart()` and `Step.addStarts()` now take `Traverser.Admin<S>` and `Traverser.Admin<S>`, respectively. *(breaking)*
+* `Step.processNextStart()` and `Step.next()` now return `Traverser.Admin<E>`. *(breaking)*
+* `Traversal.addTraverserRequirement()` method removed. *(breaking)*
+* Fixed a `hashCode()` bug in `OrderGlobalStep` and `OrderLocalStep`.
+* Added `OrderLimitStrategy` which will ensure that partitions are limited before being merged in OLAP.
+* `ComparatorHolder` now separates the traversal from the comparator. *(breaking)*
+* Bumped to Apache Spark 1.6.1.
+* If no Spark serializer is provided then `GryoSerializer` is the default, not `JavaSerializer`.
+* Added `Operator.sumLong` as a optimized binary operator intended to be used by `Memory` reducers that know they are dealing with longs.
+* Traversers from `ComputerResultStep` are no longer attached. Attaching is only used in TinkerPop's test suite via `System.getProperties()`.
+* Fixed a `hashCode()`/`equals()` bug in `MessageScope`.
+* Fixed a severe `Traversal` cloning issue that caused inconsistent `TraversalSideEffects`.
+* `TraversalSideEffects` remain consistent and usable across multiple chained OLAP jobs.
+* Added `MemoryTraversalSideEffects` which wraps `Memory` in a `TraversalSideEffects` for use in OLAP.
+* `TraversalSideEffects` are now fully functional in OLAP save that an accurate global view is possible at the start of an iteration (not during).
+* Updated the `TraversalSideEffects` API to support registered reducers and updated `get()`-semantics. *(breaking)*
+* Split existing `profile()` into `ProfileStep` and `ProfileSideEffectStep`.
+* The `profile()`-step acts like a reducing barrier and emits `TraversalMetrics` without the need for `cap()`. *(breaking)*
+* Added `LocalBarrier` interface to allow traversers to remain distributed during an iteration so as to reduce cluster traffic.
+* Added `NoOpBarrierStep` as a `LocalBarrier` implementation of `LambdaCollectingBarrierStep(noOp)`.
+* `AggregateStep` implements `LocalBarrier` and thus, doesn't needlessly communicate its barrier traversers.
+* Fixed an OLAP-based `Barrier` synchronization bug.
+* Fixed a semantic bug in `BranchStep` (and inheriting steps) where barriers reacted locally. *(breaking)*
+* Added `MemoryComputeKey` for specification of `Memory` keys in `VertexProgram`. *(breaking)*
+* Added `VertexComputeKey` for specification of vertex compute properties in `VertexProgram`. *(breaking)*
+* Added `and`, `or`, and `addAll` to `Operator`.
+* `Memory` API changed to support setting and adding values for reduction. *(breaking)*
+* `Memory` keys can be marked as broadcast and only those values are sent to workers on each iterator.
+* `Memory` keys can be marked transient and thus deleted at the end of the OLAP job.
+* Vertex compute keys can be marked transient and thus deleted at the end of the OLAP job.
+* `VertexProgram` API changed to support `MemoryComputeKey` and `VertexComputeKey`. *(breaking)*
+* `TraversalVertexProgram` able to execute OLAP and OLTP traversal sections dynamically within the same job.
+* Removed `FinalGet` interface as all post processing of reductions should be handled by the reducing step explicitly. *(breaking)*
+* Simplified all `SupplyingBarrierStep` implementations as they no longer require `MapReduce` in OLAP.
+* Simplified all `CollectingBarrierStep` implementations as they no longer require `MapReduce` in OLAP.
+* Simplified all `ReducingBarrierStep` implementations as they no longer require `MapReduce` in OLAP.
+* All steps in OLAP that used `MapReduce` now use `Memory` to do their reductions which expands the list of legal traversals.
+* `GroupStep` simplified with `GroupHelper.GroupMap` no longer being needed. Related to the removal of `FinalGet`.
+* OLAP side-effects that are no longer generated by `MapReduce` are simply stored in `ComputerResult.Memory` w/ no disk persistence needed. *(breaking)*
+* Added `Generate` step interface which states that there could be a final generating phase to a side-effect or reduction (e.g. `GroupStep`).
+* `Barrier` step interface is now the means by which non-parallel steps communicate with their counterparts in OLAP.
+* Added `MemoryComputing` step interface which states that the step uses `MemoryComputeKeys` for its computation in OLAP.
+* Added `PeerPressureVertexProgramStep` and `GraphTraversal.peerPressure()`.
+* Added `PureTraversal` for handling pure and compiled versions of a `Traversal`. Useful in OLAP.
+* Added `ScriptTraversal` which allows for delayed compilation of script-based `Traversals`.
+* Simplified `VertexProgram` implementations with a `PureTraversal`-model and deprecated `ConfigurationTraversal`.
+* Simplified script-based `Traversals` via `ScriptTraversal` and deprecated `TraversalScriptFunction` and `TraversalScriptHelper`.
+* Added `TimesModulating` interface which allows the `Step` to decide how a `times()`-modulation should be handled.
+* Added `ByModulating` interface which allows the `Step` to decide how a `by()`-modulation should be handled. *(breaking)*
+* Simplified the `by()`-modulation patterns of `OrderGlobalStep` and `OrderLocalStep`.
+* Added `GraphComputerTest.shouldSupportPreExistingComputeKeys()` to ensure existing compute keys are "revived." *(breaking)*
+* Added `GraphComputerTest.shouldSupportJobChaining()` to ensure OLAP jobs can be linearly chained. *(breaking)*
+* Fixed a bug in both `SparkGraphComputer` and `GiraphGraphComputer` regarding source data access in job chains.
+* Expanded job chaining test coverage for `GraphComputer` providers.
+* Added `TraversalHelper.onGraphComputer(traversal)`.
+* `MapReduce.map()` no longer has a default implementation. This method must be implemented. *(breaking)*
+* `TraversalVertexProgram` can work without a `GraphStep` start.
+* Added `PageRankVertexProgramStep` and `GraphTraversal.pageRank()`.
+* Added `TraversalVertexProgramStep` to support OLAP traversal job chaining.
+* Added `VertexProgramStrategy` which compiles multiple OLAP jobs into a single traversal.
+* Simplified the comparator model in `OrderGlobalStep` and `OrderLocalStep`.
+* Refactored `TraversalSource` model to allow fluent-method construction of `TraversalSources`.
+* Deprecated the concept of a `TraversalSource.Builder`.
+* Removed the concept of a `TraversalEngine`. All `Traversal` modulations are now mediated by `TraversalStrategies`. *(breaking)*
+* Added `SideEffectStrategy` for registering sideEffects in a spawned `Traversal`.
+* Added `SackStrategy` for registering a sack for a spawned `Traversal`.
+* Added `RequirementsStrategy` and `RequirementsStep` for adding dynamic `TraverserRequirements` to a `Traversal`.
+* Removed `EngineDependentStrategy`.
+* Renamed step interface `EngineDependent` to `GraphComputing` with method `onGraphComputer()`. *(breaking)*
+* Cleaned up various `TraversalStrategy` tests now that `TraversalEngine` no longer exists.
+* Added `GraphFilter` to support filtering out vertices and edges that won't be touched by an OLAP job.
+* Added `GraphComputer.vertices()` and `GraphComputer.edges()` for `GraphFilter` construction. *(breaking)*
+* `SparkGraphComputer`, `GiraphGraphComputer`, and `TinkerGraphComputer` all support `GraphFilter`.
+* Added `GraphComputerTest.shouldSupportGraphFilter()` which verifies all filtered graphs have the same topology.
+* Added `GraphFilterAware` interface to `hadoop-gremlin/` which tells the OLAP engine that the `InputFormat` handles filtering.
+* `GryoInputFormat` and `ScriptInputFormat` implement `GraphFilterAware`.
+* Added `GraphFilterInputFormat` which handles graph filtering for `InputFormats` that are not `GraphFilterAware`.
+* Fixed a bug in `TraversalHelper.isLocalStarGraph()` which allowed certain illegal traversals to pass.
+* Added `TraversalHelper.isLocalProperties()` to verify that the traversal does not touch incident edges.
+* `GraphReader` I/O interface now has `Optional<Vertex> readGraph(InputStream, GraphFilter)`. Default `UnsupportedOperationException`.
+* `GryoReader` does not materialize edges that will be filtered out and this greatly reduces GC and load times.
+* Created custom `Serializers` for `SparkGraphComputer` message-passing classes which reduce graph sizes significantly.
+
+==== Bugs
+
+* TINKERPOP-951 Barrier steps provide unexpected results in Gremlin OLAP
+* TINKERPOP-1057 GroupSideEffectStep doesn't use provided maps
+* TINKERPOP-1103 Two objects fighting for local variable name in Gremlin Console *(breaking)*
+* TINKERPOP-1149 TraversalXXXSteps Aren't Providing SideEffects
+* TINKERPOP-1181 select(Column) should not use a LambdaMapStep
+* TINKERPOP-1188 Semantics of BarrierSteps in TraversalParent global traversals is wrong. *(breaking)*
+* TINKERPOP-1194 explain() seems broken
+* TINKERPOP-1217 Repeated Logging of "The HadoopPools has not been initialized, using the default pool"
+
+==== Improvements
+
+* TINKERPOP-570 [Proposal] Provide support for OLAP to OLTP to OLAP to OLTP
+* TINKERPOP-575 Implement RemoteGraph
+* TINKERPOP-813 [Proposal] Make the Gremlin Graph Traversal Machine and Instruction Set Explicit
+* TINKERPOP-872 Remove GroupCountStep in favor of new Reduce-based GroupStep
+* TINKERPOP-890 Remove the concept of branch/ package. *(breaking)*
+* TINKERPOP-958 Improve usability of .profile() step.
+* TINKERPOP-962 Provide "vertex query" selectivity when importing data in OLAP. *(breaking)*
+* TINKERPOP-968 Add first class support for an optional traversal
+* TINKERPOP-971 TraversalSource should be fluent like GraphComputer *(breaking)*
+* TINKERPOP-1016 Replace junit-benchmarks with JMH
+* TINKERPOP-1021 Deprecate Order.valueIncr, Order.valueDecr, Order.keyIncr, and Order.keyDecr *(breaking)*
+* TINKERPOP-1032 Clean up the conf/hadoop configurations
+* TINKERPOP-1034 Bump to support Spark 1.5.2
+* TINKERPOP-1069 Support Spark 1.6.0
+* TINKERPOP-1082 INPUT_RDD and INPUT_FORMAT are bad, we should just have one key.
+* TINKERPOP-1112 Create GryoSerializers for the Spark Payload classes.
+* TINKERPOP-1121 FileSystemStorage needs to be smart about /.
+* TINKERPOP-1132 Messenger.receiveMessages() Iterator should .remove().
+* TINKERPOP-1140 TraversalVertexProgramStep in support of OLAP/OLTP conversions.
+* TINKERPOP-1153 Add ByModulating and TimesModulating interfaces.
+* TINKERPOP-1154 Create a ScriptTraversal which is Serializable and auto-compiles.
+* TINKERPOP-1162 Add VertexProgram.getTransientComputeKeys() for removing scratch-data. *(breaking)*
+* TINKERPOP-1163 GraphComputer's can have TraversalStrategies.
+* TINKERPOP-1164 ReducingBarriersSteps should use ComputerMemory, not MapReduce.
+* TINKERPOP-1166 Add Memory.reduce() as option to Memory implementations. *(breaking)*
+* TINKERPOP-1173 If no Serializer is provided in Configuration, use GryoSerializer by default (Spark)
+* TINKERPOP-1180 Add more optimized binary operators to Operator.
+* TINKERPOP-1192 TraversalSideEffects should support registered reducers (binary operators).
+* TINKERPOP-1193 Add a LocalBarrier interface.
+* TINKERPOP-1199 Use "MicroMetrics" as the mutator of the TraversalMetrics.
+* TINKERPOP-1206 ExpandableIterator can take a full TraverserSet at once -- Barriers.
+* TINKERPOP-1209 ComparatorHolder should returns a Pair<Traversal,Comparator>. *(breaking)*
+* TINKERPOP-1210 Provide an OrderLimitStep as an optimization.
+* TINKERPOP-1219 Create a test case that ensures the provider's compilation of g.V(x) and g.V().hasId(x) is identical *(breaking)*
+* TINKERPOP-1222 Allow default GraphComputer configuration
+* TINKERPOP-1223 Allow jars in gremlin.distributedJars to be read from HDFS
+* TINKERPOP-1225 Do a "rolling reduce" for GroupXXXStep in OLAP.
+* TINKERPOP-1227 Add Metrics for the TraversalOpProcessor
+* TINKERPOP-1234 program() step that takes arbitrary vertex programs
+* TINKERPOP-1236 SelectDenormalizationStrategy for select().by(starGraph) in OLAP.
+* TINKERPOP-1237 ProjectMap: For the Love of Die Faterland
+* TINKERPOP-1238 Re-use Client instances in RemoteGraph tests
\ No newline at end of file
diff --git a/docs/archive/changelogs/changelog-3.3.x.asciidoc b/docs/archive/changelogs/changelog-3.3.x.asciidoc
new file mode 100644
index 0000000..824e1bd
--- /dev/null
+++ b/docs/archive/changelogs/changelog-3.3.x.asciidoc
@@ -0,0 +1,777 @@
+////
+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.
+////
+== TinkerPop 3.3.0 (Gremlin Symphony #40 in G Minor)
+
+image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/images/gremlin-mozart.png[width=185]
+
+[[release-3-3-11]]
+=== TinkerPop 3.3.11 (Release Date: June 1, 2020)
+
+* Added `trustStoreType` such that keystore and truststore can be of different types in the Java driver.
+* Added session support to all GLVs: Javascript, .NET and Python.
+* Fixed bug in Gremlin Server shutdown if failures occurred during `GraphManager` initialization.
+* Modified Gremlin Server to close the session when the channel itself is closed.
+* Fixed bug in `Order` where comparisons of `enum` types wouldn't compare with `String` values.
+* Added `maxWaitForClose` configuration option to the Java driver.
+* Deprecated `maxWaitForSessionClose` in the Java driver.
+* Bumped to Jackson 2.9.10.4.
+* Remove invalid service descriptors from gremlin-shaded.
+* Fixed bug in Python and .NET traversal `clone()` where deep copies of bytecode were not occurring.
+* Fixed bug where `profile()` was forcing `LazyBarrierStrategy` to add an extra `barrier()` to the end of traversals.
+* Fixed bug in Python about integer serializer which was out of range of `g:Int32`
+* Bumped commons-codec 1.14
+
+==== Bugs
+
+* TINKERPOP-2347 Remove invalid service descriptors from gremlin-shaded
+* TINKERPOP-2350 clone() is not deep copying Traversal internals
+* TINKERPOP-2351 Local Map ordering of keys can generate cast errors
+* TINKERPOP-2353 Error while Shutting Down Gremlin Server
+* TINKERPOP-2355 Jackson-databind version in Gremlin shaded dependency needs to be increased - introduces vulnerability issues
+* TINKERPOP-2360 failed to deserializer int32 when gremlin-python submit bytecode with a big int value
+* TINKERPOP-2365 LazyBarrierStrategy adds a NoOpBarrierStep when profile() is present
+
+==== Improvements
+
+* TINKERPOP-2336 Allow close of channel without having to wait for server
+* TINKERPOP-2339 Gremlin.Net: Update System.Net.WebSockets.Client dependency
+* TINKERPOP-2354 Document recommendation to reuse graph traversal source
+
+[[release-3-3-10]]
+=== TinkerPop 3.3.10 (Release Date: February 3, 2020)
+
+* Improved error messaging for a `Cluster` with a bad `Channelizer` configuration in the Java driver.
+* Made `Cluster` be able to open configuration file on resources directory.
+* Implemented `Traversal.clone()` operations for all language variants.
+* Refactored `PathProcessorStrategy` to use the marker model.
+* Bumped to Tornado 5.x for gremlin-python.
+* Started keep-alive polling on `Connection` construction to ensure that a `Connection` doesn't die in the pool.
+* Deprecated `TraversalStrategies.applyStrategies()`.
+* Deprecated Jython support in `gremlin-python`.
+* Deprecated `NioChannelizer` and related classes in `gremlin-driver` and `gremlin-server`.
+* Fixed a bug in the `ClassCacheRequestCount` metric for `GremlinGroovyScriptEngine` which wasn't including the cache hit count, only the misses.
+* Improved Gremlin Server executor thread handling on client close requests.
+* Reverted: Modified Java driver to use IP address rather than hostname to create connections.
+* Allow custom XMLInputFactory to be used with GraphMLReader.
+
+==== Bugs
+
+* TINKERPOP-2175 Executor thread is not returned on channel close
+* TINKERPOP-2266 Keep alive not started at connection creation
+* TINKERPOP-2274 Test of TinkerGraph Gremlin fail on Windows and non EN locale
+* TINKERPOP-2332 JavaScript GLV: structure element toString() should internally call toString()
+* TINKERPOP-2333 JavaScript GLV: GraphSON2/3 Edge deserialization is invalid
+
+==== Improvements
+
+* TINKERPOP-2307 Add better error message for badly configured Channelizer
+* TINKERPOP-2309 Bump gremlinpython to Tornado 5.x
+* TINKERPOP-2315 Implement some form of clone() or reset() for Traversal in GLVs
+* TINKERPOP-2320 [SECURITY] XMLInputFactory initialization in GraphMLReader introduces
+* TINKERPOP-2322 Deprecate Jython support
+* TINKERPOP-2324 Deprecate the raw NIO support in the Java driver
+* TINKERPOP-2329 JavaScript GLV: Update websocket library dependency
+* TINKERPOP-2330 JavaScript GLV should expose GraphSON2Writer and GraphSONReader
+
+[[release-3-3-9]]
+=== TinkerPop 3.3.9 (Release Date: October 14, 2019)
+
+* Exposed response status attributes in a `ResponseError` in gremlin-javascript.
+* Added `ImmutableExplanation` for a `TraversalExplanation` that just contains data.
+* Added support for `UnaryOperator` and `BinaryOperator` for `Lambda` instances.
+* Fixed `TraversalExplanation` deserialization in GraphSON 2 and 3 which was not supported before in Java.
+* Added support for custom request headers in Python.
+* Fixed Java DSL annotation for generation of `addE()` which was formerly calling the wrong step.
+* Deprecated `scriptEvaluationTimeout` in favor of the more generic `evaluationTimeout`.
+* Bumped jackson-databind to 2.9.10 due to CVE-2019-14379, CVE-2019-14540, CVE-2019-16335.
+* Added `ReservedKeysVerificationStrategy` to allow warnings or exceptions when certain keys are used for properties.
+* Added the `AbstractWarningVerificationStrategy` base class for "warning" style `VerificationStrategy` implementations.
+* Refactored `EdgeLabelVerificationStrategy` to use `AbstractWarningVerificationStrategy`.
+* Added `EdgeLabelVerificationStrategy` to Python.
+* Improved handling of `null` values in bytecode construction.
+* Fixed Java driver authentication problems when calling the driver from multiple threads.
+* Modified Java driver to use IP address rather than hostname to create connections.
+* Fixed potential for `NullPointerException` with empty identifiers in `GraphStep`.
+* Postponed the timing of transport creation to `connection.write` in Gremlin Python.
+* Made `EventStrategy` compatible with multi-valued properties.
+* Changed `TraversalOpProcessor` to throw a `SERVER_ERROR_SCRIPT_EVALUATION` (597) if lambdas don't compile.
+* Bumped `commons-compress` to 1.19 due to CVE-2018-11771.
+* gremlin-javascript: Use `socketError` Connection event to prevent exit on error and expose Connection events.
+
+==== Bugs
+
+* TINKERPOP-2159 EventStrategy doesn't handle multi-valued properties
+* TINKERPOP-2283 GraphStep's ids null exception
+* TINKERPOP-2285 Error object is unreachable
+* TINKERPOP-2289 Use address instead of hostname for connection
+* TINKERPOP-2290 Javascript GLV connection refused error handling
+* TINKERPOP-2291 TraversalExplanation deserialization in GraphSON
+* TINKERPOP-2298 Bytecode.java flattenArguments throw exception when null
+* TINKERPOP-2303 GremlinDsl generate addV instead of addE
+
+==== Improvements
+
+* TINKERPOP-1810 Add Lambda.binaryOperator and Lambda.unaryOperator
+* TINKERPOP-1838 Python sample script
+* TINKERPOP-2046 Gremlin-Python: Support custom request headers in WebSocket request
+* TINKERPOP-2213 Replace scriptEvaluationTimeout in favor of something more suitable to bytecode
+* TINKERPOP-2275 Update jackson databind 2.9.9.3+
+* TINKERPOP-2277 Python sdk postpone the timing to create transport
+* TINKERPOP-2280 Prevent use of T values as property key overloads
+
+[[release-3-3-8]]
+=== TinkerPop 3.3.8 (Release Date: August 5, 2019)
+
+* Provided support for `withComputer()` in gremlin-javascript.
+* Deprecated remote traversal side-effect retrieval and related infrastructure.
+* Bumped to Groovy 2.4.17.
+* Bumped to Jackson Databind 2.9.9.1.
+* Fixed bug with Python in `g:Date` of GraphSON where local time zone was being used during serialization/deserialization.
+* Improved error messaging when an attempt is made to serialize multi-properties to GraphML.
+* Deprecated multi/meta-property support in `Neo4jGraph`.
+* Improved exception and messaging for gt/gte/lt/lte when one of the object isn't a `Comparable`.
+* Added test infrastructure to check for storage iterator leak.
+* Fixed multiple iterator leaks in query processor.
+* Fixed `optional()` so that the child traversal is treated as local.
+* Changed default keep-alive time for driver to 3 minutes.
+* Fixed bug where server-side keep-alive was not always disabled when its setting was zero.
+* Added support for `hasNext()` in Javascript and .NET.
+* Improved error messaging for invalid inputs to the TinkerGraph `IdManager` instances.
+* Forced replacement of connections in Java driver for certain exception types that seem to ultimately kill the connection.
+* Changed the `reverse()` of `desc` and `asc` on `Order` to not use the deprecated `decr` and `incr`.
+* Fixed bug in `MatchStep` where the correct was not properly determined.
+* Fixed bug where client/server exception mismatch when server throw StackOverflowError
+* Added underscore suffixed steps and tokens in Gremlin-Python that conflict with global function names.
+* Prevent exception when closing a session that doesn't exist.
+* Allow predicates and traversals to be used as options in `BranchStep`.
+* Ensure only a single final response is sent to the client with Gremlin Server.
+* Deprecated `ResponseHandlerContext` with related infrastructure and folded its functionality into `Context` in Gremlin Server.
+* Improved performance of `aggregate()` by avoiding excessive calls to `hasNext()` when the barrier is empty.
+
+==== Bugs
+
+* TINKERPOP-1619 TinkerGraphComputer worker count affects OptionalStep query results
+* TINKERPOP-2224 Detect and fix resource leak
+* TINKERPOP-2230 match() step unexpected behaviours
+* TINKERPOP-2232 RemoteStrategy does not call parent class TraversalStrategy __init__
+* TINKERPOP-2238 Fix remaining iterator leaks marked by @IgnoreIteratorLeak
+* TINKERPOP-2241 Client exception don't match Server exception when server throw StackOverflowError
+* TINKERPOP-2248 Instability of driver for blocked requests
+* TINKERPOP-2264 Gremlin Python should deserialize g:Date to UTC
+
+==== Improvements
+
+* TINKERPOP-1084 Branch option tokens should be allowed to be traversals.
+* TINKERPOP-1921 Support hasNext terminal step in GLVs
+* TINKERPOP-2020 Support withComputer() for javascript
+* TINKERPOP-2223 Update jackson databind to 2.9.9
+* TINKERPOP-2236 Improve error messaging for TinkerGraph IdManagers that fail on conversions
+* TINKERPOP-2237 Prevent error when closing sessions that don't exist *(breaking)*
+* TINKERPOP-2246 Consolidate the error propagation to the client
+* TINKERPOP-2256 processAllStarts of AggregateStep should only be called when barrier is empty
+* TINKERPOP-2260 Update jackson databind 2.9.9.1
+* TINKERPOP-2265 Deprecate Traversal.getSideEffects() functionality for remoting purposes
+* TINKERPOP-2270 Deprecate multi/metaproperty support in Neo4j
+* TINKERPOP-2272 Rename steps and tokens that conflict with standard python functions
+
+[[release-3-3-7]]
+=== TinkerPop 3.3.7 (Release Date: May 28, 2019)
+
+* Developed DSL pattern for gremlin-javascript.
+* Generated uberjar artifact for Gremlin Console.
+* Improved folding of `property()` step into related mutating steps.
+* Added `inject()` to steps generated on the DSL `TraversalSource`.
+* Removed `gperfutils` dependencies from Gremlin Console.
+* Fixed `PartitionStrategy` when setting vertex label and having `includeMetaProperties` configured to `true`.
+* Ensure `gremlin.sh` works when directories contain spaces.
+* Prevented client-side hangs if metadata generation fails on the server.
+* Fixed bug with `EventStrategy` in relation to `addE()` where detachment was not happening properly.
+* Ensured that `gremlin.sh` works when directories contain spaces.
+* Fixed bug in detachment of `Path` where embedded collection objects would prevent that process.
+* Enabled `ctrl+c` to interrupt long running processes in Gremlin Console.
+* Quieted "host unavailable" warnings for both the driver and Gremlin Console.
+* Fixed construction of `g:List` from arrays in gremlin-javascript.
+* Fixed bug in `GremlinGroovyScriptEngine` interpreter mode around class definitions.
+* Implemented `EdgeLabelVerificationStrategy`.
+* Fixed behavior of `P` for `within()` and `without()` in GLVs to be consistent with Java when using varargs.
+* Cleared the input buffer after exceptions in Gremlin Console.
+* Added parameter to configure the `processor` in the gremlin-javascript `client` constructor.
+* Bumped `Netty` to 4.1.32.
+
+==== Bugs
+
+* TINKERPOP-2112 Folding in property() step is not being optimally performed
+* TINKERPOP-2180 gremlin.sh doesn't work when directories contain spaces
+* TINKERPOP-2183 InterpreterModeASTTransformation needs to be more specific about what it transforms
+* TINKERPOP-2194 Enforcing an order on properties in one test method of ChooseTest
+* TINKERPOP-2196 PartitionStrategy with includeMetaProperties(true) can't add labeled vertex
+* TINKERPOP-2198 Documentation for Store contradicts itself
+* TINKERPOP-2199 within step does not work with more than two parameters with python
+* TINKERPOP-2200 AddEdgeStartStep used DetachedFactory.detach instead of EventStrategy.detach
+* TINKERPOP-2204 Client receives no response on failed request
+* TINKERPOP-2206 Certain types in javascript don't appear to serialize with a GraphSON type
+* TINKERPOP-2212 Path is not detaching properly under certain conditions
+
+==== Improvements
+
+* TINKERPOP-2089 Javascript DSL support
+* TINKERPOP-2179 Have o.a.t.g.driver.ser.SerializationException extend IOException
+* TINKERPOP-2181 Allow ctrl+c to break out of a long running process in Gremlin Console
+* TINKERPOP-2182 Remove gperfutils from Gremlin Console *(breaking)*
+* TINKERPOP-2191 Implement EdgeLabelVerificationStrategy
+* TINKERPOP-2211 Provide API to add per request option for a bytecode
+
+[[release-3-3-6]]
+=== TinkerPop 3.3.6 (Release Date: March 18, 2019)
+
+* Docker images use user `gremlin` instead of `root`
+* Added a new `ResponseStatusCode` for client-side serialization errors.
+* Refactored use of `commons-lang` to use `common-lang3` only, though dependencies may still use `commons-lang`.
+* Bumped `commons-lang3` to 3.8.1.
+* Improved handling of client-side serialization errors that were formerly just being logged rather than being raised.
+* Add Python `TraversalMetrics` and `Metrics` deserializers.
+* Masked sensitive configuration options in the logs of `KryoShimServiceLoader`.
+* Added `globalFunctionCacheEnabled` to the `GroovyCompilerGremlinPlugin` to allow that cache to be disabled.
+* Added `globalFunctionCacheEnabled` override to `SessionOpProcessor` configuration.
+* Added status code to `GremlinServerError` so that it would be more directly accessible during failures.
+* Added GraphSON serialization support for `Duration`, `Char`, `ByteBuffer`, `Byte`, `BigInteger` and `BigDecimal` in `gremlin-python`.
+* Added `ProfilingAware` interface to allow steps to be notified that `profile()` was being called.
+* Fixed bug where `profile()` could produce negative timings when `group()` contained a reducing barrier.
+* Improved logic determining the dead or alive state of a Java driver `Connection`.
+* Improved handling of dead connections and the availability of hosts.
+* Bumped `httpclient` to 4.5.7.
+* Bumped `slf4j` to 1.7.25.
+* Bumped `commons-codec` to 1.12.
+* Bumped to Groovy 2.5.6.
+* Bumped to Hadoop 2.7.7.
+* Fixed partial response failures when using authentication in `gremlin-python`.
+* Fixed concurrency issues in `TraverserSet.toString()` and `ObjectWritable.toString()`.
+* Fixed a bug in `InlineFilterStrategy` that mixed up and's and or's when folding merging conditions together.
+* Fixed a bug in `PartitionStrategy` where `addE()` as a start step was not applying the partition.
+* Improved handling of failing `Authenticator` instances thus improving server responses to drivers.
+* Improved performance of `JavaTranslator` by reducing calls to `Method.getParameters()`.
+* Implemented `EarlyLimitStrategy` which is supposed to significantly reduce backend operations for queries that use `range()`.
+* Reduced chance of hash collisions in `Bytecode` and its inner classes.
+* Added `Symbol.asyncIterator` member to the `Traversal` class to provide support for `await ... of` loops (async iterables).
+
+==== Bugs
+
+* TINKERPOP-2081 PersistedOutputRDD materialises rdd lazily with Spark 2.x
+* TINKERPOP-2091 Wrong/Missing feature requirements in StructureStandardTestSuite
+* TINKERPOP-2094 Gremlin Driver Cluster Builder serializer method does not use mimeType as suggested
+* TINKERPOP-2095 GroupStep looks for irrelevant barrier steps
+* TINKERPOP-2096 gremlinpython: AttributeError when connection is closed before result is received
+* TINKERPOP-2100 coalesce() creating unexpected results when used with order()
+* TINKERPOP-2105 Gremlin-Python connection not returned back to the pool on exception from gremlin server
+* TINKERPOP-2113 P.Within() doesn't work when given a List argument
+
+==== Improvements
+
+* TINKERPOP-1889 JavaScript GLV: Use heartbeat to prevent connection timeout
+* TINKERPOP-2010 Generate jsdoc for gremlin-javascript
+* TINKERPOP-2013 Process tests that are auto-ignored stink
+* TINKERPOP-2018 Generate API docs for Gremlin.Net
+* TINKERPOP-2038 Make groovy script cache size configurable
+* TINKERPOP-2050 Add a :bytecode command to Gremlin Console
+* TINKERPOP-2062 Add Traversal class to CoreImports
+* TINKERPOP-2065 Optimize iterate() for remote traversals
+* TINKERPOP-2067 Allow getting raw data from Gremlin.Net.Driver.IGremlinClient
+* TINKERPOP-2068 Bump Jackson Databind 2.9.7
+* TINKERPOP-2069 Document configuration of Gremlin.Net
+* TINKERPOP-2070 gremlin-javascript: Introduce Connection representation
+* TINKERPOP-2071 gremlin-python: the graphson deserializer for g:Set should return a python set
+* TINKERPOP-2073 Generate tabs for static code blocks
+* TINKERPOP-2074 Ensure that only NuGet packages for the current version are pushed
+* TINKERPOP-2077 VertexProgram.Builder should have a default create() method with no Graph
+* TINKERPOP-2078 Hide use of EmptyGraph or RemoteGraph behind a more unified method for TraversalSource construction
+* TINKERPOP-2084 For remote requests in console display the remote stack trace
+* TINKERPOP-2092 Deprecate default GraphSON serializer fields
+* TINKERPOP-2097 Create a DriverRemoteConnection with an initialized Client
+* TINKERPOP-2102 Deprecate static fields on TraversalSource related to remoting
+* TINKERPOP-2106 When gremlin executes timeout, throw TimeoutException instead of TraversalInterruptedException/InterruptedIOException
+* TINKERPOP-2110 Allow Connection on Different Path (from /gremlin)
+* TINKERPOP-2114 Document common Gremlin anti-patterns
+* TINKERPOP-2118 Bump to Groovy 2.4.16
+* TINKERPOP-2121 Bump Jackson Databind 2.9.8
+
+[[release-3-3-5]]
+=== TinkerPop 3.3.5 (Release Date: January 2, 2019)
+
+This release also includes changes from <<./changelog-3.2.x.asciidoc#release-3-2-11, 3.2.11>>.
+
+* Fixed and/or folding in `InlineFilterStrategy`.
+* Fixed configuration and serialization of `SubgraphStrategy` which was missing the `checkAdjacentVertices` flag.
+* Captured `TraversalInterruptionException` and converted to `TimeoutException` for `GremlinExecutor`.
+* Fixed a bug in `CoalesceStep` which squared the bulk if the step followed a `Barrier` step.
+* Fixed a bug in `GroupStep` that assigned wrong reducing bi-operators
+* Added `:bytecode` command to help developers debugging `Bytecode`-based traversals.
+* Added option to set the path for the URI on the Java driver.
+* Fixed `PersistedOutputRDD` to eager persist RDD by adding `count()` action calls.
+* Deserialized `g:Set` to a Python `Set` in GraphSON in `gremlin-python`.
+* Deprecated `StarGraph.builder()` and `StarGraph.Builder.build()` in favor of the more common "builder" patterns of `build()` and `create()` respectively.
+* Deprecated `Serializers.DEFAULT_RESULT_SERIALIZER` and `DEFAULT_REQUEST_SERIALIZER`.
+* Deprecated `TraversalSource#GREMLIN_REMOTE` and `TraversalSource#GREMLIN_REMOTE_CONNECTION_CLASS` moving them to `RemoteConnection`.
+* Fixed the setting of the default label for a `ReferenceVertex` when the original vertex was of type `ComputerAdjacentVertex`.
+* Changed Java driver to expect a generic `RemoteTraverser` object rather than the specific `DefaultRemoteTraverser`.
+* Better handled server disconnect condition for the `gremlin-python` driver by throwing a clear exception.
+* Display the remote stack trace in the Gremlin Console when scripts sent to the server fail.
+* Added `AnonymousTraversalSource` which provides a more unified means of constructing a `TraversalSource`.
+* Added `DriverRemoteConnection.using(Client)` to provide users better control over the number of connections being created.
+* Changed behavior of GraphSON deserializer in gremlin-python such that `g:Set` returns a Python `Set`.
+* Bumped to Groovy 2.4.16.
+* Fixed bug that prevented `TraversalExplanation` from serializing properly with GraphSON.
+* Changed behavior of `iterate()` in Python, Javascript and .NET to send `none()` thus avoiding unnecessary results being returned.
+* Provided for a configurable class map cache in the `GremlinGroovyScriptEngine` and exposed that in Gremlin Server.
+* `GraphProvider` instances can be annotated with `OptOut` configurations that will be applied in addition to the `OptOut` instances on a `Graph`.
+
+==== Bugs
+
+* TINKERPOP-2081 PersistedOutputRDD materialises rdd lazily with Spark 2.x
+* TINKERPOP-2091 Wrong/Missing feature requirements in StructureStandardTestSuite
+* TINKERPOP-2094 Gremlin Driver Cluster Builder serializer method does not use mimeType as suggested
+* TINKERPOP-2095 GroupStep looks for irrelevant barrier steps
+* TINKERPOP-2096 gremlinpython: AttributeError when connection is closed before result is received
+* TINKERPOP-2100 coalesce() creating unexpected results when used with order()
+* TINKERPOP-2113 P.Within() doesn't work when given a List argument
+
+==== Improvements
+
+* TINKERPOP-1889 JavaScript GLV: Use heartbeat to prevent connection timeout
+* TINKERPOP-2010 Generate jsdoc for gremlin-javascript
+* TINKERPOP-2013 Process tests that are auto-ignored stink
+* TINKERPOP-2018 Generate API docs for Gremlin.Net
+* TINKERPOP-2038 Make groovy script cache size configurable
+* TINKERPOP-2050 Add a :bytecode command to Gremlin Console
+* TINKERPOP-2062 Add Traversal class to CoreImports
+* TINKERPOP-2065 Optimize iterate() for remote traversals
+* TINKERPOP-2067 Allow getting raw data from Gremlin.Net.Driver.IGremlinClient
+* TINKERPOP-2069 Document configuration of Gremlin.Net
+* TINKERPOP-2070 gremlin-javascript: Introduce Connection representation
+* TINKERPOP-2071 gremlin-python: the graphson deserializer for g:Set should return a python set
+* TINKERPOP-2073 Generate tabs for static code blocks
+* TINKERPOP-2074 Ensure that only NuGet packages for the current version are pushed
+* TINKERPOP-2077 VertexProgram.Builder should have a default create() method with no Graph
+* TINKERPOP-2078 Hide use of EmptyGraph or RemoteGraph behind a more unified method for TraversalSource construction
+* TINKERPOP-2084 For remote requests in console display the remote stack trace
+* TINKERPOP-2092 Deprecate default GraphSON serializer fields
+* TINKERPOP-2097 Create a DriverRemoteConnection with an initialized Client
+* TINKERPOP-2102 Deprecate static fields on TraversalSource related to remoting
+* TINKERPOP-2106 When gremlin executes timeout, throw TimeoutException instead of TraversalInterruptedException/InterruptedIOException
+* TINKERPOP-2110 Allow Connection on Different Path (from /gremlin)
+* TINKERPOP-2114 Document common Gremlin anti-patterns
+* TINKERPOP-2118 Bump to Groovy 2.4.16
+* TINKERPOP-2121 Bump Jackson Databind 2.9.8
+
+[[release-3-3-4]]
+=== TinkerPop 3.3.4 (Release Date: October 15, 2018)
+
+This release also includes changes from <<./changelog-3.2.x.asciidoc#release-3-2-10, 3.2.10>>.
+
+* Added synchronized `Map` to Gryo 3.0 registrations.
+* Removed `timedInterrupt` from documentation as a way to timeout.
+* Deprecated `Order` for `incr` and `decr` in favor of `asc` and `desc`.
+* Fixed bug in `math()` for OLAP where `ComputerVerificationStrategy` was incorrectly detecting path label access and preventing execution.
+
+==== Bugs
+
+* TINKERPOP-1898 Issue with bindings in strategies and lambdas
+* TINKERPOP-1933 gremlin-python maximum recursion depth exceeded on large responses
+* TINKERPOP-1958 TinkerGraphCountStrategy can return wrong counts
+* TINKERPOP-1961 Duplicate copies of images directory in docs
+* TINKERPOP-1962 GroovyTranslator doesn't handle empty maps
+* TINKERPOP-1963 Use of reducing step in choose()
+* TINKERPOP-1972 inject() tests are throwing exceptions in .NET GLV tests
+* TINKERPOP-1978 Check for Websocket connection state when retrieved from Connection Pool missing
+* TINKERPOP-1979 Several OLAP issues in MathStep
+* TINKERPOP-1988 minor error in documentation
+* TINKERPOP-1999 [Java][gremlin-driver] Query to a remote server via the websocket client hangs indefinitely if the server becomes unavailable
+* TINKERPOP-2005 Intermittent NullPointerException in response handling
+* TINKERPOP-2009 Pick.any and Pick.none should be exposed in Gremlin-JavaScript
+* TINKERPOP-2021 Prevent maximum recursion depth failure
+* TINKERPOP-2030 KeepAlive task executed for every Connection.write call
+* TINKERPOP-2032 Update jython-standalone
+* TINKERPOP-2044 Cannot reconnect to Azure cosmos host that becomes available again
+
+==== Improvements
+
+* TINKERPOP-1113 GraphComputer subclasses should support native methods
+* TINKERPOP-1365 Log the seed used to initialize Random in tests
+* TINKERPOP-1447 Add some JavaScript intelligence to the documentation so that comments and output are not copied in a copy paste
+* TINKERPOP-1595 Go through TraversalVertexProgram with a profile and optimize.
+* TINKERPOP-1778 Do not promote timedInterrupt option for Gremlin Server script processing
+* TINKERPOP-1780 Add authentication tests for gremlin-python
+* TINKERPOP-1836 .NET sample project
+* TINKERPOP-1841 Include Python GLV tests on TravisCI
+* TINKERPOP-1864 Gremlin Python tests for GraphSON 2.0 and 3.0
+* TINKERPOP-1897 Provide Docker images of Gremlin Server and Console
+* TINKERPOP-1945 Add support for extended GraphSon types to Gremlin.net
+* TINKERPOP-1951 gremlin-server.bat doesn't support paths containing spaces
+* TINKERPOP-1956 Deprecate Order incr/decr for asc/desc
+* TINKERPOP-1959 Provide a way to submit scripts to the server in gremlin-javascript
+* TINKERPOP-1968 Refactor elements of Gremlin Server testing
+* TINKERPOP-1976 Include Computer tests for GLVs
+* TINKERPOP-1977 Gremlin-JavaScript: Support SASL authentication
+* TINKERPOP-1985 Update position on bulk loading
+* TINKERPOP-1989 Preserve order that plugins are applied in Gremlin Console
+* TINKERPOP-1995 DriverRemoteConnection close() method returns undefined
+* TINKERPOP-2011 Use NumberHelper on choose()
+* TINKERPOP-2012 Target .NET Standard 2.0 for Gremlin.Net
+* TINKERPOP-2015 Allow users to configure the WebSocket connections
+* TINKERPOP-2016 Upgrade Jackson FasterXML to 2.9.5 or later to fix security vulnerability
+* TINKERPOP-2017 Check for Column in by()
+* TINKERPOP-2022 Cluster SSL should trust default ca certs by default
+* TINKERPOP-2023 Gremlin Server should not create self-signed certs *(breaking)*
+* TINKERPOP-2024 Gremlin Server Application archetype should connect via withRemote
+* TINKERPOP-2025 Change to SHA-256/512 and drop SHA-1 for releases
+* TINKERPOP-2026 Gremlin.Net.Driver should check ClientWebSocket.State before closing
+* TINKERPOP-2034 Register synchronizedMap() with Gryo
+* TINKERPOP-2035 Gremlin-JavaScript: Pass custom headers to the websocket connection
+* TINKERPOP-2040 Improve flexibility of GroovyTranslator to handle custom types
+* TINKERPOP-2045 Remove non-indy groovy dependencies
+* TINKERPOP-2055 Provide support for special number cases like Infinity in GraphSON
+* TINKERPOP-2056 Use NumberHelper in Compare
+
+[[release-3-3-3]]
+=== TinkerPop 3.3.3 (Release Date: May 8, 2018)
+
+This release also includes changes from <<./changelog-3.2.x.asciidoc#release-3-2-9, 3.2.9>>.
+
+* Implemented `TraversalSelectStep` which allows to `select()` runtime-generated keys.
+* Coerced `BulkSet` to `g:List` in GraphSON 3.0.
+* Deprecated `CredentialsGraph` DSL in favor of `CredentialsTraversalDsl` which uses the recommended method for Gremlin DSL development.
+* Allowed `iterate()` to be called after `profile()`.
+
+==== Bugs
+
+* TINKERPOP-1869 Profile step and iterate do not play nicely with each other
+* TINKERPOP-1927 Gherkin scenario expects list with duplicates, but receives g:Set
+* TINKERPOP-1947 Path history isn't preserved for keys in mutations
+
+==== Improvements
+
+* TINKERPOP-1628 Implement TraversalSelectStep
+* TINKERPOP-1755 No docs for ReferenceElements
+* TINKERPOP-1903 Credentials DSL should use the Java annotation processor
+* TINKERPOP-1912 Remove MD5 checksums
+* TINKERPOP-1934 Bump to latest version of httpclient
+* TINKERPOP-1936 Performance enhancement to Bytecode deserialization
+* TINKERPOP-1943 JavaScript GLV: Support GraphSON3
+* TINKERPOP-1944 JavaScript GLV: DriverRemoteConnection is not exported in the root module
+* TINKERPOP-1950 Traversal construction performance enhancements
+* TINKERPOP-1953 Bump to Groovy 2.4.15
+
+[[release-3-3-2]]
+=== TinkerPop 3.3.2 (Release Date: April 2, 2018)
+
+This release also includes changes from <<./changelog-3.2.x.asciidoc#release-3-2-8, 3.2.8>>.
+
+* Fixed regression issue where the HTTPChannelizer doesn't instantiate the specified AuthenticationHandler.
+* Defaulted GLV tests for gremlin-python to run for GraphSON 3.0.
+* Fixed a bug with `Tree` serialization in GraphSON 3.0.
+* In gremlin-python, the GraphSON 3.0 `g:Set` type is now deserialized to `List`.
+
+==== Bugs
+
+* TINKERPOP-1053 installed plugins are placed in a directory relative to where gremlin.sh is started
+* TINKERPOP-1509 Failing test case for tree serialization
+* TINKERPOP-1738 Proper functioning of GraphSONReader depends on order of elements in String representation
+* TINKERPOP-1758 RemoteStrategy should be before all other DecorationStrategies.
+* TINKERPOP-1855 Update Rexster links
+* TINKERPOP-1858 HttpChannelizer regression: Does not create specified AuthenticationHandler
+* TINKERPOP-1859 Complex instance of P not serializing to bytecode properly
+* TINKERPOP-1860 valueMap(True) result in error in gremlin-python
+* TINKERPOP-1862 TinkerGraph VertexProgram message passing doesn't work properly when using Direction.BOTH
+* TINKERPOP-1867 union() can produce extra traversers
+* TINKERPOP-1872 Apply edgeFunction in SparkMessenger
+* TINKERPOP-1873 min() and max() work only in the range of Integer values
+* TINKERPOP-1874 P does not appear to be serialized consistently in GraphSON
+* TINKERPOP-1875 Gremlin-Python only aggregates to list when using GraphSON3
+* TINKERPOP-1879 Gremlin Console does not resepect equal sign for flag argument assignments
+* TINKERPOP-1880 Gremlin.NET Strong name signature could not be verified. (HRESULT: 0x80131045)
+* TINKERPOP-1883 gremlinpython future will never return
+* TINKERPOP-1890 getAnonymousTraversalClass() is not being generated for Java DSLs
+* TINKERPOP-1891 Serialization of P.not() for gremlin-javascript
+* TINKERPOP-1892 GLV test failures for .NET
+* TINKERPOP-1894 GraphSONMessageSerializerV2d0 fails to deserialize valid P.not()
+* TINKERPOP-1896 gremlin-python lambdas error
+* TINKERPOP-1907 Fix failing GLV test for withSack() in .NET
+* TINKERPOP-1917 gx:BigDecimal serialization broken in Gremlin.Net on systems with ',' as decimal separator
+* TINKERPOP-1918 Scenarios fail because of wrong numerical types
+* TINKERPOP-1919 Gherkin runner doesn't work with P.And() and P.Or() in Gremlin.Net
+* TINKERPOP-1920 Tests fail because P.Within() arguments are wrapped in an array in Gremlin.Net
+* TINKERPOP-1922 Gherkin features fail that contain P.not() in Gremlin.Net
+
+==== Improvements
+
+* TINKERPOP-1357 Centrality Recipes should mention pageRank and OLAP.
+* TINKERPOP-1489 Provide a Javascript Gremlin Language Variant
+* TINKERPOP-1586 SubgraphStrategy in OLAP
+* TINKERPOP-1726 Support WebSockets ping/pong keep-alive in Gremlin server
+* TINKERPOP-1842 iterate() missing in terminal steps documentation
+* TINKERPOP-1844 Python GLV test should run for GraphSON 3.0 *(breaking)*
+* TINKERPOP-1850 Range step has undocumented special values
+* TINKERPOP-1854 Support lambdas in Gremlin.Net
+* TINKERPOP-1857 GLV test suite consistency and completeness
+* TINKERPOP-1863 Delaying the setting of requestId till the RequestMessage instantiation time
+* TINKERPOP-1865 Run Gremlin .NET GLV tests with GraphSON 3.0
+* TINKERPOP-1866 Support g:T for .NET
+* TINKERPOP-1868 Support inject source step in Gremlin.Net
+* TINKERPOP-1870 n^2 synchronious operation in OLAP WorkerExecutor.execute() method
+* TINKERPOP-1871 Exception handling is slow in element ReferenceElement creation
+* TINKERPOP-1877 Add new graph data for specialized testing scenarios
+* TINKERPOP-1884 Bump to Netty 4.0.56.Final
+* TINKERPOP-1885 Various Gremlin.Net documentation updates
+* TINKERPOP-1901 Enable usage of enums in more steps in Gremlin.Net
+* TINKERPOP-1908 Bump to Groovy 2.4.14
+* TINKERPOP-1911 Refactor JavaTranslator to cache all reflective calls
+* TINKERPOP-1914 Support construct a GremlinServer instance from gremlin executor service
+
+[[release-3-3-1]]
+=== TinkerPop 3.3.1 (Release Date: December 17, 2017)
+
+This release also includes changes from <<./changelog-3.2.x.asciidoc#release-3-2-7, 3.2.7>>.
+
+* Added `NoneStep` and `Traversal.none()` for full filtering integration with `iterate()`.
+* Fixed bug in serialization of `Path` for GraphSON 3.0 in `gremlin-python`.
+* Added support for GraphSON 3.0 in Gremlin.Net.
+* Added `math()`-step which supports scientific calculator capabilities for numbers within a traversal.
+* Added missing `GraphTraversalSource.addE()`-method to `GremlinDslProcessor`.
+* Changed `to()` and `from()` traversal-based steps to take a wildcard `?` instead of of `E`.
+* Added `addV(traversal)` and `addE(traversal)` so that created element labels can be determined dynamically.
+* `PageRankVertexProgram` supports `maxIterations` but will break out early if epsilon-based convergence occurs.
+* Added support for epsilon-based convergence in `PageRankVertexProgram`.
+* Fixed two major bugs in how PageRank was being calculated in `PageRankVertexProgram`.
+* Added `Io.requiresVersion(Object)` to allow graph providers a way to check the `Io` type and version being constructed.
+* Defaulted `IoCore.gryo()` and `IoCore.graphson()` to both use their 3.0 formats which means that `Graph.io()` will use those by default.
+* Bumped Neo4j 3.2.3
+
+==== Bugs
+
+* TINKERPOP-1773 Lop should be created as a "software" and not a "person"
+* TINKERPOP-1783 PageRank gives incorrect results for graphs with sinks *(breaking)*
+* TINKERPOP-1799 Failure to serialize path() in gremlin-python
+* TINKERPOP-1847 tinkergraph-gremlin dependency on gremlin-test, bad scope?
+
+==== Improvements
+
+* TINKERPOP-1632 Create a set of default functions
+* TINKERPOP-1692 Bump to Neo4j 3.2.3
+* TINKERPOP-1717 Update name and link of DynamoDB storage backend in landing page
+* TINKERPOP-1730 Gremlin .NET support for GraphSON 3.0
+* TINKERPOP-1767 Method for graph providers to check an IO version and type
+* TINKERPOP-1793 addE() should allow dynamic edge labels
+* TINKERPOP-1834 Consider iterate() as a first class step
+
+[[release-3-3-0]]
+=== TinkerPop 3.3.0 (Release Date: August 21, 2017)
+
+This release also includes changes from <<./changelog-3.2.x.asciidoc#release-3-2-6, 3.2.6>>.
+
+* Removed previously deprecated `ScriptElementFactory`.
+* Added `GraphTraversalSource.addE(String)` in support of `g.addE().from().to()`.
+* Added support for `to(Vertex)` and `from(Vertex)` as a shorthand for `to(V(a))` and `from(V(b))`.
+* Bumped to support Spark 2.2.0.
+* Detected if type checking was required in `GremlinGroovyScriptEngine` and disabled related infrastructure if not.
+* Removed previously deprecated `GraphTraversal.selectV3d0()` step.
+* Removed previously deprecated `DetachedEdge(Object,String,Map,Pair,Pair)` constructor.
+* Removed previously deprecated `Bindings` constructor. It is now a private constructor.
+* Removed previously deprecated `TraversalSource.withBindings()`.
+* Removed previously deprecated `GraphTraversal.sack(BiFunction,String)`.
+* `TraversalMetrics` and `Metrics` Gryo 1.0 formats changed given internal changes to their implementations.
+* Made `TraversalMetrics` safe to write to from multiple threads.
+* Removed previously deprecated `TraversalSideEffects` methods.
+* Removed previously deprecated `finalization.LazyBarrierStrategy` (moved to `optimization.LazyBarrierStrategy`).
+* Removed previously deprecated `Constants` in Hadoop.
+* Removed previously deprecated `VertexComputing.generateComputer(Graph)`.
+* Removed previously deprecated `ConfigurationTraversal`.
+* Established the Gryo 3.0 format.
+* `GryoVersion` now includes a default `ClassResolver` to supply to the `GryoMapper`.
+* `GryoClassResolver` renamed to `GryoClassResolverV1d0` which has an abstract class that for providers to extend in `AbstractGryoClassResolver`.
+* Removed previously deprecated `Order` enums of `keyIncr`, `keyDecr`, `valueIncr`, and `valueDecr.`
+* Removed previously deprecated `GraphTraversal.mapKeys()` step.
+* Removed previously deprecated `GraphTraversal.mapValues()` step.
+* Removed previously deprecated `GraphTraversal#addV(Object...)`.
+* Removed previously deprecated `GraphTraversal#addE(Direction, String, String, Object...)`.
+* Removed previously deprecated `GraphTraversal#addOutE(String, String, Object...)`.
+* Removed previously deprecated `GraphTraversal#addInV(String, String, Object...)`.
+* Removed previously deprecated `GraphTraversal.groupV3d0()` and respective `GroupSideEffectStepV3d0` and `GroupStepV3d0`.
+* Removed previously deprecated `TraversalSource.Builder` class.
+* Removed previously deprecated `ConnectiveP`, `AndP`, `OrP` constructors.
+* Removed previously deprecated `TraversalScriptFunction` class.
+* Removed previously deprecated `TraversalScriptHelper` class.
+* Removed previously deprecated `ScriptEngineCache` class.
+* Removed previously deprecated `CoreImports` class.
+* Removed previously deprecated `GremlinJythonScriptEngine#()` constructor.
+* Removed access to previously deprecated `CoreGremlinPlugin#INSTANCE` field.
+* `gremlin.sh` and `gremln.bat` no longer support the option to pass a script as an argument for execution mode without using the `-i` option.
+* Graphite and Ganglia are no longer packaged with the Gremlin Server distribution.
+* `TransactionException` is no longer a class of `AbstractTransaction` and it extends `RuntimeException`.
+* Included an ellipse on long property names that are truncated.
+* Renamed `RangeByIsCountStrategy` to `CountStrategy`.
+* Added more specific typing to various `__` traversal steps. E.g. `<A,Vertex>out()` is `<Vertex,Vertex>out()`.
+* Updated Docker build scripts to include Python dependencies (NOTE: users should remove any previously generated TinkerPop Docker images).
+* Added "attachment requisite" `VertexProperty.element()` and `Property.element()` data in GraphSON serialization.
+* GraphSON 3.0 is now the default serialization format in TinkerGraph and Gremlin Server.
+* Changed `ServerGremlinExecutor` to not use generics since there really is no flexibility in the kind of `ScheduledExecutorService` that will be used.
+* Removed support for passing a byte array on the `sasl` parameter.
+* Removed previously deprecated `GraphSONMapper$Builder#embedTypes` option.
+* Removed previously deprecated `:remote config timeout max`.
+* Removed previously deprecated `ConnectionPoolSettings.sessionId` and `ConnectionPoolSettings.optionalSessionId()`.
+* Removed previously deprecated `reconnectInitialDelay` setting from the Java driver.
+* Removed previously deprecated `useMapperFromGraph` option.
+* Established the GraphSON 3.0 format with new `g:Map`, `g:List` and `g:Set` types.
+* Removed previously deprecated `Io.Builder#registry(IoRegistry)` method.
+* Removed previously deprecated `GryoMessageSerializerV1d0(GryoMapper)` constructor.
+* Removed previously deprecated `TinkerIoRegistry`.
+* Removed previously deprecated `getInstance()` methods on all TinkerPop classes.
+* Removed previously deprecated `VertexPropertyFeatures.supportsAddProperty()`.
+* Removed previously deprecated TinkerGraph configuration member variables.
+* Removed previously deprecated `Transaction.submit(Function)`.
+* Removed previously deprecated `OpSelectorHandler.errorMeter` and `AbstractEvalOpProcessor.errorMeter` fields.
+* Removed previously deprecated `AbstractEvalOpProcessor.validBindingName` field.
+* Removed previously deprecated `SimpleAuthenticator.CONFIG_CREDENTIALS_LOCATION` field.
+* Removed previously deprecated `IteratorHandler`, `NioGremlinResponseEncoder` and `WsGremlinResponseEncoder` classes.
+* Removed previously deprecated `Session.kill()` and `Session.manualKill()`.
+* Removed previously deprecated `Authenticator.newSaslNegotiator()` and its method implementations in classes that were assignable to that interface.
+* Removed `gremlin-groovy-test`.
+* Removed previously deprecated "G" functions in `gremlin-groovy` (i.e. `GFunction`).
+* Removed references to the old `GremlinPlugin` system that was in `gremlin-groovy` - the revised `GremlinPlugin` system in `gremlin-core` is the only one now in use.
+* `GremlinGroovyScriptEngine` no longer implements the now removed `DependencyManager`.
+* Added `Vertex`, `Edge`, `VertexProperty`, and `Property` serializers to Gremlin-Python and exposed tests that use graph object arguments.
+* `Bytecode.getSourceInstructions()` and `Bytecode.getStepInstructions()` now returns `List<Instruction>` instead of `Iterable<Instruction>`.
+* Added various `TraversalStrategy` registrations with `GryoMapper`.
+* Fixed a naming mistake in Gremlin-Python: `IdentityRemoveStrategy` is now called `IdentityRemovalStrategy`.
+* Added `TranslationStrategy` test infrastructure that verifies `Bytecode` generated from a translation is equal to the original `Bytecode`.
+* Moved `NumberHelper` into the `org.apache.tinkerpop.gremlin.util` package.
+* Added `Pop.mixed` instead of using `null` to represent such semantics.
+* `select()`-step now defaults to using `Pop.last` instead of `Pop.mixed`.
+* Added `gremlin-io-test` module to validate IO formats.
+* `RequestMessage` and `ResponseMessage` are now registered with `GryoMapper` as part of the TinkerPop range of type identifiers.
+* Removed previously deprecated `Console` constructor that took a `String` as an argument from `gremlin-console`.
+* Removed previously deprecated `ConcurrentBindings` from `gremlin-groovy`.
+* Removed previously deprecated `ScriptExecutor` from `gremlin-groovy`.
+* Removed previously deprecated `SandboxExtension` from `gremlin-groovy`.
+* Removed previously deprecated `GremlinGroovyScriptEngine` constructor that took `ImportCustomizerProvider` as an argument from `gremlin-groovy`.
+* Removed previously deprecated `GremlinGroovyScriptEngine#plugins()` from `gremlin-groovy`.
+* Added `OptionalStep` for use with `optional()` to better handle issues associated with branch side-effects.
+* `UnfoldStep` now supports unfolding of arrays.
+* Removed all performance tests that were not part of `gremlin-benchmark`.
+* Removed dependency on `junit-benchmarks` and it's related reference to `h2`.
+* Moved the source for the "home page" into the repository under `/site` so that it easier to accept contributions.
+* Added `UnshadedKryoShimService` as the new default serializer model for `SparkGraphComputer`.
+* `GryoRegistrator` is more efficient than the previous `GryoSerializer` model in `SparkGraphComputer`.
+* Added support for `IoRegistry` custom serialization in Spark/Giraph and provided a general `hadoop-gremlin` test suite.
+* Replaced term `REST` with `HTTP` to remove any confusion as to the design of the API.
+* Moved `gremlin-benchmark` under `gremlin-tools` module.
+* Added `gremlin-tools` and its submodule `gremlin-coverage`.
+* Removed `tryRandomCommit()` from `AbstractGremlinTest`.
+* Changed `gremlin-benchmark` system property for the report location to `benchmarkReportDir` for consistency.
+* Added SysV and systemd init scripts.
+* `GraphTraversal.valueMap(includeTokens,propertyKeys...)` now returns a `Map<Object,E>` since keys could be `T.id` or `T.label`.
+* Added `skip(long)` and `skip((Scope,long)` which call the `range(low,high)` equivalents with -1 as the high.
+* Added Kerberos authentication to `gremlin-server` for websockets and nio transport.
+* Added audit logging of authenticated users and gremlin queries to `gremlin-server`.
+
+==== Bugs
+
+* TINKERPOP-1211 UnfoldStep should unfold arrays. *(breaking)*
+* TINKERPOP-1426 GryoSerializer should implement Java serialization interface
+* TINKERPOP-1465 Remove deprecated newSaslNegotiator *(breaking)*
+* TINKERPOP-1483 PropertyMapStep returns Map<String,E> but puts non String keys in it!
+* TINKERPOP-1520 Difference between 'has' step generated graphson2.0 in java and python glv implementation
+* TINKERPOP-1533 Storage and IoRegistry
+* TINKERPOP-1597 PathRetractionStrategy messing up certain traversals
+* TINKERPOP-1635 gremlin-python: Duplicate serialization of element property in PropertySerializer
+* TINKERPOP-1658 Graphson2 map keys are serialised as strings
+* TINKERPOP-1716 Traversal strategies are not applied with remote in Gremlin Console
+
+==== Improvements
+
+* TINKERPOP-832 Remove deprecated addV/E/InE/OutE methods *(breaking)*
+* TINKERPOP-833 Remove deprecated GremlinGroovyScriptEngine constructor and plugins() *(breaking)*
+* TINKERPOP-834 Remove deprecated sack() method *(breaking)*
+* TINKERPOP-880 Remove deprecated GroupStepV3d0 and GroupSideEffectStepV3d0 *(breaking)*
+* TINKERPOP-929 Remove Deprecated TinkerGraph public static methods. *(breaking)*
+* TINKERPOP-980 Add a service script or daemon mode in the distribution *(breaking)*
+* TINKERPOP-999 ServerGremlinExecutor construction need not use generics for ExecutorService *(breaking)*
+* TINKERPOP-1004 Make Transaction.commit() failures consistent across implementations. *(breaking)*
+* TINKERPOP-1010 Remove deprecated credentialsDbLocation for SimpleAuthenticator *(breaking)*
+* TINKERPOP-1024 Remove deprecated tryRandomCommit() *(breaking)*
+* TINKERPOP-1028 Remove deprecated ConnectionPoolSettings session settings *(breaking)*
+* TINKERPOP-1040 Remove deprecated SandboxExtension *(breaking)*
+* TINKERPOP-1046 Remove deprecated Gremlin Server handler implementations *(breaking)*
+* TINKERPOP-1049 Remove deprecated error meter member variables in Gremlin Server handlers *(breaking)*
+* TINKERPOP-1094 Remove deprecated VertexPropertyFeatures.FEATURE_ADD_PROPERTY *(breaking)*
+* TINKERPOP-1116 Some anonymous traversal steps can be hard typed. *(breaking)*
+* TINKERPOP-1130 Each release should store Kryo/GraphSON/GraphML versions to ensure future compatibility *(breaking)*
+* TINKERPOP-1142 Remove deprecated valueIncr, valueDecr, keyIncr, keyDecr. *(breaking)*
+* TINKERPOP-1169 Remove deprecated TraversalScriptFunction and TraversalScriptHelper *(breaking)*
+* TINKERPOP-1170 Remove deprecated ConfigurationTraversal. *(breaking)*
+* TINKERPOP-1171 Remove deprecated TraversalSource.Builder *(breaking)*
+* TINKERPOP-1235 Remove deprecated ProcessPerformanceSuite and TraversalPerformanceTest *(breaking)*
+* TINKERPOP-1275 Remove deprecated max setting for :remote *(breaking)*
+* TINKERPOP-1283 Remove deprecated ScriptExecutor *(breaking)*
+* TINKERPOP-1289 Remove deprecated ConnectiveP, AndP, and OrP constructors. *(breaking)*
+* TINKERPOP-1291 Remove deprecated mapValues and mapKeys methods *(breaking)*
+* TINKERPOP-1313 Rename RangeByIsCountStrategy *(breaking)*
+* TINKERPOP-1316 Remove deprecated constructor from GryoMessageSerializers *(breaking)*
+* TINKERPOP-1327 Bring GryoRegistrator to the forefront and deprecate GryoSerializer *(breaking)*
+* TINKERPOP-1363 Cleanup Docker build script for next major release *(breaking)*
+* TINKERPOP-1369 Replace REST API with HTTP API
+* TINKERPOP-1389 Support Spark 2.0.0
+* TINKERPOP-1399 NumberHelper needs to go into util and have a private constructor *(breaking)*
+* TINKERPOP-1404 Path/label optimization
+* TINKERPOP-1408 Remove Deprecated Io.Builder.registry() *(breaking)*
+* TINKERPOP-1414 Change default GraphSON version to 3.0 *(breaking)*
+* TINKERPOP-1420 Remove deprecated ConcurrentBindings in gremlin-groovy *(breaking)*
+* TINKERPOP-1421 Remove deprecated ControlOps *(breaking)*
+* TINKERPOP-1427 GraphSON 3.0 needs collection types and consistent number typing.
+* TINKERPOP-1443 Use an API checker during build
+* TINKERPOP-1445 Large nested VertexProperties and Properties do not get printed well
+* TINKERPOP-1454 Create Serializers for Graph objects in Gremlin-Python
+* TINKERPOP-1481 Remove deprecated reconnectInitialDelay in Java driver *(breaking)*
+* TINKERPOP-1485 Move source for TinkerPop site to source code repo
+* TINKERPOP-1506 Optional/Coalesce should not allow sideEffect traversals.
+* TINKERPOP-1514 Restructure for gremlin-tools module *(breaking)*
+* TINKERPOP-1524 Bytecode.getXXXInstructions should return a List, not Iterable.
+* TINKERPOP-1526 Remove deprecated Session kill() overloads *(breaking)*
+* TINKERPOP-1536 Include GLVs in Docker build
+* TINKERPOP-1541 Select should default to Pop.last semantics *(breaking)*
+* TINKERPOP-1549 Implement skip()
+* TINKERPOP-1550 Make Graphite and Ganglia optional dependencies
+* TINKERPOP-1563 Remove deprecated getInstance() methods *(breaking)*
+* TINKERPOP-1565 Setup GraphSON 3.0
+* TINKERPOP-1566 Kerberos authentication for gremlin-server
+* TINKERPOP-1574 Get rid of untyped GraphSON in 3.0
+* TINKERPOP-1603 Remove support for SASL byte array in protocol *(breaking)*
+* TINKERPOP-1612 Remove gremlin-groovy-test module *(breaking)*
+* TINKERPOP-1621 Remove deprecated GremlnPlugin and related infrastructure *(breaking)*
+* TINKERPOP-1622 Remove deprecated G functions in gremlin-groovy *(breaking)*
+* TINKERPOP-1651 Remove deprecated gremlin.sh init syntax *(breaking)*
+* TINKERPOP-1686 Make TraversalMetrics thread safe *(breaking)*
+* TINKERPOP-1698 Gryo 3.0
+* TINKERPOP-1699 Remove deprecated userMapperFromGraph *(breaking)*
+* TINKERPOP-1700 Remove deprecated embedTypes option
+* TINKERPOP-1706 Remove deprecated ScriptEngineCache and related dead code *(breaking)*
+* TINKERPOP-1715 Bump to Spark 2.2
+* TINKERPOP-1719 Remove deprecated Traversal related code *(breaking)*
+* TINKERPOP-1720 Remove deprecated Hadoop code *(breaking)*
+* TINKERPOP-1721 Remove deprecated Bindings related code *(breaking)*
+* TINKERPOP-1724 Remove deprecated ScriptElementFactory
+* TINKERPOP-1729 Remove deprecated select steps.
+* TINKERPOP-1740 Add vertex parameter overload to to() and from()
+* TINKERPOP-1747 Streamline inheritance for gremlin-python GraphSON serializer classes
\ No newline at end of file
diff --git a/docs/archive/changelogs/changelog-3.4.x.asciidoc b/docs/archive/changelogs/changelog-3.4.x.asciidoc
new file mode 100644
index 0000000..7a2a6d9
--- /dev/null
+++ b/docs/archive/changelogs/changelog-3.4.x.asciidoc
@@ -0,0 +1,800 @@
+////
+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.
+////
+== TinkerPop 3.4.0 (Avant-Gremlin Construction #3 for Theremin and Flowers)
+
+image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/images/avant-gremlin.png[width=185]
+
+[[release-3-4-13]]
+=== TinkerPop 3.4.13 (Release Date: January 10, 2022)
+
+* Fixed `RangeGlobalStep` which was prematurely closing the iterator.
+* Added explicit state to `DefaultTraversal` to track whether or not it was fully iterated and closed to ensure it released resources properly.
+* Prevented XML External Entity (XXE) style attacks via `GraphMLReader` by disabling DTD and external entities by default.
+* Improved error message for failed serialization for HTTP-based requests.
+* Fixed a `NullPointerException` that could occur during a failed `Connection` initialization due to uninstantiated `AtomicInteger`.
+* Minor changes to the initialization of Java driver `Cluster` and `Client` such that hosts are marked as available only after successfully initializing connection pools.
+* `NoHostAvailableException` now contains a cause for the failure.
+* Bumped to Netty 4.1.72.
+* Added user-friendly message in Gremlin console for unavailable hosts upon initiation and fixed possible leak in `RemoteCommand.groovy` upon `RemoteException`.
+
+==== Bugs
+
+* TINKERPOP-2569 Reconnect to server if Java driver fails to initialize
+* TINKERPOP-2589 XML External Entity (XXE) vulnerability
+* TINKERPOP-2597 NullPointerException while initializing connection pool
+* TINKERPOP-2603 TinkerGraph sometimes could not query float values.
+* TINKERPOP-2609 HTTP returns serialization exceptions for the GraphTraversalSource
+* TINKERPOP-2626 RangeGlobalStep closes traversal prematurely
+
+==== Improvements
+
+* TINKERPOP-2504 Intermittently failing server/driver integration tests
+* TINKERPOP-2616 Provide better exceptions with SSL related failures *(breaking)*
+* TINKERPOP-2630 Clarify that a server cannot support Graphson1.0 over HTTP
+* TINKERPOP-2632 Netty 4.1.61 flagged with two high severity security violations
+* TINKERPOP-2669 Netty 4.1.61 flagged with medium severity security violations
+
+[[release-3-4-12]]
+=== TinkerPop 3.4.12 (Release Date: July 19, 2021)
+
+* Coerced single `set` arguments to `P.within` and `P.without` to `list` in Python which serializes to a more expected form for `P` instances.
+* Fixed bug in the `vertexLabelKey` validation for `GraphMLWriter` which was inadvertently validating the `edgeLabelKey`.
+* Changed `IndexStep` to make it easier for providers to determine the type of indexer being used.
+* Allowed Javascript `Translator` to take `Bytecode` or a `Traversal`.
+* Addressed CVE-2021-32640 for gremlin-javascript.
+* Allowed construction of `DriverRemoteConnection` in .NET to use host and port specification similar to Java syntax.
+* Defaulted `DriverRemoteConnection` to "g" if it the `TraversalSource` binding isn't supplied in Python.
+* Initialized metrics in `ProfileStep` even if the step hasn't iterated.
+
+==== Bugs
+
+* TINKERPOP-2358 Potential connection leak on client disposing
+* TINKERPOP-2554 Extracting step metrics from ProfileStep throws NPE if the step was not triggered
+* TINKERPOP-2565 GraphMLWriter does not check vertexLabelKey conflict
+* TINKERPOP-2578 Set arguments to P within/without are wrapped in List
+* TINKERPOP-2580 Update the custom DSL documentation
+
+==== Improvements
+
+* TINKERPOP-2548 Add getter for indexer used in IndexStep
+* TINKERPOP-2577 Remove unused test coverage dependencies from Gremlin.NET
+
+[[release-3-4-11]]
+=== TinkerPop 3.4.11 (Release Date: May 3, 2021)
+
+* Prevented Java driver from sending multiple request messages with the same identifier.
+* Improved error message for `property(T,Object)` when mutating graph elements.
+* Added method caching for GraphSON 3.0 deserialization of `P` and `TextP` instances.
+* Allowed setting `ssl_options` for gremlin-python.
+* Fixed bug with global `dedup()` when used in reducing `by()` of `group()`.
+* Fixed bug with Javascript Groovy `Translator` when generating Gremlin with multiple embedded traversals.
+* Modified Gremlin Server `Settings` to be more extensible allowing for custom options with the YAML parser.
+* Fixed `toString()` representation of `P` when string values are present in Javascript.
+* Exposed barrier size with getter for `NoOpBarrierStep`.
+* Bumped to Netty 4.1.61.
+* Added `max_content_length` as a Python driver setting.
+* Fixed bug in Java `Client` initialization, reconnect and shutdown where certain thread pool configurations might produce a deadlock.
+* Ensured that `barrier()` additions by strategies were controlled solely by `LazyBarrierStrategy`.
+* Fixed `NullPointerException` in `ResponseMessage` deserialization for GraphSON.
+* Enabled the Gremlin.Net driver to repair its connection pool after the server was temporarily unavailable.
+* Added the ability to supply a `HandshakeInterceptor` to a `Cluster` which will provide access to the initial HTTP request that establishes the websocket.
+* Fixed a possible leakage of connections in the Gremlin.NET driver that could happen if `Dispose()` was called while the pool was creating connections.
+
+==== Bugs
+
+* TINKERPOP-2512 Duplicate jars in classpath when running gremlin-server.sh
+* TINKERPOP-2514 Java client driver requests with same request ids hang
+* TINKERPOP-2516 Property folding has trouble with coalesce
+* TINKERPOP-2529 Global dedup() in reducing by() of group() detaches elements for OLTP
+* TINKERPOP-2531 Gremlin .NET driver ConnectionPool can remain without connections if server is down for 1-2 minutes
+
+==== Improvements
+
+* TINKERPOP-1994 LazyBarrierStrategy fully responsible for barrier() additions
+* TINKERPOP-2168 GraphSON: P deserialization should be optimized
+* TINKERPOP-2457 Add a max_content_length parameter to DriverRemoteConnection in the Python client
+* TINKERPOP-2532 MaxBarrierSize of NoOpBarrierStep should be accessible
+* TINKERPOP-2535 Netty 4.1.52 flagged as medium security violation
+* TINKERPOP-2547 Provide an option to supply a callback before handshake submission
+* TINKERPOP-2550 Deadlock on Client initialization
+
+[[release-3-4-10]]
+=== TinkerPop 3.4.10 (Release Date: January 18, 2021)
+
+* Added `GremlinScriptChecker` to provide a way to extract properties of scripts before doing an actual `eval()`.
+* Added `none()` step for all language variants.
+* Fixed bug in `PythonTranslator` which was improperly translating `Lambda` scripts.
+* Fixed bug in `GremlinDslProcessor` where certain return types in `TraversalSource` definitions were not generating code that would compile.
+* Changed the default read and write timeout values for the `TornadoTransport` to `None` to disable it.
+* Bumped to Groovy 2.5.14.
+
+==== Bugs
+
+* TINKERPOP-2496 GremlinDslProcessor fails when SocialTraversalSourceDsl overrides close
+* TINKERPOP-2505 Gremlin Python Client Query Times out at 30 seconds instead of the server timeout
+
+==== Improvements
+
+* TINKERPOP-2447 Improve handling of StackOverflowError for long traversals
+* TINKERPOP-2485 Invalid http tests with ?gremlin=1-1
+* TINKERPOP-2500 Add none() step for all GLVs
+
+[[release-3-4-9]]
+=== TinkerPop 3.4.9 (Release Date: December 7, 2020)
+
+* Modified the text of `profile()` output to hide step instances injected for purpose of collecting metrics.
+* Bumped to Jackson 2.11.x.
+* Bumped Netty 4.1.52.
+* Added lambda support for `gremlin-javascript`.
+* Provided a more concise syntax for constructing strategies in Groovy.
+* Aligned `CoreImports` with `GroovyTranslator` to generate more succinct syntax.
+* Improved `gremlin-groovy` understanding of `withSack()` overloads to avoid forced casts.
+* Moved `Translator` instances to `gremlin-core`.
+* Prevented barriers from over-reaching their limits by one.
+* Added `CheckedGraphManager` to prevent Gremlin Server from starting if there are no graphs configured.
+* Fixed bug in bytecode `Bindings` where calling `of()` prior to calling a child traversal in the same parent would cause the initial binding to be lost.
+* Established a default read and write timeout for the `TornadoTransport` in Python, allowing it to be configurable.
+* Delegated handling of erroneous response to the worker thread pool instead of event loop thread pool in Java Driver.
+* Removed `Connection` from `Connection Pool` when server closes a connection with no pending requests in Java Driver.
+* Improved initialization time of Java Driver if the default serializer is replaced.
+* Deprecated `withGraph()` in favor of `withEmbedded()` on `AnonymousTraversalSource`.
+* Added support for per-request level configurations, like timeouts, in .NET, Python and Javascript.
+* Fixed bug in Javascript `Translator` that wasn't handling child traversals well.
+* Prevented Gremlin Python sugar from being confused by Python magic methods.
+* Allowed Gremlin Python sugar calls from anonymous context.
+* Implemented `AutoCloseable` on `MultiIterator`.
+* Fixed an iterator leak in `HasContainer`.
+* Fixed bug in `:bytecode` command preventing translations with whitespace from working properly.
+* Added `reset` and `config` options to the `:bytecode` command to allow for greater customization options.
+* Added GraphSON extension module and the `TinkerIoRegistry` to the default `GraphSONMapper` configuration used by the `:bytecode` command.
+* Added `GremlinASTChecker` to provide a way to extract properties of scripts before doing an actual `eval()`.
+* Avoided creating unnecessary detached objects in JVM.
+* Added support for `TraversalStrategy` usage in Javascript.
+* Added `Traversal.getTraverserSetSupplier()` to allow providers to supply their own `TraverserSet` instances.
+* Release server threads waiting on connection if the connection is dead.
+* Fixed bug where server closes HTTP connection on request error even if keep alive is set to true.
+* Deprecated driver `Channelizer` keep-alive related methods.
+* Delegate handling of WebSocket handshake to Netty instead of custom code in Java Driver.
+* Delegate detection of idle connection to Netty instead of custom keep alive logic for `WebSocketChannelizer`.
+* Added support for WebSocket frame compression extension ( [RFC7692](https://tools.ietf.org/html/rfc7692) ) for `WebSocketChannelizer` in Java/Python driver.
+* Added server support for WebSocket compression extension ( [RFC7692](https://tools.ietf.org/html/rfc7692) ).
+* Fixed bug with Bytecode serialization when `Bytecode.toString()` is used in Javascript.
+* Fixed "toString" for P and TextP to produce valid script representation from bytecode glv steps containing a string predicate in Javascript.
+* Fixed a bug which could cause Java driver to hang when using `ResultSet.statusAttributes()`
+* Added a listener to javascript's `DriverRemoteConnection` to find note errors from websocket connection setup.
+* Fixed bug with `ReservedVerificationStrategy.getConfiguration()` which was omitting the reserved `keys` value.
+* Changed all configuration keys on `AbstractWarningVerificationStrategy` implementations to `public`.
+* Deprecated `BytecodeUtil` and merged its functionality to the existing `BytecodeHelper`.
+* Added configuring implementation in HasStep
+* Remove static initialization for `GraphSONMessageSerializerV1d0` and `GraphSONMessageSerializerV1d0` in Java driver.
+* Connections to the server in a connection pool are created in parallel instead of serially in Java Driver.
+* Connection pools for multiple endpoints are created in parallel instead of serially in Java Driver.
+* Introduced new HostNotAvailable exception to represent cases when no server with active connection is available.
+* Don't wait for new requests during shutdown of event loop group in Java Driver.
+
+==== Bugs
+
+* TINKERPOP-2364 Injected ProfileStep should not be displayed in child traversals
+* TINKERPOP-2369 Connections in ConnectionPool are not replaced in background when underlying channel is closed
+* TINKERPOP-2403 Gremlin javascript Translator does not handle child traversals
+* TINKERPOP-2405 gremlinpython: traversal hangs when the connection is established but the servers stops responding later
+* TINKERPOP-2408 Iterator leak in HasContainer
+* TINKERPOP-2409 js: DriverRemoteConnection never times out if server uri not available.
+* TINKERPOP-2410 Free up server threads when client is closed
+* TINKERPOP-2425 Server closes HTTP connection for keepAlive as true
+* TINKERPOP-2432 Generate correct toString() representation of bytecode in Javascript
+* TINKERPOP-2433 typo in javadocs match() Type Parameters
+* TINKERPOP-2435 Gremlin Python sugar syntax for values() can lead to unexpected problems
+* TINKERPOP-2437 gremlin-driver hangs if ResultSet.statusAttributes().get() is called when the request throws
+* TINKERPOP-2439 P and TextP toString() is broken
+* TINKERPOP-2458 Bytecode Bindings lost when followed by a child traversal
+* TINKERPOP-2465 TestHelper.generateTempFileFromResource file handling is invalid on windows
+* TINKERPOP-2475 Barrier step touches one more element of next loop
+* TINKERPOP-2478 Console byte code translator has issues with "new Date()"
+
+==== Improvements
+
+* TINKERPOP-2001 Support lambdas in Javascript
+* TINKERPOP-2054 Support TraversalStrategy specification in gremlin-javascript
+* TINKERPOP-2296 Per query timeout not working from Python
+* TINKERPOP-2392 Improve module level documentation for GLVs
+* TINKERPOP-2396 TraverserSet should be extendable for GraphDB provider
+* TINKERPOP-2397 Don't create the default Gyro serializer if the caller specifies a different one
+* TINKERPOP-2401 Upgrade Jackson-databind to 2.11.x
+* TINKERPOP-2406 Delegate processing from event loop to worker threads
+* TINKERPOP-2412 Add missing query tests
+* TINKERPOP-2413 Prefer withEmbedded() to withGraph() on AnonymousTraversalSource
+* TINKERPOP-2415 Avoid unnecessary detached objects if not required
+* TINKERPOP-2416 MultiIterator should implement AutoCloseable
+* TINKERPOP-2420 Support per query request options in .NET
+* TINKERPOP-2421 Support per query options in javascript
+* TINKERPOP-2426 Use Netty's WebSocketClientProtocolHandler
+* TINKERPOP-2427 Simplify Netty reference counting
+* TINKERPOP-2430 Looping Recipies
+* TINKERPOP-2431 Operating on Dropped Elements Recipes
+* TINKERPOP-2436 The gremlin server starts even if all graphs instantiation has failed
+* TINKERPOP-2438 Provide a way for scripts to respect with() specification of timeout
+* TINKERPOP-2440 Simplify driver by delegating keepAlive logic to Netty
+* TINKERPOP-2441 Add compression to WebSocket frames sent from client
+* TINKERPOP-2442 Make Translators that work in Java part of gremlin-core
+* TINKERPOP-2445 Speed up client initialization *(breaking)*
+* TINKERPOP-2446 Add Recipe for Optional Looping
+* TINKERPOP-2453 Add WebSocket compression to gremlin-python
+* TINKERPOP-2461 Align CoreImports with GroovyTranslator
+* TINKERPOP-2462 Duplicated BytecodeUtil and BytecodeHelper classes
+* TINKERPOP-2466 Improve syntax for Groovy scripts that use withStrategies()
+* TINKERPOP-2468 Stabilize shouldProcessSessionRequestsInOrder() test
+* TINKERPOP-2469 KrbException - Principal does not exist in test
+* TINKERPOP-2474 withSack() Groovy translation output could be simplified
+* TINKERPOP-2479 Provide a way to set a custom GraphSONMapper for :bytecode command
+* TINKERPOP-2482 Rename wsConnectionTimeout to connectionSetupTimeout
+
+[[release-3-4-8]]
+=== TinkerPop 3.4.8 (Release Date: August 3, 2020)
+
+* Fixed bug in `has(T,Traversal)` where results were not being returned.
+* Fixed bug in `select(Traversal)` where side-effects were getting lost if accessed from the child traversal.
+* Fixed authorization bug when using `WsAndHttpChannelizerHandler` with keep-alive enabled.
+* Fixed bug in option-less construction of `DriverRemoteConnection` in Javascript.
+* Bumped Jackson to 2.9.10.5.
+* Improved sampling distribution for global scope `sample()` operations.
+
+==== Bugs
+
+* TINKERPOP-2288 Get ConnectionPoolBusyException and then ServerUnavailableExceptions
+* TINKERPOP-2352 Gremlin Python driver default pool size makes Gremlin keep-alive difficult
+* TINKERPOP-2374 SaslAndHttpBasicAuthenticationHandler can't extract authorization
+* TINKERPOP-2383 has(T,Traversal) does not return results
+* TINKERPOP-2384 Inject and withSideEffect causing different outcomes in order step
+
+==== Improvements
+
+* TINKERPOP-2328 Do not close all connections if just one has became closed
+* TINKERPOP-2376 Probability distribution controlled by weight when using sample step
+
+[[release-3-4-7]]
+=== TinkerPop 3.4.7 (Release Date: June 1, 2020)
+
+This release also includes changes from <<./changelog-3.3.x.asciidoc#release-3-3-11, 3.3.11>>.
+
+* Gremlin.NET driver: Fixed a `NullReferenceException` and throw clear exception if received message is empty.
+* Bumped to Groovy 2.5.11.
+* Modified `ImportGremlinPlugin` to allow for field imports.
+* Improved error message for `math()` when the selected key in a `Map` is `null` or not a `Number`.
+* Added `:cls` command to Gremlin Console to clear the screen.
+* Bumped Netty 4.1.49.
+
+==== Bugs
+
+* TINKERPOP-2192 Gremlin.Net.Driver.Connection.Parse throws a NullReferenceException
+* TINKERPOP-2345 NullPointerException when Map key is not found for math()
+* TINKERPOP-2347 Remove invalid service descriptors from gremlin-shaded
+* TINKERPOP-2350 clone() is not deep copying Traversal internals
+* TINKERPOP-2351 Local Map ordering of keys can generate cast errors
+* TINKERPOP-2353 Error while Shutting Down Gremlin Server
+* TINKERPOP-2355 Jackson-databind version in Gremlin shaded dependency needs to be increased - introduces vulnerability issues
+* TINKERPOP-2360 failed to deserializer int32 when gremlin-python submit bytecode with a big int value
+* TINKERPOP-2365 LazyBarrierStrategy adds a NoOpBarrierStep when profile() is present
+* TINKERPOP-2368 JAVA_OPTIONS are not properly expanded in gremlin-console
+
+==== Improvements
+
+* TINKERPOP-2215 Better exception message for connection problems
+* TINKERPOP-2336 Allow close of channel without having to wait for server
+* TINKERPOP-2339 Gremlin.Net: Update System.Net.WebSockets.Client dependency
+* TINKERPOP-2354 Document recommendation to reuse graph traversal source
+* TINKERPOP-2357 Add a command to clear the Gremlin Console screen
+* TINKERPOP-2371 Add possibility to import constants with ImportGremlinPlugin
+
+[[release-3-4-6]]
+=== TinkerPop 3.4.6 (Release Date: February 20, 2020)
+
+* Fixed bug in `drop()` of properties which was introduced in 3.4.5.
+
+==== Bugs
+
+* TINKERPOP-2338 drop() not removing all edge/meta properties
+
+[[release-3-4-5]]
+=== TinkerPop 3.4.5 (Release Date: February 3, 2020)
+
+This release also includes changes from <<./changelog-3.3.x.asciidoc#release-3-3-10, 3.3.10>>.
+
+* Expanded the use of `by(String)` modulator so that it can work on `Map` as well as `Element`.
+* Improved error messaging for `by(String)` so that it is more clear as to what the problem is
+* Bumped to Netty 4.1.42
+* Improved SPARQL query translation to better allow for index optimizations during execution.
+* Improved Gremlin Server websocket handling preventing automatic server close of the channel for protocol errors.
+* Introduced internal `Buffer` API as a way to wrap Netty's Buffer API and moved `GraphBinaryReader`, `GraphBinaryWriter` and `TypeSerializer<T>` to `gremlin-core`.
+* Unified the behavior of property comparison: only compare key&value.
+* Supported `hasKey()` and `hasValue()` step for edge property and meta property, like `g.E().properties().hasKey('xx')`.
+* Modified driver to send `overrideRequestId` and `userAgent` to server when they are present in `RequestOptions` for bytecode requests.
+
+==== Bugs
+
+* TINKERPOP-2175 Executor thread is not returned on channel close
+* TINKERPOP-2266 Keep alive not started at connection creation
+* TINKERPOP-2274 Test of TinkerGraph Gremlin fail on Windows and non EN locale
+* TINKERPOP-2318 Edge properties dedup() not work with spark-gremlin *(breaking)*
+* TINKERPOP-2332 JavaScript GLV: structure element toString() should internally call toString()
+* TINKERPOP-2333 JavaScript GLV: GraphSON2/3 Edge deserialization is invalid
+
+==== Improvements
+
+* TINKERPOP-1733 hasKey, hasValues should work on Element and Property
+* TINKERPOP-2262 Improve Netty protocol handling
+* TINKERPOP-2305 GraphBinary: Wrap Buffer API
+* TINKERPOP-2307 Add better error message for badly configured Channelizer
+* TINKERPOP-2309 Bump gremlinpython to Tornado 5.x
+* TINKERPOP-2314 Employ by(String) for Map when possible and improve errors around incorrect types
+* TINKERPOP-2315 Implement some form of clone() or reset() for Traversal in GLVs
+* TINKERPOP-2320 [SECURITY] XMLInputFactory initialization in GraphMLReader introduces
+* TINKERPOP-2322 Deprecate Jython support
+* TINKERPOP-2324 Deprecate the raw NIO support in the Java driver
+* TINKERPOP-2325 Generate traversals that will better yield index lookups with SPARQL
+* TINKERPOP-2329 JavaScript GLV: Update websocket library dependency
+* TINKERPOP-2330 JavaScript GLV should expose GraphSON2Writer and GraphSONReader
+
+[[release-3-4-4]]
+=== TinkerPop 3.4.4 (Release Date: October 14, 2019)
+
+This release also includes changes from <<./changelog-3.3.x.asciidoc#release-3-3-9, 3.3.9>>.
+
+* Provided support for DSLs by way of remote connections through `AnonymousTraversalSource`.
+* Added `elementMap()` step.
+* Added GraphBinary support for Python.
+* Allowed for embedded map assertions in GLV tests.
+* Added `Direction` deserialization support in GLVs.
+
+==== Bugs
+
+* TINKERPOP-2159 EventStrategy doesn't handle multi-valued properties
+* TINKERPOP-2276 No constructor for remote connection in DSL generated traversal source
+* TINKERPOP-2283 GraphStep's ids null exception
+* TINKERPOP-2285 Error object is unreachable
+* TINKERPOP-2289 Use address instead of hostname for connection
+* TINKERPOP-2290 Javascript GLV connection refused error handling
+* TINKERPOP-2291 TraversalExplanation deserialization in GraphSON
+* TINKERPOP-2298 Bytecode.java flattenArguments throw exception when null
+* TINKERPOP-2303 GremlinDsl generate addV instead of addE
+
+==== Improvements
+
+* TINKERPOP-1810 Add Lambda.binaryOperator and Lambda.unaryOperator
+* TINKERPOP-1838 Python sample script
+* TINKERPOP-2046 Gremlin-Python: Support custom request headers in WebSocket request
+* TINKERPOP-2213 Replace scriptEvaluationTimeout in favor of something more suitable to bytecode
+* TINKERPOP-2275 Update jackson databind 2.9.9.3+
+* TINKERPOP-2277 Python sdk postpone the timing to create transport
+* TINKERPOP-2279 GraphBinary support in Python
+* TINKERPOP-2280 Prevent use of T values as property key overloads
+* TINKERPOP-2284 Make it easier to return more structure of graph elements
+* TINKERPOP-2302 Add isOnGraphComputer() field accessor to ElementMapStep
+
+[[release-3-4-3]]
+=== TinkerPop 3.4.3 (Release Date: August 5, 2019)
+
+This release also includes changes from <<./changelog-3.3.x.asciidoc#release-3-3-8, 3.3.8>>.
+
+* Improved error messaging on timeouts returned to the console from `:>`.
+* Added a `toString()` serializer for GraphBinary.
+* Configured the Gremlin Console to use GraphBinary by default.
+* Fixed transaction management for empty iterators in Gremlin Server.
+* Deprecated `MessageSerializer` implementations for Gryo in Gremlin Server.
+* Deprecated `Serializers` enum values of `GRYO_V1D0` and `GRYO_V3D0`.
+* Deprecated `SerTokens` values of `MIME_GRYO_V1D0` and `MIME_GRYO_V3D0`.
+* Added a Docker command to start Gremlin Server with the standard GLV test configurations.
+* Added `aggregate(Scope,String)` and deprecated `store()` in favor of `aggregate(local)`.
+* Modified `NumberHelper` to better ignore `Double.NaN` in `min()` and `max()` comparisons.
+* Bumped to Netty 4.1.36.
+* Bumped to Groovy 2.5.7.
+* Added `userAgent` to RequestOptions. Gremlin Console sends `Gremlin Console/<version>` as the `userAgent`.
+* Fixed DriverRemoteConnection ignoring `with` `Token` options when multiple were set.
+* Added `:set warnings <true|false>` to Gremlin Console.
+
+==== Bugs
+
+* TINKERPOP-1619 TinkerGraphComputer worker count affects OptionalStep query results
+* TINKERPOP-2157 SparkStarBarrierInterceptor injects (Byte) 0
+* TINKERPOP-2224 Detect and fix resource leak
+* TINKERPOP-2230 match() step unexpected behaviours
+* TINKERPOP-2232 RemoteStrategy does not call parent class TraversalStrategy __init__
+* TINKERPOP-2238 Fix remaining iterator leaks marked by @IgnoreIteratorLeak
+* TINKERPOP-2241 Client exception don't match Server exception when server throw StackOverflowError
+* TINKERPOP-2248 Instability of driver for blocked requests
+* TINKERPOP-2257 transaction itty may still be visited after commit
+* TINKERPOP-2264 Gremlin Python should deserialize g:Date to UTC
+
+==== Improvements
+
+* TINKERPOP-1084 Branch option tokens should be allowed to be traversals.
+* TINKERPOP-1553 Deprecate store() in favor of aggregate(Scope)
+* TINKERPOP-1921 Support hasNext terminal step in GLVs
+* TINKERPOP-2020 Support withComputer() for javascript
+* TINKERPOP-2223 Update jackson databind to 2.9.9
+* TINKERPOP-2236 Improve error messaging for TinkerGraph IdManagers that fail on conversions
+* TINKERPOP-2237 Prevent error when closing sessions that don't exist *(breaking)*
+* TINKERPOP-2242 Bump to netty 4.1.36
+* TINKERPOP-2243 Add user-agent to RequestOptions
+* TINKERPOP-2246 Consolidate the error propagation to the client
+* TINKERPOP-2250 Support toString serialization in GraphBinary
+* TINKERPOP-2256 processAllStarts of AggregateStep should only be called when barrier is empty
+* TINKERPOP-2260 Update jackson databind 2.9.9.1
+* TINKERPOP-2265 Deprecate Traversal.getSideEffects() functionality for remoting purposes
+* TINKERPOP-2270 Deprecate multi/metaproperty support in Neo4j
+* TINKERPOP-2271 Add console preference to control server-originated warning display
+* TINKERPOP-2272 Rename steps and tokens that conflict with standard python functions
+
+[[release-3-4-2]]
+=== TinkerPop 3.4.2 (Release Date: May 28, 2019)
+
+This release also includes changes from <<./changelog-3.3.x.asciidoc#release-3-3-7, 3.3.7>>.
+
+* Allow a `Traversal` to know what `TraversalSource` it spawned from.
+* Fixed problem with connection pool sizing and retry.
+* Added status attribute for warnings to be returned to the client.
+* Modified Gremlin Console to report warning status attributes.
+* Changed `:>` in Gremlin Console to submit the client-side timeout on each request.
+* Provided method to override the request identifier with `RequestOptions`.
+* Added option to set per-request settings on a `Traversal` submitted via `Bytecode`.
+* Fixed the Gryo registration for `OptionsStrategy` as it was not serializing state properly.
+
+==== Bugs
+
+* TINKERPOP-2090 After running backend for a day or so System.IO.IOException keep throwing
+* TINKERPOP-2112 Folding in property() step is not being optimally performed
+* TINKERPOP-2180 gremlin.sh doesn't work when directories contain spaces
+* TINKERPOP-2183 InterpreterModeASTTransformation needs to be more specific about what it transforms
+* TINKERPOP-2189 ConnectedComponent test assumes fixed order of vertices
+* TINKERPOP-2194 Enforcing an order on properties in one test method of ChooseTest
+* TINKERPOP-2196 PartitionStrategy with includeMetaProperties(true) can't add labeled vertex
+* TINKERPOP-2198 Documentation for Store contradicts itself
+* TINKERPOP-2199 within step does not work with more than two parameters with python
+* TINKERPOP-2200 AddEdgeStartStep used DetachedFactory.detach instead of EventStrategy.detach
+* TINKERPOP-2204 Client receives no response on failed request
+* TINKERPOP-2206 Certain types in javascript don't appear to serialize with a GraphSON type
+* TINKERPOP-2212 Path is not detaching properly under certain conditions
+* TINKERPOP-2217 Race condition in Gremlin.net driver connection
+
+==== Improvements
+
+* TINKERPOP-2089 Javascript DSL support
+* TINKERPOP-2179 Have o.a.t.g.driver.ser.SerializationException extend IOException
+* TINKERPOP-2181 Allow ctrl+c to break out of a long running process in Gremlin Console
+* TINKERPOP-2182 Remove gperfutils from Gremlin Console *(breaking)*
+* TINKERPOP-2190 Document Gremlin sanitization best practices
+* TINKERPOP-2191 Implement EdgeLabelVerificationStrategy
+* TINKERPOP-2193 Allow a Traversal to know what TraversalSource it spawned from
+* TINKERPOP-2203 Bind the console timeout to the request timeout
+* TINKERPOP-2208 Include inject() in DSLs generated with Java annotation processor
+* TINKERPOP-2211 Provide API to add per request option for a bytecode
+* TINKERPOP-2216 Consider adding conventional status attribute key for warnings
+* TINKERPOP-2219 Upgrade Netty version
+
+[[release-3-4-1]]
+=== TinkerPop 3.4.1 (Release Date: March 18, 2019)
+
+This release also includes changes from <<./changelog-3.3.x.asciidoc#release-3-3-6, 3.3.6>>.
+
+* Gremlin.NET driver: Fixed removal of closed connections and added round-robin scheduling.
+* Added GraphBinary serializer for TraversalMetrics
+* Added registration for `SparqlStrategy` for GraphSON.
+* Fixed up `SparqlStrategy` so that it could be used properly with `RemoteStrategy`.
+* Fixed `ByteBuffer` serialization for GraphBinary.
+* Fixed `Path.toString()` in `gremlin-javascript` which was referencing an invalid object.
+* Fixed potential for an infinite loop in connection creation for `gremlin-dotnet`.
+* Added fallback resolver to `TypeSerializerRegistry` for GraphBinary.
+* Added easier to understand exceptions for connection problems in the Gremlin.Net driver.
+* Support configuring the type registry builder for GraphBinary.
+* Bumped to Groovy 2.5.6.
+* Release working buffers in case of failure for GraphBinary.
+* GraphBinary: Use the same `ByteBuf` instance to write during serialization. Changed signature of write methods in type serializers.
+* Remove unused parameter in GraphBinary's `ResponseMessageSerializer`.
+* Changed `SparqlTraversalSource` so as to enable Gremlin steps to be used to process results from the `sparql()` step.
+* GraphBinary: Cache expression to obtain the method in `PSerializer`.
+
+==== Bugs
+
+* TINKERPOP-1992 count has negative time in profile
+* TINKERPOP-2126 toString() methods not thread-safe
+* TINKERPOP-2135 Gremlin.Net ConnectionPool doesn't handle closed idle connections properly
+* TINKERPOP-2139 Errors during request serialization in WebSocketGremlinRequestEncoder/NioGremlinRequestEncoder are not reported to the client
+* TINKERPOP-2141 ByteBufferSerializer modifies buffer's position
+* TINKERPOP-2148 "no connection available!" is being thrown despite lots of free connections
+* TINKERPOP-2152 Path toString fails in Gremlin JavaScript
+* TINKERPOP-2153 Remove unused parameter from ResponseMessageSerializer *(breaking)*
+* TINKERPOP-2154 GraphBinary: Serializers should release resources in case of failures
+* TINKERPOP-2155 Situation can occur that causes infinite amount of connection to be opened, causing System.Net.WebSockets.WebSocketException
+* TINKERPOP-2161 GraphBinary: Write serialization performance issue
+* TINKERPOP-2169 Responses exceeding maxContentLength cause subsequent queries to hang
+* TINKERPOP-2172 PartitionStrategy doesn't apply to AddEdgeStartStep
+* TINKERPOP-2173 Incorrect reset of log level in integration test
+* TINKERPOP-2177 Streaming response immediately after authentication stops after first partial response
+
+==== Improvements
+
+* TINKERPOP-1435 Support for extended GraphSON in gremlin-python
+* TINKERPOP-1882 Apply range and limit steps as early as possible
+* TINKERPOP-1998 IoGraphTest use different schemas for standard and readGraph configurations
+* TINKERPOP-2088 Enable SourceLink for Gremlin.Net
+* TINKERPOP-2098 Improve gremlin-server.sh help output
+* TINKERPOP-2122 Expose status codes from server errors
+* TINKERPOP-2124 InlineFilterStrategy produces wrong result
+* TINKERPOP-2125 Extend release validation script
+* TINKERPOP-2127 Add g:TraversalMetrics and g:Metrics deserializers for gremlinpython
+* TINKERPOP-2129 Mask security secret or password in logs
+* TINKERPOP-2130 Cannot instantiate DriverRemoteConnection without passing an options object
+* TINKERPOP-2131 NoConnectionAvailableException doesn't reveal the reason
+* TINKERPOP-2134 Bump to Groovy 2.5.6
+* TINKERPOP-2136 Inside lower bound inclusion (documentation)
+* TINKERPOP-2138 Provide a configuration to disable the global closure cache
+* TINKERPOP-2140 Test build with Docker automatically
+* TINKERPOP-2144 Better handle Authenticator instance failures
+* TINKERPOP-2147 Add GraphBinary serializer for TraversalMetrics
+* TINKERPOP-2149 GraphBinary: Make type serializer resolution pluggable
+* TINKERPOP-2150 GraphBinary: Support configuring the TypeSerializerRegistry builder class in config
+* TINKERPOP-2163 JavaTranslator performance enhancements
+* TINKERPOP-2164 Bytecode's hashCode impl (and its inner classes) can produce hash collisions
+* TINKERPOP-2165 Prefer commons-lang3 to commons-lang
+* TINKERPOP-2166 GraphBinary: P deserialization should be optimized
+* TINKERPOP-2167 Gremlin Javascript Traversal as async iterable
+* TINKERPOP-2171 Allow SPARQL to be extended with Gremlin steps
+* TINKERPOP-2174 Improve Docker Image Security
+
+[[release-3-4-0]]
+=== TinkerPop 3.4.0 (Release Date: January 2, 2019)
+
+This release also includes changes from <<./changelog-3.3.x.asciidoc#release-3-3-4, 3.3.4>> and <<./changelog-3.3.x.asciidoc#release-3-3-5, 3.3.5>>.
+
+* Changed Python "bindings" to use an actual `Bindings` object rather than a 2-tuple.
+* Improved the Gremlin.NET driver: It now uses request pipelining and its `ConnectionPool` has a fixed size.
+* Implemented `IndexStep` which allows to transform local collections into indexed collections or maps.
+* Made `valueMap()` aware of `by` and `with` modulators and deprecated `valueMap(boolean)` overloads.
+* Use `Compare.eq` in `Contains` predicates to ensure the same filter behavior for numeric values.
+* Added `OptionsStrategy` to allow traversals to take arbitrary traversal-wide configurations.
+* Added text predicates.
+* Added `BulkSet` as a GraphSON type with support in all language variants.
+* Added `ReferenceElementStrategy` to auto-detach elements to "reference" from a traversal.
+* Added initial release of the GraphBinary serialization format with Java support.
+* Allowed `ImportCustomizer` to accept fields.
+* Removed groovy-sql dependency.
+* Modified `Mutating` steps so that they are no longer marked as `final`.
+* Rewrote `ConnectiveStrategy` to support an arbitrary number of infix notations in a single traversal.
+* GraphSON `MessageSerializer` s will automatically register the GremlinServerModule to a provided GraphSONMapper.
+* Removed support for `-i` option in Gremlin Server which was previously deprecated.
+* Implemented `ShortestPathVertexProgram` and the `shortestPath()` step.
+* `AbstractGraphProvider` uses `g.io()` for loading test data.
+* Added the `io()` start step and `read()` and `write()` termination steps to the Gremlin language.
+* Added `GraphFeatures.supportsIoRead()` and `GraphFeatures.supportsIoWrite()`.
+* Deprecated `Graph.io()` and related infrastructure.
+* `GraphMLReader` better handles edge and vertex properties with the same name.
+* Maintained order of annotations in metrics returned from `profile()`-step.
+* Refactored `TypeTranslator` to be directly extensible for `ScriptTranslator` functions.
+* Bumped to Netty 4.1.25.
+* Bumped to Spark 2.4.0.
+* Bumped to Groovy 2.5.4.
+* Modified Gremlin Server to return a "host" status attribute on responses.
+* Added ability to the Java, .NET, Python and JavaScript drivers to retrieve status attributes returned from the server.
+* Modified Java and Gremlin.Net `ResponseException` to include status code and status attributes.
+* Modified Python `GremlinServerError` to include status attributes.
+* Modified the return type for `IGremlinClient.SubmitAsync()` to be a `ResultSet` rather than an `IReadOnlyCollection`.
+* Deprecated two `submit()`-related methods on the Java driver `Client` class.
+* Added `Client.submit()` overloads that accept per-request `RequestOptions`.
+* Added sparql-gremlin.
+* Fixed a bug in dynamic Gryo registration where registrations that did not have serializers would fail.
+* Moved `Parameterizing` interface to the `org.apache.tinkerpop.gremlin.process.traversal.step` package with other marker interfaces of its type.
+* Replaced `Parameterizing.addPropertyMutations()` with `Configuring.configure()`.
+* Changed interface hierarchy for `Parameterizing` and `Mutating` interfaces as they are tightly related.
+* Introduced the `with(k,v)` and `with(k)` step modulators which can supply configuration options to `Configuring` steps.
+* Added `OptionsStrategy` to allow traversals to take arbitrary traversal-wide configurations.
+* Introduced the `with(k,v)` and `with(k)` traveral source configuration options which can supply configuration options to the traversal.
+* Added `connectedComponent()` step and related `VertexProgram`.
+* Added `supportsUpsert()` option to `VertexFeatures` and `EdgeFeatures`.
+* `min()` and `max()` now support all types implementing `Comparable`.
+* Change the `toString()` of `Path` to be standardized as other graph elements are.
+* `hadoop-gremlin` no longer generates a test artifact.
+* Allowed `GraphProvider` to expose a cached `Graph.Feature` object so that the test suite could re-use them to speed test runs.
+* Fixed a bug in `ReducingBarrierStep`, that returned the provided seed value despite no elements being available.
+* Changed the order of `select()` scopes. The order is now: maps, side-effects, paths.
+* Moved `TraversalEngine` to `gremlin-test` as it has long been only used in testing infrastructure.
+* Nested loop support added allowing `repeat()` steps to be nested.
+* Events from `EventStrategy` raised from "new" mutations will now return a `KeyedVertexProperty` or `KeyedProperty` as is appropriate.
+* `MutationListener#vertexPropertyChanged(Vertex, VertexProperty, Object, Object...)` no longer has a default implementation.
+* Deprecated `GraphSONMessageSerializerV2d0` as it is now analogous to `GraphSONMessageSerializerGremlinV2d0`.
+* Moved previously deprecated `RemoteGraph` to `gremlin-test` as it is now just a testing component.
+* Removed previously deprecated `RemoteStrategy.instance()` and the strategy no longer has any connection to `RemoteGraph`.
+* Removed previously deprecated methods in `SubgraphStrategy` and `PartitionStrategy` builders.
+* Removed previously deprecated Credentials DSL infrastructure.
+* Removed previously deprecated `RemoteConnection#submit(Traversal)` and `RemoteConnection#submit(Bytecode)` methods.
+* Removed previously deprecated `MutationListener#vertexPropertyChanged(Vertex, Property, Object, Object...)`.
+* Removed previously deprecated `OpSelectorHandler` constructor.
+* Removed previously deprecated `close()` from `GremlinGroovyScriptEngine` which no longer implements `AutoCloseable`.
+* Removed previously deprecated `getGraphInputFormat()` and `getGraphOutputFormat()` from `HadoopConfiguration`.
+* Removed previously deprecated `AbstractOpProcessor#makeFrame()` method.
+* Removed previously deprecated `AuthenticationSettings.className` configuration option in Gremlin Server.
+* Removed previously deprecated `GraphManager` methods `getGraphs()` and `getTraversalSources()`.
+* Removed previously deprecated Gremlin Server setting for `serializedResponseTimeout`.
+* Removed previously deprecated Structure API exceptions related to "element not found" situations.
+* Removed previously deprecated `rebindings` options from the Java driver API.
+* Removed previously deprecated `LambdaCollectingBarrierStep.Consumers` enum.
+* Removed previously deprecated `HasContainer#makeHasContainers(String, P)`
+* Removed support for Giraph.
+* Removed previously deprecated JavaScript Driver property `traversers` of the `ResultSet`.
+* gremlin-python: use explicit Bindings object for python instead of a 2-tuple
+
+==== Bugs
+
+* TINKERPOP-1777 Gremlin .max step returns -2147483648 for empty result sets *(breaking)*
+* TINKERPOP-1869 Profile step and iterate do not play nicely with each other
+* TINKERPOP-1898 Issue with bindings in strategies and lambdas
+* TINKERPOP-1927 Gherkin scenario expects list with duplicates, but receives g:Set
+* TINKERPOP-1933 gremlin-python maximum recursion depth exceeded on large responses
+* TINKERPOP-1947 Path history isn't preserved for keys in mutations
+* TINKERPOP-1949 Formatting error on website
+* TINKERPOP-1958 TinkerGraphCountStrategy can return wrong counts
+* TINKERPOP-1961 Duplicate copies of images directory in docs
+* TINKERPOP-1962 GroovyTranslator doesn't handle empty maps
+* TINKERPOP-1963 Use of reducing step in choose()
+* TINKERPOP-1972 inject() tests are throwing exceptions in .NET GLV tests
+* TINKERPOP-1978 Check for Websocket connection state when retrieved from Connection Pool missing
+* TINKERPOP-1979 Several OLAP issues in MathStep
+* TINKERPOP-1988 minor error in documentation
+* TINKERPOP-1999 [Java][gremlin-driver] Query to a remote server via the websocket client hangs indefinitely if the server becomes unavailable
+* TINKERPOP-2005 Intermittent NullPointerException in response handling
+* TINKERPOP-2006 GraphML serialization invalid if a vertex and edge have similar named property
+* TINKERPOP-2009 Pick.any and Pick.none should be exposed in Gremlin-JavaScript
+* TINKERPOP-2021 Prevent maximum recursion depth failure
+* TINKERPOP-2028 AbstractGraphSONMessageSerializerV2d0 should register GremlinServerModule when mapper is provided
+* TINKERPOP-2029 ConcurrentModificationException for InlineFilterStrategy
+* TINKERPOP-2030 KeepAlive task executed for every Connection.write call
+* TINKERPOP-2032 Update jython-standalone
+* TINKERPOP-2044 Cannot reconnect to Azure cosmos host that becomes available again
+* TINKERPOP-2058 Contains predicates should rely on Compare predicates *(breaking)*
+* TINKERPOP-2081 PersistedOutputRDD materialises rdd lazily with Spark 2.x
+* TINKERPOP-2091 Wrong/Missing feature requirements in StructureStandardTestSuite
+* TINKERPOP-2094 Gremlin Driver Cluster Builder serializer method does not use mimeType as suggested
+* TINKERPOP-2095 GroupStep looks for irrelevant barrier steps
+* TINKERPOP-2096 gremlinpython: AttributeError when connection is closed before result is received
+* TINKERPOP-2100 coalesce() creating unexpected results when used with order()
+* TINKERPOP-2113 P.Within() doesn't work when given a List argument
+
+==== Improvements
+
+* TINKERPOP-550 Gremlin IO needs to support both OLTP and OLAP naturally.
+* TINKERPOP-967 Support nested-repeat() structures
+* TINKERPOP-1113 GraphComputer subclasses should support native methods
+* TINKERPOP-1143 Remove deprecated TraversalSource.Builder and TraversalEngine. *(breaking)*
+* TINKERPOP-1296 Remove deprecated serializedResponseTimeout from Gremlin Server *(breaking)*
+* TINKERPOP-1342 Allow setting scriptEvaluationTimeout in driver
+* TINKERPOP-1365 Log the seed used to initialize Random in tests
+* TINKERPOP-1410 mvn install -Dmaven.test.skip=true doesn't work on a clean machine *(breaking)*
+* TINKERPOP-1446 Add a StringFactory for Path which prefixes with type.
+* TINKERPOP-1447 Add some JavaScript intelligence to the documentation so that comments and output are not copied in a copy paste
+* TINKERPOP-1494 Means of exposing execution information from a result produced by RemoteConnection
+* TINKERPOP-1518 Provide a way for providers to expose static Graph.Features to tests
+* TINKERPOP-1522 Order of select() scopes *(breaking)*
+* TINKERPOP-1595 Go through TraversalVertexProgram with a profile and optimize.
+* TINKERPOP-1628 Implement TraversalSelectStep
+* TINKERPOP-1685 Introduce optional feature to allow for upserts without read-before-write
+* TINKERPOP-1705 Remove deprecated rebindings option *(breaking)*
+* TINKERPOP-1707 Remove deprecated AuthenticationSettings.className option *(breaking)*
+* TINKERPOP-1755 No docs for ReferenceElements
+* TINKERPOP-1769 Python graph[empty] string representation is confusing
+* TINKERPOP-1774 Gremlin .NET: Support min and max sizes in Connection pool
+* TINKERPOP-1775 Gremlin .NET: Implement a Connection write queue to support request pipelining
+* TINKERPOP-1778 Do not promote timedInterrupt option for Gremlin Server script processing
+* TINKERPOP-1780 Add authentication tests for gremlin-python
+* TINKERPOP-1831 Refactor EventStrategy *(breaking)*
+* TINKERPOP-1836 .NET sample project
+* TINKERPOP-1841 Include Python GLV tests on TravisCI
+* TINKERPOP-1849 Provide a way to fold() with an index
+* TINKERPOP-1864 Gremlin Python tests for GraphSON 2.0 and 3.0
+* TINKERPOP-1878 Sparql to Gremlin Compiler
+* TINKERPOP-1888 Extend max and min to all Comparable properties, not just Numbers *(breaking)*
+* TINKERPOP-1889 JavaScript GLV: Use heartbeat to prevent connection timeout
+* TINKERPOP-1897 Provide Docker images of Gremlin Server and Console
+* TINKERPOP-1906 Make ResponseException explorable
+* TINKERPOP-1912 Remove MD5 checksums
+* TINKERPOP-1913 Expose metadata from Gremlin Server to Clients
+* TINKERPOP-1930 Drop support for Giraph *(breaking)*
+* TINKERPOP-1934 Bump to latest version of httpclient
+* TINKERPOP-1936 Performance enhancement to Bytecode deserialization
+* TINKERPOP-1941 Remove deprecated Structure API exception methods *(breaking)*
+* TINKERPOP-1942 Binary serialization format
+* TINKERPOP-1945 Add support for extended GraphSon types to Gremlin.net
+* TINKERPOP-1946 Remove the deprecated Credentials DSL infrastructure *(breaking)*
+* TINKERPOP-1950 Traversal construction performance enhancements
+* TINKERPOP-1951 gremlin-server.bat doesn't support paths containing spaces
+* TINKERPOP-1953 Bump to Groovy 2.4.15
+* TINKERPOP-1954 Remove deprecated GraphManager methods *(breaking)*
+* TINKERPOP-1959 Provide a way to submit scripts to the server in gremlin-javascript
+* TINKERPOP-1967 Add a connectedComponent() step
+* TINKERPOP-1968 Refactor elements of Gremlin Server testing
+* TINKERPOP-1975 Introduce with() step modulator *(breaking)*
+* TINKERPOP-1976 Include Computer tests for GLVs
+* TINKERPOP-1977 Gremlin-JavaScript: Support SASL authentication
+* TINKERPOP-1984 Allow support for multiple serializer versions in Gremlin Server HTTP *(breaking)*
+* TINKERPOP-1985 Update position on bulk loading
+* TINKERPOP-1986 Remove deprecation from PartitionStrategy, SubgraphStrategy and GremlinScriptEngine *(breaking)*
+* TINKERPOP-1987 Bump to Netty 4.1.x
+* TINKERPOP-1989 Preserve order that plugins are applied in Gremlin Console
+* TINKERPOP-1990 Add a shortestPath() step
+* TINKERPOP-1993 Bump to Spark 2.3.1
+* TINKERPOP-1995 DriverRemoteConnection close() method returns undefined
+* TINKERPOP-1996 Introduce read() and write() steps
+* TINKERPOP-2002 Create a blog post explaining the value of using TinkerPop
+* TINKERPOP-2010 Generate jsdoc for gremlin-javascript
+* TINKERPOP-2011 Use NumberHelper on choose()
+* TINKERPOP-2012 Target .NET Standard 2.0 for Gremlin.Net
+* TINKERPOP-2013 Process tests that are auto-ignored stink
+* TINKERPOP-2015 Allow users to configure the WebSocket connections
+* TINKERPOP-2016 Upgrade Jackson FasterXML to 2.9.5 or later to fix security vulnerability
+* TINKERPOP-2017 Check for Column in by()
+* TINKERPOP-2018 Generate API docs for Gremlin.Net
+* TINKERPOP-2022 Cluster SSL should trust default ca certs by default
+* TINKERPOP-2023 Gremlin Server should not create self-signed certs *(breaking)*
+* TINKERPOP-2024 Gremlin Server Application archetype should connect via withRemote
+* TINKERPOP-2025 Change to SHA-256/512 and drop SHA-1 for releases
+* TINKERPOP-2026 Gremlin.Net.Driver should check ClientWebSocket.State before closing
+* TINKERPOP-2031 Remove support for -i in gremlin-server.sh *(breaking)*
+* TINKERPOP-2033 Maintain order of profile() annotations
+* TINKERPOP-2034 Register synchronizedMap() with Gryo
+* TINKERPOP-2037 Remove unused groovy-sql dependency
+* TINKERPOP-2038 Make groovy script cache size configurable
+* TINKERPOP-2039 Bump to Groovy 2.5.2 *(breaking)*
+* TINKERPOP-2040 Improve flexibility of GroovyTranslator to handle custom types
+* TINKERPOP-2041 Text Predicates
+* TINKERPOP-2045 Remove non-indy groovy dependencies
+* TINKERPOP-2049 Single argument with() overload
+* TINKERPOP-2050 Add a :bytecode command to Gremlin Console
+* TINKERPOP-2053 Provider OptionsStrategy for traversal configurations
+* TINKERPOP-2055 Provide support for special number cases like Infinity in GraphSON
+* TINKERPOP-2056 Use NumberHelper in Compare
+* TINKERPOP-2059 Modulation of valueMap() *(breaking)*
+* TINKERPOP-2060 Make Mutating steps non-final
+* TINKERPOP-2061 Add with() configuration as global to a traversal
+* TINKERPOP-2062 Add Traversal class to CoreImports
+* TINKERPOP-2064 Add status attributes to results for gremlin-javascript
+* TINKERPOP-2065 Optimize iterate() for remote traversals
+* TINKERPOP-2066 Bump to Groovy 2.5.3
+* TINKERPOP-2067 Allow getting raw data from Gremlin.Net.Driver.IGremlinClient
+* TINKERPOP-2068 Bump Jackson Databind 2.9.7
+* TINKERPOP-2069 Document configuration of Gremlin.Net
+* TINKERPOP-2070 gremlin-javascript: Introduce Connection representation
+* TINKERPOP-2071 gremlin-python: the graphson deserializer for g:Set should return a python set
+* TINKERPOP-2072 Refactor custom type translation for ScriptTranslators *(breaking)*
+* TINKERPOP-2073 Generate tabs for static code blocks
+* TINKERPOP-2074 Ensure that only NuGet packages for the current version are pushed
+* TINKERPOP-2075 Introduce ReferenceElementStrategy
+* TINKERPOP-2077 VertexProgram.Builder should have a default create() method with no Graph
+* TINKERPOP-2078 Hide use of EmptyGraph or RemoteGraph behind a more unified method for TraversalSource construction
+* TINKERPOP-2079 Move RemoteGraph to test package *(breaking)*
+* TINKERPOP-2084 For remote requests in console display the remote stack trace
+* TINKERPOP-2092 Deprecate default GraphSON serializer fields
+* TINKERPOP-2093 Bump to Groovy 2.5.4
+* TINKERPOP-2097 Create a DriverRemoteConnection with an initialized Client
+* TINKERPOP-2101 Support Spark 2.4
+* TINKERPOP-2103 Remove deprecated submit() options on RemoteConnection *(breaking)*
+* TINKERPOP-2104 Allow ImportCustomizer to handle fields
+* TINKERPOP-2106 When gremlin executes timeout, throw TimeoutException instead of TraversalInterruptedException/InterruptedIOException
+* TINKERPOP-2110 Allow Connection on Different Path (from /gremlin)
+* TINKERPOP-2111 Add BulkSet as a GraphSON type *(breaking)*
+* TINKERPOP-2114 Document common Gremlin anti-patterns
+* TINKERPOP-2116 Explicit Bindings object for Python *(breaking)*
+* TINKERPOP-2117 gremlin-python: Provide a better data structure for a Binding
+* TINKERPOP-2119 Validate C# code samples in docs
+* TINKERPOP-2121 Bump Jackson Databind 2.9.8
\ No newline at end of file
diff --git a/docs/archive/changelogs/changelog-3.5.x.asciidoc b/docs/archive/changelogs/changelog-3.5.x.asciidoc
new file mode 100644
index 0000000..e3bf254
--- /dev/null
+++ b/docs/archive/changelogs/changelog-3.5.x.asciidoc
@@ -0,0 +1,748 @@
+////
+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.
+////
+== TinkerPop 3.5.0 (The Sleeping Gremlin: No. 18 Entr'acte Symphonique)
+
+image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/images/gremlin-sleeping-beauty.png[width=185]
+
+[[release-3-5-8]]
+=== TinkerPop 3.5.8 (Release Date: November 20, 2023)
+
+* Fixed a bug in Gremlin.Net that can lead to an `InvalidOperationException` due to modifying a collection while iterating over it in the serializers.
+* Bumped Netty to 4.1.96
+
+==== Bugs
+
+* TINKERPOP-2976 InvalidOperationException: Collection was modified in GraphBinary serialization
+* TINKERPOP-2983 Upgrade Netty for Security Reasons
+
+==== Improvements
+
+* TINKERPOP-2984 Replace Moq mocking library in .NET tests
+* TINKERPOP-2991 Reformat Javadoc link in reference docs
+
+
+[[release-3-5-7]]
+=== TinkerPop 3.5.7 (Release Date: July 31, 2023)
+
+* Bumped `jackson-databind` to 2.15.2 to fix security vulnerability.
+* Introduced `maxNumberLength`, `maxStringLength`, and `maxNestingDepth` configs for `GraphSON` serializers.
+* Fixed a memory leak in the Gremlin.Net driver that only occurred if a `CancellationToken` was provided.
+* Fixed gremlin-python `Client` problem where calling `submit()` after` `close()` would hang the system.
+* Added `gremlin.spark.dontDeleteNonEmptyOutput` to stop deleting the output folder if it is not empty in `spark-gremlin`.
+* Fixed a bug in `SubgraphStrategy` where the vertex property filter produced errors if a `Vertex` was missing the key provided to `by()` as a token.
+* Upgraded `gremlin-javascript` and `gremlint` to Node 16.20.0.
+* Upgraded `gremlin-go` to Go 1.20.
+* Improved the python `Translator` class with better handling for `P`, `None` and subclasses of `str`.
+* Fixed bug in `FilterRankingStrategy` that was preventing certain traversals from recognizing labels in child traversals.
+* Added `gremlin-java8.bat` file as a workaround to allow loading the console using Java 8 on Windows.
+* Fixed a bug in `gremlin-server` where timeout tasks were not cancelled and could cause very large memory usage when timeout is large.
+* Removed `jcabi-manifests` dependency from `gremlin-core`, `gremlin-driver`, and `gremlin-server`.
+* Fixed a bug that caused the `GremlinGroovyScriptEngine` to throw a `MissingMethodException` when calling a static method in __ with the same name as an enum.
+* Deprecated Neo4j-Gremlin
+* Added `VertexPropertyFilter` to `GraphComputer`
+
+==== Bugs
+
+* TINKERPOP-2920 SubgraphStrategy failure when property key not present on vertex in by()
+* TINKERPOP-2937 Throw an error when trying to use a closed connection
+* TINKERPOP-2944 Memory leak in Gremlin.Net driver if CancellationToken is used
+* TINKERPOP-2948 PRISMA security vulnerabilty for jackson-databind 2.14.0 *(breaking)*
+* TINKERPOP-2953 Static import for __.values() overriden by Column.values()
+* TINKERPOP-2958 ScheduledExecutorService for timeouts are never cancelled
+* TINKERPOP-2965 FilterRankingStrategy removing labels it shouldn't in certain conditions
+
+==== Improvements
+
+* TINKERPOP-1403 Provide support for GraphFilter.vertexProperties() *(breaking)*
+* TINKERPOP-2941 DO NOT purge the output location if it has content in SparkGraphComputer
+* TINKERPOP-2954 Pass Gremlin Version from Maven to Java Without Manifests
+* TINKERPOP-2955 Support SSL in WebSocketClient
+* TINKERPOP-2977 Deprecate Neo4j-Gremlin
+
+[[release-3-5-6]]
+=== TinkerPop 3.5.6 (Release Date: May 1, 2023)
+
+* Added `GraphFilter` support to `GraphSONRecordReader`.
+* gremlin-python aiohttp dependency requirement upper bound relaxed to <4.0.0.
+* Fixed network connection closing for sessions and transactions in `gremlin-python`.
+* Fixed memory cleanup for sessions and transactions in `gremlin-python` and `gremlin-go`.
+* Fixed bug in `CountStrategy` where `or()` and `and()` filters were not being rewritten properly for some patterns.
+* Changed `PartitionStrategy` to force its filters to the end of the chain for `Vertex` and `Edge` read steps, thus preserving order of the `has()`.
+* Added `RequestOptions` and `RequestOptionsBuilder` types to Go GLV to encapsulate per-request settings and bindings.
+* Improved `addE()` error messaging when traverser is not a `Vertex`.
+* Added `SubmitWithOptions()` methods to `Client` and `DriverRemoteConnection` in Go GLV to pass `RequestOptions` to the server.
+* Fixed bug in which `gremlin-server` would not respond to clients if an `Error` was thrown during bytecode traversals.
+* Added ability to deploy multi-arch Docker images for server and console. Server image now supports AMD64 and ARM64.
+* Changed `with()` configuration for `ARGS_BATCH_SIZE` and `ARGS_EVAL_TIMEOUT` to be more forgiving on the type of `Number` used for the value.
+* Changed `gremlin-console` to add imports via an ImportCustomizer to reduce time spent resolving imports.
+* Bumped to Groovy 2.5.22.
+* Fixed `generateUserAgent()` in `gremlin-javascript` and `gremlin-dotnet` to handle null and undefined properly, and updated Java UserAgent error handling
+* Fixed bug in parsing of `math()` expressions where variables were not being identified if they contained a text associated with a function.
+* Refactored `FilterRankingStrategy` to improve performance for deeply nested traversals.
+* Refactored strategy application to improve performance by avoiding some excessive recursion.
+* Added `Traversal.lock()` to provide an explicit way to finalize a traversal object.
+* Changed `Traversal.getGraph()` to get its `Graph` object from itself or, if not available, its parent.
+* Added `AuthInfoProvider` interface and `NewDynamicAuth()` to gremlin-go for dynamic authentication support.
+* Fixed bug where `hasId()` unrolls ids in Java arrays to put into `P.within` but not ids in lists, this also aligned behavior of start-step and mid-traversal hasId().
+* Bumped to `snakeyaml` 2.0 to fix security vulnerability.
+* Bumped to Apache `commons-configuration` 2.9.0 to fix security vulnerability.
+* Fixed `CountStrategy` bug for cases where predicates contain negative numbers by disabling the optimization.
+* Improved `count` step optimization for negative values in input for 'eq' comparison.
+* Fixed performance issue when using `SampleGlobalStep` with a traverser that has either a `LABELED_PATH` or `PATH` requirement.
+* Reduce the `toString()` of `ObjectWritable` to avoid OOM for running OLAP queries on Spark.
+
+==== Bugs
+
+* TINKERPOP-2526 Gremlin Console performance with incomplete multi-line scripts
+* TINKERPOP-2767 Repeat Out Times traversal hangs indefinitely on first execution
+* TINKERPOP-2820 gremlin-python _close_session race condition/FD leak
+* TINKERPOP-2855 Performance degradation in TinkerGraph 3.5.4 and 3.5.5
+* TINKERPOP-2856 math() step fails if variable name contains a keyword
+* TINKERPOP-2861 Fix incorrect symlinks in source release zip
+* TINKERPOP-2863 HasId Step generates incorrect results when given a list of IDs mid-traversal
+* TINKERPOP-2878 Incorrect handling of local operations when there are duplicate elements
+* TINKERPOP-2888 DefaultTraversal's applyStrategies performance decrease
+* TINKERPOP-2891 Inconsistent behavior when comparing a counted value with a negative value
+* TINKERPOP-2893 Incorrectly comparing a counted value with multiple predicates
+* TINKERPOP-2902 Critical security vulnerability in snakeyaml
+* TINKERPOP-2905 gremlin-go gorillaTransporter.logHandler is not initialized correctly and leads to panic
+* TINKERPOP-2911 CountStrategy converts count().is(0) wrongly under ConnectiveStrategy
+* TINKERPOP-2918 Utils.GenerateUserAgent assumes Gremlin.Net.dll to be present when, in some environments, it is not.
+
+==== Improvements
+
+* TINKERPOP-2841 Test and Fix Per Request Settings in Go
+* TINKERPOP-2852 Update Maven plugin for docker-images building for M1 compatibility
+* TINKERPOP-2857 GraphSONRecordReader does not allow configure a GraphFilter during deserialization
+* TINKERPOP-2865 Add has steps injected by PartitionStrategy at the end of the filter
+* TINKERPOP-2890 Avoid exceptions on local scope based steps where possible
+* TINKERPOP-2899 SampleGlobalStep samples inefficiently with TraverserSet running into hash collisions
+* TINKERPOP-2912 Improve error message for addE() when traverser is incorrect
+* TINKERPOP-2919 Improve performance of FilterRankingStrategy for deeply nested traversals
+* TINKERPOP-2934 Optimize ObjectWritable for displaying content of Java Collection or Map to reduce OOM
+
+[[release-3-5-5]]
+=== TinkerPop 3.5.5 (Release Date: January 16, 2023)
+
+* Changed the `Result` struct in gremlin-go to make it more suitable for mocking in tests.
+* Changed label generation in `PathProcessorStrategy` to be more deterministic.
+* Bumped to Apache `commons-configuration` 2.8.0 to fix security vulnerability.
+* Fixed issue where the `GremlinGroovyScriptEngine` reused the same translator concurrently which lead to incorrect translations.
+* Fixed bug where tasks that haven't started running yet time out due to `evaluationTimeout` and never send a response back to the client.
+* Set the exact exception in `initializationFailure` on the Java driver instead of the root cause.
+* Improved error message for when `from()` and `to()` are unproductive for `addE()`.
+* Added `SparkIOUtil` utility to load graph into Spark RDD.
+* Improved performance of `CloneVertexProgram` by bypassing the shuffle state of `SparkGraphComputer`.
+* Changed `JavaTranslator` exception handling so that an `IllegalArgumentException` is used for cases where the method exists but the signature can't be discerned given the arguments supplied.
+* Dockerized all test environment for .NET, JavaScript, Python, Go, and Python-based tests for Console, and added Docker as a build requirement.
+* Async operations in .NET can now be cancelled. This however does not cancel work that is already happening on the server.
+* Bumped to `snakeyaml` 1.32 to fix security vulnerability.
+* Update docker/build.sh to work with docker-compose dockerized tests changes.
+* Fix permission issues with Docker generated files by setting permission to current user, so sudo isn't needed for maven operations.
+* Updated base images for gremlin-server and gremlin-console docker images to support arm64.
+* Use Go embed for error/logger resources for `gremlin-go` to avoid missing resource files when using binaries.
+* Added user agent to web socket handshake in java driver. Can be controlled by a new enableUserAgentOnConnect configuration. It is enabled by default.
+* Added user agent to web socket handshake in Gremlin.Net driver. Can be controlled by `EnableUserAgentOnConnect` in `ConnectionPoolSettings`. It is enabled by default.
+* Added user agent to web socket handshake in go driver. Can be controlled by a new `EnableUserAgentOnConnect` setting. It is enabled by default.
+* Added user agent to web socket handshake in python driver. Can be controlled by a new `enable_user_agent_on_connect` setting. It is enabled by default.
+* Added user agent to web socket handshake in javascript driver. Can be controlled by a new `enableUserAgentOnConnect` option. It is enabled by default.
+* Added logging in .NET.
+* Added `addDefaultXModule` to `GraphSONMapper` as a shortcut for including a version matched GraphSON extension module.
+* Modified `GraphSONRecordReader` and `GraphSONRecordWriter` to include the GraphSON extension module by default.
+* Bumped `jackson-databind` to 2.14.0 to fix security vulnerability.
+* Bumped to Groovy 2.5.15.
+* Bumped to Netty 4.1.86.
+* Bumped `ivy` to 2.5.1 to fix security vulnerability
+* Removed default SSL handshake timeout. The SSL handshake timeout will instead be capped by setting `connectionSetupTimeoutMillis`.
+* Improved logging for `gremlin-driver`.
+* Modified `Connection` and `Host` job scheduling in `gremlin-driver` by dividing their work to two different thread pools and sparing work from the primary pool responsible for submitting requests and reading results.
+* Prevented usage of the fork-join pool for `gremlin-driver` job scheduling.
+* Modified `GremlinScriptChecker` to extract the `Tokens.REQUEST_ID` from Gremlin scripts.
+* Changed `Host` initialization within a `Client` to be parallel again in `gremlin-driver`.
+* Changed mechanism for determining `Host` health which should make the driver more resilient to intermittent network failures.
+* Removed the delay for reconnecting to a potentially unhealthy `Host` only marking it as unavailable after that initial retry fails.
+* Prevented fast `NoHostAvailableException` in favor of more direct exceptions when borrowing connections from the `ConnectionPool`.
+* Improved Gherkin tests for more consistent results.
+* Provides users with potentially more information to driver TimeoutExceptions.
+* Fixed an issue in Go and Python GLVs where modifying per request settings to override request_id's was not working correctly.
+* Fixed incorrect implementation for `GraphTraversalSource.With` in `gremlin-go`.
+* Changed `Gremlin.version()` to return "VersionNotFound" if the version is missing from the manifest.
+* Fixed local steps to avoid throwing an exception for non-iterable input.
+* Fixed a case sensitivity issue when comparing request UUIDs in `gremlin-javascript`.
+
+==== Bugs
+
+* TINKERPOP-2765 Race condition during script creation when using UnifiedChannelizer
+* TINKERPOP-2769 gremlin-server does not reply with a timeout response to all timed out requests
+* TINKERPOP-2771 Critical severity security vulnerabilty in commons-configuration 2.7
+* TINKERPOP-2796 High severity security vulnerability found in snakeyaml
+* TINKERPOP-2803 Incorrect count() with sample() in TinkerGraph
+* TINKERPOP-2809 High severity security vulnerability found in jackson databind
+* TINKERPOP-2815 Critical security vulnerability for apache commons-text
+* TINKERPOP-2816 Gherkin test issues for implementers
+* TINKERPOP-2817 Support java.lang.Byte in hadoop GraphSONRecordWriter/GraphSONRecordReader
+* TINKERPOP-2826 Critical security vulnerability in ivy
+* TINKERPOP-2836 Github actions do not run java driver integration tests
+* TINKERPOP-2840 Test Failures on NonDex
+* TINKERPOP-2843 Security vulnerabilities found in netty version 4.1.77
+* TINKERPOP-2849 Incorrect implementation for GraphTraversalSource.With in gremlin-go
+
+==== Improvements
+
+* TINKERPOP-2471 Add logging to Gremlin.Net driver
+* TINKERPOP-2480 User agent for Gremlin drivers
+* TINKERPOP-2737 Dockerized Build and Test Environments
+* TINKERPOP-2772 Add Spark utility to load vertices as RDD
+* TINKERPOP-2779 Floating ConnectedComponent Feature Failures for GitHub Actions on windows
+* TINKERPOP-2785 Inability to Mock Returned Result Types in Gremlin-Go Driver
+* TINKERPOP-2792 Better exception when JavaTranslator finds a method but not the overload
+* TINKERPOP-2794 Allow cancellation of Gremlin.Net async methods
+* TINKERPOP-2808 Improve Compatibility on ARM machines
+* TINKERPOP-2813 Improve driver usability for cases where NoHostAvailableException is currently thrown
+* TINKERPOP-2814 Add a SSL handshake timeout configuration to the driver
+* TINKERPOP-2833 TestSupport loads files too slow
+* TINKERPOP-2834 CloneVertexProgram optimization on SparkGraphComputer
+* TINKERPOP-2842 Expand GremlinScriptChecker to include request id overrides
+
+[[release-3-5-4]]
+=== TinkerPop 3.5.4 (Release Date: July 18, 2022)
+
+* Added exception to Gremlin Server that is thrown when using a transaction on a non-transaction graph.
+* Exposed error message sent by the server as a property on `GremlinServerError` for gremlin-python
+* Allowed `datetime()` syntax to accept zone offset with colon separators and seconds.
+* Fixed a minor problem in the Gremlin parser where a `GraphTraversalSource` may not have been initialized.
+* Added getters to high and low properties in `RangeLocalStep`.
+* Added `Pick` traversal to the return from `getGlobalChildren()` for `BranchStep`.
+* Ensured `Pick` traversal was an integrated child.
+* Added GraphBinary serialization support to gremlin-javascript.
+* Improved startup time by removing unnecessary DNS lookup.
+* Bumped to logback 1.2.9.
+* Bumped to netty 4.1.77.
+* Fixed bug in `submitAsync()` in gremlin-python where the deprecated version was not returning its result.
+* Added missing `ResponseStatusCodeEnum` entries for 403, 429, 497, and 596 for .NET.
+* Added GraphBinary support in gremlin-python for short, bigdecimal and biginteger.
+* Fixed bug in `PartitionStrategy` where the use of `AbstractLambdaTraversal` caused an unexpected exception.
+* Fixed bug where close requests for sessions were improperly validating the request in the `UnifiedChannelizer`.
+* Deprecated and removed functionality of the `connectOnStartup` option in `gremlin-javascript` to resolve potential `unhandledRejection` and race conditions.
+* Ensured `Graph` instance was set between `TraversalStrategy` executions.
+* Fixed potential `NullPointerException` in `gremlin-driver` where initialization of a `ConnectionPool` would fail but not throw an exception due to centralized error check being satisfied by a different process.
+* Fixed a bug where the JavaScript client would hang indefinitely on traversals if the connection to the server was terminated.
+* Fix a javadoc comment in Cluster.Builder regarding maxInProcessPerConnection.
+* Added a getter for selectKeys in SelectStep
+
+==== Bugs
+
+* TINKERPOP-2734 NullPointerException when calling Client chooseConnection()
+* TINKERPOP-2735 IllegalStateException: Unrecognized content of the 'gremlin' argument... on connection close
+* TINKERPOP-2736 PluginAcceptror interface no more available in 3.5.3+ but referred in documentation
+* TINKERPOP-2741 GraphMLWriter error message is not properly formatted
+* TINKERPOP-2751 Transaction: tx.commit() hangs up in javascript client-lib
+* TINKERPOP-2754 Javascript client hangs if the server restarts
+* TINKERPOP-2763 client.submitAsync returns None value
+* TINKERPOP-2768 BranchStep pickToken should be integrated when added as a child option
+
+==== Improvements
+
+* TINKERPOP-2229 JavaScript GLV: Add GraphBinary Support
+* TINKERPOP-2631 GraphSON float serialization when ujson is used is imprecise
+* TINKERPOP-2693 Complete GraphBinary support in Python
+* TINKERPOP-2740 first request suspend more than 9s when using gremlin-java-driver
+* TINKERPOP-2748 Medium security vulnerability on netty-all and netty-codec
+* TINKERPOP-2762 getScopeKeys should respect the order of keys passed in Step
+* TINKERPOP-2764 AWS Neptune returns an inaccessible structured error response
+
+[[release-3-5-3]]
+=== TinkerPop 3.5.3 (Release Date: April 4, 2022)
+
+* Added support for using a readable stream when submitting scripts through the JavaScript driver which allows processing each batch of result sets as they come in, rather than waiting for the entire result set to complete before allowing processing.
+* Fixed issue with implicit conversion of `Infinity` number instances into `BigDecimal`.
+* Ensured that new properties are added before triggering the associated event.
+* Added support for WebSocket compression in the .NET driver. (Only available on .NET 6.)
+* Added Groovy `Translator` for .NET.
+* Bumped to `jackson-databind` 2.13.2.2.
+* Fixed bug in `DefaultTraversal.clone()` where the resulting `Traversal` copy could not be re-iterated.
+* Fixed bug in `JavaTranslator` that did not handle `has()` well where `null` was the first argument.
+* Renamed `GremlinBaseVisitor` to `DefaultGremlinBaseVisitor` in `gremlin-core` to prevent conflict with the generated `GremlinBaseVisitor` in `gremlin-language`.
+* Tracked transaction spawned connections and closed them when the parent connection was closed for `gremlin-python`.
+* Prevented unintentionally opening another transaction in `TraversalOpProcessor`` and `SessionOpProcessor` of Gremlin Server.
+* Fixed bug in `Translator` of `gremlin-python` around translation of Booleans.
+
+==== Bugs
+
+* TINKERPOP-2694 Bug of TinkerGraph gremlin api "has()"
+* TINKERPOP-2706 Traversal clone() not resetting the close state
+* TINKERPOP-2712 PropertyChangedEvent is triggered before Property is actually changed
+* TINKERPOP-2717 Gremlin.NET : WebSocketConnection does not check for MessageType.Close, causing error InvalidOperationException: "Received data deserialized into null object message. Cannot operate on it."
+* TINKERPOP-2719 hasNext is called on TraverserIterator after transaction is committed
+* TINKERPOP-2726 Python's GroovyTranslator translates boolean wrong
+
+==== Improvements
+
+* TINKERPOP-2367 Gremlin Translators for .NET
+* TINKERPOP-2518 Enhance .NET gherkin framework to deal with more advanced assertions
+* TINKERPOP-2651 Update to .NET 6
+* TINKERPOP-2679 Update JavaScript driver to support processing messages as a stream
+* TINKERPOP-2682 Enable WebSocket compression in .NET by default
+* TINKERPOP-2707 Closing parent connection in python should close tx() connections
+* TINKERPOP-2711 Make gremlin-language optional as it brings in CDDL/GPL dependencies
+* TINKERPOP-2716 Enable eslint for gremlin-javascript project
+* TINKERPOP-2725 Traversal Strategy Mix Up In Gremlin-Python
+* TINKERPOP-2727 HasContainer should allow a null key
+* TINKERPOP-2728 jackson-databind high security issue identified
+
+[[release-3-5-2]]
+=== TinkerPop 3.5.2 (Release Date: January 10, 2022)
+
+This release also includes changes from <<./changelog-3.4.x.asciidoc#release-3-4-13, 3.4.13>>.
+
+* Added an `AnonymizingTypeTranslator` for use with `GroovyTranslator` which strips PII (anonymizes any String, Numeric, Date, Timestamp, or UUID data)
+* Added support for `g.tx()` in Python.
+* Added logging in in Python.
+* Added `tx()` syntax to `gremlin-language`.
+* Fixed shutdown cleanup issue in Python aiohttp transport layer.
+* Added a `NoSugarTranslator` translator to `PythonTranslator` which translates Gremlin queries to Python without syntactic sugar (ex `g.V().limit(1)` instead of `g.V()[0:1]`)
+* Added support for `g.Tx()` in .NET.
+* Added support for `with()` constant options to `io()`.
+* Changed `GroovyTranslator` to generate code more compatible to Java with `Date` and `Timestamp`.
+* Fixed bug in the processing of the `io()` step when constructing a `Traversal` from the grammar.
+* Added the `ConnectedComponent` tokens required to properly process the `with()` of the `connectedComponent()` step.
+* Fixed `DotNetTranslator` bugs where translations produced Gremlin that failed due to ambiguous step calls to `has()`.
+* Fixed bug where `RepeatUnrollStrategy`, `InlineFilterStrategy` and `MessagePassingReductionStrategy` were all being applied more than necessary.
+* Modified grammar to accept the `datetime()` function so that Gremlin scripts have a way to natively construct a `Date`.
+* Ensured `PathRetractionStrategy` is applied after `InlineFilterStrategy` which prevents an error in traverser mapping in certain conditions.
+* Deprecated `JsonBuilder` serialization for GraphSON and Gryo.
+* Added `ProductiveByStrategy` to ensure consistency of `by()` modulator behaviors when child traversal arguments contained no elements.
+* Changed drivers to once again send the previously deprecated and removed "close" message for sessions.
+* Modified `fold()` to merge `Map` instances with `addAll`.
+* Allowed `null` string values in the Gremlin grammar.
+* Fixed support for `SeedStrategy` in the Gremlin Grammar.
+* Fixed bug in `Translator` of `gremlin-javascript` around array translation.
+* Fixed bugs in `PythonTranslator`, `JavascriptTranslator` and `DotNetTranslator` when translating `TraversalStrategy` objects to Javascript.
+* Prevented exception with `hasLabel(null)` and `hasKey(null)` and instead filter away traversers as these structural components can't ever be null.
+* Improved handling of `null` when passed to `P` predicates.
+* Handled `null` for mathematical reducing operations of `sum()`, `mean()`, `max()` and `min()`.
+* Allowed `null` values in `Memory` for `GraphComputer`.
+* Allowed `null` assignment in `withSideEffect()`.
+* Allowed labelling of steps that emit a traverser carrying `null`.
+* Fixed bug in filtering for `null` property key arguments to `valueMap()`, `elementMap()`, `properties()` and `values()`.
+* Modified grammar to allow a call to `within()` and `without()` with no arguments.
+* Fixed problems with `inject(null)` variations where `null` was the only value being submitted.
+* Fixed problem with `GroovyTranslator` and `inject(null,null)` which could be interpreted as the Groovy JDK extension `inject(Object,Closure)`.
+* Fixed error where certain variants of `inject()` with `null` might not properly construct a traversal in .NET.
+* Prevented exception with `hasValue(null)` and allowed filtering as expected.
+* Refined `DotNetTranslator` to be more explicit with `null` arguments to ensure that the right overloads are called.
+* Created `GremlinParser` to construct `Traversal` objects from `gremlin-language`.
+* Added `GremlinLangScriptEngine` as a `GremlinScriptEngine` implementation that users the grammar and `JavaTranslator` to evaluate Gremlin.
+* Added getter method for `bypassTraversal` in `AbstractLambdaTraversal`.
+* Added support for custom GraphBinary types in .NET.
+* Removed some unnecessary exception wrapping around `gremlin-driver` errors now producing a more immediate view of the actual error cause.
+
+==== Bugs
+
+* TINKERPOP-2569 Reconnect to server if Java driver fails to initialize
+* TINKERPOP-2585 Traversal failed for different strategies order
+* TINKERPOP-2589 XML External Entity (XXE) vulnerability
+* TINKERPOP-2597 NullPointerException while initializing connection pool
+* TINKERPOP-2598 within(null) NPE
+* TINKERPOP-2603 TinkerGraph sometimes could not query float values.
+* TINKERPOP-2609 HTTP returns serialization exceptions for the GraphTraversalSource
+* TINKERPOP-2621 toString for traversals such as within with empty array returns empty string as argument instead of brackets
+* TINKERPOP-2626 RangeGlobalStep closes traversal prematurely
+* TINKERPOP-2649 Unable to translate gremlin query to java
+* TINKERPOP-2658 Translator in gremlin-javascript has trouble with array arguments
+* TINKERPOP-2662 Unclosed client session and stacktrace pops up when cleanup is missed
+* TINKERPOP-2670 JavaDocs do not build when using JDK 11
+
+==== Improvements
+
+* TINKERPOP-2504 Intermittently failing server/driver integration tests
+* TINKERPOP-2555 Support for remote transactions in Python
+* TINKERPOP-2556 Support remote transactions in .NET
+* TINKERPOP-2570 Support custom type in GraphBinary for .NET
+* TINKERPOP-2582 Construct traversals from gremlin-language
+* TINKERPOP-2583 Make gremlin-groovy processing optional in Gremlin Server
+* TINKERPOP-2591 Administrative adjustments to gremlint site
+* TINKERPOP-2592 Align the style guides
+* TINKERPOP-2596 datetime function
+* TINKERPOP-2605 Further enforce and refine null semantics
+* TINKERPOP-2615 Expand testing of path() with null values
+* TINKERPOP-2616 Provide better exceptions with SSL related failures *(breaking)*
+* TINKERPOP-2620 Clean up NullPointerExceptions related to null arguments on property related steps
+* TINKERPOP-2630 Clarify that a server cannot support Graphson1.0 over HTTP
+* TINKERPOP-2632 Netty 4.1.61 flagged with two high severity security violations
+* TINKERPOP-2637 Enhance logging in the Python
+* TINKERPOP-2646 Make .NET StreamExtensions public for GraphBinary
+* TINKERPOP-2656 Provide a no syntax sugar translator for python
+* TINKERPOP-2660 Bring back close message for drivers
+* TINKERPOP-2666 Create an anonymizing Translator for logging traversals without user data
+* TINKERPOP-2667 Allow fold() with addAll to work on Map
+* TINKERPOP-2668 Updating aiohttp requirements at germin-python due to vulnerability
+* TINKERPOP-2669 Netty 4.1.61 flagged with medium severity security violations
+* TINKERPOP-2671 Add tx() support to grammar
+
+[[release-3-5-1]]
+=== TinkerPop 3.5.1 (Release Date: July 19, 2021)
+
+This release also includes changes from <<./changelog-3.4.x.asciidoc#release-3-4-12, 3.4.12>>.
+
+* Added support for `g.tx()` in Javascript.
+* Fixed bug in Javascript error message related to validating anonymous traversal spawns.
+* Changed close of Python and Javascript connections to no longer send a "close message" as the server no longer acknowledges it as of 3.5.0.
+* Fixed bug where the `Graph` instance was not being assigned to child traversals.
+* Removed sending of deprecated session close message from Gremlin.Net driver.
+
+==== Bugs
+
+* TINKERPOP-2358 Potential connection leak on client disposing
+* TINKERPOP-2554 Extracting step metrics from ProfileStep throws NPE if the step was not triggered
+* TINKERPOP-2565 GraphMLWriter does not check vertexLabelKey conflict
+* TINKERPOP-2566 Incomplete error message in bytecode step generation
+* TINKERPOP-2568 Graph instance not set for child traversals
+* TINKERPOP-2578 Set arguments to P within/without are wrapped in List
+* TINKERPOP-2579 EventStrategy doesn't work with anonymous traversal
+* TINKERPOP-2580 Update the custom DSL documentation
+
+==== Improvements
+
+* TINKERPOP-2548 Add getter for indexer used in IndexStep
+* TINKERPOP-2551 Setup scripts to publish Gremint to npm
+* TINKERPOP-2557 Support remote transactions in Javascript
+* TINKERPOP-2559 Stop sending the close message for .NET
+* TINKERPOP-2560 Stop sending close message for Python
+* TINKERPOP-2561 Stop sending close message in Javascript
+* TINKERPOP-2576 Setup automatic updates via Dependabot for Gremlin.NET
+* TINKERPOP-2577 Remove unused test coverage dependencies from Gremlin.NET
+
+[[release-3-5-0]]
+=== TinkerPop 3.5.0 (Release Date: May 3, 2021)
+
+This release also includes changes from <<./changelog-3.4.x.asciidoc#release-3-4-11, 3.4.11>>.
+
+* Changed transport implementation to use AIOHTTP instead of Tornado for gremlin-python.
+* Added max_content_length and unit test for it in gremlin-python.
+* Removed compression_option support for transport in gremlin-python.
+* Fixed event loop issues and added unit test for it in gremlin-python.
+* Fixed DriverRemoteConnection multithreading issues and added unit test for it in gremlin-python.
+* Fixed heartbeat timeout issues and tested with local server manually for gremlin-python.
+* Fixed build errors emitted for gremlin-python (asyncio task destroyed but is pending error).
+* Added `gremlin-language` module.
+* Allowed the possibility for the propagation of `null` as a `Traverser` in Gremlin.
+* Added a fully shaded version of `gremlin-driver`.
+* Exposed websocket connection status in JavaScript driver.
+* Fixed a bug where spark-gremlin was not re-attaching properties when using `dedup()`.
+* Fixed a bug in `WsAndHttpChannelizer` pipeline configuration where failed object aggregation could not write back HTTP responses.
+* Ensured better consistency of the use of `null` as arguments to mutation steps.
+* Added a `ResponseStatusCode` to indicate that a client should retry its request.
+* Added `TemporaryException` interface to indicate that a transaction can be retried.
+* Prevented `TraversalStrategy` instances from being added more than once, where the new instance replaces the old.
+* Improved error message for `addE()` when the `from()` or `to()` does not resolve to a `Vertex`.
+* Improved error message for `addE()` when cardinality is specified on `property()` assignments.
+* Allowed `property(T.label,Object)` to be used if no value was supplied to `addV(String)`.
+* Dropped support for .NET Standard 1.3 in Gremlin.Net. Only .NET Standard 2.0 is supported starting with this version.
+* Added GraphBinary support for .NET.
+* Added `UnifiedChannelizer` which exposes HTTP and Websockets connections and processes both sessionless and in-session requests with the same `gremlinPool`.
+* Bounded the `gremlinPool` in Gremlin Server to enforce rate limiting which will then produce a `TOO_MANY_REQUESTS` response status code.
+* Switched from `Newtonsoft.Json` to `System.Text.Json` as the JSON library for Gremlin.Net.
+* Allowed additional arguments to `Client.submit()` in Javascript driver to enable setting of parameters like `scriptEvaluationTimeout`.
+* Gremlin.Net driver no longer supports skipping deserialization by default. Users can however create their own `IMessageSerializer` if they need this functionality.
+* Supported deserialization of `dict` and `list` as a key in a `dict` for Python.
+* Changed the aliased `Client` to proxy `close()` methods to its underlying client.
+* Added support for remote `g.tx()` usage.
+* Added support for bytecode-based sessions.
+* Added a `Graph.Feature` for `supportsNullPropertyValues`.
+* Modified `TokenTraversal` to support `Property` thus `by(key)` and `by(value)` can now apply to `Edge` and meta-properties.
+* Added `SeedStrategy` to allow deterministic behavior for `coin()`, `sample()` and `Order.shuffle`.
+* Added `Grouping` step interface.
+* Added `TraversalParent.replaceTraversal()` which can replace a direct child traversal.
+* Added `ByModulatorOptimizationStrategy` which replaces certain standard traversals w/ optimized traversals (e.g. `TokenTraversal`).
+* Improved `IdentityRemovalStrategy` by accounting for `EndStep` situations.
+* Added `IdentityRemovalStrategy` to the standard list of `TraversalStrategies`.
+* Modified `PathRetractionStrategy` to leave labels more often with `match()` cases to return more consistent results.
+* Refactored `MapStep` to move its logic to `ScalarMapStep` so that the old behavior could be preserved while allow other implementations to have more flexibility.
+* Modified TinkerGraph to support `null` property values and can be configured to disable that feature.
+* Modified `null` handling in mutations to be consistent for a new `Vertex` as well as update to an existing one.
+* Enforced use of anonymous child traversals.
+* Removed support for Python 2.x in gremlinpython.
+* Upgraded to Apache Commons Configuration2.
+* Renamed `StoreStep` to `AggregateLocalStep`.
+* Renamed `AggregateStep` to `AggregateGlobalStep`.
+* Renamed `SERVER_ERROR_SCRIPT_EVALUATION` to `SERVER_ERROR_EVALUATION` given that this response code applies to remote traversals as well as scripts.
+* Refactored `TraversalStrategies` to implement `Iterable`.
+* Refactored `Traversal` semantics to always expect `EmptyStep` as a parent if it is meant to be the root `Traversal`.
+* Configured GraphBinary as the default binary serialization format for the Java Driver.
+* Configured GraphSON 3.0 as the default text serialization format when no serializer can be determined.
+* Configured GraphSON 3.0 as the default setting for the `GraphSONMapper`.
+* Added `JavascriptTranslator` for Java.
+* Added `DotNetTranslator` for Java.
+* Added Groovy `Translator` for Python.
+* Fixed bug in `PythonTranslator` for processing `TraversalStrategy` instances in GraphBinary.
+* Fixed bug in bytecode `Bindings` where calling `of()` prior to calling a child traversal in the same parent would cause the initial binding to be lost.
+* Migrated from Tornado to AIOHTTP for gremlinpython.
+* Bumped to Neo4j 3.4.11.
+* Bumped to Spark 3.0.0.
+* Bumped to Jackson 2.11.x.
+* Supported build for Java 11.
+* Added `MessageSerializer.getMapper()` to return the underlying object that handles serialization for a particular implementation.
+* Added a parameterized `TypeTranslator` for use with `GroovyTranslator` that should produce more cache hits.
+* Added support for `TextP` in Neo4j using its string search functions.
+* Added a kerberos KDC to the docker container for testing GLV's.
+* Added kerberos authentication to Gremlin-Python.
+* Added audit logging to bytecode-based traversals.
+* Changed `TraversalStrategy` application methodology to apply each strategy in turn to each level of the traversal hierarchy starting from root down to children.
+* Added a VertexProgramRestrictionStrategy.
+* Prevented more than one `Client` from connecting to the same Gremlin Server session.
+* Changed the Groovy to an optional dependency in `gremlin-driver`.
+* Added support for configuring an `Authorizer` implementation to Gremlin Server, allowing for authorization of individual gremlin requests.
+* Added `gremlint` module to house the Gremlin query formatting JavaScript library powering gremlint.com.
+* Removed internal functionality for the session close message in Gremlin Server - the message is accepted but ignored if sent.
+* Removed `Property.Exceptions.propertyValueCanNotBeNull` exception type as `null` now has meaning in Gremlin.
+* Removed the "experimental" support for multi/meta-properties in Neo4j.
+* Removed Gryo serialization configurations from Gremlin Server sample configurations and default configurations.
+* Removed previously deprecated custom keep-alive functionality in the Java driver.
+* Removed previously deprecated `BytecodeUtil`.
+* Removed previously deprecated `Cluster.maxWaitForSessionClose` configuration option.
+* Removed previously deprecated `TraversalStrategies.applyStrategies()`.
+* Removed previously deprecated `scriptEvaluationTimeout`.
+* Removed previously deprecated `NioChannelizer` and related classes.
+* Removed previously deprecated remote traversal side-effects and related infrastructure.
+* Removed previously deprecated `Serializers.DEFAULT_RESULT_SERIALIZER` and `Serializers.DEFAULT_REQUEST_SERIALIZER`.
+* Removed previously deprecated `decr` and `incr` from `Order`.
+* Removed previously deprecated `TraversalSource.withRemote()`.
+* Removed previously deprecated `ResponseHandlerContext` infrastructure.
+* Removed previously deprecated `VertexProgram` related infrastructure.
+* Removed previously deprecated SSL settings: `keyCertChainFile`, `keyFile`, `keyPassword` and `trustCertChainFile` and related infrastructure.
+* Removed previously deprecated `PropertyMapStep` constructor and `isIncludeTokens`.
+* Removed previously deprecated `StarGraph.builder()` and `StarGraph.Builder.create()`.
+* Removed previously deprecated `AbstractOpProcessor.generateMetaData(ChannelHandlerContext, RequestMessage, ResponseStatusCode, Iterator)`
+* Removed previously deprecated `BulkDumperVertexProgram` and `BulkLoaderVertexProgram`.
+
+==== Bugs
+
+* TINKERPOP-1619 TinkerGraphComputer worker count affects OptionalStep query results
+* TINKERPOP-2107 Spark fails to reattach properties
+* TINKERPOP-2157 SparkStarBarrierInterceptor injects (Byte) 0
+* TINKERPOP-2159 EventStrategy doesn't handle multi-valued properties
+* TINKERPOP-2175 Executor thread is not returned on channel close
+* TINKERPOP-2185 Use commons-configuration2 instead of commons-configuration *(breaking)*
+* TINKERPOP-2192 Gremlin.Net.Driver.Connection.Parse throws a NullReferenceException
+* TINKERPOP-2224 Detect and fix resource leak
+* TINKERPOP-2230 match() step unexpected behaviours
+* TINKERPOP-2232 RemoteStrategy does not call parent class TraversalStrategy __init__
+* TINKERPOP-2238 Fix remaining iterator leaks marked by @IgnoreIteratorLeak
+* TINKERPOP-2241 Client exception don't match Server exception when server throw StackOverflowError
+* TINKERPOP-2248 Instability of driver for blocked requests
+* TINKERPOP-2257 transaction itty may still be visited after commit
+* TINKERPOP-2264 Gremlin Python should deserialize g:Date to UTC
+* TINKERPOP-2266 Keep alive not started at connection creation
+* TINKERPOP-2274 Test of TinkerGraph Gremlin fail on Windows and non EN locale
+* TINKERPOP-2276 No constructor for remote connection in DSL generated traversal source
+* TINKERPOP-2283 GraphStep's ids null exception
+* TINKERPOP-2285 Error object is unreachable
+* TINKERPOP-2288 Get ConnectionPoolBusyException and then ServerUnavailableExceptions
+* TINKERPOP-2289 Use address instead of hostname for connection
+* TINKERPOP-2290 Javascript GLV connection refused error handling
+* TINKERPOP-2291 TraversalExplanation deserialization in GraphSON
+* TINKERPOP-2298 Bytecode.java flattenArguments throw exception when null
+* TINKERPOP-2303 GremlinDsl generate addV instead of addE
+* TINKERPOP-2318 Edge properties dedup() not work with spark-gremlin *(breaking)*
+* TINKERPOP-2337 In upgrade guide for 3.4.2, the option RemoteConnection.PER_REQUEST_TIMEOUT does not exist
+* TINKERPOP-2338 drop() not removing all edge/meta properties
+* TINKERPOP-2341 GremlinClientExtensions.SubmitAsync hangs as it tries to dispose connection
+* TINKERPOP-2345 NullPointerException when Map key is not found for math()
+* TINKERPOP-2347 Remove invalid service descriptors from gremlin-shaded
+* TINKERPOP-2350 clone() is not deep copying Traversal internals
+* TINKERPOP-2351 Local Map ordering of keys can generate cast errors
+* TINKERPOP-2352 Gremlin Python driver default pool size makes Gremlin keep-alive difficult
+* TINKERPOP-2353 Error while Shutting Down Gremlin Server
+* TINKERPOP-2360 failed to deserializer int32 when gremlin-python submit bytecode with a big int value
+* TINKERPOP-2364 Injected ProfileStep should not be displayed in child traversals
+* TINKERPOP-2365 LazyBarrierStrategy adds a NoOpBarrierStep when profile() is present
+* TINKERPOP-2368 JAVA_OPTIONS are not properly expanded in gremlin-console
+* TINKERPOP-2369 Connections in ConnectionPool are not replaced in background when underlying channel is closed
+* TINKERPOP-2374 SaslAndHttpBasicAuthenticationHandler can't extract authorization
+* TINKERPOP-2383 has(T,Traversal) does not return results
+* TINKERPOP-2384 Inject and withSideEffect causing different outcomes in order step
+* TINKERPOP-2388 gremlinpython: Can't close DriverRemoteConnection
+* TINKERPOP-2403 Gremlin javascript Translator does not handle child traversals
+* TINKERPOP-2405 gremlinpython: traversal hangs when the connection is established but the servers stops responding later
+* TINKERPOP-2408 Iterator leak in HasContainer
+* TINKERPOP-2409 js: DriverRemoteConnection never times out if server uri not available.
+* TINKERPOP-2410 Free up server threads when client is closed
+* TINKERPOP-2425 Server closes HTTP connection for keepAlive as true
+* TINKERPOP-2432 Generate correct toString() representation of bytecode in Javascript
+* TINKERPOP-2433 typo in javadocs match() Type Parameters
+* TINKERPOP-2435 Gremlin Python sugar syntax for values() can lead to unexpected problems
+* TINKERPOP-2437 gremlin-driver hangs if ResultSet.statusAttributes().get() is called when the request throws
+* TINKERPOP-2439 P and TextP toString() is broken
+* TINKERPOP-2458 Bytecode Bindings lost when followed by a child traversal
+* TINKERPOP-2465 TestHelper.generateTempFileFromResource file handling is invalid on windows
+* TINKERPOP-2475 Barrier step touches one more element of next loop
+* TINKERPOP-2478 Console byte code translator has issues with "new Date()"
+* TINKERPOP-2496 GremlinDslProcessor fails when SocialTraversalSourceDsl overrides close
+* TINKERPOP-2505 Gremlin Python Client Query Times out at 30 seconds instead of the server timeout
+* TINKERPOP-2512 Duplicate jars in classpath when running gremlin-server.sh
+* TINKERPOP-2513 Generics insufficiently strict on property()
+* TINKERPOP-2514 Java client driver requests with same request ids hang
+* TINKERPOP-2516 Property folding has trouble with coalesce
+* TINKERPOP-2529 Global dedup() in reducing by() of group() detaches elements for OLTP
+* TINKERPOP-2531 Gremlin .NET driver ConnectionPool can remain without connections if server is down for 1-2 minutes
+
+==== Improvements
+
+* TINKERPOP-709 Consider Bounding Gremlin Pool Queue Size
+* TINKERPOP-1084 Branch option tokens should be allowed to be traversals.
+* TINKERPOP-1553 Deprecate store() in favor of aggregate(Scope)
+* TINKERPOP-1568 Change strategy application order *(breaking)*
+* TINKERPOP-1641 Kerberos authentication for gremlin-python
+* TINKERPOP-1682 by-modulator optimization strategy
+* TINKERPOP-1733 hasKey, hasValues should work on Element and Property
+* TINKERPOP-1810 Add Lambda.binaryOperator and Lambda.unaryOperator
+* TINKERPOP-1838 Python sample script
+* TINKERPOP-1886 Gremlin Python driver to periodically issue ping / heartbeat to gremlin server
+* TINKERPOP-1921 Support hasNext terminal step in GLVs
+* TINKERPOP-1994 LazyBarrierStrategy fully responsible for barrier() additions
+* TINKERPOP-2001 Support lambdas in Javascript
+* TINKERPOP-2014 Allow an ability to specify seeding for random methods such as coin, sample and Order.shuffle
+* TINKERPOP-2020 Support withComputer() for javascript
+* TINKERPOP-2046 Gremlin-Python: Support custom request headers in WebSocket request
+* TINKERPOP-2054 Support TraversalStrategy specification in gremlin-javascript
+* TINKERPOP-2076 Build with Java 11
+* TINKERPOP-2080 Remove deprecated TraversalSource.withRemote() *(breaking)*
+* TINKERPOP-2099 Property setting with null has different behavior between add and update *(breaking)*
+* TINKERPOP-2133 Use neo4j index lookup in Neo4jGraphStep with HasContainers containing TextP predicates
+* TINKERPOP-2168 GraphSON: P deserialization should be optimized
+* TINKERPOP-2213 Replace scriptEvaluationTimeout in favor of something more suitable to bytecode
+* TINKERPOP-2215 Better exception message for connection problems
+* TINKERPOP-2223 Update jackson databind to 2.9.9
+* TINKERPOP-2231 Remove deprecated bulk dumping/loading VertexPrograms *(breaking)*
+* TINKERPOP-2233 Remove deprecated Order decr/incr *(breaking)*
+* TINKERPOP-2235 Better handle the concept of null in traversals *(breaking)*
+* TINKERPOP-2236 Improve error messaging for TinkerGraph IdManagers that fail on conversions
+* TINKERPOP-2237 Prevent error when closing sessions that don't exist *(breaking)*
+* TINKERPOP-2239 Remove previously deprecated SSL configuration options *(breaking)*
+* TINKERPOP-2242 Bump to netty 4.1.36
+* TINKERPOP-2243 Add user-agent to RequestOptions
+* TINKERPOP-2245 Consolidate the executor for bytecode & string based client
+* TINKERPOP-2246 Consolidate the error propagation to the client
+* TINKERPOP-2250 Support toString serialization in GraphBinary
+* TINKERPOP-2251 Remove deprecated VertexProgram-related methods *(breaking)*
+* TINKERPOP-2252 A meaningful way to support session based byteCode interaction through gremlin-driver
+* TINKERPOP-2254 Rename AggregateStep and StoreStep given aggregate(Scope,String) *(breaking)*
+* TINKERPOP-2256 processAllStarts of AggregateStep should only be called when barrier is empty
+* TINKERPOP-2259 Default Java based driver and server operations to GraphBinary and remove Gryo *(breaking)*
+* TINKERPOP-2260 Update jackson databind 2.9.9.1
+* TINKERPOP-2262 Improve Netty protocol handling
+* TINKERPOP-2265 Deprecate Traversal.getSideEffects() functionality for remoting purposes
+* TINKERPOP-2269 Remove remote side-effect related infrastructure *(breaking)*
+* TINKERPOP-2270 Deprecate multi/metaproperty support in Neo4j
+* TINKERPOP-2271 Add console preference to control server-originated warning display
+* TINKERPOP-2272 Rename steps and tokens that conflict with standard python functions
+* TINKERPOP-2273 Remove deprecated ResponseHandlerContext infrastructure *(breaking)*
+* TINKERPOP-2277 Python sdk postpone the timing to create transport
+* TINKERPOP-2279 GraphBinary support in Python
+* TINKERPOP-2280 Prevent use of T values as property key overloads
+* TINKERPOP-2284 Make it easier to return more structure of graph elements
+* TINKERPOP-2295 Remove deprecated scriptEvaluationTimeout *(breaking)*
+* TINKERPOP-2296 Per query timeout not working from Python
+* TINKERPOP-2302 Add isOnGraphComputer() field accessor to ElementMapStep
+* TINKERPOP-2307 Add better error message for badly configured Channelizer
+* TINKERPOP-2310 Reduce Traversal.isRoot() to a check of EmptyStep *(breaking)*
+* TINKERPOP-2311 TraversalStrategies implementing Iterable *(breaking)*
+* TINKERPOP-2312 Empty keys to group() should group to null
+* TINKERPOP-2314 Employ by(String) for Map when possible and improve errors around incorrect types
+* TINKERPOP-2315 Implement some form of clone() or reset() for Traversal in GLVs
+* TINKERPOP-2317 Remove Python 2 support *(breaking)*
+* TINKERPOP-2320 [SECURITY] XMLInputFactory initialization in GraphMLReader introduces
+* TINKERPOP-2325 Generate traversals that will better yield index lookups with SPARQL
+* TINKERPOP-2327 Remove deprecated NIO protocol support *(breaking)*
+* TINKERPOP-2328 Do not close all connections if just one has became closed
+* TINKERPOP-2335 Drop support for older GLV runtimes
+* TINKERPOP-2336 Allow close of channel without having to wait for server
+* TINKERPOP-2349 Switch from Newtonsoft.Json to System.Text.Json *(breaking)*
+* TINKERPOP-2354 Document recommendation to reuse graph traversal source
+* TINKERPOP-2356 Bump to Jackson 2.10.x
+* TINKERPOP-2357 Add a command to clear the Gremlin Console screen
+* TINKERPOP-2361 Prevent using GraphTraversalSource spawned traversals as children *(breaking)*
+* TINKERPOP-2371 Add possibility to import constants with ImportGremlinPlugin
+* TINKERPOP-2376 Probability distribution controlled by weight when using sample step
+* TINKERPOP-2377 Investigate intermittent .NET GLV test failures
+* TINKERPOP-2389 Authorization support in TinkerPop
+* TINKERPOP-2391 Drop GLV Templating System
+* TINKERPOP-2392 Improve module level documentation for GLVs
+* TINKERPOP-2394 Unable to use __ class of a custom DSL when passing a script even if this class is imported *(breaking)*
+* TINKERPOP-2395 Gremlin Python doesn't support list as keys in groupCount
+* TINKERPOP-2396 TraverserSet should be extendable for GraphDB provider
+* TINKERPOP-2397 Don't create the default Gyro serializer if the caller specifies a different one
+* TINKERPOP-2401 Upgrade Jackson-databind to 2.11.x
+* TINKERPOP-2406 Delegate processing from event loop to worker threads
+* TINKERPOP-2407 Support deserialization of a dict that has a dict as a key
+* TINKERPOP-2412 Add missing query tests
+* TINKERPOP-2413 Prefer withEmbedded() to withGraph() on AnonymousTraversalSource
+* TINKERPOP-2415 Avoid unnecessary detached objects if not required
+* TINKERPOP-2416 MultiIterator should implement AutoCloseable
+* TINKERPOP-2418 Store authenticated user on server pipeline
+* TINKERPOP-2420 Support per query request options in .NET
+* TINKERPOP-2421 Support per query options in javascript
+* TINKERPOP-2426 Use Netty's WebSocketClientProtocolHandler
+* TINKERPOP-2427 Simplify Netty reference counting
+* TINKERPOP-2430 Looping Recipies
+* TINKERPOP-2431 Operating on Dropped Elements Recipes
+* TINKERPOP-2436 The gremlin server starts even if all graphs instantiation has failed
+* TINKERPOP-2438 Provide a way for scripts to respect with() specification of timeout
+* TINKERPOP-2440 Simplify driver by delegating keepAlive logic to Netty
+* TINKERPOP-2441 Add compression to WebSocket frames sent from client
+* TINKERPOP-2442 Make Translators that work in Java part of gremlin-core
+* TINKERPOP-2443 Improve testing of Translator instances for non-JVM languages with focus on Python as a model
+* TINKERPOP-2445 Speed up client initialization *(breaking)*
+* TINKERPOP-2446 Add Recipe for Optional Looping
+* TINKERPOP-2447 Improve handling of StackOverflowError for long traversals
+* TINKERPOP-2451 JavascriptTranslator for Java
+* TINKERPOP-2452 DotNetTranslator for Java
+* TINKERPOP-2453 Add WebSocket compression to gremlin-python
+* TINKERPOP-2455 Remove deprecated custom keep-alive functionality in the Java driver Channelizer *(breaking)*
+* TINKERPOP-2457 Add a max_content_length parameter to DriverRemoteConnection in the Python client
+* TINKERPOP-2460 Change groovy to provided scope in gremlin-driver *(breaking)*
+* TINKERPOP-2461 Align CoreImports with GroovyTranslator
+* TINKERPOP-2462 Duplicated BytecodeUtil and BytecodeHelper classes
+* TINKERPOP-2466 Improve syntax for Groovy scripts that use withStrategies()
+* TINKERPOP-2468 Stabilize shouldProcessSessionRequestsInOrder() test
+* TINKERPOP-2469 KrbException - Principal does not exist in test
+* TINKERPOP-2470 Bump gremlinpython to tornado 6.x
+* TINKERPOP-2472 GraphBinary support in .NET
+* TINKERPOP-2473 Prevent TraversalStrategy instances of the same type to be added to a TraversalSource
+* TINKERPOP-2474 withSack() Groovy translation output could be simplified
+* TINKERPOP-2476 Provide fully shaded version of Java driver
+* TINKERPOP-2479 Provide a way to set a custom GraphSONMapper for :bytecode command
+* TINKERPOP-2481 IdentityRemovalStrategy not installed *(breaking)*
+* TINKERPOP-2482 Rename wsConnectionTimeout to connectionSetupTimeout
+* TINKERPOP-2484 Python IOLoop close errors
+* TINKERPOP-2485 Invalid http tests with ?gremlin=1-1
+* TINKERPOP-2494 Document Translator parameter extraction functionality
+* TINKERPOP-2499 PathRetractionStrategy returns inconsistent results when match() is not detected as the final step *(breaking)*
+* TINKERPOP-2500 Add none() step for all GLVs
+* TINKERPOP-2506 Expose client WebSocket connection status
+* TINKERPOP-2517 Introduce a retry status code to the server protocol
+* TINKERPOP-2527 Add a GroovyTranslator equivalent method to the Python client
+* TINKERPOP-2530 Transfer OyvindSabo/gremlint and OyvindSabo/gremlint.com to apache/tinkerpop/gremlint
+* TINKERPOP-2532 MaxBarrierSize of NoOpBarrierStep should be accessible
+* TINKERPOP-2533 Develop a grammar for Gremlin
+* TINKERPOP-2535 Netty 4.1.52 flagged as medium security violation
+* TINKERPOP-2537 Support bytecode based requests in sessions and remote tx()
+* TINKERPOP-2544 Modify site publishing scripts to include gremlint
+* TINKERPOP-2546 Change transport layer to use AIOHTTP instead of Tornado
+* TINKERPOP-2547 Provide an option to supply a callback before handshake submission
+* TINKERPOP-2550 Deadlock on Client initialization
\ No newline at end of file
diff --git a/docs/archive/changelogs/changelog-3.6.x.asciidoc b/docs/archive/changelogs/changelog-3.6.x.asciidoc
new file mode 100644
index 0000000..4262fc9
--- /dev/null
+++ b/docs/archive/changelogs/changelog-3.6.x.asciidoc
@@ -0,0 +1,513 @@
+////
+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.
+////
+== TinkerPop 3.6.0 (Tinkerheart)
+
+image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/images/gremlin-victorian.png[width=185]
+
+[[release-3-6-8]]
+=== TinkerPop 3.6.8 (October 23, 2024)
+
+* Fixed a bug in GremlinServer not properly propagating arguments when authentication is enabled.
+* Fixed bug in Java driver where connection pool was not removing dead connections under certain error conditions.
+* Raised handshake exceptions for Java driver for `NoHostAvailableException` situations.
+* The default logging level for Gremlin Console in Windows is set to the same WARN level as for Linux.
+* Updated to Docker Compose V2 with `docker-compose` changed to `docker compose` in pom and script files.
+* Add command line option `-l` to change logging level for Gremlin Console in Windows.
+* Add `enableCompression` connection setting to Java, Python, and JS GLVs.
+* Increased minimum python version from 3.8 to 3.9
+* Upgraded `gremlin-go` to Go 1.22.
+* Bump Netty to 4.1.100
+* Bump Logback to 1.2.13
+* Bump Ivy to 2.5.2
+* Fixed a memory leak in the Javascript driver when there is a server error response.
+* Throw more descriptive error in `gremlin-go` when request size exceeds `WriteBufferSize`
+* Fixed a missing runtime dependency in `gremlin-python`
+
+==== Bugs
+
+* TINKERPOP-3035 Add explicit property(IDictionary) for .NET
+* TINKERPOP-3050 security vulnerability in logback-core
+* TINKERPOP-3051 security vulnerability in logback-classic
+* TINKERPOP-3052 security vulnerability in ivy
+* TINKERPOP-3053 security vulnerability in netty-codec-http2
+* TINKERPOP-3076 Incorrect handling of large requests in Go GLV
+* TINKERPOP-3077 Javascript translator incorrectly handle quotes, null and undefined values
+* TINKERPOP-3079 The test `TraversalStrategiesTest#shouldAllowUserManipulationOfGlobalCache` is not idempotent, as it passes in the first run and fails in repeated runs in the same environment.
+* TINKERPOP-3081 When using authentication, evaluationTimeout is ignored
+* TINKERPOP-3116 async_timeout not declared in gremlinpython dependencies
+
+==== Improvements
+
+* TINKERPOP-2700 WebSocket compression may lead to attacks (CRIME / BREACH)
+* TINKERPOP-3086 Upgrade gremlin-python to newer Python interpreter
+* TINKERPOP-3098 Gremlin Console bat file is missing log level configuration option
+
+[[release-3-6-7]]
+=== TinkerPop 3.6.7 (April 8, 2024)
+
+* Fixed a bug in Gremlin.Net for .NET 8 that led to exceptions: `InvalidOperationException: Enumeration has not started. Call MoveNext.`
+* Fixed message requestId serialization in `gremlin-python`.
+* Improved performance of `PathRetractionStrategy` for traversals that carry many children, but don't hold many labels to propogate.
+* Fixed bug in bytecode translation of `g.tx().commit()` and `g.tx().rollback()` in all languages.
+* Improved error message from `JavaTranslator` by including exception source.
+* Added missing `short` serialization (`gx:Int16`) to GraphSONV2 and GraphSONV3 in `gremlin-python`.
+* Added tests for error handling for GLV's if `tx.commit()` is called remotely for graphs without transactions support.
+* Introduced multi-architecture AMD64/ARM64 docker images for gremlin-console.
+* Fixed bug in `JavaTranslator` where `has(String, null)` could call `has(String, Traversal)` to generate an error.
+* Fixed issue where server errors weren't being properly parsed when sending bytecode over HTTP.
+* Improved `Bulkset` contains check for elements if all elements in `Bulkset` are of the same type.
+* Fixed bug in `EarlyLimitStrategy` which was too aggressive when promoting `limit()` before `map()`.
+* Prevented mid-traversal `mergeE()` and `mergeV()` from operating on an incoming `Traverser` that contains an `Element`.
+* Improved performance of the application of `FilterRankingStrategy` for large traversals with deeply nested traversals by improving the cache operation.
+* Updated aliased client to pass along options via `with()` when submitting traversals.
+* Upgraded `gremlin-go` to Go 1.21.
+* Upgraded `gremlin-javascript` and `gremlint` to Node 18.17.0.
+* Allowed public access for `serviceName` and `mergedParams` in `CallStep`, and checks on `PartitionStrategy` usage in `MergeStep`.
+
+==== Bugs
+
+* TINKERPOP-2359 onShutDown not being called when docker container stopped
+* TINKERPOP-2913 Ensure that if tx.commit() is called remotely it does not hang for graphs without transactions
+* TINKERPOP-3022 JavaTranslator failing for has(String, null)
+* TINKERPOP-3027 Pick.any should be any_()
+* TINKERPOP-3029 Gremlin.Net: Traversal enumeration fails on .NET 8
+* TINKERPOP-3031 Bad translation for g.tx()
+* TINKERPOP-3039 Java driver won't propagate with args when using aliased client directly
+* TINKERPOP-3045 EarlyLimitStrategy is too aggresive to promote Limit and thus causing incorrect results
+* TINKERPOP-3054 RequestId serialization broken in Python GLV
+* TINKERPOP-3056 mergeE is updating vertices in certain conditions
+
+==== Improvements
+
+* TINKERPOP-2995 Create Sample Applications in each GLV
+* TINKERPOP-3021 Publish ARM64 Gremlin Console Images
+* TINKERPOP-3030 Update to .NET 8
+* TINKERPOP-3068 Make serviceName and mergedParams public for provider usage in CallStep
+
+[[release-3-6-6]]
+=== TinkerPop 3.6.6 (November 20, 2023)
+
+This release also includes changes from <<./changelog-3.5.x.asciidoc#release-3-5-8, 3.5.8>>.
+
+* Fixed a javadoc comment in `GraphTraversal.not()` method.
+* Allowed `gremlin-driver` to be used over HTTP for experimental purposes.
+* Added user agent handling to gremlin-server for HTTP requests.
+* Allowed `io()` to automatically detect ".graphml" as a file extension.
+* Deprecated the `HandshakeInterceptor` in favor of a more generic `RequestInterceptor`.
+* Allowed `gremlin-python` to be used over HTTP for experimental purposes.
+* Fixed translation of `P`, `TraversalStrategy` and Enums, and added translation for `Vertex`, `Edge`, `VertexProperty`, list, set, dict, number, binding and lambda in Groovy Translator for Python.
+* Fixed a bug in `StarGraph` where `EdgeFilter` did not remove associated Edge Properties.
+* Added Gremlin translator implementation to the Go GLV.
+* Fixed Go translator to handle array arguments.
+* In Go GLV `P.Within` and `P.Without` extended to accept array arguments similar to other GLV's
+* Improved `SubgraphStrategy` by reducing chance for redundant filtering of adjacent vertices.
+* Fixed bug with filtering for `group()` when the side-effect label was defined for it.
+* ProjectStep now throws exception when a duplicate key is provided in a query.
+* Fixed bug in `replaceLocalChild` where child traversal was not correctly integrated.
+* Fixed bug in `ElementIdStrategy` where the order of `hasId` was impacting proper filters.
+* Fixed bug in the Java driver configuration for serialization when reading settings from an `InputStream`.
+* Fixed bug in `DotNetTranslator` where `PartitionStrategy` usage was not translating properly when specifying the `readPartitions`.
+* Fixed bug in `PythonTranslator` where `Set` syntax was not being generated properly.
+* Fixed bug in configuration object given to `PartitionStrategy` for Go that prevented `readPartitions` from behing set properly.
+* Fixed bug where the `partitionKey` was not being written when using `PartitionStrategy` with `mergeV()` and `mergeE()`
+* Added checking for valid UUID requestIds in `gremlin-python` and `gremlin-javascript`.
+* Do not use `XOR` for hashCode computation of Step when only simple keys are used and duplicate keys are allowed.
+
+==== Bugs
+
+* TINKERPOP-2423 hashCode collision for steps with different attributes
+* TINKERPOP-2811 ElementIdStrategy doesn't replace all references of an element's id with the specified custom id property
+* TINKERPOP-2921 Filters not working when side-effect is used with group()
+* TINKERPOP-2976 InvalidOperationException: Collection was modified in GraphBinary serialization
+* TINKERPOP-2983 Upgrade Netty for Security Reasons
+* TINKERPOP-2996 Golang Translator in core does not properly translate list arguments
+* TINKERPOP-3001 Gremlin Console complains about missing serializers field
+* TINKERPOP-3009 SubgraphStrategy produces excessive filtering when multiple labels are filtered upon
+
+==== Improvements
+
+* TINKERPOP-2802 Support Adding Custom Serializer for Gremlin Go
+* TINKERPOP-2830 Handle User-Agent from HTTP Requests to server
+* TINKERPOP-2951 Add translator to the Go GLV
+* TINKERPOP-2964 Many TraversalParent's steps have a replaceLocalChild logic that can result in a new ChildTraversal having an ID that already exists.
+* TINKERPOP-2982 Allow gremlin-driver usage over HTTP
+* TINKERPOP-2984 Replace Moq mocking library in .NET tests
+* TINKERPOP-2986 StarGraph shall drop edge properties when dropping edges
+* TINKERPOP-2988 Serialization error throws an Invalid OpProcessor exception when using stream() API
+* TINKERPOP-2991 Reformat Javadoc link in reference docs
+* TINKERPOP-2994 PartitionStrategy does not work with mergeV() and mergeE()
+* TINKERPOP-3006 Allow gremlin-python usage over HTTP
+
+[[release-3-6-5]]
+=== TinkerPop 3.6.5 (Release Date: July 31, 2023)
+
+This release also includes changes from <<./changelog-3.5.x.asciidoc#release-3-5-7, 3.5.7>>.
+
+* Added `text/plain` MIME type to the HTTP endpoint to return a Gremlin Console-like representation of the data.
+* Added GraphBinary serialization option to the HTTP endpoint.
+* Fixed bug with `fail` step not working with a `VertexProgram` running on the server.
+* Introduced mime type `application/vnd.gremlin-v1.0+json;typed=false` to allow direct specification of GraphSON 1.0 without types.
+* Introduced mime type `application/vnd.gremlin-v2.0+json;typed=false` to allow direct specification of GraphSON 2.0 without types.
+* Removed `final` class declaration for `LabelStep`.
+* Fixed MergeE/MergeV steps to always throw exception for invalid `onMatch` option.
+* TINKERPOP-2802: Add support for custom deserializers to the Gremlin-Go Driver
+
+==== Bugs
+
+* TINKERPOP-2920 SubgraphStrategy failure when property key not present on vertex in by()
+* TINKERPOP-2937 Throw an error when trying to use a closed connection
+* TINKERPOP-2948 PRISMA security vulnerabilty for jackson-databind 2.14.0 *(breaking)*
+* TINKERPOP-2953 Static import for __.values() overriden by Column.values()
+* TINKERPOP-2958 ScheduledExecutorService for timeouts are never cancelled
+* TINKERPOP-2965 FilterRankingStrategy removing labels it shouldn't in certain conditions
+
+==== Improvements
+
+* TINKERPOP-1403 Provide support for GraphFilter.vertexProperties() *(breaking)*
+* TINKERPOP-2938 Revisit merge step feature tests
+* TINKERPOP-2939 The Merge onMatch map validation is during execution instead of construction
+* TINKERPOP-2941 DO NOT purge the output location if it has content in SparkGraphComputer
+* TINKERPOP-2947 Provide a plain text serializer for HTTP
+* TINKERPOP-2954 Pass Gremlin Version from Maven to Java Without Manifests
+* TINKERPOP-2955 Support SSL in WebSocketClient
+* TINKERPOP-2956 Update gremlint version for the published application
+* TINKERPOP-2963 Introduce new mimeType to return GraphSon-1.0 in text format
+* TINKERPOP-2977 Deprecate Neo4j-Gremlin
+
+[[release-3-6-4]]
+=== TinkerPop 3.6.4 (Release Date: May 12, 2023)
+
+* Fixed bug in `TextP.regex` and `TextP.notRegex` serialization for Java GLV.
+* Fixed a memory leak in the Gremlin.Net driver that only occurred if a `CancellationToken` was provided.
+
+==== Bugs
+
+* TINKERPOP-2945 TextP.regex() Serialization Failing in Java driver
+* TINKERPOP-2944 Memory leak in Gremlin.Net driver if CancellationToken is used
+
+[[release-3-6-3]]
+=== TinkerPop 3.6.3 (Release Date: May 1, 2023)
+
+This release also includes changes from <<./changelog-3.5.x.asciidoc#release-3-5-6, 3.5.6>>.
+
+* Fixed bug in `element()` when traversing from edges where bulking was enabled.
+* Refactored `PropertyMapStep` to improve extensibility by providers. Removed `final` class declaration for `ProjectStep` and `CoalesceStep`.
+* Fixed bug in grammar that prevented declaration of a `Map` key named `new` without quotes.
+* Fixed bug in grammar that prevented parsing of `Map` key surrounded by parenthesis which is allowable in Groovy.
+* Fixed bug in `GroovyTranslator` that surrounded `String` keys with parenthesis for `Map` when not necessary.
+* Added support to the grammar allowing `List` and `Map` key declarations for `Map` entries.
+* Fixed `Direction` enum bug in `gremlin-javascript` where `Direction.from_` and `Direction.to` was not properly aliased to `Direction.OUT` and `Direction.IN`
+* Fixed `Direction` enum in `gremlin-python` where `Direction.from_` and `Direction.to` were not added, and they can now be used instead of defining `from_=Direction.OUT` and `to=Direction.IN`
+* Improved performance of comparison (equals) between not compatible types and nulls.
+* Fixed `mergeV()` and `mergeE()` steps to work when `onCreate` is immutable map.
+* Introduced `Writing` and `Deleting` marker interfaces to identify whether a step can perform write or delete or both on Graph.
+* For `mergeV()` and `mergeE()`, added checks for illegal hidden keys and refactored `searchVertices` to allow subclasses to override search criteria.
+* Added static map capturing possible `Traversal` steps that shall be added to traversal for a given operator.
+* Fixed bug which caused some traversals to throw `GremlinTypeErrorException` to users.
+
+==== Bugs
+
+* TINKERPOP-2526 Gremlin Console performance with incomplete multi-line scripts
+* TINKERPOP-2767 Repeat Out Times traversal hangs indefinitely on first execution
+* TINKERPOP-2820 gremlin-python _close_session race condition/FD leak
+* TINKERPOP-2855 Performance degradation in TinkerGraph 3.5.4 and 3.5.5
+* TINKERPOP-2856 math() step fails if variable name contains a keyword
+* TINKERPOP-2861 Fix incorrect symlinks in source release zip
+* TINKERPOP-2863 HasId Step generates incorrect results when given a list of IDs mid-traversal
+* TINKERPOP-2870 mergeV requires key of 'new' to be quoted
+* TINKERPOP-2878 Incorrect handling of local operations when there are duplicate elements
+* TINKERPOP-2888 DefaultTraversal's applyStrategies performance decrease
+* TINKERPOP-2891 Inconsistent behavior when comparing a counted value with a negative value
+* TINKERPOP-2893 Incorrectly comparing a counted value with multiple predicates
+* TINKERPOP-2901 Incorrect result caused by has(key, predicate)
+* TINKERPOP-2902 Critical security vulnerability in snakeyaml
+* TINKERPOP-2905 gremlin-go gorillaTransporter.logHandler is not initialized correctly and leads to panic
+* TINKERPOP-2911 CountStrategy converts count().is(0) wrongly under ConnectiveStrategy
+* TINKERPOP-2918 Utils.GenerateUserAgent assumes Gremlin.Net.dll to be present when, in some environments, it is not.
+* TINKERPOP-2922 GroovyTranslator produces a Map not parseable by the grammar
+* TINKERPOP-2925 mergeE() in javascript producing an error
+* TINKERPOP-2926 Gremlin-Java > An UnsupportedOperationException occurs on calling next() after a merge step with the option step modulator if the element does not exist
+* TINKERPOP-2928 element() not working in conjunction with edge properties
+
+==== Improvements
+
+* TINKERPOP-2841 Test and Fix Per Request Settings in Go
+* TINKERPOP-2852 Update Maven plugin for docker-images building for M1 compatibility
+* TINKERPOP-2857 GraphSONRecordReader does not allow configure a GraphFilter during deserialization
+* TINKERPOP-2865 Add has steps injected by PartitionStrategy at the end of the filter
+* TINKERPOP-2890 Avoid exceptions on local scope based steps where possible
+* TINKERPOP-2899 SampleGlobalStep samples inefficiently with TraverserSet running into hash collisions
+* TINKERPOP-2912 Improve error message for addE() when traverser is incorrect
+* TINKERPOP-2919 Improve performance of FilterRankingStrategy for deeply nested traversals
+* TINKERPOP-2924 Refactor PropertyMapStep to be able to overwrite map method
+* TINKERPOP-2929 Introduce new marker interfaces to identify whether a step can perform write or delete or both
+* TINKERPOP-2931 Fix a few minor mergeV/E issues
+* TINKERPOP-2934 Optimize ObjectWritable for displaying content of Java Collection or Map to reduce OOM
+
+[[release-3-6-2]]
+=== TinkerPop 3.6.2 (Release Date: January 16, 2023)
+
+This release also includes changes from <<./changelog-3.5.x.asciidoc#release-3-5-5, 3.5.5>>.
+
+* Fixed bug in the Gremlin grammar for parsing of empty queries.
+* Provided mechanism for provider plugins to get notified on script/query processing via `GraphManager`.
+* Fixed bug in `select()` when using multiple labels.
+* Moved Gherkin feature tests to `gremlin-test` resources so that they are more easily referenced by providers.
+* Made quality of life changes to semantics for `mergeV/E` based on initial feedback.
+
+==== Bugs
+
+* TINKERPOP-2765 Race condition during script creation when using UnifiedChannelizer
+* TINKERPOP-2769 gremlin-server does not reply with a timeout response to all timed out requests
+* TINKERPOP-2771 Critical severity security vulnerabilty in commons-configuration 2.7
+* TINKERPOP-2796 High severity security vulnerability found in snakeyaml
+* TINKERPOP-2801 Incorrect deprecation notice on gremlin-python
+* TINKERPOP-2803 Incorrect count() with sample() in TinkerGraph
+* TINKERPOP-2805 No results returned for multiple labels to select()
+* TINKERPOP-2809 High severity security vulnerability found in jackson databind
+* TINKERPOP-2815 Critical security vulnerability for apache commons-text
+* TINKERPOP-2816 Gherkin test issues for implementers
+* TINKERPOP-2817 "Could not find a type identifier for the class : class java.lang.Byte" occurs when dumping graph to graphson format
+* TINKERPOP-2826 Critical security vulnerability in ivy
+* TINKERPOP-2836 Github actions do not run java driver integration tests
+* TINKERPOP-2840 Test Failures on NonDex
+* TINKERPOP-2843 Security vulnerabilities found in netty version 4.1.77
+* TINKERPOP-2849 Incorrect implementation for GraphTraversalSource.With in gremlin-go
+
+==== Improvements
+
+* TINKERPOP-2471 Add logging to Gremlin.Net driver
+* TINKERPOP-2480 User agent for Gremlin drivers
+* TINKERPOP-2622 Enforce ordering semantics in feature tests
+* TINKERPOP-2696 Refactor Gherkin test framework to better handle bindings
+* TINKERPOP-2737 Dockerized Build and Test Environments
+* TINKERPOP-2772 Add Spark utility to load vertices as RDD
+* TINKERPOP-2779 Floating ConnectedComponent Feature Failures for GitHub Actions on windows
+* TINKERPOP-2785 Inability to Mock Returned Result Types in Gremlin-Go Driver
+* TINKERPOP-2792 Better exception when JavaTranslator finds a method but not the overload
+* TINKERPOP-2794 Allow cancellation of Gremlin.Net async methods
+* TINKERPOP-2804 gherkin feature files should be on the classpath
+* TINKERPOP-2806 Provide method for provider plugins to get notified on script/query processing
+* TINKERPOP-2808 Improve Compatibility on ARM machines
+* TINKERPOP-2813 Improve driver usability for cases where NoHostAvailableException is currently thrown
+* TINKERPOP-2814 Add a SSL handshake timeout configuration to the driver
+* TINKERPOP-2818 exclude mockito-core in gremlin-core [compile scope] (import by jcabi-manifests)
+* TINKERPOP-2833 TestSupport loads files too slow
+* TINKERPOP-2834 CloneVertexProgram optimization on SparkGraphComputer
+* TINKERPOP-2842 Expand GremlinScriptChecker to include request id overrides
+* TINKERPOP-2850 Modifications to mergeV/E semantics
+
+[[release-3-6-1]]
+=== TinkerPop 3.6.1 (Release Date: July 18, 2022)
+
+This release also includes changes from <<./changelog-3.5.x.asciidoc#release-3-5-4, 3.5.4>>.
+
+* Made GraphBinary the default serialization format for .NET and Python.
+* Added missing `ResponseStatusCodeEnum` entry for 595 for .NET.
+* Fix a javadoc comment in `Cluster.Builder` regarding maxInProcessPerConnection.
+
+==== Bugs
+
+* TINKERPOP-2734 NullPointerException when calling Client chooseConnection()
+* TINKERPOP-2736 PluginAcceptor interface no more available in 3.5.3+ but referred in documentation
+* TINKERPOP-2741 GraphMLWriter error message is not properly formatted
+* TINKERPOP-2746 Medium security vulnerabilities on logback-core
+* TINKERPOP-2751 Transaction: tx.commit() hangs up in javascript client-lib
+* TINKERPOP-2754 Javascript client hangs if the server restarts
+* TINKERPOP-2768 BranchStep pickToken should be integrated when added as a child option
+
+==== Improvements
+
+* TINKERPOP-2229 JavaScript GLV: Add GraphBinary Support
+* TINKERPOP-2631 GraphSON float serialization when ujson is used is imprecise
+* TINKERPOP-2693 Complete GraphBinary support in Python
+* TINKERPOP-2715 remove log4jv1 dependency
+* TINKERPOP-2723 Make GraphBinary the default serialization format for .NET and Python *(breaking)*
+* TINKERPOP-2740 first request suspend more than 9s when using gremlin-java-driver
+* TINKERPOP-2748 Medium security vulnerability on netty-all and netty-codec
+* TINKERPOP-2762 getScopeKeys should respect the order of keys passed in Step
+* TINKERPOP-2764 AWS Neptune returns an inaccessible structured error response
+
+[[release-3-6-0]]
+=== TinkerPop 3.6.0 (Release Date: April 4, 2022)
+
+This release also includes changes from <<./changelog-3.5.x.asciidoc#release-3-5-3, 3.5.3>>.
+
+* Added parser support for `NaN` and `Infinity`.
+* Implemented comparability/orderability semantics defined in the Graph Provider documentation.
+* Added `TextP.regex` and `TextP.notRegex`.
+* Changed TinkerGraph to allow identifiers to be heterogeneous when filtering.
+* Prevented values of `T` to `property()` from being `null`.
+* Added throwing `ArithmeticException` when arithmetic operations overflow for byte, short, int and long arguments.
+* Added `element()` step.
+* Added `call()` step.
+* Added `fail()` step.
+* Added `mergeV()` and `mergeE()` steps.
+* Added `Direction` aliases of `from` and `to`.
+* Moved `TraversalOptionParent.Pick` to its own class as `Pick`.
+* Introduced Pythonic Gremlin step names using snake case and deprecated camel case naming.
+* Improved Gherkin test framework to allow for asserting traversal exceptions as a behavior.
+* Fixed query indentation for profile metrics where indent levels were not being respected.
+* `TraversalOpProcessor` no longer accepts a `String` representation of `Bytecode` for the "gremlin" argument which was left to support older versions of the drivers.
+* Removed requirement that "ids" used to filter vertices and edges need to be all of a single type.
+* Created `gremlin-annotations` module where the `@GremlinDsl` annotation and related code has been moved.
+* Moved `GremlinScriptChecker` to `gremlin-core` from `gremlin-groovy` since it is not Groovy dependent.
+* Removed `groovy` and `groovy-json` dependencies from `gremlin-driver` as well as related `JsonBuilder` serialization support.
+* Replaced log4j usage with logback where builds rely on and packaged distributions now contain the latter.
+* Improved behavior of `V()` and `E()` when `null` is an argument producing a filtering behavior rather than an exception.
+* Prevented metrics computation unless the traversal is in a locked state.
+* Added syntax to Gremlin grammar to explicitly define `byte`, `short` and `BigInteger`.
+* Added syntax to Gremlin grammar to allow construction of a reference `Vertex`.
+* Changed Gremlin grammar to allow for Groovy-like syntax when parsing a `Map` literal.
+* Created a way to produce a corpus of Gremlin traversals via `FeatureReader` and `DocumentationReader` in `gremlin-language`.
+* Changed mechanism for determining if `id` equality with `toString()` is used by validating that elements of the predicate collection are all `String` rather than enforcing homogenous collections in the process.
+* Exposed Gherkin tests as part of the provider test suite.
+* Packaged Gherkin tests and data as standalone package as a convenience distribution.
+* Removed `ProductiveByStrategy` as a strategy that is applied by default.
+* Changed `by()` modulator semantics to consistently filter.
+* Removed previously deprecated Gryo `MessageSerializer` implementations.
+* Removed previously deprecated `AuthenticationSettings.enableAuditLog`.
+* Removed previously deprecated `GroovyTranslator` from `gremlin-groovy` module.
+* Removed previously deprecated Gremlin steps that conflicted with Python keywords.
+* Removed the dependency on `six` from `gremlin-python`.
+* Bumped to Apache Hadoop 3.3.1.
+* Bumped to Apache Spark 3.2.0.
+* Bumped node.js in `gremlin-javascript` to v16.13.0.
+* Changed `NumberHelper` to properly cast to `byte` and `short` rather than default coercing to `Integer`.
+* Modified some driver defaults (maximum content length, pool size, maximum in process) to be more consistent with one another.
+* Fixed a potential connection load balancing issue due to a race condition not updating the usage count.
+* Extended `property()` to allow for setting a `Map` of property values.
+
+==== Bugs
+
+* TINKERPOP-2358 Potential connection leak on client disposing
+* TINKERPOP-2486 Client does not load balance requests across available connections
+* TINKERPOP-2507 Remove requirement that Graph implementations must filter on homogeneous identifiers *(breaking)*
+* TINKERPOP-2522 DefaultTraversalMetrics::toString does not indent annotations correctly
+* TINKERPOP-2554 Extracting step metrics from ProfileStep throws NPE if the step was not triggered
+* TINKERPOP-2565 GraphMLWriter does not check vertexLabelKey conflict
+* TINKERPOP-2566 Incomplete error message in bytecode step generation
+* TINKERPOP-2568 Graph instance not set for child traversals
+* TINKERPOP-2569 Reconnect to server if Java driver fails to initialize
+* TINKERPOP-2578 Set arguments to P within/without are wrapped in List
+* TINKERPOP-2579 EventStrategy doesn't work with anonymous traversal
+* TINKERPOP-2580 Update the custom DSL documentation
+* TINKERPOP-2585 Traversal failed for different strategies order
+* TINKERPOP-2589 XML External Entity (XXE) vulnerability
+* TINKERPOP-2597 NullPointerException while initializing connection pool
+* TINKERPOP-2598 within(null) NPE
+* TINKERPOP-2603 TinkerGraph sometimes could not query float values.
+* TINKERPOP-2604 TinkerGraph could not order vertex/edge without specified property.
+* TINKERPOP-2606 Neo4j-Gremlin could not order vertex/edge without specified property
+* TINKERPOP-2609 HTTP returns serialization exceptions for the GraphTraversalSource
+* TINKERPOP-2610 NumberHelper can return values in the form of their original type smaller than int *(breaking)*
+* TINKERPOP-2621 toString for traversals such as within with empty array returns empty string as argument instead of brackets
+* TINKERPOP-2626 RangeGlobalStep closes traversal prematurely
+* TINKERPOP-2649 Unable to translate gremlin query to java
+* TINKERPOP-2658 Translator in gremlin-javascript has trouble with array arguments
+* TINKERPOP-2661 GremlinGroovyScriptEngine handling of null arguments
+* TINKERPOP-2662 Unclosed client session and stacktrace pops up when cleanup is missed
+* TINKERPOP-2670 JavaDocs do not build when using JDK 11
+* TINKERPOP-2694 Bug of TinkerGraph gremlin api "has()"
+* TINKERPOP-2702 property(null) throws NPE
+* TINKERPOP-2706 Traversal clone() not resetting the close state
+* TINKERPOP-2712 PropertyChangedEvent is triggered before Property is actually changed
+* TINKERPOP-2717 Gremlin.NET : WebSocketConnection does not check for MessageType.Close, causing error InvalidOperationException: "Received data deserialized into null object message. Cannot operate on it."
+* TINKERPOP-2719 hasNext is called on TraverserIterator after transaction is committed
+* TINKERPOP-2726 Python's GroovyTranslator translates boolean wrong
+
+==== Improvements
+
+* TINKERPOP-2367 Gremlin Translators for .NET
+* TINKERPOP-2379 Consistent defaults and initialization APIs for drivers
+* TINKERPOP-2411 Move GremlinDslProcessor to its own artifact *(breaking)*
+* TINKERPOP-2467 Follow python naming conventions for Gremlin syntax
+* TINKERPOP-2504 Intermittently failing server/driver integration tests
+* TINKERPOP-2518 Enhance .NET gherkin framework to deal with more advanced assertions
+* TINKERPOP-2524 Expand support for number types in grammar
+* TINKERPOP-2525 Extend Gherkin tests to cover strategies
+* TINKERPOP-2534 Log4j flagged as critical security violation
+* TINKERPOP-2548 Add getter for indexer used in IndexStep
+* TINKERPOP-2551 Setup scripts to publish Gremint to npm
+* TINKERPOP-2555 Support for remote transactions in Python
+* TINKERPOP-2556 Support remote transactions in .NET
+* TINKERPOP-2557 Support remote transactions in Javascript
+* TINKERPOP-2559 Stop sending the close message for .NET
+* TINKERPOP-2560 Stop sending close message for Python
+* TINKERPOP-2561 Stop sending close message in Javascript
+* TINKERPOP-2562 Remove GraphSON 2 option in TraversalOpProcessor *(breaking)*
+* TINKERPOP-2570 Support custom type in GraphBinary for .NET
+* TINKERPOP-2576 Setup automatic updates via Dependabot for Gremlin.NET
+* TINKERPOP-2577 Remove unused test coverage dependencies from Gremlin.NET
+* TINKERPOP-2582 Construct traversals from gremlin-language
+* TINKERPOP-2583 Make gremlin-groovy processing optional in Gremlin Server
+* TINKERPOP-2591 Administrative adjustments to gremlint site
+* TINKERPOP-2592 Align the style guides
+* TINKERPOP-2593 Remove Groovy as a dependency from gremlin-driver *(breaking)*
+* TINKERPOP-2596 datetime function
+* TINKERPOP-2601 Unify Gremlin testing behind Gherkin
+* TINKERPOP-2605 Further enforce and refine null semantics
+* TINKERPOP-2608 Enhance sample().by() semantics when by produces a null *(breaking)*
+* TINKERPOP-2611 Prevent property(id,null) and addV(null) *(breaking)*
+* TINKERPOP-2613 Improve behavior of V/E(null)
+* TINKERPOP-2615 Expand testing of path() with null values
+* TINKERPOP-2616 Provide better exceptions with SSL related failures *(breaking)*
+* TINKERPOP-2620 Clean up NullPointerExceptions related to null arguments on property related steps
+* TINKERPOP-2630 Clarify that a server cannot support Graphson1.0 over HTTP
+* TINKERPOP-2632 Netty 4.1.61 flagged with two high severity security violations
+* TINKERPOP-2635 Consistent by() behavior *(breaking)*
+* TINKERPOP-2636 Remove ProductiveByStrategy as a default *(breaking)*
+* TINKERPOP-2637 Enhance logging in the Python
+* TINKERPOP-2639 Remove previously deprecated GryoMessageSerializer infrastructure *(breaking)*
+* TINKERPOP-2640 Remove previously deprecated AuthenticationSettings.enableAuditLog setting *(breaking)*
+* TINKERPOP-2641 Allow orderability on any type
+* TINKERPOP-2645 Improve behavior of hasId(null)
+* TINKERPOP-2646 Make .NET StreamExtensions public for GraphBinary
+* TINKERPOP-2650 Remove deprecated Gremlin step overloads of python keywords *(breaking)*
+* TINKERPOP-2651 Update to .NET 6
+* TINKERPOP-2652 Add TextP.regex to the text predicate set
+* TINKERPOP-2656 Provide a no syntax sugar translator for python
+* TINKERPOP-2657 Remove GroovyTranslator from gremlin-groovy *(breaking)*
+* TINKERPOP-2659 Bump javascript runtimes to node v16
+* TINKERPOP-2660 Bring back close message for drivers
+* TINKERPOP-2663 Support Vertex references in grammar
+* TINKERPOP-2665 Add the ability for property() to take a map
+* TINKERPOP-2666 Create an anonymizing Translator for logging traversals without user data
+* TINKERPOP-2667 Allow fold() with addAll to work on Map
+* TINKERPOP-2668 Updating aiohttp requirements at germin-python due to vulnerability
+* TINKERPOP-2669 Netty 4.1.61 flagged with medium severity security violations
+* TINKERPOP-2671 Add tx() support to grammar
+* TINKERPOP-2676 Refactor GremlinScript checker out of groovy package *(breaking)*
+* TINKERPOP-2678 jackson-databind medium security issue identified
+* TINKERPOP-2679 Update JavaScript driver to support processing messages as a stream
+* TINKERPOP-2680 Create call() step to allow for calling procedures
+* TINKERPOP-2681 Create merge() step to codify best practice for upsert pattern
+* TINKERPOP-2682 Enable WebSocket compression in .NET by default
+* TINKERPOP-2687 Gremlin Boolean Value Expressions 2.0 with Ternary Boolean Logics
+* TINKERPOP-2688 Investigate two .NET test failures
+* TINKERPOP-2689 VertexProperty Gherkin support for .NET
+* TINKERPOP-2690 VertexProperty Gherkin support for Javascript
+* TINKERPOP-2691 VertexProperty Gherkin support for Python
+* TINKERPOP-2695 Support NaN/Inf in Parser and Gherkin
+* TINKERPOP-2705 Support null as an argument where it makes sense in Gremlin.NET
+* TINKERPOP-2707 Closing parent connection in python should close tx() connections
+* TINKERPOP-2711 Make gremlin-language optional as it brings in CDDL/GPL dependencies
+* TINKERPOP-2713 Create an element() step that maps a Property to its Element.
+* TINKERPOP-2716 Enable eslint for gremlin-javascript project
+* TINKERPOP-2725 Traversal Strategy Mix Up In Gremlin-Python
+* TINKERPOP-2727 HasContainer should allow a null key
+* TINKERPOP-2728 jackson-databind high security issue identified
diff --git a/docs/gremlint/package-lock.json b/docs/gremlint/package-lock.json
index e370f99..9551e67 100644
--- a/docs/gremlint/package-lock.json
+++ b/docs/gremlint/package-lock.json
@@ -1,7 +1,7 @@
{
"name": "gremlint.com",
"version": "0.1.0",
- "lockfileVersion": 2,
+ "lockfileVersion": 3,
"requires": true,
"packages": {
"": {
@@ -10,27 +10,27 @@
"license": "Apache-2.0",
"dependencies": {
"customize-cra": "^1.0.0",
- "gremlint": "^3.7.0",
+ "gremlint": "^3.7.4",
"react": "^17.0.2",
"react-app-rewired": "^2.2.1",
"react-dom": "^17.0.2",
"react-scripts": "^5.0.1",
"sharp-router": "^4.1.5",
- "styled-components": "^6.1.0",
- "typescript": "^4.7.3",
- "web-vitals": "^3.5.0"
+ "styled-components": "^6.1.14",
+ "typescript": "^4.9.5",
+ "web-vitals": "^3.5.2"
},
"devDependencies": {
- "@testing-library/jest-dom": "^6.1.0",
+ "@testing-library/jest-dom": "^6.6.3",
"@testing-library/react": "^12.1.5",
- "@testing-library/user-event": "^14.5.1",
- "@types/jest": "^29.5.4",
- "@types/node": "^20.8.7",
- "@types/react": "^17.0.38",
- "@types/react-dom": "^17.0.11",
- "@types/styled-components": "^5.1.26",
- "gh-pages": "^6.0.0",
- "prettier": "^3.0.1",
+ "@testing-library/user-event": "^14.6.1",
+ "@types/jest": "^29.5.14",
+ "@types/node": "^22.12.0",
+ "@types/react": "^17.0.83",
+ "@types/react-dom": "^17.0.26",
+ "@types/styled-components": "^5.1.34",
+ "gh-pages": "^6.3.0",
+ "prettier": "^3.4.2",
"tslint": "^6.1.3",
"tslint-config-prettier": "^1.18.0"
},
@@ -39,9 +39,9 @@
}
},
"node_modules/@adobe/css-tools": {
- "version": "4.3.1",
- "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.3.1.tgz",
- "integrity": "sha512-/62yikz7NLScCGAAST5SHdnjaDJQBDq0M2muyRTpf2VQhw6StBg2ALiu73zSJQ4fMVLA+0uBhBHAle7Wg+2kSg==",
+ "version": "4.4.1",
+ "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.4.1.tgz",
+ "integrity": "sha512-12WGKBQzjUAI4ayyF4IAtfw2QR/IDoqk6jTddXDhtYTJF9ASmoE1zst7cVtP0aL/F1jUJL5r+JxKXKEgHNbEUQ==",
"dev": true
},
"node_modules/@alloc/quick-lru": {
@@ -56,121 +56,58 @@
}
},
"node_modules/@ampproject/remapping": {
- "version": "2.2.1",
- "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz",
- "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==",
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
+ "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
"dependencies": {
- "@jridgewell/gen-mapping": "^0.3.0",
- "@jridgewell/trace-mapping": "^0.3.9"
+ "@jridgewell/gen-mapping": "^0.3.5",
+ "@jridgewell/trace-mapping": "^0.3.24"
},
"engines": {
"node": ">=6.0.0"
}
},
"node_modules/@babel/code-frame": {
- "version": "7.22.13",
- "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz",
- "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==",
+ "version": "7.26.2",
+ "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz",
+ "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==",
"dependencies": {
- "@babel/highlight": "^7.22.13",
- "chalk": "^2.4.2"
+ "@babel/helper-validator-identifier": "^7.25.9",
+ "js-tokens": "^4.0.0",
+ "picocolors": "^1.0.0"
},
"engines": {
"node": ">=6.9.0"
}
},
- "node_modules/@babel/code-frame/node_modules/ansi-styles": {
- "version": "3.2.1",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
- "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
- "dependencies": {
- "color-convert": "^1.9.0"
- },
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/@babel/code-frame/node_modules/chalk": {
- "version": "2.4.2",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
- "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
- "dependencies": {
- "ansi-styles": "^3.2.1",
- "escape-string-regexp": "^1.0.5",
- "supports-color": "^5.3.0"
- },
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/@babel/code-frame/node_modules/color-convert": {
- "version": "1.9.3",
- "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
- "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
- "dependencies": {
- "color-name": "1.1.3"
- }
- },
- "node_modules/@babel/code-frame/node_modules/color-name": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
- "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
- },
- "node_modules/@babel/code-frame/node_modules/escape-string-regexp": {
- "version": "1.0.5",
- "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
- "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
- "engines": {
- "node": ">=0.8.0"
- }
- },
- "node_modules/@babel/code-frame/node_modules/has-flag": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
- "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/@babel/code-frame/node_modules/supports-color": {
- "version": "5.5.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
- "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
- "dependencies": {
- "has-flag": "^3.0.0"
- },
- "engines": {
- "node": ">=4"
- }
- },
"node_modules/@babel/compat-data": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.5.tgz",
- "integrity": "sha512-4Jc/YuIaYqKnDDz892kPIledykKg12Aw1PYX5i/TY28anJtacvM1Rrr8wbieB9GfEJwlzqT0hUEao0CxEebiDA==",
+ "version": "7.26.5",
+ "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.5.tgz",
+ "integrity": "sha512-XvcZi1KWf88RVbF9wn8MN6tYFloU5qX8KjuF3E1PVBmJ9eypXfs4GRiJwLuTZL0iSnJUKn1BFPa5BPZZJyFzPg==",
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/core": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.5.tgz",
- "integrity": "sha512-SBuTAjg91A3eKOvD+bPEz3LlhHZRNu1nFOVts9lzDJTXshHTjII0BAtDS3Y2DAkdZdDKWVZGVwkDfc4Clxn1dg==",
+ "version": "7.26.7",
+ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.7.tgz",
+ "integrity": "sha512-SRijHmF0PSPgLIBYlWnG0hyeJLwXE2CgpsXaMOrtt2yp9/86ALw6oUlj9KYuZ0JN07T4eBMVIW4li/9S1j2BGA==",
"dependencies": {
"@ampproject/remapping": "^2.2.0",
- "@babel/code-frame": "^7.22.5",
- "@babel/generator": "^7.22.5",
- "@babel/helper-compilation-targets": "^7.22.5",
- "@babel/helper-module-transforms": "^7.22.5",
- "@babel/helpers": "^7.22.5",
- "@babel/parser": "^7.22.5",
- "@babel/template": "^7.22.5",
- "@babel/traverse": "^7.22.5",
- "@babel/types": "^7.22.5",
- "convert-source-map": "^1.7.0",
+ "@babel/code-frame": "^7.26.2",
+ "@babel/generator": "^7.26.5",
+ "@babel/helper-compilation-targets": "^7.26.5",
+ "@babel/helper-module-transforms": "^7.26.0",
+ "@babel/helpers": "^7.26.7",
+ "@babel/parser": "^7.26.7",
+ "@babel/template": "^7.25.9",
+ "@babel/traverse": "^7.26.7",
+ "@babel/types": "^7.26.7",
+ "convert-source-map": "^2.0.0",
"debug": "^4.1.0",
"gensync": "^1.0.0-beta.2",
- "json5": "^2.2.2",
- "semver": "^6.3.0"
+ "json5": "^2.2.3",
+ "semver": "^6.3.1"
},
"engines": {
"node": ">=6.9.0"
@@ -181,20 +118,20 @@
}
},
"node_modules/@babel/eslint-parser": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.22.5.tgz",
- "integrity": "sha512-C69RWYNYtrgIRE5CmTd77ZiLDXqgBipahJc/jHP3sLcAGj6AJzxNIuKNpVnICqbyK7X3pFUfEvL++rvtbQpZkQ==",
+ "version": "7.26.5",
+ "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.26.5.tgz",
+ "integrity": "sha512-Kkm8C8uxI842AwQADxl0GbcG1rupELYLShazYEZO/2DYjhyWXJIOUVOE3tBYm6JXzUCNJOZEzqc4rCW/jsEQYQ==",
"dependencies": {
"@nicolo-ribaudo/eslint-scope-5-internals": "5.1.1-v1",
"eslint-visitor-keys": "^2.1.0",
- "semver": "^6.3.0"
+ "semver": "^6.3.1"
},
"engines": {
"node": "^10.13.0 || ^12.13.0 || >=14.0.0"
},
"peerDependencies": {
- "@babel/core": ">=7.11.0",
- "eslint": "^7.5.0 || ^8.0.0"
+ "@babel/core": "^7.11.0",
+ "eslint": "^7.5.0 || ^8.0.0 || ^9.0.0"
}
},
"node_modules/@babel/eslint-parser/node_modules/eslint-visitor-keys": {
@@ -206,73 +143,58 @@
}
},
"node_modules/@babel/generator": {
- "version": "7.23.0",
- "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz",
- "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==",
+ "version": "7.26.5",
+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.5.tgz",
+ "integrity": "sha512-2caSP6fN9I7HOe6nqhtft7V4g7/V/gfDsC3Ag4W7kEzzvRGKqiv0pu0HogPiZ3KaVSoNDhUws6IJjDjpfmYIXw==",
"dependencies": {
- "@babel/types": "^7.23.0",
- "@jridgewell/gen-mapping": "^0.3.2",
- "@jridgewell/trace-mapping": "^0.3.17",
- "jsesc": "^2.5.1"
+ "@babel/parser": "^7.26.5",
+ "@babel/types": "^7.26.5",
+ "@jridgewell/gen-mapping": "^0.3.5",
+ "@jridgewell/trace-mapping": "^0.3.25",
+ "jsesc": "^3.0.2"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helper-annotate-as-pure": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz",
- "integrity": "sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz",
+ "integrity": "sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==",
"dependencies": {
- "@babel/types": "^7.22.5"
- },
- "engines": {
- "node": ">=6.9.0"
- }
- },
- "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.5.tgz",
- "integrity": "sha512-m1EP3lVOPptR+2DwD125gziZNcmoNSHGmJROKoy87loWUQyJaVXDgpmruWqDARZSmtYQ+Dl25okU8+qhVzuykw==",
- "dependencies": {
- "@babel/types": "^7.22.5"
+ "@babel/types": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helper-compilation-targets": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.5.tgz",
- "integrity": "sha512-Ji+ywpHeuqxB8WDxraCiqR0xfhYjiDE/e6k7FuIaANnoOFxAHskHChz4vA1mJC9Lbm01s1PVAGhQY4FUKSkGZw==",
+ "version": "7.26.5",
+ "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.26.5.tgz",
+ "integrity": "sha512-IXuyn5EkouFJscIDuFF5EsiSolseme1s0CZB+QxVugqJLYmKdxI1VfIBOst0SUu4rnk2Z7kqTwmoO1lp3HIfnA==",
"dependencies": {
- "@babel/compat-data": "^7.22.5",
- "@babel/helper-validator-option": "^7.22.5",
- "browserslist": "^4.21.3",
+ "@babel/compat-data": "^7.26.5",
+ "@babel/helper-validator-option": "^7.25.9",
+ "browserslist": "^4.24.0",
"lru-cache": "^5.1.1",
- "semver": "^6.3.0"
+ "semver": "^6.3.1"
},
"engines": {
"node": ">=6.9.0"
- },
- "peerDependencies": {
- "@babel/core": "^7.0.0"
}
},
"node_modules/@babel/helper-create-class-features-plugin": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.5.tgz",
- "integrity": "sha512-xkb58MyOYIslxu3gKmVXmjTtUPvBU4odYzbiIQbWwLKIHCsx6UGZGX6F1IznMFVnDdirseUZopzN+ZRt8Xb33Q==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.9.tgz",
+ "integrity": "sha512-UTZQMvt0d/rSz6KI+qdu7GQze5TIajwTS++GUozlw8VBJDEOAqSXwm1WvmYEZwqdqSGQshRocPDqrt4HBZB3fQ==",
"dependencies": {
- "@babel/helper-annotate-as-pure": "^7.22.5",
- "@babel/helper-environment-visitor": "^7.22.5",
- "@babel/helper-function-name": "^7.22.5",
- "@babel/helper-member-expression-to-functions": "^7.22.5",
- "@babel/helper-optimise-call-expression": "^7.22.5",
- "@babel/helper-replace-supers": "^7.22.5",
- "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
- "@babel/helper-split-export-declaration": "^7.22.5",
- "semver": "^6.3.0"
+ "@babel/helper-annotate-as-pure": "^7.25.9",
+ "@babel/helper-member-expression-to-functions": "^7.25.9",
+ "@babel/helper-optimise-call-expression": "^7.25.9",
+ "@babel/helper-replace-supers": "^7.25.9",
+ "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9",
+ "@babel/traverse": "^7.25.9",
+ "semver": "^6.3.1"
},
"engines": {
"node": ">=6.9.0"
@@ -282,13 +204,13 @@
}
},
"node_modules/@babel/helper-create-regexp-features-plugin": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.5.tgz",
- "integrity": "sha512-1VpEFOIbMRaXyDeUwUfmTIxExLwQ+zkW+Bh5zXpApA3oQedBx9v/updixWxnx/bZpKw7u8VxWjb/qWpIcmPq8A==",
+ "version": "7.26.3",
+ "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.26.3.tgz",
+ "integrity": "sha512-G7ZRb40uUgdKOQqPLjfD12ZmGA54PzqDFUv2BKImnC9QIfGhIHKvVML0oN8IUiDq4iRqpq74ABpvOaerfWdong==",
"dependencies": {
- "@babel/helper-annotate-as-pure": "^7.22.5",
- "regexpu-core": "^5.3.1",
- "semver": "^6.3.0"
+ "@babel/helper-annotate-as-pure": "^7.25.9",
+ "regexpu-core": "^6.2.0",
+ "semver": "^6.3.1"
},
"engines": {
"node": ">=6.9.0"
@@ -298,120 +220,87 @@
}
},
"node_modules/@babel/helper-define-polyfill-provider": {
- "version": "0.4.0",
- "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.0.tgz",
- "integrity": "sha512-RnanLx5ETe6aybRi1cO/edaRH+bNYWaryCEmjDDYyNr4wnSzyOp8T0dWipmqVHKEY3AbVKUom50AKSlj1zmKbg==",
+ "version": "0.6.3",
+ "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.3.tgz",
+ "integrity": "sha512-HK7Bi+Hj6H+VTHA3ZvBis7V/6hu9QuTrnMXNybfUf2iiuU/N97I8VjB+KbhFF8Rld/Lx5MzoCwPCpPjfK+n8Cg==",
"dependencies": {
- "@babel/helper-compilation-targets": "^7.17.7",
- "@babel/helper-plugin-utils": "^7.16.7",
+ "@babel/helper-compilation-targets": "^7.22.6",
+ "@babel/helper-plugin-utils": "^7.22.5",
"debug": "^4.1.1",
"lodash.debounce": "^4.0.8",
- "resolve": "^1.14.2",
- "semver": "^6.1.2"
+ "resolve": "^1.14.2"
},
"peerDependencies": {
- "@babel/core": "^7.4.0-0"
- }
- },
- "node_modules/@babel/helper-environment-visitor": {
- "version": "7.22.20",
- "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
- "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
- "engines": {
- "node": ">=6.9.0"
- }
- },
- "node_modules/@babel/helper-function-name": {
- "version": "7.23.0",
- "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
- "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
- "dependencies": {
- "@babel/template": "^7.22.15",
- "@babel/types": "^7.23.0"
- },
- "engines": {
- "node": ">=6.9.0"
- }
- },
- "node_modules/@babel/helper-hoist-variables": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
- "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
- "dependencies": {
- "@babel/types": "^7.22.5"
- },
- "engines": {
- "node": ">=6.9.0"
+ "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
}
},
"node_modules/@babel/helper-member-expression-to-functions": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.5.tgz",
- "integrity": "sha512-aBiH1NKMG0H2cGZqspNvsaBe6wNGjbJjuLy29aU+eDZjSbbN53BaxlpB02xm9v34pLTZ1nIQPFYn2qMZoa5BQQ==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.25.9.tgz",
+ "integrity": "sha512-wbfdZ9w5vk0C0oyHqAJbc62+vet5prjj01jjJ8sKn3j9h3MQQlflEdXYvuqRWjHnM12coDEqiC1IRCi0U/EKwQ==",
"dependencies": {
- "@babel/types": "^7.22.5"
+ "@babel/traverse": "^7.25.9",
+ "@babel/types": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helper-module-imports": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz",
- "integrity": "sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz",
+ "integrity": "sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==",
"dependencies": {
- "@babel/types": "^7.22.5"
+ "@babel/traverse": "^7.25.9",
+ "@babel/types": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helper-module-transforms": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.5.tgz",
- "integrity": "sha512-+hGKDt/Ze8GFExiVHno/2dvG5IdstpzCq0y4Qc9OJ25D4q3pKfiIP/4Vp3/JvhDkLKsDK2api3q3fpIgiIF5bw==",
+ "version": "7.26.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz",
+ "integrity": "sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==",
"dependencies": {
- "@babel/helper-environment-visitor": "^7.22.5",
- "@babel/helper-module-imports": "^7.22.5",
- "@babel/helper-simple-access": "^7.22.5",
- "@babel/helper-split-export-declaration": "^7.22.5",
- "@babel/helper-validator-identifier": "^7.22.5",
- "@babel/template": "^7.22.5",
- "@babel/traverse": "^7.22.5",
- "@babel/types": "^7.22.5"
+ "@babel/helper-module-imports": "^7.25.9",
+ "@babel/helper-validator-identifier": "^7.25.9",
+ "@babel/traverse": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0"
}
},
"node_modules/@babel/helper-optimise-call-expression": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz",
- "integrity": "sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.25.9.tgz",
+ "integrity": "sha512-FIpuNaz5ow8VyrYcnXQTDRGvV6tTjkNtCK/RYNDXGSLlUD6cBuQTSw43CShGxjvfBTfcUA/r6UhUCbtYqkhcuQ==",
"dependencies": {
- "@babel/types": "^7.22.5"
+ "@babel/types": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helper-plugin-utils": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz",
- "integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==",
+ "version": "7.26.5",
+ "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.26.5.tgz",
+ "integrity": "sha512-RS+jZcRdZdRFzMyr+wcsaqOmld1/EqTghfaBGQQd/WnRdzdlvSZ//kF7U8VQTxf1ynZ4cjUcYgjVGx13ewNPMg==",
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helper-remap-async-to-generator": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.5.tgz",
- "integrity": "sha512-cU0Sq1Rf4Z55fgz7haOakIyM7+x/uCFwXpLPaeRzfoUtAEAuUZjZvFPjL/rk5rW693dIgn2hng1W7xbT7lWT4g==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.9.tgz",
+ "integrity": "sha512-IZtukuUeBbhgOcaW2s06OXTzVNJR0ybm4W5xC1opWFFJMZbwRj5LCk+ByYH7WdZPZTt8KnFwA8pvjN2yqcPlgw==",
"dependencies": {
- "@babel/helper-annotate-as-pure": "^7.22.5",
- "@babel/helper-environment-visitor": "^7.22.5",
- "@babel/helper-wrap-function": "^7.22.5",
- "@babel/types": "^7.22.5"
+ "@babel/helper-annotate-as-pure": "^7.25.9",
+ "@babel/helper-wrap-function": "^7.25.9",
+ "@babel/traverse": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
@@ -421,186 +310,89 @@
}
},
"node_modules/@babel/helper-replace-supers": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.5.tgz",
- "integrity": "sha512-aLdNM5I3kdI/V9xGNyKSF3X/gTyMUBohTZ+/3QdQKAA9vxIiy12E+8E2HoOP1/DjeqU+g6as35QHJNMDDYpuCg==",
+ "version": "7.26.5",
+ "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.26.5.tgz",
+ "integrity": "sha512-bJ6iIVdYX1YooY2X7w1q6VITt+LnUILtNk7zT78ykuwStx8BauCzxvFqFaHjOpW1bVnSUM1PN1f0p5P21wHxvg==",
"dependencies": {
- "@babel/helper-environment-visitor": "^7.22.5",
- "@babel/helper-member-expression-to-functions": "^7.22.5",
- "@babel/helper-optimise-call-expression": "^7.22.5",
- "@babel/template": "^7.22.5",
- "@babel/traverse": "^7.22.5",
- "@babel/types": "^7.22.5"
+ "@babel/helper-member-expression-to-functions": "^7.25.9",
+ "@babel/helper-optimise-call-expression": "^7.25.9",
+ "@babel/traverse": "^7.26.5"
},
"engines": {
"node": ">=6.9.0"
- }
- },
- "node_modules/@babel/helper-simple-access": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz",
- "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==",
- "dependencies": {
- "@babel/types": "^7.22.5"
},
- "engines": {
- "node": ">=6.9.0"
+ "peerDependencies": {
+ "@babel/core": "^7.0.0"
}
},
"node_modules/@babel/helper-skip-transparent-expression-wrappers": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz",
- "integrity": "sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.25.9.tgz",
+ "integrity": "sha512-K4Du3BFa3gvyhzgPcntrkDgZzQaq6uozzcpGbOO1OEJaI+EJdqWIMTLgFgQf6lrfiDFo5FU+BxKepI9RmZqahA==",
"dependencies": {
- "@babel/types": "^7.22.5"
- },
- "engines": {
- "node": ">=6.9.0"
- }
- },
- "node_modules/@babel/helper-split-export-declaration": {
- "version": "7.22.6",
- "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
- "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
- "dependencies": {
- "@babel/types": "^7.22.5"
+ "@babel/traverse": "^7.25.9",
+ "@babel/types": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helper-string-parser": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
- "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz",
+ "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==",
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helper-validator-identifier": {
- "version": "7.22.20",
- "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
- "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz",
+ "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==",
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helper-validator-option": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz",
- "integrity": "sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz",
+ "integrity": "sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==",
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helper-wrap-function": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.5.tgz",
- "integrity": "sha512-bYqLIBSEshYcYQyfks8ewYA8S30yaGSeRslcvKMvoUk6HHPySbxHq9YRi6ghhzEU+yhQv9bP/jXnygkStOcqZw==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.25.9.tgz",
+ "integrity": "sha512-ETzz9UTjQSTmw39GboatdymDq4XIQbR8ySgVrylRhPOFpsd+JrKHIuF0de7GCWmem+T4uC5z7EZguod7Wj4A4g==",
"dependencies": {
- "@babel/helper-function-name": "^7.22.5",
- "@babel/template": "^7.22.5",
- "@babel/traverse": "^7.22.5",
- "@babel/types": "^7.22.5"
+ "@babel/template": "^7.25.9",
+ "@babel/traverse": "^7.25.9",
+ "@babel/types": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helpers": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.5.tgz",
- "integrity": "sha512-pSXRmfE1vzcUIDFQcSGA5Mr+GxBV9oiRKDuDxXvWQQBCh8HoIjs/2DlDB7H8smac1IVrB9/xdXj2N3Wol9Cr+Q==",
+ "version": "7.26.7",
+ "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.7.tgz",
+ "integrity": "sha512-8NHiL98vsi0mbPQmYAGWwfcFaOy4j2HY49fXJCfuDcdE7fMIsH9a7GdaeXpIBsbT7307WU8KCMp5pUVDNL4f9A==",
"dependencies": {
- "@babel/template": "^7.22.5",
- "@babel/traverse": "^7.22.5",
- "@babel/types": "^7.22.5"
+ "@babel/template": "^7.25.9",
+ "@babel/types": "^7.26.7"
},
"engines": {
"node": ">=6.9.0"
}
},
- "node_modules/@babel/highlight": {
- "version": "7.22.20",
- "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz",
- "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==",
- "dependencies": {
- "@babel/helper-validator-identifier": "^7.22.20",
- "chalk": "^2.4.2",
- "js-tokens": "^4.0.0"
- },
- "engines": {
- "node": ">=6.9.0"
- }
- },
- "node_modules/@babel/highlight/node_modules/ansi-styles": {
- "version": "3.2.1",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
- "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
- "dependencies": {
- "color-convert": "^1.9.0"
- },
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/@babel/highlight/node_modules/chalk": {
- "version": "2.4.2",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
- "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
- "dependencies": {
- "ansi-styles": "^3.2.1",
- "escape-string-regexp": "^1.0.5",
- "supports-color": "^5.3.0"
- },
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/@babel/highlight/node_modules/color-convert": {
- "version": "1.9.3",
- "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
- "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
- "dependencies": {
- "color-name": "1.1.3"
- }
- },
- "node_modules/@babel/highlight/node_modules/color-name": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
- "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
- },
- "node_modules/@babel/highlight/node_modules/escape-string-regexp": {
- "version": "1.0.5",
- "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
- "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
- "engines": {
- "node": ">=0.8.0"
- }
- },
- "node_modules/@babel/highlight/node_modules/has-flag": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
- "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/@babel/highlight/node_modules/supports-color": {
- "version": "5.5.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
- "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
- "dependencies": {
- "has-flag": "^3.0.0"
- },
- "engines": {
- "node": ">=4"
- }
- },
"node_modules/@babel/parser": {
- "version": "7.23.0",
- "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz",
- "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==",
+ "version": "7.26.7",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.7.tgz",
+ "integrity": "sha512-kEvgGGgEjRUutvdVvZhbn/BxVt+5VSpwXz1j3WYXQbXDo8KzFOPNG2GQbdAiNq8g6wn1yKk7C/qrke03a84V+w==",
+ "dependencies": {
+ "@babel/types": "^7.26.7"
+ },
"bin": {
"parser": "bin/babel-parser.js"
},
@@ -608,12 +400,41 @@
"node": ">=6.0.0"
}
},
- "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.5.tgz",
- "integrity": "sha512-NP1M5Rf+u2Gw9qfSO4ihjcTGW5zXTi36ITLd4/EoAcEhIZ0yjMqmftDNl3QC19CX7olhrjpyU454g/2W7X0jvQ==",
+ "node_modules/@babel/plugin-bugfix-firefox-class-in-computed-class-key": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.9.tgz",
+ "integrity": "sha512-ZkRyVkThtxQ/J6nv3JFYv1RYY+JT5BvU0y3k5bWrmuG4woXypRa4PXmm9RhOwodRkYFWqC0C0cqcJ4OqR7kW+g==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.22.5"
+ "@babel/helper-plugin-utils": "^7.25.9",
+ "@babel/traverse": "^7.25.9"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0"
+ }
+ },
+ "node_modules/@babel/plugin-bugfix-safari-class-field-initializer-scope": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.25.9.tgz",
+ "integrity": "sha512-MrGRLZxLD/Zjj0gdU15dfs+HH/OXvnw/U4jJD8vpcP2CJQapPEv1IWwjc/qMg7ItBlPwSv1hRBbb7LeuANdcnw==",
+ "dependencies": {
+ "@babel/helper-plugin-utils": "^7.25.9"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0"
+ }
+ },
+ "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.9.tgz",
+ "integrity": "sha512-2qUwwfAFpJLZqxd02YW9btUCZHl+RFvdDkNfZwaIJrvB8Tesjsk8pEQkTvGwZXLqXUx/2oyY3ySRhm6HOXuCug==",
+ "dependencies": {
+ "@babel/helper-plugin-utils": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
@@ -623,13 +444,13 @@
}
},
"node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.5.tgz",
- "integrity": "sha512-31Bb65aZaUwqCbWMnZPduIZxCBngHFlzyN6Dq6KAJjtx+lx6ohKHubc61OomYi7XwVD4Ol0XCVz4h+pYFR048g==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.25.9.tgz",
+ "integrity": "sha512-6xWgLZTJXwilVjlnV7ospI3xi+sl8lN8rXXbBD6vYn3UYDlGsag8wrZkKcSI8G6KgqKP7vNFaDgeDnfAABq61g==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.22.5",
- "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
- "@babel/plugin-transform-optional-chaining": "^7.22.5"
+ "@babel/helper-plugin-utils": "^7.25.9",
+ "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9",
+ "@babel/plugin-transform-optional-chaining": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
@@ -638,10 +459,26 @@
"@babel/core": "^7.13.0"
}
},
+ "node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.25.9.tgz",
+ "integrity": "sha512-aLnMXYPnzwwqhYSCyXfKkIkYgJ8zv9RK+roo9DkTXz38ynIhd9XCbN08s3MGvqL2MYGVUGdRQLL/JqBIeJhJBg==",
+ "dependencies": {
+ "@babel/helper-plugin-utils": "^7.25.9",
+ "@babel/traverse": "^7.25.9"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0"
+ }
+ },
"node_modules/@babel/plugin-proposal-class-properties": {
"version": "7.18.6",
"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz",
"integrity": "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==",
+ "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-class-properties instead.",
"dependencies": {
"@babel/helper-create-class-features-plugin": "^7.18.6",
"@babel/helper-plugin-utils": "^7.18.6"
@@ -654,15 +491,13 @@
}
},
"node_modules/@babel/plugin-proposal-decorators": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.22.5.tgz",
- "integrity": "sha512-h8hlezQ4dl6ixodgXkH8lUfcD7x+WAuIqPUjwGoItynrXOAv4a4Tci1zA/qjzQjjcl0v3QpLdc2LM6ZACQuY7A==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.25.9.tgz",
+ "integrity": "sha512-smkNLL/O1ezy9Nhy4CNosc4Va+1wo5w4gzSZeLe6y6dM4mmHfYOCPolXQPHQxonZCF+ZyebxN9vqOolkYrSn5g==",
"dependencies": {
- "@babel/helper-create-class-features-plugin": "^7.22.5",
- "@babel/helper-plugin-utils": "^7.22.5",
- "@babel/helper-replace-supers": "^7.22.5",
- "@babel/helper-split-export-declaration": "^7.22.5",
- "@babel/plugin-syntax-decorators": "^7.22.5"
+ "@babel/helper-create-class-features-plugin": "^7.25.9",
+ "@babel/helper-plugin-utils": "^7.25.9",
+ "@babel/plugin-syntax-decorators": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
@@ -675,6 +510,7 @@
"version": "7.18.6",
"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz",
"integrity": "sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==",
+ "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-nullish-coalescing-operator instead.",
"dependencies": {
"@babel/helper-plugin-utils": "^7.18.6",
"@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
@@ -690,6 +526,7 @@
"version": "7.18.6",
"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz",
"integrity": "sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==",
+ "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-numeric-separator instead.",
"dependencies": {
"@babel/helper-plugin-utils": "^7.18.6",
"@babel/plugin-syntax-numeric-separator": "^7.10.4"
@@ -705,6 +542,7 @@
"version": "7.21.0",
"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz",
"integrity": "sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==",
+ "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-optional-chaining instead.",
"dependencies": {
"@babel/helper-plugin-utils": "^7.20.2",
"@babel/helper-skip-transparent-expression-wrappers": "^7.20.0",
@@ -721,6 +559,7 @@
"version": "7.18.6",
"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz",
"integrity": "sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==",
+ "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-private-methods instead.",
"dependencies": {
"@babel/helper-create-class-features-plugin": "^7.18.6",
"@babel/helper-plugin-utils": "^7.18.6"
@@ -743,21 +582,6 @@
"@babel/core": "^7.0.0-0"
}
},
- "node_modules/@babel/plugin-proposal-unicode-property-regex": {
- "version": "7.18.6",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz",
- "integrity": "sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==",
- "dependencies": {
- "@babel/helper-create-regexp-features-plugin": "^7.18.6",
- "@babel/helper-plugin-utils": "^7.18.6"
- },
- "engines": {
- "node": ">=4"
- },
- "peerDependencies": {
- "@babel/core": "^7.0.0-0"
- }
- },
"node_modules/@babel/plugin-syntax-async-generators": {
"version": "7.8.4",
"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
@@ -806,11 +630,11 @@
}
},
"node_modules/@babel/plugin-syntax-decorators": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.22.5.tgz",
- "integrity": "sha512-avpUOBS7IU6al8MmF1XpAyj9QYeLPuSDJI5D4pVMSMdL7xQokKqJPYQC67RCT0aCTashUXPiGwMJ0DEXXCEmMA==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.25.9.tgz",
+ "integrity": "sha512-ryzI0McXUPJnRCvMo4lumIKZUzhYUO/ScI+Mz4YVaTLt04DHNSjEUjKVvbzQjZFLuod/cYEc07mJWhzl6v4DPg==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.22.5"
+ "@babel/helper-plugin-utils": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
@@ -819,34 +643,12 @@
"@babel/core": "^7.0.0-0"
}
},
- "node_modules/@babel/plugin-syntax-dynamic-import": {
- "version": "7.8.3",
- "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
- "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
- "dependencies": {
- "@babel/helper-plugin-utils": "^7.8.0"
- },
- "peerDependencies": {
- "@babel/core": "^7.0.0-0"
- }
- },
- "node_modules/@babel/plugin-syntax-export-namespace-from": {
- "version": "7.8.3",
- "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
- "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
- "dependencies": {
- "@babel/helper-plugin-utils": "^7.8.3"
- },
- "peerDependencies": {
- "@babel/core": "^7.0.0-0"
- }
- },
"node_modules/@babel/plugin-syntax-flow": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.22.5.tgz",
- "integrity": "sha512-9RdCl0i+q0QExayk2nOS7853w08yLucnnPML6EN9S8fgMPVtdLDCdx/cOQ/i44Lb9UeQX9A35yaqBBOMMZxPxQ==",
+ "version": "7.26.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.26.0.tgz",
+ "integrity": "sha512-B+O2DnPc0iG+YXFqOxv2WNuNU97ToWjOomUQ78DouOENWUaM5sVrmet9mcomUGQFwpJd//gvUagXBSdzO1fRKg==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.22.5"
+ "@babel/helper-plugin-utils": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
@@ -856,11 +658,11 @@
}
},
"node_modules/@babel/plugin-syntax-import-assertions": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.22.5.tgz",
- "integrity": "sha512-rdV97N7KqsRzeNGoWUOK6yUsWarLjE5Su/Snk9IYPU9CwkWHs4t+rTGOvffTR8XGkJMTAdLfO0xVnXm8wugIJg==",
+ "version": "7.26.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.26.0.tgz",
+ "integrity": "sha512-QCWT5Hh830hK5EQa7XzuqIkQU9tT/whqbDz7kuaZMHFl1inRRg7JnuAEOQ0Ur0QUl0NufCk1msK2BeY79Aj/eg==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.22.5"
+ "@babel/helper-plugin-utils": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
@@ -870,11 +672,11 @@
}
},
"node_modules/@babel/plugin-syntax-import-attributes": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.22.5.tgz",
- "integrity": "sha512-KwvoWDeNKPETmozyFE0P2rOLqh39EoQHNjqizrI5B8Vt0ZNS7M56s7dAiAqbYfiAYOuIzIh96z3iR2ktgu3tEg==",
+ "version": "7.26.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.26.0.tgz",
+ "integrity": "sha512-e2dttdsJ1ZTpi3B9UYGLw41hifAubg19AtCu/2I/F1QNVclOBr1dYpTdmdyZ84Xiz43BS/tCUkMAZNLv12Pi+A==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.22.5"
+ "@babel/helper-plugin-utils": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
@@ -906,11 +708,11 @@
}
},
"node_modules/@babel/plugin-syntax-jsx": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.22.5.tgz",
- "integrity": "sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.25.9.tgz",
+ "integrity": "sha512-ld6oezHQMZsZfp6pWtbjaNDF2tiiCYYDqQszHt5VV437lewP9aSi2Of99CK0D0XB21k7FLgnLcmQKyKzynfeAA==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.22.5"
+ "@babel/helper-plugin-utils": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
@@ -1014,11 +816,11 @@
}
},
"node_modules/@babel/plugin-syntax-typescript": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.22.5.tgz",
- "integrity": "sha512-1mS2o03i7t1c6VzH6fdQ3OA8tcEIxwG18zIPRp+UY1Ihv6W+XZzBCVxExF9upussPXJ0xE9XRHwMoNs1ep/nRQ==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.25.9.tgz",
+ "integrity": "sha512-hjMgRy5hb8uJJjUcdWunWVcoi9bGpJp8p5Ol1229PoN6aytsLwNMgmdftO23wnCLMfVmTwZDWMPNq/D1SY60JQ==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.22.5"
+ "@babel/helper-plugin-utils": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
@@ -1043,11 +845,11 @@
}
},
"node_modules/@babel/plugin-transform-arrow-functions": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.22.5.tgz",
- "integrity": "sha512-26lTNXoVRdAnsaDXPpvCNUq+OVWEVC6bx7Vvz9rC53F2bagUWW4u4ii2+h8Fejfh7RYqPxn+libeFBBck9muEw==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.25.9.tgz",
+ "integrity": "sha512-6jmooXYIwn9ca5/RylZADJ+EnSxVUS5sjeJ9UPk6RWRzXCmOJCy6dqItPJFpw2cuCangPK4OYr5uhGKcmrm5Qg==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.22.5"
+ "@babel/helper-plugin-utils": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
@@ -1057,14 +859,13 @@
}
},
"node_modules/@babel/plugin-transform-async-generator-functions": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.5.tgz",
- "integrity": "sha512-gGOEvFzm3fWoyD5uZq7vVTD57pPJ3PczPUD/xCFGjzBpUosnklmXyKnGQbbbGs1NPNPskFex0j93yKbHt0cHyg==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.25.9.tgz",
+ "integrity": "sha512-RXV6QAzTBbhDMO9fWwOmwwTuYaiPbggWQ9INdZqAYeSHyG7FzQ+nOZaUUjNwKv9pV3aE4WFqFm1Hnbci5tBCAw==",
"dependencies": {
- "@babel/helper-environment-visitor": "^7.22.5",
- "@babel/helper-plugin-utils": "^7.22.5",
- "@babel/helper-remap-async-to-generator": "^7.22.5",
- "@babel/plugin-syntax-async-generators": "^7.8.4"
+ "@babel/helper-plugin-utils": "^7.25.9",
+ "@babel/helper-remap-async-to-generator": "^7.25.9",
+ "@babel/traverse": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
@@ -1074,13 +875,13 @@
}
},
"node_modules/@babel/plugin-transform-async-to-generator": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.22.5.tgz",
- "integrity": "sha512-b1A8D8ZzE/VhNDoV1MSJTnpKkCG5bJo+19R4o4oy03zM7ws8yEMK755j61Dc3EyvdysbqH5BOOTquJ7ZX9C6vQ==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.25.9.tgz",
+ "integrity": "sha512-NT7Ejn7Z/LjUH0Gv5KsBCxh7BH3fbLTV0ptHvpeMvrt3cPThHfJfst9Wrb7S8EvJ7vRTFI7z+VAvFVEQn/m5zQ==",
"dependencies": {
- "@babel/helper-module-imports": "^7.22.5",
- "@babel/helper-plugin-utils": "^7.22.5",
- "@babel/helper-remap-async-to-generator": "^7.22.5"
+ "@babel/helper-module-imports": "^7.25.9",
+ "@babel/helper-plugin-utils": "^7.25.9",
+ "@babel/helper-remap-async-to-generator": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
@@ -1090,11 +891,11 @@
}
},
"node_modules/@babel/plugin-transform-block-scoped-functions": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.22.5.tgz",
- "integrity": "sha512-tdXZ2UdknEKQWKJP1KMNmuF5Lx3MymtMN/pvA+p/VEkhK8jVcQ1fzSy8KM9qRYhAf2/lV33hoMPKI/xaI9sADA==",
+ "version": "7.26.5",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.26.5.tgz",
+ "integrity": "sha512-chuTSY+hq09+/f5lMj8ZSYgCFpppV2CbYrhNFJ1BFoXpiWPnnAb7R0MqrafCpN8E1+YRrtM1MXZHJdIx8B6rMQ==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.22.5"
+ "@babel/helper-plugin-utils": "^7.26.5"
},
"engines": {
"node": ">=6.9.0"
@@ -1104,11 +905,11 @@
}
},
"node_modules/@babel/plugin-transform-block-scoping": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.5.tgz",
- "integrity": "sha512-EcACl1i5fSQ6bt+YGuU/XGCeZKStLmyVGytWkpyhCLeQVA0eu6Wtiw92V+I1T/hnezUv7j74dA/Ro69gWcU+hg==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.9.tgz",
+ "integrity": "sha512-1F05O7AYjymAtqbsFETboN1NvBdcnzMerO+zlMyJBEz6WkMdejvGWw9p05iTSjC85RLlBseHHQpYaM4gzJkBGg==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.22.5"
+ "@babel/helper-plugin-utils": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
@@ -1118,12 +919,12 @@
}
},
"node_modules/@babel/plugin-transform-class-properties": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.22.5.tgz",
- "integrity": "sha512-nDkQ0NfkOhPTq8YCLiWNxp1+f9fCobEjCb0n8WdbNUBc4IB5V7P1QnX9IjpSoquKrXF5SKojHleVNs2vGeHCHQ==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.25.9.tgz",
+ "integrity": "sha512-bbMAII8GRSkcd0h0b4X+36GksxuheLFjP65ul9w6C3KgAamI3JqErNgSrosX6ZPj+Mpim5VvEbawXxJCyEUV3Q==",
"dependencies": {
- "@babel/helper-create-class-features-plugin": "^7.22.5",
- "@babel/helper-plugin-utils": "^7.22.5"
+ "@babel/helper-create-class-features-plugin": "^7.25.9",
+ "@babel/helper-plugin-utils": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
@@ -1133,13 +934,12 @@
}
},
"node_modules/@babel/plugin-transform-class-static-block": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.5.tgz",
- "integrity": "sha512-SPToJ5eYZLxlnp1UzdARpOGeC2GbHvr9d/UV0EukuVx8atktg194oe+C5BqQ8jRTkgLRVOPYeXRSBg1IlMoVRA==",
+ "version": "7.26.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.26.0.tgz",
+ "integrity": "sha512-6J2APTs7BDDm+UMqP1useWqhcRAXo0WIoVj26N7kPFB6S73Lgvyka4KTZYIxtgYXiN5HTyRObA72N2iu628iTQ==",
"dependencies": {
- "@babel/helper-create-class-features-plugin": "^7.22.5",
- "@babel/helper-plugin-utils": "^7.22.5",
- "@babel/plugin-syntax-class-static-block": "^7.14.5"
+ "@babel/helper-create-class-features-plugin": "^7.25.9",
+ "@babel/helper-plugin-utils": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
@@ -1149,18 +949,15 @@
}
},
"node_modules/@babel/plugin-transform-classes": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.5.tgz",
- "integrity": "sha512-2edQhLfibpWpsVBx2n/GKOz6JdGQvLruZQfGr9l1qes2KQaWswjBzhQF7UDUZMNaMMQeYnQzxwOMPsbYF7wqPQ==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.9.tgz",
+ "integrity": "sha512-mD8APIXmseE7oZvZgGABDyM34GUmK45Um2TXiBUt7PnuAxrgoSVf123qUzPxEr/+/BHrRn5NMZCdE2m/1F8DGg==",
"dependencies": {
- "@babel/helper-annotate-as-pure": "^7.22.5",
- "@babel/helper-compilation-targets": "^7.22.5",
- "@babel/helper-environment-visitor": "^7.22.5",
- "@babel/helper-function-name": "^7.22.5",
- "@babel/helper-optimise-call-expression": "^7.22.5",
- "@babel/helper-plugin-utils": "^7.22.5",
- "@babel/helper-replace-supers": "^7.22.5",
- "@babel/helper-split-export-declaration": "^7.22.5",
+ "@babel/helper-annotate-as-pure": "^7.25.9",
+ "@babel/helper-compilation-targets": "^7.25.9",
+ "@babel/helper-plugin-utils": "^7.25.9",
+ "@babel/helper-replace-supers": "^7.25.9",
+ "@babel/traverse": "^7.25.9",
"globals": "^11.1.0"
},
"engines": {
@@ -1171,12 +968,12 @@
}
},
"node_modules/@babel/plugin-transform-computed-properties": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.22.5.tgz",
- "integrity": "sha512-4GHWBgRf0krxPX+AaPtgBAlTgTeZmqDynokHOX7aqqAB4tHs3U2Y02zH6ETFdLZGcg9UQSD1WCmkVrE9ErHeOg==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.25.9.tgz",
+ "integrity": "sha512-HnBegGqXZR12xbcTHlJ9HGxw1OniltT26J5YpfruGqtUHlz/xKf/G2ak9e+t0rVqrjXa9WOhvYPz1ERfMj23AA==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.22.5",
- "@babel/template": "^7.22.5"
+ "@babel/helper-plugin-utils": "^7.25.9",
+ "@babel/template": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
@@ -1186,11 +983,11 @@
}
},
"node_modules/@babel/plugin-transform-destructuring": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.5.tgz",
- "integrity": "sha512-GfqcFuGW8vnEqTUBM7UtPd5A4q797LTvvwKxXTgRsFjoqaJiEg9deBG6kWeQYkVEL569NpnmpC0Pkr/8BLKGnQ==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.25.9.tgz",
+ "integrity": "sha512-WkCGb/3ZxXepmMiX101nnGiU+1CAdut8oHyEOHxkKuS1qKpU2SMXE2uSvfz8PBuLd49V6LEsbtyPhWC7fnkgvQ==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.22.5"
+ "@babel/helper-plugin-utils": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
@@ -1200,12 +997,12 @@
}
},
"node_modules/@babel/plugin-transform-dotall-regex": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.22.5.tgz",
- "integrity": "sha512-5/Yk9QxCQCl+sOIB1WelKnVRxTJDSAIxtJLL2/pqL14ZVlbH0fUQUZa/T5/UnQtBNgghR7mfB8ERBKyKPCi7Vw==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.25.9.tgz",
+ "integrity": "sha512-t7ZQ7g5trIgSRYhI9pIJtRl64KHotutUJsh4Eze5l7olJv+mRSg4/MmbZ0tv1eeqRbdvo/+trvJD/Oc5DmW2cA==",
"dependencies": {
- "@babel/helper-create-regexp-features-plugin": "^7.22.5",
- "@babel/helper-plugin-utils": "^7.22.5"
+ "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+ "@babel/helper-plugin-utils": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
@@ -1215,11 +1012,11 @@
}
},
"node_modules/@babel/plugin-transform-duplicate-keys": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.22.5.tgz",
- "integrity": "sha512-dEnYD+9BBgld5VBXHnF/DbYGp3fqGMsyxKbtD1mDyIA7AkTSpKXFhCVuj/oQVOoALfBs77DudA0BE4d5mcpmqw==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.25.9.tgz",
+ "integrity": "sha512-LZxhJ6dvBb/f3x8xwWIuyiAHy56nrRG3PeYTpBkkzkYRRQ6tJLu68lEF5VIqMUZiAV7a8+Tb78nEoMCMcqjXBw==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.22.5"
+ "@babel/helper-plugin-utils": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
@@ -1228,13 +1025,27 @@
"@babel/core": "^7.0.0-0"
}
},
- "node_modules/@babel/plugin-transform-dynamic-import": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.5.tgz",
- "integrity": "sha512-0MC3ppTB1AMxd8fXjSrbPa7LT9hrImt+/fcj+Pg5YMD7UQyWp/02+JWpdnCymmsXwIx5Z+sYn1bwCn4ZJNvhqQ==",
+ "node_modules/@babel/plugin-transform-duplicate-named-capturing-groups-regex": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.25.9.tgz",
+ "integrity": "sha512-0UfuJS0EsXbRvKnwcLjFtJy/Sxc5J5jhLHnFhy7u4zih97Hz6tJkLU+O+FMMrNZrosUPxDi6sYxJ/EA8jDiAog==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.22.5",
- "@babel/plugin-syntax-dynamic-import": "^7.8.3"
+ "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+ "@babel/helper-plugin-utils": "^7.25.9"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0"
+ }
+ },
+ "node_modules/@babel/plugin-transform-dynamic-import": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.25.9.tgz",
+ "integrity": "sha512-GCggjexbmSLaFhqsojeugBpeaRIgWNTcgKVq/0qIteFEqY2A+b9QidYadrWlnbWQUrW5fn+mCvf3tr7OeBFTyg==",
+ "dependencies": {
+ "@babel/helper-plugin-utils": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
@@ -1244,12 +1055,11 @@
}
},
"node_modules/@babel/plugin-transform-exponentiation-operator": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.22.5.tgz",
- "integrity": "sha512-vIpJFNM/FjZ4rh1myqIya9jXwrwwgFRHPjT3DkUA9ZLHuzox8jiXkOLvwm1H+PQIP3CqfC++WPKeuDi0Sjdj1g==",
+ "version": "7.26.3",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.26.3.tgz",
+ "integrity": "sha512-7CAHcQ58z2chuXPWblnn1K6rLDnDWieghSOEmqQsrBenH0P9InCUtOJYD89pvngljmZlJcz3fcmgYsXFNGa1ZQ==",
"dependencies": {
- "@babel/helper-builder-binary-assignment-operator-visitor": "^7.22.5",
- "@babel/helper-plugin-utils": "^7.22.5"
+ "@babel/helper-plugin-utils": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
@@ -1259,12 +1069,11 @@
}
},
"node_modules/@babel/plugin-transform-export-namespace-from": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.5.tgz",
- "integrity": "sha512-X4hhm7FRnPgd4nDA4b/5V280xCx6oL7Oob5+9qVS5C13Zq4bh1qq7LU0GgRU6b5dBWBvhGaXYVB4AcN6+ol6vg==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.25.9.tgz",
+ "integrity": "sha512-2NsEz+CxzJIVOPx2o9UsW1rXLqtChtLoVnwYHHiB04wS5sgn7mrV45fWMBX0Kk+ub9uXytVYfNP2HjbVbCB3Ww==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.22.5",
- "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
+ "@babel/helper-plugin-utils": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
@@ -1274,12 +1083,12 @@
}
},
"node_modules/@babel/plugin-transform-flow-strip-types": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.22.5.tgz",
- "integrity": "sha512-tujNbZdxdG0/54g/oua8ISToaXTFBf8EnSb5PgQSciIXWOWKX3S4+JR7ZE9ol8FZwf9kxitzkGQ+QWeov/mCiA==",
+ "version": "7.26.5",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.26.5.tgz",
+ "integrity": "sha512-eGK26RsbIkYUns3Y8qKl362juDDYK+wEdPGHGrhzUl6CewZFo55VZ7hg+CyMFU4dd5QQakBN86nBMpRsFpRvbQ==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.22.5",
- "@babel/plugin-syntax-flow": "^7.22.5"
+ "@babel/helper-plugin-utils": "^7.26.5",
+ "@babel/plugin-syntax-flow": "^7.26.0"
},
"engines": {
"node": ">=6.9.0"
@@ -1289,11 +1098,12 @@
}
},
"node_modules/@babel/plugin-transform-for-of": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.5.tgz",
- "integrity": "sha512-3kxQjX1dU9uudwSshyLeEipvrLjBCVthCgeTp6CzE/9JYrlAIaeekVxRpCWsDDfYTfRZRoCeZatCQvwo+wvK8A==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.25.9.tgz",
+ "integrity": "sha512-LqHxduHoaGELJl2uhImHwRQudhCM50pT46rIBNvtT/Oql3nqiS3wOwP+5ten7NpYSXrrVLgtZU3DZmPtWZo16A==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.22.5"
+ "@babel/helper-plugin-utils": "^7.25.9",
+ "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
@@ -1303,13 +1113,13 @@
}
},
"node_modules/@babel/plugin-transform-function-name": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.22.5.tgz",
- "integrity": "sha512-UIzQNMS0p0HHiQm3oelztj+ECwFnj+ZRV4KnguvlsD2of1whUeM6o7wGNj6oLwcDoAXQ8gEqfgC24D+VdIcevg==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.9.tgz",
+ "integrity": "sha512-8lP+Yxjv14Vc5MuWBpJsoUCd3hD6V9DgBon2FVYL4jJgbnVQ9fTgYmonchzZJOVNgzEgbxp4OwAf6xz6M/14XA==",
"dependencies": {
- "@babel/helper-compilation-targets": "^7.22.5",
- "@babel/helper-function-name": "^7.22.5",
- "@babel/helper-plugin-utils": "^7.22.5"
+ "@babel/helper-compilation-targets": "^7.25.9",
+ "@babel/helper-plugin-utils": "^7.25.9",
+ "@babel/traverse": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
@@ -1319,12 +1129,11 @@
}
},
"node_modules/@babel/plugin-transform-json-strings": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.5.tgz",
- "integrity": "sha512-DuCRB7fu8MyTLbEQd1ew3R85nx/88yMoqo2uPSjevMj3yoN7CDM8jkgrY0wmVxfJZyJ/B9fE1iq7EQppWQmR5A==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.25.9.tgz",
+ "integrity": "sha512-xoTMk0WXceiiIvsaquQQUaLLXSW1KJ159KP87VilruQm0LNNGxWzahxSS6T6i4Zg3ezp4vA4zuwiNUR53qmQAw==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.22.5",
- "@babel/plugin-syntax-json-strings": "^7.8.3"
+ "@babel/helper-plugin-utils": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
@@ -1334,11 +1143,11 @@
}
},
"node_modules/@babel/plugin-transform-literals": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.22.5.tgz",
- "integrity": "sha512-fTLj4D79M+mepcw3dgFBTIDYpbcB9Sm0bpm4ppXPaO+U+PKFFyV9MGRvS0gvGw62sd10kT5lRMKXAADb9pWy8g==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.9.tgz",
+ "integrity": "sha512-9N7+2lFziW8W9pBl2TzaNht3+pgMIRP74zizeCSrtnSKVdUl8mAjjOP2OOVQAfZ881P2cNjDj1uAMEdeD50nuQ==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.22.5"
+ "@babel/helper-plugin-utils": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
@@ -1348,12 +1157,11 @@
}
},
"node_modules/@babel/plugin-transform-logical-assignment-operators": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.5.tgz",
- "integrity": "sha512-MQQOUW1KL8X0cDWfbwYP+TbVbZm16QmQXJQ+vndPtH/BoO0lOKpVoEDMI7+PskYxH+IiE0tS8xZye0qr1lGzSA==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.25.9.tgz",
+ "integrity": "sha512-wI4wRAzGko551Y8eVf6iOY9EouIDTtPb0ByZx+ktDGHwv6bHFimrgJM/2T021txPZ2s4c7bqvHbd+vXG6K948Q==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.22.5",
- "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
+ "@babel/helper-plugin-utils": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
@@ -1363,11 +1171,11 @@
}
},
"node_modules/@babel/plugin-transform-member-expression-literals": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.22.5.tgz",
- "integrity": "sha512-RZEdkNtzzYCFl9SE9ATaUMTj2hqMb4StarOJLrZRbqqU4HSBE7UlBw9WBWQiDzrJZJdUWiMTVDI6Gv/8DPvfew==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.25.9.tgz",
+ "integrity": "sha512-PYazBVfofCQkkMzh2P6IdIUaCEWni3iYEerAsRWuVd8+jlM1S9S9cz1dF9hIzyoZ8IA3+OwVYIp9v9e+GbgZhA==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.22.5"
+ "@babel/helper-plugin-utils": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
@@ -1377,12 +1185,12 @@
}
},
"node_modules/@babel/plugin-transform-modules-amd": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.22.5.tgz",
- "integrity": "sha512-R+PTfLTcYEmb1+kK7FNkhQ1gP4KgjpSO6HfH9+f8/yfp2Nt3ggBjiVpRwmwTlfqZLafYKJACy36yDXlEmI9HjQ==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.25.9.tgz",
+ "integrity": "sha512-g5T11tnI36jVClQlMlt4qKDLlWnG5pP9CSM4GhdRciTNMRgkfpo5cR6b4rGIOYPgRRuFAvwjPQ/Yk+ql4dyhbw==",
"dependencies": {
- "@babel/helper-module-transforms": "^7.22.5",
- "@babel/helper-plugin-utils": "^7.22.5"
+ "@babel/helper-module-transforms": "^7.25.9",
+ "@babel/helper-plugin-utils": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
@@ -1392,13 +1200,12 @@
}
},
"node_modules/@babel/plugin-transform-modules-commonjs": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.5.tgz",
- "integrity": "sha512-B4pzOXj+ONRmuaQTg05b3y/4DuFz3WcCNAXPLb2Q0GT0TrGKGxNKV4jwsXts+StaM0LQczZbOpj8o1DLPDJIiA==",
+ "version": "7.26.3",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.26.3.tgz",
+ "integrity": "sha512-MgR55l4q9KddUDITEzEFYn5ZsGDXMSsU9E+kh7fjRXTIC3RHqfCo8RPRbyReYJh44HQ/yomFkqbOFohXvDCiIQ==",
"dependencies": {
- "@babel/helper-module-transforms": "^7.22.5",
- "@babel/helper-plugin-utils": "^7.22.5",
- "@babel/helper-simple-access": "^7.22.5"
+ "@babel/helper-module-transforms": "^7.26.0",
+ "@babel/helper-plugin-utils": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
@@ -1408,14 +1215,14 @@
}
},
"node_modules/@babel/plugin-transform-modules-systemjs": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.22.5.tgz",
- "integrity": "sha512-emtEpoaTMsOs6Tzz+nbmcePl6AKVtS1yC4YNAeMun9U8YCsgadPNxnOPQ8GhHFB2qdx+LZu9LgoC0Lthuu05DQ==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.9.tgz",
+ "integrity": "sha512-hyss7iIlH/zLHaehT+xwiymtPOpsiwIIRlCAOwBB04ta5Tt+lNItADdlXw3jAWZ96VJ2jlhl/c+PNIQPKNfvcA==",
"dependencies": {
- "@babel/helper-hoist-variables": "^7.22.5",
- "@babel/helper-module-transforms": "^7.22.5",
- "@babel/helper-plugin-utils": "^7.22.5",
- "@babel/helper-validator-identifier": "^7.22.5"
+ "@babel/helper-module-transforms": "^7.25.9",
+ "@babel/helper-plugin-utils": "^7.25.9",
+ "@babel/helper-validator-identifier": "^7.25.9",
+ "@babel/traverse": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
@@ -1425,12 +1232,12 @@
}
},
"node_modules/@babel/plugin-transform-modules-umd": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.22.5.tgz",
- "integrity": "sha512-+S6kzefN/E1vkSsKx8kmQuqeQsvCKCd1fraCM7zXm4SFoggI099Tr4G8U81+5gtMdUeMQ4ipdQffbKLX0/7dBQ==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.25.9.tgz",
+ "integrity": "sha512-bS9MVObUgE7ww36HEfwe6g9WakQ0KF07mQF74uuXdkoziUPfKyu/nIm663kz//e5O1nPInPFx36z7WJmJ4yNEw==",
"dependencies": {
- "@babel/helper-module-transforms": "^7.22.5",
- "@babel/helper-plugin-utils": "^7.22.5"
+ "@babel/helper-module-transforms": "^7.25.9",
+ "@babel/helper-plugin-utils": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
@@ -1440,12 +1247,12 @@
}
},
"node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz",
- "integrity": "sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.25.9.tgz",
+ "integrity": "sha512-oqB6WHdKTGl3q/ItQhpLSnWWOpjUJLsOCLVyeFgeTktkBSCiurvPOsyt93gibI9CmuKvTUEtWmG5VhZD+5T/KA==",
"dependencies": {
- "@babel/helper-create-regexp-features-plugin": "^7.22.5",
- "@babel/helper-plugin-utils": "^7.22.5"
+ "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+ "@babel/helper-plugin-utils": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
@@ -1455,11 +1262,11 @@
}
},
"node_modules/@babel/plugin-transform-new-target": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.22.5.tgz",
- "integrity": "sha512-AsF7K0Fx/cNKVyk3a+DW0JLo+Ua598/NxMRvxDnkpCIGFh43+h/v2xyhRUYf6oD8gE4QtL83C7zZVghMjHd+iw==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.25.9.tgz",
+ "integrity": "sha512-U/3p8X1yCSoKyUj2eOBIx3FOn6pElFOKvAAGf8HTtItuPyB+ZeOqfn+mvTtg9ZlOAjsPdK3ayQEjqHjU/yLeVQ==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.22.5"
+ "@babel/helper-plugin-utils": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
@@ -1469,12 +1276,11 @@
}
},
"node_modules/@babel/plugin-transform-nullish-coalescing-operator": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.5.tgz",
- "integrity": "sha512-6CF8g6z1dNYZ/VXok5uYkkBBICHZPiGEl7oDnAx2Mt1hlHVHOSIKWJaXHjQJA5VB43KZnXZDIexMchY4y2PGdA==",
+ "version": "7.26.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.26.6.tgz",
+ "integrity": "sha512-CKW8Vu+uUZneQCPtXmSBUC6NCAUdya26hWCElAWh5mVSlSRsmiCPUUDKb3Z0szng1hiAJa098Hkhg9o4SE35Qw==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.22.5",
- "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
+ "@babel/helper-plugin-utils": "^7.26.5"
},
"engines": {
"node": ">=6.9.0"
@@ -1484,12 +1290,11 @@
}
},
"node_modules/@babel/plugin-transform-numeric-separator": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.5.tgz",
- "integrity": "sha512-NbslED1/6M+sXiwwtcAB/nieypGw02Ejf4KtDeMkCEpP6gWFMX1wI9WKYua+4oBneCCEmulOkRpwywypVZzs/g==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.25.9.tgz",
+ "integrity": "sha512-TlprrJ1GBZ3r6s96Yq8gEQv82s8/5HnCVHtEJScUj90thHQbwe+E5MLhi2bbNHBEJuzrvltXSru+BUxHDoog7Q==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.22.5",
- "@babel/plugin-syntax-numeric-separator": "^7.10.4"
+ "@babel/helper-plugin-utils": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
@@ -1499,15 +1304,13 @@
}
},
"node_modules/@babel/plugin-transform-object-rest-spread": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.5.tgz",
- "integrity": "sha512-Kk3lyDmEslH9DnvCDA1s1kkd3YWQITiBOHngOtDL9Pt6BZjzqb6hiOlb8VfjiiQJ2unmegBqZu0rx5RxJb5vmQ==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.25.9.tgz",
+ "integrity": "sha512-fSaXafEE9CVHPweLYw4J0emp1t8zYTXyzN3UuG+lylqkvYd7RMrsOQ8TYx5RF231be0vqtFC6jnx3UmpJmKBYg==",
"dependencies": {
- "@babel/compat-data": "^7.22.5",
- "@babel/helper-compilation-targets": "^7.22.5",
- "@babel/helper-plugin-utils": "^7.22.5",
- "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
- "@babel/plugin-transform-parameters": "^7.22.5"
+ "@babel/helper-compilation-targets": "^7.25.9",
+ "@babel/helper-plugin-utils": "^7.25.9",
+ "@babel/plugin-transform-parameters": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
@@ -1517,12 +1320,12 @@
}
},
"node_modules/@babel/plugin-transform-object-super": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.22.5.tgz",
- "integrity": "sha512-klXqyaT9trSjIUrcsYIfETAzmOEZL3cBYqOYLJxBHfMFFggmXOv+NYSX/Jbs9mzMVESw/WycLFPRx8ba/b2Ipw==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.25.9.tgz",
+ "integrity": "sha512-Kj/Gh+Rw2RNLbCK1VAWj2U48yxxqL2x0k10nPtSdRa0O2xnHXalD0s+o1A6a0W43gJ00ANo38jxkQreckOzv5A==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.22.5",
- "@babel/helper-replace-supers": "^7.22.5"
+ "@babel/helper-plugin-utils": "^7.25.9",
+ "@babel/helper-replace-supers": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
@@ -1532,12 +1335,11 @@
}
},
"node_modules/@babel/plugin-transform-optional-catch-binding": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.5.tgz",
- "integrity": "sha512-pH8orJahy+hzZje5b8e2QIlBWQvGpelS76C63Z+jhZKsmzfNaPQ+LaW6dcJ9bxTpo1mtXbgHwy765Ro3jftmUg==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.25.9.tgz",
+ "integrity": "sha512-qM/6m6hQZzDcZF3onzIhZeDHDO43bkNNlOX0i8n3lR6zLbu0GN2d8qfM/IERJZYauhAHSLHy39NF0Ctdvcid7g==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.22.5",
- "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
+ "@babel/helper-plugin-utils": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
@@ -1547,13 +1349,12 @@
}
},
"node_modules/@babel/plugin-transform-optional-chaining": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.5.tgz",
- "integrity": "sha512-AconbMKOMkyG+xCng2JogMCDcqW8wedQAqpVIL4cOSescZ7+iW8utC6YDZLMCSUIReEA733gzRSaOSXMAt/4WQ==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.25.9.tgz",
+ "integrity": "sha512-6AvV0FsLULbpnXeBjrY4dmWF8F7gf8QnvTEoO/wX/5xm/xE1Xo8oPuD3MPS+KS9f9XBEAWN7X1aWr4z9HdOr7A==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.22.5",
- "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
- "@babel/plugin-syntax-optional-chaining": "^7.8.3"
+ "@babel/helper-plugin-utils": "^7.25.9",
+ "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
@@ -1563,11 +1364,11 @@
}
},
"node_modules/@babel/plugin-transform-parameters": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.5.tgz",
- "integrity": "sha512-AVkFUBurORBREOmHRKo06FjHYgjrabpdqRSwq6+C7R5iTCZOsM4QbcB27St0a4U6fffyAOqh3s/qEfybAhfivg==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.25.9.tgz",
+ "integrity": "sha512-wzz6MKwpnshBAiRmn4jR8LYz/g8Ksg0o80XmwZDlordjwEk9SxBzTWC7F5ef1jhbrbOW2DJ5J6ayRukrJmnr0g==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.22.5"
+ "@babel/helper-plugin-utils": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
@@ -1577,12 +1378,12 @@
}
},
"node_modules/@babel/plugin-transform-private-methods": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.22.5.tgz",
- "integrity": "sha512-PPjh4gyrQnGe97JTalgRGMuU4icsZFnWkzicB/fUtzlKUqvsWBKEpPPfr5a2JiyirZkHxnAqkQMO5Z5B2kK3fA==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.25.9.tgz",
+ "integrity": "sha512-D/JUozNpQLAPUVusvqMxyvjzllRaF8/nSrP1s2YGQT/W4LHK4xxsMcHjhOGTS01mp9Hda8nswb+FblLdJornQw==",
"dependencies": {
- "@babel/helper-create-class-features-plugin": "^7.22.5",
- "@babel/helper-plugin-utils": "^7.22.5"
+ "@babel/helper-create-class-features-plugin": "^7.25.9",
+ "@babel/helper-plugin-utils": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
@@ -1592,14 +1393,13 @@
}
},
"node_modules/@babel/plugin-transform-private-property-in-object": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.5.tgz",
- "integrity": "sha512-/9xnaTTJcVoBtSSmrVyhtSvO3kbqS2ODoh2juEU72c3aYonNF0OMGiaz2gjukyKM2wBBYJP38S4JiE0Wfb5VMQ==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.25.9.tgz",
+ "integrity": "sha512-Evf3kcMqzXA3xfYJmZ9Pg1OvKdtqsDMSWBDzZOPLvHiTt36E75jLDQo5w1gtRU95Q4E5PDttrTf25Fw8d/uWLw==",
"dependencies": {
- "@babel/helper-annotate-as-pure": "^7.22.5",
- "@babel/helper-create-class-features-plugin": "^7.22.5",
- "@babel/helper-plugin-utils": "^7.22.5",
- "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
+ "@babel/helper-annotate-as-pure": "^7.25.9",
+ "@babel/helper-create-class-features-plugin": "^7.25.9",
+ "@babel/helper-plugin-utils": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
@@ -1609,11 +1409,11 @@
}
},
"node_modules/@babel/plugin-transform-property-literals": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.22.5.tgz",
- "integrity": "sha512-TiOArgddK3mK/x1Qwf5hay2pxI6wCZnvQqrFSqbtg1GLl2JcNMitVH/YnqjP+M31pLUeTfzY1HAXFDnUBV30rQ==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.25.9.tgz",
+ "integrity": "sha512-IvIUeV5KrS/VPavfSM/Iu+RE6llrHrYIKY1yfCzyO/lMXHQ+p7uGhonmGVisv6tSBSVgWzMBohTcvkC9vQcQFA==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.22.5"
+ "@babel/helper-plugin-utils": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
@@ -1623,11 +1423,11 @@
}
},
"node_modules/@babel/plugin-transform-react-constant-elements": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.22.5.tgz",
- "integrity": "sha512-BF5SXoO+nX3h5OhlN78XbbDrBOffv+AxPP2ENaJOVqjWCgBDeOY3WcaUcddutGSfoap+5NEQ/q/4I3WZIvgkXA==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.25.9.tgz",
+ "integrity": "sha512-Ncw2JFsJVuvfRsa2lSHiC55kETQVLSnsYGQ1JDDwkUeWGTL/8Tom8aLTnlqgoeuopWrbbGndrc9AlLYrIosrow==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.22.5"
+ "@babel/helper-plugin-utils": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
@@ -1637,11 +1437,11 @@
}
},
"node_modules/@babel/plugin-transform-react-display-name": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.22.5.tgz",
- "integrity": "sha512-PVk3WPYudRF5z4GKMEYUrLjPl38fJSKNaEOkFuoprioowGuWN6w2RKznuFNSlJx7pzzXXStPUnNSOEO0jL5EVw==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.25.9.tgz",
+ "integrity": "sha512-KJfMlYIUxQB1CJfO3e0+h0ZHWOTLCPP115Awhaz8U0Zpq36Gl/cXlpoyMRnUWlhNUBAzldnCiAZNvCDj7CrKxQ==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.22.5"
+ "@babel/helper-plugin-utils": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
@@ -1651,15 +1451,15 @@
}
},
"node_modules/@babel/plugin-transform-react-jsx": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.22.5.tgz",
- "integrity": "sha512-rog5gZaVbUip5iWDMTYbVM15XQq+RkUKhET/IHR6oizR+JEoN6CAfTTuHcK4vwUyzca30qqHqEpzBOnaRMWYMA==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.25.9.tgz",
+ "integrity": "sha512-s5XwpQYCqGerXl+Pu6VDL3x0j2d82eiV77UJ8a2mDHAW7j9SWRqQ2y1fNo1Z74CdcYipl5Z41zvjj4Nfzq36rw==",
"dependencies": {
- "@babel/helper-annotate-as-pure": "^7.22.5",
- "@babel/helper-module-imports": "^7.22.5",
- "@babel/helper-plugin-utils": "^7.22.5",
- "@babel/plugin-syntax-jsx": "^7.22.5",
- "@babel/types": "^7.22.5"
+ "@babel/helper-annotate-as-pure": "^7.25.9",
+ "@babel/helper-module-imports": "^7.25.9",
+ "@babel/helper-plugin-utils": "^7.25.9",
+ "@babel/plugin-syntax-jsx": "^7.25.9",
+ "@babel/types": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
@@ -1669,11 +1469,11 @@
}
},
"node_modules/@babel/plugin-transform-react-jsx-development": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.22.5.tgz",
- "integrity": "sha512-bDhuzwWMuInwCYeDeMzyi7TaBgRQei6DqxhbyniL7/VG4RSS7HtSL2QbY4eESy1KJqlWt8g3xeEBGPuo+XqC8A==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.25.9.tgz",
+ "integrity": "sha512-9mj6rm7XVYs4mdLIpbZnHOYdpW42uoiBCTVowg7sP1thUOiANgMb4UtpRivR0pp5iL+ocvUv7X4mZgFRpJEzGw==",
"dependencies": {
- "@babel/plugin-transform-react-jsx": "^7.22.5"
+ "@babel/plugin-transform-react-jsx": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
@@ -1683,12 +1483,12 @@
}
},
"node_modules/@babel/plugin-transform-react-pure-annotations": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.22.5.tgz",
- "integrity": "sha512-gP4k85wx09q+brArVinTXhWiyzLl9UpmGva0+mWyKxk6JZequ05x3eUcIUE+FyttPKJFRRVtAvQaJ6YF9h1ZpA==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.25.9.tgz",
+ "integrity": "sha512-KQ/Takk3T8Qzj5TppkS1be588lkbTp5uj7w6a0LeQaTMSckU/wK0oJ/pih+T690tkgI5jfmg2TqDJvd41Sj1Cg==",
"dependencies": {
- "@babel/helper-annotate-as-pure": "^7.22.5",
- "@babel/helper-plugin-utils": "^7.22.5"
+ "@babel/helper-annotate-as-pure": "^7.25.9",
+ "@babel/helper-plugin-utils": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
@@ -1698,12 +1498,12 @@
}
},
"node_modules/@babel/plugin-transform-regenerator": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.5.tgz",
- "integrity": "sha512-rR7KePOE7gfEtNTh9Qw+iO3Q/e4DEsoQ+hdvM6QUDH7JRJ5qxq5AA52ZzBWbI5i9lfNuvySgOGP8ZN7LAmaiPw==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.25.9.tgz",
+ "integrity": "sha512-vwDcDNsgMPDGP0nMqzahDWE5/MLcX8sv96+wfX7as7LoF/kr97Bo/7fI00lXY4wUXYfVmwIIyG80fGZ1uvt2qg==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.22.5",
- "regenerator-transform": "^0.15.1"
+ "@babel/helper-plugin-utils": "^7.25.9",
+ "regenerator-transform": "^0.15.2"
},
"engines": {
"node": ">=6.9.0"
@@ -1712,12 +1512,27 @@
"@babel/core": "^7.0.0-0"
}
},
- "node_modules/@babel/plugin-transform-reserved-words": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.22.5.tgz",
- "integrity": "sha512-DTtGKFRQUDm8svigJzZHzb/2xatPc6TzNvAIJ5GqOKDsGFYgAskjRulbR/vGsPKq3OPqtexnz327qYpP57RFyA==",
+ "node_modules/@babel/plugin-transform-regexp-modifiers": {
+ "version": "7.26.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regexp-modifiers/-/plugin-transform-regexp-modifiers-7.26.0.tgz",
+ "integrity": "sha512-vN6saax7lrA2yA/Pak3sCxuD6F5InBjn9IcrIKQPjpsLvuHYLVroTxjdlVRHjjBWxKOqIwpTXDkOssYT4BFdRw==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.22.5"
+ "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+ "@babel/helper-plugin-utils": "^7.25.9"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0"
+ }
+ },
+ "node_modules/@babel/plugin-transform-reserved-words": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.25.9.tgz",
+ "integrity": "sha512-7DL7DKYjn5Su++4RXu8puKZm2XBPHyjWLUidaPEkCUBbE7IPcsrkRHggAOOKydH1dASWdcUBxrkOGNxUv5P3Jg==",
+ "dependencies": {
+ "@babel/helper-plugin-utils": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
@@ -1727,16 +1542,16 @@
}
},
"node_modules/@babel/plugin-transform-runtime": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.22.5.tgz",
- "integrity": "sha512-bg4Wxd1FWeFx3daHFTWk1pkSWK/AyQuiyAoeZAOkAOUBjnZPH6KT7eMxouV47tQ6hl6ax2zyAWBdWZXbrvXlaw==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.25.9.tgz",
+ "integrity": "sha512-nZp7GlEl+yULJrClz0SwHPqir3lc0zsPrDHQUcxGspSL7AKrexNSEfTbfqnDNJUO13bgKyfuOLMF8Xqtu8j3YQ==",
"dependencies": {
- "@babel/helper-module-imports": "^7.22.5",
- "@babel/helper-plugin-utils": "^7.22.5",
- "babel-plugin-polyfill-corejs2": "^0.4.3",
- "babel-plugin-polyfill-corejs3": "^0.8.1",
- "babel-plugin-polyfill-regenerator": "^0.5.0",
- "semver": "^6.3.0"
+ "@babel/helper-module-imports": "^7.25.9",
+ "@babel/helper-plugin-utils": "^7.25.9",
+ "babel-plugin-polyfill-corejs2": "^0.4.10",
+ "babel-plugin-polyfill-corejs3": "^0.10.6",
+ "babel-plugin-polyfill-regenerator": "^0.6.1",
+ "semver": "^6.3.1"
},
"engines": {
"node": ">=6.9.0"
@@ -1746,11 +1561,11 @@
}
},
"node_modules/@babel/plugin-transform-shorthand-properties": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.22.5.tgz",
- "integrity": "sha512-vM4fq9IXHscXVKzDv5itkO1X52SmdFBFcMIBZ2FRn2nqVYqw6dBexUgMvAjHW+KXpPPViD/Yo3GrDEBaRC0QYA==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.25.9.tgz",
+ "integrity": "sha512-MUv6t0FhO5qHnS/W8XCbHmiRWOphNufpE1IVxhK5kuN3Td9FT1x4rx4K42s3RYdMXCXpfWkGSbCSd0Z64xA7Ng==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.22.5"
+ "@babel/helper-plugin-utils": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
@@ -1760,12 +1575,12 @@
}
},
"node_modules/@babel/plugin-transform-spread": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.22.5.tgz",
- "integrity": "sha512-5ZzDQIGyvN4w8+dMmpohL6MBo+l2G7tfC/O2Dg7/hjpgeWvUx8FzfeOKxGog9IimPa4YekaQ9PlDqTLOljkcxg==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.25.9.tgz",
+ "integrity": "sha512-oNknIB0TbURU5pqJFVbOOFspVlrpVwo2H1+HUIsVDvp5VauGGDP1ZEvO8Nn5xyMEs3dakajOxlmkNW7kNgSm6A==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.22.5",
- "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5"
+ "@babel/helper-plugin-utils": "^7.25.9",
+ "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
@@ -1775,11 +1590,11 @@
}
},
"node_modules/@babel/plugin-transform-sticky-regex": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.22.5.tgz",
- "integrity": "sha512-zf7LuNpHG0iEeiyCNwX4j3gDg1jgt1k3ZdXBKbZSoA3BbGQGvMiSvfbZRR3Dr3aeJe3ooWFZxOOG3IRStYp2Bw==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.25.9.tgz",
+ "integrity": "sha512-WqBUSgeVwucYDP9U/xNRQam7xV8W5Zf+6Eo7T2SRVUFlhRiMNFdFz58u0KZmCVVqs2i7SHgpRnAhzRNmKfi2uA==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.22.5"
+ "@babel/helper-plugin-utils": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
@@ -1789,11 +1604,11 @@
}
},
"node_modules/@babel/plugin-transform-template-literals": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.22.5.tgz",
- "integrity": "sha512-5ciOehRNf+EyUeewo8NkbQiUs4d6ZxiHo6BcBcnFlgiJfu16q0bQUw9Jvo0b0gBKFG1SMhDSjeKXSYuJLeFSMA==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.25.9.tgz",
+ "integrity": "sha512-o97AE4syN71M/lxrCtQByzphAdlYluKPDBzDVzMmfCobUjjhAryZV0AIpRPrxN0eAkxXO6ZLEScmt+PNhj2OTw==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.22.5"
+ "@babel/helper-plugin-utils": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
@@ -1803,11 +1618,11 @@
}
},
"node_modules/@babel/plugin-transform-typeof-symbol": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.22.5.tgz",
- "integrity": "sha512-bYkI5lMzL4kPii4HHEEChkD0rkc+nvnlR6+o/qdqR6zrm0Sv/nodmyLhlq2DO0YKLUNd2VePmPRjJXSBh9OIdA==",
+ "version": "7.26.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.26.7.tgz",
+ "integrity": "sha512-jfoTXXZTgGg36BmhqT3cAYK5qkmqvJpvNrPhaK/52Vgjhw4Rq29s9UqpWWV0D6yuRmgiFH/BUVlkl96zJWqnaw==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.22.5"
+ "@babel/helper-plugin-utils": "^7.26.5"
},
"engines": {
"node": ">=6.9.0"
@@ -1817,14 +1632,15 @@
}
},
"node_modules/@babel/plugin-transform-typescript": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.22.5.tgz",
- "integrity": "sha512-SMubA9S7Cb5sGSFFUlqxyClTA9zWJ8qGQrppNUm05LtFuN1ELRFNndkix4zUJrC9F+YivWwa1dHMSyo0e0N9dA==",
+ "version": "7.26.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.26.7.tgz",
+ "integrity": "sha512-5cJurntg+AT+cgelGP9Bt788DKiAw9gIMSMU2NJrLAilnj0m8WZWUNZPSLOmadYsujHutpgElO+50foX+ib/Wg==",
"dependencies": {
- "@babel/helper-annotate-as-pure": "^7.22.5",
- "@babel/helper-create-class-features-plugin": "^7.22.5",
- "@babel/helper-plugin-utils": "^7.22.5",
- "@babel/plugin-syntax-typescript": "^7.22.5"
+ "@babel/helper-annotate-as-pure": "^7.25.9",
+ "@babel/helper-create-class-features-plugin": "^7.25.9",
+ "@babel/helper-plugin-utils": "^7.26.5",
+ "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9",
+ "@babel/plugin-syntax-typescript": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
@@ -1834,11 +1650,11 @@
}
},
"node_modules/@babel/plugin-transform-unicode-escapes": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.5.tgz",
- "integrity": "sha512-biEmVg1IYB/raUO5wT1tgfacCef15Fbzhkx493D3urBI++6hpJ+RFG4SrWMn0NEZLfvilqKf3QDrRVZHo08FYg==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.25.9.tgz",
+ "integrity": "sha512-s5EDrE6bW97LtxOcGj1Khcx5AaXwiMmi4toFWRDP9/y0Woo6pXC+iyPu/KuhKtfSrNFd7jJB+/fkOtZy6aIC6Q==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.22.5"
+ "@babel/helper-plugin-utils": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
@@ -1848,12 +1664,12 @@
}
},
"node_modules/@babel/plugin-transform-unicode-property-regex": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.22.5.tgz",
- "integrity": "sha512-HCCIb+CbJIAE6sXn5CjFQXMwkCClcOfPCzTlilJ8cUatfzwHlWQkbtV0zD338u9dZskwvuOYTuuaMaA8J5EI5A==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.25.9.tgz",
+ "integrity": "sha512-Jt2d8Ga+QwRluxRQ307Vlxa6dMrYEMZCgGxoPR8V52rxPyldHu3hdlHspxaqYmE7oID5+kB+UKUB/eWS+DkkWg==",
"dependencies": {
- "@babel/helper-create-regexp-features-plugin": "^7.22.5",
- "@babel/helper-plugin-utils": "^7.22.5"
+ "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+ "@babel/helper-plugin-utils": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
@@ -1863,12 +1679,12 @@
}
},
"node_modules/@babel/plugin-transform-unicode-regex": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.22.5.tgz",
- "integrity": "sha512-028laaOKptN5vHJf9/Arr/HiJekMd41hOEZYvNsrsXqJ7YPYuX2bQxh31fkZzGmq3YqHRJzYFFAVYvKfMPKqyg==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.25.9.tgz",
+ "integrity": "sha512-yoxstj7Rg9dlNn9UQxzk4fcNivwv4nUYz7fYXBaKxvw/lnmPuOm/ikoELygbYq68Bls3D/D+NBPHiLwZdZZ4HA==",
"dependencies": {
- "@babel/helper-create-regexp-features-plugin": "^7.22.5",
- "@babel/helper-plugin-utils": "^7.22.5"
+ "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+ "@babel/helper-plugin-utils": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
@@ -1878,12 +1694,12 @@
}
},
"node_modules/@babel/plugin-transform-unicode-sets-regex": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.22.5.tgz",
- "integrity": "sha512-lhMfi4FC15j13eKrh3DnYHjpGj6UKQHtNKTbtc1igvAhRy4+kLhV07OpLcsN0VgDEw/MjAvJO4BdMJsHwMhzCg==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.25.9.tgz",
+ "integrity": "sha512-8BYqO3GeVNHtx69fdPshN3fnzUNLrWdHhk/icSwigksJGczKSizZ+Z6SBCxTs723Fr5VSNorTIK7a+R2tISvwQ==",
"dependencies": {
- "@babel/helper-create-regexp-features-plugin": "^7.22.5",
- "@babel/helper-plugin-utils": "^7.22.5"
+ "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+ "@babel/helper-plugin-utils": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
@@ -1893,90 +1709,79 @@
}
},
"node_modules/@babel/preset-env": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.5.tgz",
- "integrity": "sha512-fj06hw89dpiZzGZtxn+QybifF07nNiZjZ7sazs2aVDcysAZVGjW7+7iFYxg6GLNM47R/thYfLdrXc+2f11Vi9A==",
+ "version": "7.26.7",
+ "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.26.7.tgz",
+ "integrity": "sha512-Ycg2tnXwixaXOVb29rana8HNPgLVBof8qqtNQ9LE22IoyZboQbGSxI6ZySMdW3K5nAe6gu35IaJefUJflhUFTQ==",
"dependencies": {
- "@babel/compat-data": "^7.22.5",
- "@babel/helper-compilation-targets": "^7.22.5",
- "@babel/helper-plugin-utils": "^7.22.5",
- "@babel/helper-validator-option": "^7.22.5",
- "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.22.5",
- "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.22.5",
+ "@babel/compat-data": "^7.26.5",
+ "@babel/helper-compilation-targets": "^7.26.5",
+ "@babel/helper-plugin-utils": "^7.26.5",
+ "@babel/helper-validator-option": "^7.25.9",
+ "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.25.9",
+ "@babel/plugin-bugfix-safari-class-field-initializer-scope": "^7.25.9",
+ "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.25.9",
+ "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.25.9",
+ "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.25.9",
"@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
- "@babel/plugin-syntax-async-generators": "^7.8.4",
- "@babel/plugin-syntax-class-properties": "^7.12.13",
- "@babel/plugin-syntax-class-static-block": "^7.14.5",
- "@babel/plugin-syntax-dynamic-import": "^7.8.3",
- "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
- "@babel/plugin-syntax-import-assertions": "^7.22.5",
- "@babel/plugin-syntax-import-attributes": "^7.22.5",
- "@babel/plugin-syntax-import-meta": "^7.10.4",
- "@babel/plugin-syntax-json-strings": "^7.8.3",
- "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
- "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
- "@babel/plugin-syntax-numeric-separator": "^7.10.4",
- "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
- "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
- "@babel/plugin-syntax-optional-chaining": "^7.8.3",
- "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
- "@babel/plugin-syntax-top-level-await": "^7.14.5",
+ "@babel/plugin-syntax-import-assertions": "^7.26.0",
+ "@babel/plugin-syntax-import-attributes": "^7.26.0",
"@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
- "@babel/plugin-transform-arrow-functions": "^7.22.5",
- "@babel/plugin-transform-async-generator-functions": "^7.22.5",
- "@babel/plugin-transform-async-to-generator": "^7.22.5",
- "@babel/plugin-transform-block-scoped-functions": "^7.22.5",
- "@babel/plugin-transform-block-scoping": "^7.22.5",
- "@babel/plugin-transform-class-properties": "^7.22.5",
- "@babel/plugin-transform-class-static-block": "^7.22.5",
- "@babel/plugin-transform-classes": "^7.22.5",
- "@babel/plugin-transform-computed-properties": "^7.22.5",
- "@babel/plugin-transform-destructuring": "^7.22.5",
- "@babel/plugin-transform-dotall-regex": "^7.22.5",
- "@babel/plugin-transform-duplicate-keys": "^7.22.5",
- "@babel/plugin-transform-dynamic-import": "^7.22.5",
- "@babel/plugin-transform-exponentiation-operator": "^7.22.5",
- "@babel/plugin-transform-export-namespace-from": "^7.22.5",
- "@babel/plugin-transform-for-of": "^7.22.5",
- "@babel/plugin-transform-function-name": "^7.22.5",
- "@babel/plugin-transform-json-strings": "^7.22.5",
- "@babel/plugin-transform-literals": "^7.22.5",
- "@babel/plugin-transform-logical-assignment-operators": "^7.22.5",
- "@babel/plugin-transform-member-expression-literals": "^7.22.5",
- "@babel/plugin-transform-modules-amd": "^7.22.5",
- "@babel/plugin-transform-modules-commonjs": "^7.22.5",
- "@babel/plugin-transform-modules-systemjs": "^7.22.5",
- "@babel/plugin-transform-modules-umd": "^7.22.5",
- "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5",
- "@babel/plugin-transform-new-target": "^7.22.5",
- "@babel/plugin-transform-nullish-coalescing-operator": "^7.22.5",
- "@babel/plugin-transform-numeric-separator": "^7.22.5",
- "@babel/plugin-transform-object-rest-spread": "^7.22.5",
- "@babel/plugin-transform-object-super": "^7.22.5",
- "@babel/plugin-transform-optional-catch-binding": "^7.22.5",
- "@babel/plugin-transform-optional-chaining": "^7.22.5",
- "@babel/plugin-transform-parameters": "^7.22.5",
- "@babel/plugin-transform-private-methods": "^7.22.5",
- "@babel/plugin-transform-private-property-in-object": "^7.22.5",
- "@babel/plugin-transform-property-literals": "^7.22.5",
- "@babel/plugin-transform-regenerator": "^7.22.5",
- "@babel/plugin-transform-reserved-words": "^7.22.5",
- "@babel/plugin-transform-shorthand-properties": "^7.22.5",
- "@babel/plugin-transform-spread": "^7.22.5",
- "@babel/plugin-transform-sticky-regex": "^7.22.5",
- "@babel/plugin-transform-template-literals": "^7.22.5",
- "@babel/plugin-transform-typeof-symbol": "^7.22.5",
- "@babel/plugin-transform-unicode-escapes": "^7.22.5",
- "@babel/plugin-transform-unicode-property-regex": "^7.22.5",
- "@babel/plugin-transform-unicode-regex": "^7.22.5",
- "@babel/plugin-transform-unicode-sets-regex": "^7.22.5",
- "@babel/preset-modules": "^0.1.5",
- "@babel/types": "^7.22.5",
- "babel-plugin-polyfill-corejs2": "^0.4.3",
- "babel-plugin-polyfill-corejs3": "^0.8.1",
- "babel-plugin-polyfill-regenerator": "^0.5.0",
- "core-js-compat": "^3.30.2",
- "semver": "^6.3.0"
+ "@babel/plugin-transform-arrow-functions": "^7.25.9",
+ "@babel/plugin-transform-async-generator-functions": "^7.25.9",
+ "@babel/plugin-transform-async-to-generator": "^7.25.9",
+ "@babel/plugin-transform-block-scoped-functions": "^7.26.5",
+ "@babel/plugin-transform-block-scoping": "^7.25.9",
+ "@babel/plugin-transform-class-properties": "^7.25.9",
+ "@babel/plugin-transform-class-static-block": "^7.26.0",
+ "@babel/plugin-transform-classes": "^7.25.9",
+ "@babel/plugin-transform-computed-properties": "^7.25.9",
+ "@babel/plugin-transform-destructuring": "^7.25.9",
+ "@babel/plugin-transform-dotall-regex": "^7.25.9",
+ "@babel/plugin-transform-duplicate-keys": "^7.25.9",
+ "@babel/plugin-transform-duplicate-named-capturing-groups-regex": "^7.25.9",
+ "@babel/plugin-transform-dynamic-import": "^7.25.9",
+ "@babel/plugin-transform-exponentiation-operator": "^7.26.3",
+ "@babel/plugin-transform-export-namespace-from": "^7.25.9",
+ "@babel/plugin-transform-for-of": "^7.25.9",
+ "@babel/plugin-transform-function-name": "^7.25.9",
+ "@babel/plugin-transform-json-strings": "^7.25.9",
+ "@babel/plugin-transform-literals": "^7.25.9",
+ "@babel/plugin-transform-logical-assignment-operators": "^7.25.9",
+ "@babel/plugin-transform-member-expression-literals": "^7.25.9",
+ "@babel/plugin-transform-modules-amd": "^7.25.9",
+ "@babel/plugin-transform-modules-commonjs": "^7.26.3",
+ "@babel/plugin-transform-modules-systemjs": "^7.25.9",
+ "@babel/plugin-transform-modules-umd": "^7.25.9",
+ "@babel/plugin-transform-named-capturing-groups-regex": "^7.25.9",
+ "@babel/plugin-transform-new-target": "^7.25.9",
+ "@babel/plugin-transform-nullish-coalescing-operator": "^7.26.6",
+ "@babel/plugin-transform-numeric-separator": "^7.25.9",
+ "@babel/plugin-transform-object-rest-spread": "^7.25.9",
+ "@babel/plugin-transform-object-super": "^7.25.9",
+ "@babel/plugin-transform-optional-catch-binding": "^7.25.9",
+ "@babel/plugin-transform-optional-chaining": "^7.25.9",
+ "@babel/plugin-transform-parameters": "^7.25.9",
+ "@babel/plugin-transform-private-methods": "^7.25.9",
+ "@babel/plugin-transform-private-property-in-object": "^7.25.9",
+ "@babel/plugin-transform-property-literals": "^7.25.9",
+ "@babel/plugin-transform-regenerator": "^7.25.9",
+ "@babel/plugin-transform-regexp-modifiers": "^7.26.0",
+ "@babel/plugin-transform-reserved-words": "^7.25.9",
+ "@babel/plugin-transform-shorthand-properties": "^7.25.9",
+ "@babel/plugin-transform-spread": "^7.25.9",
+ "@babel/plugin-transform-sticky-regex": "^7.25.9",
+ "@babel/plugin-transform-template-literals": "^7.25.9",
+ "@babel/plugin-transform-typeof-symbol": "^7.26.7",
+ "@babel/plugin-transform-unicode-escapes": "^7.25.9",
+ "@babel/plugin-transform-unicode-property-regex": "^7.25.9",
+ "@babel/plugin-transform-unicode-regex": "^7.25.9",
+ "@babel/plugin-transform-unicode-sets-regex": "^7.25.9",
+ "@babel/preset-modules": "0.1.6-no-external-plugins",
+ "babel-plugin-polyfill-corejs2": "^0.4.10",
+ "babel-plugin-polyfill-corejs3": "^0.10.6",
+ "babel-plugin-polyfill-regenerator": "^0.6.1",
+ "core-js-compat": "^3.38.1",
+ "semver": "^6.3.1"
},
"engines": {
"node": ">=6.9.0"
@@ -1986,31 +1791,29 @@
}
},
"node_modules/@babel/preset-modules": {
- "version": "0.1.5",
- "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz",
- "integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==",
+ "version": "0.1.6-no-external-plugins",
+ "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz",
+ "integrity": "sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==",
"dependencies": {
"@babel/helper-plugin-utils": "^7.0.0",
- "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
- "@babel/plugin-transform-dotall-regex": "^7.4.4",
"@babel/types": "^7.4.4",
"esutils": "^2.0.2"
},
"peerDependencies": {
- "@babel/core": "^7.0.0-0"
+ "@babel/core": "^7.0.0-0 || ^8.0.0-0 <8.0.0"
}
},
"node_modules/@babel/preset-react": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.22.5.tgz",
- "integrity": "sha512-M+Is3WikOpEJHgR385HbuCITPTaPRaNkibTEa9oiofmJvIsrceb4yp9RL9Kb+TE8LznmeyZqpP+Lopwcx59xPQ==",
+ "version": "7.26.3",
+ "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.26.3.tgz",
+ "integrity": "sha512-Nl03d6T9ky516DGK2YMxrTqvnpUW63TnJMOMonj+Zae0JiPC5BC9xPMSL6L8fiSpA5vP88qfygavVQvnLp+6Cw==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.22.5",
- "@babel/helper-validator-option": "^7.22.5",
- "@babel/plugin-transform-react-display-name": "^7.22.5",
- "@babel/plugin-transform-react-jsx": "^7.22.5",
- "@babel/plugin-transform-react-jsx-development": "^7.22.5",
- "@babel/plugin-transform-react-pure-annotations": "^7.22.5"
+ "@babel/helper-plugin-utils": "^7.25.9",
+ "@babel/helper-validator-option": "^7.25.9",
+ "@babel/plugin-transform-react-display-name": "^7.25.9",
+ "@babel/plugin-transform-react-jsx": "^7.25.9",
+ "@babel/plugin-transform-react-jsx-development": "^7.25.9",
+ "@babel/plugin-transform-react-pure-annotations": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
@@ -2020,15 +1823,15 @@
}
},
"node_modules/@babel/preset-typescript": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.22.5.tgz",
- "integrity": "sha512-YbPaal9LxztSGhmndR46FmAbkJ/1fAsw293tSU+I5E5h+cnJ3d4GTwyUgGYmOXJYdGA+uNePle4qbaRzj2NISQ==",
+ "version": "7.26.0",
+ "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.26.0.tgz",
+ "integrity": "sha512-NMk1IGZ5I/oHhoXEElcm+xUnL/szL6xflkFZmoEU9xj1qSJXpiS7rsspYo92B4DRCDvZn2erT5LdsCeXAKNCkg==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.22.5",
- "@babel/helper-validator-option": "^7.22.5",
- "@babel/plugin-syntax-jsx": "^7.22.5",
- "@babel/plugin-transform-modules-commonjs": "^7.22.5",
- "@babel/plugin-transform-typescript": "^7.22.5"
+ "@babel/helper-plugin-utils": "^7.25.9",
+ "@babel/helper-validator-option": "^7.25.9",
+ "@babel/plugin-syntax-jsx": "^7.25.9",
+ "@babel/plugin-transform-modules-commonjs": "^7.25.9",
+ "@babel/plugin-transform-typescript": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
@@ -2037,49 +1840,41 @@
"@babel/core": "^7.0.0-0"
}
},
- "node_modules/@babel/regjsgen": {
- "version": "0.8.0",
- "resolved": "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz",
- "integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA=="
- },
"node_modules/@babel/runtime": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.5.tgz",
- "integrity": "sha512-ecjvYlnAaZ/KVneE/OdKYBYfgXV3Ptu6zQWmgEF7vwKhQnvVS6bjMD2XYgj+SNvQ1GfK/pjgokfPkC/2CO8CuA==",
+ "version": "7.26.7",
+ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.7.tgz",
+ "integrity": "sha512-AOPI3D+a8dXnja+iwsUqGRjr1BbZIe771sXdapOtYI531gSqpi92vXivKcq2asu/DFpdl1ceFAKZyRzK2PCVcQ==",
"dependencies": {
- "regenerator-runtime": "^0.13.11"
+ "regenerator-runtime": "^0.14.0"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/template": {
- "version": "7.22.15",
- "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
- "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.9.tgz",
+ "integrity": "sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==",
"dependencies": {
- "@babel/code-frame": "^7.22.13",
- "@babel/parser": "^7.22.15",
- "@babel/types": "^7.22.15"
+ "@babel/code-frame": "^7.25.9",
+ "@babel/parser": "^7.25.9",
+ "@babel/types": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/traverse": {
- "version": "7.23.2",
- "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz",
- "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==",
+ "version": "7.26.7",
+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.7.tgz",
+ "integrity": "sha512-1x1sgeyRLC3r5fQOM0/xtQKsYjyxmFjaOrLJNtZ81inNjyJHGIolTULPiSc/2qe1/qfpFLisLQYFnnZl7QoedA==",
"dependencies": {
- "@babel/code-frame": "^7.22.13",
- "@babel/generator": "^7.23.0",
- "@babel/helper-environment-visitor": "^7.22.20",
- "@babel/helper-function-name": "^7.23.0",
- "@babel/helper-hoist-variables": "^7.22.5",
- "@babel/helper-split-export-declaration": "^7.22.6",
- "@babel/parser": "^7.23.0",
- "@babel/types": "^7.23.0",
- "debug": "^4.1.0",
+ "@babel/code-frame": "^7.26.2",
+ "@babel/generator": "^7.26.5",
+ "@babel/parser": "^7.26.7",
+ "@babel/template": "^7.25.9",
+ "@babel/types": "^7.26.7",
+ "debug": "^4.3.1",
"globals": "^11.1.0"
},
"engines": {
@@ -2087,13 +1882,12 @@
}
},
"node_modules/@babel/types": {
- "version": "7.23.0",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz",
- "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==",
+ "version": "7.26.7",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.7.tgz",
+ "integrity": "sha512-t8kDRGrKXyp6+tjUh7hw2RLyclsW4TRoRvRHtSyAX9Bb5ldlFh+90YAYY6awRXrlB4G5G2izNeGySpATlFzmOg==",
"dependencies": {
- "@babel/helper-string-parser": "^7.22.5",
- "@babel/helper-validator-identifier": "^7.22.20",
- "to-fast-properties": "^2.0.0"
+ "@babel/helper-string-parser": "^7.25.9",
+ "@babel/helper-validator-identifier": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
@@ -2105,9 +1899,9 @@
"integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw=="
},
"node_modules/@csstools/normalize.css": {
- "version": "12.0.0",
- "resolved": "https://registry.npmjs.org/@csstools/normalize.css/-/normalize.css-12.0.0.tgz",
- "integrity": "sha512-M0qqxAcwCsIVfpFQSlGN5XjXWu8l5JDZN+fPt1LeW5SZexQTgnaEvgXAY+CeygRw0EeppWHi12JxESWiWrB0Sg=="
+ "version": "12.1.1",
+ "resolved": "https://registry.npmjs.org/@csstools/normalize.css/-/normalize.css-12.1.1.tgz",
+ "integrity": "sha512-YAYeJ+Xqh7fUou1d1j9XHl44BmsuThiTr4iNrgCQ3J27IbhXsxXDGZ1cXv8Qvs99d4rBbLiSKy3+WZiet32PcQ=="
},
"node_modules/@csstools/postcss-cascade-layers": {
"version": "1.1.1",
@@ -2375,9 +2169,9 @@
}
},
"node_modules/@emotion/is-prop-valid": {
- "version": "1.2.1",
- "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.2.1.tgz",
- "integrity": "sha512-61Mf7Ufx4aDxx1xlDeOm8aFFigGHE4z+0sKCa+IHCeZKiyP9RLD0Mmx7m8b9/Cf37f7NAvQOOJAbQQGVr5uERw==",
+ "version": "1.2.2",
+ "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.2.2.tgz",
+ "integrity": "sha512-uNsoYd37AFmaCdXlg6EYD1KaPOaRWRByMCYzbKUX4+hhMfrxdVSelShywL4JVaAeM/eHUOSprYBQls+/neX3pw==",
"dependencies": {
"@emotion/memoize": "^0.8.1"
}
@@ -2393,35 +2187,38 @@
"integrity": "sha512-KOEGMu6dmJZtpadb476IsZBclKvILjopjUii3V+7MnXIQCYh8W3NgNcgwo21n9LXZX6EDIKvqfjYxXebDwxKmQ=="
},
"node_modules/@eslint-community/eslint-utils": {
- "version": "4.4.0",
- "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
- "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
+ "version": "4.4.1",
+ "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.1.tgz",
+ "integrity": "sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==",
"dependencies": {
- "eslint-visitor-keys": "^3.3.0"
+ "eslint-visitor-keys": "^3.4.3"
},
"engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
},
+ "funding": {
+ "url": "https://opencollective.com/eslint"
+ },
"peerDependencies": {
"eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
}
},
"node_modules/@eslint-community/regexpp": {
- "version": "4.5.1",
- "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.5.1.tgz",
- "integrity": "sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ==",
+ "version": "4.12.1",
+ "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz",
+ "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==",
"engines": {
"node": "^12.0.0 || ^14.0.0 || >=16.0.0"
}
},
"node_modules/@eslint/eslintrc": {
- "version": "2.0.3",
- "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.3.tgz",
- "integrity": "sha512-+5gy6OQfk+xx3q0d6jGZZC3f3KzAkXc/IanVxd1is/VIIziRqqt3ongQz0FiTUXqTk0c7aDB3OaFuKnuSoJicQ==",
+ "version": "2.1.4",
+ "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
+ "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
"dependencies": {
"ajv": "^6.12.4",
"debug": "^4.3.2",
- "espree": "^9.5.2",
+ "espree": "^9.6.0",
"globals": "^13.19.0",
"ignore": "^5.2.0",
"import-fresh": "^3.2.1",
@@ -2442,9 +2239,9 @@
"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
},
"node_modules/@eslint/eslintrc/node_modules/globals": {
- "version": "13.20.0",
- "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
- "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
+ "version": "13.24.0",
+ "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
+ "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
"dependencies": {
"type-fest": "^0.20.2"
},
@@ -2478,20 +2275,21 @@
}
},
"node_modules/@eslint/js": {
- "version": "8.43.0",
- "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.43.0.tgz",
- "integrity": "sha512-s2UHCoiXfxMvmfzqoN+vrQ84ahUSYde9qNO1MdxmoEhyHWsfmwOpFlwYV+ePJEVc7gFnATGUi376WowX1N7tFg==",
+ "version": "8.57.1",
+ "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz",
+ "integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==",
"engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
}
},
"node_modules/@humanwhocodes/config-array": {
- "version": "0.11.10",
- "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.10.tgz",
- "integrity": "sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==",
+ "version": "0.13.0",
+ "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz",
+ "integrity": "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==",
+ "deprecated": "Use @eslint/config-array instead",
"dependencies": {
- "@humanwhocodes/object-schema": "^1.2.1",
- "debug": "^4.1.1",
+ "@humanwhocodes/object-schema": "^2.0.3",
+ "debug": "^4.3.1",
"minimatch": "^3.0.5"
},
"engines": {
@@ -2511,9 +2309,94 @@
}
},
"node_modules/@humanwhocodes/object-schema": {
- "version": "1.2.1",
- "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
- "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA=="
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz",
+ "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==",
+ "deprecated": "Use @eslint/object-schema instead"
+ },
+ "node_modules/@isaacs/cliui": {
+ "version": "8.0.2",
+ "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
+ "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
+ "dependencies": {
+ "string-width": "^5.1.2",
+ "string-width-cjs": "npm:string-width@^4.2.0",
+ "strip-ansi": "^7.0.1",
+ "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
+ "wrap-ansi": "^8.1.0",
+ "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
+ },
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/@isaacs/cliui/node_modules/ansi-regex": {
+ "version": "6.1.0",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+ "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+ "engines": {
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+ }
+ },
+ "node_modules/@isaacs/cliui/node_modules/ansi-styles": {
+ "version": "6.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+ "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+ "engines": {
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+ }
+ },
+ "node_modules/@isaacs/cliui/node_modules/string-width": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+ "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+ "dependencies": {
+ "eastasianwidth": "^0.2.0",
+ "emoji-regex": "^9.2.2",
+ "strip-ansi": "^7.0.1"
+ },
+ "engines": {
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/@isaacs/cliui/node_modules/strip-ansi": {
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+ "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+ "dependencies": {
+ "ansi-regex": "^6.0.1"
+ },
+ "engines": {
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+ }
+ },
+ "node_modules/@isaacs/cliui/node_modules/wrap-ansi": {
+ "version": "8.1.0",
+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
+ "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
+ "dependencies": {
+ "ansi-styles": "^6.1.0",
+ "string-width": "^5.0.1",
+ "strip-ansi": "^7.0.1"
+ },
+ "engines": {
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+ }
},
"node_modules/@istanbuljs/load-nyc-config": {
"version": "1.1.0",
@@ -2547,63 +2430,69 @@
}
},
"node_modules/@jest/console": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.6.2.tgz",
- "integrity": "sha512-0N0yZof5hi44HAR2pPS+ikJ3nzKNoZdVu8FffRf3wy47I7Dm7etk/3KetMdRUqzVd16V4O2m2ISpNTbnIuqy1w==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.5.1.tgz",
+ "integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==",
"dependencies": {
- "@jest/types": "^29.6.1",
+ "@jest/types": "^27.5.1",
"@types/node": "*",
"chalk": "^4.0.0",
- "jest-message-util": "^29.6.2",
- "jest-util": "^29.6.2",
+ "jest-message-util": "^27.5.1",
+ "jest-util": "^27.5.1",
"slash": "^3.0.0"
},
"engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
"node_modules/@jest/console/node_modules/@jest/types": {
- "version": "29.6.1",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
- "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+ "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
"dependencies": {
- "@jest/schemas": "^29.6.0",
"@types/istanbul-lib-coverage": "^2.0.0",
"@types/istanbul-reports": "^3.0.0",
"@types/node": "*",
- "@types/yargs": "^17.0.8",
+ "@types/yargs": "^16.0.0",
"chalk": "^4.0.0"
},
"engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
"node_modules/@jest/console/node_modules/@types/yargs": {
- "version": "17.0.24",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
- "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "16.0.9",
+ "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz",
+ "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==",
"dependencies": {
"@types/yargs-parser": "*"
}
},
- "node_modules/@jest/console/node_modules/jest-util": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
- "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "node_modules/@jest/console/node_modules/jest-message-util": {
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
+ "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
"dependencies": {
- "@jest/types": "^29.6.1",
+ "@babel/code-frame": "^7.12.13",
+ "@jest/types": "^27.5.1",
+ "@types/stack-utils": "^2.0.0",
+ "chalk": "^4.0.0",
+ "graceful-fs": "^4.2.9",
+ "micromatch": "^4.0.4",
+ "pretty-format": "^27.5.1",
+ "slash": "^3.0.0",
+ "stack-utils": "^2.0.3"
+ },
+ "engines": {
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+ }
+ },
+ "node_modules/@jest/console/node_modules/jest-util": {
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
+ "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
+ "dependencies": {
+ "@jest/types": "^27.5.1",
"@types/node": "*",
"chalk": "^4.0.0",
"ci-info": "^3.2.0",
@@ -2611,48 +2500,45 @@
"picomatch": "^2.2.3"
},
"engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
"node_modules/@jest/core": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.6.2.tgz",
- "integrity": "sha512-Oj+5B+sDMiMWLhPFF+4/DvHOf+U10rgvCLGPHP8Xlsy/7QxS51aU/eBngudHlJXnaWD5EohAgJ4js+T6pa+zOg==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/@jest/core/-/core-27.5.1.tgz",
+ "integrity": "sha512-AK6/UTrvQD0Cd24NSqmIA6rKsu0tKIxfiCducZvqxYdmMisOYAsdItspT+fQDQYARPf8XgjAFZi0ogW2agH5nQ==",
"dependencies": {
- "@jest/console": "^29.6.2",
- "@jest/reporters": "^29.6.2",
- "@jest/test-result": "^29.6.2",
- "@jest/transform": "^29.6.2",
- "@jest/types": "^29.6.1",
+ "@jest/console": "^27.5.1",
+ "@jest/reporters": "^27.5.1",
+ "@jest/test-result": "^27.5.1",
+ "@jest/transform": "^27.5.1",
+ "@jest/types": "^27.5.1",
"@types/node": "*",
"ansi-escapes": "^4.2.1",
"chalk": "^4.0.0",
- "ci-info": "^3.2.0",
+ "emittery": "^0.8.1",
"exit": "^0.1.2",
"graceful-fs": "^4.2.9",
- "jest-changed-files": "^29.5.0",
- "jest-config": "^29.6.2",
- "jest-haste-map": "^29.6.2",
- "jest-message-util": "^29.6.2",
- "jest-regex-util": "^29.4.3",
- "jest-resolve": "^29.6.2",
- "jest-resolve-dependencies": "^29.6.2",
- "jest-runner": "^29.6.2",
- "jest-runtime": "^29.6.2",
- "jest-snapshot": "^29.6.2",
- "jest-util": "^29.6.2",
- "jest-validate": "^29.6.2",
- "jest-watcher": "^29.6.2",
+ "jest-changed-files": "^27.5.1",
+ "jest-config": "^27.5.1",
+ "jest-haste-map": "^27.5.1",
+ "jest-message-util": "^27.5.1",
+ "jest-regex-util": "^27.5.1",
+ "jest-resolve": "^27.5.1",
+ "jest-resolve-dependencies": "^27.5.1",
+ "jest-runner": "^27.5.1",
+ "jest-runtime": "^27.5.1",
+ "jest-snapshot": "^27.5.1",
+ "jest-util": "^27.5.1",
+ "jest-validate": "^27.5.1",
+ "jest-watcher": "^27.5.1",
"micromatch": "^4.0.4",
- "pretty-format": "^29.6.2",
+ "rimraf": "^3.0.0",
"slash": "^3.0.0",
"strip-ansi": "^6.0.0"
},
"engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
},
"peerDependencies": {
"node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
@@ -2663,166 +2549,54 @@
}
}
},
- "node_modules/@jest/core/node_modules/@jest/transform": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.6.2.tgz",
- "integrity": "sha512-ZqCqEISr58Ce3U+buNFJYUktLJZOggfyvR+bZMaiV1e8B1SIvJbwZMrYz3gx/KAPn9EXmOmN+uB08yLCjWkQQg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
- "@babel/core": "^7.11.6",
- "@jest/types": "^29.6.1",
- "@jridgewell/trace-mapping": "^0.3.18",
- "babel-plugin-istanbul": "^6.1.1",
- "chalk": "^4.0.0",
- "convert-source-map": "^2.0.0",
- "fast-json-stable-stringify": "^2.1.0",
- "graceful-fs": "^4.2.9",
- "jest-haste-map": "^29.6.2",
- "jest-regex-util": "^29.4.3",
- "jest-util": "^29.6.2",
- "micromatch": "^4.0.4",
- "pirates": "^4.0.4",
- "slash": "^3.0.0",
- "write-file-atomic": "^4.0.2"
- },
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
"node_modules/@jest/core/node_modules/@jest/types": {
- "version": "29.6.1",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
- "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+ "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
"dependencies": {
- "@jest/schemas": "^29.6.0",
"@types/istanbul-lib-coverage": "^2.0.0",
"@types/istanbul-reports": "^3.0.0",
"@types/node": "*",
- "@types/yargs": "^17.0.8",
+ "@types/yargs": "^16.0.0",
"chalk": "^4.0.0"
},
"engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
"node_modules/@jest/core/node_modules/@types/yargs": {
- "version": "17.0.24",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
- "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "16.0.9",
+ "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz",
+ "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==",
"dependencies": {
"@types/yargs-parser": "*"
}
},
- "node_modules/@jest/core/node_modules/ansi-styles": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
- "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
- "dev": true,
- "optional": true,
- "peer": true,
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/chalk/ansi-styles?sponsor=1"
- }
- },
- "node_modules/@jest/core/node_modules/convert-source-map": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
- "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
- "dev": true,
- "optional": true,
- "peer": true
- },
- "node_modules/@jest/core/node_modules/jest-get-type": {
- "version": "29.4.3",
- "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
- "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
- "node_modules/@jest/core/node_modules/jest-haste-map": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.6.2.tgz",
- "integrity": "sha512-+51XleTDAAysvU8rT6AnS1ZJ+WHVNqhj1k6nTvN2PYP+HjU3kqlaKQ1Lnw3NYW3bm2r8vq82X0Z1nDDHZMzHVA==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "node_modules/@jest/core/node_modules/jest-message-util": {
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
+ "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
"dependencies": {
- "@jest/types": "^29.6.1",
- "@types/graceful-fs": "^4.1.3",
- "@types/node": "*",
- "anymatch": "^3.0.3",
- "fb-watchman": "^2.0.0",
- "graceful-fs": "^4.2.9",
- "jest-regex-util": "^29.4.3",
- "jest-util": "^29.6.2",
- "jest-worker": "^29.6.2",
- "micromatch": "^4.0.4",
- "walker": "^1.0.8"
- },
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- },
- "optionalDependencies": {
- "fsevents": "^2.3.2"
- }
- },
- "node_modules/@jest/core/node_modules/jest-regex-util": {
- "version": "29.4.3",
- "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.4.3.tgz",
- "integrity": "sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
- "node_modules/@jest/core/node_modules/jest-resolve": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.6.2.tgz",
- "integrity": "sha512-G/iQUvZWI5e3SMFssc4ug4dH0aZiZpsDq9o1PtXTV1210Ztyb2+w+ZgQkB3iOiC5SmAEzJBOHWz6Hvrd+QnNPw==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
+ "@babel/code-frame": "^7.12.13",
+ "@jest/types": "^27.5.1",
+ "@types/stack-utils": "^2.0.0",
"chalk": "^4.0.0",
"graceful-fs": "^4.2.9",
- "jest-haste-map": "^29.6.2",
- "jest-pnp-resolver": "^1.2.2",
- "jest-util": "^29.6.2",
- "jest-validate": "^29.6.2",
- "resolve": "^1.20.0",
- "resolve.exports": "^2.0.0",
- "slash": "^3.0.0"
+ "micromatch": "^4.0.4",
+ "pretty-format": "^27.5.1",
+ "slash": "^3.0.0",
+ "stack-utils": "^2.0.3"
},
"engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
"node_modules/@jest/core/node_modules/jest-util": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
- "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
+ "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
"dependencies": {
- "@jest/types": "^29.6.1",
+ "@jest/types": "^27.5.1",
"@types/node": "*",
"chalk": "^4.0.0",
"ci-info": "^3.2.0",
@@ -2830,245 +2604,122 @@
"picomatch": "^2.2.3"
},
"engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
- "node_modules/@jest/core/node_modules/jest-validate": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.6.2.tgz",
- "integrity": "sha512-vGz0yMN5fUFRRbpJDPwxMpgSXW1LDKROHfBopAvDcmD6s+B/s8WJrwi+4bfH4SdInBA5C3P3BI19dBtKzx1Arg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
- "@jest/types": "^29.6.1",
- "camelcase": "^6.2.0",
- "chalk": "^4.0.0",
- "jest-get-type": "^29.4.3",
- "leven": "^3.1.0",
- "pretty-format": "^29.6.2"
- },
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
- "node_modules/@jest/core/node_modules/jest-worker": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.2.tgz",
- "integrity": "sha512-l3ccBOabTdkng8I/ORCkADz4eSMKejTYv1vB/Z83UiubqhC1oQ5Li6dWCyqOIvSifGjUBxuvxvlm6KGK2DtuAQ==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
- "@types/node": "*",
- "jest-util": "^29.6.2",
- "merge-stream": "^2.0.0",
- "supports-color": "^8.0.0"
- },
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
- "node_modules/@jest/core/node_modules/pretty-format": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.2.tgz",
- "integrity": "sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
- "@jest/schemas": "^29.6.0",
- "ansi-styles": "^5.0.0",
- "react-is": "^18.0.0"
- },
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
- "node_modules/@jest/core/node_modules/resolve.exports": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz",
- "integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "engines": {
- "node": ">=10"
- }
- },
- "node_modules/@jest/core/node_modules/supports-color": {
- "version": "8.1.1",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
- "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
- "has-flag": "^4.0.0"
- },
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/chalk/supports-color?sponsor=1"
- }
- },
- "node_modules/@jest/core/node_modules/write-file-atomic": {
- "version": "4.0.2",
- "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
- "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
- "imurmurhash": "^0.1.4",
- "signal-exit": "^3.0.7"
- },
- "engines": {
- "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
"node_modules/@jest/environment": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.6.2.tgz",
- "integrity": "sha512-AEcW43C7huGd/vogTddNNTDRpO6vQ2zaQNrttvWV18ArBx9Z56h7BIsXkNFJVOO4/kblWEQz30ckw0+L3izc+Q==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.5.1.tgz",
+ "integrity": "sha512-/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA==",
"dependencies": {
- "@jest/fake-timers": "^29.6.2",
- "@jest/types": "^29.6.1",
+ "@jest/fake-timers": "^27.5.1",
+ "@jest/types": "^27.5.1",
"@types/node": "*",
- "jest-mock": "^29.6.2"
+ "jest-mock": "^27.5.1"
},
"engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
"node_modules/@jest/environment/node_modules/@jest/types": {
- "version": "29.6.1",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
- "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+ "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
"dependencies": {
- "@jest/schemas": "^29.6.0",
"@types/istanbul-lib-coverage": "^2.0.0",
"@types/istanbul-reports": "^3.0.0",
"@types/node": "*",
- "@types/yargs": "^17.0.8",
+ "@types/yargs": "^16.0.0",
"chalk": "^4.0.0"
},
"engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
"node_modules/@jest/environment/node_modules/@types/yargs": {
- "version": "17.0.24",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
- "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "16.0.9",
+ "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz",
+ "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==",
"dependencies": {
"@types/yargs-parser": "*"
}
},
- "node_modules/@jest/expect": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.6.2.tgz",
- "integrity": "sha512-m6DrEJxVKjkELTVAztTLyS/7C92Y2b0VYqmDROYKLLALHn8T/04yPs70NADUYPrV3ruI+H3J0iUIuhkjp7vkfg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
- "expect": "^29.6.2",
- "jest-snapshot": "^29.6.2"
- },
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
"node_modules/@jest/expect-utils": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.6.2.tgz",
- "integrity": "sha512-6zIhM8go3RV2IG4aIZaZbxwpOzz3ZiM23oxAlkquOIole+G6TrbeXnykxWYlqF7kz2HlBjdKtca20x9atkEQYg==",
+ "version": "29.7.0",
+ "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz",
+ "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==",
"dev": true,
"dependencies": {
- "jest-get-type": "^29.4.3"
+ "jest-get-type": "^29.6.3"
},
"engines": {
"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
}
},
- "node_modules/@jest/expect-utils/node_modules/jest-get-type": {
- "version": "29.4.3",
- "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
- "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==",
- "dev": true,
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
"node_modules/@jest/fake-timers": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.6.2.tgz",
- "integrity": "sha512-euZDmIlWjm1Z0lJ1D0f7a0/y5Kh/koLFMUBE5SUYWrmy8oNhJpbTBDAP6CxKnadcMLDoDf4waRYCe35cH6G6PA==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.5.1.tgz",
+ "integrity": "sha512-/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ==",
"dependencies": {
- "@jest/types": "^29.6.1",
- "@sinonjs/fake-timers": "^10.0.2",
+ "@jest/types": "^27.5.1",
+ "@sinonjs/fake-timers": "^8.0.1",
"@types/node": "*",
- "jest-message-util": "^29.6.2",
- "jest-mock": "^29.6.2",
- "jest-util": "^29.6.2"
+ "jest-message-util": "^27.5.1",
+ "jest-mock": "^27.5.1",
+ "jest-util": "^27.5.1"
},
"engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
"node_modules/@jest/fake-timers/node_modules/@jest/types": {
- "version": "29.6.1",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
- "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+ "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
"dependencies": {
- "@jest/schemas": "^29.6.0",
"@types/istanbul-lib-coverage": "^2.0.0",
"@types/istanbul-reports": "^3.0.0",
"@types/node": "*",
- "@types/yargs": "^17.0.8",
+ "@types/yargs": "^16.0.0",
"chalk": "^4.0.0"
},
"engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
"node_modules/@jest/fake-timers/node_modules/@types/yargs": {
- "version": "17.0.24",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
- "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "16.0.9",
+ "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz",
+ "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==",
"dependencies": {
"@types/yargs-parser": "*"
}
},
- "node_modules/@jest/fake-timers/node_modules/jest-util": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
- "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "node_modules/@jest/fake-timers/node_modules/jest-message-util": {
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
+ "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
"dependencies": {
- "@jest/types": "^29.6.1",
+ "@babel/code-frame": "^7.12.13",
+ "@jest/types": "^27.5.1",
+ "@types/stack-utils": "^2.0.0",
+ "chalk": "^4.0.0",
+ "graceful-fs": "^4.2.9",
+ "micromatch": "^4.0.4",
+ "pretty-format": "^27.5.1",
+ "slash": "^3.0.0",
+ "stack-utils": "^2.0.3"
+ },
+ "engines": {
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+ }
+ },
+ "node_modules/@jest/fake-timers/node_modules/jest-util": {
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
+ "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
+ "dependencies": {
+ "@jest/types": "^27.5.1",
"@types/node": "*",
"chalk": "^4.0.0",
"ci-info": "^3.2.0",
@@ -3076,91 +2727,155 @@
"picomatch": "^2.2.3"
},
"engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
"node_modules/@jest/globals": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.6.2.tgz",
- "integrity": "sha512-cjuJmNDjs6aMijCmSa1g2TNG4Lby/AeU7/02VtpW+SLcZXzOLK2GpN2nLqcFjmhy3B3AoPeQVx7BnyOf681bAw==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-27.5.1.tgz",
+ "integrity": "sha512-ZEJNB41OBQQgGzgyInAv0UUfDDj3upmHydjieSxFvTRuZElrx7tXg/uVQ5hYVEwiXs3+aMsAeEc9X7xiSKCm4Q==",
"dependencies": {
- "@jest/environment": "^29.6.2",
- "@jest/expect": "^29.6.2",
- "@jest/types": "^29.6.1",
- "jest-mock": "^29.6.2"
+ "@jest/environment": "^27.5.1",
+ "@jest/types": "^27.5.1",
+ "expect": "^27.5.1"
},
"engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
"node_modules/@jest/globals/node_modules/@jest/types": {
- "version": "29.6.1",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
- "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+ "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
"dependencies": {
- "@jest/schemas": "^29.6.0",
"@types/istanbul-lib-coverage": "^2.0.0",
"@types/istanbul-reports": "^3.0.0",
"@types/node": "*",
- "@types/yargs": "^17.0.8",
+ "@types/yargs": "^16.0.0",
"chalk": "^4.0.0"
},
"engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
"node_modules/@jest/globals/node_modules/@types/yargs": {
- "version": "17.0.24",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
- "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "16.0.9",
+ "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz",
+ "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==",
"dependencies": {
"@types/yargs-parser": "*"
}
},
+ "node_modules/@jest/globals/node_modules/diff-sequences": {
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.5.1.tgz",
+ "integrity": "sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==",
+ "engines": {
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+ }
+ },
+ "node_modules/@jest/globals/node_modules/expect": {
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/expect/-/expect-27.5.1.tgz",
+ "integrity": "sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==",
+ "dependencies": {
+ "@jest/types": "^27.5.1",
+ "jest-get-type": "^27.5.1",
+ "jest-matcher-utils": "^27.5.1",
+ "jest-message-util": "^27.5.1"
+ },
+ "engines": {
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+ }
+ },
+ "node_modules/@jest/globals/node_modules/jest-diff": {
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.1.tgz",
+ "integrity": "sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==",
+ "dependencies": {
+ "chalk": "^4.0.0",
+ "diff-sequences": "^27.5.1",
+ "jest-get-type": "^27.5.1",
+ "pretty-format": "^27.5.1"
+ },
+ "engines": {
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+ }
+ },
+ "node_modules/@jest/globals/node_modules/jest-get-type": {
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz",
+ "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==",
+ "engines": {
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+ }
+ },
+ "node_modules/@jest/globals/node_modules/jest-matcher-utils": {
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz",
+ "integrity": "sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==",
+ "dependencies": {
+ "chalk": "^4.0.0",
+ "jest-diff": "^27.5.1",
+ "jest-get-type": "^27.5.1",
+ "pretty-format": "^27.5.1"
+ },
+ "engines": {
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+ }
+ },
+ "node_modules/@jest/globals/node_modules/jest-message-util": {
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
+ "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
+ "dependencies": {
+ "@babel/code-frame": "^7.12.13",
+ "@jest/types": "^27.5.1",
+ "@types/stack-utils": "^2.0.0",
+ "chalk": "^4.0.0",
+ "graceful-fs": "^4.2.9",
+ "micromatch": "^4.0.4",
+ "pretty-format": "^27.5.1",
+ "slash": "^3.0.0",
+ "stack-utils": "^2.0.3"
+ },
+ "engines": {
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+ }
+ },
"node_modules/@jest/reporters": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.6.2.tgz",
- "integrity": "sha512-sWtijrvIav8LgfJZlrGCdN0nP2EWbakglJY49J1Y5QihcQLfy7ovyxxjJBRXMNltgt4uPtEcFmIMbVshEDfFWw==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-27.5.1.tgz",
+ "integrity": "sha512-cPXh9hWIlVJMQkVk84aIvXuBB4uQQmFqZiacloFuGiP3ah1sbCxCosidXFDfqG8+6fO1oR2dTJTlsOy4VFmUfw==",
"dependencies": {
"@bcoe/v8-coverage": "^0.2.3",
- "@jest/console": "^29.6.2",
- "@jest/test-result": "^29.6.2",
- "@jest/transform": "^29.6.2",
- "@jest/types": "^29.6.1",
- "@jridgewell/trace-mapping": "^0.3.18",
+ "@jest/console": "^27.5.1",
+ "@jest/test-result": "^27.5.1",
+ "@jest/transform": "^27.5.1",
+ "@jest/types": "^27.5.1",
"@types/node": "*",
"chalk": "^4.0.0",
"collect-v8-coverage": "^1.0.0",
"exit": "^0.1.2",
- "glob": "^7.1.3",
+ "glob": "^7.1.2",
"graceful-fs": "^4.2.9",
"istanbul-lib-coverage": "^3.0.0",
"istanbul-lib-instrument": "^5.1.0",
"istanbul-lib-report": "^3.0.0",
"istanbul-lib-source-maps": "^4.0.0",
"istanbul-reports": "^3.1.3",
- "jest-message-util": "^29.6.2",
- "jest-util": "^29.6.2",
- "jest-worker": "^29.6.2",
+ "jest-haste-map": "^27.5.1",
+ "jest-resolve": "^27.5.1",
+ "jest-util": "^27.5.1",
+ "jest-worker": "^27.5.1",
"slash": "^3.0.0",
+ "source-map": "^0.6.0",
"string-length": "^4.0.1",
- "strip-ansi": "^6.0.0",
- "v8-to-istanbul": "^9.0.1"
+ "terminal-link": "^2.0.0",
+ "v8-to-istanbul": "^8.1.0"
},
"engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
},
"peerDependencies": {
"node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
@@ -3171,119 +2886,35 @@
}
}
},
- "node_modules/@jest/reporters/node_modules/@jest/transform": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.6.2.tgz",
- "integrity": "sha512-ZqCqEISr58Ce3U+buNFJYUktLJZOggfyvR+bZMaiV1e8B1SIvJbwZMrYz3gx/KAPn9EXmOmN+uB08yLCjWkQQg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
- "@babel/core": "^7.11.6",
- "@jest/types": "^29.6.1",
- "@jridgewell/trace-mapping": "^0.3.18",
- "babel-plugin-istanbul": "^6.1.1",
- "chalk": "^4.0.0",
- "convert-source-map": "^2.0.0",
- "fast-json-stable-stringify": "^2.1.0",
- "graceful-fs": "^4.2.9",
- "jest-haste-map": "^29.6.2",
- "jest-regex-util": "^29.4.3",
- "jest-util": "^29.6.2",
- "micromatch": "^4.0.4",
- "pirates": "^4.0.4",
- "slash": "^3.0.0",
- "write-file-atomic": "^4.0.2"
- },
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
"node_modules/@jest/reporters/node_modules/@jest/types": {
- "version": "29.6.1",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
- "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+ "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
"dependencies": {
- "@jest/schemas": "^29.6.0",
"@types/istanbul-lib-coverage": "^2.0.0",
"@types/istanbul-reports": "^3.0.0",
"@types/node": "*",
- "@types/yargs": "^17.0.8",
+ "@types/yargs": "^16.0.0",
"chalk": "^4.0.0"
},
"engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
"node_modules/@jest/reporters/node_modules/@types/yargs": {
- "version": "17.0.24",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
- "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "16.0.9",
+ "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz",
+ "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==",
"dependencies": {
"@types/yargs-parser": "*"
}
},
- "node_modules/@jest/reporters/node_modules/convert-source-map": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
- "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
- "dev": true,
- "optional": true,
- "peer": true
- },
- "node_modules/@jest/reporters/node_modules/jest-haste-map": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.6.2.tgz",
- "integrity": "sha512-+51XleTDAAysvU8rT6AnS1ZJ+WHVNqhj1k6nTvN2PYP+HjU3kqlaKQ1Lnw3NYW3bm2r8vq82X0Z1nDDHZMzHVA==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
- "@jest/types": "^29.6.1",
- "@types/graceful-fs": "^4.1.3",
- "@types/node": "*",
- "anymatch": "^3.0.3",
- "fb-watchman": "^2.0.0",
- "graceful-fs": "^4.2.9",
- "jest-regex-util": "^29.4.3",
- "jest-util": "^29.6.2",
- "jest-worker": "^29.6.2",
- "micromatch": "^4.0.4",
- "walker": "^1.0.8"
- },
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- },
- "optionalDependencies": {
- "fsevents": "^2.3.2"
- }
- },
- "node_modules/@jest/reporters/node_modules/jest-regex-util": {
- "version": "29.4.3",
- "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.4.3.tgz",
- "integrity": "sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
"node_modules/@jest/reporters/node_modules/jest-util": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
- "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
+ "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
"dependencies": {
- "@jest/types": "^29.6.1",
+ "@jest/types": "^27.5.1",
"@types/node": "*",
"chalk": "^4.0.0",
"ci-info": "^3.2.0",
@@ -3291,62 +2922,21 @@
"picomatch": "^2.2.3"
},
"engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
- "node_modules/@jest/reporters/node_modules/jest-worker": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.2.tgz",
- "integrity": "sha512-l3ccBOabTdkng8I/ORCkADz4eSMKejTYv1vB/Z83UiubqhC1oQ5Li6dWCyqOIvSifGjUBxuvxvlm6KGK2DtuAQ==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
- "@types/node": "*",
- "jest-util": "^29.6.2",
- "merge-stream": "^2.0.0",
- "supports-color": "^8.0.0"
- },
+ "node_modules/@jest/reporters/node_modules/source-map": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
"engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
- "node_modules/@jest/reporters/node_modules/supports-color": {
- "version": "8.1.1",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
- "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
- "has-flag": "^4.0.0"
- },
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/chalk/supports-color?sponsor=1"
- }
- },
- "node_modules/@jest/reporters/node_modules/write-file-atomic": {
- "version": "4.0.2",
- "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
- "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
- "imurmurhash": "^0.1.4",
- "signal-exit": "^3.0.7"
- },
- "engines": {
- "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+ "node": ">=0.10.0"
}
},
"node_modules/@jest/schemas": {
- "version": "29.6.0",
- "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.0.tgz",
- "integrity": "sha512-rxLjXyJBTL4LQeJW3aKo0M/+GkCOXsO+8i9Iu7eDb6KwtP65ayoDsitrdPBtujxQ88k4wI2FNYfa6TOGwSn6cQ==",
+ "version": "29.6.3",
+ "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
+ "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",
"dev": true,
"dependencies": {
"@sinclair/typebox": "^0.27.8"
@@ -3356,204 +2946,75 @@
}
},
"node_modules/@jest/source-map": {
- "version": "29.6.0",
- "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.0.tgz",
- "integrity": "sha512-oA+I2SHHQGxDCZpbrsCQSoMLb3Bz547JnM+jUr9qEbuw0vQlWZfpPS7CO9J7XiwKicEz9OFn/IYoLkkiUD7bzA==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-27.5.1.tgz",
+ "integrity": "sha512-y9NIHUYF3PJRlHk98NdC/N1gl88BL08aQQgu4k4ZopQkCw9t9cV8mtl3TV8b/YCB8XaVTFrmUTAJvjsntDireg==",
"dependencies": {
- "@jridgewell/trace-mapping": "^0.3.18",
"callsites": "^3.0.0",
- "graceful-fs": "^4.2.9"
+ "graceful-fs": "^4.2.9",
+ "source-map": "^0.6.0"
},
"engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+ }
+ },
+ "node_modules/@jest/source-map/node_modules/source-map": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+ "engines": {
+ "node": ">=0.10.0"
}
},
"node_modules/@jest/test-result": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.6.2.tgz",
- "integrity": "sha512-3VKFXzcV42EYhMCsJQURptSqnyjqCGbtLuX5Xxb6Pm6gUf1wIRIl+mandIRGJyWKgNKYF9cnstti6Ls5ekduqw==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.5.1.tgz",
+ "integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==",
"dependencies": {
- "@jest/console": "^29.6.2",
- "@jest/types": "^29.6.1",
+ "@jest/console": "^27.5.1",
+ "@jest/types": "^27.5.1",
"@types/istanbul-lib-coverage": "^2.0.0",
"collect-v8-coverage": "^1.0.0"
},
"engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
"node_modules/@jest/test-result/node_modules/@jest/types": {
- "version": "29.6.1",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
- "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+ "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
"dependencies": {
- "@jest/schemas": "^29.6.0",
"@types/istanbul-lib-coverage": "^2.0.0",
"@types/istanbul-reports": "^3.0.0",
"@types/node": "*",
- "@types/yargs": "^17.0.8",
+ "@types/yargs": "^16.0.0",
"chalk": "^4.0.0"
},
"engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
"node_modules/@jest/test-result/node_modules/@types/yargs": {
- "version": "17.0.24",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
- "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "16.0.9",
+ "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz",
+ "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==",
"dependencies": {
"@types/yargs-parser": "*"
}
},
"node_modules/@jest/test-sequencer": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.6.2.tgz",
- "integrity": "sha512-GVYi6PfPwVejO7slw6IDO0qKVum5jtrJ3KoLGbgBWyr2qr4GaxFV6su+ZAjdTX75Sr1DkMFRk09r2ZVa+wtCGw==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.5.1.tgz",
+ "integrity": "sha512-LCheJF7WB2+9JuCS7VB/EmGIdQuhtqjRNI9A43idHv3E4KltCTsPsLxvdaubFHSYwY/fNjMWjl6vNRhDiN7vpQ==",
"dependencies": {
- "@jest/test-result": "^29.6.2",
+ "@jest/test-result": "^27.5.1",
"graceful-fs": "^4.2.9",
- "jest-haste-map": "^29.6.2",
- "slash": "^3.0.0"
+ "jest-haste-map": "^27.5.1",
+ "jest-runtime": "^27.5.1"
},
"engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
- "node_modules/@jest/test-sequencer/node_modules/@jest/types": {
- "version": "29.6.1",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
- "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
- "@jest/schemas": "^29.6.0",
- "@types/istanbul-lib-coverage": "^2.0.0",
- "@types/istanbul-reports": "^3.0.0",
- "@types/node": "*",
- "@types/yargs": "^17.0.8",
- "chalk": "^4.0.0"
- },
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
- "node_modules/@jest/test-sequencer/node_modules/@types/yargs": {
- "version": "17.0.24",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
- "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
- "@types/yargs-parser": "*"
- }
- },
- "node_modules/@jest/test-sequencer/node_modules/jest-haste-map": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.6.2.tgz",
- "integrity": "sha512-+51XleTDAAysvU8rT6AnS1ZJ+WHVNqhj1k6nTvN2PYP+HjU3kqlaKQ1Lnw3NYW3bm2r8vq82X0Z1nDDHZMzHVA==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
- "@jest/types": "^29.6.1",
- "@types/graceful-fs": "^4.1.3",
- "@types/node": "*",
- "anymatch": "^3.0.3",
- "fb-watchman": "^2.0.0",
- "graceful-fs": "^4.2.9",
- "jest-regex-util": "^29.4.3",
- "jest-util": "^29.6.2",
- "jest-worker": "^29.6.2",
- "micromatch": "^4.0.4",
- "walker": "^1.0.8"
- },
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- },
- "optionalDependencies": {
- "fsevents": "^2.3.2"
- }
- },
- "node_modules/@jest/test-sequencer/node_modules/jest-regex-util": {
- "version": "29.4.3",
- "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.4.3.tgz",
- "integrity": "sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
- "node_modules/@jest/test-sequencer/node_modules/jest-util": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
- "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
- "@jest/types": "^29.6.1",
- "@types/node": "*",
- "chalk": "^4.0.0",
- "ci-info": "^3.2.0",
- "graceful-fs": "^4.2.9",
- "picomatch": "^2.2.3"
- },
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
- "node_modules/@jest/test-sequencer/node_modules/jest-worker": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.2.tgz",
- "integrity": "sha512-l3ccBOabTdkng8I/ORCkADz4eSMKejTYv1vB/Z83UiubqhC1oQ5Li6dWCyqOIvSifGjUBxuvxvlm6KGK2DtuAQ==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
- "@types/node": "*",
- "jest-util": "^29.6.2",
- "merge-stream": "^2.0.0",
- "supports-color": "^8.0.0"
- },
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
- "node_modules/@jest/test-sequencer/node_modules/supports-color": {
- "version": "8.1.1",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
- "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
- "has-flag": "^4.0.0"
- },
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/chalk/supports-color?sponsor=1"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
"node_modules/@jest/transform": {
@@ -3581,15 +3042,7 @@
"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
- "node_modules/@jest/transform/node_modules/source-map": {
- "version": "0.6.1",
- "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
- "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
- "engines": {
- "node": ">=0.10.0"
- }
- },
- "node_modules/@jest/types": {
+ "node_modules/@jest/transform/node_modules/@jest/types": {
"version": "27.5.1",
"resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
"integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
@@ -3604,67 +3057,116 @@
"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
- "node_modules/@jridgewell/gen-mapping": {
- "version": "0.3.3",
- "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
- "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
+ "node_modules/@jest/transform/node_modules/@types/yargs": {
+ "version": "16.0.9",
+ "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz",
+ "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==",
"dependencies": {
- "@jridgewell/set-array": "^1.0.1",
+ "@types/yargs-parser": "*"
+ }
+ },
+ "node_modules/@jest/transform/node_modules/convert-source-map": {
+ "version": "1.9.0",
+ "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
+ "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="
+ },
+ "node_modules/@jest/transform/node_modules/jest-util": {
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
+ "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
+ "dependencies": {
+ "@jest/types": "^27.5.1",
+ "@types/node": "*",
+ "chalk": "^4.0.0",
+ "ci-info": "^3.2.0",
+ "graceful-fs": "^4.2.9",
+ "picomatch": "^2.2.3"
+ },
+ "engines": {
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+ }
+ },
+ "node_modules/@jest/transform/node_modules/source-map": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/@jest/types": {
+ "version": "29.6.3",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+ "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
+ "dev": true,
+ "dependencies": {
+ "@jest/schemas": "^29.6.3",
+ "@types/istanbul-lib-coverage": "^2.0.0",
+ "@types/istanbul-reports": "^3.0.0",
+ "@types/node": "*",
+ "@types/yargs": "^17.0.8",
+ "chalk": "^4.0.0"
+ },
+ "engines": {
+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ }
+ },
+ "node_modules/@jridgewell/gen-mapping": {
+ "version": "0.3.8",
+ "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz",
+ "integrity": "sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==",
+ "dependencies": {
+ "@jridgewell/set-array": "^1.2.1",
"@jridgewell/sourcemap-codec": "^1.4.10",
- "@jridgewell/trace-mapping": "^0.3.9"
+ "@jridgewell/trace-mapping": "^0.3.24"
},
"engines": {
"node": ">=6.0.0"
}
},
"node_modules/@jridgewell/resolve-uri": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
- "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==",
+ "version": "3.1.2",
+ "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+ "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
"engines": {
"node": ">=6.0.0"
}
},
"node_modules/@jridgewell/set-array": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
- "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
+ "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
"engines": {
"node": ">=6.0.0"
}
},
"node_modules/@jridgewell/source-map": {
- "version": "0.3.3",
- "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.3.tgz",
- "integrity": "sha512-b+fsZXeLYi9fEULmfBrhxn4IrPlINf8fiNarzTof004v3lFdntdwa9PF7vFJqm3mg7s+ScJMxXaE3Acp1irZcg==",
+ "version": "0.3.6",
+ "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz",
+ "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==",
"dependencies": {
- "@jridgewell/gen-mapping": "^0.3.0",
- "@jridgewell/trace-mapping": "^0.3.9"
+ "@jridgewell/gen-mapping": "^0.3.5",
+ "@jridgewell/trace-mapping": "^0.3.25"
}
},
"node_modules/@jridgewell/sourcemap-codec": {
- "version": "1.4.15",
- "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
- "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
+ "version": "1.5.0",
+ "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
+ "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ=="
},
"node_modules/@jridgewell/trace-mapping": {
- "version": "0.3.18",
- "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz",
- "integrity": "sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==",
+ "version": "0.3.25",
+ "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+ "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
"dependencies": {
- "@jridgewell/resolve-uri": "3.1.0",
- "@jridgewell/sourcemap-codec": "1.4.14"
+ "@jridgewell/resolve-uri": "^3.1.0",
+ "@jridgewell/sourcemap-codec": "^1.4.14"
}
},
- "node_modules/@jridgewell/trace-mapping/node_modules/@jridgewell/sourcemap-codec": {
- "version": "1.4.14",
- "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
- "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="
- },
"node_modules/@leichtgewicht/ip-codec": {
- "version": "2.0.4",
- "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz",
- "integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A=="
+ "version": "2.0.5",
+ "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.5.tgz",
+ "integrity": "sha512-Vo+PSpZG2/fmgmiNzYK9qWRh8h/CHrwD0mo1h1DzL4yzHNSfWYujGTYsWGreD000gcgmZ7K4Ys6Tx9TxtsKdDw=="
},
"node_modules/@nicolo-ribaudo/eslint-scope-5-internals": {
"version": "5.1.1-v1",
@@ -3726,19 +3228,26 @@
"node": ">= 8"
}
},
+ "node_modules/@pkgjs/parseargs": {
+ "version": "0.11.0",
+ "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
+ "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
+ "optional": true,
+ "engines": {
+ "node": ">=14"
+ }
+ },
"node_modules/@pmmmwh/react-refresh-webpack-plugin": {
- "version": "0.5.10",
- "resolved": "https://registry.npmjs.org/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.10.tgz",
- "integrity": "sha512-j0Ya0hCFZPd4x40qLzbhGsh9TMtdb+CJQiso+WxLOPNasohq9cc5SNUcwsZaRH6++Xh91Xkm/xHCkuIiIu0LUA==",
+ "version": "0.5.15",
+ "resolved": "https://registry.npmjs.org/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.15.tgz",
+ "integrity": "sha512-LFWllMA55pzB9D34w/wXUCf8+c+IYKuJDgxiZ3qMhl64KRMBHYM1I3VdGaD2BV5FNPV2/S2596bppxHbv2ZydQ==",
"dependencies": {
- "ansi-html-community": "^0.0.8",
- "common-path-prefix": "^3.0.0",
+ "ansi-html": "^0.0.9",
"core-js-pure": "^3.23.3",
"error-stack-parser": "^2.0.6",
- "find-up": "^5.0.0",
"html-entities": "^2.1.0",
"loader-utils": "^2.0.4",
- "schema-utils": "^3.0.0",
+ "schema-utils": "^4.2.0",
"source-map": "^0.7.3"
},
"engines": {
@@ -3748,9 +3257,9 @@
"@types/webpack": "4.x || 5.x",
"react-refresh": ">=0.10.0 <1.0.0",
"sockjs-client": "^1.4.0",
- "type-fest": ">=0.17.0 <4.0.0",
+ "type-fest": ">=0.17.0 <5.0.0",
"webpack": ">=4.43.0 <6.0.0",
- "webpack-dev-server": "3.x || 4.x",
+ "webpack-dev-server": "3.x || 4.x || 5.x",
"webpack-hot-middleware": "2.x",
"webpack-plugin-serve": "0.x || 1.x"
},
@@ -3775,63 +3284,6 @@
}
}
},
- "node_modules/@pmmmwh/react-refresh-webpack-plugin/node_modules/find-up": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
- "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
- "dependencies": {
- "locate-path": "^6.0.0",
- "path-exists": "^4.0.0"
- },
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/@pmmmwh/react-refresh-webpack-plugin/node_modules/locate-path": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
- "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
- "dependencies": {
- "p-locate": "^5.0.0"
- },
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/@pmmmwh/react-refresh-webpack-plugin/node_modules/p-limit": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
- "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
- "dependencies": {
- "yocto-queue": "^0.1.0"
- },
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/@pmmmwh/react-refresh-webpack-plugin/node_modules/p-locate": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
- "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
- "dependencies": {
- "p-limit": "^3.0.2"
- },
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
"node_modules/@rollup/plugin-babel": {
"version": "5.3.1",
"resolved": "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz",
@@ -3917,10 +3369,15 @@
"resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz",
"integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw=="
},
+ "node_modules/@rtsao/scc": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@rtsao/scc/-/scc-1.1.0.tgz",
+ "integrity": "sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g=="
+ },
"node_modules/@rushstack/eslint-patch": {
- "version": "1.3.2",
- "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.3.2.tgz",
- "integrity": "sha512-V+MvGwaHH03hYhY+k6Ef/xKd6RYlc4q8WBx+2ANmipHJcKuktNcI/NgEsJgdSUF6Lw32njT6OnrRsKYCdgHjYw=="
+ "version": "1.10.5",
+ "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.10.5.tgz",
+ "integrity": "sha512-kkKUDVlII2DQiKy7UstOR1ErJP8kUKAQ4oa+SQtM0K+lPdmmjj0YnnxBgtTVYH7mUKtbsxeFC9y0AmK7Yb78/A=="
},
"node_modules/@sinclair/typebox": {
"version": "0.27.8",
@@ -3929,25 +3386,19 @@
"dev": true
},
"node_modules/@sinonjs/commons": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.0.tgz",
- "integrity": "sha512-jXBtWAF4vmdNmZgD5FoKsVLv3rPgDnLgPbU84LIJ3otV44vJlDRokVng5v8NFJdCf/da9legHcKaRuZs4L7faA==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "1.8.6",
+ "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz",
+ "integrity": "sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==",
"dependencies": {
"type-detect": "4.0.8"
}
},
"node_modules/@sinonjs/fake-timers": {
- "version": "10.3.0",
- "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz",
- "integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "8.1.0",
+ "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz",
+ "integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==",
"dependencies": {
- "@sinonjs/commons": "^3.0.0"
+ "@sinonjs/commons": "^1.7.0"
}
},
"node_modules/@surma/rollup-plugin-off-main-thread": {
@@ -4169,64 +3620,43 @@
}
},
"node_modules/@testing-library/dom": {
- "version": "9.3.1",
- "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-9.3.1.tgz",
- "integrity": "sha512-0DGPd9AR3+iDTjGoMpxIkAsUihHZ3Ai6CneU6bRRrffXMgzCdlNk43jTrD2/5LT6CBb3MWTP8v510JzYtahD2w==",
+ "version": "10.4.0",
+ "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.0.tgz",
+ "integrity": "sha512-pemlzrSESWbdAloYml3bAJMEfNh1Z7EduzqPKprCH5S341frlpYnUEW0H72dLxa6IsYr+mPno20GiSm+h9dEdQ==",
"dev": true,
"peer": true,
"dependencies": {
"@babel/code-frame": "^7.10.4",
"@babel/runtime": "^7.12.5",
"@types/aria-query": "^5.0.1",
- "aria-query": "5.1.3",
+ "aria-query": "5.3.0",
"chalk": "^4.1.0",
"dom-accessibility-api": "^0.5.9",
"lz-string": "^1.5.0",
"pretty-format": "^27.0.2"
},
"engines": {
- "node": ">=14"
+ "node": ">=18"
}
},
"node_modules/@testing-library/jest-dom": {
- "version": "6.1.0",
- "resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-6.1.0.tgz",
- "integrity": "sha512-EUAg9pvOkzmGXUSyAPt0h6yAXHxsn+FMNS1o7OX8TErmldZML2ywt10lotZXx/a1PDiSnq0fGGyEV/ybKSLPWQ==",
+ "version": "6.6.3",
+ "resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-6.6.3.tgz",
+ "integrity": "sha512-IteBhl4XqYNkM54f4ejhLRJiZNqcSCoXUOG2CPK7qbD322KjQozM4kHQOfkG2oln9b9HTYqs+Sae8vBATubxxA==",
"dev": true,
"dependencies": {
- "@adobe/css-tools": "^4.0.1",
- "@babel/runtime": "^7.9.2",
+ "@adobe/css-tools": "^4.4.0",
"aria-query": "^5.0.0",
"chalk": "^3.0.0",
"css.escape": "^1.5.1",
- "dom-accessibility-api": "^0.5.6",
- "lodash": "^4.17.15",
+ "dom-accessibility-api": "^0.6.3",
+ "lodash": "^4.17.21",
"redent": "^3.0.0"
},
"engines": {
"node": ">=14",
"npm": ">=6",
"yarn": ">=1"
- },
- "peerDependencies": {
- "@jest/globals": ">= 28",
- "@types/jest": ">= 28",
- "jest": ">= 28",
- "vitest": ">= 0.32"
- },
- "peerDependenciesMeta": {
- "@jest/globals": {
- "optional": true
- },
- "@types/jest": {
- "optional": true
- },
- "jest": {
- "optional": true
- },
- "vitest": {
- "optional": true
- }
}
},
"node_modules/@testing-library/jest-dom/node_modules/chalk": {
@@ -4242,6 +3672,12 @@
"node": ">=8"
}
},
+ "node_modules/@testing-library/jest-dom/node_modules/dom-accessibility-api": {
+ "version": "0.6.3",
+ "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.6.3.tgz",
+ "integrity": "sha512-7ZgogeTnjuHbo+ct10G9Ffp0mif17idi0IyWNVA/wcwcm7NPOD/WEHVP3n7n3MhXqxoIYm8d6MuZohYWIZ4T3w==",
+ "dev": true
+ },
"node_modules/@testing-library/react": {
"version": "12.1.5",
"resolved": "https://registry.npmjs.org/@testing-library/react/-/react-12.1.5.tgz",
@@ -4279,10 +3715,19 @@
"node": ">=12"
}
},
+ "node_modules/@testing-library/react/node_modules/aria-query": {
+ "version": "5.1.3",
+ "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.1.3.tgz",
+ "integrity": "sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==",
+ "dev": true,
+ "dependencies": {
+ "deep-equal": "^2.0.5"
+ }
+ },
"node_modules/@testing-library/user-event": {
- "version": "14.5.1",
- "resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-14.5.1.tgz",
- "integrity": "sha512-UCcUKrUYGj7ClomOo2SpNVvx4/fkd/2BbIHDCle8A0ax+P3bU7yJwDBDrS6ZwdTMARWTGODX1hEsCcO+7beJjg==",
+ "version": "14.6.1",
+ "resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-14.6.1.tgz",
+ "integrity": "sha512-vq7fv0rnt+QTXgPxr5Hjc210p6YKq2kmdziLgnsZGgLJ9e6VAShx1pACLuRjd/AS/sr7phAR58OIIpf0LlmQNw==",
"dev": true,
"engines": {
"node": ">=12",
@@ -4309,15 +3754,15 @@
}
},
"node_modules/@types/aria-query": {
- "version": "5.0.1",
- "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.1.tgz",
- "integrity": "sha512-XTIieEY+gvJ39ChLcB4If5zHtPxt3Syj5rgZR+e1ctpmK8NjPf0zFqsz4JpLJT0xla9GFDKjy8Cpu331nrmE1Q==",
+ "version": "5.0.4",
+ "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.4.tgz",
+ "integrity": "sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw==",
"dev": true
},
"node_modules/@types/babel__core": {
- "version": "7.20.1",
- "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.1.tgz",
- "integrity": "sha512-aACu/U/omhdk15O4Nfb+fHgH/z3QsfQzpnvRZhYhThms83ZnAOZz7zZAWO7mn2yyNQaA4xTO8GLK3uqFU4bYYw==",
+ "version": "7.20.5",
+ "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
+ "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==",
"dependencies": {
"@babel/parser": "^7.20.7",
"@babel/types": "^7.20.7",
@@ -4327,91 +3772,91 @@
}
},
"node_modules/@types/babel__generator": {
- "version": "7.6.4",
- "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.4.tgz",
- "integrity": "sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==",
+ "version": "7.6.8",
+ "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz",
+ "integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==",
"dependencies": {
"@babel/types": "^7.0.0"
}
},
"node_modules/@types/babel__template": {
- "version": "7.4.1",
- "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz",
- "integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==",
+ "version": "7.4.4",
+ "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz",
+ "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==",
"dependencies": {
"@babel/parser": "^7.1.0",
"@babel/types": "^7.0.0"
}
},
"node_modules/@types/babel__traverse": {
- "version": "7.20.1",
- "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.1.tgz",
- "integrity": "sha512-MitHFXnhtgwsGZWtT68URpOvLN4EREih1u3QtQiN4VdAxWKRVvGCSvw/Qth0M0Qq3pJpnGOu5JaM/ydK7OGbqg==",
+ "version": "7.20.6",
+ "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.6.tgz",
+ "integrity": "sha512-r1bzfrm0tomOI8g1SzvCaQHo6Lcv6zu0EA+W2kHrt8dyrHQxGzBBL4kdkzIS+jBMV+EYcMAEAqXqYaLJq5rOZg==",
"dependencies": {
"@babel/types": "^7.20.7"
}
},
"node_modules/@types/body-parser": {
- "version": "1.19.2",
- "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz",
- "integrity": "sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==",
+ "version": "1.19.5",
+ "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz",
+ "integrity": "sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==",
"dependencies": {
"@types/connect": "*",
"@types/node": "*"
}
},
"node_modules/@types/bonjour": {
- "version": "3.5.10",
- "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.10.tgz",
- "integrity": "sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw==",
+ "version": "3.5.13",
+ "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.13.tgz",
+ "integrity": "sha512-z9fJ5Im06zvUL548KvYNecEVlA7cVDkGUi6kZusb04mpyEFKCIZJvloCcmpmLaIahDpOQGHaHmG6imtPMmPXGQ==",
"dependencies": {
"@types/node": "*"
}
},
"node_modules/@types/connect": {
- "version": "3.4.35",
- "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz",
- "integrity": "sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==",
+ "version": "3.4.38",
+ "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz",
+ "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==",
"dependencies": {
"@types/node": "*"
}
},
"node_modules/@types/connect-history-api-fallback": {
- "version": "1.5.0",
- "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz",
- "integrity": "sha512-4x5FkPpLipqwthjPsF7ZRbOv3uoLUFkTA9G9v583qi4pACvq0uTELrB8OLUzPWUI4IJIyvM85vzkV1nyiI2Lig==",
+ "version": "1.5.4",
+ "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.4.tgz",
+ "integrity": "sha512-n6Cr2xS1h4uAulPRdlw6Jl6s1oG8KrVilPN2yUITEs+K48EzMJJ3W1xy8K5eWuFvjp3R74AOIGSmp2UfBJ8HFw==",
"dependencies": {
"@types/express-serve-static-core": "*",
"@types/node": "*"
}
},
"node_modules/@types/eslint": {
- "version": "8.40.2",
- "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.40.2.tgz",
- "integrity": "sha512-PRVjQ4Eh9z9pmmtaq8nTjZjQwKFk7YIHIud3lRoKRBgUQjgjRmoGxxGEPXQkF+lH7QkHJRNr5F4aBgYCW0lqpQ==",
+ "version": "8.56.12",
+ "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.12.tgz",
+ "integrity": "sha512-03ruubjWyOHlmljCVoxSuNDdmfZDzsrrz0P2LeJsOXr+ZwFQ+0yQIwNCwt/GYhV7Z31fgtXJTAEs+FYlEL851g==",
"dependencies": {
"@types/estree": "*",
"@types/json-schema": "*"
}
},
"node_modules/@types/eslint-scope": {
- "version": "3.7.4",
- "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz",
- "integrity": "sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==",
+ "version": "3.7.7",
+ "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
+ "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
"dependencies": {
"@types/eslint": "*",
"@types/estree": "*"
}
},
"node_modules/@types/estree": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.1.tgz",
- "integrity": "sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA=="
+ "version": "1.0.6",
+ "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
+ "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw=="
},
"node_modules/@types/express": {
- "version": "4.17.17",
- "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.17.tgz",
- "integrity": "sha512-Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q==",
+ "version": "4.17.21",
+ "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz",
+ "integrity": "sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==",
"dependencies": {
"@types/body-parser": "*",
"@types/express-serve-static-core": "^4.17.33",
@@ -4420,9 +3865,20 @@
}
},
"node_modules/@types/express-serve-static-core": {
- "version": "4.17.35",
- "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.35.tgz",
- "integrity": "sha512-wALWQwrgiB2AWTT91CB62b6Yt0sNHpznUXeZEcnPU3DRdlDIz74x8Qg1UUYKSVFi+va5vKOLYRBI1bRKiLLKIg==",
+ "version": "5.0.6",
+ "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-5.0.6.tgz",
+ "integrity": "sha512-3xhRnjJPkULekpSzgtoNYYcTWgEZkp4myc+Saevii5JPnHNvHMRlBSHDbs7Bh1iPPoVTERHEZXyhyLbMEsExsA==",
+ "dependencies": {
+ "@types/node": "*",
+ "@types/qs": "*",
+ "@types/range-parser": "*",
+ "@types/send": "*"
+ }
+ },
+ "node_modules/@types/express/node_modules/@types/express-serve-static-core": {
+ "version": "4.19.6",
+ "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.6.tgz",
+ "integrity": "sha512-N4LZ2xG7DatVqhCZzOGb1Yi5lMbXSZcmdLDe9EzSndPV2HpWYWzRbaerl2n27irrm94EPpprqa8KpskPT085+A==",
"dependencies": {
"@types/node": "*",
"@types/qs": "*",
@@ -4431,17 +3887,17 @@
}
},
"node_modules/@types/graceful-fs": {
- "version": "4.1.6",
- "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.6.tgz",
- "integrity": "sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==",
+ "version": "4.1.9",
+ "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz",
+ "integrity": "sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==",
"dependencies": {
"@types/node": "*"
}
},
"node_modules/@types/hoist-non-react-statics": {
- "version": "3.3.1",
- "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz",
- "integrity": "sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==",
+ "version": "3.3.6",
+ "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.6.tgz",
+ "integrity": "sha512-lPByRJUer/iN/xa4qpyL0qmL11DqNW81iU/IG1S3uvRUq4oKagz8VCxZjiWkumgt66YT3vOdDgZ0o32sGKtCEw==",
"dev": true,
"dependencies": {
"@types/react": "*",
@@ -4453,39 +3909,44 @@
"resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
"integrity": "sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg=="
},
+ "node_modules/@types/http-errors": {
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz",
+ "integrity": "sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA=="
+ },
"node_modules/@types/http-proxy": {
- "version": "1.17.11",
- "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.11.tgz",
- "integrity": "sha512-HC8G7c1WmaF2ekqpnFq626xd3Zz0uvaqFmBJNRZCGEZCXkvSdJoNFn/8Ygbd9fKNQj8UzLdCETaI0UWPAjK7IA==",
+ "version": "1.17.15",
+ "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.15.tgz",
+ "integrity": "sha512-25g5atgiVNTIv0LBDTg1H74Hvayx0ajtJPLLcYE3whFv75J0pWNtOBzaXJQgDTmrX1bx5U9YC2w/n65BN1HwRQ==",
"dependencies": {
"@types/node": "*"
}
},
"node_modules/@types/istanbul-lib-coverage": {
- "version": "2.0.4",
- "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz",
- "integrity": "sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g=="
+ "version": "2.0.6",
+ "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz",
+ "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w=="
},
"node_modules/@types/istanbul-lib-report": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
- "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==",
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz",
+ "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==",
"dependencies": {
"@types/istanbul-lib-coverage": "*"
}
},
"node_modules/@types/istanbul-reports": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz",
- "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==",
+ "version": "3.0.4",
+ "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz",
+ "integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==",
"dependencies": {
"@types/istanbul-lib-report": "*"
}
},
"node_modules/@types/jest": {
- "version": "29.5.4",
- "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.4.tgz",
- "integrity": "sha512-PhglGmhWeD46FYOVLt3X7TiWjzwuVGW9wG/4qocPevXMjCmrIc5b6db9WjeGE4QYVpUAWMDv3v0IiBwObY289A==",
+ "version": "29.5.14",
+ "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.14.tgz",
+ "integrity": "sha512-ZN+4sdnLUbo8EVvVc2ao0GFW6oVrQRPn4K2lglySj7APvSrgzxHiNNK99us4WDMi57xxA2yggblIAMNhXOotLQ==",
"dev": true,
"dependencies": {
"expect": "^29.0.0",
@@ -4505,12 +3966,12 @@
}
},
"node_modules/@types/jest/node_modules/pretty-format": {
- "version": "29.6.1",
- "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.1.tgz",
- "integrity": "sha512-7jRj+yXO0W7e4/tSJKoR7HRIHLPPjtNaUGG2xxKQnGvPNRkgWcQ0AZX6P4KBRJN4FcTBWb3sa7DVUJmocYuoog==",
+ "version": "29.7.0",
+ "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
+ "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
"dev": true,
"dependencies": {
- "@jest/schemas": "^29.6.0",
+ "@jest/schemas": "^29.6.3",
"ansi-styles": "^5.0.0",
"react-is": "^18.0.0"
},
@@ -4518,10 +3979,16 @@
"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
}
},
+ "node_modules/@types/jest/node_modules/react-is": {
+ "version": "18.3.1",
+ "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
+ "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
+ "dev": true
+ },
"node_modules/@types/json-schema": {
- "version": "7.0.12",
- "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.12.tgz",
- "integrity": "sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA=="
+ "version": "7.0.15",
+ "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
+ "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA=="
},
"node_modules/@types/json5": {
"version": "0.0.29",
@@ -4529,22 +3996,30 @@
"integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ=="
},
"node_modules/@types/mime": {
- "version": "1.3.2",
- "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz",
- "integrity": "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="
+ "version": "1.3.5",
+ "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz",
+ "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w=="
},
"node_modules/@types/node": {
- "version": "20.8.7",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.7.tgz",
- "integrity": "sha512-21TKHHh3eUHIi2MloeptJWALuCu5H7HQTdTrWIFReA8ad+aggoX+lRes3ex7/FtpC+sVUpFMQ+QTfYr74mruiQ==",
+ "version": "22.12.0",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-22.12.0.tgz",
+ "integrity": "sha512-Fll2FZ1riMjNmlmJOdAyY5pUbkftXslB5DgEzlIuNaiWhXd00FhWxVC/r4yV/4wBb9JfImTu+jiSvXTkJ7F/gA==",
"dependencies": {
- "undici-types": "~5.25.1"
+ "undici-types": "~6.20.0"
+ }
+ },
+ "node_modules/@types/node-forge": {
+ "version": "1.3.11",
+ "resolved": "https://registry.npmjs.org/@types/node-forge/-/node-forge-1.3.11.tgz",
+ "integrity": "sha512-FQx220y22OKNTqaByeBGqHWYz4cl94tpcxeFdvBo3wjG6XPBuZ0BNgNZRV5J5TFmmcsJ4IzsLkmGRiQbnYsBEQ==",
+ "dependencies": {
+ "@types/node": "*"
}
},
"node_modules/@types/parse-json": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
- "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.2.tgz",
+ "integrity": "sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw=="
},
"node_modules/@types/prettier": {
"version": "2.7.3",
@@ -4552,43 +4027,43 @@
"integrity": "sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA=="
},
"node_modules/@types/prop-types": {
- "version": "15.7.5",
- "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz",
- "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w=="
+ "version": "15.7.14",
+ "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.14.tgz",
+ "integrity": "sha512-gNMvNH49DJ7OJYv+KAKn0Xp45p8PLl6zo2YnvDIbTd4J6MER2BmWN49TG7n9LvkyihINxeKW8+3bfS2yDC9dzQ=="
},
"node_modules/@types/q": {
- "version": "1.5.5",
- "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.5.tgz",
- "integrity": "sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ=="
+ "version": "1.5.8",
+ "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.8.tgz",
+ "integrity": "sha512-hroOstUScF6zhIi+5+x0dzqrHA1EJi+Irri6b1fxolMTqqHIV/Cg77EtnQcZqZCu8hR3mX2BzIxN4/GzI68Kfw=="
},
"node_modules/@types/qs": {
- "version": "6.9.7",
- "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz",
- "integrity": "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw=="
+ "version": "6.9.18",
+ "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.18.tgz",
+ "integrity": "sha512-kK7dgTYDyGqS+e2Q4aK9X3D7q234CIZ1Bv0q/7Z5IwRDoADNU81xXJK/YVyLbLTZCoIwUoDoffFeF+p/eIklAA=="
},
"node_modules/@types/range-parser": {
- "version": "1.2.4",
- "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz",
- "integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="
+ "version": "1.2.7",
+ "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz",
+ "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ=="
},
"node_modules/@types/react": {
- "version": "17.0.62",
- "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.62.tgz",
- "integrity": "sha512-eANCyz9DG8p/Vdhr0ZKST8JV12PhH2ACCDYlFw6DIO+D+ca+uP4jtEDEpVqXZrh/uZdXQGwk7whJa3ah5DtyLw==",
+ "version": "17.0.83",
+ "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.83.tgz",
+ "integrity": "sha512-l0m4ArKJvmFtR4e8UmKrj1pB4tUgOhJITf+mADyF/p69Ts1YAR/E+G9XEM0mHXKVRa1dQNHseyyDNzeuAXfXQw==",
"dev": true,
"dependencies": {
"@types/prop-types": "*",
- "@types/scheduler": "*",
+ "@types/scheduler": "^0.16",
"csstype": "^3.0.2"
}
},
"node_modules/@types/react-dom": {
- "version": "17.0.20",
- "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.20.tgz",
- "integrity": "sha512-4pzIjSxDueZZ90F52mU3aPoogkHIoSIDG+oQ+wQK7Cy2B9S+MvOqY0uEA/qawKz381qrEDkvpwyt8Bm31I8sbA==",
+ "version": "17.0.26",
+ "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.26.tgz",
+ "integrity": "sha512-Z+2VcYXJwOqQ79HreLU/1fyQ88eXSSFh6I3JdrEHQIfYSI0kCQpTGvOrbE6jFGGYXKsHuwY9tBa/w5Uo6KzrEg==",
"dev": true,
- "dependencies": {
- "@types/react": "^17"
+ "peerDependencies": {
+ "@types/react": "^17.0.0"
}
},
"node_modules/@types/resolve": {
@@ -4605,58 +4080,59 @@
"integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA=="
},
"node_modules/@types/scheduler": {
- "version": "0.16.3",
- "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.3.tgz",
- "integrity": "sha512-5cJ8CB4yAx7BH1oMvdU0Jh9lrEXyPkar6F9G/ERswkCuvP4KQZfZkSjcMbAICCpQTN4OuZn8tz0HiKv9TGZgrQ=="
+ "version": "0.16.8",
+ "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.8.tgz",
+ "integrity": "sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A=="
},
"node_modules/@types/semver": {
- "version": "7.5.0",
- "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.0.tgz",
- "integrity": "sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw=="
+ "version": "7.5.8",
+ "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz",
+ "integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ=="
},
"node_modules/@types/send": {
- "version": "0.17.1",
- "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.1.tgz",
- "integrity": "sha512-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q==",
+ "version": "0.17.4",
+ "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz",
+ "integrity": "sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==",
"dependencies": {
"@types/mime": "^1",
"@types/node": "*"
}
},
"node_modules/@types/serve-index": {
- "version": "1.9.1",
- "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.1.tgz",
- "integrity": "sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg==",
+ "version": "1.9.4",
+ "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.4.tgz",
+ "integrity": "sha512-qLpGZ/c2fhSs5gnYsQxtDEq3Oy8SXPClIXkW5ghvAvsNuVSA8k+gCONcUCS/UjLEYvYps+e8uBtfgXgvhwfNug==",
"dependencies": {
"@types/express": "*"
}
},
"node_modules/@types/serve-static": {
- "version": "1.15.1",
- "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.1.tgz",
- "integrity": "sha512-NUo5XNiAdULrJENtJXZZ3fHtfMolzZwczzBbnAeBbqBwG+LaG6YaJtuwzwGSQZ2wsCrxjEhNNjAkKigy3n8teQ==",
+ "version": "1.15.7",
+ "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.7.tgz",
+ "integrity": "sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==",
"dependencies": {
- "@types/mime": "*",
- "@types/node": "*"
+ "@types/http-errors": "*",
+ "@types/node": "*",
+ "@types/send": "*"
}
},
"node_modules/@types/sockjs": {
- "version": "0.3.33",
- "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.33.tgz",
- "integrity": "sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw==",
+ "version": "0.3.36",
+ "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.36.tgz",
+ "integrity": "sha512-MK9V6NzAS1+Ud7JV9lJLFqW85VbC9dq3LmwZCuBe4wBDgKC0Kj/jd8Xl+nSviU+Qc3+m7umHHyHg//2KSa0a0Q==",
"dependencies": {
"@types/node": "*"
}
},
"node_modules/@types/stack-utils": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz",
- "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw=="
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz",
+ "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw=="
},
"node_modules/@types/styled-components": {
- "version": "5.1.26",
- "resolved": "https://registry.npmjs.org/@types/styled-components/-/styled-components-5.1.26.tgz",
- "integrity": "sha512-KuKJ9Z6xb93uJiIyxo/+ksS7yLjS1KzG6iv5i78dhVg/X3u5t1H7juRWqVmodIdz6wGVaIApo1u01kmFRdJHVw==",
+ "version": "5.1.34",
+ "resolved": "https://registry.npmjs.org/@types/styled-components/-/styled-components-5.1.34.tgz",
+ "integrity": "sha512-mmiVvwpYklFIv9E8qfxuPyIt/OuyIrn6gMOAMOFUO3WJfSrSE+sGUoa4PiZj77Ut7bKZpaa6o1fBKS/4TOEvnA==",
"dev": true,
"dependencies": {
"@types/hoist-non-react-statics": "*",
@@ -4665,47 +4141,47 @@
}
},
"node_modules/@types/stylis": {
- "version": "4.2.0",
- "resolved": "https://registry.npmjs.org/@types/stylis/-/stylis-4.2.0.tgz",
- "integrity": "sha512-n4sx2bqL0mW1tvDf/loQ+aMX7GQD3lc3fkCMC55VFNDu/vBOabO+LTIeXKM14xK0ppk5TUGcWRjiSpIlUpghKw=="
+ "version": "4.2.5",
+ "resolved": "https://registry.npmjs.org/@types/stylis/-/stylis-4.2.5.tgz",
+ "integrity": "sha512-1Xve+NMN7FWjY14vLoY5tL3BVEQ/n42YLwaqJIPYhotZ9uBHt87VceMwWQpzmdEt2TNXIorIFG+YeCUUW7RInw=="
},
"node_modules/@types/trusted-types": {
- "version": "2.0.3",
- "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.3.tgz",
- "integrity": "sha512-NfQ4gyz38SL8sDNrSixxU2Os1a5xcdFxipAFxYEuLUlvU2uDwS4NUpsImcf1//SlWItCVMMLiylsxbmNMToV/g=="
+ "version": "2.0.7",
+ "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz",
+ "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw=="
},
"node_modules/@types/ws": {
- "version": "8.5.5",
- "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.5.tgz",
- "integrity": "sha512-lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg==",
+ "version": "8.5.14",
+ "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.14.tgz",
+ "integrity": "sha512-bd/YFLW+URhBzMXurx7lWByOu+xzU9+kb3RboOteXYDfW+tr+JZa99OyNmPINEGB/ahzKrEuc8rcv4gnpJmxTw==",
"dependencies": {
"@types/node": "*"
}
},
"node_modules/@types/yargs": {
- "version": "16.0.5",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.5.tgz",
- "integrity": "sha512-AxO/ADJOBFJScHbWhq2xAhlWP24rY4aCEG/NFaMvbT3X2MgRsLjhjQwsn0Zi5zn0LG9jUhCCZMeX9Dkuw6k+vQ==",
+ "version": "17.0.33",
+ "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.33.tgz",
+ "integrity": "sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==",
"dependencies": {
"@types/yargs-parser": "*"
}
},
"node_modules/@types/yargs-parser": {
- "version": "21.0.0",
- "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz",
- "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA=="
+ "version": "21.0.3",
+ "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz",
+ "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ=="
},
"node_modules/@typescript-eslint/eslint-plugin": {
- "version": "5.59.11",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.11.tgz",
- "integrity": "sha512-XxuOfTkCUiOSyBWIvHlUraLw/JT/6Io1365RO6ZuI88STKMavJZPNMU0lFcUTeQXEhHiv64CbxYxBNoDVSmghg==",
+ "version": "5.62.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz",
+ "integrity": "sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==",
"dependencies": {
"@eslint-community/regexpp": "^4.4.0",
- "@typescript-eslint/scope-manager": "5.59.11",
- "@typescript-eslint/type-utils": "5.59.11",
- "@typescript-eslint/utils": "5.59.11",
+ "@typescript-eslint/scope-manager": "5.62.0",
+ "@typescript-eslint/type-utils": "5.62.0",
+ "@typescript-eslint/utils": "5.62.0",
"debug": "^4.3.4",
- "grapheme-splitter": "^1.0.4",
+ "graphemer": "^1.4.0",
"ignore": "^5.2.0",
"natural-compare-lite": "^1.4.0",
"semver": "^7.3.7",
@@ -4728,24 +4204,10 @@
}
}
},
- "node_modules/@typescript-eslint/eslint-plugin/node_modules/lru-cache": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
- "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
- "dependencies": {
- "yallist": "^4.0.0"
- },
- "engines": {
- "node": ">=10"
- }
- },
"node_modules/@typescript-eslint/eslint-plugin/node_modules/semver": {
- "version": "7.5.2",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz",
- "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
- "dependencies": {
- "lru-cache": "^6.0.0"
- },
+ "version": "7.7.0",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.0.tgz",
+ "integrity": "sha512-DrfFnPzblFmNrIZzg5RzHegbiRWg7KMR7btwi2yjHwx06zsUbO5g613sVwEV7FTwmzJu+Io0lJe2GJ3LxqpvBQ==",
"bin": {
"semver": "bin/semver.js"
},
@@ -4753,17 +4215,12 @@
"node": ">=10"
}
},
- "node_modules/@typescript-eslint/eslint-plugin/node_modules/yallist": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
- "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
- },
"node_modules/@typescript-eslint/experimental-utils": {
- "version": "5.59.11",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.59.11.tgz",
- "integrity": "sha512-GkQGV0UF/V5Ra7gZMBmiD1WrYUFOJNvCZs+XQnUyJoxmqfWMXVNyB2NVCPRKefoQcpvTv9UpJyfCvsJFs8NzzQ==",
+ "version": "5.62.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.62.0.tgz",
+ "integrity": "sha512-RTXpeB3eMkpoclG3ZHft6vG/Z30azNHuqY6wKPBHlVMZFuEvrtlEDe8gMqDb+SO+9hjC/pLekeSCryf9vMZlCw==",
"dependencies": {
- "@typescript-eslint/utils": "5.59.11"
+ "@typescript-eslint/utils": "5.62.0"
},
"engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -4777,13 +4234,13 @@
}
},
"node_modules/@typescript-eslint/parser": {
- "version": "5.59.11",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.59.11.tgz",
- "integrity": "sha512-s9ZF3M+Nym6CAZEkJJeO2TFHHDsKAM3ecNkLuH4i4s8/RCPnF5JRip2GyviYkeEAcwGMJxkqG9h2dAsnA1nZpA==",
+ "version": "5.62.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.62.0.tgz",
+ "integrity": "sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==",
"dependencies": {
- "@typescript-eslint/scope-manager": "5.59.11",
- "@typescript-eslint/types": "5.59.11",
- "@typescript-eslint/typescript-estree": "5.59.11",
+ "@typescript-eslint/scope-manager": "5.62.0",
+ "@typescript-eslint/types": "5.62.0",
+ "@typescript-eslint/typescript-estree": "5.62.0",
"debug": "^4.3.4"
},
"engines": {
@@ -4803,12 +4260,12 @@
}
},
"node_modules/@typescript-eslint/scope-manager": {
- "version": "5.59.11",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.59.11.tgz",
- "integrity": "sha512-dHFOsxoLFtrIcSj5h0QoBT/89hxQONwmn3FOQ0GOQcLOOXm+MIrS8zEAhs4tWl5MraxCY3ZJpaXQQdFMc2Tu+Q==",
+ "version": "5.62.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz",
+ "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==",
"dependencies": {
- "@typescript-eslint/types": "5.59.11",
- "@typescript-eslint/visitor-keys": "5.59.11"
+ "@typescript-eslint/types": "5.62.0",
+ "@typescript-eslint/visitor-keys": "5.62.0"
},
"engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -4819,12 +4276,12 @@
}
},
"node_modules/@typescript-eslint/type-utils": {
- "version": "5.59.11",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.59.11.tgz",
- "integrity": "sha512-LZqVY8hMiVRF2a7/swmkStMYSoXMFlzL6sXV6U/2gL5cwnLWQgLEG8tjWPpaE4rMIdZ6VKWwcffPlo1jPfk43g==",
+ "version": "5.62.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz",
+ "integrity": "sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==",
"dependencies": {
- "@typescript-eslint/typescript-estree": "5.59.11",
- "@typescript-eslint/utils": "5.59.11",
+ "@typescript-eslint/typescript-estree": "5.62.0",
+ "@typescript-eslint/utils": "5.62.0",
"debug": "^4.3.4",
"tsutils": "^3.21.0"
},
@@ -4845,9 +4302,9 @@
}
},
"node_modules/@typescript-eslint/types": {
- "version": "5.59.11",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.59.11.tgz",
- "integrity": "sha512-epoN6R6tkvBYSc+cllrz+c2sOFWkbisJZWkOE+y3xHtvYaOE6Wk6B8e114McRJwFRjGvYdJwLXQH5c9osME/AA==",
+ "version": "5.62.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz",
+ "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==",
"engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
},
@@ -4857,12 +4314,12 @@
}
},
"node_modules/@typescript-eslint/typescript-estree": {
- "version": "5.59.11",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.11.tgz",
- "integrity": "sha512-YupOpot5hJO0maupJXixi6l5ETdrITxeo5eBOeuV7RSKgYdU3G5cxO49/9WRnJq9EMrB7AuTSLH/bqOsXi7wPA==",
+ "version": "5.62.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz",
+ "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==",
"dependencies": {
- "@typescript-eslint/types": "5.59.11",
- "@typescript-eslint/visitor-keys": "5.59.11",
+ "@typescript-eslint/types": "5.62.0",
+ "@typescript-eslint/visitor-keys": "5.62.0",
"debug": "^4.3.4",
"globby": "^11.1.0",
"is-glob": "^4.0.3",
@@ -4882,51 +4339,10 @@
}
}
},
- "node_modules/@typescript-eslint/typescript-estree/node_modules/array-union": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
- "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/@typescript-eslint/typescript-estree/node_modules/globby": {
- "version": "11.1.0",
- "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
- "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
- "dependencies": {
- "array-union": "^2.1.0",
- "dir-glob": "^3.0.1",
- "fast-glob": "^3.2.9",
- "ignore": "^5.2.0",
- "merge2": "^1.4.1",
- "slash": "^3.0.0"
- },
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/@typescript-eslint/typescript-estree/node_modules/lru-cache": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
- "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
- "dependencies": {
- "yallist": "^4.0.0"
- },
- "engines": {
- "node": ">=10"
- }
- },
"node_modules/@typescript-eslint/typescript-estree/node_modules/semver": {
- "version": "7.5.2",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz",
- "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
- "dependencies": {
- "lru-cache": "^6.0.0"
- },
+ "version": "7.7.0",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.0.tgz",
+ "integrity": "sha512-DrfFnPzblFmNrIZzg5RzHegbiRWg7KMR7btwi2yjHwx06zsUbO5g613sVwEV7FTwmzJu+Io0lJe2GJ3LxqpvBQ==",
"bin": {
"semver": "bin/semver.js"
},
@@ -4934,22 +4350,17 @@
"node": ">=10"
}
},
- "node_modules/@typescript-eslint/typescript-estree/node_modules/yallist": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
- "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
- },
"node_modules/@typescript-eslint/utils": {
- "version": "5.59.11",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.59.11.tgz",
- "integrity": "sha512-didu2rHSOMUdJThLk4aZ1Or8IcO3HzCw/ZvEjTTIfjIrcdd5cvSIwwDy2AOlE7htSNp7QIZ10fLMyRCveesMLg==",
+ "version": "5.62.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz",
+ "integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==",
"dependencies": {
"@eslint-community/eslint-utils": "^4.2.0",
"@types/json-schema": "^7.0.9",
"@types/semver": "^7.3.12",
- "@typescript-eslint/scope-manager": "5.59.11",
- "@typescript-eslint/types": "5.59.11",
- "@typescript-eslint/typescript-estree": "5.59.11",
+ "@typescript-eslint/scope-manager": "5.62.0",
+ "@typescript-eslint/types": "5.62.0",
+ "@typescript-eslint/typescript-estree": "5.62.0",
"eslint-scope": "^5.1.1",
"semver": "^7.3.7"
},
@@ -4984,24 +4395,10 @@
"node": ">=4.0"
}
},
- "node_modules/@typescript-eslint/utils/node_modules/lru-cache": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
- "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
- "dependencies": {
- "yallist": "^4.0.0"
- },
- "engines": {
- "node": ">=10"
- }
- },
"node_modules/@typescript-eslint/utils/node_modules/semver": {
- "version": "7.5.2",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz",
- "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
- "dependencies": {
- "lru-cache": "^6.0.0"
- },
+ "version": "7.7.0",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.0.tgz",
+ "integrity": "sha512-DrfFnPzblFmNrIZzg5RzHegbiRWg7KMR7btwi2yjHwx06zsUbO5g613sVwEV7FTwmzJu+Io0lJe2GJ3LxqpvBQ==",
"bin": {
"semver": "bin/semver.js"
},
@@ -5009,17 +4406,12 @@
"node": ">=10"
}
},
- "node_modules/@typescript-eslint/utils/node_modules/yallist": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
- "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
- },
"node_modules/@typescript-eslint/visitor-keys": {
- "version": "5.59.11",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.11.tgz",
- "integrity": "sha512-KGYniTGG3AMTuKF9QBD7EIrvufkB6O6uX3knP73xbKLMpH+QRPcgnCxjWXSHjMRuOxFLovljqQgQpR0c7GvjoA==",
+ "version": "5.62.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz",
+ "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==",
"dependencies": {
- "@typescript-eslint/types": "5.59.11",
+ "@typescript-eslint/types": "5.62.0",
"eslint-visitor-keys": "^3.3.0"
},
"engines": {
@@ -5030,134 +4422,139 @@
"url": "https://opencollective.com/typescript-eslint"
}
},
+ "node_modules/@ungap/structured-clone": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.3.0.tgz",
+ "integrity": "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g=="
+ },
"node_modules/@webassemblyjs/ast": {
- "version": "1.11.6",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz",
- "integrity": "sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==",
+ "version": "1.14.1",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz",
+ "integrity": "sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==",
"dependencies": {
- "@webassemblyjs/helper-numbers": "1.11.6",
- "@webassemblyjs/helper-wasm-bytecode": "1.11.6"
+ "@webassemblyjs/helper-numbers": "1.13.2",
+ "@webassemblyjs/helper-wasm-bytecode": "1.13.2"
}
},
"node_modules/@webassemblyjs/floating-point-hex-parser": {
- "version": "1.11.6",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz",
- "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw=="
+ "version": "1.13.2",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz",
+ "integrity": "sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA=="
},
"node_modules/@webassemblyjs/helper-api-error": {
- "version": "1.11.6",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz",
- "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q=="
+ "version": "1.13.2",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz",
+ "integrity": "sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ=="
},
"node_modules/@webassemblyjs/helper-buffer": {
- "version": "1.11.6",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz",
- "integrity": "sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA=="
+ "version": "1.14.1",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz",
+ "integrity": "sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA=="
},
"node_modules/@webassemblyjs/helper-numbers": {
- "version": "1.11.6",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz",
- "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==",
+ "version": "1.13.2",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz",
+ "integrity": "sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==",
"dependencies": {
- "@webassemblyjs/floating-point-hex-parser": "1.11.6",
- "@webassemblyjs/helper-api-error": "1.11.6",
+ "@webassemblyjs/floating-point-hex-parser": "1.13.2",
+ "@webassemblyjs/helper-api-error": "1.13.2",
"@xtuc/long": "4.2.2"
}
},
"node_modules/@webassemblyjs/helper-wasm-bytecode": {
- "version": "1.11.6",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz",
- "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA=="
+ "version": "1.13.2",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz",
+ "integrity": "sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA=="
},
"node_modules/@webassemblyjs/helper-wasm-section": {
- "version": "1.11.6",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz",
- "integrity": "sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==",
+ "version": "1.14.1",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz",
+ "integrity": "sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==",
"dependencies": {
- "@webassemblyjs/ast": "1.11.6",
- "@webassemblyjs/helper-buffer": "1.11.6",
- "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
- "@webassemblyjs/wasm-gen": "1.11.6"
+ "@webassemblyjs/ast": "1.14.1",
+ "@webassemblyjs/helper-buffer": "1.14.1",
+ "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+ "@webassemblyjs/wasm-gen": "1.14.1"
}
},
"node_modules/@webassemblyjs/ieee754": {
- "version": "1.11.6",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz",
- "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==",
+ "version": "1.13.2",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz",
+ "integrity": "sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==",
"dependencies": {
"@xtuc/ieee754": "^1.2.0"
}
},
"node_modules/@webassemblyjs/leb128": {
- "version": "1.11.6",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz",
- "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==",
+ "version": "1.13.2",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.13.2.tgz",
+ "integrity": "sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==",
"dependencies": {
"@xtuc/long": "4.2.2"
}
},
"node_modules/@webassemblyjs/utf8": {
- "version": "1.11.6",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz",
- "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA=="
+ "version": "1.13.2",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.13.2.tgz",
+ "integrity": "sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ=="
},
"node_modules/@webassemblyjs/wasm-edit": {
- "version": "1.11.6",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz",
- "integrity": "sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==",
+ "version": "1.14.1",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz",
+ "integrity": "sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==",
"dependencies": {
- "@webassemblyjs/ast": "1.11.6",
- "@webassemblyjs/helper-buffer": "1.11.6",
- "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
- "@webassemblyjs/helper-wasm-section": "1.11.6",
- "@webassemblyjs/wasm-gen": "1.11.6",
- "@webassemblyjs/wasm-opt": "1.11.6",
- "@webassemblyjs/wasm-parser": "1.11.6",
- "@webassemblyjs/wast-printer": "1.11.6"
+ "@webassemblyjs/ast": "1.14.1",
+ "@webassemblyjs/helper-buffer": "1.14.1",
+ "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+ "@webassemblyjs/helper-wasm-section": "1.14.1",
+ "@webassemblyjs/wasm-gen": "1.14.1",
+ "@webassemblyjs/wasm-opt": "1.14.1",
+ "@webassemblyjs/wasm-parser": "1.14.1",
+ "@webassemblyjs/wast-printer": "1.14.1"
}
},
"node_modules/@webassemblyjs/wasm-gen": {
- "version": "1.11.6",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz",
- "integrity": "sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==",
+ "version": "1.14.1",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz",
+ "integrity": "sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==",
"dependencies": {
- "@webassemblyjs/ast": "1.11.6",
- "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
- "@webassemblyjs/ieee754": "1.11.6",
- "@webassemblyjs/leb128": "1.11.6",
- "@webassemblyjs/utf8": "1.11.6"
+ "@webassemblyjs/ast": "1.14.1",
+ "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+ "@webassemblyjs/ieee754": "1.13.2",
+ "@webassemblyjs/leb128": "1.13.2",
+ "@webassemblyjs/utf8": "1.13.2"
}
},
"node_modules/@webassemblyjs/wasm-opt": {
- "version": "1.11.6",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz",
- "integrity": "sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==",
+ "version": "1.14.1",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz",
+ "integrity": "sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==",
"dependencies": {
- "@webassemblyjs/ast": "1.11.6",
- "@webassemblyjs/helper-buffer": "1.11.6",
- "@webassemblyjs/wasm-gen": "1.11.6",
- "@webassemblyjs/wasm-parser": "1.11.6"
+ "@webassemblyjs/ast": "1.14.1",
+ "@webassemblyjs/helper-buffer": "1.14.1",
+ "@webassemblyjs/wasm-gen": "1.14.1",
+ "@webassemblyjs/wasm-parser": "1.14.1"
}
},
"node_modules/@webassemblyjs/wasm-parser": {
- "version": "1.11.6",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz",
- "integrity": "sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==",
+ "version": "1.14.1",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz",
+ "integrity": "sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==",
"dependencies": {
- "@webassemblyjs/ast": "1.11.6",
- "@webassemblyjs/helper-api-error": "1.11.6",
- "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
- "@webassemblyjs/ieee754": "1.11.6",
- "@webassemblyjs/leb128": "1.11.6",
- "@webassemblyjs/utf8": "1.11.6"
+ "@webassemblyjs/ast": "1.14.1",
+ "@webassemblyjs/helper-api-error": "1.13.2",
+ "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+ "@webassemblyjs/ieee754": "1.13.2",
+ "@webassemblyjs/leb128": "1.13.2",
+ "@webassemblyjs/utf8": "1.13.2"
}
},
"node_modules/@webassemblyjs/wast-printer": {
- "version": "1.11.6",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz",
- "integrity": "sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==",
+ "version": "1.14.1",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz",
+ "integrity": "sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==",
"dependencies": {
- "@webassemblyjs/ast": "1.11.6",
+ "@webassemblyjs/ast": "1.14.1",
"@xtuc/long": "4.2.2"
}
},
@@ -5174,7 +4571,8 @@
"node_modules/abab": {
"version": "2.0.6",
"resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
- "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA=="
+ "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==",
+ "deprecated": "Use your platform's native atob() and btoa() methods instead"
},
"node_modules/accepts": {
"version": "1.3.8",
@@ -5188,10 +4586,18 @@
"node": ">= 0.6"
}
},
+ "node_modules/accepts/node_modules/negotiator": {
+ "version": "0.6.3",
+ "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+ "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
"node_modules/acorn": {
- "version": "8.9.0",
- "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.9.0.tgz",
- "integrity": "sha512-jaVNAFBHNLXspO543WnNNPZFRtavh3skAkITqD0/2aeMkKZTN+254PyhwxFYrk3vQ1xfY+2wbesJMs/JC8/PwQ==",
+ "version": "8.14.0",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
+ "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
"bin": {
"acorn": "bin/acorn"
},
@@ -5219,14 +4625,6 @@
"node": ">=0.4.0"
}
},
- "node_modules/acorn-import-assertions": {
- "version": "1.9.0",
- "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz",
- "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==",
- "peerDependencies": {
- "acorn": "^8"
- }
- },
"node_modules/acorn-jsx": {
"version": "5.3.2",
"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
@@ -5306,14 +4704,14 @@
}
},
"node_modules/ajv-formats/node_modules/ajv": {
- "version": "8.12.0",
- "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
- "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
+ "version": "8.17.1",
+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+ "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
"dependencies": {
- "fast-deep-equal": "^3.1.1",
+ "fast-deep-equal": "^3.1.3",
+ "fast-uri": "^3.0.1",
"json-schema-traverse": "^1.0.0",
- "require-from-string": "^2.0.2",
- "uri-js": "^4.2.2"
+ "require-from-string": "^2.0.2"
},
"funding": {
"type": "github",
@@ -5347,6 +4745,17 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
+ "node_modules/ansi-html": {
+ "version": "0.0.9",
+ "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.9.tgz",
+ "integrity": "sha512-ozbS3LuenHVxNRh/wdnN16QapUHzauqSomAl1jwwJRRsGwFwtj644lIhxfWu0Fy0acCij2+AEgHvjscq3dlVXg==",
+ "engines": [
+ "node >= 0.8.0"
+ ],
+ "bin": {
+ "ansi-html": "bin/ansi-html"
+ }
+ },
"node_modules/ansi-html-community": {
"version": "0.0.8",
"resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz",
@@ -5411,39 +4820,44 @@
}
},
"node_modules/aria-query": {
- "version": "5.1.3",
- "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.1.3.tgz",
- "integrity": "sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==",
+ "version": "5.3.0",
+ "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz",
+ "integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==",
+ "dev": true,
"dependencies": {
- "deep-equal": "^2.0.5"
+ "dequal": "^2.0.3"
}
},
"node_modules/array-buffer-byte-length": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz",
- "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==",
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.2.tgz",
+ "integrity": "sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==",
"dependencies": {
- "call-bind": "^1.0.2",
- "is-array-buffer": "^3.0.1"
+ "call-bound": "^1.0.3",
+ "is-array-buffer": "^3.0.5"
+ },
+ "engines": {
+ "node": ">= 0.4"
},
"funding": {
"url": "https://github.com/sponsors/ljharb"
}
},
"node_modules/array-flatten": {
- "version": "2.1.2",
- "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
- "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ=="
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+ "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
},
"node_modules/array-includes": {
- "version": "3.1.6",
- "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz",
- "integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==",
+ "version": "3.1.8",
+ "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.8.tgz",
+ "integrity": "sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==",
"dependencies": {
- "call-bind": "^1.0.2",
- "define-properties": "^1.1.4",
- "es-abstract": "^1.20.4",
- "get-intrinsic": "^1.1.3",
+ "call-bind": "^1.0.7",
+ "define-properties": "^1.2.1",
+ "es-abstract": "^1.23.2",
+ "es-object-atoms": "^1.0.0",
+ "get-intrinsic": "^1.2.4",
"is-string": "^1.0.7"
},
"engines": {
@@ -5454,35 +4868,60 @@
}
},
"node_modules/array-union": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
- "integrity": "sha512-Dxr6QJj/RdU/hCaBjOfxW+q6lyuVE6JFWIrAUpuOOhoJJoQ99cUn3igRaHVB5P9WrgFVN0FfArM3x0cueOU8ng==",
- "dev": true,
- "dependencies": {
- "array-uniq": "^1.0.1"
- },
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+ "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
"engines": {
- "node": ">=0.10.0"
+ "node": ">=8"
}
},
- "node_modules/array-uniq": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
- "integrity": "sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q==",
- "dev": true,
+ "node_modules/array.prototype.findlast": {
+ "version": "1.2.5",
+ "resolved": "https://registry.npmjs.org/array.prototype.findlast/-/array.prototype.findlast-1.2.5.tgz",
+ "integrity": "sha512-CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ==",
+ "dependencies": {
+ "call-bind": "^1.0.7",
+ "define-properties": "^1.2.1",
+ "es-abstract": "^1.23.2",
+ "es-errors": "^1.3.0",
+ "es-object-atoms": "^1.0.0",
+ "es-shim-unscopables": "^1.0.2"
+ },
"engines": {
- "node": ">=0.10.0"
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/array.prototype.findlastindex": {
+ "version": "1.2.5",
+ "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.5.tgz",
+ "integrity": "sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==",
+ "dependencies": {
+ "call-bind": "^1.0.7",
+ "define-properties": "^1.2.1",
+ "es-abstract": "^1.23.2",
+ "es-errors": "^1.3.0",
+ "es-object-atoms": "^1.0.0",
+ "es-shim-unscopables": "^1.0.2"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
}
},
"node_modules/array.prototype.flat": {
- "version": "1.3.1",
- "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz",
- "integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==",
+ "version": "1.3.3",
+ "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.3.tgz",
+ "integrity": "sha512-rwG/ja1neyLqCuGZ5YYrznA62D4mZXg0i1cIskIUKSiqF3Cje9/wXAls9B9s1Wa2fomMsIv8czB8jZcPmxCXFg==",
"dependencies": {
- "call-bind": "^1.0.2",
- "define-properties": "^1.1.4",
- "es-abstract": "^1.20.4",
- "es-shim-unscopables": "^1.0.0"
+ "call-bind": "^1.0.8",
+ "define-properties": "^1.2.1",
+ "es-abstract": "^1.23.5",
+ "es-shim-unscopables": "^1.0.2"
},
"engines": {
"node": ">= 0.4"
@@ -5492,14 +4931,14 @@
}
},
"node_modules/array.prototype.flatmap": {
- "version": "1.3.1",
- "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz",
- "integrity": "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==",
+ "version": "1.3.3",
+ "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.3.tgz",
+ "integrity": "sha512-Y7Wt51eKJSyi80hFrJCePGGNo5ktJCslFuboqJsbf57CCPcm5zztluPlc4/aD8sWsKvlwatezpV4U1efk8kpjg==",
"dependencies": {
- "call-bind": "^1.0.2",
- "define-properties": "^1.1.4",
- "es-abstract": "^1.20.4",
- "es-shim-unscopables": "^1.0.0"
+ "call-bind": "^1.0.8",
+ "define-properties": "^1.2.1",
+ "es-abstract": "^1.23.5",
+ "es-shim-unscopables": "^1.0.2"
},
"engines": {
"node": ">= 0.4"
@@ -5509,14 +4948,16 @@
}
},
"node_modules/array.prototype.reduce": {
- "version": "1.0.5",
- "resolved": "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.5.tgz",
- "integrity": "sha512-kDdugMl7id9COE8R7MHF5jWk7Dqt/fs4Pv+JXoICnYwqpjjjbUurz6w5fT5IG6brLdJhv6/VoHB0H7oyIBXd+Q==",
+ "version": "1.0.7",
+ "resolved": "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.7.tgz",
+ "integrity": "sha512-mzmiUCVwtiD4lgxYP8g7IYy8El8p2CSMePvIbTS7gchKir/L1fgJrk0yDKmAX6mnRQFKNADYIk8nNlTris5H1Q==",
"dependencies": {
- "call-bind": "^1.0.2",
- "define-properties": "^1.1.4",
- "es-abstract": "^1.20.4",
+ "call-bind": "^1.0.7",
+ "define-properties": "^1.2.1",
+ "es-abstract": "^1.23.2",
"es-array-method-boxes-properly": "^1.0.0",
+ "es-errors": "^1.3.0",
+ "es-object-atoms": "^1.0.0",
"is-string": "^1.0.7"
},
"engines": {
@@ -5527,15 +4968,38 @@
}
},
"node_modules/array.prototype.tosorted": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.1.tgz",
- "integrity": "sha512-pZYPXPRl2PqWcsUs6LOMn+1f1532nEoPTYowBtqLwAW+W8vSVhkIGnmOX1t/UQjD6YGI0vcD2B1U7ZFGQH9jnQ==",
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.4.tgz",
+ "integrity": "sha512-p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA==",
"dependencies": {
- "call-bind": "^1.0.2",
- "define-properties": "^1.1.4",
- "es-abstract": "^1.20.4",
- "es-shim-unscopables": "^1.0.0",
- "get-intrinsic": "^1.1.3"
+ "call-bind": "^1.0.7",
+ "define-properties": "^1.2.1",
+ "es-abstract": "^1.23.3",
+ "es-errors": "^1.3.0",
+ "es-shim-unscopables": "^1.0.2"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
+ "node_modules/arraybuffer.prototype.slice": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.4.tgz",
+ "integrity": "sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==",
+ "dependencies": {
+ "array-buffer-byte-length": "^1.0.1",
+ "call-bind": "^1.0.8",
+ "define-properties": "^1.2.1",
+ "es-abstract": "^1.23.5",
+ "es-errors": "^1.3.0",
+ "get-intrinsic": "^1.2.6",
+ "is-array-buffer": "^3.0.4"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
}
},
"node_modules/asap": {
@@ -5544,14 +5008,22 @@
"integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA=="
},
"node_modules/ast-types-flow": {
- "version": "0.0.7",
- "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
- "integrity": "sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag=="
+ "version": "0.0.8",
+ "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.8.tgz",
+ "integrity": "sha512-OH/2E5Fg20h2aPrbe+QL8JZQFko0YZaF+j4mnQ7BGhfavO7OpSLa8a0y9sBwomHdSbkhTS8TQNayBfnW5DwbvQ=="
},
"node_modules/async": {
- "version": "3.2.4",
- "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz",
- "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ=="
+ "version": "3.2.6",
+ "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz",
+ "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA=="
+ },
+ "node_modules/async-function": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/async-function/-/async-function-1.0.0.tgz",
+ "integrity": "sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==",
+ "engines": {
+ "node": ">= 0.4"
+ }
},
"node_modules/asynckit": {
"version": "0.4.0",
@@ -5567,9 +5039,9 @@
}
},
"node_modules/autoprefixer": {
- "version": "10.4.14",
- "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.14.tgz",
- "integrity": "sha512-FQzyfOsTlwVzjHxKEqRIAdJx9niO6VCBCoEwax/VLSoQF29ggECcPuBqUMZ+u8jCZOPSy8b8/8KnuFbp0SaFZQ==",
+ "version": "10.4.20",
+ "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.20.tgz",
+ "integrity": "sha512-XY25y5xSv/wEoqzDyXXME4AFfkZI0P23z6Fs3YgymDnKJkCGOnkL0iTxCa85UTqaSgfcqyf3UA6+c7wUvx/16g==",
"funding": [
{
"type": "opencollective",
@@ -5578,14 +5050,18 @@
{
"type": "tidelift",
"url": "https://tidelift.com/funding/github/npm/autoprefixer"
+ },
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/ai"
}
],
"dependencies": {
- "browserslist": "^4.21.5",
- "caniuse-lite": "^1.0.30001464",
- "fraction.js": "^4.2.0",
+ "browserslist": "^4.23.3",
+ "caniuse-lite": "^1.0.30001646",
+ "fraction.js": "^4.3.7",
"normalize-range": "^0.1.2",
- "picocolors": "^1.0.0",
+ "picocolors": "^1.0.1",
"postcss-value-parser": "^4.2.0"
},
"bin": {
@@ -5599,9 +5075,12 @@
}
},
"node_modules/available-typed-arrays": {
- "version": "1.0.5",
- "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
- "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==",
+ "version": "1.0.7",
+ "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz",
+ "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==",
+ "dependencies": {
+ "possible-typed-array-names": "^1.0.0"
+ },
"engines": {
"node": ">= 0.4"
},
@@ -5610,19 +5089,19 @@
}
},
"node_modules/axe-core": {
- "version": "4.7.2",
- "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.7.2.tgz",
- "integrity": "sha512-zIURGIS1E1Q4pcrMjp+nnEh+16G56eG/MUllJH8yEvw7asDo7Ac9uhC9KIH5jzpITueEZolfYglnCGIuSBz39g==",
+ "version": "4.10.2",
+ "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.10.2.tgz",
+ "integrity": "sha512-RE3mdQ7P3FRSe7eqCWoeQ/Z9QXrtniSjp1wUjt5nRC3WIpz5rSCve6o3fsZ2aCpJtrZjSZgjwXAoTO5k4tEI0w==",
"engines": {
"node": ">=4"
}
},
"node_modules/axobject-query": {
- "version": "3.2.1",
- "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-3.2.1.tgz",
- "integrity": "sha512-jsyHu61e6N4Vbz/v18DHwWYKK0bSWLqn47eeDSKPB7m8tqMHF9YJ+mhIk2lVteyZrY8tnSj/jHOv4YiTCuCJgg==",
- "dependencies": {
- "dequal": "^2.0.3"
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-4.1.0.tgz",
+ "integrity": "sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ==",
+ "engines": {
+ "node": ">= 0.4"
}
},
"node_modules/babel-jest": {
@@ -5646,13 +5125,36 @@
"@babel/core": "^7.8.0"
}
},
+ "node_modules/babel-jest/node_modules/@jest/types": {
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+ "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+ "dependencies": {
+ "@types/istanbul-lib-coverage": "^2.0.0",
+ "@types/istanbul-reports": "^3.0.0",
+ "@types/node": "*",
+ "@types/yargs": "^16.0.0",
+ "chalk": "^4.0.0"
+ },
+ "engines": {
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+ }
+ },
+ "node_modules/babel-jest/node_modules/@types/yargs": {
+ "version": "16.0.9",
+ "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz",
+ "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==",
+ "dependencies": {
+ "@types/yargs-parser": "*"
+ }
+ },
"node_modules/babel-loader": {
- "version": "8.3.0",
- "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.3.0.tgz",
- "integrity": "sha512-H8SvsMF+m9t15HNLMipppzkC+Y2Yq+v3SonZyU70RBL/h1gxPkH08Ot8pEE9Z4Kd+czyWJClmFS8qzIP9OZ04Q==",
+ "version": "8.4.1",
+ "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.4.1.tgz",
+ "integrity": "sha512-nXzRChX+Z1GoE6yWavBQg6jDslyFF3SDjl2paADuoQtQW10JqShJt62R6eJQ5m/pjJFDT8xgKIWSP85OY8eXeA==",
"dependencies": {
"find-cache-dir": "^3.3.1",
- "loader-utils": "^2.0.0",
+ "loader-utils": "^2.0.4",
"make-dir": "^3.1.0",
"schema-utils": "^2.6.5"
},
@@ -5733,39 +5235,39 @@
}
},
"node_modules/babel-plugin-polyfill-corejs2": {
- "version": "0.4.3",
- "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.3.tgz",
- "integrity": "sha512-bM3gHc337Dta490gg+/AseNB9L4YLHxq1nGKZZSHbhXv4aTYU2MD2cjza1Ru4S6975YLTaL1K8uJf6ukJhhmtw==",
+ "version": "0.4.12",
+ "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.12.tgz",
+ "integrity": "sha512-CPWT6BwvhrTO2d8QVorhTCQw9Y43zOu7G9HigcfxvepOU6b8o3tcWad6oVgZIsZCTt42FFv97aA7ZJsbM4+8og==",
"dependencies": {
- "@babel/compat-data": "^7.17.7",
- "@babel/helper-define-polyfill-provider": "^0.4.0",
- "semver": "^6.1.1"
+ "@babel/compat-data": "^7.22.6",
+ "@babel/helper-define-polyfill-provider": "^0.6.3",
+ "semver": "^6.3.1"
},
"peerDependencies": {
- "@babel/core": "^7.0.0-0"
+ "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
}
},
"node_modules/babel-plugin-polyfill-corejs3": {
- "version": "0.8.1",
- "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.1.tgz",
- "integrity": "sha512-ikFrZITKg1xH6pLND8zT14UPgjKHiGLqex7rGEZCH2EvhsneJaJPemmpQaIZV5AL03II+lXylw3UmddDK8RU5Q==",
+ "version": "0.10.6",
+ "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.10.6.tgz",
+ "integrity": "sha512-b37+KR2i/khY5sKmWNVQAnitvquQbNdWy6lJdsr0kmquCKEEUgMKK4SboVM3HtfnZilfjr4MMQ7vY58FVWDtIA==",
"dependencies": {
- "@babel/helper-define-polyfill-provider": "^0.4.0",
- "core-js-compat": "^3.30.1"
+ "@babel/helper-define-polyfill-provider": "^0.6.2",
+ "core-js-compat": "^3.38.0"
},
"peerDependencies": {
- "@babel/core": "^7.0.0-0"
+ "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
}
},
"node_modules/babel-plugin-polyfill-regenerator": {
- "version": "0.5.0",
- "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.0.tgz",
- "integrity": "sha512-hDJtKjMLVa7Z+LwnTCxoDLQj6wdc+B8dun7ayF2fYieI6OzfuvcLMB32ihJZ4UhCBwNYGl5bg/x/P9cMdnkc2g==",
+ "version": "0.6.3",
+ "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.3.tgz",
+ "integrity": "sha512-LiWSbl4CRSIa5x/JAU6jZiG9eit9w6mz+yVMFwDE83LAWvt0AfGBoZ7HS/mkhrKuh2ZlzfVZYKoLjXdqw6Yt7Q==",
"dependencies": {
- "@babel/helper-define-polyfill-provider": "^0.4.0"
+ "@babel/helper-define-polyfill-provider": "^0.6.3"
},
"peerDependencies": {
- "@babel/core": "^7.0.0-0"
+ "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
}
},
"node_modules/babel-plugin-transform-react-remove-prop-types": {
@@ -5774,22 +5276,25 @@
"integrity": "sha512-eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA=="
},
"node_modules/babel-preset-current-node-syntax": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
- "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.1.0.tgz",
+ "integrity": "sha512-ldYss8SbBlWva1bs28q78Ju5Zq1F+8BrqBZZ0VFhLBvhh6lCpC2o3gDJi/5DRLs9FgYZCnmPYIVFU4lRXCkyUw==",
"dependencies": {
"@babel/plugin-syntax-async-generators": "^7.8.4",
"@babel/plugin-syntax-bigint": "^7.8.3",
- "@babel/plugin-syntax-class-properties": "^7.8.3",
- "@babel/plugin-syntax-import-meta": "^7.8.3",
+ "@babel/plugin-syntax-class-properties": "^7.12.13",
+ "@babel/plugin-syntax-class-static-block": "^7.14.5",
+ "@babel/plugin-syntax-import-attributes": "^7.24.7",
+ "@babel/plugin-syntax-import-meta": "^7.10.4",
"@babel/plugin-syntax-json-strings": "^7.8.3",
- "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3",
+ "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
"@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
- "@babel/plugin-syntax-numeric-separator": "^7.8.3",
+ "@babel/plugin-syntax-numeric-separator": "^7.10.4",
"@babel/plugin-syntax-object-rest-spread": "^7.8.3",
"@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
"@babel/plugin-syntax-optional-chaining": "^7.8.3",
- "@babel/plugin-syntax-top-level-await": "^7.8.3"
+ "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
+ "@babel/plugin-syntax-top-level-await": "^7.14.5"
},
"peerDependencies": {
"@babel/core": "^7.0.0"
@@ -5844,13 +5349,14 @@
"integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw=="
},
"node_modules/bfj": {
- "version": "7.0.2",
- "resolved": "https://registry.npmjs.org/bfj/-/bfj-7.0.2.tgz",
- "integrity": "sha512-+e/UqUzwmzJamNF50tBV6tZPTORow7gQ96iFow+8b562OdMpEK0BcJEq2OSPEDmAbSMBQ7PKZ87ubFkgxpYWgw==",
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/bfj/-/bfj-7.1.0.tgz",
+ "integrity": "sha512-I6MMLkn+anzNdCUp9hMRyui1HaNEUCco50lxbvNS4+EyXg8lN3nJ48PjPWtbH8UVS9CuMoaKE9U2V3l29DaRQw==",
"dependencies": {
- "bluebird": "^3.5.5",
- "check-types": "^11.1.1",
+ "bluebird": "^3.7.2",
+ "check-types": "^11.2.3",
"hoopy": "^0.1.4",
+ "jsonpath": "^1.1.1",
"tryer": "^1.0.1"
},
"engines": {
@@ -5866,11 +5372,14 @@
}
},
"node_modules/binary-extensions": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
- "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
+ "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
"engines": {
"node": ">=8"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
}
},
"node_modules/bluebird": {
@@ -5879,20 +5388,20 @@
"integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="
},
"node_modules/body-parser": {
- "version": "1.20.1",
- "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
- "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
+ "version": "1.20.3",
+ "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz",
+ "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==",
"dependencies": {
"bytes": "3.1.2",
- "content-type": "~1.0.4",
+ "content-type": "~1.0.5",
"debug": "2.6.9",
"depd": "2.0.0",
"destroy": "1.2.0",
"http-errors": "2.0.0",
"iconv-lite": "0.4.24",
"on-finished": "2.4.1",
- "qs": "6.11.0",
- "raw-body": "2.5.1",
+ "qs": "6.13.0",
+ "raw-body": "2.5.2",
"type-is": "~1.6.18",
"unpipe": "1.0.0"
},
@@ -5901,14 +5410,6 @@
"npm": "1.2.8000 || >= 1.4.16"
}
},
- "node_modules/body-parser/node_modules/bytes": {
- "version": "3.1.2",
- "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
- "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
- "engines": {
- "node": ">= 0.8"
- }
- },
"node_modules/body-parser/node_modules/debug": {
"version": "2.6.9",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -5934,12 +5435,10 @@
"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
},
"node_modules/bonjour-service": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.1.1.tgz",
- "integrity": "sha512-Z/5lQRMOG9k7W+FkeGTNjh7htqn/2LMnfOvBZ8pynNZCM9MwkQkI3zeI4oz09uWdcgmgHugVvBqxGg4VQJ5PCg==",
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.3.0.tgz",
+ "integrity": "sha512-3YuAUiSkWykd+2Azjgyxei8OWf8thdn8AITIog2M4UICzoqfjlqr64WIjEXZllf/W6vK1goqleSR6brGomxQqA==",
"dependencies": {
- "array-flatten": "^2.1.2",
- "dns-equal": "^1.0.0",
"fast-deep-equal": "^3.1.3",
"multicast-dns": "^7.2.5"
}
@@ -5959,11 +5458,11 @@
}
},
"node_modules/braces": {
- "version": "3.0.2",
- "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
- "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+ "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
"dependencies": {
- "fill-range": "^7.0.1"
+ "fill-range": "^7.1.1"
},
"engines": {
"node": ">=8"
@@ -5975,9 +5474,9 @@
"integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow=="
},
"node_modules/browserslist": {
- "version": "4.21.9",
- "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.9.tgz",
- "integrity": "sha512-M0MFoZzbUrRU4KNfCrDLnvyE7gub+peetoTid3TBIqtunaDJyXlwhakT+/VkvSXcfIzFfK/nkCs4nmyTmxdNSg==",
+ "version": "4.24.4",
+ "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.4.tgz",
+ "integrity": "sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==",
"funding": [
{
"type": "opencollective",
@@ -5993,10 +5492,10 @@
}
],
"dependencies": {
- "caniuse-lite": "^1.0.30001503",
- "electron-to-chromium": "^1.4.431",
- "node-releases": "^2.0.12",
- "update-browserslist-db": "^1.0.11"
+ "caniuse-lite": "^1.0.30001688",
+ "electron-to-chromium": "^1.5.73",
+ "node-releases": "^2.0.19",
+ "update-browserslist-db": "^1.1.1"
},
"bin": {
"browserslist": "cli.js"
@@ -6028,20 +5527,52 @@
}
},
"node_modules/bytes": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
- "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==",
+ "version": "3.1.2",
+ "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+ "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
"engines": {
"node": ">= 0.8"
}
},
"node_modules/call-bind": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
- "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+ "version": "1.0.8",
+ "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz",
+ "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==",
"dependencies": {
- "function-bind": "^1.1.1",
- "get-intrinsic": "^1.0.2"
+ "call-bind-apply-helpers": "^1.0.0",
+ "es-define-property": "^1.0.0",
+ "get-intrinsic": "^1.2.4",
+ "set-function-length": "^1.2.2"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/call-bind-apply-helpers": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.1.tgz",
+ "integrity": "sha512-BhYE+WDaywFg2TBWYNXAE+8B1ATnThNBqXHP5nQu0jWJdVvY2hvkpyB3qOmtmDePiS5/BDQ8wASEWGMWRG148g==",
+ "dependencies": {
+ "es-errors": "^1.3.0",
+ "function-bind": "^1.1.2"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
+ "node_modules/call-bound": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.3.tgz",
+ "integrity": "sha512-YTd+6wGlNlPxSuri7Y6X8tY2dmm12UMH66RpKMhiX6rsk5wXXnYgbUcOt8kiS31/AjfoTOvCsE+w8nZQLQnzHA==",
+ "dependencies": {
+ "call-bind-apply-helpers": "^1.0.1",
+ "get-intrinsic": "^1.2.6"
+ },
+ "engines": {
+ "node": ">= 0.4"
},
"funding": {
"url": "https://github.com/sponsors/ljharb"
@@ -6103,9 +5634,9 @@
}
},
"node_modules/caniuse-lite": {
- "version": "1.0.30001503",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001503.tgz",
- "integrity": "sha512-Sf9NiF+wZxPfzv8Z3iS0rXM1Do+iOy2Lxvib38glFX+08TCYYYGR5fRJXk4d77C4AYwhUjgYgMsMudbh2TqCKw==",
+ "version": "1.0.30001696",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001696.tgz",
+ "integrity": "sha512-pDCPkvzfa39ehJtJ+OwGT/2yvT2SbjfHhiIW2LWOAcMQ7BzwxT/XuyUp4OTOd0XFWA6BKw0JalnBHgSi5DGJBQ==",
"funding": [
{
"type": "opencollective",
@@ -6153,20 +5684,14 @@
}
},
"node_modules/check-types": {
- "version": "11.2.2",
- "resolved": "https://registry.npmjs.org/check-types/-/check-types-11.2.2.tgz",
- "integrity": "sha512-HBiYvXvn9Z70Z88XKjz3AEKd4HJhBXsa3j7xFnITAzoS8+q6eIGi8qDB8FKPBAjtuxjI/zFpwuiCb8oDtKOYrA=="
+ "version": "11.2.3",
+ "resolved": "https://registry.npmjs.org/check-types/-/check-types-11.2.3.tgz",
+ "integrity": "sha512-+67P1GkJRaxQD6PKK0Et9DhwQB+vGg3PM5+aavopCpZT1lj9jeqfvpgTLAWErNj8qApkkmXlu/Ug74kmhagkXg=="
},
"node_modules/chokidar": {
- "version": "3.5.3",
- "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
- "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
- "funding": [
- {
- "type": "individual",
- "url": "https://paulmillr.com/funding/"
- }
- ],
+ "version": "3.6.0",
+ "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
+ "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
"dependencies": {
"anymatch": "~3.1.2",
"braces": "~3.0.2",
@@ -6179,33 +5704,25 @@
"engines": {
"node": ">= 8.10.0"
},
+ "funding": {
+ "url": "https://paulmillr.com/funding/"
+ },
"optionalDependencies": {
"fsevents": "~2.3.2"
}
},
- "node_modules/chokidar/node_modules/glob-parent": {
- "version": "5.1.2",
- "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
- "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
- "dependencies": {
- "is-glob": "^4.0.1"
- },
- "engines": {
- "node": ">= 6"
- }
- },
"node_modules/chrome-trace-event": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
- "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz",
+ "integrity": "sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==",
"engines": {
"node": ">=6.0"
}
},
"node_modules/ci-info": {
- "version": "3.8.0",
- "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz",
- "integrity": "sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==",
+ "version": "3.9.0",
+ "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+ "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
"funding": [
{
"type": "github",
@@ -6217,14 +5734,14 @@
}
},
"node_modules/cjs-module-lexer": {
- "version": "1.2.3",
- "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz",
- "integrity": "sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ=="
+ "version": "1.4.3",
+ "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.3.tgz",
+ "integrity": "sha512-9z8TZaGM1pfswYeXrUpzPrkx8UnWYdhJclsiYMm6x/w5+nN+8Tf/LnAgfLGQCm59qAOxU8WwHEq2vNwF6i4j+Q=="
},
"node_modules/clean-css": {
- "version": "5.3.2",
- "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.2.tgz",
- "integrity": "sha512-JVJbM+f3d3Q704rF4bqQ5UUyTtuJ0JRKNbTKVEeujCCBoMdkEi+V+e8oktO9qGQNSvHrFTM6JZRXrUvGR1czww==",
+ "version": "5.3.3",
+ "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.3.tgz",
+ "integrity": "sha512-D5J+kHaVb/wKSFcyyV75uCn8fiY4sV38XJoe4CUyGQ+mOU/fMVYUdH1hJC+CJQ5uY3EnW27SbJYS4X8BiLrAFg==",
"dependencies": {
"source-map": "~0.6.0"
},
@@ -6241,19 +5758,13 @@
}
},
"node_modules/cliui": {
- "version": "8.0.1",
- "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
- "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "7.0.4",
+ "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+ "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
"dependencies": {
"string-width": "^4.2.0",
- "strip-ansi": "^6.0.1",
+ "strip-ansi": "^6.0.0",
"wrap-ansi": "^7.0.0"
- },
- "engines": {
- "node": ">=12"
}
},
"node_modules/co": {
@@ -6343,9 +5854,9 @@
}
},
"node_modules/collect-v8-coverage": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz",
- "integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg=="
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz",
+ "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q=="
},
"node_modules/color-convert": {
"version": "2.0.1",
@@ -6385,14 +5896,13 @@
}
},
"node_modules/commander": {
- "version": "2.20.3",
- "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
- "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
- },
- "node_modules/common-path-prefix": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-3.0.0.tgz",
- "integrity": "sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w=="
+ "version": "13.1.0",
+ "resolved": "https://registry.npmjs.org/commander/-/commander-13.1.0.tgz",
+ "integrity": "sha512-/rFeCpNJQbhSZjGVwO9RFV3xPqbnERS8MmIQzCtD/zl6gpJuV/bMLuN92oG3F7d8oDEHHRrujSXNUr8fpjntKw==",
+ "dev": true,
+ "engines": {
+ "node": ">=18"
+ }
},
"node_modules/common-tags": {
"version": "1.8.2",
@@ -6419,16 +5929,16 @@
}
},
"node_modules/compression": {
- "version": "1.7.4",
- "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
- "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
+ "version": "1.7.5",
+ "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.5.tgz",
+ "integrity": "sha512-bQJ0YRck5ak3LgtnpKkiabX5pNF7tMUh1BSy2ZBOTh0Dim0BUu6aPPwByIns6/A5Prh8PufSPerMDUklpzes2Q==",
"dependencies": {
- "accepts": "~1.3.5",
- "bytes": "3.0.0",
- "compressible": "~2.0.16",
+ "bytes": "3.1.2",
+ "compressible": "~2.0.18",
"debug": "2.6.9",
+ "negotiator": "~0.6.4",
"on-headers": "~1.0.2",
- "safe-buffer": "5.1.2",
+ "safe-buffer": "5.2.1",
"vary": "~1.1.2"
},
"engines": {
@@ -6448,11 +5958,6 @@
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
},
- "node_modules/compression/node_modules/safe-buffer": {
- "version": "5.1.2",
- "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
- "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
- },
"node_modules/concat-map": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -6491,14 +5996,14 @@
}
},
"node_modules/convert-source-map": {
- "version": "1.9.0",
- "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
- "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+ "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="
},
"node_modules/cookie": {
- "version": "0.5.0",
- "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
- "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
+ "version": "0.7.1",
+ "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz",
+ "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==",
"engines": {
"node": ">= 0.6"
}
@@ -6509,9 +6014,9 @@
"integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
},
"node_modules/core-js": {
- "version": "3.31.0",
- "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.31.0.tgz",
- "integrity": "sha512-NIp2TQSGfR6ba5aalZD+ZQ1fSxGhDo/s1w0nx3RYzf2pnJxt7YynxFlFScP6eV7+GZsKO95NSjGxyJsU3DZgeQ==",
+ "version": "3.40.0",
+ "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.40.0.tgz",
+ "integrity": "sha512-7vsMc/Lty6AGnn7uFpYT56QesI5D2Y/UkgKounk87OP9Z2H9Z8kj6jzcSGAxFmUtDOS0ntK6lbQz+Nsa0Jj6mQ==",
"hasInstallScript": true,
"funding": {
"type": "opencollective",
@@ -6519,11 +6024,11 @@
}
},
"node_modules/core-js-compat": {
- "version": "3.31.0",
- "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.31.0.tgz",
- "integrity": "sha512-hM7YCu1cU6Opx7MXNu0NuumM0ezNeAeRKadixyiQELWY3vT3De9S4J5ZBMraWV2vZnrE1Cirl0GtFtDtMUXzPw==",
+ "version": "3.40.0",
+ "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.40.0.tgz",
+ "integrity": "sha512-0XEDpr5y5mijvw8Lbc6E5AkjrHfp7eEoPlu36SWeAbcL8fn1G1ANe8DBlo2XoNN89oVpxWwOjYIPVzR4ZvsKCQ==",
"dependencies": {
- "browserslist": "^4.21.5"
+ "browserslist": "^4.24.3"
},
"funding": {
"type": "opencollective",
@@ -6531,9 +6036,9 @@
}
},
"node_modules/core-js-pure": {
- "version": "3.31.0",
- "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.31.0.tgz",
- "integrity": "sha512-/AnE9Y4OsJZicCzIe97JP5XoPKQJfTuEG43aEVLFJGOJpyqELod+pE6LEl63DfG1Mp8wX97LDaDpy1GmLEUxlg==",
+ "version": "3.40.0",
+ "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.40.0.tgz",
+ "integrity": "sha512-AtDzVIgRrmRKQai62yuSIN5vNiQjcJakJb4fbhVw3ehxx7Lohphvw9SGNWKhLFqSxC4ilD0g/L1huAYFQU3Q6A==",
"hasInstallScript": true,
"funding": {
"type": "opencollective",
@@ -6561,9 +6066,9 @@
}
},
"node_modules/cross-spawn": {
- "version": "7.0.3",
- "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
- "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+ "version": "7.0.6",
+ "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+ "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
"dependencies": {
"path-key": "^3.1.0",
"shebang-command": "^2.0.0",
@@ -6607,9 +6112,9 @@
}
},
"node_modules/css-declaration-sorter": {
- "version": "6.4.0",
- "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.4.0.tgz",
- "integrity": "sha512-jDfsatwWMWN0MODAFuHszfjphEXfNw9JUAhmY4pLu3TyTU+ohUpsbVtbU+1MZn4a47D9kqh03i4eyOm+74+zew==",
+ "version": "6.4.1",
+ "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.4.1.tgz",
+ "integrity": "sha512-rtdthzxKuyq6IzqX6jEcIzQF/YqccluefyCYheovBOLhFT/drQA9zj/UbRAa9J7C0o6EG6u3E6g+vKkay7/k3g==",
"engines": {
"node": "^10 || ^12 || >=14"
},
@@ -6635,18 +6140,18 @@
}
},
"node_modules/css-loader": {
- "version": "6.8.1",
- "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.8.1.tgz",
- "integrity": "sha512-xDAXtEVGlD0gJ07iclwWVkLoZOpEvAWaSyf6W18S2pOC//K8+qUDIx8IIT3D+HjnmkJPQeesOPv5aiUaJsCM2g==",
+ "version": "6.11.0",
+ "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.11.0.tgz",
+ "integrity": "sha512-CTJ+AEQJjq5NzLga5pE39qdiSV56F8ywCIsqNIRF0r7BDgWsN25aazToqAFg7ZrtA/U016xudB3ffgweORxX7g==",
"dependencies": {
"icss-utils": "^5.1.0",
- "postcss": "^8.4.21",
- "postcss-modules-extract-imports": "^3.0.0",
- "postcss-modules-local-by-default": "^4.0.3",
- "postcss-modules-scope": "^3.0.0",
+ "postcss": "^8.4.33",
+ "postcss-modules-extract-imports": "^3.1.0",
+ "postcss-modules-local-by-default": "^4.0.5",
+ "postcss-modules-scope": "^3.2.0",
"postcss-modules-values": "^4.0.0",
"postcss-value-parser": "^4.2.0",
- "semver": "^7.3.8"
+ "semver": "^7.5.4"
},
"engines": {
"node": ">= 12.13.0"
@@ -6656,27 +6161,22 @@
"url": "https://opencollective.com/webpack"
},
"peerDependencies": {
+ "@rspack/core": "0.x || 1.x",
"webpack": "^5.0.0"
- }
- },
- "node_modules/css-loader/node_modules/lru-cache": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
- "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
- "dependencies": {
- "yallist": "^4.0.0"
},
- "engines": {
- "node": ">=10"
+ "peerDependenciesMeta": {
+ "@rspack/core": {
+ "optional": true
+ },
+ "webpack": {
+ "optional": true
+ }
}
},
"node_modules/css-loader/node_modules/semver": {
- "version": "7.5.2",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz",
- "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
- "dependencies": {
- "lru-cache": "^6.0.0"
- },
+ "version": "7.7.0",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.0.tgz",
+ "integrity": "sha512-DrfFnPzblFmNrIZzg5RzHegbiRWg7KMR7btwi2yjHwx06zsUbO5g613sVwEV7FTwmzJu+Io0lJe2GJ3LxqpvBQ==",
"bin": {
"semver": "bin/semver.js"
},
@@ -6684,11 +6184,6 @@
"node": ">=10"
}
},
- "node_modules/css-loader/node_modules/yallist": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
- "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
- },
"node_modules/css-minimizer-webpack-plugin": {
"version": "3.4.1",
"resolved": "https://registry.npmjs.org/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.4.1.tgz",
@@ -6726,55 +6221,6 @@
}
}
},
- "node_modules/css-minimizer-webpack-plugin/node_modules/ajv": {
- "version": "8.12.0",
- "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
- "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
- "dependencies": {
- "fast-deep-equal": "^3.1.1",
- "json-schema-traverse": "^1.0.0",
- "require-from-string": "^2.0.2",
- "uri-js": "^4.2.2"
- },
- "funding": {
- "type": "github",
- "url": "https://github.com/sponsors/epoberezkin"
- }
- },
- "node_modules/css-minimizer-webpack-plugin/node_modules/ajv-keywords": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
- "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
- "dependencies": {
- "fast-deep-equal": "^3.1.3"
- },
- "peerDependencies": {
- "ajv": "^8.8.2"
- }
- },
- "node_modules/css-minimizer-webpack-plugin/node_modules/json-schema-traverse": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
- "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
- },
- "node_modules/css-minimizer-webpack-plugin/node_modules/schema-utils": {
- "version": "4.2.0",
- "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
- "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
- "dependencies": {
- "@types/json-schema": "^7.0.9",
- "ajv": "^8.9.0",
- "ajv-formats": "^2.1.1",
- "ajv-keywords": "^5.1.0"
- },
- "engines": {
- "node": ">= 12.13.0"
- },
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/webpack"
- }
- },
"node_modules/css-minimizer-webpack-plugin/node_modules/source-map": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -6865,9 +6311,9 @@
"dev": true
},
"node_modules/cssdb": {
- "version": "7.6.0",
- "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-7.6.0.tgz",
- "integrity": "sha512-Nna7rph8V0jC6+JBY4Vk4ndErUmfJfV6NJCaZdurL0omggabiy+QB2HCQtu5c/ACLZ0I7REv7A4QyPIoYzZx0w==",
+ "version": "7.11.2",
+ "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-7.11.2.tgz",
+ "integrity": "sha512-lhQ32TFkc1X4eTefGfYPvgovRSzIMofHkigfH8nWtyRL4XJLsRhJFreRvEgKzept7x1rjBuy3J/MurXLaFxW/A==",
"funding": [
{
"type": "opencollective",
@@ -7021,9 +6467,9 @@
"integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg=="
},
"node_modules/csstype": {
- "version": "3.1.2",
- "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz",
- "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ=="
+ "version": "3.1.3",
+ "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
+ "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw=="
},
"node_modules/customize-cra": {
"version": "1.0.0",
@@ -7051,12 +6497,60 @@
"node": ">=10"
}
},
- "node_modules/debug": {
- "version": "4.3.4",
- "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
- "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+ "node_modules/data-view-buffer": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.2.tgz",
+ "integrity": "sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==",
"dependencies": {
- "ms": "2.1.2"
+ "call-bound": "^1.0.3",
+ "es-errors": "^1.3.0",
+ "is-data-view": "^1.0.2"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/data-view-byte-length": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.2.tgz",
+ "integrity": "sha512-tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ==",
+ "dependencies": {
+ "call-bound": "^1.0.3",
+ "es-errors": "^1.3.0",
+ "is-data-view": "^1.0.2"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/inspect-js"
+ }
+ },
+ "node_modules/data-view-byte-offset": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.1.tgz",
+ "integrity": "sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==",
+ "dependencies": {
+ "call-bound": "^1.0.2",
+ "es-errors": "^1.3.0",
+ "is-data-view": "^1.0.1"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/debug": {
+ "version": "4.4.0",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
+ "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
+ "dependencies": {
+ "ms": "^2.1.3"
},
"engines": {
"node": ">=6.0"
@@ -7068,35 +6562,25 @@
}
},
"node_modules/decimal.js": {
- "version": "10.4.3",
- "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz",
- "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA=="
+ "version": "10.5.0",
+ "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.5.0.tgz",
+ "integrity": "sha512-8vDa8Qxvr/+d94hSh5P3IJwI5t8/c0KsMp+g8bNw9cY2icONa5aPfvKeieW1WlG0WQYwwhJ7mjui2xtiePQSXw=="
},
"node_modules/dedent": {
- "version": "1.5.1",
- "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.1.tgz",
- "integrity": "sha512-+LxW+KLWxu3HW3M2w2ympwtqPrqYRzU8fqi6Fhd18fBALe15blJPI/I4+UHveMVG6lJqB4JNd4UG0S5cnVHwIg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "peerDependencies": {
- "babel-plugin-macros": "^3.1.0"
- },
- "peerDependenciesMeta": {
- "babel-plugin-macros": {
- "optional": true
- }
- }
+ "version": "0.7.0",
+ "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
+ "integrity": "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA=="
},
"node_modules/deep-equal": {
- "version": "2.2.1",
- "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.1.tgz",
- "integrity": "sha512-lKdkdV6EOGoVn65XaOsPdH4rMxTZOnmFyuIkMjM1i5HHCbfjC97dawgTAy0deYNfuqUqW+Q5VrVaQYtUpSd6yQ==",
+ "version": "2.2.3",
+ "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.3.tgz",
+ "integrity": "sha512-ZIwpnevOurS8bpT4192sqAowWM76JDKSHYzMLty3BZGSswgq6pBaH3DhCSW5xVAZICZyKdOBPjwww5wfgT/6PA==",
+ "dev": true,
"dependencies": {
"array-buffer-byte-length": "^1.0.0",
- "call-bind": "^1.0.2",
+ "call-bind": "^1.0.5",
"es-get-iterator": "^1.1.3",
- "get-intrinsic": "^1.2.0",
+ "get-intrinsic": "^1.2.2",
"is-arguments": "^1.1.1",
"is-array-buffer": "^3.0.2",
"is-date-object": "^1.0.5",
@@ -7106,11 +6590,14 @@
"object-is": "^1.1.5",
"object-keys": "^1.1.1",
"object.assign": "^4.1.4",
- "regexp.prototype.flags": "^1.5.0",
+ "regexp.prototype.flags": "^1.5.1",
"side-channel": "^1.0.4",
"which-boxed-primitive": "^1.0.2",
"which-collection": "^1.0.1",
- "which-typed-array": "^1.1.9"
+ "which-typed-array": "^1.1.13"
+ },
+ "engines": {
+ "node": ">= 0.4"
},
"funding": {
"url": "https://github.com/sponsors/ljharb"
@@ -7140,6 +6627,22 @@
"node": ">= 10"
}
},
+ "node_modules/define-data-property": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+ "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
+ "dependencies": {
+ "es-define-property": "^1.0.0",
+ "es-errors": "^1.3.0",
+ "gopd": "^1.0.1"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
"node_modules/define-lazy-prop": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
@@ -7149,10 +6652,11 @@
}
},
"node_modules/define-properties": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz",
- "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==",
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
+ "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
"dependencies": {
+ "define-data-property": "^1.0.1",
"has-property-descriptors": "^1.0.0",
"object-keys": "^1.1.1"
},
@@ -7183,6 +6687,7 @@
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz",
"integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==",
+ "dev": true,
"engines": {
"node": ">=6"
}
@@ -7253,9 +6758,9 @@
}
},
"node_modules/diff-sequences": {
- "version": "29.4.3",
- "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.4.3.tgz",
- "integrity": "sha512-ofrBgwpPhCD85kMKtE9RYFFq6OC1A89oW2vvgWZNCwxrUpRUILopY7lsYyMDSjc8g6U6aiO0Qubg6r4Wgt5ZnA==",
+ "version": "29.6.3",
+ "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
+ "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==",
"dev": true,
"engines": {
"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
@@ -7277,15 +6782,10 @@
"resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz",
"integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA=="
},
- "node_modules/dns-equal": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
- "integrity": "sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg=="
- },
"node_modules/dns-packet": {
- "version": "5.6.0",
- "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.6.0.tgz",
- "integrity": "sha512-rza3UH1LwdHh9qyPXp8lkwpjSNk/AMD3dPytUoRoqnypDUhY0xvbdmVhWOfxO68frEfV9BU8V12Ez7ZsHGZpCQ==",
+ "version": "5.6.1",
+ "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.6.1.tgz",
+ "integrity": "sha512-l4gcSouhcgIKRvyy99RNVOgxXiicE+2jZoNmaNmZ6JXiGajBOJAesk1OBlJuM5k2c+eudGdLxDqXuPCKIj6kpw==",
"dependencies": {
"@leichtgewicht/ip-codec": "^2.0.1"
},
@@ -7346,6 +6846,7 @@
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz",
"integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==",
+ "deprecated": "Use your platform's native DOMException instead",
"dependencies": {
"webidl-conversions": "^5.0.0"
},
@@ -7410,20 +6911,38 @@
"resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-5.1.0.tgz",
"integrity": "sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA=="
},
+ "node_modules/dunder-proto": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
+ "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
+ "dependencies": {
+ "call-bind-apply-helpers": "^1.0.1",
+ "es-errors": "^1.3.0",
+ "gopd": "^1.2.0"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
"node_modules/duplexer": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
"integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg=="
},
+ "node_modules/eastasianwidth": {
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+ "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA=="
+ },
"node_modules/ee-first": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
"integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
},
"node_modules/ejs": {
- "version": "3.1.9",
- "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.9.tgz",
- "integrity": "sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==",
+ "version": "3.1.10",
+ "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz",
+ "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==",
"dependencies": {
"jake": "^10.8.5"
},
@@ -7435,9 +6954,9 @@
}
},
"node_modules/electron-to-chromium": {
- "version": "1.4.433",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.433.tgz",
- "integrity": "sha512-MGO1k0w1RgrfdbLVwmXcDhHHuxCn2qRgR7dYsJvWFKDttvYPx6FNzCGG0c/fBBvzK2LDh3UV7Tt9awnHnvAAUQ=="
+ "version": "1.5.90",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.90.tgz",
+ "integrity": "sha512-C3PN4aydfW91Natdyd449Kw+BzhLmof6tzy5W1pFC5SpQxVXT+oyiyOG9AgYYSN9OdA/ik3YkCrpwqI8ug5Tug=="
},
"node_modules/email-addresses": {
"version": "5.0.0",
@@ -7446,14 +6965,11 @@
"dev": true
},
"node_modules/emittery": {
- "version": "0.13.1",
- "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz",
- "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "0.8.1",
+ "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.8.1.tgz",
+ "integrity": "sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg==",
"engines": {
- "node": ">=12"
+ "node": ">=10"
},
"funding": {
"url": "https://github.com/sindresorhus/emittery?sponsor=1"
@@ -7473,17 +6989,17 @@
}
},
"node_modules/encodeurl": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
- "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
+ "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
"engines": {
"node": ">= 0.8"
}
},
"node_modules/enhanced-resolve": {
- "version": "5.15.0",
- "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz",
- "integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==",
+ "version": "5.18.0",
+ "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.0.tgz",
+ "integrity": "sha512-0/r0MySGYG8YqlayBZ6MuCfECmHFdJ5qyPh8s8wa5Hnm6SaFLSK1VYCbj+NKp090Nm1caZhD+QTnmxO7esYGyQ==",
"dependencies": {
"graceful-fs": "^4.2.4",
"tapable": "^2.2.0"
@@ -7517,44 +7033,61 @@
}
},
"node_modules/es-abstract": {
- "version": "1.21.2",
- "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.2.tgz",
- "integrity": "sha512-y/B5POM2iBnIxCiernH1G7rC9qQoM77lLIMQLuob0zhp8C56Po81+2Nj0WFKnd0pNReDTnkYryc+zhOzpEIROg==",
+ "version": "1.23.9",
+ "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.9.tgz",
+ "integrity": "sha512-py07lI0wjxAC/DcfK1S6G7iANonniZwTISvdPzk9hzeH0IZIshbuuFxLIU96OyF89Yb9hiqWn8M/bY83KY5vzA==",
"dependencies": {
- "array-buffer-byte-length": "^1.0.0",
- "available-typed-arrays": "^1.0.5",
- "call-bind": "^1.0.2",
- "es-set-tostringtag": "^2.0.1",
- "es-to-primitive": "^1.2.1",
- "function.prototype.name": "^1.1.5",
- "get-intrinsic": "^1.2.0",
- "get-symbol-description": "^1.0.0",
- "globalthis": "^1.0.3",
- "gopd": "^1.0.1",
- "has": "^1.0.3",
- "has-property-descriptors": "^1.0.0",
- "has-proto": "^1.0.1",
- "has-symbols": "^1.0.3",
- "internal-slot": "^1.0.5",
- "is-array-buffer": "^3.0.2",
+ "array-buffer-byte-length": "^1.0.2",
+ "arraybuffer.prototype.slice": "^1.0.4",
+ "available-typed-arrays": "^1.0.7",
+ "call-bind": "^1.0.8",
+ "call-bound": "^1.0.3",
+ "data-view-buffer": "^1.0.2",
+ "data-view-byte-length": "^1.0.2",
+ "data-view-byte-offset": "^1.0.1",
+ "es-define-property": "^1.0.1",
+ "es-errors": "^1.3.0",
+ "es-object-atoms": "^1.0.0",
+ "es-set-tostringtag": "^2.1.0",
+ "es-to-primitive": "^1.3.0",
+ "function.prototype.name": "^1.1.8",
+ "get-intrinsic": "^1.2.7",
+ "get-proto": "^1.0.0",
+ "get-symbol-description": "^1.1.0",
+ "globalthis": "^1.0.4",
+ "gopd": "^1.2.0",
+ "has-property-descriptors": "^1.0.2",
+ "has-proto": "^1.2.0",
+ "has-symbols": "^1.1.0",
+ "hasown": "^2.0.2",
+ "internal-slot": "^1.1.0",
+ "is-array-buffer": "^3.0.5",
"is-callable": "^1.2.7",
- "is-negative-zero": "^2.0.2",
- "is-regex": "^1.1.4",
- "is-shared-array-buffer": "^1.0.2",
- "is-string": "^1.0.7",
- "is-typed-array": "^1.1.10",
- "is-weakref": "^1.0.2",
- "object-inspect": "^1.12.3",
+ "is-data-view": "^1.0.2",
+ "is-regex": "^1.2.1",
+ "is-shared-array-buffer": "^1.0.4",
+ "is-string": "^1.1.1",
+ "is-typed-array": "^1.1.15",
+ "is-weakref": "^1.1.0",
+ "math-intrinsics": "^1.1.0",
+ "object-inspect": "^1.13.3",
"object-keys": "^1.1.1",
- "object.assign": "^4.1.4",
- "regexp.prototype.flags": "^1.4.3",
- "safe-regex-test": "^1.0.0",
- "string.prototype.trim": "^1.2.7",
- "string.prototype.trimend": "^1.0.6",
- "string.prototype.trimstart": "^1.0.6",
- "typed-array-length": "^1.0.4",
- "unbox-primitive": "^1.0.2",
- "which-typed-array": "^1.1.9"
+ "object.assign": "^4.1.7",
+ "own-keys": "^1.0.1",
+ "regexp.prototype.flags": "^1.5.3",
+ "safe-array-concat": "^1.1.3",
+ "safe-push-apply": "^1.0.0",
+ "safe-regex-test": "^1.1.0",
+ "set-proto": "^1.0.0",
+ "string.prototype.trim": "^1.2.10",
+ "string.prototype.trimend": "^1.0.9",
+ "string.prototype.trimstart": "^1.0.8",
+ "typed-array-buffer": "^1.0.3",
+ "typed-array-byte-length": "^1.0.3",
+ "typed-array-byte-offset": "^1.0.4",
+ "typed-array-length": "^1.0.7",
+ "unbox-primitive": "^1.1.0",
+ "which-typed-array": "^1.1.18"
},
"engines": {
"node": ">= 0.4"
@@ -7568,10 +7101,27 @@
"resolved": "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz",
"integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA=="
},
+ "node_modules/es-define-property": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
+ "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
+ "node_modules/es-errors": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+ "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
"node_modules/es-get-iterator": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz",
"integrity": "sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==",
+ "dev": true,
"dependencies": {
"call-bind": "^1.0.2",
"get-intrinsic": "^1.1.3",
@@ -7587,40 +7137,78 @@
"url": "https://github.com/sponsors/ljharb"
}
},
+ "node_modules/es-iterator-helpers": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.2.1.tgz",
+ "integrity": "sha512-uDn+FE1yrDzyC0pCo961B2IHbdM8y/ACZsKD4dG6WqrjV53BADjwa7D+1aom2rsNVfLyDgU/eigvlJGJ08OQ4w==",
+ "dependencies": {
+ "call-bind": "^1.0.8",
+ "call-bound": "^1.0.3",
+ "define-properties": "^1.2.1",
+ "es-abstract": "^1.23.6",
+ "es-errors": "^1.3.0",
+ "es-set-tostringtag": "^2.0.3",
+ "function-bind": "^1.1.2",
+ "get-intrinsic": "^1.2.6",
+ "globalthis": "^1.0.4",
+ "gopd": "^1.2.0",
+ "has-property-descriptors": "^1.0.2",
+ "has-proto": "^1.2.0",
+ "has-symbols": "^1.1.0",
+ "internal-slot": "^1.1.0",
+ "iterator.prototype": "^1.1.4",
+ "safe-array-concat": "^1.1.3"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
"node_modules/es-module-lexer": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.3.0.tgz",
- "integrity": "sha512-vZK7T0N2CBmBOixhmjdqx2gWVbFZ4DXZ/NyRMZVlJXPa7CyFS+/a4QQsDGDQy9ZfEzxFuNEsMLeQJnKP2p5/JA=="
+ "version": "1.6.0",
+ "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.6.0.tgz",
+ "integrity": "sha512-qqnD1yMU6tk/jnaMosogGySTZP8YtUgAffA9nMN+E/rjxcfRQ6IEk7IiozUjgxKoFHBGjTLnrHB/YC45r/59EQ=="
+ },
+ "node_modules/es-object-atoms": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
+ "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
+ "dependencies": {
+ "es-errors": "^1.3.0"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ }
},
"node_modules/es-set-tostringtag": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz",
- "integrity": "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==",
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
+ "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
"dependencies": {
- "get-intrinsic": "^1.1.3",
- "has": "^1.0.3",
- "has-tostringtag": "^1.0.0"
+ "es-errors": "^1.3.0",
+ "get-intrinsic": "^1.2.6",
+ "has-tostringtag": "^1.0.2",
+ "hasown": "^2.0.2"
},
"engines": {
"node": ">= 0.4"
}
},
"node_modules/es-shim-unscopables": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
- "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz",
+ "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==",
"dependencies": {
- "has": "^1.0.3"
+ "hasown": "^2.0.0"
}
},
"node_modules/es-to-primitive": {
- "version": "1.2.1",
- "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
- "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.3.0.tgz",
+ "integrity": "sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==",
"dependencies": {
- "is-callable": "^1.1.4",
- "is-date-object": "^1.0.1",
- "is-symbol": "^1.0.2"
+ "is-callable": "^1.2.7",
+ "is-date-object": "^1.0.5",
+ "is-symbol": "^1.0.4"
},
"engines": {
"node": ">= 0.4"
@@ -7630,9 +7218,9 @@
}
},
"node_modules/escalade": {
- "version": "3.1.1",
- "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
- "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+ "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
"engines": {
"node": ">=6"
}
@@ -7683,26 +7271,28 @@
}
},
"node_modules/eslint": {
- "version": "8.43.0",
- "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.43.0.tgz",
- "integrity": "sha512-aaCpf2JqqKesMFGgmRPessmVKjcGXqdlAYLLC3THM8t5nBRZRQ+st5WM/hoJXkdioEXLLbXgclUpM0TXo5HX5Q==",
+ "version": "8.57.1",
+ "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz",
+ "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==",
+ "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.",
"dependencies": {
"@eslint-community/eslint-utils": "^4.2.0",
- "@eslint-community/regexpp": "^4.4.0",
- "@eslint/eslintrc": "^2.0.3",
- "@eslint/js": "8.43.0",
- "@humanwhocodes/config-array": "^0.11.10",
+ "@eslint-community/regexpp": "^4.6.1",
+ "@eslint/eslintrc": "^2.1.4",
+ "@eslint/js": "8.57.1",
+ "@humanwhocodes/config-array": "^0.13.0",
"@humanwhocodes/module-importer": "^1.0.1",
"@nodelib/fs.walk": "^1.2.8",
- "ajv": "^6.10.0",
+ "@ungap/structured-clone": "^1.2.0",
+ "ajv": "^6.12.4",
"chalk": "^4.0.0",
"cross-spawn": "^7.0.2",
"debug": "^4.3.2",
"doctrine": "^3.0.0",
"escape-string-regexp": "^4.0.0",
- "eslint-scope": "^7.2.0",
- "eslint-visitor-keys": "^3.4.1",
- "espree": "^9.5.2",
+ "eslint-scope": "^7.2.2",
+ "eslint-visitor-keys": "^3.4.3",
+ "espree": "^9.6.1",
"esquery": "^1.4.2",
"esutils": "^2.0.2",
"fast-deep-equal": "^3.1.3",
@@ -7712,7 +7302,6 @@
"globals": "^13.19.0",
"graphemer": "^1.4.0",
"ignore": "^5.2.0",
- "import-fresh": "^3.0.0",
"imurmurhash": "^0.1.4",
"is-glob": "^4.0.0",
"is-path-inside": "^3.0.3",
@@ -7722,9 +7311,8 @@
"lodash.merge": "^4.6.2",
"minimatch": "^3.1.2",
"natural-compare": "^1.4.0",
- "optionator": "^0.9.1",
+ "optionator": "^0.9.3",
"strip-ansi": "^6.0.1",
- "strip-json-comments": "^3.1.0",
"text-table": "^0.2.0"
},
"bin": {
@@ -7765,13 +7353,13 @@
}
},
"node_modules/eslint-import-resolver-node": {
- "version": "0.3.7",
- "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz",
- "integrity": "sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==",
+ "version": "0.3.9",
+ "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz",
+ "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==",
"dependencies": {
"debug": "^3.2.7",
- "is-core-module": "^2.11.0",
- "resolve": "^1.22.1"
+ "is-core-module": "^2.13.0",
+ "resolve": "^1.22.4"
}
},
"node_modules/eslint-import-resolver-node/node_modules/debug": {
@@ -7783,9 +7371,9 @@
}
},
"node_modules/eslint-module-utils": {
- "version": "2.8.0",
- "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz",
- "integrity": "sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==",
+ "version": "2.12.0",
+ "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.12.0.tgz",
+ "integrity": "sha512-wALZ0HFoytlyh/1+4wuZ9FJCD/leWHQzzrxJ8+rebyReSLk7LApMyd3WJaLVoN+D5+WIdJyDK1c6JnE65V4Zyg==",
"dependencies": {
"debug": "^3.2.7"
},
@@ -7824,31 +7412,35 @@
}
},
"node_modules/eslint-plugin-import": {
- "version": "2.27.5",
- "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz",
- "integrity": "sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==",
+ "version": "2.31.0",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.31.0.tgz",
+ "integrity": "sha512-ixmkI62Rbc2/w8Vfxyh1jQRTdRTF52VxwRVHl/ykPAmqG+Nb7/kNn+byLP0LxPgI7zWA16Jt82SybJInmMia3A==",
"dependencies": {
- "array-includes": "^3.1.6",
- "array.prototype.flat": "^1.3.1",
- "array.prototype.flatmap": "^1.3.1",
+ "@rtsao/scc": "^1.1.0",
+ "array-includes": "^3.1.8",
+ "array.prototype.findlastindex": "^1.2.5",
+ "array.prototype.flat": "^1.3.2",
+ "array.prototype.flatmap": "^1.3.2",
"debug": "^3.2.7",
"doctrine": "^2.1.0",
- "eslint-import-resolver-node": "^0.3.7",
- "eslint-module-utils": "^2.7.4",
- "has": "^1.0.3",
- "is-core-module": "^2.11.0",
+ "eslint-import-resolver-node": "^0.3.9",
+ "eslint-module-utils": "^2.12.0",
+ "hasown": "^2.0.2",
+ "is-core-module": "^2.15.1",
"is-glob": "^4.0.3",
"minimatch": "^3.1.2",
- "object.values": "^1.1.6",
- "resolve": "^1.22.1",
- "semver": "^6.3.0",
- "tsconfig-paths": "^3.14.1"
+ "object.fromentries": "^2.0.8",
+ "object.groupby": "^1.0.3",
+ "object.values": "^1.2.0",
+ "semver": "^6.3.1",
+ "string.prototype.trimend": "^1.0.8",
+ "tsconfig-paths": "^3.15.0"
},
"engines": {
"node": ">=4"
},
"peerDependencies": {
- "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8"
+ "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 || ^9"
}
},
"node_modules/eslint-plugin-import/node_modules/debug": {
@@ -7894,66 +7486,76 @@
}
},
"node_modules/eslint-plugin-jsx-a11y": {
- "version": "6.7.1",
- "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.7.1.tgz",
- "integrity": "sha512-63Bog4iIethyo8smBklORknVjB0T2dwB8Mr/hIC+fBS0uyHdYYpzM/Ed+YC8VxTjlXHEWFOdmgwcDn1U2L9VCA==",
+ "version": "6.10.2",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.10.2.tgz",
+ "integrity": "sha512-scB3nz4WmG75pV8+3eRUQOHZlNSUhFNq37xnpgRkCCELU3XMvXAxLk1eqWWyE22Ki4Q01Fnsw9BA3cJHDPgn2Q==",
"dependencies": {
- "@babel/runtime": "^7.20.7",
- "aria-query": "^5.1.3",
- "array-includes": "^3.1.6",
- "array.prototype.flatmap": "^1.3.1",
- "ast-types-flow": "^0.0.7",
- "axe-core": "^4.6.2",
- "axobject-query": "^3.1.1",
+ "aria-query": "^5.3.2",
+ "array-includes": "^3.1.8",
+ "array.prototype.flatmap": "^1.3.2",
+ "ast-types-flow": "^0.0.8",
+ "axe-core": "^4.10.0",
+ "axobject-query": "^4.1.0",
"damerau-levenshtein": "^1.0.8",
"emoji-regex": "^9.2.2",
- "has": "^1.0.3",
- "jsx-ast-utils": "^3.3.3",
- "language-tags": "=1.0.5",
+ "hasown": "^2.0.2",
+ "jsx-ast-utils": "^3.3.5",
+ "language-tags": "^1.0.9",
"minimatch": "^3.1.2",
- "object.entries": "^1.1.6",
- "object.fromentries": "^2.0.6",
- "semver": "^6.3.0"
+ "object.fromentries": "^2.0.8",
+ "safe-regex-test": "^1.0.3",
+ "string.prototype.includes": "^2.0.1"
},
"engines": {
"node": ">=4.0"
},
"peerDependencies": {
- "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8"
+ "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9"
+ }
+ },
+ "node_modules/eslint-plugin-jsx-a11y/node_modules/aria-query": {
+ "version": "5.3.2",
+ "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.2.tgz",
+ "integrity": "sha512-COROpnaoap1E2F000S62r6A60uHZnmlvomhfyT2DlTcrY1OrBKn2UhH7qn5wTC9zMvD0AY7csdPSNwKP+7WiQw==",
+ "engines": {
+ "node": ">= 0.4"
}
},
"node_modules/eslint-plugin-react": {
- "version": "7.32.2",
- "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.32.2.tgz",
- "integrity": "sha512-t2fBMa+XzonrrNkyVirzKlvn5RXzzPwRHtMvLAtVZrt8oxgnTQaYbU6SXTOO1mwQgp1y5+toMSKInnzGr0Knqg==",
+ "version": "7.37.4",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.37.4.tgz",
+ "integrity": "sha512-BGP0jRmfYyvOyvMoRX/uoUeW+GqNj9y16bPQzqAHf3AYII/tDs+jMN0dBVkl88/OZwNGwrVFxE7riHsXVfy/LQ==",
"dependencies": {
- "array-includes": "^3.1.6",
- "array.prototype.flatmap": "^1.3.1",
- "array.prototype.tosorted": "^1.1.1",
+ "array-includes": "^3.1.8",
+ "array.prototype.findlast": "^1.2.5",
+ "array.prototype.flatmap": "^1.3.3",
+ "array.prototype.tosorted": "^1.1.4",
"doctrine": "^2.1.0",
+ "es-iterator-helpers": "^1.2.1",
"estraverse": "^5.3.0",
+ "hasown": "^2.0.2",
"jsx-ast-utils": "^2.4.1 || ^3.0.0",
"minimatch": "^3.1.2",
- "object.entries": "^1.1.6",
- "object.fromentries": "^2.0.6",
- "object.hasown": "^1.1.2",
- "object.values": "^1.1.6",
+ "object.entries": "^1.1.8",
+ "object.fromentries": "^2.0.8",
+ "object.values": "^1.2.1",
"prop-types": "^15.8.1",
- "resolve": "^2.0.0-next.4",
- "semver": "^6.3.0",
- "string.prototype.matchall": "^4.0.8"
+ "resolve": "^2.0.0-next.5",
+ "semver": "^6.3.1",
+ "string.prototype.matchall": "^4.0.12",
+ "string.prototype.repeat": "^1.0.0"
},
"engines": {
"node": ">=4"
},
"peerDependencies": {
- "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8"
+ "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9.7"
}
},
"node_modules/eslint-plugin-react-hooks": {
- "version": "4.6.0",
- "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz",
- "integrity": "sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==",
+ "version": "4.6.2",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.2.tgz",
+ "integrity": "sha512-QzliNJq4GinDBcD8gPB5v0wh6g8q3SUi6EFF0x8N/BL9PoVs0atuGc47ozMRyOWAKdwaZ5OnbOEa3WR+dSGKuQ==",
"engines": {
"node": ">=10"
},
@@ -7973,11 +7575,11 @@
}
},
"node_modules/eslint-plugin-react/node_modules/resolve": {
- "version": "2.0.0-next.4",
- "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.4.tgz",
- "integrity": "sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ==",
+ "version": "2.0.0-next.5",
+ "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz",
+ "integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==",
"dependencies": {
- "is-core-module": "^2.9.0",
+ "is-core-module": "^2.13.0",
"path-parse": "^1.0.7",
"supports-preserve-symlinks-flag": "^1.0.0"
},
@@ -7989,9 +7591,9 @@
}
},
"node_modules/eslint-plugin-testing-library": {
- "version": "5.11.0",
- "resolved": "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.11.0.tgz",
- "integrity": "sha512-ELY7Gefo+61OfXKlQeXNIDVVLPcvKTeiQOoMZG9TeuWa7Ln4dUNRv8JdRWBQI9Mbb427XGlVB1aa1QPZxBJM8Q==",
+ "version": "5.11.1",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.11.1.tgz",
+ "integrity": "sha512-5eX9e1Kc2PqVRed3taaLnAAqPZGEX75C+M/rXzUAI3wIg/ZxzUm1OVAwfe/O+vE+6YXOLetSe9g5GKD2ecXipw==",
"dependencies": {
"@typescript-eslint/utils": "^5.58.0"
},
@@ -8004,9 +7606,9 @@
}
},
"node_modules/eslint-scope": {
- "version": "7.2.0",
- "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.0.tgz",
- "integrity": "sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==",
+ "version": "7.2.2",
+ "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
+ "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
"dependencies": {
"esrecurse": "^4.3.0",
"estraverse": "^5.2.0"
@@ -8019,9 +7621,9 @@
}
},
"node_modules/eslint-visitor-keys": {
- "version": "3.4.1",
- "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz",
- "integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==",
+ "version": "3.4.3",
+ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+ "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
"engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
},
@@ -8052,32 +7654,6 @@
"webpack": "^5.0.0"
}
},
- "node_modules/eslint-webpack-plugin/node_modules/ajv": {
- "version": "8.12.0",
- "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
- "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
- "dependencies": {
- "fast-deep-equal": "^3.1.1",
- "json-schema-traverse": "^1.0.0",
- "require-from-string": "^2.0.2",
- "uri-js": "^4.2.2"
- },
- "funding": {
- "type": "github",
- "url": "https://github.com/sponsors/epoberezkin"
- }
- },
- "node_modules/eslint-webpack-plugin/node_modules/ajv-keywords": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
- "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
- "dependencies": {
- "fast-deep-equal": "^3.1.3"
- },
- "peerDependencies": {
- "ajv": "^8.8.2"
- }
- },
"node_modules/eslint-webpack-plugin/node_modules/jest-worker": {
"version": "28.1.3",
"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.3.tgz",
@@ -8091,29 +7667,6 @@
"node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
}
},
- "node_modules/eslint-webpack-plugin/node_modules/json-schema-traverse": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
- "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
- },
- "node_modules/eslint-webpack-plugin/node_modules/schema-utils": {
- "version": "4.2.0",
- "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
- "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
- "dependencies": {
- "@types/json-schema": "^7.0.9",
- "ajv": "^8.9.0",
- "ajv-formats": "^2.1.1",
- "ajv-keywords": "^5.1.0"
- },
- "engines": {
- "node": ">= 12.13.0"
- },
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/webpack"
- }
- },
"node_modules/eslint-webpack-plugin/node_modules/supports-color": {
"version": "8.1.1",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
@@ -8148,10 +7701,21 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
+ "node_modules/eslint/node_modules/glob-parent": {
+ "version": "6.0.2",
+ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+ "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+ "dependencies": {
+ "is-glob": "^4.0.3"
+ },
+ "engines": {
+ "node": ">=10.13.0"
+ }
+ },
"node_modules/eslint/node_modules/globals": {
- "version": "13.20.0",
- "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
- "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
+ "version": "13.24.0",
+ "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
+ "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
"dependencies": {
"type-fest": "^0.20.2"
},
@@ -8227,11 +7791,11 @@
}
},
"node_modules/espree": {
- "version": "9.5.2",
- "resolved": "https://registry.npmjs.org/espree/-/espree-9.5.2.tgz",
- "integrity": "sha512-7OASN1Wma5fum5SrNhFMAMJxOUAbhyfQ8dQ//PJaJbNw0URTPWqIghHWt1MmAANKhHZIYOHruW4Kw4ruUWOdGw==",
+ "version": "9.6.1",
+ "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
+ "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
"dependencies": {
- "acorn": "^8.8.0",
+ "acorn": "^8.9.0",
"acorn-jsx": "^5.3.2",
"eslint-visitor-keys": "^3.4.1"
},
@@ -8255,9 +7819,9 @@
}
},
"node_modules/esquery": {
- "version": "1.5.0",
- "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
- "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
+ "version": "1.6.0",
+ "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz",
+ "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==",
"dependencies": {
"estraverse": "^5.1.0"
},
@@ -8349,105 +7913,52 @@
}
},
"node_modules/expect": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/expect/-/expect-29.6.2.tgz",
- "integrity": "sha512-iAErsLxJ8C+S02QbLAwgSGSezLQK+XXRDt8IuFXFpwCNw2ECmzZSmjKcCaFVp5VRMk+WAvz6h6jokzEzBFZEuA==",
+ "version": "29.7.0",
+ "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz",
+ "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==",
"dev": true,
"dependencies": {
- "@jest/expect-utils": "^29.6.2",
- "@types/node": "*",
- "jest-get-type": "^29.4.3",
- "jest-matcher-utils": "^29.6.2",
- "jest-message-util": "^29.6.2",
- "jest-util": "^29.6.2"
- },
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
- "node_modules/expect/node_modules/@jest/types": {
- "version": "29.6.1",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
- "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
- "dev": true,
- "dependencies": {
- "@jest/schemas": "^29.6.0",
- "@types/istanbul-lib-coverage": "^2.0.0",
- "@types/istanbul-reports": "^3.0.0",
- "@types/node": "*",
- "@types/yargs": "^17.0.8",
- "chalk": "^4.0.0"
- },
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
- "node_modules/expect/node_modules/@types/yargs": {
- "version": "17.0.24",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
- "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
- "dev": true,
- "dependencies": {
- "@types/yargs-parser": "*"
- }
- },
- "node_modules/expect/node_modules/jest-get-type": {
- "version": "29.4.3",
- "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
- "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==",
- "dev": true,
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
- "node_modules/expect/node_modules/jest-util": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
- "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
- "dev": true,
- "dependencies": {
- "@jest/types": "^29.6.1",
- "@types/node": "*",
- "chalk": "^4.0.0",
- "ci-info": "^3.2.0",
- "graceful-fs": "^4.2.9",
- "picomatch": "^2.2.3"
+ "@jest/expect-utils": "^29.7.0",
+ "jest-get-type": "^29.6.3",
+ "jest-matcher-utils": "^29.7.0",
+ "jest-message-util": "^29.7.0",
+ "jest-util": "^29.7.0"
},
"engines": {
"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
}
},
"node_modules/express": {
- "version": "4.18.2",
- "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
- "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
+ "version": "4.21.2",
+ "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz",
+ "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==",
"dependencies": {
"accepts": "~1.3.8",
"array-flatten": "1.1.1",
- "body-parser": "1.20.1",
+ "body-parser": "1.20.3",
"content-disposition": "0.5.4",
"content-type": "~1.0.4",
- "cookie": "0.5.0",
+ "cookie": "0.7.1",
"cookie-signature": "1.0.6",
"debug": "2.6.9",
"depd": "2.0.0",
- "encodeurl": "~1.0.2",
+ "encodeurl": "~2.0.0",
"escape-html": "~1.0.3",
"etag": "~1.8.1",
- "finalhandler": "1.2.0",
+ "finalhandler": "1.3.1",
"fresh": "0.5.2",
"http-errors": "2.0.0",
- "merge-descriptors": "1.0.1",
+ "merge-descriptors": "1.0.3",
"methods": "~1.1.2",
"on-finished": "2.4.1",
"parseurl": "~1.3.3",
- "path-to-regexp": "0.1.7",
+ "path-to-regexp": "0.1.12",
"proxy-addr": "~2.0.7",
- "qs": "6.11.0",
+ "qs": "6.13.0",
"range-parser": "~1.2.1",
"safe-buffer": "5.2.1",
- "send": "0.18.0",
- "serve-static": "1.15.0",
+ "send": "0.19.0",
+ "serve-static": "1.16.2",
"setprototypeof": "1.2.0",
"statuses": "2.0.1",
"type-is": "~1.6.18",
@@ -8456,13 +7967,12 @@
},
"engines": {
"node": ">= 0.10.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/express"
}
},
- "node_modules/express/node_modules/array-flatten": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
- "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
- },
"node_modules/express/node_modules/debug": {
"version": "2.6.9",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -8482,31 +7992,20 @@
"integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
},
"node_modules/fast-glob": {
- "version": "3.2.12",
- "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
- "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
+ "version": "3.3.3",
+ "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
+ "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
"dependencies": {
"@nodelib/fs.stat": "^2.0.2",
"@nodelib/fs.walk": "^1.2.3",
"glob-parent": "^5.1.2",
"merge2": "^1.3.0",
- "micromatch": "^4.0.4"
+ "micromatch": "^4.0.8"
},
"engines": {
"node": ">=8.6.0"
}
},
- "node_modules/fast-glob/node_modules/glob-parent": {
- "version": "5.1.2",
- "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
- "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
- "dependencies": {
- "is-glob": "^4.0.1"
- },
- "engines": {
- "node": ">= 6"
- }
- },
"node_modules/fast-json-stable-stringify": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
@@ -8517,10 +8016,25 @@
"resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
"integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="
},
+ "node_modules/fast-uri": {
+ "version": "3.0.6",
+ "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.6.tgz",
+ "integrity": "sha512-Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw==",
+ "funding": [
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/fastify"
+ },
+ {
+ "type": "opencollective",
+ "url": "https://opencollective.com/fastify"
+ }
+ ]
+ },
"node_modules/fastq": {
- "version": "1.15.0",
- "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
- "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
+ "version": "1.19.0",
+ "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.0.tgz",
+ "integrity": "sha512-7SFSRCNjBQIZH/xZR3iy5iQYR8aGBE0h3VG6/cwlbrpdciNYBMotQav8c1XI3HjHH+NikUpP53nPdlZSdWmFzA==",
"dependencies": {
"reusify": "^1.0.4"
}
@@ -8574,6 +8088,23 @@
"webpack": "^4.0.0 || ^5.0.0"
}
},
+ "node_modules/file-loader/node_modules/schema-utils": {
+ "version": "3.3.0",
+ "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+ "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+ "dependencies": {
+ "@types/json-schema": "^7.0.8",
+ "ajv": "^6.12.5",
+ "ajv-keywords": "^3.5.2"
+ },
+ "engines": {
+ "node": ">= 10.13.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/webpack"
+ }
+ },
"node_modules/filelist": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
@@ -8636,9 +8167,9 @@
}
},
"node_modules/fill-range": {
- "version": "7.0.1",
- "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
- "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+ "version": "7.1.1",
+ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+ "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
"dependencies": {
"to-regex-range": "^5.0.1"
},
@@ -8647,12 +8178,12 @@
}
},
"node_modules/finalhandler": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
- "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
+ "version": "1.3.1",
+ "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz",
+ "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==",
"dependencies": {
"debug": "2.6.9",
- "encodeurl": "~1.0.2",
+ "encodeurl": "~2.0.0",
"escape-html": "~1.0.3",
"on-finished": "2.4.1",
"parseurl": "~1.3.3",
@@ -8705,11 +8236,12 @@
}
},
"node_modules/flat-cache": {
- "version": "3.0.4",
- "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
- "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz",
+ "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==",
"dependencies": {
- "flatted": "^3.1.0",
+ "flatted": "^3.2.9",
+ "keyv": "^4.5.3",
"rimraf": "^3.0.2"
},
"engines": {
@@ -8717,14 +8249,14 @@
}
},
"node_modules/flatted": {
- "version": "3.2.7",
- "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
- "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ=="
+ "version": "3.3.2",
+ "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.2.tgz",
+ "integrity": "sha512-AiwGJM8YcNOaobumgtng+6NHuOqC3A7MixFeDafM3X9cIUM+xUXoS5Vfgf+OihAYe20fxqNM9yPBXJzRtZ/4eA=="
},
"node_modules/follow-redirects": {
- "version": "1.15.2",
- "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
- "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
+ "version": "1.15.9",
+ "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz",
+ "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==",
"funding": [
{
"type": "individual",
@@ -8741,11 +8273,43 @@
}
},
"node_modules/for-each": {
- "version": "0.3.3",
- "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
- "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
+ "version": "0.3.4",
+ "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.4.tgz",
+ "integrity": "sha512-kKaIINnFpzW6ffJNDjjyjrk21BkDx38c0xa/klsT8VzLCaMEefv4ZTacrcVR4DmgTeBra++jMDAfS/tS799YDw==",
"dependencies": {
- "is-callable": "^1.1.3"
+ "is-callable": "^1.2.7"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/foreground-child": {
+ "version": "3.3.0",
+ "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz",
+ "integrity": "sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==",
+ "dependencies": {
+ "cross-spawn": "^7.0.0",
+ "signal-exit": "^4.0.1"
+ },
+ "engines": {
+ "node": ">=14"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/isaacs"
+ }
+ },
+ "node_modules/foreground-child/node_modules/signal-exit": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+ "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+ "engines": {
+ "node": ">=14"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/isaacs"
}
},
"node_modules/fork-ts-checker-webpack-plugin": {
@@ -8815,17 +8379,6 @@
"node": ">=10"
}
},
- "node_modules/fork-ts-checker-webpack-plugin/node_modules/lru-cache": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
- "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
- "dependencies": {
- "yallist": "^4.0.0"
- },
- "engines": {
- "node": ">=10"
- }
- },
"node_modules/fork-ts-checker-webpack-plugin/node_modules/schema-utils": {
"version": "2.7.0",
"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz",
@@ -8844,12 +8397,9 @@
}
},
"node_modules/fork-ts-checker-webpack-plugin/node_modules/semver": {
- "version": "7.5.2",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz",
- "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
- "dependencies": {
- "lru-cache": "^6.0.0"
- },
+ "version": "7.7.0",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.0.tgz",
+ "integrity": "sha512-DrfFnPzblFmNrIZzg5RzHegbiRWg7KMR7btwi2yjHwx06zsUbO5g613sVwEV7FTwmzJu+Io0lJe2GJ3LxqpvBQ==",
"bin": {
"semver": "bin/semver.js"
},
@@ -8865,15 +8415,10 @@
"node": ">=6"
}
},
- "node_modules/fork-ts-checker-webpack-plugin/node_modules/yallist": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
- "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
- },
"node_modules/form-data": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
- "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.2.tgz",
+ "integrity": "sha512-sJe+TQb2vIaIyO783qN6BlMYWMw3WBOHA1Ay2qxsnjuafEOQFJ2JakedOQirT6D5XPRxDvS7AHYyem9fTpb4LQ==",
"dependencies": {
"asynckit": "^0.4.0",
"combined-stream": "^1.0.8",
@@ -8892,15 +8437,15 @@
}
},
"node_modules/fraction.js": {
- "version": "4.2.0",
- "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz",
- "integrity": "sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==",
+ "version": "4.3.7",
+ "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.7.tgz",
+ "integrity": "sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==",
"engines": {
"node": "*"
},
"funding": {
"type": "patreon",
- "url": "https://www.patreon.com/infusion"
+ "url": "https://github.com/sponsors/rawify"
}
},
"node_modules/fresh": {
@@ -8912,9 +8457,9 @@
}
},
"node_modules/fs-extra": {
- "version": "11.1.1",
- "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz",
- "integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==",
+ "version": "11.3.0",
+ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.0.tgz",
+ "integrity": "sha512-Z4XaCL6dUDHfP/jT25jJKMmtxvuwbkrD1vNSMFlo9lNLY2c5FHYSQgHPRZUjAB26TpDEoW9HCOgplrdbaPV/ew==",
"dev": true,
"dependencies": {
"graceful-fs": "^4.2.0",
@@ -8926,9 +8471,9 @@
}
},
"node_modules/fs-monkey": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.4.tgz",
- "integrity": "sha512-INM/fWAxMICjttnD0DX1rBvinKskj5G1w+oy/pnm9u/tSlnBrzFonJMcalKJ30P8RRsPzKcCG7Q8l0jx5Fh9YQ=="
+ "version": "1.0.6",
+ "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.6.tgz",
+ "integrity": "sha512-b1FMfwetIKymC0eioW7mTywihSQE4oLzQn1dB6rZB5fx/3NpNEdAWeCSMB+60/AeT0TCXsxzAlcYVEFCTAksWg=="
},
"node_modules/fs.realpath": {
"version": "1.0.0",
@@ -8936,9 +8481,9 @@
"integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
},
"node_modules/fsevents": {
- "version": "2.3.2",
- "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
- "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+ "version": "2.3.3",
+ "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+ "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
"hasInstallScript": true,
"optional": true,
"os": [
@@ -8949,19 +8494,24 @@
}
},
"node_modules/function-bind": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
- "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+ "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
},
"node_modules/function.prototype.name": {
- "version": "1.1.5",
- "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
- "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
+ "version": "1.1.8",
+ "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.8.tgz",
+ "integrity": "sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==",
"dependencies": {
- "call-bind": "^1.0.2",
- "define-properties": "^1.1.3",
- "es-abstract": "^1.19.0",
- "functions-have-names": "^1.2.2"
+ "call-bind": "^1.0.8",
+ "call-bound": "^1.0.3",
+ "define-properties": "^1.2.1",
+ "functions-have-names": "^1.2.3",
+ "hasown": "^2.0.2",
+ "is-callable": "^1.2.7"
},
"engines": {
"node": ">= 0.4"
@@ -8995,14 +8545,23 @@
}
},
"node_modules/get-intrinsic": {
- "version": "1.2.1",
- "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
- "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
+ "version": "1.2.7",
+ "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.7.tgz",
+ "integrity": "sha512-VW6Pxhsrk0KAOqs3WEd0klDiF/+V7gQOpAvY1jVU/LHmaD/kQO4523aiJuikX/QAKYiW6x8Jh+RJej1almdtCA==",
"dependencies": {
- "function-bind": "^1.1.1",
- "has": "^1.0.3",
- "has-proto": "^1.0.1",
- "has-symbols": "^1.0.3"
+ "call-bind-apply-helpers": "^1.0.1",
+ "es-define-property": "^1.0.1",
+ "es-errors": "^1.3.0",
+ "es-object-atoms": "^1.0.0",
+ "function-bind": "^1.1.2",
+ "get-proto": "^1.0.0",
+ "gopd": "^1.2.0",
+ "has-symbols": "^1.1.0",
+ "hasown": "^2.0.2",
+ "math-intrinsics": "^1.1.0"
+ },
+ "engines": {
+ "node": ">= 0.4"
},
"funding": {
"url": "https://github.com/sponsors/ljharb"
@@ -9021,6 +8580,18 @@
"node": ">=8.0.0"
}
},
+ "node_modules/get-proto": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
+ "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
+ "dependencies": {
+ "dunder-proto": "^1.0.1",
+ "es-object-atoms": "^1.0.0"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
"node_modules/get-stream": {
"version": "6.0.1",
"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
@@ -9033,12 +8604,13 @@
}
},
"node_modules/get-symbol-description": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
- "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.1.0.tgz",
+ "integrity": "sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==",
"dependencies": {
- "call-bind": "^1.0.2",
- "get-intrinsic": "^1.1.1"
+ "call-bound": "^1.0.3",
+ "es-errors": "^1.3.0",
+ "get-intrinsic": "^1.2.6"
},
"engines": {
"node": ">= 0.4"
@@ -9048,18 +8620,18 @@
}
},
"node_modules/gh-pages": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/gh-pages/-/gh-pages-6.0.0.tgz",
- "integrity": "sha512-FXZWJRsvP/fK2HJGY+Di6FRNHvqFF6gOIELaopDjXXgjeOYSNURcuYwEO/6bwuq6koP5Lnkvnr5GViXzuOB89g==",
+ "version": "6.3.0",
+ "resolved": "https://registry.npmjs.org/gh-pages/-/gh-pages-6.3.0.tgz",
+ "integrity": "sha512-Ot5lU6jK0Eb+sszG8pciXdjMXdBJ5wODvgjR+imihTqsUWF2K6dJ9HST55lgqcs8wWcw6o6wAsUzfcYRhJPXbA==",
"dev": true,
"dependencies": {
"async": "^3.2.4",
- "commander": "^11.0.0",
+ "commander": "^13.0.0",
"email-addresses": "^5.0.0",
"filenamify": "^4.3.0",
"find-cache-dir": "^3.3.1",
"fs-extra": "^11.1.1",
- "globby": "^6.1.0"
+ "globby": "^11.1.0"
},
"bin": {
"gh-pages": "bin/gh-pages.js",
@@ -9069,19 +8641,11 @@
"node": ">=10"
}
},
- "node_modules/gh-pages/node_modules/commander": {
- "version": "11.0.0",
- "resolved": "https://registry.npmjs.org/commander/-/commander-11.0.0.tgz",
- "integrity": "sha512-9HMlXtt/BNoYr8ooyjjNRdIilOTkVJXB+GhxMTtOKwk0R4j4lS4NpjuqmRxroBfnfTSHQIHQB7wryHhXarNjmQ==",
- "dev": true,
- "engines": {
- "node": ">=16"
- }
- },
"node_modules/glob": {
"version": "7.2.3",
"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+ "deprecated": "Glob versions prior to v9 are no longer supported",
"dependencies": {
"fs.realpath": "^1.0.0",
"inflight": "^1.0.4",
@@ -9098,14 +8662,14 @@
}
},
"node_modules/glob-parent": {
- "version": "6.0.2",
- "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
- "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+ "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
"dependencies": {
- "is-glob": "^4.0.3"
+ "is-glob": "^4.0.1"
},
"engines": {
- "node": ">=10.13.0"
+ "node": ">= 6"
}
},
"node_modules/glob-to-regexp": {
@@ -9157,11 +8721,12 @@
}
},
"node_modules/globalthis": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz",
- "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==",
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz",
+ "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==",
"dependencies": {
- "define-properties": "^1.1.3"
+ "define-properties": "^1.2.1",
+ "gopd": "^1.0.1"
},
"engines": {
"node": ">= 0.4"
@@ -9171,27 +8736,30 @@
}
},
"node_modules/globby": {
- "version": "6.1.0",
- "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
- "integrity": "sha512-KVbFv2TQtbzCoxAnfD6JcHZTYCzyliEaaeM/gH8qQdkKr5s0OP9scEgvdcngyk7AVdY6YVW/TJHd+lQ/Df3Daw==",
- "dev": true,
+ "version": "11.1.0",
+ "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+ "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
"dependencies": {
- "array-union": "^1.0.1",
- "glob": "^7.0.3",
- "object-assign": "^4.0.1",
- "pify": "^2.0.0",
- "pinkie-promise": "^2.0.0"
+ "array-union": "^2.1.0",
+ "dir-glob": "^3.0.1",
+ "fast-glob": "^3.2.9",
+ "ignore": "^5.2.0",
+ "merge2": "^1.4.1",
+ "slash": "^3.0.0"
},
"engines": {
- "node": ">=0.10.0"
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
}
},
"node_modules/gopd": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
- "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
- "dependencies": {
- "get-intrinsic": "^1.1.3"
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
+ "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
+ "engines": {
+ "node": ">= 0.4"
},
"funding": {
"url": "https://github.com/sponsors/ljharb"
@@ -9202,22 +8770,18 @@
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
"integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
},
- "node_modules/grapheme-splitter": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
- "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ=="
- },
"node_modules/graphemer": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
"integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag=="
},
"node_modules/gremlint": {
- "version": "3.7.0",
- "resolved": "https://registry.npmjs.org/gremlint/-/gremlint-3.7.0.tgz",
- "integrity": "sha512-j0PMkFWONPEemiCg71K9ufugpfC+PpSERo0wC2LZE3Wwh8wF3Lc4WxmszmctSBrVpraVFjUIU1d09JIFjz5lEw==",
+ "version": "3.7.4",
+ "resolved": "https://registry.npmjs.org/gremlint/-/gremlint-3.7.4.tgz",
+ "integrity": "sha512-Y59pNzcCm2ipiaPpg+e0f9rIATJ8JLVE8rrejCfRv8M6u47sHFGEWyh5iNe78mw7wOhVY0PJK36C477/sJfiZw==",
+ "license": "Apache-2.0",
"engines": {
- "node": ">=18"
+ "node": ">=20"
}
},
"node_modules/gzip-size": {
@@ -9244,21 +8808,13 @@
"resolved": "https://registry.npmjs.org/harmony-reflect/-/harmony-reflect-1.6.2.tgz",
"integrity": "sha512-HIp/n38R9kQjDEziXyDTuW3vvoxxyxjxFzXLrBr18uB47GnSt+G9D29fqrpM5ZkspMcPICud3XsBJQ4Y2URg8g=="
},
- "node_modules/has": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
- "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
- "dependencies": {
- "function-bind": "^1.1.1"
- },
- "engines": {
- "node": ">= 0.4.0"
- }
- },
"node_modules/has-bigints": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
- "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.1.0.tgz",
+ "integrity": "sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg==",
+ "engines": {
+ "node": ">= 0.4"
+ },
"funding": {
"url": "https://github.com/sponsors/ljharb"
}
@@ -9272,20 +8828,23 @@
}
},
"node_modules/has-property-descriptors": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
- "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+ "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
"dependencies": {
- "get-intrinsic": "^1.1.1"
+ "es-define-property": "^1.0.0"
},
"funding": {
"url": "https://github.com/sponsors/ljharb"
}
},
"node_modules/has-proto": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
- "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.2.0.tgz",
+ "integrity": "sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==",
+ "dependencies": {
+ "dunder-proto": "^1.0.0"
+ },
"engines": {
"node": ">= 0.4"
},
@@ -9294,9 +8853,9 @@
}
},
"node_modules/has-symbols": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
- "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
+ "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
"engines": {
"node": ">= 0.4"
},
@@ -9305,11 +8864,11 @@
}
},
"node_modules/has-tostringtag": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
- "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
+ "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
"dependencies": {
- "has-symbols": "^1.0.2"
+ "has-symbols": "^1.0.3"
},
"engines": {
"node": ">= 0.4"
@@ -9318,6 +8877,17 @@
"url": "https://github.com/sponsors/ljharb"
}
},
+ "node_modules/hasown": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+ "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+ "dependencies": {
+ "function-bind": "^1.1.2"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
"node_modules/he": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
@@ -9335,12 +8905,6 @@
"react-is": "^16.7.0"
}
},
- "node_modules/hoist-non-react-statics/node_modules/react-is": {
- "version": "16.13.1",
- "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
- "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
- "dev": true
- },
"node_modules/hoopy": {
"version": "0.1.4",
"resolved": "https://registry.npmjs.org/hoopy/-/hoopy-0.1.4.tgz",
@@ -9404,9 +8968,9 @@
}
},
"node_modules/html-entities": {
- "version": "2.3.6",
- "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.3.6.tgz",
- "integrity": "sha512-9o0+dcpIw2/HxkNuYKxSJUF/MMRZQECK4GnF+oQOmJ83yCVHTWgCH5aOXxK5bozNRmM8wtgryjHD3uloPBDEGw==",
+ "version": "2.5.2",
+ "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.5.2.tgz",
+ "integrity": "sha512-K//PSRMQk4FZ78Kyau+mZurHn3FH0Vwr+H36eE0rPbeYkRRi9YxceYPhuN60UwWorxyKHhqoAJl2OFKa4BVtaA==",
"funding": [
{
"type": "github",
@@ -9452,9 +9016,9 @@
}
},
"node_modules/html-webpack-plugin": {
- "version": "5.5.3",
- "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.5.3.tgz",
- "integrity": "sha512-6YrDKTuqaP/TquFH7h4srYWsZx+x6k6+FbsTm0ziCwGHDP78Unr1r9F/H4+sGmMbX08GQcJ+K64x55b+7VM/jg==",
+ "version": "5.6.3",
+ "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.6.3.tgz",
+ "integrity": "sha512-QSf1yjtSAsmf7rYBV7XX86uua4W/vkhIt0xNXKbsi2foEeW7vjJQz4bhnpL3xH+l1ryl1680uNv968Z+X6jSYg==",
"dependencies": {
"@types/html-minifier-terser": "^6.0.0",
"html-minifier-terser": "^6.0.2",
@@ -9470,7 +9034,16 @@
"url": "https://opencollective.com/html-webpack-plugin"
},
"peerDependencies": {
+ "@rspack/core": "0.x || 1.x",
"webpack": "^5.20.0"
+ },
+ "peerDependenciesMeta": {
+ "@rspack/core": {
+ "optional": true
+ },
+ "webpack": {
+ "optional": true
+ }
}
},
"node_modules/htmlparser2": {
@@ -9512,9 +9085,9 @@
}
},
"node_modules/http-parser-js": {
- "version": "0.5.8",
- "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz",
- "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q=="
+ "version": "0.5.9",
+ "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.9.tgz",
+ "integrity": "sha512-n1XsPy3rXVxlqxVioEWdC+0+M+SQw0DpJynwtOPo1X+ZlvdzTLtDBIJJlDQTnwZIFJrZSzSGmIOUdP8tu+SgLw=="
},
"node_modules/http-proxy": {
"version": "1.18.1",
@@ -9543,9 +9116,9 @@
}
},
"node_modules/http-proxy-middleware": {
- "version": "2.0.6",
- "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz",
- "integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==",
+ "version": "2.0.7",
+ "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.7.tgz",
+ "integrity": "sha512-fgVY8AV7qU7z/MmXJ/rxwbrtQH4jBQ9m7kp3llF0liB7glmFeVZFBepQb32T3y8n8k2+AEYuMPCpinYW+/CuRA==",
"dependencies": {
"@types/http-proxy": "^1.17.8",
"http-proxy": "^1.18.1",
@@ -9624,9 +9197,9 @@
}
},
"node_modules/ignore": {
- "version": "5.2.4",
- "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
- "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
+ "version": "5.3.2",
+ "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
+ "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
"engines": {
"node": ">= 4"
}
@@ -9664,9 +9237,9 @@
}
},
"node_modules/import-local": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz",
- "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==",
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz",
+ "integrity": "sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==",
"dependencies": {
"pkg-dir": "^4.2.0",
"resolve-cwd": "^3.0.0"
@@ -9702,6 +9275,7 @@
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
"integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+ "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
"dependencies": {
"once": "^1.3.0",
"wrappy": "1"
@@ -9718,33 +9292,34 @@
"integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
},
"node_modules/internal-slot": {
- "version": "1.0.5",
- "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz",
- "integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==",
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.1.0.tgz",
+ "integrity": "sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==",
"dependencies": {
- "get-intrinsic": "^1.2.0",
- "has": "^1.0.3",
- "side-channel": "^1.0.4"
+ "es-errors": "^1.3.0",
+ "hasown": "^2.0.2",
+ "side-channel": "^1.1.0"
},
"engines": {
"node": ">= 0.4"
}
},
"node_modules/ipaddr.js": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.1.0.tgz",
- "integrity": "sha512-LlbxQ7xKzfBusov6UMi4MFpEg0m+mAm9xyNGEduwXMEDuf4WfzB/RZwMVYEd7IKGvh4IUkEXYxtAVu9T3OelJQ==",
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.2.0.tgz",
+ "integrity": "sha512-Ag3wB2o37wslZS19hZqorUnrnzSkpOVy+IiiDEiTqNubEYpYuHWIf6K4psgN2ZWKExS4xhVCrRVfb/wfW8fWJA==",
"engines": {
"node": ">= 10"
}
},
"node_modules/is-arguments": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
- "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.2.0.tgz",
+ "integrity": "sha512-7bVbi0huj/wrIAOzb8U1aszg9kdi3KN/CyU19CTI7tAoZYEZoL9yCDXpbXN+uPsuWnP02cyug1gleqq+TU+YCA==",
+ "dev": true,
"dependencies": {
- "call-bind": "^1.0.2",
- "has-tostringtag": "^1.0.0"
+ "call-bound": "^1.0.2",
+ "has-tostringtag": "^1.0.2"
},
"engines": {
"node": ">= 0.4"
@@ -9754,13 +9329,16 @@
}
},
"node_modules/is-array-buffer": {
- "version": "3.0.2",
- "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz",
- "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==",
+ "version": "3.0.5",
+ "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.5.tgz",
+ "integrity": "sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==",
"dependencies": {
- "call-bind": "^1.0.2",
- "get-intrinsic": "^1.2.0",
- "is-typed-array": "^1.1.10"
+ "call-bind": "^1.0.8",
+ "call-bound": "^1.0.3",
+ "get-intrinsic": "^1.2.6"
+ },
+ "engines": {
+ "node": ">= 0.4"
},
"funding": {
"url": "https://github.com/sponsors/ljharb"
@@ -9771,12 +9349,33 @@
"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
"integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="
},
- "node_modules/is-bigint": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
- "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
+ "node_modules/is-async-function": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.1.1.tgz",
+ "integrity": "sha512-9dgM/cZBnNvjzaMYHVoxxfPj2QXt22Ev7SuuPrs+xav0ukGB0S6d4ydZdEiM48kLx5kDV+QBPrpVnFyefL8kkQ==",
"dependencies": {
- "has-bigints": "^1.0.1"
+ "async-function": "^1.0.0",
+ "call-bound": "^1.0.3",
+ "get-proto": "^1.0.1",
+ "has-tostringtag": "^1.0.2",
+ "safe-regex-test": "^1.1.0"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/is-bigint": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.1.0.tgz",
+ "integrity": "sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==",
+ "dependencies": {
+ "has-bigints": "^1.0.2"
+ },
+ "engines": {
+ "node": ">= 0.4"
},
"funding": {
"url": "https://github.com/sponsors/ljharb"
@@ -9794,12 +9393,12 @@
}
},
"node_modules/is-boolean-object": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
- "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.2.1.tgz",
+ "integrity": "sha512-l9qO6eFlUETHtuihLcYOaLKByJ1f+N4kthcU9YjHy3N+B3hWv0y/2Nd0mu/7lTFnRQHTrSdXF50HQ3bl5fEnng==",
"dependencies": {
- "call-bind": "^1.0.2",
- "has-tostringtag": "^1.0.0"
+ "call-bound": "^1.0.2",
+ "has-tostringtag": "^1.0.2"
},
"engines": {
"node": ">= 0.4"
@@ -9820,22 +9419,42 @@
}
},
"node_modules/is-core-module": {
- "version": "2.12.1",
- "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.1.tgz",
- "integrity": "sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==",
+ "version": "2.16.1",
+ "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
+ "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
"dependencies": {
- "has": "^1.0.3"
+ "hasown": "^2.0.2"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/is-data-view": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.2.tgz",
+ "integrity": "sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==",
+ "dependencies": {
+ "call-bound": "^1.0.2",
+ "get-intrinsic": "^1.2.6",
+ "is-typed-array": "^1.1.13"
+ },
+ "engines": {
+ "node": ">= 0.4"
},
"funding": {
"url": "https://github.com/sponsors/ljharb"
}
},
"node_modules/is-date-object": {
- "version": "1.0.5",
- "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
- "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.1.0.tgz",
+ "integrity": "sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==",
"dependencies": {
- "has-tostringtag": "^1.0.0"
+ "call-bound": "^1.0.2",
+ "has-tostringtag": "^1.0.2"
},
"engines": {
"node": ">= 0.4"
@@ -9866,6 +9485,20 @@
"node": ">=0.10.0"
}
},
+ "node_modules/is-finalizationregistry": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.1.1.tgz",
+ "integrity": "sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==",
+ "dependencies": {
+ "call-bound": "^1.0.3"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
"node_modules/is-fullwidth-code-point": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
@@ -9882,6 +9515,23 @@
"node": ">=6"
}
},
+ "node_modules/is-generator-function": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.1.0.tgz",
+ "integrity": "sha512-nPUB5km40q9e8UfN/Zc24eLlzdSf9OfKByBw9CIdw4H1giPMeA0OIJvbchsCu4npfI2QcMVBsGEBHKZ7wLTWmQ==",
+ "dependencies": {
+ "call-bound": "^1.0.3",
+ "get-proto": "^1.0.0",
+ "has-tostringtag": "^1.0.2",
+ "safe-regex-test": "^1.1.0"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
"node_modules/is-glob": {
"version": "4.0.3",
"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
@@ -9894,9 +9544,12 @@
}
},
"node_modules/is-map": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz",
- "integrity": "sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==",
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz",
+ "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==",
+ "engines": {
+ "node": ">= 0.4"
+ },
"funding": {
"url": "https://github.com/sponsors/ljharb"
}
@@ -9906,17 +9559,6 @@
"resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz",
"integrity": "sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g=="
},
- "node_modules/is-negative-zero": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
- "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
- "engines": {
- "node": ">= 0.4"
- },
- "funding": {
- "url": "https://github.com/sponsors/ljharb"
- }
- },
"node_modules/is-number": {
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
@@ -9926,11 +9568,12 @@
}
},
"node_modules/is-number-object": {
- "version": "1.0.7",
- "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
- "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.1.1.tgz",
+ "integrity": "sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==",
"dependencies": {
- "has-tostringtag": "^1.0.0"
+ "call-bound": "^1.0.3",
+ "has-tostringtag": "^1.0.2"
},
"engines": {
"node": ">= 0.4"
@@ -9972,12 +9615,14 @@
"integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ=="
},
"node_modules/is-regex": {
- "version": "1.1.4",
- "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
- "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz",
+ "integrity": "sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==",
"dependencies": {
- "call-bind": "^1.0.2",
- "has-tostringtag": "^1.0.0"
+ "call-bound": "^1.0.2",
+ "gopd": "^1.2.0",
+ "has-tostringtag": "^1.0.2",
+ "hasown": "^2.0.2"
},
"engines": {
"node": ">= 0.4"
@@ -10003,19 +9648,25 @@
}
},
"node_modules/is-set": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz",
- "integrity": "sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==",
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz",
+ "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==",
+ "engines": {
+ "node": ">= 0.4"
+ },
"funding": {
"url": "https://github.com/sponsors/ljharb"
}
},
"node_modules/is-shared-array-buffer": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
- "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.4.tgz",
+ "integrity": "sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==",
"dependencies": {
- "call-bind": "^1.0.2"
+ "call-bound": "^1.0.3"
+ },
+ "engines": {
+ "node": ">= 0.4"
},
"funding": {
"url": "https://github.com/sponsors/ljharb"
@@ -10033,11 +9684,12 @@
}
},
"node_modules/is-string": {
- "version": "1.0.7",
- "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
- "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.1.1.tgz",
+ "integrity": "sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==",
"dependencies": {
- "has-tostringtag": "^1.0.0"
+ "call-bound": "^1.0.3",
+ "has-tostringtag": "^1.0.2"
},
"engines": {
"node": ">= 0.4"
@@ -10047,11 +9699,13 @@
}
},
"node_modules/is-symbol": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
- "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.1.1.tgz",
+ "integrity": "sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==",
"dependencies": {
- "has-symbols": "^1.0.2"
+ "call-bound": "^1.0.2",
+ "has-symbols": "^1.1.0",
+ "safe-regex-test": "^1.1.0"
},
"engines": {
"node": ">= 0.4"
@@ -10061,15 +9715,11 @@
}
},
"node_modules/is-typed-array": {
- "version": "1.1.10",
- "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz",
- "integrity": "sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==",
+ "version": "1.1.15",
+ "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.15.tgz",
+ "integrity": "sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==",
"dependencies": {
- "available-typed-arrays": "^1.0.5",
- "call-bind": "^1.0.2",
- "for-each": "^0.3.3",
- "gopd": "^1.0.1",
- "has-tostringtag": "^1.0.0"
+ "which-typed-array": "^1.1.16"
},
"engines": {
"node": ">= 0.4"
@@ -10084,31 +9734,40 @@
"integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA=="
},
"node_modules/is-weakmap": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz",
- "integrity": "sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==",
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz",
+ "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==",
+ "engines": {
+ "node": ">= 0.4"
+ },
"funding": {
"url": "https://github.com/sponsors/ljharb"
}
},
"node_modules/is-weakref": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
- "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.1.0.tgz",
+ "integrity": "sha512-SXM8Nwyys6nT5WP6pltOwKytLV7FqQ4UiibxVmW+EIosHcmCqkkjViTb5SNssDlkCiEYRP1/pdWUKVvZBmsR2Q==",
"dependencies": {
- "call-bind": "^1.0.2"
+ "call-bound": "^1.0.2"
+ },
+ "engines": {
+ "node": ">= 0.4"
},
"funding": {
"url": "https://github.com/sponsors/ljharb"
}
},
"node_modules/is-weakset": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.2.tgz",
- "integrity": "sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==",
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.4.tgz",
+ "integrity": "sha512-mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ==",
"dependencies": {
- "call-bind": "^1.0.2",
- "get-intrinsic": "^1.1.1"
+ "call-bound": "^1.0.3",
+ "get-intrinsic": "^1.2.6"
+ },
+ "engines": {
+ "node": ">= 0.4"
},
"funding": {
"url": "https://github.com/sponsors/ljharb"
@@ -10136,9 +9795,9 @@
"integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
},
"node_modules/istanbul-lib-coverage": {
- "version": "3.2.0",
- "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz",
- "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==",
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
+ "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",
"engines": {
"node": ">=8"
}
@@ -10171,17 +9830,6 @@
"node": ">=10"
}
},
- "node_modules/istanbul-lib-report/node_modules/lru-cache": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
- "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
- "dependencies": {
- "yallist": "^4.0.0"
- },
- "engines": {
- "node": ">=10"
- }
- },
"node_modules/istanbul-lib-report/node_modules/make-dir": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
@@ -10197,12 +9845,9 @@
}
},
"node_modules/istanbul-lib-report/node_modules/semver": {
- "version": "7.5.4",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
- "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
- "dependencies": {
- "lru-cache": "^6.0.0"
- },
+ "version": "7.7.0",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.0.tgz",
+ "integrity": "sha512-DrfFnPzblFmNrIZzg5RzHegbiRWg7KMR7btwi2yjHwx06zsUbO5g613sVwEV7FTwmzJu+Io0lJe2GJ3LxqpvBQ==",
"bin": {
"semver": "bin/semver.js"
},
@@ -10210,11 +9855,6 @@
"node": ">=10"
}
},
- "node_modules/istanbul-lib-report/node_modules/yallist": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
- "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
- },
"node_modules/istanbul-lib-source-maps": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
@@ -10237,9 +9877,9 @@
}
},
"node_modules/istanbul-reports": {
- "version": "3.1.6",
- "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.6.tgz",
- "integrity": "sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg==",
+ "version": "3.1.7",
+ "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz",
+ "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==",
"dependencies": {
"html-escaper": "^2.0.0",
"istanbul-lib-report": "^3.0.0"
@@ -10248,10 +9888,40 @@
"node": ">=8"
}
},
+ "node_modules/iterator.prototype": {
+ "version": "1.1.5",
+ "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.5.tgz",
+ "integrity": "sha512-H0dkQoCa3b2VEeKQBOxFph+JAbcrQdE7KC0UkqwpLmv2EC4P41QXP+rqo9wYodACiG5/WM5s9oDApTU8utwj9g==",
+ "dependencies": {
+ "define-data-property": "^1.1.4",
+ "es-object-atoms": "^1.0.0",
+ "get-intrinsic": "^1.2.6",
+ "get-proto": "^1.0.0",
+ "has-symbols": "^1.1.0",
+ "set-function-name": "^2.0.2"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
+ "node_modules/jackspeak": {
+ "version": "3.4.3",
+ "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
+ "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
+ "dependencies": {
+ "@isaacs/cliui": "^8.0.2"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/isaacs"
+ },
+ "optionalDependencies": {
+ "@pkgjs/parseargs": "^0.11.0"
+ }
+ },
"node_modules/jake": {
- "version": "10.8.7",
- "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.7.tgz",
- "integrity": "sha512-ZDi3aP+fG/LchyBzUM804VjddnwfSfsdeYkwt8NcbKRvo4rFkjhs456iLFn3k2ZUWvNe4i48WACDbza8fhq2+w==",
+ "version": "10.9.2",
+ "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.2.tgz",
+ "integrity": "sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==",
"dependencies": {
"async": "^3.2.3",
"chalk": "^4.0.2",
@@ -10266,23 +9936,19 @@
}
},
"node_modules/jest": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest/-/jest-29.6.2.tgz",
- "integrity": "sha512-8eQg2mqFbaP7CwfsTpCxQ+sHzw1WuNWL5UUvjnWP4hx2riGz9fPSzYOaU5q8/GqWn1TfgZIVTqYJygbGbWAANg==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/jest/-/jest-27.5.1.tgz",
+ "integrity": "sha512-Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ==",
"dependencies": {
- "@jest/core": "^29.6.2",
- "@jest/types": "^29.6.1",
+ "@jest/core": "^27.5.1",
"import-local": "^3.0.2",
- "jest-cli": "^29.6.2"
+ "jest-cli": "^27.5.1"
},
"bin": {
"jest": "bin/jest.js"
},
"engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
},
"peerDependencies": {
"node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
@@ -10294,123 +9960,176 @@
}
},
"node_modules/jest-changed-files": {
- "version": "29.5.0",
- "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.5.0.tgz",
- "integrity": "sha512-IFG34IUMUaNBIxjQXF/iu7g6EcdMrGRRxaUSw92I/2g2YC6vCdTltl4nHvt7Ci5nSJwXIkCu8Ka1DKF+X7Z1Ag==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-27.5.1.tgz",
+ "integrity": "sha512-buBLMiByfWGCoMsLLzGUUSpAmIAGnbR2KJoMN10ziLhOLvP4e0SlypHnAel8iqQXTrcbmfEY9sSqae5sgUsTvw==",
"dependencies": {
+ "@jest/types": "^27.5.1",
"execa": "^5.0.0",
- "p-limit": "^3.1.0"
+ "throat": "^6.0.1"
},
"engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
- "node_modules/jest-changed-files/node_modules/p-limit": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
- "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "node_modules/jest-changed-files/node_modules/@jest/types": {
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+ "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
"dependencies": {
- "yocto-queue": "^0.1.0"
- },
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/jest-circus": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.6.2.tgz",
- "integrity": "sha512-G9mN+KOYIUe2sB9kpJkO9Bk18J4dTDArNFPwoZ7WKHKel55eKIS/u2bLthxgojwlf9NLCVQfgzM/WsOVvoC6Fw==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
- "@jest/environment": "^29.6.2",
- "@jest/expect": "^29.6.2",
- "@jest/test-result": "^29.6.2",
- "@jest/types": "^29.6.1",
- "@types/node": "*",
- "chalk": "^4.0.0",
- "co": "^4.6.0",
- "dedent": "^1.0.0",
- "is-generator-fn": "^2.0.0",
- "jest-each": "^29.6.2",
- "jest-matcher-utils": "^29.6.2",
- "jest-message-util": "^29.6.2",
- "jest-runtime": "^29.6.2",
- "jest-snapshot": "^29.6.2",
- "jest-util": "^29.6.2",
- "p-limit": "^3.1.0",
- "pretty-format": "^29.6.2",
- "pure-rand": "^6.0.0",
- "slash": "^3.0.0",
- "stack-utils": "^2.0.3"
- },
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
- "node_modules/jest-circus/node_modules/@jest/types": {
- "version": "29.6.1",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
- "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
- "@jest/schemas": "^29.6.0",
"@types/istanbul-lib-coverage": "^2.0.0",
"@types/istanbul-reports": "^3.0.0",
"@types/node": "*",
- "@types/yargs": "^17.0.8",
+ "@types/yargs": "^16.0.0",
"chalk": "^4.0.0"
},
"engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
- "node_modules/jest-circus/node_modules/@types/yargs": {
- "version": "17.0.24",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
- "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "node_modules/jest-changed-files/node_modules/@types/yargs": {
+ "version": "16.0.9",
+ "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz",
+ "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==",
"dependencies": {
"@types/yargs-parser": "*"
}
},
- "node_modules/jest-circus/node_modules/ansi-styles": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
- "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
- "dev": true,
- "optional": true,
- "peer": true,
- "engines": {
- "node": ">=10"
+ "node_modules/jest-circus": {
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-27.5.1.tgz",
+ "integrity": "sha512-D95R7x5UtlMA5iBYsOHFFbMD/GVA4R/Kdq15f7xYWUfWHBto9NYRsOvnSauTgdF+ogCpJ4tyKOXhUifxS65gdw==",
+ "dependencies": {
+ "@jest/environment": "^27.5.1",
+ "@jest/test-result": "^27.5.1",
+ "@jest/types": "^27.5.1",
+ "@types/node": "*",
+ "chalk": "^4.0.0",
+ "co": "^4.6.0",
+ "dedent": "^0.7.0",
+ "expect": "^27.5.1",
+ "is-generator-fn": "^2.0.0",
+ "jest-each": "^27.5.1",
+ "jest-matcher-utils": "^27.5.1",
+ "jest-message-util": "^27.5.1",
+ "jest-runtime": "^27.5.1",
+ "jest-snapshot": "^27.5.1",
+ "jest-util": "^27.5.1",
+ "pretty-format": "^27.5.1",
+ "slash": "^3.0.0",
+ "stack-utils": "^2.0.3",
+ "throat": "^6.0.1"
},
- "funding": {
- "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+ "engines": {
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+ }
+ },
+ "node_modules/jest-circus/node_modules/@jest/types": {
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+ "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+ "dependencies": {
+ "@types/istanbul-lib-coverage": "^2.0.0",
+ "@types/istanbul-reports": "^3.0.0",
+ "@types/node": "*",
+ "@types/yargs": "^16.0.0",
+ "chalk": "^4.0.0"
+ },
+ "engines": {
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+ }
+ },
+ "node_modules/jest-circus/node_modules/@types/yargs": {
+ "version": "16.0.9",
+ "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz",
+ "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==",
+ "dependencies": {
+ "@types/yargs-parser": "*"
+ }
+ },
+ "node_modules/jest-circus/node_modules/diff-sequences": {
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.5.1.tgz",
+ "integrity": "sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==",
+ "engines": {
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+ }
+ },
+ "node_modules/jest-circus/node_modules/expect": {
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/expect/-/expect-27.5.1.tgz",
+ "integrity": "sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==",
+ "dependencies": {
+ "@jest/types": "^27.5.1",
+ "jest-get-type": "^27.5.1",
+ "jest-matcher-utils": "^27.5.1",
+ "jest-message-util": "^27.5.1"
+ },
+ "engines": {
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+ }
+ },
+ "node_modules/jest-circus/node_modules/jest-diff": {
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.1.tgz",
+ "integrity": "sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==",
+ "dependencies": {
+ "chalk": "^4.0.0",
+ "diff-sequences": "^27.5.1",
+ "jest-get-type": "^27.5.1",
+ "pretty-format": "^27.5.1"
+ },
+ "engines": {
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+ }
+ },
+ "node_modules/jest-circus/node_modules/jest-get-type": {
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz",
+ "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==",
+ "engines": {
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+ }
+ },
+ "node_modules/jest-circus/node_modules/jest-matcher-utils": {
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz",
+ "integrity": "sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==",
+ "dependencies": {
+ "chalk": "^4.0.0",
+ "jest-diff": "^27.5.1",
+ "jest-get-type": "^27.5.1",
+ "pretty-format": "^27.5.1"
+ },
+ "engines": {
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+ }
+ },
+ "node_modules/jest-circus/node_modules/jest-message-util": {
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
+ "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
+ "dependencies": {
+ "@babel/code-frame": "^7.12.13",
+ "@jest/types": "^27.5.1",
+ "@types/stack-utils": "^2.0.0",
+ "chalk": "^4.0.0",
+ "graceful-fs": "^4.2.9",
+ "micromatch": "^4.0.4",
+ "pretty-format": "^27.5.1",
+ "slash": "^3.0.0",
+ "stack-utils": "^2.0.3"
+ },
+ "engines": {
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
"node_modules/jest-circus/node_modules/jest-util": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
- "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
+ "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
"dependencies": {
- "@jest/types": "^29.6.1",
+ "@jest/types": "^27.5.1",
"@types/node": "*",
"chalk": "^4.0.0",
"ci-info": "^3.2.0",
@@ -10418,68 +10137,32 @@
"picomatch": "^2.2.3"
},
"engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
- "node_modules/jest-circus/node_modules/p-limit": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
- "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
- "yocto-queue": "^0.1.0"
- },
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/jest-circus/node_modules/pretty-format": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.2.tgz",
- "integrity": "sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
- "@jest/schemas": "^29.6.0",
- "ansi-styles": "^5.0.0",
- "react-is": "^18.0.0"
- },
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
"node_modules/jest-cli": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.6.2.tgz",
- "integrity": "sha512-TT6O247v6dCEX2UGHGyflMpxhnrL0DNqP2fRTKYm3nJJpCTfXX3GCMQPGFjXDoj0i5/Blp3jriKXFgdfmbYB6Q==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-27.5.1.tgz",
+ "integrity": "sha512-Hc6HOOwYq4/74/c62dEE3r5elx8wjYqxY0r0G/nFrLDPMFRu6RA/u8qINOIkvhxG7mMQ5EJsOGfRpI8L6eFUVw==",
"dependencies": {
- "@jest/core": "^29.6.2",
- "@jest/test-result": "^29.6.2",
- "@jest/types": "^29.6.1",
+ "@jest/core": "^27.5.1",
+ "@jest/test-result": "^27.5.1",
+ "@jest/types": "^27.5.1",
"chalk": "^4.0.0",
"exit": "^0.1.2",
"graceful-fs": "^4.2.9",
"import-local": "^3.0.2",
- "jest-config": "^29.6.2",
- "jest-util": "^29.6.2",
- "jest-validate": "^29.6.2",
+ "jest-config": "^27.5.1",
+ "jest-util": "^27.5.1",
+ "jest-validate": "^27.5.1",
"prompts": "^2.0.1",
- "yargs": "^17.3.1"
+ "yargs": "^16.2.0"
},
"bin": {
"jest": "bin/jest.js"
},
"engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
},
"peerDependencies": {
"node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
@@ -10491,69 +10174,34 @@
}
},
"node_modules/jest-cli/node_modules/@jest/types": {
- "version": "29.6.1",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
- "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+ "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
"dependencies": {
- "@jest/schemas": "^29.6.0",
"@types/istanbul-lib-coverage": "^2.0.0",
"@types/istanbul-reports": "^3.0.0",
"@types/node": "*",
- "@types/yargs": "^17.0.8",
+ "@types/yargs": "^16.0.0",
"chalk": "^4.0.0"
},
"engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
"node_modules/jest-cli/node_modules/@types/yargs": {
- "version": "17.0.24",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
- "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "16.0.9",
+ "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz",
+ "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==",
"dependencies": {
"@types/yargs-parser": "*"
}
},
- "node_modules/jest-cli/node_modules/ansi-styles": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
- "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
- "dev": true,
- "optional": true,
- "peer": true,
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/chalk/ansi-styles?sponsor=1"
- }
- },
- "node_modules/jest-cli/node_modules/jest-get-type": {
- "version": "29.4.3",
- "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
- "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
"node_modules/jest-cli/node_modules/jest-util": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
- "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
+ "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
"dependencies": {
- "@jest/types": "^29.6.1",
+ "@jest/types": "^27.5.1",
"@types/node": "*",
"chalk": "^4.0.0",
"ci-info": "^3.2.0",
@@ -10561,309 +10209,88 @@
"picomatch": "^2.2.3"
},
"engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
- "node_modules/jest-cli/node_modules/jest-validate": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.6.2.tgz",
- "integrity": "sha512-vGz0yMN5fUFRRbpJDPwxMpgSXW1LDKROHfBopAvDcmD6s+B/s8WJrwi+4bfH4SdInBA5C3P3BI19dBtKzx1Arg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
- "@jest/types": "^29.6.1",
- "camelcase": "^6.2.0",
- "chalk": "^4.0.0",
- "jest-get-type": "^29.4.3",
- "leven": "^3.1.0",
- "pretty-format": "^29.6.2"
- },
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
- "node_modules/jest-cli/node_modules/pretty-format": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.2.tgz",
- "integrity": "sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
- "@jest/schemas": "^29.6.0",
- "ansi-styles": "^5.0.0",
- "react-is": "^18.0.0"
- },
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
"node_modules/jest-config": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.6.2.tgz",
- "integrity": "sha512-VxwFOC8gkiJbuodG9CPtMRjBUNZEHxwfQXmIudSTzFWxaci3Qub1ddTRbFNQlD/zUeaifLndh/eDccFX4wCMQw==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-27.5.1.tgz",
+ "integrity": "sha512-5sAsjm6tGdsVbW9ahcChPAFCk4IlkQUknH5AvKjuLTSlcO/wCZKyFdn7Rg0EkC+OGgWODEy2hDpWB1PgzH0JNA==",
"dependencies": {
- "@babel/core": "^7.11.6",
- "@jest/test-sequencer": "^29.6.2",
- "@jest/types": "^29.6.1",
- "babel-jest": "^29.6.2",
+ "@babel/core": "^7.8.0",
+ "@jest/test-sequencer": "^27.5.1",
+ "@jest/types": "^27.5.1",
+ "babel-jest": "^27.5.1",
"chalk": "^4.0.0",
"ci-info": "^3.2.0",
"deepmerge": "^4.2.2",
- "glob": "^7.1.3",
+ "glob": "^7.1.1",
"graceful-fs": "^4.2.9",
- "jest-circus": "^29.6.2",
- "jest-environment-node": "^29.6.2",
- "jest-get-type": "^29.4.3",
- "jest-regex-util": "^29.4.3",
- "jest-resolve": "^29.6.2",
- "jest-runner": "^29.6.2",
- "jest-util": "^29.6.2",
- "jest-validate": "^29.6.2",
+ "jest-circus": "^27.5.1",
+ "jest-environment-jsdom": "^27.5.1",
+ "jest-environment-node": "^27.5.1",
+ "jest-get-type": "^27.5.1",
+ "jest-jasmine2": "^27.5.1",
+ "jest-regex-util": "^27.5.1",
+ "jest-resolve": "^27.5.1",
+ "jest-runner": "^27.5.1",
+ "jest-util": "^27.5.1",
+ "jest-validate": "^27.5.1",
"micromatch": "^4.0.4",
"parse-json": "^5.2.0",
- "pretty-format": "^29.6.2",
+ "pretty-format": "^27.5.1",
"slash": "^3.0.0",
"strip-json-comments": "^3.1.1"
},
"engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
},
"peerDependencies": {
- "@types/node": "*",
"ts-node": ">=9.0.0"
},
"peerDependenciesMeta": {
- "@types/node": {
- "optional": true
- },
"ts-node": {
"optional": true
}
}
},
- "node_modules/jest-config/node_modules/@jest/transform": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.6.2.tgz",
- "integrity": "sha512-ZqCqEISr58Ce3U+buNFJYUktLJZOggfyvR+bZMaiV1e8B1SIvJbwZMrYz3gx/KAPn9EXmOmN+uB08yLCjWkQQg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
- "@babel/core": "^7.11.6",
- "@jest/types": "^29.6.1",
- "@jridgewell/trace-mapping": "^0.3.18",
- "babel-plugin-istanbul": "^6.1.1",
- "chalk": "^4.0.0",
- "convert-source-map": "^2.0.0",
- "fast-json-stable-stringify": "^2.1.0",
- "graceful-fs": "^4.2.9",
- "jest-haste-map": "^29.6.2",
- "jest-regex-util": "^29.4.3",
- "jest-util": "^29.6.2",
- "micromatch": "^4.0.4",
- "pirates": "^4.0.4",
- "slash": "^3.0.0",
- "write-file-atomic": "^4.0.2"
- },
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
"node_modules/jest-config/node_modules/@jest/types": {
- "version": "29.6.1",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
- "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+ "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
"dependencies": {
- "@jest/schemas": "^29.6.0",
"@types/istanbul-lib-coverage": "^2.0.0",
"@types/istanbul-reports": "^3.0.0",
"@types/node": "*",
- "@types/yargs": "^17.0.8",
+ "@types/yargs": "^16.0.0",
"chalk": "^4.0.0"
},
"engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
"node_modules/jest-config/node_modules/@types/yargs": {
- "version": "17.0.24",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
- "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "16.0.9",
+ "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz",
+ "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==",
"dependencies": {
"@types/yargs-parser": "*"
}
},
- "node_modules/jest-config/node_modules/ansi-styles": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
- "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
- "dev": true,
- "optional": true,
- "peer": true,
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/chalk/ansi-styles?sponsor=1"
- }
- },
- "node_modules/jest-config/node_modules/babel-jest": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.6.2.tgz",
- "integrity": "sha512-BYCzImLos6J3BH/+HvUCHG1dTf2MzmAB4jaVxHV+29RZLjR29XuYTmsf2sdDwkrb+FczkGo3kOhE7ga6sI0P4A==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
- "@jest/transform": "^29.6.2",
- "@types/babel__core": "^7.1.14",
- "babel-plugin-istanbul": "^6.1.1",
- "babel-preset-jest": "^29.5.0",
- "chalk": "^4.0.0",
- "graceful-fs": "^4.2.9",
- "slash": "^3.0.0"
- },
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- },
- "peerDependencies": {
- "@babel/core": "^7.8.0"
- }
- },
- "node_modules/jest-config/node_modules/babel-plugin-jest-hoist": {
- "version": "29.5.0",
- "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.5.0.tgz",
- "integrity": "sha512-zSuuuAlTMT4mzLj2nPnUm6fsE6270vdOfnpbJ+RmruU75UhLFvL0N2NgI7xpeS7NaB6hGqmd5pVpGTDYvi4Q3w==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
- "@babel/template": "^7.3.3",
- "@babel/types": "^7.3.3",
- "@types/babel__core": "^7.1.14",
- "@types/babel__traverse": "^7.0.6"
- },
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
- "node_modules/jest-config/node_modules/babel-preset-jest": {
- "version": "29.5.0",
- "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.5.0.tgz",
- "integrity": "sha512-JOMloxOqdiBSxMAzjRaH023/vvcaSaec49zvg+2LmNsktC7ei39LTJGw02J+9uUtTZUq6xbLyJ4dxe9sSmIuAg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
- "babel-plugin-jest-hoist": "^29.5.0",
- "babel-preset-current-node-syntax": "^1.0.0"
- },
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- },
- "peerDependencies": {
- "@babel/core": "^7.0.0"
- }
- },
- "node_modules/jest-config/node_modules/convert-source-map": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
- "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
- "dev": true,
- "optional": true,
- "peer": true
- },
"node_modules/jest-config/node_modules/jest-get-type": {
- "version": "29.4.3",
- "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
- "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz",
+ "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==",
"engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
- "node_modules/jest-config/node_modules/jest-haste-map": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.6.2.tgz",
- "integrity": "sha512-+51XleTDAAysvU8rT6AnS1ZJ+WHVNqhj1k6nTvN2PYP+HjU3kqlaKQ1Lnw3NYW3bm2r8vq82X0Z1nDDHZMzHVA==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
- "@jest/types": "^29.6.1",
- "@types/graceful-fs": "^4.1.3",
- "@types/node": "*",
- "anymatch": "^3.0.3",
- "fb-watchman": "^2.0.0",
- "graceful-fs": "^4.2.9",
- "jest-regex-util": "^29.4.3",
- "jest-util": "^29.6.2",
- "jest-worker": "^29.6.2",
- "micromatch": "^4.0.4",
- "walker": "^1.0.8"
- },
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- },
- "optionalDependencies": {
- "fsevents": "^2.3.2"
- }
- },
- "node_modules/jest-config/node_modules/jest-regex-util": {
- "version": "29.4.3",
- "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.4.3.tgz",
- "integrity": "sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
- "node_modules/jest-config/node_modules/jest-resolve": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.6.2.tgz",
- "integrity": "sha512-G/iQUvZWI5e3SMFssc4ug4dH0aZiZpsDq9o1PtXTV1210Ztyb2+w+ZgQkB3iOiC5SmAEzJBOHWz6Hvrd+QnNPw==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
- "chalk": "^4.0.0",
- "graceful-fs": "^4.2.9",
- "jest-haste-map": "^29.6.2",
- "jest-pnp-resolver": "^1.2.2",
- "jest-util": "^29.6.2",
- "jest-validate": "^29.6.2",
- "resolve": "^1.20.0",
- "resolve.exports": "^2.0.0",
- "slash": "^3.0.0"
- },
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
"node_modules/jest-config/node_modules/jest-util": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
- "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
+ "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
"dependencies": {
- "@jest/types": "^29.6.1",
+ "@jest/types": "^27.5.1",
"@types/node": "*",
"chalk": "^4.0.0",
"ci-info": "^3.2.0",
@@ -10871,114 +10298,19 @@
"picomatch": "^2.2.3"
},
"engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
- "node_modules/jest-config/node_modules/jest-validate": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.6.2.tgz",
- "integrity": "sha512-vGz0yMN5fUFRRbpJDPwxMpgSXW1LDKROHfBopAvDcmD6s+B/s8WJrwi+4bfH4SdInBA5C3P3BI19dBtKzx1Arg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
- "@jest/types": "^29.6.1",
- "camelcase": "^6.2.0",
- "chalk": "^4.0.0",
- "jest-get-type": "^29.4.3",
- "leven": "^3.1.0",
- "pretty-format": "^29.6.2"
- },
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
- "node_modules/jest-config/node_modules/jest-worker": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.2.tgz",
- "integrity": "sha512-l3ccBOabTdkng8I/ORCkADz4eSMKejTYv1vB/Z83UiubqhC1oQ5Li6dWCyqOIvSifGjUBxuvxvlm6KGK2DtuAQ==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
- "@types/node": "*",
- "jest-util": "^29.6.2",
- "merge-stream": "^2.0.0",
- "supports-color": "^8.0.0"
- },
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
- "node_modules/jest-config/node_modules/pretty-format": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.2.tgz",
- "integrity": "sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
- "@jest/schemas": "^29.6.0",
- "ansi-styles": "^5.0.0",
- "react-is": "^18.0.0"
- },
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
- "node_modules/jest-config/node_modules/resolve.exports": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz",
- "integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "engines": {
- "node": ">=10"
- }
- },
- "node_modules/jest-config/node_modules/supports-color": {
- "version": "8.1.1",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
- "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
- "has-flag": "^4.0.0"
- },
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/chalk/supports-color?sponsor=1"
- }
- },
- "node_modules/jest-config/node_modules/write-file-atomic": {
- "version": "4.0.2",
- "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
- "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
- "imurmurhash": "^0.1.4",
- "signal-exit": "^3.0.7"
- },
- "engines": {
- "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
"node_modules/jest-diff": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.6.2.tgz",
- "integrity": "sha512-t+ST7CB9GX5F2xKwhwCf0TAR17uNDiaPTZnVymP9lw0lssa9vG+AFyDZoeIHStU3WowFFwT+ky+er0WVl2yGhA==",
+ "version": "29.7.0",
+ "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz",
+ "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==",
"dev": true,
"dependencies": {
"chalk": "^4.0.0",
- "diff-sequences": "^29.4.3",
- "jest-get-type": "^29.4.3",
- "pretty-format": "^29.6.2"
+ "diff-sequences": "^29.6.3",
+ "jest-get-type": "^29.6.3",
+ "pretty-format": "^29.7.0"
},
"engines": {
"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
@@ -10996,22 +10328,13 @@
"url": "https://github.com/chalk/ansi-styles?sponsor=1"
}
},
- "node_modules/jest-diff/node_modules/jest-get-type": {
- "version": "29.4.3",
- "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
- "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==",
- "dev": true,
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
"node_modules/jest-diff/node_modules/pretty-format": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.2.tgz",
- "integrity": "sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==",
+ "version": "29.7.0",
+ "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
+ "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
"dev": true,
"dependencies": {
- "@jest/schemas": "^29.6.0",
+ "@jest/schemas": "^29.6.3",
"ansi-styles": "^5.0.0",
"react-is": "^18.0.0"
},
@@ -11019,102 +10342,75 @@
"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
}
},
+ "node_modules/jest-diff/node_modules/react-is": {
+ "version": "18.3.1",
+ "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
+ "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
+ "dev": true
+ },
"node_modules/jest-docblock": {
- "version": "29.4.3",
- "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.4.3.tgz",
- "integrity": "sha512-fzdTftThczeSD9nZ3fzA/4KkHtnmllawWrXO69vtI+L9WjEIuXWs4AmyME7lN5hU7dB0sHhuPfcKofRsUb/2Fg==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-27.5.1.tgz",
+ "integrity": "sha512-rl7hlABeTsRYxKiUfpHrQrG4e2obOiTQWfMEH3PxPjOtdsfLQO4ReWSZaQ7DETm4xu07rl4q/h4zcKXyU0/OzQ==",
"dependencies": {
"detect-newline": "^3.0.0"
},
"engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
"node_modules/jest-each": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.6.2.tgz",
- "integrity": "sha512-MsrsqA0Ia99cIpABBc3izS1ZYoYfhIy0NNWqPSE0YXbQjwchyt6B1HD2khzyPe1WiJA7hbxXy77ZoUQxn8UlSw==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-27.5.1.tgz",
+ "integrity": "sha512-1Ff6p+FbhT/bXQnEouYy00bkNSY7OUpfIcmdl8vZ31A1UUaurOLPA8a8BbJOF2RDUElwJhmeaV7LnagI+5UwNQ==",
"dependencies": {
- "@jest/types": "^29.6.1",
+ "@jest/types": "^27.5.1",
"chalk": "^4.0.0",
- "jest-get-type": "^29.4.3",
- "jest-util": "^29.6.2",
- "pretty-format": "^29.6.2"
+ "jest-get-type": "^27.5.1",
+ "jest-util": "^27.5.1",
+ "pretty-format": "^27.5.1"
},
"engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
"node_modules/jest-each/node_modules/@jest/types": {
- "version": "29.6.1",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
- "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+ "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
"dependencies": {
- "@jest/schemas": "^29.6.0",
"@types/istanbul-lib-coverage": "^2.0.0",
"@types/istanbul-reports": "^3.0.0",
"@types/node": "*",
- "@types/yargs": "^17.0.8",
+ "@types/yargs": "^16.0.0",
"chalk": "^4.0.0"
},
"engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
"node_modules/jest-each/node_modules/@types/yargs": {
- "version": "17.0.24",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
- "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "16.0.9",
+ "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz",
+ "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==",
"dependencies": {
"@types/yargs-parser": "*"
}
},
- "node_modules/jest-each/node_modules/ansi-styles": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
- "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
- "dev": true,
- "optional": true,
- "peer": true,
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/chalk/ansi-styles?sponsor=1"
- }
- },
"node_modules/jest-each/node_modules/jest-get-type": {
- "version": "29.4.3",
- "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
- "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz",
+ "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==",
"engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
"node_modules/jest-each/node_modules/jest-util": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
- "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
+ "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
"dependencies": {
- "@jest/types": "^29.6.1",
+ "@jest/types": "^27.5.1",
"@types/node": "*",
"chalk": "^4.0.0",
"ci-info": "^3.2.0",
@@ -11122,23 +10418,7 @@
"picomatch": "^2.2.3"
},
"engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
- "node_modules/jest-each/node_modules/pretty-format": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.2.tgz",
- "integrity": "sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
- "@jest/schemas": "^29.6.0",
- "ansi-styles": "^5.0.0",
- "react-is": "^18.0.0"
- },
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
"node_modules/jest-environment-jsdom": {
@@ -11158,141 +10438,35 @@
"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
- "node_modules/jest-environment-jsdom/node_modules/@jest/environment": {
+ "node_modules/jest-environment-jsdom/node_modules/@jest/types": {
"version": "27.5.1",
- "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.5.1.tgz",
- "integrity": "sha512-/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA==",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+ "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
"dependencies": {
- "@jest/fake-timers": "^27.5.1",
- "@jest/types": "^27.5.1",
- "@types/node": "*",
- "jest-mock": "^27.5.1"
- },
- "engines": {
- "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
- }
- },
- "node_modules/jest-environment-jsdom/node_modules/@jest/fake-timers": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.5.1.tgz",
- "integrity": "sha512-/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ==",
- "dependencies": {
- "@jest/types": "^27.5.1",
- "@sinonjs/fake-timers": "^8.0.1",
- "@types/node": "*",
- "jest-message-util": "^27.5.1",
- "jest-mock": "^27.5.1",
- "jest-util": "^27.5.1"
- },
- "engines": {
- "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
- }
- },
- "node_modules/jest-environment-jsdom/node_modules/@sinonjs/commons": {
- "version": "1.8.6",
- "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz",
- "integrity": "sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==",
- "dependencies": {
- "type-detect": "4.0.8"
- }
- },
- "node_modules/jest-environment-jsdom/node_modules/@sinonjs/fake-timers": {
- "version": "8.1.0",
- "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz",
- "integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==",
- "dependencies": {
- "@sinonjs/commons": "^1.7.0"
- }
- },
- "node_modules/jest-environment-jsdom/node_modules/jest-message-util": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
- "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
- "dependencies": {
- "@babel/code-frame": "^7.12.13",
- "@jest/types": "^27.5.1",
- "@types/stack-utils": "^2.0.0",
- "chalk": "^4.0.0",
- "graceful-fs": "^4.2.9",
- "micromatch": "^4.0.4",
- "pretty-format": "^27.5.1",
- "slash": "^3.0.0",
- "stack-utils": "^2.0.3"
- },
- "engines": {
- "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
- }
- },
- "node_modules/jest-environment-jsdom/node_modules/jest-mock": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.5.1.tgz",
- "integrity": "sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og==",
- "dependencies": {
- "@jest/types": "^27.5.1",
- "@types/node": "*"
- },
- "engines": {
- "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
- }
- },
- "node_modules/jest-environment-node": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.6.2.tgz",
- "integrity": "sha512-YGdFeZ3T9a+/612c5mTQIllvWkddPbYcN2v95ZH24oWMbGA4GGS2XdIF92QMhUhvrjjuQWYgUGW2zawOyH63MQ==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
- "@jest/environment": "^29.6.2",
- "@jest/fake-timers": "^29.6.2",
- "@jest/types": "^29.6.1",
- "@types/node": "*",
- "jest-mock": "^29.6.2",
- "jest-util": "^29.6.2"
- },
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
- "node_modules/jest-environment-node/node_modules/@jest/types": {
- "version": "29.6.1",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
- "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
- "@jest/schemas": "^29.6.0",
"@types/istanbul-lib-coverage": "^2.0.0",
"@types/istanbul-reports": "^3.0.0",
"@types/node": "*",
- "@types/yargs": "^17.0.8",
+ "@types/yargs": "^16.0.0",
"chalk": "^4.0.0"
},
"engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
- "node_modules/jest-environment-node/node_modules/@types/yargs": {
- "version": "17.0.24",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
- "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "node_modules/jest-environment-jsdom/node_modules/@types/yargs": {
+ "version": "16.0.9",
+ "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz",
+ "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==",
"dependencies": {
"@types/yargs-parser": "*"
}
},
- "node_modules/jest-environment-node/node_modules/jest-util": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
- "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "node_modules/jest-environment-jsdom/node_modules/jest-util": {
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
+ "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
"dependencies": {
- "@jest/types": "^29.6.1",
+ "@jest/types": "^27.5.1",
"@types/node": "*",
"chalk": "^4.0.0",
"ci-info": "^3.2.0",
@@ -11300,15 +10474,71 @@
"picomatch": "^2.2.3"
},
"engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+ }
+ },
+ "node_modules/jest-environment-node": {
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.5.1.tgz",
+ "integrity": "sha512-Jt4ZUnxdOsTGwSRAfKEnE6BcwsSPNOijjwifq5sDFSA2kesnXTvNqKHYgM0hDq3549Uf/KzdXNYn4wMZJPlFLw==",
+ "dependencies": {
+ "@jest/environment": "^27.5.1",
+ "@jest/fake-timers": "^27.5.1",
+ "@jest/types": "^27.5.1",
+ "@types/node": "*",
+ "jest-mock": "^27.5.1",
+ "jest-util": "^27.5.1"
+ },
+ "engines": {
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+ }
+ },
+ "node_modules/jest-environment-node/node_modules/@jest/types": {
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+ "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+ "dependencies": {
+ "@types/istanbul-lib-coverage": "^2.0.0",
+ "@types/istanbul-reports": "^3.0.0",
+ "@types/node": "*",
+ "@types/yargs": "^16.0.0",
+ "chalk": "^4.0.0"
+ },
+ "engines": {
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+ }
+ },
+ "node_modules/jest-environment-node/node_modules/@types/yargs": {
+ "version": "16.0.9",
+ "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz",
+ "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==",
+ "dependencies": {
+ "@types/yargs-parser": "*"
+ }
+ },
+ "node_modules/jest-environment-node/node_modules/jest-util": {
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
+ "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
+ "dependencies": {
+ "@jest/types": "^27.5.1",
+ "@types/node": "*",
+ "chalk": "^4.0.0",
+ "ci-info": "^3.2.0",
+ "graceful-fs": "^4.2.9",
+ "picomatch": "^2.2.3"
+ },
+ "engines": {
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
"node_modules/jest-get-type": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz",
- "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==",
+ "version": "29.6.3",
+ "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz",
+ "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==",
+ "dev": true,
"engines": {
- "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
}
},
"node_modules/jest-haste-map": {
@@ -11336,6 +10566,45 @@
"fsevents": "^2.3.2"
}
},
+ "node_modules/jest-haste-map/node_modules/@jest/types": {
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+ "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+ "dependencies": {
+ "@types/istanbul-lib-coverage": "^2.0.0",
+ "@types/istanbul-reports": "^3.0.0",
+ "@types/node": "*",
+ "@types/yargs": "^16.0.0",
+ "chalk": "^4.0.0"
+ },
+ "engines": {
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+ }
+ },
+ "node_modules/jest-haste-map/node_modules/@types/yargs": {
+ "version": "16.0.9",
+ "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz",
+ "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==",
+ "dependencies": {
+ "@types/yargs-parser": "*"
+ }
+ },
+ "node_modules/jest-haste-map/node_modules/jest-util": {
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
+ "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
+ "dependencies": {
+ "@jest/types": "^27.5.1",
+ "@types/node": "*",
+ "chalk": "^4.0.0",
+ "ci-info": "^3.2.0",
+ "graceful-fs": "^4.2.9",
+ "picomatch": "^2.2.3"
+ },
+ "engines": {
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+ }
+ },
"node_modules/jest-jasmine2": {
"version": "27.5.1",
"resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.5.1.tgz",
@@ -11363,106 +10632,27 @@
"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
- "node_modules/jest-jasmine2/node_modules/@jest/console": {
+ "node_modules/jest-jasmine2/node_modules/@jest/types": {
"version": "27.5.1",
- "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.5.1.tgz",
- "integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+ "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
"dependencies": {
- "@jest/types": "^27.5.1",
- "@types/node": "*",
- "chalk": "^4.0.0",
- "jest-message-util": "^27.5.1",
- "jest-util": "^27.5.1",
- "slash": "^3.0.0"
- },
- "engines": {
- "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
- }
- },
- "node_modules/jest-jasmine2/node_modules/@jest/environment": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.5.1.tgz",
- "integrity": "sha512-/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA==",
- "dependencies": {
- "@jest/fake-timers": "^27.5.1",
- "@jest/types": "^27.5.1",
- "@types/node": "*",
- "jest-mock": "^27.5.1"
- },
- "engines": {
- "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
- }
- },
- "node_modules/jest-jasmine2/node_modules/@jest/fake-timers": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.5.1.tgz",
- "integrity": "sha512-/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ==",
- "dependencies": {
- "@jest/types": "^27.5.1",
- "@sinonjs/fake-timers": "^8.0.1",
- "@types/node": "*",
- "jest-message-util": "^27.5.1",
- "jest-mock": "^27.5.1",
- "jest-util": "^27.5.1"
- },
- "engines": {
- "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
- }
- },
- "node_modules/jest-jasmine2/node_modules/@jest/globals": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-27.5.1.tgz",
- "integrity": "sha512-ZEJNB41OBQQgGzgyInAv0UUfDDj3upmHydjieSxFvTRuZElrx7tXg/uVQ5hYVEwiXs3+aMsAeEc9X7xiSKCm4Q==",
- "dependencies": {
- "@jest/environment": "^27.5.1",
- "@jest/types": "^27.5.1",
- "expect": "^27.5.1"
- },
- "engines": {
- "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
- }
- },
- "node_modules/jest-jasmine2/node_modules/@jest/source-map": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-27.5.1.tgz",
- "integrity": "sha512-y9NIHUYF3PJRlHk98NdC/N1gl88BL08aQQgu4k4ZopQkCw9t9cV8mtl3TV8b/YCB8XaVTFrmUTAJvjsntDireg==",
- "dependencies": {
- "callsites": "^3.0.0",
- "graceful-fs": "^4.2.9",
- "source-map": "^0.6.0"
- },
- "engines": {
- "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
- }
- },
- "node_modules/jest-jasmine2/node_modules/@jest/test-result": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.5.1.tgz",
- "integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==",
- "dependencies": {
- "@jest/console": "^27.5.1",
- "@jest/types": "^27.5.1",
"@types/istanbul-lib-coverage": "^2.0.0",
- "collect-v8-coverage": "^1.0.0"
+ "@types/istanbul-reports": "^3.0.0",
+ "@types/node": "*",
+ "@types/yargs": "^16.0.0",
+ "chalk": "^4.0.0"
},
"engines": {
"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
- "node_modules/jest-jasmine2/node_modules/@sinonjs/commons": {
- "version": "1.8.6",
- "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz",
- "integrity": "sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==",
+ "node_modules/jest-jasmine2/node_modules/@types/yargs": {
+ "version": "16.0.9",
+ "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz",
+ "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==",
"dependencies": {
- "type-detect": "4.0.8"
- }
- },
- "node_modules/jest-jasmine2/node_modules/@sinonjs/fake-timers": {
- "version": "8.1.0",
- "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz",
- "integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==",
- "dependencies": {
- "@sinonjs/commons": "^1.7.0"
+ "@types/yargs-parser": "*"
}
},
"node_modules/jest-jasmine2/node_modules/diff-sequences": {
@@ -11501,17 +10691,10 @@
"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
- "node_modules/jest-jasmine2/node_modules/jest-each": {
+ "node_modules/jest-jasmine2/node_modules/jest-get-type": {
"version": "27.5.1",
- "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-27.5.1.tgz",
- "integrity": "sha512-1Ff6p+FbhT/bXQnEouYy00bkNSY7OUpfIcmdl8vZ31A1UUaurOLPA8a8BbJOF2RDUElwJhmeaV7LnagI+5UwNQ==",
- "dependencies": {
- "@jest/types": "^27.5.1",
- "chalk": "^4.0.0",
- "jest-get-type": "^27.5.1",
- "jest-util": "^27.5.1",
- "pretty-format": "^27.5.1"
- },
+ "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz",
+ "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==",
"engines": {
"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
@@ -11549,186 +10732,52 @@
"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
- "node_modules/jest-jasmine2/node_modules/jest-mock": {
+ "node_modules/jest-jasmine2/node_modules/jest-util": {
"version": "27.5.1",
- "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.5.1.tgz",
- "integrity": "sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og==",
+ "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
+ "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
"dependencies": {
"@jest/types": "^27.5.1",
- "@types/node": "*"
- },
- "engines": {
- "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
- }
- },
- "node_modules/jest-jasmine2/node_modules/jest-runtime": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.5.1.tgz",
- "integrity": "sha512-o7gxw3Gf+H2IGt8fv0RiyE1+r83FJBRruoA+FXrlHw6xEyBsU8ugA6IPfTdVyA0w8HClpbK+DGJxH59UrNMx8A==",
- "dependencies": {
- "@jest/environment": "^27.5.1",
- "@jest/fake-timers": "^27.5.1",
- "@jest/globals": "^27.5.1",
- "@jest/source-map": "^27.5.1",
- "@jest/test-result": "^27.5.1",
- "@jest/transform": "^27.5.1",
- "@jest/types": "^27.5.1",
+ "@types/node": "*",
"chalk": "^4.0.0",
- "cjs-module-lexer": "^1.0.0",
- "collect-v8-coverage": "^1.0.0",
- "execa": "^5.0.0",
- "glob": "^7.1.3",
+ "ci-info": "^3.2.0",
"graceful-fs": "^4.2.9",
- "jest-haste-map": "^27.5.1",
- "jest-message-util": "^27.5.1",
- "jest-mock": "^27.5.1",
- "jest-regex-util": "^27.5.1",
- "jest-resolve": "^27.5.1",
- "jest-snapshot": "^27.5.1",
- "jest-util": "^27.5.1",
- "slash": "^3.0.0",
- "strip-bom": "^4.0.0"
+ "picomatch": "^2.2.3"
},
"engines": {
"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
- "node_modules/jest-jasmine2/node_modules/jest-snapshot": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.5.1.tgz",
- "integrity": "sha512-yYykXI5a0I31xX67mgeLw1DZ0bJB+gpq5IpSuCAoyDi0+BhgU/RIrL+RTzDmkNTchvDFWKP8lp+w/42Z3us5sA==",
- "dependencies": {
- "@babel/core": "^7.7.2",
- "@babel/generator": "^7.7.2",
- "@babel/plugin-syntax-typescript": "^7.7.2",
- "@babel/traverse": "^7.7.2",
- "@babel/types": "^7.0.0",
- "@jest/transform": "^27.5.1",
- "@jest/types": "^27.5.1",
- "@types/babel__traverse": "^7.0.4",
- "@types/prettier": "^2.1.5",
- "babel-preset-current-node-syntax": "^1.0.0",
- "chalk": "^4.0.0",
- "expect": "^27.5.1",
- "graceful-fs": "^4.2.9",
- "jest-diff": "^27.5.1",
- "jest-get-type": "^27.5.1",
- "jest-haste-map": "^27.5.1",
- "jest-matcher-utils": "^27.5.1",
- "jest-message-util": "^27.5.1",
- "jest-util": "^27.5.1",
- "natural-compare": "^1.4.0",
- "pretty-format": "^27.5.1",
- "semver": "^7.3.2"
- },
- "engines": {
- "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
- }
- },
- "node_modules/jest-jasmine2/node_modules/lru-cache": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
- "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
- "dependencies": {
- "yallist": "^4.0.0"
- },
- "engines": {
- "node": ">=10"
- }
- },
- "node_modules/jest-jasmine2/node_modules/semver": {
- "version": "7.5.4",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
- "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
- "dependencies": {
- "lru-cache": "^6.0.0"
- },
- "bin": {
- "semver": "bin/semver.js"
- },
- "engines": {
- "node": ">=10"
- }
- },
- "node_modules/jest-jasmine2/node_modules/source-map": {
- "version": "0.6.1",
- "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
- "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
- "engines": {
- "node": ">=0.10.0"
- }
- },
- "node_modules/jest-jasmine2/node_modules/yallist": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
- "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
- },
"node_modules/jest-leak-detector": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.6.2.tgz",
- "integrity": "sha512-aNqYhfp5uYEO3tdWMb2bfWv6f0b4I0LOxVRpnRLAeque2uqOVVMLh6khnTcE2qJ5wAKop0HcreM1btoysD6bPQ==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-27.5.1.tgz",
+ "integrity": "sha512-POXfWAMvfU6WMUXftV4HolnJfnPOGEu10fscNCA76KBpRRhcMN2c8d3iT2pxQS3HLbA+5X4sOUPzYO2NUyIlHQ==",
"dependencies": {
- "jest-get-type": "^29.4.3",
- "pretty-format": "^29.6.2"
+ "jest-get-type": "^27.5.1",
+ "pretty-format": "^27.5.1"
},
"engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
- "node_modules/jest-leak-detector/node_modules/ansi-styles": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
- "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
- "dev": true,
- "optional": true,
- "peer": true,
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
"node_modules/jest-leak-detector/node_modules/jest-get-type": {
- "version": "29.4.3",
- "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
- "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz",
+ "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==",
"engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
- "node_modules/jest-leak-detector/node_modules/pretty-format": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.2.tgz",
- "integrity": "sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
- "@jest/schemas": "^29.6.0",
- "ansi-styles": "^5.0.0",
- "react-is": "^18.0.0"
- },
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
"node_modules/jest-matcher-utils": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.6.2.tgz",
- "integrity": "sha512-4LiAk3hSSobtomeIAzFTe+N8kL6z0JtF3n6I4fg29iIW7tt99R7ZcIFW34QkX+DuVrf+CUe6wuVOpm7ZKFJzZQ==",
+ "version": "29.7.0",
+ "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz",
+ "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==",
"dev": true,
"dependencies": {
"chalk": "^4.0.0",
- "jest-diff": "^29.6.2",
- "jest-get-type": "^29.4.3",
- "pretty-format": "^29.6.2"
+ "jest-diff": "^29.7.0",
+ "jest-get-type": "^29.6.3",
+ "pretty-format": "^29.7.0"
},
"engines": {
"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
@@ -11746,22 +10795,13 @@
"url": "https://github.com/chalk/ansi-styles?sponsor=1"
}
},
- "node_modules/jest-matcher-utils/node_modules/jest-get-type": {
- "version": "29.4.3",
- "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
- "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==",
- "dev": true,
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
"node_modules/jest-matcher-utils/node_modules/pretty-format": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.2.tgz",
- "integrity": "sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==",
+ "version": "29.7.0",
+ "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
+ "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
"dev": true,
"dependencies": {
- "@jest/schemas": "^29.6.0",
+ "@jest/schemas": "^29.6.3",
"ansi-styles": "^5.0.0",
"react-is": "^18.0.0"
},
@@ -11769,19 +10809,25 @@
"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
}
},
+ "node_modules/jest-matcher-utils/node_modules/react-is": {
+ "version": "18.3.1",
+ "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
+ "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
+ "dev": true
+ },
"node_modules/jest-message-util": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.6.2.tgz",
- "integrity": "sha512-vnIGYEjoPSuRqV8W9t+Wow95SDp6KPX2Uf7EoeG9G99J2OVh7OSwpS4B6J0NfpEIpfkBNHlBZpA2rblEuEFhZQ==",
+ "version": "29.7.0",
+ "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz",
+ "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==",
"dev": true,
"dependencies": {
"@babel/code-frame": "^7.12.13",
- "@jest/types": "^29.6.1",
+ "@jest/types": "^29.6.3",
"@types/stack-utils": "^2.0.0",
"chalk": "^4.0.0",
"graceful-fs": "^4.2.9",
"micromatch": "^4.0.4",
- "pretty-format": "^29.6.2",
+ "pretty-format": "^29.7.0",
"slash": "^3.0.0",
"stack-utils": "^2.0.3"
},
@@ -11789,32 +10835,6 @@
"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
}
},
- "node_modules/jest-message-util/node_modules/@jest/types": {
- "version": "29.6.1",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
- "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
- "dev": true,
- "dependencies": {
- "@jest/schemas": "^29.6.0",
- "@types/istanbul-lib-coverage": "^2.0.0",
- "@types/istanbul-reports": "^3.0.0",
- "@types/node": "*",
- "@types/yargs": "^17.0.8",
- "chalk": "^4.0.0"
- },
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
- "node_modules/jest-message-util/node_modules/@types/yargs": {
- "version": "17.0.24",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
- "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
- "dev": true,
- "dependencies": {
- "@types/yargs-parser": "*"
- }
- },
"node_modules/jest-message-util/node_modules/ansi-styles": {
"version": "5.2.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
@@ -11828,12 +10848,12 @@
}
},
"node_modules/jest-message-util/node_modules/pretty-format": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.2.tgz",
- "integrity": "sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==",
+ "version": "29.7.0",
+ "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
+ "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
"dev": true,
"dependencies": {
- "@jest/schemas": "^29.6.0",
+ "@jest/schemas": "^29.6.3",
"ansi-styles": "^5.0.0",
"react-is": "^18.0.0"
},
@@ -11841,71 +10861,47 @@
"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
}
},
+ "node_modules/jest-message-util/node_modules/react-is": {
+ "version": "18.3.1",
+ "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
+ "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
+ "dev": true
+ },
"node_modules/jest-mock": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.6.2.tgz",
- "integrity": "sha512-hoSv3lb3byzdKfwqCuT6uTscan471GUECqgNYykg6ob0yiAw3zYc7OrPnI9Qv8Wwoa4lC7AZ9hyS4AiIx5U2zg==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.5.1.tgz",
+ "integrity": "sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og==",
"dependencies": {
- "@jest/types": "^29.6.1",
- "@types/node": "*",
- "jest-util": "^29.6.2"
+ "@jest/types": "^27.5.1",
+ "@types/node": "*"
},
"engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
"node_modules/jest-mock/node_modules/@jest/types": {
- "version": "29.6.1",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
- "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+ "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
"dependencies": {
- "@jest/schemas": "^29.6.0",
"@types/istanbul-lib-coverage": "^2.0.0",
"@types/istanbul-reports": "^3.0.0",
"@types/node": "*",
- "@types/yargs": "^17.0.8",
+ "@types/yargs": "^16.0.0",
"chalk": "^4.0.0"
},
"engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
"node_modules/jest-mock/node_modules/@types/yargs": {
- "version": "17.0.24",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
- "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "16.0.9",
+ "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz",
+ "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==",
"dependencies": {
"@types/yargs-parser": "*"
}
},
- "node_modules/jest-mock/node_modules/jest-util": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
- "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
- "@jest/types": "^29.6.1",
- "@types/node": "*",
- "chalk": "^4.0.0",
- "ci-info": "^3.2.0",
- "graceful-fs": "^4.2.9",
- "picomatch": "^2.2.3"
- },
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
"node_modules/jest-pnp-resolver": {
"version": "1.2.3",
"resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",
@@ -11951,225 +10947,70 @@
}
},
"node_modules/jest-resolve-dependencies": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.6.2.tgz",
- "integrity": "sha512-LGqjDWxg2fuQQm7ypDxduLu/m4+4Lb4gczc13v51VMZbVP5tSBILqVx8qfWcsdP8f0G7aIqByIALDB0R93yL+w==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.5.1.tgz",
+ "integrity": "sha512-QQOOdY4PE39iawDn5rzbIePNigfe5B9Z91GDD1ae/xNDlu9kaat8QQ5EKnNmVWPV54hUdxCVwwj6YMgR2O7IOg==",
"dependencies": {
- "jest-regex-util": "^29.4.3",
- "jest-snapshot": "^29.6.2"
+ "@jest/types": "^27.5.1",
+ "jest-regex-util": "^27.5.1",
+ "jest-snapshot": "^27.5.1"
},
"engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
- "node_modules/jest-resolve-dependencies/node_modules/jest-regex-util": {
- "version": "29.4.3",
- "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.4.3.tgz",
- "integrity": "sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
- "node_modules/jest-runner": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.6.2.tgz",
- "integrity": "sha512-wXOT/a0EspYgfMiYHxwGLPCZfC0c38MivAlb2lMEAlwHINKemrttu1uSbcGbfDV31sFaPWnWJPmb2qXM8pqZ4w==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "node_modules/jest-resolve-dependencies/node_modules/@jest/types": {
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+ "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
"dependencies": {
- "@jest/console": "^29.6.2",
- "@jest/environment": "^29.6.2",
- "@jest/test-result": "^29.6.2",
- "@jest/transform": "^29.6.2",
- "@jest/types": "^29.6.1",
- "@types/node": "*",
- "chalk": "^4.0.0",
- "emittery": "^0.13.1",
- "graceful-fs": "^4.2.9",
- "jest-docblock": "^29.4.3",
- "jest-environment-node": "^29.6.2",
- "jest-haste-map": "^29.6.2",
- "jest-leak-detector": "^29.6.2",
- "jest-message-util": "^29.6.2",
- "jest-resolve": "^29.6.2",
- "jest-runtime": "^29.6.2",
- "jest-util": "^29.6.2",
- "jest-watcher": "^29.6.2",
- "jest-worker": "^29.6.2",
- "p-limit": "^3.1.0",
- "source-map-support": "0.5.13"
- },
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
- "node_modules/jest-runner/node_modules/@jest/transform": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.6.2.tgz",
- "integrity": "sha512-ZqCqEISr58Ce3U+buNFJYUktLJZOggfyvR+bZMaiV1e8B1SIvJbwZMrYz3gx/KAPn9EXmOmN+uB08yLCjWkQQg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
- "@babel/core": "^7.11.6",
- "@jest/types": "^29.6.1",
- "@jridgewell/trace-mapping": "^0.3.18",
- "babel-plugin-istanbul": "^6.1.1",
- "chalk": "^4.0.0",
- "convert-source-map": "^2.0.0",
- "fast-json-stable-stringify": "^2.1.0",
- "graceful-fs": "^4.2.9",
- "jest-haste-map": "^29.6.2",
- "jest-regex-util": "^29.4.3",
- "jest-util": "^29.6.2",
- "micromatch": "^4.0.4",
- "pirates": "^4.0.4",
- "slash": "^3.0.0",
- "write-file-atomic": "^4.0.2"
- },
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
- "node_modules/jest-runner/node_modules/@jest/types": {
- "version": "29.6.1",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
- "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
- "@jest/schemas": "^29.6.0",
"@types/istanbul-lib-coverage": "^2.0.0",
"@types/istanbul-reports": "^3.0.0",
"@types/node": "*",
- "@types/yargs": "^17.0.8",
+ "@types/yargs": "^16.0.0",
"chalk": "^4.0.0"
},
"engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
- "node_modules/jest-runner/node_modules/@types/yargs": {
- "version": "17.0.24",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
- "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "node_modules/jest-resolve-dependencies/node_modules/@types/yargs": {
+ "version": "16.0.9",
+ "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz",
+ "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==",
"dependencies": {
"@types/yargs-parser": "*"
}
},
- "node_modules/jest-runner/node_modules/ansi-styles": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
- "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
- "dev": true,
- "optional": true,
- "peer": true,
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/chalk/ansi-styles?sponsor=1"
- }
- },
- "node_modules/jest-runner/node_modules/convert-source-map": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
- "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
- "dev": true,
- "optional": true,
- "peer": true
- },
- "node_modules/jest-runner/node_modules/jest-get-type": {
- "version": "29.4.3",
- "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
- "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
- "node_modules/jest-runner/node_modules/jest-haste-map": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.6.2.tgz",
- "integrity": "sha512-+51XleTDAAysvU8rT6AnS1ZJ+WHVNqhj1k6nTvN2PYP+HjU3kqlaKQ1Lnw3NYW3bm2r8vq82X0Z1nDDHZMzHVA==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "node_modules/jest-resolve/node_modules/@jest/types": {
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+ "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
"dependencies": {
- "@jest/types": "^29.6.1",
- "@types/graceful-fs": "^4.1.3",
+ "@types/istanbul-lib-coverage": "^2.0.0",
+ "@types/istanbul-reports": "^3.0.0",
"@types/node": "*",
- "anymatch": "^3.0.3",
- "fb-watchman": "^2.0.0",
- "graceful-fs": "^4.2.9",
- "jest-regex-util": "^29.4.3",
- "jest-util": "^29.6.2",
- "jest-worker": "^29.6.2",
- "micromatch": "^4.0.4",
- "walker": "^1.0.8"
+ "@types/yargs": "^16.0.0",
+ "chalk": "^4.0.0"
},
"engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- },
- "optionalDependencies": {
- "fsevents": "^2.3.2"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
- "node_modules/jest-runner/node_modules/jest-regex-util": {
- "version": "29.4.3",
- "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.4.3.tgz",
- "integrity": "sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
- "node_modules/jest-runner/node_modules/jest-resolve": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.6.2.tgz",
- "integrity": "sha512-G/iQUvZWI5e3SMFssc4ug4dH0aZiZpsDq9o1PtXTV1210Ztyb2+w+ZgQkB3iOiC5SmAEzJBOHWz6Hvrd+QnNPw==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "node_modules/jest-resolve/node_modules/@types/yargs": {
+ "version": "16.0.9",
+ "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz",
+ "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==",
"dependencies": {
- "chalk": "^4.0.0",
- "graceful-fs": "^4.2.9",
- "jest-haste-map": "^29.6.2",
- "jest-pnp-resolver": "^1.2.2",
- "jest-util": "^29.6.2",
- "jest-validate": "^29.6.2",
- "resolve": "^1.20.0",
- "resolve.exports": "^2.0.0",
- "slash": "^3.0.0"
- },
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ "@types/yargs-parser": "*"
}
},
- "node_modules/jest-runner/node_modules/jest-util": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
- "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "node_modules/jest-resolve/node_modules/jest-util": {
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
+ "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
"dependencies": {
- "@jest/types": "^29.6.1",
+ "@jest/types": "^27.5.1",
"@types/node": "*",
"chalk": "^4.0.0",
"ci-info": "^3.2.0",
@@ -12177,339 +11018,178 @@
"picomatch": "^2.2.3"
},
"engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
- "node_modules/jest-runner/node_modules/jest-validate": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.6.2.tgz",
- "integrity": "sha512-vGz0yMN5fUFRRbpJDPwxMpgSXW1LDKROHfBopAvDcmD6s+B/s8WJrwi+4bfH4SdInBA5C3P3BI19dBtKzx1Arg==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "node_modules/jest-runner": {
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-27.5.1.tgz",
+ "integrity": "sha512-g4NPsM4mFCOwFKXO4p/H/kWGdJp9V8kURY2lX8Me2drgXqG7rrZAx5kv+5H7wtt/cdFIjhqYx1HrlqWHaOvDaQ==",
"dependencies": {
- "@jest/types": "^29.6.1",
- "camelcase": "^6.2.0",
- "chalk": "^4.0.0",
- "jest-get-type": "^29.4.3",
- "leven": "^3.1.0",
- "pretty-format": "^29.6.2"
- },
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
- "node_modules/jest-runner/node_modules/jest-worker": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.2.tgz",
- "integrity": "sha512-l3ccBOabTdkng8I/ORCkADz4eSMKejTYv1vB/Z83UiubqhC1oQ5Li6dWCyqOIvSifGjUBxuvxvlm6KGK2DtuAQ==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
+ "@jest/console": "^27.5.1",
+ "@jest/environment": "^27.5.1",
+ "@jest/test-result": "^27.5.1",
+ "@jest/transform": "^27.5.1",
+ "@jest/types": "^27.5.1",
"@types/node": "*",
- "jest-util": "^29.6.2",
- "merge-stream": "^2.0.0",
- "supports-color": "^8.0.0"
+ "chalk": "^4.0.0",
+ "emittery": "^0.8.1",
+ "graceful-fs": "^4.2.9",
+ "jest-docblock": "^27.5.1",
+ "jest-environment-jsdom": "^27.5.1",
+ "jest-environment-node": "^27.5.1",
+ "jest-haste-map": "^27.5.1",
+ "jest-leak-detector": "^27.5.1",
+ "jest-message-util": "^27.5.1",
+ "jest-resolve": "^27.5.1",
+ "jest-runtime": "^27.5.1",
+ "jest-util": "^27.5.1",
+ "jest-worker": "^27.5.1",
+ "source-map-support": "^0.5.6",
+ "throat": "^6.0.1"
},
"engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
- "node_modules/jest-runner/node_modules/p-limit": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
- "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "node_modules/jest-runner/node_modules/@jest/types": {
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+ "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
"dependencies": {
- "yocto-queue": "^0.1.0"
+ "@types/istanbul-lib-coverage": "^2.0.0",
+ "@types/istanbul-reports": "^3.0.0",
+ "@types/node": "*",
+ "@types/yargs": "^16.0.0",
+ "chalk": "^4.0.0"
},
"engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
- "node_modules/jest-runner/node_modules/pretty-format": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.2.tgz",
- "integrity": "sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "node_modules/jest-runner/node_modules/@types/yargs": {
+ "version": "16.0.9",
+ "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz",
+ "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==",
"dependencies": {
- "@jest/schemas": "^29.6.0",
- "ansi-styles": "^5.0.0",
- "react-is": "^18.0.0"
- },
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ "@types/yargs-parser": "*"
}
},
- "node_modules/jest-runner/node_modules/resolve.exports": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz",
- "integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "engines": {
- "node": ">=10"
- }
- },
- "node_modules/jest-runner/node_modules/source-map": {
- "version": "0.6.1",
- "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
- "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
- "dev": true,
- "optional": true,
- "peer": true,
- "engines": {
- "node": ">=0.10.0"
- }
- },
- "node_modules/jest-runner/node_modules/source-map-support": {
- "version": "0.5.13",
- "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
- "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "node_modules/jest-runner/node_modules/jest-message-util": {
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
+ "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
"dependencies": {
- "buffer-from": "^1.0.0",
- "source-map": "^0.6.0"
- }
- },
- "node_modules/jest-runner/node_modules/supports-color": {
- "version": "8.1.1",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
- "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
- "has-flag": "^4.0.0"
+ "@babel/code-frame": "^7.12.13",
+ "@jest/types": "^27.5.1",
+ "@types/stack-utils": "^2.0.0",
+ "chalk": "^4.0.0",
+ "graceful-fs": "^4.2.9",
+ "micromatch": "^4.0.4",
+ "pretty-format": "^27.5.1",
+ "slash": "^3.0.0",
+ "stack-utils": "^2.0.3"
},
"engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/chalk/supports-color?sponsor=1"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
- "node_modules/jest-runner/node_modules/write-file-atomic": {
- "version": "4.0.2",
- "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
- "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "node_modules/jest-runner/node_modules/jest-util": {
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
+ "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
"dependencies": {
- "imurmurhash": "^0.1.4",
- "signal-exit": "^3.0.7"
+ "@jest/types": "^27.5.1",
+ "@types/node": "*",
+ "chalk": "^4.0.0",
+ "ci-info": "^3.2.0",
+ "graceful-fs": "^4.2.9",
+ "picomatch": "^2.2.3"
},
"engines": {
- "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
"node_modules/jest-runtime": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.6.2.tgz",
- "integrity": "sha512-2X9dqK768KufGJyIeLmIzToDmsN0m7Iek8QNxRSI/2+iPFYHF0jTwlO3ftn7gdKd98G/VQw9XJCk77rbTGZnJg==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.5.1.tgz",
+ "integrity": "sha512-o7gxw3Gf+H2IGt8fv0RiyE1+r83FJBRruoA+FXrlHw6xEyBsU8ugA6IPfTdVyA0w8HClpbK+DGJxH59UrNMx8A==",
"dependencies": {
- "@jest/environment": "^29.6.2",
- "@jest/fake-timers": "^29.6.2",
- "@jest/globals": "^29.6.2",
- "@jest/source-map": "^29.6.0",
- "@jest/test-result": "^29.6.2",
- "@jest/transform": "^29.6.2",
- "@jest/types": "^29.6.1",
- "@types/node": "*",
+ "@jest/environment": "^27.5.1",
+ "@jest/fake-timers": "^27.5.1",
+ "@jest/globals": "^27.5.1",
+ "@jest/source-map": "^27.5.1",
+ "@jest/test-result": "^27.5.1",
+ "@jest/transform": "^27.5.1",
+ "@jest/types": "^27.5.1",
"chalk": "^4.0.0",
"cjs-module-lexer": "^1.0.0",
"collect-v8-coverage": "^1.0.0",
+ "execa": "^5.0.0",
"glob": "^7.1.3",
"graceful-fs": "^4.2.9",
- "jest-haste-map": "^29.6.2",
- "jest-message-util": "^29.6.2",
- "jest-mock": "^29.6.2",
- "jest-regex-util": "^29.4.3",
- "jest-resolve": "^29.6.2",
- "jest-snapshot": "^29.6.2",
- "jest-util": "^29.6.2",
+ "jest-haste-map": "^27.5.1",
+ "jest-message-util": "^27.5.1",
+ "jest-mock": "^27.5.1",
+ "jest-regex-util": "^27.5.1",
+ "jest-resolve": "^27.5.1",
+ "jest-snapshot": "^27.5.1",
+ "jest-util": "^27.5.1",
"slash": "^3.0.0",
"strip-bom": "^4.0.0"
},
"engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
- "node_modules/jest-runtime/node_modules/@jest/transform": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.6.2.tgz",
- "integrity": "sha512-ZqCqEISr58Ce3U+buNFJYUktLJZOggfyvR+bZMaiV1e8B1SIvJbwZMrYz3gx/KAPn9EXmOmN+uB08yLCjWkQQg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
- "@babel/core": "^7.11.6",
- "@jest/types": "^29.6.1",
- "@jridgewell/trace-mapping": "^0.3.18",
- "babel-plugin-istanbul": "^6.1.1",
- "chalk": "^4.0.0",
- "convert-source-map": "^2.0.0",
- "fast-json-stable-stringify": "^2.1.0",
- "graceful-fs": "^4.2.9",
- "jest-haste-map": "^29.6.2",
- "jest-regex-util": "^29.4.3",
- "jest-util": "^29.6.2",
- "micromatch": "^4.0.4",
- "pirates": "^4.0.4",
- "slash": "^3.0.0",
- "write-file-atomic": "^4.0.2"
- },
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
"node_modules/jest-runtime/node_modules/@jest/types": {
- "version": "29.6.1",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
- "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+ "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
"dependencies": {
- "@jest/schemas": "^29.6.0",
"@types/istanbul-lib-coverage": "^2.0.0",
"@types/istanbul-reports": "^3.0.0",
"@types/node": "*",
- "@types/yargs": "^17.0.8",
+ "@types/yargs": "^16.0.0",
"chalk": "^4.0.0"
},
"engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
"node_modules/jest-runtime/node_modules/@types/yargs": {
- "version": "17.0.24",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
- "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "16.0.9",
+ "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz",
+ "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==",
"dependencies": {
"@types/yargs-parser": "*"
}
},
- "node_modules/jest-runtime/node_modules/ansi-styles": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
- "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
- "dev": true,
- "optional": true,
- "peer": true,
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/chalk/ansi-styles?sponsor=1"
- }
- },
- "node_modules/jest-runtime/node_modules/convert-source-map": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
- "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
- "dev": true,
- "optional": true,
- "peer": true
- },
- "node_modules/jest-runtime/node_modules/jest-get-type": {
- "version": "29.4.3",
- "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
- "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
- "node_modules/jest-runtime/node_modules/jest-haste-map": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.6.2.tgz",
- "integrity": "sha512-+51XleTDAAysvU8rT6AnS1ZJ+WHVNqhj1k6nTvN2PYP+HjU3kqlaKQ1Lnw3NYW3bm2r8vq82X0Z1nDDHZMzHVA==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "node_modules/jest-runtime/node_modules/jest-message-util": {
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
+ "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
"dependencies": {
- "@jest/types": "^29.6.1",
- "@types/graceful-fs": "^4.1.3",
- "@types/node": "*",
- "anymatch": "^3.0.3",
- "fb-watchman": "^2.0.0",
- "graceful-fs": "^4.2.9",
- "jest-regex-util": "^29.4.3",
- "jest-util": "^29.6.2",
- "jest-worker": "^29.6.2",
- "micromatch": "^4.0.4",
- "walker": "^1.0.8"
- },
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- },
- "optionalDependencies": {
- "fsevents": "^2.3.2"
- }
- },
- "node_modules/jest-runtime/node_modules/jest-regex-util": {
- "version": "29.4.3",
- "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.4.3.tgz",
- "integrity": "sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
- "node_modules/jest-runtime/node_modules/jest-resolve": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.6.2.tgz",
- "integrity": "sha512-G/iQUvZWI5e3SMFssc4ug4dH0aZiZpsDq9o1PtXTV1210Ztyb2+w+ZgQkB3iOiC5SmAEzJBOHWz6Hvrd+QnNPw==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
+ "@babel/code-frame": "^7.12.13",
+ "@jest/types": "^27.5.1",
+ "@types/stack-utils": "^2.0.0",
"chalk": "^4.0.0",
"graceful-fs": "^4.2.9",
- "jest-haste-map": "^29.6.2",
- "jest-pnp-resolver": "^1.2.2",
- "jest-util": "^29.6.2",
- "jest-validate": "^29.6.2",
- "resolve": "^1.20.0",
- "resolve.exports": "^2.0.0",
- "slash": "^3.0.0"
+ "micromatch": "^4.0.4",
+ "pretty-format": "^27.5.1",
+ "slash": "^3.0.0",
+ "stack-utils": "^2.0.3"
},
"engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
"node_modules/jest-runtime/node_modules/jest-util": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
- "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
+ "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
"dependencies": {
- "@jest/types": "^29.6.1",
+ "@jest/types": "^27.5.1",
"@types/node": "*",
"chalk": "^4.0.0",
"ci-info": "^3.2.0",
@@ -12517,102 +11197,7 @@
"picomatch": "^2.2.3"
},
"engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
- "node_modules/jest-runtime/node_modules/jest-validate": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.6.2.tgz",
- "integrity": "sha512-vGz0yMN5fUFRRbpJDPwxMpgSXW1LDKROHfBopAvDcmD6s+B/s8WJrwi+4bfH4SdInBA5C3P3BI19dBtKzx1Arg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
- "@jest/types": "^29.6.1",
- "camelcase": "^6.2.0",
- "chalk": "^4.0.0",
- "jest-get-type": "^29.4.3",
- "leven": "^3.1.0",
- "pretty-format": "^29.6.2"
- },
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
- "node_modules/jest-runtime/node_modules/jest-worker": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.2.tgz",
- "integrity": "sha512-l3ccBOabTdkng8I/ORCkADz4eSMKejTYv1vB/Z83UiubqhC1oQ5Li6dWCyqOIvSifGjUBxuvxvlm6KGK2DtuAQ==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
- "@types/node": "*",
- "jest-util": "^29.6.2",
- "merge-stream": "^2.0.0",
- "supports-color": "^8.0.0"
- },
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
- "node_modules/jest-runtime/node_modules/pretty-format": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.2.tgz",
- "integrity": "sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
- "@jest/schemas": "^29.6.0",
- "ansi-styles": "^5.0.0",
- "react-is": "^18.0.0"
- },
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
- "node_modules/jest-runtime/node_modules/resolve.exports": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz",
- "integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "engines": {
- "node": ">=10"
- }
- },
- "node_modules/jest-runtime/node_modules/supports-color": {
- "version": "8.1.1",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
- "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
- "has-flag": "^4.0.0"
- },
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/chalk/supports-color?sponsor=1"
- }
- },
- "node_modules/jest-runtime/node_modules/write-file-atomic": {
- "version": "4.0.2",
- "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
- "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
- "imurmurhash": "^0.1.4",
- "signal-exit": "^3.0.7"
- },
- "engines": {
- "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
"node_modules/jest-serializer": {
@@ -12628,291 +11213,138 @@
}
},
"node_modules/jest-snapshot": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.6.2.tgz",
- "integrity": "sha512-1OdjqvqmRdGNvWXr/YZHuyhh5DeaLp1p/F8Tht/MrMw4Kr1Uu/j4lRG+iKl1DAqUJDWxtQBMk41Lnf/JETYBRA==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.5.1.tgz",
+ "integrity": "sha512-yYykXI5a0I31xX67mgeLw1DZ0bJB+gpq5IpSuCAoyDi0+BhgU/RIrL+RTzDmkNTchvDFWKP8lp+w/42Z3us5sA==",
"dependencies": {
- "@babel/core": "^7.11.6",
+ "@babel/core": "^7.7.2",
"@babel/generator": "^7.7.2",
- "@babel/plugin-syntax-jsx": "^7.7.2",
"@babel/plugin-syntax-typescript": "^7.7.2",
- "@babel/types": "^7.3.3",
- "@jest/expect-utils": "^29.6.2",
- "@jest/transform": "^29.6.2",
- "@jest/types": "^29.6.1",
+ "@babel/traverse": "^7.7.2",
+ "@babel/types": "^7.0.0",
+ "@jest/transform": "^27.5.1",
+ "@jest/types": "^27.5.1",
+ "@types/babel__traverse": "^7.0.4",
+ "@types/prettier": "^2.1.5",
"babel-preset-current-node-syntax": "^1.0.0",
"chalk": "^4.0.0",
- "expect": "^29.6.2",
+ "expect": "^27.5.1",
"graceful-fs": "^4.2.9",
- "jest-diff": "^29.6.2",
- "jest-get-type": "^29.4.3",
- "jest-matcher-utils": "^29.6.2",
- "jest-message-util": "^29.6.2",
- "jest-util": "^29.6.2",
+ "jest-diff": "^27.5.1",
+ "jest-get-type": "^27.5.1",
+ "jest-haste-map": "^27.5.1",
+ "jest-matcher-utils": "^27.5.1",
+ "jest-message-util": "^27.5.1",
+ "jest-util": "^27.5.1",
"natural-compare": "^1.4.0",
- "pretty-format": "^29.6.2",
- "semver": "^7.5.3"
+ "pretty-format": "^27.5.1",
+ "semver": "^7.3.2"
},
"engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
- "node_modules/jest-snapshot/node_modules/@jest/transform": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.6.2.tgz",
- "integrity": "sha512-ZqCqEISr58Ce3U+buNFJYUktLJZOggfyvR+bZMaiV1e8B1SIvJbwZMrYz3gx/KAPn9EXmOmN+uB08yLCjWkQQg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
- "@babel/core": "^7.11.6",
- "@jest/types": "^29.6.1",
- "@jridgewell/trace-mapping": "^0.3.18",
- "babel-plugin-istanbul": "^6.1.1",
- "chalk": "^4.0.0",
- "convert-source-map": "^2.0.0",
- "fast-json-stable-stringify": "^2.1.0",
- "graceful-fs": "^4.2.9",
- "jest-haste-map": "^29.6.2",
- "jest-regex-util": "^29.4.3",
- "jest-util": "^29.6.2",
- "micromatch": "^4.0.4",
- "pirates": "^4.0.4",
- "slash": "^3.0.0",
- "write-file-atomic": "^4.0.2"
- },
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
"node_modules/jest-snapshot/node_modules/@jest/types": {
- "version": "29.6.1",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
- "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+ "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
"dependencies": {
- "@jest/schemas": "^29.6.0",
"@types/istanbul-lib-coverage": "^2.0.0",
"@types/istanbul-reports": "^3.0.0",
"@types/node": "*",
- "@types/yargs": "^17.0.8",
+ "@types/yargs": "^16.0.0",
"chalk": "^4.0.0"
},
"engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
"node_modules/jest-snapshot/node_modules/@types/yargs": {
- "version": "17.0.24",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
- "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "16.0.9",
+ "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz",
+ "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==",
"dependencies": {
"@types/yargs-parser": "*"
}
},
- "node_modules/jest-snapshot/node_modules/ansi-styles": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
- "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "node_modules/jest-snapshot/node_modules/diff-sequences": {
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.5.1.tgz",
+ "integrity": "sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==",
"engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
- "node_modules/jest-snapshot/node_modules/convert-source-map": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
- "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
- "dev": true,
- "optional": true,
- "peer": true
+ "node_modules/jest-snapshot/node_modules/expect": {
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/expect/-/expect-27.5.1.tgz",
+ "integrity": "sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==",
+ "dependencies": {
+ "@jest/types": "^27.5.1",
+ "jest-get-type": "^27.5.1",
+ "jest-matcher-utils": "^27.5.1",
+ "jest-message-util": "^27.5.1"
+ },
+ "engines": {
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+ }
+ },
+ "node_modules/jest-snapshot/node_modules/jest-diff": {
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.1.tgz",
+ "integrity": "sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==",
+ "dependencies": {
+ "chalk": "^4.0.0",
+ "diff-sequences": "^27.5.1",
+ "jest-get-type": "^27.5.1",
+ "pretty-format": "^27.5.1"
+ },
+ "engines": {
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+ }
},
"node_modules/jest-snapshot/node_modules/jest-get-type": {
- "version": "29.4.3",
- "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
- "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz",
+ "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==",
"engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
- "node_modules/jest-snapshot/node_modules/jest-haste-map": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.6.2.tgz",
- "integrity": "sha512-+51XleTDAAysvU8rT6AnS1ZJ+WHVNqhj1k6nTvN2PYP+HjU3kqlaKQ1Lnw3NYW3bm2r8vq82X0Z1nDDHZMzHVA==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "node_modules/jest-snapshot/node_modules/jest-matcher-utils": {
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz",
+ "integrity": "sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==",
"dependencies": {
- "@jest/types": "^29.6.1",
- "@types/graceful-fs": "^4.1.3",
- "@types/node": "*",
- "anymatch": "^3.0.3",
- "fb-watchman": "^2.0.0",
- "graceful-fs": "^4.2.9",
- "jest-regex-util": "^29.4.3",
- "jest-util": "^29.6.2",
- "jest-worker": "^29.6.2",
- "micromatch": "^4.0.4",
- "walker": "^1.0.8"
+ "chalk": "^4.0.0",
+ "jest-diff": "^27.5.1",
+ "jest-get-type": "^27.5.1",
+ "pretty-format": "^27.5.1"
},
"engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- },
- "optionalDependencies": {
- "fsevents": "^2.3.2"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
- "node_modules/jest-snapshot/node_modules/jest-regex-util": {
- "version": "29.4.3",
- "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.4.3.tgz",
- "integrity": "sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "node_modules/jest-snapshot/node_modules/jest-message-util": {
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
+ "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
+ "dependencies": {
+ "@babel/code-frame": "^7.12.13",
+ "@jest/types": "^27.5.1",
+ "@types/stack-utils": "^2.0.0",
+ "chalk": "^4.0.0",
+ "graceful-fs": "^4.2.9",
+ "micromatch": "^4.0.4",
+ "pretty-format": "^27.5.1",
+ "slash": "^3.0.0",
+ "stack-utils": "^2.0.3"
+ },
"engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
"node_modules/jest-snapshot/node_modules/jest-util": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
- "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
- "@jest/types": "^29.6.1",
- "@types/node": "*",
- "chalk": "^4.0.0",
- "ci-info": "^3.2.0",
- "graceful-fs": "^4.2.9",
- "picomatch": "^2.2.3"
- },
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
- "node_modules/jest-snapshot/node_modules/jest-worker": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.2.tgz",
- "integrity": "sha512-l3ccBOabTdkng8I/ORCkADz4eSMKejTYv1vB/Z83UiubqhC1oQ5Li6dWCyqOIvSifGjUBxuvxvlm6KGK2DtuAQ==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
- "@types/node": "*",
- "jest-util": "^29.6.2",
- "merge-stream": "^2.0.0",
- "supports-color": "^8.0.0"
- },
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
- "node_modules/jest-snapshot/node_modules/lru-cache": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
- "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
- "yallist": "^4.0.0"
- },
- "engines": {
- "node": ">=10"
- }
- },
- "node_modules/jest-snapshot/node_modules/pretty-format": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.2.tgz",
- "integrity": "sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
- "@jest/schemas": "^29.6.0",
- "ansi-styles": "^5.0.0",
- "react-is": "^18.0.0"
- },
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
- "node_modules/jest-snapshot/node_modules/semver": {
- "version": "7.5.4",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
- "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
- "lru-cache": "^6.0.0"
- },
- "bin": {
- "semver": "bin/semver.js"
- },
- "engines": {
- "node": ">=10"
- }
- },
- "node_modules/jest-snapshot/node_modules/supports-color": {
- "version": "8.1.1",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
- "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
- "has-flag": "^4.0.0"
- },
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/chalk/supports-color?sponsor=1"
- }
- },
- "node_modules/jest-snapshot/node_modules/write-file-atomic": {
- "version": "4.0.2",
- "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
- "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
- "imurmurhash": "^0.1.4",
- "signal-exit": "^3.0.7"
- },
- "engines": {
- "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
- }
- },
- "node_modules/jest-snapshot/node_modules/yallist": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
- "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
- "dev": true,
- "optional": true,
- "peer": true
- },
- "node_modules/jest-util": {
"version": "27.5.1",
"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
"integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
@@ -12928,6 +11360,34 @@
"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
+ "node_modules/jest-snapshot/node_modules/semver": {
+ "version": "7.7.0",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.0.tgz",
+ "integrity": "sha512-DrfFnPzblFmNrIZzg5RzHegbiRWg7KMR7btwi2yjHwx06zsUbO5g613sVwEV7FTwmzJu+Io0lJe2GJ3LxqpvBQ==",
+ "bin": {
+ "semver": "bin/semver.js"
+ },
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/jest-util": {
+ "version": "29.7.0",
+ "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+ "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
+ "dev": true,
+ "dependencies": {
+ "@jest/types": "^29.6.3",
+ "@types/node": "*",
+ "chalk": "^4.0.0",
+ "ci-info": "^3.2.0",
+ "graceful-fs": "^4.2.9",
+ "picomatch": "^2.2.3"
+ },
+ "engines": {
+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ }
+ },
"node_modules/jest-validate": {
"version": "27.5.1",
"resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-27.5.1.tgz",
@@ -12944,36 +11404,112 @@
"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
- "node_modules/jest-watcher": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.6.2.tgz",
- "integrity": "sha512-GZitlqkMkhkefjfN/p3SJjrDaxPflqxEAv3/ik10OirZqJGYH5rPiIsgVcfof0Tdqg3shQGdEIxDBx+B4tuLzA==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "node_modules/jest-validate/node_modules/@jest/types": {
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+ "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
"dependencies": {
- "@jest/test-result": "^29.6.2",
- "@jest/types": "^29.6.1",
+ "@types/istanbul-lib-coverage": "^2.0.0",
+ "@types/istanbul-reports": "^3.0.0",
"@types/node": "*",
- "ansi-escapes": "^4.2.1",
- "chalk": "^4.0.0",
- "emittery": "^0.13.1",
- "jest-util": "^29.6.2",
- "string-length": "^4.0.1"
+ "@types/yargs": "^16.0.0",
+ "chalk": "^4.0.0"
},
"engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
- "node_modules/jest-watcher/node_modules/@jest/types": {
- "version": "29.6.1",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
- "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "node_modules/jest-validate/node_modules/@types/yargs": {
+ "version": "16.0.9",
+ "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz",
+ "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==",
"dependencies": {
- "@jest/schemas": "^29.6.0",
+ "@types/yargs-parser": "*"
+ }
+ },
+ "node_modules/jest-validate/node_modules/jest-get-type": {
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz",
+ "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==",
+ "engines": {
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+ }
+ },
+ "node_modules/jest-watch-typeahead": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/jest-watch-typeahead/-/jest-watch-typeahead-1.1.0.tgz",
+ "integrity": "sha512-Va5nLSJTN7YFtC2jd+7wsoe1pNe5K4ShLux/E5iHEwlB9AxaxmggY7to9KUqKojhaJw3aXqt5WAb4jGPOolpEw==",
+ "dependencies": {
+ "ansi-escapes": "^4.3.1",
+ "chalk": "^4.0.0",
+ "jest-regex-util": "^28.0.0",
+ "jest-watcher": "^28.0.0",
+ "slash": "^4.0.0",
+ "string-length": "^5.0.1",
+ "strip-ansi": "^7.0.1"
+ },
+ "engines": {
+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+ },
+ "peerDependencies": {
+ "jest": "^27.0.0 || ^28.0.0"
+ }
+ },
+ "node_modules/jest-watch-typeahead/node_modules/@jest/console": {
+ "version": "28.1.3",
+ "resolved": "https://registry.npmjs.org/@jest/console/-/console-28.1.3.tgz",
+ "integrity": "sha512-QPAkP5EwKdK/bxIr6C1I4Vs0rm2nHiANzj/Z5X2JQkrZo6IqvC4ldZ9K95tF0HdidhA8Bo6egxSzUFPYKcEXLw==",
+ "dependencies": {
+ "@jest/types": "^28.1.3",
+ "@types/node": "*",
+ "chalk": "^4.0.0",
+ "jest-message-util": "^28.1.3",
+ "jest-util": "^28.1.3",
+ "slash": "^3.0.0"
+ },
+ "engines": {
+ "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+ }
+ },
+ "node_modules/jest-watch-typeahead/node_modules/@jest/console/node_modules/slash": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+ "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/jest-watch-typeahead/node_modules/@jest/schemas": {
+ "version": "28.1.3",
+ "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz",
+ "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==",
+ "dependencies": {
+ "@sinclair/typebox": "^0.24.1"
+ },
+ "engines": {
+ "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+ }
+ },
+ "node_modules/jest-watch-typeahead/node_modules/@jest/test-result": {
+ "version": "28.1.3",
+ "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-28.1.3.tgz",
+ "integrity": "sha512-kZAkxnSE+FqE8YjW8gNuoVkkC9I7S1qmenl8sGcDOLropASP+BkcGKwhXoyqQuGOGeYY0y/ixjrd/iERpEXHNg==",
+ "dependencies": {
+ "@jest/console": "^28.1.3",
+ "@jest/types": "^28.1.3",
+ "@types/istanbul-lib-coverage": "^2.0.0",
+ "collect-v8-coverage": "^1.0.0"
+ },
+ "engines": {
+ "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+ }
+ },
+ "node_modules/jest-watch-typeahead/node_modules/@jest/types": {
+ "version": "28.1.3",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz",
+ "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==",
+ "dependencies": {
+ "@jest/schemas": "^28.1.3",
"@types/istanbul-lib-coverage": "^2.0.0",
"@types/istanbul-reports": "^3.0.0",
"@types/node": "*",
@@ -12981,29 +11517,77 @@
"chalk": "^4.0.0"
},
"engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
}
},
- "node_modules/jest-watcher/node_modules/@types/yargs": {
- "version": "17.0.24",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
- "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
- "@types/yargs-parser": "*"
+ "node_modules/jest-watch-typeahead/node_modules/@sinclair/typebox": {
+ "version": "0.24.51",
+ "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz",
+ "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA=="
+ },
+ "node_modules/jest-watch-typeahead/node_modules/ansi-styles": {
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+ "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/chalk/ansi-styles?sponsor=1"
}
},
- "node_modules/jest-watcher/node_modules/jest-util": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
- "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "node_modules/jest-watch-typeahead/node_modules/emittery": {
+ "version": "0.10.2",
+ "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.10.2.tgz",
+ "integrity": "sha512-aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw==",
+ "engines": {
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://github.com/sindresorhus/emittery?sponsor=1"
+ }
+ },
+ "node_modules/jest-watch-typeahead/node_modules/jest-message-util": {
+ "version": "28.1.3",
+ "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.3.tgz",
+ "integrity": "sha512-PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g==",
"dependencies": {
- "@jest/types": "^29.6.1",
+ "@babel/code-frame": "^7.12.13",
+ "@jest/types": "^28.1.3",
+ "@types/stack-utils": "^2.0.0",
+ "chalk": "^4.0.0",
+ "graceful-fs": "^4.2.9",
+ "micromatch": "^4.0.4",
+ "pretty-format": "^28.1.3",
+ "slash": "^3.0.0",
+ "stack-utils": "^2.0.3"
+ },
+ "engines": {
+ "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+ }
+ },
+ "node_modules/jest-watch-typeahead/node_modules/jest-message-util/node_modules/slash": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+ "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/jest-watch-typeahead/node_modules/jest-regex-util": {
+ "version": "28.0.2",
+ "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-28.0.2.tgz",
+ "integrity": "sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw==",
+ "engines": {
+ "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+ }
+ },
+ "node_modules/jest-watch-typeahead/node_modules/jest-util": {
+ "version": "28.1.3",
+ "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz",
+ "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==",
+ "dependencies": {
+ "@jest/types": "^28.1.3",
"@types/node": "*",
"chalk": "^4.0.0",
"ci-info": "^3.2.0",
@@ -13011,7 +11595,182 @@
"picomatch": "^2.2.3"
},
"engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+ }
+ },
+ "node_modules/jest-watch-typeahead/node_modules/jest-watcher": {
+ "version": "28.1.3",
+ "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-28.1.3.tgz",
+ "integrity": "sha512-t4qcqj9hze+jviFPUN3YAtAEeFnr/azITXQEMARf5cMwKY2SMBRnCQTXLixTl20OR6mLh9KLMrgVJgJISym+1g==",
+ "dependencies": {
+ "@jest/test-result": "^28.1.3",
+ "@jest/types": "^28.1.3",
+ "@types/node": "*",
+ "ansi-escapes": "^4.2.1",
+ "chalk": "^4.0.0",
+ "emittery": "^0.10.2",
+ "jest-util": "^28.1.3",
+ "string-length": "^4.0.1"
+ },
+ "engines": {
+ "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+ }
+ },
+ "node_modules/jest-watch-typeahead/node_modules/jest-watcher/node_modules/string-length": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
+ "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
+ "dependencies": {
+ "char-regex": "^1.0.2",
+ "strip-ansi": "^6.0.0"
+ },
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/jest-watch-typeahead/node_modules/jest-watcher/node_modules/strip-ansi": {
+ "version": "6.0.1",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+ "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+ "dependencies": {
+ "ansi-regex": "^5.0.1"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/jest-watch-typeahead/node_modules/pretty-format": {
+ "version": "28.1.3",
+ "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz",
+ "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==",
+ "dependencies": {
+ "@jest/schemas": "^28.1.3",
+ "ansi-regex": "^5.0.1",
+ "ansi-styles": "^5.0.0",
+ "react-is": "^18.0.0"
+ },
+ "engines": {
+ "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+ }
+ },
+ "node_modules/jest-watch-typeahead/node_modules/react-is": {
+ "version": "18.3.1",
+ "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
+ "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg=="
+ },
+ "node_modules/jest-watch-typeahead/node_modules/slash": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
+ "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
+ "engines": {
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/jest-watch-typeahead/node_modules/string-length": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/string-length/-/string-length-5.0.1.tgz",
+ "integrity": "sha512-9Ep08KAMUn0OadnVaBuRdE2l615CQ508kr0XMadjClfYpdCyvrbFp6Taebo8yyxokQ4viUd/xPPUA4FGgUa0ow==",
+ "dependencies": {
+ "char-regex": "^2.0.0",
+ "strip-ansi": "^7.0.1"
+ },
+ "engines": {
+ "node": ">=12.20"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/jest-watch-typeahead/node_modules/string-length/node_modules/char-regex": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-2.0.2.tgz",
+ "integrity": "sha512-cbGOjAptfM2LVmWhwRFHEKTPkLwNddVmuqYZQt895yXwAsWsXObCG+YN4DGQ/JBtT4GP1a1lPPdio2z413LmTg==",
+ "engines": {
+ "node": ">=12.20"
+ }
+ },
+ "node_modules/jest-watch-typeahead/node_modules/strip-ansi": {
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+ "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+ "dependencies": {
+ "ansi-regex": "^6.0.1"
+ },
+ "engines": {
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+ }
+ },
+ "node_modules/jest-watch-typeahead/node_modules/strip-ansi/node_modules/ansi-regex": {
+ "version": "6.1.0",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+ "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+ "engines": {
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+ }
+ },
+ "node_modules/jest-watcher": {
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.5.1.tgz",
+ "integrity": "sha512-z676SuD6Z8o8qbmEGhoEUFOM1+jfEiL3DXHK/xgEiG2EyNYfFG60jluWcupY6dATjfEsKQuibReS1djInQnoVw==",
+ "dependencies": {
+ "@jest/test-result": "^27.5.1",
+ "@jest/types": "^27.5.1",
+ "@types/node": "*",
+ "ansi-escapes": "^4.2.1",
+ "chalk": "^4.0.0",
+ "jest-util": "^27.5.1",
+ "string-length": "^4.0.1"
+ },
+ "engines": {
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+ }
+ },
+ "node_modules/jest-watcher/node_modules/@jest/types": {
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+ "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+ "dependencies": {
+ "@types/istanbul-lib-coverage": "^2.0.0",
+ "@types/istanbul-reports": "^3.0.0",
+ "@types/node": "*",
+ "@types/yargs": "^16.0.0",
+ "chalk": "^4.0.0"
+ },
+ "engines": {
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+ }
+ },
+ "node_modules/jest-watcher/node_modules/@types/yargs": {
+ "version": "16.0.9",
+ "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz",
+ "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==",
+ "dependencies": {
+ "@types/yargs-parser": "*"
+ }
+ },
+ "node_modules/jest-watcher/node_modules/jest-util": {
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
+ "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
+ "dependencies": {
+ "@jest/types": "^27.5.1",
+ "@types/node": "*",
+ "chalk": "^4.0.0",
+ "ci-info": "^3.2.0",
+ "graceful-fs": "^4.2.9",
+ "picomatch": "^2.2.3"
+ },
+ "engines": {
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
"node_modules/jest-worker": {
@@ -13041,40 +11800,10 @@
"url": "https://github.com/chalk/supports-color?sponsor=1"
}
},
- "node_modules/jest/node_modules/@jest/types": {
- "version": "29.6.1",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
- "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
- "@jest/schemas": "^29.6.0",
- "@types/istanbul-lib-coverage": "^2.0.0",
- "@types/istanbul-reports": "^3.0.0",
- "@types/node": "*",
- "@types/yargs": "^17.0.8",
- "chalk": "^4.0.0"
- },
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
- "node_modules/jest/node_modules/@types/yargs": {
- "version": "17.0.24",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
- "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
- "@types/yargs-parser": "*"
- }
- },
"node_modules/jiti": {
- "version": "1.18.2",
- "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.18.2.tgz",
- "integrity": "sha512-QAdOptna2NYiSSpv0O/BwoHBSmz4YhpzJHyi+fnMRTXFjp7B8i/YG5Z8IfusxB1ufjcD2Sre1F3R+nX3fvy7gg==",
+ "version": "1.21.7",
+ "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.7.tgz",
+ "integrity": "sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==",
"bin": {
"jiti": "bin/jiti.js"
}
@@ -13142,16 +11871,21 @@
}
},
"node_modules/jsesc": {
- "version": "2.5.2",
- "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
- "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",
+ "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==",
"bin": {
"jsesc": "bin/jsesc"
},
"engines": {
- "node": ">=4"
+ "node": ">=6"
}
},
+ "node_modules/json-buffer": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
+ "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ=="
+ },
"node_modules/json-parse-even-better-errors": {
"version": "2.3.1",
"resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
@@ -13194,6 +11928,28 @@
"graceful-fs": "^4.1.6"
}
},
+ "node_modules/jsonpath": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/jsonpath/-/jsonpath-1.1.1.tgz",
+ "integrity": "sha512-l6Cg7jRpixfbgoWgkrl77dgEj8RPvND0wMH6TwQmi9Qs4TFfS9u5cUFnbeKTwj5ga5Y3BTGGNI28k117LJ009w==",
+ "dependencies": {
+ "esprima": "1.2.2",
+ "static-eval": "2.0.2",
+ "underscore": "1.12.1"
+ }
+ },
+ "node_modules/jsonpath/node_modules/esprima": {
+ "version": "1.2.2",
+ "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.2.2.tgz",
+ "integrity": "sha512-+JpPZam9w5DuJ3Q67SqsMGtiHKENSMRVoxvArfJZK01/BfLEObtZ6orJa/MtoGNR/rfMgp5837T41PAmTwAv/A==",
+ "bin": {
+ "esparse": "bin/esparse.js",
+ "esvalidate": "bin/esvalidate.js"
+ },
+ "engines": {
+ "node": ">=0.4.0"
+ }
+ },
"node_modules/jsonpointer": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-5.0.1.tgz",
@@ -13203,17 +11959,27 @@
}
},
"node_modules/jsx-ast-utils": {
- "version": "3.3.3",
- "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.3.tgz",
- "integrity": "sha512-fYQHZTZ8jSfmWZ0iyzfwiU4WDX4HpHbMCZ3gPlWYiCl3BoeOTsqKBqnTVfH2rYT7eP5c3sVbeSPHnnJOaTrWiw==",
+ "version": "3.3.5",
+ "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz",
+ "integrity": "sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==",
"dependencies": {
- "array-includes": "^3.1.5",
- "object.assign": "^4.1.3"
+ "array-includes": "^3.1.6",
+ "array.prototype.flat": "^1.3.1",
+ "object.assign": "^4.1.4",
+ "object.values": "^1.1.6"
},
"engines": {
"node": ">=4.0"
}
},
+ "node_modules/keyv": {
+ "version": "4.5.4",
+ "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
+ "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
+ "dependencies": {
+ "json-buffer": "3.0.1"
+ }
+ },
"node_modules/kind-of": {
"version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
@@ -13239,25 +12005,28 @@
}
},
"node_modules/language-subtag-registry": {
- "version": "0.3.22",
- "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.22.tgz",
- "integrity": "sha512-tN0MCzyWnoz/4nHS6uxdlFWoUZT7ABptwKPQ52Ea7URk6vll88bWBVhodtnlfEuCcKWNGoc+uGbw1cwa9IKh/w=="
+ "version": "0.3.23",
+ "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.23.tgz",
+ "integrity": "sha512-0K65Lea881pHotoGEa5gDlMxt3pctLi2RplBb7Ezh4rRdLEOtgi7n4EwK9lamnUCkKBqaeKRVebTq6BAxSkpXQ=="
},
"node_modules/language-tags": {
- "version": "1.0.5",
- "resolved": "https://registry.npmjs.org/language-tags/-/language-tags-1.0.5.tgz",
- "integrity": "sha512-qJhlO9cGXi6hBGKoxEG/sKZDAHD5Hnu9Hs4WbOY3pCWXDhw0N8x1NenNzm2EnNLkLkk7J2SdxAkDSbb6ftT+UQ==",
+ "version": "1.0.9",
+ "resolved": "https://registry.npmjs.org/language-tags/-/language-tags-1.0.9.tgz",
+ "integrity": "sha512-MbjN408fEndfiQXbFQ1vnd+1NoLDsnQW41410oQBXiyXDMYH5z505juWa4KUE1LqxRC7DgOgZDbKLxHIwm27hA==",
"dependencies": {
- "language-subtag-registry": "~0.3.2"
+ "language-subtag-registry": "^0.3.20"
+ },
+ "engines": {
+ "node": ">=0.10"
}
},
"node_modules/launch-editor": {
- "version": "2.6.0",
- "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.6.0.tgz",
- "integrity": "sha512-JpDCcQnyAAzZZaZ7vEiSqL690w7dAEyLao+KC96zBplnYbJS7TYNjvM3M7y3dGz+v7aIsJk3hllWuc0kWAjyRQ==",
+ "version": "2.9.1",
+ "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.9.1.tgz",
+ "integrity": "sha512-Gcnl4Bd+hRO9P9icCP/RVVT2o8SFlPXofuCxvA2SaZuH45whSvf5p8x5oih5ftLiVhEI4sp5xDY+R+b3zJBh5w==",
"dependencies": {
"picocolors": "^1.0.0",
- "shell-quote": "^1.7.3"
+ "shell-quote": "^1.8.1"
}
},
"node_modules/leven": {
@@ -13426,6 +12195,14 @@
"tmpl": "1.0.5"
}
},
+ "node_modules/math-intrinsics": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
+ "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
"node_modules/mdn-data": {
"version": "2.0.4",
"resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz",
@@ -13451,9 +12228,12 @@
}
},
"node_modules/merge-descriptors": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
- "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",
+ "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==",
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
},
"node_modules/merge-stream": {
"version": "2.0.0",
@@ -13477,11 +12257,11 @@
}
},
"node_modules/micromatch": {
- "version": "4.0.5",
- "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
- "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+ "version": "4.0.8",
+ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+ "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
"dependencies": {
- "braces": "^3.0.2",
+ "braces": "^3.0.3",
"picomatch": "^2.3.1"
},
"engines": {
@@ -13536,11 +12316,12 @@
}
},
"node_modules/mini-css-extract-plugin": {
- "version": "2.7.6",
- "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.6.tgz",
- "integrity": "sha512-Qk7HcgaPkGG6eD77mLvZS1nmxlao3j+9PkrT9Uc7HAE1id3F41+DdBRYRYkbyfNRGzm8/YWtzhw7nVPmwhqTQw==",
+ "version": "2.9.2",
+ "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.2.tgz",
+ "integrity": "sha512-GJuACcS//jtq4kCtd5ii/M0SZf7OZRH+BxdqXZHaJfb8TJiVl+NgQRPwiYt2EuqeSkNydn/7vP+bcE27C5mb9w==",
"dependencies": {
- "schema-utils": "^4.0.0"
+ "schema-utils": "^4.0.0",
+ "tapable": "^2.2.1"
},
"engines": {
"node": ">= 12.13.0"
@@ -13553,55 +12334,6 @@
"webpack": "^5.0.0"
}
},
- "node_modules/mini-css-extract-plugin/node_modules/ajv": {
- "version": "8.12.0",
- "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
- "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
- "dependencies": {
- "fast-deep-equal": "^3.1.1",
- "json-schema-traverse": "^1.0.0",
- "require-from-string": "^2.0.2",
- "uri-js": "^4.2.2"
- },
- "funding": {
- "type": "github",
- "url": "https://github.com/sponsors/epoberezkin"
- }
- },
- "node_modules/mini-css-extract-plugin/node_modules/ajv-keywords": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
- "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
- "dependencies": {
- "fast-deep-equal": "^3.1.3"
- },
- "peerDependencies": {
- "ajv": "^8.8.2"
- }
- },
- "node_modules/mini-css-extract-plugin/node_modules/json-schema-traverse": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
- "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
- },
- "node_modules/mini-css-extract-plugin/node_modules/schema-utils": {
- "version": "4.2.0",
- "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
- "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
- "dependencies": {
- "@types/json-schema": "^7.0.9",
- "ajv": "^8.9.0",
- "ajv-formats": "^2.1.1",
- "ajv-keywords": "^5.1.0"
- },
- "engines": {
- "node": ">= 12.13.0"
- },
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/webpack"
- }
- },
"node_modules/minimalistic-assert": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
@@ -13626,6 +12358,14 @@
"url": "https://github.com/sponsors/ljharb"
}
},
+ "node_modules/minipass": {
+ "version": "7.1.2",
+ "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+ "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+ "engines": {
+ "node": ">=16 || 14 >=14.17"
+ }
+ },
"node_modules/mkdirp": {
"version": "0.5.6",
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
@@ -13638,9 +12378,9 @@
}
},
"node_modules/ms": {
- "version": "2.1.2",
- "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
- "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+ "version": "2.1.3",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
},
"node_modules/multicast-dns": {
"version": "7.2.5",
@@ -13665,9 +12405,9 @@
}
},
"node_modules/nanoid": {
- "version": "3.3.6",
- "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz",
- "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==",
+ "version": "3.3.8",
+ "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
+ "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
"funding": [
{
"type": "github",
@@ -13692,9 +12432,9 @@
"integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g=="
},
"node_modules/negotiator": {
- "version": "0.6.3",
- "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
- "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+ "version": "0.6.4",
+ "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz",
+ "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==",
"engines": {
"node": ">= 0.6"
}
@@ -13727,9 +12467,9 @@
"integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw=="
},
"node_modules/node-releases": {
- "version": "2.0.12",
- "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.12.tgz",
- "integrity": "sha512-QzsYKWhXTWx8h1kIvqfnC++o0pEmpRQA/aenALsL2F4pqNVr7YzcdMlDij5WBnwftRbJCNJL/O7zdKaxKPHqgQ=="
+ "version": "2.0.19",
+ "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz",
+ "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw=="
},
"node_modules/normalize-path": {
"version": "3.0.0",
@@ -13781,9 +12521,9 @@
}
},
"node_modules/nwsapi": {
- "version": "2.2.7",
- "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.7.tgz",
- "integrity": "sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ=="
+ "version": "2.2.16",
+ "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.16.tgz",
+ "integrity": "sha512-F1I/bimDpj3ncaNDhfyMWuFqmQDBwDB0Fogc2qpL3BWvkQteFD/8BzWuIRl83rq0DXfm8SGt/HFhLXZyljTXcQ=="
},
"node_modules/object-assign": {
"version": "4.1.1",
@@ -13802,20 +12542,24 @@
}
},
"node_modules/object-inspect": {
- "version": "1.12.3",
- "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
- "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
+ "version": "1.13.3",
+ "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.3.tgz",
+ "integrity": "sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA==",
+ "engines": {
+ "node": ">= 0.4"
+ },
"funding": {
"url": "https://github.com/sponsors/ljharb"
}
},
"node_modules/object-is": {
- "version": "1.1.5",
- "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
- "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
+ "version": "1.1.6",
+ "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.6.tgz",
+ "integrity": "sha512-F8cZ+KfGlSGi09lJT7/Nd6KJZ9ygtvYC0/UYYLI9nmQKLMnydpB9yvbv9K1uSkEu7FU9vYPmVwLg328tX+ot3Q==",
+ "dev": true,
"dependencies": {
- "call-bind": "^1.0.2",
- "define-properties": "^1.1.3"
+ "call-bind": "^1.0.7",
+ "define-properties": "^1.2.1"
},
"engines": {
"node": ">= 0.4"
@@ -13833,13 +12577,15 @@
}
},
"node_modules/object.assign": {
- "version": "4.1.4",
- "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
- "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
+ "version": "4.1.7",
+ "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.7.tgz",
+ "integrity": "sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==",
"dependencies": {
- "call-bind": "^1.0.2",
- "define-properties": "^1.1.4",
- "has-symbols": "^1.0.3",
+ "call-bind": "^1.0.8",
+ "call-bound": "^1.0.3",
+ "define-properties": "^1.2.1",
+ "es-object-atoms": "^1.0.0",
+ "has-symbols": "^1.1.0",
"object-keys": "^1.1.1"
},
"engines": {
@@ -13850,26 +12596,27 @@
}
},
"node_modules/object.entries": {
- "version": "1.1.6",
- "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz",
- "integrity": "sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==",
+ "version": "1.1.8",
+ "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.8.tgz",
+ "integrity": "sha512-cmopxi8VwRIAw/fkijJohSfpef5PdN0pMQJN6VC/ZKvn0LIknWD8KtgY6KlQdEc4tIjcQ3HxSMmnvtzIscdaYQ==",
"dependencies": {
- "call-bind": "^1.0.2",
- "define-properties": "^1.1.4",
- "es-abstract": "^1.20.4"
+ "call-bind": "^1.0.7",
+ "define-properties": "^1.2.1",
+ "es-object-atoms": "^1.0.0"
},
"engines": {
"node": ">= 0.4"
}
},
"node_modules/object.fromentries": {
- "version": "2.0.6",
- "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.6.tgz",
- "integrity": "sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==",
+ "version": "2.0.8",
+ "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz",
+ "integrity": "sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==",
"dependencies": {
- "call-bind": "^1.0.2",
- "define-properties": "^1.1.4",
- "es-abstract": "^1.20.4"
+ "call-bind": "^1.0.7",
+ "define-properties": "^1.2.1",
+ "es-abstract": "^1.23.2",
+ "es-object-atoms": "^1.0.0"
},
"engines": {
"node": ">= 0.4"
@@ -13879,15 +12626,17 @@
}
},
"node_modules/object.getownpropertydescriptors": {
- "version": "2.1.6",
- "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.6.tgz",
- "integrity": "sha512-lq+61g26E/BgHv0ZTFgRvi7NMEPuAxLkFU7rukXjc/AlwH4Am5xXVnIXy3un1bg/JPbXHrixRkK1itUzzPiIjQ==",
+ "version": "2.1.8",
+ "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.8.tgz",
+ "integrity": "sha512-qkHIGe4q0lSYMv0XI4SsBTJz3WaURhLvd0lKSgtVuOsJ2krg4SgMw3PIRQFMp07yi++UR3se2mkcLqsBNpBb/A==",
"dependencies": {
- "array.prototype.reduce": "^1.0.5",
- "call-bind": "^1.0.2",
- "define-properties": "^1.2.0",
- "es-abstract": "^1.21.2",
- "safe-array-concat": "^1.0.0"
+ "array.prototype.reduce": "^1.0.6",
+ "call-bind": "^1.0.7",
+ "define-properties": "^1.2.1",
+ "es-abstract": "^1.23.2",
+ "es-object-atoms": "^1.0.0",
+ "gopd": "^1.0.1",
+ "safe-array-concat": "^1.1.2"
},
"engines": {
"node": ">= 0.8"
@@ -13896,26 +12645,28 @@
"url": "https://github.com/sponsors/ljharb"
}
},
- "node_modules/object.hasown": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.2.tgz",
- "integrity": "sha512-B5UIT3J1W+WuWIU55h0mjlwaqxiE5vYENJXIXZ4VFe05pNYrkKuK0U/6aFcb0pKywYJh7IhfoqUfKVmrJJHZHw==",
+ "node_modules/object.groupby": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.3.tgz",
+ "integrity": "sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==",
"dependencies": {
- "define-properties": "^1.1.4",
- "es-abstract": "^1.20.4"
+ "call-bind": "^1.0.7",
+ "define-properties": "^1.2.1",
+ "es-abstract": "^1.23.2"
},
- "funding": {
- "url": "https://github.com/sponsors/ljharb"
+ "engines": {
+ "node": ">= 0.4"
}
},
"node_modules/object.values": {
- "version": "1.1.6",
- "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz",
- "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==",
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.1.tgz",
+ "integrity": "sha512-gXah6aZrcUxjWg2zR2MwouP2eHlCBzdV4pygudehaKXSGW4v2AsRQUK+lwwXhii6KFZcunEnmSUoYp5CXibxtA==",
"dependencies": {
- "call-bind": "^1.0.2",
- "define-properties": "^1.1.4",
- "es-abstract": "^1.20.4"
+ "call-bind": "^1.0.8",
+ "call-bound": "^1.0.3",
+ "define-properties": "^1.2.1",
+ "es-object-atoms": "^1.0.0"
},
"engines": {
"node": ">= 0.4"
@@ -13987,21 +12738,37 @@
}
},
"node_modules/optionator": {
- "version": "0.9.1",
- "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
- "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+ "version": "0.9.4",
+ "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
+ "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
"dependencies": {
"deep-is": "^0.1.3",
"fast-levenshtein": "^2.0.6",
"levn": "^0.4.1",
"prelude-ls": "^1.2.1",
"type-check": "^0.4.0",
- "word-wrap": "^1.2.3"
+ "word-wrap": "^1.2.5"
},
"engines": {
"node": ">= 0.8.0"
}
},
+ "node_modules/own-keys": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/own-keys/-/own-keys-1.0.1.tgz",
+ "integrity": "sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==",
+ "dependencies": {
+ "get-intrinsic": "^1.2.6",
+ "object-keys": "^1.1.1",
+ "safe-push-apply": "^1.0.0"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
"node_modules/p-limit": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
@@ -14047,6 +12814,11 @@
"node": ">=6"
}
},
+ "node_modules/package-json-from-dist": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
+ "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw=="
+ },
"node_modules/param-case": {
"version": "3.0.4",
"resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz",
@@ -14135,10 +12907,30 @@
"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
"integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
},
+ "node_modules/path-scurry": {
+ "version": "1.11.1",
+ "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
+ "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
+ "dependencies": {
+ "lru-cache": "^10.2.0",
+ "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
+ },
+ "engines": {
+ "node": ">=16 || 14 >=14.18"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/isaacs"
+ }
+ },
+ "node_modules/path-scurry/node_modules/lru-cache": {
+ "version": "10.4.3",
+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+ "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ=="
+ },
"node_modules/path-to-regexp": {
- "version": "0.1.7",
- "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
- "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
+ "version": "0.1.12",
+ "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
+ "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ=="
},
"node_modules/path-type": {
"version": "4.0.0",
@@ -14154,9 +12946,9 @@
"integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow=="
},
"node_modules/picocolors": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
- "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+ "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA=="
},
"node_modules/picomatch": {
"version": "2.3.1",
@@ -14177,31 +12969,10 @@
"node": ">=0.10.0"
}
},
- "node_modules/pinkie": {
- "version": "2.0.4",
- "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
- "integrity": "sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==",
- "dev": true,
- "engines": {
- "node": ">=0.10.0"
- }
- },
- "node_modules/pinkie-promise": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
- "integrity": "sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==",
- "dev": true,
- "dependencies": {
- "pinkie": "^2.0.0"
- },
- "engines": {
- "node": ">=0.10.0"
- }
- },
"node_modules/pirates": {
- "version": "4.0.5",
- "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz",
- "integrity": "sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==",
+ "version": "4.0.6",
+ "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz",
+ "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==",
"engines": {
"node": ">= 6"
}
@@ -14270,10 +13041,18 @@
"node": ">=4"
}
},
+ "node_modules/possible-typed-array-names": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz",
+ "integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==",
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
"node_modules/postcss": {
- "version": "8.4.31",
- "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
- "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
+ "version": "8.5.1",
+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.1.tgz",
+ "integrity": "sha512-6oz2beyjc5VMn/KV1pPw8fliQkhBXrVn1Z3TVyqZxU8kZpzEKhBdmCFqI6ZbmGtamQvQGuU1sgPTk8ZrXDD7jQ==",
"funding": [
{
"type": "opencollective",
@@ -14289,9 +13068,9 @@
}
],
"dependencies": {
- "nanoid": "^3.3.6",
- "picocolors": "^1.0.0",
- "source-map-js": "^1.0.2"
+ "nanoid": "^3.3.8",
+ "picocolors": "^1.1.1",
+ "source-map-js": "^1.2.1"
},
"engines": {
"node": "^10 || ^12 || >=14"
@@ -14727,20 +13506,26 @@
}
},
"node_modules/postcss-load-config": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-4.0.1.tgz",
- "integrity": "sha512-vEJIc8RdiBRu3oRAI0ymerOn+7rPuMvRXslTvZUKZonDHFIczxztIyJ1urxM1x9JXEikvpWWTUUqal5j/8QgvA==",
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-4.0.2.tgz",
+ "integrity": "sha512-bSVhyJGL00wMVoPUzAVAnbEoWyqRxkjv64tUl427SKnPrENtq6hJwUojroMz2VB+Q1edmi4IfrAPpami5VVgMQ==",
+ "funding": [
+ {
+ "type": "opencollective",
+ "url": "https://opencollective.com/postcss/"
+ },
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/ai"
+ }
+ ],
"dependencies": {
- "lilconfig": "^2.0.5",
- "yaml": "^2.1.1"
+ "lilconfig": "^3.0.0",
+ "yaml": "^2.3.4"
},
"engines": {
"node": ">= 14"
},
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/postcss/"
- },
"peerDependencies": {
"postcss": ">=8.0.9",
"ts-node": ">=9.0.0"
@@ -14754,10 +13539,24 @@
}
}
},
+ "node_modules/postcss-load-config/node_modules/lilconfig": {
+ "version": "3.1.3",
+ "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.3.tgz",
+ "integrity": "sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==",
+ "engines": {
+ "node": ">=14"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/antonk52"
+ }
+ },
"node_modules/postcss-load-config/node_modules/yaml": {
- "version": "2.3.1",
- "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.1.tgz",
- "integrity": "sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==",
+ "version": "2.7.0",
+ "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.7.0.tgz",
+ "integrity": "sha512-+hSoy/QHluxmC9kCIJyL/uyFmLmc+e5CFR5Wa+bpIhIj85LVb9ZH2nVnqrHoSvKogwODv0ClqZkmiSSaIH5LTA==",
+ "bin": {
+ "yaml": "bin.mjs"
+ },
"engines": {
"node": ">= 14"
}
@@ -14783,24 +13582,10 @@
"webpack": "^5.0.0"
}
},
- "node_modules/postcss-loader/node_modules/lru-cache": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
- "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
- "dependencies": {
- "yallist": "^4.0.0"
- },
- "engines": {
- "node": ">=10"
- }
- },
"node_modules/postcss-loader/node_modules/semver": {
- "version": "7.5.2",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz",
- "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
- "dependencies": {
- "lru-cache": "^6.0.0"
- },
+ "version": "7.7.0",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.0.tgz",
+ "integrity": "sha512-DrfFnPzblFmNrIZzg5RzHegbiRWg7KMR7btwi2yjHwx06zsUbO5g613sVwEV7FTwmzJu+Io0lJe2GJ3LxqpvBQ==",
"bin": {
"semver": "bin/semver.js"
},
@@ -14808,11 +13593,6 @@
"node": ">=10"
}
},
- "node_modules/postcss-loader/node_modules/yallist": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
- "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
- },
"node_modules/postcss-logical": {
"version": "5.0.4",
"resolved": "https://registry.npmjs.org/postcss-logical/-/postcss-logical-5.0.4.tgz",
@@ -14928,9 +13708,9 @@
}
},
"node_modules/postcss-modules-extract-imports": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
- "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.1.0.tgz",
+ "integrity": "sha512-k3kNe0aNFQDAZGbin48pL2VNidTF0w4/eASDsxlyspobzU3wZQLOGj7L9gfRe0Jo9/4uud09DsjFNH7winGv8Q==",
"engines": {
"node": "^10 || ^12 || >= 14"
},
@@ -14939,12 +13719,12 @@
}
},
"node_modules/postcss-modules-local-by-default": {
- "version": "4.0.3",
- "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.3.tgz",
- "integrity": "sha512-2/u2zraspoACtrbFRnTijMiQtb4GW4BvatjaG/bCjYQo8kLTdevCUlwuBHx2sCnSyrI3x3qj4ZK1j5LQBgzmwA==",
+ "version": "4.2.0",
+ "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.2.0.tgz",
+ "integrity": "sha512-5kcJm/zk+GJDSfw+V/42fJ5fhjL5YbFDl8nVdXkJPLLW+Vf9mTD5Xe0wqIaDnLuL2U6cDNpTr+UQ+v2HWIBhzw==",
"dependencies": {
"icss-utils": "^5.0.0",
- "postcss-selector-parser": "^6.0.2",
+ "postcss-selector-parser": "^7.0.0",
"postcss-value-parser": "^4.1.0"
},
"engines": {
@@ -14954,12 +13734,24 @@
"postcss": "^8.1.0"
}
},
- "node_modules/postcss-modules-scope": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz",
- "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==",
+ "node_modules/postcss-modules-local-by-default/node_modules/postcss-selector-parser": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.0.0.tgz",
+ "integrity": "sha512-9RbEr1Y7FFfptd/1eEdntyjMwLeghW1bHX9GWjXo19vx4ytPQhANltvVxDggzJl7mnWM+dX28kb6cyS/4iQjlQ==",
"dependencies": {
- "postcss-selector-parser": "^6.0.4"
+ "cssesc": "^3.0.0",
+ "util-deprecate": "^1.0.2"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/postcss-modules-scope": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.2.1.tgz",
+ "integrity": "sha512-m9jZstCVaqGjTAuny8MdgE88scJnCiQSlSrOWcTQgM2t32UBe+MUmFSO5t7VMSfAf/FJKImAxBav8ooCHJXCJA==",
+ "dependencies": {
+ "postcss-selector-parser": "^7.0.0"
},
"engines": {
"node": "^10 || ^12 || >= 14"
@@ -14968,6 +13760,18 @@
"postcss": "^8.1.0"
}
},
+ "node_modules/postcss-modules-scope/node_modules/postcss-selector-parser": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.0.0.tgz",
+ "integrity": "sha512-9RbEr1Y7FFfptd/1eEdntyjMwLeghW1bHX9GWjXo19vx4ytPQhANltvVxDggzJl7mnWM+dX28kb6cyS/4iQjlQ==",
+ "dependencies": {
+ "cssesc": "^3.0.0",
+ "util-deprecate": "^1.0.2"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
"node_modules/postcss-modules-values": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
@@ -14983,19 +13787,25 @@
}
},
"node_modules/postcss-nested": {
- "version": "6.0.1",
- "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.0.1.tgz",
- "integrity": "sha512-mEp4xPMi5bSWiMbsgoPfcP74lsWLHkQbZc3sY+jWYd65CUwXrUaTp0fmNpa01ZcETKlIgUdFN/MpS2xZtqL9dQ==",
+ "version": "6.2.0",
+ "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.2.0.tgz",
+ "integrity": "sha512-HQbt28KulC5AJzG+cZtj9kvKB93CFCdLvog1WFLf1D+xmMvPGlBstkpTEZfK5+AN9hfJocyBFCNiqyS48bpgzQ==",
+ "funding": [
+ {
+ "type": "opencollective",
+ "url": "https://opencollective.com/postcss/"
+ },
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/ai"
+ }
+ ],
"dependencies": {
- "postcss-selector-parser": "^6.0.11"
+ "postcss-selector-parser": "^6.1.1"
},
"engines": {
"node": ">=12.0"
},
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/postcss/"
- },
"peerDependencies": {
"postcss": "^8.2.14"
}
@@ -15381,9 +14191,9 @@
}
},
"node_modules/postcss-selector-parser": {
- "version": "6.0.13",
- "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz",
- "integrity": "sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==",
+ "version": "6.1.2",
+ "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+ "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
"dependencies": {
"cssesc": "^3.0.0",
"util-deprecate": "^1.0.2"
@@ -15488,9 +14298,9 @@
}
},
"node_modules/prettier": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.1.tgz",
- "integrity": "sha512-fcOWSnnpCrovBsmFZIGIy9UqK2FaI7Hqax+DIO0A9UxeVoY4iweyaFjS5TavZN97Hfehph0nhsZnjlVKzEQSrQ==",
+ "version": "3.4.2",
+ "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.4.2.tgz",
+ "integrity": "sha512-e9MewbtFo+Fevyuxn/4rrcDAaq0IYxPGLvObpQjiZBMAzB9IGmzlnG9RZy3FFas+eBMu2vA0CszMeduow5dIuQ==",
"dev": true,
"bin": {
"prettier": "bin/prettier.cjs"
@@ -15586,11 +14396,6 @@
"react-is": "^16.13.1"
}
},
- "node_modules/prop-types/node_modules/react-is": {
- "version": "16.13.1",
- "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
- "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
- },
"node_modules/proxy-addr": {
"version": "2.0.7",
"resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
@@ -15612,51 +14417,40 @@
}
},
"node_modules/psl": {
- "version": "1.9.0",
- "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
- "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag=="
+ "version": "1.15.0",
+ "resolved": "https://registry.npmjs.org/psl/-/psl-1.15.0.tgz",
+ "integrity": "sha512-JZd3gMVBAVQkSs6HdNZo9Sdo0LNcQeMNP3CozBJb3JYC/QUYZTnKxP+f8oWRX4rHP5EurWxqAHTSwUCjlNKa1w==",
+ "dependencies": {
+ "punycode": "^2.3.1"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/lupomontero"
+ }
},
"node_modules/punycode": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
- "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==",
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+ "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
"engines": {
"node": ">=6"
}
},
- "node_modules/pure-rand": {
- "version": "6.0.2",
- "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.0.2.tgz",
- "integrity": "sha512-6Yg0ekpKICSjPswYOuC5sku/TSWaRYlA0qsXqJgM/d/4pLPHPuTxK7Nbf7jFKzAeedUhR8C7K9Uv63FBsSo8xQ==",
- "dev": true,
- "funding": [
- {
- "type": "individual",
- "url": "https://github.com/sponsors/dubzzz"
- },
- {
- "type": "opencollective",
- "url": "https://opencollective.com/fast-check"
- }
- ],
- "optional": true,
- "peer": true
- },
"node_modules/q": {
"version": "1.5.1",
"resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
"integrity": "sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==",
+ "deprecated": "You or someone you depend on is using Q, the JavaScript Promise library that gave JavaScript developers strong feelings about promises. They can almost certainly migrate to the native JavaScript promise now. Thank you literally everyone for joining me in this bet against the odds. Be excellent to each other.\n\n(For a CapTP with native promises, see @endo/eventual-send and @endo/captp)",
"engines": {
"node": ">=0.6.0",
"teleport": ">=0.2.0"
}
},
"node_modules/qs": {
- "version": "6.11.0",
- "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
- "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+ "version": "6.13.0",
+ "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
+ "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
"dependencies": {
- "side-channel": "^1.0.4"
+ "side-channel": "^1.0.6"
},
"engines": {
"node": ">=0.6"
@@ -15714,9 +14508,9 @@
}
},
"node_modules/raw-body": {
- "version": "2.5.1",
- "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
- "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
+ "version": "2.5.2",
+ "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
+ "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
"dependencies": {
"bytes": "3.1.2",
"http-errors": "2.0.0",
@@ -15727,14 +14521,6 @@
"node": ">= 0.8"
}
},
- "node_modules/raw-body/node_modules/bytes": {
- "version": "3.1.2",
- "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
- "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
- "engines": {
- "node": ">= 0.8"
- }
- },
"node_modules/raw-body/node_modules/iconv-lite": {
"version": "0.4.24",
"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
@@ -15774,6 +14560,11 @@
"node": ">=14"
}
},
+ "node_modules/react-app-polyfill/node_modules/regenerator-runtime": {
+ "version": "0.13.11",
+ "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
+ "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
+ },
"node_modules/react-app-rewired": {
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/react-app-rewired/-/react-app-rewired-2.2.1.tgz",
@@ -15830,14 +14621,6 @@
"node": ">=14"
}
},
- "node_modules/react-dev-utils/node_modules/array-union": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
- "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
- "engines": {
- "node": ">=8"
- }
- },
"node_modules/react-dev-utils/node_modules/find-up": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
@@ -15853,29 +14636,10 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
- "node_modules/react-dev-utils/node_modules/globby": {
- "version": "11.1.0",
- "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
- "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
- "dependencies": {
- "array-union": "^2.1.0",
- "dir-glob": "^3.0.1",
- "fast-glob": "^3.2.9",
- "ignore": "^5.2.0",
- "merge2": "^1.4.1",
- "slash": "^3.0.0"
- },
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
"node_modules/react-dev-utils/node_modules/loader-utils": {
- "version": "3.2.1",
- "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.1.tgz",
- "integrity": "sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw==",
+ "version": "3.3.1",
+ "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.3.1.tgz",
+ "integrity": "sha512-FMJTLMXfCLMLfJxcX9PFqX5qD88Z5MRGaZCVzfuqeZSPsyiBzs+pahDQjbIWz2QIzPZz0NX9Zy4FX3lmK6YHIg==",
"engines": {
"node": ">= 12.13.0"
}
@@ -15941,9 +14705,9 @@
"integrity": "sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg=="
},
"node_modules/react-is": {
- "version": "18.2.0",
- "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
- "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
+ "version": "16.13.1",
+ "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+ "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
},
"node_modules/react-refresh": {
"version": "0.11.0",
@@ -16025,294 +14789,6 @@
}
}
},
- "node_modules/react-scripts/node_modules/@jest/console": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.5.1.tgz",
- "integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==",
- "dependencies": {
- "@jest/types": "^27.5.1",
- "@types/node": "*",
- "chalk": "^4.0.0",
- "jest-message-util": "^27.5.1",
- "jest-util": "^27.5.1",
- "slash": "^3.0.0"
- },
- "engines": {
- "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
- }
- },
- "node_modules/react-scripts/node_modules/@jest/core": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/@jest/core/-/core-27.5.1.tgz",
- "integrity": "sha512-AK6/UTrvQD0Cd24NSqmIA6rKsu0tKIxfiCducZvqxYdmMisOYAsdItspT+fQDQYARPf8XgjAFZi0ogW2agH5nQ==",
- "dependencies": {
- "@jest/console": "^27.5.1",
- "@jest/reporters": "^27.5.1",
- "@jest/test-result": "^27.5.1",
- "@jest/transform": "^27.5.1",
- "@jest/types": "^27.5.1",
- "@types/node": "*",
- "ansi-escapes": "^4.2.1",
- "chalk": "^4.0.0",
- "emittery": "^0.8.1",
- "exit": "^0.1.2",
- "graceful-fs": "^4.2.9",
- "jest-changed-files": "^27.5.1",
- "jest-config": "^27.5.1",
- "jest-haste-map": "^27.5.1",
- "jest-message-util": "^27.5.1",
- "jest-regex-util": "^27.5.1",
- "jest-resolve": "^27.5.1",
- "jest-resolve-dependencies": "^27.5.1",
- "jest-runner": "^27.5.1",
- "jest-runtime": "^27.5.1",
- "jest-snapshot": "^27.5.1",
- "jest-util": "^27.5.1",
- "jest-validate": "^27.5.1",
- "jest-watcher": "^27.5.1",
- "micromatch": "^4.0.4",
- "rimraf": "^3.0.0",
- "slash": "^3.0.0",
- "strip-ansi": "^6.0.0"
- },
- "engines": {
- "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
- },
- "peerDependencies": {
- "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
- },
- "peerDependenciesMeta": {
- "node-notifier": {
- "optional": true
- }
- }
- },
- "node_modules/react-scripts/node_modules/@jest/environment": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.5.1.tgz",
- "integrity": "sha512-/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA==",
- "dependencies": {
- "@jest/fake-timers": "^27.5.1",
- "@jest/types": "^27.5.1",
- "@types/node": "*",
- "jest-mock": "^27.5.1"
- },
- "engines": {
- "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
- }
- },
- "node_modules/react-scripts/node_modules/@jest/fake-timers": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.5.1.tgz",
- "integrity": "sha512-/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ==",
- "dependencies": {
- "@jest/types": "^27.5.1",
- "@sinonjs/fake-timers": "^8.0.1",
- "@types/node": "*",
- "jest-message-util": "^27.5.1",
- "jest-mock": "^27.5.1",
- "jest-util": "^27.5.1"
- },
- "engines": {
- "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
- }
- },
- "node_modules/react-scripts/node_modules/@jest/globals": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-27.5.1.tgz",
- "integrity": "sha512-ZEJNB41OBQQgGzgyInAv0UUfDDj3upmHydjieSxFvTRuZElrx7tXg/uVQ5hYVEwiXs3+aMsAeEc9X7xiSKCm4Q==",
- "dependencies": {
- "@jest/environment": "^27.5.1",
- "@jest/types": "^27.5.1",
- "expect": "^27.5.1"
- },
- "engines": {
- "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
- }
- },
- "node_modules/react-scripts/node_modules/@jest/reporters": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-27.5.1.tgz",
- "integrity": "sha512-cPXh9hWIlVJMQkVk84aIvXuBB4uQQmFqZiacloFuGiP3ah1sbCxCosidXFDfqG8+6fO1oR2dTJTlsOy4VFmUfw==",
- "dependencies": {
- "@bcoe/v8-coverage": "^0.2.3",
- "@jest/console": "^27.5.1",
- "@jest/test-result": "^27.5.1",
- "@jest/transform": "^27.5.1",
- "@jest/types": "^27.5.1",
- "@types/node": "*",
- "chalk": "^4.0.0",
- "collect-v8-coverage": "^1.0.0",
- "exit": "^0.1.2",
- "glob": "^7.1.2",
- "graceful-fs": "^4.2.9",
- "istanbul-lib-coverage": "^3.0.0",
- "istanbul-lib-instrument": "^5.1.0",
- "istanbul-lib-report": "^3.0.0",
- "istanbul-lib-source-maps": "^4.0.0",
- "istanbul-reports": "^3.1.3",
- "jest-haste-map": "^27.5.1",
- "jest-resolve": "^27.5.1",
- "jest-util": "^27.5.1",
- "jest-worker": "^27.5.1",
- "slash": "^3.0.0",
- "source-map": "^0.6.0",
- "string-length": "^4.0.1",
- "terminal-link": "^2.0.0",
- "v8-to-istanbul": "^8.1.0"
- },
- "engines": {
- "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
- },
- "peerDependencies": {
- "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
- },
- "peerDependenciesMeta": {
- "node-notifier": {
- "optional": true
- }
- }
- },
- "node_modules/react-scripts/node_modules/@jest/schemas": {
- "version": "28.1.3",
- "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz",
- "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==",
- "dependencies": {
- "@sinclair/typebox": "^0.24.1"
- },
- "engines": {
- "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
- }
- },
- "node_modules/react-scripts/node_modules/@jest/source-map": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-27.5.1.tgz",
- "integrity": "sha512-y9NIHUYF3PJRlHk98NdC/N1gl88BL08aQQgu4k4ZopQkCw9t9cV8mtl3TV8b/YCB8XaVTFrmUTAJvjsntDireg==",
- "dependencies": {
- "callsites": "^3.0.0",
- "graceful-fs": "^4.2.9",
- "source-map": "^0.6.0"
- },
- "engines": {
- "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
- }
- },
- "node_modules/react-scripts/node_modules/@jest/test-result": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.5.1.tgz",
- "integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==",
- "dependencies": {
- "@jest/console": "^27.5.1",
- "@jest/types": "^27.5.1",
- "@types/istanbul-lib-coverage": "^2.0.0",
- "collect-v8-coverage": "^1.0.0"
- },
- "engines": {
- "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
- }
- },
- "node_modules/react-scripts/node_modules/@jest/test-sequencer": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.5.1.tgz",
- "integrity": "sha512-LCheJF7WB2+9JuCS7VB/EmGIdQuhtqjRNI9A43idHv3E4KltCTsPsLxvdaubFHSYwY/fNjMWjl6vNRhDiN7vpQ==",
- "dependencies": {
- "@jest/test-result": "^27.5.1",
- "graceful-fs": "^4.2.9",
- "jest-haste-map": "^27.5.1",
- "jest-runtime": "^27.5.1"
- },
- "engines": {
- "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
- }
- },
- "node_modules/react-scripts/node_modules/@sinclair/typebox": {
- "version": "0.24.51",
- "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz",
- "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA=="
- },
- "node_modules/react-scripts/node_modules/@sinonjs/commons": {
- "version": "1.8.6",
- "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz",
- "integrity": "sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==",
- "dependencies": {
- "type-detect": "4.0.8"
- }
- },
- "node_modules/react-scripts/node_modules/@sinonjs/fake-timers": {
- "version": "8.1.0",
- "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz",
- "integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==",
- "dependencies": {
- "@sinonjs/commons": "^1.7.0"
- }
- },
- "node_modules/react-scripts/node_modules/@types/yargs": {
- "version": "17.0.24",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
- "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
- "dependencies": {
- "@types/yargs-parser": "*"
- }
- },
- "node_modules/react-scripts/node_modules/ansi-styles": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
- "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/chalk/ansi-styles?sponsor=1"
- }
- },
- "node_modules/react-scripts/node_modules/cliui": {
- "version": "7.0.4",
- "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
- "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
- "dependencies": {
- "string-width": "^4.2.0",
- "strip-ansi": "^6.0.0",
- "wrap-ansi": "^7.0.0"
- }
- },
- "node_modules/react-scripts/node_modules/dedent": {
- "version": "0.7.0",
- "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
- "integrity": "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA=="
- },
- "node_modules/react-scripts/node_modules/diff-sequences": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.5.1.tgz",
- "integrity": "sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==",
- "engines": {
- "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
- }
- },
- "node_modules/react-scripts/node_modules/emittery": {
- "version": "0.8.1",
- "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.8.1.tgz",
- "integrity": "sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg==",
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/sindresorhus/emittery?sponsor=1"
- }
- },
- "node_modules/react-scripts/node_modules/expect": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/expect/-/expect-27.5.1.tgz",
- "integrity": "sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==",
- "dependencies": {
- "@jest/types": "^27.5.1",
- "jest-get-type": "^27.5.1",
- "jest-matcher-utils": "^27.5.1",
- "jest-message-util": "^27.5.1"
- },
- "engines": {
- "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
- }
- },
"node_modules/react-scripts/node_modules/fs-extra": {
"version": "10.1.0",
"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
@@ -16326,653 +14802,10 @@
"node": ">=12"
}
},
- "node_modules/react-scripts/node_modules/jest": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/jest/-/jest-27.5.1.tgz",
- "integrity": "sha512-Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ==",
- "dependencies": {
- "@jest/core": "^27.5.1",
- "import-local": "^3.0.2",
- "jest-cli": "^27.5.1"
- },
- "bin": {
- "jest": "bin/jest.js"
- },
- "engines": {
- "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
- },
- "peerDependencies": {
- "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
- },
- "peerDependenciesMeta": {
- "node-notifier": {
- "optional": true
- }
- }
- },
- "node_modules/react-scripts/node_modules/jest-changed-files": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-27.5.1.tgz",
- "integrity": "sha512-buBLMiByfWGCoMsLLzGUUSpAmIAGnbR2KJoMN10ziLhOLvP4e0SlypHnAel8iqQXTrcbmfEY9sSqae5sgUsTvw==",
- "dependencies": {
- "@jest/types": "^27.5.1",
- "execa": "^5.0.0",
- "throat": "^6.0.1"
- },
- "engines": {
- "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
- }
- },
- "node_modules/react-scripts/node_modules/jest-circus": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-27.5.1.tgz",
- "integrity": "sha512-D95R7x5UtlMA5iBYsOHFFbMD/GVA4R/Kdq15f7xYWUfWHBto9NYRsOvnSauTgdF+ogCpJ4tyKOXhUifxS65gdw==",
- "dependencies": {
- "@jest/environment": "^27.5.1",
- "@jest/test-result": "^27.5.1",
- "@jest/types": "^27.5.1",
- "@types/node": "*",
- "chalk": "^4.0.0",
- "co": "^4.6.0",
- "dedent": "^0.7.0",
- "expect": "^27.5.1",
- "is-generator-fn": "^2.0.0",
- "jest-each": "^27.5.1",
- "jest-matcher-utils": "^27.5.1",
- "jest-message-util": "^27.5.1",
- "jest-runtime": "^27.5.1",
- "jest-snapshot": "^27.5.1",
- "jest-util": "^27.5.1",
- "pretty-format": "^27.5.1",
- "slash": "^3.0.0",
- "stack-utils": "^2.0.3",
- "throat": "^6.0.1"
- },
- "engines": {
- "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
- }
- },
- "node_modules/react-scripts/node_modules/jest-cli": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-27.5.1.tgz",
- "integrity": "sha512-Hc6HOOwYq4/74/c62dEE3r5elx8wjYqxY0r0G/nFrLDPMFRu6RA/u8qINOIkvhxG7mMQ5EJsOGfRpI8L6eFUVw==",
- "dependencies": {
- "@jest/core": "^27.5.1",
- "@jest/test-result": "^27.5.1",
- "@jest/types": "^27.5.1",
- "chalk": "^4.0.0",
- "exit": "^0.1.2",
- "graceful-fs": "^4.2.9",
- "import-local": "^3.0.2",
- "jest-config": "^27.5.1",
- "jest-util": "^27.5.1",
- "jest-validate": "^27.5.1",
- "prompts": "^2.0.1",
- "yargs": "^16.2.0"
- },
- "bin": {
- "jest": "bin/jest.js"
- },
- "engines": {
- "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
- },
- "peerDependencies": {
- "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
- },
- "peerDependenciesMeta": {
- "node-notifier": {
- "optional": true
- }
- }
- },
- "node_modules/react-scripts/node_modules/jest-config": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-27.5.1.tgz",
- "integrity": "sha512-5sAsjm6tGdsVbW9ahcChPAFCk4IlkQUknH5AvKjuLTSlcO/wCZKyFdn7Rg0EkC+OGgWODEy2hDpWB1PgzH0JNA==",
- "dependencies": {
- "@babel/core": "^7.8.0",
- "@jest/test-sequencer": "^27.5.1",
- "@jest/types": "^27.5.1",
- "babel-jest": "^27.5.1",
- "chalk": "^4.0.0",
- "ci-info": "^3.2.0",
- "deepmerge": "^4.2.2",
- "glob": "^7.1.1",
- "graceful-fs": "^4.2.9",
- "jest-circus": "^27.5.1",
- "jest-environment-jsdom": "^27.5.1",
- "jest-environment-node": "^27.5.1",
- "jest-get-type": "^27.5.1",
- "jest-jasmine2": "^27.5.1",
- "jest-regex-util": "^27.5.1",
- "jest-resolve": "^27.5.1",
- "jest-runner": "^27.5.1",
- "jest-util": "^27.5.1",
- "jest-validate": "^27.5.1",
- "micromatch": "^4.0.4",
- "parse-json": "^5.2.0",
- "pretty-format": "^27.5.1",
- "slash": "^3.0.0",
- "strip-json-comments": "^3.1.1"
- },
- "engines": {
- "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
- },
- "peerDependencies": {
- "ts-node": ">=9.0.0"
- },
- "peerDependenciesMeta": {
- "ts-node": {
- "optional": true
- }
- }
- },
- "node_modules/react-scripts/node_modules/jest-diff": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.1.tgz",
- "integrity": "sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==",
- "dependencies": {
- "chalk": "^4.0.0",
- "diff-sequences": "^27.5.1",
- "jest-get-type": "^27.5.1",
- "pretty-format": "^27.5.1"
- },
- "engines": {
- "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
- }
- },
- "node_modules/react-scripts/node_modules/jest-docblock": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-27.5.1.tgz",
- "integrity": "sha512-rl7hlABeTsRYxKiUfpHrQrG4e2obOiTQWfMEH3PxPjOtdsfLQO4ReWSZaQ7DETm4xu07rl4q/h4zcKXyU0/OzQ==",
- "dependencies": {
- "detect-newline": "^3.0.0"
- },
- "engines": {
- "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
- }
- },
- "node_modules/react-scripts/node_modules/jest-each": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-27.5.1.tgz",
- "integrity": "sha512-1Ff6p+FbhT/bXQnEouYy00bkNSY7OUpfIcmdl8vZ31A1UUaurOLPA8a8BbJOF2RDUElwJhmeaV7LnagI+5UwNQ==",
- "dependencies": {
- "@jest/types": "^27.5.1",
- "chalk": "^4.0.0",
- "jest-get-type": "^27.5.1",
- "jest-util": "^27.5.1",
- "pretty-format": "^27.5.1"
- },
- "engines": {
- "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
- }
- },
- "node_modules/react-scripts/node_modules/jest-environment-node": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.5.1.tgz",
- "integrity": "sha512-Jt4ZUnxdOsTGwSRAfKEnE6BcwsSPNOijjwifq5sDFSA2kesnXTvNqKHYgM0hDq3549Uf/KzdXNYn4wMZJPlFLw==",
- "dependencies": {
- "@jest/environment": "^27.5.1",
- "@jest/fake-timers": "^27.5.1",
- "@jest/types": "^27.5.1",
- "@types/node": "*",
- "jest-mock": "^27.5.1",
- "jest-util": "^27.5.1"
- },
- "engines": {
- "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
- }
- },
- "node_modules/react-scripts/node_modules/jest-leak-detector": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-27.5.1.tgz",
- "integrity": "sha512-POXfWAMvfU6WMUXftV4HolnJfnPOGEu10fscNCA76KBpRRhcMN2c8d3iT2pxQS3HLbA+5X4sOUPzYO2NUyIlHQ==",
- "dependencies": {
- "jest-get-type": "^27.5.1",
- "pretty-format": "^27.5.1"
- },
- "engines": {
- "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
- }
- },
- "node_modules/react-scripts/node_modules/jest-matcher-utils": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz",
- "integrity": "sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==",
- "dependencies": {
- "chalk": "^4.0.0",
- "jest-diff": "^27.5.1",
- "jest-get-type": "^27.5.1",
- "pretty-format": "^27.5.1"
- },
- "engines": {
- "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
- }
- },
- "node_modules/react-scripts/node_modules/jest-message-util": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
- "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
- "dependencies": {
- "@babel/code-frame": "^7.12.13",
- "@jest/types": "^27.5.1",
- "@types/stack-utils": "^2.0.0",
- "chalk": "^4.0.0",
- "graceful-fs": "^4.2.9",
- "micromatch": "^4.0.4",
- "pretty-format": "^27.5.1",
- "slash": "^3.0.0",
- "stack-utils": "^2.0.3"
- },
- "engines": {
- "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
- }
- },
- "node_modules/react-scripts/node_modules/jest-mock": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.5.1.tgz",
- "integrity": "sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og==",
- "dependencies": {
- "@jest/types": "^27.5.1",
- "@types/node": "*"
- },
- "engines": {
- "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
- }
- },
- "node_modules/react-scripts/node_modules/jest-resolve-dependencies": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.5.1.tgz",
- "integrity": "sha512-QQOOdY4PE39iawDn5rzbIePNigfe5B9Z91GDD1ae/xNDlu9kaat8QQ5EKnNmVWPV54hUdxCVwwj6YMgR2O7IOg==",
- "dependencies": {
- "@jest/types": "^27.5.1",
- "jest-regex-util": "^27.5.1",
- "jest-snapshot": "^27.5.1"
- },
- "engines": {
- "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
- }
- },
- "node_modules/react-scripts/node_modules/jest-runner": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-27.5.1.tgz",
- "integrity": "sha512-g4NPsM4mFCOwFKXO4p/H/kWGdJp9V8kURY2lX8Me2drgXqG7rrZAx5kv+5H7wtt/cdFIjhqYx1HrlqWHaOvDaQ==",
- "dependencies": {
- "@jest/console": "^27.5.1",
- "@jest/environment": "^27.5.1",
- "@jest/test-result": "^27.5.1",
- "@jest/transform": "^27.5.1",
- "@jest/types": "^27.5.1",
- "@types/node": "*",
- "chalk": "^4.0.0",
- "emittery": "^0.8.1",
- "graceful-fs": "^4.2.9",
- "jest-docblock": "^27.5.1",
- "jest-environment-jsdom": "^27.5.1",
- "jest-environment-node": "^27.5.1",
- "jest-haste-map": "^27.5.1",
- "jest-leak-detector": "^27.5.1",
- "jest-message-util": "^27.5.1",
- "jest-resolve": "^27.5.1",
- "jest-runtime": "^27.5.1",
- "jest-util": "^27.5.1",
- "jest-worker": "^27.5.1",
- "source-map-support": "^0.5.6",
- "throat": "^6.0.1"
- },
- "engines": {
- "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
- }
- },
- "node_modules/react-scripts/node_modules/jest-runtime": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.5.1.tgz",
- "integrity": "sha512-o7gxw3Gf+H2IGt8fv0RiyE1+r83FJBRruoA+FXrlHw6xEyBsU8ugA6IPfTdVyA0w8HClpbK+DGJxH59UrNMx8A==",
- "dependencies": {
- "@jest/environment": "^27.5.1",
- "@jest/fake-timers": "^27.5.1",
- "@jest/globals": "^27.5.1",
- "@jest/source-map": "^27.5.1",
- "@jest/test-result": "^27.5.1",
- "@jest/transform": "^27.5.1",
- "@jest/types": "^27.5.1",
- "chalk": "^4.0.0",
- "cjs-module-lexer": "^1.0.0",
- "collect-v8-coverage": "^1.0.0",
- "execa": "^5.0.0",
- "glob": "^7.1.3",
- "graceful-fs": "^4.2.9",
- "jest-haste-map": "^27.5.1",
- "jest-message-util": "^27.5.1",
- "jest-mock": "^27.5.1",
- "jest-regex-util": "^27.5.1",
- "jest-resolve": "^27.5.1",
- "jest-snapshot": "^27.5.1",
- "jest-util": "^27.5.1",
- "slash": "^3.0.0",
- "strip-bom": "^4.0.0"
- },
- "engines": {
- "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
- }
- },
- "node_modules/react-scripts/node_modules/jest-snapshot": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.5.1.tgz",
- "integrity": "sha512-yYykXI5a0I31xX67mgeLw1DZ0bJB+gpq5IpSuCAoyDi0+BhgU/RIrL+RTzDmkNTchvDFWKP8lp+w/42Z3us5sA==",
- "dependencies": {
- "@babel/core": "^7.7.2",
- "@babel/generator": "^7.7.2",
- "@babel/plugin-syntax-typescript": "^7.7.2",
- "@babel/traverse": "^7.7.2",
- "@babel/types": "^7.0.0",
- "@jest/transform": "^27.5.1",
- "@jest/types": "^27.5.1",
- "@types/babel__traverse": "^7.0.4",
- "@types/prettier": "^2.1.5",
- "babel-preset-current-node-syntax": "^1.0.0",
- "chalk": "^4.0.0",
- "expect": "^27.5.1",
- "graceful-fs": "^4.2.9",
- "jest-diff": "^27.5.1",
- "jest-get-type": "^27.5.1",
- "jest-haste-map": "^27.5.1",
- "jest-matcher-utils": "^27.5.1",
- "jest-message-util": "^27.5.1",
- "jest-util": "^27.5.1",
- "natural-compare": "^1.4.0",
- "pretty-format": "^27.5.1",
- "semver": "^7.3.2"
- },
- "engines": {
- "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
- }
- },
- "node_modules/react-scripts/node_modules/jest-watch-typeahead": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/jest-watch-typeahead/-/jest-watch-typeahead-1.1.0.tgz",
- "integrity": "sha512-Va5nLSJTN7YFtC2jd+7wsoe1pNe5K4ShLux/E5iHEwlB9AxaxmggY7to9KUqKojhaJw3aXqt5WAb4jGPOolpEw==",
- "dependencies": {
- "ansi-escapes": "^4.3.1",
- "chalk": "^4.0.0",
- "jest-regex-util": "^28.0.0",
- "jest-watcher": "^28.0.0",
- "slash": "^4.0.0",
- "string-length": "^5.0.1",
- "strip-ansi": "^7.0.1"
- },
- "engines": {
- "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
- },
- "peerDependencies": {
- "jest": "^27.0.0 || ^28.0.0"
- }
- },
- "node_modules/react-scripts/node_modules/jest-watch-typeahead/node_modules/@jest/console": {
- "version": "28.1.3",
- "resolved": "https://registry.npmjs.org/@jest/console/-/console-28.1.3.tgz",
- "integrity": "sha512-QPAkP5EwKdK/bxIr6C1I4Vs0rm2nHiANzj/Z5X2JQkrZo6IqvC4ldZ9K95tF0HdidhA8Bo6egxSzUFPYKcEXLw==",
- "dependencies": {
- "@jest/types": "^28.1.3",
- "@types/node": "*",
- "chalk": "^4.0.0",
- "jest-message-util": "^28.1.3",
- "jest-util": "^28.1.3",
- "slash": "^3.0.0"
- },
- "engines": {
- "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
- }
- },
- "node_modules/react-scripts/node_modules/jest-watch-typeahead/node_modules/@jest/console/node_modules/slash": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
- "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/react-scripts/node_modules/jest-watch-typeahead/node_modules/@jest/test-result": {
- "version": "28.1.3",
- "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-28.1.3.tgz",
- "integrity": "sha512-kZAkxnSE+FqE8YjW8gNuoVkkC9I7S1qmenl8sGcDOLropASP+BkcGKwhXoyqQuGOGeYY0y/ixjrd/iERpEXHNg==",
- "dependencies": {
- "@jest/console": "^28.1.3",
- "@jest/types": "^28.1.3",
- "@types/istanbul-lib-coverage": "^2.0.0",
- "collect-v8-coverage": "^1.0.0"
- },
- "engines": {
- "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
- }
- },
- "node_modules/react-scripts/node_modules/jest-watch-typeahead/node_modules/@jest/types": {
- "version": "28.1.3",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz",
- "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==",
- "dependencies": {
- "@jest/schemas": "^28.1.3",
- "@types/istanbul-lib-coverage": "^2.0.0",
- "@types/istanbul-reports": "^3.0.0",
- "@types/node": "*",
- "@types/yargs": "^17.0.8",
- "chalk": "^4.0.0"
- },
- "engines": {
- "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
- }
- },
- "node_modules/react-scripts/node_modules/jest-watch-typeahead/node_modules/emittery": {
- "version": "0.10.2",
- "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.10.2.tgz",
- "integrity": "sha512-aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw==",
- "engines": {
- "node": ">=12"
- },
- "funding": {
- "url": "https://github.com/sindresorhus/emittery?sponsor=1"
- }
- },
- "node_modules/react-scripts/node_modules/jest-watch-typeahead/node_modules/jest-message-util": {
- "version": "28.1.3",
- "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.3.tgz",
- "integrity": "sha512-PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g==",
- "dependencies": {
- "@babel/code-frame": "^7.12.13",
- "@jest/types": "^28.1.3",
- "@types/stack-utils": "^2.0.0",
- "chalk": "^4.0.0",
- "graceful-fs": "^4.2.9",
- "micromatch": "^4.0.4",
- "pretty-format": "^28.1.3",
- "slash": "^3.0.0",
- "stack-utils": "^2.0.3"
- },
- "engines": {
- "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
- }
- },
- "node_modules/react-scripts/node_modules/jest-watch-typeahead/node_modules/jest-message-util/node_modules/slash": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
- "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/react-scripts/node_modules/jest-watch-typeahead/node_modules/jest-regex-util": {
- "version": "28.0.2",
- "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-28.0.2.tgz",
- "integrity": "sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw==",
- "engines": {
- "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
- }
- },
- "node_modules/react-scripts/node_modules/jest-watch-typeahead/node_modules/jest-util": {
- "version": "28.1.3",
- "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz",
- "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==",
- "dependencies": {
- "@jest/types": "^28.1.3",
- "@types/node": "*",
- "chalk": "^4.0.0",
- "ci-info": "^3.2.0",
- "graceful-fs": "^4.2.9",
- "picomatch": "^2.2.3"
- },
- "engines": {
- "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
- }
- },
- "node_modules/react-scripts/node_modules/jest-watch-typeahead/node_modules/jest-watcher": {
- "version": "28.1.3",
- "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-28.1.3.tgz",
- "integrity": "sha512-t4qcqj9hze+jviFPUN3YAtAEeFnr/azITXQEMARf5cMwKY2SMBRnCQTXLixTl20OR6mLh9KLMrgVJgJISym+1g==",
- "dependencies": {
- "@jest/test-result": "^28.1.3",
- "@jest/types": "^28.1.3",
- "@types/node": "*",
- "ansi-escapes": "^4.2.1",
- "chalk": "^4.0.0",
- "emittery": "^0.10.2",
- "jest-util": "^28.1.3",
- "string-length": "^4.0.1"
- },
- "engines": {
- "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
- }
- },
- "node_modules/react-scripts/node_modules/jest-watch-typeahead/node_modules/jest-watcher/node_modules/string-length": {
- "version": "4.0.2",
- "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
- "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
- "dependencies": {
- "char-regex": "^1.0.2",
- "strip-ansi": "^6.0.0"
- },
- "engines": {
- "node": ">=10"
- }
- },
- "node_modules/react-scripts/node_modules/jest-watch-typeahead/node_modules/jest-watcher/node_modules/strip-ansi": {
- "version": "6.0.1",
- "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
- "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
- "dependencies": {
- "ansi-regex": "^5.0.1"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/react-scripts/node_modules/jest-watch-typeahead/node_modules/pretty-format": {
- "version": "28.1.3",
- "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz",
- "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==",
- "dependencies": {
- "@jest/schemas": "^28.1.3",
- "ansi-regex": "^5.0.1",
- "ansi-styles": "^5.0.0",
- "react-is": "^18.0.0"
- },
- "engines": {
- "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
- }
- },
- "node_modules/react-scripts/node_modules/jest-watch-typeahead/node_modules/slash": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
- "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
- "engines": {
- "node": ">=12"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/react-scripts/node_modules/jest-watch-typeahead/node_modules/string-length": {
- "version": "5.0.1",
- "resolved": "https://registry.npmjs.org/string-length/-/string-length-5.0.1.tgz",
- "integrity": "sha512-9Ep08KAMUn0OadnVaBuRdE2l615CQ508kr0XMadjClfYpdCyvrbFp6Taebo8yyxokQ4viUd/xPPUA4FGgUa0ow==",
- "dependencies": {
- "char-regex": "^2.0.0",
- "strip-ansi": "^7.0.1"
- },
- "engines": {
- "node": ">=12.20"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/react-scripts/node_modules/jest-watch-typeahead/node_modules/string-length/node_modules/char-regex": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-2.0.1.tgz",
- "integrity": "sha512-oSvEeo6ZUD7NepqAat3RqoucZ5SeqLJgOvVIwkafu6IP3V0pO38s/ypdVUmDDK6qIIHNlYHJAKX9E7R7HoKElw==",
- "engines": {
- "node": ">=12.20"
- }
- },
- "node_modules/react-scripts/node_modules/jest-watch-typeahead/node_modules/strip-ansi": {
- "version": "7.1.0",
- "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
- "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
- "dependencies": {
- "ansi-regex": "^6.0.1"
- },
- "engines": {
- "node": ">=12"
- },
- "funding": {
- "url": "https://github.com/chalk/strip-ansi?sponsor=1"
- }
- },
- "node_modules/react-scripts/node_modules/jest-watch-typeahead/node_modules/strip-ansi/node_modules/ansi-regex": {
- "version": "6.0.1",
- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
- "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
- "engines": {
- "node": ">=12"
- },
- "funding": {
- "url": "https://github.com/chalk/ansi-regex?sponsor=1"
- }
- },
- "node_modules/react-scripts/node_modules/jest-watcher": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.5.1.tgz",
- "integrity": "sha512-z676SuD6Z8o8qbmEGhoEUFOM1+jfEiL3DXHK/xgEiG2EyNYfFG60jluWcupY6dATjfEsKQuibReS1djInQnoVw==",
- "dependencies": {
- "@jest/test-result": "^27.5.1",
- "@jest/types": "^27.5.1",
- "@types/node": "*",
- "ansi-escapes": "^4.2.1",
- "chalk": "^4.0.0",
- "jest-util": "^27.5.1",
- "string-length": "^4.0.1"
- },
- "engines": {
- "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
- }
- },
- "node_modules/react-scripts/node_modules/lru-cache": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
- "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
- "dependencies": {
- "yallist": "^4.0.0"
- },
- "engines": {
- "node": ">=10"
- }
- },
"node_modules/react-scripts/node_modules/semver": {
- "version": "7.5.2",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz",
- "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
- "dependencies": {
- "lru-cache": "^6.0.0"
- },
+ "version": "7.7.0",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.0.tgz",
+ "integrity": "sha512-DrfFnPzblFmNrIZzg5RzHegbiRWg7KMR7btwi2yjHwx06zsUbO5g613sVwEV7FTwmzJu+Io0lJe2GJ3LxqpvBQ==",
"bin": {
"semver": "bin/semver.js"
},
@@ -16980,65 +14813,6 @@
"node": ">=10"
}
},
- "node_modules/react-scripts/node_modules/source-map": {
- "version": "0.6.1",
- "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
- "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
- "engines": {
- "node": ">=0.10.0"
- }
- },
- "node_modules/react-scripts/node_modules/v8-to-istanbul": {
- "version": "8.1.1",
- "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-8.1.1.tgz",
- "integrity": "sha512-FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w==",
- "dependencies": {
- "@types/istanbul-lib-coverage": "^2.0.1",
- "convert-source-map": "^1.6.0",
- "source-map": "^0.7.3"
- },
- "engines": {
- "node": ">=10.12.0"
- }
- },
- "node_modules/react-scripts/node_modules/v8-to-istanbul/node_modules/source-map": {
- "version": "0.7.4",
- "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
- "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
- "engines": {
- "node": ">= 8"
- }
- },
- "node_modules/react-scripts/node_modules/yallist": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
- "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
- },
- "node_modules/react-scripts/node_modules/yargs": {
- "version": "16.2.0",
- "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
- "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
- "dependencies": {
- "cliui": "^7.0.2",
- "escalade": "^3.1.1",
- "get-caller-file": "^2.0.5",
- "require-directory": "^2.1.1",
- "string-width": "^4.2.0",
- "y18n": "^5.0.5",
- "yargs-parser": "^20.2.2"
- },
- "engines": {
- "node": ">=10"
- }
- },
- "node_modules/react-scripts/node_modules/yargs-parser": {
- "version": "20.2.9",
- "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
- "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
- "engines": {
- "node": ">=10"
- }
- },
"node_modules/read-cache": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
@@ -17095,15 +14869,36 @@
"node": ">=8"
}
},
+ "node_modules/reflect.getprototypeof": {
+ "version": "1.0.10",
+ "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz",
+ "integrity": "sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==",
+ "dependencies": {
+ "call-bind": "^1.0.8",
+ "define-properties": "^1.2.1",
+ "es-abstract": "^1.23.9",
+ "es-errors": "^1.3.0",
+ "es-object-atoms": "^1.0.0",
+ "get-intrinsic": "^1.2.7",
+ "get-proto": "^1.0.1",
+ "which-builtin-type": "^1.2.1"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
"node_modules/regenerate": {
"version": "1.4.2",
"resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
"integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="
},
"node_modules/regenerate-unicode-properties": {
- "version": "10.1.0",
- "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz",
- "integrity": "sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==",
+ "version": "10.2.0",
+ "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.2.0.tgz",
+ "integrity": "sha512-DqHn3DwbmmPVzeKj9woBadqmXxLvQoQIwu7nopMc72ztvxVmVk2SBhSnx67zuye5TP+lJsb/TBQsjLKhnDf3MA==",
"dependencies": {
"regenerate": "^1.4.2"
},
@@ -17112,31 +14907,34 @@
}
},
"node_modules/regenerator-runtime": {
- "version": "0.13.11",
- "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
- "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
+ "version": "0.14.1",
+ "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
+ "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="
},
"node_modules/regenerator-transform": {
- "version": "0.15.1",
- "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.1.tgz",
- "integrity": "sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg==",
+ "version": "0.15.2",
+ "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.2.tgz",
+ "integrity": "sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==",
"dependencies": {
"@babel/runtime": "^7.8.4"
}
},
"node_modules/regex-parser": {
- "version": "2.2.11",
- "resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.2.11.tgz",
- "integrity": "sha512-jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q=="
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.3.0.tgz",
+ "integrity": "sha512-TVILVSz2jY5D47F4mA4MppkBrafEaiUWJO/TcZHEIuI13AqoZMkK1WMA4Om1YkYbTx+9Ki1/tSUXbceyr9saRg=="
},
"node_modules/regexp.prototype.flags": {
- "version": "1.5.0",
- "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz",
- "integrity": "sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==",
+ "version": "1.5.4",
+ "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz",
+ "integrity": "sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==",
"dependencies": {
- "call-bind": "^1.0.2",
- "define-properties": "^1.2.0",
- "functions-have-names": "^1.2.3"
+ "call-bind": "^1.0.8",
+ "define-properties": "^1.2.1",
+ "es-errors": "^1.3.0",
+ "get-proto": "^1.0.1",
+ "gopd": "^1.2.0",
+ "set-function-name": "^2.0.2"
},
"engines": {
"node": ">= 0.4"
@@ -17146,14 +14944,14 @@
}
},
"node_modules/regexpu-core": {
- "version": "5.3.2",
- "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz",
- "integrity": "sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==",
+ "version": "6.2.0",
+ "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-6.2.0.tgz",
+ "integrity": "sha512-H66BPQMrv+V16t8xtmq+UC0CBpiTBA60V8ibS1QVReIp8T1z8hwFxqcGzm9K6lgsN7sB5edVH8a+ze6Fqm4weA==",
"dependencies": {
- "@babel/regjsgen": "^0.8.0",
"regenerate": "^1.4.2",
- "regenerate-unicode-properties": "^10.1.0",
- "regjsparser": "^0.9.1",
+ "regenerate-unicode-properties": "^10.2.0",
+ "regjsgen": "^0.8.0",
+ "regjsparser": "^0.12.0",
"unicode-match-property-ecmascript": "^2.0.0",
"unicode-match-property-value-ecmascript": "^2.1.0"
},
@@ -17161,23 +14959,31 @@
"node": ">=4"
}
},
+ "node_modules/regjsgen": {
+ "version": "0.8.0",
+ "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.8.0.tgz",
+ "integrity": "sha512-RvwtGe3d7LvWiDQXeQw8p5asZUmfU1G/l6WbUXeHta7Y2PEIvBTwH6E2EfmYUK8pxcxEdEmaomqyp0vZZ7C+3Q=="
+ },
"node_modules/regjsparser": {
- "version": "0.9.1",
- "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz",
- "integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==",
+ "version": "0.12.0",
+ "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.12.0.tgz",
+ "integrity": "sha512-cnE+y8bz4NhMjISKbgeVJtqNbtf5QpjZP+Bslo+UqkIt9QPnX9q095eiRRASJG1/tz6dlNr6Z5NsBiWYokp6EQ==",
"dependencies": {
- "jsesc": "~0.5.0"
+ "jsesc": "~3.0.2"
},
"bin": {
"regjsparser": "bin/parser"
}
},
"node_modules/regjsparser/node_modules/jsesc": {
- "version": "0.5.0",
- "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
- "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==",
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz",
+ "integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==",
"bin": {
"jsesc": "bin/jsesc"
+ },
+ "engines": {
+ "node": ">=6"
}
},
"node_modules/relateurl": {
@@ -17222,17 +15028,20 @@
"integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="
},
"node_modules/resolve": {
- "version": "1.22.2",
- "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz",
- "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==",
+ "version": "1.22.10",
+ "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz",
+ "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==",
"dependencies": {
- "is-core-module": "^2.11.0",
+ "is-core-module": "^2.16.0",
"path-parse": "^1.0.7",
"supports-preserve-symlinks-flag": "^1.0.0"
},
"bin": {
"resolve": "bin/resolve"
},
+ "engines": {
+ "node": ">= 0.4"
+ },
"funding": {
"url": "https://github.com/sponsors/ljharb"
}
@@ -17283,6 +15092,11 @@
}
}
},
+ "node_modules/resolve-url-loader/node_modules/convert-source-map": {
+ "version": "1.9.0",
+ "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
+ "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="
+ },
"node_modules/resolve-url-loader/node_modules/picocolors": {
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
@@ -17341,6 +15155,7 @@
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
"integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+ "deprecated": "Rimraf versions prior to v4 are no longer supported",
"dependencies": {
"glob": "^7.1.3"
},
@@ -17352,9 +15167,9 @@
}
},
"node_modules/rollup": {
- "version": "2.79.1",
- "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.1.tgz",
- "integrity": "sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==",
+ "version": "2.79.2",
+ "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.2.tgz",
+ "integrity": "sha512-fS6iqSPZDs3dr/y7Od6y5nha8dW1YnbgtsyotCVvoFGKbERG++CVRFv1meyGDE1SNItQA8BrnCw7ScdAhRJ3XQ==",
"bin": {
"rollup": "dist/bin/rollup"
},
@@ -17424,13 +15239,14 @@
}
},
"node_modules/safe-array-concat": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.0.tgz",
- "integrity": "sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ==",
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.3.tgz",
+ "integrity": "sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==",
"dependencies": {
- "call-bind": "^1.0.2",
- "get-intrinsic": "^1.2.0",
- "has-symbols": "^1.0.3",
+ "call-bind": "^1.0.8",
+ "call-bound": "^1.0.2",
+ "get-intrinsic": "^1.2.6",
+ "has-symbols": "^1.1.0",
"isarray": "^2.0.5"
},
"engines": {
@@ -17459,14 +15275,32 @@
}
]
},
- "node_modules/safe-regex-test": {
+ "node_modules/safe-push-apply": {
"version": "1.0.0",
- "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz",
- "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==",
+ "resolved": "https://registry.npmjs.org/safe-push-apply/-/safe-push-apply-1.0.0.tgz",
+ "integrity": "sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==",
"dependencies": {
- "call-bind": "^1.0.2",
- "get-intrinsic": "^1.1.3",
- "is-regex": "^1.1.4"
+ "es-errors": "^1.3.0",
+ "isarray": "^2.0.5"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/safe-regex-test": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.1.0.tgz",
+ "integrity": "sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==",
+ "dependencies": {
+ "call-bound": "^1.0.2",
+ "es-errors": "^1.3.0",
+ "is-regex": "^1.2.1"
+ },
+ "engines": {
+ "node": ">= 0.4"
},
"funding": {
"url": "https://github.com/sponsors/ljharb"
@@ -17545,13 +15379,14 @@
}
},
"node_modules/schema-utils": {
- "version": "3.3.0",
- "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
- "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.0.tgz",
+ "integrity": "sha512-Gf9qqc58SpCA/xdziiHz35F4GNIWYWZrEshUc/G/r5BnLph6xpKuLeoJoQuj5WfBIx/eQLf+hmVPYHaxJu7V2g==",
"dependencies": {
- "@types/json-schema": "^7.0.8",
- "ajv": "^6.12.5",
- "ajv-keywords": "^3.5.2"
+ "@types/json-schema": "^7.0.9",
+ "ajv": "^8.9.0",
+ "ajv-formats": "^2.1.1",
+ "ajv-keywords": "^5.1.0"
},
"engines": {
"node": ">= 10.13.0"
@@ -17561,16 +15396,48 @@
"url": "https://opencollective.com/webpack"
}
},
+ "node_modules/schema-utils/node_modules/ajv": {
+ "version": "8.17.1",
+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+ "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
+ "dependencies": {
+ "fast-deep-equal": "^3.1.3",
+ "fast-uri": "^3.0.1",
+ "json-schema-traverse": "^1.0.0",
+ "require-from-string": "^2.0.2"
+ },
+ "funding": {
+ "type": "github",
+ "url": "https://github.com/sponsors/epoberezkin"
+ }
+ },
+ "node_modules/schema-utils/node_modules/ajv-keywords": {
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+ "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+ "dependencies": {
+ "fast-deep-equal": "^3.1.3"
+ },
+ "peerDependencies": {
+ "ajv": "^8.8.2"
+ }
+ },
+ "node_modules/schema-utils/node_modules/json-schema-traverse": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+ "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
+ },
"node_modules/select-hose": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
"integrity": "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg=="
},
"node_modules/selfsigned": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.1.1.tgz",
- "integrity": "sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ==",
+ "version": "2.4.1",
+ "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.4.1.tgz",
+ "integrity": "sha512-th5B4L2U+eGLq1TVh7zNRGBapioSORUeymIydxgFpwww9d2qyKvtuPU2jJuHvYAwwqi2Y596QBL3eEqcPEYL8Q==",
"dependencies": {
+ "@types/node-forge": "^1.3.0",
"node-forge": "^1"
},
"engines": {
@@ -17586,9 +15453,9 @@
}
},
"node_modules/send": {
- "version": "0.18.0",
- "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
- "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
+ "version": "0.19.0",
+ "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",
+ "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==",
"dependencies": {
"debug": "2.6.9",
"depd": "2.0.0",
@@ -17621,15 +15488,18 @@
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
},
- "node_modules/send/node_modules/ms": {
- "version": "2.1.3",
- "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
- "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+ "node_modules/send/node_modules/encodeurl": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+ "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+ "engines": {
+ "node": ">= 0.8"
+ }
},
"node_modules/serialize-javascript": {
- "version": "6.0.1",
- "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz",
- "integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==",
+ "version": "6.0.2",
+ "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
+ "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
"dependencies": {
"randombytes": "^2.1.0"
}
@@ -17705,19 +15575,62 @@
}
},
"node_modules/serve-static": {
- "version": "1.15.0",
- "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
- "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
+ "version": "1.16.2",
+ "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz",
+ "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==",
"dependencies": {
- "encodeurl": "~1.0.2",
+ "encodeurl": "~2.0.0",
"escape-html": "~1.0.3",
"parseurl": "~1.3.3",
- "send": "0.18.0"
+ "send": "0.19.0"
},
"engines": {
"node": ">= 0.8.0"
}
},
+ "node_modules/set-function-length": {
+ "version": "1.2.2",
+ "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
+ "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
+ "dependencies": {
+ "define-data-property": "^1.1.4",
+ "es-errors": "^1.3.0",
+ "function-bind": "^1.1.2",
+ "get-intrinsic": "^1.2.4",
+ "gopd": "^1.0.1",
+ "has-property-descriptors": "^1.0.2"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
+ "node_modules/set-function-name": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz",
+ "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==",
+ "dependencies": {
+ "define-data-property": "^1.1.4",
+ "es-errors": "^1.3.0",
+ "functions-have-names": "^1.2.3",
+ "has-property-descriptors": "^1.0.2"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
+ "node_modules/set-proto": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/set-proto/-/set-proto-1.0.0.tgz",
+ "integrity": "sha512-RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw==",
+ "dependencies": {
+ "dunder-proto": "^1.0.1",
+ "es-errors": "^1.3.0",
+ "es-object-atoms": "^1.0.0"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
"node_modules/setprototypeof": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
@@ -17738,12 +15651,12 @@
}
},
"node_modules/sharp-router/node_modules/@types/react": {
- "version": "16.14.43",
- "resolved": "https://registry.npmjs.org/@types/react/-/react-16.14.43.tgz",
- "integrity": "sha512-7zdjv7jvoLLQg1tTvpQsm+hyNUMT2mPlNV1+d0I8fbGhkJl82spopMyBlu4wb1dviZAxpGdk5eHu/muacknnfw==",
+ "version": "16.14.62",
+ "resolved": "https://registry.npmjs.org/@types/react/-/react-16.14.62.tgz",
+ "integrity": "sha512-BWf7hqninZav6nerxXj+NeZT/mTpDeG6Lk2zREHAy63CrnXoOGPGtNqTFYFN/sqpSaREDP5otVV88axIXmKfGA==",
"dependencies": {
"@types/prop-types": "*",
- "@types/scheduler": "*",
+ "@types/scheduler": "^0.16",
"csstype": "^3.0.2"
}
},
@@ -17767,21 +15680,79 @@
}
},
"node_modules/shell-quote": {
- "version": "1.8.1",
- "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz",
- "integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==",
+ "version": "1.8.2",
+ "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.2.tgz",
+ "integrity": "sha512-AzqKpGKjrj7EM6rKVQEPpB288oCfnrEIuyoT9cyF4nmGa7V8Zk6f7RRqYisX8X9m+Q7bd632aZW4ky7EhbQztA==",
+ "engines": {
+ "node": ">= 0.4"
+ },
"funding": {
"url": "https://github.com/sponsors/ljharb"
}
},
"node_modules/side-channel": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
- "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz",
+ "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==",
"dependencies": {
- "call-bind": "^1.0.0",
- "get-intrinsic": "^1.0.2",
- "object-inspect": "^1.9.0"
+ "es-errors": "^1.3.0",
+ "object-inspect": "^1.13.3",
+ "side-channel-list": "^1.0.0",
+ "side-channel-map": "^1.0.1",
+ "side-channel-weakmap": "^1.0.2"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/side-channel-list": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz",
+ "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==",
+ "dependencies": {
+ "es-errors": "^1.3.0",
+ "object-inspect": "^1.13.3"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/side-channel-map": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz",
+ "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==",
+ "dependencies": {
+ "call-bound": "^1.0.2",
+ "es-errors": "^1.3.0",
+ "get-intrinsic": "^1.2.5",
+ "object-inspect": "^1.13.3"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/side-channel-weakmap": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz",
+ "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==",
+ "dependencies": {
+ "call-bound": "^1.0.2",
+ "es-errors": "^1.3.0",
+ "get-intrinsic": "^1.2.5",
+ "object-inspect": "^1.13.3",
+ "side-channel-map": "^1.0.1"
+ },
+ "engines": {
+ "node": ">= 0.4"
},
"funding": {
"url": "https://github.com/sponsors/ljharb"
@@ -17829,9 +15800,9 @@
}
},
"node_modules/source-map-js": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
- "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
+ "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
"engines": {
"node": ">=0.10.0"
}
@@ -17942,6 +15913,99 @@
"resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.3.4.tgz",
"integrity": "sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw=="
},
+ "node_modules/static-eval": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/static-eval/-/static-eval-2.0.2.tgz",
+ "integrity": "sha512-N/D219Hcr2bPjLxPiV+TQE++Tsmrady7TqAJugLy7Xk1EumfDWS/f5dtBbkRCGE7wKKXuYockQoj8Rm2/pVKyg==",
+ "dependencies": {
+ "escodegen": "^1.8.1"
+ }
+ },
+ "node_modules/static-eval/node_modules/escodegen": {
+ "version": "1.14.3",
+ "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz",
+ "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==",
+ "dependencies": {
+ "esprima": "^4.0.1",
+ "estraverse": "^4.2.0",
+ "esutils": "^2.0.2",
+ "optionator": "^0.8.1"
+ },
+ "bin": {
+ "escodegen": "bin/escodegen.js",
+ "esgenerate": "bin/esgenerate.js"
+ },
+ "engines": {
+ "node": ">=4.0"
+ },
+ "optionalDependencies": {
+ "source-map": "~0.6.1"
+ }
+ },
+ "node_modules/static-eval/node_modules/estraverse": {
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+ "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+ "engines": {
+ "node": ">=4.0"
+ }
+ },
+ "node_modules/static-eval/node_modules/levn": {
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+ "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
+ "dependencies": {
+ "prelude-ls": "~1.1.2",
+ "type-check": "~0.3.2"
+ },
+ "engines": {
+ "node": ">= 0.8.0"
+ }
+ },
+ "node_modules/static-eval/node_modules/optionator": {
+ "version": "0.8.3",
+ "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
+ "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+ "dependencies": {
+ "deep-is": "~0.1.3",
+ "fast-levenshtein": "~2.0.6",
+ "levn": "~0.3.0",
+ "prelude-ls": "~1.1.2",
+ "type-check": "~0.3.2",
+ "word-wrap": "~1.2.3"
+ },
+ "engines": {
+ "node": ">= 0.8.0"
+ }
+ },
+ "node_modules/static-eval/node_modules/prelude-ls": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+ "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==",
+ "engines": {
+ "node": ">= 0.8.0"
+ }
+ },
+ "node_modules/static-eval/node_modules/source-map": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+ "optional": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/static-eval/node_modules/type-check": {
+ "version": "0.3.2",
+ "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+ "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
+ "dependencies": {
+ "prelude-ls": "~1.1.2"
+ },
+ "engines": {
+ "node": ">= 0.8.0"
+ }
+ },
"node_modules/statuses": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
@@ -17951,11 +16015,13 @@
}
},
"node_modules/stop-iteration-iterator": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz",
- "integrity": "sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==",
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.1.0.tgz",
+ "integrity": "sha512-eLoXW/DHyl62zxY4SCaIgnRhuMr6ri4juEYARS8E6sCEqzKpOiE521Ucofdx+KnDZl5xmvGYaaKCk5FEOxJCoQ==",
+ "dev": true,
"dependencies": {
- "internal-slot": "^1.0.4"
+ "es-errors": "^1.3.0",
+ "internal-slot": "^1.1.0"
},
"engines": {
"node": ">= 0.4"
@@ -17999,37 +16065,90 @@
"node": ">=8"
}
},
+ "node_modules/string-width-cjs": {
+ "name": "string-width",
+ "version": "4.2.3",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+ "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+ "dependencies": {
+ "emoji-regex": "^8.0.0",
+ "is-fullwidth-code-point": "^3.0.0",
+ "strip-ansi": "^6.0.1"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/string-width-cjs/node_modules/emoji-regex": {
+ "version": "8.0.0",
+ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+ "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+ },
"node_modules/string-width/node_modules/emoji-regex": {
"version": "8.0.0",
"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
},
- "node_modules/string.prototype.matchall": {
- "version": "4.0.8",
- "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz",
- "integrity": "sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==",
+ "node_modules/string.prototype.includes": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/string.prototype.includes/-/string.prototype.includes-2.0.1.tgz",
+ "integrity": "sha512-o7+c9bW6zpAdJHTtujeePODAhkuicdAryFsfVKwA+wGw89wJ4GTY484WTucM9hLtDEOpOvI+aHnzqnC5lHp4Rg==",
"dependencies": {
- "call-bind": "^1.0.2",
- "define-properties": "^1.1.4",
- "es-abstract": "^1.20.4",
- "get-intrinsic": "^1.1.3",
- "has-symbols": "^1.0.3",
- "internal-slot": "^1.0.3",
- "regexp.prototype.flags": "^1.4.3",
- "side-channel": "^1.0.4"
+ "call-bind": "^1.0.7",
+ "define-properties": "^1.2.1",
+ "es-abstract": "^1.23.3"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
+ "node_modules/string.prototype.matchall": {
+ "version": "4.0.12",
+ "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.12.tgz",
+ "integrity": "sha512-6CC9uyBL+/48dYizRf7H7VAYCMCNTBeM78x/VTUe9bFEaxBepPJDa1Ow99LqI/1yF7kuy7Q3cQsYMrcjGUcskA==",
+ "dependencies": {
+ "call-bind": "^1.0.8",
+ "call-bound": "^1.0.3",
+ "define-properties": "^1.2.1",
+ "es-abstract": "^1.23.6",
+ "es-errors": "^1.3.0",
+ "es-object-atoms": "^1.0.0",
+ "get-intrinsic": "^1.2.6",
+ "gopd": "^1.2.0",
+ "has-symbols": "^1.1.0",
+ "internal-slot": "^1.1.0",
+ "regexp.prototype.flags": "^1.5.3",
+ "set-function-name": "^2.0.2",
+ "side-channel": "^1.1.0"
+ },
+ "engines": {
+ "node": ">= 0.4"
},
"funding": {
"url": "https://github.com/sponsors/ljharb"
}
},
- "node_modules/string.prototype.trim": {
- "version": "1.2.7",
- "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz",
- "integrity": "sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==",
+ "node_modules/string.prototype.repeat": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/string.prototype.repeat/-/string.prototype.repeat-1.0.0.tgz",
+ "integrity": "sha512-0u/TldDbKD8bFCQ/4f5+mNRrXwZ8hg2w7ZR8wa16e8z9XpePWl3eGEcUD0OXpEH/VJH/2G3gjUtR3ZOiBe2S/w==",
"dependencies": {
- "call-bind": "^1.0.2",
- "define-properties": "^1.1.4",
- "es-abstract": "^1.20.4"
+ "define-properties": "^1.1.3",
+ "es-abstract": "^1.17.5"
+ }
+ },
+ "node_modules/string.prototype.trim": {
+ "version": "1.2.10",
+ "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz",
+ "integrity": "sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==",
+ "dependencies": {
+ "call-bind": "^1.0.8",
+ "call-bound": "^1.0.2",
+ "define-data-property": "^1.1.4",
+ "define-properties": "^1.2.1",
+ "es-abstract": "^1.23.5",
+ "es-object-atoms": "^1.0.0",
+ "has-property-descriptors": "^1.0.2"
},
"engines": {
"node": ">= 0.4"
@@ -18039,26 +16158,33 @@
}
},
"node_modules/string.prototype.trimend": {
- "version": "1.0.6",
- "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
- "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",
+ "version": "1.0.9",
+ "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz",
+ "integrity": "sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==",
"dependencies": {
- "call-bind": "^1.0.2",
- "define-properties": "^1.1.4",
- "es-abstract": "^1.20.4"
+ "call-bind": "^1.0.8",
+ "call-bound": "^1.0.2",
+ "define-properties": "^1.2.1",
+ "es-object-atoms": "^1.0.0"
+ },
+ "engines": {
+ "node": ">= 0.4"
},
"funding": {
"url": "https://github.com/sponsors/ljharb"
}
},
"node_modules/string.prototype.trimstart": {
- "version": "1.0.6",
- "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",
- "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",
+ "version": "1.0.8",
+ "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz",
+ "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==",
"dependencies": {
- "call-bind": "^1.0.2",
- "define-properties": "^1.1.4",
- "es-abstract": "^1.20.4"
+ "call-bind": "^1.0.7",
+ "define-properties": "^1.2.1",
+ "es-object-atoms": "^1.0.0"
+ },
+ "engines": {
+ "node": ">= 0.4"
},
"funding": {
"url": "https://github.com/sponsors/ljharb"
@@ -18088,6 +16214,18 @@
"node": ">=8"
}
},
+ "node_modules/strip-ansi-cjs": {
+ "name": "strip-ansi",
+ "version": "6.0.1",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+ "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+ "dependencies": {
+ "ansi-regex": "^5.0.1"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
"node_modules/strip-bom": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
@@ -18157,9 +16295,9 @@
}
},
"node_modules/style-loader": {
- "version": "3.3.3",
- "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.3.tgz",
- "integrity": "sha512-53BiGLXAcll9maCYtZi2RCQZKa8NQQai5C4horqKyRmHj9H7QmcUyucrH+4KW/gBQbXM2AsB0axoEcFZPlfPcw==",
+ "version": "3.3.4",
+ "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.4.tgz",
+ "integrity": "sha512-0WqXzrsMTyb8yjZJHDqwmnwRJvhALK9LfRtRc6B4UTWe8AijYLZYZ9thuJTZc2VfQWINADW/j+LiJnfy2RoC1w==",
"engines": {
"node": ">= 12.13.0"
},
@@ -18172,19 +16310,19 @@
}
},
"node_modules/styled-components": {
- "version": "6.1.0",
- "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-6.1.0.tgz",
- "integrity": "sha512-VWNfYYBuXzuLS/QYEeoPgMErP26WL+dX9//rEh80B2mmlS1yRxRxuL5eax4m6ybYEUoHWlTy2XOU32767mlMkg==",
+ "version": "6.1.14",
+ "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-6.1.14.tgz",
+ "integrity": "sha512-KtfwhU5jw7UoxdM0g6XU9VZQFV4do+KrM8idiVCH5h4v49W+3p3yMe0icYwJgZQZepa5DbH04Qv8P0/RdcLcgg==",
"dependencies": {
- "@emotion/is-prop-valid": "^1.2.1",
- "@emotion/unitless": "^0.8.0",
- "@types/stylis": "^4.0.2",
- "css-to-react-native": "^3.2.0",
- "csstype": "^3.1.2",
- "postcss": "^8.4.31",
- "shallowequal": "^1.1.0",
- "stylis": "^4.3.0",
- "tslib": "^2.5.0"
+ "@emotion/is-prop-valid": "1.2.2",
+ "@emotion/unitless": "0.8.1",
+ "@types/stylis": "4.2.5",
+ "css-to-react-native": "3.2.0",
+ "csstype": "3.1.3",
+ "postcss": "8.4.38",
+ "shallowequal": "1.1.0",
+ "stylis": "4.3.2",
+ "tslib": "2.6.2"
},
"engines": {
"node": ">= 16"
@@ -18198,6 +16336,38 @@
"react-dom": ">= 16.8.0"
}
},
+ "node_modules/styled-components/node_modules/postcss": {
+ "version": "8.4.38",
+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz",
+ "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==",
+ "funding": [
+ {
+ "type": "opencollective",
+ "url": "https://opencollective.com/postcss/"
+ },
+ {
+ "type": "tidelift",
+ "url": "https://tidelift.com/funding/github/npm/postcss"
+ },
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/ai"
+ }
+ ],
+ "dependencies": {
+ "nanoid": "^3.3.7",
+ "picocolors": "^1.0.0",
+ "source-map-js": "^1.2.0"
+ },
+ "engines": {
+ "node": "^10 || ^12 || >=14"
+ }
+ },
+ "node_modules/styled-components/node_modules/tslib": {
+ "version": "2.6.2",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+ "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
+ },
"node_modules/stylehacks": {
"version": "5.1.1",
"resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-5.1.1.tgz",
@@ -18214,18 +16384,18 @@
}
},
"node_modules/stylis": {
- "version": "4.3.0",
- "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.3.0.tgz",
- "integrity": "sha512-E87pIogpwUsUwXw7dNyU4QDjdgVMy52m+XEOPEKUn161cCzWjjhPSQhByfd1CcNvrOLnXQ6OnnZDwnJrz/Z4YQ=="
+ "version": "4.3.2",
+ "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.3.2.tgz",
+ "integrity": "sha512-bhtUjWd/z6ltJiQwg0dUfxEJ+W+jdqQd8TbWLWyeIJHlnsqmGLRFFd8e5mA0AZi/zx90smXRlN66YMTcaSFifg=="
},
"node_modules/sucrase": {
- "version": "3.32.0",
- "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.32.0.tgz",
- "integrity": "sha512-ydQOU34rpSyj2TGyz4D2p8rbktIOZ8QY9s+DGLvFU1i5pWJE8vkpruCjGCMHsdXwnD7JDcS+noSwM/a7zyNFDQ==",
+ "version": "3.35.0",
+ "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.35.0.tgz",
+ "integrity": "sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA==",
"dependencies": {
"@jridgewell/gen-mapping": "^0.3.2",
"commander": "^4.0.0",
- "glob": "7.1.6",
+ "glob": "^10.3.10",
"lines-and-columns": "^1.1.6",
"mz": "^2.7.0",
"pirates": "^4.0.1",
@@ -18236,7 +16406,15 @@
"sucrase-node": "bin/sucrase-node"
},
"engines": {
- "node": ">=8"
+ "node": ">=16 || 14 >=14.17"
+ }
+ },
+ "node_modules/sucrase/node_modules/brace-expansion": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+ "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+ "dependencies": {
+ "balanced-match": "^1.0.0"
}
},
"node_modules/sucrase/node_modules/commander": {
@@ -18248,19 +16426,33 @@
}
},
"node_modules/sucrase/node_modules/glob": {
- "version": "7.1.6",
- "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
- "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+ "version": "10.4.5",
+ "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
+ "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
"dependencies": {
- "fs.realpath": "^1.0.0",
- "inflight": "^1.0.4",
- "inherits": "2",
- "minimatch": "^3.0.4",
- "once": "^1.3.0",
- "path-is-absolute": "^1.0.0"
+ "foreground-child": "^3.1.0",
+ "jackspeak": "^3.1.2",
+ "minimatch": "^9.0.4",
+ "minipass": "^7.1.2",
+ "package-json-from-dist": "^1.0.0",
+ "path-scurry": "^1.11.1"
+ },
+ "bin": {
+ "glob": "dist/esm/bin.mjs"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/isaacs"
+ }
+ },
+ "node_modules/sucrase/node_modules/minimatch": {
+ "version": "9.0.5",
+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+ "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+ "dependencies": {
+ "brace-expansion": "^2.0.1"
},
"engines": {
- "node": "*"
+ "node": ">=16 || 14 >=14.17"
},
"funding": {
"url": "https://github.com/sponsors/isaacs"
@@ -18455,33 +16647,32 @@
"integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="
},
"node_modules/tailwindcss": {
- "version": "3.3.2",
- "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.2.tgz",
- "integrity": "sha512-9jPkMiIBXvPc2KywkraqsUfbfj+dHDb+JPWtSJa9MLFdrPyazI7q6WX2sUrm7R9eVR7qqv3Pas7EvQFzxKnI6w==",
+ "version": "3.4.17",
+ "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.17.tgz",
+ "integrity": "sha512-w33E2aCvSDP0tW9RZuNXadXlkHXqFzSkQew/aIa2i/Sj8fThxwovwlXHSPXTbAHwEIhBFXAedUhP2tueAKP8Og==",
"dependencies": {
"@alloc/quick-lru": "^5.2.0",
"arg": "^5.0.2",
- "chokidar": "^3.5.3",
+ "chokidar": "^3.6.0",
"didyoumean": "^1.2.2",
"dlv": "^1.1.3",
- "fast-glob": "^3.2.12",
+ "fast-glob": "^3.3.2",
"glob-parent": "^6.0.2",
"is-glob": "^4.0.3",
- "jiti": "^1.18.2",
- "lilconfig": "^2.1.0",
- "micromatch": "^4.0.5",
+ "jiti": "^1.21.6",
+ "lilconfig": "^3.1.3",
+ "micromatch": "^4.0.8",
"normalize-path": "^3.0.0",
"object-hash": "^3.0.0",
- "picocolors": "^1.0.0",
- "postcss": "^8.4.23",
+ "picocolors": "^1.1.1",
+ "postcss": "^8.4.47",
"postcss-import": "^15.1.0",
"postcss-js": "^4.0.1",
- "postcss-load-config": "^4.0.1",
- "postcss-nested": "^6.0.1",
- "postcss-selector-parser": "^6.0.11",
- "postcss-value-parser": "^4.2.0",
- "resolve": "^1.22.2",
- "sucrase": "^3.32.0"
+ "postcss-load-config": "^4.0.2",
+ "postcss-nested": "^6.2.0",
+ "postcss-selector-parser": "^6.1.2",
+ "resolve": "^1.22.8",
+ "sucrase": "^3.35.0"
},
"bin": {
"tailwind": "lib/cli.js",
@@ -18491,6 +16682,28 @@
"node": ">=14.0.0"
}
},
+ "node_modules/tailwindcss/node_modules/glob-parent": {
+ "version": "6.0.2",
+ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+ "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+ "dependencies": {
+ "is-glob": "^4.0.3"
+ },
+ "engines": {
+ "node": ">=10.13.0"
+ }
+ },
+ "node_modules/tailwindcss/node_modules/lilconfig": {
+ "version": "3.1.3",
+ "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.3.tgz",
+ "integrity": "sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==",
+ "engines": {
+ "node": ">=14"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/antonk52"
+ }
+ },
"node_modules/tapable": {
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
@@ -18551,9 +16764,9 @@
}
},
"node_modules/terser": {
- "version": "5.18.0",
- "resolved": "https://registry.npmjs.org/terser/-/terser-5.18.0.tgz",
- "integrity": "sha512-pdL757Ig5a0I+owA42l6tIuEycRuM7FPY4n62h44mRLRfnOxJkkOHd6i89dOpwZlpF6JXBwaAHF6yWzFrt+QyA==",
+ "version": "5.37.0",
+ "resolved": "https://registry.npmjs.org/terser/-/terser-5.37.0.tgz",
+ "integrity": "sha512-B8wRRkmre4ERucLM/uXx4MOV5cbnOlVAqUst+1+iLKPI0dOgFO28f84ptoQt9HEI537PMzfYa/d+GEPKTRXmYA==",
"dependencies": {
"@jridgewell/source-map": "^0.3.3",
"acorn": "^8.8.2",
@@ -18568,15 +16781,15 @@
}
},
"node_modules/terser-webpack-plugin": {
- "version": "5.3.9",
- "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz",
- "integrity": "sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==",
+ "version": "5.3.11",
+ "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.11.tgz",
+ "integrity": "sha512-RVCsMfuD0+cTt3EwX8hSl2Ks56EbFHWmhluwcqoPKtBnfjiT6olaq7PRIRfhyU8nnC2MrnDrBLfrD/RGE+cVXQ==",
"dependencies": {
- "@jridgewell/trace-mapping": "^0.3.17",
+ "@jridgewell/trace-mapping": "^0.3.25",
"jest-worker": "^27.4.5",
- "schema-utils": "^3.1.1",
- "serialize-javascript": "^6.0.1",
- "terser": "^5.16.8"
+ "schema-utils": "^4.3.0",
+ "serialize-javascript": "^6.0.2",
+ "terser": "^5.31.1"
},
"engines": {
"node": ">= 10.13.0"
@@ -18600,6 +16813,11 @@
}
}
},
+ "node_modules/terser/node_modules/commander": {
+ "version": "2.20.3",
+ "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+ "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
+ },
"node_modules/test-exclude": {
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
@@ -18652,14 +16870,6 @@
"resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
"integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw=="
},
- "node_modules/to-fast-properties": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
- "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
- "engines": {
- "node": ">=4"
- }
- },
"node_modules/to-regex-range": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -18680,9 +16890,9 @@
}
},
"node_modules/tough-cookie": {
- "version": "4.1.3",
- "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
- "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
+ "version": "4.1.4",
+ "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.4.tgz",
+ "integrity": "sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==",
"dependencies": {
"psl": "^1.1.33",
"punycode": "^2.1.1",
@@ -18744,9 +16954,9 @@
"integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA=="
},
"node_modules/tsconfig-paths": {
- "version": "3.14.2",
- "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz",
- "integrity": "sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==",
+ "version": "3.15.0",
+ "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz",
+ "integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==",
"dependencies": {
"@types/json5": "^0.0.29",
"json5": "^1.0.2",
@@ -18774,9 +16984,9 @@
}
},
"node_modules/tslib": {
- "version": "2.5.3",
- "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz",
- "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w=="
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="
},
"node_modules/tslint": {
"version": "6.1.3",
@@ -18862,6 +17072,12 @@
"integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
"dev": true
},
+ "node_modules/tslint/node_modules/commander": {
+ "version": "2.20.3",
+ "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+ "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+ "dev": true
+ },
"node_modules/tslint/node_modules/escape-string-regexp": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
@@ -18980,14 +17196,71 @@
"node": ">= 0.6"
}
},
- "node_modules/typed-array-length": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz",
- "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==",
+ "node_modules/typed-array-buffer": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz",
+ "integrity": "sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==",
"dependencies": {
- "call-bind": "^1.0.2",
+ "call-bound": "^1.0.3",
+ "es-errors": "^1.3.0",
+ "is-typed-array": "^1.1.14"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
+ "node_modules/typed-array-byte-length": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.3.tgz",
+ "integrity": "sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==",
+ "dependencies": {
+ "call-bind": "^1.0.8",
"for-each": "^0.3.3",
- "is-typed-array": "^1.1.9"
+ "gopd": "^1.2.0",
+ "has-proto": "^1.2.0",
+ "is-typed-array": "^1.1.14"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/typed-array-byte-offset": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.4.tgz",
+ "integrity": "sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==",
+ "dependencies": {
+ "available-typed-arrays": "^1.0.7",
+ "call-bind": "^1.0.8",
+ "for-each": "^0.3.3",
+ "gopd": "^1.2.0",
+ "has-proto": "^1.2.0",
+ "is-typed-array": "^1.1.15",
+ "reflect.getprototypeof": "^1.0.9"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/typed-array-length": {
+ "version": "1.0.7",
+ "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.7.tgz",
+ "integrity": "sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==",
+ "dependencies": {
+ "call-bind": "^1.0.7",
+ "for-each": "^0.3.3",
+ "gopd": "^1.0.1",
+ "is-typed-array": "^1.1.13",
+ "possible-typed-array-names": "^1.0.0",
+ "reflect.getprototypeof": "^1.0.6"
+ },
+ "engines": {
+ "node": ">= 0.4"
},
"funding": {
"url": "https://github.com/sponsors/ljharb"
@@ -19014,28 +17287,36 @@
}
},
"node_modules/unbox-primitive": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
- "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.1.0.tgz",
+ "integrity": "sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==",
"dependencies": {
- "call-bind": "^1.0.2",
+ "call-bound": "^1.0.3",
"has-bigints": "^1.0.2",
- "has-symbols": "^1.0.3",
- "which-boxed-primitive": "^1.0.2"
+ "has-symbols": "^1.1.0",
+ "which-boxed-primitive": "^1.1.1"
+ },
+ "engines": {
+ "node": ">= 0.4"
},
"funding": {
"url": "https://github.com/sponsors/ljharb"
}
},
+ "node_modules/underscore": {
+ "version": "1.12.1",
+ "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.12.1.tgz",
+ "integrity": "sha512-hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw=="
+ },
"node_modules/undici-types": {
- "version": "5.25.3",
- "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.25.3.tgz",
- "integrity": "sha512-Ga1jfYwRn7+cP9v8auvEXN1rX3sWqlayd4HP7OKk4mZWylEmu3KzXDUGrQUN6Ol7qo1gPvB2e5gX6udnyEPgdA=="
+ "version": "6.20.0",
+ "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
+ "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg=="
},
"node_modules/unicode-canonical-property-names-ecmascript": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
- "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==",
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.1.tgz",
+ "integrity": "sha512-dA8WbNeb2a6oQzAQ55YlT5vQAWGV9WXOsi3SskE3bcCdM0P4SDd+24zS/OCacdRq5BkdsRj9q3Pg6YyQoxIGqg==",
"engines": {
"node": ">=4"
}
@@ -19053,9 +17334,9 @@
}
},
"node_modules/unicode-match-property-value-ecmascript": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz",
- "integrity": "sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==",
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.2.0.tgz",
+ "integrity": "sha512-4IehN3V/+kkr5YeSSDDQG8QLqO26XpL2XP3GQtqwlT/QYSECAwFztxVHjlbh0+gjJ3XmNLS0zDsbgs9jWKExLg==",
"engines": {
"node": ">=4"
}
@@ -19080,9 +17361,9 @@
}
},
"node_modules/universalify": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
- "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+ "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
"engines": {
"node": ">= 10.0.0"
}
@@ -19110,9 +17391,9 @@
}
},
"node_modules/update-browserslist-db": {
- "version": "1.0.11",
- "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz",
- "integrity": "sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==",
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.2.tgz",
+ "integrity": "sha512-PPypAm5qvlD7XMZC3BujecnaOxwhrtoFR+Dqkk5Aa/6DssiH0ibKoketaj9w8LP7Bont1rYeoV5plxD7RTEPRg==",
"funding": [
{
"type": "opencollective",
@@ -19128,8 +17409,8 @@
}
],
"dependencies": {
- "escalade": "^3.1.1",
- "picocolors": "^1.0.0"
+ "escalade": "^3.2.0",
+ "picocolors": "^1.1.1"
},
"bin": {
"update-browserslist-db": "cli.js"
@@ -19196,21 +17477,23 @@
}
},
"node_modules/v8-to-istanbul": {
- "version": "9.1.0",
- "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.1.0.tgz",
- "integrity": "sha512-6z3GW9x8G1gd+JIIgQQQxXuiJtCXeAjp6RaPEPLv62mH3iPHPxV6W3robxtCzNErRo6ZwTmzWhsbNvjyEBKzKA==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "8.1.1",
+ "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-8.1.1.tgz",
+ "integrity": "sha512-FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w==",
"dependencies": {
- "@jridgewell/trace-mapping": "^0.3.12",
"@types/istanbul-lib-coverage": "^2.0.1",
- "convert-source-map": "^1.6.0"
+ "convert-source-map": "^1.6.0",
+ "source-map": "^0.7.3"
},
"engines": {
"node": ">=10.12.0"
}
},
+ "node_modules/v8-to-istanbul/node_modules/convert-source-map": {
+ "version": "1.9.0",
+ "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
+ "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="
+ },
"node_modules/vary": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
@@ -19248,9 +17531,9 @@
}
},
"node_modules/watchpack": {
- "version": "2.4.0",
- "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
- "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
+ "version": "2.4.2",
+ "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz",
+ "integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==",
"dependencies": {
"glob-to-regexp": "^0.4.1",
"graceful-fs": "^4.1.2"
@@ -19268,9 +17551,9 @@
}
},
"node_modules/web-vitals": {
- "version": "3.5.0",
- "resolved": "https://registry.npmjs.org/web-vitals/-/web-vitals-3.5.0.tgz",
- "integrity": "sha512-f5YnCHVG9Y6uLCePD4tY8bO/Ge15NPEQWtvm3tPzDKygloiqtb4SVqRHBcrIAqo2ztqX5XueqDn97zHF0LdT6w=="
+ "version": "3.5.2",
+ "resolved": "https://registry.npmjs.org/web-vitals/-/web-vitals-3.5.2.tgz",
+ "integrity": "sha512-c0rhqNcHXRkY/ogGDJQxZ9Im9D19hDihbzSQJrsioex+KnFgmMzBiy57Z1EjkhX/+OjyBpclDCzz2ITtjokFmg=="
},
"node_modules/webidl-conversions": {
"version": "6.1.0",
@@ -19281,33 +17564,32 @@
}
},
"node_modules/webpack": {
- "version": "5.87.0",
- "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.87.0.tgz",
- "integrity": "sha512-GOu1tNbQ7p1bDEoFRs2YPcfyGs8xq52yyPBZ3m2VGnXGtV9MxjrkABHm4V9Ia280OefsSLzvbVoXcfLxjKY/Iw==",
+ "version": "5.97.1",
+ "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.97.1.tgz",
+ "integrity": "sha512-EksG6gFY3L1eFMROS/7Wzgrii5mBAFe4rIr3r2BTfo7bcc+DWwFZ4OJ/miOuHJO/A85HwyI4eQ0F6IKXesO7Fg==",
"dependencies": {
- "@types/eslint-scope": "^3.7.3",
- "@types/estree": "^1.0.0",
- "@webassemblyjs/ast": "^1.11.5",
- "@webassemblyjs/wasm-edit": "^1.11.5",
- "@webassemblyjs/wasm-parser": "^1.11.5",
- "acorn": "^8.7.1",
- "acorn-import-assertions": "^1.9.0",
- "browserslist": "^4.14.5",
+ "@types/eslint-scope": "^3.7.7",
+ "@types/estree": "^1.0.6",
+ "@webassemblyjs/ast": "^1.14.1",
+ "@webassemblyjs/wasm-edit": "^1.14.1",
+ "@webassemblyjs/wasm-parser": "^1.14.1",
+ "acorn": "^8.14.0",
+ "browserslist": "^4.24.0",
"chrome-trace-event": "^1.0.2",
- "enhanced-resolve": "^5.15.0",
+ "enhanced-resolve": "^5.17.1",
"es-module-lexer": "^1.2.1",
"eslint-scope": "5.1.1",
"events": "^3.2.0",
"glob-to-regexp": "^0.4.1",
- "graceful-fs": "^4.2.9",
+ "graceful-fs": "^4.2.11",
"json-parse-even-better-errors": "^2.3.1",
"loader-runner": "^4.2.0",
"mime-types": "^2.1.27",
"neo-async": "^2.6.2",
"schema-utils": "^3.2.0",
"tapable": "^2.1.1",
- "terser-webpack-plugin": "^5.3.7",
- "watchpack": "^2.4.0",
+ "terser-webpack-plugin": "^5.3.10",
+ "watchpack": "^2.4.1",
"webpack-sources": "^3.2.3"
},
"bin": {
@@ -19327,9 +17609,9 @@
}
},
"node_modules/webpack-dev-middleware": {
- "version": "5.3.3",
- "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz",
- "integrity": "sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==",
+ "version": "5.3.4",
+ "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz",
+ "integrity": "sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==",
"dependencies": {
"colorette": "^2.0.10",
"memfs": "^3.4.3",
@@ -19348,59 +17630,10 @@
"webpack": "^4.0.0 || ^5.0.0"
}
},
- "node_modules/webpack-dev-middleware/node_modules/ajv": {
- "version": "8.12.0",
- "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
- "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
- "dependencies": {
- "fast-deep-equal": "^3.1.1",
- "json-schema-traverse": "^1.0.0",
- "require-from-string": "^2.0.2",
- "uri-js": "^4.2.2"
- },
- "funding": {
- "type": "github",
- "url": "https://github.com/sponsors/epoberezkin"
- }
- },
- "node_modules/webpack-dev-middleware/node_modules/ajv-keywords": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
- "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
- "dependencies": {
- "fast-deep-equal": "^3.1.3"
- },
- "peerDependencies": {
- "ajv": "^8.8.2"
- }
- },
- "node_modules/webpack-dev-middleware/node_modules/json-schema-traverse": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
- "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
- },
- "node_modules/webpack-dev-middleware/node_modules/schema-utils": {
- "version": "4.2.0",
- "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
- "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
- "dependencies": {
- "@types/json-schema": "^7.0.9",
- "ajv": "^8.9.0",
- "ajv-formats": "^2.1.1",
- "ajv-keywords": "^5.1.0"
- },
- "engines": {
- "node": ">= 12.13.0"
- },
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/webpack"
- }
- },
"node_modules/webpack-dev-server": {
- "version": "4.15.1",
- "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.1.tgz",
- "integrity": "sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA==",
+ "version": "4.15.2",
+ "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.2.tgz",
+ "integrity": "sha512-0XavAZbNJ5sDrCbkpWL8mia0o5WPOd2YGtxrEiZkBK9FjLppIUK2TgxK6qGD2P3hUXTJNNPVibrerKcx5WkR1g==",
"dependencies": {
"@types/bonjour": "^3.5.9",
"@types/connect-history-api-fallback": "^1.3.5",
@@ -19430,7 +17663,7 @@
"serve-index": "^1.9.1",
"sockjs": "^0.3.24",
"spdy": "^4.0.2",
- "webpack-dev-middleware": "^5.3.1",
+ "webpack-dev-middleware": "^5.3.4",
"ws": "^8.13.0"
},
"bin": {
@@ -19455,59 +17688,10 @@
}
}
},
- "node_modules/webpack-dev-server/node_modules/ajv": {
- "version": "8.12.0",
- "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
- "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
- "dependencies": {
- "fast-deep-equal": "^3.1.1",
- "json-schema-traverse": "^1.0.0",
- "require-from-string": "^2.0.2",
- "uri-js": "^4.2.2"
- },
- "funding": {
- "type": "github",
- "url": "https://github.com/sponsors/epoberezkin"
- }
- },
- "node_modules/webpack-dev-server/node_modules/ajv-keywords": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
- "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
- "dependencies": {
- "fast-deep-equal": "^3.1.3"
- },
- "peerDependencies": {
- "ajv": "^8.8.2"
- }
- },
- "node_modules/webpack-dev-server/node_modules/json-schema-traverse": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
- "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
- },
- "node_modules/webpack-dev-server/node_modules/schema-utils": {
- "version": "4.2.0",
- "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
- "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
- "dependencies": {
- "@types/json-schema": "^7.0.9",
- "ajv": "^8.9.0",
- "ajv-formats": "^2.1.1",
- "ajv-keywords": "^5.1.0"
- },
- "engines": {
- "node": ">= 12.13.0"
- },
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/webpack"
- }
- },
"node_modules/webpack-dev-server/node_modules/ws": {
- "version": "8.13.0",
- "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
- "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
+ "version": "8.18.0",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
+ "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
"engines": {
"node": ">=10.0.0"
},
@@ -19587,6 +17771,23 @@
"node": ">=4.0"
}
},
+ "node_modules/webpack/node_modules/schema-utils": {
+ "version": "3.3.0",
+ "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+ "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+ "dependencies": {
+ "@types/json-schema": "^7.0.8",
+ "ajv": "^6.12.5",
+ "ajv-keywords": "^3.5.2"
+ },
+ "engines": {
+ "node": ">= 10.13.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/webpack"
+ }
+ },
"node_modules/websocket-driver": {
"version": "0.7.4",
"resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
@@ -19628,9 +17829,9 @@
}
},
"node_modules/whatwg-fetch": {
- "version": "3.6.2",
- "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz",
- "integrity": "sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA=="
+ "version": "3.6.20",
+ "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.20.tgz",
+ "integrity": "sha512-EqhiFU6daOA8kpjOWTL0olhVOF3i7OrFzSYiGsEMB8GcXS+RrzauAERX65xMeNWVqxA6HXH2m69Z9LaKKdisfg=="
},
"node_modules/whatwg-mimetype": {
"version": "2.3.0",
@@ -19665,45 +17866,77 @@
}
},
"node_modules/which-boxed-primitive": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
- "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.1.1.tgz",
+ "integrity": "sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==",
"dependencies": {
- "is-bigint": "^1.0.1",
- "is-boolean-object": "^1.1.0",
- "is-number-object": "^1.0.4",
- "is-string": "^1.0.5",
- "is-symbol": "^1.0.3"
+ "is-bigint": "^1.1.0",
+ "is-boolean-object": "^1.2.1",
+ "is-number-object": "^1.1.1",
+ "is-string": "^1.1.1",
+ "is-symbol": "^1.1.1"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/which-builtin-type": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.2.1.tgz",
+ "integrity": "sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==",
+ "dependencies": {
+ "call-bound": "^1.0.2",
+ "function.prototype.name": "^1.1.6",
+ "has-tostringtag": "^1.0.2",
+ "is-async-function": "^2.0.0",
+ "is-date-object": "^1.1.0",
+ "is-finalizationregistry": "^1.1.0",
+ "is-generator-function": "^1.0.10",
+ "is-regex": "^1.2.1",
+ "is-weakref": "^1.0.2",
+ "isarray": "^2.0.5",
+ "which-boxed-primitive": "^1.1.0",
+ "which-collection": "^1.0.2",
+ "which-typed-array": "^1.1.16"
+ },
+ "engines": {
+ "node": ">= 0.4"
},
"funding": {
"url": "https://github.com/sponsors/ljharb"
}
},
"node_modules/which-collection": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz",
- "integrity": "sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==",
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz",
+ "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==",
"dependencies": {
- "is-map": "^2.0.1",
- "is-set": "^2.0.1",
- "is-weakmap": "^2.0.1",
- "is-weakset": "^2.0.1"
+ "is-map": "^2.0.3",
+ "is-set": "^2.0.3",
+ "is-weakmap": "^2.0.2",
+ "is-weakset": "^2.0.3"
+ },
+ "engines": {
+ "node": ">= 0.4"
},
"funding": {
"url": "https://github.com/sponsors/ljharb"
}
},
"node_modules/which-typed-array": {
- "version": "1.1.9",
- "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz",
- "integrity": "sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==",
+ "version": "1.1.18",
+ "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.18.tgz",
+ "integrity": "sha512-qEcY+KJYlWyLH9vNbsr6/5j59AXk5ni5aakf8ldzBvGde6Iz4sxZGkJyWSAueTG7QhOvNRYb1lDdFmL5Td0QKA==",
"dependencies": {
- "available-typed-arrays": "^1.0.5",
- "call-bind": "^1.0.2",
+ "available-typed-arrays": "^1.0.7",
+ "call-bind": "^1.0.8",
+ "call-bound": "^1.0.3",
"for-each": "^0.3.3",
- "gopd": "^1.0.1",
- "has-tostringtag": "^1.0.0",
- "is-typed-array": "^1.1.10"
+ "gopd": "^1.2.0",
+ "has-tostringtag": "^1.0.2"
},
"engines": {
"node": ">= 0.4"
@@ -19801,14 +18034,14 @@
}
},
"node_modules/workbox-build/node_modules/ajv": {
- "version": "8.12.0",
- "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
- "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
+ "version": "8.17.1",
+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+ "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
"dependencies": {
- "fast-deep-equal": "^3.1.1",
+ "fast-deep-equal": "^3.1.3",
+ "fast-uri": "^3.0.1",
"json-schema-traverse": "^1.0.0",
- "require-from-string": "^2.0.2",
- "uri-js": "^4.2.2"
+ "require-from-string": "^2.0.2"
},
"funding": {
"type": "github",
@@ -19895,6 +18128,7 @@
"version": "6.6.0",
"resolved": "https://registry.npmjs.org/workbox-google-analytics/-/workbox-google-analytics-6.6.0.tgz",
"integrity": "sha512-p4DJa6OldXWd6M9zRl0H6vB9lkrmqYFkRQ2xEiNdBFp9U0LhsGO7hsBscVEyH9H2/3eZZt8c97NB2FD9U2NJ+Q==",
+ "deprecated": "It is not compatible with newer versions of GA starting with v4, as long as you are using GAv3 it should be ok, but the package is not longer being maintained",
"dependencies": {
"workbox-background-sync": "6.6.0",
"workbox-core": "6.6.0",
@@ -20031,6 +18265,23 @@
"url": "https://github.com/chalk/wrap-ansi?sponsor=1"
}
},
+ "node_modules/wrap-ansi-cjs": {
+ "name": "wrap-ansi",
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+ "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+ "dependencies": {
+ "ansi-styles": "^4.0.0",
+ "string-width": "^4.1.0",
+ "strip-ansi": "^6.0.0"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+ }
+ },
"node_modules/wrappy": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
@@ -20048,9 +18299,9 @@
}
},
"node_modules/ws": {
- "version": "7.5.9",
- "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
- "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
+ "version": "7.5.10",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
+ "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
"engines": {
"node": ">=8.3.0"
},
@@ -20099,34 +18350,28 @@
}
},
"node_modules/yargs": {
- "version": "17.7.2",
- "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
- "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "16.2.0",
+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+ "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
"dependencies": {
- "cliui": "^8.0.1",
+ "cliui": "^7.0.2",
"escalade": "^3.1.1",
"get-caller-file": "^2.0.5",
"require-directory": "^2.1.1",
- "string-width": "^4.2.3",
+ "string-width": "^4.2.0",
"y18n": "^5.0.5",
- "yargs-parser": "^21.1.1"
+ "yargs-parser": "^20.2.2"
},
"engines": {
- "node": ">=12"
+ "node": ">=10"
}
},
"node_modules/yargs-parser": {
- "version": "21.1.1",
- "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
- "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
- "dev": true,
- "optional": true,
- "peer": true,
+ "version": "20.2.9",
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
+ "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
"engines": {
- "node": ">=12"
+ "node": ">=10"
}
},
"node_modules/yocto-queue": {
@@ -20140,14726 +18385,5 @@
"url": "https://github.com/sponsors/sindresorhus"
}
}
- },
- "dependencies": {
- "@adobe/css-tools": {
- "version": "4.3.1",
- "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.3.1.tgz",
- "integrity": "sha512-/62yikz7NLScCGAAST5SHdnjaDJQBDq0M2muyRTpf2VQhw6StBg2ALiu73zSJQ4fMVLA+0uBhBHAle7Wg+2kSg==",
- "dev": true
- },
- "@alloc/quick-lru": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/@alloc/quick-lru/-/quick-lru-5.2.0.tgz",
- "integrity": "sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw=="
- },
- "@ampproject/remapping": {
- "version": "2.2.1",
- "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz",
- "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==",
- "requires": {
- "@jridgewell/gen-mapping": "^0.3.0",
- "@jridgewell/trace-mapping": "^0.3.9"
- }
- },
- "@babel/code-frame": {
- "version": "7.22.13",
- "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz",
- "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==",
- "requires": {
- "@babel/highlight": "^7.22.13",
- "chalk": "^2.4.2"
- },
- "dependencies": {
- "ansi-styles": {
- "version": "3.2.1",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
- "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
- "requires": {
- "color-convert": "^1.9.0"
- }
- },
- "chalk": {
- "version": "2.4.2",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
- "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
- "requires": {
- "ansi-styles": "^3.2.1",
- "escape-string-regexp": "^1.0.5",
- "supports-color": "^5.3.0"
- }
- },
- "color-convert": {
- "version": "1.9.3",
- "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
- "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
- "requires": {
- "color-name": "1.1.3"
- }
- },
- "color-name": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
- "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
- },
- "escape-string-regexp": {
- "version": "1.0.5",
- "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
- "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="
- },
- "has-flag": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
- "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="
- },
- "supports-color": {
- "version": "5.5.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
- "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
- "requires": {
- "has-flag": "^3.0.0"
- }
- }
- }
- },
- "@babel/compat-data": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.5.tgz",
- "integrity": "sha512-4Jc/YuIaYqKnDDz892kPIledykKg12Aw1PYX5i/TY28anJtacvM1Rrr8wbieB9GfEJwlzqT0hUEao0CxEebiDA=="
- },
- "@babel/core": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.5.tgz",
- "integrity": "sha512-SBuTAjg91A3eKOvD+bPEz3LlhHZRNu1nFOVts9lzDJTXshHTjII0BAtDS3Y2DAkdZdDKWVZGVwkDfc4Clxn1dg==",
- "requires": {
- "@ampproject/remapping": "^2.2.0",
- "@babel/code-frame": "^7.22.5",
- "@babel/generator": "^7.22.5",
- "@babel/helper-compilation-targets": "^7.22.5",
- "@babel/helper-module-transforms": "^7.22.5",
- "@babel/helpers": "^7.22.5",
- "@babel/parser": "^7.22.5",
- "@babel/template": "^7.22.5",
- "@babel/traverse": "^7.22.5",
- "@babel/types": "^7.22.5",
- "convert-source-map": "^1.7.0",
- "debug": "^4.1.0",
- "gensync": "^1.0.0-beta.2",
- "json5": "^2.2.2",
- "semver": "^6.3.0"
- }
- },
- "@babel/eslint-parser": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.22.5.tgz",
- "integrity": "sha512-C69RWYNYtrgIRE5CmTd77ZiLDXqgBipahJc/jHP3sLcAGj6AJzxNIuKNpVnICqbyK7X3pFUfEvL++rvtbQpZkQ==",
- "requires": {
- "@nicolo-ribaudo/eslint-scope-5-internals": "5.1.1-v1",
- "eslint-visitor-keys": "^2.1.0",
- "semver": "^6.3.0"
- },
- "dependencies": {
- "eslint-visitor-keys": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
- "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw=="
- }
- }
- },
- "@babel/generator": {
- "version": "7.23.0",
- "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz",
- "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==",
- "requires": {
- "@babel/types": "^7.23.0",
- "@jridgewell/gen-mapping": "^0.3.2",
- "@jridgewell/trace-mapping": "^0.3.17",
- "jsesc": "^2.5.1"
- }
- },
- "@babel/helper-annotate-as-pure": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz",
- "integrity": "sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==",
- "requires": {
- "@babel/types": "^7.22.5"
- }
- },
- "@babel/helper-builder-binary-assignment-operator-visitor": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.5.tgz",
- "integrity": "sha512-m1EP3lVOPptR+2DwD125gziZNcmoNSHGmJROKoy87loWUQyJaVXDgpmruWqDARZSmtYQ+Dl25okU8+qhVzuykw==",
- "requires": {
- "@babel/types": "^7.22.5"
- }
- },
- "@babel/helper-compilation-targets": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.5.tgz",
- "integrity": "sha512-Ji+ywpHeuqxB8WDxraCiqR0xfhYjiDE/e6k7FuIaANnoOFxAHskHChz4vA1mJC9Lbm01s1PVAGhQY4FUKSkGZw==",
- "requires": {
- "@babel/compat-data": "^7.22.5",
- "@babel/helper-validator-option": "^7.22.5",
- "browserslist": "^4.21.3",
- "lru-cache": "^5.1.1",
- "semver": "^6.3.0"
- }
- },
- "@babel/helper-create-class-features-plugin": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.5.tgz",
- "integrity": "sha512-xkb58MyOYIslxu3gKmVXmjTtUPvBU4odYzbiIQbWwLKIHCsx6UGZGX6F1IznMFVnDdirseUZopzN+ZRt8Xb33Q==",
- "requires": {
- "@babel/helper-annotate-as-pure": "^7.22.5",
- "@babel/helper-environment-visitor": "^7.22.5",
- "@babel/helper-function-name": "^7.22.5",
- "@babel/helper-member-expression-to-functions": "^7.22.5",
- "@babel/helper-optimise-call-expression": "^7.22.5",
- "@babel/helper-replace-supers": "^7.22.5",
- "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
- "@babel/helper-split-export-declaration": "^7.22.5",
- "semver": "^6.3.0"
- }
- },
- "@babel/helper-create-regexp-features-plugin": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.5.tgz",
- "integrity": "sha512-1VpEFOIbMRaXyDeUwUfmTIxExLwQ+zkW+Bh5zXpApA3oQedBx9v/updixWxnx/bZpKw7u8VxWjb/qWpIcmPq8A==",
- "requires": {
- "@babel/helper-annotate-as-pure": "^7.22.5",
- "regexpu-core": "^5.3.1",
- "semver": "^6.3.0"
- }
- },
- "@babel/helper-define-polyfill-provider": {
- "version": "0.4.0",
- "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.0.tgz",
- "integrity": "sha512-RnanLx5ETe6aybRi1cO/edaRH+bNYWaryCEmjDDYyNr4wnSzyOp8T0dWipmqVHKEY3AbVKUom50AKSlj1zmKbg==",
- "requires": {
- "@babel/helper-compilation-targets": "^7.17.7",
- "@babel/helper-plugin-utils": "^7.16.7",
- "debug": "^4.1.1",
- "lodash.debounce": "^4.0.8",
- "resolve": "^1.14.2",
- "semver": "^6.1.2"
- }
- },
- "@babel/helper-environment-visitor": {
- "version": "7.22.20",
- "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
- "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA=="
- },
- "@babel/helper-function-name": {
- "version": "7.23.0",
- "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
- "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
- "requires": {
- "@babel/template": "^7.22.15",
- "@babel/types": "^7.23.0"
- }
- },
- "@babel/helper-hoist-variables": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
- "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
- "requires": {
- "@babel/types": "^7.22.5"
- }
- },
- "@babel/helper-member-expression-to-functions": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.5.tgz",
- "integrity": "sha512-aBiH1NKMG0H2cGZqspNvsaBe6wNGjbJjuLy29aU+eDZjSbbN53BaxlpB02xm9v34pLTZ1nIQPFYn2qMZoa5BQQ==",
- "requires": {
- "@babel/types": "^7.22.5"
- }
- },
- "@babel/helper-module-imports": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz",
- "integrity": "sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==",
- "requires": {
- "@babel/types": "^7.22.5"
- }
- },
- "@babel/helper-module-transforms": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.5.tgz",
- "integrity": "sha512-+hGKDt/Ze8GFExiVHno/2dvG5IdstpzCq0y4Qc9OJ25D4q3pKfiIP/4Vp3/JvhDkLKsDK2api3q3fpIgiIF5bw==",
- "requires": {
- "@babel/helper-environment-visitor": "^7.22.5",
- "@babel/helper-module-imports": "^7.22.5",
- "@babel/helper-simple-access": "^7.22.5",
- "@babel/helper-split-export-declaration": "^7.22.5",
- "@babel/helper-validator-identifier": "^7.22.5",
- "@babel/template": "^7.22.5",
- "@babel/traverse": "^7.22.5",
- "@babel/types": "^7.22.5"
- }
- },
- "@babel/helper-optimise-call-expression": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz",
- "integrity": "sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==",
- "requires": {
- "@babel/types": "^7.22.5"
- }
- },
- "@babel/helper-plugin-utils": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz",
- "integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg=="
- },
- "@babel/helper-remap-async-to-generator": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.5.tgz",
- "integrity": "sha512-cU0Sq1Rf4Z55fgz7haOakIyM7+x/uCFwXpLPaeRzfoUtAEAuUZjZvFPjL/rk5rW693dIgn2hng1W7xbT7lWT4g==",
- "requires": {
- "@babel/helper-annotate-as-pure": "^7.22.5",
- "@babel/helper-environment-visitor": "^7.22.5",
- "@babel/helper-wrap-function": "^7.22.5",
- "@babel/types": "^7.22.5"
- }
- },
- "@babel/helper-replace-supers": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.5.tgz",
- "integrity": "sha512-aLdNM5I3kdI/V9xGNyKSF3X/gTyMUBohTZ+/3QdQKAA9vxIiy12E+8E2HoOP1/DjeqU+g6as35QHJNMDDYpuCg==",
- "requires": {
- "@babel/helper-environment-visitor": "^7.22.5",
- "@babel/helper-member-expression-to-functions": "^7.22.5",
- "@babel/helper-optimise-call-expression": "^7.22.5",
- "@babel/template": "^7.22.5",
- "@babel/traverse": "^7.22.5",
- "@babel/types": "^7.22.5"
- }
- },
- "@babel/helper-simple-access": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz",
- "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==",
- "requires": {
- "@babel/types": "^7.22.5"
- }
- },
- "@babel/helper-skip-transparent-expression-wrappers": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz",
- "integrity": "sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==",
- "requires": {
- "@babel/types": "^7.22.5"
- }
- },
- "@babel/helper-split-export-declaration": {
- "version": "7.22.6",
- "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
- "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
- "requires": {
- "@babel/types": "^7.22.5"
- }
- },
- "@babel/helper-string-parser": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
- "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw=="
- },
- "@babel/helper-validator-identifier": {
- "version": "7.22.20",
- "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
- "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A=="
- },
- "@babel/helper-validator-option": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz",
- "integrity": "sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw=="
- },
- "@babel/helper-wrap-function": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.5.tgz",
- "integrity": "sha512-bYqLIBSEshYcYQyfks8ewYA8S30yaGSeRslcvKMvoUk6HHPySbxHq9YRi6ghhzEU+yhQv9bP/jXnygkStOcqZw==",
- "requires": {
- "@babel/helper-function-name": "^7.22.5",
- "@babel/template": "^7.22.5",
- "@babel/traverse": "^7.22.5",
- "@babel/types": "^7.22.5"
- }
- },
- "@babel/helpers": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.5.tgz",
- "integrity": "sha512-pSXRmfE1vzcUIDFQcSGA5Mr+GxBV9oiRKDuDxXvWQQBCh8HoIjs/2DlDB7H8smac1IVrB9/xdXj2N3Wol9Cr+Q==",
- "requires": {
- "@babel/template": "^7.22.5",
- "@babel/traverse": "^7.22.5",
- "@babel/types": "^7.22.5"
- }
- },
- "@babel/highlight": {
- "version": "7.22.20",
- "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz",
- "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==",
- "requires": {
- "@babel/helper-validator-identifier": "^7.22.20",
- "chalk": "^2.4.2",
- "js-tokens": "^4.0.0"
- },
- "dependencies": {
- "ansi-styles": {
- "version": "3.2.1",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
- "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
- "requires": {
- "color-convert": "^1.9.0"
- }
- },
- "chalk": {
- "version": "2.4.2",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
- "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
- "requires": {
- "ansi-styles": "^3.2.1",
- "escape-string-regexp": "^1.0.5",
- "supports-color": "^5.3.0"
- }
- },
- "color-convert": {
- "version": "1.9.3",
- "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
- "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
- "requires": {
- "color-name": "1.1.3"
- }
- },
- "color-name": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
- "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
- },
- "escape-string-regexp": {
- "version": "1.0.5",
- "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
- "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="
- },
- "has-flag": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
- "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="
- },
- "supports-color": {
- "version": "5.5.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
- "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
- "requires": {
- "has-flag": "^3.0.0"
- }
- }
- }
- },
- "@babel/parser": {
- "version": "7.23.0",
- "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz",
- "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw=="
- },
- "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.5.tgz",
- "integrity": "sha512-NP1M5Rf+u2Gw9qfSO4ihjcTGW5zXTi36ITLd4/EoAcEhIZ0yjMqmftDNl3QC19CX7olhrjpyU454g/2W7X0jvQ==",
- "requires": {
- "@babel/helper-plugin-utils": "^7.22.5"
- }
- },
- "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.5.tgz",
- "integrity": "sha512-31Bb65aZaUwqCbWMnZPduIZxCBngHFlzyN6Dq6KAJjtx+lx6ohKHubc61OomYi7XwVD4Ol0XCVz4h+pYFR048g==",
- "requires": {
- "@babel/helper-plugin-utils": "^7.22.5",
- "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
- "@babel/plugin-transform-optional-chaining": "^7.22.5"
- }
- },
- "@babel/plugin-proposal-class-properties": {
- "version": "7.18.6",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz",
- "integrity": "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==",
- "requires": {
- "@babel/helper-create-class-features-plugin": "^7.18.6",
- "@babel/helper-plugin-utils": "^7.18.6"
- }
- },
- "@babel/plugin-proposal-decorators": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.22.5.tgz",
- "integrity": "sha512-h8hlezQ4dl6ixodgXkH8lUfcD7x+WAuIqPUjwGoItynrXOAv4a4Tci1zA/qjzQjjcl0v3QpLdc2LM6ZACQuY7A==",
- "requires": {
- "@babel/helper-create-class-features-plugin": "^7.22.5",
- "@babel/helper-plugin-utils": "^7.22.5",
- "@babel/helper-replace-supers": "^7.22.5",
- "@babel/helper-split-export-declaration": "^7.22.5",
- "@babel/plugin-syntax-decorators": "^7.22.5"
- }
- },
- "@babel/plugin-proposal-nullish-coalescing-operator": {
- "version": "7.18.6",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz",
- "integrity": "sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==",
- "requires": {
- "@babel/helper-plugin-utils": "^7.18.6",
- "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
- }
- },
- "@babel/plugin-proposal-numeric-separator": {
- "version": "7.18.6",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz",
- "integrity": "sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==",
- "requires": {
- "@babel/helper-plugin-utils": "^7.18.6",
- "@babel/plugin-syntax-numeric-separator": "^7.10.4"
- }
- },
- "@babel/plugin-proposal-optional-chaining": {
- "version": "7.21.0",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz",
- "integrity": "sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==",
- "requires": {
- "@babel/helper-plugin-utils": "^7.20.2",
- "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0",
- "@babel/plugin-syntax-optional-chaining": "^7.8.3"
- }
- },
- "@babel/plugin-proposal-private-methods": {
- "version": "7.18.6",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz",
- "integrity": "sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==",
- "requires": {
- "@babel/helper-create-class-features-plugin": "^7.18.6",
- "@babel/helper-plugin-utils": "^7.18.6"
- }
- },
- "@babel/plugin-proposal-private-property-in-object": {
- "version": "7.21.0-placeholder-for-preset-env.2",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz",
- "integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==",
- "requires": {}
- },
- "@babel/plugin-proposal-unicode-property-regex": {
- "version": "7.18.6",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz",
- "integrity": "sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==",
- "requires": {
- "@babel/helper-create-regexp-features-plugin": "^7.18.6",
- "@babel/helper-plugin-utils": "^7.18.6"
- }
- },
- "@babel/plugin-syntax-async-generators": {
- "version": "7.8.4",
- "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
- "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
- "requires": {
- "@babel/helper-plugin-utils": "^7.8.0"
- }
- },
- "@babel/plugin-syntax-bigint": {
- "version": "7.8.3",
- "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
- "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
- "requires": {
- "@babel/helper-plugin-utils": "^7.8.0"
- }
- },
- "@babel/plugin-syntax-class-properties": {
- "version": "7.12.13",
- "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
- "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
- "requires": {
- "@babel/helper-plugin-utils": "^7.12.13"
- }
- },
- "@babel/plugin-syntax-class-static-block": {
- "version": "7.14.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
- "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
- "requires": {
- "@babel/helper-plugin-utils": "^7.14.5"
- }
- },
- "@babel/plugin-syntax-decorators": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.22.5.tgz",
- "integrity": "sha512-avpUOBS7IU6al8MmF1XpAyj9QYeLPuSDJI5D4pVMSMdL7xQokKqJPYQC67RCT0aCTashUXPiGwMJ0DEXXCEmMA==",
- "requires": {
- "@babel/helper-plugin-utils": "^7.22.5"
- }
- },
- "@babel/plugin-syntax-dynamic-import": {
- "version": "7.8.3",
- "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
- "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
- "requires": {
- "@babel/helper-plugin-utils": "^7.8.0"
- }
- },
- "@babel/plugin-syntax-export-namespace-from": {
- "version": "7.8.3",
- "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
- "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
- "requires": {
- "@babel/helper-plugin-utils": "^7.8.3"
- }
- },
- "@babel/plugin-syntax-flow": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.22.5.tgz",
- "integrity": "sha512-9RdCl0i+q0QExayk2nOS7853w08yLucnnPML6EN9S8fgMPVtdLDCdx/cOQ/i44Lb9UeQX9A35yaqBBOMMZxPxQ==",
- "requires": {
- "@babel/helper-plugin-utils": "^7.22.5"
- }
- },
- "@babel/plugin-syntax-import-assertions": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.22.5.tgz",
- "integrity": "sha512-rdV97N7KqsRzeNGoWUOK6yUsWarLjE5Su/Snk9IYPU9CwkWHs4t+rTGOvffTR8XGkJMTAdLfO0xVnXm8wugIJg==",
- "requires": {
- "@babel/helper-plugin-utils": "^7.22.5"
- }
- },
- "@babel/plugin-syntax-import-attributes": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.22.5.tgz",
- "integrity": "sha512-KwvoWDeNKPETmozyFE0P2rOLqh39EoQHNjqizrI5B8Vt0ZNS7M56s7dAiAqbYfiAYOuIzIh96z3iR2ktgu3tEg==",
- "requires": {
- "@babel/helper-plugin-utils": "^7.22.5"
- }
- },
- "@babel/plugin-syntax-import-meta": {
- "version": "7.10.4",
- "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
- "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
- "requires": {
- "@babel/helper-plugin-utils": "^7.10.4"
- }
- },
- "@babel/plugin-syntax-json-strings": {
- "version": "7.8.3",
- "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
- "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
- "requires": {
- "@babel/helper-plugin-utils": "^7.8.0"
- }
- },
- "@babel/plugin-syntax-jsx": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.22.5.tgz",
- "integrity": "sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==",
- "requires": {
- "@babel/helper-plugin-utils": "^7.22.5"
- }
- },
- "@babel/plugin-syntax-logical-assignment-operators": {
- "version": "7.10.4",
- "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
- "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
- "requires": {
- "@babel/helper-plugin-utils": "^7.10.4"
- }
- },
- "@babel/plugin-syntax-nullish-coalescing-operator": {
- "version": "7.8.3",
- "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
- "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
- "requires": {
- "@babel/helper-plugin-utils": "^7.8.0"
- }
- },
- "@babel/plugin-syntax-numeric-separator": {
- "version": "7.10.4",
- "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
- "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
- "requires": {
- "@babel/helper-plugin-utils": "^7.10.4"
- }
- },
- "@babel/plugin-syntax-object-rest-spread": {
- "version": "7.8.3",
- "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
- "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
- "requires": {
- "@babel/helper-plugin-utils": "^7.8.0"
- }
- },
- "@babel/plugin-syntax-optional-catch-binding": {
- "version": "7.8.3",
- "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
- "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
- "requires": {
- "@babel/helper-plugin-utils": "^7.8.0"
- }
- },
- "@babel/plugin-syntax-optional-chaining": {
- "version": "7.8.3",
- "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
- "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
- "requires": {
- "@babel/helper-plugin-utils": "^7.8.0"
- }
- },
- "@babel/plugin-syntax-private-property-in-object": {
- "version": "7.14.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
- "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
- "requires": {
- "@babel/helper-plugin-utils": "^7.14.5"
- }
- },
- "@babel/plugin-syntax-top-level-await": {
- "version": "7.14.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
- "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
- "requires": {
- "@babel/helper-plugin-utils": "^7.14.5"
- }
- },
- "@babel/plugin-syntax-typescript": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.22.5.tgz",
- "integrity": "sha512-1mS2o03i7t1c6VzH6fdQ3OA8tcEIxwG18zIPRp+UY1Ihv6W+XZzBCVxExF9upussPXJ0xE9XRHwMoNs1ep/nRQ==",
- "requires": {
- "@babel/helper-plugin-utils": "^7.22.5"
- }
- },
- "@babel/plugin-syntax-unicode-sets-regex": {
- "version": "7.18.6",
- "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz",
- "integrity": "sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==",
- "requires": {
- "@babel/helper-create-regexp-features-plugin": "^7.18.6",
- "@babel/helper-plugin-utils": "^7.18.6"
- }
- },
- "@babel/plugin-transform-arrow-functions": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.22.5.tgz",
- "integrity": "sha512-26lTNXoVRdAnsaDXPpvCNUq+OVWEVC6bx7Vvz9rC53F2bagUWW4u4ii2+h8Fejfh7RYqPxn+libeFBBck9muEw==",
- "requires": {
- "@babel/helper-plugin-utils": "^7.22.5"
- }
- },
- "@babel/plugin-transform-async-generator-functions": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.5.tgz",
- "integrity": "sha512-gGOEvFzm3fWoyD5uZq7vVTD57pPJ3PczPUD/xCFGjzBpUosnklmXyKnGQbbbGs1NPNPskFex0j93yKbHt0cHyg==",
- "requires": {
- "@babel/helper-environment-visitor": "^7.22.5",
- "@babel/helper-plugin-utils": "^7.22.5",
- "@babel/helper-remap-async-to-generator": "^7.22.5",
- "@babel/plugin-syntax-async-generators": "^7.8.4"
- }
- },
- "@babel/plugin-transform-async-to-generator": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.22.5.tgz",
- "integrity": "sha512-b1A8D8ZzE/VhNDoV1MSJTnpKkCG5bJo+19R4o4oy03zM7ws8yEMK755j61Dc3EyvdysbqH5BOOTquJ7ZX9C6vQ==",
- "requires": {
- "@babel/helper-module-imports": "^7.22.5",
- "@babel/helper-plugin-utils": "^7.22.5",
- "@babel/helper-remap-async-to-generator": "^7.22.5"
- }
- },
- "@babel/plugin-transform-block-scoped-functions": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.22.5.tgz",
- "integrity": "sha512-tdXZ2UdknEKQWKJP1KMNmuF5Lx3MymtMN/pvA+p/VEkhK8jVcQ1fzSy8KM9qRYhAf2/lV33hoMPKI/xaI9sADA==",
- "requires": {
- "@babel/helper-plugin-utils": "^7.22.5"
- }
- },
- "@babel/plugin-transform-block-scoping": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.5.tgz",
- "integrity": "sha512-EcACl1i5fSQ6bt+YGuU/XGCeZKStLmyVGytWkpyhCLeQVA0eu6Wtiw92V+I1T/hnezUv7j74dA/Ro69gWcU+hg==",
- "requires": {
- "@babel/helper-plugin-utils": "^7.22.5"
- }
- },
- "@babel/plugin-transform-class-properties": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.22.5.tgz",
- "integrity": "sha512-nDkQ0NfkOhPTq8YCLiWNxp1+f9fCobEjCb0n8WdbNUBc4IB5V7P1QnX9IjpSoquKrXF5SKojHleVNs2vGeHCHQ==",
- "requires": {
- "@babel/helper-create-class-features-plugin": "^7.22.5",
- "@babel/helper-plugin-utils": "^7.22.5"
- }
- },
- "@babel/plugin-transform-class-static-block": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.5.tgz",
- "integrity": "sha512-SPToJ5eYZLxlnp1UzdARpOGeC2GbHvr9d/UV0EukuVx8atktg194oe+C5BqQ8jRTkgLRVOPYeXRSBg1IlMoVRA==",
- "requires": {
- "@babel/helper-create-class-features-plugin": "^7.22.5",
- "@babel/helper-plugin-utils": "^7.22.5",
- "@babel/plugin-syntax-class-static-block": "^7.14.5"
- }
- },
- "@babel/plugin-transform-classes": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.5.tgz",
- "integrity": "sha512-2edQhLfibpWpsVBx2n/GKOz6JdGQvLruZQfGr9l1qes2KQaWswjBzhQF7UDUZMNaMMQeYnQzxwOMPsbYF7wqPQ==",
- "requires": {
- "@babel/helper-annotate-as-pure": "^7.22.5",
- "@babel/helper-compilation-targets": "^7.22.5",
- "@babel/helper-environment-visitor": "^7.22.5",
- "@babel/helper-function-name": "^7.22.5",
- "@babel/helper-optimise-call-expression": "^7.22.5",
- "@babel/helper-plugin-utils": "^7.22.5",
- "@babel/helper-replace-supers": "^7.22.5",
- "@babel/helper-split-export-declaration": "^7.22.5",
- "globals": "^11.1.0"
- }
- },
- "@babel/plugin-transform-computed-properties": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.22.5.tgz",
- "integrity": "sha512-4GHWBgRf0krxPX+AaPtgBAlTgTeZmqDynokHOX7aqqAB4tHs3U2Y02zH6ETFdLZGcg9UQSD1WCmkVrE9ErHeOg==",
- "requires": {
- "@babel/helper-plugin-utils": "^7.22.5",
- "@babel/template": "^7.22.5"
- }
- },
- "@babel/plugin-transform-destructuring": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.5.tgz",
- "integrity": "sha512-GfqcFuGW8vnEqTUBM7UtPd5A4q797LTvvwKxXTgRsFjoqaJiEg9deBG6kWeQYkVEL569NpnmpC0Pkr/8BLKGnQ==",
- "requires": {
- "@babel/helper-plugin-utils": "^7.22.5"
- }
- },
- "@babel/plugin-transform-dotall-regex": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.22.5.tgz",
- "integrity": "sha512-5/Yk9QxCQCl+sOIB1WelKnVRxTJDSAIxtJLL2/pqL14ZVlbH0fUQUZa/T5/UnQtBNgghR7mfB8ERBKyKPCi7Vw==",
- "requires": {
- "@babel/helper-create-regexp-features-plugin": "^7.22.5",
- "@babel/helper-plugin-utils": "^7.22.5"
- }
- },
- "@babel/plugin-transform-duplicate-keys": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.22.5.tgz",
- "integrity": "sha512-dEnYD+9BBgld5VBXHnF/DbYGp3fqGMsyxKbtD1mDyIA7AkTSpKXFhCVuj/oQVOoALfBs77DudA0BE4d5mcpmqw==",
- "requires": {
- "@babel/helper-plugin-utils": "^7.22.5"
- }
- },
- "@babel/plugin-transform-dynamic-import": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.5.tgz",
- "integrity": "sha512-0MC3ppTB1AMxd8fXjSrbPa7LT9hrImt+/fcj+Pg5YMD7UQyWp/02+JWpdnCymmsXwIx5Z+sYn1bwCn4ZJNvhqQ==",
- "requires": {
- "@babel/helper-plugin-utils": "^7.22.5",
- "@babel/plugin-syntax-dynamic-import": "^7.8.3"
- }
- },
- "@babel/plugin-transform-exponentiation-operator": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.22.5.tgz",
- "integrity": "sha512-vIpJFNM/FjZ4rh1myqIya9jXwrwwgFRHPjT3DkUA9ZLHuzox8jiXkOLvwm1H+PQIP3CqfC++WPKeuDi0Sjdj1g==",
- "requires": {
- "@babel/helper-builder-binary-assignment-operator-visitor": "^7.22.5",
- "@babel/helper-plugin-utils": "^7.22.5"
- }
- },
- "@babel/plugin-transform-export-namespace-from": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.5.tgz",
- "integrity": "sha512-X4hhm7FRnPgd4nDA4b/5V280xCx6oL7Oob5+9qVS5C13Zq4bh1qq7LU0GgRU6b5dBWBvhGaXYVB4AcN6+ol6vg==",
- "requires": {
- "@babel/helper-plugin-utils": "^7.22.5",
- "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
- }
- },
- "@babel/plugin-transform-flow-strip-types": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.22.5.tgz",
- "integrity": "sha512-tujNbZdxdG0/54g/oua8ISToaXTFBf8EnSb5PgQSciIXWOWKX3S4+JR7ZE9ol8FZwf9kxitzkGQ+QWeov/mCiA==",
- "requires": {
- "@babel/helper-plugin-utils": "^7.22.5",
- "@babel/plugin-syntax-flow": "^7.22.5"
- }
- },
- "@babel/plugin-transform-for-of": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.5.tgz",
- "integrity": "sha512-3kxQjX1dU9uudwSshyLeEipvrLjBCVthCgeTp6CzE/9JYrlAIaeekVxRpCWsDDfYTfRZRoCeZatCQvwo+wvK8A==",
- "requires": {
- "@babel/helper-plugin-utils": "^7.22.5"
- }
- },
- "@babel/plugin-transform-function-name": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.22.5.tgz",
- "integrity": "sha512-UIzQNMS0p0HHiQm3oelztj+ECwFnj+ZRV4KnguvlsD2of1whUeM6o7wGNj6oLwcDoAXQ8gEqfgC24D+VdIcevg==",
- "requires": {
- "@babel/helper-compilation-targets": "^7.22.5",
- "@babel/helper-function-name": "^7.22.5",
- "@babel/helper-plugin-utils": "^7.22.5"
- }
- },
- "@babel/plugin-transform-json-strings": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.5.tgz",
- "integrity": "sha512-DuCRB7fu8MyTLbEQd1ew3R85nx/88yMoqo2uPSjevMj3yoN7CDM8jkgrY0wmVxfJZyJ/B9fE1iq7EQppWQmR5A==",
- "requires": {
- "@babel/helper-plugin-utils": "^7.22.5",
- "@babel/plugin-syntax-json-strings": "^7.8.3"
- }
- },
- "@babel/plugin-transform-literals": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.22.5.tgz",
- "integrity": "sha512-fTLj4D79M+mepcw3dgFBTIDYpbcB9Sm0bpm4ppXPaO+U+PKFFyV9MGRvS0gvGw62sd10kT5lRMKXAADb9pWy8g==",
- "requires": {
- "@babel/helper-plugin-utils": "^7.22.5"
- }
- },
- "@babel/plugin-transform-logical-assignment-operators": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.5.tgz",
- "integrity": "sha512-MQQOUW1KL8X0cDWfbwYP+TbVbZm16QmQXJQ+vndPtH/BoO0lOKpVoEDMI7+PskYxH+IiE0tS8xZye0qr1lGzSA==",
- "requires": {
- "@babel/helper-plugin-utils": "^7.22.5",
- "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
- }
- },
- "@babel/plugin-transform-member-expression-literals": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.22.5.tgz",
- "integrity": "sha512-RZEdkNtzzYCFl9SE9ATaUMTj2hqMb4StarOJLrZRbqqU4HSBE7UlBw9WBWQiDzrJZJdUWiMTVDI6Gv/8DPvfew==",
- "requires": {
- "@babel/helper-plugin-utils": "^7.22.5"
- }
- },
- "@babel/plugin-transform-modules-amd": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.22.5.tgz",
- "integrity": "sha512-R+PTfLTcYEmb1+kK7FNkhQ1gP4KgjpSO6HfH9+f8/yfp2Nt3ggBjiVpRwmwTlfqZLafYKJACy36yDXlEmI9HjQ==",
- "requires": {
- "@babel/helper-module-transforms": "^7.22.5",
- "@babel/helper-plugin-utils": "^7.22.5"
- }
- },
- "@babel/plugin-transform-modules-commonjs": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.5.tgz",
- "integrity": "sha512-B4pzOXj+ONRmuaQTg05b3y/4DuFz3WcCNAXPLb2Q0GT0TrGKGxNKV4jwsXts+StaM0LQczZbOpj8o1DLPDJIiA==",
- "requires": {
- "@babel/helper-module-transforms": "^7.22.5",
- "@babel/helper-plugin-utils": "^7.22.5",
- "@babel/helper-simple-access": "^7.22.5"
- }
- },
- "@babel/plugin-transform-modules-systemjs": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.22.5.tgz",
- "integrity": "sha512-emtEpoaTMsOs6Tzz+nbmcePl6AKVtS1yC4YNAeMun9U8YCsgadPNxnOPQ8GhHFB2qdx+LZu9LgoC0Lthuu05DQ==",
- "requires": {
- "@babel/helper-hoist-variables": "^7.22.5",
- "@babel/helper-module-transforms": "^7.22.5",
- "@babel/helper-plugin-utils": "^7.22.5",
- "@babel/helper-validator-identifier": "^7.22.5"
- }
- },
- "@babel/plugin-transform-modules-umd": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.22.5.tgz",
- "integrity": "sha512-+S6kzefN/E1vkSsKx8kmQuqeQsvCKCd1fraCM7zXm4SFoggI099Tr4G8U81+5gtMdUeMQ4ipdQffbKLX0/7dBQ==",
- "requires": {
- "@babel/helper-module-transforms": "^7.22.5",
- "@babel/helper-plugin-utils": "^7.22.5"
- }
- },
- "@babel/plugin-transform-named-capturing-groups-regex": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz",
- "integrity": "sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==",
- "requires": {
- "@babel/helper-create-regexp-features-plugin": "^7.22.5",
- "@babel/helper-plugin-utils": "^7.22.5"
- }
- },
- "@babel/plugin-transform-new-target": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.22.5.tgz",
- "integrity": "sha512-AsF7K0Fx/cNKVyk3a+DW0JLo+Ua598/NxMRvxDnkpCIGFh43+h/v2xyhRUYf6oD8gE4QtL83C7zZVghMjHd+iw==",
- "requires": {
- "@babel/helper-plugin-utils": "^7.22.5"
- }
- },
- "@babel/plugin-transform-nullish-coalescing-operator": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.5.tgz",
- "integrity": "sha512-6CF8g6z1dNYZ/VXok5uYkkBBICHZPiGEl7oDnAx2Mt1hlHVHOSIKWJaXHjQJA5VB43KZnXZDIexMchY4y2PGdA==",
- "requires": {
- "@babel/helper-plugin-utils": "^7.22.5",
- "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
- }
- },
- "@babel/plugin-transform-numeric-separator": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.5.tgz",
- "integrity": "sha512-NbslED1/6M+sXiwwtcAB/nieypGw02Ejf4KtDeMkCEpP6gWFMX1wI9WKYua+4oBneCCEmulOkRpwywypVZzs/g==",
- "requires": {
- "@babel/helper-plugin-utils": "^7.22.5",
- "@babel/plugin-syntax-numeric-separator": "^7.10.4"
- }
- },
- "@babel/plugin-transform-object-rest-spread": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.5.tgz",
- "integrity": "sha512-Kk3lyDmEslH9DnvCDA1s1kkd3YWQITiBOHngOtDL9Pt6BZjzqb6hiOlb8VfjiiQJ2unmegBqZu0rx5RxJb5vmQ==",
- "requires": {
- "@babel/compat-data": "^7.22.5",
- "@babel/helper-compilation-targets": "^7.22.5",
- "@babel/helper-plugin-utils": "^7.22.5",
- "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
- "@babel/plugin-transform-parameters": "^7.22.5"
- }
- },
- "@babel/plugin-transform-object-super": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.22.5.tgz",
- "integrity": "sha512-klXqyaT9trSjIUrcsYIfETAzmOEZL3cBYqOYLJxBHfMFFggmXOv+NYSX/Jbs9mzMVESw/WycLFPRx8ba/b2Ipw==",
- "requires": {
- "@babel/helper-plugin-utils": "^7.22.5",
- "@babel/helper-replace-supers": "^7.22.5"
- }
- },
- "@babel/plugin-transform-optional-catch-binding": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.5.tgz",
- "integrity": "sha512-pH8orJahy+hzZje5b8e2QIlBWQvGpelS76C63Z+jhZKsmzfNaPQ+LaW6dcJ9bxTpo1mtXbgHwy765Ro3jftmUg==",
- "requires": {
- "@babel/helper-plugin-utils": "^7.22.5",
- "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
- }
- },
- "@babel/plugin-transform-optional-chaining": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.5.tgz",
- "integrity": "sha512-AconbMKOMkyG+xCng2JogMCDcqW8wedQAqpVIL4cOSescZ7+iW8utC6YDZLMCSUIReEA733gzRSaOSXMAt/4WQ==",
- "requires": {
- "@babel/helper-plugin-utils": "^7.22.5",
- "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
- "@babel/plugin-syntax-optional-chaining": "^7.8.3"
- }
- },
- "@babel/plugin-transform-parameters": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.5.tgz",
- "integrity": "sha512-AVkFUBurORBREOmHRKo06FjHYgjrabpdqRSwq6+C7R5iTCZOsM4QbcB27St0a4U6fffyAOqh3s/qEfybAhfivg==",
- "requires": {
- "@babel/helper-plugin-utils": "^7.22.5"
- }
- },
- "@babel/plugin-transform-private-methods": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.22.5.tgz",
- "integrity": "sha512-PPjh4gyrQnGe97JTalgRGMuU4icsZFnWkzicB/fUtzlKUqvsWBKEpPPfr5a2JiyirZkHxnAqkQMO5Z5B2kK3fA==",
- "requires": {
- "@babel/helper-create-class-features-plugin": "^7.22.5",
- "@babel/helper-plugin-utils": "^7.22.5"
- }
- },
- "@babel/plugin-transform-private-property-in-object": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.5.tgz",
- "integrity": "sha512-/9xnaTTJcVoBtSSmrVyhtSvO3kbqS2ODoh2juEU72c3aYonNF0OMGiaz2gjukyKM2wBBYJP38S4JiE0Wfb5VMQ==",
- "requires": {
- "@babel/helper-annotate-as-pure": "^7.22.5",
- "@babel/helper-create-class-features-plugin": "^7.22.5",
- "@babel/helper-plugin-utils": "^7.22.5",
- "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
- }
- },
- "@babel/plugin-transform-property-literals": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.22.5.tgz",
- "integrity": "sha512-TiOArgddK3mK/x1Qwf5hay2pxI6wCZnvQqrFSqbtg1GLl2JcNMitVH/YnqjP+M31pLUeTfzY1HAXFDnUBV30rQ==",
- "requires": {
- "@babel/helper-plugin-utils": "^7.22.5"
- }
- },
- "@babel/plugin-transform-react-constant-elements": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.22.5.tgz",
- "integrity": "sha512-BF5SXoO+nX3h5OhlN78XbbDrBOffv+AxPP2ENaJOVqjWCgBDeOY3WcaUcddutGSfoap+5NEQ/q/4I3WZIvgkXA==",
- "requires": {
- "@babel/helper-plugin-utils": "^7.22.5"
- }
- },
- "@babel/plugin-transform-react-display-name": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.22.5.tgz",
- "integrity": "sha512-PVk3WPYudRF5z4GKMEYUrLjPl38fJSKNaEOkFuoprioowGuWN6w2RKznuFNSlJx7pzzXXStPUnNSOEO0jL5EVw==",
- "requires": {
- "@babel/helper-plugin-utils": "^7.22.5"
- }
- },
- "@babel/plugin-transform-react-jsx": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.22.5.tgz",
- "integrity": "sha512-rog5gZaVbUip5iWDMTYbVM15XQq+RkUKhET/IHR6oizR+JEoN6CAfTTuHcK4vwUyzca30qqHqEpzBOnaRMWYMA==",
- "requires": {
- "@babel/helper-annotate-as-pure": "^7.22.5",
- "@babel/helper-module-imports": "^7.22.5",
- "@babel/helper-plugin-utils": "^7.22.5",
- "@babel/plugin-syntax-jsx": "^7.22.5",
- "@babel/types": "^7.22.5"
- }
- },
- "@babel/plugin-transform-react-jsx-development": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.22.5.tgz",
- "integrity": "sha512-bDhuzwWMuInwCYeDeMzyi7TaBgRQei6DqxhbyniL7/VG4RSS7HtSL2QbY4eESy1KJqlWt8g3xeEBGPuo+XqC8A==",
- "requires": {
- "@babel/plugin-transform-react-jsx": "^7.22.5"
- }
- },
- "@babel/plugin-transform-react-pure-annotations": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.22.5.tgz",
- "integrity": "sha512-gP4k85wx09q+brArVinTXhWiyzLl9UpmGva0+mWyKxk6JZequ05x3eUcIUE+FyttPKJFRRVtAvQaJ6YF9h1ZpA==",
- "requires": {
- "@babel/helper-annotate-as-pure": "^7.22.5",
- "@babel/helper-plugin-utils": "^7.22.5"
- }
- },
- "@babel/plugin-transform-regenerator": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.5.tgz",
- "integrity": "sha512-rR7KePOE7gfEtNTh9Qw+iO3Q/e4DEsoQ+hdvM6QUDH7JRJ5qxq5AA52ZzBWbI5i9lfNuvySgOGP8ZN7LAmaiPw==",
- "requires": {
- "@babel/helper-plugin-utils": "^7.22.5",
- "regenerator-transform": "^0.15.1"
- }
- },
- "@babel/plugin-transform-reserved-words": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.22.5.tgz",
- "integrity": "sha512-DTtGKFRQUDm8svigJzZHzb/2xatPc6TzNvAIJ5GqOKDsGFYgAskjRulbR/vGsPKq3OPqtexnz327qYpP57RFyA==",
- "requires": {
- "@babel/helper-plugin-utils": "^7.22.5"
- }
- },
- "@babel/plugin-transform-runtime": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.22.5.tgz",
- "integrity": "sha512-bg4Wxd1FWeFx3daHFTWk1pkSWK/AyQuiyAoeZAOkAOUBjnZPH6KT7eMxouV47tQ6hl6ax2zyAWBdWZXbrvXlaw==",
- "requires": {
- "@babel/helper-module-imports": "^7.22.5",
- "@babel/helper-plugin-utils": "^7.22.5",
- "babel-plugin-polyfill-corejs2": "^0.4.3",
- "babel-plugin-polyfill-corejs3": "^0.8.1",
- "babel-plugin-polyfill-regenerator": "^0.5.0",
- "semver": "^6.3.0"
- }
- },
- "@babel/plugin-transform-shorthand-properties": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.22.5.tgz",
- "integrity": "sha512-vM4fq9IXHscXVKzDv5itkO1X52SmdFBFcMIBZ2FRn2nqVYqw6dBexUgMvAjHW+KXpPPViD/Yo3GrDEBaRC0QYA==",
- "requires": {
- "@babel/helper-plugin-utils": "^7.22.5"
- }
- },
- "@babel/plugin-transform-spread": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.22.5.tgz",
- "integrity": "sha512-5ZzDQIGyvN4w8+dMmpohL6MBo+l2G7tfC/O2Dg7/hjpgeWvUx8FzfeOKxGog9IimPa4YekaQ9PlDqTLOljkcxg==",
- "requires": {
- "@babel/helper-plugin-utils": "^7.22.5",
- "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5"
- }
- },
- "@babel/plugin-transform-sticky-regex": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.22.5.tgz",
- "integrity": "sha512-zf7LuNpHG0iEeiyCNwX4j3gDg1jgt1k3ZdXBKbZSoA3BbGQGvMiSvfbZRR3Dr3aeJe3ooWFZxOOG3IRStYp2Bw==",
- "requires": {
- "@babel/helper-plugin-utils": "^7.22.5"
- }
- },
- "@babel/plugin-transform-template-literals": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.22.5.tgz",
- "integrity": "sha512-5ciOehRNf+EyUeewo8NkbQiUs4d6ZxiHo6BcBcnFlgiJfu16q0bQUw9Jvo0b0gBKFG1SMhDSjeKXSYuJLeFSMA==",
- "requires": {
- "@babel/helper-plugin-utils": "^7.22.5"
- }
- },
- "@babel/plugin-transform-typeof-symbol": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.22.5.tgz",
- "integrity": "sha512-bYkI5lMzL4kPii4HHEEChkD0rkc+nvnlR6+o/qdqR6zrm0Sv/nodmyLhlq2DO0YKLUNd2VePmPRjJXSBh9OIdA==",
- "requires": {
- "@babel/helper-plugin-utils": "^7.22.5"
- }
- },
- "@babel/plugin-transform-typescript": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.22.5.tgz",
- "integrity": "sha512-SMubA9S7Cb5sGSFFUlqxyClTA9zWJ8qGQrppNUm05LtFuN1ELRFNndkix4zUJrC9F+YivWwa1dHMSyo0e0N9dA==",
- "requires": {
- "@babel/helper-annotate-as-pure": "^7.22.5",
- "@babel/helper-create-class-features-plugin": "^7.22.5",
- "@babel/helper-plugin-utils": "^7.22.5",
- "@babel/plugin-syntax-typescript": "^7.22.5"
- }
- },
- "@babel/plugin-transform-unicode-escapes": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.5.tgz",
- "integrity": "sha512-biEmVg1IYB/raUO5wT1tgfacCef15Fbzhkx493D3urBI++6hpJ+RFG4SrWMn0NEZLfvilqKf3QDrRVZHo08FYg==",
- "requires": {
- "@babel/helper-plugin-utils": "^7.22.5"
- }
- },
- "@babel/plugin-transform-unicode-property-regex": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.22.5.tgz",
- "integrity": "sha512-HCCIb+CbJIAE6sXn5CjFQXMwkCClcOfPCzTlilJ8cUatfzwHlWQkbtV0zD338u9dZskwvuOYTuuaMaA8J5EI5A==",
- "requires": {
- "@babel/helper-create-regexp-features-plugin": "^7.22.5",
- "@babel/helper-plugin-utils": "^7.22.5"
- }
- },
- "@babel/plugin-transform-unicode-regex": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.22.5.tgz",
- "integrity": "sha512-028laaOKptN5vHJf9/Arr/HiJekMd41hOEZYvNsrsXqJ7YPYuX2bQxh31fkZzGmq3YqHRJzYFFAVYvKfMPKqyg==",
- "requires": {
- "@babel/helper-create-regexp-features-plugin": "^7.22.5",
- "@babel/helper-plugin-utils": "^7.22.5"
- }
- },
- "@babel/plugin-transform-unicode-sets-regex": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.22.5.tgz",
- "integrity": "sha512-lhMfi4FC15j13eKrh3DnYHjpGj6UKQHtNKTbtc1igvAhRy4+kLhV07OpLcsN0VgDEw/MjAvJO4BdMJsHwMhzCg==",
- "requires": {
- "@babel/helper-create-regexp-features-plugin": "^7.22.5",
- "@babel/helper-plugin-utils": "^7.22.5"
- }
- },
- "@babel/preset-env": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.5.tgz",
- "integrity": "sha512-fj06hw89dpiZzGZtxn+QybifF07nNiZjZ7sazs2aVDcysAZVGjW7+7iFYxg6GLNM47R/thYfLdrXc+2f11Vi9A==",
- "requires": {
- "@babel/compat-data": "^7.22.5",
- "@babel/helper-compilation-targets": "^7.22.5",
- "@babel/helper-plugin-utils": "^7.22.5",
- "@babel/helper-validator-option": "^7.22.5",
- "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.22.5",
- "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.22.5",
- "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
- "@babel/plugin-syntax-async-generators": "^7.8.4",
- "@babel/plugin-syntax-class-properties": "^7.12.13",
- "@babel/plugin-syntax-class-static-block": "^7.14.5",
- "@babel/plugin-syntax-dynamic-import": "^7.8.3",
- "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
- "@babel/plugin-syntax-import-assertions": "^7.22.5",
- "@babel/plugin-syntax-import-attributes": "^7.22.5",
- "@babel/plugin-syntax-import-meta": "^7.10.4",
- "@babel/plugin-syntax-json-strings": "^7.8.3",
- "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
- "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
- "@babel/plugin-syntax-numeric-separator": "^7.10.4",
- "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
- "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
- "@babel/plugin-syntax-optional-chaining": "^7.8.3",
- "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
- "@babel/plugin-syntax-top-level-await": "^7.14.5",
- "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
- "@babel/plugin-transform-arrow-functions": "^7.22.5",
- "@babel/plugin-transform-async-generator-functions": "^7.22.5",
- "@babel/plugin-transform-async-to-generator": "^7.22.5",
- "@babel/plugin-transform-block-scoped-functions": "^7.22.5",
- "@babel/plugin-transform-block-scoping": "^7.22.5",
- "@babel/plugin-transform-class-properties": "^7.22.5",
- "@babel/plugin-transform-class-static-block": "^7.22.5",
- "@babel/plugin-transform-classes": "^7.22.5",
- "@babel/plugin-transform-computed-properties": "^7.22.5",
- "@babel/plugin-transform-destructuring": "^7.22.5",
- "@babel/plugin-transform-dotall-regex": "^7.22.5",
- "@babel/plugin-transform-duplicate-keys": "^7.22.5",
- "@babel/plugin-transform-dynamic-import": "^7.22.5",
- "@babel/plugin-transform-exponentiation-operator": "^7.22.5",
- "@babel/plugin-transform-export-namespace-from": "^7.22.5",
- "@babel/plugin-transform-for-of": "^7.22.5",
- "@babel/plugin-transform-function-name": "^7.22.5",
- "@babel/plugin-transform-json-strings": "^7.22.5",
- "@babel/plugin-transform-literals": "^7.22.5",
- "@babel/plugin-transform-logical-assignment-operators": "^7.22.5",
- "@babel/plugin-transform-member-expression-literals": "^7.22.5",
- "@babel/plugin-transform-modules-amd": "^7.22.5",
- "@babel/plugin-transform-modules-commonjs": "^7.22.5",
- "@babel/plugin-transform-modules-systemjs": "^7.22.5",
- "@babel/plugin-transform-modules-umd": "^7.22.5",
- "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5",
- "@babel/plugin-transform-new-target": "^7.22.5",
- "@babel/plugin-transform-nullish-coalescing-operator": "^7.22.5",
- "@babel/plugin-transform-numeric-separator": "^7.22.5",
- "@babel/plugin-transform-object-rest-spread": "^7.22.5",
- "@babel/plugin-transform-object-super": "^7.22.5",
- "@babel/plugin-transform-optional-catch-binding": "^7.22.5",
- "@babel/plugin-transform-optional-chaining": "^7.22.5",
- "@babel/plugin-transform-parameters": "^7.22.5",
- "@babel/plugin-transform-private-methods": "^7.22.5",
- "@babel/plugin-transform-private-property-in-object": "^7.22.5",
- "@babel/plugin-transform-property-literals": "^7.22.5",
- "@babel/plugin-transform-regenerator": "^7.22.5",
- "@babel/plugin-transform-reserved-words": "^7.22.5",
- "@babel/plugin-transform-shorthand-properties": "^7.22.5",
- "@babel/plugin-transform-spread": "^7.22.5",
- "@babel/plugin-transform-sticky-regex": "^7.22.5",
- "@babel/plugin-transform-template-literals": "^7.22.5",
- "@babel/plugin-transform-typeof-symbol": "^7.22.5",
- "@babel/plugin-transform-unicode-escapes": "^7.22.5",
- "@babel/plugin-transform-unicode-property-regex": "^7.22.5",
- "@babel/plugin-transform-unicode-regex": "^7.22.5",
- "@babel/plugin-transform-unicode-sets-regex": "^7.22.5",
- "@babel/preset-modules": "^0.1.5",
- "@babel/types": "^7.22.5",
- "babel-plugin-polyfill-corejs2": "^0.4.3",
- "babel-plugin-polyfill-corejs3": "^0.8.1",
- "babel-plugin-polyfill-regenerator": "^0.5.0",
- "core-js-compat": "^3.30.2",
- "semver": "^6.3.0"
- }
- },
- "@babel/preset-modules": {
- "version": "0.1.5",
- "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz",
- "integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==",
- "requires": {
- "@babel/helper-plugin-utils": "^7.0.0",
- "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
- "@babel/plugin-transform-dotall-regex": "^7.4.4",
- "@babel/types": "^7.4.4",
- "esutils": "^2.0.2"
- }
- },
- "@babel/preset-react": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.22.5.tgz",
- "integrity": "sha512-M+Is3WikOpEJHgR385HbuCITPTaPRaNkibTEa9oiofmJvIsrceb4yp9RL9Kb+TE8LznmeyZqpP+Lopwcx59xPQ==",
- "requires": {
- "@babel/helper-plugin-utils": "^7.22.5",
- "@babel/helper-validator-option": "^7.22.5",
- "@babel/plugin-transform-react-display-name": "^7.22.5",
- "@babel/plugin-transform-react-jsx": "^7.22.5",
- "@babel/plugin-transform-react-jsx-development": "^7.22.5",
- "@babel/plugin-transform-react-pure-annotations": "^7.22.5"
- }
- },
- "@babel/preset-typescript": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.22.5.tgz",
- "integrity": "sha512-YbPaal9LxztSGhmndR46FmAbkJ/1fAsw293tSU+I5E5h+cnJ3d4GTwyUgGYmOXJYdGA+uNePle4qbaRzj2NISQ==",
- "requires": {
- "@babel/helper-plugin-utils": "^7.22.5",
- "@babel/helper-validator-option": "^7.22.5",
- "@babel/plugin-syntax-jsx": "^7.22.5",
- "@babel/plugin-transform-modules-commonjs": "^7.22.5",
- "@babel/plugin-transform-typescript": "^7.22.5"
- }
- },
- "@babel/regjsgen": {
- "version": "0.8.0",
- "resolved": "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz",
- "integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA=="
- },
- "@babel/runtime": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.5.tgz",
- "integrity": "sha512-ecjvYlnAaZ/KVneE/OdKYBYfgXV3Ptu6zQWmgEF7vwKhQnvVS6bjMD2XYgj+SNvQ1GfK/pjgokfPkC/2CO8CuA==",
- "requires": {
- "regenerator-runtime": "^0.13.11"
- }
- },
- "@babel/template": {
- "version": "7.22.15",
- "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
- "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
- "requires": {
- "@babel/code-frame": "^7.22.13",
- "@babel/parser": "^7.22.15",
- "@babel/types": "^7.22.15"
- }
- },
- "@babel/traverse": {
- "version": "7.23.2",
- "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz",
- "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==",
- "requires": {
- "@babel/code-frame": "^7.22.13",
- "@babel/generator": "^7.23.0",
- "@babel/helper-environment-visitor": "^7.22.20",
- "@babel/helper-function-name": "^7.23.0",
- "@babel/helper-hoist-variables": "^7.22.5",
- "@babel/helper-split-export-declaration": "^7.22.6",
- "@babel/parser": "^7.23.0",
- "@babel/types": "^7.23.0",
- "debug": "^4.1.0",
- "globals": "^11.1.0"
- }
- },
- "@babel/types": {
- "version": "7.23.0",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz",
- "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==",
- "requires": {
- "@babel/helper-string-parser": "^7.22.5",
- "@babel/helper-validator-identifier": "^7.22.20",
- "to-fast-properties": "^2.0.0"
- }
- },
- "@bcoe/v8-coverage": {
- "version": "0.2.3",
- "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
- "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw=="
- },
- "@csstools/normalize.css": {
- "version": "12.0.0",
- "resolved": "https://registry.npmjs.org/@csstools/normalize.css/-/normalize.css-12.0.0.tgz",
- "integrity": "sha512-M0qqxAcwCsIVfpFQSlGN5XjXWu8l5JDZN+fPt1LeW5SZexQTgnaEvgXAY+CeygRw0EeppWHi12JxESWiWrB0Sg=="
- },
- "@csstools/postcss-cascade-layers": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/@csstools/postcss-cascade-layers/-/postcss-cascade-layers-1.1.1.tgz",
- "integrity": "sha512-+KdYrpKC5TgomQr2DlZF4lDEpHcoxnj5IGddYYfBWJAKfj1JtuHUIqMa+E1pJJ+z3kvDViWMqyqPlG4Ja7amQA==",
- "requires": {
- "@csstools/selector-specificity": "^2.0.2",
- "postcss-selector-parser": "^6.0.10"
- }
- },
- "@csstools/postcss-color-function": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/@csstools/postcss-color-function/-/postcss-color-function-1.1.1.tgz",
- "integrity": "sha512-Bc0f62WmHdtRDjf5f3e2STwRAl89N2CLb+9iAwzrv4L2hncrbDwnQD9PCq0gtAt7pOI2leIV08HIBUd4jxD8cw==",
- "requires": {
- "@csstools/postcss-progressive-custom-properties": "^1.1.0",
- "postcss-value-parser": "^4.2.0"
- }
- },
- "@csstools/postcss-font-format-keywords": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/@csstools/postcss-font-format-keywords/-/postcss-font-format-keywords-1.0.1.tgz",
- "integrity": "sha512-ZgrlzuUAjXIOc2JueK0X5sZDjCtgimVp/O5CEqTcs5ShWBa6smhWYbS0x5cVc/+rycTDbjjzoP0KTDnUneZGOg==",
- "requires": {
- "postcss-value-parser": "^4.2.0"
- }
- },
- "@csstools/postcss-hwb-function": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/@csstools/postcss-hwb-function/-/postcss-hwb-function-1.0.2.tgz",
- "integrity": "sha512-YHdEru4o3Rsbjmu6vHy4UKOXZD+Rn2zmkAmLRfPet6+Jz4Ojw8cbWxe1n42VaXQhD3CQUXXTooIy8OkVbUcL+w==",
- "requires": {
- "postcss-value-parser": "^4.2.0"
- }
- },
- "@csstools/postcss-ic-unit": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/@csstools/postcss-ic-unit/-/postcss-ic-unit-1.0.1.tgz",
- "integrity": "sha512-Ot1rcwRAaRHNKC9tAqoqNZhjdYBzKk1POgWfhN4uCOE47ebGcLRqXjKkApVDpjifL6u2/55ekkpnFcp+s/OZUw==",
- "requires": {
- "@csstools/postcss-progressive-custom-properties": "^1.1.0",
- "postcss-value-parser": "^4.2.0"
- }
- },
- "@csstools/postcss-is-pseudo-class": {
- "version": "2.0.7",
- "resolved": "https://registry.npmjs.org/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-2.0.7.tgz",
- "integrity": "sha512-7JPeVVZHd+jxYdULl87lvjgvWldYu+Bc62s9vD/ED6/QTGjy0jy0US/f6BG53sVMTBJ1lzKZFpYmofBN9eaRiA==",
- "requires": {
- "@csstools/selector-specificity": "^2.0.0",
- "postcss-selector-parser": "^6.0.10"
- }
- },
- "@csstools/postcss-nested-calc": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/@csstools/postcss-nested-calc/-/postcss-nested-calc-1.0.0.tgz",
- "integrity": "sha512-JCsQsw1wjYwv1bJmgjKSoZNvf7R6+wuHDAbi5f/7MbFhl2d/+v+TvBTU4BJH3G1X1H87dHl0mh6TfYogbT/dJQ==",
- "requires": {
- "postcss-value-parser": "^4.2.0"
- }
- },
- "@csstools/postcss-normalize-display-values": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/@csstools/postcss-normalize-display-values/-/postcss-normalize-display-values-1.0.1.tgz",
- "integrity": "sha512-jcOanIbv55OFKQ3sYeFD/T0Ti7AMXc9nM1hZWu8m/2722gOTxFg7xYu4RDLJLeZmPUVQlGzo4jhzvTUq3x4ZUw==",
- "requires": {
- "postcss-value-parser": "^4.2.0"
- }
- },
- "@csstools/postcss-oklab-function": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/@csstools/postcss-oklab-function/-/postcss-oklab-function-1.1.1.tgz",
- "integrity": "sha512-nJpJgsdA3dA9y5pgyb/UfEzE7W5Ka7u0CX0/HIMVBNWzWemdcTH3XwANECU6anWv/ao4vVNLTMxhiPNZsTK6iA==",
- "requires": {
- "@csstools/postcss-progressive-custom-properties": "^1.1.0",
- "postcss-value-parser": "^4.2.0"
- }
- },
- "@csstools/postcss-progressive-custom-properties": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/@csstools/postcss-progressive-custom-properties/-/postcss-progressive-custom-properties-1.3.0.tgz",
- "integrity": "sha512-ASA9W1aIy5ygskZYuWams4BzafD12ULvSypmaLJT2jvQ8G0M3I8PRQhC0h7mG0Z3LI05+agZjqSR9+K9yaQQjA==",
- "requires": {
- "postcss-value-parser": "^4.2.0"
- }
- },
- "@csstools/postcss-stepped-value-functions": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/@csstools/postcss-stepped-value-functions/-/postcss-stepped-value-functions-1.0.1.tgz",
- "integrity": "sha512-dz0LNoo3ijpTOQqEJLY8nyaapl6umbmDcgj4AD0lgVQ572b2eqA1iGZYTTWhrcrHztWDDRAX2DGYyw2VBjvCvQ==",
- "requires": {
- "postcss-value-parser": "^4.2.0"
- }
- },
- "@csstools/postcss-text-decoration-shorthand": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/@csstools/postcss-text-decoration-shorthand/-/postcss-text-decoration-shorthand-1.0.0.tgz",
- "integrity": "sha512-c1XwKJ2eMIWrzQenN0XbcfzckOLLJiczqy+YvfGmzoVXd7pT9FfObiSEfzs84bpE/VqfpEuAZ9tCRbZkZxxbdw==",
- "requires": {
- "postcss-value-parser": "^4.2.0"
- }
- },
- "@csstools/postcss-trigonometric-functions": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/@csstools/postcss-trigonometric-functions/-/postcss-trigonometric-functions-1.0.2.tgz",
- "integrity": "sha512-woKaLO///4bb+zZC2s80l+7cm07M7268MsyG3M0ActXXEFi6SuhvriQYcb58iiKGbjwwIU7n45iRLEHypB47Og==",
- "requires": {
- "postcss-value-parser": "^4.2.0"
- }
- },
- "@csstools/postcss-unset-value": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/@csstools/postcss-unset-value/-/postcss-unset-value-1.0.2.tgz",
- "integrity": "sha512-c8J4roPBILnelAsdLr4XOAR/GsTm0GJi4XpcfvoWk3U6KiTCqiFYc63KhRMQQX35jYMp4Ao8Ij9+IZRgMfJp1g==",
- "requires": {}
- },
- "@csstools/selector-specificity": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.2.0.tgz",
- "integrity": "sha512-+OJ9konv95ClSTOJCmMZqpd5+YGsB2S+x6w3E1oaM8UuR5j8nTNHYSz8c9BEPGDOCMQYIEEGlVPj/VY64iTbGw==",
- "requires": {}
- },
- "@emotion/is-prop-valid": {
- "version": "1.2.1",
- "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.2.1.tgz",
- "integrity": "sha512-61Mf7Ufx4aDxx1xlDeOm8aFFigGHE4z+0sKCa+IHCeZKiyP9RLD0Mmx7m8b9/Cf37f7NAvQOOJAbQQGVr5uERw==",
- "requires": {
- "@emotion/memoize": "^0.8.1"
- }
- },
- "@emotion/memoize": {
- "version": "0.8.1",
- "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.8.1.tgz",
- "integrity": "sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA=="
- },
- "@emotion/unitless": {
- "version": "0.8.1",
- "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.8.1.tgz",
- "integrity": "sha512-KOEGMu6dmJZtpadb476IsZBclKvILjopjUii3V+7MnXIQCYh8W3NgNcgwo21n9LXZX6EDIKvqfjYxXebDwxKmQ=="
- },
- "@eslint-community/eslint-utils": {
- "version": "4.4.0",
- "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
- "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
- "requires": {
- "eslint-visitor-keys": "^3.3.0"
- }
- },
- "@eslint-community/regexpp": {
- "version": "4.5.1",
- "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.5.1.tgz",
- "integrity": "sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ=="
- },
- "@eslint/eslintrc": {
- "version": "2.0.3",
- "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.3.tgz",
- "integrity": "sha512-+5gy6OQfk+xx3q0d6jGZZC3f3KzAkXc/IanVxd1is/VIIziRqqt3ongQz0FiTUXqTk0c7aDB3OaFuKnuSoJicQ==",
- "requires": {
- "ajv": "^6.12.4",
- "debug": "^4.3.2",
- "espree": "^9.5.2",
- "globals": "^13.19.0",
- "ignore": "^5.2.0",
- "import-fresh": "^3.2.1",
- "js-yaml": "^4.1.0",
- "minimatch": "^3.1.2",
- "strip-json-comments": "^3.1.1"
- },
- "dependencies": {
- "argparse": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
- "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
- },
- "globals": {
- "version": "13.20.0",
- "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
- "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
- "requires": {
- "type-fest": "^0.20.2"
- }
- },
- "js-yaml": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
- "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
- "requires": {
- "argparse": "^2.0.1"
- }
- },
- "type-fest": {
- "version": "0.20.2",
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
- "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ=="
- }
- }
- },
- "@eslint/js": {
- "version": "8.43.0",
- "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.43.0.tgz",
- "integrity": "sha512-s2UHCoiXfxMvmfzqoN+vrQ84ahUSYde9qNO1MdxmoEhyHWsfmwOpFlwYV+ePJEVc7gFnATGUi376WowX1N7tFg=="
- },
- "@humanwhocodes/config-array": {
- "version": "0.11.10",
- "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.10.tgz",
- "integrity": "sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==",
- "requires": {
- "@humanwhocodes/object-schema": "^1.2.1",
- "debug": "^4.1.1",
- "minimatch": "^3.0.5"
- }
- },
- "@humanwhocodes/module-importer": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
- "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA=="
- },
- "@humanwhocodes/object-schema": {
- "version": "1.2.1",
- "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
- "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA=="
- },
- "@istanbuljs/load-nyc-config": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
- "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
- "requires": {
- "camelcase": "^5.3.1",
- "find-up": "^4.1.0",
- "get-package-type": "^0.1.0",
- "js-yaml": "^3.13.1",
- "resolve-from": "^5.0.0"
- },
- "dependencies": {
- "camelcase": {
- "version": "5.3.1",
- "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
- "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
- }
- }
- },
- "@istanbuljs/schema": {
- "version": "0.1.3",
- "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
- "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA=="
- },
- "@jest/console": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.6.2.tgz",
- "integrity": "sha512-0N0yZof5hi44HAR2pPS+ikJ3nzKNoZdVu8FffRf3wy47I7Dm7etk/3KetMdRUqzVd16V4O2m2ISpNTbnIuqy1w==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/types": "^29.6.1",
- "@types/node": "*",
- "chalk": "^4.0.0",
- "jest-message-util": "^29.6.2",
- "jest-util": "^29.6.2",
- "slash": "^3.0.0"
- },
- "dependencies": {
- "@jest/types": {
- "version": "29.6.1",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
- "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/schemas": "^29.6.0",
- "@types/istanbul-lib-coverage": "^2.0.0",
- "@types/istanbul-reports": "^3.0.0",
- "@types/node": "*",
- "@types/yargs": "^17.0.8",
- "chalk": "^4.0.0"
- }
- },
- "@types/yargs": {
- "version": "17.0.24",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
- "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@types/yargs-parser": "*"
- }
- },
- "jest-util": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
- "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/types": "^29.6.1",
- "@types/node": "*",
- "chalk": "^4.0.0",
- "ci-info": "^3.2.0",
- "graceful-fs": "^4.2.9",
- "picomatch": "^2.2.3"
- }
- }
- }
- },
- "@jest/core": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.6.2.tgz",
- "integrity": "sha512-Oj+5B+sDMiMWLhPFF+4/DvHOf+U10rgvCLGPHP8Xlsy/7QxS51aU/eBngudHlJXnaWD5EohAgJ4js+T6pa+zOg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/console": "^29.6.2",
- "@jest/reporters": "^29.6.2",
- "@jest/test-result": "^29.6.2",
- "@jest/transform": "^29.6.2",
- "@jest/types": "^29.6.1",
- "@types/node": "*",
- "ansi-escapes": "^4.2.1",
- "chalk": "^4.0.0",
- "ci-info": "^3.2.0",
- "exit": "^0.1.2",
- "graceful-fs": "^4.2.9",
- "jest-changed-files": "^29.5.0",
- "jest-config": "^29.6.2",
- "jest-haste-map": "^29.6.2",
- "jest-message-util": "^29.6.2",
- "jest-regex-util": "^29.4.3",
- "jest-resolve": "^29.6.2",
- "jest-resolve-dependencies": "^29.6.2",
- "jest-runner": "^29.6.2",
- "jest-runtime": "^29.6.2",
- "jest-snapshot": "^29.6.2",
- "jest-util": "^29.6.2",
- "jest-validate": "^29.6.2",
- "jest-watcher": "^29.6.2",
- "micromatch": "^4.0.4",
- "pretty-format": "^29.6.2",
- "slash": "^3.0.0",
- "strip-ansi": "^6.0.0"
- },
- "dependencies": {
- "@jest/transform": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.6.2.tgz",
- "integrity": "sha512-ZqCqEISr58Ce3U+buNFJYUktLJZOggfyvR+bZMaiV1e8B1SIvJbwZMrYz3gx/KAPn9EXmOmN+uB08yLCjWkQQg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@babel/core": "^7.11.6",
- "@jest/types": "^29.6.1",
- "@jridgewell/trace-mapping": "^0.3.18",
- "babel-plugin-istanbul": "^6.1.1",
- "chalk": "^4.0.0",
- "convert-source-map": "^2.0.0",
- "fast-json-stable-stringify": "^2.1.0",
- "graceful-fs": "^4.2.9",
- "jest-haste-map": "^29.6.2",
- "jest-regex-util": "^29.4.3",
- "jest-util": "^29.6.2",
- "micromatch": "^4.0.4",
- "pirates": "^4.0.4",
- "slash": "^3.0.0",
- "write-file-atomic": "^4.0.2"
- }
- },
- "@jest/types": {
- "version": "29.6.1",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
- "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/schemas": "^29.6.0",
- "@types/istanbul-lib-coverage": "^2.0.0",
- "@types/istanbul-reports": "^3.0.0",
- "@types/node": "*",
- "@types/yargs": "^17.0.8",
- "chalk": "^4.0.0"
- }
- },
- "@types/yargs": {
- "version": "17.0.24",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
- "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@types/yargs-parser": "*"
- }
- },
- "ansi-styles": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
- "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
- "dev": true,
- "optional": true,
- "peer": true
- },
- "convert-source-map": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
- "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
- "dev": true,
- "optional": true,
- "peer": true
- },
- "jest-get-type": {
- "version": "29.4.3",
- "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
- "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==",
- "dev": true,
- "optional": true,
- "peer": true
- },
- "jest-haste-map": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.6.2.tgz",
- "integrity": "sha512-+51XleTDAAysvU8rT6AnS1ZJ+WHVNqhj1k6nTvN2PYP+HjU3kqlaKQ1Lnw3NYW3bm2r8vq82X0Z1nDDHZMzHVA==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/types": "^29.6.1",
- "@types/graceful-fs": "^4.1.3",
- "@types/node": "*",
- "anymatch": "^3.0.3",
- "fb-watchman": "^2.0.0",
- "fsevents": "^2.3.2",
- "graceful-fs": "^4.2.9",
- "jest-regex-util": "^29.4.3",
- "jest-util": "^29.6.2",
- "jest-worker": "^29.6.2",
- "micromatch": "^4.0.4",
- "walker": "^1.0.8"
- }
- },
- "jest-regex-util": {
- "version": "29.4.3",
- "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.4.3.tgz",
- "integrity": "sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==",
- "dev": true,
- "optional": true,
- "peer": true
- },
- "jest-resolve": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.6.2.tgz",
- "integrity": "sha512-G/iQUvZWI5e3SMFssc4ug4dH0aZiZpsDq9o1PtXTV1210Ztyb2+w+ZgQkB3iOiC5SmAEzJBOHWz6Hvrd+QnNPw==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "chalk": "^4.0.0",
- "graceful-fs": "^4.2.9",
- "jest-haste-map": "^29.6.2",
- "jest-pnp-resolver": "^1.2.2",
- "jest-util": "^29.6.2",
- "jest-validate": "^29.6.2",
- "resolve": "^1.20.0",
- "resolve.exports": "^2.0.0",
- "slash": "^3.0.0"
- }
- },
- "jest-util": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
- "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/types": "^29.6.1",
- "@types/node": "*",
- "chalk": "^4.0.0",
- "ci-info": "^3.2.0",
- "graceful-fs": "^4.2.9",
- "picomatch": "^2.2.3"
- }
- },
- "jest-validate": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.6.2.tgz",
- "integrity": "sha512-vGz0yMN5fUFRRbpJDPwxMpgSXW1LDKROHfBopAvDcmD6s+B/s8WJrwi+4bfH4SdInBA5C3P3BI19dBtKzx1Arg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/types": "^29.6.1",
- "camelcase": "^6.2.0",
- "chalk": "^4.0.0",
- "jest-get-type": "^29.4.3",
- "leven": "^3.1.0",
- "pretty-format": "^29.6.2"
- }
- },
- "jest-worker": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.2.tgz",
- "integrity": "sha512-l3ccBOabTdkng8I/ORCkADz4eSMKejTYv1vB/Z83UiubqhC1oQ5Li6dWCyqOIvSifGjUBxuvxvlm6KGK2DtuAQ==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@types/node": "*",
- "jest-util": "^29.6.2",
- "merge-stream": "^2.0.0",
- "supports-color": "^8.0.0"
- }
- },
- "pretty-format": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.2.tgz",
- "integrity": "sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/schemas": "^29.6.0",
- "ansi-styles": "^5.0.0",
- "react-is": "^18.0.0"
- }
- },
- "resolve.exports": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz",
- "integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==",
- "dev": true,
- "optional": true,
- "peer": true
- },
- "supports-color": {
- "version": "8.1.1",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
- "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "has-flag": "^4.0.0"
- }
- },
- "write-file-atomic": {
- "version": "4.0.2",
- "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
- "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "imurmurhash": "^0.1.4",
- "signal-exit": "^3.0.7"
- }
- }
- }
- },
- "@jest/environment": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.6.2.tgz",
- "integrity": "sha512-AEcW43C7huGd/vogTddNNTDRpO6vQ2zaQNrttvWV18ArBx9Z56h7BIsXkNFJVOO4/kblWEQz30ckw0+L3izc+Q==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/fake-timers": "^29.6.2",
- "@jest/types": "^29.6.1",
- "@types/node": "*",
- "jest-mock": "^29.6.2"
- },
- "dependencies": {
- "@jest/types": {
- "version": "29.6.1",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
- "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/schemas": "^29.6.0",
- "@types/istanbul-lib-coverage": "^2.0.0",
- "@types/istanbul-reports": "^3.0.0",
- "@types/node": "*",
- "@types/yargs": "^17.0.8",
- "chalk": "^4.0.0"
- }
- },
- "@types/yargs": {
- "version": "17.0.24",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
- "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@types/yargs-parser": "*"
- }
- }
- }
- },
- "@jest/expect": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.6.2.tgz",
- "integrity": "sha512-m6DrEJxVKjkELTVAztTLyS/7C92Y2b0VYqmDROYKLLALHn8T/04yPs70NADUYPrV3ruI+H3J0iUIuhkjp7vkfg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "expect": "^29.6.2",
- "jest-snapshot": "^29.6.2"
- }
- },
- "@jest/expect-utils": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.6.2.tgz",
- "integrity": "sha512-6zIhM8go3RV2IG4aIZaZbxwpOzz3ZiM23oxAlkquOIole+G6TrbeXnykxWYlqF7kz2HlBjdKtca20x9atkEQYg==",
- "dev": true,
- "requires": {
- "jest-get-type": "^29.4.3"
- },
- "dependencies": {
- "jest-get-type": {
- "version": "29.4.3",
- "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
- "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==",
- "dev": true
- }
- }
- },
- "@jest/fake-timers": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.6.2.tgz",
- "integrity": "sha512-euZDmIlWjm1Z0lJ1D0f7a0/y5Kh/koLFMUBE5SUYWrmy8oNhJpbTBDAP6CxKnadcMLDoDf4waRYCe35cH6G6PA==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/types": "^29.6.1",
- "@sinonjs/fake-timers": "^10.0.2",
- "@types/node": "*",
- "jest-message-util": "^29.6.2",
- "jest-mock": "^29.6.2",
- "jest-util": "^29.6.2"
- },
- "dependencies": {
- "@jest/types": {
- "version": "29.6.1",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
- "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/schemas": "^29.6.0",
- "@types/istanbul-lib-coverage": "^2.0.0",
- "@types/istanbul-reports": "^3.0.0",
- "@types/node": "*",
- "@types/yargs": "^17.0.8",
- "chalk": "^4.0.0"
- }
- },
- "@types/yargs": {
- "version": "17.0.24",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
- "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@types/yargs-parser": "*"
- }
- },
- "jest-util": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
- "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/types": "^29.6.1",
- "@types/node": "*",
- "chalk": "^4.0.0",
- "ci-info": "^3.2.0",
- "graceful-fs": "^4.2.9",
- "picomatch": "^2.2.3"
- }
- }
- }
- },
- "@jest/globals": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.6.2.tgz",
- "integrity": "sha512-cjuJmNDjs6aMijCmSa1g2TNG4Lby/AeU7/02VtpW+SLcZXzOLK2GpN2nLqcFjmhy3B3AoPeQVx7BnyOf681bAw==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/environment": "^29.6.2",
- "@jest/expect": "^29.6.2",
- "@jest/types": "^29.6.1",
- "jest-mock": "^29.6.2"
- },
- "dependencies": {
- "@jest/types": {
- "version": "29.6.1",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
- "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/schemas": "^29.6.0",
- "@types/istanbul-lib-coverage": "^2.0.0",
- "@types/istanbul-reports": "^3.0.0",
- "@types/node": "*",
- "@types/yargs": "^17.0.8",
- "chalk": "^4.0.0"
- }
- },
- "@types/yargs": {
- "version": "17.0.24",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
- "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@types/yargs-parser": "*"
- }
- }
- }
- },
- "@jest/reporters": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.6.2.tgz",
- "integrity": "sha512-sWtijrvIav8LgfJZlrGCdN0nP2EWbakglJY49J1Y5QihcQLfy7ovyxxjJBRXMNltgt4uPtEcFmIMbVshEDfFWw==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@bcoe/v8-coverage": "^0.2.3",
- "@jest/console": "^29.6.2",
- "@jest/test-result": "^29.6.2",
- "@jest/transform": "^29.6.2",
- "@jest/types": "^29.6.1",
- "@jridgewell/trace-mapping": "^0.3.18",
- "@types/node": "*",
- "chalk": "^4.0.0",
- "collect-v8-coverage": "^1.0.0",
- "exit": "^0.1.2",
- "glob": "^7.1.3",
- "graceful-fs": "^4.2.9",
- "istanbul-lib-coverage": "^3.0.0",
- "istanbul-lib-instrument": "^5.1.0",
- "istanbul-lib-report": "^3.0.0",
- "istanbul-lib-source-maps": "^4.0.0",
- "istanbul-reports": "^3.1.3",
- "jest-message-util": "^29.6.2",
- "jest-util": "^29.6.2",
- "jest-worker": "^29.6.2",
- "slash": "^3.0.0",
- "string-length": "^4.0.1",
- "strip-ansi": "^6.0.0",
- "v8-to-istanbul": "^9.0.1"
- },
- "dependencies": {
- "@jest/transform": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.6.2.tgz",
- "integrity": "sha512-ZqCqEISr58Ce3U+buNFJYUktLJZOggfyvR+bZMaiV1e8B1SIvJbwZMrYz3gx/KAPn9EXmOmN+uB08yLCjWkQQg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@babel/core": "^7.11.6",
- "@jest/types": "^29.6.1",
- "@jridgewell/trace-mapping": "^0.3.18",
- "babel-plugin-istanbul": "^6.1.1",
- "chalk": "^4.0.0",
- "convert-source-map": "^2.0.0",
- "fast-json-stable-stringify": "^2.1.0",
- "graceful-fs": "^4.2.9",
- "jest-haste-map": "^29.6.2",
- "jest-regex-util": "^29.4.3",
- "jest-util": "^29.6.2",
- "micromatch": "^4.0.4",
- "pirates": "^4.0.4",
- "slash": "^3.0.0",
- "write-file-atomic": "^4.0.2"
- }
- },
- "@jest/types": {
- "version": "29.6.1",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
- "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/schemas": "^29.6.0",
- "@types/istanbul-lib-coverage": "^2.0.0",
- "@types/istanbul-reports": "^3.0.0",
- "@types/node": "*",
- "@types/yargs": "^17.0.8",
- "chalk": "^4.0.0"
- }
- },
- "@types/yargs": {
- "version": "17.0.24",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
- "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@types/yargs-parser": "*"
- }
- },
- "convert-source-map": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
- "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
- "dev": true,
- "optional": true,
- "peer": true
- },
- "jest-haste-map": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.6.2.tgz",
- "integrity": "sha512-+51XleTDAAysvU8rT6AnS1ZJ+WHVNqhj1k6nTvN2PYP+HjU3kqlaKQ1Lnw3NYW3bm2r8vq82X0Z1nDDHZMzHVA==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/types": "^29.6.1",
- "@types/graceful-fs": "^4.1.3",
- "@types/node": "*",
- "anymatch": "^3.0.3",
- "fb-watchman": "^2.0.0",
- "fsevents": "^2.3.2",
- "graceful-fs": "^4.2.9",
- "jest-regex-util": "^29.4.3",
- "jest-util": "^29.6.2",
- "jest-worker": "^29.6.2",
- "micromatch": "^4.0.4",
- "walker": "^1.0.8"
- }
- },
- "jest-regex-util": {
- "version": "29.4.3",
- "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.4.3.tgz",
- "integrity": "sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==",
- "dev": true,
- "optional": true,
- "peer": true
- },
- "jest-util": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
- "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/types": "^29.6.1",
- "@types/node": "*",
- "chalk": "^4.0.0",
- "ci-info": "^3.2.0",
- "graceful-fs": "^4.2.9",
- "picomatch": "^2.2.3"
- }
- },
- "jest-worker": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.2.tgz",
- "integrity": "sha512-l3ccBOabTdkng8I/ORCkADz4eSMKejTYv1vB/Z83UiubqhC1oQ5Li6dWCyqOIvSifGjUBxuvxvlm6KGK2DtuAQ==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@types/node": "*",
- "jest-util": "^29.6.2",
- "merge-stream": "^2.0.0",
- "supports-color": "^8.0.0"
- }
- },
- "supports-color": {
- "version": "8.1.1",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
- "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "has-flag": "^4.0.0"
- }
- },
- "write-file-atomic": {
- "version": "4.0.2",
- "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
- "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "imurmurhash": "^0.1.4",
- "signal-exit": "^3.0.7"
- }
- }
- }
- },
- "@jest/schemas": {
- "version": "29.6.0",
- "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.0.tgz",
- "integrity": "sha512-rxLjXyJBTL4LQeJW3aKo0M/+GkCOXsO+8i9Iu7eDb6KwtP65ayoDsitrdPBtujxQ88k4wI2FNYfa6TOGwSn6cQ==",
- "dev": true,
- "requires": {
- "@sinclair/typebox": "^0.27.8"
- }
- },
- "@jest/source-map": {
- "version": "29.6.0",
- "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.0.tgz",
- "integrity": "sha512-oA+I2SHHQGxDCZpbrsCQSoMLb3Bz547JnM+jUr9qEbuw0vQlWZfpPS7CO9J7XiwKicEz9OFn/IYoLkkiUD7bzA==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jridgewell/trace-mapping": "^0.3.18",
- "callsites": "^3.0.0",
- "graceful-fs": "^4.2.9"
- }
- },
- "@jest/test-result": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.6.2.tgz",
- "integrity": "sha512-3VKFXzcV42EYhMCsJQURptSqnyjqCGbtLuX5Xxb6Pm6gUf1wIRIl+mandIRGJyWKgNKYF9cnstti6Ls5ekduqw==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/console": "^29.6.2",
- "@jest/types": "^29.6.1",
- "@types/istanbul-lib-coverage": "^2.0.0",
- "collect-v8-coverage": "^1.0.0"
- },
- "dependencies": {
- "@jest/types": {
- "version": "29.6.1",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
- "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/schemas": "^29.6.0",
- "@types/istanbul-lib-coverage": "^2.0.0",
- "@types/istanbul-reports": "^3.0.0",
- "@types/node": "*",
- "@types/yargs": "^17.0.8",
- "chalk": "^4.0.0"
- }
- },
- "@types/yargs": {
- "version": "17.0.24",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
- "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@types/yargs-parser": "*"
- }
- }
- }
- },
- "@jest/test-sequencer": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.6.2.tgz",
- "integrity": "sha512-GVYi6PfPwVejO7slw6IDO0qKVum5jtrJ3KoLGbgBWyr2qr4GaxFV6su+ZAjdTX75Sr1DkMFRk09r2ZVa+wtCGw==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/test-result": "^29.6.2",
- "graceful-fs": "^4.2.9",
- "jest-haste-map": "^29.6.2",
- "slash": "^3.0.0"
- },
- "dependencies": {
- "@jest/types": {
- "version": "29.6.1",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
- "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/schemas": "^29.6.0",
- "@types/istanbul-lib-coverage": "^2.0.0",
- "@types/istanbul-reports": "^3.0.0",
- "@types/node": "*",
- "@types/yargs": "^17.0.8",
- "chalk": "^4.0.0"
- }
- },
- "@types/yargs": {
- "version": "17.0.24",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
- "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@types/yargs-parser": "*"
- }
- },
- "jest-haste-map": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.6.2.tgz",
- "integrity": "sha512-+51XleTDAAysvU8rT6AnS1ZJ+WHVNqhj1k6nTvN2PYP+HjU3kqlaKQ1Lnw3NYW3bm2r8vq82X0Z1nDDHZMzHVA==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/types": "^29.6.1",
- "@types/graceful-fs": "^4.1.3",
- "@types/node": "*",
- "anymatch": "^3.0.3",
- "fb-watchman": "^2.0.0",
- "fsevents": "^2.3.2",
- "graceful-fs": "^4.2.9",
- "jest-regex-util": "^29.4.3",
- "jest-util": "^29.6.2",
- "jest-worker": "^29.6.2",
- "micromatch": "^4.0.4",
- "walker": "^1.0.8"
- }
- },
- "jest-regex-util": {
- "version": "29.4.3",
- "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.4.3.tgz",
- "integrity": "sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==",
- "dev": true,
- "optional": true,
- "peer": true
- },
- "jest-util": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
- "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/types": "^29.6.1",
- "@types/node": "*",
- "chalk": "^4.0.0",
- "ci-info": "^3.2.0",
- "graceful-fs": "^4.2.9",
- "picomatch": "^2.2.3"
- }
- },
- "jest-worker": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.2.tgz",
- "integrity": "sha512-l3ccBOabTdkng8I/ORCkADz4eSMKejTYv1vB/Z83UiubqhC1oQ5Li6dWCyqOIvSifGjUBxuvxvlm6KGK2DtuAQ==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@types/node": "*",
- "jest-util": "^29.6.2",
- "merge-stream": "^2.0.0",
- "supports-color": "^8.0.0"
- }
- },
- "supports-color": {
- "version": "8.1.1",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
- "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "has-flag": "^4.0.0"
- }
- }
- }
- },
- "@jest/transform": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.5.1.tgz",
- "integrity": "sha512-ipON6WtYgl/1329g5AIJVbUuEh0wZVbdpGwC99Jw4LwuoBNS95MVphU6zOeD9pDkon+LLbFL7lOQRapbB8SCHw==",
- "requires": {
- "@babel/core": "^7.1.0",
- "@jest/types": "^27.5.1",
- "babel-plugin-istanbul": "^6.1.1",
- "chalk": "^4.0.0",
- "convert-source-map": "^1.4.0",
- "fast-json-stable-stringify": "^2.0.0",
- "graceful-fs": "^4.2.9",
- "jest-haste-map": "^27.5.1",
- "jest-regex-util": "^27.5.1",
- "jest-util": "^27.5.1",
- "micromatch": "^4.0.4",
- "pirates": "^4.0.4",
- "slash": "^3.0.0",
- "source-map": "^0.6.1",
- "write-file-atomic": "^3.0.0"
- },
- "dependencies": {
- "source-map": {
- "version": "0.6.1",
- "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
- "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
- }
- }
- },
- "@jest/types": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
- "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
- "requires": {
- "@types/istanbul-lib-coverage": "^2.0.0",
- "@types/istanbul-reports": "^3.0.0",
- "@types/node": "*",
- "@types/yargs": "^16.0.0",
- "chalk": "^4.0.0"
- }
- },
- "@jridgewell/gen-mapping": {
- "version": "0.3.3",
- "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
- "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
- "requires": {
- "@jridgewell/set-array": "^1.0.1",
- "@jridgewell/sourcemap-codec": "^1.4.10",
- "@jridgewell/trace-mapping": "^0.3.9"
- }
- },
- "@jridgewell/resolve-uri": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
- "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w=="
- },
- "@jridgewell/set-array": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
- "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw=="
- },
- "@jridgewell/source-map": {
- "version": "0.3.3",
- "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.3.tgz",
- "integrity": "sha512-b+fsZXeLYi9fEULmfBrhxn4IrPlINf8fiNarzTof004v3lFdntdwa9PF7vFJqm3mg7s+ScJMxXaE3Acp1irZcg==",
- "requires": {
- "@jridgewell/gen-mapping": "^0.3.0",
- "@jridgewell/trace-mapping": "^0.3.9"
- }
- },
- "@jridgewell/sourcemap-codec": {
- "version": "1.4.15",
- "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
- "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
- },
- "@jridgewell/trace-mapping": {
- "version": "0.3.18",
- "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz",
- "integrity": "sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==",
- "requires": {
- "@jridgewell/resolve-uri": "3.1.0",
- "@jridgewell/sourcemap-codec": "1.4.14"
- },
- "dependencies": {
- "@jridgewell/sourcemap-codec": {
- "version": "1.4.14",
- "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
- "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="
- }
- }
- },
- "@leichtgewicht/ip-codec": {
- "version": "2.0.4",
- "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz",
- "integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A=="
- },
- "@nicolo-ribaudo/eslint-scope-5-internals": {
- "version": "5.1.1-v1",
- "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz",
- "integrity": "sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==",
- "requires": {
- "eslint-scope": "5.1.1"
- },
- "dependencies": {
- "eslint-scope": {
- "version": "5.1.1",
- "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
- "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
- "requires": {
- "esrecurse": "^4.3.0",
- "estraverse": "^4.1.1"
- }
- },
- "estraverse": {
- "version": "4.3.0",
- "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
- "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="
- }
- }
- },
- "@nodelib/fs.scandir": {
- "version": "2.1.5",
- "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
- "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
- "requires": {
- "@nodelib/fs.stat": "2.0.5",
- "run-parallel": "^1.1.9"
- }
- },
- "@nodelib/fs.stat": {
- "version": "2.0.5",
- "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
- "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A=="
- },
- "@nodelib/fs.walk": {
- "version": "1.2.8",
- "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
- "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
- "requires": {
- "@nodelib/fs.scandir": "2.1.5",
- "fastq": "^1.6.0"
- }
- },
- "@pmmmwh/react-refresh-webpack-plugin": {
- "version": "0.5.10",
- "resolved": "https://registry.npmjs.org/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.10.tgz",
- "integrity": "sha512-j0Ya0hCFZPd4x40qLzbhGsh9TMtdb+CJQiso+WxLOPNasohq9cc5SNUcwsZaRH6++Xh91Xkm/xHCkuIiIu0LUA==",
- "requires": {
- "ansi-html-community": "^0.0.8",
- "common-path-prefix": "^3.0.0",
- "core-js-pure": "^3.23.3",
- "error-stack-parser": "^2.0.6",
- "find-up": "^5.0.0",
- "html-entities": "^2.1.0",
- "loader-utils": "^2.0.4",
- "schema-utils": "^3.0.0",
- "source-map": "^0.7.3"
- },
- "dependencies": {
- "find-up": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
- "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
- "requires": {
- "locate-path": "^6.0.0",
- "path-exists": "^4.0.0"
- }
- },
- "locate-path": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
- "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
- "requires": {
- "p-locate": "^5.0.0"
- }
- },
- "p-limit": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
- "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
- "requires": {
- "yocto-queue": "^0.1.0"
- }
- },
- "p-locate": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
- "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
- "requires": {
- "p-limit": "^3.0.2"
- }
- }
- }
- },
- "@rollup/plugin-babel": {
- "version": "5.3.1",
- "resolved": "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz",
- "integrity": "sha512-WFfdLWU/xVWKeRQnKmIAQULUI7Il0gZnBIH/ZFO069wYIfPu+8zrfp/KMW0atmELoRDq8FbiP3VCss9MhCut7Q==",
- "requires": {
- "@babel/helper-module-imports": "^7.10.4",
- "@rollup/pluginutils": "^3.1.0"
- }
- },
- "@rollup/plugin-node-resolve": {
- "version": "11.2.1",
- "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-11.2.1.tgz",
- "integrity": "sha512-yc2n43jcqVyGE2sqV5/YCmocy9ArjVAP/BeXyTtADTBBX6V0e5UMqwO8CdQ0kzjb6zu5P1qMzsScCMRvE9OlVg==",
- "requires": {
- "@rollup/pluginutils": "^3.1.0",
- "@types/resolve": "1.17.1",
- "builtin-modules": "^3.1.0",
- "deepmerge": "^4.2.2",
- "is-module": "^1.0.0",
- "resolve": "^1.19.0"
- },
- "dependencies": {
- "builtin-modules": {
- "version": "3.3.0",
- "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz",
- "integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw=="
- }
- }
- },
- "@rollup/plugin-replace": {
- "version": "2.4.2",
- "resolved": "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-2.4.2.tgz",
- "integrity": "sha512-IGcu+cydlUMZ5En85jxHH4qj2hta/11BHq95iHEyb2sbgiN0eCdzvUcHw5gt9pBL5lTi4JDYJ1acCoMGpTvEZg==",
- "requires": {
- "@rollup/pluginutils": "^3.1.0",
- "magic-string": "^0.25.7"
- }
- },
- "@rollup/pluginutils": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz",
- "integrity": "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==",
- "requires": {
- "@types/estree": "0.0.39",
- "estree-walker": "^1.0.1",
- "picomatch": "^2.2.2"
- },
- "dependencies": {
- "@types/estree": {
- "version": "0.0.39",
- "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz",
- "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw=="
- }
- }
- },
- "@rushstack/eslint-patch": {
- "version": "1.3.2",
- "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.3.2.tgz",
- "integrity": "sha512-V+MvGwaHH03hYhY+k6Ef/xKd6RYlc4q8WBx+2ANmipHJcKuktNcI/NgEsJgdSUF6Lw32njT6OnrRsKYCdgHjYw=="
- },
- "@sinclair/typebox": {
- "version": "0.27.8",
- "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
- "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==",
- "dev": true
- },
- "@sinonjs/commons": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.0.tgz",
- "integrity": "sha512-jXBtWAF4vmdNmZgD5FoKsVLv3rPgDnLgPbU84LIJ3otV44vJlDRokVng5v8NFJdCf/da9legHcKaRuZs4L7faA==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "type-detect": "4.0.8"
- }
- },
- "@sinonjs/fake-timers": {
- "version": "10.3.0",
- "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz",
- "integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@sinonjs/commons": "^3.0.0"
- }
- },
- "@surma/rollup-plugin-off-main-thread": {
- "version": "2.2.3",
- "resolved": "https://registry.npmjs.org/@surma/rollup-plugin-off-main-thread/-/rollup-plugin-off-main-thread-2.2.3.tgz",
- "integrity": "sha512-lR8q/9W7hZpMWweNiAKU7NQerBnzQQLvi8qnTDU/fxItPhtZVMbPV3lbCwjhIlNBe9Bbr5V+KHshvWmVSG9cxQ==",
- "requires": {
- "ejs": "^3.1.6",
- "json5": "^2.2.0",
- "magic-string": "^0.25.0",
- "string.prototype.matchall": "^4.0.6"
- }
- },
- "@svgr/babel-plugin-add-jsx-attribute": {
- "version": "5.4.0",
- "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-5.4.0.tgz",
- "integrity": "sha512-ZFf2gs/8/6B8PnSofI0inYXr2SDNTDScPXhN7k5EqD4aZ3gi6u+rbmZHVB8IM3wDyx8ntKACZbtXSm7oZGRqVg=="
- },
- "@svgr/babel-plugin-remove-jsx-attribute": {
- "version": "5.4.0",
- "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-5.4.0.tgz",
- "integrity": "sha512-yaS4o2PgUtwLFGTKbsiAy6D0o3ugcUhWK0Z45umJ66EPWunAz9fuFw2gJuje6wqQvQWOTJvIahUwndOXb7QCPg=="
- },
- "@svgr/babel-plugin-remove-jsx-empty-expression": {
- "version": "5.0.1",
- "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-5.0.1.tgz",
- "integrity": "sha512-LA72+88A11ND/yFIMzyuLRSMJ+tRKeYKeQ+mR3DcAZ5I4h5CPWN9AHyUzJbWSYp/u2u0xhmgOe0+E41+GjEueA=="
- },
- "@svgr/babel-plugin-replace-jsx-attribute-value": {
- "version": "5.0.1",
- "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-5.0.1.tgz",
- "integrity": "sha512-PoiE6ZD2Eiy5mK+fjHqwGOS+IXX0wq/YDtNyIgOrc6ejFnxN4b13pRpiIPbtPwHEc+NT2KCjteAcq33/F1Y9KQ=="
- },
- "@svgr/babel-plugin-svg-dynamic-title": {
- "version": "5.4.0",
- "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-5.4.0.tgz",
- "integrity": "sha512-zSOZH8PdZOpuG1ZVx/cLVePB2ibo3WPpqo7gFIjLV9a0QsuQAzJiwwqmuEdTaW2pegyBE17Uu15mOgOcgabQZg=="
- },
- "@svgr/babel-plugin-svg-em-dimensions": {
- "version": "5.4.0",
- "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-5.4.0.tgz",
- "integrity": "sha512-cPzDbDA5oT/sPXDCUYoVXEmm3VIoAWAPT6mSPTJNbQaBNUuEKVKyGH93oDY4e42PYHRW67N5alJx/eEol20abw=="
- },
- "@svgr/babel-plugin-transform-react-native-svg": {
- "version": "5.4.0",
- "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-5.4.0.tgz",
- "integrity": "sha512-3eYP/SaopZ41GHwXma7Rmxcv9uRslRDTY1estspeB1w1ueZWd/tPlMfEOoccYpEMZU3jD4OU7YitnXcF5hLW2Q=="
- },
- "@svgr/babel-plugin-transform-svg-component": {
- "version": "5.5.0",
- "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-5.5.0.tgz",
- "integrity": "sha512-q4jSH1UUvbrsOtlo/tKcgSeiCHRSBdXoIoqX1pgcKK/aU3JD27wmMKwGtpB8qRYUYoyXvfGxUVKchLuR5pB3rQ=="
- },
- "@svgr/babel-preset": {
- "version": "5.5.0",
- "resolved": "https://registry.npmjs.org/@svgr/babel-preset/-/babel-preset-5.5.0.tgz",
- "integrity": "sha512-4FiXBjvQ+z2j7yASeGPEi8VD/5rrGQk4Xrq3EdJmoZgz/tpqChpo5hgXDvmEauwtvOc52q8ghhZK4Oy7qph4ig==",
- "requires": {
- "@svgr/babel-plugin-add-jsx-attribute": "^5.4.0",
- "@svgr/babel-plugin-remove-jsx-attribute": "^5.4.0",
- "@svgr/babel-plugin-remove-jsx-empty-expression": "^5.0.1",
- "@svgr/babel-plugin-replace-jsx-attribute-value": "^5.0.1",
- "@svgr/babel-plugin-svg-dynamic-title": "^5.4.0",
- "@svgr/babel-plugin-svg-em-dimensions": "^5.4.0",
- "@svgr/babel-plugin-transform-react-native-svg": "^5.4.0",
- "@svgr/babel-plugin-transform-svg-component": "^5.5.0"
- }
- },
- "@svgr/core": {
- "version": "5.5.0",
- "resolved": "https://registry.npmjs.org/@svgr/core/-/core-5.5.0.tgz",
- "integrity": "sha512-q52VOcsJPvV3jO1wkPtzTuKlvX7Y3xIcWRpCMtBF3MrteZJtBfQw/+u0B1BHy5ColpQc1/YVTrPEtSYIMNZlrQ==",
- "requires": {
- "@svgr/plugin-jsx": "^5.5.0",
- "camelcase": "^6.2.0",
- "cosmiconfig": "^7.0.0"
- }
- },
- "@svgr/hast-util-to-babel-ast": {
- "version": "5.5.0",
- "resolved": "https://registry.npmjs.org/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-5.5.0.tgz",
- "integrity": "sha512-cAaR/CAiZRB8GP32N+1jocovUtvlj0+e65TB50/6Lcime+EA49m/8l+P2ko+XPJ4dw3xaPS3jOL4F2X4KWxoeQ==",
- "requires": {
- "@babel/types": "^7.12.6"
- }
- },
- "@svgr/plugin-jsx": {
- "version": "5.5.0",
- "resolved": "https://registry.npmjs.org/@svgr/plugin-jsx/-/plugin-jsx-5.5.0.tgz",
- "integrity": "sha512-V/wVh33j12hGh05IDg8GpIUXbjAPnTdPTKuP4VNLggnwaHMPNQNae2pRnyTAILWCQdz5GyMqtO488g7CKM8CBA==",
- "requires": {
- "@babel/core": "^7.12.3",
- "@svgr/babel-preset": "^5.5.0",
- "@svgr/hast-util-to-babel-ast": "^5.5.0",
- "svg-parser": "^2.0.2"
- }
- },
- "@svgr/plugin-svgo": {
- "version": "5.5.0",
- "resolved": "https://registry.npmjs.org/@svgr/plugin-svgo/-/plugin-svgo-5.5.0.tgz",
- "integrity": "sha512-r5swKk46GuQl4RrVejVwpeeJaydoxkdwkM1mBKOgJLBUJPGaLci6ylg/IjhrRsREKDkr4kbMWdgOtbXEh0fyLQ==",
- "requires": {
- "cosmiconfig": "^7.0.0",
- "deepmerge": "^4.2.2",
- "svgo": "^1.2.2"
- }
- },
- "@svgr/webpack": {
- "version": "5.5.0",
- "resolved": "https://registry.npmjs.org/@svgr/webpack/-/webpack-5.5.0.tgz",
- "integrity": "sha512-DOBOK255wfQxguUta2INKkzPj6AIS6iafZYiYmHn6W3pHlycSRRlvWKCfLDG10fXfLWqE3DJHgRUOyJYmARa7g==",
- "requires": {
- "@babel/core": "^7.12.3",
- "@babel/plugin-transform-react-constant-elements": "^7.12.1",
- "@babel/preset-env": "^7.12.1",
- "@babel/preset-react": "^7.12.5",
- "@svgr/core": "^5.5.0",
- "@svgr/plugin-jsx": "^5.5.0",
- "@svgr/plugin-svgo": "^5.5.0",
- "loader-utils": "^2.0.0"
- }
- },
- "@testing-library/dom": {
- "version": "9.3.1",
- "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-9.3.1.tgz",
- "integrity": "sha512-0DGPd9AR3+iDTjGoMpxIkAsUihHZ3Ai6CneU6bRRrffXMgzCdlNk43jTrD2/5LT6CBb3MWTP8v510JzYtahD2w==",
- "dev": true,
- "peer": true,
- "requires": {
- "@babel/code-frame": "^7.10.4",
- "@babel/runtime": "^7.12.5",
- "@types/aria-query": "^5.0.1",
- "aria-query": "5.1.3",
- "chalk": "^4.1.0",
- "dom-accessibility-api": "^0.5.9",
- "lz-string": "^1.5.0",
- "pretty-format": "^27.0.2"
- }
- },
- "@testing-library/jest-dom": {
- "version": "6.1.0",
- "resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-6.1.0.tgz",
- "integrity": "sha512-EUAg9pvOkzmGXUSyAPt0h6yAXHxsn+FMNS1o7OX8TErmldZML2ywt10lotZXx/a1PDiSnq0fGGyEV/ybKSLPWQ==",
- "dev": true,
- "requires": {
- "@adobe/css-tools": "^4.0.1",
- "@babel/runtime": "^7.9.2",
- "aria-query": "^5.0.0",
- "chalk": "^3.0.0",
- "css.escape": "^1.5.1",
- "dom-accessibility-api": "^0.5.6",
- "lodash": "^4.17.15",
- "redent": "^3.0.0"
- },
- "dependencies": {
- "chalk": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
- "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
- "dev": true,
- "requires": {
- "ansi-styles": "^4.1.0",
- "supports-color": "^7.1.0"
- }
- }
- }
- },
- "@testing-library/react": {
- "version": "12.1.5",
- "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-12.1.5.tgz",
- "integrity": "sha512-OfTXCJUFgjd/digLUuPxa0+/3ZxsQmE7ub9kcbW/wi96Bh3o/p5vrETcBGfP17NWPGqeYYl5LTRpwyGoMC4ysg==",
- "dev": true,
- "requires": {
- "@babel/runtime": "^7.12.5",
- "@testing-library/dom": "^8.0.0",
- "@types/react-dom": "<18.0.0"
- },
- "dependencies": {
- "@testing-library/dom": {
- "version": "8.20.1",
- "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-8.20.1.tgz",
- "integrity": "sha512-/DiOQ5xBxgdYRC8LNk7U+RWat0S3qRLeIw3ZIkMQ9kkVlRmwD/Eg8k8CqIpD6GW7u20JIUOfMKbxtiLutpjQ4g==",
- "dev": true,
- "requires": {
- "@babel/code-frame": "^7.10.4",
- "@babel/runtime": "^7.12.5",
- "@types/aria-query": "^5.0.1",
- "aria-query": "5.1.3",
- "chalk": "^4.1.0",
- "dom-accessibility-api": "^0.5.9",
- "lz-string": "^1.5.0",
- "pretty-format": "^27.0.2"
- }
- }
- }
- },
- "@testing-library/user-event": {
- "version": "14.5.1",
- "resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-14.5.1.tgz",
- "integrity": "sha512-UCcUKrUYGj7ClomOo2SpNVvx4/fkd/2BbIHDCle8A0ax+P3bU7yJwDBDrS6ZwdTMARWTGODX1hEsCcO+7beJjg==",
- "dev": true,
- "requires": {}
- },
- "@tootallnate/once": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
- "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw=="
- },
- "@trysound/sax": {
- "version": "0.2.0",
- "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz",
- "integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA=="
- },
- "@types/aria-query": {
- "version": "5.0.1",
- "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.1.tgz",
- "integrity": "sha512-XTIieEY+gvJ39ChLcB4If5zHtPxt3Syj5rgZR+e1ctpmK8NjPf0zFqsz4JpLJT0xla9GFDKjy8Cpu331nrmE1Q==",
- "dev": true
- },
- "@types/babel__core": {
- "version": "7.20.1",
- "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.1.tgz",
- "integrity": "sha512-aACu/U/omhdk15O4Nfb+fHgH/z3QsfQzpnvRZhYhThms83ZnAOZz7zZAWO7mn2yyNQaA4xTO8GLK3uqFU4bYYw==",
- "requires": {
- "@babel/parser": "^7.20.7",
- "@babel/types": "^7.20.7",
- "@types/babel__generator": "*",
- "@types/babel__template": "*",
- "@types/babel__traverse": "*"
- }
- },
- "@types/babel__generator": {
- "version": "7.6.4",
- "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.4.tgz",
- "integrity": "sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==",
- "requires": {
- "@babel/types": "^7.0.0"
- }
- },
- "@types/babel__template": {
- "version": "7.4.1",
- "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz",
- "integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==",
- "requires": {
- "@babel/parser": "^7.1.0",
- "@babel/types": "^7.0.0"
- }
- },
- "@types/babel__traverse": {
- "version": "7.20.1",
- "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.1.tgz",
- "integrity": "sha512-MitHFXnhtgwsGZWtT68URpOvLN4EREih1u3QtQiN4VdAxWKRVvGCSvw/Qth0M0Qq3pJpnGOu5JaM/ydK7OGbqg==",
- "requires": {
- "@babel/types": "^7.20.7"
- }
- },
- "@types/body-parser": {
- "version": "1.19.2",
- "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz",
- "integrity": "sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==",
- "requires": {
- "@types/connect": "*",
- "@types/node": "*"
- }
- },
- "@types/bonjour": {
- "version": "3.5.10",
- "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.10.tgz",
- "integrity": "sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw==",
- "requires": {
- "@types/node": "*"
- }
- },
- "@types/connect": {
- "version": "3.4.35",
- "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz",
- "integrity": "sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==",
- "requires": {
- "@types/node": "*"
- }
- },
- "@types/connect-history-api-fallback": {
- "version": "1.5.0",
- "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz",
- "integrity": "sha512-4x5FkPpLipqwthjPsF7ZRbOv3uoLUFkTA9G9v583qi4pACvq0uTELrB8OLUzPWUI4IJIyvM85vzkV1nyiI2Lig==",
- "requires": {
- "@types/express-serve-static-core": "*",
- "@types/node": "*"
- }
- },
- "@types/eslint": {
- "version": "8.40.2",
- "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.40.2.tgz",
- "integrity": "sha512-PRVjQ4Eh9z9pmmtaq8nTjZjQwKFk7YIHIud3lRoKRBgUQjgjRmoGxxGEPXQkF+lH7QkHJRNr5F4aBgYCW0lqpQ==",
- "requires": {
- "@types/estree": "*",
- "@types/json-schema": "*"
- }
- },
- "@types/eslint-scope": {
- "version": "3.7.4",
- "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz",
- "integrity": "sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==",
- "requires": {
- "@types/eslint": "*",
- "@types/estree": "*"
- }
- },
- "@types/estree": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.1.tgz",
- "integrity": "sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA=="
- },
- "@types/express": {
- "version": "4.17.17",
- "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.17.tgz",
- "integrity": "sha512-Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q==",
- "requires": {
- "@types/body-parser": "*",
- "@types/express-serve-static-core": "^4.17.33",
- "@types/qs": "*",
- "@types/serve-static": "*"
- }
- },
- "@types/express-serve-static-core": {
- "version": "4.17.35",
- "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.35.tgz",
- "integrity": "sha512-wALWQwrgiB2AWTT91CB62b6Yt0sNHpznUXeZEcnPU3DRdlDIz74x8Qg1UUYKSVFi+va5vKOLYRBI1bRKiLLKIg==",
- "requires": {
- "@types/node": "*",
- "@types/qs": "*",
- "@types/range-parser": "*",
- "@types/send": "*"
- }
- },
- "@types/graceful-fs": {
- "version": "4.1.6",
- "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.6.tgz",
- "integrity": "sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==",
- "requires": {
- "@types/node": "*"
- }
- },
- "@types/hoist-non-react-statics": {
- "version": "3.3.1",
- "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz",
- "integrity": "sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==",
- "dev": true,
- "requires": {
- "@types/react": "*",
- "hoist-non-react-statics": "^3.3.0"
- }
- },
- "@types/html-minifier-terser": {
- "version": "6.1.0",
- "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
- "integrity": "sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg=="
- },
- "@types/http-proxy": {
- "version": "1.17.11",
- "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.11.tgz",
- "integrity": "sha512-HC8G7c1WmaF2ekqpnFq626xd3Zz0uvaqFmBJNRZCGEZCXkvSdJoNFn/8Ygbd9fKNQj8UzLdCETaI0UWPAjK7IA==",
- "requires": {
- "@types/node": "*"
- }
- },
- "@types/istanbul-lib-coverage": {
- "version": "2.0.4",
- "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz",
- "integrity": "sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g=="
- },
- "@types/istanbul-lib-report": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
- "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==",
- "requires": {
- "@types/istanbul-lib-coverage": "*"
- }
- },
- "@types/istanbul-reports": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz",
- "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==",
- "requires": {
- "@types/istanbul-lib-report": "*"
- }
- },
- "@types/jest": {
- "version": "29.5.4",
- "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.4.tgz",
- "integrity": "sha512-PhglGmhWeD46FYOVLt3X7TiWjzwuVGW9wG/4qocPevXMjCmrIc5b6db9WjeGE4QYVpUAWMDv3v0IiBwObY289A==",
- "dev": true,
- "requires": {
- "expect": "^29.0.0",
- "pretty-format": "^29.0.0"
- },
- "dependencies": {
- "ansi-styles": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
- "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
- "dev": true
- },
- "pretty-format": {
- "version": "29.6.1",
- "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.1.tgz",
- "integrity": "sha512-7jRj+yXO0W7e4/tSJKoR7HRIHLPPjtNaUGG2xxKQnGvPNRkgWcQ0AZX6P4KBRJN4FcTBWb3sa7DVUJmocYuoog==",
- "dev": true,
- "requires": {
- "@jest/schemas": "^29.6.0",
- "ansi-styles": "^5.0.0",
- "react-is": "^18.0.0"
- }
- }
- }
- },
- "@types/json-schema": {
- "version": "7.0.12",
- "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.12.tgz",
- "integrity": "sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA=="
- },
- "@types/json5": {
- "version": "0.0.29",
- "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
- "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ=="
- },
- "@types/mime": {
- "version": "1.3.2",
- "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz",
- "integrity": "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="
- },
- "@types/node": {
- "version": "20.8.7",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.7.tgz",
- "integrity": "sha512-21TKHHh3eUHIi2MloeptJWALuCu5H7HQTdTrWIFReA8ad+aggoX+lRes3ex7/FtpC+sVUpFMQ+QTfYr74mruiQ==",
- "requires": {
- "undici-types": "~5.25.1"
- }
- },
- "@types/parse-json": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
- "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="
- },
- "@types/prettier": {
- "version": "2.7.3",
- "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.3.tgz",
- "integrity": "sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA=="
- },
- "@types/prop-types": {
- "version": "15.7.5",
- "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz",
- "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w=="
- },
- "@types/q": {
- "version": "1.5.5",
- "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.5.tgz",
- "integrity": "sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ=="
- },
- "@types/qs": {
- "version": "6.9.7",
- "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz",
- "integrity": "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw=="
- },
- "@types/range-parser": {
- "version": "1.2.4",
- "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz",
- "integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="
- },
- "@types/react": {
- "version": "17.0.62",
- "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.62.tgz",
- "integrity": "sha512-eANCyz9DG8p/Vdhr0ZKST8JV12PhH2ACCDYlFw6DIO+D+ca+uP4jtEDEpVqXZrh/uZdXQGwk7whJa3ah5DtyLw==",
- "dev": true,
- "requires": {
- "@types/prop-types": "*",
- "@types/scheduler": "*",
- "csstype": "^3.0.2"
- }
- },
- "@types/react-dom": {
- "version": "17.0.20",
- "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.20.tgz",
- "integrity": "sha512-4pzIjSxDueZZ90F52mU3aPoogkHIoSIDG+oQ+wQK7Cy2B9S+MvOqY0uEA/qawKz381qrEDkvpwyt8Bm31I8sbA==",
- "dev": true,
- "requires": {
- "@types/react": "^17"
- }
- },
- "@types/resolve": {
- "version": "1.17.1",
- "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.17.1.tgz",
- "integrity": "sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==",
- "requires": {
- "@types/node": "*"
- }
- },
- "@types/retry": {
- "version": "0.12.0",
- "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz",
- "integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA=="
- },
- "@types/scheduler": {
- "version": "0.16.3",
- "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.3.tgz",
- "integrity": "sha512-5cJ8CB4yAx7BH1oMvdU0Jh9lrEXyPkar6F9G/ERswkCuvP4KQZfZkSjcMbAICCpQTN4OuZn8tz0HiKv9TGZgrQ=="
- },
- "@types/semver": {
- "version": "7.5.0",
- "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.0.tgz",
- "integrity": "sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw=="
- },
- "@types/send": {
- "version": "0.17.1",
- "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.1.tgz",
- "integrity": "sha512-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q==",
- "requires": {
- "@types/mime": "^1",
- "@types/node": "*"
- }
- },
- "@types/serve-index": {
- "version": "1.9.1",
- "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.1.tgz",
- "integrity": "sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg==",
- "requires": {
- "@types/express": "*"
- }
- },
- "@types/serve-static": {
- "version": "1.15.1",
- "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.1.tgz",
- "integrity": "sha512-NUo5XNiAdULrJENtJXZZ3fHtfMolzZwczzBbnAeBbqBwG+LaG6YaJtuwzwGSQZ2wsCrxjEhNNjAkKigy3n8teQ==",
- "requires": {
- "@types/mime": "*",
- "@types/node": "*"
- }
- },
- "@types/sockjs": {
- "version": "0.3.33",
- "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.33.tgz",
- "integrity": "sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw==",
- "requires": {
- "@types/node": "*"
- }
- },
- "@types/stack-utils": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz",
- "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw=="
- },
- "@types/styled-components": {
- "version": "5.1.26",
- "resolved": "https://registry.npmjs.org/@types/styled-components/-/styled-components-5.1.26.tgz",
- "integrity": "sha512-KuKJ9Z6xb93uJiIyxo/+ksS7yLjS1KzG6iv5i78dhVg/X3u5t1H7juRWqVmodIdz6wGVaIApo1u01kmFRdJHVw==",
- "dev": true,
- "requires": {
- "@types/hoist-non-react-statics": "*",
- "@types/react": "*",
- "csstype": "^3.0.2"
- }
- },
- "@types/stylis": {
- "version": "4.2.0",
- "resolved": "https://registry.npmjs.org/@types/stylis/-/stylis-4.2.0.tgz",
- "integrity": "sha512-n4sx2bqL0mW1tvDf/loQ+aMX7GQD3lc3fkCMC55VFNDu/vBOabO+LTIeXKM14xK0ppk5TUGcWRjiSpIlUpghKw=="
- },
- "@types/trusted-types": {
- "version": "2.0.3",
- "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.3.tgz",
- "integrity": "sha512-NfQ4gyz38SL8sDNrSixxU2Os1a5xcdFxipAFxYEuLUlvU2uDwS4NUpsImcf1//SlWItCVMMLiylsxbmNMToV/g=="
- },
- "@types/ws": {
- "version": "8.5.5",
- "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.5.tgz",
- "integrity": "sha512-lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg==",
- "requires": {
- "@types/node": "*"
- }
- },
- "@types/yargs": {
- "version": "16.0.5",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.5.tgz",
- "integrity": "sha512-AxO/ADJOBFJScHbWhq2xAhlWP24rY4aCEG/NFaMvbT3X2MgRsLjhjQwsn0Zi5zn0LG9jUhCCZMeX9Dkuw6k+vQ==",
- "requires": {
- "@types/yargs-parser": "*"
- }
- },
- "@types/yargs-parser": {
- "version": "21.0.0",
- "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz",
- "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA=="
- },
- "@typescript-eslint/eslint-plugin": {
- "version": "5.59.11",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.11.tgz",
- "integrity": "sha512-XxuOfTkCUiOSyBWIvHlUraLw/JT/6Io1365RO6ZuI88STKMavJZPNMU0lFcUTeQXEhHiv64CbxYxBNoDVSmghg==",
- "requires": {
- "@eslint-community/regexpp": "^4.4.0",
- "@typescript-eslint/scope-manager": "5.59.11",
- "@typescript-eslint/type-utils": "5.59.11",
- "@typescript-eslint/utils": "5.59.11",
- "debug": "^4.3.4",
- "grapheme-splitter": "^1.0.4",
- "ignore": "^5.2.0",
- "natural-compare-lite": "^1.4.0",
- "semver": "^7.3.7",
- "tsutils": "^3.21.0"
- },
- "dependencies": {
- "lru-cache": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
- "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
- "requires": {
- "yallist": "^4.0.0"
- }
- },
- "semver": {
- "version": "7.5.2",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz",
- "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
- "requires": {
- "lru-cache": "^6.0.0"
- }
- },
- "yallist": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
- "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
- }
- }
- },
- "@typescript-eslint/experimental-utils": {
- "version": "5.59.11",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.59.11.tgz",
- "integrity": "sha512-GkQGV0UF/V5Ra7gZMBmiD1WrYUFOJNvCZs+XQnUyJoxmqfWMXVNyB2NVCPRKefoQcpvTv9UpJyfCvsJFs8NzzQ==",
- "requires": {
- "@typescript-eslint/utils": "5.59.11"
- }
- },
- "@typescript-eslint/parser": {
- "version": "5.59.11",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.59.11.tgz",
- "integrity": "sha512-s9ZF3M+Nym6CAZEkJJeO2TFHHDsKAM3ecNkLuH4i4s8/RCPnF5JRip2GyviYkeEAcwGMJxkqG9h2dAsnA1nZpA==",
- "requires": {
- "@typescript-eslint/scope-manager": "5.59.11",
- "@typescript-eslint/types": "5.59.11",
- "@typescript-eslint/typescript-estree": "5.59.11",
- "debug": "^4.3.4"
- }
- },
- "@typescript-eslint/scope-manager": {
- "version": "5.59.11",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.59.11.tgz",
- "integrity": "sha512-dHFOsxoLFtrIcSj5h0QoBT/89hxQONwmn3FOQ0GOQcLOOXm+MIrS8zEAhs4tWl5MraxCY3ZJpaXQQdFMc2Tu+Q==",
- "requires": {
- "@typescript-eslint/types": "5.59.11",
- "@typescript-eslint/visitor-keys": "5.59.11"
- }
- },
- "@typescript-eslint/type-utils": {
- "version": "5.59.11",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.59.11.tgz",
- "integrity": "sha512-LZqVY8hMiVRF2a7/swmkStMYSoXMFlzL6sXV6U/2gL5cwnLWQgLEG8tjWPpaE4rMIdZ6VKWwcffPlo1jPfk43g==",
- "requires": {
- "@typescript-eslint/typescript-estree": "5.59.11",
- "@typescript-eslint/utils": "5.59.11",
- "debug": "^4.3.4",
- "tsutils": "^3.21.0"
- }
- },
- "@typescript-eslint/types": {
- "version": "5.59.11",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.59.11.tgz",
- "integrity": "sha512-epoN6R6tkvBYSc+cllrz+c2sOFWkbisJZWkOE+y3xHtvYaOE6Wk6B8e114McRJwFRjGvYdJwLXQH5c9osME/AA=="
- },
- "@typescript-eslint/typescript-estree": {
- "version": "5.59.11",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.11.tgz",
- "integrity": "sha512-YupOpot5hJO0maupJXixi6l5ETdrITxeo5eBOeuV7RSKgYdU3G5cxO49/9WRnJq9EMrB7AuTSLH/bqOsXi7wPA==",
- "requires": {
- "@typescript-eslint/types": "5.59.11",
- "@typescript-eslint/visitor-keys": "5.59.11",
- "debug": "^4.3.4",
- "globby": "^11.1.0",
- "is-glob": "^4.0.3",
- "semver": "^7.3.7",
- "tsutils": "^3.21.0"
- },
- "dependencies": {
- "array-union": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
- "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw=="
- },
- "globby": {
- "version": "11.1.0",
- "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
- "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
- "requires": {
- "array-union": "^2.1.0",
- "dir-glob": "^3.0.1",
- "fast-glob": "^3.2.9",
- "ignore": "^5.2.0",
- "merge2": "^1.4.1",
- "slash": "^3.0.0"
- }
- },
- "lru-cache": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
- "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
- "requires": {
- "yallist": "^4.0.0"
- }
- },
- "semver": {
- "version": "7.5.2",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz",
- "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
- "requires": {
- "lru-cache": "^6.0.0"
- }
- },
- "yallist": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
- "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
- }
- }
- },
- "@typescript-eslint/utils": {
- "version": "5.59.11",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.59.11.tgz",
- "integrity": "sha512-didu2rHSOMUdJThLk4aZ1Or8IcO3HzCw/ZvEjTTIfjIrcdd5cvSIwwDy2AOlE7htSNp7QIZ10fLMyRCveesMLg==",
- "requires": {
- "@eslint-community/eslint-utils": "^4.2.0",
- "@types/json-schema": "^7.0.9",
- "@types/semver": "^7.3.12",
- "@typescript-eslint/scope-manager": "5.59.11",
- "@typescript-eslint/types": "5.59.11",
- "@typescript-eslint/typescript-estree": "5.59.11",
- "eslint-scope": "^5.1.1",
- "semver": "^7.3.7"
- },
- "dependencies": {
- "eslint-scope": {
- "version": "5.1.1",
- "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
- "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
- "requires": {
- "esrecurse": "^4.3.0",
- "estraverse": "^4.1.1"
- }
- },
- "estraverse": {
- "version": "4.3.0",
- "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
- "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="
- },
- "lru-cache": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
- "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
- "requires": {
- "yallist": "^4.0.0"
- }
- },
- "semver": {
- "version": "7.5.2",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz",
- "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
- "requires": {
- "lru-cache": "^6.0.0"
- }
- },
- "yallist": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
- "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
- }
- }
- },
- "@typescript-eslint/visitor-keys": {
- "version": "5.59.11",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.11.tgz",
- "integrity": "sha512-KGYniTGG3AMTuKF9QBD7EIrvufkB6O6uX3knP73xbKLMpH+QRPcgnCxjWXSHjMRuOxFLovljqQgQpR0c7GvjoA==",
- "requires": {
- "@typescript-eslint/types": "5.59.11",
- "eslint-visitor-keys": "^3.3.0"
- }
- },
- "@webassemblyjs/ast": {
- "version": "1.11.6",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz",
- "integrity": "sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==",
- "requires": {
- "@webassemblyjs/helper-numbers": "1.11.6",
- "@webassemblyjs/helper-wasm-bytecode": "1.11.6"
- }
- },
- "@webassemblyjs/floating-point-hex-parser": {
- "version": "1.11.6",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz",
- "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw=="
- },
- "@webassemblyjs/helper-api-error": {
- "version": "1.11.6",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz",
- "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q=="
- },
- "@webassemblyjs/helper-buffer": {
- "version": "1.11.6",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz",
- "integrity": "sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA=="
- },
- "@webassemblyjs/helper-numbers": {
- "version": "1.11.6",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz",
- "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==",
- "requires": {
- "@webassemblyjs/floating-point-hex-parser": "1.11.6",
- "@webassemblyjs/helper-api-error": "1.11.6",
- "@xtuc/long": "4.2.2"
- }
- },
- "@webassemblyjs/helper-wasm-bytecode": {
- "version": "1.11.6",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz",
- "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA=="
- },
- "@webassemblyjs/helper-wasm-section": {
- "version": "1.11.6",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz",
- "integrity": "sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==",
- "requires": {
- "@webassemblyjs/ast": "1.11.6",
- "@webassemblyjs/helper-buffer": "1.11.6",
- "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
- "@webassemblyjs/wasm-gen": "1.11.6"
- }
- },
- "@webassemblyjs/ieee754": {
- "version": "1.11.6",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz",
- "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==",
- "requires": {
- "@xtuc/ieee754": "^1.2.0"
- }
- },
- "@webassemblyjs/leb128": {
- "version": "1.11.6",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz",
- "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==",
- "requires": {
- "@xtuc/long": "4.2.2"
- }
- },
- "@webassemblyjs/utf8": {
- "version": "1.11.6",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz",
- "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA=="
- },
- "@webassemblyjs/wasm-edit": {
- "version": "1.11.6",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz",
- "integrity": "sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==",
- "requires": {
- "@webassemblyjs/ast": "1.11.6",
- "@webassemblyjs/helper-buffer": "1.11.6",
- "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
- "@webassemblyjs/helper-wasm-section": "1.11.6",
- "@webassemblyjs/wasm-gen": "1.11.6",
- "@webassemblyjs/wasm-opt": "1.11.6",
- "@webassemblyjs/wasm-parser": "1.11.6",
- "@webassemblyjs/wast-printer": "1.11.6"
- }
- },
- "@webassemblyjs/wasm-gen": {
- "version": "1.11.6",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz",
- "integrity": "sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==",
- "requires": {
- "@webassemblyjs/ast": "1.11.6",
- "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
- "@webassemblyjs/ieee754": "1.11.6",
- "@webassemblyjs/leb128": "1.11.6",
- "@webassemblyjs/utf8": "1.11.6"
- }
- },
- "@webassemblyjs/wasm-opt": {
- "version": "1.11.6",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz",
- "integrity": "sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==",
- "requires": {
- "@webassemblyjs/ast": "1.11.6",
- "@webassemblyjs/helper-buffer": "1.11.6",
- "@webassemblyjs/wasm-gen": "1.11.6",
- "@webassemblyjs/wasm-parser": "1.11.6"
- }
- },
- "@webassemblyjs/wasm-parser": {
- "version": "1.11.6",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz",
- "integrity": "sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==",
- "requires": {
- "@webassemblyjs/ast": "1.11.6",
- "@webassemblyjs/helper-api-error": "1.11.6",
- "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
- "@webassemblyjs/ieee754": "1.11.6",
- "@webassemblyjs/leb128": "1.11.6",
- "@webassemblyjs/utf8": "1.11.6"
- }
- },
- "@webassemblyjs/wast-printer": {
- "version": "1.11.6",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz",
- "integrity": "sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==",
- "requires": {
- "@webassemblyjs/ast": "1.11.6",
- "@xtuc/long": "4.2.2"
- }
- },
- "@xtuc/ieee754": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
- "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA=="
- },
- "@xtuc/long": {
- "version": "4.2.2",
- "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
- "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
- },
- "abab": {
- "version": "2.0.6",
- "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
- "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA=="
- },
- "accepts": {
- "version": "1.3.8",
- "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
- "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
- "requires": {
- "mime-types": "~2.1.34",
- "negotiator": "0.6.3"
- }
- },
- "acorn": {
- "version": "8.9.0",
- "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.9.0.tgz",
- "integrity": "sha512-jaVNAFBHNLXspO543WnNNPZFRtavh3skAkITqD0/2aeMkKZTN+254PyhwxFYrk3vQ1xfY+2wbesJMs/JC8/PwQ=="
- },
- "acorn-globals": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz",
- "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==",
- "requires": {
- "acorn": "^7.1.1",
- "acorn-walk": "^7.1.1"
- },
- "dependencies": {
- "acorn": {
- "version": "7.4.1",
- "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
- "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="
- }
- }
- },
- "acorn-import-assertions": {
- "version": "1.9.0",
- "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz",
- "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==",
- "requires": {}
- },
- "acorn-jsx": {
- "version": "5.3.2",
- "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
- "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
- "requires": {}
- },
- "acorn-walk": {
- "version": "7.2.0",
- "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
- "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA=="
- },
- "address": {
- "version": "1.2.2",
- "resolved": "https://registry.npmjs.org/address/-/address-1.2.2.tgz",
- "integrity": "sha512-4B/qKCfeE/ODUaAUpSwfzazo5x29WD4r3vXiWsB7I2mSDAihwEqKO+g8GELZUQSSAo5e1XTYh3ZVfLyxBc12nA=="
- },
- "adjust-sourcemap-loader": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-4.0.0.tgz",
- "integrity": "sha512-OXwN5b9pCUXNQHJpwwD2qP40byEmSgzj8B4ydSN0uMNYWiFmJ6x6KwUllMmfk8Rwu/HJDFR7U8ubsWBoN0Xp0A==",
- "requires": {
- "loader-utils": "^2.0.0",
- "regex-parser": "^2.2.11"
- }
- },
- "agent-base": {
- "version": "6.0.2",
- "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
- "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
- "requires": {
- "debug": "4"
- }
- },
- "ajv": {
- "version": "6.12.6",
- "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
- "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
- "requires": {
- "fast-deep-equal": "^3.1.1",
- "fast-json-stable-stringify": "^2.0.0",
- "json-schema-traverse": "^0.4.1",
- "uri-js": "^4.2.2"
- }
- },
- "ajv-formats": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
- "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
- "requires": {
- "ajv": "^8.0.0"
- },
- "dependencies": {
- "ajv": {
- "version": "8.12.0",
- "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
- "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
- "requires": {
- "fast-deep-equal": "^3.1.1",
- "json-schema-traverse": "^1.0.0",
- "require-from-string": "^2.0.2",
- "uri-js": "^4.2.2"
- }
- },
- "json-schema-traverse": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
- "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
- }
- }
- },
- "ajv-keywords": {
- "version": "3.5.2",
- "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
- "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
- "requires": {}
- },
- "ansi-escapes": {
- "version": "4.3.2",
- "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
- "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
- "requires": {
- "type-fest": "^0.21.3"
- }
- },
- "ansi-html-community": {
- "version": "0.0.8",
- "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz",
- "integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw=="
- },
- "ansi-regex": {
- "version": "5.0.1",
- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
- "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
- },
- "ansi-styles": {
- "version": "4.3.0",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
- "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
- "requires": {
- "color-convert": "^2.0.1"
- }
- },
- "any-promise": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
- "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A=="
- },
- "anymatch": {
- "version": "3.1.3",
- "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
- "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
- "requires": {
- "normalize-path": "^3.0.0",
- "picomatch": "^2.0.4"
- }
- },
- "arg": {
- "version": "5.0.2",
- "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz",
- "integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg=="
- },
- "argparse": {
- "version": "1.0.10",
- "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
- "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
- "requires": {
- "sprintf-js": "~1.0.2"
- }
- },
- "aria-query": {
- "version": "5.1.3",
- "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.1.3.tgz",
- "integrity": "sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==",
- "requires": {
- "deep-equal": "^2.0.5"
- }
- },
- "array-buffer-byte-length": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz",
- "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==",
- "requires": {
- "call-bind": "^1.0.2",
- "is-array-buffer": "^3.0.1"
- }
- },
- "array-flatten": {
- "version": "2.1.2",
- "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
- "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ=="
- },
- "array-includes": {
- "version": "3.1.6",
- "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz",
- "integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==",
- "requires": {
- "call-bind": "^1.0.2",
- "define-properties": "^1.1.4",
- "es-abstract": "^1.20.4",
- "get-intrinsic": "^1.1.3",
- "is-string": "^1.0.7"
- }
- },
- "array-union": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
- "integrity": "sha512-Dxr6QJj/RdU/hCaBjOfxW+q6lyuVE6JFWIrAUpuOOhoJJoQ99cUn3igRaHVB5P9WrgFVN0FfArM3x0cueOU8ng==",
- "dev": true,
- "requires": {
- "array-uniq": "^1.0.1"
- }
- },
- "array-uniq": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
- "integrity": "sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q==",
- "dev": true
- },
- "array.prototype.flat": {
- "version": "1.3.1",
- "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz",
- "integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==",
- "requires": {
- "call-bind": "^1.0.2",
- "define-properties": "^1.1.4",
- "es-abstract": "^1.20.4",
- "es-shim-unscopables": "^1.0.0"
- }
- },
- "array.prototype.flatmap": {
- "version": "1.3.1",
- "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz",
- "integrity": "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==",
- "requires": {
- "call-bind": "^1.0.2",
- "define-properties": "^1.1.4",
- "es-abstract": "^1.20.4",
- "es-shim-unscopables": "^1.0.0"
- }
- },
- "array.prototype.reduce": {
- "version": "1.0.5",
- "resolved": "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.5.tgz",
- "integrity": "sha512-kDdugMl7id9COE8R7MHF5jWk7Dqt/fs4Pv+JXoICnYwqpjjjbUurz6w5fT5IG6brLdJhv6/VoHB0H7oyIBXd+Q==",
- "requires": {
- "call-bind": "^1.0.2",
- "define-properties": "^1.1.4",
- "es-abstract": "^1.20.4",
- "es-array-method-boxes-properly": "^1.0.0",
- "is-string": "^1.0.7"
- }
- },
- "array.prototype.tosorted": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.1.tgz",
- "integrity": "sha512-pZYPXPRl2PqWcsUs6LOMn+1f1532nEoPTYowBtqLwAW+W8vSVhkIGnmOX1t/UQjD6YGI0vcD2B1U7ZFGQH9jnQ==",
- "requires": {
- "call-bind": "^1.0.2",
- "define-properties": "^1.1.4",
- "es-abstract": "^1.20.4",
- "es-shim-unscopables": "^1.0.0",
- "get-intrinsic": "^1.1.3"
- }
- },
- "asap": {
- "version": "2.0.6",
- "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
- "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA=="
- },
- "ast-types-flow": {
- "version": "0.0.7",
- "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
- "integrity": "sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag=="
- },
- "async": {
- "version": "3.2.4",
- "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz",
- "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ=="
- },
- "asynckit": {
- "version": "0.4.0",
- "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
- "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
- },
- "at-least-node": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
- "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg=="
- },
- "autoprefixer": {
- "version": "10.4.14",
- "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.14.tgz",
- "integrity": "sha512-FQzyfOsTlwVzjHxKEqRIAdJx9niO6VCBCoEwax/VLSoQF29ggECcPuBqUMZ+u8jCZOPSy8b8/8KnuFbp0SaFZQ==",
- "requires": {
- "browserslist": "^4.21.5",
- "caniuse-lite": "^1.0.30001464",
- "fraction.js": "^4.2.0",
- "normalize-range": "^0.1.2",
- "picocolors": "^1.0.0",
- "postcss-value-parser": "^4.2.0"
- }
- },
- "available-typed-arrays": {
- "version": "1.0.5",
- "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
- "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw=="
- },
- "axe-core": {
- "version": "4.7.2",
- "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.7.2.tgz",
- "integrity": "sha512-zIURGIS1E1Q4pcrMjp+nnEh+16G56eG/MUllJH8yEvw7asDo7Ac9uhC9KIH5jzpITueEZolfYglnCGIuSBz39g=="
- },
- "axobject-query": {
- "version": "3.2.1",
- "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-3.2.1.tgz",
- "integrity": "sha512-jsyHu61e6N4Vbz/v18DHwWYKK0bSWLqn47eeDSKPB7m8tqMHF9YJ+mhIk2lVteyZrY8tnSj/jHOv4YiTCuCJgg==",
- "requires": {
- "dequal": "^2.0.3"
- }
- },
- "babel-jest": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.5.1.tgz",
- "integrity": "sha512-cdQ5dXjGRd0IBRATiQ4mZGlGlRE8kJpjPOixdNRdT+m3UcNqmYWN6rK6nvtXYfY3D76cb8s/O1Ss8ea24PIwcg==",
- "requires": {
- "@jest/transform": "^27.5.1",
- "@jest/types": "^27.5.1",
- "@types/babel__core": "^7.1.14",
- "babel-plugin-istanbul": "^6.1.1",
- "babel-preset-jest": "^27.5.1",
- "chalk": "^4.0.0",
- "graceful-fs": "^4.2.9",
- "slash": "^3.0.0"
- }
- },
- "babel-loader": {
- "version": "8.3.0",
- "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.3.0.tgz",
- "integrity": "sha512-H8SvsMF+m9t15HNLMipppzkC+Y2Yq+v3SonZyU70RBL/h1gxPkH08Ot8pEE9Z4Kd+czyWJClmFS8qzIP9OZ04Q==",
- "requires": {
- "find-cache-dir": "^3.3.1",
- "loader-utils": "^2.0.0",
- "make-dir": "^3.1.0",
- "schema-utils": "^2.6.5"
- },
- "dependencies": {
- "schema-utils": {
- "version": "2.7.1",
- "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
- "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
- "requires": {
- "@types/json-schema": "^7.0.5",
- "ajv": "^6.12.4",
- "ajv-keywords": "^3.5.2"
- }
- }
- }
- },
- "babel-plugin-istanbul": {
- "version": "6.1.1",
- "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
- "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
- "requires": {
- "@babel/helper-plugin-utils": "^7.0.0",
- "@istanbuljs/load-nyc-config": "^1.0.0",
- "@istanbuljs/schema": "^0.1.2",
- "istanbul-lib-instrument": "^5.0.4",
- "test-exclude": "^6.0.0"
- }
- },
- "babel-plugin-jest-hoist": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.5.1.tgz",
- "integrity": "sha512-50wCwD5EMNW4aRpOwtqzyZHIewTYNxLA4nhB+09d8BIssfNfzBRhkBIHiaPv1Si226TQSvp8gxAJm2iY2qs2hQ==",
- "requires": {
- "@babel/template": "^7.3.3",
- "@babel/types": "^7.3.3",
- "@types/babel__core": "^7.0.0",
- "@types/babel__traverse": "^7.0.6"
- }
- },
- "babel-plugin-macros": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz",
- "integrity": "sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==",
- "requires": {
- "@babel/runtime": "^7.12.5",
- "cosmiconfig": "^7.0.0",
- "resolve": "^1.19.0"
- }
- },
- "babel-plugin-named-asset-import": {
- "version": "0.3.8",
- "resolved": "https://registry.npmjs.org/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.8.tgz",
- "integrity": "sha512-WXiAc++qo7XcJ1ZnTYGtLxmBCVbddAml3CEXgWaBzNzLNoxtQ8AiGEFDMOhot9XjTCQbvP5E77Fj9Gk924f00Q==",
- "requires": {}
- },
- "babel-plugin-polyfill-corejs2": {
- "version": "0.4.3",
- "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.3.tgz",
- "integrity": "sha512-bM3gHc337Dta490gg+/AseNB9L4YLHxq1nGKZZSHbhXv4aTYU2MD2cjza1Ru4S6975YLTaL1K8uJf6ukJhhmtw==",
- "requires": {
- "@babel/compat-data": "^7.17.7",
- "@babel/helper-define-polyfill-provider": "^0.4.0",
- "semver": "^6.1.1"
- }
- },
- "babel-plugin-polyfill-corejs3": {
- "version": "0.8.1",
- "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.1.tgz",
- "integrity": "sha512-ikFrZITKg1xH6pLND8zT14UPgjKHiGLqex7rGEZCH2EvhsneJaJPemmpQaIZV5AL03II+lXylw3UmddDK8RU5Q==",
- "requires": {
- "@babel/helper-define-polyfill-provider": "^0.4.0",
- "core-js-compat": "^3.30.1"
- }
- },
- "babel-plugin-polyfill-regenerator": {
- "version": "0.5.0",
- "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.0.tgz",
- "integrity": "sha512-hDJtKjMLVa7Z+LwnTCxoDLQj6wdc+B8dun7ayF2fYieI6OzfuvcLMB32ihJZ4UhCBwNYGl5bg/x/P9cMdnkc2g==",
- "requires": {
- "@babel/helper-define-polyfill-provider": "^0.4.0"
- }
- },
- "babel-plugin-transform-react-remove-prop-types": {
- "version": "0.4.24",
- "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.24.tgz",
- "integrity": "sha512-eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA=="
- },
- "babel-preset-current-node-syntax": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
- "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
- "requires": {
- "@babel/plugin-syntax-async-generators": "^7.8.4",
- "@babel/plugin-syntax-bigint": "^7.8.3",
- "@babel/plugin-syntax-class-properties": "^7.8.3",
- "@babel/plugin-syntax-import-meta": "^7.8.3",
- "@babel/plugin-syntax-json-strings": "^7.8.3",
- "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3",
- "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
- "@babel/plugin-syntax-numeric-separator": "^7.8.3",
- "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
- "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
- "@babel/plugin-syntax-optional-chaining": "^7.8.3",
- "@babel/plugin-syntax-top-level-await": "^7.8.3"
- }
- },
- "babel-preset-jest": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-27.5.1.tgz",
- "integrity": "sha512-Nptf2FzlPCWYuJg41HBqXVT8ym6bXOevuCTbhxlUpjwtysGaIWFvDEjp4y+G7fl13FgOdjs7P/DmErqH7da0Ag==",
- "requires": {
- "babel-plugin-jest-hoist": "^27.5.1",
- "babel-preset-current-node-syntax": "^1.0.0"
- }
- },
- "babel-preset-react-app": {
- "version": "10.0.1",
- "resolved": "https://registry.npmjs.org/babel-preset-react-app/-/babel-preset-react-app-10.0.1.tgz",
- "integrity": "sha512-b0D9IZ1WhhCWkrTXyFuIIgqGzSkRIH5D5AmB0bXbzYAB1OBAwHcUeyWW2LorutLWF5btNo/N7r/cIdmvvKJlYg==",
- "requires": {
- "@babel/core": "^7.16.0",
- "@babel/plugin-proposal-class-properties": "^7.16.0",
- "@babel/plugin-proposal-decorators": "^7.16.4",
- "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.0",
- "@babel/plugin-proposal-numeric-separator": "^7.16.0",
- "@babel/plugin-proposal-optional-chaining": "^7.16.0",
- "@babel/plugin-proposal-private-methods": "^7.16.0",
- "@babel/plugin-transform-flow-strip-types": "^7.16.0",
- "@babel/plugin-transform-react-display-name": "^7.16.0",
- "@babel/plugin-transform-runtime": "^7.16.4",
- "@babel/preset-env": "^7.16.4",
- "@babel/preset-react": "^7.16.0",
- "@babel/preset-typescript": "^7.16.0",
- "@babel/runtime": "^7.16.3",
- "babel-plugin-macros": "^3.1.0",
- "babel-plugin-transform-react-remove-prop-types": "^0.4.24"
- }
- },
- "balanced-match": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
- "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
- },
- "batch": {
- "version": "0.6.1",
- "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
- "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw=="
- },
- "bfj": {
- "version": "7.0.2",
- "resolved": "https://registry.npmjs.org/bfj/-/bfj-7.0.2.tgz",
- "integrity": "sha512-+e/UqUzwmzJamNF50tBV6tZPTORow7gQ96iFow+8b562OdMpEK0BcJEq2OSPEDmAbSMBQ7PKZ87ubFkgxpYWgw==",
- "requires": {
- "bluebird": "^3.5.5",
- "check-types": "^11.1.1",
- "hoopy": "^0.1.4",
- "tryer": "^1.0.1"
- }
- },
- "big.js": {
- "version": "5.2.2",
- "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
- "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="
- },
- "binary-extensions": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
- "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA=="
- },
- "bluebird": {
- "version": "3.7.2",
- "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
- "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="
- },
- "body-parser": {
- "version": "1.20.1",
- "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
- "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
- "requires": {
- "bytes": "3.1.2",
- "content-type": "~1.0.4",
- "debug": "2.6.9",
- "depd": "2.0.0",
- "destroy": "1.2.0",
- "http-errors": "2.0.0",
- "iconv-lite": "0.4.24",
- "on-finished": "2.4.1",
- "qs": "6.11.0",
- "raw-body": "2.5.1",
- "type-is": "~1.6.18",
- "unpipe": "1.0.0"
- },
- "dependencies": {
- "bytes": {
- "version": "3.1.2",
- "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
- "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="
- },
- "debug": {
- "version": "2.6.9",
- "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
- "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
- "requires": {
- "ms": "2.0.0"
- }
- },
- "iconv-lite": {
- "version": "0.4.24",
- "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
- "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
- "requires": {
- "safer-buffer": ">= 2.1.2 < 3"
- }
- },
- "ms": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
- "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
- }
- }
- },
- "bonjour-service": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.1.1.tgz",
- "integrity": "sha512-Z/5lQRMOG9k7W+FkeGTNjh7htqn/2LMnfOvBZ8pynNZCM9MwkQkI3zeI4oz09uWdcgmgHugVvBqxGg4VQJ5PCg==",
- "requires": {
- "array-flatten": "^2.1.2",
- "dns-equal": "^1.0.0",
- "fast-deep-equal": "^3.1.3",
- "multicast-dns": "^7.2.5"
- }
- },
- "boolbase": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
- "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww=="
- },
- "brace-expansion": {
- "version": "1.1.11",
- "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
- "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
- "requires": {
- "balanced-match": "^1.0.0",
- "concat-map": "0.0.1"
- }
- },
- "braces": {
- "version": "3.0.2",
- "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
- "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
- "requires": {
- "fill-range": "^7.0.1"
- }
- },
- "browser-process-hrtime": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
- "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow=="
- },
- "browserslist": {
- "version": "4.21.9",
- "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.9.tgz",
- "integrity": "sha512-M0MFoZzbUrRU4KNfCrDLnvyE7gub+peetoTid3TBIqtunaDJyXlwhakT+/VkvSXcfIzFfK/nkCs4nmyTmxdNSg==",
- "requires": {
- "caniuse-lite": "^1.0.30001503",
- "electron-to-chromium": "^1.4.431",
- "node-releases": "^2.0.12",
- "update-browserslist-db": "^1.0.11"
- }
- },
- "bser": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
- "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
- "requires": {
- "node-int64": "^0.4.0"
- }
- },
- "buffer-from": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
- "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
- },
- "builtin-modules": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
- "integrity": "sha512-wxXCdllwGhI2kCC0MnvTGYTMvnVZTvqgypkiTI8Pa5tcz2i6VqsqwYGgqwXji+4RgCzms6EajE4IxiUH6HH8nQ==",
- "dev": true
- },
- "bytes": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
- "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw=="
- },
- "call-bind": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
- "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
- "requires": {
- "function-bind": "^1.1.1",
- "get-intrinsic": "^1.0.2"
- }
- },
- "callsites": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
- "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="
- },
- "camel-case": {
- "version": "4.1.2",
- "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz",
- "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==",
- "requires": {
- "pascal-case": "^3.1.2",
- "tslib": "^2.0.3"
- }
- },
- "camelcase": {
- "version": "6.3.0",
- "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
- "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA=="
- },
- "camelcase-css": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/camelcase-css/-/camelcase-css-2.0.1.tgz",
- "integrity": "sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA=="
- },
- "camelize": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/camelize/-/camelize-1.0.1.tgz",
- "integrity": "sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ=="
- },
- "caniuse-api": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
- "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==",
- "requires": {
- "browserslist": "^4.0.0",
- "caniuse-lite": "^1.0.0",
- "lodash.memoize": "^4.1.2",
- "lodash.uniq": "^4.5.0"
- }
- },
- "caniuse-lite": {
- "version": "1.0.30001503",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001503.tgz",
- "integrity": "sha512-Sf9NiF+wZxPfzv8Z3iS0rXM1Do+iOy2Lxvib38glFX+08TCYYYGR5fRJXk4d77C4AYwhUjgYgMsMudbh2TqCKw=="
- },
- "case-sensitive-paths-webpack-plugin": {
- "version": "2.4.0",
- "resolved": "https://registry.npmjs.org/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.4.0.tgz",
- "integrity": "sha512-roIFONhcxog0JSSWbvVAh3OocukmSgpqOH6YpMkCvav/ySIV3JKg4Dc8vYtQjYi/UxpNE36r/9v+VqTQqgkYmw=="
- },
- "chalk": {
- "version": "4.1.2",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
- "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
- "requires": {
- "ansi-styles": "^4.1.0",
- "supports-color": "^7.1.0"
- }
- },
- "char-regex": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
- "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw=="
- },
- "check-types": {
- "version": "11.2.2",
- "resolved": "https://registry.npmjs.org/check-types/-/check-types-11.2.2.tgz",
- "integrity": "sha512-HBiYvXvn9Z70Z88XKjz3AEKd4HJhBXsa3j7xFnITAzoS8+q6eIGi8qDB8FKPBAjtuxjI/zFpwuiCb8oDtKOYrA=="
- },
- "chokidar": {
- "version": "3.5.3",
- "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
- "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
- "requires": {
- "anymatch": "~3.1.2",
- "braces": "~3.0.2",
- "fsevents": "~2.3.2",
- "glob-parent": "~5.1.2",
- "is-binary-path": "~2.1.0",
- "is-glob": "~4.0.1",
- "normalize-path": "~3.0.0",
- "readdirp": "~3.6.0"
- },
- "dependencies": {
- "glob-parent": {
- "version": "5.1.2",
- "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
- "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
- "requires": {
- "is-glob": "^4.0.1"
- }
- }
- }
- },
- "chrome-trace-event": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
- "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg=="
- },
- "ci-info": {
- "version": "3.8.0",
- "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz",
- "integrity": "sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw=="
- },
- "cjs-module-lexer": {
- "version": "1.2.3",
- "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz",
- "integrity": "sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ=="
- },
- "clean-css": {
- "version": "5.3.2",
- "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.2.tgz",
- "integrity": "sha512-JVJbM+f3d3Q704rF4bqQ5UUyTtuJ0JRKNbTKVEeujCCBoMdkEi+V+e8oktO9qGQNSvHrFTM6JZRXrUvGR1czww==",
- "requires": {
- "source-map": "~0.6.0"
- },
- "dependencies": {
- "source-map": {
- "version": "0.6.1",
- "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
- "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
- }
- }
- },
- "cliui": {
- "version": "8.0.1",
- "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
- "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "string-width": "^4.2.0",
- "strip-ansi": "^6.0.1",
- "wrap-ansi": "^7.0.0"
- }
- },
- "co": {
- "version": "4.6.0",
- "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
- "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ=="
- },
- "coa": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
- "integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==",
- "requires": {
- "@types/q": "^1.5.1",
- "chalk": "^2.4.1",
- "q": "^1.1.2"
- },
- "dependencies": {
- "ansi-styles": {
- "version": "3.2.1",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
- "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
- "requires": {
- "color-convert": "^1.9.0"
- }
- },
- "chalk": {
- "version": "2.4.2",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
- "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
- "requires": {
- "ansi-styles": "^3.2.1",
- "escape-string-regexp": "^1.0.5",
- "supports-color": "^5.3.0"
- }
- },
- "color-convert": {
- "version": "1.9.3",
- "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
- "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
- "requires": {
- "color-name": "1.1.3"
- }
- },
- "color-name": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
- "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
- },
- "escape-string-regexp": {
- "version": "1.0.5",
- "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
- "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="
- },
- "has-flag": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
- "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="
- },
- "supports-color": {
- "version": "5.5.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
- "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
- "requires": {
- "has-flag": "^3.0.0"
- }
- }
- }
- },
- "collect-v8-coverage": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz",
- "integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg=="
- },
- "color-convert": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
- "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
- "requires": {
- "color-name": "~1.1.4"
- }
- },
- "color-name": {
- "version": "1.1.4",
- "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
- "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
- },
- "colord": {
- "version": "2.9.3",
- "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz",
- "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw=="
- },
- "colorette": {
- "version": "2.0.20",
- "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
- "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w=="
- },
- "combined-stream": {
- "version": "1.0.8",
- "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
- "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
- "requires": {
- "delayed-stream": "~1.0.0"
- }
- },
- "commander": {
- "version": "2.20.3",
- "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
- "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
- },
- "common-path-prefix": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-3.0.0.tgz",
- "integrity": "sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w=="
- },
- "common-tags": {
- "version": "1.8.2",
- "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.2.tgz",
- "integrity": "sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA=="
- },
- "commondir": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
- "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg=="
- },
- "compressible": {
- "version": "2.0.18",
- "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
- "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
- "requires": {
- "mime-db": ">= 1.43.0 < 2"
- }
- },
- "compression": {
- "version": "1.7.4",
- "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
- "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
- "requires": {
- "accepts": "~1.3.5",
- "bytes": "3.0.0",
- "compressible": "~2.0.16",
- "debug": "2.6.9",
- "on-headers": "~1.0.2",
- "safe-buffer": "5.1.2",
- "vary": "~1.1.2"
- },
- "dependencies": {
- "debug": {
- "version": "2.6.9",
- "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
- "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
- "requires": {
- "ms": "2.0.0"
- }
- },
- "ms": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
- "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
- },
- "safe-buffer": {
- "version": "5.1.2",
- "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
- "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
- }
- }
- },
- "concat-map": {
- "version": "0.0.1",
- "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
- "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
- },
- "confusing-browser-globals": {
- "version": "1.0.11",
- "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz",
- "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA=="
- },
- "connect-history-api-fallback": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz",
- "integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA=="
- },
- "content-disposition": {
- "version": "0.5.4",
- "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
- "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
- "requires": {
- "safe-buffer": "5.2.1"
- }
- },
- "content-type": {
- "version": "1.0.5",
- "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
- "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA=="
- },
- "convert-source-map": {
- "version": "1.9.0",
- "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
- "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="
- },
- "cookie": {
- "version": "0.5.0",
- "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
- "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw=="
- },
- "cookie-signature": {
- "version": "1.0.6",
- "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
- "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
- },
- "core-js": {
- "version": "3.31.0",
- "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.31.0.tgz",
- "integrity": "sha512-NIp2TQSGfR6ba5aalZD+ZQ1fSxGhDo/s1w0nx3RYzf2pnJxt7YynxFlFScP6eV7+GZsKO95NSjGxyJsU3DZgeQ=="
- },
- "core-js-compat": {
- "version": "3.31.0",
- "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.31.0.tgz",
- "integrity": "sha512-hM7YCu1cU6Opx7MXNu0NuumM0ezNeAeRKadixyiQELWY3vT3De9S4J5ZBMraWV2vZnrE1Cirl0GtFtDtMUXzPw==",
- "requires": {
- "browserslist": "^4.21.5"
- }
- },
- "core-js-pure": {
- "version": "3.31.0",
- "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.31.0.tgz",
- "integrity": "sha512-/AnE9Y4OsJZicCzIe97JP5XoPKQJfTuEG43aEVLFJGOJpyqELod+pE6LEl63DfG1Mp8wX97LDaDpy1GmLEUxlg=="
- },
- "core-util-is": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
- "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
- },
- "cosmiconfig": {
- "version": "7.1.0",
- "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz",
- "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==",
- "requires": {
- "@types/parse-json": "^4.0.0",
- "import-fresh": "^3.2.1",
- "parse-json": "^5.0.0",
- "path-type": "^4.0.0",
- "yaml": "^1.10.0"
- }
- },
- "cross-spawn": {
- "version": "7.0.3",
- "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
- "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
- "requires": {
- "path-key": "^3.1.0",
- "shebang-command": "^2.0.0",
- "which": "^2.0.1"
- }
- },
- "crypto-random-string": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz",
- "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA=="
- },
- "css-blank-pseudo": {
- "version": "3.0.3",
- "resolved": "https://registry.npmjs.org/css-blank-pseudo/-/css-blank-pseudo-3.0.3.tgz",
- "integrity": "sha512-VS90XWtsHGqoM0t4KpH053c4ehxZ2E6HtGI7x68YFV0pTo/QmkV/YFA+NnlvK8guxZVNWGQhVNJGC39Q8XF4OQ==",
- "requires": {
- "postcss-selector-parser": "^6.0.9"
- }
- },
- "css-color-keywords": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/css-color-keywords/-/css-color-keywords-1.0.0.tgz",
- "integrity": "sha512-FyyrDHZKEjXDpNJYvVsV960FiqQyXc/LlYmsxl2BcdMb2WPx0OGRVgTg55rPSyLSNMqP52R9r8geSp7apN3Ofg=="
- },
- "css-declaration-sorter": {
- "version": "6.4.0",
- "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.4.0.tgz",
- "integrity": "sha512-jDfsatwWMWN0MODAFuHszfjphEXfNw9JUAhmY4pLu3TyTU+ohUpsbVtbU+1MZn4a47D9kqh03i4eyOm+74+zew==",
- "requires": {}
- },
- "css-has-pseudo": {
- "version": "3.0.4",
- "resolved": "https://registry.npmjs.org/css-has-pseudo/-/css-has-pseudo-3.0.4.tgz",
- "integrity": "sha512-Vse0xpR1K9MNlp2j5w1pgWIJtm1a8qS0JwS9goFYcImjlHEmywP9VUF05aGBXzGpDJF86QXk4L0ypBmwPhGArw==",
- "requires": {
- "postcss-selector-parser": "^6.0.9"
- }
- },
- "css-loader": {
- "version": "6.8.1",
- "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.8.1.tgz",
- "integrity": "sha512-xDAXtEVGlD0gJ07iclwWVkLoZOpEvAWaSyf6W18S2pOC//K8+qUDIx8IIT3D+HjnmkJPQeesOPv5aiUaJsCM2g==",
- "requires": {
- "icss-utils": "^5.1.0",
- "postcss": "^8.4.21",
- "postcss-modules-extract-imports": "^3.0.0",
- "postcss-modules-local-by-default": "^4.0.3",
- "postcss-modules-scope": "^3.0.0",
- "postcss-modules-values": "^4.0.0",
- "postcss-value-parser": "^4.2.0",
- "semver": "^7.3.8"
- },
- "dependencies": {
- "lru-cache": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
- "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
- "requires": {
- "yallist": "^4.0.0"
- }
- },
- "semver": {
- "version": "7.5.2",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz",
- "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
- "requires": {
- "lru-cache": "^6.0.0"
- }
- },
- "yallist": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
- "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
- }
- }
- },
- "css-minimizer-webpack-plugin": {
- "version": "3.4.1",
- "resolved": "https://registry.npmjs.org/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.4.1.tgz",
- "integrity": "sha512-1u6D71zeIfgngN2XNRJefc/hY7Ybsxd74Jm4qngIXyUEk7fss3VUzuHxLAq/R8NAba4QU9OUSaMZlbpRc7bM4Q==",
- "requires": {
- "cssnano": "^5.0.6",
- "jest-worker": "^27.0.2",
- "postcss": "^8.3.5",
- "schema-utils": "^4.0.0",
- "serialize-javascript": "^6.0.0",
- "source-map": "^0.6.1"
- },
- "dependencies": {
- "ajv": {
- "version": "8.12.0",
- "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
- "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
- "requires": {
- "fast-deep-equal": "^3.1.1",
- "json-schema-traverse": "^1.0.0",
- "require-from-string": "^2.0.2",
- "uri-js": "^4.2.2"
- }
- },
- "ajv-keywords": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
- "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
- "requires": {
- "fast-deep-equal": "^3.1.3"
- }
- },
- "json-schema-traverse": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
- "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
- },
- "schema-utils": {
- "version": "4.2.0",
- "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
- "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
- "requires": {
- "@types/json-schema": "^7.0.9",
- "ajv": "^8.9.0",
- "ajv-formats": "^2.1.1",
- "ajv-keywords": "^5.1.0"
- }
- },
- "source-map": {
- "version": "0.6.1",
- "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
- "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
- }
- }
- },
- "css-prefers-color-scheme": {
- "version": "6.0.3",
- "resolved": "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-6.0.3.tgz",
- "integrity": "sha512-4BqMbZksRkJQx2zAjrokiGMd07RqOa2IxIrrN10lyBe9xhn9DEvjUK79J6jkeiv9D9hQFXKb6g1jwU62jziJZA==",
- "requires": {}
- },
- "css-select": {
- "version": "4.3.0",
- "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
- "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
- "requires": {
- "boolbase": "^1.0.0",
- "css-what": "^6.0.1",
- "domhandler": "^4.3.1",
- "domutils": "^2.8.0",
- "nth-check": "^2.0.1"
- }
- },
- "css-select-base-adapter": {
- "version": "0.1.1",
- "resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz",
- "integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w=="
- },
- "css-to-react-native": {
- "version": "3.2.0",
- "resolved": "https://registry.npmjs.org/css-to-react-native/-/css-to-react-native-3.2.0.tgz",
- "integrity": "sha512-e8RKaLXMOFii+02mOlqwjbD00KSEKqblnpO9e++1aXS1fPQOpS1YoqdVHBqPjHNoxeF2mimzVqawm2KCbEdtHQ==",
- "requires": {
- "camelize": "^1.0.0",
- "css-color-keywords": "^1.0.0",
- "postcss-value-parser": "^4.0.2"
- }
- },
- "css-tree": {
- "version": "1.0.0-alpha.37",
- "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz",
- "integrity": "sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==",
- "requires": {
- "mdn-data": "2.0.4",
- "source-map": "^0.6.1"
- },
- "dependencies": {
- "source-map": {
- "version": "0.6.1",
- "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
- "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
- }
- }
- },
- "css-what": {
- "version": "6.1.0",
- "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
- "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw=="
- },
- "css.escape": {
- "version": "1.5.1",
- "resolved": "https://registry.npmjs.org/css.escape/-/css.escape-1.5.1.tgz",
- "integrity": "sha512-YUifsXXuknHlUsmlgyY0PKzgPOr7/FjCePfHNt0jxm83wHZi44VDMQ7/fGNkjY3/jV1MC+1CmZbaHzugyeRtpg==",
- "dev": true
- },
- "cssdb": {
- "version": "7.6.0",
- "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-7.6.0.tgz",
- "integrity": "sha512-Nna7rph8V0jC6+JBY4Vk4ndErUmfJfV6NJCaZdurL0omggabiy+QB2HCQtu5c/ACLZ0I7REv7A4QyPIoYzZx0w=="
- },
- "cssesc": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
- "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg=="
- },
- "cssnano": {
- "version": "5.1.15",
- "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.1.15.tgz",
- "integrity": "sha512-j+BKgDcLDQA+eDifLx0EO4XSA56b7uut3BQFH+wbSaSTuGLuiyTa/wbRYthUXX8LC9mLg+WWKe8h+qJuwTAbHw==",
- "requires": {
- "cssnano-preset-default": "^5.2.14",
- "lilconfig": "^2.0.3",
- "yaml": "^1.10.2"
- }
- },
- "cssnano-preset-default": {
- "version": "5.2.14",
- "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.2.14.tgz",
- "integrity": "sha512-t0SFesj/ZV2OTylqQVOrFgEh5uanxbO6ZAdeCrNsUQ6fVuXwYTxJPNAGvGTxHbD68ldIJNec7PyYZDBrfDQ+6A==",
- "requires": {
- "css-declaration-sorter": "^6.3.1",
- "cssnano-utils": "^3.1.0",
- "postcss-calc": "^8.2.3",
- "postcss-colormin": "^5.3.1",
- "postcss-convert-values": "^5.1.3",
- "postcss-discard-comments": "^5.1.2",
- "postcss-discard-duplicates": "^5.1.0",
- "postcss-discard-empty": "^5.1.1",
- "postcss-discard-overridden": "^5.1.0",
- "postcss-merge-longhand": "^5.1.7",
- "postcss-merge-rules": "^5.1.4",
- "postcss-minify-font-values": "^5.1.0",
- "postcss-minify-gradients": "^5.1.1",
- "postcss-minify-params": "^5.1.4",
- "postcss-minify-selectors": "^5.2.1",
- "postcss-normalize-charset": "^5.1.0",
- "postcss-normalize-display-values": "^5.1.0",
- "postcss-normalize-positions": "^5.1.1",
- "postcss-normalize-repeat-style": "^5.1.1",
- "postcss-normalize-string": "^5.1.0",
- "postcss-normalize-timing-functions": "^5.1.0",
- "postcss-normalize-unicode": "^5.1.1",
- "postcss-normalize-url": "^5.1.0",
- "postcss-normalize-whitespace": "^5.1.1",
- "postcss-ordered-values": "^5.1.3",
- "postcss-reduce-initial": "^5.1.2",
- "postcss-reduce-transforms": "^5.1.0",
- "postcss-svgo": "^5.1.0",
- "postcss-unique-selectors": "^5.1.1"
- }
- },
- "cssnano-utils": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.1.0.tgz",
- "integrity": "sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==",
- "requires": {}
- },
- "csso": {
- "version": "4.2.0",
- "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
- "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
- "requires": {
- "css-tree": "^1.1.2"
- },
- "dependencies": {
- "css-tree": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
- "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
- "requires": {
- "mdn-data": "2.0.14",
- "source-map": "^0.6.1"
- }
- },
- "mdn-data": {
- "version": "2.0.14",
- "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
- "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow=="
- },
- "source-map": {
- "version": "0.6.1",
- "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
- "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
- }
- }
- },
- "cssom": {
- "version": "0.4.4",
- "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz",
- "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw=="
- },
- "cssstyle": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
- "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
- "requires": {
- "cssom": "~0.3.6"
- },
- "dependencies": {
- "cssom": {
- "version": "0.3.8",
- "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
- "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg=="
- }
- }
- },
- "csstype": {
- "version": "3.1.2",
- "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz",
- "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ=="
- },
- "customize-cra": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/customize-cra/-/customize-cra-1.0.0.tgz",
- "integrity": "sha512-DbtaLuy59224U+xCiukkxSq8clq++MOtJ1Et7LED1fLszWe88EoblEYFBJ895sB1mC6B4uu3xPT/IjClELhMbA==",
- "requires": {
- "lodash.flow": "^3.5.0"
- }
- },
- "damerau-levenshtein": {
- "version": "1.0.8",
- "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz",
- "integrity": "sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA=="
- },
- "data-urls": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz",
- "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==",
- "requires": {
- "abab": "^2.0.3",
- "whatwg-mimetype": "^2.3.0",
- "whatwg-url": "^8.0.0"
- }
- },
- "debug": {
- "version": "4.3.4",
- "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
- "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
- "requires": {
- "ms": "2.1.2"
- }
- },
- "decimal.js": {
- "version": "10.4.3",
- "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz",
- "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA=="
- },
- "dedent": {
- "version": "1.5.1",
- "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.1.tgz",
- "integrity": "sha512-+LxW+KLWxu3HW3M2w2ympwtqPrqYRzU8fqi6Fhd18fBALe15blJPI/I4+UHveMVG6lJqB4JNd4UG0S5cnVHwIg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {}
- },
- "deep-equal": {
- "version": "2.2.1",
- "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.1.tgz",
- "integrity": "sha512-lKdkdV6EOGoVn65XaOsPdH4rMxTZOnmFyuIkMjM1i5HHCbfjC97dawgTAy0deYNfuqUqW+Q5VrVaQYtUpSd6yQ==",
- "requires": {
- "array-buffer-byte-length": "^1.0.0",
- "call-bind": "^1.0.2",
- "es-get-iterator": "^1.1.3",
- "get-intrinsic": "^1.2.0",
- "is-arguments": "^1.1.1",
- "is-array-buffer": "^3.0.2",
- "is-date-object": "^1.0.5",
- "is-regex": "^1.1.4",
- "is-shared-array-buffer": "^1.0.2",
- "isarray": "^2.0.5",
- "object-is": "^1.1.5",
- "object-keys": "^1.1.1",
- "object.assign": "^4.1.4",
- "regexp.prototype.flags": "^1.5.0",
- "side-channel": "^1.0.4",
- "which-boxed-primitive": "^1.0.2",
- "which-collection": "^1.0.1",
- "which-typed-array": "^1.1.9"
- }
- },
- "deep-is": {
- "version": "0.1.4",
- "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
- "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="
- },
- "deepmerge": {
- "version": "4.3.1",
- "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
- "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A=="
- },
- "default-gateway": {
- "version": "6.0.3",
- "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz",
- "integrity": "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==",
- "requires": {
- "execa": "^5.0.0"
- }
- },
- "define-lazy-prop": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
- "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og=="
- },
- "define-properties": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz",
- "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==",
- "requires": {
- "has-property-descriptors": "^1.0.0",
- "object-keys": "^1.1.1"
- }
- },
- "delayed-stream": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
- "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="
- },
- "depd": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
- "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="
- },
- "dequal": {
- "version": "2.0.3",
- "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz",
- "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA=="
- },
- "destroy": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
- "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg=="
- },
- "detect-newline": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
- "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA=="
- },
- "detect-node": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
- "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g=="
- },
- "detect-port-alt": {
- "version": "1.1.6",
- "resolved": "https://registry.npmjs.org/detect-port-alt/-/detect-port-alt-1.1.6.tgz",
- "integrity": "sha512-5tQykt+LqfJFBEYaDITx7S7cR7mJ/zQmLXZ2qt5w04ainYZw6tBf9dBunMjVeVOdYVRUzUOE4HkY5J7+uttb5Q==",
- "requires": {
- "address": "^1.0.1",
- "debug": "^2.6.0"
- },
- "dependencies": {
- "debug": {
- "version": "2.6.9",
- "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
- "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
- "requires": {
- "ms": "2.0.0"
- }
- },
- "ms": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
- "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
- }
- }
- },
- "didyoumean": {
- "version": "1.2.2",
- "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz",
- "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw=="
- },
- "diff": {
- "version": "4.0.2",
- "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
- "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
- "dev": true
- },
- "diff-sequences": {
- "version": "29.4.3",
- "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.4.3.tgz",
- "integrity": "sha512-ofrBgwpPhCD85kMKtE9RYFFq6OC1A89oW2vvgWZNCwxrUpRUILopY7lsYyMDSjc8g6U6aiO0Qubg6r4Wgt5ZnA==",
- "dev": true
- },
- "dir-glob": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
- "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
- "requires": {
- "path-type": "^4.0.0"
- }
- },
- "dlv": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz",
- "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA=="
- },
- "dns-equal": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
- "integrity": "sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg=="
- },
- "dns-packet": {
- "version": "5.6.0",
- "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.6.0.tgz",
- "integrity": "sha512-rza3UH1LwdHh9qyPXp8lkwpjSNk/AMD3dPytUoRoqnypDUhY0xvbdmVhWOfxO68frEfV9BU8V12Ez7ZsHGZpCQ==",
- "requires": {
- "@leichtgewicht/ip-codec": "^2.0.1"
- }
- },
- "doctrine": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
- "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
- "requires": {
- "esutils": "^2.0.2"
- }
- },
- "dom-accessibility-api": {
- "version": "0.5.16",
- "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz",
- "integrity": "sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==",
- "dev": true
- },
- "dom-converter": {
- "version": "0.2.0",
- "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz",
- "integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==",
- "requires": {
- "utila": "~0.4"
- }
- },
- "dom-serializer": {
- "version": "1.4.1",
- "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
- "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
- "requires": {
- "domelementtype": "^2.0.1",
- "domhandler": "^4.2.0",
- "entities": "^2.0.0"
- }
- },
- "domelementtype": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
- "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw=="
- },
- "domexception": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz",
- "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==",
- "requires": {
- "webidl-conversions": "^5.0.0"
- },
- "dependencies": {
- "webidl-conversions": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz",
- "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA=="
- }
- }
- },
- "domhandler": {
- "version": "4.3.1",
- "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
- "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
- "requires": {
- "domelementtype": "^2.2.0"
- }
- },
- "domutils": {
- "version": "2.8.0",
- "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
- "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
- "requires": {
- "dom-serializer": "^1.0.1",
- "domelementtype": "^2.2.0",
- "domhandler": "^4.2.0"
- }
- },
- "dot-case": {
- "version": "3.0.4",
- "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz",
- "integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==",
- "requires": {
- "no-case": "^3.0.4",
- "tslib": "^2.0.3"
- }
- },
- "dotenv": {
- "version": "10.0.0",
- "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz",
- "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q=="
- },
- "dotenv-expand": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-5.1.0.tgz",
- "integrity": "sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA=="
- },
- "duplexer": {
- "version": "0.1.2",
- "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
- "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg=="
- },
- "ee-first": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
- "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
- },
- "ejs": {
- "version": "3.1.9",
- "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.9.tgz",
- "integrity": "sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==",
- "requires": {
- "jake": "^10.8.5"
- }
- },
- "electron-to-chromium": {
- "version": "1.4.433",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.433.tgz",
- "integrity": "sha512-MGO1k0w1RgrfdbLVwmXcDhHHuxCn2qRgR7dYsJvWFKDttvYPx6FNzCGG0c/fBBvzK2LDh3UV7Tt9awnHnvAAUQ=="
- },
- "email-addresses": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/email-addresses/-/email-addresses-5.0.0.tgz",
- "integrity": "sha512-4OIPYlA6JXqtVn8zpHpGiI7vE6EQOAg16aGnDMIAlZVinnoZ8208tW1hAbjWydgN/4PLTT9q+O1K6AH/vALJGw==",
- "dev": true
- },
- "emittery": {
- "version": "0.13.1",
- "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz",
- "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==",
- "dev": true,
- "optional": true,
- "peer": true
- },
- "emoji-regex": {
- "version": "9.2.2",
- "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
- "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg=="
- },
- "emojis-list": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
- "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q=="
- },
- "encodeurl": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
- "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="
- },
- "enhanced-resolve": {
- "version": "5.15.0",
- "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz",
- "integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==",
- "requires": {
- "graceful-fs": "^4.2.4",
- "tapable": "^2.2.0"
- }
- },
- "entities": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
- "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="
- },
- "error-ex": {
- "version": "1.3.2",
- "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
- "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
- "requires": {
- "is-arrayish": "^0.2.1"
- }
- },
- "error-stack-parser": {
- "version": "2.1.4",
- "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.1.4.tgz",
- "integrity": "sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ==",
- "requires": {
- "stackframe": "^1.3.4"
- }
- },
- "es-abstract": {
- "version": "1.21.2",
- "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.2.tgz",
- "integrity": "sha512-y/B5POM2iBnIxCiernH1G7rC9qQoM77lLIMQLuob0zhp8C56Po81+2Nj0WFKnd0pNReDTnkYryc+zhOzpEIROg==",
- "requires": {
- "array-buffer-byte-length": "^1.0.0",
- "available-typed-arrays": "^1.0.5",
- "call-bind": "^1.0.2",
- "es-set-tostringtag": "^2.0.1",
- "es-to-primitive": "^1.2.1",
- "function.prototype.name": "^1.1.5",
- "get-intrinsic": "^1.2.0",
- "get-symbol-description": "^1.0.0",
- "globalthis": "^1.0.3",
- "gopd": "^1.0.1",
- "has": "^1.0.3",
- "has-property-descriptors": "^1.0.0",
- "has-proto": "^1.0.1",
- "has-symbols": "^1.0.3",
- "internal-slot": "^1.0.5",
- "is-array-buffer": "^3.0.2",
- "is-callable": "^1.2.7",
- "is-negative-zero": "^2.0.2",
- "is-regex": "^1.1.4",
- "is-shared-array-buffer": "^1.0.2",
- "is-string": "^1.0.7",
- "is-typed-array": "^1.1.10",
- "is-weakref": "^1.0.2",
- "object-inspect": "^1.12.3",
- "object-keys": "^1.1.1",
- "object.assign": "^4.1.4",
- "regexp.prototype.flags": "^1.4.3",
- "safe-regex-test": "^1.0.0",
- "string.prototype.trim": "^1.2.7",
- "string.prototype.trimend": "^1.0.6",
- "string.prototype.trimstart": "^1.0.6",
- "typed-array-length": "^1.0.4",
- "unbox-primitive": "^1.0.2",
- "which-typed-array": "^1.1.9"
- }
- },
- "es-array-method-boxes-properly": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz",
- "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA=="
- },
- "es-get-iterator": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz",
- "integrity": "sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==",
- "requires": {
- "call-bind": "^1.0.2",
- "get-intrinsic": "^1.1.3",
- "has-symbols": "^1.0.3",
- "is-arguments": "^1.1.1",
- "is-map": "^2.0.2",
- "is-set": "^2.0.2",
- "is-string": "^1.0.7",
- "isarray": "^2.0.5",
- "stop-iteration-iterator": "^1.0.0"
- }
- },
- "es-module-lexer": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.3.0.tgz",
- "integrity": "sha512-vZK7T0N2CBmBOixhmjdqx2gWVbFZ4DXZ/NyRMZVlJXPa7CyFS+/a4QQsDGDQy9ZfEzxFuNEsMLeQJnKP2p5/JA=="
- },
- "es-set-tostringtag": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz",
- "integrity": "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==",
- "requires": {
- "get-intrinsic": "^1.1.3",
- "has": "^1.0.3",
- "has-tostringtag": "^1.0.0"
- }
- },
- "es-shim-unscopables": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
- "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
- "requires": {
- "has": "^1.0.3"
- }
- },
- "es-to-primitive": {
- "version": "1.2.1",
- "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
- "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
- "requires": {
- "is-callable": "^1.1.4",
- "is-date-object": "^1.0.1",
- "is-symbol": "^1.0.2"
- }
- },
- "escalade": {
- "version": "3.1.1",
- "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
- "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="
- },
- "escape-html": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
- "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
- },
- "escape-string-regexp": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
- "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="
- },
- "escodegen": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz",
- "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==",
- "requires": {
- "esprima": "^4.0.1",
- "estraverse": "^5.2.0",
- "esutils": "^2.0.2",
- "source-map": "~0.6.1"
- },
- "dependencies": {
- "source-map": {
- "version": "0.6.1",
- "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
- "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
- "optional": true
- }
- }
- },
- "eslint": {
- "version": "8.43.0",
- "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.43.0.tgz",
- "integrity": "sha512-aaCpf2JqqKesMFGgmRPessmVKjcGXqdlAYLLC3THM8t5nBRZRQ+st5WM/hoJXkdioEXLLbXgclUpM0TXo5HX5Q==",
- "requires": {
- "@eslint-community/eslint-utils": "^4.2.0",
- "@eslint-community/regexpp": "^4.4.0",
- "@eslint/eslintrc": "^2.0.3",
- "@eslint/js": "8.43.0",
- "@humanwhocodes/config-array": "^0.11.10",
- "@humanwhocodes/module-importer": "^1.0.1",
- "@nodelib/fs.walk": "^1.2.8",
- "ajv": "^6.10.0",
- "chalk": "^4.0.0",
- "cross-spawn": "^7.0.2",
- "debug": "^4.3.2",
- "doctrine": "^3.0.0",
- "escape-string-regexp": "^4.0.0",
- "eslint-scope": "^7.2.0",
- "eslint-visitor-keys": "^3.4.1",
- "espree": "^9.5.2",
- "esquery": "^1.4.2",
- "esutils": "^2.0.2",
- "fast-deep-equal": "^3.1.3",
- "file-entry-cache": "^6.0.1",
- "find-up": "^5.0.0",
- "glob-parent": "^6.0.2",
- "globals": "^13.19.0",
- "graphemer": "^1.4.0",
- "ignore": "^5.2.0",
- "import-fresh": "^3.0.0",
- "imurmurhash": "^0.1.4",
- "is-glob": "^4.0.0",
- "is-path-inside": "^3.0.3",
- "js-yaml": "^4.1.0",
- "json-stable-stringify-without-jsonify": "^1.0.1",
- "levn": "^0.4.1",
- "lodash.merge": "^4.6.2",
- "minimatch": "^3.1.2",
- "natural-compare": "^1.4.0",
- "optionator": "^0.9.1",
- "strip-ansi": "^6.0.1",
- "strip-json-comments": "^3.1.0",
- "text-table": "^0.2.0"
- },
- "dependencies": {
- "argparse": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
- "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
- },
- "find-up": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
- "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
- "requires": {
- "locate-path": "^6.0.0",
- "path-exists": "^4.0.0"
- }
- },
- "globals": {
- "version": "13.20.0",
- "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
- "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
- "requires": {
- "type-fest": "^0.20.2"
- }
- },
- "js-yaml": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
- "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
- "requires": {
- "argparse": "^2.0.1"
- }
- },
- "locate-path": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
- "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
- "requires": {
- "p-locate": "^5.0.0"
- }
- },
- "p-limit": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
- "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
- "requires": {
- "yocto-queue": "^0.1.0"
- }
- },
- "p-locate": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
- "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
- "requires": {
- "p-limit": "^3.0.2"
- }
- },
- "type-fest": {
- "version": "0.20.2",
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
- "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ=="
- }
- }
- },
- "eslint-config-react-app": {
- "version": "7.0.1",
- "resolved": "https://registry.npmjs.org/eslint-config-react-app/-/eslint-config-react-app-7.0.1.tgz",
- "integrity": "sha512-K6rNzvkIeHaTd8m/QEh1Zko0KI7BACWkkneSs6s9cKZC/J27X3eZR6Upt1jkmZ/4FK+XUOPPxMEN7+lbUXfSlA==",
- "requires": {
- "@babel/core": "^7.16.0",
- "@babel/eslint-parser": "^7.16.3",
- "@rushstack/eslint-patch": "^1.1.0",
- "@typescript-eslint/eslint-plugin": "^5.5.0",
- "@typescript-eslint/parser": "^5.5.0",
- "babel-preset-react-app": "^10.0.1",
- "confusing-browser-globals": "^1.0.11",
- "eslint-plugin-flowtype": "^8.0.3",
- "eslint-plugin-import": "^2.25.3",
- "eslint-plugin-jest": "^25.3.0",
- "eslint-plugin-jsx-a11y": "^6.5.1",
- "eslint-plugin-react": "^7.27.1",
- "eslint-plugin-react-hooks": "^4.3.0",
- "eslint-plugin-testing-library": "^5.0.1"
- }
- },
- "eslint-import-resolver-node": {
- "version": "0.3.7",
- "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz",
- "integrity": "sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==",
- "requires": {
- "debug": "^3.2.7",
- "is-core-module": "^2.11.0",
- "resolve": "^1.22.1"
- },
- "dependencies": {
- "debug": {
- "version": "3.2.7",
- "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
- "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
- "requires": {
- "ms": "^2.1.1"
- }
- }
- }
- },
- "eslint-module-utils": {
- "version": "2.8.0",
- "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz",
- "integrity": "sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==",
- "requires": {
- "debug": "^3.2.7"
- },
- "dependencies": {
- "debug": {
- "version": "3.2.7",
- "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
- "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
- "requires": {
- "ms": "^2.1.1"
- }
- }
- }
- },
- "eslint-plugin-flowtype": {
- "version": "8.0.3",
- "resolved": "https://registry.npmjs.org/eslint-plugin-flowtype/-/eslint-plugin-flowtype-8.0.3.tgz",
- "integrity": "sha512-dX8l6qUL6O+fYPtpNRideCFSpmWOUVx5QcaGLVqe/vlDiBSe4vYljDWDETwnyFzpl7By/WVIu6rcrniCgH9BqQ==",
- "requires": {
- "lodash": "^4.17.21",
- "string-natural-compare": "^3.0.1"
- }
- },
- "eslint-plugin-import": {
- "version": "2.27.5",
- "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz",
- "integrity": "sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==",
- "requires": {
- "array-includes": "^3.1.6",
- "array.prototype.flat": "^1.3.1",
- "array.prototype.flatmap": "^1.3.1",
- "debug": "^3.2.7",
- "doctrine": "^2.1.0",
- "eslint-import-resolver-node": "^0.3.7",
- "eslint-module-utils": "^2.7.4",
- "has": "^1.0.3",
- "is-core-module": "^2.11.0",
- "is-glob": "^4.0.3",
- "minimatch": "^3.1.2",
- "object.values": "^1.1.6",
- "resolve": "^1.22.1",
- "semver": "^6.3.0",
- "tsconfig-paths": "^3.14.1"
- },
- "dependencies": {
- "debug": {
- "version": "3.2.7",
- "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
- "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
- "requires": {
- "ms": "^2.1.1"
- }
- },
- "doctrine": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
- "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
- "requires": {
- "esutils": "^2.0.2"
- }
- }
- }
- },
- "eslint-plugin-jest": {
- "version": "25.7.0",
- "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-25.7.0.tgz",
- "integrity": "sha512-PWLUEXeeF7C9QGKqvdSbzLOiLTx+bno7/HC9eefePfEb257QFHg7ye3dh80AZVkaa/RQsBB1Q/ORQvg2X7F0NQ==",
- "requires": {
- "@typescript-eslint/experimental-utils": "^5.0.0"
- }
- },
- "eslint-plugin-jsx-a11y": {
- "version": "6.7.1",
- "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.7.1.tgz",
- "integrity": "sha512-63Bog4iIethyo8smBklORknVjB0T2dwB8Mr/hIC+fBS0uyHdYYpzM/Ed+YC8VxTjlXHEWFOdmgwcDn1U2L9VCA==",
- "requires": {
- "@babel/runtime": "^7.20.7",
- "aria-query": "^5.1.3",
- "array-includes": "^3.1.6",
- "array.prototype.flatmap": "^1.3.1",
- "ast-types-flow": "^0.0.7",
- "axe-core": "^4.6.2",
- "axobject-query": "^3.1.1",
- "damerau-levenshtein": "^1.0.8",
- "emoji-regex": "^9.2.2",
- "has": "^1.0.3",
- "jsx-ast-utils": "^3.3.3",
- "language-tags": "=1.0.5",
- "minimatch": "^3.1.2",
- "object.entries": "^1.1.6",
- "object.fromentries": "^2.0.6",
- "semver": "^6.3.0"
- }
- },
- "eslint-plugin-react": {
- "version": "7.32.2",
- "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.32.2.tgz",
- "integrity": "sha512-t2fBMa+XzonrrNkyVirzKlvn5RXzzPwRHtMvLAtVZrt8oxgnTQaYbU6SXTOO1mwQgp1y5+toMSKInnzGr0Knqg==",
- "requires": {
- "array-includes": "^3.1.6",
- "array.prototype.flatmap": "^1.3.1",
- "array.prototype.tosorted": "^1.1.1",
- "doctrine": "^2.1.0",
- "estraverse": "^5.3.0",
- "jsx-ast-utils": "^2.4.1 || ^3.0.0",
- "minimatch": "^3.1.2",
- "object.entries": "^1.1.6",
- "object.fromentries": "^2.0.6",
- "object.hasown": "^1.1.2",
- "object.values": "^1.1.6",
- "prop-types": "^15.8.1",
- "resolve": "^2.0.0-next.4",
- "semver": "^6.3.0",
- "string.prototype.matchall": "^4.0.8"
- },
- "dependencies": {
- "doctrine": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
- "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
- "requires": {
- "esutils": "^2.0.2"
- }
- },
- "resolve": {
- "version": "2.0.0-next.4",
- "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.4.tgz",
- "integrity": "sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ==",
- "requires": {
- "is-core-module": "^2.9.0",
- "path-parse": "^1.0.7",
- "supports-preserve-symlinks-flag": "^1.0.0"
- }
- }
- }
- },
- "eslint-plugin-react-hooks": {
- "version": "4.6.0",
- "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz",
- "integrity": "sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==",
- "requires": {}
- },
- "eslint-plugin-testing-library": {
- "version": "5.11.0",
- "resolved": "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.11.0.tgz",
- "integrity": "sha512-ELY7Gefo+61OfXKlQeXNIDVVLPcvKTeiQOoMZG9TeuWa7Ln4dUNRv8JdRWBQI9Mbb427XGlVB1aa1QPZxBJM8Q==",
- "requires": {
- "@typescript-eslint/utils": "^5.58.0"
- }
- },
- "eslint-scope": {
- "version": "7.2.0",
- "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.0.tgz",
- "integrity": "sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==",
- "requires": {
- "esrecurse": "^4.3.0",
- "estraverse": "^5.2.0"
- }
- },
- "eslint-visitor-keys": {
- "version": "3.4.1",
- "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz",
- "integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA=="
- },
- "eslint-webpack-plugin": {
- "version": "3.2.0",
- "resolved": "https://registry.npmjs.org/eslint-webpack-plugin/-/eslint-webpack-plugin-3.2.0.tgz",
- "integrity": "sha512-avrKcGncpPbPSUHX6B3stNGzkKFto3eL+DKM4+VyMrVnhPc3vRczVlCq3uhuFOdRvDHTVXuzwk1ZKUrqDQHQ9w==",
- "requires": {
- "@types/eslint": "^7.29.0 || ^8.4.1",
- "jest-worker": "^28.0.2",
- "micromatch": "^4.0.5",
- "normalize-path": "^3.0.0",
- "schema-utils": "^4.0.0"
- },
- "dependencies": {
- "ajv": {
- "version": "8.12.0",
- "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
- "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
- "requires": {
- "fast-deep-equal": "^3.1.1",
- "json-schema-traverse": "^1.0.0",
- "require-from-string": "^2.0.2",
- "uri-js": "^4.2.2"
- }
- },
- "ajv-keywords": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
- "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
- "requires": {
- "fast-deep-equal": "^3.1.3"
- }
- },
- "jest-worker": {
- "version": "28.1.3",
- "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.3.tgz",
- "integrity": "sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g==",
- "requires": {
- "@types/node": "*",
- "merge-stream": "^2.0.0",
- "supports-color": "^8.0.0"
- }
- },
- "json-schema-traverse": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
- "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
- },
- "schema-utils": {
- "version": "4.2.0",
- "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
- "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
- "requires": {
- "@types/json-schema": "^7.0.9",
- "ajv": "^8.9.0",
- "ajv-formats": "^2.1.1",
- "ajv-keywords": "^5.1.0"
- }
- },
- "supports-color": {
- "version": "8.1.1",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
- "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
- "requires": {
- "has-flag": "^4.0.0"
- }
- }
- }
- },
- "espree": {
- "version": "9.5.2",
- "resolved": "https://registry.npmjs.org/espree/-/espree-9.5.2.tgz",
- "integrity": "sha512-7OASN1Wma5fum5SrNhFMAMJxOUAbhyfQ8dQ//PJaJbNw0URTPWqIghHWt1MmAANKhHZIYOHruW4Kw4ruUWOdGw==",
- "requires": {
- "acorn": "^8.8.0",
- "acorn-jsx": "^5.3.2",
- "eslint-visitor-keys": "^3.4.1"
- }
- },
- "esprima": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
- "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
- },
- "esquery": {
- "version": "1.5.0",
- "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
- "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
- "requires": {
- "estraverse": "^5.1.0"
- }
- },
- "esrecurse": {
- "version": "4.3.0",
- "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
- "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
- "requires": {
- "estraverse": "^5.2.0"
- }
- },
- "estraverse": {
- "version": "5.3.0",
- "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
- "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="
- },
- "estree-walker": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz",
- "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg=="
- },
- "esutils": {
- "version": "2.0.3",
- "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
- "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="
- },
- "etag": {
- "version": "1.8.1",
- "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
- "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="
- },
- "eventemitter3": {
- "version": "4.0.7",
- "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
- "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
- },
- "events": {
- "version": "3.3.0",
- "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
- "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q=="
- },
- "execa": {
- "version": "5.1.1",
- "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
- "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
- "requires": {
- "cross-spawn": "^7.0.3",
- "get-stream": "^6.0.0",
- "human-signals": "^2.1.0",
- "is-stream": "^2.0.0",
- "merge-stream": "^2.0.0",
- "npm-run-path": "^4.0.1",
- "onetime": "^5.1.2",
- "signal-exit": "^3.0.3",
- "strip-final-newline": "^2.0.0"
- }
- },
- "exit": {
- "version": "0.1.2",
- "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
- "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ=="
- },
- "expect": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/expect/-/expect-29.6.2.tgz",
- "integrity": "sha512-iAErsLxJ8C+S02QbLAwgSGSezLQK+XXRDt8IuFXFpwCNw2ECmzZSmjKcCaFVp5VRMk+WAvz6h6jokzEzBFZEuA==",
- "dev": true,
- "requires": {
- "@jest/expect-utils": "^29.6.2",
- "@types/node": "*",
- "jest-get-type": "^29.4.3",
- "jest-matcher-utils": "^29.6.2",
- "jest-message-util": "^29.6.2",
- "jest-util": "^29.6.2"
- },
- "dependencies": {
- "@jest/types": {
- "version": "29.6.1",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
- "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
- "dev": true,
- "requires": {
- "@jest/schemas": "^29.6.0",
- "@types/istanbul-lib-coverage": "^2.0.0",
- "@types/istanbul-reports": "^3.0.0",
- "@types/node": "*",
- "@types/yargs": "^17.0.8",
- "chalk": "^4.0.0"
- }
- },
- "@types/yargs": {
- "version": "17.0.24",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
- "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
- "dev": true,
- "requires": {
- "@types/yargs-parser": "*"
- }
- },
- "jest-get-type": {
- "version": "29.4.3",
- "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
- "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==",
- "dev": true
- },
- "jest-util": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
- "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
- "dev": true,
- "requires": {
- "@jest/types": "^29.6.1",
- "@types/node": "*",
- "chalk": "^4.0.0",
- "ci-info": "^3.2.0",
- "graceful-fs": "^4.2.9",
- "picomatch": "^2.2.3"
- }
- }
- }
- },
- "express": {
- "version": "4.18.2",
- "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
- "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
- "requires": {
- "accepts": "~1.3.8",
- "array-flatten": "1.1.1",
- "body-parser": "1.20.1",
- "content-disposition": "0.5.4",
- "content-type": "~1.0.4",
- "cookie": "0.5.0",
- "cookie-signature": "1.0.6",
- "debug": "2.6.9",
- "depd": "2.0.0",
- "encodeurl": "~1.0.2",
- "escape-html": "~1.0.3",
- "etag": "~1.8.1",
- "finalhandler": "1.2.0",
- "fresh": "0.5.2",
- "http-errors": "2.0.0",
- "merge-descriptors": "1.0.1",
- "methods": "~1.1.2",
- "on-finished": "2.4.1",
- "parseurl": "~1.3.3",
- "path-to-regexp": "0.1.7",
- "proxy-addr": "~2.0.7",
- "qs": "6.11.0",
- "range-parser": "~1.2.1",
- "safe-buffer": "5.2.1",
- "send": "0.18.0",
- "serve-static": "1.15.0",
- "setprototypeof": "1.2.0",
- "statuses": "2.0.1",
- "type-is": "~1.6.18",
- "utils-merge": "1.0.1",
- "vary": "~1.1.2"
- },
- "dependencies": {
- "array-flatten": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
- "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
- },
- "debug": {
- "version": "2.6.9",
- "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
- "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
- "requires": {
- "ms": "2.0.0"
- }
- },
- "ms": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
- "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
- }
- }
- },
- "fast-deep-equal": {
- "version": "3.1.3",
- "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
- "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
- },
- "fast-glob": {
- "version": "3.2.12",
- "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
- "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
- "requires": {
- "@nodelib/fs.stat": "^2.0.2",
- "@nodelib/fs.walk": "^1.2.3",
- "glob-parent": "^5.1.2",
- "merge2": "^1.3.0",
- "micromatch": "^4.0.4"
- },
- "dependencies": {
- "glob-parent": {
- "version": "5.1.2",
- "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
- "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
- "requires": {
- "is-glob": "^4.0.1"
- }
- }
- }
- },
- "fast-json-stable-stringify": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
- "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
- },
- "fast-levenshtein": {
- "version": "2.0.6",
- "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
- "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="
- },
- "fastq": {
- "version": "1.15.0",
- "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
- "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
- "requires": {
- "reusify": "^1.0.4"
- }
- },
- "faye-websocket": {
- "version": "0.11.4",
- "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
- "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
- "requires": {
- "websocket-driver": ">=0.5.1"
- }
- },
- "fb-watchman": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz",
- "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==",
- "requires": {
- "bser": "2.1.1"
- }
- },
- "file-entry-cache": {
- "version": "6.0.1",
- "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
- "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
- "requires": {
- "flat-cache": "^3.0.4"
- }
- },
- "file-loader": {
- "version": "6.2.0",
- "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz",
- "integrity": "sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==",
- "requires": {
- "loader-utils": "^2.0.0",
- "schema-utils": "^3.0.0"
- }
- },
- "filelist": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
- "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==",
- "requires": {
- "minimatch": "^5.0.1"
- },
- "dependencies": {
- "brace-expansion": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
- "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
- "requires": {
- "balanced-match": "^1.0.0"
- }
- },
- "minimatch": {
- "version": "5.1.6",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
- "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
- "requires": {
- "brace-expansion": "^2.0.1"
- }
- }
- }
- },
- "filename-reserved-regex": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz",
- "integrity": "sha512-lc1bnsSr4L4Bdif8Xb/qrtokGbq5zlsms/CYH8PP+WtCkGNF65DPiQY8vG3SakEdRn8Dlnm+gW/qWKKjS5sZzQ==",
- "dev": true
- },
- "filenamify": {
- "version": "4.3.0",
- "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-4.3.0.tgz",
- "integrity": "sha512-hcFKyUG57yWGAzu1CMt/dPzYZuv+jAJUT85bL8mrXvNe6hWj6yEHEc4EdcgiA6Z3oi1/9wXJdZPXF2dZNgwgOg==",
- "dev": true,
- "requires": {
- "filename-reserved-regex": "^2.0.0",
- "strip-outer": "^1.0.1",
- "trim-repeated": "^1.0.0"
- }
- },
- "filesize": {
- "version": "8.0.7",
- "resolved": "https://registry.npmjs.org/filesize/-/filesize-8.0.7.tgz",
- "integrity": "sha512-pjmC+bkIF8XI7fWaH8KxHcZL3DPybs1roSKP4rKDvy20tAWwIObE4+JIseG2byfGKhud5ZnM4YSGKBz7Sh0ndQ=="
- },
- "fill-range": {
- "version": "7.0.1",
- "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
- "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
- "requires": {
- "to-regex-range": "^5.0.1"
- }
- },
- "finalhandler": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
- "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
- "requires": {
- "debug": "2.6.9",
- "encodeurl": "~1.0.2",
- "escape-html": "~1.0.3",
- "on-finished": "2.4.1",
- "parseurl": "~1.3.3",
- "statuses": "2.0.1",
- "unpipe": "~1.0.0"
- },
- "dependencies": {
- "debug": {
- "version": "2.6.9",
- "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
- "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
- "requires": {
- "ms": "2.0.0"
- }
- },
- "ms": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
- "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
- }
- }
- },
- "find-cache-dir": {
- "version": "3.3.2",
- "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
- "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
- "requires": {
- "commondir": "^1.0.1",
- "make-dir": "^3.0.2",
- "pkg-dir": "^4.1.0"
- }
- },
- "find-up": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
- "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
- "requires": {
- "locate-path": "^5.0.0",
- "path-exists": "^4.0.0"
- }
- },
- "flat-cache": {
- "version": "3.0.4",
- "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
- "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
- "requires": {
- "flatted": "^3.1.0",
- "rimraf": "^3.0.2"
- }
- },
- "flatted": {
- "version": "3.2.7",
- "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
- "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ=="
- },
- "follow-redirects": {
- "version": "1.15.2",
- "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
- "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA=="
- },
- "for-each": {
- "version": "0.3.3",
- "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
- "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
- "requires": {
- "is-callable": "^1.1.3"
- }
- },
- "fork-ts-checker-webpack-plugin": {
- "version": "6.5.3",
- "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.5.3.tgz",
- "integrity": "sha512-SbH/l9ikmMWycd5puHJKTkZJKddF4iRLyW3DeZ08HTI7NGyLS38MXd/KGgeWumQO7YNQbW2u/NtPT2YowbPaGQ==",
- "requires": {
- "@babel/code-frame": "^7.8.3",
- "@types/json-schema": "^7.0.5",
- "chalk": "^4.1.0",
- "chokidar": "^3.4.2",
- "cosmiconfig": "^6.0.0",
- "deepmerge": "^4.2.2",
- "fs-extra": "^9.0.0",
- "glob": "^7.1.6",
- "memfs": "^3.1.2",
- "minimatch": "^3.0.4",
- "schema-utils": "2.7.0",
- "semver": "^7.3.2",
- "tapable": "^1.0.0"
- },
- "dependencies": {
- "cosmiconfig": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz",
- "integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==",
- "requires": {
- "@types/parse-json": "^4.0.0",
- "import-fresh": "^3.1.0",
- "parse-json": "^5.0.0",
- "path-type": "^4.0.0",
- "yaml": "^1.7.2"
- }
- },
- "fs-extra": {
- "version": "9.1.0",
- "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
- "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
- "requires": {
- "at-least-node": "^1.0.0",
- "graceful-fs": "^4.2.0",
- "jsonfile": "^6.0.1",
- "universalify": "^2.0.0"
- }
- },
- "lru-cache": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
- "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
- "requires": {
- "yallist": "^4.0.0"
- }
- },
- "schema-utils": {
- "version": "2.7.0",
- "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz",
- "integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==",
- "requires": {
- "@types/json-schema": "^7.0.4",
- "ajv": "^6.12.2",
- "ajv-keywords": "^3.4.1"
- }
- },
- "semver": {
- "version": "7.5.2",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz",
- "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
- "requires": {
- "lru-cache": "^6.0.0"
- }
- },
- "tapable": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
- "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA=="
- },
- "yallist": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
- "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
- }
- }
- },
- "form-data": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
- "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
- "requires": {
- "asynckit": "^0.4.0",
- "combined-stream": "^1.0.8",
- "mime-types": "^2.1.12"
- }
- },
- "forwarded": {
- "version": "0.2.0",
- "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
- "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="
- },
- "fraction.js": {
- "version": "4.2.0",
- "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz",
- "integrity": "sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA=="
- },
- "fresh": {
- "version": "0.5.2",
- "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
- "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="
- },
- "fs-extra": {
- "version": "11.1.1",
- "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz",
- "integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==",
- "dev": true,
- "requires": {
- "graceful-fs": "^4.2.0",
- "jsonfile": "^6.0.1",
- "universalify": "^2.0.0"
- }
- },
- "fs-monkey": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.4.tgz",
- "integrity": "sha512-INM/fWAxMICjttnD0DX1rBvinKskj5G1w+oy/pnm9u/tSlnBrzFonJMcalKJ30P8RRsPzKcCG7Q8l0jx5Fh9YQ=="
- },
- "fs.realpath": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
- "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
- },
- "fsevents": {
- "version": "2.3.2",
- "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
- "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
- "optional": true
- },
- "function-bind": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
- "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
- },
- "function.prototype.name": {
- "version": "1.1.5",
- "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
- "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
- "requires": {
- "call-bind": "^1.0.2",
- "define-properties": "^1.1.3",
- "es-abstract": "^1.19.0",
- "functions-have-names": "^1.2.2"
- }
- },
- "functions-have-names": {
- "version": "1.2.3",
- "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
- "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ=="
- },
- "gensync": {
- "version": "1.0.0-beta.2",
- "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
- "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="
- },
- "get-caller-file": {
- "version": "2.0.5",
- "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
- "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
- },
- "get-intrinsic": {
- "version": "1.2.1",
- "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
- "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
- "requires": {
- "function-bind": "^1.1.1",
- "has": "^1.0.3",
- "has-proto": "^1.0.1",
- "has-symbols": "^1.0.3"
- }
- },
- "get-own-enumerable-property-symbols": {
- "version": "3.0.2",
- "resolved": "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz",
- "integrity": "sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g=="
- },
- "get-package-type": {
- "version": "0.1.0",
- "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
- "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q=="
- },
- "get-stream": {
- "version": "6.0.1",
- "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
- "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg=="
- },
- "get-symbol-description": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
- "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
- "requires": {
- "call-bind": "^1.0.2",
- "get-intrinsic": "^1.1.1"
- }
- },
- "gh-pages": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/gh-pages/-/gh-pages-6.0.0.tgz",
- "integrity": "sha512-FXZWJRsvP/fK2HJGY+Di6FRNHvqFF6gOIELaopDjXXgjeOYSNURcuYwEO/6bwuq6koP5Lnkvnr5GViXzuOB89g==",
- "dev": true,
- "requires": {
- "async": "^3.2.4",
- "commander": "^11.0.0",
- "email-addresses": "^5.0.0",
- "filenamify": "^4.3.0",
- "find-cache-dir": "^3.3.1",
- "fs-extra": "^11.1.1",
- "globby": "^6.1.0"
- },
- "dependencies": {
- "commander": {
- "version": "11.0.0",
- "resolved": "https://registry.npmjs.org/commander/-/commander-11.0.0.tgz",
- "integrity": "sha512-9HMlXtt/BNoYr8ooyjjNRdIilOTkVJXB+GhxMTtOKwk0R4j4lS4NpjuqmRxroBfnfTSHQIHQB7wryHhXarNjmQ==",
- "dev": true
- }
- }
- },
- "glob": {
- "version": "7.2.3",
- "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
- "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
- "requires": {
- "fs.realpath": "^1.0.0",
- "inflight": "^1.0.4",
- "inherits": "2",
- "minimatch": "^3.1.1",
- "once": "^1.3.0",
- "path-is-absolute": "^1.0.0"
- }
- },
- "glob-parent": {
- "version": "6.0.2",
- "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
- "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
- "requires": {
- "is-glob": "^4.0.3"
- }
- },
- "glob-to-regexp": {
- "version": "0.4.1",
- "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
- "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="
- },
- "global-modules": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
- "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
- "requires": {
- "global-prefix": "^3.0.0"
- }
- },
- "global-prefix": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz",
- "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==",
- "requires": {
- "ini": "^1.3.5",
- "kind-of": "^6.0.2",
- "which": "^1.3.1"
- },
- "dependencies": {
- "which": {
- "version": "1.3.1",
- "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
- "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
- "requires": {
- "isexe": "^2.0.0"
- }
- }
- }
- },
- "globals": {
- "version": "11.12.0",
- "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
- "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="
- },
- "globalthis": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz",
- "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==",
- "requires": {
- "define-properties": "^1.1.3"
- }
- },
- "globby": {
- "version": "6.1.0",
- "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
- "integrity": "sha512-KVbFv2TQtbzCoxAnfD6JcHZTYCzyliEaaeM/gH8qQdkKr5s0OP9scEgvdcngyk7AVdY6YVW/TJHd+lQ/Df3Daw==",
- "dev": true,
- "requires": {
- "array-union": "^1.0.1",
- "glob": "^7.0.3",
- "object-assign": "^4.0.1",
- "pify": "^2.0.0",
- "pinkie-promise": "^2.0.0"
- }
- },
- "gopd": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
- "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
- "requires": {
- "get-intrinsic": "^1.1.3"
- }
- },
- "graceful-fs": {
- "version": "4.2.11",
- "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
- "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
- },
- "grapheme-splitter": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
- "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ=="
- },
- "graphemer": {
- "version": "1.4.0",
- "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
- "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag=="
- },
- "gremlint": {
- "version": "3.7.0",
- "resolved": "https://registry.npmjs.org/gremlint/-/gremlint-3.7.0.tgz",
- "integrity": "sha512-j0PMkFWONPEemiCg71K9ufugpfC+PpSERo0wC2LZE3Wwh8wF3Lc4WxmszmctSBrVpraVFjUIU1d09JIFjz5lEw=="
- },
- "gzip-size": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz",
- "integrity": "sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==",
- "requires": {
- "duplexer": "^0.1.2"
- }
- },
- "handle-thing": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
- "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg=="
- },
- "harmony-reflect": {
- "version": "1.6.2",
- "resolved": "https://registry.npmjs.org/harmony-reflect/-/harmony-reflect-1.6.2.tgz",
- "integrity": "sha512-HIp/n38R9kQjDEziXyDTuW3vvoxxyxjxFzXLrBr18uB47GnSt+G9D29fqrpM5ZkspMcPICud3XsBJQ4Y2URg8g=="
- },
- "has": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
- "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
- "requires": {
- "function-bind": "^1.1.1"
- }
- },
- "has-bigints": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
- "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ=="
- },
- "has-flag": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
- "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
- },
- "has-property-descriptors": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
- "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
- "requires": {
- "get-intrinsic": "^1.1.1"
- }
- },
- "has-proto": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
- "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg=="
- },
- "has-symbols": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
- "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
- },
- "has-tostringtag": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
- "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
- "requires": {
- "has-symbols": "^1.0.2"
- }
- },
- "he": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
- "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="
- },
- "hoist-non-react-statics": {
- "version": "3.3.2",
- "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
- "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
- "dev": true,
- "requires": {
- "react-is": "^16.7.0"
- },
- "dependencies": {
- "react-is": {
- "version": "16.13.1",
- "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
- "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
- "dev": true
- }
- }
- },
- "hoopy": {
- "version": "0.1.4",
- "resolved": "https://registry.npmjs.org/hoopy/-/hoopy-0.1.4.tgz",
- "integrity": "sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ=="
- },
- "hpack.js": {
- "version": "2.1.6",
- "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
- "integrity": "sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==",
- "requires": {
- "inherits": "^2.0.1",
- "obuf": "^1.0.0",
- "readable-stream": "^2.0.1",
- "wbuf": "^1.1.0"
- },
- "dependencies": {
- "isarray": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
- "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
- },
- "readable-stream": {
- "version": "2.3.8",
- "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
- "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
- "requires": {
- "core-util-is": "~1.0.0",
- "inherits": "~2.0.3",
- "isarray": "~1.0.0",
- "process-nextick-args": "~2.0.0",
- "safe-buffer": "~5.1.1",
- "string_decoder": "~1.1.1",
- "util-deprecate": "~1.0.1"
- }
- },
- "safe-buffer": {
- "version": "5.1.2",
- "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
- "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
- },
- "string_decoder": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
- "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
- "requires": {
- "safe-buffer": "~5.1.0"
- }
- }
- }
- },
- "html-encoding-sniffer": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz",
- "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==",
- "requires": {
- "whatwg-encoding": "^1.0.5"
- }
- },
- "html-entities": {
- "version": "2.3.6",
- "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.3.6.tgz",
- "integrity": "sha512-9o0+dcpIw2/HxkNuYKxSJUF/MMRZQECK4GnF+oQOmJ83yCVHTWgCH5aOXxK5bozNRmM8wtgryjHD3uloPBDEGw=="
- },
- "html-escaper": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
- "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg=="
- },
- "html-minifier-terser": {
- "version": "6.1.0",
- "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
- "integrity": "sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==",
- "requires": {
- "camel-case": "^4.1.2",
- "clean-css": "^5.2.2",
- "commander": "^8.3.0",
- "he": "^1.2.0",
- "param-case": "^3.0.4",
- "relateurl": "^0.2.7",
- "terser": "^5.10.0"
- },
- "dependencies": {
- "commander": {
- "version": "8.3.0",
- "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
- "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww=="
- }
- }
- },
- "html-webpack-plugin": {
- "version": "5.5.3",
- "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.5.3.tgz",
- "integrity": "sha512-6YrDKTuqaP/TquFH7h4srYWsZx+x6k6+FbsTm0ziCwGHDP78Unr1r9F/H4+sGmMbX08GQcJ+K64x55b+7VM/jg==",
- "requires": {
- "@types/html-minifier-terser": "^6.0.0",
- "html-minifier-terser": "^6.0.2",
- "lodash": "^4.17.21",
- "pretty-error": "^4.0.0",
- "tapable": "^2.0.0"
- }
- },
- "htmlparser2": {
- "version": "6.1.0",
- "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz",
- "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==",
- "requires": {
- "domelementtype": "^2.0.1",
- "domhandler": "^4.0.0",
- "domutils": "^2.5.2",
- "entities": "^2.0.0"
- }
- },
- "http-deceiver": {
- "version": "1.2.7",
- "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
- "integrity": "sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw=="
- },
- "http-errors": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
- "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
- "requires": {
- "depd": "2.0.0",
- "inherits": "2.0.4",
- "setprototypeof": "1.2.0",
- "statuses": "2.0.1",
- "toidentifier": "1.0.1"
- }
- },
- "http-parser-js": {
- "version": "0.5.8",
- "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz",
- "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q=="
- },
- "http-proxy": {
- "version": "1.18.1",
- "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
- "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
- "requires": {
- "eventemitter3": "^4.0.0",
- "follow-redirects": "^1.0.0",
- "requires-port": "^1.0.0"
- }
- },
- "http-proxy-agent": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
- "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
- "requires": {
- "@tootallnate/once": "1",
- "agent-base": "6",
- "debug": "4"
- }
- },
- "http-proxy-middleware": {
- "version": "2.0.6",
- "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz",
- "integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==",
- "requires": {
- "@types/http-proxy": "^1.17.8",
- "http-proxy": "^1.18.1",
- "is-glob": "^4.0.1",
- "is-plain-obj": "^3.0.0",
- "micromatch": "^4.0.2"
- }
- },
- "https-proxy-agent": {
- "version": "5.0.1",
- "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
- "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
- "requires": {
- "agent-base": "6",
- "debug": "4"
- }
- },
- "human-signals": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
- "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw=="
- },
- "iconv-lite": {
- "version": "0.6.3",
- "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
- "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
- "requires": {
- "safer-buffer": ">= 2.1.2 < 3.0.0"
- }
- },
- "icss-utils": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
- "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
- "requires": {}
- },
- "idb": {
- "version": "7.1.1",
- "resolved": "https://registry.npmjs.org/idb/-/idb-7.1.1.tgz",
- "integrity": "sha512-gchesWBzyvGHRO9W8tzUWFDycow5gwjvFKfyV9FF32Y7F50yZMp7mP+T2mJIWFx49zicqyC4uefHM17o6xKIVQ=="
- },
- "identity-obj-proxy": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/identity-obj-proxy/-/identity-obj-proxy-3.0.0.tgz",
- "integrity": "sha512-00n6YnVHKrinT9t0d9+5yZC6UBNJANpYEQvL2LlX6Ab9lnmxzIRcEmTPuyGScvl1+jKuCICX1Z0Ab1pPKKdikA==",
- "requires": {
- "harmony-reflect": "^1.4.6"
- }
- },
- "ignore": {
- "version": "5.2.4",
- "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
- "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ=="
- },
- "immer": {
- "version": "9.0.21",
- "resolved": "https://registry.npmjs.org/immer/-/immer-9.0.21.tgz",
- "integrity": "sha512-bc4NBHqOqSfRW7POMkHd51LvClaeMXpm8dx0e8oE2GORbq5aRK7Bxl4FyzVLdGtLmvLKL7BTDBG5ACQm4HWjTA=="
- },
- "import-fresh": {
- "version": "3.3.0",
- "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
- "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
- "requires": {
- "parent-module": "^1.0.0",
- "resolve-from": "^4.0.0"
- },
- "dependencies": {
- "resolve-from": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
- "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="
- }
- }
- },
- "import-local": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz",
- "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==",
- "requires": {
- "pkg-dir": "^4.2.0",
- "resolve-cwd": "^3.0.0"
- }
- },
- "imurmurhash": {
- "version": "0.1.4",
- "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
- "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA=="
- },
- "indent-string": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
- "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
- "dev": true
- },
- "inflight": {
- "version": "1.0.6",
- "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
- "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
- "requires": {
- "once": "^1.3.0",
- "wrappy": "1"
- }
- },
- "inherits": {
- "version": "2.0.4",
- "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
- "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
- },
- "ini": {
- "version": "1.3.8",
- "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
- "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
- },
- "internal-slot": {
- "version": "1.0.5",
- "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz",
- "integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==",
- "requires": {
- "get-intrinsic": "^1.2.0",
- "has": "^1.0.3",
- "side-channel": "^1.0.4"
- }
- },
- "ipaddr.js": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.1.0.tgz",
- "integrity": "sha512-LlbxQ7xKzfBusov6UMi4MFpEg0m+mAm9xyNGEduwXMEDuf4WfzB/RZwMVYEd7IKGvh4IUkEXYxtAVu9T3OelJQ=="
- },
- "is-arguments": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
- "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
- "requires": {
- "call-bind": "^1.0.2",
- "has-tostringtag": "^1.0.0"
- }
- },
- "is-array-buffer": {
- "version": "3.0.2",
- "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz",
- "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==",
- "requires": {
- "call-bind": "^1.0.2",
- "get-intrinsic": "^1.2.0",
- "is-typed-array": "^1.1.10"
- }
- },
- "is-arrayish": {
- "version": "0.2.1",
- "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
- "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="
- },
- "is-bigint": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
- "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
- "requires": {
- "has-bigints": "^1.0.1"
- }
- },
- "is-binary-path": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
- "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
- "requires": {
- "binary-extensions": "^2.0.0"
- }
- },
- "is-boolean-object": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
- "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
- "requires": {
- "call-bind": "^1.0.2",
- "has-tostringtag": "^1.0.0"
- }
- },
- "is-callable": {
- "version": "1.2.7",
- "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
- "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA=="
- },
- "is-core-module": {
- "version": "2.12.1",
- "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.1.tgz",
- "integrity": "sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==",
- "requires": {
- "has": "^1.0.3"
- }
- },
- "is-date-object": {
- "version": "1.0.5",
- "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
- "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
- "requires": {
- "has-tostringtag": "^1.0.0"
- }
- },
- "is-docker": {
- "version": "2.2.1",
- "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
- "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ=="
- },
- "is-extglob": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
- "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ=="
- },
- "is-fullwidth-code-point": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
- "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
- },
- "is-generator-fn": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
- "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ=="
- },
- "is-glob": {
- "version": "4.0.3",
- "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
- "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
- "requires": {
- "is-extglob": "^2.1.1"
- }
- },
- "is-map": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz",
- "integrity": "sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg=="
- },
- "is-module": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz",
- "integrity": "sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g=="
- },
- "is-negative-zero": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
- "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA=="
- },
- "is-number": {
- "version": "7.0.0",
- "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
- "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="
- },
- "is-number-object": {
- "version": "1.0.7",
- "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
- "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
- "requires": {
- "has-tostringtag": "^1.0.0"
- }
- },
- "is-obj": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
- "integrity": "sha512-l4RyHgRqGN4Y3+9JHVrNqO+tN0rV5My76uW5/nuO4K1b6vw5G8d/cmFjP9tRfEsdhZNt0IFdZuK/c2Vr4Nb+Qg=="
- },
- "is-path-inside": {
- "version": "3.0.3",
- "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
- "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ=="
- },
- "is-plain-obj": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
- "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA=="
- },
- "is-potential-custom-element-name": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
- "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ=="
- },
- "is-regex": {
- "version": "1.1.4",
- "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
- "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
- "requires": {
- "call-bind": "^1.0.2",
- "has-tostringtag": "^1.0.0"
- }
- },
- "is-regexp": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz",
- "integrity": "sha512-7zjFAPO4/gwyQAAgRRmqeEeyIICSdmCqa3tsVHMdBzaXXRiqopZL4Cyghg/XulGWrtABTpbnYYzzIRffLkP4oA=="
- },
- "is-root": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/is-root/-/is-root-2.1.0.tgz",
- "integrity": "sha512-AGOriNp96vNBd3HtU+RzFEc75FfR5ymiYv8E553I71SCeXBiMsVDUtdio1OEFvrPyLIQ9tVR5RxXIFe5PUFjMg=="
- },
- "is-set": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz",
- "integrity": "sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g=="
- },
- "is-shared-array-buffer": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
- "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
- "requires": {
- "call-bind": "^1.0.2"
- }
- },
- "is-stream": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
- "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg=="
- },
- "is-string": {
- "version": "1.0.7",
- "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
- "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
- "requires": {
- "has-tostringtag": "^1.0.0"
- }
- },
- "is-symbol": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
- "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
- "requires": {
- "has-symbols": "^1.0.2"
- }
- },
- "is-typed-array": {
- "version": "1.1.10",
- "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz",
- "integrity": "sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==",
- "requires": {
- "available-typed-arrays": "^1.0.5",
- "call-bind": "^1.0.2",
- "for-each": "^0.3.3",
- "gopd": "^1.0.1",
- "has-tostringtag": "^1.0.0"
- }
- },
- "is-typedarray": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
- "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA=="
- },
- "is-weakmap": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz",
- "integrity": "sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA=="
- },
- "is-weakref": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
- "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
- "requires": {
- "call-bind": "^1.0.2"
- }
- },
- "is-weakset": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.2.tgz",
- "integrity": "sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==",
- "requires": {
- "call-bind": "^1.0.2",
- "get-intrinsic": "^1.1.1"
- }
- },
- "is-wsl": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
- "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
- "requires": {
- "is-docker": "^2.0.0"
- }
- },
- "isarray": {
- "version": "2.0.5",
- "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
- "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw=="
- },
- "isexe": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
- "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
- },
- "istanbul-lib-coverage": {
- "version": "3.2.0",
- "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz",
- "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw=="
- },
- "istanbul-lib-instrument": {
- "version": "5.2.1",
- "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
- "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
- "requires": {
- "@babel/core": "^7.12.3",
- "@babel/parser": "^7.14.7",
- "@istanbuljs/schema": "^0.1.2",
- "istanbul-lib-coverage": "^3.2.0",
- "semver": "^6.3.0"
- }
- },
- "istanbul-lib-report": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
- "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
- "requires": {
- "istanbul-lib-coverage": "^3.0.0",
- "make-dir": "^4.0.0",
- "supports-color": "^7.1.0"
- },
- "dependencies": {
- "lru-cache": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
- "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
- "requires": {
- "yallist": "^4.0.0"
- }
- },
- "make-dir": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
- "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
- "requires": {
- "semver": "^7.5.3"
- }
- },
- "semver": {
- "version": "7.5.4",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
- "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
- "requires": {
- "lru-cache": "^6.0.0"
- }
- },
- "yallist": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
- "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
- }
- }
- },
- "istanbul-lib-source-maps": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
- "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
- "requires": {
- "debug": "^4.1.1",
- "istanbul-lib-coverage": "^3.0.0",
- "source-map": "^0.6.1"
- },
- "dependencies": {
- "source-map": {
- "version": "0.6.1",
- "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
- "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
- }
- }
- },
- "istanbul-reports": {
- "version": "3.1.6",
- "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.6.tgz",
- "integrity": "sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg==",
- "requires": {
- "html-escaper": "^2.0.0",
- "istanbul-lib-report": "^3.0.0"
- }
- },
- "jake": {
- "version": "10.8.7",
- "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.7.tgz",
- "integrity": "sha512-ZDi3aP+fG/LchyBzUM804VjddnwfSfsdeYkwt8NcbKRvo4rFkjhs456iLFn3k2ZUWvNe4i48WACDbza8fhq2+w==",
- "requires": {
- "async": "^3.2.3",
- "chalk": "^4.0.2",
- "filelist": "^1.0.4",
- "minimatch": "^3.1.2"
- }
- },
- "jest": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest/-/jest-29.6.2.tgz",
- "integrity": "sha512-8eQg2mqFbaP7CwfsTpCxQ+sHzw1WuNWL5UUvjnWP4hx2riGz9fPSzYOaU5q8/GqWn1TfgZIVTqYJygbGbWAANg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/core": "^29.6.2",
- "@jest/types": "^29.6.1",
- "import-local": "^3.0.2",
- "jest-cli": "^29.6.2"
- },
- "dependencies": {
- "@jest/types": {
- "version": "29.6.1",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
- "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/schemas": "^29.6.0",
- "@types/istanbul-lib-coverage": "^2.0.0",
- "@types/istanbul-reports": "^3.0.0",
- "@types/node": "*",
- "@types/yargs": "^17.0.8",
- "chalk": "^4.0.0"
- }
- },
- "@types/yargs": {
- "version": "17.0.24",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
- "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@types/yargs-parser": "*"
- }
- }
- }
- },
- "jest-changed-files": {
- "version": "29.5.0",
- "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.5.0.tgz",
- "integrity": "sha512-IFG34IUMUaNBIxjQXF/iu7g6EcdMrGRRxaUSw92I/2g2YC6vCdTltl4nHvt7Ci5nSJwXIkCu8Ka1DKF+X7Z1Ag==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "execa": "^5.0.0",
- "p-limit": "^3.1.0"
- },
- "dependencies": {
- "p-limit": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
- "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "yocto-queue": "^0.1.0"
- }
- }
- }
- },
- "jest-circus": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.6.2.tgz",
- "integrity": "sha512-G9mN+KOYIUe2sB9kpJkO9Bk18J4dTDArNFPwoZ7WKHKel55eKIS/u2bLthxgojwlf9NLCVQfgzM/WsOVvoC6Fw==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/environment": "^29.6.2",
- "@jest/expect": "^29.6.2",
- "@jest/test-result": "^29.6.2",
- "@jest/types": "^29.6.1",
- "@types/node": "*",
- "chalk": "^4.0.0",
- "co": "^4.6.0",
- "dedent": "^1.0.0",
- "is-generator-fn": "^2.0.0",
- "jest-each": "^29.6.2",
- "jest-matcher-utils": "^29.6.2",
- "jest-message-util": "^29.6.2",
- "jest-runtime": "^29.6.2",
- "jest-snapshot": "^29.6.2",
- "jest-util": "^29.6.2",
- "p-limit": "^3.1.0",
- "pretty-format": "^29.6.2",
- "pure-rand": "^6.0.0",
- "slash": "^3.0.0",
- "stack-utils": "^2.0.3"
- },
- "dependencies": {
- "@jest/types": {
- "version": "29.6.1",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
- "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/schemas": "^29.6.0",
- "@types/istanbul-lib-coverage": "^2.0.0",
- "@types/istanbul-reports": "^3.0.0",
- "@types/node": "*",
- "@types/yargs": "^17.0.8",
- "chalk": "^4.0.0"
- }
- },
- "@types/yargs": {
- "version": "17.0.24",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
- "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@types/yargs-parser": "*"
- }
- },
- "ansi-styles": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
- "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
- "dev": true,
- "optional": true,
- "peer": true
- },
- "jest-util": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
- "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/types": "^29.6.1",
- "@types/node": "*",
- "chalk": "^4.0.0",
- "ci-info": "^3.2.0",
- "graceful-fs": "^4.2.9",
- "picomatch": "^2.2.3"
- }
- },
- "p-limit": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
- "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "yocto-queue": "^0.1.0"
- }
- },
- "pretty-format": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.2.tgz",
- "integrity": "sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/schemas": "^29.6.0",
- "ansi-styles": "^5.0.0",
- "react-is": "^18.0.0"
- }
- }
- }
- },
- "jest-cli": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.6.2.tgz",
- "integrity": "sha512-TT6O247v6dCEX2UGHGyflMpxhnrL0DNqP2fRTKYm3nJJpCTfXX3GCMQPGFjXDoj0i5/Blp3jriKXFgdfmbYB6Q==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/core": "^29.6.2",
- "@jest/test-result": "^29.6.2",
- "@jest/types": "^29.6.1",
- "chalk": "^4.0.0",
- "exit": "^0.1.2",
- "graceful-fs": "^4.2.9",
- "import-local": "^3.0.2",
- "jest-config": "^29.6.2",
- "jest-util": "^29.6.2",
- "jest-validate": "^29.6.2",
- "prompts": "^2.0.1",
- "yargs": "^17.3.1"
- },
- "dependencies": {
- "@jest/types": {
- "version": "29.6.1",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
- "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/schemas": "^29.6.0",
- "@types/istanbul-lib-coverage": "^2.0.0",
- "@types/istanbul-reports": "^3.0.0",
- "@types/node": "*",
- "@types/yargs": "^17.0.8",
- "chalk": "^4.0.0"
- }
- },
- "@types/yargs": {
- "version": "17.0.24",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
- "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@types/yargs-parser": "*"
- }
- },
- "ansi-styles": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
- "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
- "dev": true,
- "optional": true,
- "peer": true
- },
- "jest-get-type": {
- "version": "29.4.3",
- "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
- "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==",
- "dev": true,
- "optional": true,
- "peer": true
- },
- "jest-util": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
- "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/types": "^29.6.1",
- "@types/node": "*",
- "chalk": "^4.0.0",
- "ci-info": "^3.2.0",
- "graceful-fs": "^4.2.9",
- "picomatch": "^2.2.3"
- }
- },
- "jest-validate": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.6.2.tgz",
- "integrity": "sha512-vGz0yMN5fUFRRbpJDPwxMpgSXW1LDKROHfBopAvDcmD6s+B/s8WJrwi+4bfH4SdInBA5C3P3BI19dBtKzx1Arg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/types": "^29.6.1",
- "camelcase": "^6.2.0",
- "chalk": "^4.0.0",
- "jest-get-type": "^29.4.3",
- "leven": "^3.1.0",
- "pretty-format": "^29.6.2"
- }
- },
- "pretty-format": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.2.tgz",
- "integrity": "sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/schemas": "^29.6.0",
- "ansi-styles": "^5.0.0",
- "react-is": "^18.0.0"
- }
- }
- }
- },
- "jest-config": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.6.2.tgz",
- "integrity": "sha512-VxwFOC8gkiJbuodG9CPtMRjBUNZEHxwfQXmIudSTzFWxaci3Qub1ddTRbFNQlD/zUeaifLndh/eDccFX4wCMQw==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@babel/core": "^7.11.6",
- "@jest/test-sequencer": "^29.6.2",
- "@jest/types": "^29.6.1",
- "babel-jest": "^29.6.2",
- "chalk": "^4.0.0",
- "ci-info": "^3.2.0",
- "deepmerge": "^4.2.2",
- "glob": "^7.1.3",
- "graceful-fs": "^4.2.9",
- "jest-circus": "^29.6.2",
- "jest-environment-node": "^29.6.2",
- "jest-get-type": "^29.4.3",
- "jest-regex-util": "^29.4.3",
- "jest-resolve": "^29.6.2",
- "jest-runner": "^29.6.2",
- "jest-util": "^29.6.2",
- "jest-validate": "^29.6.2",
- "micromatch": "^4.0.4",
- "parse-json": "^5.2.0",
- "pretty-format": "^29.6.2",
- "slash": "^3.0.0",
- "strip-json-comments": "^3.1.1"
- },
- "dependencies": {
- "@jest/transform": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.6.2.tgz",
- "integrity": "sha512-ZqCqEISr58Ce3U+buNFJYUktLJZOggfyvR+bZMaiV1e8B1SIvJbwZMrYz3gx/KAPn9EXmOmN+uB08yLCjWkQQg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@babel/core": "^7.11.6",
- "@jest/types": "^29.6.1",
- "@jridgewell/trace-mapping": "^0.3.18",
- "babel-plugin-istanbul": "^6.1.1",
- "chalk": "^4.0.0",
- "convert-source-map": "^2.0.0",
- "fast-json-stable-stringify": "^2.1.0",
- "graceful-fs": "^4.2.9",
- "jest-haste-map": "^29.6.2",
- "jest-regex-util": "^29.4.3",
- "jest-util": "^29.6.2",
- "micromatch": "^4.0.4",
- "pirates": "^4.0.4",
- "slash": "^3.0.0",
- "write-file-atomic": "^4.0.2"
- }
- },
- "@jest/types": {
- "version": "29.6.1",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
- "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/schemas": "^29.6.0",
- "@types/istanbul-lib-coverage": "^2.0.0",
- "@types/istanbul-reports": "^3.0.0",
- "@types/node": "*",
- "@types/yargs": "^17.0.8",
- "chalk": "^4.0.0"
- }
- },
- "@types/yargs": {
- "version": "17.0.24",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
- "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@types/yargs-parser": "*"
- }
- },
- "ansi-styles": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
- "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
- "dev": true,
- "optional": true,
- "peer": true
- },
- "babel-jest": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.6.2.tgz",
- "integrity": "sha512-BYCzImLos6J3BH/+HvUCHG1dTf2MzmAB4jaVxHV+29RZLjR29XuYTmsf2sdDwkrb+FczkGo3kOhE7ga6sI0P4A==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/transform": "^29.6.2",
- "@types/babel__core": "^7.1.14",
- "babel-plugin-istanbul": "^6.1.1",
- "babel-preset-jest": "^29.5.0",
- "chalk": "^4.0.0",
- "graceful-fs": "^4.2.9",
- "slash": "^3.0.0"
- }
- },
- "babel-plugin-jest-hoist": {
- "version": "29.5.0",
- "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.5.0.tgz",
- "integrity": "sha512-zSuuuAlTMT4mzLj2nPnUm6fsE6270vdOfnpbJ+RmruU75UhLFvL0N2NgI7xpeS7NaB6hGqmd5pVpGTDYvi4Q3w==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@babel/template": "^7.3.3",
- "@babel/types": "^7.3.3",
- "@types/babel__core": "^7.1.14",
- "@types/babel__traverse": "^7.0.6"
- }
- },
- "babel-preset-jest": {
- "version": "29.5.0",
- "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.5.0.tgz",
- "integrity": "sha512-JOMloxOqdiBSxMAzjRaH023/vvcaSaec49zvg+2LmNsktC7ei39LTJGw02J+9uUtTZUq6xbLyJ4dxe9sSmIuAg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "babel-plugin-jest-hoist": "^29.5.0",
- "babel-preset-current-node-syntax": "^1.0.0"
- }
- },
- "convert-source-map": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
- "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
- "dev": true,
- "optional": true,
- "peer": true
- },
- "jest-get-type": {
- "version": "29.4.3",
- "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
- "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==",
- "dev": true,
- "optional": true,
- "peer": true
- },
- "jest-haste-map": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.6.2.tgz",
- "integrity": "sha512-+51XleTDAAysvU8rT6AnS1ZJ+WHVNqhj1k6nTvN2PYP+HjU3kqlaKQ1Lnw3NYW3bm2r8vq82X0Z1nDDHZMzHVA==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/types": "^29.6.1",
- "@types/graceful-fs": "^4.1.3",
- "@types/node": "*",
- "anymatch": "^3.0.3",
- "fb-watchman": "^2.0.0",
- "fsevents": "^2.3.2",
- "graceful-fs": "^4.2.9",
- "jest-regex-util": "^29.4.3",
- "jest-util": "^29.6.2",
- "jest-worker": "^29.6.2",
- "micromatch": "^4.0.4",
- "walker": "^1.0.8"
- }
- },
- "jest-regex-util": {
- "version": "29.4.3",
- "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.4.3.tgz",
- "integrity": "sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==",
- "dev": true,
- "optional": true,
- "peer": true
- },
- "jest-resolve": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.6.2.tgz",
- "integrity": "sha512-G/iQUvZWI5e3SMFssc4ug4dH0aZiZpsDq9o1PtXTV1210Ztyb2+w+ZgQkB3iOiC5SmAEzJBOHWz6Hvrd+QnNPw==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "chalk": "^4.0.0",
- "graceful-fs": "^4.2.9",
- "jest-haste-map": "^29.6.2",
- "jest-pnp-resolver": "^1.2.2",
- "jest-util": "^29.6.2",
- "jest-validate": "^29.6.2",
- "resolve": "^1.20.0",
- "resolve.exports": "^2.0.0",
- "slash": "^3.0.0"
- }
- },
- "jest-util": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
- "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/types": "^29.6.1",
- "@types/node": "*",
- "chalk": "^4.0.0",
- "ci-info": "^3.2.0",
- "graceful-fs": "^4.2.9",
- "picomatch": "^2.2.3"
- }
- },
- "jest-validate": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.6.2.tgz",
- "integrity": "sha512-vGz0yMN5fUFRRbpJDPwxMpgSXW1LDKROHfBopAvDcmD6s+B/s8WJrwi+4bfH4SdInBA5C3P3BI19dBtKzx1Arg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/types": "^29.6.1",
- "camelcase": "^6.2.0",
- "chalk": "^4.0.0",
- "jest-get-type": "^29.4.3",
- "leven": "^3.1.0",
- "pretty-format": "^29.6.2"
- }
- },
- "jest-worker": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.2.tgz",
- "integrity": "sha512-l3ccBOabTdkng8I/ORCkADz4eSMKejTYv1vB/Z83UiubqhC1oQ5Li6dWCyqOIvSifGjUBxuvxvlm6KGK2DtuAQ==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@types/node": "*",
- "jest-util": "^29.6.2",
- "merge-stream": "^2.0.0",
- "supports-color": "^8.0.0"
- }
- },
- "pretty-format": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.2.tgz",
- "integrity": "sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/schemas": "^29.6.0",
- "ansi-styles": "^5.0.0",
- "react-is": "^18.0.0"
- }
- },
- "resolve.exports": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz",
- "integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==",
- "dev": true,
- "optional": true,
- "peer": true
- },
- "supports-color": {
- "version": "8.1.1",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
- "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "has-flag": "^4.0.0"
- }
- },
- "write-file-atomic": {
- "version": "4.0.2",
- "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
- "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "imurmurhash": "^0.1.4",
- "signal-exit": "^3.0.7"
- }
- }
- }
- },
- "jest-diff": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.6.2.tgz",
- "integrity": "sha512-t+ST7CB9GX5F2xKwhwCf0TAR17uNDiaPTZnVymP9lw0lssa9vG+AFyDZoeIHStU3WowFFwT+ky+er0WVl2yGhA==",
- "dev": true,
- "requires": {
- "chalk": "^4.0.0",
- "diff-sequences": "^29.4.3",
- "jest-get-type": "^29.4.3",
- "pretty-format": "^29.6.2"
- },
- "dependencies": {
- "ansi-styles": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
- "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
- "dev": true
- },
- "jest-get-type": {
- "version": "29.4.3",
- "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
- "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==",
- "dev": true
- },
- "pretty-format": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.2.tgz",
- "integrity": "sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==",
- "dev": true,
- "requires": {
- "@jest/schemas": "^29.6.0",
- "ansi-styles": "^5.0.0",
- "react-is": "^18.0.0"
- }
- }
- }
- },
- "jest-docblock": {
- "version": "29.4.3",
- "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.4.3.tgz",
- "integrity": "sha512-fzdTftThczeSD9nZ3fzA/4KkHtnmllawWrXO69vtI+L9WjEIuXWs4AmyME7lN5hU7dB0sHhuPfcKofRsUb/2Fg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "detect-newline": "^3.0.0"
- }
- },
- "jest-each": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.6.2.tgz",
- "integrity": "sha512-MsrsqA0Ia99cIpABBc3izS1ZYoYfhIy0NNWqPSE0YXbQjwchyt6B1HD2khzyPe1WiJA7hbxXy77ZoUQxn8UlSw==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/types": "^29.6.1",
- "chalk": "^4.0.0",
- "jest-get-type": "^29.4.3",
- "jest-util": "^29.6.2",
- "pretty-format": "^29.6.2"
- },
- "dependencies": {
- "@jest/types": {
- "version": "29.6.1",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
- "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/schemas": "^29.6.0",
- "@types/istanbul-lib-coverage": "^2.0.0",
- "@types/istanbul-reports": "^3.0.0",
- "@types/node": "*",
- "@types/yargs": "^17.0.8",
- "chalk": "^4.0.0"
- }
- },
- "@types/yargs": {
- "version": "17.0.24",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
- "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@types/yargs-parser": "*"
- }
- },
- "ansi-styles": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
- "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
- "dev": true,
- "optional": true,
- "peer": true
- },
- "jest-get-type": {
- "version": "29.4.3",
- "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
- "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==",
- "dev": true,
- "optional": true,
- "peer": true
- },
- "jest-util": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
- "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/types": "^29.6.1",
- "@types/node": "*",
- "chalk": "^4.0.0",
- "ci-info": "^3.2.0",
- "graceful-fs": "^4.2.9",
- "picomatch": "^2.2.3"
- }
- },
- "pretty-format": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.2.tgz",
- "integrity": "sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/schemas": "^29.6.0",
- "ansi-styles": "^5.0.0",
- "react-is": "^18.0.0"
- }
- }
- }
- },
- "jest-environment-jsdom": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.5.1.tgz",
- "integrity": "sha512-TFBvkTC1Hnnnrka/fUb56atfDtJ9VMZ94JkjTbggl1PEpwrYtUBKMezB3inLmWqQsXYLcMwNoDQwoBTAvFfsfw==",
- "requires": {
- "@jest/environment": "^27.5.1",
- "@jest/fake-timers": "^27.5.1",
- "@jest/types": "^27.5.1",
- "@types/node": "*",
- "jest-mock": "^27.5.1",
- "jest-util": "^27.5.1",
- "jsdom": "^16.6.0"
- },
- "dependencies": {
- "@jest/environment": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.5.1.tgz",
- "integrity": "sha512-/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA==",
- "requires": {
- "@jest/fake-timers": "^27.5.1",
- "@jest/types": "^27.5.1",
- "@types/node": "*",
- "jest-mock": "^27.5.1"
- }
- },
- "@jest/fake-timers": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.5.1.tgz",
- "integrity": "sha512-/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ==",
- "requires": {
- "@jest/types": "^27.5.1",
- "@sinonjs/fake-timers": "^8.0.1",
- "@types/node": "*",
- "jest-message-util": "^27.5.1",
- "jest-mock": "^27.5.1",
- "jest-util": "^27.5.1"
- }
- },
- "@sinonjs/commons": {
- "version": "1.8.6",
- "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz",
- "integrity": "sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==",
- "requires": {
- "type-detect": "4.0.8"
- }
- },
- "@sinonjs/fake-timers": {
- "version": "8.1.0",
- "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz",
- "integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==",
- "requires": {
- "@sinonjs/commons": "^1.7.0"
- }
- },
- "jest-message-util": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
- "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
- "requires": {
- "@babel/code-frame": "^7.12.13",
- "@jest/types": "^27.5.1",
- "@types/stack-utils": "^2.0.0",
- "chalk": "^4.0.0",
- "graceful-fs": "^4.2.9",
- "micromatch": "^4.0.4",
- "pretty-format": "^27.5.1",
- "slash": "^3.0.0",
- "stack-utils": "^2.0.3"
- }
- },
- "jest-mock": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.5.1.tgz",
- "integrity": "sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og==",
- "requires": {
- "@jest/types": "^27.5.1",
- "@types/node": "*"
- }
- }
- }
- },
- "jest-environment-node": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.6.2.tgz",
- "integrity": "sha512-YGdFeZ3T9a+/612c5mTQIllvWkddPbYcN2v95ZH24oWMbGA4GGS2XdIF92QMhUhvrjjuQWYgUGW2zawOyH63MQ==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/environment": "^29.6.2",
- "@jest/fake-timers": "^29.6.2",
- "@jest/types": "^29.6.1",
- "@types/node": "*",
- "jest-mock": "^29.6.2",
- "jest-util": "^29.6.2"
- },
- "dependencies": {
- "@jest/types": {
- "version": "29.6.1",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
- "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/schemas": "^29.6.0",
- "@types/istanbul-lib-coverage": "^2.0.0",
- "@types/istanbul-reports": "^3.0.0",
- "@types/node": "*",
- "@types/yargs": "^17.0.8",
- "chalk": "^4.0.0"
- }
- },
- "@types/yargs": {
- "version": "17.0.24",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
- "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@types/yargs-parser": "*"
- }
- },
- "jest-util": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
- "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/types": "^29.6.1",
- "@types/node": "*",
- "chalk": "^4.0.0",
- "ci-info": "^3.2.0",
- "graceful-fs": "^4.2.9",
- "picomatch": "^2.2.3"
- }
- }
- }
- },
- "jest-get-type": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz",
- "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw=="
- },
- "jest-haste-map": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.5.1.tgz",
- "integrity": "sha512-7GgkZ4Fw4NFbMSDSpZwXeBiIbx+t/46nJ2QitkOjvwPYyZmqttu2TDSimMHP1EkPOi4xUZAN1doE5Vd25H4Jng==",
- "requires": {
- "@jest/types": "^27.5.1",
- "@types/graceful-fs": "^4.1.2",
- "@types/node": "*",
- "anymatch": "^3.0.3",
- "fb-watchman": "^2.0.0",
- "fsevents": "^2.3.2",
- "graceful-fs": "^4.2.9",
- "jest-regex-util": "^27.5.1",
- "jest-serializer": "^27.5.1",
- "jest-util": "^27.5.1",
- "jest-worker": "^27.5.1",
- "micromatch": "^4.0.4",
- "walker": "^1.0.7"
- }
- },
- "jest-jasmine2": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.5.1.tgz",
- "integrity": "sha512-jtq7VVyG8SqAorDpApwiJJImd0V2wv1xzdheGHRGyuT7gZm6gG47QEskOlzsN1PG/6WNaCo5pmwMHDf3AkG2pQ==",
- "requires": {
- "@jest/environment": "^27.5.1",
- "@jest/source-map": "^27.5.1",
- "@jest/test-result": "^27.5.1",
- "@jest/types": "^27.5.1",
- "@types/node": "*",
- "chalk": "^4.0.0",
- "co": "^4.6.0",
- "expect": "^27.5.1",
- "is-generator-fn": "^2.0.0",
- "jest-each": "^27.5.1",
- "jest-matcher-utils": "^27.5.1",
- "jest-message-util": "^27.5.1",
- "jest-runtime": "^27.5.1",
- "jest-snapshot": "^27.5.1",
- "jest-util": "^27.5.1",
- "pretty-format": "^27.5.1",
- "throat": "^6.0.1"
- },
- "dependencies": {
- "@jest/console": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.5.1.tgz",
- "integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==",
- "requires": {
- "@jest/types": "^27.5.1",
- "@types/node": "*",
- "chalk": "^4.0.0",
- "jest-message-util": "^27.5.1",
- "jest-util": "^27.5.1",
- "slash": "^3.0.0"
- }
- },
- "@jest/environment": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.5.1.tgz",
- "integrity": "sha512-/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA==",
- "requires": {
- "@jest/fake-timers": "^27.5.1",
- "@jest/types": "^27.5.1",
- "@types/node": "*",
- "jest-mock": "^27.5.1"
- }
- },
- "@jest/fake-timers": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.5.1.tgz",
- "integrity": "sha512-/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ==",
- "requires": {
- "@jest/types": "^27.5.1",
- "@sinonjs/fake-timers": "^8.0.1",
- "@types/node": "*",
- "jest-message-util": "^27.5.1",
- "jest-mock": "^27.5.1",
- "jest-util": "^27.5.1"
- }
- },
- "@jest/globals": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-27.5.1.tgz",
- "integrity": "sha512-ZEJNB41OBQQgGzgyInAv0UUfDDj3upmHydjieSxFvTRuZElrx7tXg/uVQ5hYVEwiXs3+aMsAeEc9X7xiSKCm4Q==",
- "requires": {
- "@jest/environment": "^27.5.1",
- "@jest/types": "^27.5.1",
- "expect": "^27.5.1"
- }
- },
- "@jest/source-map": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-27.5.1.tgz",
- "integrity": "sha512-y9NIHUYF3PJRlHk98NdC/N1gl88BL08aQQgu4k4ZopQkCw9t9cV8mtl3TV8b/YCB8XaVTFrmUTAJvjsntDireg==",
- "requires": {
- "callsites": "^3.0.0",
- "graceful-fs": "^4.2.9",
- "source-map": "^0.6.0"
- }
- },
- "@jest/test-result": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.5.1.tgz",
- "integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==",
- "requires": {
- "@jest/console": "^27.5.1",
- "@jest/types": "^27.5.1",
- "@types/istanbul-lib-coverage": "^2.0.0",
- "collect-v8-coverage": "^1.0.0"
- }
- },
- "@sinonjs/commons": {
- "version": "1.8.6",
- "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz",
- "integrity": "sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==",
- "requires": {
- "type-detect": "4.0.8"
- }
- },
- "@sinonjs/fake-timers": {
- "version": "8.1.0",
- "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz",
- "integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==",
- "requires": {
- "@sinonjs/commons": "^1.7.0"
- }
- },
- "diff-sequences": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.5.1.tgz",
- "integrity": "sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ=="
- },
- "expect": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/expect/-/expect-27.5.1.tgz",
- "integrity": "sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==",
- "requires": {
- "@jest/types": "^27.5.1",
- "jest-get-type": "^27.5.1",
- "jest-matcher-utils": "^27.5.1",
- "jest-message-util": "^27.5.1"
- }
- },
- "jest-diff": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.1.tgz",
- "integrity": "sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==",
- "requires": {
- "chalk": "^4.0.0",
- "diff-sequences": "^27.5.1",
- "jest-get-type": "^27.5.1",
- "pretty-format": "^27.5.1"
- }
- },
- "jest-each": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-27.5.1.tgz",
- "integrity": "sha512-1Ff6p+FbhT/bXQnEouYy00bkNSY7OUpfIcmdl8vZ31A1UUaurOLPA8a8BbJOF2RDUElwJhmeaV7LnagI+5UwNQ==",
- "requires": {
- "@jest/types": "^27.5.1",
- "chalk": "^4.0.0",
- "jest-get-type": "^27.5.1",
- "jest-util": "^27.5.1",
- "pretty-format": "^27.5.1"
- }
- },
- "jest-matcher-utils": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz",
- "integrity": "sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==",
- "requires": {
- "chalk": "^4.0.0",
- "jest-diff": "^27.5.1",
- "jest-get-type": "^27.5.1",
- "pretty-format": "^27.5.1"
- }
- },
- "jest-message-util": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
- "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
- "requires": {
- "@babel/code-frame": "^7.12.13",
- "@jest/types": "^27.5.1",
- "@types/stack-utils": "^2.0.0",
- "chalk": "^4.0.0",
- "graceful-fs": "^4.2.9",
- "micromatch": "^4.0.4",
- "pretty-format": "^27.5.1",
- "slash": "^3.0.0",
- "stack-utils": "^2.0.3"
- }
- },
- "jest-mock": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.5.1.tgz",
- "integrity": "sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og==",
- "requires": {
- "@jest/types": "^27.5.1",
- "@types/node": "*"
- }
- },
- "jest-runtime": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.5.1.tgz",
- "integrity": "sha512-o7gxw3Gf+H2IGt8fv0RiyE1+r83FJBRruoA+FXrlHw6xEyBsU8ugA6IPfTdVyA0w8HClpbK+DGJxH59UrNMx8A==",
- "requires": {
- "@jest/environment": "^27.5.1",
- "@jest/fake-timers": "^27.5.1",
- "@jest/globals": "^27.5.1",
- "@jest/source-map": "^27.5.1",
- "@jest/test-result": "^27.5.1",
- "@jest/transform": "^27.5.1",
- "@jest/types": "^27.5.1",
- "chalk": "^4.0.0",
- "cjs-module-lexer": "^1.0.0",
- "collect-v8-coverage": "^1.0.0",
- "execa": "^5.0.0",
- "glob": "^7.1.3",
- "graceful-fs": "^4.2.9",
- "jest-haste-map": "^27.5.1",
- "jest-message-util": "^27.5.1",
- "jest-mock": "^27.5.1",
- "jest-regex-util": "^27.5.1",
- "jest-resolve": "^27.5.1",
- "jest-snapshot": "^27.5.1",
- "jest-util": "^27.5.1",
- "slash": "^3.0.0",
- "strip-bom": "^4.0.0"
- }
- },
- "jest-snapshot": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.5.1.tgz",
- "integrity": "sha512-yYykXI5a0I31xX67mgeLw1DZ0bJB+gpq5IpSuCAoyDi0+BhgU/RIrL+RTzDmkNTchvDFWKP8lp+w/42Z3us5sA==",
- "requires": {
- "@babel/core": "^7.7.2",
- "@babel/generator": "^7.7.2",
- "@babel/plugin-syntax-typescript": "^7.7.2",
- "@babel/traverse": "^7.7.2",
- "@babel/types": "^7.0.0",
- "@jest/transform": "^27.5.1",
- "@jest/types": "^27.5.1",
- "@types/babel__traverse": "^7.0.4",
- "@types/prettier": "^2.1.5",
- "babel-preset-current-node-syntax": "^1.0.0",
- "chalk": "^4.0.0",
- "expect": "^27.5.1",
- "graceful-fs": "^4.2.9",
- "jest-diff": "^27.5.1",
- "jest-get-type": "^27.5.1",
- "jest-haste-map": "^27.5.1",
- "jest-matcher-utils": "^27.5.1",
- "jest-message-util": "^27.5.1",
- "jest-util": "^27.5.1",
- "natural-compare": "^1.4.0",
- "pretty-format": "^27.5.1",
- "semver": "^7.3.2"
- }
- },
- "lru-cache": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
- "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
- "requires": {
- "yallist": "^4.0.0"
- }
- },
- "semver": {
- "version": "7.5.4",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
- "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
- "requires": {
- "lru-cache": "^6.0.0"
- }
- },
- "source-map": {
- "version": "0.6.1",
- "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
- "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
- },
- "yallist": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
- "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
- }
- }
- },
- "jest-leak-detector": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.6.2.tgz",
- "integrity": "sha512-aNqYhfp5uYEO3tdWMb2bfWv6f0b4I0LOxVRpnRLAeque2uqOVVMLh6khnTcE2qJ5wAKop0HcreM1btoysD6bPQ==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "jest-get-type": "^29.4.3",
- "pretty-format": "^29.6.2"
- },
- "dependencies": {
- "ansi-styles": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
- "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
- "dev": true,
- "optional": true,
- "peer": true
- },
- "jest-get-type": {
- "version": "29.4.3",
- "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
- "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==",
- "dev": true,
- "optional": true,
- "peer": true
- },
- "pretty-format": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.2.tgz",
- "integrity": "sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/schemas": "^29.6.0",
- "ansi-styles": "^5.0.0",
- "react-is": "^18.0.0"
- }
- }
- }
- },
- "jest-matcher-utils": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.6.2.tgz",
- "integrity": "sha512-4LiAk3hSSobtomeIAzFTe+N8kL6z0JtF3n6I4fg29iIW7tt99R7ZcIFW34QkX+DuVrf+CUe6wuVOpm7ZKFJzZQ==",
- "dev": true,
- "requires": {
- "chalk": "^4.0.0",
- "jest-diff": "^29.6.2",
- "jest-get-type": "^29.4.3",
- "pretty-format": "^29.6.2"
- },
- "dependencies": {
- "ansi-styles": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
- "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
- "dev": true
- },
- "jest-get-type": {
- "version": "29.4.3",
- "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
- "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==",
- "dev": true
- },
- "pretty-format": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.2.tgz",
- "integrity": "sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==",
- "dev": true,
- "requires": {
- "@jest/schemas": "^29.6.0",
- "ansi-styles": "^5.0.0",
- "react-is": "^18.0.0"
- }
- }
- }
- },
- "jest-message-util": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.6.2.tgz",
- "integrity": "sha512-vnIGYEjoPSuRqV8W9t+Wow95SDp6KPX2Uf7EoeG9G99J2OVh7OSwpS4B6J0NfpEIpfkBNHlBZpA2rblEuEFhZQ==",
- "dev": true,
- "requires": {
- "@babel/code-frame": "^7.12.13",
- "@jest/types": "^29.6.1",
- "@types/stack-utils": "^2.0.0",
- "chalk": "^4.0.0",
- "graceful-fs": "^4.2.9",
- "micromatch": "^4.0.4",
- "pretty-format": "^29.6.2",
- "slash": "^3.0.0",
- "stack-utils": "^2.0.3"
- },
- "dependencies": {
- "@jest/types": {
- "version": "29.6.1",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
- "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
- "dev": true,
- "requires": {
- "@jest/schemas": "^29.6.0",
- "@types/istanbul-lib-coverage": "^2.0.0",
- "@types/istanbul-reports": "^3.0.0",
- "@types/node": "*",
- "@types/yargs": "^17.0.8",
- "chalk": "^4.0.0"
- }
- },
- "@types/yargs": {
- "version": "17.0.24",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
- "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
- "dev": true,
- "requires": {
- "@types/yargs-parser": "*"
- }
- },
- "ansi-styles": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
- "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
- "dev": true
- },
- "pretty-format": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.2.tgz",
- "integrity": "sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==",
- "dev": true,
- "requires": {
- "@jest/schemas": "^29.6.0",
- "ansi-styles": "^5.0.0",
- "react-is": "^18.0.0"
- }
- }
- }
- },
- "jest-mock": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.6.2.tgz",
- "integrity": "sha512-hoSv3lb3byzdKfwqCuT6uTscan471GUECqgNYykg6ob0yiAw3zYc7OrPnI9Qv8Wwoa4lC7AZ9hyS4AiIx5U2zg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/types": "^29.6.1",
- "@types/node": "*",
- "jest-util": "^29.6.2"
- },
- "dependencies": {
- "@jest/types": {
- "version": "29.6.1",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
- "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/schemas": "^29.6.0",
- "@types/istanbul-lib-coverage": "^2.0.0",
- "@types/istanbul-reports": "^3.0.0",
- "@types/node": "*",
- "@types/yargs": "^17.0.8",
- "chalk": "^4.0.0"
- }
- },
- "@types/yargs": {
- "version": "17.0.24",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
- "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@types/yargs-parser": "*"
- }
- },
- "jest-util": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
- "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/types": "^29.6.1",
- "@types/node": "*",
- "chalk": "^4.0.0",
- "ci-info": "^3.2.0",
- "graceful-fs": "^4.2.9",
- "picomatch": "^2.2.3"
- }
- }
- }
- },
- "jest-pnp-resolver": {
- "version": "1.2.3",
- "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",
- "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==",
- "requires": {}
- },
- "jest-regex-util": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.5.1.tgz",
- "integrity": "sha512-4bfKq2zie+x16okqDXjXn9ql2B0dScQu+vcwe4TvFVhkVyuWLqpZrZtXxLLWoXYgn0E87I6r6GRYHF7wFZBUvg=="
- },
- "jest-resolve": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.5.1.tgz",
- "integrity": "sha512-FFDy8/9E6CV83IMbDpcjOhumAQPDyETnU2KZ1O98DwTnz8AOBsW/Xv3GySr1mOZdItLR+zDZ7I/UdTFbgSOVCw==",
- "requires": {
- "@jest/types": "^27.5.1",
- "chalk": "^4.0.0",
- "graceful-fs": "^4.2.9",
- "jest-haste-map": "^27.5.1",
- "jest-pnp-resolver": "^1.2.2",
- "jest-util": "^27.5.1",
- "jest-validate": "^27.5.1",
- "resolve": "^1.20.0",
- "resolve.exports": "^1.1.0",
- "slash": "^3.0.0"
- }
- },
- "jest-resolve-dependencies": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.6.2.tgz",
- "integrity": "sha512-LGqjDWxg2fuQQm7ypDxduLu/m4+4Lb4gczc13v51VMZbVP5tSBILqVx8qfWcsdP8f0G7aIqByIALDB0R93yL+w==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "jest-regex-util": "^29.4.3",
- "jest-snapshot": "^29.6.2"
- },
- "dependencies": {
- "jest-regex-util": {
- "version": "29.4.3",
- "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.4.3.tgz",
- "integrity": "sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==",
- "dev": true,
- "optional": true,
- "peer": true
- }
- }
- },
- "jest-runner": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.6.2.tgz",
- "integrity": "sha512-wXOT/a0EspYgfMiYHxwGLPCZfC0c38MivAlb2lMEAlwHINKemrttu1uSbcGbfDV31sFaPWnWJPmb2qXM8pqZ4w==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/console": "^29.6.2",
- "@jest/environment": "^29.6.2",
- "@jest/test-result": "^29.6.2",
- "@jest/transform": "^29.6.2",
- "@jest/types": "^29.6.1",
- "@types/node": "*",
- "chalk": "^4.0.0",
- "emittery": "^0.13.1",
- "graceful-fs": "^4.2.9",
- "jest-docblock": "^29.4.3",
- "jest-environment-node": "^29.6.2",
- "jest-haste-map": "^29.6.2",
- "jest-leak-detector": "^29.6.2",
- "jest-message-util": "^29.6.2",
- "jest-resolve": "^29.6.2",
- "jest-runtime": "^29.6.2",
- "jest-util": "^29.6.2",
- "jest-watcher": "^29.6.2",
- "jest-worker": "^29.6.2",
- "p-limit": "^3.1.0",
- "source-map-support": "0.5.13"
- },
- "dependencies": {
- "@jest/transform": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.6.2.tgz",
- "integrity": "sha512-ZqCqEISr58Ce3U+buNFJYUktLJZOggfyvR+bZMaiV1e8B1SIvJbwZMrYz3gx/KAPn9EXmOmN+uB08yLCjWkQQg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@babel/core": "^7.11.6",
- "@jest/types": "^29.6.1",
- "@jridgewell/trace-mapping": "^0.3.18",
- "babel-plugin-istanbul": "^6.1.1",
- "chalk": "^4.0.0",
- "convert-source-map": "^2.0.0",
- "fast-json-stable-stringify": "^2.1.0",
- "graceful-fs": "^4.2.9",
- "jest-haste-map": "^29.6.2",
- "jest-regex-util": "^29.4.3",
- "jest-util": "^29.6.2",
- "micromatch": "^4.0.4",
- "pirates": "^4.0.4",
- "slash": "^3.0.0",
- "write-file-atomic": "^4.0.2"
- }
- },
- "@jest/types": {
- "version": "29.6.1",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
- "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/schemas": "^29.6.0",
- "@types/istanbul-lib-coverage": "^2.0.0",
- "@types/istanbul-reports": "^3.0.0",
- "@types/node": "*",
- "@types/yargs": "^17.0.8",
- "chalk": "^4.0.0"
- }
- },
- "@types/yargs": {
- "version": "17.0.24",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
- "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@types/yargs-parser": "*"
- }
- },
- "ansi-styles": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
- "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
- "dev": true,
- "optional": true,
- "peer": true
- },
- "convert-source-map": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
- "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
- "dev": true,
- "optional": true,
- "peer": true
- },
- "jest-get-type": {
- "version": "29.4.3",
- "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
- "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==",
- "dev": true,
- "optional": true,
- "peer": true
- },
- "jest-haste-map": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.6.2.tgz",
- "integrity": "sha512-+51XleTDAAysvU8rT6AnS1ZJ+WHVNqhj1k6nTvN2PYP+HjU3kqlaKQ1Lnw3NYW3bm2r8vq82X0Z1nDDHZMzHVA==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/types": "^29.6.1",
- "@types/graceful-fs": "^4.1.3",
- "@types/node": "*",
- "anymatch": "^3.0.3",
- "fb-watchman": "^2.0.0",
- "fsevents": "^2.3.2",
- "graceful-fs": "^4.2.9",
- "jest-regex-util": "^29.4.3",
- "jest-util": "^29.6.2",
- "jest-worker": "^29.6.2",
- "micromatch": "^4.0.4",
- "walker": "^1.0.8"
- }
- },
- "jest-regex-util": {
- "version": "29.4.3",
- "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.4.3.tgz",
- "integrity": "sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==",
- "dev": true,
- "optional": true,
- "peer": true
- },
- "jest-resolve": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.6.2.tgz",
- "integrity": "sha512-G/iQUvZWI5e3SMFssc4ug4dH0aZiZpsDq9o1PtXTV1210Ztyb2+w+ZgQkB3iOiC5SmAEzJBOHWz6Hvrd+QnNPw==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "chalk": "^4.0.0",
- "graceful-fs": "^4.2.9",
- "jest-haste-map": "^29.6.2",
- "jest-pnp-resolver": "^1.2.2",
- "jest-util": "^29.6.2",
- "jest-validate": "^29.6.2",
- "resolve": "^1.20.0",
- "resolve.exports": "^2.0.0",
- "slash": "^3.0.0"
- }
- },
- "jest-util": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
- "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/types": "^29.6.1",
- "@types/node": "*",
- "chalk": "^4.0.0",
- "ci-info": "^3.2.0",
- "graceful-fs": "^4.2.9",
- "picomatch": "^2.2.3"
- }
- },
- "jest-validate": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.6.2.tgz",
- "integrity": "sha512-vGz0yMN5fUFRRbpJDPwxMpgSXW1LDKROHfBopAvDcmD6s+B/s8WJrwi+4bfH4SdInBA5C3P3BI19dBtKzx1Arg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/types": "^29.6.1",
- "camelcase": "^6.2.0",
- "chalk": "^4.0.0",
- "jest-get-type": "^29.4.3",
- "leven": "^3.1.0",
- "pretty-format": "^29.6.2"
- }
- },
- "jest-worker": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.2.tgz",
- "integrity": "sha512-l3ccBOabTdkng8I/ORCkADz4eSMKejTYv1vB/Z83UiubqhC1oQ5Li6dWCyqOIvSifGjUBxuvxvlm6KGK2DtuAQ==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@types/node": "*",
- "jest-util": "^29.6.2",
- "merge-stream": "^2.0.0",
- "supports-color": "^8.0.0"
- }
- },
- "p-limit": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
- "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "yocto-queue": "^0.1.0"
- }
- },
- "pretty-format": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.2.tgz",
- "integrity": "sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/schemas": "^29.6.0",
- "ansi-styles": "^5.0.0",
- "react-is": "^18.0.0"
- }
- },
- "resolve.exports": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz",
- "integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==",
- "dev": true,
- "optional": true,
- "peer": true
- },
- "source-map": {
- "version": "0.6.1",
- "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
- "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
- "dev": true,
- "optional": true,
- "peer": true
- },
- "source-map-support": {
- "version": "0.5.13",
- "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
- "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "buffer-from": "^1.0.0",
- "source-map": "^0.6.0"
- }
- },
- "supports-color": {
- "version": "8.1.1",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
- "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "has-flag": "^4.0.0"
- }
- },
- "write-file-atomic": {
- "version": "4.0.2",
- "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
- "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "imurmurhash": "^0.1.4",
- "signal-exit": "^3.0.7"
- }
- }
- }
- },
- "jest-runtime": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.6.2.tgz",
- "integrity": "sha512-2X9dqK768KufGJyIeLmIzToDmsN0m7Iek8QNxRSI/2+iPFYHF0jTwlO3ftn7gdKd98G/VQw9XJCk77rbTGZnJg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/environment": "^29.6.2",
- "@jest/fake-timers": "^29.6.2",
- "@jest/globals": "^29.6.2",
- "@jest/source-map": "^29.6.0",
- "@jest/test-result": "^29.6.2",
- "@jest/transform": "^29.6.2",
- "@jest/types": "^29.6.1",
- "@types/node": "*",
- "chalk": "^4.0.0",
- "cjs-module-lexer": "^1.0.0",
- "collect-v8-coverage": "^1.0.0",
- "glob": "^7.1.3",
- "graceful-fs": "^4.2.9",
- "jest-haste-map": "^29.6.2",
- "jest-message-util": "^29.6.2",
- "jest-mock": "^29.6.2",
- "jest-regex-util": "^29.4.3",
- "jest-resolve": "^29.6.2",
- "jest-snapshot": "^29.6.2",
- "jest-util": "^29.6.2",
- "slash": "^3.0.0",
- "strip-bom": "^4.0.0"
- },
- "dependencies": {
- "@jest/transform": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.6.2.tgz",
- "integrity": "sha512-ZqCqEISr58Ce3U+buNFJYUktLJZOggfyvR+bZMaiV1e8B1SIvJbwZMrYz3gx/KAPn9EXmOmN+uB08yLCjWkQQg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@babel/core": "^7.11.6",
- "@jest/types": "^29.6.1",
- "@jridgewell/trace-mapping": "^0.3.18",
- "babel-plugin-istanbul": "^6.1.1",
- "chalk": "^4.0.0",
- "convert-source-map": "^2.0.0",
- "fast-json-stable-stringify": "^2.1.0",
- "graceful-fs": "^4.2.9",
- "jest-haste-map": "^29.6.2",
- "jest-regex-util": "^29.4.3",
- "jest-util": "^29.6.2",
- "micromatch": "^4.0.4",
- "pirates": "^4.0.4",
- "slash": "^3.0.0",
- "write-file-atomic": "^4.0.2"
- }
- },
- "@jest/types": {
- "version": "29.6.1",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
- "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/schemas": "^29.6.0",
- "@types/istanbul-lib-coverage": "^2.0.0",
- "@types/istanbul-reports": "^3.0.0",
- "@types/node": "*",
- "@types/yargs": "^17.0.8",
- "chalk": "^4.0.0"
- }
- },
- "@types/yargs": {
- "version": "17.0.24",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
- "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@types/yargs-parser": "*"
- }
- },
- "ansi-styles": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
- "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
- "dev": true,
- "optional": true,
- "peer": true
- },
- "convert-source-map": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
- "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
- "dev": true,
- "optional": true,
- "peer": true
- },
- "jest-get-type": {
- "version": "29.4.3",
- "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
- "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==",
- "dev": true,
- "optional": true,
- "peer": true
- },
- "jest-haste-map": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.6.2.tgz",
- "integrity": "sha512-+51XleTDAAysvU8rT6AnS1ZJ+WHVNqhj1k6nTvN2PYP+HjU3kqlaKQ1Lnw3NYW3bm2r8vq82X0Z1nDDHZMzHVA==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/types": "^29.6.1",
- "@types/graceful-fs": "^4.1.3",
- "@types/node": "*",
- "anymatch": "^3.0.3",
- "fb-watchman": "^2.0.0",
- "fsevents": "^2.3.2",
- "graceful-fs": "^4.2.9",
- "jest-regex-util": "^29.4.3",
- "jest-util": "^29.6.2",
- "jest-worker": "^29.6.2",
- "micromatch": "^4.0.4",
- "walker": "^1.0.8"
- }
- },
- "jest-regex-util": {
- "version": "29.4.3",
- "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.4.3.tgz",
- "integrity": "sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==",
- "dev": true,
- "optional": true,
- "peer": true
- },
- "jest-resolve": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.6.2.tgz",
- "integrity": "sha512-G/iQUvZWI5e3SMFssc4ug4dH0aZiZpsDq9o1PtXTV1210Ztyb2+w+ZgQkB3iOiC5SmAEzJBOHWz6Hvrd+QnNPw==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "chalk": "^4.0.0",
- "graceful-fs": "^4.2.9",
- "jest-haste-map": "^29.6.2",
- "jest-pnp-resolver": "^1.2.2",
- "jest-util": "^29.6.2",
- "jest-validate": "^29.6.2",
- "resolve": "^1.20.0",
- "resolve.exports": "^2.0.0",
- "slash": "^3.0.0"
- }
- },
- "jest-util": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
- "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/types": "^29.6.1",
- "@types/node": "*",
- "chalk": "^4.0.0",
- "ci-info": "^3.2.0",
- "graceful-fs": "^4.2.9",
- "picomatch": "^2.2.3"
- }
- },
- "jest-validate": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.6.2.tgz",
- "integrity": "sha512-vGz0yMN5fUFRRbpJDPwxMpgSXW1LDKROHfBopAvDcmD6s+B/s8WJrwi+4bfH4SdInBA5C3P3BI19dBtKzx1Arg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/types": "^29.6.1",
- "camelcase": "^6.2.0",
- "chalk": "^4.0.0",
- "jest-get-type": "^29.4.3",
- "leven": "^3.1.0",
- "pretty-format": "^29.6.2"
- }
- },
- "jest-worker": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.2.tgz",
- "integrity": "sha512-l3ccBOabTdkng8I/ORCkADz4eSMKejTYv1vB/Z83UiubqhC1oQ5Li6dWCyqOIvSifGjUBxuvxvlm6KGK2DtuAQ==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@types/node": "*",
- "jest-util": "^29.6.2",
- "merge-stream": "^2.0.0",
- "supports-color": "^8.0.0"
- }
- },
- "pretty-format": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.2.tgz",
- "integrity": "sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/schemas": "^29.6.0",
- "ansi-styles": "^5.0.0",
- "react-is": "^18.0.0"
- }
- },
- "resolve.exports": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz",
- "integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==",
- "dev": true,
- "optional": true,
- "peer": true
- },
- "supports-color": {
- "version": "8.1.1",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
- "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "has-flag": "^4.0.0"
- }
- },
- "write-file-atomic": {
- "version": "4.0.2",
- "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
- "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "imurmurhash": "^0.1.4",
- "signal-exit": "^3.0.7"
- }
- }
- }
- },
- "jest-serializer": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-27.5.1.tgz",
- "integrity": "sha512-jZCyo6iIxO1aqUxpuBlwTDMkzOAJS4a3eYz3YzgxxVQFwLeSA7Jfq5cbqCY+JLvTDrWirgusI/0KwxKMgrdf7w==",
- "requires": {
- "@types/node": "*",
- "graceful-fs": "^4.2.9"
- }
- },
- "jest-snapshot": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.6.2.tgz",
- "integrity": "sha512-1OdjqvqmRdGNvWXr/YZHuyhh5DeaLp1p/F8Tht/MrMw4Kr1Uu/j4lRG+iKl1DAqUJDWxtQBMk41Lnf/JETYBRA==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@babel/core": "^7.11.6",
- "@babel/generator": "^7.7.2",
- "@babel/plugin-syntax-jsx": "^7.7.2",
- "@babel/plugin-syntax-typescript": "^7.7.2",
- "@babel/types": "^7.3.3",
- "@jest/expect-utils": "^29.6.2",
- "@jest/transform": "^29.6.2",
- "@jest/types": "^29.6.1",
- "babel-preset-current-node-syntax": "^1.0.0",
- "chalk": "^4.0.0",
- "expect": "^29.6.2",
- "graceful-fs": "^4.2.9",
- "jest-diff": "^29.6.2",
- "jest-get-type": "^29.4.3",
- "jest-matcher-utils": "^29.6.2",
- "jest-message-util": "^29.6.2",
- "jest-util": "^29.6.2",
- "natural-compare": "^1.4.0",
- "pretty-format": "^29.6.2",
- "semver": "^7.5.3"
- },
- "dependencies": {
- "@jest/transform": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.6.2.tgz",
- "integrity": "sha512-ZqCqEISr58Ce3U+buNFJYUktLJZOggfyvR+bZMaiV1e8B1SIvJbwZMrYz3gx/KAPn9EXmOmN+uB08yLCjWkQQg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@babel/core": "^7.11.6",
- "@jest/types": "^29.6.1",
- "@jridgewell/trace-mapping": "^0.3.18",
- "babel-plugin-istanbul": "^6.1.1",
- "chalk": "^4.0.0",
- "convert-source-map": "^2.0.0",
- "fast-json-stable-stringify": "^2.1.0",
- "graceful-fs": "^4.2.9",
- "jest-haste-map": "^29.6.2",
- "jest-regex-util": "^29.4.3",
- "jest-util": "^29.6.2",
- "micromatch": "^4.0.4",
- "pirates": "^4.0.4",
- "slash": "^3.0.0",
- "write-file-atomic": "^4.0.2"
- }
- },
- "@jest/types": {
- "version": "29.6.1",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
- "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/schemas": "^29.6.0",
- "@types/istanbul-lib-coverage": "^2.0.0",
- "@types/istanbul-reports": "^3.0.0",
- "@types/node": "*",
- "@types/yargs": "^17.0.8",
- "chalk": "^4.0.0"
- }
- },
- "@types/yargs": {
- "version": "17.0.24",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
- "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@types/yargs-parser": "*"
- }
- },
- "ansi-styles": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
- "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
- "dev": true,
- "optional": true,
- "peer": true
- },
- "convert-source-map": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
- "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
- "dev": true,
- "optional": true,
- "peer": true
- },
- "jest-get-type": {
- "version": "29.4.3",
- "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
- "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==",
- "dev": true,
- "optional": true,
- "peer": true
- },
- "jest-haste-map": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.6.2.tgz",
- "integrity": "sha512-+51XleTDAAysvU8rT6AnS1ZJ+WHVNqhj1k6nTvN2PYP+HjU3kqlaKQ1Lnw3NYW3bm2r8vq82X0Z1nDDHZMzHVA==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/types": "^29.6.1",
- "@types/graceful-fs": "^4.1.3",
- "@types/node": "*",
- "anymatch": "^3.0.3",
- "fb-watchman": "^2.0.0",
- "fsevents": "^2.3.2",
- "graceful-fs": "^4.2.9",
- "jest-regex-util": "^29.4.3",
- "jest-util": "^29.6.2",
- "jest-worker": "^29.6.2",
- "micromatch": "^4.0.4",
- "walker": "^1.0.8"
- }
- },
- "jest-regex-util": {
- "version": "29.4.3",
- "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.4.3.tgz",
- "integrity": "sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==",
- "dev": true,
- "optional": true,
- "peer": true
- },
- "jest-util": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
- "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/types": "^29.6.1",
- "@types/node": "*",
- "chalk": "^4.0.0",
- "ci-info": "^3.2.0",
- "graceful-fs": "^4.2.9",
- "picomatch": "^2.2.3"
- }
- },
- "jest-worker": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.2.tgz",
- "integrity": "sha512-l3ccBOabTdkng8I/ORCkADz4eSMKejTYv1vB/Z83UiubqhC1oQ5Li6dWCyqOIvSifGjUBxuvxvlm6KGK2DtuAQ==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@types/node": "*",
- "jest-util": "^29.6.2",
- "merge-stream": "^2.0.0",
- "supports-color": "^8.0.0"
- }
- },
- "lru-cache": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
- "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "yallist": "^4.0.0"
- }
- },
- "pretty-format": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.2.tgz",
- "integrity": "sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/schemas": "^29.6.0",
- "ansi-styles": "^5.0.0",
- "react-is": "^18.0.0"
- }
- },
- "semver": {
- "version": "7.5.4",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
- "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "lru-cache": "^6.0.0"
- }
- },
- "supports-color": {
- "version": "8.1.1",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
- "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "has-flag": "^4.0.0"
- }
- },
- "write-file-atomic": {
- "version": "4.0.2",
- "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
- "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "imurmurhash": "^0.1.4",
- "signal-exit": "^3.0.7"
- }
- },
- "yallist": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
- "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
- "dev": true,
- "optional": true,
- "peer": true
- }
- }
- },
- "jest-util": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
- "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
- "requires": {
- "@jest/types": "^27.5.1",
- "@types/node": "*",
- "chalk": "^4.0.0",
- "ci-info": "^3.2.0",
- "graceful-fs": "^4.2.9",
- "picomatch": "^2.2.3"
- }
- },
- "jest-validate": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-27.5.1.tgz",
- "integrity": "sha512-thkNli0LYTmOI1tDB3FI1S1RTp/Bqyd9pTarJwL87OIBFuqEb5Apv5EaApEudYg4g86e3CT6kM0RowkhtEnCBQ==",
- "requires": {
- "@jest/types": "^27.5.1",
- "camelcase": "^6.2.0",
- "chalk": "^4.0.0",
- "jest-get-type": "^27.5.1",
- "leven": "^3.1.0",
- "pretty-format": "^27.5.1"
- }
- },
- "jest-watcher": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.6.2.tgz",
- "integrity": "sha512-GZitlqkMkhkefjfN/p3SJjrDaxPflqxEAv3/ik10OirZqJGYH5rPiIsgVcfof0Tdqg3shQGdEIxDBx+B4tuLzA==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/test-result": "^29.6.2",
- "@jest/types": "^29.6.1",
- "@types/node": "*",
- "ansi-escapes": "^4.2.1",
- "chalk": "^4.0.0",
- "emittery": "^0.13.1",
- "jest-util": "^29.6.2",
- "string-length": "^4.0.1"
- },
- "dependencies": {
- "@jest/types": {
- "version": "29.6.1",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
- "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/schemas": "^29.6.0",
- "@types/istanbul-lib-coverage": "^2.0.0",
- "@types/istanbul-reports": "^3.0.0",
- "@types/node": "*",
- "@types/yargs": "^17.0.8",
- "chalk": "^4.0.0"
- }
- },
- "@types/yargs": {
- "version": "17.0.24",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
- "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@types/yargs-parser": "*"
- }
- },
- "jest-util": {
- "version": "29.6.2",
- "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
- "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jest/types": "^29.6.1",
- "@types/node": "*",
- "chalk": "^4.0.0",
- "ci-info": "^3.2.0",
- "graceful-fs": "^4.2.9",
- "picomatch": "^2.2.3"
- }
- }
- }
- },
- "jest-worker": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
- "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
- "requires": {
- "@types/node": "*",
- "merge-stream": "^2.0.0",
- "supports-color": "^8.0.0"
- },
- "dependencies": {
- "supports-color": {
- "version": "8.1.1",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
- "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
- "requires": {
- "has-flag": "^4.0.0"
- }
- }
- }
- },
- "jiti": {
- "version": "1.18.2",
- "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.18.2.tgz",
- "integrity": "sha512-QAdOptna2NYiSSpv0O/BwoHBSmz4YhpzJHyi+fnMRTXFjp7B8i/YG5Z8IfusxB1ufjcD2Sre1F3R+nX3fvy7gg=="
- },
- "js-tokens": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
- "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
- },
- "js-yaml": {
- "version": "3.14.1",
- "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
- "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
- "requires": {
- "argparse": "^1.0.7",
- "esprima": "^4.0.0"
- }
- },
- "jsdom": {
- "version": "16.7.0",
- "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz",
- "integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==",
- "requires": {
- "abab": "^2.0.5",
- "acorn": "^8.2.4",
- "acorn-globals": "^6.0.0",
- "cssom": "^0.4.4",
- "cssstyle": "^2.3.0",
- "data-urls": "^2.0.0",
- "decimal.js": "^10.2.1",
- "domexception": "^2.0.1",
- "escodegen": "^2.0.0",
- "form-data": "^3.0.0",
- "html-encoding-sniffer": "^2.0.1",
- "http-proxy-agent": "^4.0.1",
- "https-proxy-agent": "^5.0.0",
- "is-potential-custom-element-name": "^1.0.1",
- "nwsapi": "^2.2.0",
- "parse5": "6.0.1",
- "saxes": "^5.0.1",
- "symbol-tree": "^3.2.4",
- "tough-cookie": "^4.0.0",
- "w3c-hr-time": "^1.0.2",
- "w3c-xmlserializer": "^2.0.0",
- "webidl-conversions": "^6.1.0",
- "whatwg-encoding": "^1.0.5",
- "whatwg-mimetype": "^2.3.0",
- "whatwg-url": "^8.5.0",
- "ws": "^7.4.6",
- "xml-name-validator": "^3.0.0"
- }
- },
- "jsesc": {
- "version": "2.5.2",
- "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
- "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="
- },
- "json-parse-even-better-errors": {
- "version": "2.3.1",
- "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
- "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
- },
- "json-schema": {
- "version": "0.4.0",
- "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
- "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA=="
- },
- "json-schema-traverse": {
- "version": "0.4.1",
- "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
- "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
- },
- "json-stable-stringify-without-jsonify": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
- "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw=="
- },
- "json5": {
- "version": "2.2.3",
- "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
- "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="
- },
- "jsonfile": {
- "version": "6.1.0",
- "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
- "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
- "requires": {
- "graceful-fs": "^4.1.6",
- "universalify": "^2.0.0"
- }
- },
- "jsonpointer": {
- "version": "5.0.1",
- "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-5.0.1.tgz",
- "integrity": "sha512-p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ=="
- },
- "jsx-ast-utils": {
- "version": "3.3.3",
- "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.3.tgz",
- "integrity": "sha512-fYQHZTZ8jSfmWZ0iyzfwiU4WDX4HpHbMCZ3gPlWYiCl3BoeOTsqKBqnTVfH2rYT7eP5c3sVbeSPHnnJOaTrWiw==",
- "requires": {
- "array-includes": "^3.1.5",
- "object.assign": "^4.1.3"
- }
- },
- "kind-of": {
- "version": "6.0.3",
- "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
- "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
- },
- "kleur": {
- "version": "3.0.3",
- "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
- "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w=="
- },
- "klona": {
- "version": "2.0.6",
- "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.6.tgz",
- "integrity": "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA=="
- },
- "language-subtag-registry": {
- "version": "0.3.22",
- "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.22.tgz",
- "integrity": "sha512-tN0MCzyWnoz/4nHS6uxdlFWoUZT7ABptwKPQ52Ea7URk6vll88bWBVhodtnlfEuCcKWNGoc+uGbw1cwa9IKh/w=="
- },
- "language-tags": {
- "version": "1.0.5",
- "resolved": "https://registry.npmjs.org/language-tags/-/language-tags-1.0.5.tgz",
- "integrity": "sha512-qJhlO9cGXi6hBGKoxEG/sKZDAHD5Hnu9Hs4WbOY3pCWXDhw0N8x1NenNzm2EnNLkLkk7J2SdxAkDSbb6ftT+UQ==",
- "requires": {
- "language-subtag-registry": "~0.3.2"
- }
- },
- "launch-editor": {
- "version": "2.6.0",
- "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.6.0.tgz",
- "integrity": "sha512-JpDCcQnyAAzZZaZ7vEiSqL690w7dAEyLao+KC96zBplnYbJS7TYNjvM3M7y3dGz+v7aIsJk3hllWuc0kWAjyRQ==",
- "requires": {
- "picocolors": "^1.0.0",
- "shell-quote": "^1.7.3"
- }
- },
- "leven": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
- "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A=="
- },
- "levn": {
- "version": "0.4.1",
- "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
- "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
- "requires": {
- "prelude-ls": "^1.2.1",
- "type-check": "~0.4.0"
- }
- },
- "lilconfig": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz",
- "integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ=="
- },
- "lines-and-columns": {
- "version": "1.2.4",
- "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
- "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
- },
- "loader-runner": {
- "version": "4.3.0",
- "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
- "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg=="
- },
- "loader-utils": {
- "version": "2.0.4",
- "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
- "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
- "requires": {
- "big.js": "^5.2.2",
- "emojis-list": "^3.0.0",
- "json5": "^2.1.2"
- }
- },
- "locate-path": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
- "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
- "requires": {
- "p-locate": "^4.1.0"
- }
- },
- "lodash": {
- "version": "4.17.21",
- "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
- "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
- },
- "lodash.debounce": {
- "version": "4.0.8",
- "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
- "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="
- },
- "lodash.flow": {
- "version": "3.5.0",
- "resolved": "https://registry.npmjs.org/lodash.flow/-/lodash.flow-3.5.0.tgz",
- "integrity": "sha512-ff3BX/tSioo+XojX4MOsOMhJw0nZoUEF011LX8g8d3gvjVbxd89cCio4BCXronjxcTUIJUoqKEUA+n4CqvvRPw=="
- },
- "lodash.memoize": {
- "version": "4.1.2",
- "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
- "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag=="
- },
- "lodash.merge": {
- "version": "4.6.2",
- "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
- "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
- },
- "lodash.sortby": {
- "version": "4.7.0",
- "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
- "integrity": "sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA=="
- },
- "lodash.uniq": {
- "version": "4.5.0",
- "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
- "integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ=="
- },
- "loose-envify": {
- "version": "1.4.0",
- "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
- "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
- "requires": {
- "js-tokens": "^3.0.0 || ^4.0.0"
- }
- },
- "lower-case": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz",
- "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==",
- "requires": {
- "tslib": "^2.0.3"
- }
- },
- "lru-cache": {
- "version": "5.1.1",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
- "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
- "requires": {
- "yallist": "^3.0.2"
- }
- },
- "lz-string": {
- "version": "1.5.0",
- "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.5.0.tgz",
- "integrity": "sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==",
- "dev": true
- },
- "magic-string": {
- "version": "0.25.9",
- "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz",
- "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==",
- "requires": {
- "sourcemap-codec": "^1.4.8"
- }
- },
- "make-dir": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
- "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
- "requires": {
- "semver": "^6.0.0"
- }
- },
- "makeerror": {
- "version": "1.0.12",
- "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
- "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
- "requires": {
- "tmpl": "1.0.5"
- }
- },
- "mdn-data": {
- "version": "2.0.4",
- "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz",
- "integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA=="
- },
- "media-typer": {
- "version": "0.3.0",
- "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
- "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="
- },
- "memfs": {
- "version": "3.5.3",
- "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.5.3.tgz",
- "integrity": "sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==",
- "requires": {
- "fs-monkey": "^1.0.4"
- }
- },
- "merge-descriptors": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
- "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="
- },
- "merge-stream": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
- "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="
- },
- "merge2": {
- "version": "1.4.1",
- "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
- "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="
- },
- "methods": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
- "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w=="
- },
- "micromatch": {
- "version": "4.0.5",
- "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
- "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
- "requires": {
- "braces": "^3.0.2",
- "picomatch": "^2.3.1"
- }
- },
- "mime": {
- "version": "1.6.0",
- "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
- "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
- },
- "mime-db": {
- "version": "1.52.0",
- "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
- "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
- },
- "mime-types": {
- "version": "2.1.35",
- "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
- "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
- "requires": {
- "mime-db": "1.52.0"
- }
- },
- "mimic-fn": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
- "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
- },
- "min-indent": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
- "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
- "dev": true
- },
- "mini-css-extract-plugin": {
- "version": "2.7.6",
- "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.6.tgz",
- "integrity": "sha512-Qk7HcgaPkGG6eD77mLvZS1nmxlao3j+9PkrT9Uc7HAE1id3F41+DdBRYRYkbyfNRGzm8/YWtzhw7nVPmwhqTQw==",
- "requires": {
- "schema-utils": "^4.0.0"
- },
- "dependencies": {
- "ajv": {
- "version": "8.12.0",
- "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
- "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
- "requires": {
- "fast-deep-equal": "^3.1.1",
- "json-schema-traverse": "^1.0.0",
- "require-from-string": "^2.0.2",
- "uri-js": "^4.2.2"
- }
- },
- "ajv-keywords": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
- "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
- "requires": {
- "fast-deep-equal": "^3.1.3"
- }
- },
- "json-schema-traverse": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
- "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
- },
- "schema-utils": {
- "version": "4.2.0",
- "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
- "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
- "requires": {
- "@types/json-schema": "^7.0.9",
- "ajv": "^8.9.0",
- "ajv-formats": "^2.1.1",
- "ajv-keywords": "^5.1.0"
- }
- }
- }
- },
- "minimalistic-assert": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
- "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="
- },
- "minimatch": {
- "version": "3.1.2",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
- "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
- "requires": {
- "brace-expansion": "^1.1.7"
- }
- },
- "minimist": {
- "version": "1.2.8",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
- "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA=="
- },
- "mkdirp": {
- "version": "0.5.6",
- "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
- "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
- "requires": {
- "minimist": "^1.2.6"
- }
- },
- "ms": {
- "version": "2.1.2",
- "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
- "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
- },
- "multicast-dns": {
- "version": "7.2.5",
- "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz",
- "integrity": "sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==",
- "requires": {
- "dns-packet": "^5.2.2",
- "thunky": "^1.0.2"
- }
- },
- "mz": {
- "version": "2.7.0",
- "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
- "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
- "requires": {
- "any-promise": "^1.0.0",
- "object-assign": "^4.0.1",
- "thenify-all": "^1.0.0"
- }
- },
- "nanoid": {
- "version": "3.3.6",
- "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz",
- "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA=="
- },
- "natural-compare": {
- "version": "1.4.0",
- "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
- "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="
- },
- "natural-compare-lite": {
- "version": "1.4.0",
- "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz",
- "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g=="
- },
- "negotiator": {
- "version": "0.6.3",
- "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
- "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="
- },
- "neo-async": {
- "version": "2.6.2",
- "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
- "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="
- },
- "no-case": {
- "version": "3.0.4",
- "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
- "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==",
- "requires": {
- "lower-case": "^2.0.2",
- "tslib": "^2.0.3"
- }
- },
- "node-forge": {
- "version": "1.3.1",
- "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
- "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA=="
- },
- "node-int64": {
- "version": "0.4.0",
- "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
- "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw=="
- },
- "node-releases": {
- "version": "2.0.12",
- "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.12.tgz",
- "integrity": "sha512-QzsYKWhXTWx8h1kIvqfnC++o0pEmpRQA/aenALsL2F4pqNVr7YzcdMlDij5WBnwftRbJCNJL/O7zdKaxKPHqgQ=="
- },
- "normalize-path": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
- "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
- },
- "normalize-range": {
- "version": "0.1.2",
- "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
- "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA=="
- },
- "normalize-url": {
- "version": "6.1.0",
- "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
- "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A=="
- },
- "npm-run-path": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
- "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
- "requires": {
- "path-key": "^3.0.0"
- }
- },
- "nth-check": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
- "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
- "requires": {
- "boolbase": "^1.0.0"
- }
- },
- "nwsapi": {
- "version": "2.2.7",
- "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.7.tgz",
- "integrity": "sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ=="
- },
- "object-assign": {
- "version": "4.1.1",
- "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
- "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="
- },
- "object-hash": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz",
- "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw=="
- },
- "object-inspect": {
- "version": "1.12.3",
- "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
- "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g=="
- },
- "object-is": {
- "version": "1.1.5",
- "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
- "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
- "requires": {
- "call-bind": "^1.0.2",
- "define-properties": "^1.1.3"
- }
- },
- "object-keys": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
- "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
- },
- "object.assign": {
- "version": "4.1.4",
- "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
- "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
- "requires": {
- "call-bind": "^1.0.2",
- "define-properties": "^1.1.4",
- "has-symbols": "^1.0.3",
- "object-keys": "^1.1.1"
- }
- },
- "object.entries": {
- "version": "1.1.6",
- "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz",
- "integrity": "sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==",
- "requires": {
- "call-bind": "^1.0.2",
- "define-properties": "^1.1.4",
- "es-abstract": "^1.20.4"
- }
- },
- "object.fromentries": {
- "version": "2.0.6",
- "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.6.tgz",
- "integrity": "sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==",
- "requires": {
- "call-bind": "^1.0.2",
- "define-properties": "^1.1.4",
- "es-abstract": "^1.20.4"
- }
- },
- "object.getownpropertydescriptors": {
- "version": "2.1.6",
- "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.6.tgz",
- "integrity": "sha512-lq+61g26E/BgHv0ZTFgRvi7NMEPuAxLkFU7rukXjc/AlwH4Am5xXVnIXy3un1bg/JPbXHrixRkK1itUzzPiIjQ==",
- "requires": {
- "array.prototype.reduce": "^1.0.5",
- "call-bind": "^1.0.2",
- "define-properties": "^1.2.0",
- "es-abstract": "^1.21.2",
- "safe-array-concat": "^1.0.0"
- }
- },
- "object.hasown": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.2.tgz",
- "integrity": "sha512-B5UIT3J1W+WuWIU55h0mjlwaqxiE5vYENJXIXZ4VFe05pNYrkKuK0U/6aFcb0pKywYJh7IhfoqUfKVmrJJHZHw==",
- "requires": {
- "define-properties": "^1.1.4",
- "es-abstract": "^1.20.4"
- }
- },
- "object.values": {
- "version": "1.1.6",
- "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz",
- "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==",
- "requires": {
- "call-bind": "^1.0.2",
- "define-properties": "^1.1.4",
- "es-abstract": "^1.20.4"
- }
- },
- "obuf": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
- "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg=="
- },
- "on-finished": {
- "version": "2.4.1",
- "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
- "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
- "requires": {
- "ee-first": "1.1.1"
- }
- },
- "on-headers": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
- "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA=="
- },
- "once": {
- "version": "1.4.0",
- "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
- "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
- "requires": {
- "wrappy": "1"
- }
- },
- "onetime": {
- "version": "5.1.2",
- "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
- "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
- "requires": {
- "mimic-fn": "^2.1.0"
- }
- },
- "open": {
- "version": "8.4.2",
- "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz",
- "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==",
- "requires": {
- "define-lazy-prop": "^2.0.0",
- "is-docker": "^2.1.1",
- "is-wsl": "^2.2.0"
- }
- },
- "optionator": {
- "version": "0.9.1",
- "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
- "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
- "requires": {
- "deep-is": "^0.1.3",
- "fast-levenshtein": "^2.0.6",
- "levn": "^0.4.1",
- "prelude-ls": "^1.2.1",
- "type-check": "^0.4.0",
- "word-wrap": "^1.2.3"
- }
- },
- "p-limit": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
- "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
- "requires": {
- "p-try": "^2.0.0"
- }
- },
- "p-locate": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
- "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
- "requires": {
- "p-limit": "^2.2.0"
- }
- },
- "p-retry": {
- "version": "4.6.2",
- "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.2.tgz",
- "integrity": "sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==",
- "requires": {
- "@types/retry": "0.12.0",
- "retry": "^0.13.1"
- }
- },
- "p-try": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
- "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
- },
- "param-case": {
- "version": "3.0.4",
- "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz",
- "integrity": "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==",
- "requires": {
- "dot-case": "^3.0.4",
- "tslib": "^2.0.3"
- }
- },
- "parent-module": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
- "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
- "requires": {
- "callsites": "^3.0.0"
- }
- },
- "parse-json": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
- "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
- "requires": {
- "@babel/code-frame": "^7.0.0",
- "error-ex": "^1.3.1",
- "json-parse-even-better-errors": "^2.3.0",
- "lines-and-columns": "^1.1.6"
- }
- },
- "parse5": {
- "version": "6.0.1",
- "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
- "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw=="
- },
- "parseurl": {
- "version": "1.3.3",
- "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
- "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="
- },
- "pascal-case": {
- "version": "3.1.2",
- "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz",
- "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==",
- "requires": {
- "no-case": "^3.0.4",
- "tslib": "^2.0.3"
- }
- },
- "path-exists": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
- "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="
- },
- "path-is-absolute": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
- "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="
- },
- "path-key": {
- "version": "3.1.1",
- "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
- "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="
- },
- "path-parse": {
- "version": "1.0.7",
- "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
- "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
- },
- "path-to-regexp": {
- "version": "0.1.7",
- "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
- "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
- },
- "path-type": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
- "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="
- },
- "performance-now": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
- "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow=="
- },
- "picocolors": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
- "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
- },
- "picomatch": {
- "version": "2.3.1",
- "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
- "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="
- },
- "pify": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
- "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog=="
- },
- "pinkie": {
- "version": "2.0.4",
- "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
- "integrity": "sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==",
- "dev": true
- },
- "pinkie-promise": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
- "integrity": "sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==",
- "dev": true,
- "requires": {
- "pinkie": "^2.0.0"
- }
- },
- "pirates": {
- "version": "4.0.5",
- "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz",
- "integrity": "sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ=="
- },
- "pkg-dir": {
- "version": "4.2.0",
- "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
- "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
- "requires": {
- "find-up": "^4.0.0"
- }
- },
- "pkg-up": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz",
- "integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==",
- "requires": {
- "find-up": "^3.0.0"
- },
- "dependencies": {
- "find-up": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
- "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
- "requires": {
- "locate-path": "^3.0.0"
- }
- },
- "locate-path": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
- "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
- "requires": {
- "p-locate": "^3.0.0",
- "path-exists": "^3.0.0"
- }
- },
- "p-locate": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
- "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
- "requires": {
- "p-limit": "^2.0.0"
- }
- },
- "path-exists": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
- "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ=="
- }
- }
- },
- "postcss": {
- "version": "8.4.31",
- "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
- "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
- "requires": {
- "nanoid": "^3.3.6",
- "picocolors": "^1.0.0",
- "source-map-js": "^1.0.2"
- }
- },
- "postcss-attribute-case-insensitive": {
- "version": "5.0.2",
- "resolved": "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-5.0.2.tgz",
- "integrity": "sha512-XIidXV8fDr0kKt28vqki84fRK8VW8eTuIa4PChv2MqKuT6C9UjmSKzen6KaWhWEoYvwxFCa7n/tC1SZ3tyq4SQ==",
- "requires": {
- "postcss-selector-parser": "^6.0.10"
- }
- },
- "postcss-browser-comments": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/postcss-browser-comments/-/postcss-browser-comments-4.0.0.tgz",
- "integrity": "sha512-X9X9/WN3KIvY9+hNERUqX9gncsgBA25XaeR+jshHz2j8+sYyHktHw1JdKuMjeLpGktXidqDhA7b/qm1mrBDmgg==",
- "requires": {}
- },
- "postcss-calc": {
- "version": "8.2.4",
- "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.2.4.tgz",
- "integrity": "sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q==",
- "requires": {
- "postcss-selector-parser": "^6.0.9",
- "postcss-value-parser": "^4.2.0"
- }
- },
- "postcss-clamp": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/postcss-clamp/-/postcss-clamp-4.1.0.tgz",
- "integrity": "sha512-ry4b1Llo/9zz+PKC+030KUnPITTJAHeOwjfAyyB60eT0AorGLdzp52s31OsPRHRf8NchkgFoG2y6fCfn1IV1Ow==",
- "requires": {
- "postcss-value-parser": "^4.2.0"
- }
- },
- "postcss-color-functional-notation": {
- "version": "4.2.4",
- "resolved": "https://registry.npmjs.org/postcss-color-functional-notation/-/postcss-color-functional-notation-4.2.4.tgz",
- "integrity": "sha512-2yrTAUZUab9s6CpxkxC4rVgFEVaR6/2Pipvi6qcgvnYiVqZcbDHEoBDhrXzyb7Efh2CCfHQNtcqWcIruDTIUeg==",
- "requires": {
- "postcss-value-parser": "^4.2.0"
- }
- },
- "postcss-color-hex-alpha": {
- "version": "8.0.4",
- "resolved": "https://registry.npmjs.org/postcss-color-hex-alpha/-/postcss-color-hex-alpha-8.0.4.tgz",
- "integrity": "sha512-nLo2DCRC9eE4w2JmuKgVA3fGL3d01kGq752pVALF68qpGLmx2Qrk91QTKkdUqqp45T1K1XV8IhQpcu1hoAQflQ==",
- "requires": {
- "postcss-value-parser": "^4.2.0"
- }
- },
- "postcss-color-rebeccapurple": {
- "version": "7.1.1",
- "resolved": "https://registry.npmjs.org/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-7.1.1.tgz",
- "integrity": "sha512-pGxkuVEInwLHgkNxUc4sdg4g3py7zUeCQ9sMfwyHAT+Ezk8a4OaaVZ8lIY5+oNqA/BXXgLyXv0+5wHP68R79hg==",
- "requires": {
- "postcss-value-parser": "^4.2.0"
- }
- },
- "postcss-colormin": {
- "version": "5.3.1",
- "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.3.1.tgz",
- "integrity": "sha512-UsWQG0AqTFQmpBegeLLc1+c3jIqBNB0zlDGRWR+dQ3pRKJL1oeMzyqmH3o2PIfn9MBdNrVPWhDbT769LxCTLJQ==",
- "requires": {
- "browserslist": "^4.21.4",
- "caniuse-api": "^3.0.0",
- "colord": "^2.9.1",
- "postcss-value-parser": "^4.2.0"
- }
- },
- "postcss-convert-values": {
- "version": "5.1.3",
- "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.1.3.tgz",
- "integrity": "sha512-82pC1xkJZtcJEfiLw6UXnXVXScgtBrjlO5CBmuDQc+dlb88ZYheFsjTn40+zBVi3DkfF7iezO0nJUPLcJK3pvA==",
- "requires": {
- "browserslist": "^4.21.4",
- "postcss-value-parser": "^4.2.0"
- }
- },
- "postcss-custom-media": {
- "version": "8.0.2",
- "resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-8.0.2.tgz",
- "integrity": "sha512-7yi25vDAoHAkbhAzX9dHx2yc6ntS4jQvejrNcC+csQJAXjj15e7VcWfMgLqBNAbOvqi5uIa9huOVwdHbf+sKqg==",
- "requires": {
- "postcss-value-parser": "^4.2.0"
- }
- },
- "postcss-custom-properties": {
- "version": "12.1.11",
- "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-12.1.11.tgz",
- "integrity": "sha512-0IDJYhgU8xDv1KY6+VgUwuQkVtmYzRwu+dMjnmdMafXYv86SWqfxkc7qdDvWS38vsjaEtv8e0vGOUQrAiMBLpQ==",
- "requires": {
- "postcss-value-parser": "^4.2.0"
- }
- },
- "postcss-custom-selectors": {
- "version": "6.0.3",
- "resolved": "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-6.0.3.tgz",
- "integrity": "sha512-fgVkmyiWDwmD3JbpCmB45SvvlCD6z9CG6Ie6Iere22W5aHea6oWa7EM2bpnv2Fj3I94L3VbtvX9KqwSi5aFzSg==",
- "requires": {
- "postcss-selector-parser": "^6.0.4"
- }
- },
- "postcss-dir-pseudo-class": {
- "version": "6.0.5",
- "resolved": "https://registry.npmjs.org/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-6.0.5.tgz",
- "integrity": "sha512-eqn4m70P031PF7ZQIvSgy9RSJ5uI2171O/OO/zcRNYpJbvaeKFUlar1aJ7rmgiQtbm0FSPsRewjpdS0Oew7MPA==",
- "requires": {
- "postcss-selector-parser": "^6.0.10"
- }
- },
- "postcss-discard-comments": {
- "version": "5.1.2",
- "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz",
- "integrity": "sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ==",
- "requires": {}
- },
- "postcss-discard-duplicates": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz",
- "integrity": "sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==",
- "requires": {}
- },
- "postcss-discard-empty": {
- "version": "5.1.1",
- "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz",
- "integrity": "sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==",
- "requires": {}
- },
- "postcss-discard-overridden": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz",
- "integrity": "sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==",
- "requires": {}
- },
- "postcss-double-position-gradients": {
- "version": "3.1.2",
- "resolved": "https://registry.npmjs.org/postcss-double-position-gradients/-/postcss-double-position-gradients-3.1.2.tgz",
- "integrity": "sha512-GX+FuE/uBR6eskOK+4vkXgT6pDkexLokPaz/AbJna9s5Kzp/yl488pKPjhy0obB475ovfT1Wv8ho7U/cHNaRgQ==",
- "requires": {
- "@csstools/postcss-progressive-custom-properties": "^1.1.0",
- "postcss-value-parser": "^4.2.0"
- }
- },
- "postcss-env-function": {
- "version": "4.0.6",
- "resolved": "https://registry.npmjs.org/postcss-env-function/-/postcss-env-function-4.0.6.tgz",
- "integrity": "sha512-kpA6FsLra+NqcFnL81TnsU+Z7orGtDTxcOhl6pwXeEq1yFPpRMkCDpHhrz8CFQDr/Wfm0jLiNQ1OsGGPjlqPwA==",
- "requires": {
- "postcss-value-parser": "^4.2.0"
- }
- },
- "postcss-flexbugs-fixes": {
- "version": "5.0.2",
- "resolved": "https://registry.npmjs.org/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-5.0.2.tgz",
- "integrity": "sha512-18f9voByak7bTktR2QgDveglpn9DTbBWPUzSOe9g0N4WR/2eSt6Vrcbf0hmspvMI6YWGywz6B9f7jzpFNJJgnQ==",
- "requires": {}
- },
- "postcss-focus-visible": {
- "version": "6.0.4",
- "resolved": "https://registry.npmjs.org/postcss-focus-visible/-/postcss-focus-visible-6.0.4.tgz",
- "integrity": "sha512-QcKuUU/dgNsstIK6HELFRT5Y3lbrMLEOwG+A4s5cA+fx3A3y/JTq3X9LaOj3OC3ALH0XqyrgQIgey/MIZ8Wczw==",
- "requires": {
- "postcss-selector-parser": "^6.0.9"
- }
- },
- "postcss-focus-within": {
- "version": "5.0.4",
- "resolved": "https://registry.npmjs.org/postcss-focus-within/-/postcss-focus-within-5.0.4.tgz",
- "integrity": "sha512-vvjDN++C0mu8jz4af5d52CB184ogg/sSxAFS+oUJQq2SuCe7T5U2iIsVJtsCp2d6R4j0jr5+q3rPkBVZkXD9fQ==",
- "requires": {
- "postcss-selector-parser": "^6.0.9"
- }
- },
- "postcss-font-variant": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-5.0.0.tgz",
- "integrity": "sha512-1fmkBaCALD72CK2a9i468mA/+tr9/1cBxRRMXOUaZqO43oWPR5imcyPjXwuv7PXbCid4ndlP5zWhidQVVa3hmA==",
- "requires": {}
- },
- "postcss-gap-properties": {
- "version": "3.0.5",
- "resolved": "https://registry.npmjs.org/postcss-gap-properties/-/postcss-gap-properties-3.0.5.tgz",
- "integrity": "sha512-IuE6gKSdoUNcvkGIqdtjtcMtZIFyXZhmFd5RUlg97iVEvp1BZKV5ngsAjCjrVy+14uhGBQl9tzmi1Qwq4kqVOg==",
- "requires": {}
- },
- "postcss-image-set-function": {
- "version": "4.0.7",
- "resolved": "https://registry.npmjs.org/postcss-image-set-function/-/postcss-image-set-function-4.0.7.tgz",
- "integrity": "sha512-9T2r9rsvYzm5ndsBE8WgtrMlIT7VbtTfE7b3BQnudUqnBcBo7L758oc+o+pdj/dUV0l5wjwSdjeOH2DZtfv8qw==",
- "requires": {
- "postcss-value-parser": "^4.2.0"
- }
- },
- "postcss-import": {
- "version": "15.1.0",
- "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-15.1.0.tgz",
- "integrity": "sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==",
- "requires": {
- "postcss-value-parser": "^4.0.0",
- "read-cache": "^1.0.0",
- "resolve": "^1.1.7"
- }
- },
- "postcss-initial": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/postcss-initial/-/postcss-initial-4.0.1.tgz",
- "integrity": "sha512-0ueD7rPqX8Pn1xJIjay0AZeIuDoF+V+VvMt/uOnn+4ezUKhZM/NokDeP6DwMNyIoYByuN/94IQnt5FEkaN59xQ==",
- "requires": {}
- },
- "postcss-js": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.1.tgz",
- "integrity": "sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==",
- "requires": {
- "camelcase-css": "^2.0.1"
- }
- },
- "postcss-lab-function": {
- "version": "4.2.1",
- "resolved": "https://registry.npmjs.org/postcss-lab-function/-/postcss-lab-function-4.2.1.tgz",
- "integrity": "sha512-xuXll4isR03CrQsmxyz92LJB2xX9n+pZJ5jE9JgcnmsCammLyKdlzrBin+25dy6wIjfhJpKBAN80gsTlCgRk2w==",
- "requires": {
- "@csstools/postcss-progressive-custom-properties": "^1.1.0",
- "postcss-value-parser": "^4.2.0"
- }
- },
- "postcss-load-config": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-4.0.1.tgz",
- "integrity": "sha512-vEJIc8RdiBRu3oRAI0ymerOn+7rPuMvRXslTvZUKZonDHFIczxztIyJ1urxM1x9JXEikvpWWTUUqal5j/8QgvA==",
- "requires": {
- "lilconfig": "^2.0.5",
- "yaml": "^2.1.1"
- },
- "dependencies": {
- "yaml": {
- "version": "2.3.1",
- "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.1.tgz",
- "integrity": "sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ=="
- }
- }
- },
- "postcss-loader": {
- "version": "6.2.1",
- "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-6.2.1.tgz",
- "integrity": "sha512-WbbYpmAaKcux/P66bZ40bpWsBucjx/TTgVVzRZ9yUO8yQfVBlameJ0ZGVaPfH64hNSBh63a+ICP5nqOpBA0w+Q==",
- "requires": {
- "cosmiconfig": "^7.0.0",
- "klona": "^2.0.5",
- "semver": "^7.3.5"
- },
- "dependencies": {
- "lru-cache": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
- "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
- "requires": {
- "yallist": "^4.0.0"
- }
- },
- "semver": {
- "version": "7.5.2",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz",
- "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
- "requires": {
- "lru-cache": "^6.0.0"
- }
- },
- "yallist": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
- "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
- }
- }
- },
- "postcss-logical": {
- "version": "5.0.4",
- "resolved": "https://registry.npmjs.org/postcss-logical/-/postcss-logical-5.0.4.tgz",
- "integrity": "sha512-RHXxplCeLh9VjinvMrZONq7im4wjWGlRJAqmAVLXyZaXwfDWP73/oq4NdIp+OZwhQUMj0zjqDfM5Fj7qby+B4g==",
- "requires": {}
- },
- "postcss-media-minmax": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/postcss-media-minmax/-/postcss-media-minmax-5.0.0.tgz",
- "integrity": "sha512-yDUvFf9QdFZTuCUg0g0uNSHVlJ5X1lSzDZjPSFaiCWvjgsvu8vEVxtahPrLMinIDEEGnx6cBe6iqdx5YWz08wQ==",
- "requires": {}
- },
- "postcss-merge-longhand": {
- "version": "5.1.7",
- "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.1.7.tgz",
- "integrity": "sha512-YCI9gZB+PLNskrK0BB3/2OzPnGhPkBEwmwhfYk1ilBHYVAZB7/tkTHFBAnCrvBBOmeYyMYw3DMjT55SyxMBzjQ==",
- "requires": {
- "postcss-value-parser": "^4.2.0",
- "stylehacks": "^5.1.1"
- }
- },
- "postcss-merge-rules": {
- "version": "5.1.4",
- "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.1.4.tgz",
- "integrity": "sha512-0R2IuYpgU93y9lhVbO/OylTtKMVcHb67zjWIfCiKR9rWL3GUk1677LAqD/BcHizukdZEjT8Ru3oHRoAYoJy44g==",
- "requires": {
- "browserslist": "^4.21.4",
- "caniuse-api": "^3.0.0",
- "cssnano-utils": "^3.1.0",
- "postcss-selector-parser": "^6.0.5"
- }
- },
- "postcss-minify-font-values": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz",
- "integrity": "sha512-el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA==",
- "requires": {
- "postcss-value-parser": "^4.2.0"
- }
- },
- "postcss-minify-gradients": {
- "version": "5.1.1",
- "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz",
- "integrity": "sha512-VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw==",
- "requires": {
- "colord": "^2.9.1",
- "cssnano-utils": "^3.1.0",
- "postcss-value-parser": "^4.2.0"
- }
- },
- "postcss-minify-params": {
- "version": "5.1.4",
- "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.1.4.tgz",
- "integrity": "sha512-+mePA3MgdmVmv6g+30rn57USjOGSAyuxUmkfiWpzalZ8aiBkdPYjXWtHuwJGm1v5Ojy0Z0LaSYhHaLJQB0P8Jw==",
- "requires": {
- "browserslist": "^4.21.4",
- "cssnano-utils": "^3.1.0",
- "postcss-value-parser": "^4.2.0"
- }
- },
- "postcss-minify-selectors": {
- "version": "5.2.1",
- "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.2.1.tgz",
- "integrity": "sha512-nPJu7OjZJTsVUmPdm2TcaiohIwxP+v8ha9NehQ2ye9szv4orirRU3SDdtUmKH+10nzn0bAyOXZ0UEr7OpvLehg==",
- "requires": {
- "postcss-selector-parser": "^6.0.5"
- }
- },
- "postcss-modules-extract-imports": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
- "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
- "requires": {}
- },
- "postcss-modules-local-by-default": {
- "version": "4.0.3",
- "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.3.tgz",
- "integrity": "sha512-2/u2zraspoACtrbFRnTijMiQtb4GW4BvatjaG/bCjYQo8kLTdevCUlwuBHx2sCnSyrI3x3qj4ZK1j5LQBgzmwA==",
- "requires": {
- "icss-utils": "^5.0.0",
- "postcss-selector-parser": "^6.0.2",
- "postcss-value-parser": "^4.1.0"
- }
- },
- "postcss-modules-scope": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz",
- "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==",
- "requires": {
- "postcss-selector-parser": "^6.0.4"
- }
- },
- "postcss-modules-values": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
- "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
- "requires": {
- "icss-utils": "^5.0.0"
- }
- },
- "postcss-nested": {
- "version": "6.0.1",
- "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.0.1.tgz",
- "integrity": "sha512-mEp4xPMi5bSWiMbsgoPfcP74lsWLHkQbZc3sY+jWYd65CUwXrUaTp0fmNpa01ZcETKlIgUdFN/MpS2xZtqL9dQ==",
- "requires": {
- "postcss-selector-parser": "^6.0.11"
- }
- },
- "postcss-nesting": {
- "version": "10.2.0",
- "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-10.2.0.tgz",
- "integrity": "sha512-EwMkYchxiDiKUhlJGzWsD9b2zvq/r2SSubcRrgP+jujMXFzqvANLt16lJANC+5uZ6hjI7lpRmI6O8JIl+8l1KA==",
- "requires": {
- "@csstools/selector-specificity": "^2.0.0",
- "postcss-selector-parser": "^6.0.10"
- }
- },
- "postcss-normalize": {
- "version": "10.0.1",
- "resolved": "https://registry.npmjs.org/postcss-normalize/-/postcss-normalize-10.0.1.tgz",
- "integrity": "sha512-+5w18/rDev5mqERcG3W5GZNMJa1eoYYNGo8gB7tEwaos0ajk3ZXAI4mHGcNT47NE+ZnZD1pEpUOFLvltIwmeJA==",
- "requires": {
- "@csstools/normalize.css": "*",
- "postcss-browser-comments": "^4",
- "sanitize.css": "*"
- }
- },
- "postcss-normalize-charset": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz",
- "integrity": "sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==",
- "requires": {}
- },
- "postcss-normalize-display-values": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz",
- "integrity": "sha512-WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA==",
- "requires": {
- "postcss-value-parser": "^4.2.0"
- }
- },
- "postcss-normalize-positions": {
- "version": "5.1.1",
- "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.1.1.tgz",
- "integrity": "sha512-6UpCb0G4eofTCQLFVuI3EVNZzBNPiIKcA1AKVka+31fTVySphr3VUgAIULBhxZkKgwLImhzMR2Bw1ORK+37INg==",
- "requires": {
- "postcss-value-parser": "^4.2.0"
- }
- },
- "postcss-normalize-repeat-style": {
- "version": "5.1.1",
- "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.1.tgz",
- "integrity": "sha512-mFpLspGWkQtBcWIRFLmewo8aC3ImN2i/J3v8YCFUwDnPu3Xz4rLohDO26lGjwNsQxB3YF0KKRwspGzE2JEuS0g==",
- "requires": {
- "postcss-value-parser": "^4.2.0"
- }
- },
- "postcss-normalize-string": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz",
- "integrity": "sha512-oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w==",
- "requires": {
- "postcss-value-parser": "^4.2.0"
- }
- },
- "postcss-normalize-timing-functions": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz",
- "integrity": "sha512-DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg==",
- "requires": {
- "postcss-value-parser": "^4.2.0"
- }
- },
- "postcss-normalize-unicode": {
- "version": "5.1.1",
- "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.1.tgz",
- "integrity": "sha512-qnCL5jzkNUmKVhZoENp1mJiGNPcsJCs1aaRmURmeJGES23Z/ajaln+EPTD+rBeNkSryI+2WTdW+lwcVdOikrpA==",
- "requires": {
- "browserslist": "^4.21.4",
- "postcss-value-parser": "^4.2.0"
- }
- },
- "postcss-normalize-url": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz",
- "integrity": "sha512-5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew==",
- "requires": {
- "normalize-url": "^6.0.1",
- "postcss-value-parser": "^4.2.0"
- }
- },
- "postcss-normalize-whitespace": {
- "version": "5.1.1",
- "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz",
- "integrity": "sha512-83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA==",
- "requires": {
- "postcss-value-parser": "^4.2.0"
- }
- },
- "postcss-opacity-percentage": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/postcss-opacity-percentage/-/postcss-opacity-percentage-1.1.3.tgz",
- "integrity": "sha512-An6Ba4pHBiDtyVpSLymUUERMo2cU7s+Obz6BTrS+gxkbnSBNKSuD0AVUc+CpBMrpVPKKfoVz0WQCX+Tnst0i4A==",
- "requires": {}
- },
- "postcss-ordered-values": {
- "version": "5.1.3",
- "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.1.3.tgz",
- "integrity": "sha512-9UO79VUhPwEkzbb3RNpqqghc6lcYej1aveQteWY+4POIwlqkYE21HKWaLDF6lWNuqCobEAyTovVhtI32Rbv2RQ==",
- "requires": {
- "cssnano-utils": "^3.1.0",
- "postcss-value-parser": "^4.2.0"
- }
- },
- "postcss-overflow-shorthand": {
- "version": "3.0.4",
- "resolved": "https://registry.npmjs.org/postcss-overflow-shorthand/-/postcss-overflow-shorthand-3.0.4.tgz",
- "integrity": "sha512-otYl/ylHK8Y9bcBnPLo3foYFLL6a6Ak+3EQBPOTR7luMYCOsiVTUk1iLvNf6tVPNGXcoL9Hoz37kpfriRIFb4A==",
- "requires": {
- "postcss-value-parser": "^4.2.0"
- }
- },
- "postcss-page-break": {
- "version": "3.0.4",
- "resolved": "https://registry.npmjs.org/postcss-page-break/-/postcss-page-break-3.0.4.tgz",
- "integrity": "sha512-1JGu8oCjVXLa9q9rFTo4MbeeA5FMe00/9C7lN4va606Rdb+HkxXtXsmEDrIraQ11fGz/WvKWa8gMuCKkrXpTsQ==",
- "requires": {}
- },
- "postcss-place": {
- "version": "7.0.5",
- "resolved": "https://registry.npmjs.org/postcss-place/-/postcss-place-7.0.5.tgz",
- "integrity": "sha512-wR8igaZROA6Z4pv0d+bvVrvGY4GVHihBCBQieXFY3kuSuMyOmEnnfFzHl/tQuqHZkfkIVBEbDvYcFfHmpSet9g==",
- "requires": {
- "postcss-value-parser": "^4.2.0"
- }
- },
- "postcss-preset-env": {
- "version": "7.8.3",
- "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-7.8.3.tgz",
- "integrity": "sha512-T1LgRm5uEVFSEF83vHZJV2z19lHg4yJuZ6gXZZkqVsqv63nlr6zabMH3l4Pc01FQCyfWVrh2GaUeCVy9Po+Aag==",
- "requires": {
- "@csstools/postcss-cascade-layers": "^1.1.1",
- "@csstools/postcss-color-function": "^1.1.1",
- "@csstools/postcss-font-format-keywords": "^1.0.1",
- "@csstools/postcss-hwb-function": "^1.0.2",
- "@csstools/postcss-ic-unit": "^1.0.1",
- "@csstools/postcss-is-pseudo-class": "^2.0.7",
- "@csstools/postcss-nested-calc": "^1.0.0",
- "@csstools/postcss-normalize-display-values": "^1.0.1",
- "@csstools/postcss-oklab-function": "^1.1.1",
- "@csstools/postcss-progressive-custom-properties": "^1.3.0",
- "@csstools/postcss-stepped-value-functions": "^1.0.1",
- "@csstools/postcss-text-decoration-shorthand": "^1.0.0",
- "@csstools/postcss-trigonometric-functions": "^1.0.2",
- "@csstools/postcss-unset-value": "^1.0.2",
- "autoprefixer": "^10.4.13",
- "browserslist": "^4.21.4",
- "css-blank-pseudo": "^3.0.3",
- "css-has-pseudo": "^3.0.4",
- "css-prefers-color-scheme": "^6.0.3",
- "cssdb": "^7.1.0",
- "postcss-attribute-case-insensitive": "^5.0.2",
- "postcss-clamp": "^4.1.0",
- "postcss-color-functional-notation": "^4.2.4",
- "postcss-color-hex-alpha": "^8.0.4",
- "postcss-color-rebeccapurple": "^7.1.1",
- "postcss-custom-media": "^8.0.2",
- "postcss-custom-properties": "^12.1.10",
- "postcss-custom-selectors": "^6.0.3",
- "postcss-dir-pseudo-class": "^6.0.5",
- "postcss-double-position-gradients": "^3.1.2",
- "postcss-env-function": "^4.0.6",
- "postcss-focus-visible": "^6.0.4",
- "postcss-focus-within": "^5.0.4",
- "postcss-font-variant": "^5.0.0",
- "postcss-gap-properties": "^3.0.5",
- "postcss-image-set-function": "^4.0.7",
- "postcss-initial": "^4.0.1",
- "postcss-lab-function": "^4.2.1",
- "postcss-logical": "^5.0.4",
- "postcss-media-minmax": "^5.0.0",
- "postcss-nesting": "^10.2.0",
- "postcss-opacity-percentage": "^1.1.2",
- "postcss-overflow-shorthand": "^3.0.4",
- "postcss-page-break": "^3.0.4",
- "postcss-place": "^7.0.5",
- "postcss-pseudo-class-any-link": "^7.1.6",
- "postcss-replace-overflow-wrap": "^4.0.0",
- "postcss-selector-not": "^6.0.1",
- "postcss-value-parser": "^4.2.0"
- }
- },
- "postcss-pseudo-class-any-link": {
- "version": "7.1.6",
- "resolved": "https://registry.npmjs.org/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-7.1.6.tgz",
- "integrity": "sha512-9sCtZkO6f/5ML9WcTLcIyV1yz9D1rf0tWc+ulKcvV30s0iZKS/ONyETvoWsr6vnrmW+X+KmuK3gV/w5EWnT37w==",
- "requires": {
- "postcss-selector-parser": "^6.0.10"
- }
- },
- "postcss-reduce-initial": {
- "version": "5.1.2",
- "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.1.2.tgz",
- "integrity": "sha512-dE/y2XRaqAi6OvjzD22pjTUQ8eOfc6m/natGHgKFBK9DxFmIm69YmaRVQrGgFlEfc1HePIurY0TmDeROK05rIg==",
- "requires": {
- "browserslist": "^4.21.4",
- "caniuse-api": "^3.0.0"
- }
- },
- "postcss-reduce-transforms": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz",
- "integrity": "sha512-2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ==",
- "requires": {
- "postcss-value-parser": "^4.2.0"
- }
- },
- "postcss-replace-overflow-wrap": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-4.0.0.tgz",
- "integrity": "sha512-KmF7SBPphT4gPPcKZc7aDkweHiKEEO8cla/GjcBK+ckKxiZslIu3C4GCRW3DNfL0o7yW7kMQu9xlZ1kXRXLXtw==",
- "requires": {}
- },
- "postcss-selector-not": {
- "version": "6.0.1",
- "resolved": "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-6.0.1.tgz",
- "integrity": "sha512-1i9affjAe9xu/y9uqWH+tD4r6/hDaXJruk8xn2x1vzxC2U3J3LKO3zJW4CyxlNhA56pADJ/djpEwpH1RClI2rQ==",
- "requires": {
- "postcss-selector-parser": "^6.0.10"
- }
- },
- "postcss-selector-parser": {
- "version": "6.0.13",
- "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz",
- "integrity": "sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==",
- "requires": {
- "cssesc": "^3.0.0",
- "util-deprecate": "^1.0.2"
- }
- },
- "postcss-svgo": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.1.0.tgz",
- "integrity": "sha512-D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA==",
- "requires": {
- "postcss-value-parser": "^4.2.0",
- "svgo": "^2.7.0"
- },
- "dependencies": {
- "commander": {
- "version": "7.2.0",
- "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
- "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw=="
- },
- "css-tree": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
- "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
- "requires": {
- "mdn-data": "2.0.14",
- "source-map": "^0.6.1"
- }
- },
- "mdn-data": {
- "version": "2.0.14",
- "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
- "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow=="
- },
- "source-map": {
- "version": "0.6.1",
- "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
- "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
- },
- "svgo": {
- "version": "2.8.0",
- "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz",
- "integrity": "sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==",
- "requires": {
- "@trysound/sax": "0.2.0",
- "commander": "^7.2.0",
- "css-select": "^4.1.3",
- "css-tree": "^1.1.3",
- "csso": "^4.2.0",
- "picocolors": "^1.0.0",
- "stable": "^0.1.8"
- }
- }
- }
- },
- "postcss-unique-selectors": {
- "version": "5.1.1",
- "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz",
- "integrity": "sha512-5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA==",
- "requires": {
- "postcss-selector-parser": "^6.0.5"
- }
- },
- "postcss-value-parser": {
- "version": "4.2.0",
- "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
- "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
- },
- "prelude-ls": {
- "version": "1.2.1",
- "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
- "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="
- },
- "prettier": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.1.tgz",
- "integrity": "sha512-fcOWSnnpCrovBsmFZIGIy9UqK2FaI7Hqax+DIO0A9UxeVoY4iweyaFjS5TavZN97Hfehph0nhsZnjlVKzEQSrQ==",
- "dev": true
- },
- "pretty-bytes": {
- "version": "5.6.0",
- "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz",
- "integrity": "sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg=="
- },
- "pretty-error": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-4.0.0.tgz",
- "integrity": "sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw==",
- "requires": {
- "lodash": "^4.17.20",
- "renderkid": "^3.0.0"
- }
- },
- "pretty-format": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
- "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
- "requires": {
- "ansi-regex": "^5.0.1",
- "ansi-styles": "^5.0.0",
- "react-is": "^17.0.1"
- },
- "dependencies": {
- "ansi-styles": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
- "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="
- },
- "react-is": {
- "version": "17.0.2",
- "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
- "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
- }
- }
- },
- "process-nextick-args": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
- "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
- },
- "promise": {
- "version": "8.3.0",
- "resolved": "https://registry.npmjs.org/promise/-/promise-8.3.0.tgz",
- "integrity": "sha512-rZPNPKTOYVNEEKFaq1HqTgOwZD+4/YHS5ukLzQCypkj+OkYx7iv0mA91lJlpPPZ8vMau3IIGj5Qlwrx+8iiSmg==",
- "requires": {
- "asap": "~2.0.6"
- }
- },
- "prompts": {
- "version": "2.4.2",
- "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
- "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
- "requires": {
- "kleur": "^3.0.3",
- "sisteransi": "^1.0.5"
- }
- },
- "prop-types": {
- "version": "15.8.1",
- "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
- "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
- "requires": {
- "loose-envify": "^1.4.0",
- "object-assign": "^4.1.1",
- "react-is": "^16.13.1"
- },
- "dependencies": {
- "react-is": {
- "version": "16.13.1",
- "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
- "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
- }
- }
- },
- "proxy-addr": {
- "version": "2.0.7",
- "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
- "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
- "requires": {
- "forwarded": "0.2.0",
- "ipaddr.js": "1.9.1"
- },
- "dependencies": {
- "ipaddr.js": {
- "version": "1.9.1",
- "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
- "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="
- }
- }
- },
- "psl": {
- "version": "1.9.0",
- "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
- "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag=="
- },
- "punycode": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
- "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA=="
- },
- "pure-rand": {
- "version": "6.0.2",
- "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.0.2.tgz",
- "integrity": "sha512-6Yg0ekpKICSjPswYOuC5sku/TSWaRYlA0qsXqJgM/d/4pLPHPuTxK7Nbf7jFKzAeedUhR8C7K9Uv63FBsSo8xQ==",
- "dev": true,
- "optional": true,
- "peer": true
- },
- "q": {
- "version": "1.5.1",
- "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
- "integrity": "sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw=="
- },
- "qs": {
- "version": "6.11.0",
- "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
- "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
- "requires": {
- "side-channel": "^1.0.4"
- }
- },
- "querystringify": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
- "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ=="
- },
- "queue-microtask": {
- "version": "1.2.3",
- "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
- "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="
- },
- "raf": {
- "version": "3.4.1",
- "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz",
- "integrity": "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==",
- "requires": {
- "performance-now": "^2.1.0"
- }
- },
- "randombytes": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
- "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
- "requires": {
- "safe-buffer": "^5.1.0"
- }
- },
- "range-parser": {
- "version": "1.2.1",
- "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
- "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
- },
- "raw-body": {
- "version": "2.5.1",
- "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
- "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
- "requires": {
- "bytes": "3.1.2",
- "http-errors": "2.0.0",
- "iconv-lite": "0.4.24",
- "unpipe": "1.0.0"
- },
- "dependencies": {
- "bytes": {
- "version": "3.1.2",
- "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
- "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="
- },
- "iconv-lite": {
- "version": "0.4.24",
- "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
- "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
- "requires": {
- "safer-buffer": ">= 2.1.2 < 3"
- }
- }
- }
- },
- "react": {
- "version": "17.0.2",
- "resolved": "https://registry.npmjs.org/react/-/react-17.0.2.tgz",
- "integrity": "sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==",
- "requires": {
- "loose-envify": "^1.1.0",
- "object-assign": "^4.1.1"
- }
- },
- "react-app-polyfill": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/react-app-polyfill/-/react-app-polyfill-3.0.0.tgz",
- "integrity": "sha512-sZ41cxiU5llIB003yxxQBYrARBqe0repqPTTYBTmMqTz9szeBbE37BehCE891NZsmdZqqP+xWKdT3eo3vOzN8w==",
- "requires": {
- "core-js": "^3.19.2",
- "object-assign": "^4.1.1",
- "promise": "^8.1.0",
- "raf": "^3.4.1",
- "regenerator-runtime": "^0.13.9",
- "whatwg-fetch": "^3.6.2"
- }
- },
- "react-app-rewired": {
- "version": "2.2.1",
- "resolved": "https://registry.npmjs.org/react-app-rewired/-/react-app-rewired-2.2.1.tgz",
- "integrity": "sha512-uFQWTErXeLDrMzOJHKp0h8P1z0LV9HzPGsJ6adOtGlA/B9WfT6Shh4j2tLTTGlXOfiVx6w6iWpp7SOC5pvk+gA==",
- "requires": {
- "semver": "^5.6.0"
- },
- "dependencies": {
- "semver": {
- "version": "5.7.2",
- "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
- "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g=="
- }
- }
- },
- "react-dev-utils": {
- "version": "12.0.1",
- "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-12.0.1.tgz",
- "integrity": "sha512-84Ivxmr17KjUupyqzFode6xKhjwuEJDROWKJy/BthkL7Wn6NJ8h4WE6k/exAv6ImS+0oZLRRW5j/aINMHyeGeQ==",
- "requires": {
- "@babel/code-frame": "^7.16.0",
- "address": "^1.1.2",
- "browserslist": "^4.18.1",
- "chalk": "^4.1.2",
- "cross-spawn": "^7.0.3",
- "detect-port-alt": "^1.1.6",
- "escape-string-regexp": "^4.0.0",
- "filesize": "^8.0.6",
- "find-up": "^5.0.0",
- "fork-ts-checker-webpack-plugin": "^6.5.0",
- "global-modules": "^2.0.0",
- "globby": "^11.0.4",
- "gzip-size": "^6.0.0",
- "immer": "^9.0.7",
- "is-root": "^2.1.0",
- "loader-utils": "^3.2.0",
- "open": "^8.4.0",
- "pkg-up": "^3.1.0",
- "prompts": "^2.4.2",
- "react-error-overlay": "^6.0.11",
- "recursive-readdir": "^2.2.2",
- "shell-quote": "^1.7.3",
- "strip-ansi": "^6.0.1",
- "text-table": "^0.2.0"
- },
- "dependencies": {
- "array-union": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
- "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw=="
- },
- "find-up": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
- "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
- "requires": {
- "locate-path": "^6.0.0",
- "path-exists": "^4.0.0"
- }
- },
- "globby": {
- "version": "11.1.0",
- "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
- "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
- "requires": {
- "array-union": "^2.1.0",
- "dir-glob": "^3.0.1",
- "fast-glob": "^3.2.9",
- "ignore": "^5.2.0",
- "merge2": "^1.4.1",
- "slash": "^3.0.0"
- }
- },
- "loader-utils": {
- "version": "3.2.1",
- "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.1.tgz",
- "integrity": "sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw=="
- },
- "locate-path": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
- "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
- "requires": {
- "p-locate": "^5.0.0"
- }
- },
- "p-limit": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
- "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
- "requires": {
- "yocto-queue": "^0.1.0"
- }
- },
- "p-locate": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
- "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
- "requires": {
- "p-limit": "^3.0.2"
- }
- }
- }
- },
- "react-dom": {
- "version": "17.0.2",
- "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-17.0.2.tgz",
- "integrity": "sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==",
- "requires": {
- "loose-envify": "^1.1.0",
- "object-assign": "^4.1.1",
- "scheduler": "^0.20.2"
- }
- },
- "react-error-overlay": {
- "version": "6.0.11",
- "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.11.tgz",
- "integrity": "sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg=="
- },
- "react-is": {
- "version": "18.2.0",
- "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
- "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
- },
- "react-refresh": {
- "version": "0.11.0",
- "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.11.0.tgz",
- "integrity": "sha512-F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A=="
- },
- "react-scripts": {
- "version": "5.0.1",
- "resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-5.0.1.tgz",
- "integrity": "sha512-8VAmEm/ZAwQzJ+GOMLbBsTdDKOpuZh7RPs0UymvBR2vRk4iZWCskjbFnxqjrzoIvlNNRZ3QJFx6/qDSi6zSnaQ==",
- "requires": {
- "@babel/core": "^7.16.0",
- "@pmmmwh/react-refresh-webpack-plugin": "^0.5.3",
- "@svgr/webpack": "^5.5.0",
- "babel-jest": "^27.4.2",
- "babel-loader": "^8.2.3",
- "babel-plugin-named-asset-import": "^0.3.8",
- "babel-preset-react-app": "^10.0.1",
- "bfj": "^7.0.2",
- "browserslist": "^4.18.1",
- "camelcase": "^6.2.1",
- "case-sensitive-paths-webpack-plugin": "^2.4.0",
- "css-loader": "^6.5.1",
- "css-minimizer-webpack-plugin": "^3.2.0",
- "dotenv": "^10.0.0",
- "dotenv-expand": "^5.1.0",
- "eslint": "^8.3.0",
- "eslint-config-react-app": "^7.0.1",
- "eslint-webpack-plugin": "^3.1.1",
- "file-loader": "^6.2.0",
- "fs-extra": "^10.0.0",
- "fsevents": "^2.3.2",
- "html-webpack-plugin": "^5.5.0",
- "identity-obj-proxy": "^3.0.0",
- "jest": "^27.4.3",
- "jest-resolve": "^27.4.2",
- "jest-watch-typeahead": "^1.0.0",
- "mini-css-extract-plugin": "^2.4.5",
- "postcss": "^8.4.4",
- "postcss-flexbugs-fixes": "^5.0.2",
- "postcss-loader": "^6.2.1",
- "postcss-normalize": "^10.0.1",
- "postcss-preset-env": "^7.0.1",
- "prompts": "^2.4.2",
- "react-app-polyfill": "^3.0.0",
- "react-dev-utils": "^12.0.1",
- "react-refresh": "^0.11.0",
- "resolve": "^1.20.0",
- "resolve-url-loader": "^4.0.0",
- "sass-loader": "^12.3.0",
- "semver": "^7.3.5",
- "source-map-loader": "^3.0.0",
- "style-loader": "^3.3.1",
- "tailwindcss": "^3.0.2",
- "terser-webpack-plugin": "^5.2.5",
- "webpack": "^5.64.4",
- "webpack-dev-server": "^4.6.0",
- "webpack-manifest-plugin": "^4.0.2",
- "workbox-webpack-plugin": "^6.4.1"
- },
- "dependencies": {
- "@jest/console": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.5.1.tgz",
- "integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==",
- "requires": {
- "@jest/types": "^27.5.1",
- "@types/node": "*",
- "chalk": "^4.0.0",
- "jest-message-util": "^27.5.1",
- "jest-util": "^27.5.1",
- "slash": "^3.0.0"
- }
- },
- "@jest/core": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/@jest/core/-/core-27.5.1.tgz",
- "integrity": "sha512-AK6/UTrvQD0Cd24NSqmIA6rKsu0tKIxfiCducZvqxYdmMisOYAsdItspT+fQDQYARPf8XgjAFZi0ogW2agH5nQ==",
- "requires": {
- "@jest/console": "^27.5.1",
- "@jest/reporters": "^27.5.1",
- "@jest/test-result": "^27.5.1",
- "@jest/transform": "^27.5.1",
- "@jest/types": "^27.5.1",
- "@types/node": "*",
- "ansi-escapes": "^4.2.1",
- "chalk": "^4.0.0",
- "emittery": "^0.8.1",
- "exit": "^0.1.2",
- "graceful-fs": "^4.2.9",
- "jest-changed-files": "^27.5.1",
- "jest-config": "^27.5.1",
- "jest-haste-map": "^27.5.1",
- "jest-message-util": "^27.5.1",
- "jest-regex-util": "^27.5.1",
- "jest-resolve": "^27.5.1",
- "jest-resolve-dependencies": "^27.5.1",
- "jest-runner": "^27.5.1",
- "jest-runtime": "^27.5.1",
- "jest-snapshot": "^27.5.1",
- "jest-util": "^27.5.1",
- "jest-validate": "^27.5.1",
- "jest-watcher": "^27.5.1",
- "micromatch": "^4.0.4",
- "rimraf": "^3.0.0",
- "slash": "^3.0.0",
- "strip-ansi": "^6.0.0"
- }
- },
- "@jest/environment": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.5.1.tgz",
- "integrity": "sha512-/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA==",
- "requires": {
- "@jest/fake-timers": "^27.5.1",
- "@jest/types": "^27.5.1",
- "@types/node": "*",
- "jest-mock": "^27.5.1"
- }
- },
- "@jest/fake-timers": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.5.1.tgz",
- "integrity": "sha512-/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ==",
- "requires": {
- "@jest/types": "^27.5.1",
- "@sinonjs/fake-timers": "^8.0.1",
- "@types/node": "*",
- "jest-message-util": "^27.5.1",
- "jest-mock": "^27.5.1",
- "jest-util": "^27.5.1"
- }
- },
- "@jest/globals": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-27.5.1.tgz",
- "integrity": "sha512-ZEJNB41OBQQgGzgyInAv0UUfDDj3upmHydjieSxFvTRuZElrx7tXg/uVQ5hYVEwiXs3+aMsAeEc9X7xiSKCm4Q==",
- "requires": {
- "@jest/environment": "^27.5.1",
- "@jest/types": "^27.5.1",
- "expect": "^27.5.1"
- }
- },
- "@jest/reporters": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-27.5.1.tgz",
- "integrity": "sha512-cPXh9hWIlVJMQkVk84aIvXuBB4uQQmFqZiacloFuGiP3ah1sbCxCosidXFDfqG8+6fO1oR2dTJTlsOy4VFmUfw==",
- "requires": {
- "@bcoe/v8-coverage": "^0.2.3",
- "@jest/console": "^27.5.1",
- "@jest/test-result": "^27.5.1",
- "@jest/transform": "^27.5.1",
- "@jest/types": "^27.5.1",
- "@types/node": "*",
- "chalk": "^4.0.0",
- "collect-v8-coverage": "^1.0.0",
- "exit": "^0.1.2",
- "glob": "^7.1.2",
- "graceful-fs": "^4.2.9",
- "istanbul-lib-coverage": "^3.0.0",
- "istanbul-lib-instrument": "^5.1.0",
- "istanbul-lib-report": "^3.0.0",
- "istanbul-lib-source-maps": "^4.0.0",
- "istanbul-reports": "^3.1.3",
- "jest-haste-map": "^27.5.1",
- "jest-resolve": "^27.5.1",
- "jest-util": "^27.5.1",
- "jest-worker": "^27.5.1",
- "slash": "^3.0.0",
- "source-map": "^0.6.0",
- "string-length": "^4.0.1",
- "terminal-link": "^2.0.0",
- "v8-to-istanbul": "^8.1.0"
- }
- },
- "@jest/schemas": {
- "version": "28.1.3",
- "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz",
- "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==",
- "requires": {
- "@sinclair/typebox": "^0.24.1"
- }
- },
- "@jest/source-map": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-27.5.1.tgz",
- "integrity": "sha512-y9NIHUYF3PJRlHk98NdC/N1gl88BL08aQQgu4k4ZopQkCw9t9cV8mtl3TV8b/YCB8XaVTFrmUTAJvjsntDireg==",
- "requires": {
- "callsites": "^3.0.0",
- "graceful-fs": "^4.2.9",
- "source-map": "^0.6.0"
- }
- },
- "@jest/test-result": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.5.1.tgz",
- "integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==",
- "requires": {
- "@jest/console": "^27.5.1",
- "@jest/types": "^27.5.1",
- "@types/istanbul-lib-coverage": "^2.0.0",
- "collect-v8-coverage": "^1.0.0"
- }
- },
- "@jest/test-sequencer": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.5.1.tgz",
- "integrity": "sha512-LCheJF7WB2+9JuCS7VB/EmGIdQuhtqjRNI9A43idHv3E4KltCTsPsLxvdaubFHSYwY/fNjMWjl6vNRhDiN7vpQ==",
- "requires": {
- "@jest/test-result": "^27.5.1",
- "graceful-fs": "^4.2.9",
- "jest-haste-map": "^27.5.1",
- "jest-runtime": "^27.5.1"
- }
- },
- "@sinclair/typebox": {
- "version": "0.24.51",
- "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz",
- "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA=="
- },
- "@sinonjs/commons": {
- "version": "1.8.6",
- "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz",
- "integrity": "sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==",
- "requires": {
- "type-detect": "4.0.8"
- }
- },
- "@sinonjs/fake-timers": {
- "version": "8.1.0",
- "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz",
- "integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==",
- "requires": {
- "@sinonjs/commons": "^1.7.0"
- }
- },
- "@types/yargs": {
- "version": "17.0.24",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
- "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
- "requires": {
- "@types/yargs-parser": "*"
- }
- },
- "ansi-styles": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
- "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="
- },
- "cliui": {
- "version": "7.0.4",
- "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
- "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
- "requires": {
- "string-width": "^4.2.0",
- "strip-ansi": "^6.0.0",
- "wrap-ansi": "^7.0.0"
- }
- },
- "dedent": {
- "version": "0.7.0",
- "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
- "integrity": "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA=="
- },
- "diff-sequences": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.5.1.tgz",
- "integrity": "sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ=="
- },
- "emittery": {
- "version": "0.8.1",
- "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.8.1.tgz",
- "integrity": "sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg=="
- },
- "expect": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/expect/-/expect-27.5.1.tgz",
- "integrity": "sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==",
- "requires": {
- "@jest/types": "^27.5.1",
- "jest-get-type": "^27.5.1",
- "jest-matcher-utils": "^27.5.1",
- "jest-message-util": "^27.5.1"
- }
- },
- "fs-extra": {
- "version": "10.1.0",
- "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
- "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
- "requires": {
- "graceful-fs": "^4.2.0",
- "jsonfile": "^6.0.1",
- "universalify": "^2.0.0"
- }
- },
- "jest": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/jest/-/jest-27.5.1.tgz",
- "integrity": "sha512-Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ==",
- "requires": {
- "@jest/core": "^27.5.1",
- "import-local": "^3.0.2",
- "jest-cli": "^27.5.1"
- }
- },
- "jest-changed-files": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-27.5.1.tgz",
- "integrity": "sha512-buBLMiByfWGCoMsLLzGUUSpAmIAGnbR2KJoMN10ziLhOLvP4e0SlypHnAel8iqQXTrcbmfEY9sSqae5sgUsTvw==",
- "requires": {
- "@jest/types": "^27.5.1",
- "execa": "^5.0.0",
- "throat": "^6.0.1"
- }
- },
- "jest-circus": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-27.5.1.tgz",
- "integrity": "sha512-D95R7x5UtlMA5iBYsOHFFbMD/GVA4R/Kdq15f7xYWUfWHBto9NYRsOvnSauTgdF+ogCpJ4tyKOXhUifxS65gdw==",
- "requires": {
- "@jest/environment": "^27.5.1",
- "@jest/test-result": "^27.5.1",
- "@jest/types": "^27.5.1",
- "@types/node": "*",
- "chalk": "^4.0.0",
- "co": "^4.6.0",
- "dedent": "^0.7.0",
- "expect": "^27.5.1",
- "is-generator-fn": "^2.0.0",
- "jest-each": "^27.5.1",
- "jest-matcher-utils": "^27.5.1",
- "jest-message-util": "^27.5.1",
- "jest-runtime": "^27.5.1",
- "jest-snapshot": "^27.5.1",
- "jest-util": "^27.5.1",
- "pretty-format": "^27.5.1",
- "slash": "^3.0.0",
- "stack-utils": "^2.0.3",
- "throat": "^6.0.1"
- }
- },
- "jest-cli": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-27.5.1.tgz",
- "integrity": "sha512-Hc6HOOwYq4/74/c62dEE3r5elx8wjYqxY0r0G/nFrLDPMFRu6RA/u8qINOIkvhxG7mMQ5EJsOGfRpI8L6eFUVw==",
- "requires": {
- "@jest/core": "^27.5.1",
- "@jest/test-result": "^27.5.1",
- "@jest/types": "^27.5.1",
- "chalk": "^4.0.0",
- "exit": "^0.1.2",
- "graceful-fs": "^4.2.9",
- "import-local": "^3.0.2",
- "jest-config": "^27.5.1",
- "jest-util": "^27.5.1",
- "jest-validate": "^27.5.1",
- "prompts": "^2.0.1",
- "yargs": "^16.2.0"
- }
- },
- "jest-config": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-27.5.1.tgz",
- "integrity": "sha512-5sAsjm6tGdsVbW9ahcChPAFCk4IlkQUknH5AvKjuLTSlcO/wCZKyFdn7Rg0EkC+OGgWODEy2hDpWB1PgzH0JNA==",
- "requires": {
- "@babel/core": "^7.8.0",
- "@jest/test-sequencer": "^27.5.1",
- "@jest/types": "^27.5.1",
- "babel-jest": "^27.5.1",
- "chalk": "^4.0.0",
- "ci-info": "^3.2.0",
- "deepmerge": "^4.2.2",
- "glob": "^7.1.1",
- "graceful-fs": "^4.2.9",
- "jest-circus": "^27.5.1",
- "jest-environment-jsdom": "^27.5.1",
- "jest-environment-node": "^27.5.1",
- "jest-get-type": "^27.5.1",
- "jest-jasmine2": "^27.5.1",
- "jest-regex-util": "^27.5.1",
- "jest-resolve": "^27.5.1",
- "jest-runner": "^27.5.1",
- "jest-util": "^27.5.1",
- "jest-validate": "^27.5.1",
- "micromatch": "^4.0.4",
- "parse-json": "^5.2.0",
- "pretty-format": "^27.5.1",
- "slash": "^3.0.0",
- "strip-json-comments": "^3.1.1"
- }
- },
- "jest-diff": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.1.tgz",
- "integrity": "sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==",
- "requires": {
- "chalk": "^4.0.0",
- "diff-sequences": "^27.5.1",
- "jest-get-type": "^27.5.1",
- "pretty-format": "^27.5.1"
- }
- },
- "jest-docblock": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-27.5.1.tgz",
- "integrity": "sha512-rl7hlABeTsRYxKiUfpHrQrG4e2obOiTQWfMEH3PxPjOtdsfLQO4ReWSZaQ7DETm4xu07rl4q/h4zcKXyU0/OzQ==",
- "requires": {
- "detect-newline": "^3.0.0"
- }
- },
- "jest-each": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-27.5.1.tgz",
- "integrity": "sha512-1Ff6p+FbhT/bXQnEouYy00bkNSY7OUpfIcmdl8vZ31A1UUaurOLPA8a8BbJOF2RDUElwJhmeaV7LnagI+5UwNQ==",
- "requires": {
- "@jest/types": "^27.5.1",
- "chalk": "^4.0.0",
- "jest-get-type": "^27.5.1",
- "jest-util": "^27.5.1",
- "pretty-format": "^27.5.1"
- }
- },
- "jest-environment-node": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.5.1.tgz",
- "integrity": "sha512-Jt4ZUnxdOsTGwSRAfKEnE6BcwsSPNOijjwifq5sDFSA2kesnXTvNqKHYgM0hDq3549Uf/KzdXNYn4wMZJPlFLw==",
- "requires": {
- "@jest/environment": "^27.5.1",
- "@jest/fake-timers": "^27.5.1",
- "@jest/types": "^27.5.1",
- "@types/node": "*",
- "jest-mock": "^27.5.1",
- "jest-util": "^27.5.1"
- }
- },
- "jest-leak-detector": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-27.5.1.tgz",
- "integrity": "sha512-POXfWAMvfU6WMUXftV4HolnJfnPOGEu10fscNCA76KBpRRhcMN2c8d3iT2pxQS3HLbA+5X4sOUPzYO2NUyIlHQ==",
- "requires": {
- "jest-get-type": "^27.5.1",
- "pretty-format": "^27.5.1"
- }
- },
- "jest-matcher-utils": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz",
- "integrity": "sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==",
- "requires": {
- "chalk": "^4.0.0",
- "jest-diff": "^27.5.1",
- "jest-get-type": "^27.5.1",
- "pretty-format": "^27.5.1"
- }
- },
- "jest-message-util": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
- "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
- "requires": {
- "@babel/code-frame": "^7.12.13",
- "@jest/types": "^27.5.1",
- "@types/stack-utils": "^2.0.0",
- "chalk": "^4.0.0",
- "graceful-fs": "^4.2.9",
- "micromatch": "^4.0.4",
- "pretty-format": "^27.5.1",
- "slash": "^3.0.0",
- "stack-utils": "^2.0.3"
- }
- },
- "jest-mock": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.5.1.tgz",
- "integrity": "sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og==",
- "requires": {
- "@jest/types": "^27.5.1",
- "@types/node": "*"
- }
- },
- "jest-resolve-dependencies": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.5.1.tgz",
- "integrity": "sha512-QQOOdY4PE39iawDn5rzbIePNigfe5B9Z91GDD1ae/xNDlu9kaat8QQ5EKnNmVWPV54hUdxCVwwj6YMgR2O7IOg==",
- "requires": {
- "@jest/types": "^27.5.1",
- "jest-regex-util": "^27.5.1",
- "jest-snapshot": "^27.5.1"
- }
- },
- "jest-runner": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-27.5.1.tgz",
- "integrity": "sha512-g4NPsM4mFCOwFKXO4p/H/kWGdJp9V8kURY2lX8Me2drgXqG7rrZAx5kv+5H7wtt/cdFIjhqYx1HrlqWHaOvDaQ==",
- "requires": {
- "@jest/console": "^27.5.1",
- "@jest/environment": "^27.5.1",
- "@jest/test-result": "^27.5.1",
- "@jest/transform": "^27.5.1",
- "@jest/types": "^27.5.1",
- "@types/node": "*",
- "chalk": "^4.0.0",
- "emittery": "^0.8.1",
- "graceful-fs": "^4.2.9",
- "jest-docblock": "^27.5.1",
- "jest-environment-jsdom": "^27.5.1",
- "jest-environment-node": "^27.5.1",
- "jest-haste-map": "^27.5.1",
- "jest-leak-detector": "^27.5.1",
- "jest-message-util": "^27.5.1",
- "jest-resolve": "^27.5.1",
- "jest-runtime": "^27.5.1",
- "jest-util": "^27.5.1",
- "jest-worker": "^27.5.1",
- "source-map-support": "^0.5.6",
- "throat": "^6.0.1"
- }
- },
- "jest-runtime": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.5.1.tgz",
- "integrity": "sha512-o7gxw3Gf+H2IGt8fv0RiyE1+r83FJBRruoA+FXrlHw6xEyBsU8ugA6IPfTdVyA0w8HClpbK+DGJxH59UrNMx8A==",
- "requires": {
- "@jest/environment": "^27.5.1",
- "@jest/fake-timers": "^27.5.1",
- "@jest/globals": "^27.5.1",
- "@jest/source-map": "^27.5.1",
- "@jest/test-result": "^27.5.1",
- "@jest/transform": "^27.5.1",
- "@jest/types": "^27.5.1",
- "chalk": "^4.0.0",
- "cjs-module-lexer": "^1.0.0",
- "collect-v8-coverage": "^1.0.0",
- "execa": "^5.0.0",
- "glob": "^7.1.3",
- "graceful-fs": "^4.2.9",
- "jest-haste-map": "^27.5.1",
- "jest-message-util": "^27.5.1",
- "jest-mock": "^27.5.1",
- "jest-regex-util": "^27.5.1",
- "jest-resolve": "^27.5.1",
- "jest-snapshot": "^27.5.1",
- "jest-util": "^27.5.1",
- "slash": "^3.0.0",
- "strip-bom": "^4.0.0"
- }
- },
- "jest-snapshot": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.5.1.tgz",
- "integrity": "sha512-yYykXI5a0I31xX67mgeLw1DZ0bJB+gpq5IpSuCAoyDi0+BhgU/RIrL+RTzDmkNTchvDFWKP8lp+w/42Z3us5sA==",
- "requires": {
- "@babel/core": "^7.7.2",
- "@babel/generator": "^7.7.2",
- "@babel/plugin-syntax-typescript": "^7.7.2",
- "@babel/traverse": "^7.7.2",
- "@babel/types": "^7.0.0",
- "@jest/transform": "^27.5.1",
- "@jest/types": "^27.5.1",
- "@types/babel__traverse": "^7.0.4",
- "@types/prettier": "^2.1.5",
- "babel-preset-current-node-syntax": "^1.0.0",
- "chalk": "^4.0.0",
- "expect": "^27.5.1",
- "graceful-fs": "^4.2.9",
- "jest-diff": "^27.5.1",
- "jest-get-type": "^27.5.1",
- "jest-haste-map": "^27.5.1",
- "jest-matcher-utils": "^27.5.1",
- "jest-message-util": "^27.5.1",
- "jest-util": "^27.5.1",
- "natural-compare": "^1.4.0",
- "pretty-format": "^27.5.1",
- "semver": "^7.3.2"
- }
- },
- "jest-watch-typeahead": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/jest-watch-typeahead/-/jest-watch-typeahead-1.1.0.tgz",
- "integrity": "sha512-Va5nLSJTN7YFtC2jd+7wsoe1pNe5K4ShLux/E5iHEwlB9AxaxmggY7to9KUqKojhaJw3aXqt5WAb4jGPOolpEw==",
- "requires": {
- "ansi-escapes": "^4.3.1",
- "chalk": "^4.0.0",
- "jest-regex-util": "^28.0.0",
- "jest-watcher": "^28.0.0",
- "slash": "^4.0.0",
- "string-length": "^5.0.1",
- "strip-ansi": "^7.0.1"
- },
- "dependencies": {
- "@jest/console": {
- "version": "28.1.3",
- "resolved": "https://registry.npmjs.org/@jest/console/-/console-28.1.3.tgz",
- "integrity": "sha512-QPAkP5EwKdK/bxIr6C1I4Vs0rm2nHiANzj/Z5X2JQkrZo6IqvC4ldZ9K95tF0HdidhA8Bo6egxSzUFPYKcEXLw==",
- "requires": {
- "@jest/types": "^28.1.3",
- "@types/node": "*",
- "chalk": "^4.0.0",
- "jest-message-util": "^28.1.3",
- "jest-util": "^28.1.3",
- "slash": "^3.0.0"
- },
- "dependencies": {
- "slash": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
- "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="
- }
- }
- },
- "@jest/test-result": {
- "version": "28.1.3",
- "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-28.1.3.tgz",
- "integrity": "sha512-kZAkxnSE+FqE8YjW8gNuoVkkC9I7S1qmenl8sGcDOLropASP+BkcGKwhXoyqQuGOGeYY0y/ixjrd/iERpEXHNg==",
- "requires": {
- "@jest/console": "^28.1.3",
- "@jest/types": "^28.1.3",
- "@types/istanbul-lib-coverage": "^2.0.0",
- "collect-v8-coverage": "^1.0.0"
- }
- },
- "@jest/types": {
- "version": "28.1.3",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz",
- "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==",
- "requires": {
- "@jest/schemas": "^28.1.3",
- "@types/istanbul-lib-coverage": "^2.0.0",
- "@types/istanbul-reports": "^3.0.0",
- "@types/node": "*",
- "@types/yargs": "^17.0.8",
- "chalk": "^4.0.0"
- }
- },
- "emittery": {
- "version": "0.10.2",
- "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.10.2.tgz",
- "integrity": "sha512-aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw=="
- },
- "jest-message-util": {
- "version": "28.1.3",
- "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.3.tgz",
- "integrity": "sha512-PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g==",
- "requires": {
- "@babel/code-frame": "^7.12.13",
- "@jest/types": "^28.1.3",
- "@types/stack-utils": "^2.0.0",
- "chalk": "^4.0.0",
- "graceful-fs": "^4.2.9",
- "micromatch": "^4.0.4",
- "pretty-format": "^28.1.3",
- "slash": "^3.0.0",
- "stack-utils": "^2.0.3"
- },
- "dependencies": {
- "slash": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
- "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="
- }
- }
- },
- "jest-regex-util": {
- "version": "28.0.2",
- "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-28.0.2.tgz",
- "integrity": "sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw=="
- },
- "jest-util": {
- "version": "28.1.3",
- "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz",
- "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==",
- "requires": {
- "@jest/types": "^28.1.3",
- "@types/node": "*",
- "chalk": "^4.0.0",
- "ci-info": "^3.2.0",
- "graceful-fs": "^4.2.9",
- "picomatch": "^2.2.3"
- }
- },
- "jest-watcher": {
- "version": "28.1.3",
- "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-28.1.3.tgz",
- "integrity": "sha512-t4qcqj9hze+jviFPUN3YAtAEeFnr/azITXQEMARf5cMwKY2SMBRnCQTXLixTl20OR6mLh9KLMrgVJgJISym+1g==",
- "requires": {
- "@jest/test-result": "^28.1.3",
- "@jest/types": "^28.1.3",
- "@types/node": "*",
- "ansi-escapes": "^4.2.1",
- "chalk": "^4.0.0",
- "emittery": "^0.10.2",
- "jest-util": "^28.1.3",
- "string-length": "^4.0.1"
- },
- "dependencies": {
- "string-length": {
- "version": "4.0.2",
- "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
- "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
- "requires": {
- "char-regex": "^1.0.2",
- "strip-ansi": "^6.0.0"
- }
- },
- "strip-ansi": {
- "version": "6.0.1",
- "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
- "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
- "requires": {
- "ansi-regex": "^5.0.1"
- }
- }
- }
- },
- "pretty-format": {
- "version": "28.1.3",
- "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz",
- "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==",
- "requires": {
- "@jest/schemas": "^28.1.3",
- "ansi-regex": "^5.0.1",
- "ansi-styles": "^5.0.0",
- "react-is": "^18.0.0"
- }
- },
- "slash": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
- "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew=="
- },
- "string-length": {
- "version": "5.0.1",
- "resolved": "https://registry.npmjs.org/string-length/-/string-length-5.0.1.tgz",
- "integrity": "sha512-9Ep08KAMUn0OadnVaBuRdE2l615CQ508kr0XMadjClfYpdCyvrbFp6Taebo8yyxokQ4viUd/xPPUA4FGgUa0ow==",
- "requires": {
- "char-regex": "^2.0.0",
- "strip-ansi": "^7.0.1"
- },
- "dependencies": {
- "char-regex": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-2.0.1.tgz",
- "integrity": "sha512-oSvEeo6ZUD7NepqAat3RqoucZ5SeqLJgOvVIwkafu6IP3V0pO38s/ypdVUmDDK6qIIHNlYHJAKX9E7R7HoKElw=="
- }
- }
- },
- "strip-ansi": {
- "version": "7.1.0",
- "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
- "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
- "requires": {
- "ansi-regex": "^6.0.1"
- },
- "dependencies": {
- "ansi-regex": {
- "version": "6.0.1",
- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
- "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA=="
- }
- }
- }
- }
- },
- "jest-watcher": {
- "version": "27.5.1",
- "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.5.1.tgz",
- "integrity": "sha512-z676SuD6Z8o8qbmEGhoEUFOM1+jfEiL3DXHK/xgEiG2EyNYfFG60jluWcupY6dATjfEsKQuibReS1djInQnoVw==",
- "requires": {
- "@jest/test-result": "^27.5.1",
- "@jest/types": "^27.5.1",
- "@types/node": "*",
- "ansi-escapes": "^4.2.1",
- "chalk": "^4.0.0",
- "jest-util": "^27.5.1",
- "string-length": "^4.0.1"
- }
- },
- "lru-cache": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
- "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
- "requires": {
- "yallist": "^4.0.0"
- }
- },
- "semver": {
- "version": "7.5.2",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz",
- "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
- "requires": {
- "lru-cache": "^6.0.0"
- }
- },
- "source-map": {
- "version": "0.6.1",
- "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
- "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
- },
- "v8-to-istanbul": {
- "version": "8.1.1",
- "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-8.1.1.tgz",
- "integrity": "sha512-FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w==",
- "requires": {
- "@types/istanbul-lib-coverage": "^2.0.1",
- "convert-source-map": "^1.6.0",
- "source-map": "^0.7.3"
- },
- "dependencies": {
- "source-map": {
- "version": "0.7.4",
- "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
- "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA=="
- }
- }
- },
- "yallist": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
- "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
- },
- "yargs": {
- "version": "16.2.0",
- "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
- "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
- "requires": {
- "cliui": "^7.0.2",
- "escalade": "^3.1.1",
- "get-caller-file": "^2.0.5",
- "require-directory": "^2.1.1",
- "string-width": "^4.2.0",
- "y18n": "^5.0.5",
- "yargs-parser": "^20.2.2"
- }
- },
- "yargs-parser": {
- "version": "20.2.9",
- "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
- "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w=="
- }
- }
- },
- "read-cache": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
- "integrity": "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==",
- "requires": {
- "pify": "^2.3.0"
- }
- },
- "readable-stream": {
- "version": "3.6.2",
- "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
- "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
- "requires": {
- "inherits": "^2.0.3",
- "string_decoder": "^1.1.1",
- "util-deprecate": "^1.0.1"
- }
- },
- "readdirp": {
- "version": "3.6.0",
- "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
- "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
- "requires": {
- "picomatch": "^2.2.1"
- }
- },
- "recursive-readdir": {
- "version": "2.2.3",
- "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.3.tgz",
- "integrity": "sha512-8HrF5ZsXk5FAH9dgsx3BlUer73nIhuj+9OrQwEbLTPOBzGkL1lsFCR01am+v+0m2Cmbs1nP12hLDl5FA7EszKA==",
- "requires": {
- "minimatch": "^3.0.5"
- }
- },
- "redent": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
- "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
- "dev": true,
- "requires": {
- "indent-string": "^4.0.0",
- "strip-indent": "^3.0.0"
- }
- },
- "regenerate": {
- "version": "1.4.2",
- "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
- "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="
- },
- "regenerate-unicode-properties": {
- "version": "10.1.0",
- "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz",
- "integrity": "sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==",
- "requires": {
- "regenerate": "^1.4.2"
- }
- },
- "regenerator-runtime": {
- "version": "0.13.11",
- "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
- "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
- },
- "regenerator-transform": {
- "version": "0.15.1",
- "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.1.tgz",
- "integrity": "sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg==",
- "requires": {
- "@babel/runtime": "^7.8.4"
- }
- },
- "regex-parser": {
- "version": "2.2.11",
- "resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.2.11.tgz",
- "integrity": "sha512-jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q=="
- },
- "regexp.prototype.flags": {
- "version": "1.5.0",
- "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz",
- "integrity": "sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==",
- "requires": {
- "call-bind": "^1.0.2",
- "define-properties": "^1.2.0",
- "functions-have-names": "^1.2.3"
- }
- },
- "regexpu-core": {
- "version": "5.3.2",
- "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz",
- "integrity": "sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==",
- "requires": {
- "@babel/regjsgen": "^0.8.0",
- "regenerate": "^1.4.2",
- "regenerate-unicode-properties": "^10.1.0",
- "regjsparser": "^0.9.1",
- "unicode-match-property-ecmascript": "^2.0.0",
- "unicode-match-property-value-ecmascript": "^2.1.0"
- }
- },
- "regjsparser": {
- "version": "0.9.1",
- "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz",
- "integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==",
- "requires": {
- "jsesc": "~0.5.0"
- },
- "dependencies": {
- "jsesc": {
- "version": "0.5.0",
- "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
- "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA=="
- }
- }
- },
- "relateurl": {
- "version": "0.2.7",
- "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
- "integrity": "sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog=="
- },
- "renderkid": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-3.0.0.tgz",
- "integrity": "sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg==",
- "requires": {
- "css-select": "^4.1.3",
- "dom-converter": "^0.2.0",
- "htmlparser2": "^6.1.0",
- "lodash": "^4.17.21",
- "strip-ansi": "^6.0.1"
- }
- },
- "require-directory": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
- "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="
- },
- "require-from-string": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
- "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw=="
- },
- "requires-port": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
- "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="
- },
- "resolve": {
- "version": "1.22.2",
- "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz",
- "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==",
- "requires": {
- "is-core-module": "^2.11.0",
- "path-parse": "^1.0.7",
- "supports-preserve-symlinks-flag": "^1.0.0"
- }
- },
- "resolve-cwd": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
- "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
- "requires": {
- "resolve-from": "^5.0.0"
- }
- },
- "resolve-from": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
- "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw=="
- },
- "resolve-url-loader": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-4.0.0.tgz",
- "integrity": "sha512-05VEMczVREcbtT7Bz+C+96eUO5HDNvdthIiMB34t7FcF8ehcu4wC0sSgPUubs3XW2Q3CNLJk/BJrCU9wVRymiA==",
- "requires": {
- "adjust-sourcemap-loader": "^4.0.0",
- "convert-source-map": "^1.7.0",
- "loader-utils": "^2.0.0",
- "postcss": "^7.0.35",
- "source-map": "0.6.1"
- },
- "dependencies": {
- "picocolors": {
- "version": "0.2.1",
- "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
- "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA=="
- },
- "postcss": {
- "version": "7.0.39",
- "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
- "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
- "requires": {
- "picocolors": "^0.2.1",
- "source-map": "^0.6.1"
- }
- },
- "source-map": {
- "version": "0.6.1",
- "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
- "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
- }
- }
- },
- "resolve.exports": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.1.tgz",
- "integrity": "sha512-/NtpHNDN7jWhAaQ9BvBUYZ6YTXsRBgfqWFWP7BZBaoMJO/I3G5OFzvTuWNlZC3aPjins1F+TNrLKsGbH4rfsRQ=="
- },
- "retry": {
- "version": "0.13.1",
- "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
- "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg=="
- },
- "reusify": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
- "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="
- },
- "rimraf": {
- "version": "3.0.2",
- "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
- "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
- "requires": {
- "glob": "^7.1.3"
- }
- },
- "rollup": {
- "version": "2.79.1",
- "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.1.tgz",
- "integrity": "sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==",
- "requires": {
- "fsevents": "~2.3.2"
- }
- },
- "rollup-plugin-terser": {
- "version": "7.0.2",
- "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz",
- "integrity": "sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ==",
- "requires": {
- "@babel/code-frame": "^7.10.4",
- "jest-worker": "^26.2.1",
- "serialize-javascript": "^4.0.0",
- "terser": "^5.0.0"
- },
- "dependencies": {
- "jest-worker": {
- "version": "26.6.2",
- "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz",
- "integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==",
- "requires": {
- "@types/node": "*",
- "merge-stream": "^2.0.0",
- "supports-color": "^7.0.0"
- }
- },
- "serialize-javascript": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
- "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
- "requires": {
- "randombytes": "^2.1.0"
- }
- }
- }
- },
- "run-parallel": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
- "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
- "requires": {
- "queue-microtask": "^1.2.2"
- }
- },
- "safe-array-concat": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.0.tgz",
- "integrity": "sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ==",
- "requires": {
- "call-bind": "^1.0.2",
- "get-intrinsic": "^1.2.0",
- "has-symbols": "^1.0.3",
- "isarray": "^2.0.5"
- }
- },
- "safe-buffer": {
- "version": "5.2.1",
- "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
- "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
- },
- "safe-regex-test": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz",
- "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==",
- "requires": {
- "call-bind": "^1.0.2",
- "get-intrinsic": "^1.1.3",
- "is-regex": "^1.1.4"
- }
- },
- "safer-buffer": {
- "version": "2.1.2",
- "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
- "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
- },
- "sanitize.css": {
- "version": "13.0.0",
- "resolved": "https://registry.npmjs.org/sanitize.css/-/sanitize.css-13.0.0.tgz",
- "integrity": "sha512-ZRwKbh/eQ6w9vmTjkuG0Ioi3HBwPFce0O+v//ve+aOq1oeCy7jMV2qzzAlpsNuqpqCBjjriM1lbtZbF/Q8jVyA=="
- },
- "sass-loader": {
- "version": "12.6.0",
- "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-12.6.0.tgz",
- "integrity": "sha512-oLTaH0YCtX4cfnJZxKSLAyglED0naiYfNG1iXfU5w1LNZ+ukoA5DtyDIN5zmKVZwYNJP4KRc5Y3hkWga+7tYfA==",
- "requires": {
- "klona": "^2.0.4",
- "neo-async": "^2.6.2"
- }
- },
- "sax": {
- "version": "1.2.4",
- "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
- "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
- },
- "saxes": {
- "version": "5.0.1",
- "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz",
- "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==",
- "requires": {
- "xmlchars": "^2.2.0"
- }
- },
- "scheduler": {
- "version": "0.20.2",
- "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.20.2.tgz",
- "integrity": "sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==",
- "requires": {
- "loose-envify": "^1.1.0",
- "object-assign": "^4.1.1"
- }
- },
- "schema-utils": {
- "version": "3.3.0",
- "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
- "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
- "requires": {
- "@types/json-schema": "^7.0.8",
- "ajv": "^6.12.5",
- "ajv-keywords": "^3.5.2"
- }
- },
- "select-hose": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
- "integrity": "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg=="
- },
- "selfsigned": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.1.1.tgz",
- "integrity": "sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ==",
- "requires": {
- "node-forge": "^1"
- }
- },
- "semver": {
- "version": "6.3.1",
- "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
- "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
- },
- "send": {
- "version": "0.18.0",
- "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
- "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
- "requires": {
- "debug": "2.6.9",
- "depd": "2.0.0",
- "destroy": "1.2.0",
- "encodeurl": "~1.0.2",
- "escape-html": "~1.0.3",
- "etag": "~1.8.1",
- "fresh": "0.5.2",
- "http-errors": "2.0.0",
- "mime": "1.6.0",
- "ms": "2.1.3",
- "on-finished": "2.4.1",
- "range-parser": "~1.2.1",
- "statuses": "2.0.1"
- },
- "dependencies": {
- "debug": {
- "version": "2.6.9",
- "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
- "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
- "requires": {
- "ms": "2.0.0"
- },
- "dependencies": {
- "ms": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
- "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
- }
- }
- },
- "ms": {
- "version": "2.1.3",
- "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
- "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
- }
- }
- },
- "serialize-javascript": {
- "version": "6.0.1",
- "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz",
- "integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==",
- "requires": {
- "randombytes": "^2.1.0"
- }
- },
- "serve-index": {
- "version": "1.9.1",
- "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
- "integrity": "sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==",
- "requires": {
- "accepts": "~1.3.4",
- "batch": "0.6.1",
- "debug": "2.6.9",
- "escape-html": "~1.0.3",
- "http-errors": "~1.6.2",
- "mime-types": "~2.1.17",
- "parseurl": "~1.3.2"
- },
- "dependencies": {
- "debug": {
- "version": "2.6.9",
- "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
- "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
- "requires": {
- "ms": "2.0.0"
- }
- },
- "depd": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
- "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ=="
- },
- "http-errors": {
- "version": "1.6.3",
- "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
- "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
- "requires": {
- "depd": "~1.1.2",
- "inherits": "2.0.3",
- "setprototypeof": "1.1.0",
- "statuses": ">= 1.4.0 < 2"
- }
- },
- "inherits": {
- "version": "2.0.3",
- "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
- "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw=="
- },
- "ms": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
- "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
- },
- "setprototypeof": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
- "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="
- },
- "statuses": {
- "version": "1.5.0",
- "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
- "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA=="
- }
- }
- },
- "serve-static": {
- "version": "1.15.0",
- "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
- "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
- "requires": {
- "encodeurl": "~1.0.2",
- "escape-html": "~1.0.3",
- "parseurl": "~1.3.3",
- "send": "0.18.0"
- }
- },
- "setprototypeof": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
- "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
- },
- "shallowequal": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz",
- "integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ=="
- },
- "sharp-router": {
- "version": "4.1.5",
- "resolved": "https://registry.npmjs.org/sharp-router/-/sharp-router-4.1.5.tgz",
- "integrity": "sha512-08BqX0aWohy4c9ZeG5sqPxTkdoCbVypEiI7kQrDY/lRV0n1javLc8LLJ7XqF80Uns0jMIPMRPp9I5PTBZZXAww==",
- "requires": {
- "@types/react": "^16.9.55",
- "react": "^17.0.1"
- },
- "dependencies": {
- "@types/react": {
- "version": "16.14.43",
- "resolved": "https://registry.npmjs.org/@types/react/-/react-16.14.43.tgz",
- "integrity": "sha512-7zdjv7jvoLLQg1tTvpQsm+hyNUMT2mPlNV1+d0I8fbGhkJl82spopMyBlu4wb1dviZAxpGdk5eHu/muacknnfw==",
- "requires": {
- "@types/prop-types": "*",
- "@types/scheduler": "*",
- "csstype": "^3.0.2"
- }
- }
- }
- },
- "shebang-command": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
- "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
- "requires": {
- "shebang-regex": "^3.0.0"
- }
- },
- "shebang-regex": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
- "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
- },
- "shell-quote": {
- "version": "1.8.1",
- "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz",
- "integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA=="
- },
- "side-channel": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
- "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
- "requires": {
- "call-bind": "^1.0.0",
- "get-intrinsic": "^1.0.2",
- "object-inspect": "^1.9.0"
- }
- },
- "signal-exit": {
- "version": "3.0.7",
- "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
- "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
- },
- "sisteransi": {
- "version": "1.0.5",
- "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
- "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg=="
- },
- "slash": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
- "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="
- },
- "sockjs": {
- "version": "0.3.24",
- "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz",
- "integrity": "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==",
- "requires": {
- "faye-websocket": "^0.11.3",
- "uuid": "^8.3.2",
- "websocket-driver": "^0.7.4"
- }
- },
- "source-list-map": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
- "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw=="
- },
- "source-map": {
- "version": "0.7.4",
- "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
- "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA=="
- },
- "source-map-js": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
- "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw=="
- },
- "source-map-loader": {
- "version": "3.0.2",
- "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-3.0.2.tgz",
- "integrity": "sha512-BokxPoLjyl3iOrgkWaakaxqnelAJSS+0V+De0kKIq6lyWrXuiPgYTGp6z3iHmqljKAaLXwZa+ctD8GccRJeVvg==",
- "requires": {
- "abab": "^2.0.5",
- "iconv-lite": "^0.6.3",
- "source-map-js": "^1.0.1"
- }
- },
- "source-map-support": {
- "version": "0.5.21",
- "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
- "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
- "requires": {
- "buffer-from": "^1.0.0",
- "source-map": "^0.6.0"
- },
- "dependencies": {
- "source-map": {
- "version": "0.6.1",
- "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
- "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
- }
- }
- },
- "sourcemap-codec": {
- "version": "1.4.8",
- "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
- "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA=="
- },
- "spdy": {
- "version": "4.0.2",
- "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz",
- "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==",
- "requires": {
- "debug": "^4.1.0",
- "handle-thing": "^2.0.0",
- "http-deceiver": "^1.2.7",
- "select-hose": "^2.0.0",
- "spdy-transport": "^3.0.0"
- }
- },
- "spdy-transport": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
- "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
- "requires": {
- "debug": "^4.1.0",
- "detect-node": "^2.0.4",
- "hpack.js": "^2.1.6",
- "obuf": "^1.1.2",
- "readable-stream": "^3.0.6",
- "wbuf": "^1.7.3"
- }
- },
- "sprintf-js": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
- "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="
- },
- "stable": {
- "version": "0.1.8",
- "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
- "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w=="
- },
- "stack-utils": {
- "version": "2.0.6",
- "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz",
- "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==",
- "requires": {
- "escape-string-regexp": "^2.0.0"
- },
- "dependencies": {
- "escape-string-regexp": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
- "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w=="
- }
- }
- },
- "stackframe": {
- "version": "1.3.4",
- "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.3.4.tgz",
- "integrity": "sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw=="
- },
- "statuses": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
- "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="
- },
- "stop-iteration-iterator": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz",
- "integrity": "sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==",
- "requires": {
- "internal-slot": "^1.0.4"
- }
- },
- "string_decoder": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
- "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
- "requires": {
- "safe-buffer": "~5.2.0"
- }
- },
- "string-length": {
- "version": "4.0.2",
- "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
- "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
- "requires": {
- "char-regex": "^1.0.2",
- "strip-ansi": "^6.0.0"
- }
- },
- "string-natural-compare": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/string-natural-compare/-/string-natural-compare-3.0.1.tgz",
- "integrity": "sha512-n3sPwynL1nwKi3WJ6AIsClwBMa0zTi54fn2oLU6ndfTSIO05xaznjSf15PcBZU6FNWbmN5Q6cxT4V5hGvB4taw=="
- },
- "string-width": {
- "version": "4.2.3",
- "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
- "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
- "requires": {
- "emoji-regex": "^8.0.0",
- "is-fullwidth-code-point": "^3.0.0",
- "strip-ansi": "^6.0.1"
- },
- "dependencies": {
- "emoji-regex": {
- "version": "8.0.0",
- "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
- "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
- }
- }
- },
- "string.prototype.matchall": {
- "version": "4.0.8",
- "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz",
- "integrity": "sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==",
- "requires": {
- "call-bind": "^1.0.2",
- "define-properties": "^1.1.4",
- "es-abstract": "^1.20.4",
- "get-intrinsic": "^1.1.3",
- "has-symbols": "^1.0.3",
- "internal-slot": "^1.0.3",
- "regexp.prototype.flags": "^1.4.3",
- "side-channel": "^1.0.4"
- }
- },
- "string.prototype.trim": {
- "version": "1.2.7",
- "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz",
- "integrity": "sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==",
- "requires": {
- "call-bind": "^1.0.2",
- "define-properties": "^1.1.4",
- "es-abstract": "^1.20.4"
- }
- },
- "string.prototype.trimend": {
- "version": "1.0.6",
- "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
- "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",
- "requires": {
- "call-bind": "^1.0.2",
- "define-properties": "^1.1.4",
- "es-abstract": "^1.20.4"
- }
- },
- "string.prototype.trimstart": {
- "version": "1.0.6",
- "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",
- "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",
- "requires": {
- "call-bind": "^1.0.2",
- "define-properties": "^1.1.4",
- "es-abstract": "^1.20.4"
- }
- },
- "stringify-object": {
- "version": "3.3.0",
- "resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz",
- "integrity": "sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==",
- "requires": {
- "get-own-enumerable-property-symbols": "^3.0.0",
- "is-obj": "^1.0.1",
- "is-regexp": "^1.0.0"
- }
- },
- "strip-ansi": {
- "version": "6.0.1",
- "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
- "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
- "requires": {
- "ansi-regex": "^5.0.1"
- }
- },
- "strip-bom": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
- "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w=="
- },
- "strip-comments": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/strip-comments/-/strip-comments-2.0.1.tgz",
- "integrity": "sha512-ZprKx+bBLXv067WTCALv8SSz5l2+XhpYCsVtSqlMnkAXMWDq+/ekVbl1ghqP9rUHTzv6sm/DwCOiYutU/yp1fw=="
- },
- "strip-final-newline": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
- "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA=="
- },
- "strip-indent": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
- "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
- "dev": true,
- "requires": {
- "min-indent": "^1.0.0"
- }
- },
- "strip-json-comments": {
- "version": "3.1.1",
- "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
- "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="
- },
- "strip-outer": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz",
- "integrity": "sha512-k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg==",
- "dev": true,
- "requires": {
- "escape-string-regexp": "^1.0.2"
- },
- "dependencies": {
- "escape-string-regexp": {
- "version": "1.0.5",
- "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
- "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
- "dev": true
- }
- }
- },
- "style-loader": {
- "version": "3.3.3",
- "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.3.tgz",
- "integrity": "sha512-53BiGLXAcll9maCYtZi2RCQZKa8NQQai5C4horqKyRmHj9H7QmcUyucrH+4KW/gBQbXM2AsB0axoEcFZPlfPcw==",
- "requires": {}
- },
- "styled-components": {
- "version": "6.1.0",
- "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-6.1.0.tgz",
- "integrity": "sha512-VWNfYYBuXzuLS/QYEeoPgMErP26WL+dX9//rEh80B2mmlS1yRxRxuL5eax4m6ybYEUoHWlTy2XOU32767mlMkg==",
- "requires": {
- "@emotion/is-prop-valid": "^1.2.1",
- "@emotion/unitless": "^0.8.0",
- "@types/stylis": "^4.0.2",
- "css-to-react-native": "^3.2.0",
- "csstype": "^3.1.2",
- "postcss": "^8.4.31",
- "shallowequal": "^1.1.0",
- "stylis": "^4.3.0",
- "tslib": "^2.5.0"
- }
- },
- "stylehacks": {
- "version": "5.1.1",
- "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-5.1.1.tgz",
- "integrity": "sha512-sBpcd5Hx7G6seo7b1LkpttvTz7ikD0LlH5RmdcBNb6fFR0Fl7LQwHDFr300q4cwUqi+IYrFGmsIHieMBfnN/Bw==",
- "requires": {
- "browserslist": "^4.21.4",
- "postcss-selector-parser": "^6.0.4"
- }
- },
- "stylis": {
- "version": "4.3.0",
- "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.3.0.tgz",
- "integrity": "sha512-E87pIogpwUsUwXw7dNyU4QDjdgVMy52m+XEOPEKUn161cCzWjjhPSQhByfd1CcNvrOLnXQ6OnnZDwnJrz/Z4YQ=="
- },
- "sucrase": {
- "version": "3.32.0",
- "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.32.0.tgz",
- "integrity": "sha512-ydQOU34rpSyj2TGyz4D2p8rbktIOZ8QY9s+DGLvFU1i5pWJE8vkpruCjGCMHsdXwnD7JDcS+noSwM/a7zyNFDQ==",
- "requires": {
- "@jridgewell/gen-mapping": "^0.3.2",
- "commander": "^4.0.0",
- "glob": "7.1.6",
- "lines-and-columns": "^1.1.6",
- "mz": "^2.7.0",
- "pirates": "^4.0.1",
- "ts-interface-checker": "^0.1.9"
- },
- "dependencies": {
- "commander": {
- "version": "4.1.1",
- "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
- "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA=="
- },
- "glob": {
- "version": "7.1.6",
- "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
- "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
- "requires": {
- "fs.realpath": "^1.0.0",
- "inflight": "^1.0.4",
- "inherits": "2",
- "minimatch": "^3.0.4",
- "once": "^1.3.0",
- "path-is-absolute": "^1.0.0"
- }
- }
- }
- },
- "supports-color": {
- "version": "7.2.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
- "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
- "requires": {
- "has-flag": "^4.0.0"
- }
- },
- "supports-hyperlinks": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz",
- "integrity": "sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==",
- "requires": {
- "has-flag": "^4.0.0",
- "supports-color": "^7.0.0"
- }
- },
- "supports-preserve-symlinks-flag": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
- "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="
- },
- "svg-parser": {
- "version": "2.0.4",
- "resolved": "https://registry.npmjs.org/svg-parser/-/svg-parser-2.0.4.tgz",
- "integrity": "sha512-e4hG1hRwoOdRb37cIMSgzNsxyzKfayW6VOflrwvR+/bzrkyxY/31WkbgnQpgtrNp1SdpJvpUAGTa/ZoiPNDuRQ=="
- },
- "svgo": {
- "version": "1.3.2",
- "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz",
- "integrity": "sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==",
- "requires": {
- "chalk": "^2.4.1",
- "coa": "^2.0.2",
- "css-select": "^2.0.0",
- "css-select-base-adapter": "^0.1.1",
- "css-tree": "1.0.0-alpha.37",
- "csso": "^4.0.2",
- "js-yaml": "^3.13.1",
- "mkdirp": "~0.5.1",
- "object.values": "^1.1.0",
- "sax": "~1.2.4",
- "stable": "^0.1.8",
- "unquote": "~1.1.1",
- "util.promisify": "~1.0.0"
- },
- "dependencies": {
- "ansi-styles": {
- "version": "3.2.1",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
- "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
- "requires": {
- "color-convert": "^1.9.0"
- }
- },
- "chalk": {
- "version": "2.4.2",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
- "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
- "requires": {
- "ansi-styles": "^3.2.1",
- "escape-string-regexp": "^1.0.5",
- "supports-color": "^5.3.0"
- }
- },
- "color-convert": {
- "version": "1.9.3",
- "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
- "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
- "requires": {
- "color-name": "1.1.3"
- }
- },
- "color-name": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
- "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
- },
- "css-select": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz",
- "integrity": "sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==",
- "requires": {
- "boolbase": "^1.0.0",
- "css-what": "^3.2.1",
- "domutils": "^1.7.0",
- "nth-check": "^1.0.2"
- }
- },
- "css-what": {
- "version": "3.4.2",
- "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.4.2.tgz",
- "integrity": "sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ=="
- },
- "dom-serializer": {
- "version": "0.2.2",
- "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
- "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
- "requires": {
- "domelementtype": "^2.0.1",
- "entities": "^2.0.0"
- }
- },
- "domutils": {
- "version": "1.7.0",
- "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
- "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
- "requires": {
- "dom-serializer": "0",
- "domelementtype": "1"
- },
- "dependencies": {
- "domelementtype": {
- "version": "1.3.1",
- "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
- "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="
- }
- }
- },
- "escape-string-regexp": {
- "version": "1.0.5",
- "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
- "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="
- },
- "has-flag": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
- "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="
- },
- "nth-check": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
- "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
- "requires": {
- "boolbase": "~1.0.0"
- }
- },
- "supports-color": {
- "version": "5.5.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
- "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
- "requires": {
- "has-flag": "^3.0.0"
- }
- }
- }
- },
- "symbol-tree": {
- "version": "3.2.4",
- "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
- "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="
- },
- "tailwindcss": {
- "version": "3.3.2",
- "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.2.tgz",
- "integrity": "sha512-9jPkMiIBXvPc2KywkraqsUfbfj+dHDb+JPWtSJa9MLFdrPyazI7q6WX2sUrm7R9eVR7qqv3Pas7EvQFzxKnI6w==",
- "requires": {
- "@alloc/quick-lru": "^5.2.0",
- "arg": "^5.0.2",
- "chokidar": "^3.5.3",
- "didyoumean": "^1.2.2",
- "dlv": "^1.1.3",
- "fast-glob": "^3.2.12",
- "glob-parent": "^6.0.2",
- "is-glob": "^4.0.3",
- "jiti": "^1.18.2",
- "lilconfig": "^2.1.0",
- "micromatch": "^4.0.5",
- "normalize-path": "^3.0.0",
- "object-hash": "^3.0.0",
- "picocolors": "^1.0.0",
- "postcss": "^8.4.23",
- "postcss-import": "^15.1.0",
- "postcss-js": "^4.0.1",
- "postcss-load-config": "^4.0.1",
- "postcss-nested": "^6.0.1",
- "postcss-selector-parser": "^6.0.11",
- "postcss-value-parser": "^4.2.0",
- "resolve": "^1.22.2",
- "sucrase": "^3.32.0"
- }
- },
- "tapable": {
- "version": "2.2.1",
- "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
- "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ=="
- },
- "temp-dir": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-2.0.0.tgz",
- "integrity": "sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg=="
- },
- "tempy": {
- "version": "0.6.0",
- "resolved": "https://registry.npmjs.org/tempy/-/tempy-0.6.0.tgz",
- "integrity": "sha512-G13vtMYPT/J8A4X2SjdtBTphZlrp1gKv6hZiOjw14RCWg6GbHuQBGtjlx75xLbYV/wEc0D7G5K4rxKP/cXk8Bw==",
- "requires": {
- "is-stream": "^2.0.0",
- "temp-dir": "^2.0.0",
- "type-fest": "^0.16.0",
- "unique-string": "^2.0.0"
- },
- "dependencies": {
- "type-fest": {
- "version": "0.16.0",
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.16.0.tgz",
- "integrity": "sha512-eaBzG6MxNzEn9kiwvtre90cXaNLkmadMWa1zQMs3XORCXNbsH/OewwbxC5ia9dCxIxnTAsSxXJaa/p5y8DlvJg=="
- }
- }
- },
- "terminal-link": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz",
- "integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==",
- "requires": {
- "ansi-escapes": "^4.2.1",
- "supports-hyperlinks": "^2.0.0"
- }
- },
- "terser": {
- "version": "5.18.0",
- "resolved": "https://registry.npmjs.org/terser/-/terser-5.18.0.tgz",
- "integrity": "sha512-pdL757Ig5a0I+owA42l6tIuEycRuM7FPY4n62h44mRLRfnOxJkkOHd6i89dOpwZlpF6JXBwaAHF6yWzFrt+QyA==",
- "requires": {
- "@jridgewell/source-map": "^0.3.3",
- "acorn": "^8.8.2",
- "commander": "^2.20.0",
- "source-map-support": "~0.5.20"
- }
- },
- "terser-webpack-plugin": {
- "version": "5.3.9",
- "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz",
- "integrity": "sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==",
- "requires": {
- "@jridgewell/trace-mapping": "^0.3.17",
- "jest-worker": "^27.4.5",
- "schema-utils": "^3.1.1",
- "serialize-javascript": "^6.0.1",
- "terser": "^5.16.8"
- }
- },
- "test-exclude": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
- "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
- "requires": {
- "@istanbuljs/schema": "^0.1.2",
- "glob": "^7.1.4",
- "minimatch": "^3.0.4"
- }
- },
- "text-table": {
- "version": "0.2.0",
- "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
- "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="
- },
- "thenify": {
- "version": "3.3.1",
- "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
- "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==",
- "requires": {
- "any-promise": "^1.0.0"
- }
- },
- "thenify-all": {
- "version": "1.6.0",
- "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
- "integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==",
- "requires": {
- "thenify": ">= 3.1.0 < 4"
- }
- },
- "throat": {
- "version": "6.0.2",
- "resolved": "https://registry.npmjs.org/throat/-/throat-6.0.2.tgz",
- "integrity": "sha512-WKexMoJj3vEuK0yFEapj8y64V0A6xcuPuK9Gt1d0R+dzCSJc0lHqQytAbSB4cDAK0dWh4T0E2ETkoLE2WZ41OQ=="
- },
- "thunky": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
- "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA=="
- },
- "tmpl": {
- "version": "1.0.5",
- "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
- "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw=="
- },
- "to-fast-properties": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
- "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog=="
- },
- "to-regex-range": {
- "version": "5.0.1",
- "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
- "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
- "requires": {
- "is-number": "^7.0.0"
- }
- },
- "toidentifier": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
- "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="
- },
- "tough-cookie": {
- "version": "4.1.3",
- "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
- "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
- "requires": {
- "psl": "^1.1.33",
- "punycode": "^2.1.1",
- "universalify": "^0.2.0",
- "url-parse": "^1.5.3"
- },
- "dependencies": {
- "universalify": {
- "version": "0.2.0",
- "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
- "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg=="
- }
- }
- },
- "tr46": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz",
- "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==",
- "requires": {
- "punycode": "^2.1.1"
- }
- },
- "trim-repeated": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz",
- "integrity": "sha512-pkonvlKk8/ZuR0D5tLW8ljt5I8kmxp2XKymhepUeOdCEfKpZaktSArkLHZt76OB1ZvO9bssUsDty4SWhLvZpLg==",
- "dev": true,
- "requires": {
- "escape-string-regexp": "^1.0.2"
- },
- "dependencies": {
- "escape-string-regexp": {
- "version": "1.0.5",
- "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
- "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
- "dev": true
- }
- }
- },
- "tryer": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz",
- "integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA=="
- },
- "ts-interface-checker": {
- "version": "0.1.13",
- "resolved": "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz",
- "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA=="
- },
- "tsconfig-paths": {
- "version": "3.14.2",
- "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz",
- "integrity": "sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==",
- "requires": {
- "@types/json5": "^0.0.29",
- "json5": "^1.0.2",
- "minimist": "^1.2.6",
- "strip-bom": "^3.0.0"
- },
- "dependencies": {
- "json5": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
- "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
- "requires": {
- "minimist": "^1.2.0"
- }
- },
- "strip-bom": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
- "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA=="
- }
- }
- },
- "tslib": {
- "version": "2.5.3",
- "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz",
- "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w=="
- },
- "tslint": {
- "version": "6.1.3",
- "resolved": "https://registry.npmjs.org/tslint/-/tslint-6.1.3.tgz",
- "integrity": "sha512-IbR4nkT96EQOvKE2PW/djGz8iGNeJ4rF2mBfiYaR/nvUWYKJhLwimoJKgjIFEIDibBtOevj7BqCRL4oHeWWUCg==",
- "dev": true,
- "requires": {
- "@babel/code-frame": "^7.0.0",
- "builtin-modules": "^1.1.1",
- "chalk": "^2.3.0",
- "commander": "^2.12.1",
- "diff": "^4.0.1",
- "glob": "^7.1.1",
- "js-yaml": "^3.13.1",
- "minimatch": "^3.0.4",
- "mkdirp": "^0.5.3",
- "resolve": "^1.3.2",
- "semver": "^5.3.0",
- "tslib": "^1.13.0",
- "tsutils": "^2.29.0"
- },
- "dependencies": {
- "ansi-styles": {
- "version": "3.2.1",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
- "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
- "dev": true,
- "requires": {
- "color-convert": "^1.9.0"
- }
- },
- "chalk": {
- "version": "2.4.2",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
- "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
- "dev": true,
- "requires": {
- "ansi-styles": "^3.2.1",
- "escape-string-regexp": "^1.0.5",
- "supports-color": "^5.3.0"
- }
- },
- "color-convert": {
- "version": "1.9.3",
- "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
- "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
- "dev": true,
- "requires": {
- "color-name": "1.1.3"
- }
- },
- "color-name": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
- "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
- "dev": true
- },
- "escape-string-regexp": {
- "version": "1.0.5",
- "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
- "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
- "dev": true
- },
- "has-flag": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
- "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
- "dev": true
- },
- "semver": {
- "version": "5.7.2",
- "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
- "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
- "dev": true
- },
- "supports-color": {
- "version": "5.5.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
- "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
- "dev": true,
- "requires": {
- "has-flag": "^3.0.0"
- }
- },
- "tslib": {
- "version": "1.14.1",
- "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
- "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
- "dev": true
- },
- "tsutils": {
- "version": "2.29.0",
- "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz",
- "integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==",
- "dev": true,
- "requires": {
- "tslib": "^1.8.1"
- }
- }
- }
- },
- "tslint-config-prettier": {
- "version": "1.18.0",
- "resolved": "https://registry.npmjs.org/tslint-config-prettier/-/tslint-config-prettier-1.18.0.tgz",
- "integrity": "sha512-xPw9PgNPLG3iKRxmK7DWr+Ea/SzrvfHtjFt5LBl61gk2UBG/DB9kCXRjv+xyIU1rUtnayLeMUVJBcMX8Z17nDg==",
- "dev": true
- },
- "tsutils": {
- "version": "3.21.0",
- "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
- "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
- "requires": {
- "tslib": "^1.8.1"
- },
- "dependencies": {
- "tslib": {
- "version": "1.14.1",
- "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
- "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
- }
- }
- },
- "type-check": {
- "version": "0.4.0",
- "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
- "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
- "requires": {
- "prelude-ls": "^1.2.1"
- }
- },
- "type-detect": {
- "version": "4.0.8",
- "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
- "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g=="
- },
- "type-fest": {
- "version": "0.21.3",
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
- "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w=="
- },
- "type-is": {
- "version": "1.6.18",
- "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
- "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
- "requires": {
- "media-typer": "0.3.0",
- "mime-types": "~2.1.24"
- }
- },
- "typed-array-length": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz",
- "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==",
- "requires": {
- "call-bind": "^1.0.2",
- "for-each": "^0.3.3",
- "is-typed-array": "^1.1.9"
- }
- },
- "typedarray-to-buffer": {
- "version": "3.1.5",
- "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
- "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
- "requires": {
- "is-typedarray": "^1.0.0"
- }
- },
- "typescript": {
- "version": "4.9.5",
- "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
- "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g=="
- },
- "unbox-primitive": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
- "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
- "requires": {
- "call-bind": "^1.0.2",
- "has-bigints": "^1.0.2",
- "has-symbols": "^1.0.3",
- "which-boxed-primitive": "^1.0.2"
- }
- },
- "undici-types": {
- "version": "5.25.3",
- "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.25.3.tgz",
- "integrity": "sha512-Ga1jfYwRn7+cP9v8auvEXN1rX3sWqlayd4HP7OKk4mZWylEmu3KzXDUGrQUN6Ol7qo1gPvB2e5gX6udnyEPgdA=="
- },
- "unicode-canonical-property-names-ecmascript": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
- "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ=="
- },
- "unicode-match-property-ecmascript": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz",
- "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==",
- "requires": {
- "unicode-canonical-property-names-ecmascript": "^2.0.0",
- "unicode-property-aliases-ecmascript": "^2.0.0"
- }
- },
- "unicode-match-property-value-ecmascript": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz",
- "integrity": "sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA=="
- },
- "unicode-property-aliases-ecmascript": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz",
- "integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w=="
- },
- "unique-string": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz",
- "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==",
- "requires": {
- "crypto-random-string": "^2.0.0"
- }
- },
- "universalify": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
- "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="
- },
- "unpipe": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
- "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ=="
- },
- "unquote": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
- "integrity": "sha512-vRCqFv6UhXpWxZPyGDh/F3ZpNv8/qo7w6iufLpQg9aKnQ71qM4B5KiI7Mia9COcjEhrO9LueHpMYjYzsWH3OIg=="
- },
- "upath": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
- "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg=="
- },
- "update-browserslist-db": {
- "version": "1.0.11",
- "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz",
- "integrity": "sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==",
- "requires": {
- "escalade": "^3.1.1",
- "picocolors": "^1.0.0"
- }
- },
- "uri-js": {
- "version": "4.4.1",
- "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
- "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
- "requires": {
- "punycode": "^2.1.0"
- }
- },
- "url-parse": {
- "version": "1.5.10",
- "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
- "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
- "requires": {
- "querystringify": "^2.1.1",
- "requires-port": "^1.0.0"
- }
- },
- "util-deprecate": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
- "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
- },
- "util.promisify": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz",
- "integrity": "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==",
- "requires": {
- "define-properties": "^1.1.3",
- "es-abstract": "^1.17.2",
- "has-symbols": "^1.0.1",
- "object.getownpropertydescriptors": "^2.1.0"
- }
- },
- "utila": {
- "version": "0.4.0",
- "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz",
- "integrity": "sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA=="
- },
- "utils-merge": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
- "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA=="
- },
- "uuid": {
- "version": "8.3.2",
- "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
- "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
- },
- "v8-to-istanbul": {
- "version": "9.1.0",
- "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.1.0.tgz",
- "integrity": "sha512-6z3GW9x8G1gd+JIIgQQQxXuiJtCXeAjp6RaPEPLv62mH3iPHPxV6W3robxtCzNErRo6ZwTmzWhsbNvjyEBKzKA==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "@jridgewell/trace-mapping": "^0.3.12",
- "@types/istanbul-lib-coverage": "^2.0.1",
- "convert-source-map": "^1.6.0"
- }
- },
- "vary": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
- "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg=="
- },
- "w3c-hr-time": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
- "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
- "requires": {
- "browser-process-hrtime": "^1.0.0"
- }
- },
- "w3c-xmlserializer": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz",
- "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==",
- "requires": {
- "xml-name-validator": "^3.0.0"
- }
- },
- "walker": {
- "version": "1.0.8",
- "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
- "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
- "requires": {
- "makeerror": "1.0.12"
- }
- },
- "watchpack": {
- "version": "2.4.0",
- "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
- "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
- "requires": {
- "glob-to-regexp": "^0.4.1",
- "graceful-fs": "^4.1.2"
- }
- },
- "wbuf": {
- "version": "1.7.3",
- "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
- "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
- "requires": {
- "minimalistic-assert": "^1.0.0"
- }
- },
- "web-vitals": {
- "version": "3.5.0",
- "resolved": "https://registry.npmjs.org/web-vitals/-/web-vitals-3.5.0.tgz",
- "integrity": "sha512-f5YnCHVG9Y6uLCePD4tY8bO/Ge15NPEQWtvm3tPzDKygloiqtb4SVqRHBcrIAqo2ztqX5XueqDn97zHF0LdT6w=="
- },
- "webidl-conversions": {
- "version": "6.1.0",
- "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
- "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w=="
- },
- "webpack": {
- "version": "5.87.0",
- "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.87.0.tgz",
- "integrity": "sha512-GOu1tNbQ7p1bDEoFRs2YPcfyGs8xq52yyPBZ3m2VGnXGtV9MxjrkABHm4V9Ia280OefsSLzvbVoXcfLxjKY/Iw==",
- "requires": {
- "@types/eslint-scope": "^3.7.3",
- "@types/estree": "^1.0.0",
- "@webassemblyjs/ast": "^1.11.5",
- "@webassemblyjs/wasm-edit": "^1.11.5",
- "@webassemblyjs/wasm-parser": "^1.11.5",
- "acorn": "^8.7.1",
- "acorn-import-assertions": "^1.9.0",
- "browserslist": "^4.14.5",
- "chrome-trace-event": "^1.0.2",
- "enhanced-resolve": "^5.15.0",
- "es-module-lexer": "^1.2.1",
- "eslint-scope": "5.1.1",
- "events": "^3.2.0",
- "glob-to-regexp": "^0.4.1",
- "graceful-fs": "^4.2.9",
- "json-parse-even-better-errors": "^2.3.1",
- "loader-runner": "^4.2.0",
- "mime-types": "^2.1.27",
- "neo-async": "^2.6.2",
- "schema-utils": "^3.2.0",
- "tapable": "^2.1.1",
- "terser-webpack-plugin": "^5.3.7",
- "watchpack": "^2.4.0",
- "webpack-sources": "^3.2.3"
- },
- "dependencies": {
- "eslint-scope": {
- "version": "5.1.1",
- "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
- "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
- "requires": {
- "esrecurse": "^4.3.0",
- "estraverse": "^4.1.1"
- }
- },
- "estraverse": {
- "version": "4.3.0",
- "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
- "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="
- }
- }
- },
- "webpack-dev-middleware": {
- "version": "5.3.3",
- "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz",
- "integrity": "sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==",
- "requires": {
- "colorette": "^2.0.10",
- "memfs": "^3.4.3",
- "mime-types": "^2.1.31",
- "range-parser": "^1.2.1",
- "schema-utils": "^4.0.0"
- },
- "dependencies": {
- "ajv": {
- "version": "8.12.0",
- "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
- "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
- "requires": {
- "fast-deep-equal": "^3.1.1",
- "json-schema-traverse": "^1.0.0",
- "require-from-string": "^2.0.2",
- "uri-js": "^4.2.2"
- }
- },
- "ajv-keywords": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
- "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
- "requires": {
- "fast-deep-equal": "^3.1.3"
- }
- },
- "json-schema-traverse": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
- "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
- },
- "schema-utils": {
- "version": "4.2.0",
- "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
- "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
- "requires": {
- "@types/json-schema": "^7.0.9",
- "ajv": "^8.9.0",
- "ajv-formats": "^2.1.1",
- "ajv-keywords": "^5.1.0"
- }
- }
- }
- },
- "webpack-dev-server": {
- "version": "4.15.1",
- "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.1.tgz",
- "integrity": "sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA==",
- "requires": {
- "@types/bonjour": "^3.5.9",
- "@types/connect-history-api-fallback": "^1.3.5",
- "@types/express": "^4.17.13",
- "@types/serve-index": "^1.9.1",
- "@types/serve-static": "^1.13.10",
- "@types/sockjs": "^0.3.33",
- "@types/ws": "^8.5.5",
- "ansi-html-community": "^0.0.8",
- "bonjour-service": "^1.0.11",
- "chokidar": "^3.5.3",
- "colorette": "^2.0.10",
- "compression": "^1.7.4",
- "connect-history-api-fallback": "^2.0.0",
- "default-gateway": "^6.0.3",
- "express": "^4.17.3",
- "graceful-fs": "^4.2.6",
- "html-entities": "^2.3.2",
- "http-proxy-middleware": "^2.0.3",
- "ipaddr.js": "^2.0.1",
- "launch-editor": "^2.6.0",
- "open": "^8.0.9",
- "p-retry": "^4.5.0",
- "rimraf": "^3.0.2",
- "schema-utils": "^4.0.0",
- "selfsigned": "^2.1.1",
- "serve-index": "^1.9.1",
- "sockjs": "^0.3.24",
- "spdy": "^4.0.2",
- "webpack-dev-middleware": "^5.3.1",
- "ws": "^8.13.0"
- },
- "dependencies": {
- "ajv": {
- "version": "8.12.0",
- "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
- "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
- "requires": {
- "fast-deep-equal": "^3.1.1",
- "json-schema-traverse": "^1.0.0",
- "require-from-string": "^2.0.2",
- "uri-js": "^4.2.2"
- }
- },
- "ajv-keywords": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
- "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
- "requires": {
- "fast-deep-equal": "^3.1.3"
- }
- },
- "json-schema-traverse": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
- "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
- },
- "schema-utils": {
- "version": "4.2.0",
- "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
- "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
- "requires": {
- "@types/json-schema": "^7.0.9",
- "ajv": "^8.9.0",
- "ajv-formats": "^2.1.1",
- "ajv-keywords": "^5.1.0"
- }
- },
- "ws": {
- "version": "8.13.0",
- "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
- "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
- "requires": {}
- }
- }
- },
- "webpack-manifest-plugin": {
- "version": "4.1.1",
- "resolved": "https://registry.npmjs.org/webpack-manifest-plugin/-/webpack-manifest-plugin-4.1.1.tgz",
- "integrity": "sha512-YXUAwxtfKIJIKkhg03MKuiFAD72PlrqCiwdwO4VEXdRO5V0ORCNwaOwAZawPZalCbmH9kBDmXnNeQOw+BIEiow==",
- "requires": {
- "tapable": "^2.0.0",
- "webpack-sources": "^2.2.0"
- },
- "dependencies": {
- "source-map": {
- "version": "0.6.1",
- "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
- "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
- },
- "webpack-sources": {
- "version": "2.3.1",
- "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.3.1.tgz",
- "integrity": "sha512-y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA==",
- "requires": {
- "source-list-map": "^2.0.1",
- "source-map": "^0.6.1"
- }
- }
- }
- },
- "webpack-sources": {
- "version": "3.2.3",
- "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
- "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w=="
- },
- "websocket-driver": {
- "version": "0.7.4",
- "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
- "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
- "requires": {
- "http-parser-js": ">=0.5.1",
- "safe-buffer": ">=5.1.0",
- "websocket-extensions": ">=0.1.1"
- }
- },
- "websocket-extensions": {
- "version": "0.1.4",
- "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
- "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="
- },
- "whatwg-encoding": {
- "version": "1.0.5",
- "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
- "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
- "requires": {
- "iconv-lite": "0.4.24"
- },
- "dependencies": {
- "iconv-lite": {
- "version": "0.4.24",
- "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
- "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
- "requires": {
- "safer-buffer": ">= 2.1.2 < 3"
- }
- }
- }
- },
- "whatwg-fetch": {
- "version": "3.6.2",
- "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz",
- "integrity": "sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA=="
- },
- "whatwg-mimetype": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
- "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g=="
- },
- "whatwg-url": {
- "version": "8.7.0",
- "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz",
- "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==",
- "requires": {
- "lodash": "^4.7.0",
- "tr46": "^2.1.0",
- "webidl-conversions": "^6.1.0"
- }
- },
- "which": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
- "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
- "requires": {
- "isexe": "^2.0.0"
- }
- },
- "which-boxed-primitive": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
- "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
- "requires": {
- "is-bigint": "^1.0.1",
- "is-boolean-object": "^1.1.0",
- "is-number-object": "^1.0.4",
- "is-string": "^1.0.5",
- "is-symbol": "^1.0.3"
- }
- },
- "which-collection": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz",
- "integrity": "sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==",
- "requires": {
- "is-map": "^2.0.1",
- "is-set": "^2.0.1",
- "is-weakmap": "^2.0.1",
- "is-weakset": "^2.0.1"
- }
- },
- "which-typed-array": {
- "version": "1.1.9",
- "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz",
- "integrity": "sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==",
- "requires": {
- "available-typed-arrays": "^1.0.5",
- "call-bind": "^1.0.2",
- "for-each": "^0.3.3",
- "gopd": "^1.0.1",
- "has-tostringtag": "^1.0.0",
- "is-typed-array": "^1.1.10"
- }
- },
- "word-wrap": {
- "version": "1.2.5",
- "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
- "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA=="
- },
- "workbox-background-sync": {
- "version": "6.6.0",
- "resolved": "https://registry.npmjs.org/workbox-background-sync/-/workbox-background-sync-6.6.0.tgz",
- "integrity": "sha512-jkf4ZdgOJxC9u2vztxLuPT/UjlH7m/nWRQ/MgGL0v8BJHoZdVGJd18Kck+a0e55wGXdqyHO+4IQTk0685g4MUw==",
- "requires": {
- "idb": "^7.0.1",
- "workbox-core": "6.6.0"
- }
- },
- "workbox-broadcast-update": {
- "version": "6.6.0",
- "resolved": "https://registry.npmjs.org/workbox-broadcast-update/-/workbox-broadcast-update-6.6.0.tgz",
- "integrity": "sha512-nm+v6QmrIFaB/yokJmQ/93qIJ7n72NICxIwQwe5xsZiV2aI93MGGyEyzOzDPVz5THEr5rC3FJSsO3346cId64Q==",
- "requires": {
- "workbox-core": "6.6.0"
- }
- },
- "workbox-build": {
- "version": "6.6.0",
- "resolved": "https://registry.npmjs.org/workbox-build/-/workbox-build-6.6.0.tgz",
- "integrity": "sha512-Tjf+gBwOTuGyZwMz2Nk/B13Fuyeo0Q84W++bebbVsfr9iLkDSo6j6PST8tET9HYA58mlRXwlMGpyWO8ETJiXdQ==",
- "requires": {
- "@apideck/better-ajv-errors": "^0.3.1",
- "@babel/core": "^7.11.1",
- "@babel/preset-env": "^7.11.0",
- "@babel/runtime": "^7.11.2",
- "@rollup/plugin-babel": "^5.2.0",
- "@rollup/plugin-node-resolve": "^11.2.1",
- "@rollup/plugin-replace": "^2.4.1",
- "@surma/rollup-plugin-off-main-thread": "^2.2.3",
- "ajv": "^8.6.0",
- "common-tags": "^1.8.0",
- "fast-json-stable-stringify": "^2.1.0",
- "fs-extra": "^9.0.1",
- "glob": "^7.1.6",
- "lodash": "^4.17.20",
- "pretty-bytes": "^5.3.0",
- "rollup": "^2.43.1",
- "rollup-plugin-terser": "^7.0.0",
- "source-map": "^0.8.0-beta.0",
- "stringify-object": "^3.3.0",
- "strip-comments": "^2.0.1",
- "tempy": "^0.6.0",
- "upath": "^1.2.0",
- "workbox-background-sync": "6.6.0",
- "workbox-broadcast-update": "6.6.0",
- "workbox-cacheable-response": "6.6.0",
- "workbox-core": "6.6.0",
- "workbox-expiration": "6.6.0",
- "workbox-google-analytics": "6.6.0",
- "workbox-navigation-preload": "6.6.0",
- "workbox-precaching": "6.6.0",
- "workbox-range-requests": "6.6.0",
- "workbox-recipes": "6.6.0",
- "workbox-routing": "6.6.0",
- "workbox-strategies": "6.6.0",
- "workbox-streams": "6.6.0",
- "workbox-sw": "6.6.0",
- "workbox-window": "6.6.0"
- },
- "dependencies": {
- "@apideck/better-ajv-errors": {
- "version": "0.3.6",
- "resolved": "https://registry.npmjs.org/@apideck/better-ajv-errors/-/better-ajv-errors-0.3.6.tgz",
- "integrity": "sha512-P+ZygBLZtkp0qqOAJJVX4oX/sFo5JR3eBWwwuqHHhK0GIgQOKWrAfiAaWX0aArHkRWHMuggFEgAZNxVPwPZYaA==",
- "requires": {
- "json-schema": "^0.4.0",
- "jsonpointer": "^5.0.0",
- "leven": "^3.1.0"
- }
- },
- "ajv": {
- "version": "8.12.0",
- "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
- "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
- "requires": {
- "fast-deep-equal": "^3.1.1",
- "json-schema-traverse": "^1.0.0",
- "require-from-string": "^2.0.2",
- "uri-js": "^4.2.2"
- }
- },
- "fs-extra": {
- "version": "9.1.0",
- "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
- "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
- "requires": {
- "at-least-node": "^1.0.0",
- "graceful-fs": "^4.2.0",
- "jsonfile": "^6.0.1",
- "universalify": "^2.0.0"
- }
- },
- "json-schema-traverse": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
- "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
- },
- "source-map": {
- "version": "0.8.0-beta.0",
- "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.8.0-beta.0.tgz",
- "integrity": "sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==",
- "requires": {
- "whatwg-url": "^7.0.0"
- }
- },
- "tr46": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz",
- "integrity": "sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==",
- "requires": {
- "punycode": "^2.1.0"
- }
- },
- "webidl-conversions": {
- "version": "4.0.2",
- "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
- "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="
- },
- "whatwg-url": {
- "version": "7.1.0",
- "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz",
- "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==",
- "requires": {
- "lodash.sortby": "^4.7.0",
- "tr46": "^1.0.1",
- "webidl-conversions": "^4.0.2"
- }
- }
- }
- },
- "workbox-cacheable-response": {
- "version": "6.6.0",
- "resolved": "https://registry.npmjs.org/workbox-cacheable-response/-/workbox-cacheable-response-6.6.0.tgz",
- "integrity": "sha512-JfhJUSQDwsF1Xv3EV1vWzSsCOZn4mQ38bWEBR3LdvOxSPgB65gAM6cS2CX8rkkKHRgiLrN7Wxoyu+TuH67kHrw==",
- "requires": {
- "workbox-core": "6.6.0"
- }
- },
- "workbox-core": {
- "version": "6.6.0",
- "resolved": "https://registry.npmjs.org/workbox-core/-/workbox-core-6.6.0.tgz",
- "integrity": "sha512-GDtFRF7Yg3DD859PMbPAYPeJyg5gJYXuBQAC+wyrWuuXgpfoOrIQIvFRZnQ7+czTIQjIr1DhLEGFzZanAT/3bQ=="
- },
- "workbox-expiration": {
- "version": "6.6.0",
- "resolved": "https://registry.npmjs.org/workbox-expiration/-/workbox-expiration-6.6.0.tgz",
- "integrity": "sha512-baplYXcDHbe8vAo7GYvyAmlS4f6998Jff513L4XvlzAOxcl8F620O91guoJ5EOf5qeXG4cGdNZHkkVAPouFCpw==",
- "requires": {
- "idb": "^7.0.1",
- "workbox-core": "6.6.0"
- }
- },
- "workbox-google-analytics": {
- "version": "6.6.0",
- "resolved": "https://registry.npmjs.org/workbox-google-analytics/-/workbox-google-analytics-6.6.0.tgz",
- "integrity": "sha512-p4DJa6OldXWd6M9zRl0H6vB9lkrmqYFkRQ2xEiNdBFp9U0LhsGO7hsBscVEyH9H2/3eZZt8c97NB2FD9U2NJ+Q==",
- "requires": {
- "workbox-background-sync": "6.6.0",
- "workbox-core": "6.6.0",
- "workbox-routing": "6.6.0",
- "workbox-strategies": "6.6.0"
- }
- },
- "workbox-navigation-preload": {
- "version": "6.6.0",
- "resolved": "https://registry.npmjs.org/workbox-navigation-preload/-/workbox-navigation-preload-6.6.0.tgz",
- "integrity": "sha512-utNEWG+uOfXdaZmvhshrh7KzhDu/1iMHyQOV6Aqup8Mm78D286ugu5k9MFD9SzBT5TcwgwSORVvInaXWbvKz9Q==",
- "requires": {
- "workbox-core": "6.6.0"
- }
- },
- "workbox-precaching": {
- "version": "6.6.0",
- "resolved": "https://registry.npmjs.org/workbox-precaching/-/workbox-precaching-6.6.0.tgz",
- "integrity": "sha512-eYu/7MqtRZN1IDttl/UQcSZFkHP7dnvr/X3Vn6Iw6OsPMruQHiVjjomDFCNtd8k2RdjLs0xiz9nq+t3YVBcWPw==",
- "requires": {
- "workbox-core": "6.6.0",
- "workbox-routing": "6.6.0",
- "workbox-strategies": "6.6.0"
- }
- },
- "workbox-range-requests": {
- "version": "6.6.0",
- "resolved": "https://registry.npmjs.org/workbox-range-requests/-/workbox-range-requests-6.6.0.tgz",
- "integrity": "sha512-V3aICz5fLGq5DpSYEU8LxeXvsT//mRWzKrfBOIxzIdQnV/Wj7R+LyJVTczi4CQ4NwKhAaBVaSujI1cEjXW+hTw==",
- "requires": {
- "workbox-core": "6.6.0"
- }
- },
- "workbox-recipes": {
- "version": "6.6.0",
- "resolved": "https://registry.npmjs.org/workbox-recipes/-/workbox-recipes-6.6.0.tgz",
- "integrity": "sha512-TFi3kTgYw73t5tg73yPVqQC8QQjxJSeqjXRO4ouE/CeypmP2O/xqmB/ZFBBQazLTPxILUQ0b8aeh0IuxVn9a6A==",
- "requires": {
- "workbox-cacheable-response": "6.6.0",
- "workbox-core": "6.6.0",
- "workbox-expiration": "6.6.0",
- "workbox-precaching": "6.6.0",
- "workbox-routing": "6.6.0",
- "workbox-strategies": "6.6.0"
- }
- },
- "workbox-routing": {
- "version": "6.6.0",
- "resolved": "https://registry.npmjs.org/workbox-routing/-/workbox-routing-6.6.0.tgz",
- "integrity": "sha512-x8gdN7VDBiLC03izAZRfU+WKUXJnbqt6PG9Uh0XuPRzJPpZGLKce/FkOX95dWHRpOHWLEq8RXzjW0O+POSkKvw==",
- "requires": {
- "workbox-core": "6.6.0"
- }
- },
- "workbox-strategies": {
- "version": "6.6.0",
- "resolved": "https://registry.npmjs.org/workbox-strategies/-/workbox-strategies-6.6.0.tgz",
- "integrity": "sha512-eC07XGuINAKUWDnZeIPdRdVja4JQtTuc35TZ8SwMb1ztjp7Ddq2CJ4yqLvWzFWGlYI7CG/YGqaETntTxBGdKgQ==",
- "requires": {
- "workbox-core": "6.6.0"
- }
- },
- "workbox-streams": {
- "version": "6.6.0",
- "resolved": "https://registry.npmjs.org/workbox-streams/-/workbox-streams-6.6.0.tgz",
- "integrity": "sha512-rfMJLVvwuED09CnH1RnIep7L9+mj4ufkTyDPVaXPKlhi9+0czCu+SJggWCIFbPpJaAZmp2iyVGLqS3RUmY3fxg==",
- "requires": {
- "workbox-core": "6.6.0",
- "workbox-routing": "6.6.0"
- }
- },
- "workbox-sw": {
- "version": "6.6.0",
- "resolved": "https://registry.npmjs.org/workbox-sw/-/workbox-sw-6.6.0.tgz",
- "integrity": "sha512-R2IkwDokbtHUE4Kus8pKO5+VkPHD2oqTgl+XJwh4zbF1HyjAbgNmK/FneZHVU7p03XUt9ICfuGDYISWG9qV/CQ=="
- },
- "workbox-webpack-plugin": {
- "version": "6.6.0",
- "resolved": "https://registry.npmjs.org/workbox-webpack-plugin/-/workbox-webpack-plugin-6.6.0.tgz",
- "integrity": "sha512-xNZIZHalboZU66Wa7x1YkjIqEy1gTR+zPM+kjrYJzqN7iurYZBctBLISyScjhkJKYuRrZUP0iqViZTh8rS0+3A==",
- "requires": {
- "fast-json-stable-stringify": "^2.1.0",
- "pretty-bytes": "^5.4.1",
- "upath": "^1.2.0",
- "webpack-sources": "^1.4.3",
- "workbox-build": "6.6.0"
- },
- "dependencies": {
- "source-map": {
- "version": "0.6.1",
- "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
- "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
- },
- "webpack-sources": {
- "version": "1.4.3",
- "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
- "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
- "requires": {
- "source-list-map": "^2.0.0",
- "source-map": "~0.6.1"
- }
- }
- }
- },
- "workbox-window": {
- "version": "6.6.0",
- "resolved": "https://registry.npmjs.org/workbox-window/-/workbox-window-6.6.0.tgz",
- "integrity": "sha512-L4N9+vka17d16geaJXXRjENLFldvkWy7JyGxElRD0JvBxvFEd8LOhr+uXCcar/NzAmIBRv9EZ+M+Qr4mOoBITw==",
- "requires": {
- "@types/trusted-types": "^2.0.2",
- "workbox-core": "6.6.0"
- }
- },
- "wrap-ansi": {
- "version": "7.0.0",
- "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
- "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
- "requires": {
- "ansi-styles": "^4.0.0",
- "string-width": "^4.1.0",
- "strip-ansi": "^6.0.0"
- }
- },
- "wrappy": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
- "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
- },
- "write-file-atomic": {
- "version": "3.0.3",
- "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
- "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
- "requires": {
- "imurmurhash": "^0.1.4",
- "is-typedarray": "^1.0.0",
- "signal-exit": "^3.0.2",
- "typedarray-to-buffer": "^3.1.5"
- }
- },
- "ws": {
- "version": "7.5.9",
- "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
- "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
- "requires": {}
- },
- "xml-name-validator": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
- "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw=="
- },
- "xmlchars": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
- "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw=="
- },
- "y18n": {
- "version": "5.0.8",
- "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
- "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="
- },
- "yallist": {
- "version": "3.1.1",
- "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
- "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
- },
- "yaml": {
- "version": "1.10.2",
- "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
- "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg=="
- },
- "yargs": {
- "version": "17.7.2",
- "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
- "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
- "dev": true,
- "optional": true,
- "peer": true,
- "requires": {
- "cliui": "^8.0.1",
- "escalade": "^3.1.1",
- "get-caller-file": "^2.0.5",
- "require-directory": "^2.1.1",
- "string-width": "^4.2.3",
- "y18n": "^5.0.5",
- "yargs-parser": "^21.1.1"
- }
- },
- "yargs-parser": {
- "version": "21.1.1",
- "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
- "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
- "dev": true,
- "optional": true,
- "peer": true
- },
- "yocto-queue": {
- "version": "0.1.0",
- "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
- "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="
- }
}
}
diff --git a/docs/gremlint/package.json b/docs/gremlint/package.json
index 220e1e4..1ddcced 100644
--- a/docs/gremlint/package.json
+++ b/docs/gremlint/package.json
@@ -5,15 +5,15 @@
"private": true,
"dependencies": {
"customize-cra": "^1.0.0",
- "gremlint": "^3.7.0",
+ "gremlint": "^3.7.4",
"react": "^17.0.2",
"react-app-rewired": "^2.2.1",
"react-dom": "^17.0.2",
"react-scripts": "^5.0.1",
"sharp-router": "^4.1.5",
- "styled-components": "^6.1.0",
- "typescript": "^4.7.3",
- "web-vitals": "^3.5.0"
+ "styled-components": "^6.1.14",
+ "typescript": "^4.9.5",
+ "web-vitals": "^3.5.2"
},
"scripts": {
"predeploy": "npm run build",
@@ -44,16 +44,16 @@
]
},
"devDependencies": {
- "@testing-library/jest-dom": "^6.1.0",
+ "@testing-library/jest-dom": "^6.6.3",
"@testing-library/react": "^12.1.5",
- "@testing-library/user-event": "^14.5.1",
- "@types/jest": "^29.5.4",
- "@types/node": "^20.8.7",
- "@types/react": "^17.0.38",
- "@types/react-dom": "^17.0.11",
- "@types/styled-components": "^5.1.26",
- "gh-pages": "^6.0.0",
- "prettier": "^3.0.1",
+ "@testing-library/user-event": "^14.6.1",
+ "@types/jest": "^29.5.14",
+ "@types/node": "^22.12.0",
+ "@types/react": "^17.0.83",
+ "@types/react-dom": "^17.0.26",
+ "@types/styled-components": "^5.1.34",
+ "gh-pages": "^6.3.0",
+ "prettier": "^3.4.2",
"tslint": "^6.1.3",
"tslint-config-prettier": "^1.18.0"
},
diff --git a/docs/site/home/benefits-use-cases.html b/docs/site/home/benefits-use-cases.html
index 9a6a5f2..6d68c8b 100644
--- a/docs/site/home/benefits-use-cases.html
+++ b/docs/site/home/benefits-use-cases.html
@@ -19,10 +19,26 @@
<meta charset=utf-8>
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+ <meta name="robots" content="index, follow">
<link href="img/favicon.png" rel="shortcut icon"/>
- <title>Apache TinkerPop: Benefits and Use Cases</title>
- <meta name="description" content="">
- <meta name="keywords" content="">
+ <title>Graph Database Benefits & Use Cases | Apache TinkerPop</title>
+ <meta name="description" content="Graph database advantages for social networks, fraud detection, and recommendation engines. Discover how graph computing solves complex relationship challenges.">
+ <meta name="keywords" content="graph database, use cases, relationships, TinkerPop">
+ <link rel="canonical" href="https://tinkerpop.apache.org/benefits-use-cases.html">
+
+ <!-- Open Graph / Facebook -->
+ <meta property="og:type" content="website">
+ <meta property="og:url" content="https://tinkerpop.apache.org/benefits-use-cases.html">
+ <meta property="og:title" content="Graph Database Benefits & Use Cases | Apache TinkerPop">
+ <meta property="og:description" content="Graph database advantages for social networks, fraud detection, and recommendation engines. Discover how graph computing solves complex relationship challenges.">
+ <meta property="og:image" content="https://tinkerpop.apache.org/img/use-cases/bg.png">
+
+ <!-- Twitter -->
+ <meta name="twitter:card" content="summary_large_image">
+ <meta name="twitter:site" content="@apachetinkerpop">
+ <meta name="twitter:title" content="Graph Database Benefits & Use Cases | Apache TinkerPop">
+ <meta name="twitter:description" content="Graph database advantages for social networks, fraud detection, and recommendation engines. Discover how graph computing solves complex relationship challenges.">
+ <meta name="twitter:image" content="https://tinkerpop.apache.org/img/use-cases/bg.png">
<link href="css/bootstrap.min.css" rel="stylesheet">
<link href="css/font-awesome.css" rel="stylesheet"/>
<link href="css/custome.css" rel="stylesheet">
@@ -46,6 +62,110 @@
})();
</script>
<!-- End Matomo Code -->
+
+ <!-- Structured Data / JSON-LD -->
+ <script type="application/ld+json">
+ {
+ "@context": "https://schema.org",
+ "@graph": [
+ {
+ "@type": "Organization",
+ "@id": "https://tinkerpop.apache.org/#organization",
+ "name": "Apache TinkerPop",
+ "url": "https://tinkerpop.apache.org/",
+ "logo": {
+ "@type": "ImageObject",
+ "url": "https://tinkerpop.apache.org/img/logo.png",
+ "width": 280,
+ "height": 60
+ }
+ },
+ {
+ "@type": "WebSite",
+ "@id": "https://tinkerpop.apache.org/#website",
+ "url": "https://tinkerpop.apache.org/",
+ "name": "Apache TinkerPop",
+ "publisher": {
+ "@id": "https://tinkerpop.apache.org/#organization"
+ }
+ },
+ {
+ "@type": "WebPage",
+ "@id": "https://tinkerpop.apache.org/benefits-use-cases.html",
+ "url": "https://tinkerpop.apache.org/benefits-use-cases.html",
+ "name": "Graph Database Benefits & Use Cases | Apache TinkerPop",
+ "isPartOf": {
+ "@id": "https://tinkerpop.apache.org/#website"
+ },
+ "about": {
+ "@id": "https://tinkerpop.apache.org/#organization"
+ }
+ },
+ {
+ "@type": "BreadcrumbList",
+ "itemListElement": [
+ {
+ "@type": "ListItem",
+ "position": 1,
+ "item": {
+ "@type": "WebPage",
+ "@id": "https://tinkerpop.apache.org/",
+ "url": "https://tinkerpop.apache.org/",
+ "name": "Home"
+ }
+ },
+ {
+ "@type": "ListItem",
+ "position": 2,
+ "item": {
+ "@type": "WebPage",
+ "@id": "https://tinkerpop.apache.org/benefits-use-cases.html",
+ "url": "https://tinkerpop.apache.org/benefits-use-cases.html",
+ "name": "Benefits & Use Cases"
+ }
+ }
+ ]
+ },
+ {
+ "@type": "FAQPage",
+ "mainEntity": [
+ {
+ "@type": "Question",
+ "name": "What is a graph database?",
+ "acceptedAnswer": {
+ "@type": "Answer",
+ "text": "A graph database is a structure composed of vertices and edges, where vertices denote discrete objects such as a person, a place, or an event, and edges denote relationships between vertices. Both vertices and edges can have properties, which are key/value-pairs that express non-relational information."
+ }
+ },
+ {
+ "@type": "Question",
+ "name": "When should I use a graph database?",
+ "acceptedAnswer": {
+ "@type": "Answer",
+ "text": "If your domain is composed of a heterogeneous set of objects (vertices) that can be related to one another in a multitude of ways (edges), then a graph may be the right representation to use. Graph databases are particularly effective for data models with complex relationships."
+ }
+ },
+ {
+ "@type": "Question",
+ "name": "What are common use cases for graph databases?",
+ "acceptedAnswer": {
+ "@type": "Answer",
+ "text": "Common use cases for graph databases include social networks, fraud detection, knowledge graphs, recommendation engines, identity/access management, customer 360 views, master data management, supply chain management, and compliance systems."
+ }
+ },
+ {
+ "@type": "Question",
+ "name": "What advantages do graph databases offer over relational databases?",
+ "acceptedAnswer": {
+ "@type": "Answer",
+ "text": "Graph databases allow you to think in terms of actors within a world of complex relations as opposed to statically-typed tables joined in aggregate. They offer a flexible, intuitive data structure along with algorithms for complex reasoning: path analysis, vertex clustering and ranking, subgraph identification, and more."
+ }
+ }
+ ]
+ }
+ ]
+ }
+ </script>
</head>
<body>
<!-- header -->
@@ -54,7 +174,7 @@
<nav class="navbar navbar-expand-lg ">
<div class="container-fluid">
<a class="navbar-brand" href="index.html">
- <img src="img/logo.png" class="img-fluid" alt="img">
+ <img src="img/logo.png" class="img-fluid" alt="Apache TinkerPop Graph Computing Framework Logo">
</a>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse"
data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent"
@@ -183,7 +303,7 @@
<!-- hero -->
<div class="container hero-inner">
- <img src="img/use-cases/bg.png" class="img-fluid w-100" alt="img">
+ <img src="img/use-cases/bg.png" class="img-fluid w-100" alt="TinkerPop Use Cases Banner">
</div>
<!-- Content -->
@@ -194,7 +314,7 @@
<h1 class="ft-40 bold black mb-3 md-md-5">Benefits & Use Cases</h1>
</div>
<div class="col-lg-6 mb-4 md-lg-0">
- <img src="img/use-cases/gremlin-main.png" class="img-fluid w-100" alt="img">
+ <img src="img/use-cases/gremlin-main.png" class="img-fluid w-100" alt="TinkerPop Gremlin">
</div>
<div class="col-lg-6 ">
<div class="use-case-page-pl-3">
@@ -232,7 +352,7 @@
</div>
<div class="col-md-4">
<div class="uc-box">
- <img src="img/use-cases/network.png" class="img-fluid mb-3" alt="img">
+ <img src="img/use-cases/network.png" class="img-fluid mb-3" alt="Social Networks Icon">
<h3 class="ft-18 bold text-blue">Social Networks</h3>
<p>Unleash the power of a social network by using relationships between individuals to infer and
recommend connections.</p>
@@ -241,7 +361,7 @@
<div class="col-md-4">
<div class="uc-box">
- <img src="img/use-cases/fraud.png" class="img-fluid mb-3" alt="img">
+ <img src="img/use-cases/fraud.png" class="img-fluid mb-3" alt="Fraud Detection Icon">
<h3 class="ft-18 bold text-blue">Fraud Detection</h3>
<p>Leverage the connections inherent in a financial transaction to provide real-time analysis and
detection for known fraudulent patterns of activity.</p>
@@ -250,7 +370,7 @@
<div class="col-md-4">
<div class="uc-box">
- <img src="img/use-cases/knowledge.png" class="img-fluid mb-3" alt="img">
+ <img src="img/use-cases/knowledge.png" class="img-fluid mb-3" alt="Knowledge Graphs Icon">
<h3 class="ft-18 bold text-blue">Knowledge Graphs</h3>
<p>Unite disperate data sources and data silos to provide contextually relevant information to
queries.</p>
@@ -259,7 +379,7 @@
<div class="col-md-4">
<div class="uc-box">
- <img src="img/use-cases/recommendation.png" class="img-fluid mb-3" alt="img">
+ <img src="img/use-cases/recommendation.png" class="img-fluid mb-3" alt="Recommendation Engines Icon">
<h3 class="ft-18 bold text-blue">Recommendation Engines</h3>
<p>Provide real-time personalized recommendations for products, services and content by utilizing
connections within data.</p>
@@ -268,7 +388,7 @@
<div class="col-md-4">
<div class="uc-box">
- <img src="img/use-cases/identify.png" class="img-fluid mb-3" alt="img">
+ <img src="img/use-cases/identify.png" class="img-fluid mb-3" alt="Identity and Access Management Icon">
<h3 class="ft-18 bold text-blue">Identity/Access Management</h3>
<p>Effectively and effciently track user activity and access using a graph of assets and
relationships.</p>
@@ -277,7 +397,7 @@
<div class="col-md-4">
<div class="uc-box">
- <img src="img/use-cases/360-view.png" class="img-fluid mb-3" alt="img">
+ <img src="img/use-cases/360-view.png" class="img-fluid mb-3" alt="Customer 360 View Icon">
<h3 class="ft-18 bold text-blue">Customer 360</h3>
<p>Leverage disconnected data sources to provide a holisitic 360 degree view of customer
interactons</p>
@@ -285,7 +405,7 @@
</div>
<div class="col-md-4">
<div class="uc-box">
- <img src="img/use-cases/master-data.png" class="img-fluid mb-3" alt="img">
+ <img src="img/use-cases/master-data.png" class="img-fluid mb-3" alt="Master Data Management Icon">
<h3 class="ft-18 bold text-blue">Master Data Management</h3>
<p>Organize and provide access to canonical master data by combining data in a schemaless and
flexible manner.</p>
@@ -295,7 +415,7 @@
<div class="col-md-4">
<div class="uc-box">
- <img src="img/use-cases/supply-chain.png" class="img-fluid mb-3" alt="img">
+ <img src="img/use-cases/supply-chain.png" class="img-fluid mb-3" alt="Supply Chain Management Icon">
<h3 class="ft-18 bold text-blue">Supply Chain Management</h3>
<p>Manage and visualize complex interconnected supply chains to identify optimizations and assess
risk.</p>
@@ -305,7 +425,7 @@
<div class="col-md-4">
<div class="uc-box">
- <img src="img/use-cases/compliant.png" class="img-fluid mb-3" alt="img">
+ <img src="img/use-cases/compliant.png" class="img-fluid mb-3" alt="Compliance Icon">
<h3 class="ft-18 bold text-blue">Compliance</h3>
<p>Ensure effective compliance by examining and evaluating entities against a network of applicable
interconnected regulations.</p>
@@ -326,7 +446,7 @@
<div class="ju-box">
<h2 class="ft-40 text-blue bold">Join Us</h2>
<p class="bold">Join us on our Discord Server</p>
- <a href="https://discord.gg/tinkerpop"><img src="img/tpvewx.png" class="img-fluid mt-3" alt="img"></a>
+ <a href="https://discord.gg/tinkerpop"><img src="img/tpvewx.png" class="img-fluid mt-3" alt="TinkerPop Discord invitation"></a>
</div>
</div>
</div>
@@ -342,11 +462,11 @@
<div class="bold ft-25">Apache TinkerPop™</div>
<p class="mt-2 mb-4">Apache TinkerPop™ is a graph computing framework for both graph databases (OLTP) and graph analytic systems (OLAP).</p>
<ul class="list-unstyled list-inline hover-op-low">
- <li class="list-inline-item"><a href="https://discord.gg/tinkerpop"><img src="img/social/discord.svg" class="img-fluid" alt="img"></a></li>
- <li class="list-inline-item"><a href="https://github.com/apache/tinkerpop"><img src="img/social/github-box.svg" class="img-fluid" alt="img"></a></li>
- <li class="list-inline-item"><a href="https://www.twitch.tv/apachetinkerpop"><img src="img/social/twitch.png" class="img-fluid" alt="img"></a></li>
- <li class="list-inline-item"><a href="https://twitter.com/apachetinkerpop"><img src="img/social/twitter-square.svg" class="img-fluid" alt="img"></a></li>
- <li class="list-inline-item"><a href="https://www.youtube.com/@apachetinkerpop"><img src="img/social/youtube.png" class="img-fluid" alt="img"></a></li>
+ <li class="list-inline-item"><a href="https://discord.gg/tinkerpop"><img src="img/social/discord.svg" class="img-fluid" alt="TinkerPop Discord"></a></li>
+ <li class="list-inline-item"><a href="https://github.com/apache/tinkerpop"><img src="img/social/github-box.svg" class="img-fluid" alt="TinkerPop GitHub"></a></li>
+ <li class="list-inline-item"><a href="https://www.twitch.tv/apachetinkerpop"><img src="img/social/twitch.png" class="img-fluid" alt="TinkerPop Twitch"></a></li>
+ <li class="list-inline-item"><a href="https://twitter.com/apachetinkerpop"><img src="img/social/twitter-square.svg" class="img-fluid" alt="TinkerPop Twitter"></a></li>
+ <li class="list-inline-item"><a href="https://www.youtube.com/@apachetinkerpop"><img src="img/social/youtube.png" class="img-fluid" alt="TinkerPop YouTube"></a></li>
</ul>
</div>
<div class="col-md-4 ft-links">
@@ -388,7 +508,7 @@
</div>
</div>
</footer>
-<script src="js/jquery-1.11.1.js"></script>
+<script src="js/jquery-1.12.4.min.js"></script>
<script src="js/bootstrap.bundle.min.js"></script>
<script src="js/wow.min.js"></script>
<script src="js/my.js"></script>
diff --git a/docs/site/home/community.html b/docs/site/home/community.html
index 5c83ce5..34b1bdf 100644
--- a/docs/site/home/community.html
+++ b/docs/site/home/community.html
@@ -18,10 +18,26 @@
<meta charset=utf-8>
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+ <meta name="robots" content="index, follow">
<link href="img/favicon.png" rel="shortcut icon"/>
- <title>Apache TinkerPop: Community</title>
- <meta name="description" content="">
- <meta name="keywords" content="">
+ <title>Graph Computing Community | Apache TinkerPop</title>
+ <meta name="description" content="Join the Apache TinkerPop community to collaborate on graph technology. Connect with developers and contribute to the open-source graph ecosystem.">
+ <meta name="keywords" content="graph community, TinkerPop, open source, developers">
+ <link rel="canonical" href="https://tinkerpop.apache.org/community.html">
+
+ <!-- Open Graph / Facebook -->
+ <meta property="og:type" content="website">
+ <meta property="og:url" content="https://tinkerpop.apache.org/community.html">
+ <meta property="og:title" content="Graph Computing Community | Apache TinkerPop">
+ <meta property="og:description" content="Join the Apache TinkerPop community to collaborate on graph technology. Connect with developers and contribute to the open-source graph ecosystem.">
+ <meta property="og:image" content="https://tinkerpop.apache.org/img/community/community-banner.png">
+
+ <!-- Twitter -->
+ <meta name="twitter:card" content="summary_large_image">
+ <meta name="twitter:site" content="@apachetinkerpop">
+ <meta name="twitter:title" content="Graph Computing Community | Apache TinkerPop">
+ <meta name="twitter:description" content="Join the Apache TinkerPop community to collaborate on graph technology. Connect with developers and contribute to the open-source graph ecosystem.">
+ <meta name="twitter:image" content="https://tinkerpop.apache.org/img/community/community-banner.png">
<link href="css/bootstrap.min.css" rel="stylesheet">
<link href="css/font-awesome.css" rel="stylesheet"/>
<link href="css/custome.css" rel="stylesheet">
@@ -46,6 +62,114 @@
})();
</script>
<!-- End Matomo Code -->
+
+ <!-- Structured Data / JSON-LD -->
+ <script type="application/ld+json">
+ {
+ "@context": "https://schema.org",
+ "@graph": [
+ {
+ "@type": "Organization",
+ "@id": "https://tinkerpop.apache.org/#organization",
+ "name": "Apache TinkerPop",
+ "url": "https://tinkerpop.apache.org/",
+ "logo": {
+ "@type": "ImageObject",
+ "url": "https://tinkerpop.apache.org/img/logo.png",
+ "width": 280,
+ "height": 60
+ },
+ "description": "Apache TinkerPop is a graph computing framework for both graph databases (OLTP) and graph analytic systems (OLAP)."
+ },
+ {
+ "@type": "WebSite",
+ "@id": "https://tinkerpop.apache.org/#website",
+ "url": "https://tinkerpop.apache.org/",
+ "name": "Apache TinkerPop",
+ "publisher": {
+ "@id": "https://tinkerpop.apache.org/#organization"
+ }
+ },
+ {
+ "@type": "WebPage",
+ "@id": "https://tinkerpop.apache.org/community.html#webpage",
+ "url": "https://tinkerpop.apache.org/community.html",
+ "name": "Graph Computing Community | Apache TinkerPop",
+ "isPartOf": {
+ "@id": "https://tinkerpop.apache.org/#website"
+ },
+ "about": {
+ "@id": "https://tinkerpop.apache.org/#organization"
+ },
+ "description": "Join the Apache TinkerPop community to collaborate on graph database technology. Connect with developers, find resources, and contribute to the open-source graph computing ecosystem."
+ },
+ {
+ "@type": "BreadcrumbList",
+ "@id": "https://tinkerpop.apache.org/community.html#breadcrumblist",
+ "itemListElement": [
+ {
+ "@type": "ListItem",
+ "position": 1,
+ "item": {
+ "@type": "WebPage",
+ "@id": "https://tinkerpop.apache.org/",
+ "url": "https://tinkerpop.apache.org/",
+ "name": "Home"
+ }
+ },
+ {
+ "@type": "ListItem",
+ "position": 2,
+ "item": {
+ "@type": "WebPage",
+ "@id": "https://tinkerpop.apache.org/community.html",
+ "url": "https://tinkerpop.apache.org/community.html",
+ "name": "Community"
+ }
+ }
+ ]
+ },
+ {
+ "@type": "FAQPage",
+ "@id": "https://tinkerpop.apache.org/community.html#faqpage",
+ "mainEntity": [
+ {
+ "@type": "Question",
+ "name": "What programming languages are supported by TinkerPop?",
+ "acceptedAnswer": {
+ "@type": "Answer",
+ "text": "Apache TinkerPop officially supports Java, Groovy, Python, .NET (C#), JavaScript, and Go. There are also community-supported libraries for many other languages including Scala, Ruby, PHP, Clojure, Elixir, Haskell, and Rust."
+ }
+ },
+ {
+ "@type": "Question",
+ "name": "How do I contribute to Apache TinkerPop?",
+ "acceptedAnswer": {
+ "@type": "Answer",
+ "text": "You can contribute to Apache TinkerPop by participating in discussions on Discord or mailing lists, submitting bug reports or feature requests to the issue tracker, contributing code or documentation via pull requests on GitHub, or helping other users in the community."
+ }
+ },
+ {
+ "@type": "Question",
+ "name": "Where can I get help with TinkerPop and Gremlin?",
+ "acceptedAnswer": {
+ "@type": "Answer",
+ "text": "The TinkerPop community offers various support channels including Discord, Answer Overflow, Stack Overflow, user mailing lists, and developer mailing lists. You can also find documentation, tutorials, and examples on the TinkerPop website."
+ }
+ },
+ {
+ "@type": "Question",
+ "name": "What tools are available for working with TinkerPop?",
+ "acceptedAnswer": {
+ "@type": "Answer",
+ "text": "There are many tools available for working with TinkerPop including visualization tools like Graphexp, KeyLines, and Linkurious, development tools like Gremlint and Gremlator, Docker containers, and language-specific libraries and frameworks for various programming languages."
+ }
+ }
+ ]
+ }
+ ]
+ }
+ </script>
</head>
<body>
<!-- header -->
@@ -54,7 +178,7 @@
<nav class="navbar navbar-expand-lg ">
<div class="container-fluid">
<a class="navbar-brand" href="index.html">
- <img src="img/logo.png" class="img-fluid" alt="img">
+ <img src="img/logo.png" class="img-fluid" alt="Apache TinkerPop Graph Computing Framework Logo">
</a>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse"
data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent"
@@ -183,7 +307,7 @@
<!-- hero -->
<div class="container hero-inner">
- <img src="img/community/bg.png" class="img-fluid w-100" alt="img">
+ <img src="img/community/bg.png" class="img-fluid w-100" alt="TinkerPop Community Banner">
</div>
<!-- Content -->
@@ -210,7 +334,7 @@
</div>
<div class="col-md-6 col-lg-3 mb-3">
<div class="d-flex align-items-start">
- <img src="img/community/tinkerpop.png" class="img-fluid me-3" alt="img">
+ <img src="img/community/tinkerpop.png" class="img-fluid me-3" alt="TinkerPop Official Support Icon">
<div class="text-blue bold ft-17">
Official TinkerPop Support
</div>
@@ -218,7 +342,7 @@
</div>
<div class="col-md-6 col-lg-3 mb-3">
<div class="d-flex align-items-start">
- <img src="img/community/third-party.png" class="img-fluid me-3" alt="img">
+ <img src="img/community/third-party.png" class="img-fluid me-3" alt="Community Support Icon">
<div class="text-blue bold ft-17">
Community support
</div>
@@ -226,7 +350,7 @@
</div>
<div class="col-md-6 col-lg-3 mb-3">
<div class="d-flex align-items-start">
- <img src="img/community/tools.png" class="img-fluid me-3" alt="img">
+ <img src="img/community/tools.png" class="img-fluid me-3" alt="Some Tools and Libraries Icon">
<div class="text-blue bold ft-17">
Some tools and libraries
</div>
@@ -234,7 +358,7 @@
</div>
<div class="col-md-6 col-lg-3 mb-3">
<div class="d-flex align-items-start">
- <img src="img/community/tool.png" class="img-fluid me-3" alt="img">
+ <img src="img/community/tool.png" class="img-fluid me-3" alt="Many Tools and Libraries Icon">
<div class="text-blue bold ft-17">
Many tools and libraries
</div>
@@ -251,7 +375,7 @@
<h2 class="accordion-header">
<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse"
data-bs-target="#collapseOne" aria-expanded="false" aria-controls="collapseOne">
- <img src="img/community/clojure.png" class="img-fluid me-3" alt="img">Clojure
+ <img src="img/community/clojure.png" class="img-fluid me-3" alt="Clojure Logo">Clojure
<div class="d-inline-block ms-4 "><img src="img/community/third-party.png"
class="img-fluid " alt="img"> <img
src="img/community/tools.png" class="img-fluid me-2 " alt="img"></div>
@@ -280,12 +404,12 @@
</div>
</div>
- <!-- elixer -->
+ <!-- elixir -->
<div class="accordion-item" id="lang-elixer">
<h2 class="accordion-header" >
<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse"
data-bs-target="#collapseTwo" aria-expanded="false" aria-controls="collapseTwo">
- <img src="img/community/elixer.png" class="img-fluid me-3" alt="img">Elixer
+ <img src="img/community/elixer.png" class="img-fluid me-3" alt="Elixir Logo">Elixir
<div class="d-inline-block ms-4 "><img src="img/community/third-party.png"
class="img-fluid " alt="img"> <img
src="img/community/tools.png" class="img-fluid me-2 " alt="img"></div>
@@ -302,7 +426,7 @@
Third-Party Libraries and Tools
</p>
<p class="ft-17">- <a class="text-blue"
- href="https://github.com/Revmaker/gremlex"
+ href="https://github.com/coingaming/gremlex"
target="_blank">Gremlex</a>: A Gremlin Server driver for
Elixir.</p>
</div>
@@ -316,7 +440,7 @@
<h2 class="accordion-header">
<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse"
data-bs-target="#collapse3" aria-expanded="false" aria-controls="collapse3">
- <img src="img/community/go.png" class="img-fluid me-3" alt="img">Go
+ <img src="img/community/go.png" class="img-fluid me-3" alt="Go Logo">Go
<div class="d-inline-block ms-4 "><img src="img/community/tinkerpop.png"
class="img-fluid me-2 " alt="img">
<img src="img/community/third-party.png"
@@ -348,7 +472,7 @@
</div>
<div class="col-md-12 mb-4 mb-lg-0 col-lg-6 text-center">
<div class="code-box">
- <code class="language-go-module">go get github.com/apache/tinkerpop/gremlin-go/v3@v3.7.0</code>
+ <code class="language-go-module">go get github.com/apache/tinkerpop/gremlin-go/v3@v3.7.4</code>
</div>
<p class="medium black">Go Module</p>
</div>
@@ -358,7 +482,7 @@
<div class="mt-4 text-center text-blue ft-17">
<a href="https://tinkerpop.apache.org/docs/current/reference/#gremlin-go"
- target="_blank"><u>Learn More</u></a>
+ target="_blank"><u>Gremlin-Go Documentation & Reference</u></a>
</div>
<div class="d-flex align-items-start">
@@ -389,7 +513,7 @@
<h2 class="accordion-header">
<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse"
data-bs-target="#collapse4" aria-expanded="false" aria-controls="collapse4">
- <img src="img/community/groovy.png" class="img-fluid me-3" alt="img">Groovy
+ <img src="img/community/groovy.png" class="img-fluid me-3" alt="Groovy Logo">Groovy
<div class="d-inline-block ms-4 "><img src="img/community/tinkerpop.png"
class="img-fluid me-2 " alt="img"> <img
src="img/community/tools.png" class="img-fluid me-2 " alt="img"></div>
@@ -420,7 +544,7 @@
<div class="col-md-12 mb-4 mb-lg-0 col-lg-6 text-center">
<div class="code-box">
<code class="language-groovy">implementation
- 'org.apache.tinkerpop:gremlin-groovy:3.7.0'</code>
+ 'org.apache.tinkerpop:gremlin-groovy:3.7.4'</code>
</div>
<p class="medium black">Gradle</p>
</div>
@@ -431,7 +555,7 @@
<div class="mt-4 text-center text-blue ft-17">
<a href="https://tinkerpop.apache.org/docs/current/reference/#gremlin-groovy"
- target="_blank"><u>Learn More</u></a>
+ target="_blank"><u>Gremlin-Groovy Documentation & Reference</u></a>
</div>
</div>
</div>
@@ -442,7 +566,7 @@
<h2 class="accordion-header">
<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse"
data-bs-target="#collapse5" aria-expanded="false" aria-controls="collapse5">
- <img src="img/community/haskell.png" class="img-fluid me-3" alt="img">Haskell
+ <img src="img/community/haskell.png" class="img-fluid me-3" alt="Haskell Logo">Haskell
<div class="d-inline-block ms-4 "><img src="img/community/third-party.png"
class="img-fluid " alt="img"> <img
src="img/community/tools.png" class="img-fluid me-2 " alt="img"></div>
@@ -508,7 +632,7 @@
<dependency>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-driver</artifactId>
- <version>3.7.0</version>
+ <version>3.7.4</version>
</dependency></code></pre>
</div>
<p class="medium black">Maven</p>
@@ -521,7 +645,7 @@
<div class="mt-4 text-center text-blue ft-17">
<a href="https://tinkerpop.apache.org/docs/current/reference/#gremlin-java"
- target="_blank"><u>Learn More</u></a>
+ target="_blank"><u>Gremlin-Java Documentation & Reference</u></a>
</div>
<div class="d-flex align-items-start">
@@ -559,7 +683,7 @@
<h2 class="accordion-header">
<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse"
data-bs-target="#collapse7" aria-expanded="false" aria-controls="collapse7">
- <img src="img/community/javascript.png" class="img-fluid me-3" alt="img">Javascript
+ <img src="img/community/javascript.png" class="img-fluid me-3" alt="JavaScript Logo">Javascript
<div class="d-inline-block ms-4 "><img src="img/community/tinkerpop.png"
class="img-fluid me-2 " alt="img"> <img
src="img/community/third-party.png" class="img-fluid me-2 " alt="img"> <img
@@ -598,7 +722,7 @@
<div class="mt-4 text-center text-blue ft-17">
<a href="https://tinkerpop.apache.org/docs/current/reference/#gremlin-javascript"
- target="_blank"><u>Learn More</u></a>
+ target="_blank"><u>Gremlin-JavaScript Documentation & Reference</u></a>
</div>
<div class="d-flex align-items-start">
@@ -701,7 +825,7 @@
</div>
<div class="col-md-12 mb-4 mb-lg-0 col-lg-6 text-center">
<div class="code-box">
- <pre><code class="language-plain">dotnet add package Gremlin.Net --version 3.7.0</code></pre>
+ <pre><code class="language-plain">dotnet add package Gremlin.Net --version 3.7.4</code></pre>
</div>
<p class="medium black">NuGet</p>
</div>
@@ -711,7 +835,7 @@
<div class="mt-4 text-center text-blue ft-17">
<a href="https://tinkerpop.apache.org/docs/current/reference/#gremlin-dotnet"
- target="_blank"><u>Learn More</u></a>
+ target="_blank"><u>Gremlin.NET Documentation & Reference</u></a>
</div>
<div class="d-flex align-items-start">
@@ -778,7 +902,7 @@
<div class="mt-4 text-center text-blue ft-17">
<a href="https://tinkerpop.apache.org/docs/current/reference/#gremlin-python"
- target="_blank"><u>Learn More</u></a>
+ target="_blank"><u>Gremlin-Python Documentation & Reference</u></a>
</div>
<div class="d-flex align-items-start">
@@ -1155,7 +1279,7 @@
<div class="ju-box">
<h2 class="ft-40 text-blue bold">Join Us</h2>
<p class="bold">Join us on our Discord Server</p>
- <a href="https://discord.gg/tinkerpop"><img src="img/tpvewx.png" class="img-fluid mt-3" alt="img"></a>
+ <a href="https://discord.gg/tinkerpop"><img src="img/tpvewx.png" class="img-fluid mt-3" alt="Discord logo"></a>
</div>
</div>
</div>
@@ -1171,11 +1295,11 @@
<div class="bold ft-25">Apache TinkerPop™</div>
<p class="mt-2 mb-4">Apache TinkerPop™ is a graph computing framework for both graph databases (OLTP) and graph analytic systems (OLAP).</p>
<ul class="list-unstyled list-inline hover-op-low">
- <li class="list-inline-item"><a href="https://discord.gg/tinkerpop"><img src="img/social/discord.svg" class="img-fluid" alt="img"></a></li>
- <li class="list-inline-item"><a href="https://github.com/apache/tinkerpop"><img src="img/social/github-box.svg" class="img-fluid" alt="img"></a></li>
- <li class="list-inline-item"><a href="https://www.twitch.tv/apachetinkerpop"><img src="img/social/twitch.png" class="img-fluid" alt="img"></a></li>
- <li class="list-inline-item"><a href="https://twitter.com/apachetinkerpop"><img src="img/social/twitter-square.svg" class="img-fluid" alt="img"></a></li>
- <li class="list-inline-item"><a href="https://www.youtube.com/@apachetinkerpop"><img src="img/social/youtube.png" class="img-fluid" alt="img"></a></li>
+ <li class="list-inline-item"><a href="https://discord.gg/tinkerpop"><img src="img/social/discord.svg" class="img-fluid" alt="TinkerPop Discord"></a></li>
+ <li class="list-inline-item"><a href="https://github.com/apache/tinkerpop"><img src="img/social/github-box.svg" class="img-fluid" alt="TinkerPop GitHub"></a></li>
+ <li class="list-inline-item"><a href="https://www.twitch.tv/apachetinkerpop"><img src="img/social/twitch.png" class="img-fluid" alt="TinkerPop Twitch"></a></li>
+ <li class="list-inline-item"><a href="https://twitter.com/apachetinkerpop"><img src="img/social/twitter-square.svg" class="img-fluid" alt="TinkerPop Twitter"></a></li>
+ <li class="list-inline-item"><a href="https://www.youtube.com/@apachetinkerpop"><img src="img/social/youtube.png" class="img-fluid" alt="TinkerPop YouTube"></a></li>
</ul>
</div>
<div class="col-md-4 ft-links">
@@ -1217,7 +1341,7 @@
</div>
</div>
</footer>
-<script src="js/jquery-1.11.1.js"></script>
+<script src="js/jquery-1.12.4.min.js"></script>
<script src="js/bootstrap.bundle.min.js"></script>
<script src="js/wow.min.js"></script>
<script src="js/my.js"></script>
diff --git a/docs/site/home/css/prism.css b/docs/site/home/css/prism.css
index 34f8b85..784228a 100644
--- a/docs/site/home/css/prism.css
+++ b/docs/site/home/css/prism.css
@@ -3,8 +3,8 @@
* the TinkerPop website style.
*/
-/* PrismJS 1.27.0
-https://prismjs.com/download.html#themes=prism-tomorrow&languages=markup+css+clike+javascript+csharp+go+go-module+groovy+java+python */
+/* PrismJS 1.30.0
+https://prismjs.com/download#themes=prism-tomorrow&languages=markup+css+clike+javascript+csharp+go+go-module+groovy+java+python+xml-doc */
/**
* prism.js tomorrow night eighties for JavaScript, CoffeeScript, CSS and HTML
* Based on https://github.com/chriskempson/tomorrow-theme
diff --git a/docs/site/home/download.html b/docs/site/home/download.html
index 6f81ec5..7a82b9c 100644
--- a/docs/site/home/download.html
+++ b/docs/site/home/download.html
@@ -18,10 +18,26 @@
<meta charset=utf-8>
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+ <meta name="robots" content="index, follow">
<link href="img/favicon.png" rel="shortcut icon" />
- <title>Apache TinkerPop: Downloads</title>
- <meta name="description" content="">
- <meta name="keywords" content="">
+ <title>Download Graph Computing Tools | Apache TinkerPop</title>
+ <meta name="description" content="Download TinkerPop graph tools including Gremlin Console, Server, and source code. Get started with the leading graph framework for your applications.">
+ <meta name="keywords" content="download, TinkerPop, Gremlin, graph tools">
+ <link rel="canonical" href="https://tinkerpop.apache.org/download.html">
+
+ <!-- Open Graph / Facebook -->
+ <meta property="og:type" content="website">
+ <meta property="og:url" content="https://tinkerpop.apache.org/download.html">
+ <meta property="og:title" content="Download Graph Computing Tools | Apache TinkerPop">
+ <meta property="og:description" content="Download TinkerPop graph tools including Gremlin Console, Server, and source code. Get started with the leading graph framework for your applications.">
+ <meta property="og:image" content="https://tinkerpop.apache.org/img/download/downloads-header.png">
+
+ <!-- Twitter -->
+ <meta name="twitter:card" content="summary_large_image">
+ <meta name="twitter:site" content="@apachetinkerpop">
+ <meta name="twitter:title" content="Download Graph Computing Tools | Apache TinkerPop">
+ <meta name="twitter:description" content="Download TinkerPop graph tools including Gremlin Console, Server, and source code. Get started with the leading graph framework for your applications.">
+ <meta name="twitter:image" content="https://tinkerpop.apache.org/img/download/downloads-header.png">
<link href="css/bootstrap.min.css" rel="stylesheet">
<link href="css/font-awesome.css" rel="stylesheet"/>
<link href="css/custome.css" rel="stylesheet">
@@ -45,6 +61,85 @@
})();
</script>
<!-- End Matomo Code -->
+
+ <!-- Structured Data / JSON-LD -->
+ <script type="application/ld+json">
+ {
+ "@context": "https://schema.org",
+ "@graph": [
+ {
+ "@type": "SoftwareApplication",
+ "name": "Apache TinkerPop",
+ "applicationCategory": "GraphDatabase",
+ "operatingSystem": "Java 8/11",
+ "softwareVersion": "3.7.3",
+ "downloadUrl": "https://www.apache.org/dyn/closer.lua/tinkerpop/3.7.4/apache-tinkerpop-gremlin-console-3.7.4-bin.zip",
+ "license": "https://www.apache.org/licenses/LICENSE-2.0",
+ "offers": {
+ "@type": "Offer",
+ "price": "0",
+ "priceCurrency": "USD"
+ },
+ "description": "Apache TinkerPop is a graph computing framework for both graph databases (OLTP) and graph analytic systems (OLAP)."
+ },
+ {
+ "@type": "BreadcrumbList",
+ "itemListElement": [
+ {
+ "@type": "ListItem",
+ "position": 1,
+ "name": "Home",
+ "item": "https://tinkerpop.apache.org/"
+ },
+ {
+ "@type": "ListItem",
+ "position": 2,
+ "name": "Downloads",
+ "item": "https://tinkerpop.apache.org/download.html"
+ }
+ ]
+ },
+ {
+ "@type": "FAQPage",
+ "@id": "https://tinkerpop.apache.org/download.html#faqpage",
+ "mainEntity": [
+ {
+ "@type": "Question",
+ "name": "What are the system requirements for running TinkerPop tools?",
+ "acceptedAnswer": {
+ "@type": "Answer",
+ "text": "Gremlin Console and Gremlin Server are compatible with Java 8/11. Ensure you have a compatible Java version installed before downloading."
+ }
+ },
+ {
+ "@type": "Question",
+ "name": "Which TinkerPop version should I download?",
+ "acceptedAnswer": {
+ "@type": "Answer",
+ "text": "For most users, we recommend the latest stable release."
+ }
+ },
+ {
+ "@type": "Question",
+ "name": "How do I verify the integrity of my download?",
+ "acceptedAnswer": {
+ "@type": "Answer",
+ "text": "You can verify downloads using PGP signatures or SHA512 checksums. First download the KEYS file from the Apache distribution directory, then verify using commands like 'gpg --import KEYS' followed by 'gpg --verify [download-file].asc [download-file]'."
+ }
+ },
+ {
+ "@type": "Question",
+ "name": "Are there packaged artifacts available in other repositories?",
+ "acceptedAnswer": {
+ "@type": "Answer",
+ "text": "Yes, TinkerPop artifacts are available in Docker, Maven Central, PyPI, npm, and NuGet. Language-specific drivers can be installed through these respective package managers."
+ }
+ }
+ ]
+ }
+ ]
+ }
+ </script>
</head>
<body>
<!-- header -->
@@ -53,7 +148,7 @@
<nav class="navbar navbar-expand-lg ">
<div class="container-fluid">
<a class="navbar-brand" href="index.html">
- <img src="img/logo.png" class="img-fluid" alt="img">
+ <img src="img/logo.png" class="img-fluid" alt="Apache TinkerPop Graph Computing Framework Logo">
</a>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse"
data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent"
@@ -182,7 +277,7 @@
<!-- hero -->
<div class="container hero-inner">
- <img src="img/download/bg.png" class="img-fluid w-100" alt="img">
+ <img src="img/download/bg.png" class="img-fluid w-100" alt="Apache TinkerPop Graph Database Download Background">
</div>
<!-- Content -->
@@ -202,53 +297,57 @@
</div>
<div class="row d-flex align-items-center">
<div class="col-lg-3 col-md-6 mb-2 mb-lg-0">
- <img src="img/download/icon.png" class="img-fluid me-2" alt="img"> <span class="bold">3.7.0</span> (latest, stable) <p class="d-inline-block ms-4 mb-0">31-July-2023</p>
+ <img src="img/download/icon.png" class="img-fluid me-2" alt="TinkerPop Version Icon"> <span class="bold">3.7.4</span> (latest, stable) <p class="d-inline-block ms-4 mb-0">01-August-2025</p>
</div>
<div class="col-lg-4 col-md-6 mb-2 mb-lg-0">
- <p class="text-blue mb-0"><a href="https://github.com/apache/tinkerpop/blob/3.7.0/CHANGELOG.asciidoc#release-3-7-0">release notes</a> | <a href="https://tinkerpop.apache.org/docs/3.7.0/upgrade/#_tinkerpop_3_7-0">upgrade</a> | <a href="https://tinkerpop.apache.org/docs/3.7.0/">documentation</a> | <a href="#" data-bs-toggle="modal" data-bs-target="#contributors-3_7_0">contributors</a></p>
+ <p class="text-blue mb-0"><a href="https://github.com/apache/tinkerpop/blob/3.7.4/CHANGELOG.asciidoc#release-3-7-4">release notes</a> | <a href="https://tinkerpop.apache.org/docs/3.7.4/upgrade/#_tinkerpop_3_7_4">upgrade</a> | <a href="https://tinkerpop.apache.org/docs/3.7.4/">documentation</a> | <a href="#" data-bs-toggle="modal" data-bs-target="#contributors-3_7_4">contributors</a></p>
</div>
<div class="col-lg-5 col-md-12 mb-2 mb-lg-2">
- <a class="btn btn-theme me-2" href="https://www.apache.org/dyn/closer.lua/tinkerpop/3.7.0/apache-tinkerpop-gremlin-console-3.7.0-bin.zip"><img src="img/download/bx-download.svg" class="img-fluid me-2" alt="img">Gremlin Console</a>
- <a class="btn btn-theme me-2" href="https://www.apache.org/dyn/closer.lua/tinkerpop/3.7.0/apache-tinkerpop-gremlin-server-3.7.0-bin.zip"><img src="img/download/bx-download.svg" class="img-fluid me-2" alt="img">Gremlin Server</a>
- <a class="btn btn-theme me-2" href="https://www.apache.org/dyn/closer.lua/tinkerpop/3.7.0/apache-tinkerpop-3.7.0-src.zip"><img src="img/download/bx-download.svg" class="img-fluid me-2" alt="img">Source</a>
+ <a class="btn btn-theme me-2" href="https://www.apache.org/dyn/closer.lua/tinkerpop/3.7.4/apache-tinkerpop-gremlin-console-3.7.4-bin.zip"><img src="img/download/bx-download.svg" class="img-fluid me-2" alt="">Gremlin Console</a>
+ <a class="btn btn-theme me-2" href="https://www.apache.org/dyn/closer.lua/tinkerpop/3.7.4/apache-tinkerpop-gremlin-server-3.7.4-bin.zip"><img src="img/download/bx-download.svg" class="img-fluid me-2" alt="">Gremlin Server</a>
+ <a class="btn btn-theme me-2" href="https://www.apache.org/dyn/closer.lua/tinkerpop/3.7.4/apache-tinkerpop-3.7.4-src.zip"><img src="img/download/bx-download.svg" class="img-fluid me-2" alt="">Source</a>
+ </div>
+ </div>
+ <div class="row d-flex mt-4 mt-md-5">
+ <div class="col-12 mb-3s">
+ <h2 class="ft-25 black bold">Beta Releases</h2>
</div>
</div>
<div class="row d-flex align-items-center">
+ <p class="mb-3 mb-md-3 medium black">Beta releases offer a public preview of an upcoming full release. Some features may be missing and
+ others may be subject to change in future betas or a final release.</p>
<div class="col-lg-3 col-md-6 mb-2 mb-lg-0">
- <img src="img/download/icon.png" class="img-fluid me-2" alt="img"> <span class="bold">3.6.5</span> (maintenance) <p class="d-inline-block ms-4 mb-0">31-July-2023</p>
+ <img src="img/download/icon.png" class="img-fluid me-2" alt="TinkerPop Version Icon"> <span class="bold">4.0.0-beta.1</span> (pre-release) <p class="d-inline-block ms-4 mb-0">17-January-2025</p>
</div>
- <div class="col-lg-4 col-md-6 mb-2 mb-lg-0">
- <p class="text-blue mb-0"><a href="https://github.com/apache/tinkerpop/blob/3.6.5/CHANGELOG.asciidoc#release-3-6-5">release notes</a> | <a href="https://tinkerpop.apache.org/docs/3.6.5/upgrade/#_tinkerpop_3_6_5">upgrade</a> | <a href="https://tinkerpop.apache.org/docs/3.6.5/">documentation</a> | <a href="#" data-bs-toggle="modal" data-bs-target="#contributors-3_6_5">contributors</a></p>
- </div>
- <div class="col-lg-5 col-md-12 mb-2 mb-lg-2">
- <a class="btn btn-theme me-2" href="https://www.apache.org/dyn/closer.lua/tinkerpop/3.6.5/apache-tinkerpop-gremlin-console-3.6.5-bin.zip"><img src="img/download/bx-download.svg" class="img-fluid me-2" alt="img">Gremlin Console</a>
- <a class="btn btn-theme me-2" href="https://www.apache.org/dyn/closer.lua/tinkerpop/3.6.5/apache-tinkerpop-gremlin-server-3.6.5-bin.zip"><img src="img/download/bx-download.svg" class="img-fluid me-2" alt="img">Gremlin Server</a>
- <a class="btn btn-theme me-2" href="https://www.apache.org/dyn/closer.lua/tinkerpop/3.6.5/apache-tinkerpop-3.6.5-src.zip"><img src="img/download/bx-download.svg" class="img-fluid me-2" alt="img">Source</a>
- </div>
- </div>
- <div class="row d-flex align-items-center">
- <div class="col-lg-3 col-md-6 mb-2 mb-lg-0">
- <img src="img/download/icon.png" class="img-fluid me-2" alt="img"> <span class="bold">3.5.7</span> (maintenance) <p class="d-inline-block ms-4 mb-0">31-July-2023</p>
+ <div class="col-lg-4 col-md-6 mb-2 mb-lg-0">
+ <p class="text-blue mb-0"><a href="https://github.com/apache/tinkerpop/blob/4.0.0-beta.1/CHANGELOG.asciidoc#release-4-0-0-beta-1">release notes</a> | <a href="https://tinkerpop.apache.org/docs/4.0.0-beta.1/upgrade/#_tinkerpop_4_0_0_beta_1">upgrade</a> | <a href="https://tinkerpop.apache.org/docs/4.0.0-beta.1/">documentation</a> | <a href="#" data-bs-toggle="modal" data-bs-target="#contributors-4_0_0_beta_1">contributors</a></p>
</div>
- <div class="col-lg-4 col-md-6 mb-2 mb-lg-0">
- <p class="text-blue mb-0"><a href="https://github.com/apache/tinkerpop/blob/3.5.7/CHANGELOG.asciidoc#release-3-5-7">release notes</a> | <a href="https://tinkerpop.apache.org/docs/3.5.7/upgrade/#_tinkerpop_3_5_7">upgrade</a> | <a href="https://tinkerpop.apache.org/docs/3.5.7/">documentation</a> | <a href="#" data-bs-toggle="modal" data-bs-target="#contributors-3_5_7">contributors</a></p>
- </div>
- <div class="col-lg-5 col-md-12 mb-2 mb-lg-0">
- <a class="btn btn-theme me-2" href="https://www.apache.org/dyn/closer.lua/tinkerpop/3.5.7/apache-tinkerpop-gremlin-console-3.5.7-bin.zip"><img src="img/download/bx-download.svg" class="img-fluid me-2" alt="img">Gremlin Console</a>
- <a class="btn btn-theme me-2" href="https://www.apache.org/dyn/closer.lua/tinkerpop/3.5.7/apache-tinkerpop-gremlin-server-3.5.7-bin.zip"><img src="img/download/bx-download.svg" class="img-fluid me-2" alt="img">Gremlin Server</a>
- <a class="btn btn-theme me-2" href="https://www.apache.org/dyn/closer.lua/tinkerpop/3.5.7/apache-tinkerpop-3.5.7-src.zip"><img src="img/download/bx-download.svg" class="img-fluid me-2" alt="img">Source</a>
- </div>
+ <div class="col-lg-5 col-md-12 mb-2 mb-lg-2">
+ <a class="btn btn-theme me-2" href="https://www.apache.org/dyn/closer.lua/tinkerpop/4.0.0-beta.1/apache-tinkerpop-gremlin-console-4.0.0-beta.1-bin.zip"><img src="img/download/bx-download.svg" class="img-fluid me-2" alt="Download Icon">Gremlin Console</a>
+ <a class="btn btn-theme me-2" href="https://www.apache.org/dyn/closer.lua/tinkerpop/4.0.0-beta.1/apache-tinkerpop-gremlin-server-4.0.0-beta.1-bin.zip"><img src="img/download/bx-download.svg" class="img-fluid me-2" alt="Download Icon">Gremlin Server</a>
+ <a class="btn btn-theme me-2" href="https://www.apache.org/dyn/closer.lua/tinkerpop/4.0.0-beta.1/apache-tinkerpop-4.0.0-beta.1-src.zip"><img src="img/download/bx-download.svg" class="img-fluid me-2" alt="Download Icon">Source</a>
+ </div>
</div>
<div class="row d-flex align-items-center mt-4 mt-md-5">
<h2 class="ft-25 black bold mb-4">Archived Releases</h2>
<div class="col-lg-3 col-md-6 mb-2 mb-lg-0">
<img src="img/download/icon.png" class="img-fluid me-2" alt="img">
<select id="dropdownArchives" class="form-select d-inliine-block">
- <option selected="selected">3.6.4 (12-May-2023)</option>
+ <option selected="selected">3.7.3 (23-October-2024)</option>
+ <option>3.7.2 (8-April-2024)</option>
+ <option>3.7.1 (20-November-2023)</option>
+ <option>3.7.0 (31-July-2023)</option>
+ <option>3.6.8 (23-October-2024)</option>
+ <option>3.6.7 (8-April-2024)</option>
+ <option>3.6.6 (20-November-2023)</option>
+ <option>3.6.5 (31-July-2023)</option>
+ <option>3.6.4 (12-May-2023)</option>
<option>3.6.3 (1-May-2023)</option>
<option>3.6.2 (16-January-2023)</option>
<option>3.6.1 (18-July-2022)</option>
<option>3.6.0 (4-April-2022)</option>
+ <option>3.5.8 (20-November-2023)</option>
+ <option>3.5.7 (31-July-2023)</option>
<option>3.5.6 (1-May-2023)</option>
<option>3.5.5 (16-January-2023)</option>
<option>3.5.4 (18-July-2022)</option>
@@ -327,20 +426,20 @@
<div class="col-lg-11 col-md-12">
<div class="info-box">
<div class="d-flex mb-3 align-items-start">
- <img src="img/download/information-circle-outline.svg" class="img-fluid me-2 pt-1" alt="img">
+ <img src="img/download/information-circle-outline.svg" class="img-fluid me-2 pt-1" alt="Information Icon">
<div>
Gremlin Console and Gremlin Server are compatible with Java 11/17.
</div>
</div>
<div class="d-flex mb-3 align-items-start">
- <img src="img/download/information-circle-outline.svg" class="img-fluid me-2 pt-1" alt="img">
+ <img src="img/download/information-circle-outline.svg" class="img-fluid me-2 pt-1" alt="Information Icon">
<div>
Upgrade documentation was only introduced at 3.1.1-incubating which is why there are no "upgrade" links in versions prior to that one.
</div>
</div>
<div class="d-flex align-items-start">
- <img src="img/download/information-circle-outline.svg" class="img-fluid me-2 pt-1" alt="img">
+ <img src="img/download/information-circle-outline.svg" class="img-fluid me-2 pt-1" alt="Information Icon">
<div>
This page lists official Apache releases only. TinkerPop occasionally produces unofficial binary release candidates (denoted by the suffix "-RC") which are NOT promoted or announced as actual release versions. Such releases are for early development and evaluation purposes only. They are not suitable for production.
</div>
@@ -379,7 +478,7 @@
<td data-label="Artifacts"><a href="https://pkg.go.dev/github.com/apache/tinkerpop/gremlin-go/v3" class="text-blue">gremlin-go</a></td>
<td data-label="">
<div class="code-box1">
- go get github.com/apache/tinkerpop/gremlin-go/v3@v3.7.0
+ go get github.com/apache/tinkerpop/gremlin-go/v3@v3.7.4
</div>
</td>
</tr>
@@ -393,7 +492,7 @@
<dependency> <br>
<groupId>org.apache.tinkerpop</groupId> <br>
<artifactId>gremlin-driver</artifactId> <br>
- <version>3.7.0</version> <br>
+ <version>3.7.4</version> <br>
</dependency>
</div>
</td>
@@ -424,7 +523,7 @@
<td data-label="Artifacts"><a href="https://www.nuget.org/packages/Gremlin.Net/" class="text-blue">Gremlin.Net </a> <br> <a href="https://www.nuget.org/packages/Gremlin.Net.Template/" class="text-blue">Gremlin.Net.Template </a></td>
<td data-label="">
<div class="code-box1">
- dotnet add package Gremlin.Net --version 3.7.0 <br>dotnet add package Gremlin.Net.template --version 3.7.0
+ dotnet add package Gremlin.Net --version 3.7.4 <br>dotnet add package Gremlin.Net.template --version 3.7.4
</div>
</td>
</tr>
@@ -481,6 +580,200 @@
<!-- Contributor Modals -->
+
+ <!-- 4.0.0-beta.1 -->
+ <div class="modal fade" id="contributors-4_0_0_beta_1" tabindex="-1" role="dialog">
+ <div class="modal-dialog" role="document">
+ <div class="modal-content">
+ <div class="modal-header">
+ <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
+
+ </div>
+ <div class="modal-body">
+ <h4 class="modal-title bold black mb-2 ">4.0.0-beta.1</h4>
+ <p>Release Manager: Cole Greer</p>
+
+ <div class="code-box1"><pre><code>$ git shortlog -sn 3.7.3..4.0.0-beta.1
+ 88 Stephen Mallette
+ 81 Cole-Greer
+ 70 Ken Hu
+ 63 Yang Xia
+ 36 Valentyn Kahamlyk
+ 23 Florian Hockmann
+ 20 dependabot[bot]
+ 20 kenhuuu
+ 7 Cole Greer
+ 6 andreachild
+ 4 Ryan Tan
+ 2 DKZed
+ 2 Qiantong Zhong
+ 2 Tiến Nguyễn Khắc
+ 2 dh-cloud
+ 2 spmallette
+ 1 Andrea Child
+ 1 Flora Jin
+ 1 JonZeolla
+ 1 KyleBoyer
+ 1 Norio Akagi
+ 1 Qiantong
+ 1 Simon Zhao</code></pre></div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <!-- 3.7.4 -->
+ <div class="modal fade" id="contributors-3_7_4" tabindex="-1" role="dialog">
+ <div class="modal-dialog" role="document">
+ <div class="modal-content">
+ <div class="modal-header">
+ <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
+
+ </div>
+ <div class="modal-body">
+ <h4 class="modal-title bold black mb-2 ">3.7.4</h4>
+ <p>Release Manager: Yang Xia</p>
+
+ <div class="code-box1"><pre><code>$ git shortlog -sn 3.7.3..3.7.4
+ 37 Stephen Mallette
+ 14 dependabot[bot]
+ 8 Cole-Greer
+ 8 andreachild
+ 5 Flora Jin
+ 4 Cole Greer
+ 4 xiazcy
+ 3 nnmva
+ 2 KyleBoyer
+ 2 Qiantong Zhong
+ 1 Clement de Groc
+ 1 DKZed
+ 1 Dylan Werner-Meier
+ 1 Hongjiang Zhang
+ 1 Norio Akagi
+ 1 Petr Langr
+ 1 Simon Zhao
+ 1 Vaibhav Malhotra
+ 1 Valentyn Kahamlyk
+ 1 dh-cloud</code></pre></div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <!-- 3.7.3 -->
+ <div class="modal fade" id="contributors-3_7_3" tabindex="-1" role="dialog">
+ <div class="modal-dialog" role="document">
+ <div class="modal-content">
+ <div class="modal-header">
+ <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
+
+ </div>
+ <div class="modal-body">
+ <h4 class="modal-title bold black mb-2 ">3.7.3</h4>
+ <p>Release Manager: Cole Greer</p>
+
+ <div class="code-box1"><pre><code>$ git shortlog -sn 3.7.2..3.7.3
+ 51 dependabot[bot]
+ 29 Cole-Greer
+ 27 Stephen Mallette
+ 23 Florian Hockmann
+ 9 Yang Xia
+ 9 lyndon
+ 8 Ken Hu
+ 8 kenhuuu
+ 7 Prashant Upadhyay
+ 5 Cole Greer
+ 5 Norio Akagi
+ 4 Valentyn Kahamlyk
+ 2 Daniel Weber
+ 2 Oleksandr Porunov
+ 2 xiazcy
+ 1 Hongjiang Zhang
+ 1 Hugo van Kemenade
+ 1 JonZeolla
+ 1 Qiantong
+ 1 Saikiran Boga
+ 1 Tomer Ohana
+ 1 kaiyaok2
+ 1 saikiranboga
+ 1 thomas dg
+ 1 thomas-dg</code></pre></div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <!-- 3.7.2 -->
+ <div class="modal fade" id="contributors-3_7_2" tabindex="-1" role="dialog">
+ <div class="modal-dialog" role="document">
+ <div class="modal-content">
+ <div class="modal-header">
+ <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
+
+ </div>
+ <div class="modal-body">
+ <h4 class="modal-title bold black mb-2 ">3.7.2</h4>
+ <p>Release Manager: Yang Xia</p>
+
+ <div class="code-box1"><pre><code>$ git shortlog -sn 3.7.1..3.7.2
+ 47 dependabot[bot]
+ 31 Florian Hockmann
+ 27 Stephen Mallette
+ 17 Cole-Greer
+ 16 Yang Xia
+ 14 Ryan Tan
+ 6 Valentyn Kahamlyk
+ 4 xiazcy
+ 4 Ken Hu
+ 2 steigma
+ 2 kenhuuu
+ 1 Tiến Nguyễn Khắc
+ 1 Prashant Upadhyay
+ 1 Saikiran Boga
+ 1 Cole Greer
+ 1 Willem Broekema</code></pre></div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <!-- 3.7.1 -->
+ <div class="modal fade" id="contributors-3_7_1" tabindex="-1" role="dialog">
+ <div class="modal-dialog" role="document">
+ <div class="modal-content">
+ <div class="modal-header">
+ <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
+
+ </div>
+ <div class="modal-body">
+ <h4 class="modal-title bold black mb-2 ">3.7.1</h4>
+ <p>Release Manager: Yang Xia</p>
+
+ <div class="code-box1"><pre><code>$ git shortlog -sn 3.7.0..3.7.1
+ 48 Stephen Mallette
+ 48 Cole-Greer
+ 43 Florian Hockmann
+ 38 dependabot[bot]
+ 31 Yang Xia
+ 18 Valentyn Kahamlyk
+ 10 Ken Hu
+ 6 kenhuuu
+ 5 Ryan Tan
+ 3 xiazcy
+ 3 Norio Akagi
+ 2 Cole Greer
+ 1 Thomas
+ 1 Itay Wolfish
+ 1 HappyHacker123
+ 1 Daniel Weber
+ 1 spmallette
+ 1 Jesse White
+ 1 Boxuan Li</code></pre></div>
+ </div>
+ </div>
+ </div>
+ </div>
+
<!-- 3.7.0 -->
<div class="modal fade" id="contributors-3_7_0" tabindex="-1" role="dialog">
<div class="modal-dialog" role="document">
@@ -521,6 +814,107 @@
</div>
</div>
+ <!-- 3.6.8 -->
+ <div class="modal fade" id="contributors-3_6_8" tabindex="-1" role="dialog">
+ <div class="modal-dialog" role="document">
+ <div class="modal-content">
+ <div class="modal-header">
+ <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
+
+ </div>
+ <div class="modal-body">
+ <h4 class="modal-title bold black mb-2 ">3.6.8</h4>
+ <p>Release Manager: Cole Greer</p>
+
+ <div class="code-box1"><pre><code>$ git shortlog -sn 3.6.7..3.6.8
+ 48 dependabot[bot]
+ 16 Florian Hockmann
+ 9 lyndon
+ 8 Cole-Greer
+ 4 Cole Greer
+ 3 Stephen Mallette
+ 2 Ken Hu
+ 2 Yang Xia
+ 2 kenhuuu
+ 1 Hugo van Kemenade
+ 1 JonZeolla
+ 1 Prashant Upadhyay
+ 1 Qiantong
+ 1 Tomer Ohana
+ 1 Valentyn Kahamlyk
+ 1 kaiyaok2
+ 1 xiazcy</code></pre></div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <!-- 3.6.7 -->
+ <div class="modal fade" id="contributors-3_6_7" tabindex="-1" role="dialog">
+ <div class="modal-dialog" role="document">
+ <div class="modal-content">
+ <div class="modal-header">
+ <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
+
+ </div>
+ <div class="modal-body">
+ <h4 class="modal-title bold black mb-2 ">3.6.7</h4>
+ <p>Release Manager: Yang Xia</p>
+
+ <div class="code-box1"><pre><code>$ git shortlog -sn 3.6.6..3.6.7
+ 46 dependabot[bot]
+ 17 Florian Hockmann
+ 11 Stephen Mallette
+ 8 Ryan Tan
+ 5 Yang Xia
+ 2 xiazcy
+ 2 Cole-Greer
+ 2 steigma
+ 1 Valentyn Kahamlyk
+ 1 Willem Broekema
+ 1 Prashant Upadhyay
+ 1 Ken Hu
+ 1 kenhuuu
+ 1 Cole Greer
+ 1 Saikiran Boga</code></pre></div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <!-- 3.6.6 -->
+ <div class="modal fade" id="contributors-3_6_6" tabindex="-1" role="dialog">
+ <div class="modal-dialog" role="document">
+ <div class="modal-content">
+ <div class="modal-header">
+ <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
+
+ </div>
+ <div class="modal-body">
+ <h4 class="modal-title bold black mb-2 ">3.6.6</h4>
+ <p>Release Manager: Yang Xia</p>
+
+ <div class="code-box1"><pre><code>$ git shortlog -sn 3.6.5..3.6.6
+ 34 dependabot[bot]
+ 30 Florian Hockmann
+ 19 Cole-Greer
+ 16 Stephen Mallette
+ 11 Yang Xia
+ 3 Norio Akagi
+ 3 Valentyn Kahamlyk
+ 2 xiazcy
+ 2 Ryan Tan
+ 2 kenhuuu
+ 1 Jesse White
+ 1 Itay Wolfish
+ 1 Daniel Weber
+ 1 Boxuan Li
+ 1 Ken Hu</code></pre></div>
+ </div>
+ </div>
+ </div>
+ </div>
+
<!-- 3.6.5 -->
<div class="modal fade" id="contributors-3_6_5" tabindex="-1" role="dialog">
<div class="modal-dialog" role="document">
@@ -748,7 +1142,33 @@
</div>
</div>
- <!-- 3.5.6 -->
+ <!-- 3.5.8 -->
+ <div class="modal fade" id="contributors-3_5_8" tabindex="-1" role="dialog">
+ <div class="modal-dialog" role="document">
+ <div class="modal-content">
+ <div class="modal-header">
+ <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
+
+ </div>
+ <div class="modal-body">
+ <h4 class="modal-title bold black mb-2 ">3.5.8</h4>
+ <p>Release Manager: Yang Xia</p>
+
+ <div class="code-box1"><pre><code>$ git shortlog -sn 3.5.7..3.5.8
+ 34 dependabot[bot]
+ 18 Florian Hockmann
+ 3 Yang Xia
+ 3 Cole-Greer
+ 1 xiazcy
+ 1 Daniel Weber
+ 1 Ryan Tan
+ 1 Stephen Mallette</code></pre></div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <!-- 3.5.7 -->
<div class="modal fade" id="contributors-3_5_7" tabindex="-1" role="dialog">
<div class="modal-dialog" role="document">
<div class="modal-content">
@@ -2527,7 +2947,7 @@
<div class="ju-box">
<h2 class="ft-40 text-blue bold">Join Us</h2>
<p class="bold">Join us on our Discord Server</p>
- <a href="https://discord.gg/tinkerpop"><img src="img/tpvewx.png" class="img-fluid mt-3" alt="img"></a>
+ <a href="https://discord.gg/tinkerpop"><img src="img/tpvewx.png" class="img-fluid mt-3" alt="Discord logo"></a>
</div>
</div>
</div>
@@ -2544,11 +2964,11 @@
<div class="bold ft-25">Apache TinkerPop™</div>
<p class="mt-2 mb-4">Apache TinkerPop™ is a graph computing framework for both graph databases (OLTP) and graph analytic systems (OLAP).</p>
<ul class="list-unstyled list-inline hover-op-low">
- <li class="list-inline-item"><a href="https://discord.gg/tinkerpop"><img src="img/social/discord.svg" class="img-fluid" alt="img"></a></li>
- <li class="list-inline-item"><a href="https://github.com/apache/tinkerpop"><img src="img/social/github-box.svg" class="img-fluid" alt="img"></a></li>
- <li class="list-inline-item"><a href="https://www.twitch.tv/apachetinkerpop"><img src="img/social/twitch.png" class="img-fluid" alt="img"></a></li>
- <li class="list-inline-item"><a href="https://twitter.com/apachetinkerpop"><img src="img/social/twitter-square.svg" class="img-fluid" alt="img"></a></li>
- <li class="list-inline-item"><a href="https://www.youtube.com/@apachetinkerpop"><img src="img/social/youtube.png" class="img-fluid" alt="img"></a></li>
+ <li class="list-inline-item"><a href="https://discord.gg/tinkerpop"><img src="img/social/discord.svg" class="img-fluid" alt="TinkerPop Discord"></a></li>
+ <li class="list-inline-item"><a href="https://github.com/apache/tinkerpop"><img src="img/social/github-box.svg" class="img-fluid" alt="TinkerPop GitHub"></a></li>
+ <li class="list-inline-item"><a href="https://www.twitch.tv/apachetinkerpop"><img src="img/social/twitch.png" class="img-fluid" alt="TinkerPop Twitch"></a></li>
+ <li class="list-inline-item"><a href="https://twitter.com/apachetinkerpop"><img src="img/social/twitter-square.svg" class="img-fluid" alt="TinkerPop Twitter"></a></li>
+ <li class="list-inline-item"><a href="https://www.youtube.com/@apachetinkerpop"><img src="img/social/youtube.png" class="img-fluid" alt="TinkerPop YouTube"></a></li>
</ul>
</div>
<div class="col-md-4 ft-links">
@@ -2587,10 +3007,9 @@
</div>
</div>
</footer>
- <script src="js/jquery-1.11.1.js"></script>
+ <script src="js/jquery-1.12.4.min.js"></script>
<script src="js/bootstrap.bundle.min.js"></script>
- <script src="js/wow.min.js"></script>
+ <script src="js/wow.min.js"></script>
<script src="js/my.js"></script>
</body>
</html>
-
diff --git a/docs/site/home/gremlin.html b/docs/site/home/gremlin.html
index 6c27652..923e0cb 100644
--- a/docs/site/home/gremlin.html
+++ b/docs/site/home/gremlin.html
@@ -18,10 +18,27 @@
<meta charset=utf-8>
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+ <meta name="robots" content="index, follow">
<link href="img/favicon.png" rel="shortcut icon" />
- <title>Apache TinkerPop: Gremlin</title>
- <meta name="description" content="">
- <meta name="keywords" content="">
+ <title>Graph Query Language - Gremlin | Apache TinkerPop</title>
+ <meta name="description" content="Gremlin is a graph traversal language for querying databases with a functional, data-flow approach. Learn how to use this powerful query language.">
+ <meta name="keywords" content="graph query, Gremlin, traversal, TinkerPop">
+ <link rel="canonical" href="https://tinkerpop.apache.org/gremlin.html">
+
+ <!-- Open Graph / Facebook -->
+ <meta property="og:type" content="website">
+ <meta property="og:url" content="https://tinkerpop.apache.org/gremlin.html">
+ <meta property="og:title" content="Graph Query Language - Gremlin | Apache TinkerPop">
+ <meta property="og:description" content="Gremlin is a graph traversal language for querying databases with a functional, data-flow approach. Learn how to use this powerful query language.">
+ <meta property="og:image" content="https://tinkerpop.apache.org/img/gremlin/gremlin-logo.png">
+
+ <!-- Twitter -->
+ <meta name="twitter:card" content="summary_large_image">
+ <meta name="twitter:site" content="@apachetinkerpop">
+ <meta name="twitter:title" content="Graph Query Language - Gremlin | Apache TinkerPop">
+ <meta name="twitter:description" content="Gremlin is a graph traversal language for querying databases with a functional, data-flow approach. Learn how to use this powerful query language.">
+ <meta name="twitter:image" content="https://tinkerpop.apache.org/img/gremlin/gremlin-logo.png">
+
<link href="css/bootstrap.min.css" rel="stylesheet">
<link href="css/font-awesome.css" rel="stylesheet"/>
<link href="css/custome.css" rel="stylesheet">
@@ -29,6 +46,7 @@
<link href="css/animate.css" rel="stylesheet"/>
<link href="css/prism.css" rel="stylesheet">
<link href="css/fonts.css" rel="stylesheet">
+
<!-- Matomo -->
<script>
var _paq = window._paq = window._paq || [];
@@ -46,6 +64,93 @@
})();
</script>
<!-- End Matomo Code -->
+
+ <!-- Structured Data / JSON-LD -->
+ <script type="application/ld+json">
+ {
+ "@context": "https://schema.org",
+ "@graph": [
+ {
+ "@type": "Organization",
+ "@id": "https://tinkerpop.apache.org/#organization",
+ "name": "Apache TinkerPop",
+ "url": "https://tinkerpop.apache.org/",
+ "logo": {
+ "@type": "ImageObject",
+ "url": "https://tinkerpop.apache.org/img/logo.png",
+ "width": 280,
+ "height": 60
+ },
+ "description": "Apache TinkerPop is a graph computing framework for both graph databases (OLTP) and graph analytic systems (OLAP)."
+ },
+ {
+ "@type": "WebSite",
+ "@id": "https://tinkerpop.apache.org/#website",
+ "url": "https://tinkerpop.apache.org/",
+ "name": "Apache TinkerPop",
+ "publisher": {
+ "@id": "https://tinkerpop.apache.org/#organization"
+ }
+ },
+ {
+ "@type": "TechArticle",
+ "@id": "https://tinkerpop.apache.org/gremlin.html#article",
+ "headline": "Graph Query Language - Gremlin",
+ "description": "Gremlin is a graph traversal language that enables developers to query graph databases with a functional, data-flow approach. Learn how to use this powerful graph query language for your data relationships.",
+ "isPartOf": {
+ "@id": "https://tinkerpop.apache.org/#website"
+ },
+ "publisher": {
+ "@id": "https://tinkerpop.apache.org/#organization"
+ },
+ "mainEntityOfPage": {
+ "@id": "https://tinkerpop.apache.org/gremlin.html#webpage"
+ },
+ "inLanguage": "en",
+ "technicalArticle": true
+ },
+ {
+ "@type": "WebPage",
+ "@id": "https://tinkerpop.apache.org/gremlin.html#webpage",
+ "url": "https://tinkerpop.apache.org/gremlin.html",
+ "name": "Graph Query Language - Gremlin | Apache TinkerPop",
+ "isPartOf": {
+ "@id": "https://tinkerpop.apache.org/#website"
+ },
+ "about": {
+ "@id": "https://tinkerpop.apache.org/#organization"
+ },
+ "description": "Gremlin is a graph traversal language that enables developers to query graph databases with a functional, data-flow approach. Learn how to use this powerful graph query language for your data relationships."
+ },
+ {
+ "@type": "BreadcrumbList",
+ "@id": "https://tinkerpop.apache.org/gremlin.html#breadcrumblist",
+ "itemListElement": [
+ {
+ "@type": "ListItem",
+ "position": 1,
+ "item": {
+ "@type": "WebPage",
+ "@id": "https://tinkerpop.apache.org/",
+ "url": "https://tinkerpop.apache.org/",
+ "name": "Home"
+ }
+ },
+ {
+ "@type": "ListItem",
+ "position": 2,
+ "item": {
+ "@type": "WebPage",
+ "@id": "https://tinkerpop.apache.org/gremlin.html",
+ "url": "https://tinkerpop.apache.org/gremlin.html",
+ "name": "Gremlin Query Language"
+ }
+ }
+ ]
+ }
+ ]
+ }
+ </script>
</head>
<body>
<!-- header -->
@@ -650,11 +755,10 @@
</div>
</div>
</footer>
- <script src="js/jquery-1.11.1.js"></script>
+ <script src="js/jquery-1.12.4.min.js"></script>
<script src="js/bootstrap.bundle.min.js"></script>
- <script src="js/wow.min.js"></script>
+ <script src="js/wow.min.js"></script>
<script src="js/my.js"></script>
<script src="js/prism.js"></script>
</body>
</html>
-
diff --git a/docs/site/home/img/providers/25.png b/docs/site/home/img/providers/25.png
index e0073a1..2180cce 100644
--- a/docs/site/home/img/providers/25.png
+++ b/docs/site/home/img/providers/25.png
Binary files differ
diff --git a/docs/site/home/index.html b/docs/site/home/index.html
index 72970e4..9c7537a 100644
--- a/docs/site/home/index.html
+++ b/docs/site/home/index.html
@@ -18,10 +18,27 @@
<meta charset=utf-8>
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+ <meta name="robots" content="index, follow">
<link href="img/favicon.png" rel="shortcut icon"/>
- <title>Apache TinkerPop: Home</title>
- <meta name="description" content="">
- <meta name="keywords" content="">
+ <title>Graph Computing Framework | Apache TinkerPop</title>
+ <meta name="description" content="Graph computing framework for databases and analytics systems. Apache TinkerPop powers graph applications with the Gremlin query language.">
+ <meta name="keywords" content="graph computing, graph database, Gremlin, TinkerPop">
+ <link rel="canonical" href="https://tinkerpop.apache.org/">
+
+ <!-- Open Graph / Facebook -->
+ <meta property="og:type" content="website">
+ <meta property="og:url" content="https://tinkerpop.apache.org/">
+ <meta property="og:title" content="Graph Computing Framework | Apache TinkerPop">
+ <meta property="og:description" content="Graph computing framework for databases and analytics systems. Apache TinkerPop powers graph applications with the Gremlin query language.">
+ <meta property="og:image" content="https://tinkerpop.apache.org/img/tinkerpop-splash.png">
+
+ <!-- Twitter -->
+ <meta name="twitter:card" content="summary_large_image">
+ <meta name="twitter:site" content="@apachetinkerpop">
+ <meta name="twitter:title" content="Graph Computing Framework | Apache TinkerPop">
+ <meta name="twitter:description" content="Graph computing framework for databases and analytics systems. Apache TinkerPop powers graph applications with the Gremlin query language.">
+ <meta name="twitter:image" content="https://tinkerpop.apache.org/img/tinkerpop-splash.png">
+
<link href="css/bootstrap.min.css" rel="stylesheet">
<link href="css/font-awesome.css" rel="stylesheet"/>
<link href="css/custome.css" rel="stylesheet">
@@ -46,6 +63,70 @@
})();
</script>
<!-- End Matomo Code -->
+
+ <!-- Structured Data / JSON-LD: Used for SEO and rich search results -->
+ <script type="application/ld+json">
+ {
+ "@context": "https://schema.org",
+ "@graph": [
+ {
+ "@type": "Organization",
+ "@id": "https://tinkerpop.apache.org/#organization",
+ "name": "Apache TinkerPop",
+ "url": "https://tinkerpop.apache.org/",
+ "logo": {
+ "@type": "ImageObject",
+ "url": "https://tinkerpop.apache.org/img/logo.png",
+ "width": 280,
+ "height": 60
+ },
+ "description": "Apache TinkerPop is a graph computing framework for both graph databases (OLTP) and graph analytic systems (OLAP).",
+ "sameAs": [
+ "https://github.com/apache/tinkerpop/",
+ "https://twitter.com/apachetinkerpop"
+ ]
+ },
+ {
+ "@type": "WebSite",
+ "@id": "https://tinkerpop.apache.org/#website",
+ "url": "https://tinkerpop.apache.org/",
+ "name": "Apache TinkerPop",
+ "publisher": {
+ "@id": "https://tinkerpop.apache.org/#organization"
+ }
+ },
+ {
+ "@type": "WebPage",
+ "@id": "https://tinkerpop.apache.org/#webpage",
+ "url": "https://tinkerpop.apache.org/",
+ "name": "Graph Computing Framework | Apache TinkerPop",
+ "isPartOf": {
+ "@id": "https://tinkerpop.apache.org/#website"
+ },
+ "about": {
+ "@id": "https://tinkerpop.apache.org/#organization"
+ },
+ "description": "Apache TinkerPop is a powerful open-source graph computing framework for both graph databases (OLTP) and graph analytic systems (OLAP). Build modern graph applications with the Gremlin query language."
+ },
+ {
+ "@type": "BreadcrumbList",
+ "@id": "https://tinkerpop.apache.org/#breadcrumblist",
+ "itemListElement": [
+ {
+ "@type": "ListItem",
+ "position": 1,
+ "item": {
+ "@type": "WebPage",
+ "@id": "https://tinkerpop.apache.org/",
+ "url": "https://tinkerpop.apache.org/",
+ "name": "Home"
+ }
+ }
+ ]
+ }
+ ]
+ }
+ </script>
</head>
<body>
<!-- header -->
@@ -54,7 +135,7 @@
<nav class="navbar navbar-expand-lg ">
<div class="container-fluid">
<a class="navbar-brand" href="index.html">
- <img src="img/logo.png" class="img-fluid" alt="img">
+ <img src="img/logo.png" class="img-fluid" alt="Apache TinkerPop Graph Computing Framework Logo">
</a>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse"
data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent"
@@ -140,16 +221,16 @@
Community
</a>
<ul class="dropdown-menu" aria-labelledby="navbarDropdown3">
- <li><a class="dropdown-item" href="https://discord.gg/tinkerpop" target="_blank"><img src="img/discord-logo.png" class="nav-icon"/>Discord</a></li>
- <li><a class="dropdown-item" href="https://www.answeroverflow.com/c/838910279550238720"><img src="img/answer-overflow-logo.png" class="nav-icon"/>Answer Overflow</a></li>
- <li><a class="dropdown-item" href="https://stackoverflow.com/questions/tagged/gremlin"><img src="img/stack-overflow-logo.png" class="nav-icon"/>Stack Overflow</a></li>
- <li><a class="dropdown-item" href="https://groups.google.com/group/gremlin-users"><img src="img/mail.png" class="nav-icon"/>User Mailing List</a></li>
- <li><a class="dropdown-item" href="https://lists.apache.org/list.html?dev@tinkerpop.apache.org"><img src="img/mail.png" class="nav-icon"/>Developer Mailing List</a></li>
- <li><a class="dropdown-item" href="https://issues.apache.org/jira/browse/TINKERPOP/"><img src="img/jira-logo.png" class="nav-icon"/>Issue Tracker</a></li>
- <li><a class="dropdown-item" href="https://github.com/apache/tinkerpop/"><img src="img/github-logo.png" class="nav-icon"/>GitHub</a></li>
- <li><a class="dropdown-item" href="https://www.twitch.tv/apachetinkerpop"><img src="img/twitch-logo.png" class="nav-icon"/>Twitch</a></li>
- <li><a class="dropdown-item" href="https://twitter.com/apachetinkerpop"><img src="img/twitter-logo.png" class="nav-icon"/>Twitter</a></li>
- <li><a class="dropdown-item" href="https://www.youtube.com/@apachetinkerpop"><img src="img/youtube-logo.png" class="nav-icon"/>YouTube</a></li>
+ <li><a class="dropdown-item" href="https://discord.gg/tinkerpop" target="_blank"><img src="img/discord-logo.png" class="nav-icon" alt="Discord logo"/>Discord</a></li>
+ <li><a class="dropdown-item" href="https://www.answeroverflow.com/c/838910279550238720"><img src="img/answer-overflow-logo.png" class="nav-icon" alt="Answer Overflow logo"/>Answer Overflow</a></li>
+ <li><a class="dropdown-item" href="https://stackoverflow.com/questions/tagged/gremlin"><img src="img/stack-overflow-logo.png" class="nav-icon" alt="Stack Overflow logo"/>Stack Overflow</a></li>
+ <li><a class="dropdown-item" href="https://groups.google.com/group/gremlin-users"><img src="img/mail.png" class="nav-icon" alt="Email icon for user mailing list"/>User Mailing List</a></li>
+ <li><a class="dropdown-item" href="https://lists.apache.org/list.html?dev@tinkerpop.apache.org"><img src="img/mail.png" class="nav-icon" alt="Email icon for developer mailing list"/>Developer Mailing List</a></li>
+ <li><a class="dropdown-item" href="https://issues.apache.org/jira/browse/TINKERPOP/"><img src="img/jira-logo.png" class="nav-icon" alt="JIRA issue tracker logo"/>Issue Tracker</a></li>
+ <li><a class="dropdown-item" href="https://github.com/apache/tinkerpop/"><img src="img/github-logo.png" class="nav-icon" alt="GitHub logo"/>GitHub</a></li>
+ <li><a class="dropdown-item" href="https://www.twitch.tv/apachetinkerpop"><img src="img/twitch-logo.png" class="nav-icon" alt="Twitch logo"/>Twitch</a></li>
+ <li><a class="dropdown-item" href="https://twitter.com/apachetinkerpop"><img src="img/twitter-logo.png" class="nav-icon" alt="Twitter logo"/>Twitter</a></li>
+ <li><a class="dropdown-item" href="https://www.youtube.com/@apachetinkerpop"><img src="img/youtube-logo.png" class="nav-icon" alt="YouTube logo"/>YouTube</a></li>
<li><hr class="dropdown-divider"></li>
<li><a class="dropdown-item" href="https://tinkerpop.apache.org/docs/current/dev/developer/#_contributing">Contributing</a></li>
<li><a class="dropdown-item" href="https://tinkerpop.apache.org/docs/current/dev/provider/#policies">Policies</a></li>
@@ -189,7 +270,7 @@
<h1 class="ft-40 bold black mb-3">Apache TinkerPop™</h1>
<p>Apache TinkerPop™ is a graph computing framework for both graph databases (OLTP) and graph analytic
systems (OLAP).</p>
- <a href="https://discord.gg/tinkerpop" target="_blank"><img src="img/discord-button.png" alt="img"
+ <a href="https://discord.gg/tinkerpop" target="_blank"><img src="img/discord-button.png" alt="Join the TinkerPop Discord Community"
class="img-fluid"></a>
</div>
</div>
@@ -199,7 +280,7 @@
<div class="container">
<div class="row">
<div class="col-12 text-center">
- <img src="img/tinkerpop-splash.png" class="img-fluid tinkerpop-splash" alt="img">
+ <img src="img/tinkerpop-splash.png" class="img-fluid tinkerpop-splash" alt="TinkerPop Character Splash">
</div>
</div>
</div>
@@ -210,32 +291,32 @@
<div class="dd-box">
<div class="text-center">
<h2 class="ft-30 bold black mb-2">Downloads & Documentation</h2>
- <p class="mb-3 mb-md-5 medium ">Released: 31-July-2023</p>
+ <p class="mb-3 mb-md-5 medium ">Released: 01-August-2025</p>
</div>
<div class="row">
<div class="col-lg-6 border-right text-center">
- <h3 class="ft-25 bold black mb-6">TinkerPop 3.7.0 Downloads</h3>
+ <h3 class="ft-25 bold black mb-6">TinkerPop 3.7.4 Downloads</h3>
<div class="row">
<div class="col-md-4 mb-3">
- <img src="img/group-24.svg" class="img-fluid mb-2" alt="img"><br>
+ <img src="img/group-24.svg" class="img-fluid mb-2" alt="Gremlin Console icon"><br>
<a class="text-blue"
- href="https://www.apache.org/dyn/closer.lua/tinkerpop/3.7.0/apache-tinkerpop-gremlin-console-3.7.0-bin.zip"><img
- src="img/download-cloud-line.svg" class="me-2 img-fluid" alt="img">Gremlin
+ href="https://www.apache.org/dyn/closer.lua/tinkerpop/3.7.4/apache-tinkerpop-gremlin-console-3.7.4-bin.zip"><img
+ src="img/download-cloud-line.svg" class="me-2 img-fluid" alt="Download icon">Gremlin
Console</a>
</div>
<div class="col-md-4 mb-3">
- <img src="img/group-25.svg" class="img-fluid mb-2" alt="img"><br>
+ <img src="img/group-25.svg" class="img-fluid mb-2" alt="Gremlin Server icon"><br>
<a class="text-blue"
- href="https://www.apache.org/dyn/closer.lua/tinkerpop/3.7.0/apache-tinkerpop-gremlin-server-3.7.0-bin.zip"><img
- src="img/download-cloud-line.svg" class="me-2 img-fluid" alt="img">Gremlin
+ href="https://www.apache.org/dyn/closer.lua/tinkerpop/3.7.4/apache-tinkerpop-gremlin-server-3.7.4-bin.zip"><img
+ src="img/download-cloud-line.svg" class="me-2 img-fluid" alt="Download icon">Gremlin
Server</a>
</div>
<div class="col-md-4 mb-3">
- <img src="img/group-26.svg" class="img-fluid mb-2" alt="img"><br>
+ <img src="img/group-26.svg" class="img-fluid mb-2" alt="Source code icon"><br>
<a class="text-blue"
- href="https://www.apache.org/dyn/closer.lua/tinkerpop/3.7.0/apache-tinkerpop-3.7.0-src.zip"><img
+ href="https://www.apache.org/dyn/closer.lua/tinkerpop/3.7.4/apache-tinkerpop-3.7.4-src.zip"><img
src="img/download-cloud-line.svg" class="me-2 img-fluid"
- alt="img">Source</a>
+ alt="Download icon">Source</a>
</div>
</div>
</div>
@@ -247,7 +328,7 @@
<button class="btn btn-theme btn-cust w-100 dropdown-toggle text-start"
type="button" id="dropdownMenuButton1" data-bs-toggle="dropdown"
aria-expanded="false">
- <img src="img/link.svg" class="img-fluid me-2" alt="img"> Documentation
+ <img src="img/link.svg" class="img-fluid me-2" alt="Link icon"> Documentation
</button>
<ul class="dropdown-menu w-100" aria-labelledby="dropdownMenuButton1">
<li><a class="dropdown-item"
@@ -266,7 +347,7 @@
</div>
<div class="col-md-6 mb-3"><a class="btn btn-theme btn-cust w-100 text-start"
href="https://tinkerpop.apache.org/javadocs/current/core/"><img
- src="img/link.svg" class="img-fluid me-2" alt="img">Javadoc - Core</a>
+ src="img/link.svg" class="img-fluid me-2" alt="Link icon">Javadoc - Core</a>
</div>
<div class="col-md-6 mb-3">
<a class="btn btn-theme btn-cust w-100 text-start"
@@ -348,7 +429,7 @@
<div class="container">
<div class="row">
<div class="col-lg-6 mb-4 mb-lg-0">
- <img src="img/gremlin-logo.png" alt="img" class="img-fluid">
+ <img src="img/gremlin-logo.png" alt="Gremlin Graph Query Language Logo" class="img-fluid">
</div>
<div class="col-lg-6 ">
<h2 class="ft-30 bold text-white mb-3">Gremlin Query Language</h2>
@@ -460,7 +541,7 @@
</div>
</div>
<a class="btn btn-theme btn-cust" href="gremlin.html"><img src="img/link.svg" class="img-fluid me-2"
- alt="img">Learn More</a>
+ alt="img">Explore Gremlin Graph Query Language</a>
</div>
</div>
</div>
@@ -472,16 +553,16 @@
<div class="row d-flex">
<div class="col-lg-12">
- <img src="img/tinkerpopfuture-home.png" class="img-fluid w-100" alt="img">
+ <img src="img/tinkerpopfuture-home.png" class="img-fluid w-100" alt="TinkerPop Banner">
</div>
</div>
</div>
</div>
<div class="sec-pad pt-0">
<div class="container">
- <div class="row d-flex">
+ <div class="row d-flex">
<div class="col-lg-6 mb-4 mb-lg-0">
- <h2 class="ft-30 bold black mb-3 ">Benefits & Use Cases</h2>
+ <h2 class="ft-30 bold black mb-3 mt-4">Benefits & Use Cases</h2>
<p class="mb-3">A graph is a structure composed of vertices and edges. Both vertices and edges can have
an arbitrary number of key/value-pairs called properties. Vertices denote discrete objects such as a
person, a place, or an event. Edges denote relationships between vertices. For instance, a person
@@ -492,7 +573,7 @@
a graph, each vertex is seen as an atomic entity (not simply a "row in a table") that can be linked
to any other vertex or have properties added or removed at will.</p>
- <a href="benefits-use-cases.html" class="text-blue ft-17"><u>Learn More</u></a>
+ <a href="benefits-use-cases.html" class="text-blue ft-17"><u>Explore Graph Database Benefits & Use Cases</u></a>
</div>
<div class="col-lg-6 ">
<h2 class="ft-30 bold black mb-3">How to use TinkerPop</h2>
@@ -502,7 +583,7 @@
<p class="mb-2 text-blue bold">Database Support</p>
<p class="mb-2">TinkerPop is widely supported by more than two dozen commercial and open source
graph databases</p>
- <a href="providers.html" class="text-blue ft-17"><u>Learn More</u></a>
+ <a href="providers.html" class="text-blue ft-17"><u>Explore Graph Database Providers</u></a>
</div>
</div>
@@ -514,7 +595,7 @@
NodeJS with additional drivers provided through community contributions</p>
<p class="mb-2">There is a wide array of third-party managed tools and applications that are
TinkerPop-compatible</p>
- <a href="community.html" class="text-blue ft-17"><u>Learn More</u></a>
+ <a href="community.html" class="text-blue ft-17"><u>Explore Graph Programming Languages & Tools</u></a>
</div>
</div>
</div>
@@ -1001,7 +1082,7 @@
<div class="ju-box">
<h2 class="ft-40 text-blue bold">Join Us</h2>
<p class="bold">Join us on our Discord Server</p>
- <a href="https://discord.gg/tinkerpop"><img src="img/tpvewx.png" class="img-fluid mt-3" alt="img"></a>
+ <a href="https://discord.gg/tinkerpop"><img src="img/tpvewx.png" class="img-fluid mt-3" alt="Discord logo"></a>
</div>
</div>
</div>
@@ -1017,11 +1098,11 @@
<div class="bold ft-25">Apache TinkerPop™</div>
<p class="mt-2 mb-4">Apache TinkerPop™ is a graph computing framework for both graph databases (OLTP) and graph analytic systems (OLAP).</p>
<ul class="list-unstyled list-inline hover-op-low">
- <li class="list-inline-item"><a href="https://discord.gg/tinkerpop"><img src="img/social/discord.svg" class="img-fluid" alt="img"></a></li>
- <li class="list-inline-item"><a href="https://github.com/apache/tinkerpop"><img src="img/social/github-box.svg" class="img-fluid" alt="img"></a></li>
- <li class="list-inline-item"><a href="https://www.twitch.tv/apachetinkerpop"><img src="img/social/twitch.png" class="img-fluid" alt="img"></a></li>
- <li class="list-inline-item"><a href="https://twitter.com/apachetinkerpop"><img src="img/social/twitter-square.svg" class="img-fluid" alt="img"></a></li>
- <li class="list-inline-item"><a href="https://www.youtube.com/@apachetinkerpop"><img src="img/social/youtube.png" class="img-fluid" alt="img"></a></li>
+ <li class="list-inline-item"><a href="https://discord.gg/tinkerpop"><img src="img/social/discord.svg" class="img-fluid" alt="TinkerPop Discord"></a></li>
+ <li class="list-inline-item"><a href="https://github.com/apache/tinkerpop"><img src="img/social/github-box.svg" class="img-fluid" alt="TinkerPop GitHub"></a></li>
+ <li class="list-inline-item"><a href="https://www.twitch.tv/apachetinkerpop"><img src="img/social/twitch.png" class="img-fluid" alt="TinkerPop Twitch"></a></li>
+ <li class="list-inline-item"><a href="https://twitter.com/apachetinkerpop"><img src="img/social/twitter-square.svg" class="img-fluid" alt="TinkerPop Twitter"></a></li>
+ <li class="list-inline-item"><a href="https://www.youtube.com/@apachetinkerpop"><img src="img/social/youtube.png" class="img-fluid" alt="TinkerPop YouTube"></a></li>
</ul>
</div>
<div class="col-md-4 ft-links">
@@ -1063,11 +1144,10 @@
</div>
</div>
</footer>
-<script src="js/jquery-1.11.1.js"></script>
+<script src="js/jquery-1.12.4.min.js"></script>
<script src="js/bootstrap.bundle.min.js"></script>
<script src="js/wow.min.js"></script>
<script src="js/my.js"></script>
<script src="js/prism.js"></script>
</body>
</html>
-
diff --git a/docs/site/home/js/jquery-1.11.1.js b/docs/site/home/js/jquery-1.11.1.js
deleted file mode 100644
index 787bfdc..0000000
--- a/docs/site/home/js/jquery-1.11.1.js
+++ /dev/null
@@ -1,639 +0,0 @@
-(function(global,factory){if(typeof module==="object"&&typeof module.exports==="object"){module.exports=global.document?factory(global,true):function(w){if(!w.document){throw new Error("jQuery requires a window with a document");}
-return factory(w);};}else{factory(global);}}(typeof window!=="undefined"?window:this,function(window,noGlobal){var deletedIds=[];var slice=deletedIds.slice;var concat=deletedIds.concat;var push=deletedIds.push;var indexOf=deletedIds.indexOf;var class2type={};var toString=class2type.toString;var hasOwn=class2type.hasOwnProperty;var support={};var
-version="1.11.1",jQuery=function(selector,context){return new jQuery.fn.init(selector,context);},rtrim=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,rmsPrefix=/^-ms-/,rdashAlpha=/-([\da-z])/gi,fcamelCase=function(all,letter){return letter.toUpperCase();};jQuery.fn=jQuery.prototype={jquery:version,constructor:jQuery,selector:"",length:0,toArray:function(){return slice.call(this);},get:function(num){return num!=null?(num<0?this[num+this.length]:this[num]):slice.call(this);},pushStack:function(elems){var ret=jQuery.merge(this.constructor(),elems);ret.prevObject=this;ret.context=this.context;return ret;},each:function(callback,args){return jQuery.each(this,callback,args);},map:function(callback){return this.pushStack(jQuery.map(this,function(elem,i){return callback.call(elem,i,elem);}));},slice:function(){return this.pushStack(slice.apply(this,arguments));},first:function(){return this.eq(0);},last:function(){return this.eq(-1);},eq:function(i){var len=this.length,j=+i+(i<0?len:0);return this.pushStack(j>=0&&j<len?[this[j]]:[]);},end:function(){return this.prevObject||this.constructor(null);},push:push,sort:deletedIds.sort,splice:deletedIds.splice};jQuery.extend=jQuery.fn.extend=function(){var src,copyIsArray,copy,name,options,clone,target=arguments[0]||{},i=1,length=arguments.length,deep=false;if(typeof target==="boolean"){deep=target;target=arguments[i]||{};i++;}
-if(typeof target!=="object"&&!jQuery.isFunction(target)){target={};}
-if(i===length){target=this;i--;}
-for(;i<length;i++){if((options=arguments[i])!=null){for(name in options){src=target[name];copy=options[name];if(target===copy){continue;}
-if(deep&©&&(jQuery.isPlainObject(copy)||(copyIsArray=jQuery.isArray(copy)))){if(copyIsArray){copyIsArray=false;clone=src&&jQuery.isArray(src)?src:[];}else{clone=src&&jQuery.isPlainObject(src)?src:{};}
-target[name]=jQuery.extend(deep,clone,copy);}else if(copy!==undefined){target[name]=copy;}}}}
-return target;};jQuery.extend({expando:"jQuery"+(version+Math.random()).replace(/\D/g,""),isReady:true,error:function(msg){throw new Error(msg);},noop:function(){},isFunction:function(obj){return jQuery.type(obj)==="function";},isArray:Array.isArray||function(obj){return jQuery.type(obj)==="array";},isWindow:function(obj){return obj!=null&&obj==obj.window;},isNumeric:function(obj){return!jQuery.isArray(obj)&&obj-parseFloat(obj)>=0;},isEmptyObject:function(obj){var name;for(name in obj){return false;}
-return true;},isPlainObject:function(obj){var key;if(!obj||jQuery.type(obj)!=="object"||obj.nodeType||jQuery.isWindow(obj)){return false;}
-try{if(obj.constructor&&!hasOwn.call(obj,"constructor")&&!hasOwn.call(obj.constructor.prototype,"isPrototypeOf")){return false;}}catch(e){return false;}
-if(support.ownLast){for(key in obj){return hasOwn.call(obj,key);}}
-for(key in obj){}
-return key===undefined||hasOwn.call(obj,key);},type:function(obj){if(obj==null){return obj+"";}
-return typeof obj==="object"||typeof obj==="function"?class2type[toString.call(obj)]||"object":typeof obj;},globalEval:function(data){if(data&&jQuery.trim(data)){(window.execScript||function(data){window["eval"].call(window,data);})(data);}},camelCase:function(string){return string.replace(rmsPrefix,"ms-").replace(rdashAlpha,fcamelCase);},nodeName:function(elem,name){return elem.nodeName&&elem.nodeName.toLowerCase()===name.toLowerCase();},each:function(obj,callback,args){var value,i=0,length=obj.length,isArray=isArraylike(obj);if(args){if(isArray){for(;i<length;i++){value=callback.apply(obj[i],args);if(value===false){break;}}}else{for(i in obj){value=callback.apply(obj[i],args);if(value===false){break;}}}}else{if(isArray){for(;i<length;i++){value=callback.call(obj[i],i,obj[i]);if(value===false){break;}}}else{for(i in obj){value=callback.call(obj[i],i,obj[i]);if(value===false){break;}}}}
-return obj;},trim:function(text){return text==null?"":(text+"").replace(rtrim,"");},makeArray:function(arr,results){var ret=results||[];if(arr!=null){if(isArraylike(Object(arr))){jQuery.merge(ret,typeof arr==="string"?[arr]:arr);}else{push.call(ret,arr);}}
-return ret;},inArray:function(elem,arr,i){var len;if(arr){if(indexOf){return indexOf.call(arr,elem,i);}
-len=arr.length;i=i?i<0?Math.max(0,len+i):i:0;for(;i<len;i++){if(i in arr&&arr[i]===elem){return i;}}}
-return-1;},merge:function(first,second){var len=+second.length,j=0,i=first.length;while(j<len){first[i++]=second[j++];}
-if(len!==len){while(second[j]!==undefined){first[i++]=second[j++];}}
-first.length=i;return first;},grep:function(elems,callback,invert){var callbackInverse,matches=[],i=0,length=elems.length,callbackExpect=!invert;for(;i<length;i++){callbackInverse=!callback(elems[i],i);if(callbackInverse!==callbackExpect){matches.push(elems[i]);}}
-return matches;},map:function(elems,callback,arg){var value,i=0,length=elems.length,isArray=isArraylike(elems),ret=[];if(isArray){for(;i<length;i++){value=callback(elems[i],i,arg);if(value!=null){ret.push(value);}}}else{for(i in elems){value=callback(elems[i],i,arg);if(value!=null){ret.push(value);}}}
-return concat.apply([],ret);},guid:1,proxy:function(fn,context){var args,proxy,tmp;if(typeof context==="string"){tmp=fn[context];context=fn;fn=tmp;}
-if(!jQuery.isFunction(fn)){return undefined;}
-args=slice.call(arguments,2);proxy=function(){return fn.apply(context||this,args.concat(slice.call(arguments)));};proxy.guid=fn.guid=fn.guid||jQuery.guid++;return proxy;},now:function(){return+(new Date());},support:support});jQuery.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(i,name){class2type["[object "+name+"]"]=name.toLowerCase();});function isArraylike(obj){var length=obj.length,type=jQuery.type(obj);if(type==="function"||jQuery.isWindow(obj)){return false;}
-if(obj.nodeType===1&&length){return true;}
-return type==="array"||length===0||typeof length==="number"&&length>0&&(length-1)in obj;}
-var Sizzle=(function(window){var i,support,Expr,getText,isXML,tokenize,compile,select,outermostContext,sortInput,hasDuplicate,setDocument,document,docElem,documentIsHTML,rbuggyQSA,rbuggyMatches,matches,contains,expando="sizzle"+-(new Date()),preferredDoc=window.document,dirruns=0,done=0,classCache=createCache(),tokenCache=createCache(),compilerCache=createCache(),sortOrder=function(a,b){if(a===b){hasDuplicate=true;}
-return 0;},strundefined=typeof undefined,MAX_NEGATIVE=1<<31,hasOwn=({}).hasOwnProperty,arr=[],pop=arr.pop,push_native=arr.push,push=arr.push,slice=arr.slice,indexOf=arr.indexOf||function(elem){var i=0,len=this.length;for(;i<len;i++){if(this[i]===elem){return i;}}
-return-1;},booleans="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",whitespace="[\\x20\\t\\r\\n\\f]",characterEncoding="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",identifier=characterEncoding.replace("w","w#"),attributes="\\["+whitespace+"*("+characterEncoding+")(?:"+whitespace+"*([*^$|!~]?=)"+whitespace+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+identifier+"))|)"+whitespace+"*\\]",pseudos=":("+characterEncoding+")(?:\\(("+"('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|"+"((?:\\\\.|[^\\\\()[\\]]|"+attributes+")*)|"+".*"+")\\)|)",rtrim=new RegExp("^"+whitespace+"+|((?:^|[^\\\\])(?:\\\\.)*)"+whitespace+"+$","g"),rcomma=new RegExp("^"+whitespace+"*,"+whitespace+"*"),rcombinators=new RegExp("^"+whitespace+"*([>+~]|"+whitespace+")"+whitespace+"*"),rattributeQuotes=new RegExp("="+whitespace+"*([^\\]'\"]*?)"+whitespace+"*\\]","g"),rpseudo=new RegExp(pseudos),ridentifier=new RegExp("^"+identifier+"$"),matchExpr={"ID":new RegExp("^#("+characterEncoding+")"),"CLASS":new RegExp("^\\.("+characterEncoding+")"),"TAG":new RegExp("^("+characterEncoding.replace("w","w*")+")"),"ATTR":new RegExp("^"+attributes),"PSEUDO":new RegExp("^"+pseudos),"CHILD":new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+whitespace+"*(even|odd|(([+-]|)(\\d*)n|)"+whitespace+"*(?:([+-]|)"+whitespace+"*(\\d+)|))"+whitespace+"*\\)|)","i"),"bool":new RegExp("^(?:"+booleans+")$","i"),"needsContext":new RegExp("^"+whitespace+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+whitespace+"*((?:-\\d)?\\d*)"+whitespace+"*\\)|)(?=[^-]|$)","i")},rinputs=/^(?:input|select|textarea|button)$/i,rheader=/^h\d$/i,rnative=/^[^{]+\{\s*\[native \w/,rquickExpr=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,rsibling=/[+~]/,rescape=/'|\\/g,runescape=new RegExp("\\\\([\\da-f]{1,6}"+whitespace+"?|("+whitespace+")|.)","ig"),funescape=function(_,escaped,escapedWhitespace){var high="0x"+escaped-0x10000;return high!==high||escapedWhitespace?escaped:high<0?String.fromCharCode(high+0x10000):String.fromCharCode(high>>10|0xD800,high&0x3FF|0xDC00);};try{push.apply((arr=slice.call(preferredDoc.childNodes)),preferredDoc.childNodes);arr[preferredDoc.childNodes.length].nodeType;}catch(e){push={apply:arr.length?function(target,els){push_native.apply(target,slice.call(els));}:function(target,els){var j=target.length,i=0;while((target[j++]=els[i++])){}
-target.length=j-1;}};}
-function Sizzle(selector,context,results,seed){var match,elem,m,nodeType,i,groups,old,nid,newContext,newSelector;if((context?context.ownerDocument||context:preferredDoc)!==document){setDocument(context);}
-context=context||document;results=results||[];if(!selector||typeof selector!=="string"){return results;}
-if((nodeType=context.nodeType)!==1&&nodeType!==9){return[];}
-if(documentIsHTML&&!seed){if((match=rquickExpr.exec(selector))){if((m=match[1])){if(nodeType===9){elem=context.getElementById(m);if(elem&&elem.parentNode){if(elem.id===m){results.push(elem);return results;}}else{return results;}}else{if(context.ownerDocument&&(elem=context.ownerDocument.getElementById(m))&&contains(context,elem)&&elem.id===m){results.push(elem);return results;}}}else if(match[2]){push.apply(results,context.getElementsByTagName(selector));return results;}else if((m=match[3])&&support.getElementsByClassName&&context.getElementsByClassName){push.apply(results,context.getElementsByClassName(m));return results;}}
-if(support.qsa&&(!rbuggyQSA||!rbuggyQSA.test(selector))){nid=old=expando;newContext=context;newSelector=nodeType===9&&selector;if(nodeType===1&&context.nodeName.toLowerCase()!=="object"){groups=tokenize(selector);if((old=context.getAttribute("id"))){nid=old.replace(rescape,"\\$&");}else{context.setAttribute("id",nid);}
-nid="[id='"+nid+"'] ";i=groups.length;while(i--){groups[i]=nid+toSelector(groups[i]);}
-newContext=rsibling.test(selector)&&testContext(context.parentNode)||context;newSelector=groups.join(",");}
-if(newSelector){try{push.apply(results,newContext.querySelectorAll(newSelector));return results;}catch(qsaError){}finally{if(!old){context.removeAttribute("id");}}}}}
-return select(selector.replace(rtrim,"$1"),context,results,seed);}
-function createCache(){var keys=[];function cache(key,value){if(keys.push(key+" ")>Expr.cacheLength){delete cache[keys.shift()];}
-return(cache[key+" "]=value);}
-return cache;}
-function markFunction(fn){fn[expando]=true;return fn;}
-function assert(fn){var div=document.createElement("div");try{return!!fn(div);}catch(e){return false;}finally{if(div.parentNode){div.parentNode.removeChild(div);}
-div=null;}}
-function addHandle(attrs,handler){var arr=attrs.split("|"),i=attrs.length;while(i--){Expr.attrHandle[arr[i]]=handler;}}
-function siblingCheck(a,b){var cur=b&&a,diff=cur&&a.nodeType===1&&b.nodeType===1&&(~b.sourceIndex||MAX_NEGATIVE)-(~a.sourceIndex||MAX_NEGATIVE);if(diff){return diff;}
-if(cur){while((cur=cur.nextSibling)){if(cur===b){return-1;}}}
-return a?1:-1;}
-function createInputPseudo(type){return function(elem){var name=elem.nodeName.toLowerCase();return name==="input"&&elem.type===type;};}
-function createButtonPseudo(type){return function(elem){var name=elem.nodeName.toLowerCase();return(name==="input"||name==="button")&&elem.type===type;};}
-function createPositionalPseudo(fn){return markFunction(function(argument){argument=+argument;return markFunction(function(seed,matches){var j,matchIndexes=fn([],seed.length,argument),i=matchIndexes.length;while(i--){if(seed[(j=matchIndexes[i])]){seed[j]=!(matches[j]=seed[j]);}}});});}
-function testContext(context){return context&&typeof context.getElementsByTagName!==strundefined&&context;}
-support=Sizzle.support={};isXML=Sizzle.isXML=function(elem){var documentElement=elem&&(elem.ownerDocument||elem).documentElement;return documentElement?documentElement.nodeName!=="HTML":false;};setDocument=Sizzle.setDocument=function(node){var hasCompare,doc=node?node.ownerDocument||node:preferredDoc,parent=doc.defaultView;if(doc===document||doc.nodeType!==9||!doc.documentElement){return document;}
-document=doc;docElem=doc.documentElement;documentIsHTML=!isXML(doc);if(parent&&parent!==parent.top){if(parent.addEventListener){parent.addEventListener("unload",function(){setDocument();},false);}else if(parent.attachEvent){parent.attachEvent("onunload",function(){setDocument();});}}
-support.attributes=assert(function(div){div.className="i";return!div.getAttribute("className");});support.getElementsByTagName=assert(function(div){div.appendChild(doc.createComment(""));return!div.getElementsByTagName("*").length;});support.getElementsByClassName=rnative.test(doc.getElementsByClassName)&&assert(function(div){div.innerHTML="<div class='a'></div><div class='a i'></div>";div.firstChild.className="i";return div.getElementsByClassName("i").length===2;});support.getById=assert(function(div){docElem.appendChild(div).id=expando;return!doc.getElementsByName||!doc.getElementsByName(expando).length;});if(support.getById){Expr.find["ID"]=function(id,context){if(typeof context.getElementById!==strundefined&&documentIsHTML){var m=context.getElementById(id);return m&&m.parentNode?[m]:[];}};Expr.filter["ID"]=function(id){var attrId=id.replace(runescape,funescape);return function(elem){return elem.getAttribute("id")===attrId;};};}else{delete Expr.find["ID"];Expr.filter["ID"]=function(id){var attrId=id.replace(runescape,funescape);return function(elem){var node=typeof elem.getAttributeNode!==strundefined&&elem.getAttributeNode("id");return node&&node.value===attrId;};};}
-Expr.find["TAG"]=support.getElementsByTagName?function(tag,context){if(typeof context.getElementsByTagName!==strundefined){return context.getElementsByTagName(tag);}}:function(tag,context){var elem,tmp=[],i=0,results=context.getElementsByTagName(tag);if(tag==="*"){while((elem=results[i++])){if(elem.nodeType===1){tmp.push(elem);}}
-return tmp;}
-return results;};Expr.find["CLASS"]=support.getElementsByClassName&&function(className,context){if(typeof context.getElementsByClassName!==strundefined&&documentIsHTML){return context.getElementsByClassName(className);}};rbuggyMatches=[];rbuggyQSA=[];if((support.qsa=rnative.test(doc.querySelectorAll))){assert(function(div){div.innerHTML="<select msallowclip=''><option selected=''></option></select>";if(div.querySelectorAll("[msallowclip^='']").length){rbuggyQSA.push("[*^$]="+whitespace+"*(?:''|\"\")");}
-if(!div.querySelectorAll("[selected]").length){rbuggyQSA.push("\\["+whitespace+"*(?:value|"+booleans+")");}
-if(!div.querySelectorAll(":checked").length){rbuggyQSA.push(":checked");}});assert(function(div){var input=doc.createElement("input");input.setAttribute("type","hidden");div.appendChild(input).setAttribute("name","D");if(div.querySelectorAll("[name=d]").length){rbuggyQSA.push("name"+whitespace+"*[*^$|!~]?=");}
-if(!div.querySelectorAll(":enabled").length){rbuggyQSA.push(":enabled",":disabled");}
-div.querySelectorAll("*,:x");rbuggyQSA.push(",.*:");});}
-if((support.matchesSelector=rnative.test((matches=docElem.matches||docElem.webkitMatchesSelector||docElem.mozMatchesSelector||docElem.oMatchesSelector||docElem.msMatchesSelector)))){assert(function(div){support.disconnectedMatch=matches.call(div,"div");matches.call(div,"[s!='']:x");rbuggyMatches.push("!=",pseudos);});}
-rbuggyQSA=rbuggyQSA.length&&new RegExp(rbuggyQSA.join("|"));rbuggyMatches=rbuggyMatches.length&&new RegExp(rbuggyMatches.join("|"));hasCompare=rnative.test(docElem.compareDocumentPosition);contains=hasCompare||rnative.test(docElem.contains)?function(a,b){var adown=a.nodeType===9?a.documentElement:a,bup=b&&b.parentNode;return a===bup||!!(bup&&bup.nodeType===1&&(adown.contains?adown.contains(bup):a.compareDocumentPosition&&a.compareDocumentPosition(bup)&16));}:function(a,b){if(b){while((b=b.parentNode)){if(b===a){return true;}}}
-return false;};sortOrder=hasCompare?function(a,b){if(a===b){hasDuplicate=true;return 0;}
-var compare=!a.compareDocumentPosition-!b.compareDocumentPosition;if(compare){return compare;}
-compare=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1;if(compare&1||(!support.sortDetached&&b.compareDocumentPosition(a)===compare)){if(a===doc||a.ownerDocument===preferredDoc&&contains(preferredDoc,a)){return-1;}
-if(b===doc||b.ownerDocument===preferredDoc&&contains(preferredDoc,b)){return 1;}
-return sortInput?(indexOf.call(sortInput,a)-indexOf.call(sortInput,b)):0;}
-return compare&4?-1:1;}:function(a,b){if(a===b){hasDuplicate=true;return 0;}
-var cur,i=0,aup=a.parentNode,bup=b.parentNode,ap=[a],bp=[b];if(!aup||!bup){return a===doc?-1:b===doc?1:aup?-1:bup?1:sortInput?(indexOf.call(sortInput,a)-indexOf.call(sortInput,b)):0;}else if(aup===bup){return siblingCheck(a,b);}
-cur=a;while((cur=cur.parentNode)){ap.unshift(cur);}
-cur=b;while((cur=cur.parentNode)){bp.unshift(cur);}
-while(ap[i]===bp[i]){i++;}
-return i?siblingCheck(ap[i],bp[i]):ap[i]===preferredDoc?-1:bp[i]===preferredDoc?1:0;};return doc;};Sizzle.matches=function(expr,elements){return Sizzle(expr,null,null,elements);};Sizzle.matchesSelector=function(elem,expr){if((elem.ownerDocument||elem)!==document){setDocument(elem);}
-expr=expr.replace(rattributeQuotes,"='$1']");if(support.matchesSelector&&documentIsHTML&&(!rbuggyMatches||!rbuggyMatches.test(expr))&&(!rbuggyQSA||!rbuggyQSA.test(expr))){try{var ret=matches.call(elem,expr);if(ret||support.disconnectedMatch||elem.document&&elem.document.nodeType!==11){return ret;}}catch(e){}}
-return Sizzle(expr,document,null,[elem]).length>0;};Sizzle.contains=function(context,elem){if((context.ownerDocument||context)!==document){setDocument(context);}
-return contains(context,elem);};Sizzle.attr=function(elem,name){if((elem.ownerDocument||elem)!==document){setDocument(elem);}
-var fn=Expr.attrHandle[name.toLowerCase()],val=fn&&hasOwn.call(Expr.attrHandle,name.toLowerCase())?fn(elem,name,!documentIsHTML):undefined;return val!==undefined?val:support.attributes||!documentIsHTML?elem.getAttribute(name):(val=elem.getAttributeNode(name))&&val.specified?val.value:null;};Sizzle.error=function(msg){throw new Error("Syntax error, unrecognized expression: "+msg);};Sizzle.uniqueSort=function(results){var elem,duplicates=[],j=0,i=0;hasDuplicate=!support.detectDuplicates;sortInput=!support.sortStable&&results.slice(0);results.sort(sortOrder);if(hasDuplicate){while((elem=results[i++])){if(elem===results[i]){j=duplicates.push(i);}}
-while(j--){results.splice(duplicates[j],1);}}
-sortInput=null;return results;};getText=Sizzle.getText=function(elem){var node,ret="",i=0,nodeType=elem.nodeType;if(!nodeType){while((node=elem[i++])){ret+=getText(node);}}else if(nodeType===1||nodeType===9||nodeType===11){if(typeof elem.textContent==="string"){return elem.textContent;}else{for(elem=elem.firstChild;elem;elem=elem.nextSibling){ret+=getText(elem);}}}else if(nodeType===3||nodeType===4){return elem.nodeValue;}
-return ret;};Expr=Sizzle.selectors={cacheLength:50,createPseudo:markFunction,match:matchExpr,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:true}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:true},"~":{dir:"previousSibling"}},preFilter:{"ATTR":function(match){match[1]=match[1].replace(runescape,funescape);match[3]=(match[3]||match[4]||match[5]||"").replace(runescape,funescape);if(match[2]==="~="){match[3]=" "+match[3]+" ";}
-return match.slice(0,4);},"CHILD":function(match){match[1]=match[1].toLowerCase();if(match[1].slice(0,3)==="nth"){if(!match[3]){Sizzle.error(match[0]);}
-match[4]=+(match[4]?match[5]+(match[6]||1):2*(match[3]==="even"||match[3]==="odd"));match[5]=+((match[7]+match[8])||match[3]==="odd");}else if(match[3]){Sizzle.error(match[0]);}
-return match;},"PSEUDO":function(match){var excess,unquoted=!match[6]&&match[2];if(matchExpr["CHILD"].test(match[0])){return null;}
-if(match[3]){match[2]=match[4]||match[5]||"";}else if(unquoted&&rpseudo.test(unquoted)&&(excess=tokenize(unquoted,true))&&(excess=unquoted.indexOf(")",unquoted.length-excess)-unquoted.length)){match[0]=match[0].slice(0,excess);match[2]=unquoted.slice(0,excess);}
-return match.slice(0,3);}},filter:{"TAG":function(nodeNameSelector){var nodeName=nodeNameSelector.replace(runescape,funescape).toLowerCase();return nodeNameSelector==="*"?function(){return true;}:function(elem){return elem.nodeName&&elem.nodeName.toLowerCase()===nodeName;};},"CLASS":function(className){var pattern=classCache[className+" "];return pattern||(pattern=new RegExp("(^|"+whitespace+")"+className+"("+whitespace+"|$)"))&&classCache(className,function(elem){return pattern.test(typeof elem.className==="string"&&elem.className||typeof elem.getAttribute!==strundefined&&elem.getAttribute("class")||"");});},"ATTR":function(name,operator,check){return function(elem){var result=Sizzle.attr(elem,name);if(result==null){return operator==="!=";}
-if(!operator){return true;}
-result+="";return operator==="="?result===check:operator==="!="?result!==check:operator==="^="?check&&result.indexOf(check)===0:operator==="*="?check&&result.indexOf(check)>-1:operator==="$="?check&&result.slice(-check.length)===check:operator==="~="?(" "+result+" ").indexOf(check)>-1:operator==="|="?result===check||result.slice(0,check.length+1)===check+"-":false;};},"CHILD":function(type,what,argument,first,last){var simple=type.slice(0,3)!=="nth",forward=type.slice(-4)!=="last",ofType=what==="of-type";return first===1&&last===0?function(elem){return!!elem.parentNode;}:function(elem,context,xml){var cache,outerCache,node,diff,nodeIndex,start,dir=simple!==forward?"nextSibling":"previousSibling",parent=elem.parentNode,name=ofType&&elem.nodeName.toLowerCase(),useCache=!xml&&!ofType;if(parent){if(simple){while(dir){node=elem;while((node=node[dir])){if(ofType?node.nodeName.toLowerCase()===name:node.nodeType===1){return false;}}
-start=dir=type==="only"&&!start&&"nextSibling";}
-return true;}
-start=[forward?parent.firstChild:parent.lastChild];if(forward&&useCache){outerCache=parent[expando]||(parent[expando]={});cache=outerCache[type]||[];nodeIndex=cache[0]===dirruns&&cache[1];diff=cache[0]===dirruns&&cache[2];node=nodeIndex&&parent.childNodes[nodeIndex];while((node=++nodeIndex&&node&&node[dir]||(diff=nodeIndex=0)||start.pop())){if(node.nodeType===1&&++diff&&node===elem){outerCache[type]=[dirruns,nodeIndex,diff];break;}}}else if(useCache&&(cache=(elem[expando]||(elem[expando]={}))[type])&&cache[0]===dirruns){diff=cache[1];}else{while((node=++nodeIndex&&node&&node[dir]||(diff=nodeIndex=0)||start.pop())){if((ofType?node.nodeName.toLowerCase()===name:node.nodeType===1)&&++diff){if(useCache){(node[expando]||(node[expando]={}))[type]=[dirruns,diff];}
-if(node===elem){break;}}}}
-diff-=last;return diff===first||(diff%first===0&&diff/first>=0);}};},"PSEUDO":function(pseudo,argument){var args,fn=Expr.pseudos[pseudo]||Expr.setFilters[pseudo.toLowerCase()]||Sizzle.error("unsupported pseudo: "+pseudo);if(fn[expando]){return fn(argument);}
-if(fn.length>1){args=[pseudo,pseudo,"",argument];return Expr.setFilters.hasOwnProperty(pseudo.toLowerCase())?markFunction(function(seed,matches){var idx,matched=fn(seed,argument),i=matched.length;while(i--){idx=indexOf.call(seed,matched[i]);seed[idx]=!(matches[idx]=matched[i]);}}):function(elem){return fn(elem,0,args);};}
-return fn;}},pseudos:{"not":markFunction(function(selector){var input=[],results=[],matcher=compile(selector.replace(rtrim,"$1"));return matcher[expando]?markFunction(function(seed,matches,context,xml){var elem,unmatched=matcher(seed,null,xml,[]),i=seed.length;while(i--){if((elem=unmatched[i])){seed[i]=!(matches[i]=elem);}}}):function(elem,context,xml){input[0]=elem;matcher(input,null,xml,results);return!results.pop();};}),"has":markFunction(function(selector){return function(elem){return Sizzle(selector,elem).length>0;};}),"contains":markFunction(function(text){return function(elem){return(elem.textContent||elem.innerText||getText(elem)).indexOf(text)>-1;};}),"lang":markFunction(function(lang){if(!ridentifier.test(lang||"")){Sizzle.error("unsupported lang: "+lang);}
-lang=lang.replace(runescape,funescape).toLowerCase();return function(elem){var elemLang;do{if((elemLang=documentIsHTML?elem.lang:elem.getAttribute("xml:lang")||elem.getAttribute("lang"))){elemLang=elemLang.toLowerCase();return elemLang===lang||elemLang.indexOf(lang+"-")===0;}}while((elem=elem.parentNode)&&elem.nodeType===1);return false;};}),"target":function(elem){var hash=window.location&&window.location.hash;return hash&&hash.slice(1)===elem.id;},"root":function(elem){return elem===docElem;},"focus":function(elem){return elem===document.activeElement&&(!document.hasFocus||document.hasFocus())&&!!(elem.type||elem.href||~elem.tabIndex);},"enabled":function(elem){return elem.disabled===false;},"disabled":function(elem){return elem.disabled===true;},"checked":function(elem){var nodeName=elem.nodeName.toLowerCase();return(nodeName==="input"&&!!elem.checked)||(nodeName==="option"&&!!elem.selected);},"selected":function(elem){if(elem.parentNode){elem.parentNode.selectedIndex;}
-return elem.selected===true;},"empty":function(elem){for(elem=elem.firstChild;elem;elem=elem.nextSibling){if(elem.nodeType<6){return false;}}
-return true;},"parent":function(elem){return!Expr.pseudos["empty"](elem);},"header":function(elem){return rheader.test(elem.nodeName);},"input":function(elem){return rinputs.test(elem.nodeName);},"button":function(elem){var name=elem.nodeName.toLowerCase();return name==="input"&&elem.type==="button"||name==="button";},"text":function(elem){var attr;return elem.nodeName.toLowerCase()==="input"&&elem.type==="text"&&((attr=elem.getAttribute("type"))==null||attr.toLowerCase()==="text");},"first":createPositionalPseudo(function(){return[0];}),"last":createPositionalPseudo(function(matchIndexes,length){return[length-1];}),"eq":createPositionalPseudo(function(matchIndexes,length,argument){return[argument<0?argument+length:argument];}),"even":createPositionalPseudo(function(matchIndexes,length){var i=0;for(;i<length;i+=2){matchIndexes.push(i);}
-return matchIndexes;}),"odd":createPositionalPseudo(function(matchIndexes,length){var i=1;for(;i<length;i+=2){matchIndexes.push(i);}
-return matchIndexes;}),"lt":createPositionalPseudo(function(matchIndexes,length,argument){var i=argument<0?argument+length:argument;for(;--i>=0;){matchIndexes.push(i);}
-return matchIndexes;}),"gt":createPositionalPseudo(function(matchIndexes,length,argument){var i=argument<0?argument+length:argument;for(;++i<length;){matchIndexes.push(i);}
-return matchIndexes;})}};Expr.pseudos["nth"]=Expr.pseudos["eq"];for(i in{radio:true,checkbox:true,file:true,password:true,image:true}){Expr.pseudos[i]=createInputPseudo(i);}
-for(i in{submit:true,reset:true}){Expr.pseudos[i]=createButtonPseudo(i);}
-function setFilters(){}
-setFilters.prototype=Expr.filters=Expr.pseudos;Expr.setFilters=new setFilters();tokenize=Sizzle.tokenize=function(selector,parseOnly){var matched,match,tokens,type,soFar,groups,preFilters,cached=tokenCache[selector+" "];if(cached){return parseOnly?0:cached.slice(0);}
-soFar=selector;groups=[];preFilters=Expr.preFilter;while(soFar){if(!matched||(match=rcomma.exec(soFar))){if(match){soFar=soFar.slice(match[0].length)||soFar;}
-groups.push((tokens=[]));}
-matched=false;if((match=rcombinators.exec(soFar))){matched=match.shift();tokens.push({value:matched,type:match[0].replace(rtrim," ")});soFar=soFar.slice(matched.length);}
-for(type in Expr.filter){if((match=matchExpr[type].exec(soFar))&&(!preFilters[type]||(match=preFilters[type](match)))){matched=match.shift();tokens.push({value:matched,type:type,matches:match});soFar=soFar.slice(matched.length);}}
-if(!matched){break;}}
-return parseOnly?soFar.length:soFar?Sizzle.error(selector):tokenCache(selector,groups).slice(0);};function toSelector(tokens){var i=0,len=tokens.length,selector="";for(;i<len;i++){selector+=tokens[i].value;}
-return selector;}
-function addCombinator(matcher,combinator,base){var dir=combinator.dir,checkNonElements=base&&dir==="parentNode",doneName=done++;return combinator.first?function(elem,context,xml){while((elem=elem[dir])){if(elem.nodeType===1||checkNonElements){return matcher(elem,context,xml);}}}:function(elem,context,xml){var oldCache,outerCache,newCache=[dirruns,doneName];if(xml){while((elem=elem[dir])){if(elem.nodeType===1||checkNonElements){if(matcher(elem,context,xml)){return true;}}}}else{while((elem=elem[dir])){if(elem.nodeType===1||checkNonElements){outerCache=elem[expando]||(elem[expando]={});if((oldCache=outerCache[dir])&&oldCache[0]===dirruns&&oldCache[1]===doneName){return(newCache[2]=oldCache[2]);}else{outerCache[dir]=newCache;if((newCache[2]=matcher(elem,context,xml))){return true;}}}}}};}
-function elementMatcher(matchers){return matchers.length>1?function(elem,context,xml){var i=matchers.length;while(i--){if(!matchers[i](elem,context,xml)){return false;}}
-return true;}:matchers[0];}
-function multipleContexts(selector,contexts,results){var i=0,len=contexts.length;for(;i<len;i++){Sizzle(selector,contexts[i],results);}
-return results;}
-function condense(unmatched,map,filter,context,xml){var elem,newUnmatched=[],i=0,len=unmatched.length,mapped=map!=null;for(;i<len;i++){if((elem=unmatched[i])){if(!filter||filter(elem,context,xml)){newUnmatched.push(elem);if(mapped){map.push(i);}}}}
-return newUnmatched;}
-function setMatcher(preFilter,selector,matcher,postFilter,postFinder,postSelector){if(postFilter&&!postFilter[expando]){postFilter=setMatcher(postFilter);}
-if(postFinder&&!postFinder[expando]){postFinder=setMatcher(postFinder,postSelector);}
-return markFunction(function(seed,results,context,xml){var temp,i,elem,preMap=[],postMap=[],preexisting=results.length,elems=seed||multipleContexts(selector||"*",context.nodeType?[context]:context,[]),matcherIn=preFilter&&(seed||!selector)?condense(elems,preMap,preFilter,context,xml):elems,matcherOut=matcher?postFinder||(seed?preFilter:preexisting||postFilter)?[]:results:matcherIn;if(matcher){matcher(matcherIn,matcherOut,context,xml);}
-if(postFilter){temp=condense(matcherOut,postMap);postFilter(temp,[],context,xml);i=temp.length;while(i--){if((elem=temp[i])){matcherOut[postMap[i]]=!(matcherIn[postMap[i]]=elem);}}}
-if(seed){if(postFinder||preFilter){if(postFinder){temp=[];i=matcherOut.length;while(i--){if((elem=matcherOut[i])){temp.push((matcherIn[i]=elem));}}
-postFinder(null,(matcherOut=[]),temp,xml);}
-i=matcherOut.length;while(i--){if((elem=matcherOut[i])&&(temp=postFinder?indexOf.call(seed,elem):preMap[i])>-1){seed[temp]=!(results[temp]=elem);}}}}else{matcherOut=condense(matcherOut===results?matcherOut.splice(preexisting,matcherOut.length):matcherOut);if(postFinder){postFinder(null,results,matcherOut,xml);}else{push.apply(results,matcherOut);}}});}
-function matcherFromTokens(tokens){var checkContext,matcher,j,len=tokens.length,leadingRelative=Expr.relative[tokens[0].type],implicitRelative=leadingRelative||Expr.relative[" "],i=leadingRelative?1:0,matchContext=addCombinator(function(elem){return elem===checkContext;},implicitRelative,true),matchAnyContext=addCombinator(function(elem){return indexOf.call(checkContext,elem)>-1;},implicitRelative,true),matchers=[function(elem,context,xml){return(!leadingRelative&&(xml||context!==outermostContext))||((checkContext=context).nodeType?matchContext(elem,context,xml):matchAnyContext(elem,context,xml));}];for(;i<len;i++){if((matcher=Expr.relative[tokens[i].type])){matchers=[addCombinator(elementMatcher(matchers),matcher)];}else{matcher=Expr.filter[tokens[i].type].apply(null,tokens[i].matches);if(matcher[expando]){j=++i;for(;j<len;j++){if(Expr.relative[tokens[j].type]){break;}}
-return setMatcher(i>1&&elementMatcher(matchers),i>1&&toSelector(tokens.slice(0,i-1).concat({value:tokens[i-2].type===" "?"*":""})).replace(rtrim,"$1"),matcher,i<j&&matcherFromTokens(tokens.slice(i,j)),j<len&&matcherFromTokens((tokens=tokens.slice(j))),j<len&&toSelector(tokens));}
-matchers.push(matcher);}}
-return elementMatcher(matchers);}
-function matcherFromGroupMatchers(elementMatchers,setMatchers){var bySet=setMatchers.length>0,byElement=elementMatchers.length>0,superMatcher=function(seed,context,xml,results,outermost){var elem,j,matcher,matchedCount=0,i="0",unmatched=seed&&[],setMatched=[],contextBackup=outermostContext,elems=seed||byElement&&Expr.find["TAG"]("*",outermost),dirrunsUnique=(dirruns+=contextBackup==null?1:Math.random()||0.1),len=elems.length;if(outermost){outermostContext=context!==document&&context;}
-for(;i!==len&&(elem=elems[i])!=null;i++){if(byElement&&elem){j=0;while((matcher=elementMatchers[j++])){if(matcher(elem,context,xml)){results.push(elem);break;}}
-if(outermost){dirruns=dirrunsUnique;}}
-if(bySet){if((elem=!matcher&&elem)){matchedCount--;}
-if(seed){unmatched.push(elem);}}}
-matchedCount+=i;if(bySet&&i!==matchedCount){j=0;while((matcher=setMatchers[j++])){matcher(unmatched,setMatched,context,xml);}
-if(seed){if(matchedCount>0){while(i--){if(!(unmatched[i]||setMatched[i])){setMatched[i]=pop.call(results);}}}
-setMatched=condense(setMatched);}
-push.apply(results,setMatched);if(outermost&&!seed&&setMatched.length>0&&(matchedCount+setMatchers.length)>1){Sizzle.uniqueSort(results);}}
-if(outermost){dirruns=dirrunsUnique;outermostContext=contextBackup;}
-return unmatched;};return bySet?markFunction(superMatcher):superMatcher;}
-compile=Sizzle.compile=function(selector,match){var i,setMatchers=[],elementMatchers=[],cached=compilerCache[selector+" "];if(!cached){if(!match){match=tokenize(selector);}
-i=match.length;while(i--){cached=matcherFromTokens(match[i]);if(cached[expando]){setMatchers.push(cached);}else{elementMatchers.push(cached);}}
-cached=compilerCache(selector,matcherFromGroupMatchers(elementMatchers,setMatchers));cached.selector=selector;}
-return cached;};select=Sizzle.select=function(selector,context,results,seed){var i,tokens,token,type,find,compiled=typeof selector==="function"&&selector,match=!seed&&tokenize((selector=compiled.selector||selector));results=results||[];if(match.length===1){tokens=match[0]=match[0].slice(0);if(tokens.length>2&&(token=tokens[0]).type==="ID"&&support.getById&&context.nodeType===9&&documentIsHTML&&Expr.relative[tokens[1].type]){context=(Expr.find["ID"](token.matches[0].replace(runescape,funescape),context)||[])[0];if(!context){return results;}else if(compiled){context=context.parentNode;}
-selector=selector.slice(tokens.shift().value.length);}
-i=matchExpr["needsContext"].test(selector)?0:tokens.length;while(i--){token=tokens[i];if(Expr.relative[(type=token.type)]){break;}
-if((find=Expr.find[type])){if((seed=find(token.matches[0].replace(runescape,funescape),rsibling.test(tokens[0].type)&&testContext(context.parentNode)||context))){tokens.splice(i,1);selector=seed.length&&toSelector(tokens);if(!selector){push.apply(results,seed);return results;}
-break;}}}}
-(compiled||compile(selector,match))(seed,context,!documentIsHTML,results,rsibling.test(selector)&&testContext(context.parentNode)||context);return results;};support.sortStable=expando.split("").sort(sortOrder).join("")===expando;support.detectDuplicates=!!hasDuplicate;setDocument();support.sortDetached=assert(function(div1){return div1.compareDocumentPosition(document.createElement("div"))&1;});if(!assert(function(div){div.innerHTML="<a href='#'></a>";return div.firstChild.getAttribute("href")==="#";})){addHandle("type|href|height|width",function(elem,name,isXML){if(!isXML){return elem.getAttribute(name,name.toLowerCase()==="type"?1:2);}});}
-if(!support.attributes||!assert(function(div){div.innerHTML="<input/>";div.firstChild.setAttribute("value","");return div.firstChild.getAttribute("value")==="";})){addHandle("value",function(elem,name,isXML){if(!isXML&&elem.nodeName.toLowerCase()==="input"){return elem.defaultValue;}});}
-if(!assert(function(div){return div.getAttribute("disabled")==null;})){addHandle(booleans,function(elem,name,isXML){var val;if(!isXML){return elem[name]===true?name.toLowerCase():(val=elem.getAttributeNode(name))&&val.specified?val.value:null;}});}
-return Sizzle;})(window);jQuery.find=Sizzle;jQuery.expr=Sizzle.selectors;jQuery.expr[":"]=jQuery.expr.pseudos;jQuery.unique=Sizzle.uniqueSort;jQuery.text=Sizzle.getText;jQuery.isXMLDoc=Sizzle.isXML;jQuery.contains=Sizzle.contains;var rneedsContext=jQuery.expr.match.needsContext;var rsingleTag=(/^<(\w+)\s*\/?>(?:<\/\1>|)$/);var risSimple=/^.[^:#\[\.,]*$/;function winnow(elements,qualifier,not){if(jQuery.isFunction(qualifier)){return jQuery.grep(elements,function(elem,i){return!!qualifier.call(elem,i,elem)!==not;});}
-if(qualifier.nodeType){return jQuery.grep(elements,function(elem){return(elem===qualifier)!==not;});}
-if(typeof qualifier==="string"){if(risSimple.test(qualifier)){return jQuery.filter(qualifier,elements,not);}
-qualifier=jQuery.filter(qualifier,elements);}
-return jQuery.grep(elements,function(elem){return(jQuery.inArray(elem,qualifier)>=0)!==not;});}
-jQuery.filter=function(expr,elems,not){var elem=elems[0];if(not){expr=":not("+expr+")";}
-return elems.length===1&&elem.nodeType===1?jQuery.find.matchesSelector(elem,expr)?[elem]:[]:jQuery.find.matches(expr,jQuery.grep(elems,function(elem){return elem.nodeType===1;}));};jQuery.fn.extend({find:function(selector){var i,ret=[],self=this,len=self.length;if(typeof selector!=="string"){return this.pushStack(jQuery(selector).filter(function(){for(i=0;i<len;i++){if(jQuery.contains(self[i],this)){return true;}}}));}
-for(i=0;i<len;i++){jQuery.find(selector,self[i],ret);}
-ret=this.pushStack(len>1?jQuery.unique(ret):ret);ret.selector=this.selector?this.selector+" "+selector:selector;return ret;},filter:function(selector){return this.pushStack(winnow(this,selector||[],false));},not:function(selector){return this.pushStack(winnow(this,selector||[],true));},is:function(selector){return!!winnow(this,typeof selector==="string"&&rneedsContext.test(selector)?jQuery(selector):selector||[],false).length;}});var rootjQuery,document=window.document,rquickExpr=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,init=jQuery.fn.init=function(selector,context){var match,elem;if(!selector){return this;}
-if(typeof selector==="string"){if(selector.charAt(0)==="<"&&selector.charAt(selector.length-1)===">"&&selector.length>=3){match=[null,selector,null];}else{match=rquickExpr.exec(selector);}
-if(match&&(match[1]||!context)){if(match[1]){context=context instanceof jQuery?context[0]:context;jQuery.merge(this,jQuery.parseHTML(match[1],context&&context.nodeType?context.ownerDocument||context:document,true));if(rsingleTag.test(match[1])&&jQuery.isPlainObject(context)){for(match in context){if(jQuery.isFunction(this[match])){this[match](context[match]);}else{this.attr(match,context[match]);}}}
-return this;}else{elem=document.getElementById(match[2]);if(elem&&elem.parentNode){if(elem.id!==match[2]){return rootjQuery.find(selector);}
-this.length=1;this[0]=elem;}
-this.context=document;this.selector=selector;return this;}}else if(!context||context.jquery){return(context||rootjQuery).find(selector);}else{return this.constructor(context).find(selector);}}else if(selector.nodeType){this.context=this[0]=selector;this.length=1;return this;}else if(jQuery.isFunction(selector)){return typeof rootjQuery.ready!=="undefined"?rootjQuery.ready(selector):selector(jQuery);}
-if(selector.selector!==undefined){this.selector=selector.selector;this.context=selector.context;}
-return jQuery.makeArray(selector,this);};init.prototype=jQuery.fn;rootjQuery=jQuery(document);var rparentsprev=/^(?:parents|prev(?:Until|All))/,guaranteedUnique={children:true,contents:true,next:true,prev:true};jQuery.extend({dir:function(elem,dir,until){var matched=[],cur=elem[dir];while(cur&&cur.nodeType!==9&&(until===undefined||cur.nodeType!==1||!jQuery(cur).is(until))){if(cur.nodeType===1){matched.push(cur);}
-cur=cur[dir];}
-return matched;},sibling:function(n,elem){var r=[];for(;n;n=n.nextSibling){if(n.nodeType===1&&n!==elem){r.push(n);}}
-return r;}});jQuery.fn.extend({has:function(target){var i,targets=jQuery(target,this),len=targets.length;return this.filter(function(){for(i=0;i<len;i++){if(jQuery.contains(this,targets[i])){return true;}}});},closest:function(selectors,context){var cur,i=0,l=this.length,matched=[],pos=rneedsContext.test(selectors)||typeof selectors!=="string"?jQuery(selectors,context||this.context):0;for(;i<l;i++){for(cur=this[i];cur&&cur!==context;cur=cur.parentNode){if(cur.nodeType<11&&(pos?pos.index(cur)>-1:cur.nodeType===1&&jQuery.find.matchesSelector(cur,selectors))){matched.push(cur);break;}}}
-return this.pushStack(matched.length>1?jQuery.unique(matched):matched);},index:function(elem){if(!elem){return(this[0]&&this[0].parentNode)?this.first().prevAll().length:-1;}
-if(typeof elem==="string"){return jQuery.inArray(this[0],jQuery(elem));}
-return jQuery.inArray(elem.jquery?elem[0]:elem,this);},add:function(selector,context){return this.pushStack(jQuery.unique(jQuery.merge(this.get(),jQuery(selector,context))));},addBack:function(selector){return this.add(selector==null?this.prevObject:this.prevObject.filter(selector));}});function sibling(cur,dir){do{cur=cur[dir];}while(cur&&cur.nodeType!==1);return cur;}
-jQuery.each({parent:function(elem){var parent=elem.parentNode;return parent&&parent.nodeType!==11?parent:null;},parents:function(elem){return jQuery.dir(elem,"parentNode");},parentsUntil:function(elem,i,until){return jQuery.dir(elem,"parentNode",until);},next:function(elem){return sibling(elem,"nextSibling");},prev:function(elem){return sibling(elem,"previousSibling");},nextAll:function(elem){return jQuery.dir(elem,"nextSibling");},prevAll:function(elem){return jQuery.dir(elem,"previousSibling");},nextUntil:function(elem,i,until){return jQuery.dir(elem,"nextSibling",until);},prevUntil:function(elem,i,until){return jQuery.dir(elem,"previousSibling",until);},siblings:function(elem){return jQuery.sibling((elem.parentNode||{}).firstChild,elem);},children:function(elem){return jQuery.sibling(elem.firstChild);},contents:function(elem){return jQuery.nodeName(elem,"iframe")?elem.contentDocument||elem.contentWindow.document:jQuery.merge([],elem.childNodes);}},function(name,fn){jQuery.fn[name]=function(until,selector){var ret=jQuery.map(this,fn,until);if(name.slice(-5)!=="Until"){selector=until;}
-if(selector&&typeof selector==="string"){ret=jQuery.filter(selector,ret);}
-if(this.length>1){if(!guaranteedUnique[name]){ret=jQuery.unique(ret);}
-if(rparentsprev.test(name)){ret=ret.reverse();}}
-return this.pushStack(ret);};});var rnotwhite=(/\S+/g);var optionsCache={};function createOptions(options){var object=optionsCache[options]={};jQuery.each(options.match(rnotwhite)||[],function(_,flag){object[flag]=true;});return object;}
-jQuery.Callbacks=function(options){options=typeof options==="string"?(optionsCache[options]||createOptions(options)):jQuery.extend({},options);var
-firing,memory,fired,firingLength,firingIndex,firingStart,list=[],stack=!options.once&&[],fire=function(data){memory=options.memory&&data;fired=true;firingIndex=firingStart||0;firingStart=0;firingLength=list.length;firing=true;for(;list&&firingIndex<firingLength;firingIndex++){if(list[firingIndex].apply(data[0],data[1])===false&&options.stopOnFalse){memory=false;break;}}
-firing=false;if(list){if(stack){if(stack.length){fire(stack.shift());}}else if(memory){list=[];}else{self.disable();}}},self={add:function(){if(list){var start=list.length;(function add(args){jQuery.each(args,function(_,arg){var type=jQuery.type(arg);if(type==="function"){if(!options.unique||!self.has(arg)){list.push(arg);}}else if(arg&&arg.length&&type!=="string"){add(arg);}});})(arguments);if(firing){firingLength=list.length;}else if(memory){firingStart=start;fire(memory);}}
-return this;},remove:function(){if(list){jQuery.each(arguments,function(_,arg){var index;while((index=jQuery.inArray(arg,list,index))>-1){list.splice(index,1);if(firing){if(index<=firingLength){firingLength--;}
-if(index<=firingIndex){firingIndex--;}}}});}
-return this;},has:function(fn){return fn?jQuery.inArray(fn,list)>-1:!!(list&&list.length);},empty:function(){list=[];firingLength=0;return this;},disable:function(){list=stack=memory=undefined;return this;},disabled:function(){return!list;},lock:function(){stack=undefined;if(!memory){self.disable();}
-return this;},locked:function(){return!stack;},fireWith:function(context,args){if(list&&(!fired||stack)){args=args||[];args=[context,args.slice?args.slice():args];if(firing){stack.push(args);}else{fire(args);}}
-return this;},fire:function(){self.fireWith(this,arguments);return this;},fired:function(){return!!fired;}};return self;};jQuery.extend({Deferred:function(func){var tuples=[["resolve","done",jQuery.Callbacks("once memory"),"resolved"],["reject","fail",jQuery.Callbacks("once memory"),"rejected"],["notify","progress",jQuery.Callbacks("memory")]],state="pending",promise={state:function(){return state;},always:function(){deferred.done(arguments).fail(arguments);return this;},then:function(){var fns=arguments;return jQuery.Deferred(function(newDefer){jQuery.each(tuples,function(i,tuple){var fn=jQuery.isFunction(fns[i])&&fns[i];deferred[tuple[1]](function(){var returned=fn&&fn.apply(this,arguments);if(returned&&jQuery.isFunction(returned.promise)){returned.promise().done(newDefer.resolve).fail(newDefer.reject).progress(newDefer.notify);}else{newDefer[tuple[0]+"With"](this===promise?newDefer.promise():this,fn?[returned]:arguments);}});});fns=null;}).promise();},promise:function(obj){return obj!=null?jQuery.extend(obj,promise):promise;}},deferred={};promise.pipe=promise.then;jQuery.each(tuples,function(i,tuple){var list=tuple[2],stateString=tuple[3];promise[tuple[1]]=list.add;if(stateString){list.add(function(){state=stateString;},tuples[i^1][2].disable,tuples[2][2].lock);}
-deferred[tuple[0]]=function(){deferred[tuple[0]+"With"](this===deferred?promise:this,arguments);return this;};deferred[tuple[0]+"With"]=list.fireWith;});promise.promise(deferred);if(func){func.call(deferred,deferred);}
-return deferred;},when:function(subordinate){var i=0,resolveValues=slice.call(arguments),length=resolveValues.length,remaining=length!==1||(subordinate&&jQuery.isFunction(subordinate.promise))?length:0,deferred=remaining===1?subordinate:jQuery.Deferred(),updateFunc=function(i,contexts,values){return function(value){contexts[i]=this;values[i]=arguments.length>1?slice.call(arguments):value;if(values===progressValues){deferred.notifyWith(contexts,values);}else if(!(--remaining)){deferred.resolveWith(contexts,values);}};},progressValues,progressContexts,resolveContexts;if(length>1){progressValues=new Array(length);progressContexts=new Array(length);resolveContexts=new Array(length);for(;i<length;i++){if(resolveValues[i]&&jQuery.isFunction(resolveValues[i].promise)){resolveValues[i].promise().done(updateFunc(i,resolveContexts,resolveValues)).fail(deferred.reject).progress(updateFunc(i,progressContexts,progressValues));}else{--remaining;}}}
-if(!remaining){deferred.resolveWith(resolveContexts,resolveValues);}
-return deferred.promise();}});var readyList;jQuery.fn.ready=function(fn){jQuery.ready.promise().done(fn);return this;};jQuery.extend({isReady:false,readyWait:1,holdReady:function(hold){if(hold){jQuery.readyWait++;}else{jQuery.ready(true);}},ready:function(wait){if(wait===true?--jQuery.readyWait:jQuery.isReady){return;}
-if(!document.body){return setTimeout(jQuery.ready);}
-jQuery.isReady=true;if(wait!==true&&--jQuery.readyWait>0){return;}
-readyList.resolveWith(document,[jQuery]);if(jQuery.fn.triggerHandler){jQuery(document).triggerHandler("ready");jQuery(document).off("ready");}}});function detach(){if(document.addEventListener){document.removeEventListener("DOMContentLoaded",completed,false);window.removeEventListener("load",completed,false);}else{document.detachEvent("onreadystatechange",completed);window.detachEvent("onload",completed);}}
-function completed(){if(document.addEventListener||event.type==="load"||document.readyState==="complete"){detach();jQuery.ready();}}
-jQuery.ready.promise=function(obj){if(!readyList){readyList=jQuery.Deferred();if(document.readyState==="complete"){setTimeout(jQuery.ready);}else if(document.addEventListener){document.addEventListener("DOMContentLoaded",completed,false);window.addEventListener("load",completed,false);}else{document.attachEvent("onreadystatechange",completed);window.attachEvent("onload",completed);var top=false;try{top=window.frameElement==null&&document.documentElement;}catch(e){}
-if(top&&top.doScroll){(function doScrollCheck(){if(!jQuery.isReady){try{top.doScroll("left");}catch(e){return setTimeout(doScrollCheck,50);}
-detach();jQuery.ready();}})();}}}
-return readyList.promise(obj);};var strundefined=typeof undefined;var i;for(i in jQuery(support)){break;}
-support.ownLast=i!=="0";support.inlineBlockNeedsLayout=false;jQuery(function(){var val,div,body,container;body=document.getElementsByTagName("body")[0];if(!body||!body.style){return;}
-div=document.createElement("div");container=document.createElement("div");container.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px";body.appendChild(container).appendChild(div);if(typeof div.style.zoom!==strundefined){div.style.cssText="display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1";support.inlineBlockNeedsLayout=val=div.offsetWidth===3;if(val){body.style.zoom=1;}}
-body.removeChild(container);});(function(){var div=document.createElement("div");if(support.deleteExpando==null){support.deleteExpando=true;try{delete div.test;}catch(e){support.deleteExpando=false;}}
-div=null;})();jQuery.acceptData=function(elem){var noData=jQuery.noData[(elem.nodeName+" ").toLowerCase()],nodeType=+elem.nodeType||1;return nodeType!==1&&nodeType!==9?false:!noData||noData!==true&&elem.getAttribute("classid")===noData;};var rbrace=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,rmultiDash=/([A-Z])/g;function dataAttr(elem,key,data){if(data===undefined&&elem.nodeType===1){var name="data-"+key.replace(rmultiDash,"-$1").toLowerCase();data=elem.getAttribute(name);if(typeof data==="string"){try{data=data==="true"?true:data==="false"?false:data==="null"?null:+data+""===data?+data:rbrace.test(data)?jQuery.parseJSON(data):data;}catch(e){}
-jQuery.data(elem,key,data);}else{data=undefined;}}
-return data;}
-function isEmptyDataObject(obj){var name;for(name in obj){if(name==="data"&&jQuery.isEmptyObject(obj[name])){continue;}
-if(name!=="toJSON"){return false;}}
-return true;}
-function internalData(elem,name,data,pvt){if(!jQuery.acceptData(elem)){return;}
-var ret,thisCache,internalKey=jQuery.expando,isNode=elem.nodeType,cache=isNode?jQuery.cache:elem,id=isNode?elem[internalKey]:elem[internalKey]&&internalKey;if((!id||!cache[id]||(!pvt&&!cache[id].data))&&data===undefined&&typeof name==="string"){return;}
-if(!id){if(isNode){id=elem[internalKey]=deletedIds.pop()||jQuery.guid++;}else{id=internalKey;}}
-if(!cache[id]){cache[id]=isNode?{}:{toJSON:jQuery.noop};}
-if(typeof name==="object"||typeof name==="function"){if(pvt){cache[id]=jQuery.extend(cache[id],name);}else{cache[id].data=jQuery.extend(cache[id].data,name);}}
-thisCache=cache[id];if(!pvt){if(!thisCache.data){thisCache.data={};}
-thisCache=thisCache.data;}
-if(data!==undefined){thisCache[jQuery.camelCase(name)]=data;}
-if(typeof name==="string"){ret=thisCache[name];if(ret==null){ret=thisCache[jQuery.camelCase(name)];}}else{ret=thisCache;}
-return ret;}
-function internalRemoveData(elem,name,pvt){if(!jQuery.acceptData(elem)){return;}
-var thisCache,i,isNode=elem.nodeType,cache=isNode?jQuery.cache:elem,id=isNode?elem[jQuery.expando]:jQuery.expando;if(!cache[id]){return;}
-if(name){thisCache=pvt?cache[id]:cache[id].data;if(thisCache){if(!jQuery.isArray(name)){if(name in thisCache){name=[name];}else{name=jQuery.camelCase(name);if(name in thisCache){name=[name];}else{name=name.split(" ");}}}else{name=name.concat(jQuery.map(name,jQuery.camelCase));}
-i=name.length;while(i--){delete thisCache[name[i]];}
-if(pvt?!isEmptyDataObject(thisCache):!jQuery.isEmptyObject(thisCache)){return;}}}
-if(!pvt){delete cache[id].data;if(!isEmptyDataObject(cache[id])){return;}}
-if(isNode){jQuery.cleanData([elem],true);}else if(support.deleteExpando||cache!=cache.window){delete cache[id];}else{cache[id]=null;}}
-jQuery.extend({cache:{},noData:{"applet ":true,"embed ":true,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(elem){elem=elem.nodeType?jQuery.cache[elem[jQuery.expando]]:elem[jQuery.expando];return!!elem&&!isEmptyDataObject(elem);},data:function(elem,name,data){return internalData(elem,name,data);},removeData:function(elem,name){return internalRemoveData(elem,name);},_data:function(elem,name,data){return internalData(elem,name,data,true);},_removeData:function(elem,name){return internalRemoveData(elem,name,true);}});jQuery.fn.extend({data:function(key,value){var i,name,data,elem=this[0],attrs=elem&&elem.attributes;if(key===undefined){if(this.length){data=jQuery.data(elem);if(elem.nodeType===1&&!jQuery._data(elem,"parsedAttrs")){i=attrs.length;while(i--){if(attrs[i]){name=attrs[i].name;if(name.indexOf("data-")===0){name=jQuery.camelCase(name.slice(5));dataAttr(elem,name,data[name]);}}}
-jQuery._data(elem,"parsedAttrs",true);}}
-return data;}
-if(typeof key==="object"){return this.each(function(){jQuery.data(this,key);});}
-return arguments.length>1?this.each(function(){jQuery.data(this,key,value);}):elem?dataAttr(elem,key,jQuery.data(elem,key)):undefined;},removeData:function(key){return this.each(function(){jQuery.removeData(this,key);});}});jQuery.extend({queue:function(elem,type,data){var queue;if(elem){type=(type||"fx")+"queue";queue=jQuery._data(elem,type);if(data){if(!queue||jQuery.isArray(data)){queue=jQuery._data(elem,type,jQuery.makeArray(data));}else{queue.push(data);}}
-return queue||[];}},dequeue:function(elem,type){type=type||"fx";var queue=jQuery.queue(elem,type),startLength=queue.length,fn=queue.shift(),hooks=jQuery._queueHooks(elem,type),next=function(){jQuery.dequeue(elem,type);};if(fn==="inprogress"){fn=queue.shift();startLength--;}
-if(fn){if(type==="fx"){queue.unshift("inprogress");}
-delete hooks.stop;fn.call(elem,next,hooks);}
-if(!startLength&&hooks){hooks.empty.fire();}},_queueHooks:function(elem,type){var key=type+"queueHooks";return jQuery._data(elem,key)||jQuery._data(elem,key,{empty:jQuery.Callbacks("once memory").add(function(){jQuery._removeData(elem,type+"queue");jQuery._removeData(elem,key);})});}});jQuery.fn.extend({queue:function(type,data){var setter=2;if(typeof type!=="string"){data=type;type="fx";setter--;}
-if(arguments.length<setter){return jQuery.queue(this[0],type);}
-return data===undefined?this:this.each(function(){var queue=jQuery.queue(this,type,data);jQuery._queueHooks(this,type);if(type==="fx"&&queue[0]!=="inprogress"){jQuery.dequeue(this,type);}});},dequeue:function(type){return this.each(function(){jQuery.dequeue(this,type);});},clearQueue:function(type){return this.queue(type||"fx",[]);},promise:function(type,obj){var tmp,count=1,defer=jQuery.Deferred(),elements=this,i=this.length,resolve=function(){if(!(--count)){defer.resolveWith(elements,[elements]);}};if(typeof type!=="string"){obj=type;type=undefined;}
-type=type||"fx";while(i--){tmp=jQuery._data(elements[i],type+"queueHooks");if(tmp&&tmp.empty){count++;tmp.empty.add(resolve);}}
-resolve();return defer.promise(obj);}});var pnum=(/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/).source;var cssExpand=["Top","Right","Bottom","Left"];var isHidden=function(elem,el){elem=el||elem;return jQuery.css(elem,"display")==="none"||!jQuery.contains(elem.ownerDocument,elem);};var access=jQuery.access=function(elems,fn,key,value,chainable,emptyGet,raw){var i=0,length=elems.length,bulk=key==null;if(jQuery.type(key)==="object"){chainable=true;for(i in key){jQuery.access(elems,fn,i,key[i],true,emptyGet,raw);}}else if(value!==undefined){chainable=true;if(!jQuery.isFunction(value)){raw=true;}
-if(bulk){if(raw){fn.call(elems,value);fn=null;}else{bulk=fn;fn=function(elem,key,value){return bulk.call(jQuery(elem),value);};}}
-if(fn){for(;i<length;i++){fn(elems[i],key,raw?value:value.call(elems[i],i,fn(elems[i],key)));}}}
-return chainable?elems:bulk?fn.call(elems):length?fn(elems[0],key):emptyGet;};var rcheckableType=(/^(?:checkbox|radio)$/i);(function(){var input=document.createElement("input"),div=document.createElement("div"),fragment=document.createDocumentFragment();div.innerHTML=" <link/><table></table><a href='/a'>a</a><input type='checkbox'/>";support.leadingWhitespace=div.firstChild.nodeType===3;support.tbody=!div.getElementsByTagName("tbody").length;support.htmlSerialize=!!div.getElementsByTagName("link").length;support.html5Clone=document.createElement("nav").cloneNode(true).outerHTML!=="<:nav></:nav>";input.type="checkbox";input.checked=true;fragment.appendChild(input);support.appendChecked=input.checked;div.innerHTML="<textarea>x</textarea>";support.noCloneChecked=!!div.cloneNode(true).lastChild.defaultValue;fragment.appendChild(div);div.innerHTML="<input type='radio' checked='checked' name='t'/>";support.checkClone=div.cloneNode(true).cloneNode(true).lastChild.checked;support.noCloneEvent=true;if(div.attachEvent){div.attachEvent("onclick",function(){support.noCloneEvent=false;});div.cloneNode(true).click();}
-if(support.deleteExpando==null){support.deleteExpando=true;try{delete div.test;}catch(e){support.deleteExpando=false;}}})();(function(){var i,eventName,div=document.createElement("div");for(i in{submit:true,change:true,focusin:true}){eventName="on"+i;if(!(support[i+"Bubbles"]=eventName in window)){div.setAttribute(eventName,"t");support[i+"Bubbles"]=div.attributes[eventName].expando===false;}}
-div=null;})();var rformElems=/^(?:input|select|textarea)$/i,rkeyEvent=/^key/,rmouseEvent=/^(?:mouse|pointer|contextmenu)|click/,rfocusMorph=/^(?:focusinfocus|focusoutblur)$/,rtypenamespace=/^([^.]*)(?:\.(.+)|)$/;function returnTrue(){return true;}
-function returnFalse(){return false;}
-function safeActiveElement(){try{return document.activeElement;}catch(err){}}
-jQuery.event={global:{},add:function(elem,types,handler,data,selector){var tmp,events,t,handleObjIn,special,eventHandle,handleObj,handlers,type,namespaces,origType,elemData=jQuery._data(elem);if(!elemData){return;}
-if(handler.handler){handleObjIn=handler;handler=handleObjIn.handler;selector=handleObjIn.selector;}
-if(!handler.guid){handler.guid=jQuery.guid++;}
-if(!(events=elemData.events)){events=elemData.events={};}
-if(!(eventHandle=elemData.handle)){eventHandle=elemData.handle=function(e){return typeof jQuery!==strundefined&&(!e||jQuery.event.triggered!==e.type)?jQuery.event.dispatch.apply(eventHandle.elem,arguments):undefined;};eventHandle.elem=elem;}
-types=(types||"").match(rnotwhite)||[""];t=types.length;while(t--){tmp=rtypenamespace.exec(types[t])||[];type=origType=tmp[1];namespaces=(tmp[2]||"").split(".").sort();if(!type){continue;}
-special=jQuery.event.special[type]||{};type=(selector?special.delegateType:special.bindType)||type;special=jQuery.event.special[type]||{};handleObj=jQuery.extend({type:type,origType:origType,data:data,handler:handler,guid:handler.guid,selector:selector,needsContext:selector&&jQuery.expr.match.needsContext.test(selector),namespace:namespaces.join(".")},handleObjIn);if(!(handlers=events[type])){handlers=events[type]=[];handlers.delegateCount=0;if(!special.setup||special.setup.call(elem,data,namespaces,eventHandle)===false){if(elem.addEventListener){elem.addEventListener(type,eventHandle,false);}else if(elem.attachEvent){elem.attachEvent("on"+type,eventHandle);}}}
-if(special.add){special.add.call(elem,handleObj);if(!handleObj.handler.guid){handleObj.handler.guid=handler.guid;}}
-if(selector){handlers.splice(handlers.delegateCount++,0,handleObj);}else{handlers.push(handleObj);}
-jQuery.event.global[type]=true;}
-elem=null;},remove:function(elem,types,handler,selector,mappedTypes){var j,handleObj,tmp,origCount,t,events,special,handlers,type,namespaces,origType,elemData=jQuery.hasData(elem)&&jQuery._data(elem);if(!elemData||!(events=elemData.events)){return;}
-types=(types||"").match(rnotwhite)||[""];t=types.length;while(t--){tmp=rtypenamespace.exec(types[t])||[];type=origType=tmp[1];namespaces=(tmp[2]||"").split(".").sort();if(!type){for(type in events){jQuery.event.remove(elem,type+types[t],handler,selector,true);}
-continue;}
-special=jQuery.event.special[type]||{};type=(selector?special.delegateType:special.bindType)||type;handlers=events[type]||[];tmp=tmp[2]&&new RegExp("(^|\\.)"+namespaces.join("\\.(?:.*\\.|)")+"(\\.|$)");origCount=j=handlers.length;while(j--){handleObj=handlers[j];if((mappedTypes||origType===handleObj.origType)&&(!handler||handler.guid===handleObj.guid)&&(!tmp||tmp.test(handleObj.namespace))&&(!selector||selector===handleObj.selector||selector==="**"&&handleObj.selector)){handlers.splice(j,1);if(handleObj.selector){handlers.delegateCount--;}
-if(special.remove){special.remove.call(elem,handleObj);}}}
-if(origCount&&!handlers.length){if(!special.teardown||special.teardown.call(elem,namespaces,elemData.handle)===false){jQuery.removeEvent(elem,type,elemData.handle);}
-delete events[type];}}
-if(jQuery.isEmptyObject(events)){delete elemData.handle;jQuery._removeData(elem,"events");}},trigger:function(event,data,elem,onlyHandlers){var handle,ontype,cur,bubbleType,special,tmp,i,eventPath=[elem||document],type=hasOwn.call(event,"type")?event.type:event,namespaces=hasOwn.call(event,"namespace")?event.namespace.split("."):[];cur=tmp=elem=elem||document;if(elem.nodeType===3||elem.nodeType===8){return;}
-if(rfocusMorph.test(type+jQuery.event.triggered)){return;}
-if(type.indexOf(".")>=0){namespaces=type.split(".");type=namespaces.shift();namespaces.sort();}
-ontype=type.indexOf(":")<0&&"on"+type;event=event[jQuery.expando]?event:new jQuery.Event(type,typeof event==="object"&&event);event.isTrigger=onlyHandlers?2:3;event.namespace=namespaces.join(".");event.namespace_re=event.namespace?new RegExp("(^|\\.)"+namespaces.join("\\.(?:.*\\.|)")+"(\\.|$)"):null;event.result=undefined;if(!event.target){event.target=elem;}
-data=data==null?[event]:jQuery.makeArray(data,[event]);special=jQuery.event.special[type]||{};if(!onlyHandlers&&special.trigger&&special.trigger.apply(elem,data)===false){return;}
-if(!onlyHandlers&&!special.noBubble&&!jQuery.isWindow(elem)){bubbleType=special.delegateType||type;if(!rfocusMorph.test(bubbleType+type)){cur=cur.parentNode;}
-for(;cur;cur=cur.parentNode){eventPath.push(cur);tmp=cur;}
-if(tmp===(elem.ownerDocument||document)){eventPath.push(tmp.defaultView||tmp.parentWindow||window);}}
-i=0;while((cur=eventPath[i++])&&!event.isPropagationStopped()){event.type=i>1?bubbleType:special.bindType||type;handle=(jQuery._data(cur,"events")||{})[event.type]&&jQuery._data(cur,"handle");if(handle){handle.apply(cur,data);}
-handle=ontype&&cur[ontype];if(handle&&handle.apply&&jQuery.acceptData(cur)){event.result=handle.apply(cur,data);if(event.result===false){event.preventDefault();}}}
-event.type=type;if(!onlyHandlers&&!event.isDefaultPrevented()){if((!special._default||special._default.apply(eventPath.pop(),data)===false)&&jQuery.acceptData(elem)){if(ontype&&elem[type]&&!jQuery.isWindow(elem)){tmp=elem[ontype];if(tmp){elem[ontype]=null;}
-jQuery.event.triggered=type;try{elem[type]();}catch(e){}
-jQuery.event.triggered=undefined;if(tmp){elem[ontype]=tmp;}}}}
-return event.result;},dispatch:function(event){event=jQuery.event.fix(event);var i,ret,handleObj,matched,j,handlerQueue=[],args=slice.call(arguments),handlers=(jQuery._data(this,"events")||{})[event.type]||[],special=jQuery.event.special[event.type]||{};args[0]=event;event.delegateTarget=this;if(special.preDispatch&&special.preDispatch.call(this,event)===false){return;}
-handlerQueue=jQuery.event.handlers.call(this,event,handlers);i=0;while((matched=handlerQueue[i++])&&!event.isPropagationStopped()){event.currentTarget=matched.elem;j=0;while((handleObj=matched.handlers[j++])&&!event.isImmediatePropagationStopped()){if(!event.namespace_re||event.namespace_re.test(handleObj.namespace)){event.handleObj=handleObj;event.data=handleObj.data;ret=((jQuery.event.special[handleObj.origType]||{}).handle||handleObj.handler).apply(matched.elem,args);if(ret!==undefined){if((event.result=ret)===false){event.preventDefault();event.stopPropagation();}}}}}
-if(special.postDispatch){special.postDispatch.call(this,event);}
-return event.result;},handlers:function(event,handlers){var sel,handleObj,matches,i,handlerQueue=[],delegateCount=handlers.delegateCount,cur=event.target;if(delegateCount&&cur.nodeType&&(!event.button||event.type!=="click")){for(;cur!=this;cur=cur.parentNode||this){if(cur.nodeType===1&&(cur.disabled!==true||event.type!=="click")){matches=[];for(i=0;i<delegateCount;i++){handleObj=handlers[i];sel=handleObj.selector+" ";if(matches[sel]===undefined){matches[sel]=handleObj.needsContext?jQuery(sel,this).index(cur)>=0:jQuery.find(sel,this,null,[cur]).length;}
-if(matches[sel]){matches.push(handleObj);}}
-if(matches.length){handlerQueue.push({elem:cur,handlers:matches});}}}}
-if(delegateCount<handlers.length){handlerQueue.push({elem:this,handlers:handlers.slice(delegateCount)});}
-return handlerQueue;},fix:function(event){if(event[jQuery.expando]){return event;}
-var i,prop,copy,type=event.type,originalEvent=event,fixHook=this.fixHooks[type];if(!fixHook){this.fixHooks[type]=fixHook=rmouseEvent.test(type)?this.mouseHooks:rkeyEvent.test(type)?this.keyHooks:{};}
-copy=fixHook.props?this.props.concat(fixHook.props):this.props;event=new jQuery.Event(originalEvent);i=copy.length;while(i--){prop=copy[i];event[prop]=originalEvent[prop];}
-if(!event.target){event.target=originalEvent.srcElement||document;}
-if(event.target.nodeType===3){event.target=event.target.parentNode;}
-event.metaKey=!!event.metaKey;return fixHook.filter?fixHook.filter(event,originalEvent):event;},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(event,original){if(event.which==null){event.which=original.charCode!=null?original.charCode:original.keyCode;}
-return event;}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(event,original){var body,eventDoc,doc,button=original.button,fromElement=original.fromElement;if(event.pageX==null&&original.clientX!=null){eventDoc=event.target.ownerDocument||document;doc=eventDoc.documentElement;body=eventDoc.body;event.pageX=original.clientX+(doc&&doc.scrollLeft||body&&body.scrollLeft||0)-(doc&&doc.clientLeft||body&&body.clientLeft||0);event.pageY=original.clientY+(doc&&doc.scrollTop||body&&body.scrollTop||0)-(doc&&doc.clientTop||body&&body.clientTop||0);}
-if(!event.relatedTarget&&fromElement){event.relatedTarget=fromElement===event.target?original.toElement:fromElement;}
-if(!event.which&&button!==undefined){event.which=(button&1?1:(button&2?3:(button&4?2:0)));}
-return event;}},special:{load:{noBubble:true},focus:{trigger:function(){if(this!==safeActiveElement()&&this.focus){try{this.focus();return false;}catch(e){}}},delegateType:"focusin"},blur:{trigger:function(){if(this===safeActiveElement()&&this.blur){this.blur();return false;}},delegateType:"focusout"},click:{trigger:function(){if(jQuery.nodeName(this,"input")&&this.type==="checkbox"&&this.click){this.click();return false;}},_default:function(event){return jQuery.nodeName(event.target,"a");}},beforeunload:{postDispatch:function(event){if(event.result!==undefined&&event.originalEvent){event.originalEvent.returnValue=event.result;}}}},simulate:function(type,elem,event,bubble){var e=jQuery.extend(new jQuery.Event(),event,{type:type,isSimulated:true,originalEvent:{}});if(bubble){jQuery.event.trigger(e,null,elem);}else{jQuery.event.dispatch.call(elem,e);}
-if(e.isDefaultPrevented()){event.preventDefault();}}};jQuery.removeEvent=document.removeEventListener?function(elem,type,handle){if(elem.removeEventListener){elem.removeEventListener(type,handle,false);}}:function(elem,type,handle){var name="on"+type;if(elem.detachEvent){if(typeof elem[name]===strundefined){elem[name]=null;}
-elem.detachEvent(name,handle);}};jQuery.Event=function(src,props){if(!(this instanceof jQuery.Event)){return new jQuery.Event(src,props);}
-if(src&&src.type){this.originalEvent=src;this.type=src.type;this.isDefaultPrevented=src.defaultPrevented||src.defaultPrevented===undefined&&src.returnValue===false?returnTrue:returnFalse;}else{this.type=src;}
-if(props){jQuery.extend(this,props);}
-this.timeStamp=src&&src.timeStamp||jQuery.now();this[jQuery.expando]=true;};jQuery.Event.prototype={isDefaultPrevented:returnFalse,isPropagationStopped:returnFalse,isImmediatePropagationStopped:returnFalse,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=returnTrue;if(!e){return;}
-if(e.preventDefault){e.preventDefault();}else{e.returnValue=false;}},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=returnTrue;if(!e){return;}
-if(e.stopPropagation){e.stopPropagation();}
-e.cancelBubble=true;},stopImmediatePropagation:function(){var e=this.originalEvent;this.isImmediatePropagationStopped=returnTrue;if(e&&e.stopImmediatePropagation){e.stopImmediatePropagation();}
-this.stopPropagation();}};jQuery.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(orig,fix){jQuery.event.special[orig]={delegateType:fix,bindType:fix,handle:function(event){var ret,target=this,related=event.relatedTarget,handleObj=event.handleObj;if(!related||(related!==target&&!jQuery.contains(target,related))){event.type=handleObj.origType;ret=handleObj.handler.apply(this,arguments);event.type=fix;}
-return ret;}};});if(!support.submitBubbles){jQuery.event.special.submit={setup:function(){if(jQuery.nodeName(this,"form")){return false;}
-jQuery.event.add(this,"click._submit keypress._submit",function(e){var elem=e.target,form=jQuery.nodeName(elem,"input")||jQuery.nodeName(elem,"button")?elem.form:undefined;if(form&&!jQuery._data(form,"submitBubbles")){jQuery.event.add(form,"submit._submit",function(event){event._submit_bubble=true;});jQuery._data(form,"submitBubbles",true);}});},postDispatch:function(event){if(event._submit_bubble){delete event._submit_bubble;if(this.parentNode&&!event.isTrigger){jQuery.event.simulate("submit",this.parentNode,event,true);}}},teardown:function(){if(jQuery.nodeName(this,"form")){return false;}
-jQuery.event.remove(this,"._submit");}};}
-if(!support.changeBubbles){jQuery.event.special.change={setup:function(){if(rformElems.test(this.nodeName)){if(this.type==="checkbox"||this.type==="radio"){jQuery.event.add(this,"propertychange._change",function(event){if(event.originalEvent.propertyName==="checked"){this._just_changed=true;}});jQuery.event.add(this,"click._change",function(event){if(this._just_changed&&!event.isTrigger){this._just_changed=false;}
-jQuery.event.simulate("change",this,event,true);});}
-return false;}
-jQuery.event.add(this,"beforeactivate._change",function(e){var elem=e.target;if(rformElems.test(elem.nodeName)&&!jQuery._data(elem,"changeBubbles")){jQuery.event.add(elem,"change._change",function(event){if(this.parentNode&&!event.isSimulated&&!event.isTrigger){jQuery.event.simulate("change",this.parentNode,event,true);}});jQuery._data(elem,"changeBubbles",true);}});},handle:function(event){var elem=event.target;if(this!==elem||event.isSimulated||event.isTrigger||(elem.type!=="radio"&&elem.type!=="checkbox")){return event.handleObj.handler.apply(this,arguments);}},teardown:function(){jQuery.event.remove(this,"._change");return!rformElems.test(this.nodeName);}};}
-if(!support.focusinBubbles){jQuery.each({focus:"focusin",blur:"focusout"},function(orig,fix){var handler=function(event){jQuery.event.simulate(fix,event.target,jQuery.event.fix(event),true);};jQuery.event.special[fix]={setup:function(){var doc=this.ownerDocument||this,attaches=jQuery._data(doc,fix);if(!attaches){doc.addEventListener(orig,handler,true);}
-jQuery._data(doc,fix,(attaches||0)+1);},teardown:function(){var doc=this.ownerDocument||this,attaches=jQuery._data(doc,fix)-1;if(!attaches){doc.removeEventListener(orig,handler,true);jQuery._removeData(doc,fix);}else{jQuery._data(doc,fix,attaches);}}};});}
-jQuery.fn.extend({on:function(types,selector,data,fn,one){var type,origFn;if(typeof types==="object"){if(typeof selector!=="string"){data=data||selector;selector=undefined;}
-for(type in types){this.on(type,selector,data,types[type],one);}
-return this;}
-if(data==null&&fn==null){fn=selector;data=selector=undefined;}else if(fn==null){if(typeof selector==="string"){fn=data;data=undefined;}else{fn=data;data=selector;selector=undefined;}}
-if(fn===false){fn=returnFalse;}else if(!fn){return this;}
-if(one===1){origFn=fn;fn=function(event){jQuery().off(event);return origFn.apply(this,arguments);};fn.guid=origFn.guid||(origFn.guid=jQuery.guid++);}
-return this.each(function(){jQuery.event.add(this,types,fn,data,selector);});},one:function(types,selector,data,fn){return this.on(types,selector,data,fn,1);},off:function(types,selector,fn){var handleObj,type;if(types&&types.preventDefault&&types.handleObj){handleObj=types.handleObj;jQuery(types.delegateTarget).off(handleObj.namespace?handleObj.origType+"."+handleObj.namespace:handleObj.origType,handleObj.selector,handleObj.handler);return this;}
-if(typeof types==="object"){for(type in types){this.off(type,selector,types[type]);}
-return this;}
-if(selector===false||typeof selector==="function"){fn=selector;selector=undefined;}
-if(fn===false){fn=returnFalse;}
-return this.each(function(){jQuery.event.remove(this,types,fn,selector);});},trigger:function(type,data){return this.each(function(){jQuery.event.trigger(type,data,this);});},triggerHandler:function(type,data){var elem=this[0];if(elem){return jQuery.event.trigger(type,data,elem,true);}}});function createSafeFragment(document){var list=nodeNames.split("|"),safeFrag=document.createDocumentFragment();if(safeFrag.createElement){while(list.length){safeFrag.createElement(list.pop());}}
-return safeFrag;}
-var nodeNames="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|"+"header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",rinlinejQuery=/ jQuery\d+="(?:null|\d+)"/g,rnoshimcache=new RegExp("<(?:"+nodeNames+")[\\s/>]","i"),rleadingWhitespace=/^\s+/,rxhtmlTag=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,rtagName=/<([\w:]+)/,rtbody=/<tbody/i,rhtml=/<|&#?\w+;/,rnoInnerhtml=/<(?:script|style|link)/i,rchecked=/checked\s*(?:[^=]|=\s*.checked.)/i,rscriptType=/^$|\/(?:java|ecma)script/i,rscriptTypeMasked=/^true\/(.*)/,rcleanScript=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,wrapMap={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:support.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]},safeFragment=createSafeFragment(document),fragmentDiv=safeFragment.appendChild(document.createElement("div"));wrapMap.optgroup=wrapMap.option;wrapMap.tbody=wrapMap.tfoot=wrapMap.colgroup=wrapMap.caption=wrapMap.thead;wrapMap.th=wrapMap.td;function getAll(context,tag){var elems,elem,i=0,found=typeof context.getElementsByTagName!==strundefined?context.getElementsByTagName(tag||"*"):typeof context.querySelectorAll!==strundefined?context.querySelectorAll(tag||"*"):undefined;if(!found){for(found=[],elems=context.childNodes||context;(elem=elems[i])!=null;i++){if(!tag||jQuery.nodeName(elem,tag)){found.push(elem);}else{jQuery.merge(found,getAll(elem,tag));}}}
-return tag===undefined||tag&&jQuery.nodeName(context,tag)?jQuery.merge([context],found):found;}
-function fixDefaultChecked(elem){if(rcheckableType.test(elem.type)){elem.defaultChecked=elem.checked;}}
-function manipulationTarget(elem,content){return jQuery.nodeName(elem,"table")&&jQuery.nodeName(content.nodeType!==11?content:content.firstChild,"tr")?elem.getElementsByTagName("tbody")[0]||elem.appendChild(elem.ownerDocument.createElement("tbody")):elem;}
-function disableScript(elem){elem.type=(jQuery.find.attr(elem,"type")!==null)+"/"+elem.type;return elem;}
-function restoreScript(elem){var match=rscriptTypeMasked.exec(elem.type);if(match){elem.type=match[1];}else{elem.removeAttribute("type");}
-return elem;}
-function setGlobalEval(elems,refElements){var elem,i=0;for(;(elem=elems[i])!=null;i++){jQuery._data(elem,"globalEval",!refElements||jQuery._data(refElements[i],"globalEval"));}}
-function cloneCopyEvent(src,dest){if(dest.nodeType!==1||!jQuery.hasData(src)){return;}
-var type,i,l,oldData=jQuery._data(src),curData=jQuery._data(dest,oldData),events=oldData.events;if(events){delete curData.handle;curData.events={};for(type in events){for(i=0,l=events[type].length;i<l;i++){jQuery.event.add(dest,type,events[type][i]);}}}
-if(curData.data){curData.data=jQuery.extend({},curData.data);}}
-function fixCloneNodeIssues(src,dest){var nodeName,e,data;if(dest.nodeType!==1){return;}
-nodeName=dest.nodeName.toLowerCase();if(!support.noCloneEvent&&dest[jQuery.expando]){data=jQuery._data(dest);for(e in data.events){jQuery.removeEvent(dest,e,data.handle);}
-dest.removeAttribute(jQuery.expando);}
-if(nodeName==="script"&&dest.text!==src.text){disableScript(dest).text=src.text;restoreScript(dest);}else if(nodeName==="object"){if(dest.parentNode){dest.outerHTML=src.outerHTML;}
-if(support.html5Clone&&(src.innerHTML&&!jQuery.trim(dest.innerHTML))){dest.innerHTML=src.innerHTML;}}else if(nodeName==="input"&&rcheckableType.test(src.type)){dest.defaultChecked=dest.checked=src.checked;if(dest.value!==src.value){dest.value=src.value;}}else if(nodeName==="option"){dest.defaultSelected=dest.selected=src.defaultSelected;}else if(nodeName==="input"||nodeName==="textarea"){dest.defaultValue=src.defaultValue;}}
-jQuery.extend({clone:function(elem,dataAndEvents,deepDataAndEvents){var destElements,node,clone,i,srcElements,inPage=jQuery.contains(elem.ownerDocument,elem);if(support.html5Clone||jQuery.isXMLDoc(elem)||!rnoshimcache.test("<"+elem.nodeName+">")){clone=elem.cloneNode(true);}else{fragmentDiv.innerHTML=elem.outerHTML;fragmentDiv.removeChild(clone=fragmentDiv.firstChild);}
-if((!support.noCloneEvent||!support.noCloneChecked)&&(elem.nodeType===1||elem.nodeType===11)&&!jQuery.isXMLDoc(elem)){destElements=getAll(clone);srcElements=getAll(elem);for(i=0;(node=srcElements[i])!=null;++i){if(destElements[i]){fixCloneNodeIssues(node,destElements[i]);}}}
-if(dataAndEvents){if(deepDataAndEvents){srcElements=srcElements||getAll(elem);destElements=destElements||getAll(clone);for(i=0;(node=srcElements[i])!=null;i++){cloneCopyEvent(node,destElements[i]);}}else{cloneCopyEvent(elem,clone);}}
-destElements=getAll(clone,"script");if(destElements.length>0){setGlobalEval(destElements,!inPage&&getAll(elem,"script"));}
-destElements=srcElements=node=null;return clone;},buildFragment:function(elems,context,scripts,selection){var j,elem,contains,tmp,tag,tbody,wrap,l=elems.length,safe=createSafeFragment(context),nodes=[],i=0;for(;i<l;i++){elem=elems[i];if(elem||elem===0){if(jQuery.type(elem)==="object"){jQuery.merge(nodes,elem.nodeType?[elem]:elem);}else if(!rhtml.test(elem)){nodes.push(context.createTextNode(elem));}else{tmp=tmp||safe.appendChild(context.createElement("div"));tag=(rtagName.exec(elem)||["",""])[1].toLowerCase();wrap=wrapMap[tag]||wrapMap._default;tmp.innerHTML=wrap[1]+elem.replace(rxhtmlTag,"<$1></$2>")+wrap[2];j=wrap[0];while(j--){tmp=tmp.lastChild;}
-if(!support.leadingWhitespace&&rleadingWhitespace.test(elem)){nodes.push(context.createTextNode(rleadingWhitespace.exec(elem)[0]));}
-if(!support.tbody){elem=tag==="table"&&!rtbody.test(elem)?tmp.firstChild:wrap[1]==="<table>"&&!rtbody.test(elem)?tmp:0;j=elem&&elem.childNodes.length;while(j--){if(jQuery.nodeName((tbody=elem.childNodes[j]),"tbody")&&!tbody.childNodes.length){elem.removeChild(tbody);}}}
-jQuery.merge(nodes,tmp.childNodes);tmp.textContent="";while(tmp.firstChild){tmp.removeChild(tmp.firstChild);}
-tmp=safe.lastChild;}}}
-if(tmp){safe.removeChild(tmp);}
-if(!support.appendChecked){jQuery.grep(getAll(nodes,"input"),fixDefaultChecked);}
-i=0;while((elem=nodes[i++])){if(selection&&jQuery.inArray(elem,selection)!==-1){continue;}
-contains=jQuery.contains(elem.ownerDocument,elem);tmp=getAll(safe.appendChild(elem),"script");if(contains){setGlobalEval(tmp);}
-if(scripts){j=0;while((elem=tmp[j++])){if(rscriptType.test(elem.type||"")){scripts.push(elem);}}}}
-tmp=null;return safe;},cleanData:function(elems,acceptData){var elem,type,id,data,i=0,internalKey=jQuery.expando,cache=jQuery.cache,deleteExpando=support.deleteExpando,special=jQuery.event.special;for(;(elem=elems[i])!=null;i++){if(acceptData||jQuery.acceptData(elem)){id=elem[internalKey];data=id&&cache[id];if(data){if(data.events){for(type in data.events){if(special[type]){jQuery.event.remove(elem,type);}else{jQuery.removeEvent(elem,type,data.handle);}}}
-if(cache[id]){delete cache[id];if(deleteExpando){delete elem[internalKey];}else if(typeof elem.removeAttribute!==strundefined){elem.removeAttribute(internalKey);}else{elem[internalKey]=null;}
-deletedIds.push(id);}}}}}});jQuery.fn.extend({text:function(value){return access(this,function(value){return value===undefined?jQuery.text(this):this.empty().append((this[0]&&this[0].ownerDocument||document).createTextNode(value));},null,value,arguments.length);},append:function(){return this.domManip(arguments,function(elem){if(this.nodeType===1||this.nodeType===11||this.nodeType===9){var target=manipulationTarget(this,elem);target.appendChild(elem);}});},prepend:function(){return this.domManip(arguments,function(elem){if(this.nodeType===1||this.nodeType===11||this.nodeType===9){var target=manipulationTarget(this,elem);target.insertBefore(elem,target.firstChild);}});},before:function(){return this.domManip(arguments,function(elem){if(this.parentNode){this.parentNode.insertBefore(elem,this);}});},after:function(){return this.domManip(arguments,function(elem){if(this.parentNode){this.parentNode.insertBefore(elem,this.nextSibling);}});},remove:function(selector,keepData){var elem,elems=selector?jQuery.filter(selector,this):this,i=0;for(;(elem=elems[i])!=null;i++){if(!keepData&&elem.nodeType===1){jQuery.cleanData(getAll(elem));}
-if(elem.parentNode){if(keepData&&jQuery.contains(elem.ownerDocument,elem)){setGlobalEval(getAll(elem,"script"));}
-elem.parentNode.removeChild(elem);}}
-return this;},empty:function(){var elem,i=0;for(;(elem=this[i])!=null;i++){if(elem.nodeType===1){jQuery.cleanData(getAll(elem,false));}
-while(elem.firstChild){elem.removeChild(elem.firstChild);}
-if(elem.options&&jQuery.nodeName(elem,"select")){elem.options.length=0;}}
-return this;},clone:function(dataAndEvents,deepDataAndEvents){dataAndEvents=dataAndEvents==null?false:dataAndEvents;deepDataAndEvents=deepDataAndEvents==null?dataAndEvents:deepDataAndEvents;return this.map(function(){return jQuery.clone(this,dataAndEvents,deepDataAndEvents);});},html:function(value){return access(this,function(value){var elem=this[0]||{},i=0,l=this.length;if(value===undefined){return elem.nodeType===1?elem.innerHTML.replace(rinlinejQuery,""):undefined;}
-if(typeof value==="string"&&!rnoInnerhtml.test(value)&&(support.htmlSerialize||!rnoshimcache.test(value))&&(support.leadingWhitespace||!rleadingWhitespace.test(value))&&!wrapMap[(rtagName.exec(value)||["",""])[1].toLowerCase()]){value=value.replace(rxhtmlTag,"<$1></$2>");try{for(;i<l;i++){elem=this[i]||{};if(elem.nodeType===1){jQuery.cleanData(getAll(elem,false));elem.innerHTML=value;}}
-elem=0;}catch(e){}}
-if(elem){this.empty().append(value);}},null,value,arguments.length);},replaceWith:function(){var arg=arguments[0];this.domManip(arguments,function(elem){arg=this.parentNode;jQuery.cleanData(getAll(this));if(arg){arg.replaceChild(elem,this);}});return arg&&(arg.length||arg.nodeType)?this:this.remove();},detach:function(selector){return this.remove(selector,true);},domManip:function(args,callback){args=concat.apply([],args);var first,node,hasScripts,scripts,doc,fragment,i=0,l=this.length,set=this,iNoClone=l-1,value=args[0],isFunction=jQuery.isFunction(value);if(isFunction||(l>1&&typeof value==="string"&&!support.checkClone&&rchecked.test(value))){return this.each(function(index){var self=set.eq(index);if(isFunction){args[0]=value.call(this,index,self.html());}
-self.domManip(args,callback);});}
-if(l){fragment=jQuery.buildFragment(args,this[0].ownerDocument,false,this);first=fragment.firstChild;if(fragment.childNodes.length===1){fragment=first;}
-if(first){scripts=jQuery.map(getAll(fragment,"script"),disableScript);hasScripts=scripts.length;for(;i<l;i++){node=fragment;if(i!==iNoClone){node=jQuery.clone(node,true,true);if(hasScripts){jQuery.merge(scripts,getAll(node,"script"));}}
-callback.call(this[i],node,i);}
-if(hasScripts){doc=scripts[scripts.length-1].ownerDocument;jQuery.map(scripts,restoreScript);for(i=0;i<hasScripts;i++){node=scripts[i];if(rscriptType.test(node.type||"")&&!jQuery._data(node,"globalEval")&&jQuery.contains(doc,node)){if(node.src){if(jQuery._evalUrl){jQuery._evalUrl(node.src);}}else{jQuery.globalEval((node.text||node.textContent||node.innerHTML||"").replace(rcleanScript,""));}}}}
-fragment=first=null;}}
-return this;}});jQuery.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(name,original){jQuery.fn[name]=function(selector){var elems,i=0,ret=[],insert=jQuery(selector),last=insert.length-1;for(;i<=last;i++){elems=i===last?this:this.clone(true);jQuery(insert[i])[original](elems);push.apply(ret,elems.get());}
-return this.pushStack(ret);};});var iframe,elemdisplay={};function actualDisplay(name,doc){var style,elem=jQuery(doc.createElement(name)).appendTo(doc.body),display=window.getDefaultComputedStyle&&(style=window.getDefaultComputedStyle(elem[0]))?style.display:jQuery.css(elem[0],"display");elem.detach();return display;}
-function defaultDisplay(nodeName){var doc=document,display=elemdisplay[nodeName];if(!display){display=actualDisplay(nodeName,doc);if(display==="none"||!display){iframe=(iframe||jQuery("<iframe frameborder='0' width='0' height='0'/>")).appendTo(doc.documentElement);doc=(iframe[0].contentWindow||iframe[0].contentDocument).document;doc.write();doc.close();display=actualDisplay(nodeName,doc);iframe.detach();}
-elemdisplay[nodeName]=display;}
-return display;}
-(function(){var shrinkWrapBlocksVal;support.shrinkWrapBlocks=function(){if(shrinkWrapBlocksVal!=null){return shrinkWrapBlocksVal;}
-shrinkWrapBlocksVal=false;var div,body,container;body=document.getElementsByTagName("body")[0];if(!body||!body.style){return;}
-div=document.createElement("div");container=document.createElement("div");container.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px";body.appendChild(container).appendChild(div);if(typeof div.style.zoom!==strundefined){div.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;"+"box-sizing:content-box;display:block;margin:0;border:0;"+"padding:1px;width:1px;zoom:1";div.appendChild(document.createElement("div")).style.width="5px";shrinkWrapBlocksVal=div.offsetWidth!==3;}
-body.removeChild(container);return shrinkWrapBlocksVal;};})();var rmargin=(/^margin/);var rnumnonpx=new RegExp("^("+pnum+")(?!px)[a-z%]+$","i");var getStyles,curCSS,rposition=/^(top|right|bottom|left)$/;if(window.getComputedStyle){getStyles=function(elem){return elem.ownerDocument.defaultView.getComputedStyle(elem,null);};curCSS=function(elem,name,computed){var width,minWidth,maxWidth,ret,style=elem.style;computed=computed||getStyles(elem);ret=computed?computed.getPropertyValue(name)||computed[name]:undefined;if(computed){if(ret===""&&!jQuery.contains(elem.ownerDocument,elem)){ret=jQuery.style(elem,name);}
-if(rnumnonpx.test(ret)&&rmargin.test(name)){width=style.width;minWidth=style.minWidth;maxWidth=style.maxWidth;style.minWidth=style.maxWidth=style.width=ret;ret=computed.width;style.width=width;style.minWidth=minWidth;style.maxWidth=maxWidth;}}
-return ret===undefined?ret:ret+"";};}else if(document.documentElement.currentStyle){getStyles=function(elem){return elem.currentStyle;};curCSS=function(elem,name,computed){var left,rs,rsLeft,ret,style=elem.style;computed=computed||getStyles(elem);ret=computed?computed[name]:undefined;if(ret==null&&style&&style[name]){ret=style[name];}
-if(rnumnonpx.test(ret)&&!rposition.test(name)){left=style.left;rs=elem.runtimeStyle;rsLeft=rs&&rs.left;if(rsLeft){rs.left=elem.currentStyle.left;}
-style.left=name==="fontSize"?"1em":ret;ret=style.pixelLeft+"px";style.left=left;if(rsLeft){rs.left=rsLeft;}}
-return ret===undefined?ret:ret+""||"auto";};}
-function addGetHookIf(conditionFn,hookFn){return{get:function(){var condition=conditionFn();if(condition==null){return;}
-if(condition){delete this.get;return;}
-return(this.get=hookFn).apply(this,arguments);}};}
-(function(){var div,style,a,pixelPositionVal,boxSizingReliableVal,reliableHiddenOffsetsVal,reliableMarginRightVal;div=document.createElement("div");div.innerHTML=" <link/><table></table><a href='/a'>a</a><input type='checkbox'/>";a=div.getElementsByTagName("a")[0];style=a&&a.style;if(!style){return;}
-style.cssText="float:left;opacity:.5";support.opacity=style.opacity==="0.5";support.cssFloat=!!style.cssFloat;div.style.backgroundClip="content-box";div.cloneNode(true).style.backgroundClip="";support.clearCloneStyle=div.style.backgroundClip==="content-box";support.boxSizing=style.boxSizing===""||style.MozBoxSizing===""||style.WebkitBoxSizing==="";jQuery.extend(support,{reliableHiddenOffsets:function(){if(reliableHiddenOffsetsVal==null){computeStyleTests();}
-return reliableHiddenOffsetsVal;},boxSizingReliable:function(){if(boxSizingReliableVal==null){computeStyleTests();}
-return boxSizingReliableVal;},pixelPosition:function(){if(pixelPositionVal==null){computeStyleTests();}
-return pixelPositionVal;},reliableMarginRight:function(){if(reliableMarginRightVal==null){computeStyleTests();}
-return reliableMarginRightVal;}});function computeStyleTests(){var div,body,container,contents;body=document.getElementsByTagName("body")[0];if(!body||!body.style){return;}
-div=document.createElement("div");container=document.createElement("div");container.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px";body.appendChild(container).appendChild(div);div.style.cssText="-webkit-box-sizing:border-box;-moz-box-sizing:border-box;"+"box-sizing:border-box;display:block;margin-top:1%;top:1%;"+"border:1px;padding:1px;width:4px;position:absolute";pixelPositionVal=boxSizingReliableVal=false;reliableMarginRightVal=true;if(window.getComputedStyle){pixelPositionVal=(window.getComputedStyle(div,null)||{}).top!=="1%";boxSizingReliableVal=(window.getComputedStyle(div,null)||{width:"4px"}).width==="4px";contents=div.appendChild(document.createElement("div"));contents.style.cssText=div.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;"+"box-sizing:content-box;display:block;margin:0;border:0;padding:0";contents.style.marginRight=contents.style.width="0";div.style.width="1px";reliableMarginRightVal=!parseFloat((window.getComputedStyle(contents,null)||{}).marginRight);}
-div.innerHTML="<table><tr><td></td><td>t</td></tr></table>";contents=div.getElementsByTagName("td");contents[0].style.cssText="margin:0;border:0;padding:0;display:none";reliableHiddenOffsetsVal=contents[0].offsetHeight===0;if(reliableHiddenOffsetsVal){contents[0].style.display="";contents[1].style.display="none";reliableHiddenOffsetsVal=contents[0].offsetHeight===0;}
-body.removeChild(container);}})();jQuery.swap=function(elem,options,callback,args){var ret,name,old={};for(name in options){old[name]=elem.style[name];elem.style[name]=options[name];}
-ret=callback.apply(elem,args||[]);for(name in options){elem.style[name]=old[name];}
-return ret;};var
-ralpha=/alpha\([^)]*\)/i,ropacity=/opacity\s*=\s*([^)]*)/,rdisplayswap=/^(none|table(?!-c[ea]).+)/,rnumsplit=new RegExp("^("+pnum+")(.*)$","i"),rrelNum=new RegExp("^([+-])=("+pnum+")","i"),cssShow={position:"absolute",visibility:"hidden",display:"block"},cssNormalTransform={letterSpacing:"0",fontWeight:"400"},cssPrefixes=["Webkit","O","Moz","ms"];function vendorPropName(style,name){if(name in style){return name;}
-var capName=name.charAt(0).toUpperCase()+name.slice(1),origName=name,i=cssPrefixes.length;while(i--){name=cssPrefixes[i]+capName;if(name in style){return name;}}
-return origName;}
-function showHide(elements,show){var display,elem,hidden,values=[],index=0,length=elements.length;for(;index<length;index++){elem=elements[index];if(!elem.style){continue;}
-values[index]=jQuery._data(elem,"olddisplay");display=elem.style.display;if(show){if(!values[index]&&display==="none"){elem.style.display="";}
-if(elem.style.display===""&&isHidden(elem)){values[index]=jQuery._data(elem,"olddisplay",defaultDisplay(elem.nodeName));}}else{hidden=isHidden(elem);if(display&&display!=="none"||!hidden){jQuery._data(elem,"olddisplay",hidden?display:jQuery.css(elem,"display"));}}}
-for(index=0;index<length;index++){elem=elements[index];if(!elem.style){continue;}
-if(!show||elem.style.display==="none"||elem.style.display===""){elem.style.display=show?values[index]||"":"none";}}
-return elements;}
-function setPositiveNumber(elem,value,subtract){var matches=rnumsplit.exec(value);return matches?Math.max(0,matches[1]-(subtract||0))+(matches[2]||"px"):value;}
-function augmentWidthOrHeight(elem,name,extra,isBorderBox,styles){var i=extra===(isBorderBox?"border":"content")?4:name==="width"?1:0,val=0;for(;i<4;i+=2){if(extra==="margin"){val+=jQuery.css(elem,extra+cssExpand[i],true,styles);}
-if(isBorderBox){if(extra==="content"){val-=jQuery.css(elem,"padding"+cssExpand[i],true,styles);}
-if(extra!=="margin"){val-=jQuery.css(elem,"border"+cssExpand[i]+"Width",true,styles);}}else{val+=jQuery.css(elem,"padding"+cssExpand[i],true,styles);if(extra!=="padding"){val+=jQuery.css(elem,"border"+cssExpand[i]+"Width",true,styles);}}}
-return val;}
-function getWidthOrHeight(elem,name,extra){var valueIsBorderBox=true,val=name==="width"?elem.offsetWidth:elem.offsetHeight,styles=getStyles(elem),isBorderBox=support.boxSizing&&jQuery.css(elem,"boxSizing",false,styles)==="border-box";if(val<=0||val==null){val=curCSS(elem,name,styles);if(val<0||val==null){val=elem.style[name];}
-if(rnumnonpx.test(val)){return val;}
-valueIsBorderBox=isBorderBox&&(support.boxSizingReliable()||val===elem.style[name]);val=parseFloat(val)||0;}
-return(val+augmentWidthOrHeight(elem,name,extra||(isBorderBox?"border":"content"),valueIsBorderBox,styles))+"px";}
-jQuery.extend({cssHooks:{opacity:{get:function(elem,computed){if(computed){var ret=curCSS(elem,"opacity");return ret===""?"1":ret;}}}},cssNumber:{"columnCount":true,"fillOpacity":true,"flexGrow":true,"flexShrink":true,"fontWeight":true,"lineHeight":true,"opacity":true,"order":true,"orphans":true,"widows":true,"zIndex":true,"zoom":true},cssProps:{"float":support.cssFloat?"cssFloat":"styleFloat"},style:function(elem,name,value,extra){if(!elem||elem.nodeType===3||elem.nodeType===8||!elem.style){return;}
-var ret,type,hooks,origName=jQuery.camelCase(name),style=elem.style;name=jQuery.cssProps[origName]||(jQuery.cssProps[origName]=vendorPropName(style,origName));hooks=jQuery.cssHooks[name]||jQuery.cssHooks[origName];if(value!==undefined){type=typeof value;if(type==="string"&&(ret=rrelNum.exec(value))){value=(ret[1]+1)*ret[2]+parseFloat(jQuery.css(elem,name));type="number";}
-if(value==null||value!==value){return;}
-if(type==="number"&&!jQuery.cssNumber[origName]){value+="px";}
-if(!support.clearCloneStyle&&value===""&&name.indexOf("background")===0){style[name]="inherit";}
-if(!hooks||!("set"in hooks)||(value=hooks.set(elem,value,extra))!==undefined){try{style[name]=value;}catch(e){}}}else{if(hooks&&"get"in hooks&&(ret=hooks.get(elem,false,extra))!==undefined){return ret;}
-return style[name];}},css:function(elem,name,extra,styles){var num,val,hooks,origName=jQuery.camelCase(name);name=jQuery.cssProps[origName]||(jQuery.cssProps[origName]=vendorPropName(elem.style,origName));hooks=jQuery.cssHooks[name]||jQuery.cssHooks[origName];if(hooks&&"get"in hooks){val=hooks.get(elem,true,extra);}
-if(val===undefined){val=curCSS(elem,name,styles);}
-if(val==="normal"&&name in cssNormalTransform){val=cssNormalTransform[name];}
-if(extra===""||extra){num=parseFloat(val);return extra===true||jQuery.isNumeric(num)?num||0:val;}
-return val;}});jQuery.each(["height","width"],function(i,name){jQuery.cssHooks[name]={get:function(elem,computed,extra){if(computed){return rdisplayswap.test(jQuery.css(elem,"display"))&&elem.offsetWidth===0?jQuery.swap(elem,cssShow,function(){return getWidthOrHeight(elem,name,extra);}):getWidthOrHeight(elem,name,extra);}},set:function(elem,value,extra){var styles=extra&&getStyles(elem);return setPositiveNumber(elem,value,extra?augmentWidthOrHeight(elem,name,extra,support.boxSizing&&jQuery.css(elem,"boxSizing",false,styles)==="border-box",styles):0);}};});if(!support.opacity){jQuery.cssHooks.opacity={get:function(elem,computed){return ropacity.test((computed&&elem.currentStyle?elem.currentStyle.filter:elem.style.filter)||"")?(0.01*parseFloat(RegExp.$1))+"":computed?"1":"";},set:function(elem,value){var style=elem.style,currentStyle=elem.currentStyle,opacity=jQuery.isNumeric(value)?"alpha(opacity="+value*100+")":"",filter=currentStyle&¤tStyle.filter||style.filter||"";style.zoom=1;if((value>=1||value==="")&&jQuery.trim(filter.replace(ralpha,""))===""&&style.removeAttribute){style.removeAttribute("filter");if(value===""||currentStyle&&!currentStyle.filter){return;}}
-style.filter=ralpha.test(filter)?filter.replace(ralpha,opacity):filter+" "+opacity;}};}
-jQuery.cssHooks.marginRight=addGetHookIf(support.reliableMarginRight,function(elem,computed){if(computed){return jQuery.swap(elem,{"display":"inline-block"},curCSS,[elem,"marginRight"]);}});jQuery.each({margin:"",padding:"",border:"Width"},function(prefix,suffix){jQuery.cssHooks[prefix+suffix]={expand:function(value){var i=0,expanded={},parts=typeof value==="string"?value.split(" "):[value];for(;i<4;i++){expanded[prefix+cssExpand[i]+suffix]=parts[i]||parts[i-2]||parts[0];}
-return expanded;}};if(!rmargin.test(prefix)){jQuery.cssHooks[prefix+suffix].set=setPositiveNumber;}});jQuery.fn.extend({css:function(name,value){return access(this,function(elem,name,value){var styles,len,map={},i=0;if(jQuery.isArray(name)){styles=getStyles(elem);len=name.length;for(;i<len;i++){map[name[i]]=jQuery.css(elem,name[i],false,styles);}
-return map;}
-return value!==undefined?jQuery.style(elem,name,value):jQuery.css(elem,name);},name,value,arguments.length>1);},show:function(){return showHide(this,true);},hide:function(){return showHide(this);},toggle:function(state){if(typeof state==="boolean"){return state?this.show():this.hide();}
-return this.each(function(){if(isHidden(this)){jQuery(this).show();}else{jQuery(this).hide();}});}});function Tween(elem,options,prop,end,easing){return new Tween.prototype.init(elem,options,prop,end,easing);}
-jQuery.Tween=Tween;Tween.prototype={constructor:Tween,init:function(elem,options,prop,end,easing,unit){this.elem=elem;this.prop=prop;this.easing=easing||"swing";this.options=options;this.start=this.now=this.cur();this.end=end;this.unit=unit||(jQuery.cssNumber[prop]?"":"px");},cur:function(){var hooks=Tween.propHooks[this.prop];return hooks&&hooks.get?hooks.get(this):Tween.propHooks._default.get(this);},run:function(percent){var eased,hooks=Tween.propHooks[this.prop];if(this.options.duration){this.pos=eased=jQuery.easing[this.easing](percent,this.options.duration*percent,0,1,this.options.duration);}else{this.pos=eased=percent;}
-this.now=(this.end-this.start)*eased+this.start;if(this.options.step){this.options.step.call(this.elem,this.now,this);}
-if(hooks&&hooks.set){hooks.set(this);}else{Tween.propHooks._default.set(this);}
-return this;}};Tween.prototype.init.prototype=Tween.prototype;Tween.propHooks={_default:{get:function(tween){var result;if(tween.elem[tween.prop]!=null&&(!tween.elem.style||tween.elem.style[tween.prop]==null)){return tween.elem[tween.prop];}
-result=jQuery.css(tween.elem,tween.prop,"");return!result||result==="auto"?0:result;},set:function(tween){if(jQuery.fx.step[tween.prop]){jQuery.fx.step[tween.prop](tween);}else if(tween.elem.style&&(tween.elem.style[jQuery.cssProps[tween.prop]]!=null||jQuery.cssHooks[tween.prop])){jQuery.style(tween.elem,tween.prop,tween.now+tween.unit);}else{tween.elem[tween.prop]=tween.now;}}}};Tween.propHooks.scrollTop=Tween.propHooks.scrollLeft={set:function(tween){if(tween.elem.nodeType&&tween.elem.parentNode){tween.elem[tween.prop]=tween.now;}}};jQuery.easing={linear:function(p){return p;},swing:function(p){return 0.5-Math.cos(p*Math.PI)/2;}};jQuery.fx=Tween.prototype.init;jQuery.fx.step={};var
-fxNow,timerId,rfxtypes=/^(?:toggle|show|hide)$/,rfxnum=new RegExp("^(?:([+-])=|)("+pnum+")([a-z%]*)$","i"),rrun=/queueHooks$/,animationPrefilters=[defaultPrefilter],tweeners={"*":[function(prop,value){var tween=this.createTween(prop,value),target=tween.cur(),parts=rfxnum.exec(value),unit=parts&&parts[3]||(jQuery.cssNumber[prop]?"":"px"),start=(jQuery.cssNumber[prop]||unit!=="px"&&+target)&&rfxnum.exec(jQuery.css(tween.elem,prop)),scale=1,maxIterations=20;if(start&&start[3]!==unit){unit=unit||start[3];parts=parts||[];start=+target||1;do{scale=scale||".5";start=start/scale;jQuery.style(tween.elem,prop,start+unit);}while(scale!==(scale=tween.cur()/target)&&scale!==1&&--maxIterations);}
-if(parts){start=tween.start=+start||+target||0;tween.unit=unit;tween.end=parts[1]?start+(parts[1]+1)*parts[2]:+parts[2];}
-return tween;}]};function createFxNow(){setTimeout(function(){fxNow=undefined;});return(fxNow=jQuery.now());}
-function genFx(type,includeWidth){var which,attrs={height:type},i=0;includeWidth=includeWidth?1:0;for(;i<4;i+=2-includeWidth){which=cssExpand[i];attrs["margin"+which]=attrs["padding"+which]=type;}
-if(includeWidth){attrs.opacity=attrs.width=type;}
-return attrs;}
-function createTween(value,prop,animation){var tween,collection=(tweeners[prop]||[]).concat(tweeners["*"]),index=0,length=collection.length;for(;index<length;index++){if((tween=collection[index].call(animation,prop,value))){return tween;}}}
-function defaultPrefilter(elem,props,opts){var prop,value,toggle,tween,hooks,oldfire,display,checkDisplay,anim=this,orig={},style=elem.style,hidden=elem.nodeType&&isHidden(elem),dataShow=jQuery._data(elem,"fxshow");if(!opts.queue){hooks=jQuery._queueHooks(elem,"fx");if(hooks.unqueued==null){hooks.unqueued=0;oldfire=hooks.empty.fire;hooks.empty.fire=function(){if(!hooks.unqueued){oldfire();}};}
-hooks.unqueued++;anim.always(function(){anim.always(function(){hooks.unqueued--;if(!jQuery.queue(elem,"fx").length){hooks.empty.fire();}});});}
-if(elem.nodeType===1&&("height"in props||"width"in props)){opts.overflow=[style.overflow,style.overflowX,style.overflowY];display=jQuery.css(elem,"display");checkDisplay=display==="none"?jQuery._data(elem,"olddisplay")||defaultDisplay(elem.nodeName):display;if(checkDisplay==="inline"&&jQuery.css(elem,"float")==="none"){if(!support.inlineBlockNeedsLayout||defaultDisplay(elem.nodeName)==="inline"){style.display="inline-block";}else{style.zoom=1;}}}
-if(opts.overflow){style.overflow="hidden";if(!support.shrinkWrapBlocks()){anim.always(function(){style.overflow=opts.overflow[0];style.overflowX=opts.overflow[1];style.overflowY=opts.overflow[2];});}}
-for(prop in props){value=props[prop];if(rfxtypes.exec(value)){delete props[prop];toggle=toggle||value==="toggle";if(value===(hidden?"hide":"show")){if(value==="show"&&dataShow&&dataShow[prop]!==undefined){hidden=true;}else{continue;}}
-orig[prop]=dataShow&&dataShow[prop]||jQuery.style(elem,prop);}else{display=undefined;}}
-if(!jQuery.isEmptyObject(orig)){if(dataShow){if("hidden"in dataShow){hidden=dataShow.hidden;}}else{dataShow=jQuery._data(elem,"fxshow",{});}
-if(toggle){dataShow.hidden=!hidden;}
-if(hidden){jQuery(elem).show();}else{anim.done(function(){jQuery(elem).hide();});}
-anim.done(function(){var prop;jQuery._removeData(elem,"fxshow");for(prop in orig){jQuery.style(elem,prop,orig[prop]);}});for(prop in orig){tween=createTween(hidden?dataShow[prop]:0,prop,anim);if(!(prop in dataShow)){dataShow[prop]=tween.start;if(hidden){tween.end=tween.start;tween.start=prop==="width"||prop==="height"?1:0;}}}}else if((display==="none"?defaultDisplay(elem.nodeName):display)==="inline"){style.display=display;}}
-function propFilter(props,specialEasing){var index,name,easing,value,hooks;for(index in props){name=jQuery.camelCase(index);easing=specialEasing[name];value=props[index];if(jQuery.isArray(value)){easing=value[1];value=props[index]=value[0];}
-if(index!==name){props[name]=value;delete props[index];}
-hooks=jQuery.cssHooks[name];if(hooks&&"expand"in hooks){value=hooks.expand(value);delete props[name];for(index in value){if(!(index in props)){props[index]=value[index];specialEasing[index]=easing;}}}else{specialEasing[name]=easing;}}}
-function Animation(elem,properties,options){var result,stopped,index=0,length=animationPrefilters.length,deferred=jQuery.Deferred().always(function(){delete tick.elem;}),tick=function(){if(stopped){return false;}
-var currentTime=fxNow||createFxNow(),remaining=Math.max(0,animation.startTime+animation.duration-currentTime),temp=remaining/animation.duration||0,percent=1-temp,index=0,length=animation.tweens.length;for(;index<length;index++){animation.tweens[index].run(percent);}
-deferred.notifyWith(elem,[animation,percent,remaining]);if(percent<1&&length){return remaining;}else{deferred.resolveWith(elem,[animation]);return false;}},animation=deferred.promise({elem:elem,props:jQuery.extend({},properties),opts:jQuery.extend(true,{specialEasing:{}},options),originalProperties:properties,originalOptions:options,startTime:fxNow||createFxNow(),duration:options.duration,tweens:[],createTween:function(prop,end){var tween=jQuery.Tween(elem,animation.opts,prop,end,animation.opts.specialEasing[prop]||animation.opts.easing);animation.tweens.push(tween);return tween;},stop:function(gotoEnd){var index=0,length=gotoEnd?animation.tweens.length:0;if(stopped){return this;}
-stopped=true;for(;index<length;index++){animation.tweens[index].run(1);}
-if(gotoEnd){deferred.resolveWith(elem,[animation,gotoEnd]);}else{deferred.rejectWith(elem,[animation,gotoEnd]);}
-return this;}}),props=animation.props;propFilter(props,animation.opts.specialEasing);for(;index<length;index++){result=animationPrefilters[index].call(animation,elem,props,animation.opts);if(result){return result;}}
-jQuery.map(props,createTween,animation);if(jQuery.isFunction(animation.opts.start)){animation.opts.start.call(elem,animation);}
-jQuery.fx.timer(jQuery.extend(tick,{elem:elem,anim:animation,queue:animation.opts.queue}));return animation.progress(animation.opts.progress).done(animation.opts.done,animation.opts.complete).fail(animation.opts.fail).always(animation.opts.always);}
-jQuery.Animation=jQuery.extend(Animation,{tweener:function(props,callback){if(jQuery.isFunction(props)){callback=props;props=["*"];}else{props=props.split(" ");}
-var prop,index=0,length=props.length;for(;index<length;index++){prop=props[index];tweeners[prop]=tweeners[prop]||[];tweeners[prop].unshift(callback);}},prefilter:function(callback,prepend){if(prepend){animationPrefilters.unshift(callback);}else{animationPrefilters.push(callback);}}});jQuery.speed=function(speed,easing,fn){var opt=speed&&typeof speed==="object"?jQuery.extend({},speed):{complete:fn||!fn&&easing||jQuery.isFunction(speed)&&speed,duration:speed,easing:fn&&easing||easing&&!jQuery.isFunction(easing)&&easing};opt.duration=jQuery.fx.off?0:typeof opt.duration==="number"?opt.duration:opt.duration in jQuery.fx.speeds?jQuery.fx.speeds[opt.duration]:jQuery.fx.speeds._default;if(opt.queue==null||opt.queue===true){opt.queue="fx";}
-opt.old=opt.complete;opt.complete=function(){if(jQuery.isFunction(opt.old)){opt.old.call(this);}
-if(opt.queue){jQuery.dequeue(this,opt.queue);}};return opt;};jQuery.fn.extend({fadeTo:function(speed,to,easing,callback){return this.filter(isHidden).css("opacity",0).show().end().animate({opacity:to},speed,easing,callback);},animate:function(prop,speed,easing,callback){var empty=jQuery.isEmptyObject(prop),optall=jQuery.speed(speed,easing,callback),doAnimation=function(){var anim=Animation(this,jQuery.extend({},prop),optall);if(empty||jQuery._data(this,"finish")){anim.stop(true);}};doAnimation.finish=doAnimation;return empty||optall.queue===false?this.each(doAnimation):this.queue(optall.queue,doAnimation);},stop:function(type,clearQueue,gotoEnd){var stopQueue=function(hooks){var stop=hooks.stop;delete hooks.stop;stop(gotoEnd);};if(typeof type!=="string"){gotoEnd=clearQueue;clearQueue=type;type=undefined;}
-if(clearQueue&&type!==false){this.queue(type||"fx",[]);}
-return this.each(function(){var dequeue=true,index=type!=null&&type+"queueHooks",timers=jQuery.timers,data=jQuery._data(this);if(index){if(data[index]&&data[index].stop){stopQueue(data[index]);}}else{for(index in data){if(data[index]&&data[index].stop&&rrun.test(index)){stopQueue(data[index]);}}}
-for(index=timers.length;index--;){if(timers[index].elem===this&&(type==null||timers[index].queue===type)){timers[index].anim.stop(gotoEnd);dequeue=false;timers.splice(index,1);}}
-if(dequeue||!gotoEnd){jQuery.dequeue(this,type);}});},finish:function(type){if(type!==false){type=type||"fx";}
-return this.each(function(){var index,data=jQuery._data(this),queue=data[type+"queue"],hooks=data[type+"queueHooks"],timers=jQuery.timers,length=queue?queue.length:0;data.finish=true;jQuery.queue(this,type,[]);if(hooks&&hooks.stop){hooks.stop.call(this,true);}
-for(index=timers.length;index--;){if(timers[index].elem===this&&timers[index].queue===type){timers[index].anim.stop(true);timers.splice(index,1);}}
-for(index=0;index<length;index++){if(queue[index]&&queue[index].finish){queue[index].finish.call(this);}}
-delete data.finish;});}});jQuery.each(["toggle","show","hide"],function(i,name){var cssFn=jQuery.fn[name];jQuery.fn[name]=function(speed,easing,callback){return speed==null||typeof speed==="boolean"?cssFn.apply(this,arguments):this.animate(genFx(name,true),speed,easing,callback);};});jQuery.each({slideDown:genFx("show"),slideUp:genFx("hide"),slideToggle:genFx("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(name,props){jQuery.fn[name]=function(speed,easing,callback){return this.animate(props,speed,easing,callback);};});jQuery.timers=[];jQuery.fx.tick=function(){var timer,timers=jQuery.timers,i=0;fxNow=jQuery.now();for(;i<timers.length;i++){timer=timers[i];if(!timer()&&timers[i]===timer){timers.splice(i--,1);}}
-if(!timers.length){jQuery.fx.stop();}
-fxNow=undefined;};jQuery.fx.timer=function(timer){jQuery.timers.push(timer);if(timer()){jQuery.fx.start();}else{jQuery.timers.pop();}};jQuery.fx.interval=13;jQuery.fx.start=function(){if(!timerId){timerId=setInterval(jQuery.fx.tick,jQuery.fx.interval);}};jQuery.fx.stop=function(){clearInterval(timerId);timerId=null;};jQuery.fx.speeds={slow:600,fast:200,_default:400};jQuery.fn.delay=function(time,type){time=jQuery.fx?jQuery.fx.speeds[time]||time:time;type=type||"fx";return this.queue(type,function(next,hooks){var timeout=setTimeout(next,time);hooks.stop=function(){clearTimeout(timeout);};});};(function(){var input,div,select,a,opt;div=document.createElement("div");div.setAttribute("className","t");div.innerHTML=" <link/><table></table><a href='/a'>a</a><input type='checkbox'/>";a=div.getElementsByTagName("a")[0];select=document.createElement("select");opt=select.appendChild(document.createElement("option"));input=div.getElementsByTagName("input")[0];a.style.cssText="top:1px";support.getSetAttribute=div.className!=="t";support.style=/top/.test(a.getAttribute("style"));support.hrefNormalized=a.getAttribute("href")==="/a";support.checkOn=!!input.value;support.optSelected=opt.selected;support.enctype=!!document.createElement("form").enctype;select.disabled=true;support.optDisabled=!opt.disabled;input=document.createElement("input");input.setAttribute("value","");support.input=input.getAttribute("value")==="";input.value="t";input.setAttribute("type","radio");support.radioValue=input.value==="t";})();var rreturn=/\r/g;jQuery.fn.extend({val:function(value){var hooks,ret,isFunction,elem=this[0];if(!arguments.length){if(elem){hooks=jQuery.valHooks[elem.type]||jQuery.valHooks[elem.nodeName.toLowerCase()];if(hooks&&"get"in hooks&&(ret=hooks.get(elem,"value"))!==undefined){return ret;}
-ret=elem.value;return typeof ret==="string"?ret.replace(rreturn,""):ret==null?"":ret;}
-return;}
-isFunction=jQuery.isFunction(value);return this.each(function(i){var val;if(this.nodeType!==1){return;}
-if(isFunction){val=value.call(this,i,jQuery(this).val());}else{val=value;}
-if(val==null){val="";}else if(typeof val==="number"){val+="";}else if(jQuery.isArray(val)){val=jQuery.map(val,function(value){return value==null?"":value+"";});}
-hooks=jQuery.valHooks[this.type]||jQuery.valHooks[this.nodeName.toLowerCase()];if(!hooks||!("set"in hooks)||hooks.set(this,val,"value")===undefined){this.value=val;}});}});jQuery.extend({valHooks:{option:{get:function(elem){var val=jQuery.find.attr(elem,"value");return val!=null?val:jQuery.trim(jQuery.text(elem));}},select:{get:function(elem){var value,option,options=elem.options,index=elem.selectedIndex,one=elem.type==="select-one"||index<0,values=one?null:[],max=one?index+1:options.length,i=index<0?max:one?index:0;for(;i<max;i++){option=options[i];if((option.selected||i===index)&&(support.optDisabled?!option.disabled:option.getAttribute("disabled")===null)&&(!option.parentNode.disabled||!jQuery.nodeName(option.parentNode,"optgroup"))){value=jQuery(option).val();if(one){return value;}
-values.push(value);}}
-return values;},set:function(elem,value){var optionSet,option,options=elem.options,values=jQuery.makeArray(value),i=options.length;while(i--){option=options[i];if(jQuery.inArray(jQuery.valHooks.option.get(option),values)>=0){try{option.selected=optionSet=true;}catch(_){option.scrollHeight;}}else{option.selected=false;}}
-if(!optionSet){elem.selectedIndex=-1;}
-return options;}}}});jQuery.each(["radio","checkbox"],function(){jQuery.valHooks[this]={set:function(elem,value){if(jQuery.isArray(value)){return(elem.checked=jQuery.inArray(jQuery(elem).val(),value)>=0);}}};if(!support.checkOn){jQuery.valHooks[this].get=function(elem){return elem.getAttribute("value")===null?"on":elem.value;};}});var nodeHook,boolHook,attrHandle=jQuery.expr.attrHandle,ruseDefault=/^(?:checked|selected)$/i,getSetAttribute=support.getSetAttribute,getSetInput=support.input;jQuery.fn.extend({attr:function(name,value){return access(this,jQuery.attr,name,value,arguments.length>1);},removeAttr:function(name){return this.each(function(){jQuery.removeAttr(this,name);});}});jQuery.extend({attr:function(elem,name,value){var hooks,ret,nType=elem.nodeType;if(!elem||nType===3||nType===8||nType===2){return;}
-if(typeof elem.getAttribute===strundefined){return jQuery.prop(elem,name,value);}
-if(nType!==1||!jQuery.isXMLDoc(elem)){name=name.toLowerCase();hooks=jQuery.attrHooks[name]||(jQuery.expr.match.bool.test(name)?boolHook:nodeHook);}
-if(value!==undefined){if(value===null){jQuery.removeAttr(elem,name);}else if(hooks&&"set"in hooks&&(ret=hooks.set(elem,value,name))!==undefined){return ret;}else{elem.setAttribute(name,value+"");return value;}}else if(hooks&&"get"in hooks&&(ret=hooks.get(elem,name))!==null){return ret;}else{ret=jQuery.find.attr(elem,name);return ret==null?undefined:ret;}},removeAttr:function(elem,value){var name,propName,i=0,attrNames=value&&value.match(rnotwhite);if(attrNames&&elem.nodeType===1){while((name=attrNames[i++])){propName=jQuery.propFix[name]||name;if(jQuery.expr.match.bool.test(name)){if(getSetInput&&getSetAttribute||!ruseDefault.test(name)){elem[propName]=false;}else{elem[jQuery.camelCase("default-"+name)]=elem[propName]=false;}}else{jQuery.attr(elem,name,"");}
-elem.removeAttribute(getSetAttribute?name:propName);}}},attrHooks:{type:{set:function(elem,value){if(!support.radioValue&&value==="radio"&&jQuery.nodeName(elem,"input")){var val=elem.value;elem.setAttribute("type",value);if(val){elem.value=val;}
-return value;}}}}});boolHook={set:function(elem,value,name){if(value===false){jQuery.removeAttr(elem,name);}else if(getSetInput&&getSetAttribute||!ruseDefault.test(name)){elem.setAttribute(!getSetAttribute&&jQuery.propFix[name]||name,name);}else{elem[jQuery.camelCase("default-"+name)]=elem[name]=true;}
-return name;}};jQuery.each(jQuery.expr.match.bool.source.match(/\w+/g),function(i,name){var getter=attrHandle[name]||jQuery.find.attr;attrHandle[name]=getSetInput&&getSetAttribute||!ruseDefault.test(name)?function(elem,name,isXML){var ret,handle;if(!isXML){handle=attrHandle[name];attrHandle[name]=ret;ret=getter(elem,name,isXML)!=null?name.toLowerCase():null;attrHandle[name]=handle;}
-return ret;}:function(elem,name,isXML){if(!isXML){return elem[jQuery.camelCase("default-"+name)]?name.toLowerCase():null;}};});if(!getSetInput||!getSetAttribute){jQuery.attrHooks.value={set:function(elem,value,name){if(jQuery.nodeName(elem,"input")){elem.defaultValue=value;}else{return nodeHook&&nodeHook.set(elem,value,name);}}};}
-if(!getSetAttribute){nodeHook={set:function(elem,value,name){var ret=elem.getAttributeNode(name);if(!ret){elem.setAttributeNode((ret=elem.ownerDocument.createAttribute(name)));}
-ret.value=value+="";if(name==="value"||value===elem.getAttribute(name)){return value;}}};attrHandle.id=attrHandle.name=attrHandle.coords=function(elem,name,isXML){var ret;if(!isXML){return(ret=elem.getAttributeNode(name))&&ret.value!==""?ret.value:null;}};jQuery.valHooks.button={get:function(elem,name){var ret=elem.getAttributeNode(name);if(ret&&ret.specified){return ret.value;}},set:nodeHook.set};jQuery.attrHooks.contenteditable={set:function(elem,value,name){nodeHook.set(elem,value===""?false:value,name);}};jQuery.each(["width","height"],function(i,name){jQuery.attrHooks[name]={set:function(elem,value){if(value===""){elem.setAttribute(name,"auto");return value;}}};});}
-if(!support.style){jQuery.attrHooks.style={get:function(elem){return elem.style.cssText||undefined;},set:function(elem,value){return(elem.style.cssText=value+"");}};}
-var rfocusable=/^(?:input|select|textarea|button|object)$/i,rclickable=/^(?:a|area)$/i;jQuery.fn.extend({prop:function(name,value){return access(this,jQuery.prop,name,value,arguments.length>1);},removeProp:function(name){name=jQuery.propFix[name]||name;return this.each(function(){try{this[name]=undefined;delete this[name];}catch(e){}});}});jQuery.extend({propFix:{"for":"htmlFor","class":"className"},prop:function(elem,name,value){var ret,hooks,notxml,nType=elem.nodeType;if(!elem||nType===3||nType===8||nType===2){return;}
-notxml=nType!==1||!jQuery.isXMLDoc(elem);if(notxml){name=jQuery.propFix[name]||name;hooks=jQuery.propHooks[name];}
-if(value!==undefined){return hooks&&"set"in hooks&&(ret=hooks.set(elem,value,name))!==undefined?ret:(elem[name]=value);}else{return hooks&&"get"in hooks&&(ret=hooks.get(elem,name))!==null?ret:elem[name];}},propHooks:{tabIndex:{get:function(elem){var tabindex=jQuery.find.attr(elem,"tabindex");return tabindex?parseInt(tabindex,10):rfocusable.test(elem.nodeName)||rclickable.test(elem.nodeName)&&elem.href?0:-1;}}}});if(!support.hrefNormalized){jQuery.each(["href","src"],function(i,name){jQuery.propHooks[name]={get:function(elem){return elem.getAttribute(name,4);}};});}
-if(!support.optSelected){jQuery.propHooks.selected={get:function(elem){var parent=elem.parentNode;if(parent){parent.selectedIndex;if(parent.parentNode){parent.parentNode.selectedIndex;}}
-return null;}};}
-jQuery.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){jQuery.propFix[this.toLowerCase()]=this;});if(!support.enctype){jQuery.propFix.enctype="encoding";}
-var rclass=/[\t\r\n\f]/g;jQuery.fn.extend({addClass:function(value){var classes,elem,cur,clazz,j,finalValue,i=0,len=this.length,proceed=typeof value==="string"&&value;if(jQuery.isFunction(value)){return this.each(function(j){jQuery(this).addClass(value.call(this,j,this.className));});}
-if(proceed){classes=(value||"").match(rnotwhite)||[];for(;i<len;i++){elem=this[i];cur=elem.nodeType===1&&(elem.className?(" "+elem.className+" ").replace(rclass," "):" ");if(cur){j=0;while((clazz=classes[j++])){if(cur.indexOf(" "+clazz+" ")<0){cur+=clazz+" ";}}
-finalValue=jQuery.trim(cur);if(elem.className!==finalValue){elem.className=finalValue;}}}}
-return this;},removeClass:function(value){var classes,elem,cur,clazz,j,finalValue,i=0,len=this.length,proceed=arguments.length===0||typeof value==="string"&&value;if(jQuery.isFunction(value)){return this.each(function(j){jQuery(this).removeClass(value.call(this,j,this.className));});}
-if(proceed){classes=(value||"").match(rnotwhite)||[];for(;i<len;i++){elem=this[i];cur=elem.nodeType===1&&(elem.className?(" "+elem.className+" ").replace(rclass," "):"");if(cur){j=0;while((clazz=classes[j++])){while(cur.indexOf(" "+clazz+" ")>=0){cur=cur.replace(" "+clazz+" "," ");}}
-finalValue=value?jQuery.trim(cur):"";if(elem.className!==finalValue){elem.className=finalValue;}}}}
-return this;},toggleClass:function(value,stateVal){var type=typeof value;if(typeof stateVal==="boolean"&&type==="string"){return stateVal?this.addClass(value):this.removeClass(value);}
-if(jQuery.isFunction(value)){return this.each(function(i){jQuery(this).toggleClass(value.call(this,i,this.className,stateVal),stateVal);});}
-return this.each(function(){if(type==="string"){var className,i=0,self=jQuery(this),classNames=value.match(rnotwhite)||[];while((className=classNames[i++])){if(self.hasClass(className)){self.removeClass(className);}else{self.addClass(className);}}}else if(type===strundefined||type==="boolean"){if(this.className){jQuery._data(this,"__className__",this.className);}
-this.className=this.className||value===false?"":jQuery._data(this,"__className__")||"";}});},hasClass:function(selector){var className=" "+selector+" ",i=0,l=this.length;for(;i<l;i++){if(this[i].nodeType===1&&(" "+this[i].className+" ").replace(rclass," ").indexOf(className)>=0){return true;}}
-return false;}});jQuery.each(("blur focus focusin focusout load resize scroll unload click dblclick "+"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave "+"change select submit keydown keypress keyup error contextmenu").split(" "),function(i,name){jQuery.fn[name]=function(data,fn){return arguments.length>0?this.on(name,null,data,fn):this.trigger(name);};});jQuery.fn.extend({hover:function(fnOver,fnOut){return this.mouseenter(fnOver).mouseleave(fnOut||fnOver);},bind:function(types,data,fn){return this.on(types,null,data,fn);},unbind:function(types,fn){return this.off(types,null,fn);},delegate:function(selector,types,data,fn){return this.on(types,selector,data,fn);},undelegate:function(selector,types,fn){return arguments.length===1?this.off(selector,"**"):this.off(types,selector||"**",fn);}});var nonce=jQuery.now();var rquery=(/\?/);var rvalidtokens=/(,)|(\[|{)|(}|])|"(?:[^"\\\r\n]|\\["\\\/bfnrt]|\\u[\da-fA-F]{4})*"\s*:?|true|false|null|-?(?!0\d)\d+(?:\.\d+|)(?:[eE][+-]?\d+|)/g;jQuery.parseJSON=function(data){if(window.JSON&&window.JSON.parse){return window.JSON.parse(data+"");}
-var requireNonComma,depth=null,str=jQuery.trim(data+"");return str&&!jQuery.trim(str.replace(rvalidtokens,function(token,comma,open,close){if(requireNonComma&&comma){depth=0;}
-if(depth===0){return token;}
-requireNonComma=open||comma;depth+=!close-!open;return"";}))?(Function("return "+str))():jQuery.error("Invalid JSON: "+data);};jQuery.parseXML=function(data){var xml,tmp;if(!data||typeof data!=="string"){return null;}
-try{if(window.DOMParser){tmp=new DOMParser();xml=tmp.parseFromString(data,"text/xml");}else{xml=new ActiveXObject("Microsoft.XMLDOM");xml.async="false";xml.loadXML(data);}}catch(e){xml=undefined;}
-if(!xml||!xml.documentElement||xml.getElementsByTagName("parsererror").length){jQuery.error("Invalid XML: "+data);}
-return xml;};var
-ajaxLocParts,ajaxLocation,rhash=/#.*$/,rts=/([?&])_=[^&]*/,rheaders=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,rlocalProtocol=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,rnoContent=/^(?:GET|HEAD)$/,rprotocol=/^\/\//,rurl=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,prefilters={},transports={},allTypes="*/".concat("*");try{ajaxLocation=location.href;}catch(e){ajaxLocation=document.createElement("a");ajaxLocation.href="";ajaxLocation=ajaxLocation.href;}
-ajaxLocParts=rurl.exec(ajaxLocation.toLowerCase())||[];function addToPrefiltersOrTransports(structure){return function(dataTypeExpression,func){if(typeof dataTypeExpression!=="string"){func=dataTypeExpression;dataTypeExpression="*";}
-var dataType,i=0,dataTypes=dataTypeExpression.toLowerCase().match(rnotwhite)||[];if(jQuery.isFunction(func)){while((dataType=dataTypes[i++])){if(dataType.charAt(0)==="+"){dataType=dataType.slice(1)||"*";(structure[dataType]=structure[dataType]||[]).unshift(func);}else{(structure[dataType]=structure[dataType]||[]).push(func);}}}};}
-function inspectPrefiltersOrTransports(structure,options,originalOptions,jqXHR){var inspected={},seekingTransport=(structure===transports);function inspect(dataType){var selected;inspected[dataType]=true;jQuery.each(structure[dataType]||[],function(_,prefilterOrFactory){var dataTypeOrTransport=prefilterOrFactory(options,originalOptions,jqXHR);if(typeof dataTypeOrTransport==="string"&&!seekingTransport&&!inspected[dataTypeOrTransport]){options.dataTypes.unshift(dataTypeOrTransport);inspect(dataTypeOrTransport);return false;}else if(seekingTransport){return!(selected=dataTypeOrTransport);}});return selected;}
-return inspect(options.dataTypes[0])||!inspected["*"]&&inspect("*");}
-function ajaxExtend(target,src){var deep,key,flatOptions=jQuery.ajaxSettings.flatOptions||{};for(key in src){if(src[key]!==undefined){(flatOptions[key]?target:(deep||(deep={})))[key]=src[key];}}
-if(deep){jQuery.extend(true,target,deep);}
-return target;}
-function ajaxHandleResponses(s,jqXHR,responses){var firstDataType,ct,finalDataType,type,contents=s.contents,dataTypes=s.dataTypes;while(dataTypes[0]==="*"){dataTypes.shift();if(ct===undefined){ct=s.mimeType||jqXHR.getResponseHeader("Content-Type");}}
-if(ct){for(type in contents){if(contents[type]&&contents[type].test(ct)){dataTypes.unshift(type);break;}}}
-if(dataTypes[0]in responses){finalDataType=dataTypes[0];}else{for(type in responses){if(!dataTypes[0]||s.converters[type+" "+dataTypes[0]]){finalDataType=type;break;}
-if(!firstDataType){firstDataType=type;}}
-finalDataType=finalDataType||firstDataType;}
-if(finalDataType){if(finalDataType!==dataTypes[0]){dataTypes.unshift(finalDataType);}
-return responses[finalDataType];}}
-function ajaxConvert(s,response,jqXHR,isSuccess){var conv2,current,conv,tmp,prev,converters={},dataTypes=s.dataTypes.slice();if(dataTypes[1]){for(conv in s.converters){converters[conv.toLowerCase()]=s.converters[conv];}}
-current=dataTypes.shift();while(current){if(s.responseFields[current]){jqXHR[s.responseFields[current]]=response;}
-if(!prev&&isSuccess&&s.dataFilter){response=s.dataFilter(response,s.dataType);}
-prev=current;current=dataTypes.shift();if(current){if(current==="*"){current=prev;}else if(prev!=="*"&&prev!==current){conv=converters[prev+" "+current]||converters["* "+current];if(!conv){for(conv2 in converters){tmp=conv2.split(" ");if(tmp[1]===current){conv=converters[prev+" "+tmp[0]]||converters["* "+tmp[0]];if(conv){if(conv===true){conv=converters[conv2];}else if(converters[conv2]!==true){current=tmp[0];dataTypes.unshift(tmp[1]);}
-break;}}}}
-if(conv!==true){if(conv&&s["throws"]){response=conv(response);}else{try{response=conv(response);}catch(e){return{state:"parsererror",error:conv?e:"No conversion from "+prev+" to "+current};}}}}}}
-return{state:"success",data:response};}
-jQuery.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:ajaxLocation,type:"GET",isLocal:rlocalProtocol.test(ajaxLocParts[1]),global:true,processData:true,async:true,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":allTypes,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":true,"text json":jQuery.parseJSON,"text xml":jQuery.parseXML},flatOptions:{url:true,context:true}},ajaxSetup:function(target,settings){return settings?ajaxExtend(ajaxExtend(target,jQuery.ajaxSettings),settings):ajaxExtend(jQuery.ajaxSettings,target);},ajaxPrefilter:addToPrefiltersOrTransports(prefilters),ajaxTransport:addToPrefiltersOrTransports(transports),ajax:function(url,options){if(typeof url==="object"){options=url;url=undefined;}
-options=options||{};var
-parts,i,cacheURL,responseHeadersString,timeoutTimer,fireGlobals,transport,responseHeaders,s=jQuery.ajaxSetup({},options),callbackContext=s.context||s,globalEventContext=s.context&&(callbackContext.nodeType||callbackContext.jquery)?jQuery(callbackContext):jQuery.event,deferred=jQuery.Deferred(),completeDeferred=jQuery.Callbacks("once memory"),statusCode=s.statusCode||{},requestHeaders={},requestHeadersNames={},state=0,strAbort="canceled",jqXHR={readyState:0,getResponseHeader:function(key){var match;if(state===2){if(!responseHeaders){responseHeaders={};while((match=rheaders.exec(responseHeadersString))){responseHeaders[match[1].toLowerCase()]=match[2];}}
-match=responseHeaders[key.toLowerCase()];}
-return match==null?null:match;},getAllResponseHeaders:function(){return state===2?responseHeadersString:null;},setRequestHeader:function(name,value){var lname=name.toLowerCase();if(!state){name=requestHeadersNames[lname]=requestHeadersNames[lname]||name;requestHeaders[name]=value;}
-return this;},overrideMimeType:function(type){if(!state){s.mimeType=type;}
-return this;},statusCode:function(map){var code;if(map){if(state<2){for(code in map){statusCode[code]=[statusCode[code],map[code]];}}else{jqXHR.always(map[jqXHR.status]);}}
-return this;},abort:function(statusText){var finalText=statusText||strAbort;if(transport){transport.abort(finalText);}
-done(0,finalText);return this;}};deferred.promise(jqXHR).complete=completeDeferred.add;jqXHR.success=jqXHR.done;jqXHR.error=jqXHR.fail;s.url=((url||s.url||ajaxLocation)+"").replace(rhash,"").replace(rprotocol,ajaxLocParts[1]+"//");s.type=options.method||options.type||s.method||s.type;s.dataTypes=jQuery.trim(s.dataType||"*").toLowerCase().match(rnotwhite)||[""];if(s.crossDomain==null){parts=rurl.exec(s.url.toLowerCase());s.crossDomain=!!(parts&&(parts[1]!==ajaxLocParts[1]||parts[2]!==ajaxLocParts[2]||(parts[3]||(parts[1]==="http:"?"80":"443"))!==(ajaxLocParts[3]||(ajaxLocParts[1]==="http:"?"80":"443"))));}
-if(s.data&&s.processData&&typeof s.data!=="string"){s.data=jQuery.param(s.data,s.traditional);}
-inspectPrefiltersOrTransports(prefilters,s,options,jqXHR);if(state===2){return jqXHR;}
-fireGlobals=s.global;if(fireGlobals&&jQuery.active++===0){jQuery.event.trigger("ajaxStart");}
-s.type=s.type.toUpperCase();s.hasContent=!rnoContent.test(s.type);cacheURL=s.url;if(!s.hasContent){if(s.data){cacheURL=(s.url+=(rquery.test(cacheURL)?"&":"?")+s.data);delete s.data;}
-if(s.cache===false){s.url=rts.test(cacheURL)?cacheURL.replace(rts,"$1_="+nonce++):cacheURL+(rquery.test(cacheURL)?"&":"?")+"_="+nonce++;}}
-if(s.ifModified){if(jQuery.lastModified[cacheURL]){jqXHR.setRequestHeader("If-Modified-Since",jQuery.lastModified[cacheURL]);}
-if(jQuery.etag[cacheURL]){jqXHR.setRequestHeader("If-None-Match",jQuery.etag[cacheURL]);}}
-if(s.data&&s.hasContent&&s.contentType!==false||options.contentType){jqXHR.setRequestHeader("Content-Type",s.contentType);}
-jqXHR.setRequestHeader("Accept",s.dataTypes[0]&&s.accepts[s.dataTypes[0]]?s.accepts[s.dataTypes[0]]+(s.dataTypes[0]!=="*"?", "+allTypes+"; q=0.01":""):s.accepts["*"]);for(i in s.headers){jqXHR.setRequestHeader(i,s.headers[i]);}
-if(s.beforeSend&&(s.beforeSend.call(callbackContext,jqXHR,s)===false||state===2)){return jqXHR.abort();}
-strAbort="abort";for(i in{success:1,error:1,complete:1}){jqXHR[i](s[i]);}
-transport=inspectPrefiltersOrTransports(transports,s,options,jqXHR);if(!transport){done(-1,"No Transport");}else{jqXHR.readyState=1;if(fireGlobals){globalEventContext.trigger("ajaxSend",[jqXHR,s]);}
-if(s.async&&s.timeout>0){timeoutTimer=setTimeout(function(){jqXHR.abort("timeout");},s.timeout);}
-try{state=1;transport.send(requestHeaders,done);}catch(e){if(state<2){done(-1,e);}else{throw e;}}}
-function done(status,nativeStatusText,responses,headers){var isSuccess,success,error,response,modified,statusText=nativeStatusText;if(state===2){return;}
-state=2;if(timeoutTimer){clearTimeout(timeoutTimer);}
-transport=undefined;responseHeadersString=headers||"";jqXHR.readyState=status>0?4:0;isSuccess=status>=200&&status<300||status===304;if(responses){response=ajaxHandleResponses(s,jqXHR,responses);}
-response=ajaxConvert(s,response,jqXHR,isSuccess);if(isSuccess){if(s.ifModified){modified=jqXHR.getResponseHeader("Last-Modified");if(modified){jQuery.lastModified[cacheURL]=modified;}
-modified=jqXHR.getResponseHeader("etag");if(modified){jQuery.etag[cacheURL]=modified;}}
-if(status===204||s.type==="HEAD"){statusText="nocontent";}else if(status===304){statusText="notmodified";}else{statusText=response.state;success=response.data;error=response.error;isSuccess=!error;}}else{error=statusText;if(status||!statusText){statusText="error";if(status<0){status=0;}}}
-jqXHR.status=status;jqXHR.statusText=(nativeStatusText||statusText)+"";if(isSuccess){deferred.resolveWith(callbackContext,[success,statusText,jqXHR]);}else{deferred.rejectWith(callbackContext,[jqXHR,statusText,error]);}
-jqXHR.statusCode(statusCode);statusCode=undefined;if(fireGlobals){globalEventContext.trigger(isSuccess?"ajaxSuccess":"ajaxError",[jqXHR,s,isSuccess?success:error]);}
-completeDeferred.fireWith(callbackContext,[jqXHR,statusText]);if(fireGlobals){globalEventContext.trigger("ajaxComplete",[jqXHR,s]);if(!(--jQuery.active)){jQuery.event.trigger("ajaxStop");}}}
-return jqXHR;},getJSON:function(url,data,callback){return jQuery.get(url,data,callback,"json");},getScript:function(url,callback){return jQuery.get(url,undefined,callback,"script");}});jQuery.each(["get","post"],function(i,method){jQuery[method]=function(url,data,callback,type){if(jQuery.isFunction(data)){type=type||callback;callback=data;data=undefined;}
-return jQuery.ajax({url:url,type:method,dataType:type,data:data,success:callback});};});jQuery.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(i,type){jQuery.fn[type]=function(fn){return this.on(type,fn);};});jQuery._evalUrl=function(url){return jQuery.ajax({url:url,type:"GET",dataType:"script",async:false,global:false,"throws":true});};jQuery.fn.extend({wrapAll:function(html){if(jQuery.isFunction(html)){return this.each(function(i){jQuery(this).wrapAll(html.call(this,i));});}
-if(this[0]){var wrap=jQuery(html,this[0].ownerDocument).eq(0).clone(true);if(this[0].parentNode){wrap.insertBefore(this[0]);}
-wrap.map(function(){var elem=this;while(elem.firstChild&&elem.firstChild.nodeType===1){elem=elem.firstChild;}
-return elem;}).append(this);}
-return this;},wrapInner:function(html){if(jQuery.isFunction(html)){return this.each(function(i){jQuery(this).wrapInner(html.call(this,i));});}
-return this.each(function(){var self=jQuery(this),contents=self.contents();if(contents.length){contents.wrapAll(html);}else{self.append(html);}});},wrap:function(html){var isFunction=jQuery.isFunction(html);return this.each(function(i){jQuery(this).wrapAll(isFunction?html.call(this,i):html);});},unwrap:function(){return this.parent().each(function(){if(!jQuery.nodeName(this,"body")){jQuery(this).replaceWith(this.childNodes);}}).end();}});jQuery.expr.filters.hidden=function(elem){return elem.offsetWidth<=0&&elem.offsetHeight<=0||(!support.reliableHiddenOffsets()&&((elem.style&&elem.style.display)||jQuery.css(elem,"display"))==="none");};jQuery.expr.filters.visible=function(elem){return!jQuery.expr.filters.hidden(elem);};var r20=/%20/g,rbracket=/\[\]$/,rCRLF=/\r?\n/g,rsubmitterTypes=/^(?:submit|button|image|reset|file)$/i,rsubmittable=/^(?:input|select|textarea|keygen)/i;function buildParams(prefix,obj,traditional,add){var name;if(jQuery.isArray(obj)){jQuery.each(obj,function(i,v){if(traditional||rbracket.test(prefix)){add(prefix,v);}else{buildParams(prefix+"["+(typeof v==="object"?i:"")+"]",v,traditional,add);}});}else if(!traditional&&jQuery.type(obj)==="object"){for(name in obj){buildParams(prefix+"["+name+"]",obj[name],traditional,add);}}else{add(prefix,obj);}}
-jQuery.param=function(a,traditional){var prefix,s=[],add=function(key,value){value=jQuery.isFunction(value)?value():(value==null?"":value);s[s.length]=encodeURIComponent(key)+"="+encodeURIComponent(value);};if(traditional===undefined){traditional=jQuery.ajaxSettings&&jQuery.ajaxSettings.traditional;}
-if(jQuery.isArray(a)||(a.jquery&&!jQuery.isPlainObject(a))){jQuery.each(a,function(){add(this.name,this.value);});}else{for(prefix in a){buildParams(prefix,a[prefix],traditional,add);}}
-return s.join("&").replace(r20,"+");};jQuery.fn.extend({serialize:function(){return jQuery.param(this.serializeArray());},serializeArray:function(){return this.map(function(){var elements=jQuery.prop(this,"elements");return elements?jQuery.makeArray(elements):this;}).filter(function(){var type=this.type;return this.name&&!jQuery(this).is(":disabled")&&rsubmittable.test(this.nodeName)&&!rsubmitterTypes.test(type)&&(this.checked||!rcheckableType.test(type));}).map(function(i,elem){var val=jQuery(this).val();return val==null?null:jQuery.isArray(val)?jQuery.map(val,function(val){return{name:elem.name,value:val.replace(rCRLF,"\r\n")};}):{name:elem.name,value:val.replace(rCRLF,"\r\n")};}).get();}});jQuery.ajaxSettings.xhr=window.ActiveXObject!==undefined?function(){return!this.isLocal&&/^(get|post|head|put|delete|options)$/i.test(this.type)&&createStandardXHR()||createActiveXHR();}:createStandardXHR;var xhrId=0,xhrCallbacks={},xhrSupported=jQuery.ajaxSettings.xhr();if(window.ActiveXObject){jQuery(window).on("unload",function(){for(var key in xhrCallbacks){xhrCallbacks[key](undefined,true);}});}
-support.cors=!!xhrSupported&&("withCredentials"in xhrSupported);xhrSupported=support.ajax=!!xhrSupported;if(xhrSupported){jQuery.ajaxTransport(function(options){if(!options.crossDomain||support.cors){var callback;return{send:function(headers,complete){var i,xhr=options.xhr(),id=++xhrId;xhr.open(options.type,options.url,options.async,options.username,options.password);if(options.xhrFields){for(i in options.xhrFields){xhr[i]=options.xhrFields[i];}}
-if(options.mimeType&&xhr.overrideMimeType){xhr.overrideMimeType(options.mimeType);}
-if(!options.crossDomain&&!headers["X-Requested-With"]){headers["X-Requested-With"]="XMLHttpRequest";}
-for(i in headers){if(headers[i]!==undefined){xhr.setRequestHeader(i,headers[i]+"");}}
-xhr.send((options.hasContent&&options.data)||null);callback=function(_,isAbort){var status,statusText,responses;if(callback&&(isAbort||xhr.readyState===4)){delete xhrCallbacks[id];callback=undefined;xhr.onreadystatechange=jQuery.noop;if(isAbort){if(xhr.readyState!==4){xhr.abort();}}else{responses={};status=xhr.status;if(typeof xhr.responseText==="string"){responses.text=xhr.responseText;}
-try{statusText=xhr.statusText;}catch(e){statusText="";}
-if(!status&&options.isLocal&&!options.crossDomain){status=responses.text?200:404;}else if(status===1223){status=204;}}}
-if(responses){complete(status,statusText,responses,xhr.getAllResponseHeaders());}};if(!options.async){callback();}else if(xhr.readyState===4){setTimeout(callback);}else{xhr.onreadystatechange=xhrCallbacks[id]=callback;}},abort:function(){if(callback){callback(undefined,true);}}};}});}
-function createStandardXHR(){try{return new window.XMLHttpRequest();}catch(e){}}
-function createActiveXHR(){try{return new window.ActiveXObject("Microsoft.XMLHTTP");}catch(e){}}
-jQuery.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(text){jQuery.globalEval(text);return text;}}});jQuery.ajaxPrefilter("script",function(s){if(s.cache===undefined){s.cache=false;}
-if(s.crossDomain){s.type="GET";s.global=false;}});jQuery.ajaxTransport("script",function(s){if(s.crossDomain){var script,head=document.head||jQuery("head")[0]||document.documentElement;return{send:function(_,callback){script=document.createElement("script");script.async=true;if(s.scriptCharset){script.charset=s.scriptCharset;}
-script.src=s.url;script.onload=script.onreadystatechange=function(_,isAbort){if(isAbort||!script.readyState||/loaded|complete/.test(script.readyState)){script.onload=script.onreadystatechange=null;if(script.parentNode){script.parentNode.removeChild(script);}
-script=null;if(!isAbort){callback(200,"success");}}};head.insertBefore(script,head.firstChild);},abort:function(){if(script){script.onload(undefined,true);}}};}});var oldCallbacks=[],rjsonp=/(=)\?(?=&|$)|\?\?/;jQuery.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var callback=oldCallbacks.pop()||(jQuery.expando+"_"+(nonce++));this[callback]=true;return callback;}});jQuery.ajaxPrefilter("json jsonp",function(s,originalSettings,jqXHR){var callbackName,overwritten,responseContainer,jsonProp=s.jsonp!==false&&(rjsonp.test(s.url)?"url":typeof s.data==="string"&&!(s.contentType||"").indexOf("application/x-www-form-urlencoded")&&rjsonp.test(s.data)&&"data");if(jsonProp||s.dataTypes[0]==="jsonp"){callbackName=s.jsonpCallback=jQuery.isFunction(s.jsonpCallback)?s.jsonpCallback():s.jsonpCallback;if(jsonProp){s[jsonProp]=s[jsonProp].replace(rjsonp,"$1"+callbackName);}else if(s.jsonp!==false){s.url+=(rquery.test(s.url)?"&":"?")+s.jsonp+"="+callbackName;}
-s.converters["script json"]=function(){if(!responseContainer){jQuery.error(callbackName+" was not called");}
-return responseContainer[0];};s.dataTypes[0]="json";overwritten=window[callbackName];window[callbackName]=function(){responseContainer=arguments;};jqXHR.always(function(){window[callbackName]=overwritten;if(s[callbackName]){s.jsonpCallback=originalSettings.jsonpCallback;oldCallbacks.push(callbackName);}
-if(responseContainer&&jQuery.isFunction(overwritten)){overwritten(responseContainer[0]);}
-responseContainer=overwritten=undefined;});return"script";}});jQuery.parseHTML=function(data,context,keepScripts){if(!data||typeof data!=="string"){return null;}
-if(typeof context==="boolean"){keepScripts=context;context=false;}
-context=context||document;var parsed=rsingleTag.exec(data),scripts=!keepScripts&&[];if(parsed){return[context.createElement(parsed[1])];}
-parsed=jQuery.buildFragment([data],context,scripts);if(scripts&&scripts.length){jQuery(scripts).remove();}
-return jQuery.merge([],parsed.childNodes);};var _load=jQuery.fn.load;jQuery.fn.load=function(url,params,callback){if(typeof url!=="string"&&_load){return _load.apply(this,arguments);}
-var selector,response,type,self=this,off=url.indexOf(" ");if(off>=0){selector=jQuery.trim(url.slice(off,url.length));url=url.slice(0,off);}
-if(jQuery.isFunction(params)){callback=params;params=undefined;}else if(params&&typeof params==="object"){type="POST";}
-if(self.length>0){jQuery.ajax({url:url,type:type,dataType:"html",data:params}).done(function(responseText){response=arguments;self.html(selector?jQuery("<div>").append(jQuery.parseHTML(responseText)).find(selector):responseText);}).complete(callback&&function(jqXHR,status){self.each(callback,response||[jqXHR.responseText,status,jqXHR]);});}
-return this;};jQuery.expr.filters.animated=function(elem){return jQuery.grep(jQuery.timers,function(fn){return elem===fn.elem;}).length;};var docElem=window.document.documentElement;function getWindow(elem){return jQuery.isWindow(elem)?elem:elem.nodeType===9?elem.defaultView||elem.parentWindow:false;}
-jQuery.offset={setOffset:function(elem,options,i){var curPosition,curLeft,curCSSTop,curTop,curOffset,curCSSLeft,calculatePosition,position=jQuery.css(elem,"position"),curElem=jQuery(elem),props={};if(position==="static"){elem.style.position="relative";}
-curOffset=curElem.offset();curCSSTop=jQuery.css(elem,"top");curCSSLeft=jQuery.css(elem,"left");calculatePosition=(position==="absolute"||position==="fixed")&&jQuery.inArray("auto",[curCSSTop,curCSSLeft])>-1;if(calculatePosition){curPosition=curElem.position();curTop=curPosition.top;curLeft=curPosition.left;}else{curTop=parseFloat(curCSSTop)||0;curLeft=parseFloat(curCSSLeft)||0;}
-if(jQuery.isFunction(options)){options=options.call(elem,i,curOffset);}
-if(options.top!=null){props.top=(options.top-curOffset.top)+curTop;}
-if(options.left!=null){props.left=(options.left-curOffset.left)+curLeft;}
-if("using"in options){options.using.call(elem,props);}else{curElem.css(props);}}};jQuery.fn.extend({offset:function(options){if(arguments.length){return options===undefined?this:this.each(function(i){jQuery.offset.setOffset(this,options,i);});}
-var docElem,win,box={top:0,left:0},elem=this[0],doc=elem&&elem.ownerDocument;if(!doc){return;}
-docElem=doc.documentElement;if(!jQuery.contains(docElem,elem)){return box;}
-if(typeof elem.getBoundingClientRect!==strundefined){box=elem.getBoundingClientRect();}
-win=getWindow(doc);return{top:box.top+(win.pageYOffset||docElem.scrollTop)-(docElem.clientTop||0),left:box.left+(win.pageXOffset||docElem.scrollLeft)-(docElem.clientLeft||0)};},position:function(){if(!this[0]){return;}
-var offsetParent,offset,parentOffset={top:0,left:0},elem=this[0];if(jQuery.css(elem,"position")==="fixed"){offset=elem.getBoundingClientRect();}else{offsetParent=this.offsetParent();offset=this.offset();if(!jQuery.nodeName(offsetParent[0],"html")){parentOffset=offsetParent.offset();}
-parentOffset.top+=jQuery.css(offsetParent[0],"borderTopWidth",true);parentOffset.left+=jQuery.css(offsetParent[0],"borderLeftWidth",true);}
-return{top:offset.top-parentOffset.top-jQuery.css(elem,"marginTop",true),left:offset.left-parentOffset.left-jQuery.css(elem,"marginLeft",true)};},offsetParent:function(){return this.map(function(){var offsetParent=this.offsetParent||docElem;while(offsetParent&&(!jQuery.nodeName(offsetParent,"html")&&jQuery.css(offsetParent,"position")==="static")){offsetParent=offsetParent.offsetParent;}
-return offsetParent||docElem;});}});jQuery.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(method,prop){var top=/Y/.test(prop);jQuery.fn[method]=function(val){return access(this,function(elem,method,val){var win=getWindow(elem);if(val===undefined){return win?(prop in win)?win[prop]:win.document.documentElement[method]:elem[method];}
-if(win){win.scrollTo(!top?val:jQuery(win).scrollLeft(),top?val:jQuery(win).scrollTop());}else{elem[method]=val;}},method,val,arguments.length,null);};});jQuery.each(["top","left"],function(i,prop){jQuery.cssHooks[prop]=addGetHookIf(support.pixelPosition,function(elem,computed){if(computed){computed=curCSS(elem,prop);return rnumnonpx.test(computed)?jQuery(elem).position()[prop]+"px":computed;}});});jQuery.each({Height:"height",Width:"width"},function(name,type){jQuery.each({padding:"inner"+name,content:type,"":"outer"+name},function(defaultExtra,funcName){jQuery.fn[funcName]=function(margin,value){var chainable=arguments.length&&(defaultExtra||typeof margin!=="boolean"),extra=defaultExtra||(margin===true||value===true?"margin":"border");return access(this,function(elem,type,value){var doc;if(jQuery.isWindow(elem)){return elem.document.documentElement["client"+name];}
-if(elem.nodeType===9){doc=elem.documentElement;return Math.max(elem.body["scroll"+name],doc["scroll"+name],elem.body["offset"+name],doc["offset"+name],doc["client"+name]);}
-return value===undefined?jQuery.css(elem,type,extra):jQuery.style(elem,type,value,extra);},type,chainable?margin:undefined,chainable,null);};});});jQuery.fn.size=function(){return this.length;};jQuery.fn.andSelf=jQuery.fn.addBack;if(typeof define==="function"&&define.amd){define("jquery",[],function(){return jQuery;});}
-var
-_jQuery=window.jQuery,_$=window.$;jQuery.noConflict=function(deep){if(window.$===jQuery){window.$=_$;}
-if(deep&&window.jQuery===jQuery){window.jQuery=_jQuery;}
-return jQuery;};if(typeof noGlobal===strundefined){window.jQuery=window.$=jQuery;}
-return jQuery;}));
\ No newline at end of file
diff --git a/docs/site/home/js/jquery-1.12.4.min.js b/docs/site/home/js/jquery-1.12.4.min.js
new file mode 100644
index 0000000..e836475
--- /dev/null
+++ b/docs/site/home/js/jquery-1.12.4.min.js
@@ -0,0 +1,5 @@
+/*! jQuery v1.12.4 | (c) jQuery Foundation | jquery.org/license */
+!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=a.document,e=c.slice,f=c.concat,g=c.push,h=c.indexOf,i={},j=i.toString,k=i.hasOwnProperty,l={},m="1.12.4",n=function(a,b){return new n.fn.init(a,b)},o=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,p=/^-ms-/,q=/-([\da-z])/gi,r=function(a,b){return b.toUpperCase()};n.fn=n.prototype={jquery:m,constructor:n,selector:"",length:0,toArray:function(){return e.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:e.call(this)},pushStack:function(a){var b=n.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a){return n.each(this,a)},map:function(a){return this.pushStack(n.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(e.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor()},push:g,sort:c.sort,splice:c.splice},n.extend=n.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||n.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(e=arguments[h]))for(d in e)a=g[d],c=e[d],g!==c&&(j&&c&&(n.isPlainObject(c)||(b=n.isArray(c)))?(b?(b=!1,f=a&&n.isArray(a)?a:[]):f=a&&n.isPlainObject(a)?a:{},g[d]=n.extend(j,f,c)):void 0!==c&&(g[d]=c));return g},n.extend({expando:"jQuery"+(m+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===n.type(a)},isArray:Array.isArray||function(a){return"array"===n.type(a)},isWindow:function(a){return null!=a&&a==a.window},isNumeric:function(a){var b=a&&a.toString();return!n.isArray(a)&&b-parseFloat(b)+1>=0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},isPlainObject:function(a){var b;if(!a||"object"!==n.type(a)||a.nodeType||n.isWindow(a))return!1;try{if(a.constructor&&!k.call(a,"constructor")&&!k.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}if(!l.ownFirst)for(b in a)return k.call(a,b);for(b in a);return void 0===b||k.call(a,b)},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?i[j.call(a)]||"object":typeof a},globalEval:function(b){b&&n.trim(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(p,"ms-").replace(q,r)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b){var c,d=0;if(s(a)){for(c=a.length;c>d;d++)if(b.call(a[d],d,a[d])===!1)break}else for(d in a)if(b.call(a[d],d,a[d])===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(o,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(s(Object(a))?n.merge(c,"string"==typeof a?[a]:a):g.call(c,a)),c},inArray:function(a,b,c){var d;if(b){if(h)return h.call(b,a,c);for(d=b.length,c=c?0>c?Math.max(0,d+c):c:0;d>c;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,b){var c=+b.length,d=0,e=a.length;while(c>d)a[e++]=b[d++];if(c!==c)while(void 0!==b[d])a[e++]=b[d++];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,e,g=0,h=[];if(s(a))for(d=a.length;d>g;g++)e=b(a[g],g,c),null!=e&&h.push(e);else for(g in a)e=b(a[g],g,c),null!=e&&h.push(e);return f.apply([],h)},guid:1,proxy:function(a,b){var c,d,f;return"string"==typeof b&&(f=a[b],b=a,a=f),n.isFunction(a)?(c=e.call(arguments,2),d=function(){return a.apply(b||this,c.concat(e.call(arguments)))},d.guid=a.guid=a.guid||n.guid++,d):void 0},now:function(){return+new Date},support:l}),"function"==typeof Symbol&&(n.fn[Symbol.iterator]=c[Symbol.iterator]),n.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(a,b){i["[object "+b+"]"]=b.toLowerCase()});function s(a){var b=!!a&&"length"in a&&a.length,c=n.type(a);return"function"===c||n.isWindow(a)?!1:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var t=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+1*new Date,v=a.document,w=0,x=0,y=ga(),z=ga(),A=ga(),B=function(a,b){return a===b&&(l=!0),0},C=1<<31,D={}.hasOwnProperty,E=[],F=E.pop,G=E.push,H=E.push,I=E.slice,J=function(a,b){for(var c=0,d=a.length;d>c;c++)if(a[c]===b)return c;return-1},K="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",L="[\\x20\\t\\r\\n\\f]",M="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",N="\\["+L+"*("+M+")(?:"+L+"*([*^$|!~]?=)"+L+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+M+"))|)"+L+"*\\]",O=":("+M+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+N+")*)|.*)\\)|)",P=new RegExp(L+"+","g"),Q=new RegExp("^"+L+"+|((?:^|[^\\\\])(?:\\\\.)*)"+L+"+$","g"),R=new RegExp("^"+L+"*,"+L+"*"),S=new RegExp("^"+L+"*([>+~]|"+L+")"+L+"*"),T=new RegExp("="+L+"*([^\\]'\"]*?)"+L+"*\\]","g"),U=new RegExp(O),V=new RegExp("^"+M+"$"),W={ID:new RegExp("^#("+M+")"),CLASS:new RegExp("^\\.("+M+")"),TAG:new RegExp("^("+M+"|[*])"),ATTR:new RegExp("^"+N),PSEUDO:new RegExp("^"+O),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+L+"*(even|odd|(([+-]|)(\\d*)n|)"+L+"*(?:([+-]|)"+L+"*(\\d+)|))"+L+"*\\)|)","i"),bool:new RegExp("^(?:"+K+")$","i"),needsContext:new RegExp("^"+L+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+L+"*((?:-\\d)?\\d*)"+L+"*\\)|)(?=[^-]|$)","i")},X=/^(?:input|select|textarea|button)$/i,Y=/^h\d$/i,Z=/^[^{]+\{\s*\[native \w/,$=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,_=/[+~]/,aa=/'|\\/g,ba=new RegExp("\\\\([\\da-f]{1,6}"+L+"?|("+L+")|.)","ig"),ca=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)},da=function(){m()};try{H.apply(E=I.call(v.childNodes),v.childNodes),E[v.childNodes.length].nodeType}catch(ea){H={apply:E.length?function(a,b){G.apply(a,I.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function fa(a,b,d,e){var f,h,j,k,l,o,r,s,w=b&&b.ownerDocument,x=b?b.nodeType:9;if(d=d||[],"string"!=typeof a||!a||1!==x&&9!==x&&11!==x)return d;if(!e&&((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,p)){if(11!==x&&(o=$.exec(a)))if(f=o[1]){if(9===x){if(!(j=b.getElementById(f)))return d;if(j.id===f)return d.push(j),d}else if(w&&(j=w.getElementById(f))&&t(b,j)&&j.id===f)return d.push(j),d}else{if(o[2])return H.apply(d,b.getElementsByTagName(a)),d;if((f=o[3])&&c.getElementsByClassName&&b.getElementsByClassName)return H.apply(d,b.getElementsByClassName(f)),d}if(c.qsa&&!A[a+" "]&&(!q||!q.test(a))){if(1!==x)w=b,s=a;else if("object"!==b.nodeName.toLowerCase()){(k=b.getAttribute("id"))?k=k.replace(aa,"\\$&"):b.setAttribute("id",k=u),r=g(a),h=r.length,l=V.test(k)?"#"+k:"[id='"+k+"']";while(h--)r[h]=l+" "+qa(r[h]);s=r.join(","),w=_.test(a)&&oa(b.parentNode)||b}if(s)try{return H.apply(d,w.querySelectorAll(s)),d}catch(y){}finally{k===u&&b.removeAttribute("id")}}}return i(a.replace(Q,"$1"),b,d,e)}function ga(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ha(a){return a[u]=!0,a}function ia(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function ja(a,b){var c=a.split("|"),e=c.length;while(e--)d.attrHandle[c[e]]=b}function ka(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||C)-(~a.sourceIndex||C);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function la(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function ma(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function na(a){return ha(function(b){return b=+b,ha(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function oa(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=fa.support={},f=fa.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=fa.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=n.documentElement,p=!f(n),(e=n.defaultView)&&e.top!==e&&(e.addEventListener?e.addEventListener("unload",da,!1):e.attachEvent&&e.attachEvent("onunload",da)),c.attributes=ia(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ia(function(a){return a.appendChild(n.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=Z.test(n.getElementsByClassName),c.getById=ia(function(a){return o.appendChild(a).id=u,!n.getElementsByName||!n.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c=b.getElementById(a);return c?[c]:[]}},d.filter.ID=function(a){var b=a.replace(ba,ca);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(ba,ca);return function(a){var c="undefined"!=typeof a.getAttributeNode&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return"undefined"!=typeof b.getElementsByTagName?b.getElementsByTagName(a):c.qsa?b.querySelectorAll(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return"undefined"!=typeof b.getElementsByClassName&&p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=Z.test(n.querySelectorAll))&&(ia(function(a){o.appendChild(a).innerHTML="<a id='"+u+"'></a><select id='"+u+"-\r\\' msallowcapture=''><option selected=''></option></select>",a.querySelectorAll("[msallowcapture^='']").length&&q.push("[*^$]="+L+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+L+"*(?:value|"+K+")"),a.querySelectorAll("[id~="+u+"-]").length||q.push("~="),a.querySelectorAll(":checked").length||q.push(":checked"),a.querySelectorAll("a#"+u+"+*").length||q.push(".#.+[+~]")}),ia(function(a){var b=n.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+L+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=Z.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ia(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",O)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=Z.test(o.compareDocumentPosition),t=b||Z.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===n||a.ownerDocument===v&&t(v,a)?-1:b===n||b.ownerDocument===v&&t(v,b)?1:k?J(k,a)-J(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,e=a.parentNode,f=b.parentNode,g=[a],h=[b];if(!e||!f)return a===n?-1:b===n?1:e?-1:f?1:k?J(k,a)-J(k,b):0;if(e===f)return ka(a,b);c=a;while(c=c.parentNode)g.unshift(c);c=b;while(c=c.parentNode)h.unshift(c);while(g[d]===h[d])d++;return d?ka(g[d],h[d]):g[d]===v?-1:h[d]===v?1:0},n):n},fa.matches=function(a,b){return fa(a,null,null,b)},fa.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(T,"='$1']"),c.matchesSelector&&p&&!A[b+" "]&&(!r||!r.test(b))&&(!q||!q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return fa(b,n,null,[a]).length>0},fa.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},fa.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&D.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},fa.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},fa.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=fa.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=fa.selectors={cacheLength:50,createPseudo:ha,match:W,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(ba,ca),a[3]=(a[3]||a[4]||a[5]||"").replace(ba,ca),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||fa.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&fa.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return W.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&U.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(ba,ca).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+L+")"+a+"("+L+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||"undefined"!=typeof a.getAttribute&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=fa.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e.replace(P," ")+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h,t=!1;if(q){if(f){while(p){m=b;while(m=m[p])if(h?m.nodeName.toLowerCase()===r:1===m.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){m=q,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n&&j[2],m=n&&q.childNodes[n];while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if(1===m.nodeType&&++t&&m===b){k[a]=[w,n,t];break}}else if(s&&(m=b,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n),t===!1)while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if((h?m.nodeName.toLowerCase()===r:1===m.nodeType)&&++t&&(s&&(l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),k[a]=[w,t]),m===b))break;return t-=e,t===d||t%d===0&&t/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||fa.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ha(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=J(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:ha(function(a){var b=[],c=[],d=h(a.replace(Q,"$1"));return d[u]?ha(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),b[0]=null,!c.pop()}}),has:ha(function(a){return function(b){return fa(a,b).length>0}}),contains:ha(function(a){return a=a.replace(ba,ca),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ha(function(a){return V.test(a||"")||fa.error("unsupported lang: "+a),a=a.replace(ba,ca).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Y.test(a.nodeName)},input:function(a){return X.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:na(function(){return[0]}),last:na(function(a,b){return[b-1]}),eq:na(function(a,b,c){return[0>c?c+b:c]}),even:na(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:na(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:na(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:na(function(a,b,c){for(var d=0>c?c+b:c;++d<b;)a.push(d);return a})}},d.pseudos.nth=d.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})d.pseudos[b]=la(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=ma(b);function pa(){}pa.prototype=d.filters=d.pseudos,d.setFilters=new pa,g=fa.tokenize=function(a,b){var c,e,f,g,h,i,j,k=z[a+" "];if(k)return b?0:k.slice(0);h=a,i=[],j=d.preFilter;while(h){c&&!(e=R.exec(h))||(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=S.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(Q," ")}),h=h.slice(c.length));for(g in d.filter)!(e=W[g].exec(h))||j[g]&&!(e=j[g](e))||(c=e.shift(),f.push({value:c,type:g,matches:e}),h=h.slice(c.length));if(!c)break}return b?h.length:h?fa.error(a):z(a,i).slice(0)};function qa(a){for(var b=0,c=a.length,d="";c>b;b++)d+=a[b].value;return d}function ra(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j,k=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(j=b[u]||(b[u]={}),i=j[b.uniqueID]||(j[b.uniqueID]={}),(h=i[d])&&h[0]===w&&h[1]===f)return k[2]=h[2];if(i[d]=k,k[2]=a(b,c,g))return!0}}}function sa(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function ta(a,b,c){for(var d=0,e=b.length;e>d;d++)fa(a,b[d],c);return c}function ua(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(c&&!c(f,d,e)||(g.push(f),j&&b.push(h)));return g}function va(a,b,c,d,e,f){return d&&!d[u]&&(d=va(d)),e&&!e[u]&&(e=va(e,f)),ha(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||ta(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:ua(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=ua(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?J(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=ua(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):H.apply(g,r)})}function wa(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=ra(function(a){return a===b},h,!0),l=ra(function(a){return J(b,a)>-1},h,!0),m=[function(a,c,d){var e=!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d));return b=null,e}];f>i;i++)if(c=d.relative[a[i].type])m=[ra(sa(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return va(i>1&&sa(m),i>1&&qa(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(Q,"$1"),c,e>i&&wa(a.slice(i,e)),f>e&&wa(a=a.slice(e)),f>e&&qa(a))}m.push(c)}return sa(m)}function xa(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,o,q,r=0,s="0",t=f&&[],u=[],v=j,x=f||e&&d.find.TAG("*",k),y=w+=null==v?1:Math.random()||.1,z=x.length;for(k&&(j=g===n||g||k);s!==z&&null!=(l=x[s]);s++){if(e&&l){o=0,g||l.ownerDocument===n||(m(l),h=!p);while(q=a[o++])if(q(l,g||n,h)){i.push(l);break}k&&(w=y)}c&&((l=!q&&l)&&r--,f&&t.push(l))}if(r+=s,c&&s!==r){o=0;while(q=b[o++])q(t,u,g,h);if(f){if(r>0)while(s--)t[s]||u[s]||(u[s]=F.call(i));u=ua(u)}H.apply(i,u),k&&!f&&u.length>0&&r+b.length>1&&fa.uniqueSort(i)}return k&&(w=y,j=v),t};return c?ha(f):f}return h=fa.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=wa(b[c]),f[u]?d.push(f):e.push(f);f=A(a,xa(e,d)),f.selector=a}return f},i=fa.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(ba,ca),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=W.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(ba,ca),_.test(j[0].type)&&oa(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&qa(j),!a)return H.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,!b||_.test(a)&&oa(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ia(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ia(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||ja("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ia(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||ja("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ia(function(a){return null==a.getAttribute("disabled")})||ja(K,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),fa}(a);n.find=t,n.expr=t.selectors,n.expr[":"]=n.expr.pseudos,n.uniqueSort=n.unique=t.uniqueSort,n.text=t.getText,n.isXMLDoc=t.isXML,n.contains=t.contains;var u=function(a,b,c){var d=[],e=void 0!==c;while((a=a[b])&&9!==a.nodeType)if(1===a.nodeType){if(e&&n(a).is(c))break;d.push(a)}return d},v=function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c},w=n.expr.match.needsContext,x=/^<([\w-]+)\s*\/?>(?:<\/\1>|)$/,y=/^.[^:#\[\.,]*$/;function z(a,b,c){if(n.isFunction(b))return n.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return n.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(y.test(b))return n.filter(b,a,c);b=n.filter(b,a)}return n.grep(a,function(a){return n.inArray(a,b)>-1!==c})}n.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?n.find.matchesSelector(d,a)?[d]:[]:n.find.matches(a,n.grep(b,function(a){return 1===a.nodeType}))},n.fn.extend({find:function(a){var b,c=[],d=this,e=d.length;if("string"!=typeof a)return this.pushStack(n(a).filter(function(){for(b=0;e>b;b++)if(n.contains(d[b],this))return!0}));for(b=0;e>b;b++)n.find(a,d[b],c);return c=this.pushStack(e>1?n.unique(c):c),c.selector=this.selector?this.selector+" "+a:a,c},filter:function(a){return this.pushStack(z(this,a||[],!1))},not:function(a){return this.pushStack(z(this,a||[],!0))},is:function(a){return!!z(this,"string"==typeof a&&w.test(a)?n(a):a||[],!1).length}});var A,B=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,C=n.fn.init=function(a,b,c){var e,f;if(!a)return this;if(c=c||A,"string"==typeof a){if(e="<"===a.charAt(0)&&">"===a.charAt(a.length-1)&&a.length>=3?[null,a,null]:B.exec(a),!e||!e[1]&&b)return!b||b.jquery?(b||c).find(a):this.constructor(b).find(a);if(e[1]){if(b=b instanceof n?b[0]:b,n.merge(this,n.parseHTML(e[1],b&&b.nodeType?b.ownerDocument||b:d,!0)),x.test(e[1])&&n.isPlainObject(b))for(e in b)n.isFunction(this[e])?this[e](b[e]):this.attr(e,b[e]);return this}if(f=d.getElementById(e[2]),f&&f.parentNode){if(f.id!==e[2])return A.find(a);this.length=1,this[0]=f}return this.context=d,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):n.isFunction(a)?"undefined"!=typeof c.ready?c.ready(a):a(n):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),n.makeArray(a,this))};C.prototype=n.fn,A=n(d);var D=/^(?:parents|prev(?:Until|All))/,E={children:!0,contents:!0,next:!0,prev:!0};n.fn.extend({has:function(a){var b,c=n(a,this),d=c.length;return this.filter(function(){for(b=0;d>b;b++)if(n.contains(this,c[b]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=w.test(a)||"string"!=typeof a?n(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&n.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?n.uniqueSort(f):f)},index:function(a){return a?"string"==typeof a?n.inArray(this[0],n(a)):n.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(n.uniqueSort(n.merge(this.get(),n(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function F(a,b){do a=a[b];while(a&&1!==a.nodeType);return a}n.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return u(a,"parentNode")},parentsUntil:function(a,b,c){return u(a,"parentNode",c)},next:function(a){return F(a,"nextSibling")},prev:function(a){return F(a,"previousSibling")},nextAll:function(a){return u(a,"nextSibling")},prevAll:function(a){return u(a,"previousSibling")},nextUntil:function(a,b,c){return u(a,"nextSibling",c)},prevUntil:function(a,b,c){return u(a,"previousSibling",c)},siblings:function(a){return v((a.parentNode||{}).firstChild,a)},children:function(a){return v(a.firstChild)},contents:function(a){return n.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:n.merge([],a.childNodes)}},function(a,b){n.fn[a]=function(c,d){var e=n.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=n.filter(d,e)),this.length>1&&(E[a]||(e=n.uniqueSort(e)),D.test(a)&&(e=e.reverse())),this.pushStack(e)}});var G=/\S+/g;function H(a){var b={};return n.each(a.match(G)||[],function(a,c){b[c]=!0}),b}n.Callbacks=function(a){a="string"==typeof a?H(a):n.extend({},a);var b,c,d,e,f=[],g=[],h=-1,i=function(){for(e=a.once,d=b=!0;g.length;h=-1){c=g.shift();while(++h<f.length)f[h].apply(c[0],c[1])===!1&&a.stopOnFalse&&(h=f.length,c=!1)}a.memory||(c=!1),b=!1,e&&(f=c?[]:"")},j={add:function(){return f&&(c&&!b&&(h=f.length-1,g.push(c)),function d(b){n.each(b,function(b,c){n.isFunction(c)?a.unique&&j.has(c)||f.push(c):c&&c.length&&"string"!==n.type(c)&&d(c)})}(arguments),c&&!b&&i()),this},remove:function(){return n.each(arguments,function(a,b){var c;while((c=n.inArray(b,f,c))>-1)f.splice(c,1),h>=c&&h--}),this},has:function(a){return a?n.inArray(a,f)>-1:f.length>0},empty:function(){return f&&(f=[]),this},disable:function(){return e=g=[],f=c="",this},disabled:function(){return!f},lock:function(){return e=!0,c||j.disable(),this},locked:function(){return!!e},fireWith:function(a,c){return e||(c=c||[],c=[a,c.slice?c.slice():c],g.push(c),b||i()),this},fire:function(){return j.fireWith(this,arguments),this},fired:function(){return!!d}};return j},n.extend({Deferred:function(a){var b=[["resolve","done",n.Callbacks("once memory"),"resolved"],["reject","fail",n.Callbacks("once memory"),"rejected"],["notify","progress",n.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return n.Deferred(function(c){n.each(b,function(b,f){var g=n.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&n.isFunction(a.promise)?a.promise().progress(c.notify).done(c.resolve).fail(c.reject):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?n.extend(a,d):d}},e={};return d.pipe=d.then,n.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=e.call(arguments),d=c.length,f=1!==d||a&&n.isFunction(a.promise)?d:0,g=1===f?a:n.Deferred(),h=function(a,b,c){return function(d){b[a]=this,c[a]=arguments.length>1?e.call(arguments):d,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(d>1)for(i=new Array(d),j=new Array(d),k=new Array(d);d>b;b++)c[b]&&n.isFunction(c[b].promise)?c[b].promise().progress(h(b,j,i)).done(h(b,k,c)).fail(g.reject):--f;return f||g.resolveWith(k,c),g.promise()}});var I;n.fn.ready=function(a){return n.ready.promise().done(a),this},n.extend({isReady:!1,readyWait:1,holdReady:function(a){a?n.readyWait++:n.ready(!0)},ready:function(a){(a===!0?--n.readyWait:n.isReady)||(n.isReady=!0,a!==!0&&--n.readyWait>0||(I.resolveWith(d,[n]),n.fn.triggerHandler&&(n(d).triggerHandler("ready"),n(d).off("ready"))))}});function J(){d.addEventListener?(d.removeEventListener("DOMContentLoaded",K),a.removeEventListener("load",K)):(d.detachEvent("onreadystatechange",K),a.detachEvent("onload",K))}function K(){(d.addEventListener||"load"===a.event.type||"complete"===d.readyState)&&(J(),n.ready())}n.ready.promise=function(b){if(!I)if(I=n.Deferred(),"complete"===d.readyState||"loading"!==d.readyState&&!d.documentElement.doScroll)a.setTimeout(n.ready);else if(d.addEventListener)d.addEventListener("DOMContentLoaded",K),a.addEventListener("load",K);else{d.attachEvent("onreadystatechange",K),a.attachEvent("onload",K);var c=!1;try{c=null==a.frameElement&&d.documentElement}catch(e){}c&&c.doScroll&&!function f(){if(!n.isReady){try{c.doScroll("left")}catch(b){return a.setTimeout(f,50)}J(),n.ready()}}()}return I.promise(b)},n.ready.promise();var L;for(L in n(l))break;l.ownFirst="0"===L,l.inlineBlockNeedsLayout=!1,n(function(){var a,b,c,e;c=d.getElementsByTagName("body")[0],c&&c.style&&(b=d.createElement("div"),e=d.createElement("div"),e.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(e).appendChild(b),"undefined"!=typeof b.style.zoom&&(b.style.cssText="display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1",l.inlineBlockNeedsLayout=a=3===b.offsetWidth,a&&(c.style.zoom=1)),c.removeChild(e))}),function(){var a=d.createElement("div");l.deleteExpando=!0;try{delete a.test}catch(b){l.deleteExpando=!1}a=null}();var M=function(a){var b=n.noData[(a.nodeName+" ").toLowerCase()],c=+a.nodeType||1;return 1!==c&&9!==c?!1:!b||b!==!0&&a.getAttribute("classid")===b},N=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,O=/([A-Z])/g;function P(a,b,c){if(void 0===c&&1===a.nodeType){var d="data-"+b.replace(O,"-$1").toLowerCase();if(c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:N.test(c)?n.parseJSON(c):c}catch(e){}n.data(a,b,c)}else c=void 0;
+}return c}function Q(a){var b;for(b in a)if(("data"!==b||!n.isEmptyObject(a[b]))&&"toJSON"!==b)return!1;return!0}function R(a,b,d,e){if(M(a)){var f,g,h=n.expando,i=a.nodeType,j=i?n.cache:a,k=i?a[h]:a[h]&&h;if(k&&j[k]&&(e||j[k].data)||void 0!==d||"string"!=typeof b)return k||(k=i?a[h]=c.pop()||n.guid++:h),j[k]||(j[k]=i?{}:{toJSON:n.noop}),"object"!=typeof b&&"function"!=typeof b||(e?j[k]=n.extend(j[k],b):j[k].data=n.extend(j[k].data,b)),g=j[k],e||(g.data||(g.data={}),g=g.data),void 0!==d&&(g[n.camelCase(b)]=d),"string"==typeof b?(f=g[b],null==f&&(f=g[n.camelCase(b)])):f=g,f}}function S(a,b,c){if(M(a)){var d,e,f=a.nodeType,g=f?n.cache:a,h=f?a[n.expando]:n.expando;if(g[h]){if(b&&(d=c?g[h]:g[h].data)){n.isArray(b)?b=b.concat(n.map(b,n.camelCase)):b in d?b=[b]:(b=n.camelCase(b),b=b in d?[b]:b.split(" ")),e=b.length;while(e--)delete d[b[e]];if(c?!Q(d):!n.isEmptyObject(d))return}(c||(delete g[h].data,Q(g[h])))&&(f?n.cleanData([a],!0):l.deleteExpando||g!=g.window?delete g[h]:g[h]=void 0)}}}n.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(a){return a=a.nodeType?n.cache[a[n.expando]]:a[n.expando],!!a&&!Q(a)},data:function(a,b,c){return R(a,b,c)},removeData:function(a,b){return S(a,b)},_data:function(a,b,c){return R(a,b,c,!0)},_removeData:function(a,b){return S(a,b,!0)}}),n.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=n.data(f),1===f.nodeType&&!n._data(f,"parsedAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=n.camelCase(d.slice(5)),P(f,d,e[d])));n._data(f,"parsedAttrs",!0)}return e}return"object"==typeof a?this.each(function(){n.data(this,a)}):arguments.length>1?this.each(function(){n.data(this,a,b)}):f?P(f,a,n.data(f,a)):void 0},removeData:function(a){return this.each(function(){n.removeData(this,a)})}}),n.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=n._data(a,b),c&&(!d||n.isArray(c)?d=n._data(a,b,n.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=n.queue(a,b),d=c.length,e=c.shift(),f=n._queueHooks(a,b),g=function(){n.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return n._data(a,c)||n._data(a,c,{empty:n.Callbacks("once memory").add(function(){n._removeData(a,b+"queue"),n._removeData(a,c)})})}}),n.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?n.queue(this[0],a):void 0===b?this:this.each(function(){var c=n.queue(this,a,b);n._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&n.dequeue(this,a)})},dequeue:function(a){return this.each(function(){n.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=n.Deferred(),f=this,g=this.length,h=function(){--d||e.resolveWith(f,[f])};"string"!=typeof a&&(b=a,a=void 0),a=a||"fx";while(g--)c=n._data(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}}),function(){var a;l.shrinkWrapBlocks=function(){if(null!=a)return a;a=!1;var b,c,e;return c=d.getElementsByTagName("body")[0],c&&c.style?(b=d.createElement("div"),e=d.createElement("div"),e.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(e).appendChild(b),"undefined"!=typeof b.style.zoom&&(b.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:1px;width:1px;zoom:1",b.appendChild(d.createElement("div")).style.width="5px",a=3!==b.offsetWidth),c.removeChild(e),a):void 0}}();var T=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,U=new RegExp("^(?:([+-])=|)("+T+")([a-z%]*)$","i"),V=["Top","Right","Bottom","Left"],W=function(a,b){return a=b||a,"none"===n.css(a,"display")||!n.contains(a.ownerDocument,a)};function X(a,b,c,d){var e,f=1,g=20,h=d?function(){return d.cur()}:function(){return n.css(a,b,"")},i=h(),j=c&&c[3]||(n.cssNumber[b]?"":"px"),k=(n.cssNumber[b]||"px"!==j&&+i)&&U.exec(n.css(a,b));if(k&&k[3]!==j){j=j||k[3],c=c||[],k=+i||1;do f=f||".5",k/=f,n.style(a,b,k+j);while(f!==(f=h()/i)&&1!==f&&--g)}return c&&(k=+k||+i||0,e=c[1]?k+(c[1]+1)*c[2]:+c[2],d&&(d.unit=j,d.start=k,d.end=e)),e}var Y=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===n.type(c)){e=!0;for(h in c)Y(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,n.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(n(a),c)})),b))for(;i>h;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},Z=/^(?:checkbox|radio)$/i,$=/<([\w:-]+)/,_=/^$|\/(?:java|ecma)script/i,aa=/^\s+/,ba="abbr|article|aside|audio|bdi|canvas|data|datalist|details|dialog|figcaption|figure|footer|header|hgroup|main|mark|meter|nav|output|picture|progress|section|summary|template|time|video";function ca(a){var b=ba.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}!function(){var a=d.createElement("div"),b=d.createDocumentFragment(),c=d.createElement("input");a.innerHTML=" <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",l.leadingWhitespace=3===a.firstChild.nodeType,l.tbody=!a.getElementsByTagName("tbody").length,l.htmlSerialize=!!a.getElementsByTagName("link").length,l.html5Clone="<:nav></:nav>"!==d.createElement("nav").cloneNode(!0).outerHTML,c.type="checkbox",c.checked=!0,b.appendChild(c),l.appendChecked=c.checked,a.innerHTML="<textarea>x</textarea>",l.noCloneChecked=!!a.cloneNode(!0).lastChild.defaultValue,b.appendChild(a),c=d.createElement("input"),c.setAttribute("type","radio"),c.setAttribute("checked","checked"),c.setAttribute("name","t"),a.appendChild(c),l.checkClone=a.cloneNode(!0).cloneNode(!0).lastChild.checked,l.noCloneEvent=!!a.addEventListener,a[n.expando]=1,l.attributes=!a.getAttribute(n.expando)}();var da={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:l.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]};da.optgroup=da.option,da.tbody=da.tfoot=da.colgroup=da.caption=da.thead,da.th=da.td;function ea(a,b){var c,d,e=0,f="undefined"!=typeof a.getElementsByTagName?a.getElementsByTagName(b||"*"):"undefined"!=typeof a.querySelectorAll?a.querySelectorAll(b||"*"):void 0;if(!f)for(f=[],c=a.childNodes||a;null!=(d=c[e]);e++)!b||n.nodeName(d,b)?f.push(d):n.merge(f,ea(d,b));return void 0===b||b&&n.nodeName(a,b)?n.merge([a],f):f}function fa(a,b){for(var c,d=0;null!=(c=a[d]);d++)n._data(c,"globalEval",!b||n._data(b[d],"globalEval"))}var ga=/<|&#?\w+;/,ha=/<tbody/i;function ia(a){Z.test(a.type)&&(a.defaultChecked=a.checked)}function ja(a,b,c,d,e){for(var f,g,h,i,j,k,m,o=a.length,p=ca(b),q=[],r=0;o>r;r++)if(g=a[r],g||0===g)if("object"===n.type(g))n.merge(q,g.nodeType?[g]:g);else if(ga.test(g)){i=i||p.appendChild(b.createElement("div")),j=($.exec(g)||["",""])[1].toLowerCase(),m=da[j]||da._default,i.innerHTML=m[1]+n.htmlPrefilter(g)+m[2],f=m[0];while(f--)i=i.lastChild;if(!l.leadingWhitespace&&aa.test(g)&&q.push(b.createTextNode(aa.exec(g)[0])),!l.tbody){g="table"!==j||ha.test(g)?"<table>"!==m[1]||ha.test(g)?0:i:i.firstChild,f=g&&g.childNodes.length;while(f--)n.nodeName(k=g.childNodes[f],"tbody")&&!k.childNodes.length&&g.removeChild(k)}n.merge(q,i.childNodes),i.textContent="";while(i.firstChild)i.removeChild(i.firstChild);i=p.lastChild}else q.push(b.createTextNode(g));i&&p.removeChild(i),l.appendChecked||n.grep(ea(q,"input"),ia),r=0;while(g=q[r++])if(d&&n.inArray(g,d)>-1)e&&e.push(g);else if(h=n.contains(g.ownerDocument,g),i=ea(p.appendChild(g),"script"),h&&fa(i),c){f=0;while(g=i[f++])_.test(g.type||"")&&c.push(g)}return i=null,p}!function(){var b,c,e=d.createElement("div");for(b in{submit:!0,change:!0,focusin:!0})c="on"+b,(l[b]=c in a)||(e.setAttribute(c,"t"),l[b]=e.attributes[c].expando===!1);e=null}();var ka=/^(?:input|select|textarea)$/i,la=/^key/,ma=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,na=/^(?:focusinfocus|focusoutblur)$/,oa=/^([^.]*)(?:\.(.+)|)/;function pa(){return!0}function qa(){return!1}function ra(){try{return d.activeElement}catch(a){}}function sa(a,b,c,d,e,f){var g,h;if("object"==typeof b){"string"!=typeof c&&(d=d||c,c=void 0);for(h in b)sa(a,h,c,d,b[h],f);return a}if(null==d&&null==e?(e=c,d=c=void 0):null==e&&("string"==typeof c?(e=d,d=void 0):(e=d,d=c,c=void 0)),e===!1)e=qa;else if(!e)return a;return 1===f&&(g=e,e=function(a){return n().off(a),g.apply(this,arguments)},e.guid=g.guid||(g.guid=n.guid++)),a.each(function(){n.event.add(this,b,e,d,c)})}n.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=n._data(a);if(r){c.handler&&(i=c,c=i.handler,e=i.selector),c.guid||(c.guid=n.guid++),(g=r.events)||(g=r.events={}),(k=r.handle)||(k=r.handle=function(a){return"undefined"==typeof n||a&&n.event.triggered===a.type?void 0:n.event.dispatch.apply(k.elem,arguments)},k.elem=a),b=(b||"").match(G)||[""],h=b.length;while(h--)f=oa.exec(b[h])||[],o=q=f[1],p=(f[2]||"").split(".").sort(),o&&(j=n.event.special[o]||{},o=(e?j.delegateType:j.bindType)||o,j=n.event.special[o]||{},l=n.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&n.expr.match.needsContext.test(e),namespace:p.join(".")},i),(m=g[o])||(m=g[o]=[],m.delegateCount=0,j.setup&&j.setup.call(a,d,p,k)!==!1||(a.addEventListener?a.addEventListener(o,k,!1):a.attachEvent&&a.attachEvent("on"+o,k))),j.add&&(j.add.call(a,l),l.handler.guid||(l.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,l):m.push(l),n.event.global[o]=!0);a=null}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=n.hasData(a)&&n._data(a);if(r&&(k=r.events)){b=(b||"").match(G)||[""],j=b.length;while(j--)if(h=oa.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=n.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,m=k[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),i=f=m.length;while(f--)g=m[f],!e&&q!==g.origType||c&&c.guid!==g.guid||h&&!h.test(g.namespace)||d&&d!==g.selector&&("**"!==d||!g.selector)||(m.splice(f,1),g.selector&&m.delegateCount--,l.remove&&l.remove.call(a,g));i&&!m.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||n.removeEvent(a,o,r.handle),delete k[o])}else for(o in k)n.event.remove(a,o+b[j],c,d,!0);n.isEmptyObject(k)&&(delete r.handle,n._removeData(a,"events"))}},trigger:function(b,c,e,f){var g,h,i,j,l,m,o,p=[e||d],q=k.call(b,"type")?b.type:b,r=k.call(b,"namespace")?b.namespace.split("."):[];if(i=m=e=e||d,3!==e.nodeType&&8!==e.nodeType&&!na.test(q+n.event.triggered)&&(q.indexOf(".")>-1&&(r=q.split("."),q=r.shift(),r.sort()),h=q.indexOf(":")<0&&"on"+q,b=b[n.expando]?b:new n.Event(q,"object"==typeof b&&b),b.isTrigger=f?2:3,b.namespace=r.join("."),b.rnamespace=b.namespace?new RegExp("(^|\\.)"+r.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=e),c=null==c?[b]:n.makeArray(c,[b]),l=n.event.special[q]||{},f||!l.trigger||l.trigger.apply(e,c)!==!1)){if(!f&&!l.noBubble&&!n.isWindow(e)){for(j=l.delegateType||q,na.test(j+q)||(i=i.parentNode);i;i=i.parentNode)p.push(i),m=i;m===(e.ownerDocument||d)&&p.push(m.defaultView||m.parentWindow||a)}o=0;while((i=p[o++])&&!b.isPropagationStopped())b.type=o>1?j:l.bindType||q,g=(n._data(i,"events")||{})[b.type]&&n._data(i,"handle"),g&&g.apply(i,c),g=h&&i[h],g&&g.apply&&M(i)&&(b.result=g.apply(i,c),b.result===!1&&b.preventDefault());if(b.type=q,!f&&!b.isDefaultPrevented()&&(!l._default||l._default.apply(p.pop(),c)===!1)&&M(e)&&h&&e[q]&&!n.isWindow(e)){m=e[h],m&&(e[h]=null),n.event.triggered=q;try{e[q]()}catch(s){}n.event.triggered=void 0,m&&(e[h]=m)}return b.result}},dispatch:function(a){a=n.event.fix(a);var b,c,d,f,g,h=[],i=e.call(arguments),j=(n._data(this,"events")||{})[a.type]||[],k=n.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=n.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,c=0;while((g=f.handlers[c++])&&!a.isImmediatePropagationStopped())a.rnamespace&&!a.rnamespace.test(g.namespace)||(a.handleObj=g,a.data=g.data,d=((n.event.special[g.origType]||{}).handle||g.handler).apply(f.elem,i),void 0!==d&&(a.result=d)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&("click"!==a.type||isNaN(a.button)||a.button<1))for(;i!=this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(d=[],c=0;h>c;c++)f=b[c],e=f.selector+" ",void 0===d[e]&&(d[e]=f.needsContext?n(e,this).index(i)>-1:n.find(e,this,null,[i]).length),d[e]&&d.push(f);d.length&&g.push({elem:i,handlers:d})}return h<b.length&&g.push({elem:this,handlers:b.slice(h)}),g},fix:function(a){if(a[n.expando])return a;var b,c,e,f=a.type,g=a,h=this.fixHooks[f];h||(this.fixHooks[f]=h=ma.test(f)?this.mouseHooks:la.test(f)?this.keyHooks:{}),e=h.props?this.props.concat(h.props):this.props,a=new n.Event(g),b=e.length;while(b--)c=e[b],a[c]=g[c];return a.target||(a.target=g.srcElement||d),3===a.target.nodeType&&(a.target=a.target.parentNode),a.metaKey=!!a.metaKey,h.filter?h.filter(a,g):a},props:"altKey bubbles cancelable ctrlKey currentTarget detail eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){return null==a.which&&(a.which=null!=b.charCode?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,b){var c,e,f,g=b.button,h=b.fromElement;return null==a.pageX&&null!=b.clientX&&(e=a.target.ownerDocument||d,f=e.documentElement,c=e.body,a.pageX=b.clientX+(f&&f.scrollLeft||c&&c.scrollLeft||0)-(f&&f.clientLeft||c&&c.clientLeft||0),a.pageY=b.clientY+(f&&f.scrollTop||c&&c.scrollTop||0)-(f&&f.clientTop||c&&c.clientTop||0)),!a.relatedTarget&&h&&(a.relatedTarget=h===a.target?b.toElement:h),a.which||void 0===g||(a.which=1&g?1:2&g?3:4&g?2:0),a}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==ra()&&this.focus)try{return this.focus(),!1}catch(a){}},delegateType:"focusin"},blur:{trigger:function(){return this===ra()&&this.blur?(this.blur(),!1):void 0},delegateType:"focusout"},click:{trigger:function(){return n.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):void 0},_default:function(a){return n.nodeName(a.target,"a")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&a.originalEvent&&(a.originalEvent.returnValue=a.result)}}},simulate:function(a,b,c){var d=n.extend(new n.Event,c,{type:a,isSimulated:!0});n.event.trigger(d,null,b),d.isDefaultPrevented()&&c.preventDefault()}},n.removeEvent=d.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c)}:function(a,b,c){var d="on"+b;a.detachEvent&&("undefined"==typeof a[d]&&(a[d]=null),a.detachEvent(d,c))},n.Event=function(a,b){return this instanceof n.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&a.returnValue===!1?pa:qa):this.type=a,b&&n.extend(this,b),this.timeStamp=a&&a.timeStamp||n.now(),void(this[n.expando]=!0)):new n.Event(a,b)},n.Event.prototype={constructor:n.Event,isDefaultPrevented:qa,isPropagationStopped:qa,isImmediatePropagationStopped:qa,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=pa,a&&(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=pa,a&&!this.isSimulated&&(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){var a=this.originalEvent;this.isImmediatePropagationStopped=pa,a&&a.stopImmediatePropagation&&a.stopImmediatePropagation(),this.stopPropagation()}},n.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(a,b){n.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return e&&(e===d||n.contains(d,e))||(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),l.submit||(n.event.special.submit={setup:function(){return n.nodeName(this,"form")?!1:void n.event.add(this,"click._submit keypress._submit",function(a){var b=a.target,c=n.nodeName(b,"input")||n.nodeName(b,"button")?n.prop(b,"form"):void 0;c&&!n._data(c,"submit")&&(n.event.add(c,"submit._submit",function(a){a._submitBubble=!0}),n._data(c,"submit",!0))})},postDispatch:function(a){a._submitBubble&&(delete a._submitBubble,this.parentNode&&!a.isTrigger&&n.event.simulate("submit",this.parentNode,a))},teardown:function(){return n.nodeName(this,"form")?!1:void n.event.remove(this,"._submit")}}),l.change||(n.event.special.change={setup:function(){return ka.test(this.nodeName)?("checkbox"!==this.type&&"radio"!==this.type||(n.event.add(this,"propertychange._change",function(a){"checked"===a.originalEvent.propertyName&&(this._justChanged=!0)}),n.event.add(this,"click._change",function(a){this._justChanged&&!a.isTrigger&&(this._justChanged=!1),n.event.simulate("change",this,a)})),!1):void n.event.add(this,"beforeactivate._change",function(a){var b=a.target;ka.test(b.nodeName)&&!n._data(b,"change")&&(n.event.add(b,"change._change",function(a){!this.parentNode||a.isSimulated||a.isTrigger||n.event.simulate("change",this.parentNode,a)}),n._data(b,"change",!0))})},handle:function(a){var b=a.target;return this!==b||a.isSimulated||a.isTrigger||"radio"!==b.type&&"checkbox"!==b.type?a.handleObj.handler.apply(this,arguments):void 0},teardown:function(){return n.event.remove(this,"._change"),!ka.test(this.nodeName)}}),l.focusin||n.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){n.event.simulate(b,a.target,n.event.fix(a))};n.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=n._data(d,b);e||d.addEventListener(a,c,!0),n._data(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=n._data(d,b)-1;e?n._data(d,b,e):(d.removeEventListener(a,c,!0),n._removeData(d,b))}}}),n.fn.extend({on:function(a,b,c,d){return sa(this,a,b,c,d)},one:function(a,b,c,d){return sa(this,a,b,c,d,1)},off:function(a,b,c){var d,e;if(a&&a.preventDefault&&a.handleObj)return d=a.handleObj,n(a.delegateTarget).off(d.namespace?d.origType+"."+d.namespace:d.origType,d.selector,d.handler),this;if("object"==typeof a){for(e in a)this.off(e,b,a[e]);return this}return b!==!1&&"function"!=typeof b||(c=b,b=void 0),c===!1&&(c=qa),this.each(function(){n.event.remove(this,a,c,b)})},trigger:function(a,b){return this.each(function(){n.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];return c?n.event.trigger(a,b,c,!0):void 0}});var ta=/ jQuery\d+="(?:null|\d+)"/g,ua=new RegExp("<(?:"+ba+")[\\s/>]","i"),va=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi,wa=/<script|<style|<link/i,xa=/checked\s*(?:[^=]|=\s*.checked.)/i,ya=/^true\/(.*)/,za=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,Aa=ca(d),Ba=Aa.appendChild(d.createElement("div"));function Ca(a,b){return n.nodeName(a,"table")&&n.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function Da(a){return a.type=(null!==n.find.attr(a,"type"))+"/"+a.type,a}function Ea(a){var b=ya.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function Fa(a,b){if(1===b.nodeType&&n.hasData(a)){var c,d,e,f=n._data(a),g=n._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;e>d;d++)n.event.add(b,c,h[c][d])}g.data&&(g.data=n.extend({},g.data))}}function Ga(a,b){var c,d,e;if(1===b.nodeType){if(c=b.nodeName.toLowerCase(),!l.noCloneEvent&&b[n.expando]){e=n._data(b);for(d in e.events)n.removeEvent(b,d,e.handle);b.removeAttribute(n.expando)}"script"===c&&b.text!==a.text?(Da(b).text=a.text,Ea(b)):"object"===c?(b.parentNode&&(b.outerHTML=a.outerHTML),l.html5Clone&&a.innerHTML&&!n.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):"input"===c&&Z.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):"option"===c?b.defaultSelected=b.selected=a.defaultSelected:"input"!==c&&"textarea"!==c||(b.defaultValue=a.defaultValue)}}function Ha(a,b,c,d){b=f.apply([],b);var e,g,h,i,j,k,m=0,o=a.length,p=o-1,q=b[0],r=n.isFunction(q);if(r||o>1&&"string"==typeof q&&!l.checkClone&&xa.test(q))return a.each(function(e){var f=a.eq(e);r&&(b[0]=q.call(this,e,f.html())),Ha(f,b,c,d)});if(o&&(k=ja(b,a[0].ownerDocument,!1,a,d),e=k.firstChild,1===k.childNodes.length&&(k=e),e||d)){for(i=n.map(ea(k,"script"),Da),h=i.length;o>m;m++)g=k,m!==p&&(g=n.clone(g,!0,!0),h&&n.merge(i,ea(g,"script"))),c.call(a[m],g,m);if(h)for(j=i[i.length-1].ownerDocument,n.map(i,Ea),m=0;h>m;m++)g=i[m],_.test(g.type||"")&&!n._data(g,"globalEval")&&n.contains(j,g)&&(g.src?n._evalUrl&&n._evalUrl(g.src):n.globalEval((g.text||g.textContent||g.innerHTML||"").replace(za,"")));k=e=null}return a}function Ia(a,b,c){for(var d,e=b?n.filter(b,a):a,f=0;null!=(d=e[f]);f++)c||1!==d.nodeType||n.cleanData(ea(d)),d.parentNode&&(c&&n.contains(d.ownerDocument,d)&&fa(ea(d,"script")),d.parentNode.removeChild(d));return a}n.extend({htmlPrefilter:function(a){return a.replace(va,"<$1></$2>")},clone:function(a,b,c){var d,e,f,g,h,i=n.contains(a.ownerDocument,a);if(l.html5Clone||n.isXMLDoc(a)||!ua.test("<"+a.nodeName+">")?f=a.cloneNode(!0):(Ba.innerHTML=a.outerHTML,Ba.removeChild(f=Ba.firstChild)),!(l.noCloneEvent&&l.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||n.isXMLDoc(a)))for(d=ea(f),h=ea(a),g=0;null!=(e=h[g]);++g)d[g]&&Ga(e,d[g]);if(b)if(c)for(h=h||ea(a),d=d||ea(f),g=0;null!=(e=h[g]);g++)Fa(e,d[g]);else Fa(a,f);return d=ea(f,"script"),d.length>0&&fa(d,!i&&ea(a,"script")),d=h=e=null,f},cleanData:function(a,b){for(var d,e,f,g,h=0,i=n.expando,j=n.cache,k=l.attributes,m=n.event.special;null!=(d=a[h]);h++)if((b||M(d))&&(f=d[i],g=f&&j[f])){if(g.events)for(e in g.events)m[e]?n.event.remove(d,e):n.removeEvent(d,e,g.handle);j[f]&&(delete j[f],k||"undefined"==typeof d.removeAttribute?d[i]=void 0:d.removeAttribute(i),c.push(f))}}}),n.fn.extend({domManip:Ha,detach:function(a){return Ia(this,a,!0)},remove:function(a){return Ia(this,a)},text:function(a){return Y(this,function(a){return void 0===a?n.text(this):this.empty().append((this[0]&&this[0].ownerDocument||d).createTextNode(a))},null,a,arguments.length)},append:function(){return Ha(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=Ca(this,a);b.appendChild(a)}})},prepend:function(){return Ha(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=Ca(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return Ha(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return Ha(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},empty:function(){for(var a,b=0;null!=(a=this[b]);b++){1===a.nodeType&&n.cleanData(ea(a,!1));while(a.firstChild)a.removeChild(a.firstChild);a.options&&n.nodeName(a,"select")&&(a.options.length=0)}return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return n.clone(this,a,b)})},html:function(a){return Y(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a)return 1===b.nodeType?b.innerHTML.replace(ta,""):void 0;if("string"==typeof a&&!wa.test(a)&&(l.htmlSerialize||!ua.test(a))&&(l.leadingWhitespace||!aa.test(a))&&!da[($.exec(a)||["",""])[1].toLowerCase()]){a=n.htmlPrefilter(a);try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(n.cleanData(ea(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=[];return Ha(this,arguments,function(b){var c=this.parentNode;n.inArray(this,a)<0&&(n.cleanData(ea(this)),c&&c.replaceChild(b,this))},a)}}),n.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){n.fn[a]=function(a){for(var c,d=0,e=[],f=n(a),h=f.length-1;h>=d;d++)c=d===h?this:this.clone(!0),n(f[d])[b](c),g.apply(e,c.get());return this.pushStack(e)}});var Ja,Ka={HTML:"block",BODY:"block"};function La(a,b){var c=n(b.createElement(a)).appendTo(b.body),d=n.css(c[0],"display");return c.detach(),d}function Ma(a){var b=d,c=Ka[a];return c||(c=La(a,b),"none"!==c&&c||(Ja=(Ja||n("<iframe frameborder='0' width='0' height='0'/>")).appendTo(b.documentElement),b=(Ja[0].contentWindow||Ja[0].contentDocument).document,b.write(),b.close(),c=La(a,b),Ja.detach()),Ka[a]=c),c}var Na=/^margin/,Oa=new RegExp("^("+T+")(?!px)[a-z%]+$","i"),Pa=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e},Qa=d.documentElement;!function(){var b,c,e,f,g,h,i=d.createElement("div"),j=d.createElement("div");if(j.style){j.style.cssText="float:left;opacity:.5",l.opacity="0.5"===j.style.opacity,l.cssFloat=!!j.style.cssFloat,j.style.backgroundClip="content-box",j.cloneNode(!0).style.backgroundClip="",l.clearCloneStyle="content-box"===j.style.backgroundClip,i=d.createElement("div"),i.style.cssText="border:0;width:8px;height:0;top:0;left:-9999px;padding:0;margin-top:1px;position:absolute",j.innerHTML="",i.appendChild(j),l.boxSizing=""===j.style.boxSizing||""===j.style.MozBoxSizing||""===j.style.WebkitBoxSizing,n.extend(l,{reliableHiddenOffsets:function(){return null==b&&k(),f},boxSizingReliable:function(){return null==b&&k(),e},pixelMarginRight:function(){return null==b&&k(),c},pixelPosition:function(){return null==b&&k(),b},reliableMarginRight:function(){return null==b&&k(),g},reliableMarginLeft:function(){return null==b&&k(),h}});function k(){var k,l,m=d.documentElement;m.appendChild(i),j.style.cssText="-webkit-box-sizing:border-box;box-sizing:border-box;position:relative;display:block;margin:auto;border:1px;padding:1px;top:1%;width:50%",b=e=h=!1,c=g=!0,a.getComputedStyle&&(l=a.getComputedStyle(j),b="1%"!==(l||{}).top,h="2px"===(l||{}).marginLeft,e="4px"===(l||{width:"4px"}).width,j.style.marginRight="50%",c="4px"===(l||{marginRight:"4px"}).marginRight,k=j.appendChild(d.createElement("div")),k.style.cssText=j.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:0",k.style.marginRight=k.style.width="0",j.style.width="1px",g=!parseFloat((a.getComputedStyle(k)||{}).marginRight),j.removeChild(k)),j.style.display="none",f=0===j.getClientRects().length,f&&(j.style.display="",j.innerHTML="<table><tr><td></td><td>t</td></tr></table>",j.childNodes[0].style.borderCollapse="separate",k=j.getElementsByTagName("td"),k[0].style.cssText="margin:0;border:0;padding:0;display:none",f=0===k[0].offsetHeight,f&&(k[0].style.display="",k[1].style.display="none",f=0===k[0].offsetHeight)),m.removeChild(i)}}}();var Ra,Sa,Ta=/^(top|right|bottom|left)$/;a.getComputedStyle?(Ra=function(b){var c=b.ownerDocument.defaultView;return c&&c.opener||(c=a),c.getComputedStyle(b)},Sa=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Ra(a),g=c?c.getPropertyValue(b)||c[b]:void 0,""!==g&&void 0!==g||n.contains(a.ownerDocument,a)||(g=n.style(a,b)),c&&!l.pixelMarginRight()&&Oa.test(g)&&Na.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f),void 0===g?g:g+""}):Qa.currentStyle&&(Ra=function(a){return a.currentStyle},Sa=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Ra(a),g=c?c[b]:void 0,null==g&&h&&h[b]&&(g=h[b]),Oa.test(g)&&!Ta.test(b)&&(d=h.left,e=a.runtimeStyle,f=e&&e.left,f&&(e.left=a.currentStyle.left),h.left="fontSize"===b?"1em":g,g=h.pixelLeft+"px",h.left=d,f&&(e.left=f)),void 0===g?g:g+""||"auto"});function Ua(a,b){return{get:function(){return a()?void delete this.get:(this.get=b).apply(this,arguments)}}}var Va=/alpha\([^)]*\)/i,Wa=/opacity\s*=\s*([^)]*)/i,Xa=/^(none|table(?!-c[ea]).+)/,Ya=new RegExp("^("+T+")(.*)$","i"),Za={position:"absolute",visibility:"hidden",display:"block"},$a={letterSpacing:"0",fontWeight:"400"},_a=["Webkit","O","Moz","ms"],ab=d.createElement("div").style;function bb(a){if(a in ab)return a;var b=a.charAt(0).toUpperCase()+a.slice(1),c=_a.length;while(c--)if(a=_a[c]+b,a in ab)return a}function cb(a,b){for(var c,d,e,f=[],g=0,h=a.length;h>g;g++)d=a[g],d.style&&(f[g]=n._data(d,"olddisplay"),c=d.style.display,b?(f[g]||"none"!==c||(d.style.display=""),""===d.style.display&&W(d)&&(f[g]=n._data(d,"olddisplay",Ma(d.nodeName)))):(e=W(d),(c&&"none"!==c||!e)&&n._data(d,"olddisplay",e?c:n.css(d,"display"))));for(g=0;h>g;g++)d=a[g],d.style&&(b&&"none"!==d.style.display&&""!==d.style.display||(d.style.display=b?f[g]||"":"none"));return a}function db(a,b,c){var d=Ya.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function eb(a,b,c,d,e){for(var f=c===(d?"border":"content")?4:"width"===b?1:0,g=0;4>f;f+=2)"margin"===c&&(g+=n.css(a,c+V[f],!0,e)),d?("content"===c&&(g-=n.css(a,"padding"+V[f],!0,e)),"margin"!==c&&(g-=n.css(a,"border"+V[f]+"Width",!0,e))):(g+=n.css(a,"padding"+V[f],!0,e),"padding"!==c&&(g+=n.css(a,"border"+V[f]+"Width",!0,e)));return g}function fb(a,b,c){var d=!0,e="width"===b?a.offsetWidth:a.offsetHeight,f=Ra(a),g=l.boxSizing&&"border-box"===n.css(a,"boxSizing",!1,f);if(0>=e||null==e){if(e=Sa(a,b,f),(0>e||null==e)&&(e=a.style[b]),Oa.test(e))return e;d=g&&(l.boxSizingReliable()||e===a.style[b]),e=parseFloat(e)||0}return e+eb(a,b,c||(g?"border":"content"),d,f)+"px"}n.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=Sa(a,"opacity");return""===c?"1":c}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":l.cssFloat?"cssFloat":"styleFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=n.camelCase(b),i=a.style;if(b=n.cssProps[h]||(n.cssProps[h]=bb(h)||h),g=n.cssHooks[b]||n.cssHooks[h],void 0===c)return g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:i[b];if(f=typeof c,"string"===f&&(e=U.exec(c))&&e[1]&&(c=X(a,b,e),f="number"),null!=c&&c===c&&("number"===f&&(c+=e&&e[3]||(n.cssNumber[h]?"":"px")),l.clearCloneStyle||""!==c||0!==b.indexOf("background")||(i[b]="inherit"),!(g&&"set"in g&&void 0===(c=g.set(a,c,d)))))try{i[b]=c}catch(j){}}},css:function(a,b,c,d){var e,f,g,h=n.camelCase(b);return b=n.cssProps[h]||(n.cssProps[h]=bb(h)||h),g=n.cssHooks[b]||n.cssHooks[h],g&&"get"in g&&(f=g.get(a,!0,c)),void 0===f&&(f=Sa(a,b,d)),"normal"===f&&b in $a&&(f=$a[b]),""===c||c?(e=parseFloat(f),c===!0||isFinite(e)?e||0:f):f}}),n.each(["height","width"],function(a,b){n.cssHooks[b]={get:function(a,c,d){return c?Xa.test(n.css(a,"display"))&&0===a.offsetWidth?Pa(a,Za,function(){return fb(a,b,d)}):fb(a,b,d):void 0},set:function(a,c,d){var e=d&&Ra(a);return db(a,c,d?eb(a,b,d,l.boxSizing&&"border-box"===n.css(a,"boxSizing",!1,e),e):0)}}}),l.opacity||(n.cssHooks.opacity={get:function(a,b){return Wa.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=n.isNumeric(b)?"alpha(opacity="+100*b+")":"",f=d&&d.filter||c.filter||"";c.zoom=1,(b>=1||""===b)&&""===n.trim(f.replace(Va,""))&&c.removeAttribute&&(c.removeAttribute("filter"),""===b||d&&!d.filter)||(c.filter=Va.test(f)?f.replace(Va,e):f+" "+e)}}),n.cssHooks.marginRight=Ua(l.reliableMarginRight,function(a,b){return b?Pa(a,{display:"inline-block"},Sa,[a,"marginRight"]):void 0}),n.cssHooks.marginLeft=Ua(l.reliableMarginLeft,function(a,b){return b?(parseFloat(Sa(a,"marginLeft"))||(n.contains(a.ownerDocument,a)?a.getBoundingClientRect().left-Pa(a,{
+marginLeft:0},function(){return a.getBoundingClientRect().left}):0))+"px":void 0}),n.each({margin:"",padding:"",border:"Width"},function(a,b){n.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];4>d;d++)e[a+V[d]+b]=f[d]||f[d-2]||f[0];return e}},Na.test(a)||(n.cssHooks[a+b].set=db)}),n.fn.extend({css:function(a,b){return Y(this,function(a,b,c){var d,e,f={},g=0;if(n.isArray(b)){for(d=Ra(a),e=b.length;e>g;g++)f[b[g]]=n.css(a,b[g],!1,d);return f}return void 0!==c?n.style(a,b,c):n.css(a,b)},a,b,arguments.length>1)},show:function(){return cb(this,!0)},hide:function(){return cb(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){W(this)?n(this).show():n(this).hide()})}});function gb(a,b,c,d,e){return new gb.prototype.init(a,b,c,d,e)}n.Tween=gb,gb.prototype={constructor:gb,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||n.easing._default,this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(n.cssNumber[c]?"":"px")},cur:function(){var a=gb.propHooks[this.prop];return a&&a.get?a.get(this):gb.propHooks._default.get(this)},run:function(a){var b,c=gb.propHooks[this.prop];return this.options.duration?this.pos=b=n.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):this.pos=b=a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):gb.propHooks._default.set(this),this}},gb.prototype.init.prototype=gb.prototype,gb.propHooks={_default:{get:function(a){var b;return 1!==a.elem.nodeType||null!=a.elem[a.prop]&&null==a.elem.style[a.prop]?a.elem[a.prop]:(b=n.css(a.elem,a.prop,""),b&&"auto"!==b?b:0)},set:function(a){n.fx.step[a.prop]?n.fx.step[a.prop](a):1!==a.elem.nodeType||null==a.elem.style[n.cssProps[a.prop]]&&!n.cssHooks[a.prop]?a.elem[a.prop]=a.now:n.style(a.elem,a.prop,a.now+a.unit)}}},gb.propHooks.scrollTop=gb.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},n.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2},_default:"swing"},n.fx=gb.prototype.init,n.fx.step={};var hb,ib,jb=/^(?:toggle|show|hide)$/,kb=/queueHooks$/;function lb(){return a.setTimeout(function(){hb=void 0}),hb=n.now()}function mb(a,b){var c,d={height:a},e=0;for(b=b?1:0;4>e;e+=2-b)c=V[e],d["margin"+c]=d["padding"+c]=a;return b&&(d.opacity=d.width=a),d}function nb(a,b,c){for(var d,e=(qb.tweeners[b]||[]).concat(qb.tweeners["*"]),f=0,g=e.length;g>f;f++)if(d=e[f].call(c,b,a))return d}function ob(a,b,c){var d,e,f,g,h,i,j,k,m=this,o={},p=a.style,q=a.nodeType&&W(a),r=n._data(a,"fxshow");c.queue||(h=n._queueHooks(a,"fx"),null==h.unqueued&&(h.unqueued=0,i=h.empty.fire,h.empty.fire=function(){h.unqueued||i()}),h.unqueued++,m.always(function(){m.always(function(){h.unqueued--,n.queue(a,"fx").length||h.empty.fire()})})),1===a.nodeType&&("height"in b||"width"in b)&&(c.overflow=[p.overflow,p.overflowX,p.overflowY],j=n.css(a,"display"),k="none"===j?n._data(a,"olddisplay")||Ma(a.nodeName):j,"inline"===k&&"none"===n.css(a,"float")&&(l.inlineBlockNeedsLayout&&"inline"!==Ma(a.nodeName)?p.zoom=1:p.display="inline-block")),c.overflow&&(p.overflow="hidden",l.shrinkWrapBlocks()||m.always(function(){p.overflow=c.overflow[0],p.overflowX=c.overflow[1],p.overflowY=c.overflow[2]}));for(d in b)if(e=b[d],jb.exec(e)){if(delete b[d],f=f||"toggle"===e,e===(q?"hide":"show")){if("show"!==e||!r||void 0===r[d])continue;q=!0}o[d]=r&&r[d]||n.style(a,d)}else j=void 0;if(n.isEmptyObject(o))"inline"===("none"===j?Ma(a.nodeName):j)&&(p.display=j);else{r?"hidden"in r&&(q=r.hidden):r=n._data(a,"fxshow",{}),f&&(r.hidden=!q),q?n(a).show():m.done(function(){n(a).hide()}),m.done(function(){var b;n._removeData(a,"fxshow");for(b in o)n.style(a,b,o[b])});for(d in o)g=nb(q?r[d]:0,d,m),d in r||(r[d]=g.start,q&&(g.end=g.start,g.start="width"===d||"height"===d?1:0))}}function pb(a,b){var c,d,e,f,g;for(c in a)if(d=n.camelCase(c),e=b[d],f=a[c],n.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=n.cssHooks[d],g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function qb(a,b,c){var d,e,f=0,g=qb.prefilters.length,h=n.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=hb||lb(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;i>g;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),1>f&&i?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:n.extend({},b),opts:n.extend(!0,{specialEasing:{},easing:n.easing._default},c),originalProperties:b,originalOptions:c,startTime:hb||lb(),duration:c.duration,tweens:[],createTween:function(b,c){var d=n.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(d),d},stop:function(b){var c=0,d=b?j.tweens.length:0;if(e)return this;for(e=!0;d>c;c++)j.tweens[c].run(1);return b?(h.notifyWith(a,[j,1,0]),h.resolveWith(a,[j,b])):h.rejectWith(a,[j,b]),this}}),k=j.props;for(pb(k,j.opts.specialEasing);g>f;f++)if(d=qb.prefilters[f].call(j,a,k,j.opts))return n.isFunction(d.stop)&&(n._queueHooks(j.elem,j.opts.queue).stop=n.proxy(d.stop,d)),d;return n.map(k,nb,j),n.isFunction(j.opts.start)&&j.opts.start.call(a,j),n.fx.timer(n.extend(i,{elem:a,anim:j,queue:j.opts.queue})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}n.Animation=n.extend(qb,{tweeners:{"*":[function(a,b){var c=this.createTween(a,b);return X(c.elem,a,U.exec(b),c),c}]},tweener:function(a,b){n.isFunction(a)?(b=a,a=["*"]):a=a.match(G);for(var c,d=0,e=a.length;e>d;d++)c=a[d],qb.tweeners[c]=qb.tweeners[c]||[],qb.tweeners[c].unshift(b)},prefilters:[ob],prefilter:function(a,b){b?qb.prefilters.unshift(a):qb.prefilters.push(a)}}),n.speed=function(a,b,c){var d=a&&"object"==typeof a?n.extend({},a):{complete:c||!c&&b||n.isFunction(a)&&a,duration:a,easing:c&&b||b&&!n.isFunction(b)&&b};return d.duration=n.fx.off?0:"number"==typeof d.duration?d.duration:d.duration in n.fx.speeds?n.fx.speeds[d.duration]:n.fx.speeds._default,null!=d.queue&&d.queue!==!0||(d.queue="fx"),d.old=d.complete,d.complete=function(){n.isFunction(d.old)&&d.old.call(this),d.queue&&n.dequeue(this,d.queue)},d},n.fn.extend({fadeTo:function(a,b,c,d){return this.filter(W).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=n.isEmptyObject(a),f=n.speed(b,c,d),g=function(){var b=qb(this,n.extend({},a),f);(e||n._data(this,"finish"))&&b.stop(!0)};return g.finish=g,e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,b,c){var d=function(a){var b=a.stop;delete a.stop,b(c)};return"string"!=typeof a&&(c=b,b=a,a=void 0),b&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,e=null!=a&&a+"queueHooks",f=n.timers,g=n._data(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&kb.test(e)&&d(g[e]);for(e=f.length;e--;)f[e].elem!==this||null!=a&&f[e].queue!==a||(f[e].anim.stop(c),b=!1,f.splice(e,1));!b&&c||n.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=n._data(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=n.timers,g=d?d.length:0;for(c.finish=!0,n.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;g>b;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),n.each(["toggle","show","hide"],function(a,b){var c=n.fn[b];n.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(mb(b,!0),a,d,e)}}),n.each({slideDown:mb("show"),slideUp:mb("hide"),slideToggle:mb("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){n.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),n.timers=[],n.fx.tick=function(){var a,b=n.timers,c=0;for(hb=n.now();c<b.length;c++)a=b[c],a()||b[c]!==a||b.splice(c--,1);b.length||n.fx.stop(),hb=void 0},n.fx.timer=function(a){n.timers.push(a),a()?n.fx.start():n.timers.pop()},n.fx.interval=13,n.fx.start=function(){ib||(ib=a.setInterval(n.fx.tick,n.fx.interval))},n.fx.stop=function(){a.clearInterval(ib),ib=null},n.fx.speeds={slow:600,fast:200,_default:400},n.fn.delay=function(b,c){return b=n.fx?n.fx.speeds[b]||b:b,c=c||"fx",this.queue(c,function(c,d){var e=a.setTimeout(c,b);d.stop=function(){a.clearTimeout(e)}})},function(){var a,b=d.createElement("input"),c=d.createElement("div"),e=d.createElement("select"),f=e.appendChild(d.createElement("option"));c=d.createElement("div"),c.setAttribute("className","t"),c.innerHTML=" <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",a=c.getElementsByTagName("a")[0],b.setAttribute("type","checkbox"),c.appendChild(b),a=c.getElementsByTagName("a")[0],a.style.cssText="top:1px",l.getSetAttribute="t"!==c.className,l.style=/top/.test(a.getAttribute("style")),l.hrefNormalized="/a"===a.getAttribute("href"),l.checkOn=!!b.value,l.optSelected=f.selected,l.enctype=!!d.createElement("form").enctype,e.disabled=!0,l.optDisabled=!f.disabled,b=d.createElement("input"),b.setAttribute("value",""),l.input=""===b.getAttribute("value"),b.value="t",b.setAttribute("type","radio"),l.radioValue="t"===b.value}();var rb=/\r/g,sb=/[\x20\t\r\n\f]+/g;n.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=n.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,n(this).val()):a,null==e?e="":"number"==typeof e?e+="":n.isArray(e)&&(e=n.map(e,function(a){return null==a?"":a+""})),b=n.valHooks[this.type]||n.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=n.valHooks[e.type]||n.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(rb,""):null==c?"":c)}}}),n.extend({valHooks:{option:{get:function(a){var b=n.find.attr(a,"value");return null!=b?b:n.trim(n.text(a)).replace(sb," ")}},select:{get:function(a){for(var b,c,d=a.options,e=a.selectedIndex,f="select-one"===a.type||0>e,g=f?null:[],h=f?e+1:d.length,i=0>e?h:f?e:0;h>i;i++)if(c=d[i],(c.selected||i===e)&&(l.optDisabled?!c.disabled:null===c.getAttribute("disabled"))&&(!c.parentNode.disabled||!n.nodeName(c.parentNode,"optgroup"))){if(b=n(c).val(),f)return b;g.push(b)}return g},set:function(a,b){var c,d,e=a.options,f=n.makeArray(b),g=e.length;while(g--)if(d=e[g],n.inArray(n.valHooks.option.get(d),f)>-1)try{d.selected=c=!0}catch(h){d.scrollHeight}else d.selected=!1;return c||(a.selectedIndex=-1),e}}}}),n.each(["radio","checkbox"],function(){n.valHooks[this]={set:function(a,b){return n.isArray(b)?a.checked=n.inArray(n(a).val(),b)>-1:void 0}},l.checkOn||(n.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})});var tb,ub,vb=n.expr.attrHandle,wb=/^(?:checked|selected)$/i,xb=l.getSetAttribute,yb=l.input;n.fn.extend({attr:function(a,b){return Y(this,n.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){n.removeAttr(this,a)})}}),n.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(3!==f&&8!==f&&2!==f)return"undefined"==typeof a.getAttribute?n.prop(a,b,c):(1===f&&n.isXMLDoc(a)||(b=b.toLowerCase(),e=n.attrHooks[b]||(n.expr.match.bool.test(b)?ub:tb)),void 0!==c?null===c?void n.removeAttr(a,b):e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:(a.setAttribute(b,c+""),c):e&&"get"in e&&null!==(d=e.get(a,b))?d:(d=n.find.attr(a,b),null==d?void 0:d))},attrHooks:{type:{set:function(a,b){if(!l.radioValue&&"radio"===b&&n.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}},removeAttr:function(a,b){var c,d,e=0,f=b&&b.match(G);if(f&&1===a.nodeType)while(c=f[e++])d=n.propFix[c]||c,n.expr.match.bool.test(c)?yb&&xb||!wb.test(c)?a[d]=!1:a[n.camelCase("default-"+c)]=a[d]=!1:n.attr(a,c,""),a.removeAttribute(xb?c:d)}}),ub={set:function(a,b,c){return b===!1?n.removeAttr(a,c):yb&&xb||!wb.test(c)?a.setAttribute(!xb&&n.propFix[c]||c,c):a[n.camelCase("default-"+c)]=a[c]=!0,c}},n.each(n.expr.match.bool.source.match(/\w+/g),function(a,b){var c=vb[b]||n.find.attr;yb&&xb||!wb.test(b)?vb[b]=function(a,b,d){var e,f;return d||(f=vb[b],vb[b]=e,e=null!=c(a,b,d)?b.toLowerCase():null,vb[b]=f),e}:vb[b]=function(a,b,c){return c?void 0:a[n.camelCase("default-"+b)]?b.toLowerCase():null}}),yb&&xb||(n.attrHooks.value={set:function(a,b,c){return n.nodeName(a,"input")?void(a.defaultValue=b):tb&&tb.set(a,b,c)}}),xb||(tb={set:function(a,b,c){var d=a.getAttributeNode(c);return d||a.setAttributeNode(d=a.ownerDocument.createAttribute(c)),d.value=b+="","value"===c||b===a.getAttribute(c)?b:void 0}},vb.id=vb.name=vb.coords=function(a,b,c){var d;return c?void 0:(d=a.getAttributeNode(b))&&""!==d.value?d.value:null},n.valHooks.button={get:function(a,b){var c=a.getAttributeNode(b);return c&&c.specified?c.value:void 0},set:tb.set},n.attrHooks.contenteditable={set:function(a,b,c){tb.set(a,""===b?!1:b,c)}},n.each(["width","height"],function(a,b){n.attrHooks[b]={set:function(a,c){return""===c?(a.setAttribute(b,"auto"),c):void 0}}})),l.style||(n.attrHooks.style={get:function(a){return a.style.cssText||void 0},set:function(a,b){return a.style.cssText=b+""}});var zb=/^(?:input|select|textarea|button|object)$/i,Ab=/^(?:a|area)$/i;n.fn.extend({prop:function(a,b){return Y(this,n.prop,a,b,arguments.length>1)},removeProp:function(a){return a=n.propFix[a]||a,this.each(function(){try{this[a]=void 0,delete this[a]}catch(b){}})}}),n.extend({prop:function(a,b,c){var d,e,f=a.nodeType;if(3!==f&&8!==f&&2!==f)return 1===f&&n.isXMLDoc(a)||(b=n.propFix[b]||b,e=n.propHooks[b]),void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){var b=n.find.attr(a,"tabindex");return b?parseInt(b,10):zb.test(a.nodeName)||Ab.test(a.nodeName)&&a.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),l.hrefNormalized||n.each(["href","src"],function(a,b){n.propHooks[b]={get:function(a){return a.getAttribute(b,4)}}}),l.optSelected||(n.propHooks.selected={get:function(a){var b=a.parentNode;return b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex),null},set:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex)}}),n.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){n.propFix[this.toLowerCase()]=this}),l.enctype||(n.propFix.enctype="encoding");var Bb=/[\t\r\n\f]/g;function Cb(a){return n.attr(a,"class")||""}n.fn.extend({addClass:function(a){var b,c,d,e,f,g,h,i=0;if(n.isFunction(a))return this.each(function(b){n(this).addClass(a.call(this,b,Cb(this)))});if("string"==typeof a&&a){b=a.match(G)||[];while(c=this[i++])if(e=Cb(c),d=1===c.nodeType&&(" "+e+" ").replace(Bb," ")){g=0;while(f=b[g++])d.indexOf(" "+f+" ")<0&&(d+=f+" ");h=n.trim(d),e!==h&&n.attr(c,"class",h)}}return this},removeClass:function(a){var b,c,d,e,f,g,h,i=0;if(n.isFunction(a))return this.each(function(b){n(this).removeClass(a.call(this,b,Cb(this)))});if(!arguments.length)return this.attr("class","");if("string"==typeof a&&a){b=a.match(G)||[];while(c=this[i++])if(e=Cb(c),d=1===c.nodeType&&(" "+e+" ").replace(Bb," ")){g=0;while(f=b[g++])while(d.indexOf(" "+f+" ")>-1)d=d.replace(" "+f+" "," ");h=n.trim(d),e!==h&&n.attr(c,"class",h)}}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):n.isFunction(a)?this.each(function(c){n(this).toggleClass(a.call(this,c,Cb(this),b),b)}):this.each(function(){var b,d,e,f;if("string"===c){d=0,e=n(this),f=a.match(G)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else void 0!==a&&"boolean"!==c||(b=Cb(this),b&&n._data(this,"__className__",b),n.attr(this,"class",b||a===!1?"":n._data(this,"__className__")||""))})},hasClass:function(a){var b,c,d=0;b=" "+a+" ";while(c=this[d++])if(1===c.nodeType&&(" "+Cb(c)+" ").replace(Bb," ").indexOf(b)>-1)return!0;return!1}}),n.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){n.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),n.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}});var Db=a.location,Eb=n.now(),Fb=/\?/,Gb=/(,)|(\[|{)|(}|])|"(?:[^"\\\r\n]|\\["\\\/bfnrt]|\\u[\da-fA-F]{4})*"\s*:?|true|false|null|-?(?!0\d)\d+(?:\.\d+|)(?:[eE][+-]?\d+|)/g;n.parseJSON=function(b){if(a.JSON&&a.JSON.parse)return a.JSON.parse(b+"");var c,d=null,e=n.trim(b+"");return e&&!n.trim(e.replace(Gb,function(a,b,e,f){return c&&b&&(d=0),0===d?a:(c=e||b,d+=!f-!e,"")}))?Function("return "+e)():n.error("Invalid JSON: "+b)},n.parseXML=function(b){var c,d;if(!b||"string"!=typeof b)return null;try{a.DOMParser?(d=new a.DOMParser,c=d.parseFromString(b,"text/xml")):(c=new a.ActiveXObject("Microsoft.XMLDOM"),c.async="false",c.loadXML(b))}catch(e){c=void 0}return c&&c.documentElement&&!c.getElementsByTagName("parsererror").length||n.error("Invalid XML: "+b),c};var Hb=/#.*$/,Ib=/([?&])_=[^&]*/,Jb=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Kb=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Lb=/^(?:GET|HEAD)$/,Mb=/^\/\//,Nb=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,Ob={},Pb={},Qb="*/".concat("*"),Rb=Db.href,Sb=Nb.exec(Rb.toLowerCase())||[];function Tb(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(G)||[];if(n.isFunction(c))while(d=f[e++])"+"===d.charAt(0)?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function Ub(a,b,c,d){var e={},f=a===Pb;function g(h){var i;return e[h]=!0,n.each(a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||f||e[j]?f?!(i=j):void 0:(b.dataTypes.unshift(j),g(j),!1)}),i}return g(b.dataTypes[0])||!e["*"]&&g("*")}function Vb(a,b){var c,d,e=n.ajaxSettings.flatOptions||{};for(d in b)void 0!==b[d]&&((e[d]?a:c||(c={}))[d]=b[d]);return c&&n.extend(!0,a,c),a}function Wb(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while("*"===i[0])i.shift(),void 0===e&&(e=a.mimeType||b.getResponseHeader("Content-Type"));if(e)for(g in h)if(h[g]&&h[g].test(e)){i.unshift(g);break}if(i[0]in c)f=i[0];else{for(g in c){if(!i[0]||a.converters[g+" "+i[0]]){f=g;break}d||(d=g)}f=f||d}return f?(f!==i[0]&&i.unshift(f),c[f]):void 0}function Xb(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];f=k.shift();while(f)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)for(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}n.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Rb,type:"GET",isLocal:Kb.test(Sb[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Qb,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":n.parseJSON,"text xml":n.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?Vb(Vb(a,n.ajaxSettings),b):Vb(n.ajaxSettings,a)},ajaxPrefilter:Tb(Ob),ajaxTransport:Tb(Pb),ajax:function(b,c){"object"==typeof b&&(c=b,b=void 0),c=c||{};var d,e,f,g,h,i,j,k,l=n.ajaxSetup({},c),m=l.context||l,o=l.context&&(m.nodeType||m.jquery)?n(m):n.event,p=n.Deferred(),q=n.Callbacks("once memory"),r=l.statusCode||{},s={},t={},u=0,v="canceled",w={readyState:0,getResponseHeader:function(a){var b;if(2===u){if(!k){k={};while(b=Jb.exec(g))k[b[1].toLowerCase()]=b[2]}b=k[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return 2===u?g:null},setRequestHeader:function(a,b){var c=a.toLowerCase();return u||(a=t[c]=t[c]||a,s[a]=b),this},overrideMimeType:function(a){return u||(l.mimeType=a),this},statusCode:function(a){var b;if(a)if(2>u)for(b in a)r[b]=[r[b],a[b]];else w.always(a[w.status]);return this},abort:function(a){var b=a||v;return j&&j.abort(b),y(0,b),this}};if(p.promise(w).complete=q.add,w.success=w.done,w.error=w.fail,l.url=((b||l.url||Rb)+"").replace(Hb,"").replace(Mb,Sb[1]+"//"),l.type=c.method||c.type||l.method||l.type,l.dataTypes=n.trim(l.dataType||"*").toLowerCase().match(G)||[""],null==l.crossDomain&&(d=Nb.exec(l.url.toLowerCase()),l.crossDomain=!(!d||d[1]===Sb[1]&&d[2]===Sb[2]&&(d[3]||("http:"===d[1]?"80":"443"))===(Sb[3]||("http:"===Sb[1]?"80":"443")))),l.data&&l.processData&&"string"!=typeof l.data&&(l.data=n.param(l.data,l.traditional)),Ub(Ob,l,c,w),2===u)return w;i=n.event&&l.global,i&&0===n.active++&&n.event.trigger("ajaxStart"),l.type=l.type.toUpperCase(),l.hasContent=!Lb.test(l.type),f=l.url,l.hasContent||(l.data&&(f=l.url+=(Fb.test(f)?"&":"?")+l.data,delete l.data),l.cache===!1&&(l.url=Ib.test(f)?f.replace(Ib,"$1_="+Eb++):f+(Fb.test(f)?"&":"?")+"_="+Eb++)),l.ifModified&&(n.lastModified[f]&&w.setRequestHeader("If-Modified-Since",n.lastModified[f]),n.etag[f]&&w.setRequestHeader("If-None-Match",n.etag[f])),(l.data&&l.hasContent&&l.contentType!==!1||c.contentType)&&w.setRequestHeader("Content-Type",l.contentType),w.setRequestHeader("Accept",l.dataTypes[0]&&l.accepts[l.dataTypes[0]]?l.accepts[l.dataTypes[0]]+("*"!==l.dataTypes[0]?", "+Qb+"; q=0.01":""):l.accepts["*"]);for(e in l.headers)w.setRequestHeader(e,l.headers[e]);if(l.beforeSend&&(l.beforeSend.call(m,w,l)===!1||2===u))return w.abort();v="abort";for(e in{success:1,error:1,complete:1})w[e](l[e]);if(j=Ub(Pb,l,c,w)){if(w.readyState=1,i&&o.trigger("ajaxSend",[w,l]),2===u)return w;l.async&&l.timeout>0&&(h=a.setTimeout(function(){w.abort("timeout")},l.timeout));try{u=1,j.send(s,y)}catch(x){if(!(2>u))throw x;y(-1,x)}}else y(-1,"No Transport");function y(b,c,d,e){var k,s,t,v,x,y=c;2!==u&&(u=2,h&&a.clearTimeout(h),j=void 0,g=e||"",w.readyState=b>0?4:0,k=b>=200&&300>b||304===b,d&&(v=Wb(l,w,d)),v=Xb(l,v,w,k),k?(l.ifModified&&(x=w.getResponseHeader("Last-Modified"),x&&(n.lastModified[f]=x),x=w.getResponseHeader("etag"),x&&(n.etag[f]=x)),204===b||"HEAD"===l.type?y="nocontent":304===b?y="notmodified":(y=v.state,s=v.data,t=v.error,k=!t)):(t=y,!b&&y||(y="error",0>b&&(b=0))),w.status=b,w.statusText=(c||y)+"",k?p.resolveWith(m,[s,y,w]):p.rejectWith(m,[w,y,t]),w.statusCode(r),r=void 0,i&&o.trigger(k?"ajaxSuccess":"ajaxError",[w,l,k?s:t]),q.fireWith(m,[w,y]),i&&(o.trigger("ajaxComplete",[w,l]),--n.active||n.event.trigger("ajaxStop")))}return w},getJSON:function(a,b,c){return n.get(a,b,c,"json")},getScript:function(a,b){return n.get(a,void 0,b,"script")}}),n.each(["get","post"],function(a,b){n[b]=function(a,c,d,e){return n.isFunction(c)&&(e=e||d,d=c,c=void 0),n.ajax(n.extend({url:a,type:b,dataType:e,data:c,success:d},n.isPlainObject(a)&&a))}}),n._evalUrl=function(a){return n.ajax({url:a,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,"throws":!0})},n.fn.extend({wrapAll:function(a){if(n.isFunction(a))return this.each(function(b){n(this).wrapAll(a.call(this,b))});if(this[0]){var b=n(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&1===a.firstChild.nodeType)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){return n.isFunction(a)?this.each(function(b){n(this).wrapInner(a.call(this,b))}):this.each(function(){var b=n(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=n.isFunction(a);return this.each(function(c){n(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){n.nodeName(this,"body")||n(this).replaceWith(this.childNodes)}).end()}});function Yb(a){return a.style&&a.style.display||n.css(a,"display")}function Zb(a){if(!n.contains(a.ownerDocument||d,a))return!0;while(a&&1===a.nodeType){if("none"===Yb(a)||"hidden"===a.type)return!0;a=a.parentNode}return!1}n.expr.filters.hidden=function(a){return l.reliableHiddenOffsets()?a.offsetWidth<=0&&a.offsetHeight<=0&&!a.getClientRects().length:Zb(a)},n.expr.filters.visible=function(a){return!n.expr.filters.hidden(a)};var $b=/%20/g,_b=/\[\]$/,ac=/\r?\n/g,bc=/^(?:submit|button|image|reset|file)$/i,cc=/^(?:input|select|textarea|keygen)/i;function dc(a,b,c,d){var e;if(n.isArray(b))n.each(b,function(b,e){c||_b.test(a)?d(a,e):dc(a+"["+("object"==typeof e&&null!=e?b:"")+"]",e,c,d)});else if(c||"object"!==n.type(b))d(a,b);else for(e in b)dc(a+"["+e+"]",b[e],c,d)}n.param=function(a,b){var c,d=[],e=function(a,b){b=n.isFunction(b)?b():null==b?"":b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};if(void 0===b&&(b=n.ajaxSettings&&n.ajaxSettings.traditional),n.isArray(a)||a.jquery&&!n.isPlainObject(a))n.each(a,function(){e(this.name,this.value)});else for(c in a)dc(c,a[c],b,e);return d.join("&").replace($b,"+")},n.fn.extend({serialize:function(){return n.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=n.prop(this,"elements");return a?n.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!n(this).is(":disabled")&&cc.test(this.nodeName)&&!bc.test(a)&&(this.checked||!Z.test(a))}).map(function(a,b){var c=n(this).val();return null==c?null:n.isArray(c)?n.map(c,function(a){return{name:b.name,value:a.replace(ac,"\r\n")}}):{name:b.name,value:c.replace(ac,"\r\n")}}).get()}}),n.ajaxSettings.xhr=void 0!==a.ActiveXObject?function(){return this.isLocal?ic():d.documentMode>8?hc():/^(get|post|head|put|delete|options)$/i.test(this.type)&&hc()||ic()}:hc;var ec=0,fc={},gc=n.ajaxSettings.xhr();a.attachEvent&&a.attachEvent("onunload",function(){for(var a in fc)fc[a](void 0,!0)}),l.cors=!!gc&&"withCredentials"in gc,gc=l.ajax=!!gc,gc&&n.ajaxTransport(function(b){if(!b.crossDomain||l.cors){var c;return{send:function(d,e){var f,g=b.xhr(),h=++ec;if(g.open(b.type,b.url,b.async,b.username,b.password),b.xhrFields)for(f in b.xhrFields)g[f]=b.xhrFields[f];b.mimeType&&g.overrideMimeType&&g.overrideMimeType(b.mimeType),b.crossDomain||d["X-Requested-With"]||(d["X-Requested-With"]="XMLHttpRequest");for(f in d)void 0!==d[f]&&g.setRequestHeader(f,d[f]+"");g.send(b.hasContent&&b.data||null),c=function(a,d){var f,i,j;if(c&&(d||4===g.readyState))if(delete fc[h],c=void 0,g.onreadystatechange=n.noop,d)4!==g.readyState&&g.abort();else{j={},f=g.status,"string"==typeof g.responseText&&(j.text=g.responseText);try{i=g.statusText}catch(k){i=""}f||!b.isLocal||b.crossDomain?1223===f&&(f=204):f=j.text?200:404}j&&e(f,i,j,g.getAllResponseHeaders())},b.async?4===g.readyState?a.setTimeout(c):g.onreadystatechange=fc[h]=c:c()},abort:function(){c&&c(void 0,!0)}}}});function hc(){try{return new a.XMLHttpRequest}catch(b){}}function ic(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}n.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(a){return n.globalEval(a),a}}}),n.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),n.ajaxTransport("script",function(a){if(a.crossDomain){var b,c=d.head||n("head")[0]||d.documentElement;return{send:function(e,f){b=d.createElement("script"),b.async=!0,a.scriptCharset&&(b.charset=a.scriptCharset),b.src=a.url,b.onload=b.onreadystatechange=function(a,c){(c||!b.readyState||/loaded|complete/.test(b.readyState))&&(b.onload=b.onreadystatechange=null,b.parentNode&&b.parentNode.removeChild(b),b=null,c||f(200,"success"))},c.insertBefore(b,c.firstChild)},abort:function(){b&&b.onload(void 0,!0)}}}});var jc=[],kc=/(=)\?(?=&|$)|\?\?/;n.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=jc.pop()||n.expando+"_"+Eb++;return this[a]=!0,a}}),n.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(kc.test(b.url)?"url":"string"==typeof b.data&&0===(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&kc.test(b.data)&&"data");return h||"jsonp"===b.dataTypes[0]?(e=b.jsonpCallback=n.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,h?b[h]=b[h].replace(kc,"$1"+e):b.jsonp!==!1&&(b.url+=(Fb.test(b.url)?"&":"?")+b.jsonp+"="+e),b.converters["script json"]=function(){return g||n.error(e+" was not called"),g[0]},b.dataTypes[0]="json",f=a[e],a[e]=function(){g=arguments},d.always(function(){void 0===f?n(a).removeProp(e):a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,jc.push(e)),g&&n.isFunction(f)&&f(g[0]),g=f=void 0}),"script"):void 0}),n.parseHTML=function(a,b,c){if(!a||"string"!=typeof a)return null;"boolean"==typeof b&&(c=b,b=!1),b=b||d;var e=x.exec(a),f=!c&&[];return e?[b.createElement(e[1])]:(e=ja([a],b,f),f&&f.length&&n(f).remove(),n.merge([],e.childNodes))};var lc=n.fn.load;n.fn.load=function(a,b,c){if("string"!=typeof a&&lc)return lc.apply(this,arguments);var d,e,f,g=this,h=a.indexOf(" ");return h>-1&&(d=n.trim(a.slice(h,a.length)),a=a.slice(0,h)),n.isFunction(b)?(c=b,b=void 0):b&&"object"==typeof b&&(e="POST"),g.length>0&&n.ajax({url:a,type:e||"GET",dataType:"html",data:b}).done(function(a){f=arguments,g.html(d?n("<div>").append(n.parseHTML(a)).find(d):a)}).always(c&&function(a,b){g.each(function(){c.apply(this,f||[a.responseText,b,a])})}),this},n.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){n.fn[b]=function(a){return this.on(b,a)}}),n.expr.filters.animated=function(a){return n.grep(n.timers,function(b){return a===b.elem}).length};function mc(a){return n.isWindow(a)?a:9===a.nodeType?a.defaultView||a.parentWindow:!1}n.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=n.css(a,"position"),l=n(a),m={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=n.css(a,"top"),i=n.css(a,"left"),j=("absolute"===k||"fixed"===k)&&n.inArray("auto",[f,i])>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),n.isFunction(b)&&(b=b.call(a,c,n.extend({},h))),null!=b.top&&(m.top=b.top-h.top+g),null!=b.left&&(m.left=b.left-h.left+e),"using"in b?b.using.call(a,m):l.css(m)}},n.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){n.offset.setOffset(this,a,b)});var b,c,d={top:0,left:0},e=this[0],f=e&&e.ownerDocument;if(f)return b=f.documentElement,n.contains(b,e)?("undefined"!=typeof e.getBoundingClientRect&&(d=e.getBoundingClientRect()),c=mc(f),{top:d.top+(c.pageYOffset||b.scrollTop)-(b.clientTop||0),left:d.left+(c.pageXOffset||b.scrollLeft)-(b.clientLeft||0)}):d},position:function(){if(this[0]){var a,b,c={top:0,left:0},d=this[0];return"fixed"===n.css(d,"position")?b=d.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),n.nodeName(a[0],"html")||(c=a.offset()),c.top+=n.css(a[0],"borderTopWidth",!0),c.left+=n.css(a[0],"borderLeftWidth",!0)),{top:b.top-c.top-n.css(d,"marginTop",!0),left:b.left-c.left-n.css(d,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent;while(a&&!n.nodeName(a,"html")&&"static"===n.css(a,"position"))a=a.offsetParent;return a||Qa})}}),n.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,b){var c=/Y/.test(b);n.fn[a]=function(d){return Y(this,function(a,d,e){var f=mc(a);return void 0===e?f?b in f?f[b]:f.document.documentElement[d]:a[d]:void(f?f.scrollTo(c?n(f).scrollLeft():e,c?e:n(f).scrollTop()):a[d]=e)},a,d,arguments.length,null)}}),n.each(["top","left"],function(a,b){n.cssHooks[b]=Ua(l.pixelPosition,function(a,c){return c?(c=Sa(a,b),Oa.test(c)?n(a).position()[b]+"px":c):void 0})}),n.each({Height:"height",Width:"width"},function(a,b){n.each({
+padding:"inner"+a,content:b,"":"outer"+a},function(c,d){n.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return Y(this,function(b,c,d){var e;return n.isWindow(b)?b.document.documentElement["client"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body["scroll"+a],e["scroll"+a],b.body["offset"+a],e["offset"+a],e["client"+a])):void 0===d?n.css(b,c,g):n.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),n.fn.extend({bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)}}),n.fn.size=function(){return this.length},n.fn.andSelf=n.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return n});var nc=a.jQuery,oc=a.$;return n.noConflict=function(b){return a.$===n&&(a.$=oc),b&&a.jQuery===n&&(a.jQuery=nc),n},b||(a.jQuery=a.$=n),n});
diff --git a/docs/site/home/js/prism.js b/docs/site/home/js/prism.js
index c37259f..db6f422 100644
--- a/docs/site/home/js/prism.js
+++ b/docs/site/home/js/prism.js
@@ -1,5 +1,5 @@
-/* PrismJS 1.27.0
-https://prismjs.com/download.html#themes=prism-tomorrow&languages=markup+css+clike+javascript+csharp+go+go-module+groovy+java+python */
+/* PrismJS 1.30.0
+https://prismjs.com/download#themes=prism-tomorrow&languages=markup+css+clike+javascript+csharp+go+go-module+groovy+java+python+xml-doc */
/// <reference lib="WebWorker"/>
var _self = (typeof window !== 'undefined')
@@ -224,7 +224,7 @@
if (typeof document === 'undefined') {
return null;
}
- if ('currentScript' in document && 1 < 2 /* hack to trip TS' flow analysis */) {
+ if (document.currentScript && document.currentScript.tagName === 'SCRIPT' && 1 < 2 /* hack to trip TS' flow analysis */) {
return /** @type {any} */ (document.currentScript);
}
@@ -1317,7 +1317,10 @@
pattern: /^=/,
alias: 'attr-equals'
},
- /"|'/
+ {
+ pattern: /^(\s*)["']|["']$/,
+ lookbehind: true
+ }
]
}
},
@@ -1455,7 +1458,7 @@
Prism.languages.css = {
'comment': /\/\*[\s\S]*?\*\//,
'atrule': {
- pattern: /@[\w-](?:[^;{\s]|\s+(?![\s{]))*(?:;|(?=\s*\{))/,
+ pattern: RegExp('@[\\w-](?:' + /[^;{\s"']|\s+(?!\s)/.source + '|' + string.source + ')*?' + /(?:;|(?=\s*\{))/.source),
inside: {
'rule': /^@[\w-]+/,
'selector-function-argument': {
@@ -2262,7 +2265,8 @@
'operator': {
pattern: /(^|[^.])(?:<<=?|>>>?=?|->|--|\+\+|&&|\|\||::|[?:~]|[-+*/%&|^!=<>]=?)/m,
lookbehind: true
- }
+ },
+ 'constant': /\b[A-Z][A-Z_\d]+\b/
});
Prism.languages.insertBefore('java', 'string', {
@@ -2393,4 +2397,45 @@
Prism.languages.python['string-interpolation'].inside['interpolation'].inside.rest = Prism.languages.python;
-Prism.languages.py = Prism.languages.python;
\ No newline at end of file
+Prism.languages.py = Prism.languages.python;
+
+(function (Prism) {
+
+ /**
+ * If the given language is present, it will insert the given doc comment grammar token into it.
+ *
+ * @param {string} lang
+ * @param {any} docComment
+ */
+ function insertDocComment(lang, docComment) {
+ if (Prism.languages[lang]) {
+ Prism.languages.insertBefore(lang, 'comment', {
+ 'doc-comment': docComment
+ });
+ }
+ }
+
+ var tag = Prism.languages.markup.tag;
+
+ var slashDocComment = {
+ pattern: /\/\/\/.*/,
+ greedy: true,
+ alias: 'comment',
+ inside: {
+ 'tag': tag
+ }
+ };
+ var tickDocComment = {
+ pattern: /'''.*/,
+ greedy: true,
+ alias: 'comment',
+ inside: {
+ 'tag': tag
+ }
+ };
+
+ insertDocComment('csharp', slashDocComment);
+ insertDocComment('fsharp', slashDocComment);
+ insertDocComment('vbnet', tickDocComment);
+
+}(Prism));
diff --git a/docs/site/home/providers.html b/docs/site/home/providers.html
index c0e4add..6b74d2b 100644
--- a/docs/site/home/providers.html
+++ b/docs/site/home/providers.html
@@ -18,10 +18,26 @@
<meta charset=utf-8>
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+ <meta name="robots" content="index, follow">
<link href="img/favicon.png" rel="shortcut icon"/>
- <title>Apache TinkerPop: Providers</title>
- <meta name="description" content="">
- <meta name="keywords" content="">
+ <title>Graph Database Providers & Systems | Apache TinkerPop</title>
+ <meta name="description" content="TinkerPop-enabled graph databases and analytics tools from leading providers. Find the right graph system for your application needs.">
+ <meta name="keywords" content="graph providers, database systems, TinkerPop, analytics">
+ <link rel="canonical" href="https://tinkerpop.apache.org/providers.html">
+
+ <!-- Open Graph / Facebook -->
+ <meta property="og:type" content="website">
+ <meta property="og:url" content="https://tinkerpop.apache.org/providers.html">
+ <meta property="og:title" content="Graph Database Providers & Systems | Apache TinkerPop">
+ <meta property="og:description" content="TinkerPop-enabled graph databases and analytics tools from leading providers. Find the right graph system for your application needs.">
+ <meta property="og:image" content="https://tinkerpop.apache.org/img/providers/providers.png">
+
+ <!-- Twitter -->
+ <meta name="twitter:card" content="summary_large_image">
+ <meta name="twitter:site" content="@apachetinkerpop">
+ <meta name="twitter:title" content="Graph Database Providers & Systems | Apache TinkerPop">
+ <meta name="twitter:description" content="TinkerPop-enabled graph databases and analytics tools from leading providers. Find the right graph system for your application needs.">
+ <meta name="twitter:image" content="https://tinkerpop.apache.org/img/providers/providers.png">
<link href="css/bootstrap.min.css" rel="stylesheet">
<link href="css/font-awesome.css" rel="stylesheet"/>
<link href="css/custome.css" rel="stylesheet">
@@ -44,6 +60,138 @@
})();
</script>
<!-- End Matomo Code -->
+
+ <!-- Structured Data / JSON-LD -->
+ <script type="application/ld+json">
+ {
+ "@context": "https://schema.org",
+ "@graph": [
+ {
+ "@type": "Organization",
+ "@id": "https://tinkerpop.apache.org/#organization",
+ "name": "Apache TinkerPop",
+ "url": "https://tinkerpop.apache.org/",
+ "logo": {
+ "@type": "ImageObject",
+ "url": "https://tinkerpop.apache.org/img/logo.png",
+ "width": 280,
+ "height": 60
+ },
+ "description": "Apache TinkerPop is a graph computing framework for both graph databases (OLTP) and graph analytic systems (OLAP)."
+ },
+ {
+ "@type": "WebSite",
+ "@id": "https://tinkerpop.apache.org/#website",
+ "url": "https://tinkerpop.apache.org/",
+ "name": "Apache TinkerPop",
+ "publisher": {
+ "@id": "https://tinkerpop.apache.org/#organization"
+ }
+ },
+ {
+ "@type": "WebPage",
+ "@id": "https://tinkerpop.apache.org/providers.html#webpage",
+ "url": "https://tinkerpop.apache.org/providers.html",
+ "name": "Graph Database Providers & Systems | Apache TinkerPop",
+ "isPartOf": {
+ "@id": "https://tinkerpop.apache.org/#website"
+ },
+ "about": {
+ "@id": "https://tinkerpop.apache.org/#organization"
+ },
+ "description": "Discover TinkerPop-enabled graph databases, processors, and analytics tools from leading providers. Find the right graph database system for your application needs and use cases."
+ },
+ {
+ "@type": "ItemList",
+ "@id": "https://tinkerpop.apache.org/providers.html#itemlist",
+ "itemListElement": [
+ {
+ "@type": "ListItem",
+ "position": 1,
+ "name": "Aerospike Graph",
+ "url": "https://aerospike.com/products/graph-database/"
+ },
+ {
+ "@type": "ListItem",
+ "position": 2,
+ "name": "Alibaba Graph Database",
+ "url": "https://cn.aliyun.com/product/gdb"
+ },
+ {
+ "@type": "ListItem",
+ "position": 3,
+ "name": "Amazon Neptune",
+ "url": "https://aws.amazon.com/neptune/"
+ }
+ ]
+ },
+ {
+ "@type": "BreadcrumbList",
+ "@id": "https://tinkerpop.apache.org/providers.html#breadcrumblist",
+ "itemListElement": [
+ {
+ "@type": "ListItem",
+ "position": 1,
+ "item": {
+ "@type": "WebPage",
+ "@id": "https://tinkerpop.apache.org/",
+ "url": "https://tinkerpop.apache.org/",
+ "name": "Home"
+ }
+ },
+ {
+ "@type": "ListItem",
+ "position": 2,
+ "item": {
+ "@type": "WebPage",
+ "@id": "https://tinkerpop.apache.org/providers.html",
+ "url": "https://tinkerpop.apache.org/providers.html",
+ "name": "Graph Database Providers"
+ }
+ }
+ ]
+ },
+ {
+ "@type": "FAQPage",
+ "@id": "https://tinkerpop.apache.org/providers.html#faqpage",
+ "mainEntity": [
+ {
+ "@type": "Question",
+ "name": "What is a TinkerPop-enabled graph system?",
+ "acceptedAnswer": {
+ "@type": "Answer",
+ "text": "A TinkerPop-enabled graph system is a graph database, processor, or analytics tool that implements the Apache TinkerPop interfaces, allowing users to query the system using the Gremlin query language and leverage the full TinkerPop stack regardless of the underlying graph database."
+ }
+ },
+ {
+ "@type": "Question",
+ "name": "How can I get my graph system listed on the TinkerPop providers page?",
+ "acceptedAnswer": {
+ "@type": "Answer",
+ "text": "To get your graph system listed, you need to follow Apache TinkerPop's provider listing policy which includes implementing the required TinkerPop interfaces, passing compatibility tests, and submitting your request through the appropriate channels. See the provider documentation for details."
+ }
+ },
+ {
+ "@type": "Question",
+ "name": "What types of graph systems are supported by TinkerPop?",
+ "acceptedAnswer": {
+ "@type": "Answer",
+ "text": "TinkerPop supports both OLTP (Online Transaction Processing) graph databases for real-time queries and OLAP (Online Analytical Processing) graph processors for batch analytics. Many systems support both approaches."
+ }
+ },
+ {
+ "@type": "Question",
+ "name": "What are the benefits of using a TinkerPop-enabled graph database?",
+ "acceptedAnswer": {
+ "@type": "Answer",
+ "text": "Using a TinkerPop-enabled graph database provides application portability across different graph systems, access to the Gremlin query language, and the ability to leverage a common ecosystem of tools, libraries, and knowledge regardless of which specific graph database you choose."
+ }
+ }
+ ]
+ }
+ ]
+ }
+ </script>
</head>
<body>
<!-- header -->
@@ -52,7 +200,7 @@
<nav class="navbar navbar-expand-lg ">
<div class="container-fluid">
<a class="navbar-brand" href="index.html">
- <img src="img/logo.png" class="img-fluid" alt="img">
+ <img src="img/logo.png" class="img-fluid" alt="Apache TinkerPop Graph Computing Framework Logo">
</a>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse"
data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent"
@@ -181,7 +329,7 @@
<!-- hero -->
<div class="container hero-inner">
- <img src="img/providers/bg.png" class="img-fluid w-100" alt="img">
+ <img src="img/providers/bg.png" class="img-fluid w-100" alt="Graph Database Providers Header Banner">
</div>
<!-- Content -->
@@ -194,7 +342,7 @@
</div>
<div class="row d-flex align-items-center">
<div class="col-lg-6 mb-4 md-lg-0">
- <img src="img/providers/providers.png" class="img-fluid w-100" alt="img">
+ <img src="img/providers/providers.png" class="img-fluid w-100" alt="TinkerPop-enabled Graph Database Provider Ecosystem Illustration">
</div>
<div class="col-lg-6 ">
<div class="use-case-page-pl-3">
@@ -206,8 +354,8 @@
computing features. The other type of provider are language designers that have a (graph) query
language they wish to have execute on the Gremlin traversal machine and thus, against any
TinkerPop-enabled graph system.</p>
- <a href="https://tinkerpop.apache.org/docs/current/dev/provider/" class="text-blue "><u>Learn
- More</u></a>
+ <a href="https://tinkerpop.apache.org/docs/current/dev/provider/" class="text-blue "><u>Provider
+ Documentation & Guidelines</u></a>
</div>
</div>
</div>
@@ -230,10 +378,10 @@
<div class="col-md-6 col-lg-4">
<div class="uc-box">
<div class="d-flex align-items-start">
- <img src="img/providers/25.png " class="img-fluid mb-3" alt="img">
+ <img src="img/providers/25.png " class="img-fluid mb-3" alt="Aerospike Graph Logo">
<div class="text-start ms-3">
<a class="ft-18 bold text-blue" href="https://aerospike.com/products/graph-database/">Aerospike Graph</a>
- <p class="mb-0 mt-2">A massively scalable, high-performance graph database for the property graph model</p>
+ <p class="mb-0 mt-2">A massively scalable, high-performance, distributed graph database.</p>
</div>
</div>
</div>
@@ -242,7 +390,7 @@
<div class="col-md-6 col-lg-4">
<div class="uc-box">
<div class="d-flex align-items-start">
- <img src="img/providers/1.png " class="img-fluid mb-3" alt="img">
+ <img src="img/providers/1.png " class="img-fluid mb-3" alt="Alibaba Graph Database Logo">
<div class="text-start ms-3">
<a class="ft-18 bold text-blue" href="https://cn.aliyun.com/product/gdb">Alibaba Graph Database</a>
<p class="mb-0 mt-2">A real-time, reliable, cloud-native graph database service that
@@ -255,7 +403,7 @@
<div class="col-md-6 col-lg-4">
<div class="uc-box">
<div class="d-flex align-items-start">
- <img src="img/providers/2.png " class="img-fluid mb-3" alt="img">
+ <img src="img/providers/2.png " class="img-fluid mb-3" alt="Amazon Neptune Logo">
<div class="text-start ms-3">
<a class="ft-18 bold text-blue" href="https://aws.amazon.com/neptune/">Amazon Neptune</a>
<p class="mb-0 mt-2">Fully-managed graph database service.</p>
@@ -558,7 +706,7 @@
<div class="ju-box">
<h2 class="ft-40 text-blue bold">Join Us</h2>
<p class="bold">Join us on our Discord Server</p>
- <a href="https://discord.gg/tinkerpop"><img src="img/tpvewx.png" class="img-fluid mt-3" alt="img"></a>
+ <a href="https://discord.gg/tinkerpop"><img src="img/tpvewx.png" class="img-fluid mt-3" alt="TinkerPop Discord QR code and invitation"></a>
</div>
</div>
</div>
@@ -574,11 +722,11 @@
<div class="bold ft-25">Apache TinkerPop™</div>
<p class="mt-2 mb-4">Apache TinkerPop™ is a graph computing framework for both graph databases (OLTP) and graph analytic systems (OLAP).</p>
<ul class="list-unstyled list-inline hover-op-low">
- <li class="list-inline-item"><a href="https://discord.gg/tinkerpop"><img src="img/social/discord.svg" class="img-fluid" alt="img"></a></li>
- <li class="list-inline-item"><a href="https://github.com/apache/tinkerpop"><img src="img/social/github-box.svg" class="img-fluid" alt="img"></a></li>
- <li class="list-inline-item"><a href="https://www.twitch.tv/apachetinkerpop"><img src="img/social/twitch.png" class="img-fluid" alt="img"></a></li>
- <li class="list-inline-item"><a href="https://twitter.com/apachetinkerpop"><img src="img/social/twitter-square.svg" class="img-fluid" alt="img"></a></li>
- <li class="list-inline-item"><a href="https://www.youtube.com/@apachetinkerpop"><img src="img/social/youtube.png" class="img-fluid" alt="img"></a></li>
+ <li class="list-inline-item"><a href="https://discord.gg/tinkerpop"><img src="img/social/discord.svg" class="img-fluid" alt="TinkerPop Discord"></a></li>
+ <li class="list-inline-item"><a href="https://github.com/apache/tinkerpop"><img src="img/social/github-box.svg" class="img-fluid" alt="TinkerPop GitHub"></a></li>
+ <li class="list-inline-item"><a href="https://www.twitch.tv/apachetinkerpop"><img src="img/social/twitch.png" class="img-fluid" alt="TinkerPop Twitch"></a></li>
+ <li class="list-inline-item"><a href="https://twitter.com/apachetinkerpop"><img src="img/social/twitter-square.svg" class="img-fluid" alt="TinkerPop Twitter"></a></li>
+ <li class="list-inline-item"><a href="https://www.youtube.com/@apachetinkerpop"><img src="img/social/youtube.png" class="img-fluid" alt="TinkerPop YouTube"></a></li>
</ul>
</div>
<div class="col-md-4 ft-links">
@@ -620,7 +768,7 @@
</div>
</div>
</footer>
-<script src="js/jquery-1.11.1.js"></script>
+<script src="js/jquery-1.12.4.min.js"></script>
<script src="js/bootstrap.bundle.min.js"></script>
<script src="js/wow.min.js"></script>
<script src="js/my.js"></script>
diff --git a/docs/site/home/robots.txt b/docs/site/home/robots.txt
new file mode 100644
index 0000000..7359e0a
--- /dev/null
+++ b/docs/site/home/robots.txt
@@ -0,0 +1,6 @@
+User-agent: *
+Allow: /
+Disallow: /staging/
+
+# Sitemap reference
+Sitemap: https://tinkerpop.apache.org/sitemap.xml
diff --git a/docs/site/home/sitemap.xml b/docs/site/home/sitemap.xml
new file mode 100644
index 0000000..bfcfbcd
--- /dev/null
+++ b/docs/site/home/sitemap.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+ <url>
+ <loc>https://tinkerpop.apache.org/</loc>
+ <lastmod>2025-05-07</lastmod>
+ <priority>1.0</priority>
+ <changefreq>monthly</changefreq>
+ </url>
+ <url>
+ <loc>https://tinkerpop.apache.org/gremlin.html</loc>
+ <lastmod>2025-05-07</lastmod>
+ <priority>0.9</priority>
+ <changefreq>yearly</changefreq>
+ </url>
+ <url>
+ <loc>https://tinkerpop.apache.org/providers.html</loc>
+ <lastmod>2025-05-07</lastmod>
+ <priority>0.8</priority>
+ <changefreq>yearly</changefreq>
+ </url>
+ <url>
+ <loc>https://tinkerpop.apache.org/benefits-use-cases.html</loc>
+ <lastmod>2025-05-07</lastmod>
+ <priority>0.8</priority>
+ <changefreq>yearly</changefreq>
+ </url>
+ <url>
+ <loc>https://tinkerpop.apache.org/community.html</loc>
+ <lastmod>2025-05-07</lastmod>
+ <priority>0.7</priority>
+ <changefreq>monthly</changefreq>
+ </url>
+ <url>
+ <loc>https://tinkerpop.apache.org/download.html</loc>
+ <lastmod>2025-05-07</lastmod>
+ <priority>0.9</priority>
+ <changefreq>monthly</changefreq>
+ </url>
+</urlset>
diff --git a/docs/src/dev/developer/contributing.asciidoc b/docs/src/dev/developer/contributing.asciidoc
index 2ff4362..52a3962 100644
--- a/docs/src/dev/developer/contributing.asciidoc
+++ b/docs/src/dev/developer/contributing.asciidoc
@@ -240,9 +240,8 @@
[[versioning]]
== Versioning
-TinkerPop version numbers follow a format of `EPOCH.MAJOR.MINOR.PATCH`, where:
+As of TinkerPop 4.0.0, version numbers follow a format of `MAJOR.MINOR.PATCH`, where:
-* `EPOCH` version is incremented for epochs of thinking around TinkerPop and its relation to the graph ecosystem and is part of a complete release.
* `MAJOR` version is incremented for incompatible changes and is part of a complete release.
* `MINOR` version is incremented for backward compatible changes and is part of a complete release.
* `PATCH` version is incremented for backward compatible bug fixes and typically only applied to client modules for partial release.
@@ -253,18 +252,9 @@
typically server modules. In this way, for example, a small fix can be applied and released around .NET without having
to release all the other components which may not have experienced any real change.
-The number for `EPOCH` rarely changes and when it does, it typically represents a complete re-write of the software
-and thus massive changes can be expected. As a result of the definition for `EPOCH`, there is greater focus on the other
-three numbers when considering where changes will land:
-
-1. A client with a specific `EPOCH.MAJOR.MINOR` will be backward compatible with user application code written for
-`EPOCH.MAJOR.MINOR`.
-1. A client with specific `EPOCH.MAJOR` will be backward compatible with the `EPOCH.MAJOR` version of the server.
-
-A complete release is always just `EPOCH.MAJOR.MINOR` where the `PATCH` is inferred as "0", thus 3.6.x line would
-initially release all components as `3.6.0`. A `PATCH` number must start with "1" within a release because of how
-link:https://github.com/NuGet/Home/issues/7376[Nuget treats "0"]. If it was determined that `gremlin-python` needed a
-special release then it could be released independently of the other modules as `3.6.0.1`.
+1. A client with a specific `MAJOR.MINOR` will be backward compatible with user application code written for
+`MAJOR.MINOR`.
+1. A client with specific `MAJOR` will be backward compatible with the `MAJOR` version of the server.
In short, the dev mailing list is open to discussion on where a change will land. The discussion just needs to have
good reasoning and use the general principles above as a framework for coming to a consensus.
diff --git a/docs/src/dev/developer/for-committers.asciidoc b/docs/src/dev/developer/for-committers.asciidoc
index 4f36f9ee..f44092c 100644
--- a/docs/src/dev/developer/for-committers.asciidoc
+++ b/docs/src/dev/developer/for-committers.asciidoc
@@ -64,7 +64,7 @@
about the project among contributors, though it must be kept in mind that project discussion and decisions must occur
on the dev mailing list mentioned above.
-Occasionally, online meetings via video conference are held. These meetings are schedule via the dev mailing list
+Occasionally, online meetings via video conference are held. These meetings are scheduled via the dev mailing list
about a week before they are to occur to find a day and time that is available for those interested in attending.
On the day of the meeting, the meeting organizer will create a Google Hangout (or similar video conferencing link).
At that point, all who are interested can attend. Meeting minutes should be
@@ -142,7 +142,7 @@
* `3.5-dev` - 3.5.x (no longer maintained)
* `3.6-dev` - 3.6.x (no longer maintained)
* `3.7-dev` - 3.7.x (non-breaking bug fixes and enhancements)
-* `master` - 4.x (current development)
+* `master` - 4.x.x (current development)
The branch description above that reads "non-breaking bug fixes and enhancements" simply means that within that release
line (i.e. patch version) changes should not alter existing behavior, introduce new APIs, change serialization formats,
@@ -154,9 +154,9 @@
Changes to earlier branches should merge forward toward `master` (e.g. `3.7-dev` should merge to `master`). Please read
more about this process in the <<pull-requests, Pull Requests>> section.
-As described in <<versioning,versioning>>, it is possible to do a "partial" release which will utilize a four-digit
-version that starts with a "1" (e.g. `3.6.0.1`). The branching strategy for a partial release requires that a `-dev`
-branch be created with the three digit prefix.
+As described in <<versioning,versioning>>, it is possible to do a "partial" release which will utilize the third "patch" digit
+version that starts with a "1" (e.g. `4.0.1`). The branching strategy for a partial release requires that a `-dev`
+branch be created with the two digit prefix (e.g. 4.0-dev).
Other branches may be created for collaborating on features or for RFC's that other developers may want to inspect.
It is suggested that the JIRA issue ID be used as the prefix, since that triggers certain automation, and it provides a
@@ -171,8 +171,8 @@
Tags are used for milestones, release candidates, and approved <<versioning,partial and complete releases>>. Tags for a
complete release are simply defined by the three-digit version number. Tags for a partial release, should be prefixed
-by the individual language relevant to that release. For example, if there is an initial partial release for `3.6.0`
-on `gremlin-python` then the tag should be `3.6.0.1-python`.
+by the individual language relevant to that release. For example, if there is an initial partial release for `4.0.0`
+on `gremlin-python` then the tag should be `4.0.1-python`.
Please refrain from creating arbitrary tags, as they produce permanent clutter.
@@ -213,7 +213,7 @@
affect users or providers. This label is important when organizing release notes.
** The "deprecation" label which is assigned to an issue that includes changes to deprecate a portion of the API.
* The "affects/fix version(s)" fields should be appropriately set, where the "fix version" implies the version on
-which that particular issue will completed. This is a field usually only set by committers and should only be set
+which that particular issue will be completed. This is a field usually only set by committers and should only be set
when the issue is being closed with a completed disposition (e.g. "Done", "Fixed", etc.).
* The "priority" field can be arbitrarily applied with one exception. The "trivial" option should be reserved for
tasks that are "easy" for a potential new contributor to jump into and do not have significant impact to urgently
@@ -629,6 +629,8 @@
`GraphComputer`.
* `@GraphComputerVerificationStarGraphExceeded` - The scenario itself is not written to support `GraphComputer` because
the traversal does not mind the star graph limitation.
+* `@GremlinGroovyNotSupported` - The scenario uses `gremlin-lang` syntax which is incompatible with `gremlin-groovy` and
+cannot be resolved with the groovy translator. This is typically for scenarios using ambiguously-types `null` parameters.
* `@InsertionOrderingRequired` - The scenario is reliant on the graph system predictably returning results (vertices,
edges, properties) in the same order in which they were inserted into the graph.
* `@MetaProperties` - The scenario makes use of meta-properties.
@@ -755,7 +757,7 @@
* You are responsible for a release and need to manipulate files accordingly for the release.
** `Gremlin.version()`, CHANGELOG dates, `pom.xml` version bumps, etc.
-* You are doing an minor change and it is obvious that an RTC is not required (would be a pointless burden to the community).
+* You are doing a minor change and it is obvious that an RTC is not required (would be a pointless burden to the community).
** The fix is under the link:http://www.apache.org/foundation/glossary.html#CommitThenReview[commit-then-review] (CTR) policy and lazy consensus is sufficient, where a single -1 vote requires you to revert your changes.
** Adding a test case, fixing spelling/grammar mistakes in the documentation, fixing LICENSE/NOTICE/etc. files, fixing a minor issue in an already merged branch.
@@ -892,7 +894,7 @@
`pom.xml` file of any module, build `gremlin-driver`, Gremlin Console and Gremlin Server and examine the contents of
the binary distributions:
-* target/gremlin-driver-x.y.z-uber.jar
+* target/gremlin-driver-x.y.z-shaded.jar
* target/gremlin-console-x.y.z-uber.jar
* target/apache-tinkerpop-gremlin-console-x.y.z-distribution.zip
* target/apache-tinkerpop-gremlin-server-x.y.z-distribution.zip
diff --git a/docs/src/dev/developer/release.asciidoc b/docs/src/dev/developer/release.asciidoc
index 5110fe3..33a29c8 100644
--- a/docs/src/dev/developer/release.asciidoc
+++ b/docs/src/dev/developer/release.asciidoc
@@ -112,6 +112,12 @@
. Fourteen days before release, issue an email to the dev mailing list to remind the community of the pending release.
.. Note any important issues open in JIRA in that post.
.. Request review and update of the "upgrade documentation" and CHANGELOG.
+. Prior to the start of code freeze, consider any minor non-breaking dependency updates. The following commands or tools
+may be useful to list available updates:
+- `mvn versions:display-dependency-updates -DallowMajorUpdates=false`
+- `go list -m -u all`
+- `npm-check-updates`
+- `dotnet-check-updates`
. Seven days before release, announce the code freeze on the dev mailing list to remind the community that the branch
under release is protected. Tweaks to documentation and other odds and ends related to release are still allowed
during this period.
@@ -318,7 +324,10 @@
.. Review `Gremlin.Net.csproj`, `Gremlin.Net.Template.csproj` and `Gremlin.Net.Template.nuspec` in `gremlin-dotnet`
.. Review `package.json` and `package-lock.json` in `gremlin-javascript` and in `gremlint`
.. `pushd gremlin-console/bin; ln -fs ../target/apache-tinkerpop-gremlin-console-xx.yy.zz-SNAPSHOT-standalone/bin/gremlin.sh gremlin.sh; popd`
-.. Update CHANGELOG and upgrade docs to have the appropriate headers for the next version.
+.. Update CHANGELOG and upgrade docs to have the appropriate headers for the next version. If a major line will no longer be under development, archive the CHANGELOG entries for it as follows:
+... Create a new `changelog-x.x.x.asciidoc` in the `docs/archive/changelogs` folder.
+... Copy all CHANGELOG entries of the major version into the file (refer to previous files).
+... Replace the CHANGELOG entries under each minor releases with an archived notice containing link to the archived changelog file (refer to previous links inside CHANGELOG).
.. `mvn clean install -DskipTests` - need to build first so that the right version of the console is used with `bin/publish-docs.sh`
.. `mvn deploy -DskipTests` - deploy the new `SNAPSHOT`
.. `bin/process-docs.sh` and validate the generated `SNAPSHOT` documentation locally and then `bin/publish-docs.sh <username>`
diff --git a/docs/src/dev/future/index.asciidoc b/docs/src/dev/future/index.asciidoc
index f66a4ce..0c7045e 100644
--- a/docs/src/dev/future/index.asciidoc
+++ b/docs/src/dev/future/index.asciidoc
@@ -54,16 +54,16 @@
major breaking features lined for 4.0, and additional features lined up for minor versions.
Additional details on each feature can be found in the Appendix.
-=== 4.0 Milestone Release (2024Q4)
+=== 4.0.0-beta.1 Release (2024Q4)
As discussed in the link:https://lists.apache.org/thread/hh58k28qy49lb9k7b9j4mnqvpxj0xf85[DISCUSS thread], we are looking
-to release a milestone build of what is done so far to gather feedback.
+to release a beta build of what is done so far to gather feedback.
-This milestone would roughly offer the opportunity to try Gremlin Server HTTP with the revised GraphSON and GraphBinary
+This beta would roughly offer the opportunity to try Gremlin Server HTTP with the revised GraphSON and GraphBinary
serialization formats for TinkerPop 4.0, using Java and Python drivers. These drivers will initially continue to support
GraphSON as it can help with debugging (given its human-readable format) and offers wider serialization options for users
in these early days, we should expect to just have GraphBinary support for drivers in the future for simplicity.
-This milestone release would include the following list of features for preview:
+This beta release would include the following list of features for preview:
* <<http-support>>
** Replacement of WebSocket with HTTP/1.1 (link:https://lists.apache.org/thread/vfs1j9ycb8voxwc00gdzfmlg2gghx3n1[DISCUSS thread])
diff --git a/docs/src/dev/io/graphbinary.asciidoc b/docs/src/dev/io/graphbinary.asciidoc
index cf8a140..8c6a190 100644
--- a/docs/src/dev/io/graphbinary.asciidoc
+++ b/docs/src/dev/io/graphbinary.asciidoc
@@ -35,7 +35,8 @@
* `{type_code}` is a single unsigned byte representing the type number.
* `{type_info}` is an optional sequence of bytes providing additional information of the type represented. This is
specially useful for representing complex and custom types.
-* `{value_flag}` is a single byte providing information about the value. Flags have the following meaning:
+* `{value_flag}` is a single byte providing information about the value. Each type may have its own specific flags so
+see each type for more details. Generally, flags have the following meaning:
** `0x01` The value is `null`. When this flag is set, no bytes for `{value}` will be provided.
* `{value}` is a sequence of bytes which content is determined by the type.
@@ -50,7 +51,7 @@
- `02 00 00 00 00 00 00 00 00 01`: a 64-bit integer number 1. It’s composed by the type_code `0x02`, empty flags and
eight bytes to describe the value.
-== Version 1.0
+== Version 4.0
=== Forward Compatibility
@@ -65,9 +66,7 @@
- `0x01`: Int
- `0x02`: Long
- `0x03`: String
-- `0x04`: Date
-- `0x05`: Timestamp
-- `0x06`: Class
+- `0x04`: DateTime
- `0x07`: Double
- `0x08`: Float
- `0x09`: List
@@ -80,55 +79,24 @@
- `0x10`: TinkerGraph
- `0x11`: Vertex
- `0x12`: VertexProperty
-- `0x13`: Barrier
-- `0x14`: Binding
-- `0x15`: Bytecode
-- `0x16`: Cardinality
-- `0x17`: Column
- `0x18`: Direction
-- `0x19`: Operator
-- `0x1a`: Order
-- `0x1b`: Pick
-- `0x1c`: Pop
-- `0x1d`: Lambda
-- `0x1e`: P
-- `0x1f`: Scope
- `0x20`: T
-- `0x21`: Traverser
- `0x22`: BigDecimal
- `0x23`: BigInteger
- `0x24`: Byte
-- `0x25`: ByteBuffer
+- `0x25`: Binary
- `0x26`: Short
- `0x27`: Boolean
-- `0x28`: TextP
-- `0x29`: TraversalStrategy
-- `0x2a`: BulkSet
- `0x2b`: Tree
-- `0x2c`: Metrics
-- `0x2d`: TraversalMetrics
-- `0x2e`: Merge
-- `0x2f`: DT
+- `0xf0`: CompositePDT
+- `0xf1`: PrimitivePDT
+- `0xfd`: Marker
- `0xfe`: Unspecified null object
-- `0x00`: Custom
==== Extended Types
- `0x80`: Char
- `0x81`: Duration
-- `0x82`: InetAddress
-- `0x83`: Instant
-- `0x84`: LocalDate
-- `0x85`: LocalDateTime
-- `0x86`: LocalTime
-- `0x87`: MonthDay
-- `0x88`: OffsetDateTime
-- `0x89`: OffsetTime
-- `0x8a`: Period
-- `0x8b`: Year
-- `0x8c`: YearMonth
-- `0x8d`: ZonedDateTime
-- `0x8e`: ZoneOffset
=== Null handling
@@ -181,22 +149,19 @@
- `00 00 00 04 61 62 63 64`: the string 'abcd'.
- `00 00 00 00`: the empty string ''.
-==== Date
+==== DateTime
-Format: An 8-byte two's complement signed integer representing a millisecond-precision offset from the unix epoch.
+A date-time with an offset from UTC/Greenwich in the ISO-8601 calendar system, such as 2007-12-03T10:15:30+01:00.
-Example values
+Format: `{year}{month}{day}{time}{offset}`
-- `00 00 00 00 00 00 00 00`: The moment in time 1970-01-01T00:00:00.000Z.
-- `ff ff ff ff ff ff ff ff`: The moment in time 1969-12-31T23:59:59.999Z.
+Where:
-==== Timestamp
-
-Format: The same as `Date`.
-
-==== Class
-
-Format: A `String` containing the fqcn.
+- `{year}` is an `Int` from -999,999,999 to 999,999,999.
+- `{month}` is a `Byte` to represent the month, from 1 (January) to 12 (December)
+- `{day}` is a `Byte` from 1 to 31.
+- `{time}` is a `Long` to represent nanoseconds since midnight, from 0 to 86399999999999
+- `{offset}` is an `Int` to represent total zone offset in seconds, from -64800 (-18:00) to 64800 (+18:00).
==== Double
@@ -219,9 +184,9 @@
==== List
-An ordered collection of items.
+An ordered collection of items. The format depends on the {value_flag}.
-Format: `{length}{item_0}...{item_n}`
+Format (value_flag=0x00): `{length}{item_0}...{item_n}`
Where:
@@ -229,6 +194,15 @@
- `{item_0}...{item_n}` are the items of the list. `{item_i}` is a fully qualified typed value composed of
`{type_code}{type_info}{value_flag}{value}`.
+Format (value_flag=0x02): `{length}{item_0}{bulk_0}...{item_n}{bulk_n}`
+
+Where:
+
+- `{length}` is an `Int` describing the length of the collection.
+- `{item_0}...{item_n}` are the items of the list. `{item_i}` is a fully qualified typed value composed of
+`{type_code}{type_info}{value_flag}{value}`.
+- `{bulk_0}...{bulk_n}` are `Int` that represent how many times that item should be repeated in the expanded list.
+
==== Set
A collection that contains no duplicate elements.
@@ -237,7 +211,7 @@
==== Map
-A dictionary of keys to values.
+A dictionary of keys to values. A {value_flag} equal to 0x02 means that the map is ordered.
Format: `{length}{item_0}...{item_n}`
@@ -265,15 +239,29 @@
Where:
- `{id}` is a fully qualified typed value composed of `{type_code}{type_info}{value_flag}{value}`.
-- `{label}` is a `String` value.
+- `{label}` is a `List` {value}.
- `{inVId}` is a fully qualified typed value composed of `{type_code}{type_info}{value_flag}{value}`.
-- `{inVLabel}` is a `String` value.
+- `{inVLabel}` is a `List` {value}.
- `{outVId}` is a fully qualified typed value composed of `{type_code}{type_info}{value_flag}{value}`.
-- `{outVLabel}` is a `String` value.
+- `{outVLabel}` is a `List` {value}.
- `{parent}` is a fully qualified typed value composed of `{type_code}{type_info}{value_flag}{value}` which contains
the parent `Vertex`. Note that as TinkerPop currently send "references" only, this value will always be `null`.
-- `{properties}` is a fully qualified typed value composed of `{type_code}{type_info}{value_flag}{value}` which contains
-the properties for the edge.
+- `{properties}` is a `List` of `Property` objects.
+
+Example values:
+
+[source,text]
+----
+01 00 00 00 00 0d id is 13
+00 00 00 01 03 00 00 00 00 08 64 65 76 65 6c 6f 70 73 label is a size 1 list with string 'develops'
+01 00 00 00 00 0a inVId is 10
+00 00 00 01 03 00 00 00 00 08 73 6f 66 74 77 61 72 65 inVLabel is a size 1 list with string 'software'
+01 00 00 00 00 01 outVId is 1
+00 00 00 01 03 00 00 00 00 06 70 65 72 73 6f 6e outVLabel is a size 1 list with string 'person'
+fe 01 parent is always null
+09 00 00 00 00 01 properties is a size 1 list
+0f 00 00 00 00 05 73 69 6e 63 65 01 00 00 00 07 d9 fe 01 property with key 'since' and value 2009 and null parent
+----
==== Path
@@ -338,9 +326,23 @@
Where:
- `{id}` is a fully qualified typed value composed of `{type_code}{type_info}{value_flag}{value}`.
-- `{label}` is a `String` value.
-- `{properties}` is a fully qualified typed value composed of `{type_code}{type_info}{value_flag}{value}` which contains
-properties.
+- `{label}` is a `List` {value}.
+- `{properties}` is a `List` of `VertexProperty` values.
+
+Example values:
+
+[source,text]
+----
+01 00 00 00 00 01 id is int 1
+00 00 00 01 03 00 00 00 00 06 70 65 72 73 6f 6e label is size 1 list with string 'person'
+09 00 00 00 00 01 12 00 02 00 00 00 00 00 00 00 00 09 properties is a size 1 list with VertexProperty id 9
+00 00 00 01 03 00 00 00 00 08 6c 6f 63 61 74 69 6f 6e VertexProperty label is string 'location'
+03 00 00 00 00 08 73 61 6e 74 61 20 66 65 VertexProperty value is string 'santa fe'
+fe 01 VertexProperty parent is always null
+09 00 00 00 00 01 VertexProperty has a size 1 list
+0f 00 00 00 00 09 73 74 61 72 74 54 69 6d 65 metaproperty with string key 'startTime'
+01 00 00 00 07 d5 fe 01 VertexProperty metaproperty value is 2005 with null parent
+----
==== VertexProperty
@@ -349,106 +351,40 @@
Where:
- `{id}` is a fully qualified typed value composed of `{type_code}{type_info}{value_flag}{value}`.
-- `{label}` is a `String` value.
+- `{label}` is a `List` {value}.
- `{value}` is a fully qualified typed value composed of `{type_code}{type_info}{value_flag}{value}`.
- `{parent}` is a fully qualified typed value composed of `{type_code}{type_info}{value_flag}{value}` which contains
the parent `Vertex`. Note that as TinkerPop currently send "references" only, this value will always be `null`.
-- `{properties}` is a fully qualified typed value composed of `{type_code}{type_info}{value_flag}{value}` which contains
-properties.
+- `{properties}` is a `List` of `Property` objects.
-==== Barrier
+Example values:
-Format: a fully qualified single `String` representing the enum value.
-
-==== Binding
-
-Format: `{key}{value}`
-
-Where:
-
-- `{key}` is a `String` value.
-- `{value}` is a fully qualified typed value composed of `{type_code}{type_info}{value_flag}{value}`.
-
-==== Bytecode
-
-Format: `{steps_length}{step_0}...{step_n}{sources_length}{source_0}...{source_n}`
-
-Where:
-
-* `{steps_length}` is an `Int` value describing the amount of steps.
-* `{step_i}` is composed of `{name}{values_length}{value_0}...{value_n}`, where:
-** `{name}` is a String.
-** `{values_length}` is an `Int` describing the amount values.
-** `{value_i}` is a fully qualified typed value composed of `{type_code}{type_info}{value_flag}{value}` describing the step argument.
-* `{sources_length}` is an `Int` value describing the amount of source instructions.
-* `{source_i}` is composed of `{name}{values_length}{value_0}...{value_n}`, where:
-** `{name}` is a `String`.
-** `{values_length}` is an `Int` describing the amount values.
-** `{value_i}` is a fully qualified typed value composed of `{type_code}{type_info}{value_flag}{value}`.
-
-==== Cardinality
-
-Format: a fully qualified single `String` representing the enum value.
-
-==== Column
-
-Format: a fully qualified single `String` representing the enum value.
+[source,text]
+----
+02 00 00 00 00 00 00 00 00 00 id is Long 0
+00 00 00 01 03 00 00 00 00 04 6e 61 6d 65 label is size 1 list with string 'name'
+03 00 00 00 00 05 6d 61 72 6b 6f value is string 'marko'
+fe 01 parent is always null
+09 00 00 00 00 00 metaproperties is empty list
+----
==== Direction
Format: a fully qualified single `String` representing the enum value.
-==== Operator
+Example values:
-Format: a fully qualified single `String` representing the enum value.
-
-==== Order
-
-Format: a fully qualified single `String` representing the enum value.
-
-==== Pick
-
-Format: a fully qualified single `String` representing the enum value.
-
-==== Pop
-
-Format: a fully qualified single `String` representing the enum value.
-
-==== Lambda
-
-Format: `{language}{script}{arguments_length}`
-Where:
-
-- `{language}` is a `String`.
-- `{script}` is a `String`.
-- `{arguments_length}` is an `Int`.
-
-==== P
-
-Format: `{name}{values_length}{value_0}...{value_n}`
-
-Where:
-
-- `{name}` is a String.
-- `{values_length}` is an `Int` describing the amount values.
-- `{value_i}` is a fully qualified typed value composed of `{type_code}{type_info}{value_flag}{value}`.
-
-==== Scope
-
-Format: a fully qualified single `String` representing the enum value.
+- `00 00 00 03 4F 55 54`: OUT
+- `00 00 00 02 49 4E`: IN
==== T
Format: a fully qualified single `String` representing the enum value.
-==== Traverser
+Example values:
-Format: `{bulk}{value}`
-
-Where:
-
-- `{bulk}` is a `Long`.
-- `{value}` is a fully qualified typed value composed of `{type_code}{type_info}{value_flag}{value}`.
+- `00 00 00 05 6C 61 62 65 6C`: label
+- `00 00 00 02 69 64`: id
==== BigDecimal
@@ -470,7 +406,7 @@
Where:
-- `{length}` is an `Int`.
+- `{length}` is an `Int` describing the size of `{value}` in bytes.
- `{value}` is the two's complement of the `BigInteger`.
Example values of the two's complement `{value}`:
@@ -485,9 +421,14 @@
==== Byte
-An 8-bit two's complement integer.
+Format: 1-byte two's complement integer.
-==== ByteBuffer
+Example values:
+
+- `01`: 8-bit integer number 1.
+- `ff`: 8-bit integer number -1.
+
+==== Binary
Format: `{length}{value}`
@@ -500,43 +441,15 @@
Format: 2-byte two's complement integer.
+Example values:
+
+- `00 01`: 16-bit integer number 1.
+- `01 02`: 16-bit integer number 258.
+
==== Boolean
Format: A single byte containing the value `0x01` when it's `true` and `0` otherwise.
-==== TextP
-
-Format: `{predicate}{values_length}{value_0}...{value_n}`
-
-Where:
-
-- `{name}` is a String.
-- `{values_length}` is an `Int` describing the amount values.
-- `{value_i}` is a fully qualified typed value composed of `{type_code}{type_info}{value_flag}{value}`.
-
-==== TraversalStrategy
-
-Format: `{strategy_class}{configuration}`
-
-Where:
-
-- `{strategy_class}` is a `Class` that is of type `TraversalStrategy`.
-- `{configuration}` is a `Map` of data used to configure the strategy that will be given to a `TraversalStrategy` `create(Configuration)` method.
-
-==== BulkSet
-
-Format: `{length}{item_0}...{item_n}`
-
-Where:
-
-- `{length}` is an `Int` describing the length of the `BulkSet`.
-- `{item_0}...{item_n}` are the items of the `BulkSet`. `{item_i}` is a sequence of a fully qualified typed value composed of
-`{type_code}{type_info}{value_flag}{value}` followed by the "bulk" which is a `Long` value.
-
-If the implementing language does not have a `BulkSet` object to deserialize into, this format can be coerced to a
-`List` and still be considered compliant with Gremlin. Simply "expand the bulk" by adding the item to the `List` the
-number of times specified by the bulk.
-
==== Tree
Format: `{length}{item_0}...{item_n}`
@@ -547,59 +460,58 @@
- `{item_0}...{item_n}` are the items of the `Tree`. `{item_i}` is composed of a `{key}` which is a fully-qualified typed value
followed by a `{Tree}`.
-==== Metrics
+==== Marker
-Format: `{id}{name}{duration}{counts}{annotations}{nested_metrics}`
+A 1-byte marker used to separate the end of the data and the beginning of the status of a `ResponseMessage`. This is
+mainly used by language variants during deserialization.
+
+Format: 1-byte integer with a value of `00`.
+
+==== CompositePDT
+
+A composite custom type, represented as a type and a map of values.
+
+Format: `{type}{fields}`
Where:
-- `{id}` is a `String` representing the identifier.
-- `{name}` is a `String` representing the name.
-- `{duration}` is a `Long` describing the duration in nanoseconds.
-- `{counts}` is a `Map` composed by `String` keys and `Long` values.
-- `{annotations}` is a `Map` composed by `String` keys and a value of any type.
-- `{nested_metrics}` is a `List` composed by `Metrics` items.
+- `{type}` is a `String` containing the implementation specific text identifier of the custom type.
+- `{fields}` is a `Map` representing the fields of the composite type.
-==== TraversalMetrics
+Example values:
-Format: `{duration}{metrics}`
+[source,text]
+----
+03 00 00 00 00 05 50 6F 69 6E 74: the string "Point"
+0A 00 00 00 00 02 31 30: length 2 map header
+03 00 00 00 00 01 78 01 00 00 00 00 01: {x:1}
+03 00 00 00 00 01 79 01 00 00 00 00 02: {y:2}
+----
+
+==== PrimitivePDT
+
+A primitive custom type, represented as a type and the stringified value.
+
+Format: `{type}{value}`
Where:
-- `{duration}` is a `Long` describing the duration in nanoseconds.
-- `{metrics}` is a `List` composed by `Metrics` items.
+- `{type}` is a `String` containing the implementation specific text identifier of the custom type.
+- `{value}` is a `String` representing the string version of the value.
-==== Merge
+Example values:
-Format: a single `String` representing the enum value.
-
-==== DT
-
-Format: a single `String` representing the enum value.
-
-==== Custom
-
-A custom type, represented as a blob value.
-
-Type Info: `{name}{custom_type_info}`
-
-Where:
-
-- `{name}` is a `String` containing the implementation specific text identifier of the custom type.
-- `{custom_type_info}` is a `ByteBuffer` representing the additional type information, specially useful
-for complex custom types.
-
-Value format: `{blob}`
-
-Where:
-
-- `{blob}` is a `ByteBuffer`.
+[source,text]
+----
+03 00 00 00 00 05 55 69 6E 74 38: the string "Uint8"
+03 00 00 00 00 02 31 30: the string "10"
+----
==== Unspecified Null Object
A `null` value for an unspecified Object value.
-It's represented using the null `{value_flag}` set and no sequence of bytes.
+It's represented using the null `{value_flag}` set and no sequence of bytes (which is `FE 01`).
==== Char
@@ -630,126 +542,6 @@
- `{seconds}` is a `Long`.
- `{nanos}` is an `Int`.
-==== InetAddress
-
-Format: Same as `ByteBuffer`, having only 4 byte or 16 byte sequences allowed.
-
-==== Instant
-
-An instantaneous point on the time-line.
-
-Format: `{seconds}{nanos}`
-
-Where:
-
-- `{seconds}` is a `Long`.
-- `{nanos}` is an `Int`.
-
-==== LocalDate
-
-A date without a time-zone in the ISO-8601 calendar system.
-
-Format: `{year}{month}{day}`
-
-Where:
-
-- `{year}` is an `Int` from -999,999,999 to 999,999,999.
-- `{month}` is a `Byte` to represent the month, from 1 (January) to 12 (December)
-- `{day}` is a `Byte` from 1 to 31.
-
-==== LocalDateTime
-
-Format: `{date}{time}`
-
-Where:
-
-- `{date}` is `LocalDate`.
-- `{time}` is a `LocalTime`.
-
-==== LocalTime
-A time without a time-zone in the ISO-8601 calendar system.
-
-Format: An 8 byte two's complement long representing nanoseconds since midnight.
-
-Valid values are in the range 0 to 86399999999999
-
-==== MonthDay
-
-A month-day in the ISO-8601 calendar system.
-
-Format: `{month}{day}`
-
-Where:
-
-- `{month}` is `Byte` value from 1 to 12.
-- `{day}` is `Byte` value from 1 to 31.
-
-==== OffsetDateTime
-
-A date-time with an offset from UTC/Greenwich in the ISO-8601 calendar system, such as 2007-12-03T10:15:30+01:00.
-
-Format: `{local_date_time}{offset}`
-
-Where:
-
-- `{local_date_time}` is `LocalDateTime`.
-- `{offset}` is `ZoneOffset`.
-
-==== OffsetTime
-
-A time with an offset from UTC/Greenwich in the ISO-8601 calendar system, such as 10:15:30+01:00.
-
-Format: `{local_time}{offset}`
-
-Where:
-
-- `{local_time}` is `LocalTime`.
-- `{offset}` is `ZoneOffset`.
-
-==== Period
-
-A date-based amount of time in the ISO-8601 calendar system, such as '2 years, 3 months and 4 days'.
-
-Format: `{years}{month}{days}`
-
-Where:
-
-`{years}`, `{month}` and `{days}` are `Int` values.
-
-==== Year
-
-A year in the ISO-8601 calendar system, such as 2018.
-
-Format: An `Int` representing the years.
-
-==== YearMonth
-
-A year-month in the ISO-8601 calendar system, such as 2007-12.
-
-Format: `{year}{month}`
-
-Where:
-
-- `{year}` is an `Int`.
-- `{month}` is a `Byte` from 1 to 12.
-
-==== ZonedDateTime
-
-A date-time with a time-zone in the ISO-8601 calendar system.
-
-Format: `{local_date_time}{zone_offset}`
-
-Where:
-
-- `{local_date_time}` is `LocalDateTime`.
-- `{zone_offset}` is a `ZoneOffset`.
-
-==== ZoneOffset
-
-A time-zone offset from Greenwich/UTC, such as +02:00.
-
-Format: An `Int` representing total zone offset in seconds.
-
=== Request and Response Messages
Request and response messages are special container types used to represent messages from client to the server and the
@@ -759,33 +551,32 @@
Represents a message from the client to the server.
-Format: `{version}{request_id}{op}{processor}{args}`
+Format: `{version}{fields}{gremlin}`
Where:
- `{version}` is a `Byte` representing the specification version, with the most significant bit set to one. For this
-version of the format, the value expected is `0x81` (`10000001`).
-- `{request_id}` is a `UUID`.
-- `{op}` is a `String`.
-- `{processor}` is a `String`.
-- `{args}` is a `Map`.
+version of the format, the value expected is `0x84` (`10000004`).
+- `{fields}` is a `Map`.
+- `{gremlin}` is a `String`.
-The total length is not part of the message as the transport layer will provide it. For example: WebSockets,
-as a framing protocol, defines payload length.
+The total length is not part of the message as the transport layer will provide it. For example: in HTTP, there is the
+`Content-Length` header which defines the payload size.
==== Response Message
-Format: `{version}{request_id}{status_code}{status_message}{status_attributes}{result_meta}{result_data}`
+Format: `{version}{bulked}{result_data}{marker}{status_code}{status_message}{exception}`
Where:
- `{version}` is a `Byte` representing the protocol version, with the most significant bit set to one. For this version
-of the protocol, the value expected is `0x81` (`10000001`).
-- `{request_id}` is a nullable `UUID`.
+of the protocol, the value expected is `0x84` (`10000004`).
+- `{bulked}` is a `Byte` representing whether `{result_data}` is bulked. `00` is false and `01` is true.
+- `{result_data}` is a sequence of fully qualified typed value composed of `{type_code}{type_info}{value_flag}{value}`.
+If `{bulked}` is `01` then each value is followed by an 8-byte integer denoting the bulk of the preceding value.
+- `{marker}` is a `Marker`.
- `{status_code}` is an `Int`.
- `{status_message}` is a nullable `String`.
-- `{status_attributes}` is a `Map`.
-- `{result_meta}` is a `Map`.
-- `{result_data}` is a fully qualified typed value composed of `{type_code}{type_info}{value_flag}{value}`.
+- `{exception}` is a nullable `String`.
The total length is not part of the message as the transport layer will provide it.
diff --git a/docs/src/dev/io/graphson.asciidoc b/docs/src/dev/io/graphson.asciidoc
index 8bfacf2..987a486 100644
--- a/docs/src/dev/io/graphson.asciidoc
+++ b/docs/src/dev/io/graphson.asciidoc
@@ -17,11 +17,13 @@
[[graphson]]
= GraphSON
-image:gremlin-graphson.png[width=350,float=left] GraphSON is a JSON-based format that is designed for human readable
+image:../../../static/images/gremlin-graphson.png[width=350,float=left] GraphSON is a JSON-based format that is designed for human readable
output that is easily supported in any programming language through the wide-array of JSON parsing libraries that
-exist on virtually all platforms. GraphSON is considered both a "graph" format and a generalized object serialization
-format. That characteristic makes it useful as a serialization format for Gremlin Server where arbitrary objects
-of varying types may be returned as results.
+exist on virtually all platforms. GraphSON versions 1 to 3 were considered to be both a "graph" format and a
+generalized object serialization format. That characteristic makes it useful as a serialization format for Gremlin
+Server where arbitrary objects of varying types may be returned as results. However, starting in GraphSON 4, GraphSON
+is only intended to be a network serialization format that is only able to serialize specific types defined by the
+format. It is only meant to be used with the TinkerPop HTTP API.
When considering GraphSON as a "graph" format, the relevant feature to consider is the `writeGraph` and `readGraph`
methods on the `GraphSONWriter` and `GraphSONReader` interfaces, respectively. These methods write the entire `Graph`
@@ -48,7 +50,7 @@
Generalized object serialization will be discussed later in this section, so for now the focus will be on the "graph"
format. Unlike GraphML, GraphSON does not use an edge list format. It uses an adjacency list. In the adjacency list,
each vertex is essentially a line in the file and the vertex line contains a list of all the edges associated with
-that vertex. The GraphSON 3.0 representation looks like this for the Modern toy graph:
+that vertex. The GraphSON 4.0 representation looks like this for the Modern toy graph:
[source,json]
----
@@ -60,7 +62,7 @@
{"id":{"@type":"g:Int32","@value":6},"label":"person","outE":{"created":[{"id":{"@type":"g:Int32","@value":12},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Double","@value":0.2}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":10},"value":"peter"}],"age":[{"id":{"@type":"g:Int64","@value":11},"value":{"@type":"g:Int32","@value":35}}]}}
----
-At a glance, one can see that this is not a valid JSON document. While that form may seem incorrect, there is a reason.
+At a glance, one can see that this is not a valid JSON document (although it is a valid https://jsonlines.org[JSON Lines] document). While that form may seem incorrect, there is a reason.
The "graph" format is designed by default to be splittable, such that distributed systems like Spark can easily divide
the GraphSON file for processing. If this data were represented as an "array of vertices" with square brackets at the
beginning and end of the file, the format would be less conducive to fit that purpose. It is possible to change this
@@ -70,11 +72,11 @@
[source,json]
----
{ "vertices": [
- {"id":{"@type":"g:Int32","@value":1},"label":"person","outE":{"created":[{"id":{"@type":"g:Int32","@value":9},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Double","@value":0.4}}}],"knows":[{"id":{"@type":"g:Int32","@value":7},"inV":{"@type":"g:Int32","@value":2},"properties":{"weight":{"@type":"g:Double","@value":0.5}}},{"id":{"@type":"g:Int32","@value":8},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Double","@value":1.0}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":0},"value":"marko"}],"age":[{"id":{"@type":"g:Int64","@value":1},"value":{"@type":"g:Int32","@value":29}}]}}
- {"id":{"@type":"g:Int32","@value":2},"label":"person","inE":{"knows":[{"id":{"@type":"g:Int32","@value":7},"outV":{"@type":"g:Int32","@value":1},"properties":{"weight":{"@type":"g:Double","@value":0.5}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":2},"value":"vadas"}],"age":[{"id":{"@type":"g:Int64","@value":3},"value":{"@type":"g:Int32","@value":27}}]}}
- {"id":{"@type":"g:Int32","@value":3},"label":"software","inE":{"created":[{"id":{"@type":"g:Int32","@value":9},"outV":{"@type":"g:Int32","@value":1},"properties":{"weight":{"@type":"g:Double","@value":0.4}}},{"id":{"@type":"g:Int32","@value":11},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Double","@value":0.4}}},{"id":{"@type":"g:Int32","@value":12},"outV":{"@type":"g:Int32","@value":6},"properties":{"weight":{"@type":"g:Double","@value":0.2}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":4},"value":"lop"}],"lang":[{"id":{"@type":"g:Int64","@value":5},"value":"java"}]}}
- {"id":{"@type":"g:Int32","@value":4},"label":"person","inE":{"knows":[{"id":{"@type":"g:Int32","@value":8},"outV":{"@type":"g:Int32","@value":1},"properties":{"weight":{"@type":"g:Double","@value":1.0}}}]},"outE":{"created":[{"id":{"@type":"g:Int32","@value":10},"inV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Double","@value":1.0}}},{"id":{"@type":"g:Int32","@value":11},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Double","@value":0.4}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":6},"value":"josh"}],"age":[{"id":{"@type":"g:Int64","@value":7},"value":{"@type":"g:Int32","@value":32}}]}}
- {"id":{"@type":"g:Int32","@value":5},"label":"software","inE":{"created":[{"id":{"@type":"g:Int32","@value":10},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Double","@value":1.0}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":8},"value":"ripple"}],"lang":[{"id":{"@type":"g:Int64","@value":9},"value":"java"}]}}
+ {"id":{"@type":"g:Int32","@value":1},"label":"person","outE":{"created":[{"id":{"@type":"g:Int32","@value":9},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Double","@value":0.4}}}],"knows":[{"id":{"@type":"g:Int32","@value":7},"inV":{"@type":"g:Int32","@value":2},"properties":{"weight":{"@type":"g:Double","@value":0.5}}},{"id":{"@type":"g:Int32","@value":8},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Double","@value":1.0}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":0},"value":"marko"}],"age":[{"id":{"@type":"g:Int64","@value":1},"value":{"@type":"g:Int32","@value":29}}]}},
+ {"id":{"@type":"g:Int32","@value":2},"label":"person","inE":{"knows":[{"id":{"@type":"g:Int32","@value":7},"outV":{"@type":"g:Int32","@value":1},"properties":{"weight":{"@type":"g:Double","@value":0.5}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":2},"value":"vadas"}],"age":[{"id":{"@type":"g:Int64","@value":3},"value":{"@type":"g:Int32","@value":27}}]}},
+ {"id":{"@type":"g:Int32","@value":3},"label":"software","inE":{"created":[{"id":{"@type":"g:Int32","@value":9},"outV":{"@type":"g:Int32","@value":1},"properties":{"weight":{"@type":"g:Double","@value":0.4}}},{"id":{"@type":"g:Int32","@value":11},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Double","@value":0.4}}},{"id":{"@type":"g:Int32","@value":12},"outV":{"@type":"g:Int32","@value":6},"properties":{"weight":{"@type":"g:Double","@value":0.2}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":4},"value":"lop"}],"lang":[{"id":{"@type":"g:Int64","@value":5},"value":"java"}]}},
+ {"id":{"@type":"g:Int32","@value":4},"label":"person","inE":{"knows":[{"id":{"@type":"g:Int32","@value":8},"outV":{"@type":"g:Int32","@value":1},"properties":{"weight":{"@type":"g:Double","@value":1.0}}}]},"outE":{"created":[{"id":{"@type":"g:Int32","@value":10},"inV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Double","@value":1.0}}},{"id":{"@type":"g:Int32","@value":11},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Double","@value":0.4}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":6},"value":"josh"}],"age":[{"id":{"@type":"g:Int64","@value":7},"value":{"@type":"g:Int32","@value":32}}]}},
+ {"id":{"@type":"g:Int32","@value":5},"label":"software","inE":{"created":[{"id":{"@type":"g:Int32","@value":10},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Double","@value":1.0}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":8},"value":"ripple"}],"lang":[{"id":{"@type":"g:Int64","@value":9},"value":"java"}]}},
{"id":{"@type":"g:Int32","@value":6},"label":"person","outE":{"created":[{"id":{"@type":"g:Int32","@value":12},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Double","@value":0.2}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":10},"value":"peter"}],"age":[{"id":{"@type":"g:Int64","@value":11},"value":{"@type":"g:Int32","@value":35}}]}}
]}
----
@@ -97,112 +99,2196 @@
and it could be different (or change) from server to server. When building applications, it is recommended that the
mime type is made explicit on requests to avoid breaking changes or unexpected results.
-[[graphson-1d0]]
-== Version 1.0
+[[graphson-4]]
+== Version 4.0
-Version 1.0 of GraphSON was released with TinkerPop 3.0.0. It is referred to by the following mime types:
+Version 4.0 of GraphSON was first introduced on TinkerPop 4.0.0 and is represented by the
+`application/vnd.gremlin-v4.0+json` mime type. There also exists an untyped version:
+`application/vnd.gremlin-v4.0+json;types=false`. It is very similar to GraphSON 3.0, with just several key differences:
+many underused or duplicated types have been removed, labels are now list of strings and request/response formats have
+changed quite a bit, and custom types have been replaced with Provider Defined Type (PDT).
-* `application/vnd.gremlin-v1.0+json` - types embedded
-* `application/vnd.gremlin-v1.0+json;types=false` - no types embedded
+=== Boolean
-When types are embedded, GraphSON uses the standard
-link:https://github.com/FasterXML/jackson-databind[Jackson] type embedding approach that writes the full Java class
-name into a "@class" field in the JSON. While this approach isn't especially language agnostic it does at least give
-some hint as to what the expected type is.
+Matches the JSON Boolean and doesn't have type information.
-This section focuses on non-embedded types and their formats as there was little usage of embedded types in generalized
-object serialization use cases. The format was simply too cumbersome to parse of non-Jackson enabled libraries and the
-use cases for it were limited. <<graphson-2d0,GraphSON Version 2.0>> attempts to improve upon this limitation.
+[source,text]
+----
+true
+----
-=== Graph Structure
+[source,text]
+----
+true
+----
-==== Edge
+=== Composite PDT
+
+JSON Object with two required keys: "type" and "fields" +
+"type" is a JSON String +
+"fields" is a `g:Map`
[source,json]
----
{
- "id" : 13,
- "label" : "develops",
- "type" : "edge",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : 10,
- "outV" : 1,
- "properties" : {
- "since" : 2009
+ "@type": "g:CompositePdt",
+ "@value": {
+ "type": "tinkerId",
+ "fields": {
+ "@type": "g:Map",
+ "@value": [
+ "intId",
+ {
+ "@type": "g:Int32",
+ "@value": -1360894799
+ },
+ "strId",
+ "0"
+ ]
+ }
}
}
----
-==== Path
+[source,json]
+----
+{
+ "type": "tinkerId",
+ "fields": {
+ "intId": -1360894799,
+ "strId": "0"
+ }
+}
+----
+
+=== DateTime
+
+JSON String representing a datetime in the ISO-8601 format.
[source,json]
----
{
- "labels" : [ [ ], [ ], [ ] ],
- "objects" : [ {
- "id" : 1,
- "label" : "person",
- "type" : "vertex",
- "properties" : {
- "name" : [ {
- "id" : 0,
- "value" : "marko"
- } ],
- "location" : [ {
- "id" : 6,
- "value" : "san diego",
- "properties" : {
- "startTime" : 1997,
- "endTime" : 2001
- }
- }, {
- "id" : 7,
- "value" : "santa cruz",
- "properties" : {
- "startTime" : 2001,
- "endTime" : 2004
- }
- }, {
- "id" : 8,
- "value" : "brussels",
- "properties" : {
- "startTime" : 2004,
- "endTime" : 2005
- }
- }, {
- "id" : 9,
- "value" : "santa fe",
- "properties" : {
- "startTime" : 2005
- }
- } ]
- }
- }, {
- "id" : 10,
- "label" : "software",
- "type" : "vertex",
- "properties" : {
- "name" : [ {
- "id" : 4,
- "value" : "gremlin"
- } ]
- }
- }, {
- "id" : 11,
- "label" : "software",
- "type" : "vertex",
- "properties" : {
- "name" : [ {
- "id" : 5,
- "value" : "tinkergraph"
- } ]
- }
- } ]
+ "@type" : "g:DateTime",
+ "@value" : "2007-12-03T10:15:30+01:00"
}
----
-==== Property
+[source,text]
+----
+"2007-12-03T10:15:30+01:00"
+----
+
+=== Double
+
+A JSON Number with the same range as a IEEE754 double precision floating point or a JSON String with one of the
+following values: "-Infinity", "Infinity", "NaN"
+
+[source,json]
+----
+{
+ "@type" : "g:Double",
+ "@value" : 100.0
+}
+----
+
+[source,text]
+----
+100.0
+----
+
+=== Float
+
+A JSON Number with the same range as a IEEE754 single precision floating point or a JSON String with one of the
+following values: "-Infinity", "Infinity", "NaN"
+
+[source,json]
+----
+{
+ "@type" : "g:Float",
+ "@value" : 100.0
+}
+----
+
+[source,text]
+----
+100.0
+----
+
+=== Integer
+
+A JSON Number with the same range as a 4-byte signed integer.
+
+[source,json]
+----
+{
+ "@type" : "g:Int32",
+ "@value" : 100
+}
+----
+
+[source,text]
+----
+100
+----
+
+=== List
+
+List is a JSON Array. The type is used to distinguish between different collection types that are also mapped to JSON
+Array. The untyped version converts complex types to JSON String.
+
+[source,json]
+----
+{
+ "@type": "g:List",
+ "@value": [
+ {
+ "@type": "g:Int32",
+ "@value": 1
+ },
+ "person",
+ true,
+ null
+ ]
+}
+----
+
+[source,text]
+----
+[ 1, "person", true, null ]
+----
+
+=== Long
+
+A JSON Number with the same range as a 8-byte signed integer.
+
+[source,json]
+----
+{
+ "@type" : "g:Int64",
+ "@value" : 100
+}
+----
+
+[source,text]
+----
+100
+----
+
+=== Map
+
+Map is a JSON Array to provide the ability to allow for non-String keys, which is not possible in JSON. The untyped
+version converts complex types to JSON String.
+
+[source,json]
+----
+{
+ "@type": "g:Map",
+ "@value": [
+ {
+ "@type": "g:List",
+ "@value": [
+ {
+ "@type": "g:Int32",
+ "@value": 1
+ },
+ {
+ "@type": "g:Int32",
+ "@value": 2
+ },
+ {
+ "@type": "g:Int32",
+ "@value": 3
+ }
+ ]
+ },
+ null,
+ "test",
+ {
+ "@type": "g:Int32",
+ "@value": 123
+ },
+ {
+ "@type": "g:DateTime",
+ "@value": "2024-09-02T10:30Z"
+ },
+ "red"
+ ]
+}
+----
+
+[source,json]
+----
+{
+ "[1, 2, 3]": null,
+ "test": 123,
+ "2024-09-02T10:30Z": "red"
+}
+----
+
+=== Null
+
+Matches the JSON Null and doesn't have type information.
+
+[source,text]
+----
+null
+----
+
+[source,text]
+----
+null
+----
+
+=== Primitive PDT
+
+JSON Object with two required keys: "type" and "value" +
+"type" is a JSON String +
+"value" is a JSON String
+
+[source,json]
+----
+{
+ "@type": "g:PrimitivePdt",
+ "@value": {
+ "type": "tinkerId",
+ "value": "-1360894799"
+ }
+}
+----
+
+[source,json]
+----
+{
+ "type": "tinkerId",
+ "value": "-1360894799"
+}
+----
+
+=== Set
+
+A JSON Array. The untyped version converts complex types to JSON String.
+
+[source,json]
+----
+{
+ "@type": "g:Set",
+ "@value": [
+ null,
+ {
+ "@type": "g:Int32",
+ "@value": 2
+ },
+ "person",
+ true
+ ]
+}
+----
+
+[source,text]
+----
+[ null, 2, "person", true ]
+----
+
+=== String
+
+Matches the JSON String and doesn't have type information.
+
+[source,text]
+----
+"abc"
+----
+
+[source,text]
+----
+"abc"
+----
+
+=== UUID
+
+JSON String form of UUID.
+
+[source,json]
+----
+{
+ "@type" : "g:UUID",
+ "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
+}
+----
+
+[source,text]
+----
+"41d2e28a-20a4-4ab0-b379-d810dede3786"
+----
+
+=== Edge
+
+JSON Object (required keys are: id, label, inVLabel, outVLabel, inV, outV) +
+"id" is any GraphSON 4.0 type +
+"inV", "outV" is an Object that contains "id" which is any GraphSON 4.0 type and "label" which is a `g:List` of `String`
+"label" is a `g:List` of `String` +
+"properties" is an optional Object containing Arrays of `g:Property`
+
+The untyped version has one additional required key "type" which is always "vertex".
+
+[source,json]
+----
+{
+ "@type": "g:Edge",
+ "@value": {
+ "id": {
+ "@type": "g:Int32",
+ "@value": 13
+ },
+ "label": [
+ "develops"
+ ],
+ "inV": {
+ "id": {
+ "@type": "g:Int32",
+ "@value": 10
+ },
+ "label": [
+ "software"
+ ]
+ },
+ "outV": {
+ "id": {
+ "@type": "g:Int32",
+ "@value": 1
+ },
+ "label": [
+ "person"
+ ]
+ },
+ "properties": {
+ "since": [
+ {
+ "@type": "g:Property",
+ "@value": {
+ "key": "since",
+ "value": {
+ "@type": "g:Int32",
+ "@value": 2009
+ }
+ }
+ }
+ ]
+ }
+ }
+}
+----
+
+[source,json]
+----
+{
+ "id": 13,
+ "label": [
+ "develops"
+ ],
+ "type": "edge",
+ "inV": {
+ "id": 10,
+ "label": [
+ "software"
+ ]
+ },
+ "outV": {
+ "id": 1,
+ "label": [
+ "person"
+ ]
+ },
+ "properties": {
+ "since": [
+ 2009
+ ]
+ }
+}
+----
+
+=== Graph
+
+`TinkerGraph` has a custom serializer that is registered as part of the `TinkerIoRegistry`. Graph is a JSON Object with
+two required keys: "vertices" and "edges" +
+"vertices" is an Array of `g:Vertex` +
+"edges" is an Array of `g:Edge`
+
+[source,json]
+----
+{
+ "@type": "g:graph",
+ "@value": {
+ "vertices": [
+ {
+ "@type": "g:Vertex",
+ "@value": {
+ "id": {
+ "@type": "g:Int32",
+ "@value": 1
+ },
+ "label": [
+ "person"
+ ],
+ "properties": {
+ "name": [
+ {
+ "@type": "g:VertexProperty",
+ "@value": {
+ "id": {
+ "@type": "g:Int64",
+ "@value": 0
+ },
+ "value": "marko",
+ "label": [
+ "name"
+ ]
+ }
+ }
+ ],
+ "location": [
+ {
+ "@type": "g:VertexProperty",
+ "@value": {
+ "id": {
+ "@type": "g:Int64",
+ "@value": 6
+ },
+ "value": "san diego",
+ "label": [
+ "location"
+ ],
+ "properties": {
+ "startTime": {
+ "@type": "g:Int32",
+ "@value": 1997
+ },
+ "endTime": {
+ "@type": "g:Int32",
+ "@value": 2001
+ }
+ }
+ }
+ },
+ {
+ "@type": "g:VertexProperty",
+ "@value": {
+ "id": {
+ "@type": "g:Int64",
+ "@value": 7
+ },
+ "value": "santa cruz",
+ "label": [
+ "location"
+ ],
+ "properties": {
+ "startTime": {
+ "@type": "g:Int32",
+ "@value": 2001
+ },
+ "endTime": {
+ "@type": "g:Int32",
+ "@value": 2004
+ }
+ }
+ }
+ },
+ {
+ "@type": "g:VertexProperty",
+ "@value": {
+ "id": {
+ "@type": "g:Int64",
+ "@value": 8
+ },
+ "value": "brussels",
+ "label": [
+ "location"
+ ],
+ "properties": {
+ "startTime": {
+ "@type": "g:Int32",
+ "@value": 2004
+ },
+ "endTime": {
+ "@type": "g:Int32",
+ "@value": 2005
+ }
+ }
+ }
+ },
+ {
+ "@type": "g:VertexProperty",
+ "@value": {
+ "id": {
+ "@type": "g:Int64",
+ "@value": 9
+ },
+ "value": "santa fe",
+ "label": [
+ "location"
+ ],
+ "properties": {
+ "startTime": {
+ "@type": "g:Int32",
+ "@value": 2005
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ },
+ {
+ "@type": "g:Vertex",
+ "@value": {
+ "id": {
+ "@type": "g:Int32",
+ "@value": 7
+ },
+ "label": [
+ "person"
+ ],
+ "properties": {
+ "name": [
+ {
+ "@type": "g:VertexProperty",
+ "@value": {
+ "id": {
+ "@type": "g:Int64",
+ "@value": 1
+ },
+ "value": "stephen",
+ "label": [
+ "name"
+ ]
+ }
+ }
+ ],
+ "location": [
+ {
+ "@type": "g:VertexProperty",
+ "@value": {
+ "id": {
+ "@type": "g:Int64",
+ "@value": 10
+ },
+ "value": "centreville",
+ "label": [
+ "location"
+ ],
+ "properties": {
+ "startTime": {
+ "@type": "g:Int32",
+ "@value": 1990
+ },
+ "endTime": {
+ "@type": "g:Int32",
+ "@value": 2000
+ }
+ }
+ }
+ },
+ {
+ "@type": "g:VertexProperty",
+ "@value": {
+ "id": {
+ "@type": "g:Int64",
+ "@value": 11
+ },
+ "value": "dulles",
+ "label": [
+ "location"
+ ],
+ "properties": {
+ "startTime": {
+ "@type": "g:Int32",
+ "@value": 2000
+ },
+ "endTime": {
+ "@type": "g:Int32",
+ "@value": 2006
+ }
+ }
+ }
+ },
+ {
+ "@type": "g:VertexProperty",
+ "@value": {
+ "id": {
+ "@type": "g:Int64",
+ "@value": 12
+ },
+ "value": "purcellville",
+ "label": [
+ "location"
+ ],
+ "properties": {
+ "startTime": {
+ "@type": "g:Int32",
+ "@value": 2006
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ },
+ {
+ "@type": "g:Vertex",
+ "@value": {
+ "id": {
+ "@type": "g:Int32",
+ "@value": 8
+ },
+ "label": [
+ "person"
+ ],
+ "properties": {
+ "name": [
+ {
+ "@type": "g:VertexProperty",
+ "@value": {
+ "id": {
+ "@type": "g:Int64",
+ "@value": 2
+ },
+ "value": "matthias",
+ "label": [
+ "name"
+ ]
+ }
+ }
+ ],
+ "location": [
+ {
+ "@type": "g:VertexProperty",
+ "@value": {
+ "id": {
+ "@type": "g:Int64",
+ "@value": 13
+ },
+ "value": "bremen",
+ "label": [
+ "location"
+ ],
+ "properties": {
+ "startTime": {
+ "@type": "g:Int32",
+ "@value": 2004
+ },
+ "endTime": {
+ "@type": "g:Int32",
+ "@value": 2007
+ }
+ }
+ }
+ },
+ {
+ "@type": "g:VertexProperty",
+ "@value": {
+ "id": {
+ "@type": "g:Int64",
+ "@value": 14
+ },
+ "value": "baltimore",
+ "label": [
+ "location"
+ ],
+ "properties": {
+ "startTime": {
+ "@type": "g:Int32",
+ "@value": 2007
+ },
+ "endTime": {
+ "@type": "g:Int32",
+ "@value": 2011
+ }
+ }
+ }
+ },
+ {
+ "@type": "g:VertexProperty",
+ "@value": {
+ "id": {
+ "@type": "g:Int64",
+ "@value": 15
+ },
+ "value": "oakland",
+ "label": [
+ "location"
+ ],
+ "properties": {
+ "startTime": {
+ "@type": "g:Int32",
+ "@value": 2011
+ },
+ "endTime": {
+ "@type": "g:Int32",
+ "@value": 2014
+ }
+ }
+ }
+ },
+ {
+ "@type": "g:VertexProperty",
+ "@value": {
+ "id": {
+ "@type": "g:Int64",
+ "@value": 16
+ },
+ "value": "seattle",
+ "label": [
+ "location"
+ ],
+ "properties": {
+ "startTime": {
+ "@type": "g:Int32",
+ "@value": 2014
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ },
+ {
+ "@type": "g:Vertex",
+ "@value": {
+ "id": {
+ "@type": "g:Int32",
+ "@value": 9
+ },
+ "label": [
+ "person"
+ ],
+ "properties": {
+ "name": [
+ {
+ "@type": "g:VertexProperty",
+ "@value": {
+ "id": {
+ "@type": "g:Int64",
+ "@value": 3
+ },
+ "value": "daniel",
+ "label": [
+ "name"
+ ]
+ }
+ }
+ ],
+ "location": [
+ {
+ "@type": "g:VertexProperty",
+ "@value": {
+ "id": {
+ "@type": "g:Int64",
+ "@value": 17
+ },
+ "value": "spremberg",
+ "label": [
+ "location"
+ ],
+ "properties": {
+ "startTime": {
+ "@type": "g:Int32",
+ "@value": 1982
+ },
+ "endTime": {
+ "@type": "g:Int32",
+ "@value": 2005
+ }
+ }
+ }
+ },
+ {
+ "@type": "g:VertexProperty",
+ "@value": {
+ "id": {
+ "@type": "g:Int64",
+ "@value": 18
+ },
+ "value": "kaiserslautern",
+ "label": [
+ "location"
+ ],
+ "properties": {
+ "startTime": {
+ "@type": "g:Int32",
+ "@value": 2005
+ },
+ "endTime": {
+ "@type": "g:Int32",
+ "@value": 2009
+ }
+ }
+ }
+ },
+ {
+ "@type": "g:VertexProperty",
+ "@value": {
+ "id": {
+ "@type": "g:Int64",
+ "@value": 19
+ },
+ "value": "aachen",
+ "label": [
+ "location"
+ ],
+ "properties": {
+ "startTime": {
+ "@type": "g:Int32",
+ "@value": 2009
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ },
+ {
+ "@type": "g:Vertex",
+ "@value": {
+ "id": {
+ "@type": "g:Int32",
+ "@value": 10
+ },
+ "label": [
+ "software"
+ ],
+ "properties": {
+ "name": [
+ {
+ "@type": "g:VertexProperty",
+ "@value": {
+ "id": {
+ "@type": "g:Int64",
+ "@value": 4
+ },
+ "value": "gremlin",
+ "label": [
+ "name"
+ ]
+ }
+ }
+ ]
+ }
+ }
+ },
+ {
+ "@type": "g:Vertex",
+ "@value": {
+ "id": {
+ "@type": "g:Int32",
+ "@value": 11
+ },
+ "label": [
+ "software"
+ ],
+ "properties": {
+ "name": [
+ {
+ "@type": "g:VertexProperty",
+ "@value": {
+ "id": {
+ "@type": "g:Int64",
+ "@value": 5
+ },
+ "value": "tinkergraph",
+ "label": [
+ "name"
+ ]
+ }
+ }
+ ]
+ }
+ }
+ }
+ ],
+ "edges": [
+ {
+ "@type": "g:Edge",
+ "@value": {
+ "id": {
+ "@type": "g:Int32",
+ "@value": 13
+ },
+ "label": [
+ "develops"
+ ],
+ "inV": {
+ "id": {
+ "@type": "g:Int32",
+ "@value": 10
+ },
+ "label": [
+ "software"
+ ]
+ },
+ "outV": {
+ "id": {
+ "@type": "g:Int32",
+ "@value": 1
+ },
+ "label": [
+ "person"
+ ]
+ },
+ "properties": {
+ "since": [
+ {
+ "@type": "g:Property",
+ "@value": {
+ "key": "since",
+ "value": {
+ "@type": "g:Int32",
+ "@value": 2009
+ }
+ }
+ }
+ ]
+ }
+ }
+ },
+ {
+ "@type": "g:Edge",
+ "@value": {
+ "id": {
+ "@type": "g:Int32",
+ "@value": 14
+ },
+ "label": [
+ "develops"
+ ],
+ "inV": {
+ "id": {
+ "@type": "g:Int32",
+ "@value": 11
+ },
+ "label": [
+ "software"
+ ]
+ },
+ "outV": {
+ "id": {
+ "@type": "g:Int32",
+ "@value": 1
+ },
+ "label": [
+ "person"
+ ]
+ },
+ "properties": {
+ "since": [
+ {
+ "@type": "g:Property",
+ "@value": {
+ "key": "since",
+ "value": {
+ "@type": "g:Int32",
+ "@value": 2010
+ }
+ }
+ }
+ ]
+ }
+ }
+ },
+ {
+ "@type": "g:Edge",
+ "@value": {
+ "id": {
+ "@type": "g:Int32",
+ "@value": 15
+ },
+ "label": [
+ "uses"
+ ],
+ "inV": {
+ "id": {
+ "@type": "g:Int32",
+ "@value": 10
+ },
+ "label": [
+ "software"
+ ]
+ },
+ "outV": {
+ "id": {
+ "@type": "g:Int32",
+ "@value": 1
+ },
+ "label": [
+ "person"
+ ]
+ },
+ "properties": {
+ "skill": [
+ {
+ "@type": "g:Property",
+ "@value": {
+ "key": "skill",
+ "value": {
+ "@type": "g:Int32",
+ "@value": 4
+ }
+ }
+ }
+ ]
+ }
+ }
+ },
+ {
+ "@type": "g:Edge",
+ "@value": {
+ "id": {
+ "@type": "g:Int32",
+ "@value": 16
+ },
+ "label": [
+ "uses"
+ ],
+ "inV": {
+ "id": {
+ "@type": "g:Int32",
+ "@value": 11
+ },
+ "label": [
+ "software"
+ ]
+ },
+ "outV": {
+ "id": {
+ "@type": "g:Int32",
+ "@value": 1
+ },
+ "label": [
+ "person"
+ ]
+ },
+ "properties": {
+ "skill": [
+ {
+ "@type": "g:Property",
+ "@value": {
+ "key": "skill",
+ "value": {
+ "@type": "g:Int32",
+ "@value": 5
+ }
+ }
+ }
+ ]
+ }
+ }
+ },
+ {
+ "@type": "g:Edge",
+ "@value": {
+ "id": {
+ "@type": "g:Int32",
+ "@value": 17
+ },
+ "label": [
+ "develops"
+ ],
+ "inV": {
+ "id": {
+ "@type": "g:Int32",
+ "@value": 10
+ },
+ "label": [
+ "software"
+ ]
+ },
+ "outV": {
+ "id": {
+ "@type": "g:Int32",
+ "@value": 7
+ },
+ "label": [
+ "person"
+ ]
+ },
+ "properties": {
+ "since": [
+ {
+ "@type": "g:Property",
+ "@value": {
+ "key": "since",
+ "value": {
+ "@type": "g:Int32",
+ "@value": 2010
+ }
+ }
+ }
+ ]
+ }
+ }
+ },
+ {
+ "@type": "g:Edge",
+ "@value": {
+ "id": {
+ "@type": "g:Int32",
+ "@value": 18
+ },
+ "label": [
+ "develops"
+ ],
+ "inV": {
+ "id": {
+ "@type": "g:Int32",
+ "@value": 11
+ },
+ "label": [
+ "software"
+ ]
+ },
+ "outV": {
+ "id": {
+ "@type": "g:Int32",
+ "@value": 7
+ },
+ "label": [
+ "person"
+ ]
+ },
+ "properties": {
+ "since": [
+ {
+ "@type": "g:Property",
+ "@value": {
+ "key": "since",
+ "value": {
+ "@type": "g:Int32",
+ "@value": 2011
+ }
+ }
+ }
+ ]
+ }
+ }
+ },
+ {
+ "@type": "g:Edge",
+ "@value": {
+ "id": {
+ "@type": "g:Int32",
+ "@value": 19
+ },
+ "label": [
+ "uses"
+ ],
+ "inV": {
+ "id": {
+ "@type": "g:Int32",
+ "@value": 10
+ },
+ "label": [
+ "software"
+ ]
+ },
+ "outV": {
+ "id": {
+ "@type": "g:Int32",
+ "@value": 7
+ },
+ "label": [
+ "person"
+ ]
+ },
+ "properties": {
+ "skill": [
+ {
+ "@type": "g:Property",
+ "@value": {
+ "key": "skill",
+ "value": {
+ "@type": "g:Int32",
+ "@value": 5
+ }
+ }
+ }
+ ]
+ }
+ }
+ },
+ {
+ "@type": "g:Edge",
+ "@value": {
+ "id": {
+ "@type": "g:Int32",
+ "@value": 20
+ },
+ "label": [
+ "uses"
+ ],
+ "inV": {
+ "id": {
+ "@type": "g:Int32",
+ "@value": 11
+ },
+ "label": [
+ "software"
+ ]
+ },
+ "outV": {
+ "id": {
+ "@type": "g:Int32",
+ "@value": 7
+ },
+ "label": [
+ "person"
+ ]
+ },
+ "properties": {
+ "skill": [
+ {
+ "@type": "g:Property",
+ "@value": {
+ "key": "skill",
+ "value": {
+ "@type": "g:Int32",
+ "@value": 4
+ }
+ }
+ }
+ ]
+ }
+ }
+ },
+ {
+ "@type": "g:Edge",
+ "@value": {
+ "id": {
+ "@type": "g:Int32",
+ "@value": 21
+ },
+ "label": [
+ "develops"
+ ],
+ "inV": {
+ "id": {
+ "@type": "g:Int32",
+ "@value": 10
+ },
+ "label": [
+ "software"
+ ]
+ },
+ "outV": {
+ "id": {
+ "@type": "g:Int32",
+ "@value": 8
+ },
+ "label": [
+ "person"
+ ]
+ },
+ "properties": {
+ "since": [
+ {
+ "@type": "g:Property",
+ "@value": {
+ "key": "since",
+ "value": {
+ "@type": "g:Int32",
+ "@value": 2012
+ }
+ }
+ }
+ ]
+ }
+ }
+ },
+ {
+ "@type": "g:Edge",
+ "@value": {
+ "id": {
+ "@type": "g:Int32",
+ "@value": 22
+ },
+ "label": [
+ "uses"
+ ],
+ "inV": {
+ "id": {
+ "@type": "g:Int32",
+ "@value": 10
+ },
+ "label": [
+ "software"
+ ]
+ },
+ "outV": {
+ "id": {
+ "@type": "g:Int32",
+ "@value": 8
+ },
+ "label": [
+ "person"
+ ]
+ },
+ "properties": {
+ "skill": [
+ {
+ "@type": "g:Property",
+ "@value": {
+ "key": "skill",
+ "value": {
+ "@type": "g:Int32",
+ "@value": 3
+ }
+ }
+ }
+ ]
+ }
+ }
+ },
+ {
+ "@type": "g:Edge",
+ "@value": {
+ "id": {
+ "@type": "g:Int32",
+ "@value": 23
+ },
+ "label": [
+ "uses"
+ ],
+ "inV": {
+ "id": {
+ "@type": "g:Int32",
+ "@value": 11
+ },
+ "label": [
+ "software"
+ ]
+ },
+ "outV": {
+ "id": {
+ "@type": "g:Int32",
+ "@value": 8
+ },
+ "label": [
+ "person"
+ ]
+ },
+ "properties": {
+ "skill": [
+ {
+ "@type": "g:Property",
+ "@value": {
+ "key": "skill",
+ "value": {
+ "@type": "g:Int32",
+ "@value": 3
+ }
+ }
+ }
+ ]
+ }
+ }
+ },
+ {
+ "@type": "g:Edge",
+ "@value": {
+ "id": {
+ "@type": "g:Int32",
+ "@value": 24
+ },
+ "label": [
+ "uses"
+ ],
+ "inV": {
+ "id": {
+ "@type": "g:Int32",
+ "@value": 10
+ },
+ "label": [
+ "software"
+ ]
+ },
+ "outV": {
+ "id": {
+ "@type": "g:Int32",
+ "@value": 9
+ },
+ "label": [
+ "person"
+ ]
+ },
+ "properties": {
+ "skill": [
+ {
+ "@type": "g:Property",
+ "@value": {
+ "key": "skill",
+ "value": {
+ "@type": "g:Int32",
+ "@value": 5
+ }
+ }
+ }
+ ]
+ }
+ }
+ },
+ {
+ "@type": "g:Edge",
+ "@value": {
+ "id": {
+ "@type": "g:Int32",
+ "@value": 25
+ },
+ "label": [
+ "uses"
+ ],
+ "inV": {
+ "id": {
+ "@type": "g:Int32",
+ "@value": 11
+ },
+ "label": [
+ "software"
+ ]
+ },
+ "outV": {
+ "id": {
+ "@type": "g:Int32",
+ "@value": 9
+ },
+ "label": [
+ "person"
+ ]
+ },
+ "properties": {
+ "skill": [
+ {
+ "@type": "g:Property",
+ "@value": {
+ "key": "skill",
+ "value": {
+ "@type": "g:Int32",
+ "@value": 3
+ }
+ }
+ }
+ ]
+ }
+ }
+ },
+ {
+ "@type": "g:Edge",
+ "@value": {
+ "id": {
+ "@type": "g:Int32",
+ "@value": 26
+ },
+ "label": [
+ "traverses"
+ ],
+ "inV": {
+ "id": {
+ "@type": "g:Int32",
+ "@value": 11
+ },
+ "label": [
+ "software"
+ ]
+ },
+ "outV": {
+ "id": {
+ "@type": "g:Int32",
+ "@value": 10
+ },
+ "label": [
+ "software"
+ ]
+ }
+ }
+ }
+ ]
+ }
+}
+----
+
+[source,json]
+----
+{
+ "vertices": [
+ {
+ "id": 1,
+ "label": [
+ "person"
+ ],
+ "type": "vertex",
+ "properties": {
+ "name": [
+ {
+ "id": 0,
+ "value": "marko"
+ }
+ ],
+ "location": [
+ {
+ "id": 6,
+ "value": "san diego",
+ "properties": {
+ "startTime": 1997,
+ "endTime": 2001
+ }
+ },
+ {
+ "id": 7,
+ "value": "santa cruz",
+ "properties": {
+ "startTime": 2001,
+ "endTime": 2004
+ }
+ },
+ {
+ "id": 8,
+ "value": "brussels",
+ "properties": {
+ "startTime": 2004,
+ "endTime": 2005
+ }
+ },
+ {
+ "id": 9,
+ "value": "santa fe",
+ "properties": {
+ "startTime": 2005
+ }
+ }
+ ]
+ }
+ },
+ {
+ "id": 7,
+ "label": [
+ "person"
+ ],
+ "type": "vertex",
+ "properties": {
+ "name": [
+ {
+ "id": 1,
+ "value": "stephen"
+ }
+ ],
+ "location": [
+ {
+ "id": 10,
+ "value": "centreville",
+ "properties": {
+ "startTime": 1990,
+ "endTime": 2000
+ }
+ },
+ {
+ "id": 11,
+ "value": "dulles",
+ "properties": {
+ "startTime": 2000,
+ "endTime": 2006
+ }
+ },
+ {
+ "id": 12,
+ "value": "purcellville",
+ "properties": {
+ "startTime": 2006
+ }
+ }
+ ]
+ }
+ },
+ {
+ "id": 8,
+ "label": [
+ "person"
+ ],
+ "type": "vertex",
+ "properties": {
+ "name": [
+ {
+ "id": 2,
+ "value": "matthias"
+ }
+ ],
+ "location": [
+ {
+ "id": 13,
+ "value": "bremen",
+ "properties": {
+ "startTime": 2004,
+ "endTime": 2007
+ }
+ },
+ {
+ "id": 14,
+ "value": "baltimore",
+ "properties": {
+ "startTime": 2007,
+ "endTime": 2011
+ }
+ },
+ {
+ "id": 15,
+ "value": "oakland",
+ "properties": {
+ "startTime": 2011,
+ "endTime": 2014
+ }
+ },
+ {
+ "id": 16,
+ "value": "seattle",
+ "properties": {
+ "startTime": 2014
+ }
+ }
+ ]
+ }
+ },
+ {
+ "id": 9,
+ "label": [
+ "person"
+ ],
+ "type": "vertex",
+ "properties": {
+ "name": [
+ {
+ "id": 3,
+ "value": "daniel"
+ }
+ ],
+ "location": [
+ {
+ "id": 17,
+ "value": "spremberg",
+ "properties": {
+ "startTime": 1982,
+ "endTime": 2005
+ }
+ },
+ {
+ "id": 18,
+ "value": "kaiserslautern",
+ "properties": {
+ "startTime": 2005,
+ "endTime": 2009
+ }
+ },
+ {
+ "id": 19,
+ "value": "aachen",
+ "properties": {
+ "startTime": 2009
+ }
+ }
+ ]
+ }
+ },
+ {
+ "id": 10,
+ "label": [
+ "software"
+ ],
+ "type": "vertex",
+ "properties": {
+ "name": [
+ {
+ "id": 4,
+ "value": "gremlin"
+ }
+ ]
+ }
+ },
+ {
+ "id": 11,
+ "label": [
+ "software"
+ ],
+ "type": "vertex",
+ "properties": {
+ "name": [
+ {
+ "id": 5,
+ "value": "tinkergraph"
+ }
+ ]
+ }
+ }
+ ],
+ "edges": [
+ {
+ "id": 13,
+ "label": [
+ "develops"
+ ],
+ "type": "edge",
+ "inV": {
+ "id": 10,
+ "label": [
+ "software"
+ ]
+ },
+ "outV": {
+ "id": 1,
+ "label": [
+ "person"
+ ]
+ },
+ "properties": {
+ "since": [
+ 2009
+ ]
+ }
+ },
+ {
+ "id": 14,
+ "label": [
+ "develops"
+ ],
+ "type": "edge",
+ "inV": {
+ "id": 11,
+ "label": [
+ "software"
+ ]
+ },
+ "outV": {
+ "id": 1,
+ "label": [
+ "person"
+ ]
+ },
+ "properties": {
+ "since": [
+ 2010
+ ]
+ }
+ },
+ {
+ "id": 15,
+ "label": [
+ "uses"
+ ],
+ "type": "edge",
+ "inV": {
+ "id": 10,
+ "label": [
+ "software"
+ ]
+ },
+ "outV": {
+ "id": 1,
+ "label": [
+ "person"
+ ]
+ },
+ "properties": {
+ "skill": [
+ 4
+ ]
+ }
+ },
+ {
+ "id": 16,
+ "label": [
+ "uses"
+ ],
+ "type": "edge",
+ "inV": {
+ "id": 11,
+ "label": [
+ "software"
+ ]
+ },
+ "outV": {
+ "id": 1,
+ "label": [
+ "person"
+ ]
+ },
+ "properties": {
+ "skill": [
+ 5
+ ]
+ }
+ },
+ {
+ "id": 17,
+ "label": [
+ "develops"
+ ],
+ "type": "edge",
+ "inV": {
+ "id": 10,
+ "label": [
+ "software"
+ ]
+ },
+ "outV": {
+ "id": 7,
+ "label": [
+ "person"
+ ]
+ },
+ "properties": {
+ "since": [
+ 2010
+ ]
+ }
+ },
+ {
+ "id": 18,
+ "label": [
+ "develops"
+ ],
+ "type": "edge",
+ "inV": {
+ "id": 11,
+ "label": [
+ "software"
+ ]
+ },
+ "outV": {
+ "id": 7,
+ "label": [
+ "person"
+ ]
+ },
+ "properties": {
+ "since": [
+ 2011
+ ]
+ }
+ },
+ {
+ "id": 19,
+ "label": [
+ "uses"
+ ],
+ "type": "edge",
+ "inV": {
+ "id": 10,
+ "label": [
+ "software"
+ ]
+ },
+ "outV": {
+ "id": 7,
+ "label": [
+ "person"
+ ]
+ },
+ "properties": {
+ "skill": [
+ 5
+ ]
+ }
+ },
+ {
+ "id": 20,
+ "label": [
+ "uses"
+ ],
+ "type": "edge",
+ "inV": {
+ "id": 11,
+ "label": [
+ "software"
+ ]
+ },
+ "outV": {
+ "id": 7,
+ "label": [
+ "person"
+ ]
+ },
+ "properties": {
+ "skill": [
+ 4
+ ]
+ }
+ },
+ {
+ "id": 21,
+ "label": [
+ "develops"
+ ],
+ "type": "edge",
+ "inV": {
+ "id": 10,
+ "label": [
+ "software"
+ ]
+ },
+ "outV": {
+ "id": 8,
+ "label": [
+ "person"
+ ]
+ },
+ "properties": {
+ "since": [
+ 2012
+ ]
+ }
+ },
+ {
+ "id": 22,
+ "label": [
+ "uses"
+ ],
+ "type": "edge",
+ "inV": {
+ "id": 10,
+ "label": [
+ "software"
+ ]
+ },
+ "outV": {
+ "id": 8,
+ "label": [
+ "person"
+ ]
+ },
+ "properties": {
+ "skill": [
+ 3
+ ]
+ }
+ },
+ {
+ "id": 23,
+ "label": [
+ "uses"
+ ],
+ "type": "edge",
+ "inV": {
+ "id": 11,
+ "label": [
+ "software"
+ ]
+ },
+ "outV": {
+ "id": 8,
+ "label": [
+ "person"
+ ]
+ },
+ "properties": {
+ "skill": [
+ 3
+ ]
+ }
+ },
+ {
+ "id": 24,
+ "label": [
+ "uses"
+ ],
+ "type": "edge",
+ "inV": {
+ "id": 10,
+ "label": [
+ "software"
+ ]
+ },
+ "outV": {
+ "id": 9,
+ "label": [
+ "person"
+ ]
+ },
+ "properties": {
+ "skill": [
+ 5
+ ]
+ }
+ },
+ {
+ "id": 25,
+ "label": [
+ "uses"
+ ],
+ "type": "edge",
+ "inV": {
+ "id": 11,
+ "label": [
+ "software"
+ ]
+ },
+ "outV": {
+ "id": 9,
+ "label": [
+ "person"
+ ]
+ },
+ "properties": {
+ "skill": [
+ 3
+ ]
+ }
+ },
+ {
+ "id": 26,
+ "label": [
+ "traverses"
+ ],
+ "type": "edge",
+ "inV": {
+ "id": 11,
+ "label": [
+ "software"
+ ]
+ },
+ "outV": {
+ "id": 10,
+ "label": [
+ "software"
+ ]
+ }
+ }
+ ]
+}
+----
+
+=== Path
+
+Object with two required keys: "labels" and "objects" +
+"labels" is a `g:List` of `g:Set` of labels of the steps traversed +
+"objects" is a `g:List` of objects traversed
+
+[source,json]
+----
+{
+ "@type": "g:Path",
+ "@value": {
+ "labels": {
+ "@type": "g:List",
+ "@value": [
+ {
+ "@type": "g:Set",
+ "@value": []
+ },
+ {
+ "@type": "g:Set",
+ "@value": []
+ },
+ {
+ "@type": "g:Set",
+ "@value": []
+ }
+ ]
+ },
+ "objects": {
+ "@type": "g:List",
+ "@value": [
+ {
+ "@type": "g:Vertex",
+ "@value": {
+ "id": {
+ "@type": "g:Int32",
+ "@value": 1
+ },
+ "label": [
+ "person"
+ ]
+ }
+ },
+ {
+ "@type": "g:Vertex",
+ "@value": {
+ "id": {
+ "@type": "g:Int32",
+ "@value": 10
+ },
+ "label": [
+ "software"
+ ]
+ }
+ },
+ {
+ "@type": "g:Vertex",
+ "@value": {
+ "id": {
+ "@type": "g:Int32",
+ "@value": 11
+ },
+ "label": [
+ "software"
+ ]
+ }
+ }
+ ]
+ }
+ }
+}
+----
+
+[source,json]
+----
+{
+ "labels": [
+ [],
+ [],
+ []
+ ],
+ "objects": [
+ {
+ "id": 1,
+ "label": [
+ "person"
+ ],
+ "type": "vertex"
+ },
+ {
+ "id": 10,
+ "label": [
+ "software"
+ ],
+ "type": "vertex"
+ },
+ {
+ "id": 11,
+ "label": [
+ "software"
+ ],
+ "type": "vertex"
+ }
+ ]
+}
+----
+
+=== Property
+
+JSON Object with two required keys: "key" and "value" +
+"key" is a `String` +
+"value" is any GraphSON 4.0 type
+
+[source,json]
+----
+{
+ "@type": "g:Property",
+ "@value": {
+ "key": "since",
+ "value": {
+ "@type": "g:Int32",
+ "@value": 2009
+ }
+ }
+}
+----
[source,json]
----
@@ -212,4634 +2298,381 @@
}
----
-==== TinkerGraph
+=== Tree
-`TinkerGraph` has a custom serializer that is registered as part of the `TinkerIoRegistry`.
+JSON Object with one or more possibly nested "key" "value" pairs
+"key" is an Element (`g:Vertex`, `g:Edge`, `g:VertexProperty`)
+"value" is a `g:Tree` making this a recursively defined structure
[source,json]
----
{
- "vertices" : [ {
- "id" : 1,
- "label" : "person",
- "type" : "vertex",
- "properties" : {
- "name" : [ {
- "id" : 0,
- "value" : "marko"
- } ],
- "location" : [ {
- "id" : 6,
- "value" : "san diego",
- "properties" : {
- "startTime" : 1997,
- "endTime" : 2001
- }
- }, {
- "id" : 7,
- "value" : "santa cruz",
- "properties" : {
- "startTime" : 2001,
- "endTime" : 2004
- }
- }, {
- "id" : 8,
- "value" : "brussels",
- "properties" : {
- "startTime" : 2004,
- "endTime" : 2005
- }
- }, {
- "id" : 9,
- "value" : "santa fe",
- "properties" : {
- "startTime" : 2005
- }
- } ]
- }
- }, {
- "id" : 7,
- "label" : "person",
- "type" : "vertex",
- "properties" : {
- "name" : [ {
- "id" : 1,
- "value" : "stephen"
- } ],
- "location" : [ {
- "id" : 10,
- "value" : "centreville",
- "properties" : {
- "startTime" : 1990,
- "endTime" : 2000
- }
- }, {
- "id" : 11,
- "value" : "dulles",
- "properties" : {
- "startTime" : 2000,
- "endTime" : 2006
- }
- }, {
- "id" : 12,
- "value" : "purcellville",
- "properties" : {
- "startTime" : 2006
- }
- } ]
- }
- }, {
- "id" : 8,
- "label" : "person",
- "type" : "vertex",
- "properties" : {
- "name" : [ {
- "id" : 2,
- "value" : "matthias"
- } ],
- "location" : [ {
- "id" : 13,
- "value" : "bremen",
- "properties" : {
- "startTime" : 2004,
- "endTime" : 2007
- }
- }, {
- "id" : 14,
- "value" : "baltimore",
- "properties" : {
- "startTime" : 2007,
- "endTime" : 2011
- }
- }, {
- "id" : 15,
- "value" : "oakland",
- "properties" : {
- "startTime" : 2011,
- "endTime" : 2014
- }
- }, {
- "id" : 16,
- "value" : "seattle",
- "properties" : {
- "startTime" : 2014
- }
- } ]
- }
- }, {
- "id" : 9,
- "label" : "person",
- "type" : "vertex",
- "properties" : {
- "name" : [ {
- "id" : 3,
- "value" : "daniel"
- } ],
- "location" : [ {
- "id" : 17,
- "value" : "spremberg",
- "properties" : {
- "startTime" : 1982,
- "endTime" : 2005
- }
- }, {
- "id" : 18,
- "value" : "kaiserslautern",
- "properties" : {
- "startTime" : 2005,
- "endTime" : 2009
- }
- }, {
- "id" : 19,
- "value" : "aachen",
- "properties" : {
- "startTime" : 2009
- }
- } ]
- }
- }, {
- "id" : 10,
- "label" : "software",
- "type" : "vertex",
- "properties" : {
- "name" : [ {
- "id" : 4,
- "value" : "gremlin"
- } ]
- }
- }, {
- "id" : 11,
- "label" : "software",
- "type" : "vertex",
- "properties" : {
- "name" : [ {
- "id" : 5,
- "value" : "tinkergraph"
- } ]
- }
- } ],
- "edges" : [ {
- "id" : 13,
- "label" : "develops",
- "type" : "edge",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : 10,
- "outV" : 1,
- "properties" : {
- "since" : 2009
- }
- }, {
- "id" : 14,
- "label" : "develops",
- "type" : "edge",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : 11,
- "outV" : 1,
- "properties" : {
- "since" : 2010
- }
- }, {
- "id" : 15,
- "label" : "uses",
- "type" : "edge",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : 10,
- "outV" : 1,
- "properties" : {
- "skill" : 4
- }
- }, {
- "id" : 16,
- "label" : "uses",
- "type" : "edge",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : 11,
- "outV" : 1,
- "properties" : {
- "skill" : 5
- }
- }, {
- "id" : 17,
- "label" : "develops",
- "type" : "edge",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : 10,
- "outV" : 7,
- "properties" : {
- "since" : 2010
- }
- }, {
- "id" : 18,
- "label" : "develops",
- "type" : "edge",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : 11,
- "outV" : 7,
- "properties" : {
- "since" : 2011
- }
- }, {
- "id" : 19,
- "label" : "uses",
- "type" : "edge",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : 10,
- "outV" : 7,
- "properties" : {
- "skill" : 5
- }
- }, {
- "id" : 20,
- "label" : "uses",
- "type" : "edge",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : 11,
- "outV" : 7,
- "properties" : {
- "skill" : 4
- }
- }, {
- "id" : 21,
- "label" : "develops",
- "type" : "edge",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : 10,
- "outV" : 8,
- "properties" : {
- "since" : 2012
- }
- }, {
- "id" : 22,
- "label" : "uses",
- "type" : "edge",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : 10,
- "outV" : 8,
- "properties" : {
- "skill" : 3
- }
- }, {
- "id" : 23,
- "label" : "uses",
- "type" : "edge",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : 11,
- "outV" : 8,
- "properties" : {
- "skill" : 3
- }
- }, {
- "id" : 24,
- "label" : "uses",
- "type" : "edge",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : 10,
- "outV" : 9,
- "properties" : {
- "skill" : 5
- }
- }, {
- "id" : 25,
- "label" : "uses",
- "type" : "edge",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : 11,
- "outV" : 9,
- "properties" : {
- "skill" : 3
- }
- }, {
- "id" : 26,
- "label" : "traverses",
- "type" : "edge",
- "inVLabel" : "software",
- "outVLabel" : "software",
- "inV" : 11,
- "outV" : 10
- } ]
-}
-----
-
-==== Vertex
-
-[source,json]
-----
-{
- "id" : 1,
- "label" : "person",
- "type" : "vertex",
- "properties" : {
- "name" : [ {
- "id" : 0,
- "value" : "marko"
- } ],
- "location" : [ {
- "id" : 6,
- "value" : "san diego",
- "properties" : {
- "startTime" : 1997,
- "endTime" : 2001
- }
- }, {
- "id" : 7,
- "value" : "santa cruz",
- "properties" : {
- "startTime" : 2001,
- "endTime" : 2004
- }
- }, {
- "id" : 8,
- "value" : "brussels",
- "properties" : {
- "startTime" : 2004,
- "endTime" : 2005
- }
- }, {
- "id" : 9,
- "value" : "santa fe",
- "properties" : {
- "startTime" : 2005
- }
- } ]
- }
-}
-----
-
-==== VertexProperty
-
-[source,json]
-----
-{
- "id" : 0,
- "value" : "marko",
- "label" : "name"
-}
-----
-
-
-=== RequestMessage
-
-==== Authentication Response
-
-The following `RequestMessage` is an example of the response that should be made to a SASL-based authentication challenge.
-
-[source,json]
-----
-{
- "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
- "op" : "authentication",
- "processor" : "",
- "args" : {
- "saslMechanism" : "PLAIN",
- "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
- }
-}
-----
-
-==== Session Eval
-
-The following `RequestMessage` is an example of a simple session request for a script evaluation with parameters.
-
-[source,json]
-----
-{
- "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
- "op" : "eval",
- "processor" : "session",
- "args" : {
- "gremlin" : "g.V(x)",
- "language" : "gremlin-groovy",
- "session" : "unique-session-identifier",
- "bindings" : {
- "x" : 1
- }
- }
-}
-----
-
-==== Session Eval Aliased
-
-The following `RequestMessage` is an example of a session request for a script evaluation with an alias that binds the `TraversalSource` of "g" to "social".
-
-[source,json]
-----
-{
- "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
- "op" : "eval",
- "processor" : "session",
- "args" : {
- "gremlin" : "social.V(x)",
- "language" : "gremlin-groovy",
- "aliases" : {
- "g" : "social"
- },
- "session" : "unique-session-identifier",
- "bindings" : {
- "x" : 1
- }
- }
-}
-----
-
-==== Session Close
-
-The following `RequestMessage` is an example of a request to close a session.
-
-[source,json]
-----
-{
- "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
- "op" : "close",
- "processor" : "session",
- "args" : {
- "session" : "unique-session-identifier"
- }
-}
-----
-
-==== Sessionless Eval
-
-The following `RequestMessage` is an example of a simple sessionless request for a script evaluation with parameters.
-
-[source,json]
-----
-{
- "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
- "op" : "eval",
- "processor" : "",
- "args" : {
- "gremlin" : "g.V(x)",
- "language" : "gremlin-groovy",
- "bindings" : {
- "x" : 1
- }
- }
-}
-----
-
-==== Sessionless Eval Aliased
-
-The following `RequestMessage` is an example of a sessionless request for a script evaluation with an alias that binds the `TraversalSource` of "g" to "social".
-
-[source,json]
-----
-{
- "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
- "op" : "eval",
- "processor" : "",
- "args" : {
- "gremlin" : "social.V(x)",
- "language" : "gremlin-groovy",
- "aliases" : {
- "g" : "social"
- },
- "bindings" : {
- "x" : 1
- }
- }
-}
-----
-
-
-=== ResponseMessage
-
-==== Authentication Challenge
-
-When authentication is enabled, an initial request to the server will result in an authentication challenge. The typical response message will appear as follows, but handling it could be different dependending on the SASL implementation (e.g. multiple challenges may be requested in some cases, but not in the default provided by Gremlin Server).
-
-[source,json]
-----
-{
- "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
- "status" : {
- "message" : "",
- "code" : 407,
- "attributes" : { }
- },
- "result" : {
- "data" : null,
- "meta" : { }
- }
-}
-----
-
-==== Standard Result
-
-The following `ResponseMessage` is a typical example of the typical successful response Gremlin Server will return when returning results from a script.
-
-[source,json]
-----
-{
- "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
- "status" : {
- "message" : "",
- "code" : 200,
- "attributes" : { }
- },
- "result" : {
- "data" : [ {
- "id" : 1,
- "label" : "person",
- "type" : "vertex",
- "properties" : {
- "name" : [ {
- "id" : 0,
- "value" : "marko"
- } ],
- "location" : [ {
- "id" : 6,
- "value" : "san diego",
- "properties" : {
- "startTime" : 1997,
- "endTime" : 2001
+ "@type": "g:Tree",
+ "@value": [
+ {
+ "key": {
+ "@type": "g:Vertex",
+ "@value": {
+ "id": {
+ "@type": "g:Int32",
+ "@value": 10
+ },
+ "label": [
+ "software"
+ ],
+ "properties": {
+ "name": [
+ {
+ "@type": "g:VertexProperty",
+ "@value": {
+ "id": {
+ "@type": "g:Int64",
+ "@value": 4
+ },
+ "value": "gremlin",
+ "label": [
+ "name"
+ ]
+ }
+ }
+ ]
}
- }, {
- "id" : 7,
- "value" : "santa cruz",
- "properties" : {
- "startTime" : 2001,
- "endTime" : 2004
- }
- }, {
- "id" : 8,
- "value" : "brussels",
- "properties" : {
- "startTime" : 2004,
- "endTime" : 2005
- }
- }, {
- "id" : 9,
- "value" : "santa fe",
- "properties" : {
- "startTime" : 2005
- }
- } ]
- }
- } ],
- "meta" : { }
- }
-}
-----
-
-[[graphson-2d0]]
-== Version 2.0
-
-Version 2.0 of GraphSON was first introduced on TinkerPop 3.2.2. It was designed to be less tied to
-link:https://github.com/FasterXML/jackson-databind[Jackson] (a JVM library) and to be less lossy as it pertained to
-types. While the <<graphson-1d0,GraphSON 1.0>> section focused on GraphSON without embedded types, GraphSON 2.0 will
-do the opposite as embedded types is the expected manner in which non-JVM languages will interact with TinkerPop.
-
-GraphSON 2.0 is referred to by the following mime types:
-
-* `application/vnd.gremlin-v2.0+json` - Values are typed by way of a "complex object" that defines a `@typeId` and
-`@value`. The `@typeId` is composed of two parts: a namespace and a type name, in the format "namespace:typename". A
-namespace allows TinkerPop providers and users to categorize custom types that they may implement and avoid collision
-with existing TinkerPop types. By default, TinkerPop types will have the namespace "g" (or "gx" for "extended" types).
-* `application/vnd.gremlin-v2.0+json;types=false` - Values do not have their types embedded in the JSON. This format
-does not follow the 1.0 untyped format in that it does not include a "type" field for `Vertex` and `Edge` objects and
-it serializes property values in those graph objects with a `label` field which is redundant as the "key" field for
-that property will already represent that value.
-
-=== Core
-
-==== Class
-
-[source,json]
-----
-{
- "@type" : "g:Class",
- "@value" : "java.io.File"
-}
-----
-
-==== Date
-
-Representing a millisecond-precision offset from the unix epoch. In Java, it is simply `Date.getTime()`.
-
-[source,json]
-----
-{
- "@type" : "g:Date",
- "@value" : 1481750076295
-}
-----
-
-==== Double
-
-While the `@value` is expected to be a JSON number, it might also be a `String` of `NaN`, `Infinity` or `-Infinity`.
-
-[source,json]
-----
-{
- "@type" : "g:Double",
- "@value" : 100.0
-}
-----
-
-==== Float
-
-[source,json]
-----
-{
- "@type" : "g:Float",
- "@value" : 100.0
-}
-----
-
-==== Integer
-
-[source,json]
-----
-{
- "@type" : "g:Int32",
- "@value" : 100
-}
-----
-
-==== Long
-
-[source,json]
-----
-{
- "@type" : "g:Int64",
- "@value" : 100
-}
-----
-
-==== Timestamp
-
-[source,json]
-----
-{
- "@type" : "g:Timestamp",
- "@value" : 1481750076295
-}
-----
-
-==== UUID
-
-[source,json]
-----
-{
- "@type" : "g:UUID",
- "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
-----
-
-
-=== Graph Structure
-
-==== Edge
-
-[source,json]
-----
-{
- "@type" : "g:Edge",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 13
- },
- "label" : "develops",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : {
- "@type" : "g:Int32",
- "@value" : 10
- },
- "outV" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "properties" : {
- "since" : {
- "@type" : "g:Int32",
- "@value" : 2009
- }
- }
- }
-}
-----
-
-==== Path
-
-[source,json]
-----
-{
- "@type" : "g:Path",
- "@value" : {
- "labels" : [ [ ], [ ], [ ] ],
- "objects" : [ {
- "@type" : "g:Vertex",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "label" : "person"
- }
- }, {
- "@type" : "g:Vertex",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 10
- },
- "label" : "software",
- "properties" : {
- "name" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 4
- },
- "value" : "gremlin",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 10
- },
- "label" : "name"
- }
- } ]
}
- }
- }, {
- "@type" : "g:Vertex",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 11
- },
- "label" : "software",
- "properties" : {
- "name" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 5
- },
- "value" : "tinkergraph",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 11
- },
- "label" : "name"
- }
- } ]
- }
- }
- } ]
- }
-}
-----
-
-==== Property
-
-[source,json]
-----
-{
- "@type" : "g:Property",
- "@value" : {
- "key" : "since",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 2009
- },
- "element" : {
- "@type" : "g:Edge",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 13
- },
- "label" : "develops",
- "outV" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "inV" : {
- "@type" : "g:Int32",
- "@value" : 10
- }
- }
- }
- }
-}
-----
-
-==== StarGraph
-
-[source,json]
-----
-{
- "starVertex" : {
- "@type" : "g:Vertex",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 1
},
- "label" : "person",
- "properties" : {
- "name" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 0
- },
- "value" : "marko",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "label" : "name"
- }
- } ],
- "location" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 6
- },
- "value" : "san diego",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 1997
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2001
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 7
- },
- "value" : "santa cruz",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2001
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2004
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 8
- },
- "value" : "brussels",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2004
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2005
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 9
- },
- "value" : "santa fe",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2005
- }
- }
- }
- } ]
- }
- }
- }
-}
-----
-
-==== TinkerGraph
-
-`TinkerGraph` has a custom serializer that is registered as part of the `TinkerIoRegistry`.
-
-[source,json]
-----
-{
- "@type" : "tinker:graph",
- "@value" : {
- "vertices" : [ {
- "@type" : "g:Vertex",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "label" : "person",
- "properties" : {
- "name" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 0
- },
- "value" : "marko",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "label" : "name"
- }
- } ],
- "location" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 6
- },
- "value" : "san diego",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 1997
+ "value": {
+ "@type": "g:Tree",
+ "@value": [
+ {
+ "key": {
+ "@type": "g:Vertex",
+ "@value": {
+ "id": {
+ "@type": "g:Int32",
+ "@value": 11
},
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2001
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 7
- },
- "value" : "santa cruz",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2001
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2004
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 8
- },
- "value" : "brussels",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2004
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2005
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 9
- },
- "value" : "santa fe",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2005
- }
- }
- }
- } ]
- }
- }
- }, {
- "@type" : "g:Vertex",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 7
- },
- "label" : "person",
- "properties" : {
- "name" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 1
- },
- "value" : "stephen",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 7
- },
- "label" : "name"
- }
- } ],
- "location" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 10
- },
- "value" : "centreville",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 7
- },
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 1990
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2000
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 11
- },
- "value" : "dulles",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 7
- },
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2000
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2006
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 12
- },
- "value" : "purcellville",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 7
- },
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2006
- }
- }
- }
- } ]
- }
- }
- }, {
- "@type" : "g:Vertex",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 8
- },
- "label" : "person",
- "properties" : {
- "name" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 2
- },
- "value" : "matthias",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 8
- },
- "label" : "name"
- }
- } ],
- "location" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 13
- },
- "value" : "bremen",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 8
- },
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2004
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2007
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 14
- },
- "value" : "baltimore",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 8
- },
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2007
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2011
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 15
- },
- "value" : "oakland",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 8
- },
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2011
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2014
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 16
- },
- "value" : "seattle",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 8
- },
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2014
- }
- }
- }
- } ]
- }
- }
- }, {
- "@type" : "g:Vertex",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 9
- },
- "label" : "person",
- "properties" : {
- "name" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 3
- },
- "value" : "daniel",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 9
- },
- "label" : "name"
- }
- } ],
- "location" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 17
- },
- "value" : "spremberg",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 9
- },
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 1982
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2005
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 18
- },
- "value" : "kaiserslautern",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 9
- },
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2005
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2009
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 19
- },
- "value" : "aachen",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 9
- },
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2009
- }
- }
- }
- } ]
- }
- }
- }, {
- "@type" : "g:Vertex",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 10
- },
- "label" : "software",
- "properties" : {
- "name" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 4
- },
- "value" : "gremlin",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 10
- },
- "label" : "name"
- }
- } ]
- }
- }
- }, {
- "@type" : "g:Vertex",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 11
- },
- "label" : "software",
- "properties" : {
- "name" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 5
- },
- "value" : "tinkergraph",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 11
- },
- "label" : "name"
- }
- } ]
- }
- }
- } ],
- "edges" : [ {
- "@type" : "g:Edge",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 13
- },
- "label" : "develops",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : {
- "@type" : "g:Int32",
- "@value" : 10
- },
- "outV" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "properties" : {
- "since" : {
- "@type" : "g:Int32",
- "@value" : 2009
- }
- }
- }
- }, {
- "@type" : "g:Edge",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 14
- },
- "label" : "develops",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : {
- "@type" : "g:Int32",
- "@value" : 11
- },
- "outV" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "properties" : {
- "since" : {
- "@type" : "g:Int32",
- "@value" : 2010
- }
- }
- }
- }, {
- "@type" : "g:Edge",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 15
- },
- "label" : "uses",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : {
- "@type" : "g:Int32",
- "@value" : 10
- },
- "outV" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "properties" : {
- "skill" : {
- "@type" : "g:Int32",
- "@value" : 4
- }
- }
- }
- }, {
- "@type" : "g:Edge",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 16
- },
- "label" : "uses",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : {
- "@type" : "g:Int32",
- "@value" : 11
- },
- "outV" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "properties" : {
- "skill" : {
- "@type" : "g:Int32",
- "@value" : 5
- }
- }
- }
- }, {
- "@type" : "g:Edge",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 17
- },
- "label" : "develops",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : {
- "@type" : "g:Int32",
- "@value" : 10
- },
- "outV" : {
- "@type" : "g:Int32",
- "@value" : 7
- },
- "properties" : {
- "since" : {
- "@type" : "g:Int32",
- "@value" : 2010
- }
- }
- }
- }, {
- "@type" : "g:Edge",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 18
- },
- "label" : "develops",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : {
- "@type" : "g:Int32",
- "@value" : 11
- },
- "outV" : {
- "@type" : "g:Int32",
- "@value" : 7
- },
- "properties" : {
- "since" : {
- "@type" : "g:Int32",
- "@value" : 2011
- }
- }
- }
- }, {
- "@type" : "g:Edge",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 19
- },
- "label" : "uses",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : {
- "@type" : "g:Int32",
- "@value" : 10
- },
- "outV" : {
- "@type" : "g:Int32",
- "@value" : 7
- },
- "properties" : {
- "skill" : {
- "@type" : "g:Int32",
- "@value" : 5
- }
- }
- }
- }, {
- "@type" : "g:Edge",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 20
- },
- "label" : "uses",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : {
- "@type" : "g:Int32",
- "@value" : 11
- },
- "outV" : {
- "@type" : "g:Int32",
- "@value" : 7
- },
- "properties" : {
- "skill" : {
- "@type" : "g:Int32",
- "@value" : 4
- }
- }
- }
- }, {
- "@type" : "g:Edge",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 21
- },
- "label" : "develops",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : {
- "@type" : "g:Int32",
- "@value" : 10
- },
- "outV" : {
- "@type" : "g:Int32",
- "@value" : 8
- },
- "properties" : {
- "since" : {
- "@type" : "g:Int32",
- "@value" : 2012
- }
- }
- }
- }, {
- "@type" : "g:Edge",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 22
- },
- "label" : "uses",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : {
- "@type" : "g:Int32",
- "@value" : 10
- },
- "outV" : {
- "@type" : "g:Int32",
- "@value" : 8
- },
- "properties" : {
- "skill" : {
- "@type" : "g:Int32",
- "@value" : 3
- }
- }
- }
- }, {
- "@type" : "g:Edge",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 23
- },
- "label" : "uses",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : {
- "@type" : "g:Int32",
- "@value" : 11
- },
- "outV" : {
- "@type" : "g:Int32",
- "@value" : 8
- },
- "properties" : {
- "skill" : {
- "@type" : "g:Int32",
- "@value" : 3
- }
- }
- }
- }, {
- "@type" : "g:Edge",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 24
- },
- "label" : "uses",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : {
- "@type" : "g:Int32",
- "@value" : 10
- },
- "outV" : {
- "@type" : "g:Int32",
- "@value" : 9
- },
- "properties" : {
- "skill" : {
- "@type" : "g:Int32",
- "@value" : 5
- }
- }
- }
- }, {
- "@type" : "g:Edge",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 25
- },
- "label" : "uses",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : {
- "@type" : "g:Int32",
- "@value" : 11
- },
- "outV" : {
- "@type" : "g:Int32",
- "@value" : 9
- },
- "properties" : {
- "skill" : {
- "@type" : "g:Int32",
- "@value" : 3
- }
- }
- }
- }, {
- "@type" : "g:Edge",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 26
- },
- "label" : "traverses",
- "inVLabel" : "software",
- "outVLabel" : "software",
- "inV" : {
- "@type" : "g:Int32",
- "@value" : 11
- },
- "outV" : {
- "@type" : "g:Int32",
- "@value" : 10
- }
- }
- } ]
- }
-}
-----
-
-==== Tree
-
-[source,json]
-----
-{
- "@type" : "g:Tree",
- "@value" : [ {
- "key" : {
- "@type" : "g:Vertex",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "label" : "person",
- "properties" : {
- "name" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 0
- },
- "value" : "marko",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "label" : "name"
- }
- } ],
- "location" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 6
- },
- "value" : "san diego",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 1997
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2001
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 7
- },
- "value" : "santa cruz",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2001
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2004
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 8
- },
- "value" : "brussels",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2004
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2005
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 9
- },
- "value" : "santa fe",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2005
- }
- }
- }
- } ]
- }
- }
- },
- "value" : {
- "@type" : "g:Tree",
- "@value" : [ {
- "key" : {
- "@type" : "g:Vertex",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 10
- },
- "label" : "software",
- "properties" : {
- "name" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 4
- },
- "value" : "gremlin",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 10
- },
- "label" : "name"
- }
- } ]
- }
- }
- },
- "value" : {
- "@type" : "g:Tree",
- "@value" : [ {
- "key" : {
- "@type" : "g:Vertex",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 11
- },
- "label" : "software",
- "properties" : {
- "name" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 5
- },
- "value" : "tinkergraph",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 11
- },
- "label" : "name"
+ "label": [
+ "software"
+ ],
+ "properties": {
+ "name": [
+ {
+ "@type": "g:VertexProperty",
+ "@value": {
+ "id": {
+ "@type": "g:Int64",
+ "@value": 5
+ },
+ "value": "tinkergraph",
+ "label": [
+ "name"
+ ]
+ }
}
- } ]
+ ]
}
}
},
- "value" : {
- "@type" : "g:Tree",
- "@value" : [ ]
+ "value": {
+ "@type": "g:Tree",
+ "@value": []
}
- } ]
- }
- } ]
+ }
+ ]
+ }
}
- } ]
+ ]
}
----
-==== Vertex
+[source,json]
+----
+[
+ {
+ "key": {
+ "id": 10,
+ "label": [
+ "software"
+ ],
+ "type": "vertex",
+ "properties": {
+ "name": [
+ {
+ "id": 4,
+ "value": "gremlin"
+ }
+ ]
+ }
+ },
+ "value": [
+ {
+ "key": {
+ "id": 11,
+ "label": [
+ "software"
+ ],
+ "type": "vertex",
+ "properties": {
+ "name": [
+ {
+ "id": 5,
+ "value": "tinkergraph"
+ }
+ ]
+ }
+ },
+ "value": []
+ }
+ ]
+ }
+]
+----
+
+=== Vertex
+
+JSON Object with required keys: "id", "label", "properties" +
+"id" is any GraphSON 4.0 type +
+"label" is a `g:List` of `String` +
+"properties" is an optional Object containing Arrays of `g:VertexProperty`
+
+The untyped version has one additional required key "type" which is always "vertex".
[source,json]
----
{
- "@type" : "g:Vertex",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 1
+ "@type": "g:Vertex",
+ "@value": {
+ "id": {
+ "@type": "g:Int32",
+ "@value": 1
},
- "label" : "person",
- "properties" : {
- "name" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 0
- },
- "value" : "marko",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "label" : "name"
- }
- } ],
- "location" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 6
- },
- "value" : "san diego",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 1997
+ "label": [
+ "person"
+ ],
+ "properties": {
+ "name": [
+ {
+ "@type": "g:VertexProperty",
+ "@value": {
+ "id": {
+ "@type": "g:Int64",
+ "@value": 0
},
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2001
- }
+ "value": "marko",
+ "label": [
+ "name"
+ ]
}
}
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 7
- },
- "value" : "santa cruz",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2001
+ ],
+ "location": [
+ {
+ "@type": "g:VertexProperty",
+ "@value": {
+ "id": {
+ "@type": "g:Int64",
+ "@value": 6
},
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2004
+ "value": "san diego",
+ "label": [
+ "location"
+ ],
+ "properties": {
+ "startTime": {
+ "@type": "g:Int32",
+ "@value": 1997
+ },
+ "endTime": {
+ "@type": "g:Int32",
+ "@value": 2001
+ }
}
}
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 8
- },
- "value" : "brussels",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2004
+ },
+ {
+ "@type": "g:VertexProperty",
+ "@value": {
+ "id": {
+ "@type": "g:Int64",
+ "@value": 7
},
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2005
+ "value": "santa cruz",
+ "label": [
+ "location"
+ ],
+ "properties": {
+ "startTime": {
+ "@type": "g:Int32",
+ "@value": 2001
+ },
+ "endTime": {
+ "@type": "g:Int32",
+ "@value": 2004
+ }
+ }
+ }
+ },
+ {
+ "@type": "g:VertexProperty",
+ "@value": {
+ "id": {
+ "@type": "g:Int64",
+ "@value": 8
+ },
+ "value": "brussels",
+ "label": [
+ "location"
+ ],
+ "properties": {
+ "startTime": {
+ "@type": "g:Int32",
+ "@value": 2004
+ },
+ "endTime": {
+ "@type": "g:Int32",
+ "@value": 2005
+ }
+ }
+ }
+ },
+ {
+ "@type": "g:VertexProperty",
+ "@value": {
+ "id": {
+ "@type": "g:Int64",
+ "@value": 9
+ },
+ "value": "santa fe",
+ "label": [
+ "location"
+ ],
+ "properties": {
+ "startTime": {
+ "@type": "g:Int32",
+ "@value": 2005
+ }
}
}
}
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 9
- },
- "value" : "santa fe",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2005
- }
- }
- }
- } ]
+ ]
}
}
}
----
-==== VertexProperty
-
[source,json]
----
{
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 0
- },
- "value" : "marko",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "label" : "name"
- }
-}
-----
-
-
-=== Graph Process
-
-==== Barrier
-
-[source,json]
-----
-{
- "@type" : "g:Barrier",
- "@value" : "normSack"
-}
-----
-
-==== Binding
-
-A "Binding" refers to a `Bytecode.Binding`.
-
-[source,json]
-----
-{
- "@type" : "g:Binding",
- "@value" : {
- "key" : "x",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 1
- }
- }
-}
-----
-
-==== Bytecode
-
-The following `Bytecode` example represents the traversal of `g.V().hasLabel('person').out().in().tree()`. Obviously the serialized `Bytecode` woudl be quite different for the endless variations of commands that could be used together in the Gremlin language.
-
-[source,json]
-----
-{
- "@type" : "g:Bytecode",
- "@value" : {
- "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
- }
-}
-----
-
-==== Cardinality
-
-[source,json]
-----
-{
- "@type" : "g:Cardinality",
- "@value" : "list"
-}
-----
-
-==== Column
-
-[source,json]
-----
-{
- "@type" : "g:Column",
- "@value" : "keys"
-}
-----
-
-==== Direction
-
-[source,json]
-----
-{
- "@type" : "g:Direction",
- "@value" : "OUT"
-}
-----
-
-==== DT
-
-[source,json]
-----
-{
- "@type" : "g:DT",
- "@value" : "minute"
-}
-----
-
-==== Lambda
-
-[source,json]
-----
-{
- "@type" : "g:Lambda",
- "@value" : {
- "script" : "{ it.get() }",
- "language" : "gremlin-groovy",
- "arguments" : 1
- }
-}
-----
-
-==== Merge
-
-[source,json]
-----
-{
- "@type" : "g:Merge",
- "@value" : "onMatch"
-}
-----
-
-==== Metrics
-
-[source,json]
-----
-{
- "@type" : "g:Metrics",
- "@value" : {
- "dur" : {
- "@type" : "g:Double",
- "@value" : 100.0
- },
- "counts" : {
- "traverserCount" : {
- "@type" : "g:Int64",
- "@value" : 4
+ "id": 1,
+ "label": [
+ "person"
+ ],
+ "type": "vertex",
+ "properties": {
+ "name": [
+ {
+ "id": 0,
+ "value": "marko"
+ }
+ ],
+ "location": [
+ {
+ "id": 6,
+ "value": "san diego",
+ "properties": {
+ "startTime": 1997,
+ "endTime": 2001
+ }
},
- "elementCount" : {
- "@type" : "g:Int64",
- "@value" : 4
- }
- },
- "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
- "annotations" : {
- "percentDur" : {
- "@type" : "g:Double",
- "@value" : 25.0
- }
- },
- "id" : "7.0.0()",
- "metrics" : [ {
- "@type" : "g:Metrics",
- "@value" : {
- "dur" : {
- "@type" : "g:Double",
- "@value" : 100.0
- },
- "counts" : {
- "traverserCount" : {
- "@type" : "g:Int64",
- "@value" : 7
- },
- "elementCount" : {
- "@type" : "g:Int64",
- "@value" : 7
- }
- },
- "name" : "VertexStep(OUT,vertex)",
- "annotations" : {
- "percentDur" : {
- "@type" : "g:Double",
- "@value" : 25.0
- }
- },
- "id" : "3.0.0()"
- }
- } ]
- }
-}
-----
-
-==== Operator
-
-[source,json]
-----
-{
- "@type" : "g:Operator",
- "@value" : "sum"
-}
-----
-
-==== Order
-
-[source,json]
-----
-{
- "@type" : "g:Order",
- "@value" : "shuffle"
-}
-----
-
-==== P
-
-[source,json]
-----
-{
- "@type" : "g:P",
- "@value" : {
- "predicate" : "gt",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 0
- }
- }
-}
-----
-
-==== P within
-
-[source,json]
-----
-{
- "@type" : "g:P",
- "@value" : {
- "predicate" : "within",
- "value" : [ {
- "@type" : "g:Int32",
- "@value" : 1
- } ]
- }
-}
-----
-
-==== P without
-
-[source,json]
-----
-{
- "@type" : "g:P",
- "@value" : {
- "predicate" : "without",
- "value" : [ {
- "@type" : "g:Int32",
- "@value" : 1
- }, {
- "@type" : "g:Int32",
- "@value" : 2
- } ]
- }
-}
-----
-
-==== P and
-
-[source,json]
-----
-{
- "@type" : "g:P",
- "@value" : {
- "predicate" : "and",
- "value" : [ {
- "@type" : "g:P",
- "@value" : {
- "predicate" : "gt",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 0
+ {
+ "id": 7,
+ "value": "santa cruz",
+ "properties": {
+ "startTime": 2001,
+ "endTime": 2004
+ }
+ },
+ {
+ "id": 8,
+ "value": "brussels",
+ "properties": {
+ "startTime": 2004,
+ "endTime": 2005
+ }
+ },
+ {
+ "id": 9,
+ "value": "santa fe",
+ "properties": {
+ "startTime": 2005
}
}
- }, {
- "@type" : "g:P",
- "@value" : {
- "predicate" : "lt",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 10
- }
- }
- } ]
+ ]
}
}
----
-==== P or
+=== VertexProperty
+
+JSON Object with required keys: "id", "value", "label", "properties" +
+"id" is any type GraphSON 4.0 type +
+"value" is any type GraphSON 4.0 type +
+"label" is a `g:List` of `String` +
+"properties" is an optional Object containing Arrays of "g:Property" (metaproperties)
[source,json]
----
{
- "@type" : "g:P",
- "@value" : {
- "predicate" : "or",
- "value" : [ {
- "@type" : "g:P",
- "@value" : {
- "predicate" : "gt",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 0
- }
- }
- }, {
- "@type" : "g:P",
- "@value" : {
- "predicate" : "within",
- "value" : [ {
- "@type" : "g:Int32",
- "@value" : -1
- }, {
- "@type" : "g:Int32",
- "@value" : -10
- }, {
- "@type" : "g:Int32",
- "@value" : -100
- } ]
- }
- } ]
- }
-}
-----
-
-==== Pick
-
-[source,json]
-----
-{
- "@type" : "g:Pick",
- "@value" : "any"
-}
-----
-
-==== Pop
-
-[source,json]
-----
-{
- "@type" : "g:Pop",
- "@value" : "all"
-}
-----
-
-==== Scope
-
-[source,json]
-----
-{
- "@type" : "g:Scope",
- "@value" : "local"
-}
-----
-
-==== T
-
-[source,json]
-----
-{
- "@type" : "g:T",
- "@value" : "label"
-}
-----
-
-==== TextP
-
-[source,json]
-----
-{
- "@type" : "g:TextP",
- "@value" : {
- "predicate" : "containing",
- "value" : "ark"
- }
-}
-----
-
-==== TraversalMetrics
-
-[source,json]
-----
-{
- "@type" : "g:TraversalMetrics",
- "@value" : {
- "dur" : {
- "@type" : "g:Double",
- "@value" : 0.004
- },
- "metrics" : [ {
- "@type" : "g:Metrics",
- "@value" : {
- "dur" : {
- "@type" : "g:Double",
- "@value" : 100.0
- },
- "counts" : {
- "traverserCount" : {
- "@type" : "g:Int64",
- "@value" : 4
- },
- "elementCount" : {
- "@type" : "g:Int64",
- "@value" : 4
- }
- },
- "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
- "annotations" : {
- "percentDur" : {
- "@type" : "g:Double",
- "@value" : 25.0
- }
- },
- "id" : "7.0.0()"
- }
- }, {
- "@type" : "g:Metrics",
- "@value" : {
- "dur" : {
- "@type" : "g:Double",
- "@value" : 100.0
- },
- "counts" : {
- "traverserCount" : {
- "@type" : "g:Int64",
- "@value" : 13
- },
- "elementCount" : {
- "@type" : "g:Int64",
- "@value" : 13
- }
- },
- "name" : "VertexStep(OUT,vertex)",
- "annotations" : {
- "percentDur" : {
- "@type" : "g:Double",
- "@value" : 25.0
- }
- },
- "id" : "2.0.0()"
- }
- }, {
- "@type" : "g:Metrics",
- "@value" : {
- "dur" : {
- "@type" : "g:Double",
- "@value" : 100.0
- },
- "counts" : {
- "traverserCount" : {
- "@type" : "g:Int64",
- "@value" : 7
- },
- "elementCount" : {
- "@type" : "g:Int64",
- "@value" : 7
- }
- },
- "name" : "VertexStep(OUT,vertex)",
- "annotations" : {
- "percentDur" : {
- "@type" : "g:Double",
- "@value" : 25.0
- }
- },
- "id" : "3.0.0()"
- }
- }, {
- "@type" : "g:Metrics",
- "@value" : {
- "dur" : {
- "@type" : "g:Double",
- "@value" : 100.0
- },
- "counts" : {
- "traverserCount" : {
- "@type" : "g:Int64",
- "@value" : 1
- },
- "elementCount" : {
- "@type" : "g:Int64",
- "@value" : 1
- }
- },
- "name" : "TreeStep",
- "annotations" : {
- "percentDur" : {
- "@type" : "g:Double",
- "@value" : 25.0
- }
- },
- "id" : "4.0.0()"
- }
- } ]
- }
-}
-----
-
-==== TraversalStrategy
-
-[source,json]
-----
-{
- "@type": "g:HaltedTraverserStrategy",
+ "@type": "g:VertexProperty",
"@value": {
- "conf": {
- "haltedTraverserFactory": "org.apache.tinkerpop.gremlin.structure.util.detached.DetachedFactory"
+ "id": {
+ "@type": "g:Int64",
+ "@value": 0
},
- "fqcn": "org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.HaltedTraverserStrategy"
+ "value": "marko",
+ "label": [
+ "name"
+ ]
}
}
----
-==== Traverser
+[source,json]
+----
+{
+ "id": 0,
+ "value": "marko",
+ "label": [
+ "name"
+ ]
+}
+----
+
+=== BulkSet
+
+JSON Array that contains the expanded entries of the BulkSet.
+
+NOTE: BulkSet is serialized to g:List so there is no BulkSet deserializer.
[source,json]
----
{
- "@type" : "g:Traverser",
- "@value" : {
- "bulk" : {
- "@type" : "g:Int64",
- "@value" : 1
- },
- "value" : {
- "@type" : "g:Vertex",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "label" : "person",
- "properties" : {
- "name" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 0
- },
- "value" : "marko",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "label" : "name"
- }
- } ],
- "location" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 6
- },
- "value" : "san diego",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 1997
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2001
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 7
- },
- "value" : "santa cruz",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2001
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2004
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 8
- },
- "value" : "brussels",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2004
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2005
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 9
- },
- "value" : "santa fe",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2005
- }
- }
- }
- } ]
- }
- }
- }
- }
+ "@type": "g:List",
+ "@value": [
+ "marko",
+ "josh",
+ "josh"
+ ]
}
----
-
-=== RequestMessage
-
-==== Authentication Response
-
-The following `RequestMessage` is an example of the response that should be made to a SASL-based authentication challenge.
-
[source,json]
----
-{
- "requestId" : {
- "@type" : "g:UUID",
- "@value" : "cb682578-9d92-4499-9ebc-5c6aa73c5397"
- },
- "op" : "authentication",
- "processor" : "",
- "args" : {
- "saslMechanism" : "PLAIN",
- "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
- }
-}
+[ "marko", "josh", "josh" ]
----
-==== Session Eval
+=== Direction
-The following `RequestMessage` is an example of a simple session request for a script evaluation with parameters.
-
-[source,json]
-----
-{
- "requestId" : {
- "@type" : "g:UUID",
- "@value" : "cb682578-9d92-4499-9ebc-5c6aa73c5397"
- },
- "op" : "eval",
- "processor" : "session",
- "args" : {
- "gremlin" : "g.V(x)",
- "language" : "gremlin-groovy",
- "session" : "unique-session-identifier",
- "bindings" : {
- "x" : {
- "@type" : "g:Int32",
- "@value" : 1
- }
- }
- }
-}
-----
-
-==== Session Eval Aliased
-
-The following `RequestMessage` is an example of a session request for a script evaluation with an alias that binds the `TraversalSource` of "g" to "social".
-
-[source,json]
-----
-{
- "requestId" : {
- "@type" : "g:UUID",
- "@value" : "cb682578-9d92-4499-9ebc-5c6aa73c5397"
- },
- "op" : "eval",
- "processor" : "session",
- "args" : {
- "gremlin" : "social.V(x)",
- "language" : "gremlin-groovy",
- "aliases" : {
- "g" : "social"
- },
- "session" : "unique-session-identifier",
- "bindings" : {
- "x" : {
- "@type" : "g:Int32",
- "@value" : 1
- }
- }
- }
-}
-----
-
-==== Session Close
-
-The following `RequestMessage` is an example of a request to close a session.
-
-[source,json]
-----
-{
- "requestId" : {
- "@type" : "g:UUID",
- "@value" : "cb682578-9d92-4499-9ebc-5c6aa73c5397"
- },
- "op" : "close",
- "processor" : "session",
- "args" : {
- "session" : "unique-session-identifier"
- }
-}
-----
-
-==== Sessionless Eval
-
-The following `RequestMessage` is an example of a simple sessionless request for a script evaluation with parameters.
-
-[source,json]
-----
-{
- "requestId" : {
- "@type" : "g:UUID",
- "@value" : "cb682578-9d92-4499-9ebc-5c6aa73c5397"
- },
- "op" : "eval",
- "processor" : "",
- "args" : {
- "gremlin" : "g.V(x)",
- "language" : "gremlin-groovy",
- "bindings" : {
- "x" : {
- "@type" : "g:Int32",
- "@value" : 1
- }
- }
- }
-}
-----
-
-==== Sessionless Eval Aliased
-
-The following `RequestMessage` is an example of a sessionless request for a script evaluation with an alias that binds the `TraversalSource` of "g" to "social".
-
-[source,json]
-----
-{
- "requestId" : {
- "@type" : "g:UUID",
- "@value" : "cb682578-9d92-4499-9ebc-5c6aa73c5397"
- },
- "op" : "eval",
- "processor" : "",
- "args" : {
- "gremlin" : "social.V(x)",
- "language" : "gremlin-groovy",
- "aliases" : {
- "g" : "social"
- },
- "bindings" : {
- "x" : {
- "@type" : "g:Int32",
- "@value" : 1
- }
- }
- }
-}
-----
-
-=== ResponseMessage
-
-==== Authentication Challenge
-
-When authentication is enabled, an initial request to the server will result in an authentication challenge. The typical response message will appear as follows, but handling it could be different dependending on the SASL implementation (e.g. multiple challenges maybe requested in some cases, but not in the default provided by Gremlin Server).
-
-[source,json]
-----
-{
- "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
- "status" : {
- "message" : "",
- "code" : 407,
- "attributes" : { }
- },
- "result" : {
- "data" : null,
- "meta" : { }
- }
-}
-----
-
-==== Standard Result
-
-The following `ResponseMessage` is a typical example of the typical successful response Gremlin Server will return when returning results from a script.
-
-[source,json]
-----
-{
- "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
- "status" : {
- "message" : "",
- "code" : 200,
- "attributes" : { }
- },
- "result" : {
- "data" : [ {
- "@type" : "g:Vertex",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "label" : "person",
- "properties" : {
- "name" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 0
- },
- "value" : "marko",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "label" : "name"
- }
- } ],
- "location" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 6
- },
- "value" : "san diego",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 1997
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2001
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 7
- },
- "value" : "santa cruz",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2001
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2004
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 8
- },
- "value" : "brussels",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2004
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2005
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 9
- },
- "value" : "santa fe",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2005
- }
- }
- }
- } ]
- }
- }
- } ],
- "meta" : { }
- }
-}
-----
-
-
-=== Extended
-
-Note that the "extended" types require the addition of the separate `GraphSONXModuleV2` module as follows:
-
-[source,java]
-----
-mapper = GraphSONMapper.build().
- typeInfo(TypeInfo.PARTIAL_TYPES).
- addCustomModule(GraphSONXModuleV2.build()).
- version(GraphSONVersion.V2_0).create().createMapper()
-----
-
-==== BigDecimal
-
-[source,json]
-----
-{
- "@type" : "gx:BigDecimal",
- "@value" : 123456789987654321123456789987654321
-}
-----
-
-==== BigInteger
-
-[source,json]
-----
-{
- "@type" : "gx:BigInteger",
- "@value" : 123456789987654321123456789987654321
-}
-----
-
-==== Byte
-
-[source,json]
-----
-{
- "@type" : "gx:Byte",
- "@value" : 1
-}
-----
-
-==== ByteBuffer
-
-[source,json]
-----
-{
- "@type" : "gx:ByteBuffer",
- "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
-----
-
-==== Char
-
-[source,json]
-----
-{
- "@type" : "gx:Char",
- "@value" : "x"
-}
-----
-
-==== Duration
-
-The following example is a `Duration` of five days.
-
-[source,json]
-----
-{
- "@type" : "gx:Duration",
- "@value" : "PT120H"
-}
-----
-
-==== InetAddress
-
-[source,json]
-----
-{
- "@type" : "gx:InetAddress",
- "@value" : "localhost"
-}
-----
-
-==== Instant
-
-[source,json]
-----
-{
- "@type" : "gx:Instant",
- "@value" : "2016-12-14T16:39:19.349Z"
-}
-----
-
-==== LocalDate
-
-[source,json]
-----
-{
- "@type" : "gx:LocalDate",
- "@value" : "2016-01-01"
-}
-----
-
-==== LocalDateTime
-
-[source,json]
-----
-{
- "@type" : "gx:LocalDateTime",
- "@value" : "2016-01-01T12:30"
-}
-----
-
-==== LocalTime
-
-[source,json]
-----
-{
- "@type" : "gx:LocalTime",
- "@value" : "12:30:45"
-}
-----
-
-==== MonthDay
-
-[source,json]
-----
-{
- "@type" : "gx:MonthDay",
- "@value" : "--01-01"
-}
-----
-
-==== OffsetDateTime
-
-[source,json]
-----
-{
- "@type" : "gx:OffsetDateTime",
- "@value" : "2007-12-03T10:15:30+01:00"
-}
-----
-
-==== OffsetTime
-
-[source,json]
-----
-{
- "@type" : "gx:OffsetTime",
- "@value" : "10:15:30+01:00"
-}
-----
-
-==== Period
-
-The following example is a `Period` of one year, six months and fifteen days.
-
-[source,json]
-----
-{
- "@type" : "gx:Period",
- "@value" : "P1Y6M15D"
-}
-----
-
-==== Short
-
-[source,json]
-----
-{
- "@type" : "gx:Int16",
- "@value" : 100
-}
-----
-
-==== Year
-
-The following example is of the `Year` "2016".
-
-[source,json]
-----
-{
- "@type" : "gx:Year",
- "@value" : "2016"
-}
-----
-
-==== YearMonth
-
-The following example is a `YearMonth` of "June 2016"
-
-[source,json]
-----
-{
- "@type" : "gx:YearMonth",
- "@value" : "2016-06"
-}
-----
-
-==== ZonedDateTime
-
-[source,json]
-----
-{
- "@type" : "gx:ZonedDateTime",
- "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
-----
-
-==== ZoneOffset
-
-The following example is a `ZoneOffset` of three hours, six minutes, and nine seconds.
-
-[source,json]
-----
-{
- "@type" : "gx:ZoneOffset",
- "@value" : "+03:06:09"
-}
-----
-
-[[graphson-3d0]]
-== Version 3.0
-
-Version 3.0 of GraphSON was first introduced on TinkerPop 3.3.0 and is represented by the `application/vnd.gremlin-v3.0+json`
-mime type. It was introduced as only having embedded types. It is quite similar to GraphSON 2.0 with embedded types
-and in most cases will appear compatible to the eye, however there are some critical differences. GraphSON 2.0 relied
-on JSON data types for collections like `Map` and `List`. In GraphSON 3.0, there is explicit typed support for `Map`,
-`List` and `Set` as Gremlin relies on those types in quite specific ways that are not directly compatible with the
-JSON definitions of those collections. In the case of `List` and `Set`, it was important to distinguish between the
-two and for `Map` it was necessary to have the ability to return `Map` instances that did not have `String` keys
-(e.g. `g.V().out().groupCount()`).
-
-As of TinkerPop 3.7.0, GraphSON 3.0 also has a typeless representation referenced by the
-`application/vnd.gremlin-v3.0+json;types=false`. This format matches the format developed for 1.0.
-
-=== Core
-
-==== Class
-
-[source,json]
-----
-{
- "@type" : "g:Class",
- "@value" : "java.io.File"
-}
-----
-
-==== Date
-
-Representing a millisecond-precision offset from the unix epoch. In Java, it is simply `Date.getTime()`.
-
-[source,json]
-----
-{
- "@type" : "g:Date",
- "@value" : 1481750076295
-}
-----
-
-==== Double
-
-[source,json]
-----
-{
- "@type" : "g:Double",
- "@value" : 100.0
-}
-----
-
-==== Float
-
-[source,json]
-----
-{
- "@type" : "g:Float",
- "@value" : 100.0
-}
-----
-
-==== Integer
-
-[source,json]
-----
-{
- "@type" : "g:Int32",
- "@value" : 100
-}
-----
-
-==== List
-
-List is used to distinguish between different collection types as JSON is not explicit enough for all of Gremlin's requirements.
-
-[source,json]
-----
-{
- "@type" : "g:List",
- "@value" : [ {
- "@type" : "g:Int32",
- "@value" : 1
- }, "person", true ]
-}
-----
-
-==== Long
-
-[source,json]
-----
-{
- "@type" : "g:Int64",
- "@value" : 100
-}
-----
-
-==== Map
-
-Map is redefined so that to provide the ability to allow for non-String keys, which is not possible in JSON.
-
-[source,json]
-----
-{
- "@type" : "g:Map",
- "@value" : [ {
- "@type" : "g:Date",
- "@value" : 1481750076295
- }, "red", {
- "@type" : "g:List",
- "@value" : [ {
- "@type" : "g:Int32",
- "@value" : 1
- }, {
- "@type" : "g:Int32",
- "@value" : 2
- }, {
- "@type" : "g:Int32",
- "@value" : 3
- } ]
- }, {
- "@type" : "g:Date",
- "@value" : 1481750076295
- }, "test", {
- "@type" : "g:Int32",
- "@value" : 123
- } ]
-}
-----
-
-==== Set
-
-Allows a JSON collection to behave as a Set.
-
-[source,json]
-----
-{
- "@type" : "g:Set",
- "@value" : [ {
- "@type" : "g:Int32",
- "@value" : 1
- }, "person", true ]
-}
-----
-
-==== Timestamp
-
-[source,json]
-----
-{
- "@type" : "g:Timestamp",
- "@value" : 1481750076295
-}
-----
-
-==== UUID
-
-[source,json]
-----
-{
- "@type" : "g:UUID",
- "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
-----
-
-
-=== Graph Structure
-
-==== Edge
-
-[source,json]
-----
-{
- "@type" : "g:Edge",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 13
- },
- "label" : "develops",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : {
- "@type" : "g:Int32",
- "@value" : 10
- },
- "outV" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "properties" : {
- "since" : {
- "@type" : "g:Property",
- "@value" : {
- "key" : "since",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 2009
- }
- }
- }
- }
- }
-}
-----
-
-==== Path
-
-[source,json]
-----
-{
- "@type" : "g:Path",
- "@value" : {
- "labels" : {
- "@type" : "g:List",
- "@value" : [ {
- "@type" : "g:Set",
- "@value" : [ ]
- }, {
- "@type" : "g:Set",
- "@value" : [ ]
- }, {
- "@type" : "g:Set",
- "@value" : [ ]
- } ]
- },
- "objects" : {
- "@type" : "g:List",
- "@value" : [ {
- "@type" : "g:Vertex",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "label" : "person"
- }
- }, {
- "@type" : "g:Vertex",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 10
- },
- "label" : "software"
- }
- }, {
- "@type" : "g:Vertex",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 11
- },
- "label" : "software"
- }
- } ]
- }
- }
-}
-----
-
-==== Property
-
-[source,json]
-----
-{
- "@type" : "g:Property",
- "@value" : {
- "key" : "since",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 2009
- }
- }
-}
-----
-
-==== TinkerGraph
-
-`TinkerGraph` has a custom serializer that is registered as part of the `TinkerIoRegistry`.
-
-[source,json]
-----
-{
- "@type" : "tinker:graph",
- "@value" : {
- "vertices" : [ {
- "@type" : "g:Vertex",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "label" : "person",
- "properties" : {
- "name" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 0
- },
- "value" : "marko",
- "label" : "name"
- }
- } ],
- "location" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 6
- },
- "value" : "san diego",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 1997
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2001
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 7
- },
- "value" : "santa cruz",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2001
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2004
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 8
- },
- "value" : "brussels",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2004
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2005
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 9
- },
- "value" : "santa fe",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2005
- }
- }
- }
- } ]
- }
- }
- }, {
- "@type" : "g:Vertex",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 7
- },
- "label" : "person",
- "properties" : {
- "name" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 1
- },
- "value" : "stephen",
- "label" : "name"
- }
- } ],
- "location" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 10
- },
- "value" : "centreville",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 1990
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2000
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 11
- },
- "value" : "dulles",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2000
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2006
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 12
- },
- "value" : "purcellville",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2006
- }
- }
- }
- } ]
- }
- }
- }, {
- "@type" : "g:Vertex",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 8
- },
- "label" : "person",
- "properties" : {
- "name" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 2
- },
- "value" : "matthias",
- "label" : "name"
- }
- } ],
- "location" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 13
- },
- "value" : "bremen",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2004
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2007
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 14
- },
- "value" : "baltimore",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2007
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2011
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 15
- },
- "value" : "oakland",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2011
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2014
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 16
- },
- "value" : "seattle",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2014
- }
- }
- }
- } ]
- }
- }
- }, {
- "@type" : "g:Vertex",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 9
- },
- "label" : "person",
- "properties" : {
- "name" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 3
- },
- "value" : "daniel",
- "label" : "name"
- }
- } ],
- "location" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 17
- },
- "value" : "spremberg",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 1982
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2005
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 18
- },
- "value" : "kaiserslautern",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2005
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2009
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 19
- },
- "value" : "aachen",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2009
- }
- }
- }
- } ]
- }
- }
- }, {
- "@type" : "g:Vertex",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 10
- },
- "label" : "software",
- "properties" : {
- "name" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 4
- },
- "value" : "gremlin",
- "label" : "name"
- }
- } ]
- }
- }
- }, {
- "@type" : "g:Vertex",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 11
- },
- "label" : "software",
- "properties" : {
- "name" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 5
- },
- "value" : "tinkergraph",
- "label" : "name"
- }
- } ]
- }
- }
- } ],
- "edges" : [ {
- "@type" : "g:Edge",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 13
- },
- "label" : "develops",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : {
- "@type" : "g:Int32",
- "@value" : 10
- },
- "outV" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "properties" : {
- "since" : {
- "@type" : "g:Property",
- "@value" : {
- "key" : "since",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 2009
- }
- }
- }
- }
- }
- }, {
- "@type" : "g:Edge",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 14
- },
- "label" : "develops",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : {
- "@type" : "g:Int32",
- "@value" : 11
- },
- "outV" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "properties" : {
- "since" : {
- "@type" : "g:Property",
- "@value" : {
- "key" : "since",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 2010
- }
- }
- }
- }
- }
- }, {
- "@type" : "g:Edge",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 15
- },
- "label" : "uses",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : {
- "@type" : "g:Int32",
- "@value" : 10
- },
- "outV" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "properties" : {
- "skill" : {
- "@type" : "g:Property",
- "@value" : {
- "key" : "skill",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 4
- }
- }
- }
- }
- }
- }, {
- "@type" : "g:Edge",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 16
- },
- "label" : "uses",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : {
- "@type" : "g:Int32",
- "@value" : 11
- },
- "outV" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "properties" : {
- "skill" : {
- "@type" : "g:Property",
- "@value" : {
- "key" : "skill",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 5
- }
- }
- }
- }
- }
- }, {
- "@type" : "g:Edge",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 17
- },
- "label" : "develops",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : {
- "@type" : "g:Int32",
- "@value" : 10
- },
- "outV" : {
- "@type" : "g:Int32",
- "@value" : 7
- },
- "properties" : {
- "since" : {
- "@type" : "g:Property",
- "@value" : {
- "key" : "since",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 2010
- }
- }
- }
- }
- }
- }, {
- "@type" : "g:Edge",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 18
- },
- "label" : "develops",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : {
- "@type" : "g:Int32",
- "@value" : 11
- },
- "outV" : {
- "@type" : "g:Int32",
- "@value" : 7
- },
- "properties" : {
- "since" : {
- "@type" : "g:Property",
- "@value" : {
- "key" : "since",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 2011
- }
- }
- }
- }
- }
- }, {
- "@type" : "g:Edge",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 19
- },
- "label" : "uses",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : {
- "@type" : "g:Int32",
- "@value" : 10
- },
- "outV" : {
- "@type" : "g:Int32",
- "@value" : 7
- },
- "properties" : {
- "skill" : {
- "@type" : "g:Property",
- "@value" : {
- "key" : "skill",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 5
- }
- }
- }
- }
- }
- }, {
- "@type" : "g:Edge",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 20
- },
- "label" : "uses",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : {
- "@type" : "g:Int32",
- "@value" : 11
- },
- "outV" : {
- "@type" : "g:Int32",
- "@value" : 7
- },
- "properties" : {
- "skill" : {
- "@type" : "g:Property",
- "@value" : {
- "key" : "skill",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 4
- }
- }
- }
- }
- }
- }, {
- "@type" : "g:Edge",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 21
- },
- "label" : "develops",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : {
- "@type" : "g:Int32",
- "@value" : 10
- },
- "outV" : {
- "@type" : "g:Int32",
- "@value" : 8
- },
- "properties" : {
- "since" : {
- "@type" : "g:Property",
- "@value" : {
- "key" : "since",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 2012
- }
- }
- }
- }
- }
- }, {
- "@type" : "g:Edge",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 22
- },
- "label" : "uses",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : {
- "@type" : "g:Int32",
- "@value" : 10
- },
- "outV" : {
- "@type" : "g:Int32",
- "@value" : 8
- },
- "properties" : {
- "skill" : {
- "@type" : "g:Property",
- "@value" : {
- "key" : "skill",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 3
- }
- }
- }
- }
- }
- }, {
- "@type" : "g:Edge",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 23
- },
- "label" : "uses",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : {
- "@type" : "g:Int32",
- "@value" : 11
- },
- "outV" : {
- "@type" : "g:Int32",
- "@value" : 8
- },
- "properties" : {
- "skill" : {
- "@type" : "g:Property",
- "@value" : {
- "key" : "skill",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 3
- }
- }
- }
- }
- }
- }, {
- "@type" : "g:Edge",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 24
- },
- "label" : "uses",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : {
- "@type" : "g:Int32",
- "@value" : 10
- },
- "outV" : {
- "@type" : "g:Int32",
- "@value" : 9
- },
- "properties" : {
- "skill" : {
- "@type" : "g:Property",
- "@value" : {
- "key" : "skill",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 5
- }
- }
- }
- }
- }
- }, {
- "@type" : "g:Edge",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 25
- },
- "label" : "uses",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : {
- "@type" : "g:Int32",
- "@value" : 11
- },
- "outV" : {
- "@type" : "g:Int32",
- "@value" : 9
- },
- "properties" : {
- "skill" : {
- "@type" : "g:Property",
- "@value" : {
- "key" : "skill",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 3
- }
- }
- }
- }
- }
- }, {
- "@type" : "g:Edge",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 26
- },
- "label" : "traverses",
- "inVLabel" : "software",
- "outVLabel" : "software",
- "inV" : {
- "@type" : "g:Int32",
- "@value" : 11
- },
- "outV" : {
- "@type" : "g:Int32",
- "@value" : 10
- }
- }
- } ]
- }
-}
-----
-
-==== Vertex
-
-[source,json]
-----
-{
- "@type" : "g:Vertex",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "label" : "person",
- "properties" : {
- "name" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 0
- },
- "value" : "marko",
- "label" : "name"
- }
- } ],
- "location" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 6
- },
- "value" : "san diego",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 1997
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2001
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 7
- },
- "value" : "santa cruz",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2001
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2004
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 8
- },
- "value" : "brussels",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2004
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2005
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 9
- },
- "value" : "santa fe",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2005
- }
- }
- }
- } ]
- }
- }
-}
-----
-
-==== VertexProperty
-
-[source,json]
-----
-{
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 0
- },
- "value" : "marko",
- "label" : "name"
- }
-}
-----
-
-
-=== Graph Process
-
-==== Barrier
-
-[source,json]
-----
-{
- "@type" : "g:Barrier",
- "@value" : "normSack"
-}
-----
-
-==== Binding
-
-A "Binding" refers to a `Bytecode.Binding`.
-
-[source,json]
-----
-{
- "@type" : "g:Binding",
- "@value" : {
- "key" : "x",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 1
- }
- }
-}
-----
-
-==== BulkSet
-
-[source,json]
-----
-{
- "@type" : "g:BulkSet",
- "@value" : [ "marko", {
- "@type" : "g:Int64",
- "@value" : 1
- }, "josh", {
- "@type" : "g:Int64",
- "@value" : 2
- } ]
-}
-----
-
-==== Bytecode
-
-The following `Bytecode` example represents the traversal of `g.V().hasLabel('person').out().in().tree()`. Obviously the serialized `Bytecode` woudl be quite different for the endless variations of commands that could be used together in the Gremlin language.
-
-[source,json]
-----
-{
- "@type" : "g:Bytecode",
- "@value" : {
- "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
- }
-}
-----
-
-==== Cardinality
-
-[source,json]
-----
-{
- "@type" : "g:Cardinality",
- "@value" : "list"
-}
-----
-
-==== Column
-
-[source,json]
-----
-{
- "@type" : "g:Column",
- "@value" : "keys"
-}
-----
-
-==== Direction
+JSON String of the enum value.
[source,json]
----
@@ -4849,283 +2682,14 @@
}
----
-==== DT
-
-[source,json]
+[source,text]
----
-{
- "@type" : "g:DT",
- "@value" : "minute"
-}
+"OUT"
----
-==== Lambda
+=== T
-[source,json]
-----
-{
- "@type" : "g:Lambda",
- "@value" : {
- "script" : "{ it.get() }",
- "language" : "gremlin-groovy",
- "arguments" : 1
- }
-}
-----
-
-==== Merge
-
-[source,json]
-----
-{
- "@type" : "g:Merge",
- "@value" : "onMatch"
-}
-----
-
-==== Metrics
-
-[source,json]
-----
-{
- "@type" : "g:Metrics",
- "@value" : {
- "@type" : "g:Map",
- "@value" : [ "dur", {
- "@type" : "g:Double",
- "@value" : 100.0
- }, "counts", {
- "@type" : "g:Map",
- "@value" : [ "traverserCount", {
- "@type" : "g:Int64",
- "@value" : 4
- }, "elementCount", {
- "@type" : "g:Int64",
- "@value" : 4
- } ]
- }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
- "@type" : "g:Map",
- "@value" : [ "percentDur", {
- "@type" : "g:Double",
- "@value" : 25.0
- } ]
- }, "id", "7.0.0()", "metrics", {
- "@type" : "g:List",
- "@value" : [ {
- "@type" : "g:Metrics",
- "@value" : {
- "@type" : "g:Map",
- "@value" : [ "dur", {
- "@type" : "g:Double",
- "@value" : 100.0
- }, "counts", {
- "@type" : "g:Map",
- "@value" : [ "traverserCount", {
- "@type" : "g:Int64",
- "@value" : 7
- }, "elementCount", {
- "@type" : "g:Int64",
- "@value" : 7
- } ]
- }, "name", "VertexStep(OUT,vertex)", "annotations", {
- "@type" : "g:Map",
- "@value" : [ "percentDur", {
- "@type" : "g:Double",
- "@value" : 25.0
- } ]
- }, "id", "3.0.0()" ]
- }
- } ]
- } ]
- }
-}
-----
-
-==== Operator
-
-[source,json]
-----
-{
- "@type" : "g:Operator",
- "@value" : "sum"
-}
-----
-
-==== Order
-
-[source,json]
-----
-{
- "@type" : "g:Order",
- "@value" : "shuffle"
-}
-----
-
-==== P
-
-`P` expects a single value of a `List` of values. There is special handling for `List` values when it comes to `within`, `without`, `inside`, `outside` and `between`. For `inside`, `outside` and `between`, the expectation is that the collection contain two objects (the rest will be ignored) and those two objects become the arguments to those methods. For `within` and `without`, these methods will accept an arbitrary number of objects in the collection.
-
-[source,json]
-----
-{
- "@type" : "g:P",
- "@value" : {
- "predicate" : "gt",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 0
- }
- }
-}
-----
-
-==== P within
-
-Please see <<_p,P>> for additional information on `within`.
-
-[source,json]
-----
-{
- "@type" : "g:P",
- "@value" : {
- "predicate" : "within",
- "value" : {
- "@type" : "g:List",
- "@value" : [ {
- "@type" : "g:Int32",
- "@value" : 1
- } ]
- }
- }
-}
-----
-
-==== P without
-
-Please see <<_p,P>> for additional information on `within`.
-
-[source,json]
-----
-{
- "@type" : "g:P",
- "@value" : {
- "predicate" : "without",
- "value" : {
- "@type" : "g:List",
- "@value" : [ {
- "@type" : "g:Int32",
- "@value" : 1
- }, {
- "@type" : "g:Int32",
- "@value" : 2
- } ]
- }
- }
-}
-----
-
-==== P and
-
-[source,json]
-----
-{
- "@type" : "g:P",
- "@value" : {
- "predicate" : "and",
- "value" : [ {
- "@type" : "g:P",
- "@value" : {
- "predicate" : "gt",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 0
- }
- }
- }, {
- "@type" : "g:P",
- "@value" : {
- "predicate" : "lt",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 10
- }
- }
- } ]
- }
-}
-----
-
-==== P or
-
-[source,json]
-----
-{
- "@type" : "g:P",
- "@value" : {
- "predicate" : "or",
- "value" : [ {
- "@type" : "g:P",
- "@value" : {
- "predicate" : "gt",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 0
- }
- }
- }, {
- "@type" : "g:P",
- "@value" : {
- "predicate" : "within",
- "value" : {
- "@type" : "g:List",
- "@value" : [ {
- "@type" : "g:Int32",
- "@value" : -1
- }, {
- "@type" : "g:Int32",
- "@value" : -10
- }, {
- "@type" : "g:Int32",
- "@value" : -100
- } ]
- }
- }
- } ]
- }
-}
-----
-
-==== Pick
-
-[source,json]
-----
-{
- "@type" : "g:Pick",
- "@value" : "any"
-}
-----
-
-==== Pop
-
-[source,json]
-----
-{
- "@type" : "g:Pop",
- "@value" : "all"
-}
-----
-
-==== Scope
-
-[source,json]
-----
-{
- "@type" : "g:Scope",
- "@value" : "local"
-}
-----
-
-==== T
+JSON String of the enum value.
[source,json]
----
@@ -5135,775 +2699,413 @@
}
----
-==== TextP
-
-[source,json]
+[source,text]
----
-{
- "@type" : "g:TextP",
- "@value" : {
- "predicate" : "containing",
- "value" : "ark"
- }
-}
+"label"
----
-==== TraversalMetrics
-
-[source,json]
-----
-{
- "@type" : "g:TraversalMetrics",
- "@value" : {
- "@type" : "g:Map",
- "@value" : [ "dur", {
- "@type" : "g:Double",
- "@value" : 0.004
- }, "metrics", {
- "@type" : "g:List",
- "@value" : [ {
- "@type" : "g:Metrics",
- "@value" : {
- "@type" : "g:Map",
- "@value" : [ "dur", {
- "@type" : "g:Double",
- "@value" : 100.0
- }, "counts", {
- "@type" : "g:Map",
- "@value" : [ "traverserCount", {
- "@type" : "g:Int64",
- "@value" : 4
- }, "elementCount", {
- "@type" : "g:Int64",
- "@value" : 4
- } ]
- }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
- "@type" : "g:Map",
- "@value" : [ "percentDur", {
- "@type" : "g:Double",
- "@value" : 25.0
- } ]
- }, "id", "7.0.0()" ]
- }
- }, {
- "@type" : "g:Metrics",
- "@value" : {
- "@type" : "g:Map",
- "@value" : [ "dur", {
- "@type" : "g:Double",
- "@value" : 100.0
- }, "counts", {
- "@type" : "g:Map",
- "@value" : [ "traverserCount", {
- "@type" : "g:Int64",
- "@value" : 13
- }, "elementCount", {
- "@type" : "g:Int64",
- "@value" : 13
- } ]
- }, "name", "VertexStep(OUT,vertex)", "annotations", {
- "@type" : "g:Map",
- "@value" : [ "percentDur", {
- "@type" : "g:Double",
- "@value" : 25.0
- } ]
- }, "id", "2.0.0()" ]
- }
- }, {
- "@type" : "g:Metrics",
- "@value" : {
- "@type" : "g:Map",
- "@value" : [ "dur", {
- "@type" : "g:Double",
- "@value" : 100.0
- }, "counts", {
- "@type" : "g:Map",
- "@value" : [ "traverserCount", {
- "@type" : "g:Int64",
- "@value" : 7
- }, "elementCount", {
- "@type" : "g:Int64",
- "@value" : 7
- } ]
- }, "name", "VertexStep(OUT,vertex)", "annotations", {
- "@type" : "g:Map",
- "@value" : [ "percentDur", {
- "@type" : "g:Double",
- "@value" : 25.0
- } ]
- }, "id", "3.0.0()" ]
- }
- }, {
- "@type" : "g:Metrics",
- "@value" : {
- "@type" : "g:Map",
- "@value" : [ "dur", {
- "@type" : "g:Double",
- "@value" : 100.0
- }, "counts", {
- "@type" : "g:Map",
- "@value" : [ "traverserCount", {
- "@type" : "g:Int64",
- "@value" : 1
- }, "elementCount", {
- "@type" : "g:Int64",
- "@value" : 1
- } ]
- }, "name", "TreeStep", "annotations", {
- "@type" : "g:Map",
- "@value" : [ "percentDur", {
- "@type" : "g:Double",
- "@value" : 25.0
- } ]
- }, "id", "4.0.0()" ]
- }
- } ]
- } ]
- }
-}
-----
-
-==== TraversalStrategy
-
-[source,json]
-----
-{
- "@type": "g:HaltedTraverserStrategy",
- "@value": {
- "conf": {
- "haltedTraverserFactory": "org.apache.tinkerpop.gremlin.structure.util.detached.DetachedFactory"
- },
- "fqcn": "org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.HaltedTraverserStrategy"
- }
-}
-----
-
-==== Traverser
-
-[source,json]
-----
-{
- "@type" : "g:Traverser",
- "@value" : {
- "bulk" : {
- "@type" : "g:Int64",
- "@value" : 1
- },
- "value" : {
- "@type" : "g:Vertex",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "label" : "person",
- "properties" : {
- "name" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 0
- },
- "value" : "marko",
- "label" : "name"
- }
- } ],
- "location" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 6
- },
- "value" : "san diego",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 1997
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2001
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 7
- },
- "value" : "santa cruz",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2001
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2004
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 8
- },
- "value" : "brussels",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2004
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2005
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 9
- },
- "value" : "santa fe",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2005
- }
- }
- }
- } ]
- }
- }
- }
- }
-}
-----
-
-
-=== RequestMessage
-
-==== Authentication Response
-
-The following `RequestMessage` is an example of the response that should be made to a SASL-based authentication challenge.
-
-[source,json]
-----
-{
- "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
- "op" : "authentication",
- "processor" : "",
- "args" : {
- "@type" : "g:Map",
- "@value" : [ "saslMechanism", "PLAIN", "sasl", "AHN0ZXBocGhlbgBwYXNzd29yZA==" ]
- }
-}
-----
-
-==== Session Eval
-
-The following `RequestMessage` is an example of a simple session request for a script evaluation with parameters.
-
-[source,json]
-----
-{
- "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
- "op" : "eval",
- "processor" : "session",
- "args" : {
- "@type" : "g:Map",
- "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "session", "unique-session-identifier", "bindings", {
- "@type" : "g:Map",
- "@value" : [ "x", {
- "@type" : "g:Int32",
- "@value" : 1
- } ]
- } ]
- }
-}
-----
-
-==== Session Eval Aliased
-
-The following `RequestMessage` is an example of a session request for a script evaluation with an alias that binds the `TraversalSource` of "g" to "social".
-
-[source,json]
-----
-{
- "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
- "op" : "eval",
- "processor" : "session",
- "args" : {
- "@type" : "g:Map",
- "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
- "@type" : "g:Map",
- "@value" : [ "g", "social" ]
- }, "session", "unique-session-identifier", "bindings", {
- "@type" : "g:Map",
- "@value" : [ "x", {
- "@type" : "g:Int32",
- "@value" : 1
- } ]
- } ]
- }
-}
-----
-
-==== Session Close
-
-The following `RequestMessage` is an example of a request to close a session.
-
-[source,json]
-----
-{
- "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
- "op" : "close",
- "processor" : "session",
- "args" : {
- "@type" : "g:Map",
- "@value" : [ "session", "unique-session-identifier" ]
- }
-}
-----
-
-==== Sessionless Eval
+=== Standard Request
The following `RequestMessage` is an example of a simple sessionless request for a script evaluation with parameters.
[source,json]
----
{
- "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
- "op" : "eval",
- "processor" : "",
- "args" : {
- "@type" : "g:Map",
- "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "bindings", {
- "@type" : "g:Map",
- "@value" : [ "x", {
- "@type" : "g:Int32",
- "@value" : 1
- } ]
- } ]
- }
-}
-----
-
-==== Sessionless Eval Aliased
-
-The following `RequestMessage` is an example of a sessionless request for a script evaluation with an alias that binds the `TraversalSource` of "g" to "social".
-
-[source,json]
-----
-{
- "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
- "op" : "eval",
- "processor" : "",
- "args" : {
- "@type" : "g:Map",
- "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
- "@type" : "g:Map",
- "@value" : [ "g", "social" ]
- }, "bindings", {
- "@type" : "g:Map",
- "@value" : [ "x", {
- "@type" : "g:Int32",
- "@value" : 1
- } ]
- } ]
- }
-}
-----
-
-
-=== ResponseMessage
-
-==== Authentication Challenge
-
-When authentication is enabled, an initial request to the server will result in an authentication challenge. The typical response message will appear as follows, but handling it could be different depending on the SASL implementation (e.g. multiple challenges may be requested in some cases, but not in the default provided by Gremlin Server).
-
-[source,json]
-----
-{
- "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
- "status" : {
- "message" : "",
- "code" : 407,
- "attributes" : {
- "@type" : "g:Map",
- "@value" : [ ]
- }
+ "gremlin": "g.V(x)",
+ "materializeProperties": "tokens",
+ "timeoutMs": {
+ "@type": "g:Int64",
+ "@value": 1000
},
- "result" : {
- "data" : null,
- "meta" : {
- "@type" : "g:Map",
- "@value" : [ ]
- }
- }
+ "g": "g",
+ "bindings": {
+ "@type": "g:Map",
+ "@value": [
+ "x",
+ {
+ "@type": "g:Int32",
+ "@value": 1
+ }
+ ]
+ },
+ "language": "gremlin-groovy"
}
----
-==== Standard Result
+[source,json]
+----
+{
+ "gremlin": "g.V(x)",
+ "materializeProperties": "tokens",
+ "timeoutMs": 1000,
+ "g": "g",
+ "bindings": {
+ "x": 1
+ },
+ "language": "gremlin-groovy"
+}
+----
+
+=== Standard Result
The following `ResponseMessage` is a typical example of the typical successful response Gremlin Server will return when returning results from a script.
[source,json]
----
{
- "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
- "status" : {
- "message" : "",
- "code" : 200,
- "attributes" : {
- "@type" : "g:Map",
- "@value" : [ ]
- }
- },
- "result" : {
- "data" : {
- "@type" : "g:List",
- "@value" : [ {
- "@type" : "g:Vertex",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "label" : "person",
- "properties" : {
- "name" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 0
- },
- "value" : "marko",
- "label" : "name"
- }
- } ],
- "location" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 6
- },
- "value" : "san diego",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 1997
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2001
+ "result": {
+ "data": {
+ "@type": "g:List",
+ "@value": [
+ {
+ "@type": "g:Vertex",
+ "@value": {
+ "id": {
+ "@type": "g:Int32",
+ "@value": 1
+ },
+ "label": [
+ "person"
+ ],
+ "properties": {
+ "name": [
+ {
+ "@type": "g:VertexProperty",
+ "@value": {
+ "id": {
+ "@type": "g:Int64",
+ "@value": 0
+ },
+ "value": "marko",
+ "label": [
+ "name"
+ ]
}
}
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 7
+ ],
+ "location": [
+ {
+ "@type": "g:VertexProperty",
+ "@value": {
+ "id": {
+ "@type": "g:Int64",
+ "@value": 6
+ },
+ "value": "san diego",
+ "label": [
+ "location"
+ ],
+ "properties": {
+ "startTime": {
+ "@type": "g:Int32",
+ "@value": 1997
+ },
+ "endTime": {
+ "@type": "g:Int32",
+ "@value": 2001
+ }
+ }
+ }
},
- "value" : "santa cruz",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2001
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2004
+ {
+ "@type": "g:VertexProperty",
+ "@value": {
+ "id": {
+ "@type": "g:Int64",
+ "@value": 7
+ },
+ "value": "santa cruz",
+ "label": [
+ "location"
+ ],
+ "properties": {
+ "startTime": {
+ "@type": "g:Int32",
+ "@value": 2001
+ },
+ "endTime": {
+ "@type": "g:Int32",
+ "@value": 2004
+ }
+ }
+ }
+ },
+ {
+ "@type": "g:VertexProperty",
+ "@value": {
+ "id": {
+ "@type": "g:Int64",
+ "@value": 8
+ },
+ "value": "brussels",
+ "label": [
+ "location"
+ ],
+ "properties": {
+ "startTime": {
+ "@type": "g:Int32",
+ "@value": 2004
+ },
+ "endTime": {
+ "@type": "g:Int32",
+ "@value": 2005
+ }
+ }
+ }
+ },
+ {
+ "@type": "g:VertexProperty",
+ "@value": {
+ "id": {
+ "@type": "g:Int64",
+ "@value": 9
+ },
+ "value": "santa fe",
+ "label": [
+ "location"
+ ],
+ "properties": {
+ "startTime": {
+ "@type": "g:Int32",
+ "@value": 2005
+ }
+ }
}
}
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 8
- },
- "value" : "brussels",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2004
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2005
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 9
- },
- "value" : "santa fe",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2005
- }
- }
- }
- } ]
+ ]
+ }
}
}
- } ]
- },
- "meta" : {
- "@type" : "g:Map",
- "@value" : [ ]
+ ]
}
+ },
+ "status": {
+ "code": 200
}
}
----
+[source,json]
+----
+{
+ "result": {
+ "data": [
+ {
+ "id": 1,
+ "label": [
+ "person"
+ ],
+ "type": "vertex",
+ "properties": {
+ "name": [
+ {
+ "id": 0,
+ "value": "marko"
+ }
+ ],
+ "location": [
+ {
+ "id": 6,
+ "value": "san diego",
+ "properties": {
+ "startTime": 1997,
+ "endTime": 2001
+ }
+ },
+ {
+ "id": 7,
+ "value": "santa cruz",
+ "properties": {
+ "startTime": 2001,
+ "endTime": 2004
+ }
+ },
+ {
+ "id": 8,
+ "value": "brussels",
+ "properties": {
+ "startTime": 2004,
+ "endTime": 2005
+ }
+ },
+ {
+ "id": 9,
+ "value": "santa fe",
+ "properties": {
+ "startTime": 2005
+ }
+ }
+ ]
+ }
+ }
+ ]
+ },
+ "status": {
+ "code": 200
+ }
+}
+----
-=== Extended
+=== Error Result
-Note that the "extended" types require the addition of the separate `GraphSONXModuleV3d0` module as follows:
+The following `ResponseMessage` is a typical example of the typical successful response Gremlin Server will return when returning results from a script.
+
+[source,json]
+----
+{
+ "result": {
+ "data": {
+ "@type": "g:List",
+ "@value": []
+ }
+ },
+ "status": {
+ "code": 500,
+ "message": "A timeout occurred during traversal evaluation",
+ "exception": "ServerTimeoutExceededException"
+ }
+}
+----
+
+[source,json]
+----
+{
+ "result": {
+ "data": []
+ },
+ "status": {
+ "code": 500,
+ "message": "A timeout occurred during traversal evaluation",
+ "exception": "ServerTimeoutExceededException"
+ }
+}
+----
+
+Note that the "extended" types require the addition of the separate `GraphSONXModuleV4d0` module as follows:
[source,java]
----
mapper = GraphSONMapper.build().
typeInfo(TypeInfo.PARTIAL_TYPES).
- addCustomModule(GraphSONXModuleV3.build()).
- version(GraphSONVersion.V3_0).create().createMapper()
+ addCustomModule(GraphSONXModuleV4.build()).
+ version(GraphSONVersion.V4_0).create().createMapper()
----
-==== BigDecimal
+=== BigDecimal
+
+A JSON Number.
[source,json]
----
{
- "@type" : "gx:BigDecimal",
+ "@type" : "g:BigDecimal",
"@value" : 123456789987654321123456789987654321
}
----
-==== BigInteger
+[source,text]
+----
+123456789987654321123456789987654321
+----
+
+=== BigInteger
+
+A JSON Number.
[source,json]
----
{
- "@type" : "gx:BigInteger",
+ "@type" : "g:BigInteger",
"@value" : 123456789987654321123456789987654321
}
----
-==== Byte
+[source,text]
+----
+123456789987654321123456789987654321
+----
+
+=== Byte
+
+A JSON Number with the same range as a 1-byte signed integer.
[source,json]
----
{
- "@type" : "gx:Byte",
+ "@type" : "g:Byte",
"@value" : 1
}
----
-==== ByteBuffer
+[source,text]
+----
+1
+----
+
+=== Binary
+
+JSON String containing base64-encoded bytes
[source,json]
----
{
- "@type" : "gx:ByteBuffer",
+ "@type" : "g:Binary",
"@value" : "c29tZSBieXRlcyBmb3IgeW91"
}
----
-==== Char
+[source,text]
+----
+"c29tZSBieXRlcyBmb3IgeW91"
+----
+
+=== Char
+
+A JSON String containing a single UTF-8 encoded character.
[source,json]
----
{
- "@type" : "gx:Char",
+ "@type" : "g:Char",
"@value" : "x"
}
----
-==== Duration
+[source,text]
+----
+"x"
+----
-The following example is a `Duration` of five days.
+=== Duration
+
+JSON String with ISO-8601 seconds based representation. The following example is a `Duration` of five days.
[source,json]
----
{
- "@type" : "gx:Duration",
+ "@type" : "g:Duration",
"@value" : "PT120H"
}
----
-==== InetAddress
+[source,text]
+----
+"PT120H"
+----
+
+=== Short
+
+A JSON Number with the same range as a 2-byte signed integer.
[source,json]
----
{
- "@type" : "gx:InetAddress",
- "@value" : "localhost"
-}
-----
-
-==== Instant
-
-[source,json]
-----
-{
- "@type" : "gx:Instant",
- "@value" : "2016-12-14T16:39:19.349Z"
-}
-----
-
-==== LocalDate
-
-[source,json]
-----
-{
- "@type" : "gx:LocalDate",
- "@value" : "2016-01-01"
-}
-----
-
-==== LocalDateTime
-
-[source,json]
-----
-{
- "@type" : "gx:LocalDateTime",
- "@value" : "2016-01-01T12:30"
-}
-----
-
-==== LocalTime
-
-[source,json]
-----
-{
- "@type" : "gx:LocalTime",
- "@value" : "12:30:45"
-}
-----
-
-==== MonthDay
-
-[source,json]
-----
-{
- "@type" : "gx:MonthDay",
- "@value" : "--01-01"
-}
-----
-
-==== OffsetDateTime
-
-[source,json]
-----
-{
- "@type" : "gx:OffsetDateTime",
- "@value" : "2007-12-03T10:15:30+01:00"
-}
-----
-
-==== OffsetTime
-
-[source,json]
-----
-{
- "@type" : "gx:OffsetTime",
- "@value" : "10:15:30+01:00"
-}
-----
-
-==== Period
-
-The following example is a `Period` of one year, six months and fifteen days.
-
-[source,json]
-----
-{
- "@type" : "gx:Period",
- "@value" : "P1Y6M15D"
-}
-----
-
-==== Short
-
-[source,json]
-----
-{
- "@type" : "gx:Int16",
+ "@type" : "g:Int16",
"@value" : 100
}
----
-==== Year
-
-The following example is of the `Year` "2016".
-
-[source,json]
+[source,text]
----
-{
- "@type" : "gx:Year",
- "@value" : "2016"
-}
-----
-
-==== YearMonth
-
-The following example is a `YearMonth` of "June 2016"
-
-[source,json]
-----
-{
- "@type" : "gx:YearMonth",
- "@value" : "2016-06"
-}
-----
-
-==== ZonedDateTime
-
-[source,json]
-----
-{
- "@type" : "gx:ZonedDateTime",
- "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
-----
-
-==== ZoneOffset
-
-The following example is a `ZoneOffset` of three hours, six minutes, and nine seconds.
-
-[source,json]
-----
-{
- "@type" : "gx:ZoneOffset",
- "@value" : "+03:06:09"
-}
+100
----
diff --git a/docs/src/dev/provider/gremlin-semantics.asciidoc b/docs/src/dev/provider/gremlin-semantics.asciidoc
index 49aa52b..59dca71 100644
--- a/docs/src/dev/provider/gremlin-semantics.asciidoc
+++ b/docs/src/dev/provider/gremlin-semantics.asciidoc
@@ -1900,7 +1900,6 @@
See: link:https://github.com/apache/tinkerpop/tree/x.y.z/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/NoneStep.java[source],
link:https://tinkerpop.apache.org/docs/x.y.z/reference/#none-step[reference]
-
[[product-step]]
=== product()
diff --git a/docs/src/dev/provider/index.asciidoc b/docs/src/dev/provider/index.asciidoc
index cb78aef..6adee19 100644
--- a/docs/src/dev/provider/index.asciidoc
+++ b/docs/src/dev/provider/index.asciidoc
@@ -582,26 +582,26 @@
A `RemoteConnection` is an interface that is important for usage on traversal sources configured using the
link:https://tinkerpop.apache.org/docs/x.y.z/reference/#connecting-via-drivers[with()] option. A `Traversal`
that is generated from that source will apply a `RemoteStrategy` which will inject a `RemoteStep` to its end. That
-step will then send the `Bytecode` of the `Traversal` over the `RemoteConnection` to get the results that it will
+step will then send the `GremlinLang` of the `Traversal` over the `RemoteConnection` to get the results that it will
iterate.
There is one method to implement on `RemoteConnection`:
[source,java]
-public <E> CompletableFuture<RemoteTraversal<?, E>> submitAsync(final Bytecode bytecode) throws RemoteConnectionException;
+public <E> CompletableFuture<RemoteTraversal<?, E>> submitAsync(final GremlinLang gremlinLang) throws RemoteConnectionException;
Note that it returns a `RemoteTraversal`. This interface should also be implemented and in most cases implementers can
simply extend the `AbstractRemoteTraversal`.
TinkerPop provides the `DriverRemoteConnection` as a useful and
link:https://github.com/apache/tinkerpop/blob/x.y.z/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote[example implementation].
-`DriverRemoteConnection` serializes the `Traversal` as Gremlin bytecode and then submits it for remote processing on
-Gremlin Server. Gremlin Server rebinds the `Traversal` to a configured `Graph` instance and then iterates the results
-back as it would normally do.
+`DriverRemoteConnection` serializes the `Traversal` as GremlinLang and then submits it for remote processing on
+Gremlin Server. Gremlin Server parses the script into a `Traversal` to a configured `Graph` instance and then iterates
+the results back as it would normally do.
Implementing `RemoteConnection` is not something routinely done for those implementing `gremlin-core`. It is only
something required if there is a need to exploit remote traversal submission. If a graph provider has a "graph server"
-similar to Gremlin Server that can accept bytecode-based requests on its own protocol, then that would be one example
+similar to Gremlin Server that can accept traversal-based requests on its own protocol, then that would be one example
of a reason to implement this interface.
[[bulk-import-export]]
@@ -650,6 +650,9 @@
==== JVM Test Suite
+IMPORTANT: 4.0.0-beta.1 Release - The final form of the TinkerPop test suite for 4.0 is not wholly settled, but going
+forward providers should focus on implementing the <<gherkin-tests-suite>> as opposed to the JVM suite.
+
The JVM test suite is useful to graph system implementers who want to validate that their `Graph` implementation is
working properly and that Gremlin features specific to embedded use cases are behaving as expected. These tests do not
validate that all the semantics of the Gremlin query language are properly operating. Providers should implement the
@@ -976,19 +979,15 @@
It is however possible to describe the core communication protocol using the standard out-of-the-box configuration
which should provide enough information to develop a driver for a specific language.
-image::gremlin-server-flow.png[width=300,float=right]
+Gremlin Server is distributed with a configuration that utilizes HTTP with a custom API. Under this configuration,
+Gremlin Server accepts requests containing a Gremlin script, evaluates that script and then streams back the results in
+HTTP chunks.
-Gremlin Server is distributed with a configuration that utilizes link:http://en.wikipedia.org/wiki/WebSocket[WebSocket]
-with a custom sub-protocol. Under this configuration, Gremlin Server accepts requests containing a Gremlin script,
-evaluates that script and then streams back the results. The notion of "streaming" is depicted in the diagram to the
-right.
-
-The diagram shows an incoming request to process the Gremlin script of `g.V()`. Gremlin Server evaluates that script,
-getting an `Iterator` of vertices as a result, and steps through each `Vertex` within it. The vertices are batched
-together given the `resultIterationBatchSize` configuration. In this case, that value must be `2` given that each
-"response" contains two vertices. Each response is serialized given the requested serializer type (JSON is likely
-best for non-JVM languages) and written back to the requesting client immediately. Gremlin Server does not wait for
-the entire result to be iterated, before sending back a response. It will send the responses as they are realized.
+Let's use the incoming request to process the Gremlin script of `g.V()` as an example. Gremlin Server evaluates that
+script, getting an `Iterator` of vertices as a result, and steps through each `Vertex` within it. The vertices are
+batched together into an HTTP chunk. Each response is serialized given the requested serializer type (GraphBinary is
+recommended) and written back to the requesting client immediately. Gremlin Server does not wait for the entire result
+to be iterated, before sending back a response. It will send the responses as they are realized.
This approach allows for the processing of large result sets without having to serialize the entire result into memory
for the response. It places a bit of a burden on the developer of the driver however, because it becomes necessary to
@@ -997,340 +996,231 @@
out-of-the-box configuration. It is quite possible to construct other flows, that might be more amenable to a
particular language or style of processing.
-It is recommended but not required that a driver include a `User-Agent` header as part of any web socket
-handshake request to Gremlin Server. Gremlin Server uses the user agent in building usage metrics
-as well as debugging. The standard format for connection user agents is:
+NOTE: TinkerPop provides a test server which may be useful for testing drivers. Details can be found
+link:https://tinkerpop.apache.org/docs/current/dev/developer/#gremlin-socket-server-tests[here]
+It is recommended but not required that a driver include a `User-Agent` header as part of any HTTP request to Gremlin
+Server. Gremlin Server uses the user agent in building usage metrics as well as debugging. The standard format for
+connection user agents is:
+
+[[user-agent-format]]
`"[Application Name] [GLV Name].[Version] [Language Runtime Version] [OS].[Version] [CPU Architecture]"`
For example:
`"MyTestApplication Gremlin-Java.3.5.4 11.0.16.1 Mac_OS_X.12.6.1 aarch64"`
+The following section provides an in-depth description of the TinkerPop HTTP API. The HTTP API is used for
+communicating the requests and responses that were described earlier.
+
+=== HTTP API
+
+This section describes the TinkerPop HTTP API which should be implemented by both graph system providers and graph
+driver providers. There is only one endpoint that currently needs to be supported which is `POST /gremlin`. This
+endpoint is a Gremlin evaluator which takes in a Gremlin script request and responds with the serialized results. The
+formats below use a bit of pseudo-JSON to help represent request and response bodies. The actual format of the request
+and response bodies will be determined by the serializers defined via the "Accept" and "Content-Type" headers. As a
+result, a generic type definition in this document like "number" could translate to a "long" for a serializer that
+supports types like GraphBinary.
+
+==== HTTP Request
+
To formulate a request to Gremlin Server, a `RequestMessage` needs to be constructed. The `RequestMessage` is a
-generalized representation of a request that carries a set of "standard" values in addition to optional ones that are
-dependent on the operation being performed. A `RequestMessage` has these fields:
+generalized representation of a request. This message can be serialized in any fashion that is supported by Gremlin
+Server, which by default is GraphBinary. An HTTP request that contains a `RequestMessage` has the following form:
+
+[source,text]
+----
+POST /gremlin HTTP/1.1
+Accept: <mimetype>
+Content-Type: <mimetype>
+Gremlin-Hints: <hints>
+
+{
+ "gremlin": string,
+ "timeoutMs": number,
+ "bindings": object,
+ "g": string,
+ "language" : string,
+ "materializeProperties": string,
+ "bulkResults": boolean
+}
+----
+
+An actual, complete request might look like the following:
+
+[source,text]
+----
+POST /gremlin HTTP/1.1
+content-length: 61
+host: 127.0.0.1
+content-type: application/vnd.gremlin-v4.0+json
+accept-encoding: deflate
+accept: application/vnd.graphbinary-v4.0
+user-agent: NotAvailable Gremlin-Java.4.0.0 11.0.25 Windows_11.10.0 amd64
+{
+ "gremlin": "g.V()",
+ "language": "gremlin-lang"
+}
+----
+
+===== Expected Request HTTP Headers
+
+[width="100%",cols="3,10,3,3",options="header"]
+|=========================================================
+|Name |Description |Required |Default
+|Accept |Serializer MIME types supported for the response. Must be a mimetype (see <<serializers>>). |No |`application/vnd.gremlin-v4.0+json;types=false`
+|Accept-Encoding |The requested compression algorithm of the response. Valid values: `deflate`. |No |N/A
+|Authorization |Header used with Basic authorization. |No |N/A
+|Content-Length |The size of the payload |Yes |N/A
+|Content-Type |The MIME type of the serialized body |No |None
+|Gremlin-Hints |A semi-colon separated list of key/value pair metadata that could be helpful to the server in processing a particular request in some way. Must be a hints (see table below). |No |N/A
+|User-Agent |The user agent. Follow the format specified by <<user-agent-format, user agent format>>. |No |<<user-agent-format, user agent format>>
+|=========================================================
+
+===== Request Header Value Options
+
+[width="100%",cols="2,10",options="header"]
+|=========================================================
+|Name |Options
+|mimetype |A MIME type listed in <<serializers>>.
+|hints | mutations: yes, no, unknown - Indicates if the Gremlin contains steps that can mutate the graph.
+|=========================================================
+
+The body of the request should be a `RequestMessage` which is a `Map`. The `RequestMessage` should be serialized using
+the serializer specified by the `Content-Type` header. The following are the key value pairs allowed in a
+`RequestMessage`:
+
+===== Request Message Format
+
+[width="100%",cols="3,10,3,3",options="header"]
+|=========================================================
+|Key |Description |Value |Required
+|gremlin |The Gremlin query to execute. |String containing script |Yes
+|timeoutMs |The maximum time a query is allowed to execute in milliseconds. |Number between 0 and 2^31-1 |No
+|bindings |A map used during query execution. Its usage depends on "language". For "gremlin-groovy", these are the variable bindings. For "gremlin-lang", these are the parameter bindings. |Object (Map) |No
+|g |The name of the graph traversal source to which the query applies. Default: "g" |String containing traversal source name |No
+|language |The name of the ScriptEngine to use to parse the gremlin query. Default: "gremlin-lang" |String containing ScriptEngine name |No
+|materializeProperties |Whether to include all properties for results. One of "tokens" or "all". |String |No
+|bulkResults |Whether the results should be bulked by the server (only applies to GraphBinary) |Boolean |No
+|=========================================================
+
+==== HTTP Response
+
+When Gremlin Server receives that request, it will decode it given the "mime type", and execute it using the
+`ScriptEngine` specified by the `language` field. In this case, it will evaluate the script `g.V(x).out()` using the
+`bindings` supplied in the `args` and stream back the results in HTTP chunks. When the chunks are combined, they will
+form a single `ResponseMessage`. The HTTP response containing the `ResponseMessage` has the following form:
+
+[source,text]
+----
+HTTP/1.1 200
+Content-type: <mimetype>
+Transfer-Encoding: chunked
+Gremlin-RequestId: <uuid>
+{
+ "result": list,
+ "status": object
+}
+----
+
+NOTE: While this response message is expected for all serialized responses, there may be some errors that are not
+serialized. In that case, the `Content-Type` of the response should be `application/json` and the JSON should contain a
+`message` key.
+
+===== Response Message Format
+
+[width="100%",cols="2,10a",options="header"]
+|=========================================================
+|Key |Description
+|result |A map that contains the result data.
+[width="100%",cols="3,10,3,3",options="header"]
+!=========================================================
+!Name !Description !Required !Default
+!data !A list of result objects. !Array !Yes
+!=========================================================
+|status |A map that contains the status of the result.
+[width="100%",cols="3,10,3,3",options="header"]
+!=========================================================
+!Name !Description !Required !Default
+!code !The actual <<http-status-codes,status code>> of the result. !Number !Yes
+!exception !A class of exception if an error occurred. !String !No
+!message !The error message if an error occurred. !String !No
+!=========================================================
+|=========================================================
+
+===== Expected Response HTTP Headers
+
+[width="100%",cols="3,10,3,3",options="header"]
+|=========================================================
+|Name |Description |Required |Default
+|Content-Type |The MIME type of the serialized body which is based on the request's `Accept` header. May also be "application/json". |Yes |N/A
+|Gremlin-RequestId |The server generated UUID that is used as a request ID. |Yes |N/A
+|Transfer-Encoding |The server should attempt to chunk all responses. |No |"chunked"
+|=========================================================
+
+===== Response Header Value Options
[width="100%",cols="3,10",options="header"]
|=========================================================
-|Key |Description
-|requestId |A link:http://en.wikipedia.org/wiki/Globally_unique_identifier[UUID] representing the unique identification for the request.
-|op |The name of the "operation" to execute based on the available `OpProcessor` configured in the Gremlin Server. To evaluate a script, use `eval`.
-|processor |The name of the `OpProcessor` to utilize. The default `OpProcessor` for evaluating scripts is unnamed and therefore script evaluation purposes, this value can be an empty string.
-|args |A `Map` of arbitrary parameters to pass to Gremlin Server. The requirements for the contents of this `Map` are dependent on the `op` selected.
+|Name |Options
+|mimetype |A MIME type listed in <<serializers>>.
+|uuid |A randomly generated UUID string.
|=========================================================
-This message can be serialized in any fashion that is supported by Gremlin Server. New serialization methods can
-be plugged in by implementing a `ServiceLoader` enabled `MessageSerializer`, however Gremlin Server provides for
-JSON serialization by default which will be good enough for purposes of most developers building drivers.
-A `RequestMessage` to evaluate a script with variable bindings looks like this in JSON:
+[[http-status-codes]]
+===== Response Status Codes
-[source,js]
-----
-{ "requestId":"1d6d02bd-8e56-421d-9438-3bd6d0079ff1",
- "op":"eval",
- "processor":"",
- "args":{"gremlin":"g.V(x).out()",
- "bindings":{"x":1},
- "language":"gremlin-groovy"}}
-----
+The following table details the HTTP status codes that Gremlin Server will send:
-The above JSON represents the "body" of the request to send to Gremlin Server. When sending this "body" over
-WebSocket, Gremlin Server can accept a packet frame using a "text" (1) or a "binary" (2) opcode. Using "text"
-is a bit more limited in that Gremlin Server will always process the body of that request as JSON. Generally speaking
-"text" is just for testing purposes.
-
-The preferred method for sending requests to Gremlin Server is to use the "binary" opcode. In this case, a "header"
-will need be sent in addition to to the "body". The "header" basically consists of a "mime type" so that Gremlin
-Server knows how to deserialize the `RequestMessage`. So, the actual byte array sent to Gremlin Server would be
-formatted as follows:
-
-image::gremlin-server-request.png[]
-
-The first byte represents the length of the "mime type" string value that follows. Given the default configuration of
-Gremlin Server, this value should be set to `application/json`. The "payload" represents the JSON message above
-encoded as bytes.
-
-NOTE: Gremlin Server will only accept masked packets as it pertains to a WebSocket packet header construction.
-
-When Gremlin Server receives that request, it will decode it given the "mime type", pass it to the requested
-`OpProcessor` which will execute the `op` defined in the message. In this case, it will evaluate the script
-`g.V(x).out()` using the `bindings` supplied in the `args` and stream back the results in a series of
-`ResponseMessages`. A `ResponseMessage` looks like this:
-
-[width="100%",cols="3,10",options="header"]
-|=========================================================
-|Key |Description
-|requestId |The identifier of the `RequestMessage` that generated this `ResponseMessage`.
-|status | The `status` contains a `Map` of three keys: `code` which refers to a `ResultCode` that is somewhat analogous to an link:http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html[HTTP status code], `attributes` that represent a `Map` of protocol-level information, and `message` which is just a human-readable `String` usually associated with errors.
-|result | The `result` contains a `Map` of two keys: `data` which refers to the actual data returned from the server (the type of data is determined by the operation requested) and `meta` which is a `Map` of meta-data related to the response.
-|=========================================================
-
-In this case the `ResponseMessage` returned to the client would look something like this:
-
-[source,js]
-----
-{"result":{"data":[{"id": 2,"label": "person","type": "vertex","properties": [
- {"id": 2, "value": "vadas", "label": "name"},
- {"id": 3, "value": 27, "label": "age"}]},
- ], "meta":{}},
- "requestId":"1d6d02bd-8e56-421d-9438-3bd6d0079ff1",
- "status":{"code":206,"attributes":{},"message":""}}
-----
-
-Gremlin Server is capable of streaming results such that additional responses will arrive over the WebSocket connection until
-the iteration of the result on the server is complete. Each successful incremental message will have a `ResultCode`
-of `206`. Termination of the stream will be marked by a final `200` status code. Note that all messages without a
-`206` represent terminating conditions for a request. The following table details the various status codes that
-Gremlin Server will send:
-
-[width="100%",cols="2,2,9",options="header"]
+[width="100%",cols="1,3,9",options="header"]
|=========================================================
|Code |Name |Description
|200 |SUCCESS |The server successfully processed a request to completion - there are no messages remaining in this stream.
|204 |NO CONTENT |The server processed the request but there is no result to return (e.g. an `Iterator` with no elements) - there are no messages remaining in this stream.
|206 |PARTIAL CONTENT |The server successfully returned some content, but there is more in the stream to arrive - wait for a `SUCCESS` to signify the end of the stream.
+|400 |BAD REQUEST |There was a problem with the HTTP request.
|401 |UNAUTHORIZED |The request attempted to access resources that the requesting user did not have access to.
|403 |FORBIDDEN |The server could authenticate the request, but will not fulfill it.
-|407 |AUTHENTICATE |A challenge from the server for the client to authenticate its request.
-|497 |REQUEST ERROR SERIALIZATION |The request message contained an object that was not serializable.
-|498 |REQUEST ERROR MALFORMED REQUEST |The request message was not properly formatted which means it could not be parsed at all or the "op" code was not recognized such that Gremlin Server could properly route it for processing. Check the message format and retry the request.
-|499 |REQUEST ERROR INVALID REQUEST ARGUMENTS |The request message was parseable, but the arguments supplied in the message were in conflict or incomplete. Check the message format and retry the request.
-|500 |SERVER ERROR |A general server error occurred that prevented the request from being processed.
-|595 |SERVER ERROR FAIL STEP | A server error that is produced when the `fail()` step is triggered. The returned exception will include information consistent with the `Failure` interface.
-|596 |SERVER ERROR TEMPORARY |A server error occurred, but it was temporary in nature and therefore the client is free to retry it's request as-is with the potential for success.
-|597 |SERVER ERROR EVALUATION |The script submitted for processing evaluated in the `ScriptEngine` with errors and could not be processed. Check the script submitted for syntax errors or other problems and then resubmit.
-|598 |SERVER ERROR TIMEOUT |The server exceeded one of the timeout settings for the request and could therefore only partially responded or did not respond at all.
-|599 |SERVER ERROR SERIALIZATION |The server was not capable of serializing an object that was returned from the script supplied on the request. Either transform the object into something Gremlin Server can process within the script or install mapper serialization classes to Gremlin Server.
+|404 |NOT FOUND |The server was unable to find the requested resource.
+|405 |METHOD NOT ALLOWED |The request used an unsupported method. The server only supports POST.
+|413 |REQUEST ENTITY TOO LARGE |The request was too large or the query could not be compiled due to size limitations.
+|500 |INTERNAL SERVER ERROR |A general server error occurred that prevented the request from being processed.
+|505 |HTTP VERSION NOT SUPPORTED |A server error indicating that an unsupported version of HTTP is being used. Only HTTP/1.1 is supported.
|=========================================================
-NOTE: Please refer to the link:https://tinkerpop.apache.org/docs/x.y.z/dev/io[IO Reference Documentation] for more
-examples of `RequestMessage` and `ResponseMessage` instances.
+===== Trailing Headers
-NOTE: Tinkerpop provides a test server which may be useful for testing drivers. Details can be found
-link:https://tinkerpop.apache.org/docs/current/dev/developer/#gremlin-socket-server-tests[here]
+Error responses will have trailing headers in addition to the status object in the response body. This information is
+duplicated and should be the same, so graph driver providers should use whichever is easier for them. The trailers,
+however, will only contain the `Status` and `Exception` without the `Message`.
-=== OpProcessors Arguments
+==== HTTP Examples
-The following sections define a non-exhaustive list of available operations and arguments for embedded `OpProcessors`
-(i.e. ones packaged with Gremlin Server).
+For examples of actual requests and responses, take a look at the IO documentation for
+link:https://tinkerpop.apache.org/docs/x.y.z/dev/io/#_requestmessage[GraphSON requests] and
+link:https://tinkerpop.apache.org/docs/x.y.z/dev/io/#_responsemessage[GraphSON responses].
-==== Common
+=== HTTP Request Interceptor
-All `OpProcessor` instances support these arguments.
-
-[width="100%",cols="2,2,9",options="header"]
-|=========================================================
-|Key |Type |Description
-|batchSize |Int |When the result is an iterator this value defines the number of iterations each `ResponseMessage` should contain - overrides the `resultIterationBatchSize` server setting.
-|=========================================================
-
-==== Standard OpProcessor
-
-The "standard" `OpProcessor` handles requests for the primary function of Gremlin Server - executing Gremlin.
-Requests made to this `OpProcessor` are "sessionless" in the sense that a request must encapsulate the entirety
-of a transaction. There is no state maintained between requests. A transaction is started when the script is first
-evaluated and is committed when the script completes (or rolled back if an error occurred).
-
-[width="100%",cols="3,10a",options="header"]
-|=========================================================
-|Key |Description
-|processor |As this is the default `OpProcessor` this value can be set to an empty string.
-|op |[width="100%",cols="3,10",options="header"]
-!=========================================================
-!Key !Description
-!`authentication` !A request that contains the response to a server challenge for authentication.
-!`eval` !Evaluate a Gremlin script provided as a `String`.
-!=========================================================
-|=========================================================
-
-**`authentication` operation arguments**
-
-[width="100%",cols="2,2,9",options="header"]
-|=========================================================
-|Key |Type |Description
-|sasl |String | *Required* The response to the server authentication challenge. This value is dependent on the SASL authentication mechanism required by the server and is Base64 encoded.
-|saslMechanism |String | The SASL mechanism: `PLAIN` or `GSSAPI`. Note that it is up to the server implementation to use or disregard this setting (default implementation in Gremlin Server ignores it).
-|=========================================================
-
-**`eval` operation arguments**
-
-[width="100%",cols="2,2,9",options="header"]
-|=========================================================
-|Key |Type |Description
-|gremlin |String | *Required* The Gremlin script to evaluate.
-|bindings |Map |A map of key/value pairs to apply as variables in the context of the Gremlin script.
-|language |String |The flavor of Gremlin used (e.g. `gremlin-groovy`).
-|aliases |Map |A map of key/value pairs that allow globally bound `Graph` and `TraversalSource` objects to
-be aliased to different variable names for purposes of the current request. The value represents the name of the
-global variable and its key represents the new binding name as it will be referenced in the Gremlin query. For
-example, if the Gremlin Server defines two `TraversalSource` instances named `g1` and `g2`, it would be possible
-to send an alias pair with key of "g" and value of "g2" and thus allow the script to refer to "g2" simply as "g".
-|evaluationTimeout |Long |An override for the server setting that determines the maximum time to wait for a script to execute on the server.
-|=========================================================
-
-==== Session OpProcessor
-
-The "session" `OpProcessor` handles requests for the primary function of Gremlin Server - executing Gremlin. It is
-like the "standard" `OpProcessor`, but instead maintains state between sessions and allows the option to leave all
-transaction management up to the calling client. It is important that clients that open sessions, commit or roll
-them back, however Gremlin Server will try to clean up such things when a session is killed that has been abandoned.
-It is important to consider that a session can only be maintained with a single machine. In the event that multiple
-Gremlin Server are deployed, session state is not shared among them.
-
-[width="100%",cols="3,10a",options="header"]
-|=========================================================
-|Key |Description
-|processor |This value should be set to `session`
-|op |
-[cols="3,10",options="header"]
-!=========================================================
-!Key !Description
-!`authentication` !A request that contains the response to a server challenge for authentication.
-!`eval` !Evaluate a Gremlin script provided as a `String`.
-!`close` !Deprecated. Gremlin-Server will only return a `NO CONTENT` message.
-|=========================================================
-
-NOTE: The "close" message related to sessions was deprecated as of 3.3.11. Closing sessions now relies on closing the connections. The function to accept `close` message on the server was removed
-in 3.5.0, but has been added back as of 3.5.2. Servers wishing to be compatible with older versions of the driver need only send back a `NO_CONTENT` for
-this message (which is what Gremlin Server does as of 3.5.0). Drivers wishing to be compatible with servers prior to
-3.3.11 may continue to send the message on calls to `close()`, otherwise such code can be removed.
-
-**`authentication` operation arguments**
-
-[width="100%",cols="2,2,9",options="header"]
-|=========================================================
-|Key |Type |Description
-|saslMechanism |String | The SASL mechanism: `PLAIN` or `GSSAPI`. Note that it is up to the server implementation to use or disregard this setting (default implementation in Gremlin Server ignores it).
-|sasl |String | *Required* The response to the server authentication challenge. This value is dependent on the SASL authentication mechanism required by the server and is Base64 encoded.
-|=========================================================
-
-**`eval` operation arguments**
-
-[width="100%",options="header"]
-|=========================================================
-|Key |Type |Description
-|gremlin |String | *Required* The Gremlin script to evaluate.
-|session |String | *Required* The session identifier for the current session - typically this value should be a UUID (the session will be created if it doesn't exist).
-|manageTransaction |Boolean |When set to `true` the transaction for the current request is auto-committed or rolled-back as are done with sessionless requests - defaulted to `false`.
-|bindings |Map |A map of key/value pairs to apply as variables in the context of the Gremlin script.
-|evaluationTimeout |Long |An override for the server setting that determines the maximum time to wait for a script to execute on the server.
-|language |String |The flavor of Gremlin used (e.g. `gremlin-groovy`)
-|aliases |Map |A map of key/value pairs that allow globally bound `Graph` and `TraversalSource` objects to
-be aliased to different variable names for purposes of the current request. The value represents the name the
-global variable and its key represents the new binding name as it will be referenced in the Gremlin query. For
-example, if the Gremlin Server defines two `TraversalSource` instances named `g1` and `g2`, it would be possible
-to send an alias pair with key of "g" and value of "g2" and thus allow the script to refer to "g2" simply as "g".
-|=========================================================
-
-**`close` operation arguments**
-[width="100%",cols="2,2,9",options="header"]
-|=========================================================
-|Key |Type |Description
-|session |String | *Required* The session identifier for the session to close.
-|force |Boolean | Determines if the session should be force closed when the client is closed. Force closing will not
-attempt to close open transactions from existing running jobs and leave it to the underlying graph to decided how to
-proceed with those orphaned transactions. Setting this to `true` tends to lead to faster close operation and release
-of resources which can be desirable if Gremlin Server has a long session timeout and a long script evaluation timeout
-as attempts to close long run jobs can occur more rapidly. If not provided, this value is `false`.
-|=========================================================
-
-==== Traversal OpProcessor
-
-Both the Standard and Session OpProcessors allow for Gremlin scripts to be submitted to the server. The
-`TraversalOpProcessor` however allows Gremlin `Bytecode` to be submitted to the server. Supporting this `OpProcessor`
-makes it possible for a link:https://tinkerpop.apache.org/docs/x.y.z/reference/#gremlin-drivers-variants[Gremlin Language Variant]
-to submit a `Traversal` directly to Gremlin Server in the native language of the GLV without having to use a script in
-a different language.
-
-Unlike Standard and Session OpProcessors, the Traversal OpProcessor does not simply return the results of the
-`Traversal`. It instead returns `Traverser` objects which allows the client to take advantage of
-link:https://tinkerpop.apache.org/docs/x.y.z/reference/#barrier-step[bulking]. To describe this interaction more
-directly, the returned `Traverser` will represent some value from the `Traversal` result and the number of times it
-is represented in the full stream of results. So, if a `Traversal` happens to return the same vertex twenty times
-it won't return twenty instances of the same object. It will return one in `Traverser` with the `bulk` value set to
-twenty. Under this model, the amount of processing and network overhead can be reduced considerably.
-
-To demonstrate consider this example:
-
-[gremlin-groovy]
-----
-cluster = Cluster.open()
-client = cluster.connect()
-aliased = client.alias("g")
-g = traversal().with(org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph.instance()) <1>
-rs = aliased.submit(g.V().both().barrier().both().barrier()).all().get() <2>
-aliased.submit(g.V().both().barrier().both().barrier().count()).all().get().get(0).getInt() <3>
-rs.collect{[value: it.getObject().get(), bulk: it.getObject().bulk()]} <4>
-----
-
-<1> All commands through this step are just designed to demonstrate bulking with Gremlin Server and don't represent
-a real-world way that this feature would be used.
-<2> Submit a `Traversal` that happens to ensure that the server uses bulking. Note that a `Traverser` is returned
-and that there are only six results.
-<3> In actuality, however, if this same `Traversal` is iterated there are thirty results. Without bulking, the previous
-request would have sent back thirty traversers.
-<4> Note that the sum of the bulk of each `Traverser` is thirty.
-
-The full iteration of a `Traversal` is thus left to the client. It must interpret the bulk on the `Traverser` and
-unroll it to represent the actual number of times it exists when iterated. The unrolling is typically handled
-directly within TinkerPop's remote traversal implementations.
-
-[width="100%",cols="3,10a",options="header"]
-|=========================================================
-|Key |Description
-|processor |This value should be set to `traversal`
-|op |
-[cols="3,10",options="header"]
-!=========================================================
-!Key !Description
-!`authentication` !A request that contains the response to a server challenge for authentication.
-!`bytecode` !A request that contains the `Bytecode` representation of a `Traversal`.
-|=========================================================
-
-**`authentication` operation arguments**
-
-[width="100%",cols="2,2,9",options="header"]
-|=========================================================
-|Key |Type |Description
-|sasl |String | *Required* The response to the server authentication challenge. This value is dependent on the SASL authentication mechanism required by the server and is Base64 encoded.
-|=========================================================
-
-**`bytecode` operation arguments**
-
-[width="100%",cols="2,2,9",options="header"]
-|=========================================================
-|Key |Type |Description
-|gremlin |String | *Required* The `Bytecode` representation of a `Traversal`.
-|aliases |Map | *Required* A map with a single key/value pair that refers to a globally bound `TraversalSource` object
-to be aliased to different variable names for purposes of the current request. The value represents the name of the
-global variable and its key represents the new binding name as it will be referenced in the Gremlin query. For
-example, if the Gremlin Server defines two `TraversalSource` instances named `g1`, it would be possible
-to send an alias pair with key of "g" and value of "g1" and thus allow the script to refer to "g1" simply as "g". Note
-that unlike users of `alias` in other contexts, in this case, the key can *only* be set to "g" and there can be only
-one key value pair present (since only one `Traversal` is being submitted, there is no sense to having more than a
-single alias).
-|=========================================================
+A graph driver may support HTTP request intercepting which provides a means for the user of your graph driver to update
+the headers and body of the HTTP request before it is sent to the server. This enables use cases where a graph system
+provider's server implementation has additional capabilities that aren't included in the base Gremlin Server. Although
+every graph system provider is expected to support the protocol defined by the TinkerPop HTTP API, this doesn't
+preclude them from including additional functionality. Be aware that if you choose to not provide this functionality,
+then your graph driver may not have access to some graph provider's features, or, possibly, it may not be able to
+connect at all.
=== Authentication and Authorization
-Gremlin Server supports link:https://en.wikipedia.org/wiki/Simple_Authentication_and_Security_Layer[SASL-based]
-authentication. A SASL implementation provides a series of challenges and responses that a driver must comply with
-in order to authenticate. Gremlin Server supports the "PLAIN" SASL mechanism, which is a cleartext
-password system, for all link:https://tinkerpop.apache.org/docs/x.y.z/reference/#gremlin-drivers-variants[Gremlin Language Variants].
-Other SASL mechanisms supported for selected clients are listed in the
-link:https://tinkerpop.apache.org/docs/x.y.z/reference/#security[security section of the Gremlin Server reference documentation].
+By default, Gremlin Server only supports
+link:https://en.wikipedia.org/wiki/Basic_access_authentication[basic HTTP authentication]. This is handled by the
+`HttpBasicAuthenticationHandler` which is the only `AbstractAuthenticationHandler` provided with the Gremlin Server.
+Other common HTTP authentication schemes that are sent via an HTTP header can be supported by implementing a custom
+`AbstractAuthenticationHandler`. Because the communication protocol is HTTP/1.1, authentication should be header-based
+and should not include negotiation.
-When authentication is enabled, an incoming request is intercepted before it is evaluated by the `ScriptEngine`. The
-request is saved on the server and a `AUTHENTICATE` challenge response (status code `407`) is returned to the client.
-
-The client will detect the `AUTHENTICATE` and respond with an `authentication` for the `op` and an `arg` named `sasl`.
-In case of the "PLAIN" SASL mechanism the `arg` contains the password. The password should be either, an encoded
-sequence of UTF-8 bytes, delimited by 0 (US-ASCII NUL), where the form is : `<NUL>username<NUL>password`, or a Base64
-encoded string of the former (which in this instance would be `AHVzZXJuYW1lAHBhc3N3b3Jk`). Should Gremlin Server be
-able to authenticate with the provided credentials, the server will return the results of the original request as it
-normally does without authentication. If it cannot authenticate given the challenge response from the client, it will
-return `UNAUTHORIZED` (status code `401`).
-
-NOTE: Gremlin Server does not support the "authorization identity" as described in link:https://tools.ietf.org/html/rfc4616[RFC4616].
+When basic authentication is enabled, an incoming request is intercepted before it is evaluated by the `ScriptEngine`.
+The request is examined for an `Authorization` header. If one doesn't exist then "401 Unauthorized" error response is
+returned.
In addition to authenticating users at the start of a connection, Gremlin Server allows providers to authorize users on
a per request basis. If
@@ -1346,6 +1236,39 @@
NOTE: While Gremlin Server supports this authorization feature it is not a feature that TinkerPop requires of graph
providers as part of the agreement between client and server.
+[[serializers]]
+=== Serializers
+
+In order to serialize and deserialize the requests and responses, your graph driver will need to implement
+link:https://tinkerpop.apache.org/docs/x.y.z/dev/io/#graphbinary[GraphBinary]. The Gremlin Server is capable of
+returning both GraphBinary and GraphSON, however, GraphBinary is a more compact format which can lead to increased
+performance as fewer bytes need to be sent through the wire. For this reason, drivers only need to support GraphBinary.
+link:https://tinkerpop.apache.org/docs/x.y.z/dev/io/#graphson[GraphSON] can be used by applications that only support JSON serialization.
+
+The following table lists the serializers supported by the Gremlin Server and their MIME types. These MIME types should
+be used in the `Content-Type` and `Accept` HTTP headers.
+
+[width="100%",cols="3,5,5",options="header"]
+|=========================================================
+|Name |Description |MIME type
+|Untyped GraphSON 4.0 |A JSON-based graph format |application/vnd.gremlin-v4.0+json;types=false
+|Typed GraphSON 4.0 |A JSON-based graph format with embedded type information used for serialization |application/vnd.gremlin-v4.0+json;types=true
+|GraphBinary 4.0 |A binary graph format |application/vnd.graphbinary-v4.0
+|=========================================================
+
+==== IO Tests
+
+The IO test suite is a collection of files that contain the expected outcome of serialization of certain types. These
+tests can be used to determine if a particular serializer has been correctly implemented. In general, a driver should
+be able to "round trip" each of these types. That is, it should be able to both read from and write to those exact same
+bytes. Not all programming languages provide library types that will match the specification of the corresponding type
+defined by the serializer. In this case, it is not possible to completely round trip that type and you may skip that
+test. The GraphBinary test files can be found
+link:https://github.com/apache/tinkerpop/tree/x.y.z/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary[here].
+The link:https://github.com/apache/tinkerpop/blob/x.y.z/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractTypedCompatibilityTest.java:[Java implementation]
+can be used as a reference on how these files can be used and its
+link:https://github.com/apache/tinkerpop/blob/x.y.z/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/structure/io/Model.java[model]
+shows the Java representation of those files.
[[gremlin-plugins]]
== Gremlin Plugins
diff --git a/docs/src/recipes/anti-patterns.asciidoc b/docs/src/recipes/anti-patterns.asciidoc
index 839764e..6fe01c7 100644
--- a/docs/src/recipes/anti-patterns.asciidoc
+++ b/docs/src/recipes/anti-patterns.asciidoc
@@ -56,7 +56,7 @@
from("p${relation.from}").
to("p${relation.to}")
} ; []
-traversalAsString = org.apache.tinkerpop.gremlin.process.traversal.translator.GroovyTranslator.of("g").translate(t.bytecode).getScript() ; []
+traversalAsString = traversalAsString = t.gremlinLang.getGremlin() ; []
[ "Traversal String Length": traversalAsString.length()
, "Traversal Preview": traversalAsString.replaceFirst(/^(.{104}).*(.{64})$/, '$1 ... $2') ]
----
diff --git a/docs/src/reference/gremlin-applications.asciidoc b/docs/src/reference/gremlin-applications.asciidoc
index cd342a1..efe9c6c 100644
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@ -78,7 +78,7 @@
\,,,/
(o o)
------oOOo-(3)-oOOo-----
+-----oOOo-(4)-oOOo-----
plugin loaded: tinkerpop.server
plugin loaded: tinkerpop.utilities
plugin loaded: tinkerpop.tinkergraph
@@ -134,55 +134,16 @@
|:install |:+ |Imports a Maven library and its dependencies into the Console.
|:uninstall |:- |Removes a Maven library and its dependencies. A restart of the console is required for removal to fully take effect.
|:plugin |:pin |Plugin management functions to list, activate and deactivate available plugins.
-|:remote |:rem |Configures a "remote" context where Gremlin or results of Gremlin will be processed via usage of `:submit`.
-|:submit |:> |Submit Gremlin to the currently active context defined by `:remote`.
-|:bytecode |:bc |Provides options for translating and evaluating `Bytecode` for debugging purposes.
|=========================================================
-Many of the above commands are described elsewhere or are generally self-explanatory, but the `:bytecode` command
-could use some additional explanation. The following code shows example usage:
-
-[source,text]
-----
-gremlin> :bytecode from g.V().out('knows') <1>
-==>{"@type":"g:Bytecode","@value":{"step":[["V"],["out","knows"]]}}
-gremlin> :bytecode translate g {"@type":"g:Bytecode","@value":{"step":[["V"],["out","knows"]]}} <2>
-==>g.V().out("knows")
-gremlin> m = GraphSONMapper.build().create()
-==>org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper@69d6a7cd
-gremlin> :bc config m <3>
-==>Configured bytecode serializer
-gremlin> :bc from g.V().property('d',java.time.YearMonth.now()) <4>
-Could not find a type identifier for the class : class java.time.Month. Make sure the value to serialize has a type identifier registered for its class. (through reference chain: java.time.YearMonth["month"])
-Type ':help' or ':h' for help.
-Display stack trace? [yN]n
-gremlin> :bc reset <5>
-==>Bytecode serializer reset to GraphSON 3.0 with extensions and TinkerGraph serializers
-gremlin> :bc from g.V().property('d',java.time.YearMonth.now())
-==>{"@type":"g:Bytecode","@value":{"step":[["V"],["property","d",{"@type":"gx:YearMonth","@value":"2020-11"}]]}}
-----
-
-<1> Generates a GraphSON 3.0 representation of the traversal as bytecode.
-<2> Converts bytecode in GraphSON 3.0 format to a traversal string.
-<3> Configure a custom `GraphSONMapper` for the `:bytecode` command to use which can be helpful when working with
-custom classes from different graph providers. The `config` option can take a `GraphSONMapper` argument as shown or
-one or more `IoRegistry` or `SimpleModule` implementations that will plug into the default `GraphSONMapper` constructed
-by the `:bytecode` command. The default will configure for GraphSON 3.0 with the extensions module and, if present,
-the `TinkerIoRegistry` from TinkerGraph.
-<4> Note that the `YearMonth` will not serialize because `m` did not configure the extensions module.
-<5> After `reset` it works properly once more.
-
-NOTE: The Console does expose the `:record` command which is inherited from the Groovy Shell. This command works well
-with local commands, but may record session outputs differently for `:remote` commands. If there is a need to use
-`:record` it may be best to manually create a `Cluster` object and issue commands that way so that they evaluate
-locally in the shell.
+NOTE: The Console also exposes the `:record` command which is inherited from the Groovy Shell.
=== Interrupting Evaluations
If there is some input that is taking too long to evaluate or to iterate through, use `ctrl+c` to attempt to interrupt
that process. It is an "attempt" in the sense that the long running process is only informed of the interruption by
the user and must respond to it (as with any call to `interrupt()` on a `Thread`). A `Traversal` will typically respond
-to such requests as do most commands, including `:remote` operations.
+to such requests as do most commands.
[source,text]
----
@@ -263,7 +224,6 @@
----
gremlin> :plugin list <1>
==>tinkerpop.server[active]
-==>tinkerpop.gephi
==>tinkerpop.utilities[active]
==>tinkerpop.sugar
==>tinkerpop.tinkergraph[active]
@@ -273,7 +233,6 @@
==>loaded: [org.apache.tinkerpop, neo4j-gremlin, x.y.z]
gremlin> :plugin list <4>
==>tinkerpop.server[active]
-==>tinkerpop.gephi
==>tinkerpop.utilities[active]
==>tinkerpop.sugar
==>tinkerpop.tinkergraph[active]
@@ -282,7 +241,6 @@
==>tinkerpop.neo4j activated
gremlin> :plugin list <6>
==>tinkerpop.server[active]
-==>tinkerpop.gephi
==>tinkerpop.sugar[active]
==>tinkerpop.utilities[active]
==>tinkerpop.neo4j[active]
@@ -392,7 +350,7 @@
\,,,/
(o o)
------oOOo-(3)-oOOo-----
+-----oOOo-(4)-oOOo-----
plugin activated: tinkerpop.server
plugin activated: tinkerpop.utilities
plugin activated: tinkerpop.tinkergraph
@@ -424,7 +382,7 @@
\,,,/
(o o)
------oOOo-(3)-oOOo-----
+-----oOOo-(4)-oOOo-----
plugin activated: tinkerpop.server
plugin activated: tinkerpop.utilities
plugin activated: tinkerpop.tinkergraph
@@ -462,8 +420,8 @@
NOTE: Please see the link:https://tinkerpop.apache.org/docs/x.y.z/dev/provider/[Provider Documentation] for information
on how to develop a driver for Gremlin Server.
-By default, communication with Gremlin Server occurs over link:http://en.wikipedia.org/wiki/WebSocket[WebSocket] and
-exposes a custom sub-protocol for interacting with the server.
+By default, communication with Gremlin Server occurs over HTTP/1.1. The TinkerPop HTTP API is described in the
+link:https://tinkerpop.apache.org/docs/x.y.z/dev/provider/#_http_api[HTTP provider documentation].
WARNING: Gremlin Server allows for the execution of remotely submitted "scripts" (i.e. arbitrary code sent by a client
to the server). Developers should consider the security implications involved in running Gremlin Server without the
@@ -482,7 +440,7 @@
[INFO] GremlinServer
\,,,/
(o o)
------oOOo-(3)-oOOo-----
+-----oOOo-(4)-oOOo-----
[INFO] GremlinServer - Configuring Gremlin Server from conf/gremlin-server-modern.yaml
[INFO] MetricManager - Configured Metrics Slf4jReporter configured with interval=180000ms and loggerName=org.apache.tinkerpop.gremlin.server.Settings$Slf4jReporterMetrics
@@ -491,17 +449,13 @@
[INFO] ServerGremlinExecutor - Initialized GremlinExecutor and preparing GremlinScriptEngines instances.
[INFO] ServerGremlinExecutor - Initialized gremlin-groovy GremlinScriptEngine and registered metrics
[INFO] ServerGremlinExecutor - A GraphTraversalSource is now bound to [g] with graphtraversalsource[tinkergraph[vertices:0 edges:0], standard]
-[INFO] OpLoader - Adding the standard OpProcessor.
-[INFO] OpLoader - Adding the session OpProcessor.
-[INFO] OpLoader - Adding the traversal OpProcessor.
[INFO] GremlinServer - Executing start up LifeCycleHook
[INFO] Logger$info - Loading 'modern' graph data.
[INFO] GremlinServer - idleConnectionTimeout was set to 0 which resolves to 0 seconds when configuring this value - this feature will be disabled
[INFO] GremlinServer - keepAliveInterval was set to 0 which resolves to 0 seconds when configuring this value - this feature will be disabled
-[INFO] AbstractChannelizer - Configured application/vnd.gremlin-v3.0+json with org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3
-[INFO] AbstractChannelizer - Configured application/json with org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3
-[INFO] AbstractChannelizer - Configured application/vnd.graphbinary-v1.0 with org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1
-[INFO] AbstractChannelizer - Configured application/vnd.graphbinary-v1.0-stringd with org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1
+[INFO] AbstractChannelizer - Configured application/vnd.gremlin-v4.0+json with org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV4
+[INFO] AbstractChannelizer - Configured application/json with org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV4
+[INFO] AbstractChannelizer - Configured application/vnd.graphbinary-v4.0 with org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV4
[INFO] GremlinServer$1 - Gremlin Server configured with worker thread pool of 1, gremlin pool of 4 and boss thread pool of 1.
[INFO] GremlinServer$1 - Channel started at port 8182.
----
@@ -545,8 +499,8 @@
[[connecting-via-drivers]]
=== Connecting via Drivers
-image:rexster-connect.png[width=180,float=right] TinkerPop offers client-side drivers for the Gremlin Server websocket
-sub-protocol in a variety of languages:
+image:rexster-connect.png[width=180,float=right] TinkerPop offers client-side drivers for the Gremlin Server that
+communicates via the TinkerPop HTTP API in a variety of languages:
* <<gremlin-dotnet,C#>>
* <<gremlin-go,Go>>
@@ -555,9 +509,9 @@
* <<gremlin-python,Python>>
These drivers provide methods to send Gremlin based requests and get back traversal results as a response. The requests
-may be script-based or bytecode-based. As discussed earlier in the <<connecting-gremlin-server,introduction>> the
-recommendation is to use bytecode-based requests. The difference between sending scripts and sending bytecode are
-demonstrated below in some basic examples:
+are script-based or traversal-based. Traversals are internally translated into a `gremlin-lang` compatible script.
+Traversals are still the recommended way to send Gremlin as it has better integration with your language of choice. The
+difference between sending scripts and sending traversals are demonstrated below in some basic examples:
[source,java,tab]
----
@@ -568,7 +522,7 @@
params.put("name","marko");
List<Result> list = client.submit("g.V().has('person','name',name).out('knows')", params).all().get();
-// bytecode
+// traversal
GraphTraversalSource g = traversal().with(DriverRemoteConnection.using("localhost",8182,"g"));
List<Vertex> list = g.V().has("person","name","marko").out("knows").toList();
----
@@ -579,7 +533,7 @@
def client = cluster.connect()
def list = client.submit("g.V().has('person','name',name).out('knows')", [name: "marko"]).all().get();
-// bytecode
+// traversal
def g = traversal().with(DriverRemoteConnection.using("localhost",8182,"g"))
def list = g.V().has('person','name','marko').out('knows').toList()
----
@@ -594,7 +548,7 @@
const conn = client.open();
const list = conn.submit("g.V().has('person','name',name).out('knows')",{name: 'marko'}).then(function (response) { ... });
-// bytecode
+// traversal
const g = gtraversal().with(new DriverRemoteConnection('ws://localhost:8182/gremlin'));
const list = g.V().has("person","name","marko").out("knows").toList();
----
@@ -604,7 +558,7 @@
client = Client('ws://localhost:8182/gremlin', 'g')
list = client.submit("g.V().has('person','name',name).out('knows')",{'name': 'marko'}).all()
-# bytecode
+# traversal
g = traversal().with(DriverRemoteConnection('ws://localhost:8182/gremlin','g'))
list = g.V().has("person","name","marko").out("knows").toList()
----
@@ -616,14 +570,14 @@
new(RequestOptionsBuilder).AddBinding("name", "marko").Create())
result, err := resultSet.All()
-// bytecode
+// traversal
remote, err := NewDriverRemoteConnection("ws://localhost:8182/gremlin")
g := Traversal_().With(remote)
list, err := g.V().Has("person", "name", "marko").Out("knows").ToList()
----
-The advantage of bytecode over scripts should be apparent from the above examples. Scripts are just strings that are
-embedded in code (in the above examples, the strings are Groovy-based) whereas bytecode based requests are themselves
+The advantage of traversals over scripts should be apparent from the above examples. Scripts are just strings that are
+embedded in code (in the above examples, the strings are Groovy-based) whereas traversal based requests are themselves
code written in the native language of use. Obviously, the advantage of the Gremlin being actual code is that there
are checks (e.g. compile-time, auto-complete and other IDE support, language level checks, etc.) that help validate the
Gremlin during the development process.
@@ -652,7 +606,7 @@
[[connecting-via-console]]
=== Connecting via Console
-With Gremlin Server running it is now possible to issue some scripts to it for processing. Start Gremlin Console as
+Gremlin Console can be used to send remote traversals to a running Gremlin Server. Start Gremlin Console as
follows:
[source,text]
@@ -661,242 +615,81 @@
\,,,/
(o o)
------oOOo-(3)-oOOo-----
+-----oOOo-(4)-oOOo-----
gremlin>
----
-The console has the notion of a "remote", which represents a place a script will be sent from the console to be
-evaluated elsewhere in some other context (e.g. Gremlin Server, Hadoop, etc.). To create a remote in the console,
-do the following:
+Remote traversals can then be constructed as follows.
[gremlin-groovy]
----
-:remote connect tinkerpop.server conf/remote.yaml
+g = traversal().with('conf/remote-graph.properties')
+
+g.V().values('name')
+g.V().has('name','marko').out('created').values('name')
+g.E().label().groupCount()
+
+g.close()
----
-The `:remote` command shown above displays the current status of the remote connection. This command can also be
-used to configure a new connection and change other related settings. To actually send a script to the server a
-different command is required:
+One can also construct remote traversal source via DRC, as well as via client to submit scripts.
-[gremlin-groovy]
+[source, text]
----
-:> g.V().values('name')
-:> g.V().has('name','marko').out('created').values('name')
-:> g.E().label().groupCount()
-result
-:remote close
+// with DRC
+g = traversal().with(DriverRemoteConnection.using("localhost",8182,"g"))
+g.V().count()
+
+// with client
+client = Cluster.build("localhost").port(8182).create().connect()
+client.submit("g.V().count()")
----
-The `:>` command, which is a shorthand for `:submit`, sends the script to the server to execute there. Results are
-wrapped in an `Result` object which is a just a holder for each individual result. The `class` shows the data type
-for the containing value. Note that the last script sent was supposed to return a `Map`, but its `class` is
-`java.lang.String`. By default, the connection is configured to only return text results. In other words,
-Gremlin Server is using `toString` to serialize all results back to the console. This enables virtually any
-object on the server to be returned to the console, but it doesn't allow the opportunity to work with this data
-in any way in the console itself. A different configuration of the `:remote` is required to get the results back
-as "objects":
-
-[gremlin-groovy]
-----
-:remote connect tinkerpop.server conf/remote-objects.yaml <1>
-:remote list <2>
-:> g.E().label().groupCount() <3>
-m = result[0].object <4>
-m.sort {it.value}
-script = """
- g.V().hasLabel('person').
- out('knows').
- out('created').
- group().
- by('name')
- """
-:> @script <5>
-:remote close
-----
-
-<1> This configuration file specifies that results should be deserialized back into an `Object` in the console with
-the caveat being that the server and console both know how to serialize and deserialize the result to be returned.
-<2> There are now two configured remote connections. The one marked by an asterisk is the one that was just created
-and denotes the current one that `:submit` will react to.
-<3> When the script is executed again, the `class` is no longer shown to be a `java.lang.String`. It is instead a `java.util.HashMap`.
-<4> The last result of a remote script is always stored in the reserved variable `result`, which allows access to
-the `Result` and by virtue of that, the `Map` itself.
-<5> If the submission requires multiple-lines to express, then a multi-line string can be created. The `:>` command
-realizes that the user is referencing a variable via `@` and submits the string script.
-
-TIP: In Groovy, `""" text """` is a convenient way to create a multi-line string and works well in concert with
-`:> @variable`. Note that this model of submitting a string variable works for all `:>` based plugins, not just Gremlin Server.
-
-WARNING: Not all values that can be returned from a Gremlin script end up being serializable. For example,
-submitting `:> graph` will return a `Graph` instance and in most cases those are not serializable by Gremlin Server
-and will return a serialization error. It should be noted that `TinkerGraph`, as a convenience for shipping around
-small sub-graphs, is serializable from Gremlin Server.
-
-The alternative syntax to connecting allows for the `Cluster` to be user constructed directly in the console as
-opposed to simply providing a static YAML file.
-
-[gremlin-groovy]
-----
-cluster = Cluster.open()
-:remote connect tinkerpop.server cluster
-----
-
-The Gremlin Server `:remote config` command for the driver has the following configuration options:
-
-[width="100%",cols="3,10a",options="header"]
-|=========================================================
-|Command |Description
-|alias |
-[width="100%",cols="3,10",options="header"]
-!=========================================================
-!Option !Description
-! _pairs_ !A set of key/value alias/binding pairs to apply to requests.
-!`reset` !Clears any aliases that were supplied in previous configurations of the remote.
-!`show` !Shows the current set of aliases which is returned as a `Map`
-!=========================================================
-|timeout |Specifies the length of time in milliseconds the Console will wait for a response from the server. Specify
-"none" to have no timeout. By default, this setting uses "none".
-|=========================================================
-
-[[console-aliases]]
-==== Aliases
-
-The `alias` configuration command for the Gremlin Server `:remote` can be useful in situations where there are
-multiple `Graph` or `TraversalSource` instances on the server, as it becomes possible to rename them from the client
-for purposes of execution within the context of a script. Therefore, it becomes possible to submit commands this way:
-
-[gremlin-groovy]
-----
-:remote connect tinkerpop.server conf/remote-objects.yaml
-:remote config alias x g
-:> x.E().label().groupCount()
-:remote close
-----
-
-[[console-sessions]]
-==== Sessions
-
-A `:remote` created in the following fashion will be "sessionless", meaning each script issued to the server with
-`:>` will be encased in a transaction and no state will be maintained from one request to the next.
-
-[source,groovy]
-----
-gremlin> :remote connect tinkerpop.server conf/remote-objects.yaml
-==>Configured localhost/127.0.0.1:8182
-----
-
-In other words, the transaction will be automatically committed (or rolledback on error) and any variables declared
-in that script will be forgotten for the next request. See the section on <<sessions, "Considering Sessions">>
-for more information on that topic.
-
-To enable the remote to connect with a session the `connect` argument takes another argument as follows:
-
-[gremlin-groovy]
-----
-:remote connect tinkerpop.server conf/remote.yaml session
-:> x = 1
-:> y = 2
-:> x + y
-:remote close
-----
-
-With the above command a session gets created with a random UUID for a session identifier. It is also possible to
-assign a custom session identifier by adding it as the last argument to `:remote` command above. There is also the
-option to replace "session" with "session-managed" to create a session that will auto-manage transactions (i.e. each
-request will occur within the bounds of a transaction). In this way, the state of bound variables between requests are
-maintained, but the need to manually managed the transactional scope of the graph is no longer required.
-
-[[console-remote-console]]
-==== Remote Console
-
-Previous examples have shown usage of the `:>` command to send scripts to Gremlin Server. The Gremlin Console also
-supports an additional method for doing this which can be more convenient when the intention is to exclusively
-work with a remote connection to the server.
-
-[gremlin-groovy]
-----
-:remote connect tinkerpop.server conf/remote.yaml session
-:remote console
-x = 1
-y = 2
-x + y
-:remote console
-:remote close
-----
-
-In the above example, the `:remote console` command is executed. It places the console in a state where the `:>` is
-no longer required. Each script line is actually automatically submitted to Gremlin Server for evaluation. The
-variables `x` and `y` that were defined actually don't exist locally - they only exist on the server! In this sense,
-putting the console in this mode is basically like creating a window to a session on Gremlin Server.
-
-TIP: When using `:remote console` there is not much point to using a configuration that uses a serializer that returns
-actual data. In other words, using a configuration like the one inside of `conf/remote-objects.yaml` isn't typically
-useful as in this mode the result will only ever be displayed but not used. Using a serializer configuration like
-the one in `conf/remote.yaml` should perform better.
-
-NOTE: Console commands, those that begin with a colon (e.g. `:x`, `:remote`) do not execute remotely when in this mode.
-They are all still evaluated locally.
[[connecting-via-http]]
=== Connecting via HTTP
-image:gremlin-rexster.png[width=225,float=left] While the default behavior for Gremlin Server is to provide a
-WebSocket-based connection, it can also be configured to support plain HTTP web service.
-The HTTP endpoint provides for a communication protocol familiar to most developers, with a wide support of
-programming languages, tools and libraries for accessing it. As a result, HTTP provides a fast way to get started
-with Gremlin Server. It also may represent an easier upgrade path from link:https://github.com/tinkerpop/rexster[Rexster]
-as the API for the endpoint is very similar to Rexster's link:https://github.com/tinkerpop/rexster/wiki/Gremlin-Extension[Gremlin Extension].
+image:gremlin-rexster.png[width=225,float=left] The HTTP endpoint provides for a communication protocol familiar to
+most developers, with a wide support of programming languages, tools and libraries for accessing it. As a result, HTTP
+provides a fast way to get started with Gremlin Server.
-IMPORTANT: TinkerPop provides and supports this HTTP endpoint as a convenience and for legacy reasons, but users should
-prefer the recommended approach of bytcode based requests as described in <<connecting-gremlin,Connecting Gremlin>>
-section.
+Gremlin Server implements the link:https://tinkerpop.apache.org/docs/x.y.z/dev/provider/#_http_api[TinkerPop HTTP API].
+It provides a single endpoint which allows for the submission of a Gremlin script as a request. For each request, it
+returns a response containing the serialized results of that script.
-Gremlin Server provides for a single HTTP endpoint - a Gremlin evaluator - which allows the submission of a Gremlin
-script as a request. For each request, it returns a response containing the serialized results of that script.
-To enable this endpoint, Gremlin Server needs to be configured with the `HttpChannelizer`, which replaces the default.
-The `WsAndHttpChannelizer` may also be configured to enable both WebSockets and the REST endpoint in the configuration
-file:
-
-[source,yaml]
-channelizer: org.apache.tinkerpop.gremlin.server.channel.HttpChannelizer
-
-[source,yaml]
-channelizer: org.apache.tinkerpop.gremlin.server.channel.WsAndHttpChannelizer
-
-The `HttpChannelizer` is already configured in the `gremlin-server-rest-modern.yaml` file that is packaged with the Gremlin
+The `HttpChannelizer` is already configured in the `gremlin-server-modern.yaml` file that is packaged with the Gremlin
Server distribution. To utilize it, start Gremlin Server as follows:
[source,text]
-bin/gremlin-server.sh conf/gremlin-server-rest-modern.yaml
+bin/gremlin-server.sh conf/gremlin-server-modern.yaml
Once the server has started, issue a request. Here's an example with link:http://curl.haxx.se/[cURL]:
[source,text]
-$ curl "http://localhost:8182?gremlin=100-1"
-
-which returns:
-
-[source,js]
-{
- "result":{"data":99,"meta":{}},
- "requestId":"0581cdba-b152-45c4-80fa-3d36a6eecf1c",
- "status":{"code":200,"attributes":{},"message":""}
-}
-
-The above example showed a `GET` operation, but the preferred method for this endpoint is `POST`:
-
-[source,text]
curl -X POST -d "{\"gremlin\":\"100-1\"}" "http://localhost:8182"
-which returns:
+returns:
[source,js]
{
- "result":{"data":99,"meta":{}},
- "requestId":"ef2fe16c-441d-4e13-9ddb-3c7b5dfb10ba",
- "status":{"code":200,"attributes":{},"message":""}
+ "result": {
+ "data": {
+ "@type": "g:List",
+ "@value": [
+ {
+ "@type": "g:Int32",
+ "@value": 99
+ }
+ ]
+ }
+ },
+ "status": {
+ "code": 200
+ }
}
+`POST` is the only supported method for this endpoint. This means that `GET` with query parameters is not supported.
+
It is also preferred that Gremlin scripts be parameterized when possible via `bindings`:
[source,text]
@@ -913,6 +706,9 @@
types are preserved or to pass complex objects such as lists or maps, use `POST` which will at least support the
allowed JSON data types.
+NOTE: The Gremlin Server doesn't support link:https://en.wikipedia.org/wiki/HTTP_pipelining[HTTP pipelining]. Attempts
+to use this feature will cause the server to throw an error and may lead to results being sent out-of-order.
+
Passing the `Accept` header with a valid MIME type will trigger the server to return the result in a particular format.
Note that in addition to the formats available given the server's `serializers` configuration, there is also a basic
`text/plain` format which produces a text representation of results similar to the Gremlin Console:
@@ -937,11 +733,6 @@
By default this value is set to `gremlin-groovy`. If using a `GET` operation, this value can be set as a query
string argument with by setting the `language` key.
-WARNING: Consider the size of the result of a submitted script being returned from the HTTP endpoint. A script
-that iterates thousands of results will serialize each of those in memory into a single JSON result set. It is
-quite possible that such a script will generate `OutOfMemoryError` exceptions on the server. Consider the default
-WebSocket configuration, which supports streaming, if that type of use case is required.
-
[[server-configuring]]
=== Configuring
@@ -1000,9 +791,6 @@
WARNING: On Windows, gremlin-server.bat will always start in the foreground. When no parameter is provided, it will
start with the default `conf/gremlin-server.yaml` file.
-NOTE: The following configuration options may reference the `UnifiedChannelizer`. It was deprecated in 3.8.0 and will
-be removed in a future version.
-
The following table describes the various YAML configuration options that Gremlin Server expects:
[width="100%",cols="3,10,^2",options="header"]
@@ -1013,7 +801,7 @@
|authentication.config |A `Map` of configuration settings to be passed to the `Authenticator` when it is constructed. The settings available are dependent on the implementation. |_none_
|authorization.authorizer |The fully qualified classname of an `Authorizer` implementation to use. |_none_
|authorization.config |A `Map` of configuration settings to be passed to the `Authorizer` when it is constructed. The settings available are dependent on the implementation. |_none_
-|channelizer |The fully qualified classname of the `Channelizer` implementation to use. A `Channelizer` is a "channel initializer" which Gremlin Server uses to define the type of processing pipeline to use. By allowing different `Channelizer` implementations, Gremlin Server can support different communication protocols (e.g. WebSocket). |`WebSocketChannelizer`
+|channelizer |The fully qualified classname of the `Channelizer` implementation to use. A `Channelizer` is a "channel initializer" which Gremlin Server uses to define the type of processing pipeline to use. By allowing different `Channelizer` implementations, Gremlin Server can support different communication protocols (e.g. HTTP). |`HttpChannelizer`
|enableAuditLog |The `AuthenticationHandler`, `AuthorizationHandler` and processors can issue audit logging messages with the authenticated user, remote socket address and requests with a gremlin query. For privacy reasons, the default value of this setting is false. The audit logging messages are logged at the INFO level via the `audit.org.apache.tinkerpop.gremlin.server` logger, which can be configured using the `logback.xml` file. |_false_
|graphManager |The fully qualified classname of the `GraphManager` implementation to use. A `GraphManager` is a class that adheres to the TinkerPop `GraphManager` interface, allowing custom implementations for storing and managing graph references, as well as defining custom methods to open and close graphs instantiations. To prevent Gremlin Server from starting when all graphs fails, the `CheckedGraphManager` can be used.|`DefaultGraphManager`
|graphs |A `Map` of `Graph` configuration files where the key of the `Map` becomes the name to which the `Graph` will be bound and the value is the file name of a `Graph` configuration file. |_none_
@@ -1023,11 +811,10 @@
|keepAliveInterval |Time in milliseconds that the server will allow a channel to not send responses to a client before it sends a "ping" to see if it is still present. If it is present, the client should respond with a "pong" which will thus reset the `idleConnectionTimeout` and keep the channel open. If enabled, this number should be smaller than the value provided to the `idleConnectionTimeout`. Note that while this value is to be provided as milliseconds it will resolve to second precision. Set this value to `0` to disable this feature. |0
|maxAccumulationBufferComponents |Maximum number of request components that can be aggregated for a message. |1024
|maxChunkSize |The maximum length of the content or each chunk. If the content length exceeds this value, the transfer encoding of the decoded request will be converted to 'chunked' and the content will be split into multiple `HttpContent` objects. If the transfer encoding of the HTTP request is 'chunked' already, each chunk will be split into smaller chunks if the length of the chunk exceeds this value. |8192
-|maxContentLength |The maximum length of the aggregated content for a message. Works in concert with `maxChunkSize` where chunked requests are accumulated back into a single message. A request exceeding this size will return a `413 - Request Entity Too Large` status code. A response exceeding this size will raise an internal exception. |65536
+|maxRequestContentLength |The maximum length of the aggregated content for a request message. Works in concert with `maxChunkSize` where chunked requests are accumulated back into a single message. A request exceeding this size will return a `413 - Request Entity Too Large` status code. |10485760
|maxHeaderSize |The maximum length of all headers. |8192
|maxInitialLineLength |The maximum length of the initial line (e.g. "GET / HTTP/1.0") processed in a request, which essentially controls the maximum length of the submitted URI. |4096
-|maxParameters |The maximum number of parameters that can be passed on a request. Larger numbers may impact performance for scripts. This configuration only applies to the `UnifiedChannelizer`. |16
-|maxSessionTaskQueueSize |The maximum size that an individual session can queue requests before starting to reject them. This configuration only applies to the `UnifiedChannelizer`. |4096
+|maxParameters |The maximum number of parameters that can be passed on a request. Larger numbers may impact performance for scripts. This configuration only applies to the `HttpChannelizer`. |16
|maxWorkQueueSize |The maximum size the general processing queue can grow before the `gremlinPool` starts to reject requests. |8192
|metrics.consoleReporter.enabled |Turns on console reporting of metrics. |false
|metrics.consoleReporter.interval |Time in milliseconds between reports of metrics to console. |180000
@@ -1048,11 +835,8 @@
|metrics.slf4jReporter.enabled |Turns on SLF4j reporting of metrics. |false
|metrics.slf4jReporter.interval |Time in milliseconds between reports of metrics to SLF4j. |180000
|port |The port to bind the server to. |8182
-|processors |A `List` of `Map` settings, where each `Map` represents a `OpProcessor` implementation to use along with its configuration. |_none_
-|processors[X].className |The full class name of the `OpProcessor` implementation. |_none_
-|processors[X].config |A `Map` containing `OpProcessor` specific configurations. |_none_
|resultIterationBatchSize |Defines the size in which the result of a request is "batched" back to the client. In other words, if set to `1`, then a result that had ten items in it would get each result sent back individually. If set to `2` the same ten results would come back in five batches of two each. |64
-|scriptEngines |A `Map` of `ScriptEngine` implementations to expose through Gremlin Server, where the key is the name given by the `ScriptEngine` implementation. The key must match the name exactly for the `ScriptEngine` to be constructed. The value paired with this key is itself a `Map` of configuration for that `ScriptEngine`. If this value is not set, it will default to "gremlin-groovy". |_gremlin-groovy_
+|scriptEngines |A `Map` of `ScriptEngine` implementations to expose through Gremlin Server, where the key is the name given by the `ScriptEngine` implementation. The key must match the name exactly for the `ScriptEngine` to be constructed. The value paired with this key is itself a `Map` of configuration for that `ScriptEngine`. If this value is not set, it will default to "gremlin-lang". |_gremlin-lang_
|scriptEngines.<name>.imports |A comma separated list of classes/packages to make available to the `ScriptEngine`. |_none_
|scriptEngines.<name>.staticImports |A comma separated list of "static" imports to make available to the `ScriptEngine`. |_none_
|scriptEngines.<name>.scripts |A comma separated list of script files to execute on `ScriptEngine` initialization. `Graph` and `TraversalSource` instance references produced from scripts will be stored globally in Gremlin Server, therefore it is possible to use initialization scripts to add Traversal Strategies or create entirely new `Graph` instances all together. Instantiating a `LifeCycleHook` in a script provides a way to execute scripts when Gremlin Server starts and stops.|_none_
@@ -1061,7 +845,6 @@
|serializers |A `List` of `Map` settings, where each `Map` represents a `MessageSerializer` implementation to use along with its configuration. If this value is not set, then Gremlin Server will configure with GraphSON and GraphBinary but will not register any `ioRegistries` for configured graphs. |_empty_
|serializers[X].className |The full class name of the `MessageSerializer` implementation. |_none_
|serializers[X].config |A `Map` containing `MessageSerializer` specific configurations. |_none_
-|sessionLifetimeTimeout |The maximum time in milliseconds that a session can exist. This value cannot be extended beyond this value irrespective of the number of requests and their individual timeouts. The session life cannot be extended once started. This configuration only applies to the `UnifiedChannelizer`. |600000 (10 minutes)
|ssl.enabled |Determines if SSL is turned on or not. |false
|ssl.keyStore |The private key in JKS or PKCS#12 format. |_none_
|ssl.keyStorePassword |The password of the `keyStore` if it is password-protected. |_none_
@@ -1074,65 +857,13 @@
|strictTransactionManagement |Set to `true` to require `aliases` to be submitted on every requests, where the `aliases` become the scope of transaction management. |false
|threadPoolBoss |The number of threads available to Gremlin Server for accepting connections. Should always be set to `1`. |1
|threadPoolWorker |The number of threads available to Gremlin Server for processing non-blocking reads and writes. |1
-|useCommonEngineForSessions |Ensures that the same `ScriptEngine` is used to support sessions and sessionless requests which will lead to better performance. Do not change this setting from the default without a specific use case in mind. This configuration only applies to the `UnifiedChannelizer`. |true
|useEpollEventLoop |Try to use epoll event loops (works only on Linux os) instead of netty NIO. |false
-|useGlobalFunctionCacheForSessions |Enable the global function cache for sessions when using the `UnifiedChannelizer`. When `true` it means that functions created in one request to a session remain available on the next request to that session. This setting is only relevant when `useGlobalFunctionCacheForSessions` is `false`. |true
|writeBufferHighWaterMark | If the number of bytes in the network send buffer exceeds this value then the channel is no longer writeable, accepting no additional writes until buffer is drained and the `writeBufferLowWaterMark` is met. |65536
|writeBufferLowWaterMark | Once the number of bytes queued in the network send buffer exceeds the `writeBufferHighWaterMark`, the channel will not become writeable again until the buffer is drained and it drops below this value. |32768
|=========================================================
See the <<metrics,Metrics>> section for more information on how to configure Ganglia and Graphite.
-[[opprocessor-configurations]]
-==== OpProcessor Configurations
-
-IMPORTANT: The `UnifiedChannelizer` (deprecated in 3.8.0) does not rely on `OpProcessor` infrastructure. If using that
-channelizer, these configuration options can be ignored.
-
-An `OpProcessor` provides a way to plug-in handlers to Gremlin Server's processing flow. Gremlin Server uses this
-plug-in system itself to expose the packaged functionality that it exposes. Configurations can be supplied to an
-`OpProcessor` through the `processors` key in the Gremlin Server configuration file. Each `OpProcessor` can take a
-`Map` of arguments which are specific to a particular implementation:
-
-[source,yaml]
-----
-processors:
- - { className: org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: { sessionTimeout: 28800000 }}
-----
-
-The following sub-sections describe those configurations for each `OpProcessor` implementations supplied with Gremlin
-Server.
-
-===== SessionOpProcessor
-
-The `SessionOpProcessor` provides a way to interact with Gremlin Server over a <<sessions,session>>.
-
-[width="100%",cols="3,10,^2",options="header"]
-|=========================================================
-|Name |Description |Default
-|globalFunctionCacheEnabled |Determines if the script engine cache for global functions is enabled and behaves as an override to the plugin specific setting of the same name. |true
-|maxParameters |Maximum number of parameters that can be passed on the request. |16
-|perGraphCloseTimeout |Time in milliseconds to wait for each configured graph to close any open transactions when the session is killed. |10000
-|sessionTimeout |Time in milliseconds before a session will time out. |28800000
-|=========================================================
-
-===== StandardOpProcessor
-
-The `StandardOpProcessor` provides a way to interact with Gremlin Server without use of sessions and is the default
-method for processing script evaluation requests.
-
-[width="100%",cols="3,10,^2",options="header"]
-|=========================================================
-|Name |Description |Default
-|maxParameters |Maximum number of parameters that can be passed on the request. |16
-|=========================================================
-
-[[traversalopprocessor]]
-===== TraversalOpProcessor
-
-The `TraversalOpProcessor` provides a way to accept traversals configured via <<connecting-via-drivers,with()>>.
-It has no special configuration settings.
-
==== Serialization
Gremlin Server can accept requests and return results using different serialization formats. Serializers implement the
@@ -1169,12 +900,8 @@
[width="100%",cols="2,2,4,4",options="header"]
|=========================================================
|Version |Embedded Types |Mime Type |Class
-|1.0 |yes |`application/vnd.gremlin-v1.0+json` |`GraphSONMessageSerializerGremlinV1`
-|1.0 |no |`application/vnd.gremlin-v1.0+json;types=false` |`GraphSONUntypedMessageSerializerV1`
-|2.0 |yes |`application/vnd.gremlin-v2.0+json` |`GraphSONMessageSerializerV2`
-|2.0 |no |`application/vnd.gremlin-v2.0+json;types=false` |`GraphSONUntypedMessageSerializerV2`
-|3.0 |yes |`application/vnd.gremlin-v3.0+json` |`GraphSONMessageSerializerV3`
-|3.0 |no |`application/vnd.gremlin-v3.0+json;types=false` |`GraphSONMessageSerializerV3`
+|4.0 |yes |`application/vnd.gremlin-v4.0+json` |`GraphSONMessageSerializerV4`
+|4.0 |no |`application/vnd.gremlin-v4.0+json;types=false` |`GraphSONMessageSerializerV4`
|=========================================================
The above serializer classes can be found in the `org.apache.tinkerpop.gremlin.util.ser` package of `gremlin-util`.
@@ -1190,10 +917,10 @@
[source,yaml]
----
- - { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3 }
+ - { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV4 }
----
-Gremlin Server is configured by default with GraphSON 3.0 as shown above. It has the following configuration option:
+Gremlin Server is configured by default with GraphSON 4.0 as shown above. It has the following configuration option:
[width="100%",cols="3,10,^2",options="header"]
|=========================================================
@@ -1201,23 +928,11 @@
|ioRegistries |A list of `IoRegistry` implementations to be applied to the serializer. |_none_
|=========================================================
-It is worth noting that GraphSON 1.0 still has some appeal for some users as it can be configured to produce an untyped
-JSON format which is a bit easier to consume than its successors which embed data types into the output. This version
-of GraphSON tends to be the one that users like to utilize when <<connecting-via-http,connecting via HTTP>> and is still
-used by some <<connecting-rgp, Remote Gremlin Providers>> for this purpose.
+It is possible for two serializers to bind to the same mime type such as `application/json`. When such conflicts arise,
+Gremlin Server will use the order of the serializers to determine priority such that the first serializer to bind to a
+type will be used and the others ignored. The following log message will indicate how the server is ultimately configured:
-To configure Gremlin Server this way, the `GraphSONMessageSerializerV1d0` must be included:
-
-[source,yaml]
-----
- - { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV1 }
- - { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3 }
-----
-
-In the above situation, both `GraphSONMessageSerializerV1d0` and `GraphSONMessageSerializerV3d0` each bind to the
-`application/json` mime type. When such conflicts arise, Gremlin Server will use the order of the serializers to
-determine priority such that the first serializer to bind to a type will be used and the others ignored. The following
-log message will indicate how the server is ultimately configured:
+NOTE: The below examples use GraphSON 1.0 and GraphSON 3.0 for example purposes, however, they are no longer available.
[source,text]
----
@@ -1244,20 +959,18 @@
format itself is described in the link:https://tinkerpop.apache.org/docs/x.y.z/dev/io/#graphbinary[IO Documentation].
[source,yaml]
- - { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1 }
+ - { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV4 }
-It has the MIME type of `application/vnd.graphbinary-v1.0` and the following configuration options:
+It has the MIME type of `application/vnd.graphbinary-v4.0` and the following configuration options:
[width="100%",cols="3,10,^2",options="header"]
|=========================================================
|Key |Description |Default
-|custom |A list of classes with custom kryo `Serializer` implementations related to them in the form of `<class>;<serializer-class>`. |_none_
|ioRegistries |A list of `IoRegistry` implementations to be applied to the serializer. |_none_
|builder |Name of the `TypeSerializerRegistry.Builder` instance to be used to construct the `TypeSerializerRegistry`. |_none_
|=========================================================
-As described above, there are multiple ways in which to register serializers for GraphBinary-based serialization. Note
-that the `ioRegistries` setting is applied first, followed by the `custom` setting.
+As described above, there are multiple ways in which to register serializers for GraphBinary-based serialization.
[[metrics]]
==== Metrics
@@ -1296,10 +1009,9 @@
the `writeBufferHighWaterMark` configuration is exceeded, with mean rate, as well as the 1, 5, and 15-minute rates.
* `engine-name.session.session-id.*` - Metrics related to different `GremlinScriptEngine` instances configured for
session-based requests where "engine-name" will be the actual name of the engine, such as "gremlin-groovy" and
-"session-id" will be the identifier for the session itself. This metric is not measured under the `UnifiedChannelizer`.
+"session-id" will be the identifier for the session itself.
* `engine-name.sessionless.*` - Metrics related to different `GremlinScriptEngine` instances configured for sessionless
-requests where "engine-name" will be the actual name of the engine, such as "gremlin-groovy". This metric is not
-measured under the `UnifiedChannelizer`.
+requests where "engine-name" will be the actual name of the engine, such as "gremlin-groovy".
* `errors` - The number of total errors, mean rate, as well as the 1, 5, and 15-minute error rates.
* `op.eval` - The number of script evaluations, mean rate, 1, 5, and 15 minute rates, minimum, maximum, median, mean,
and standard deviation evaluation times, as well as the 75th, 95th, 98th, 99th and 99.9th percentile evaluation times
@@ -1307,9 +1019,7 @@
* `op.traversal` - The number of `Traversal` bytecode-based executions, mean rate, 1, 5, and 15 minute rates, minimum,
maximum, median, mean, and standard deviation evaluation times, as well as the 75th, 95th, 98th, 99th and 99.9th
percentile evaluation times.
-* `sessions` - The number of sessions open at the time the metric was last measured. For the `UnifiedChannelizer`, each
-request creates a "session", even a so-called "sessionless request", which is basically a session that will only
-execute within the context of that single request.
+* `sessions` - The number of sessions open at the time the metric was last measured.
* `user-agent.*` - Counts the number of connection requests from clients providing a given user agent.
NOTE: Gremlin Server has a limit of 10000 unique user agents to be tracked by metrics. If this cap is exceeded
@@ -1378,36 +1088,16 @@
chosen. Script execution options are covered <<script-execution, "at the end of this section">>. This section
starts with authentication.
-Gremlin Server supports a pluggable authentication framework using
-link:https://en.wikipedia.org/wiki/Simple_Authentication_and_Security_Layer[SASL] (Simple Authentication and
-Security Layer). Depending on the client used to connect to Gremlin Server, different authentication
-mechanisms are accessible, see the table below.
-
-[width="70%",cols="3,5,3",options="header"]
-|=========================================================
-|Client |Authentication mechanism |Availability
-|HTTP |BASIC |3.0.0-incubating
-1.3+v|Gremlin-Java/
-Gremlin-Console |PLAIN SASL (username/password) |3.0.0-incubating
-|Pluggable SASL |3.0.0-incubating
-|GSSAPI SASL (Kerberos) |3.3.0
-|Gremlin.NET |PLAIN SASL |3.3.0
-1.2+v|Gremlin-Python |PLAIN SASL |3.2.2
-|GSSAPI SASL (Kerberos) |3.4.7
-|Gremlin.Net |PLAIN SASL |3.2.7
-|Gremlin-Javascript |PLAIN SASL |3.3.0
-|Gremlin-go |PLAIN SASL |3.5.4
-|=========================================================
+By default, Gremlin Server supports HTTP basic authentication.
By default, Gremlin Server is configured to allow all requests to be processed (i.e. no authentication). To enable
authentication, Gremlin Server must be configured with an `Authenticator` implementation in its YAML file. Gremlin
-Server comes packaged with two implementations called `SimpleAuthenticator` for plain text authentication using HTTP
-BASIC or PLAIN SASL and `Krb5Authenticator` for Kerberos authentication using GSSAPI SASL.
+Server comes packaged with an implementation called `SimpleAuthenticator` for plain text authentication using HTTP
+BASIC.
==== Plain text authentication
-The `SimpleAuthenticator` implements the "PLAIN" SASL mechanism (i.e. plain text) to authenticate a request. It also
-supports handling basic authentication requests from http clients. It validates
+The `SimpleAuthenticator` supports handling basic authentication requests from http clients. It validates
username/password pairs against a graph database, which must be provided to it as part of the configuration.
[source,yaml]
@@ -1465,7 +1155,7 @@
[INFO] GremlinServer -
\,,,/
(o o)
------oOOo-(3)-oOOo-----
+-----oOOo-(4)-oOOo-----
[INFO] GremlinServer - Configuring Gremlin Server from conf/gremlin-server-secure.yaml
...
@@ -1498,7 +1188,7 @@
[INFO] GremlinServer -
\,,,/
(o o)
------oOOo-(3)-oOOo-----
+-----oOOo-(4)-oOOo-----
[INFO] GremlinServer - Configuring Gremlin Server from conf/gremlin-server-secure.yaml
...
@@ -1559,59 +1249,6 @@
TinkerGraph to persist that data or to manually persist it (e.g. write the graph data to Gryo) once changes are
complete. Alternatively, use a persistent graph to hold the credentials and configure Gremlin Server accordingly.
-[[krb5authenticator]]
-==== Kerberos Authentication
-
-The `Krb5Authenticator` implements the "GSSAPI" SASL mechanism (i.e. Kerberos) to authenticate a request from a Gremlin
-client. It can be applied in an existing Kerberos environment and validates whether a
-link:https://www.roguelynn.com/words/explain-like-im-5-kerberos/[valid authentication proof and service ticket are
-offered].
-
-[source,yaml]
-authentication: {
- authenticator: org.apache.tinkerpop.gremlin.server.auth.Krb5Authenticator,
- config: {
- principal: gremlinserver/hostname.your.org@YOUR.REALM,
- keytab: /etc/security/keytabs/gremlinserver.service.keytab}}
-
-`Krb5Authenticator` needs a Kerberos service principal and a keytab that holds the secret key for that principal. The keytab
-location and service name, e.g. gremlinserver, are free to be chosen. `Krb5Authenticator` finds the KDC's hostname and
-port from the krb5.conf file with Kerberos configurations. This file can reside at either the
-https://web.mit.edu/kerberos/krb5-devel/doc/mitK5defaults.html[default location] or a location to be specified as a
-system property in the JAVA_OPTIONS environment variable of Gremlin Server:
-
-[source, bash]
-export JAVA_OPTIONS="${JAVA_OPTIONS} -Xms512m -Xmx4096m -Djava.security.krb5.conf=/etc/krb5.conf"
-
-Gremlin clients have to specify the service name as the `protocol` connection parameter. For Gremlin-Console the
-`protocol` is an entry in the remote.yaml file, for Gremlin-java the client builder has a `protocol()` method.
-
-In addition to the `protocol`, the Gremlin client needs to specify a `jaasEntry`, an entry in the
-link:https://en.wikipedia.org/wiki/Java_Authentication_and_Authorization_Service[JAAS] configuration file. As a
-start one can define a conf/gremlin-jaas.conf file with a `GremlinConsole` jaasEntry:
-
-[source, jaas]
-GremlinConsole {
- com.sun.security.auth.module.Krb5LoginModule required
- doNotPrompt=true
- useTicketCache=true;
-};
-
-This configuration tells Gremlin Console to pass authentication requests from Gremlin Server to the Krb5LoginModule, which is
-part of the java standard library. The Krb5LoginModule does not prompt the user for a username and password but uses the
-ticket cache that is normally refreshed when a user logs in to a host within the Kerberos realm.
-
-The Gremlin client needs the location of the JAAS configuration file to be passed as a system property to the JVM. For
-Gremlin-Console the easiest way to do this is to pass it to the run script via the JAVA_OPTIONS environment property.
-If the krb5.conf Kerberos configuration file is not available from the
-https://web.mit.edu/kerberos/krb5-devel/doc/mitK5defaults.html[default location] it has to be provided as a system
-property as well:
-
-[source, bash]
-JAAS_OPTION="-Djava.security.auth.login.config=conf/gremlin-jaas.conf"
-KRB5_OPTION="-Djava.security.krb5.conf=/etc/krb5.conf"
-export JAVA_OPTIONS="${JAVA_OPTIONS} ${KRB5_OPTION} ${JAAS_OPTION}"
-
[[authorization]]
==== Authorization
@@ -1665,6 +1302,8 @@
execution of `GraphFactory.open()` or `GraphTraversalSource.getGraph()` methods without resorting to TinkerPop
implementation details (that is, internal API's that can change without notice).
+IMPORTANT: 4.0.0-beta.1 Release - These authorization mechanisms don't currently apply due to the removal of Bytecode.
+
The three mechanisms for authorization each have their merits in terms of simplicity and flexibility. The table below
gives an overview.
@@ -1696,8 +1335,8 @@
execution time as a result of an applied `Strategy` (denoted as 'hybrid' bytecode analysis in the table). A code
example pursuing the former option is provided in the <<authz-code-example, next section>>.
-NOTE: Both the passive and active authorization solutions need to analyze the gremlin bytecode of the original request
-for unwanted removal of restricting Strategies.
+IMPORTANT: 4.0.0-beta.1 Release - passive and active authorization mechanisms are not supported in this beta
+because bytecode has been replaced with GremlinLang.
NOTE: Gremlin Server is not shipped with `Authorizer` implementations, because these would heavily depend on the external
systems to integrate with, e.g. link:https://ldap.com/directory-servers/[LDAP systems] or
@@ -1744,7 +1383,6 @@
import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SubgraphStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ReadOnlyStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.util.BytecodeHelper;
import org.apache.tinkerpop.gremlin.server.Settings.AuthorizationSettings;
import org.apache.tinkerpop.gremlin.server.auth.AuthenticatedUser;
@@ -1992,10 +1630,10 @@
continuously:
[source,groovy]
-gremlin> :remote connect tinkerpop.server conf/remote.yaml
-==>Configured localhost/127.0.0.1:8182
-gremlin> :> while(true) { }
-==>Evaluation exceeded the configured 'evaluationTimeout' threshold of 30000 ms or evaluation was otherwise cancelled directly for request [while(true) {}]
+client = Cluster.build("localhost").port(8182).create().connect()
+==>org.apache.tinkerpop.gremlin.driver.Client$ClusteredClient@42ff9a77
+client.submit("while(true) { }")
+org.apache.tinkerpop.gremlin.driver.exception.ResponseException: A timeout occurred during traversal evaluation of [RequestMessage{, fields={bindings={}, language=gremlin-groovy, batchSize=64}, gremlin=while(true) { }}] - consider increasing the limit given to evaluationTimeout
The `GroovyCompilerGremlinPlugin` has a number of configuration options:
@@ -2163,12 +1801,6 @@
tend to optimize sessions to be long-lived. For short-lived sessions, which may be typical when using bytecode based
remote transactions, quickly creating and destroying these sessions can be expensive. It is likely that there will be
increased garbage collection times and frequency as well as a general increase in overall server processing.
-** `UnifiedChannelizer` - The threads of the `gremlinPool` are used to service both sessions and sessionless requests.
-With a common thread pool, this channelizer is a better choice when using lots of short-lived sessions as compared to
-`WebSocketChannelizer` and `WsAndHttpChannelizer`, because there is less cost in starting and stopping sessions. It is
-important though to understand the expected workload for the server and plan the size accordingly to ensure that the
-server does not need to wait for an extended period of time for a thread to be available to process the queue of
-incoming requests.
* Graph element serialization for `Vertex` and `Edge` can be expensive, as their data structures are complex given the
possible existence of multi-properties and meta-properties. When returning data from Gremlin Server only return the
data that is required. For example, if only two properties of a `Vertex` are needed then simply return the two rather
@@ -2208,7 +1840,7 @@
[[parameterized-scripts]]
==== Parameterized Scripts
-image:gremlin-parameterized.png[width=150,float=left] If using the standard `GremlinGroovyScriptEngine` in Gremlin
+image:gremlin-parameterized.png[width=150,float=left] If using `GremlinGroovyScriptEngine` in Gremlin
Server, it is imperative to use script parameterization. Period. There are at least two good
reasons for doing so: script caching and protection from "Gremlin injection" (conceptually the same as the notion of
SQL injection).
@@ -2219,7 +1851,7 @@
concerns of this section. When considering parameterization, users should also consider the graph database they are
using to determine if it has native mechanisms that preclude the need for parameterization.
-With respect to caching, Gremlin Server caches all scripts that are passed to it. The cache is keyed based on the a
+With respect to caching, Gremlin Server caches all scripts that are passed to it. The cache is keyed based on the
hash of the script. Therefore `g.V(1)` and `g.V(2)` will be recognized as two separate scripts in the cache. If that
script is parameterized to `g.V(x)` where `x` is passed as a parameter from the client, there will be no additional
compilation cost for future requests on that script. Compilation of a script should be considered "expensive" and
@@ -2272,21 +1904,14 @@
client.submit(query, params);
----
-Gremlin injection should not be possible with `Bytecode` based traversals - only scripts - because `Bytecode`
-traversals will treat all arguments as literal values. There is potential for concern if lambda based steps are
-utilized as they execute arbitrary code, which is string based, but configuring `TraversalSource` instances with
-`LambdaRestrictionStrategy`, which prevents lambdas all together, using a graph that does not allow lambdas at all, or
-configuring appropriate <<script-execution,sandbox options>> in Gremlin Server (or such options available to the graph
-database in use) should each help mitigate problems related to this issue.
-
-Scripts create classes which get loaded to the JVM metaspace and to a `Class` cache. For those using script
+Groovy scripts create classes which get loaded to the JVM metaspace and to a `Class` cache. For those using script
parameterization, a typical application should not generate an overabundance of pressure on these two components of
Gremlin Server's memory footprint. On the other hand, it's not too hard to imagine a situation where problems might
emerge:
* An application use case makes parameterization impossible and therefore all scripts are unique.
* There is a bug in an applications parameterization code that is actually instead producing unique scripts.
-* A long running Gremln Server takes lots of non-parameterized scripts from Gremlin Console or similar tools.
+* A long running Gremlin Server takes lots of non-parameterized scripts from Gremlin Console or similar tools.
In these sorts of cases, Gremlin Server's performance can be affected adversely as without some additional configuration
the metaspace will grow indefinitely (possibly along with the general heap) triggering longer and more frequent rounds
@@ -2298,7 +1923,7 @@
Perhaps the more important guards are related to the JVM metaspace. Start by setting the initial size of this space
with `-XX:MetaspaceSize`. When this value is exceeded it will trigger a GC round - it is essentially a threshold for
-GC. The grow of this value can be capped with `-XX:MaxMetaspaceSize` (this value is unlimited by default). In an ideal
+GC. The growth of this value can be capped with `-XX:MaxMetaspaceSize` (this value is unlimited by default). In an ideal
situation (i.e. parameterization), the `-XX:MetaspaceSize` should have a large enough setting so as to avoid early GC
rounds for metaspace, but outside of an ideal world (i.e. non-parameterization) it may not be smart to make this number
too large. Making the setting too large (and thus the `-XX:MaxMetaspaceSize` even larger) may trigger longer GC rounds
@@ -2321,9 +1946,6 @@
trends is likely the best way to understand how a particular workload is affecting the metaspace and its relation to
GC. Getting these settings "right" however will help ensure much more predictable Gremlin Server operations.
-IMPORTANT: A lambda used in a bytecode-based request will be treated as a script, so issues related to raw script-based
-requests apply equally well to lambda-bytecode requests.
-
==== Properties of Elements
It was mentioned above at the start of this "Best Practices" section that serialization of graph elements (i.e.
@@ -2331,10 +1953,10 @@
by the requesting system. This point begs for further clarification as there are a number of ways to use and configure
Gremlin Server which might influence its interpretation.
-To begin to discuss these nuances, first consider the method of making requests to Gremlin Server: script or bytecode.
+To begin to discuss these nuances, first consider the method of making requests to Gremlin Server: script or traversal.
For scripts, that will mean that users are sending string representation of Gremlin to the server directly through a
-driver over websockets or through the HTTP. For bytecode, users will be utilize a <<gremlin-drivers-variants, Gremlin GLV>>
-which will construct bytecode for them and submit the request to the server upon iteration of their traversal.
+driver or over HTTP. For bytecode, users will be utilize a <<gremlin-drivers-variants, Gremlin GLV>> which will
+construct bytecode for them and submit the request to the server upon iteration of their traversal.
In either case, it is important to also consider the method of "detachment". Detachment refers to the manner in which
a graph element is disconnected from the graph for purpose of serialization. Depending on the case and configuration,
@@ -2438,9 +2060,9 @@
If Gremlin Server processes a large number of unique scripts, the global function cache will grow beyond the memory
available to Gremlin Server and an `OutOfMemoryError` will loom. Script parameterization goes a long way to solving
this problem and running out of memory should not be an issue for those cases. If it is a problem or if there is no
-script parameterization due to a given use case (perhaps using with use of <<sessions,sessions>>), it is possible to
-better control the nature of the global function cache from the client side, by issuing scripts with a parameter to
-help define how the garbage collector should treat the references.
+script parameterization due to a given use case, it is possible to better control the nature of the global function
+cache from the client side, by issuing scripts with a parameter to help define how the garbage collector should treat
+the references.
The parameter is called `#jsr223.groovy.engine.keep.globals` and has four options:
@@ -2485,101 +2107,6 @@
manner as memory gets low. For production systems, it is likely that a more predictable strategy be taken as shown
above with the use of the `maximumSize`.
-[[sessions]]
-==== Considering Sessions
-
-The preferred approach for issuing script-based requests to Gremlin Server is to do so in a sessionless manner. The
-concept of "sessionless" refers to a request that is completely encapsulated within a single transaction, such that
-the script in the request starts with a new transaction and ends with a closed transaction. Sessionless requests have
-automatic transaction management handled by Gremlin Server, thus automatically opening and closing transactions as
-previously described. The downside to the sessionless approach is that the entire script to be executed must be known
-at the time of submission so that it can all be executed at once. This requirement makes it difficult for some use
-cases where more control over the transaction is desired.
-
-For such use cases, Gremlin Server supports sessions. With sessions, the user is in complete control of the start
-and end of the transaction. This feature comes with some additional expense to consider:
-
-* Initialization scripts will be executed for each session created so any expense related to them will be established
-each time a session is constructed.
-* There will be one script cache per session, which obviously increases memory requirements. The cache is not shared,
-so as to ensure that a session has isolation from other session environments. As a result, if the same script is
-executed in each session the same compilation cost will be paid for each session it is executed in.
-* Each session will require its own thread pool with a single thread in it - this ensures that transactional
-boundaries are managed properly from one request to the next.
-* If there are multiple Gremlin Server instances, communication from the client to the server must be bound to the
-server that the session was initialized in. Gremlin Server does not share session state as the transactional context
-of a `Graph` is bound to the thread it was initialized in.
-
-To connect to a session with Java via the `gremlin-driver`, it is necessary to create a `SessionedClient` from the
-`Cluster` object:
-
-[source,java]
-----
-Cluster cluster = Cluster.open(); <1>
-Client client = cluster.connect("sessionName"); <2>
-----
-
-<1> Opens a reference to `localhost` as <<gremlin-java,previously shown>>.
-<2> Creates a `SessionedClient` given the configuration options of the Cluster. The `connect()` method is given a
-`String` value that becomes the unique name of the session. It is often best to simply use a `UUID` to represent
-the session.
-
-It is also possible to have Gremlin Server manage the transactions as is done with sessionless requests. The user is
-in control of enabling this feature when creating the `SessionedClient`:
-
-[source,java]
-----
-Cluster cluster = Cluster.open();
-Client client = cluster.connect("sessionName", true);
-----
-
-Specifying `true` to the `connect()` method signifies that the `client` should make each request as one encapsulated
-in a transaction. With this configuration of `client` there is no need to close a transaction manually.
-
-When using this mode of the `SessionedClient` it is important to recognize that global variable state for the session
-is not rolled-back on failure depending on where the failure occurs. For example, sending the following script would
-create a variable "x" in global session scope that would be accessible on the next request:
-
-[source,groovy]
-x = 1
-
-However, sending this script which explicitly throws an exception:
-
-[source,groovy]
-y = 2
-throw new RuntimeException()
-
-will result in an obvious failure during script evaluation and "y" will not be available to the next request. The
-complication arises where the script evaluates successfully, but fails during result iteration or serialization. For
-example, this script:
-
-[source,groovy]
-a = 1
-g.addV()
-
-would successfully evaluate and return a `Traversal`. The variable "a" would be available on the next request. However,
-if there was a failure in transaction management on the call to `commit()`, "a" would still be available to the next
-request.
-
-To avoid unexpected problems with state in relation to errors in sessions, it is best to follow these guidelines:
-
-* Do not re-use session identifiers. Simply use a new UUID for each session.
-* On exception, be sure to call `close()` on the `Client` and create a new session.
-* While you may submit parallel asynchronous requests to a session, it may not make sense to do so because they are
-simply executed serially as they arrive to the session. A failed asynchronous request could leave an invalid state
-in the session which may not allow later requests to succeed. Either use synchronous requests only or carefully
-consider error conditions with asynchronous requests.
-
-[source,java]
-----
-Client.SessionSettings settings =
- Client.SessionSettings.build().maintainStateAfterException(true).create();
-Client session = cluster.connect(Client.Settings.build().useSession(settings).create());
-----
-
-A session is a "heavier" approach to the simple "request/response" approach of sessionless requests, but is sometimes
-necessary for a given use case.
-
[[considering-transactions]]
==== Considering Transactions
@@ -2598,65 +2125,6 @@
Gremlin Server will only close transactions on the graphs specified by the `aliases`. Keeping this setting `false`,
will simply have Gremlin Server close transactions on all graphs for every request.
-[[considering-state]]
-==== Considering State
-
-With HTTP and any sessionless requests, there is no variable state maintained between requests. Therefore,
-when <<connecting-via-console,connecting with the console>>, for example, it is not possible to create a variable in
-one command and then expect to access it in the next:
-
-[source,groovy]
-----
-gremlin> :remote connect tinkerpop.server conf/remote.yaml
-==>Configured localhost/127.0.0.1:8182
-gremlin> :> x = 2
-==>2
-gremlin> :> 2 + x
-No such property: x for class: Script4
-Display stack trace? [yN] n
-----
-
-The same behavior would be seen with HTTP or when using sessionless requests through one of the Gremlin Server drivers.
-If having this behavior is desireable, then <<sessions,consider sessions>>.
-
-There is an exception to this notion of state not existing between requests and that is globally defined functions.
-All functions created via scripts are global to the server.
-
-[source,groovy]
-----
-gremlin> :> def subtractIt(int x, int y) { x - y }
-==>null
-gremlin> :> subtractIt(8,7)
-==>1
-----
-
-If this behavior is not desirable there are several options. A first option would be to consider using sessions. Each
-session gets its own `ScriptEngine`, which maintains its own isolated cache of global functions, whereas sessionless
-requests uses a single function cache. A second option would be to define functions as closures:
-
-[source,groovy]
-----
-gremlin> :> multiplyIt = { int x, int y -> x * y }
-==>Script7$_run_closure1@6b24f3ab
-gremlin> :> multiplyIt(7, 8)
-No signature of method: org.apache.tinkerpop.gremlin.groovy.jsr223.GremlinGroovyScriptEngine.multiplyIt() is applicable for argument types: (java.lang.Integer, java.lang.Integer) values: [7, 8]
-Display stack trace? [yN]
-----
-
-When the function is declared this way, the function is viewed by the `ScriptEngine` as a variable rather than a global
-function and since sessionless requests don't maintain state, the function is forgotten for the next request. A final
-option would be to manage the `ScriptEngine` cache manually:
-
-[source,bourne]
-----
-$ curl -X POST -d "{\"gremlin\":\"def divideIt(int x, int y){ x / y }\",\"bindings\":{\"#jsr223.groovy.engine.keep.globals\":\"phantom\"}}" "http://localhost:8182"
-{"requestId":"97fe1467-a943-45ea-8fd6-9e889a6c9381","status":{"message":"","code":200,"attributes":{}},"result":{"data":[null],"meta":{}}}
-$ curl -X POST -d "{\"gremlin\":\"divideIt(8, 2)\"}" "http://localhost:8182"
-{"message":"Error encountered evaluating script: divideIt(8, 2)"}
-----
-
-In the above HTTP-based requests, the bindings contain a special parameter that tells the `ScriptEngine` cache to
-immediately forget the script after execution. In this way, the function does not end up being globally available.
[[request-retry]]
==== Request Retry
@@ -2677,7 +2145,7 @@
[INFO] GremlinServer -
\,,,/
(o o)
------oOOo-(3)-oOOo-----
+-----oOOo-(4)-oOOo-----
[INFO] GremlinServer - Configuring Gremlin Server from conf/gremlin-server.yaml
...
@@ -2724,147 +2192,6 @@
This plugin imports the appropriate classes for managing the credentials graph.
-[[gephi-plugin]]
-=== Gephi Plugin
-
-image:gephi-logo.png[width=200, float=left] link:http://gephi.org/[Gephi] is an interactive visualization,
-exploration, and analysis platform for graphs. The link:https://gephi.org/plugins/#/plugin/graphstreaming[Graph Streaming]
-plugin for Gephi provides an API that can be leveraged to stream graph data to a running Gephi application. The Gephi
-plugin for Gremlin Console utilizes this API to allow for graph and traversal visualization.
-
-IMPORTANT: These instructions have been tested with Gephi 0.9.2 and Graph Streaming plugin 1.0.3.
-
-The following instructions assume that Gephi has been download and installed. It further assumes that the Graph
-Streaming plugin has been installed (`Tools > Plugins`). The following instructions explain how to visualize a
-`Graph` and `Traversal`.
-
-In Gephi, create a new project with `File > New Project`. In the lower left view, click the "Streaming" tab, open the
-Master drop down, and right click `Master Server > Start` which starts the Graph Streaming server in Gephi and by
-default accepts requests at `http://localhost:8080/workspace1`:
-
-image::gephi-start-server.png[width=800]
-
-IMPORTANT: The Gephi Streaming Plugin doesn't detect port conflicts and will appear to start the plugin successfully
-even if there is something already active on that port it wants to connect to (which is 8080 by default). Be sure
-that there is nothing running on the port before Gephi will be using before starting the plugin. Failing to do
-this produce behavior where the console will appear to submit requests to Gephi successfully but nothing will
-render.
-
-WARNING: Do not skip the `File > New Project` step as it may prevent a newly started Gephi application from fully
-enabling the streaming tab.
-
-Start the xref:gremlin-console[Gremlin Console] and activate the Gephi plugin:
-
-[gremlin-groovy]
-----
-:plugin use tinkerpop.gephi
-graph = TinkerFactory.createModern()
-:remote connect tinkerpop.gephi
-:> graph
-----
-
-The above Gremlin session activates the Gephi plugin, creates the "modern" `TinkerGraph`, uses the `:remote` command
-to setup a connection to the Graph Streaming server in Gephi (with default parameters that will be explained below),
-and then uses `:submit` which sends the vertices and edges of the graph to the Gephi Streaming Server. The resulting
-graph appears in Gephi as displayed in the left image below.
-
-image::gephi-graph-submit.png[width=800]
-
-NOTE: Issuing `:> graph` again will clear the Gephi workspace and then re-write the graph. To manually empty the
-workspace do `:> clear`.
-
-Now that the graph is visualized in Gephi, it is possible to link:https://gephi.github.io/users/tutorial-layouts/[apply a layout algorithm],
-change the size and/or color of vertices and edges, and display labels/properties of interest. Further information
-can be found in Gephi's tutorial on link:https://gephi.github.io/users/tutorial-visualization/[Visualization].
-After applying the Fruchterman Reingold layout, increasing the node size, decreasing the edge scale, and displaying
-the id, name, and weight attributes the graph looks as displayed in the right image above.
-
-Visualization of a `Traversal` has a different approach as the visualization occurs as the `Traversal` is executing,
-thus showing a real-time view of its execution. A `Traversal` must be "configured" to operate in this format and for
-that it requires use of the `visualTraversal` option on the `config` function of the `:remote` command:
-
-[gremlin-groovy,modern]
-----
-:remote config visualTraversal graph <1>
-traversal = vg.V(2).in().out('knows').
- has('age',gt(30)).outE('created').
- has('weight',gt(0.5d)).inV();[] <2>
-:> traversal <3>
-----
-
-<1> Configure a "visual traversal" from your "graph" - this must be a `Graph` instance. This command will create a
-new `TraversalSource` called "vg" that must be used to visualize any spawned traversals in Gephi.
-<2> Define the traversal to be visualized. Note that ending the line with `;[]` simply prevents iteration of
-the traversal before it is submitted.
-<3> Submit the `Traversal` to visualize to Gephi.
-
-When the `:>` line is called, each step of the `Traversal` that produces or filters vertices generates events to
-Gephi. The events update the color and size of the vertices at that step with `startRGBColor` and `startSize`
-respectively. After the first step visualization, it sleeps for the configured `stepDelay` in milliseconds. On the
-second step, it decays the configured `colorToFade` of all the previously visited vertices in prior steps, by
-multiplying the current `colorToFade` value for each vertex with the `colorFadeRate`. Setting the `colorFadeRate`
-value to `1.0` will prevent the color decay. The screenshots below show how the visualization evolves over the four
-steps:
-
-image::gephi-traversal.png[width=1200]
-
-To get a sense of how the visualization configuration parameters affect the output, see the example below:
-
-[gremlin-groovy,modern]
-----
-:remote config startRGBColor [0.0,0.3,1.0]
-:remote config colorToFade b
-:remote config colorFadeRate 0.5
-:> traversal
-----
-
-image::gephi-traversal-config.png[width=400]
-
-The visualization configuration above starts with a blue color now (most recently visited), fading the blue color
-(so that dark green remains on oldest visited), and fading the blue color more quickly so that the gradient from dark
-green to blue across steps has higher contrast. The following table provides a more detailed description of the
-Gephi plugin configuration parameters as accepted via the `:remote config` command:
-
-[width="100%",cols="3,10,^2",options="header"]
-|=========================================================
-|Parameter |Description |Default
-|workspace |The name of the workspace that your Graph Streaming server is started for. |workspace1
-|host |The host URL where the Graph Streaming server is configured for. |localhost
-|port |The port number of the URL that the Graph Streaming server is listening on. |8080
-|sizeDecrementRate |The rate at which the size of an element decreases on each step of the visualization. |0.33
-|stepDelay |The amount of time in milliseconds to pause between step visualizations. |1000
-|startRGBColor |A size 3 float array of RGB color values which define the starting color to update most recently visited nodes with. |[0.0,1.0,0.5]
-|startSize |The size an element should be when it is most recently visited. |20
-|colorToFade |A single char from the set `{r,g,b,R,G,B}` determining which color to fade for vertices visited in prior steps |g
-|colorFadeRate |A float value in the range `(0.0,1.0]` which is multiplied against the current `colorToFade` value for prior vertices; a `1.0` value effectively turns off the color fading of prior step visited vertices |0.7
-|visualTraversal |Creates a `TraversalSource` variable in the Console named `vg` which can be used for visualizing traversals. This configuration option takes two parameters. The first is required and is the name of the `Graph` instance variable that will generate the `TraversalSource`. The second parameter is the variable name that the `TraversalSource` should have when referenced in the Console. If left unspecified, this value defaults to `vg`. |vg
-|=========================================================
-
-NOTE: This plugin is typically only useful to the Gremlin Console and is enabled in the there by default.
-
-The instructions above assume that the `Graph` instance being visualized is local to the Gremlin Console. It makes that
-assumption because the Gephi plugin requires a locally held `Graph`. If the intent is to visualize a `Graph` instance
-hosted in Gremlin Server or a TinkerPop-enabled graph that can only be connected to in a "remote" fashion, then it
-is still possible to use the Gephi plugin, but the requirement for a locally held `Graph` remains the same. To use
-the Gephi plugin in these situations simply use <<subgraph-step,subgraph()-step>> to extract the portion of the remote
-graph that will be visualized. Use of that step will return a `TinkerGraph` instance to the Gremlin Console at which
-point it can be used locally with the Gephi plugin. The following example demonstrates the general steps:
-
-[source,text]
-----
-gremlin> :remote connect tinkerpop.server conf/remote-objects.yaml <1>
-...
-gremlin> :> g.E().hasLabel('knows').subgraph('subGraph').cap('subGraph') <2>
-...
-gremlin> graph = result[0].object <3>
-...
-----
-
-<1> Be sure to connect with a serializer configured to return objects and not their `toString()` representation which
-is discussed in more detail in the <<connecting-via-console, Connecting Via Console>> Section.
-<2> Use the `:>` command to subgraph the remote graph as needed.
-<3> The `TinkerGraph` of that previous traversal can be found in the `result` object and now that the `Graph` is local
-to Gremlin Console it can be used with Gephi as shown in the prior instruction set.
[[graph-plugins]]
=== Graph Plugins
diff --git a/docs/src/reference/gremlin-variants.asciidoc b/docs/src/reference/gremlin-variants.asciidoc
index 6c31d72..9d9dcad 100644
--- a/docs/src/reference/gremlin-variants.asciidoc
+++ b/docs/src/reference/gremlin-variants.asciidoc
@@ -33,12 +33,12 @@
TinkerPop provides an array of drivers in different programming languages as a way to connect to a remote Gremlin
Server or Remote Gremlin Provider. Drivers allow the developer to make requests to that remote system and get back
-results from the TinkerPop-enabled graphs hosted within. A driver can submit Gremlin strings and Gremlin bytecode
-over this sub-protocol. Gremlin strings are written in the scripting language made available by the remote system that
+results from the TinkerPop-enabled graphs hosted within. A driver can submit Gremlin strings and Gremlin traversals
+over this HTTP protocol. Gremlin strings are written in the scripting language made available by the remote system that
the driver is connecting to (typically, Groovy-based). This connection approach is quite similar to what developers
are likely familiar with when using JDBC and SQL.
-The preferred approach is to use bytecode-based requests, which essentially allows the ability to craft Gremlin
+The preferred approach is to use traversal-based requests, which essentially allows the ability to craft Gremlin
directly in the programming language of choice. As Gremlin makes use of two fundamental programming constructs:
link:https://en.wikipedia.org/wiki/Function_composition[function composition] and
link:https://en.wikipedia.org/wiki/Nested_function[function nesting], it is possible to embed the Gremlin language
@@ -69,6 +69,8 @@
[[gremlin-go]]
== Gremlin-Go
+IMPORTANT: 4.0.0-beta.1 Release - Gremlin-Go is not available in this beta, please consider testing with Java or
+Python.
image:gremlin-go.png[width=130,float=right] Apache TinkerPop's Gremlin-Go implements Gremlin within the link:https://go.dev/[Go] language and can therefore be used on different operating systems. Go's syntax has the similar constructs as Java including
"dot notation" for function chaining (`a.b.c`) and round bracket function arguments (`a(b,c)`). Something unlike Java is that Gremlin-Go requires a
@@ -727,7 +729,7 @@
[gremlin-groovy]
----
-cluster = Cluster.open('conf/remote-objects.yaml')
+cluster = Cluster.open('conf/remote.yaml')
client = cluster.connect()
g = traversal().with(DriverRemoteConnection.using(client, "g"))
g.V().elementMap()
@@ -787,21 +789,21 @@
[width="100%",cols="3,10,^2",options="header"]
|=========================================================
|Key |Description |Default
-|connectionPool.channelizer |The fully qualified classname of the client `Channelizer` that defines how to connect to the server. |`Channelizer.WebSocketChannelizer`
+|auth.type |Type of Auth to submit on requests that require authentication. Can be: `basic` or `sigv4`. |_""_
+|auth.username |The username to submit on requests that require basic authentication. |_none_
+|auth.password |The password to submit on requests that require basic authentication. |_none_
+|auth.region |The region setting for sigv4 authentication. |_none_
+|auth.serviceName |The service name setting for sigv4 authentication. |_none_
+|connectionPool.connectionSetupTimeoutMillis | Duration of time in milliseconds provided for connection setup to complete which includes the SSL handshake. |15000
|connectionPool.enableSsl |Determines if SSL should be enabled or not. If enabled on the server then it must be enabled on the client. |false
-|connectionPool.keepAliveInterval |Length of time in milliseconds to wait on an idle connection before sending a keep-alive request. Set to zero to disable this feature. |180000
+|connectionPool.idleConnectionTimeout | Duration of time in milliseconds that the driver will allow a channel to not receive read or writes before it automatically closes. |180000
|connectionPool.keyStore |The private key in JKS or PKCS#12 format. |_none_
|connectionPool.keyStorePassword |The password of the `keyStore` if it is password-protected. |_none_
|connectionPool.keyStoreType |`PKCS12` |_none_
-|connectionPool.maxContentLength |The maximum length in bytes that a message can be sent to the server. This number can be no greater than the setting of the same name in the server configuration. |65536
-|connectionPool.maxInProcessPerConnection |The maximum number of in-flight requests that can occur on a connection. |4
-|connectionPool.maxSimultaneousUsagePerConnection |The maximum number of times that a connection can be borrowed from the pool simultaneously. |16
-|connectionPool.maxSize |The maximum size of a connection pool for a host. |8
+|connectionPool.maxResponseContentLength |The maximum length in bytes that a message can be received from the server. |2147483647
+|connectionPool.maxSize |The maximum size of a connection pool for a host. |128
|connectionPool.maxWaitForConnection |The amount of time in milliseconds to wait for a new connection before timing out. |3000
|connectionPool.maxWaitForClose |The amount of time in milliseconds to wait for pending messages to be returned from the server before closing the connection. |3000
-|connectionPool.minInProcessPerConnection |The minimum number of in-flight requests that can occur on a connection. |1
-|connectionPool.minSimultaneousUsagePerConnection |The maximum number of times that a connection can be borrowed from the pool simultaneously. |8
-|connectionPool.minSize |The minimum size of a connection pool for a host. |2
|connectionPool.reconnectInterval |The amount of time in milliseconds to wait before trying to reconnect to a dead host. |1000
|connectionPool.resultIterationBatchSize |The override value for the size of the result batches to be returned from the server. |64
|connectionPool.sslCipherSuites |The list of JSSE ciphers to support for SSL connections. If specified, only the ciphers that are listed and supported will be enabled. If not specified, the JVM default is used. |_none_
@@ -810,17 +812,14 @@
|connectionPool.trustStore |File location for a SSL Certificate Chain to use when SSL is enabled. If this value is not provided and SSL is enabled, the default `TrustManager` will be used. |_none_
|connectionPool.trustStorePassword |The password of the `trustStore` if it is password-protected |_none_
|connectionPool.validationRequest |A script that is used to test server connectivity. A good script to use is one that evaluates quickly and returns no data. The default simply returns an empty string, but if a graph is required by a particular provider, a good traversal might be `g.inject()`. |_''_
-|connectionPool.connectionSetupTimeoutMillis | Duration of time in milliseconds provided for connection setup to complete which includes WebSocket protocol handshake and SSL handshake. |15000
-|enableCompression |Enables permessage-deflate compression. Note that use of compression may increase vulnerability to attacks such as CRIME/BREACH.|true
+|bulkResults |Sets whether the server should attempt to get bulk results or not. |false
|enableUserAgentOnConnect |Enables sending a user agent to the server during connection requests. More details can be found in provider docs link:https://tinkerpop.apache.org/docs/x.y.z/dev/provider/#_graph_driver_provider_requirements[here].|true
|hosts |The list of hosts that the driver will connect to. |localhost
-|jaasEntry |Sets the `AuthProperties.Property.JAAS_ENTRY` properties for authentication to Gremlin Server. |_none_
|nioPoolSize |Size of the pool for handling request/response operations. |available processors
|password |The password to submit on requests that require authentication. |_none_
|path |The URL path to the Gremlin Server. |_/gremlin_
|port |The port of the Gremlin Server to connect to. The same port will be applied for all hosts. |8192
-|protocol |Sets the `AuthProperties.Property.PROTOCOL` properties for authentication to Gremlin Server. |_none_
-|serializer.className |The fully qualified class name of the `MessageSerializer` that will be used to communicate with the server. Note that the serializer configured on the client should be supported by the server configuration. |_none_
+|serializer.className |The fully qualified class name of the `MessageSerializer` that will be used to deserialize responses from the server. Note that the serializer configured on the client should be supported by the server configuration. |_none_
|serializer.config |A `Map` of configuration settings for the serializer. |_none_
|username |The username to submit on requests that require authentication. |_none_
|workerPoolSize |Size of the pool for handling background work. |available processors * 2
@@ -831,25 +830,28 @@
[[gremlin-java-transactions]]
=== Transactions
-Transactions with Java are best described in <<transactions,The Traversal - Transactions>> section of this
-documentation as Java covers both embedded and remote use cases.
+IMPORTANT: 4.0.0-beta.1 Release - Transactions with Java isn't currently supported.
[[gremlin-java-serialization]]
=== Serialization
Remote systems like Gremlin Server and Remote Gremlin Providers respond to requests made in a particular serialization
format and respond by serializing results to some format to be interpreted by the client. For JVM-based languages,
-there are two options for serialization: GraphSON and GraphBinary. It is important that the client and server
-have the same serializers configured in the same way or else one or the other will experience serialization exceptions
-and fail to always communicate. Discrepancy in serializer registration between client and server can happen fairly
-easily as different graph systems may automatically include serializers on the server-side, thus leaving the client
-to be configured manually. As an example:
+there is a single option for serialization: GraphBinary.
+
+IMPORTANT: 4.0.0-beta.1 Release - There is temporary support for GraphSON in the Java driver which will help with
+testing, but it is expected that the drivers will only support GraphBinary when 4.0 is fully released.
+
+It is important that the client and server have the same serializers configured in the same way or else one or the
+other will experience serialization exceptions and fail to always communicate. Discrepancy in serializer registration
+between client and server can happen fairly easily as different graph systems may automatically include serializers on
+the server-side, thus leaving the client to be configured manually. As an example:
[source,java]
----
IoRegistry registry = ...; // an IoRegistry instance exposed by a specific graph provider
TypeSerializerRegistry typeSerializerRegistry = TypeSerializerRegistry.build().addRegistry(registry).create();
-MessageSerializer serializer = new GraphBinaryMessageSerializerV1(typeSerializerRegistry);
+MessageSerializer serializer = new GraphBinaryMessageSerializerV4(typeSerializerRegistry);
Cluster cluster = Cluster.build().
serializer(serializer).
create();
@@ -860,26 +862,35 @@
The `IoRegistry` tells the serializer what classes from the graph provider to auto-register during serialization.
Gremlin Server roughly uses this same approach when it configures its serializers, so using this same model will
ensure compatibility when making requests. Obviously, it is possible to switch to GraphSON or GraphBinary by using
-the appropriate `MessageSerializer` (e.g. `GraphSONMessageSerializerV3` or `GraphBinaryMessageSerializerV1` respectively)
+the appropriate `MessageSerializer` (e.g. `GraphSONMessageSerializerV4` or `GraphBinaryMessageSerializerV4` respectively)
in the same way and building that into the `Cluster` object.
-A particularly important configuration along these lines is easily overlooked when choosing to use GraphSON rather than
-GraphBinary. GraphBinary offers a bit of help in dynamically detecting available classpath items and will dynamically
-include `TinkerGraph` as a serialization target which allows the <<subgraph-step>> to work properly in remote contexts.
-GraphSON does not. When using GraphSON, you must manually include the `TinkerIoRegistryV3` in the configuration for the
-driver.
+[[gremlin-java-gvalue]]
+=== GValue Parameterization
+
+A `GValue` is an encapsulation of a parameter name and value. The GValue class has a series of static methods to
+construct GValues of various types from a given parameter name and value. Some of the most common examples are listed
+below, see the
+link:++https://tinkerpop.apache.org/javadocs/x.y.z/full/org/apache/tinkerpop/gremlin/process/traversal/step/GValue.html#method.summary++[Javadocs]
+for a complete listing.
[source,java]
----
-GraphSONMapper.Builder builder = GraphSONMapper.build().addRegistry(TinkerIoRegistryV3.instance());
-GraphSONMessageSerializerV3 serializer = new GraphSONMessageSerializerV3(builder);
-Cluster cluster = TestClientFactory.build().serializer(serializer).create();
-Client client = cluster.connect();
-GraphTraversalSource g = traversal().withRemote(DriverRemoteConnection.using(client, "g"));
+GValue<String> stringArg = GValue.ofString("name", "value");
+GValue<Integer> intArg = GValue.ofInteger("name", 1);
+GValue<Map> mapArg = GValue.ofMap("name", Collections.emptyMap());
+GValue<?> autoTypedArg = GValue.of("name", "value"); // GValue will attempt to automatically detect correct type
----
-IMPORTANT: Prefer GraphBinary over GraphSON when using the driver. If you do choose GraphSON, prefer GraphSON 3 and
-know that GraphSON 2 is not compatible with <<subgraph-step>.
+A <<traversal-parameterization,subset of gremlin steps>> are able to accept `GValues`. When constructing a
+`GraphTraversal` with such steps in Java, a GValue may be passed in the traversal to utilize a parameter in place of a
+literal.
+
+[source,java]
+----
+g.V().has("name", GValue.ofString("name", "marko"));
+g.mergeV(GValue.ofMap("vertexPattern", Collections.singletonMap("name", "marko")));
+----
[[gremlin-java-gvalue]]
=== GValue Parameterization
@@ -1065,6 +1076,29 @@
The above code demonstrates how the `alias` method can be used such that the script need only contain a reference
to "g" and "g1" and "g2" are automatically rebound into "g" on the server-side.
+==== RequestInterceptor
+
+Gremlin-Java allows for modification of the underlying HTTP request through the use of `RequestInteceptors`. This is
+intended to be an advanced feature which means that you will need to understand how the implementation works in order
+to safely utilize it. Gremlin-Java is written in a way that you should be able to interact with a TinkerPop-enabled
+server without having to use interceptors. This is intended for cases where the server has special capabilities.
+
+A `RequestInterceptor` is simply a `UnaryOperator`. A list of these are maintained and will be run sequentially for
+each request. When building a `Cluster` instance, the methods `addInterceptorAfter()`, `addInterceptorBefore()`,
+`addInterceptor()`, and `removeInterceptor()` can be used to add or remove interceptors. It's important to remember
+that order matters so if one interceptor depends on another's output then ensure they are added in the correct order.
+Note that `Auth` is also implemented using interceptors, and `Auth` is always run last after your list of interceptors
+has already ran. By default, the `PayloadSerializingInterceptor` with the name `serializer` is added to your list of
+interceptors. This interceptor is used for serializing the body of the request. The first interceptor is provided with
+a `org.apache.tinkerpop.gremlin.driver.HttpRequest` that contains a `RequestMessage` in the body. As a reminder
+`RequestMessage` is immutable and only certain keys can be added to them. If you want to customize the body by adding
+other fields, you will need to make a different copy of the `RequestMessage` or completely change the body to contain a
+different data type. The very last interceptor should have a `org.apache.tinkerpop.gremlin.driver.HttpRequest` that
+contains a byte[] in the body.
+
+For an example of a simple `RequestInterceptor` that only modifies the header of the request take a look at
+link:https://github.com/apache/tinkerpop/blob/x.y.z/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/auth/Basic.java[basic authentication].
+
[[gremlin-java-dsl]]
=== Domain Specific Languages
@@ -1202,17 +1236,16 @@
social.persons("marko").knows("josh");
----
-NOTE: Using Maven, as shown in the `gremlin-archetype-dsl` module, makes developing DSLs with the annotation processor
-straightforward in that it sets up appropriate paths to the generated code automatically.
+NOTE: Using Maven makes developing DSLs with the annotation processor straightforward in that it sets up appropriate
+paths to the generated code automatically.
[[gremlin-java-troubleshooting]]
=== Troubleshooting
-*Max frame length of 65536 has been exceeded*
+*Response exceeded X bytes.*
-This error occurs when the driver attempts to process a request/response that exceeds the configured maximum size.
-The most direct way to fix this problem is to increase the `maxContentLength` setting in the driver. Ideally, the
-`maxContentLength` set for the driver should match the setting defined on the server.
+This error occurs when the driver attempts to process a response that exceeds the configured maximum response size.
+The most direct way to fix this problem is to increase the `maxResponseContentLength` setting in the driver.
*TimeoutException*
@@ -1265,30 +1298,6 @@
----
anchor:java-application-examples[]
-anchor:gremlin-archetypes[]
-[[gremlin-java-archetypes]]
-=== Application Archetypes
-
-The available link:https://maven.apache.org/guides/introduction/introduction-to-archetypes.html[Maven archetypes] are
-as follows:
-
-* `gremlin-archetype-dsl` - An example project that demonstrates how to build Domain Specific Languages with Gremlin
-in Java.
-* `gremlin-archetype-server` - An example project that demonstrates the basic structure of a
-<<gremlin-server,Gremlin Server>> project, how to connect with the Gremlin Driver, and how to embed Gremlin Server in
-a testing framework.
-* `gremlin-archetype-tinkergraph` - A basic example of how to structure a TinkerPop project with Maven.
-
-Use Maven to generate these example projects with a command like:
-
-[source,shell]
-$ mvn archetype:generate -DarchetypeGroupId=org.apache.tinkerpop -DarchetypeArtifactId=gremlin-archetype-server \
- -DarchetypeVersion=x.y.z -DgroupId=com.my -DartifactId=app -Dversion=0.1 -DinteractiveMode=false
-
-This command will generate a new Maven project in a directory called "app" with a `pom.xml` specifying a `groupId` of
-`com.my`. Please see the `README.asciidoc` in the root of each generated project for information on how to build and
-execute it.
-
[[gremlin-java-examples]]
=== Application Examples
@@ -1309,6 +1318,8 @@
[[gremlin-javascript]]
== Gremlin-JavaScript
+IMPORTANT: 4.0.0-beta.1 Release - Gremlin-JavaScript is not available in this beta, please consider testing with
+Java or Python.
image:gremlin-js.png[width=130,float=right] Apache TinkerPop's Gremlin-JavaScript implements Gremlin within the
JavaScript language. It targets Node.js runtime and can be used on different operating systems on any Node.js 6 or
@@ -1436,7 +1447,6 @@
|options.authenticator |Authenticator |The authentication handler to use. |undefined
|options.processor |String |The name of the opProcessor to use, leave it undefined or set 'session' when session mode. |undefined
|options.session |String |The sessionId of Client in session mode. undefined means session-less Client. |undefined
-|options.enableCompression |Boolean |Enables permessage-deflate compression. Note that use of compression may increase vulnerability to attacks such as CRIME/BREACH.|false
|options.enableUserAgentOnConnect |Boolean |Determines if a user agent will be sent during connection handshake. |true
|options.headers |Object |An associative array containing the additional header key/values for the initial request. |undefined
|options.pingEnabled |Boolean |Setup ping interval. |true
@@ -1541,15 +1551,6 @@
}
----
-It is also possible to initialize the `Client` to use <<sessions,sessions>>:
-
-[source,javascript]
-----
-const client = new gremlin.driver.Client('ws://localhost:8182/gremlin', { traversalSource: 'g', 'session': 'unique-string-id' });
-----
-
-With this configuration, the state of variables within scripts are preserved between requests.
-
==== Per Request Settings
The `client.submit()` functions accept a `requestOptions` which expects a dictionary. The `requestOptions`
@@ -1781,6 +1782,8 @@
anchor:gremlin-DotNet[]
[[gremlin-dotnet]]
== Gremlin.Net
+IMPORTANT: 4.0.0-beta.1 Release - Gremlin.Net is not available in this beta, please consider testing with Java or
+Python.
image:gremlin-dotnet-logo.png[width=371,float=right] Apache TinkerPop's Gremlin.Net implements Gremlin within the C#
language. It targets .NET Standard and can therefore be used on different operating systems and with different .NET
@@ -1976,14 +1979,6 @@
include::../../../gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Docs/Reference/GremlinVariantsTests.cs[tags=submittingScriptsWithAuthentication]
----
-It is also possible to initialize the `Client` to use <<sessions,sessions>>:
-
-[source,csharp]
-----
-var gremlinServer = new GremlinServer("localhost", 8182);
-var client = new GremlinClient(gremlinServer, sessionId: Guid.NewGuid().ToString()))
-----
-
==== Per Request Settings
The `GremlinClient.Submit()` functions accept an option to build a raw `RequestMessage`. A good use-case for this
@@ -2187,7 +2182,6 @@
[source,bash]
----
pip install gremlinpython
-pip install gremlinpython[kerberos] # Optional, not available on Microsoft Windows
----
[[gremlin-python-connecting]]
@@ -2199,42 +2193,35 @@
[source,python]
----
-g = traversal().with_(DriverRemoteConnection('ws://localhost:8182/gremlin','g'))
+g = traversal().with_(DriverRemoteConnection('http://localhost:8182/gremlin','g'))
----
-If you need to send additional headers in the websockets connection, you can pass an optional `headers` parameter
+If you need to send additional headers in the HTTP connection, you can pass an optional `headers` parameter
to the `DriverRemoteConnection` constructor.
[source,python]
----
g = traversal().with_(DriverRemoteConnection(
- 'ws://localhost:8182/gremlin', 'g', headers={'Header':'Value'}))
+ 'http://localhost:8182/gremlin', 'g', headers={'Header':'Value'}))
----
-Gremlin-Python supports plain text and Kerberos SASL authentication, you can set it on the connection options.
+Gremlin-Python contains an `auth` module that allows custom authentication implementation, with plain text and SigV4
+authentication provided as reference.
[source,python]
----
# Plain text authentication
g = traversal().with_(DriverRemoteConnection(
- 'ws://localhost:8182/gremlin', 'g', username='stephen', password='password'))
+ 'ws://localhost:8182/gremlin', 'g', auth=basic('stephen', 'password')))
-# Kerberos authentication
+# SigV4 authentication
g = traversal().with_(DriverRemoteConnection(
- 'ws://localhost:8182/gremlin', 'g', kerberized_service='gremlin@hostname.your.org'))
+ 'ws://localhost:8182/gremlin', 'g', auth=sigv4(service-region, service-name)))
----
-The value specified for the kerberized_service should correspond to the first part of the principal name configured for
-the gremlin service, but with the slash replaced by an _at_ sign. The Gremlin-Python client reads the kerberos
-configurations from your system. It finds the KDC's hostname and port from the krb5.conf file at the
-https://web.mit.edu/kerberos/krb5-devel/doc/mitK5defaults.html[default location] or as indicated in the KRB5_CONFIG
-environment variable. It finds credentials from the credential cache or a keytab file at the
-https://web.mit.edu/kerberos/krb5-devel/doc/mitK5defaults.html[default locations] or as indicated
-in the KRB5CCNAME or KRB5_KTNAME environment variables.
-
If you authenticate to a remote <<connecting-gremlin-server,Gremlin Server>> or
-<<connecting-rgp,Remote Gremlin Provider>>, this server normally has SSL activated and the websockets url will start
-with 'wss://'. If Gremlin-Server uses a self-signed certificate for SSL, Gremlin-Python needs access to a local copy of
+<<connecting-rgp,Remote Gremlin Provider>>, this server normally has SSL activated and the HTTP url will start
+with 'https://'. If Gremlin-Server uses a self-signed certificate for SSL, Gremlin-Python needs access to a local copy of
the CA certificate file (in openssl .pem format), to be specified in the SSL_CERT_FILE environment variable.
NOTE: If connecting from an inherently single-threaded Python process where blocking while waiting for Gremlin
@@ -2250,8 +2237,8 @@
vertices = g.with_('evaluationTimeout', 500).V().out('knows').to_list()
----
-The following options are allowed on a per-request basis in this fashion: `batchSize`, `requestId`, `userAgent` and
-`evaluationTimeout` (formerly `scriptEvaluationTimeout` which is also supported but now deprecated).
+The following options are allowed on a per-request basis in this fashion: `batchSize`, `bulkResults`, `language`, `materializeProperties`,
+`userAgent`, and `evaluationTimeout`.
anchor:python-imports[]
[[gremlin-python-imports]]
@@ -2338,24 +2325,24 @@
[width="100%",cols="3,10,^2",options="header"]
|=========================================================
|Key |Description |Default
-|enable_compression |Enables sending a user agent to the server during connection requests. |False
-|enable_user_agent_on_connect |Enables sending a user agent to the server during connection requests. More details can be found in provider docs
-link:https://tinkerpop.apache.org/docs/x.y.z/dev/provider/#_graph_driver_provider_requirements[here].|True
|headers |Additional headers that will be added to each request message. |`None`
-|kerberized_service |the first part of the principal name configured for the gremlin service|"""
|max_workers |Maximum number of worker threads. |Number of CPUs * 5
-|message_serializer |The message serializer implementation.|`gremlin_python.driver.serializer.GraphBinarySerializersV1`
-|password |The password to submit on requests that require authentication. |""
+|request_serializer |The request serializer implementation.|`gremlin_python.driver.serializer.GraphBinarySerializersV4`
+|response_serializer |The response serializer implementation.|`gremlin_python.driver.serializer.GraphBinarySerializersV4`
+|interceptors |The request interceptors to run after request serialization.|`None`
+|auth |The authentication scheme to use when submitting requests that require authentication. |`None`
|pool_size |The number of connections used by the pool. |4
|protocol_factory |A callable that returns an instance of `AbstractBaseProtocol`. |`gremlin_python.driver.protocol.GremlinServerWSProtocol`
-|session | A unique string-based identifier (typically a UUID) to enable a <<sessions,session-based connection>>. This is not a valid configuration for `DriverRemoteConnection`. |None
|transport_factory |A callable that returns an instance of `AbstractBaseTransport`. |`gremlin_python.driver.aiohttp.transport.AiohttpTransport`
-|username |The username to submit on requests that require authentication. |""
+|enable_user_agent_on_connect |Enables sending a user agent to the server during connection requests.
+More details can be found in provider docs
+link:https://tinkerpop.apache.org/docs/x.y.z/dev/provider/#_graph_driver_provider_requirements[here].|True
+|bulk_results |Enables bulking of results on the server. |False
|=========================================================
Note that the `transport_factory` can allow for additional configuration of the `AiohttpTransport`, which allows
pass through of the named parameters available in
-link:https://docs.aiohttp.org/en/stable/client_reference.html#aiohttp.ClientSession.ws_connect[AIOHTTP's ws_connect],
+link:https://docs.aiohttp.org/en/stable/client_reference.html#aiohttp.ClientSession[AIOHTTP's HTTP ClientSession],
and the ability to call the api from an event loop:
[source,python]
@@ -2363,27 +2350,12 @@
import ssl
...
g = traversal().with_(
- DriverRemoteConnection('ws://localhost:8182/gremlin','g',
- transport_factory=lambda: AiohttpTransport(read_timeout=60,
- write_timeout=20,
- heartbeat=10,
- call_from_event_loop=True,
- max_content_length=100*1024*1024,
+ DriverRemoteConnection('http://localhost:8182/gremlin','g',
+ transport_factory=lambda: AiohttpTransport(timeout=60,
+ max_line_size=100*1024*1024,
ssl_options=ssl.create_default_context(Purpose.CLIENT_AUTH))))
----
-Note that the `heartbeat` enables keep-alive functionality within aiohttp and it is not enabled by default. It is
-important that the heartbeat interval is not too short, as the wait for the server response to the heartbeat request
-is half the amount of this value. Therefore, if the heartbeat is ten seconds then the wait for the response is just
-five seconds. If the response is not received in that time period then the connection will be closed and any ongoing
-requests on that connection will fail to retrieve results. Therefore, if the heartbeat is set to one second, it only
-provides a half-second to get the response which raises the possibility considerably that the connection will be
-inadvertently closed.
-
-Compression configuration options are described in the
-link:https://docs.python.org/3.6/library/zlib.html#zlib.compressobj[zlib documentation]. By default, compression
-settings are configured as shown in the above example.
-
[[gremlin-python-strategies]]
=== Traversal Strategies
@@ -2416,6 +2388,7 @@
[[gremlin-python-transactions]]
=== Transactions
+IMPORTANT: 4.0.0-beta.1 Release - Transactions are currently disabled in this beta release.
To get a full understanding of this section, it would be good to start by reading the <<transactions,Transactions>>
section of this documentation, which discusses transactions in the general context of TinkerPop itself. This section
@@ -2423,7 +2396,7 @@
[source,python]
----
-g = traversal().with_(DriverRemoteConnection('ws://localhost:8182/gremlin'))
+g = traversal().with_remote(DriverRemoteConnection('ws://localhost:8182/gremlin'))
# Create a Transaction.
tx = g.tx()
@@ -2445,41 +2418,19 @@
----
-[[gremlin-python-lambda]]
-=== The Lambda Solution
+[[gremlin-python-gvalue]]
+=== GValue Parameterization
-Supporting link:https://en.wikipedia.org/wiki/Anonymous_function[anonymous functions] across languages is difficult as
-most languages do not support lambda introspection and thus, code analysis. In Gremlin-Python, a Gremlin lambda should
-be represented as a zero-arg callable that returns a string representation of the lambda expected for use in the
-traversal. The lambda should be written as a `Gremlin-Groovy` string. When the lambda is represented in `Bytecode` its
-language is encoded such that the remote connection host can infer which translator and ultimate execution engine to
-use.
+A `GValue` is an encapsulation of a parameter name and value. A <<traversal-parameterization,subset of gremlin steps>>
+are able to accept GValues. When constructing a `GraphTraversal` with such steps in Python, a GValue may be passed in
+the traversal to utilize a parameter in place of a literal.
[source,python]
----
->>> g.V().out().map(lambda: "it.get().value('name').length()").sum().to_list()
-[24]
+g.V().has('name', GValue('name', 'marko'))
+g.merge_v(GValue('vertexPattern', {'name': 'marko'}))
----
-TIP: When running into situations where Groovy cannot properly discern a method signature based on the `Lambda`
-instance created, it will help to fully define the closure in the lambda expression - so rather than
-`lambda: ('it.get().value('name')','gremlin-groovy')`, prefer `lambda: ('x -> x.get().value('name'),'gremlin-groovy')`.
-
-Finally, Gremlin `Bytecode` that includes lambdas requires that the traversal be processed by the
-`ScriptEngine`. To avoid continued recompilation costs, it supports the encoding of bindings, which allow a remote
-engine to to cache traversals that will be reused over and over again save that some parameterization may change. Thus,
-instead of translating, compiling, and then executing each submitted bytecode, it is possible to simply execute.
-
-[source,python]
-----
->>> g.V(Bindings.of('x',1)).out('created').map(lambda: "it.get().value('name').length()").sum_().to_list()
-[3]
->>> g.V(Bindings.of('x',4)).out('created').map(lambda: "it.get().value('name').length()").sum_().to_list()
-[9]
-----
-
-WARNING: As explained throughout the documentation, when possible <<a-note-on-lambdas,avoid>> lambdas.
-
[[gremlin-python-scripts]]
=== Submitting Scripts
@@ -2490,7 +2441,7 @@
[source,python]
----
from gremlin_python.driver import client <1>
-client = client.Client('ws://localhost:8182/gremlin', 'g') <2>
+client = client.Client('http://localhost:8182/gremlin', 'g') <2>
----
<1> Import the Gremlin-Python `client` module.
@@ -2627,7 +2578,7 @@
[source,python]
----
-social = traversal(SocialTraversalSource).with_(DriverRemoteConnection('ws://localhost:8182/gremlin','g'))
+social = traversal(SocialTraversalSource).with_remote(DriverRemoteConnection('ws://localhost:8182/gremlin','g'))
social.persons('marko').knows('josh')
social.persons('marko').youngest_friends_age()
social.persons().filter(__.created_at_least(2)).count()
@@ -2676,8 +2627,23 @@
to `Set` manually.
* Gremlin is capable of returning `Dictionary` results that use non-hashable keys (e.g. Dictionary as a key) and Python
does not support that at a language level. Using GraphSON 3.0 or GraphBinary (after 3.5.0) makes it possible to return
-such results. In all other cases, Gremlin that returns such results will need to be re-written to avoid that sort of
-key.
+such results. However, it may not be possible to serialize these maps so they can't be re-inserted (or round tripped).
+In all other cases, Gremlin that returns such results will need to be re-written to avoid that sort of key.
+* The `float` type in Python is a double precision floating point number which is commonly referred to in other
+languages as a `double`. This means that single precision floating point values will be deserialized into a double, so
+there will be a precision difference.
+* Gremlin supports multiple fixed-width integers such as byte (1-byte), short (2-byte), and long (8-byte). These are
+deserialized into Python's variable size `int` type. These numbers can't be exactly round tripped because the original
+type information is lost during deserialization. During serialization, these numbers will try to be converted into a
+4-byte integer which may throw exceptions if the value is too large or waste space if the value is very small.
+* The Gremlin Char type is deserialized as a string and therefore can't be round tripped as it will it will attempt to
+be serialized as a string.
+* Date and Duration types in Gremlin are deserialized as `datetime.datetime` and `datetime.timedelta` respectively in
+`gremlin-python`. This can lead to errors for large values because they exceed the maximum size allowed for `datetime`
+and `timedelta`.
+* In Gremlin, 1 isn't equal to the boolean true value and 0 isn't equal to the boolean false value, but they are equal
+in Python. This means that in `gremlin-python` if these values are in a `Set`, you will get a different behavior than
+what is intended by Gremlin, since it follows Python's behavior.
* The `subgraph()`-step is not supported by any variant that is not running on the Java Virtual Machine as there is
no `Graph` instance to deserialize a result into on the client-side. A workaround is to replace the step with
`aggregate(local)` and then convert those results to something the client can use locally.
@@ -2697,7 +2663,7 @@
[source,python]
----
def print_vertices():
- g = traversal().with_(DriverRemoteConnection("ws://localhost:8182/gremlin"))
+ g = traversal().with(DriverRemoteConnection("ws://localhost:8182/gremlin"))
# Do your traversal.
async def run_in_thread():
diff --git a/docs/src/reference/implementations-hadoop-start.asciidoc b/docs/src/reference/implementations-hadoop-start.asciidoc
index 901ac58..0e0c0ce 100644
--- a/docs/src/reference/implementations-hadoop-start.asciidoc
+++ b/docs/src/reference/implementations-hadoop-start.asciidoc
@@ -48,7 +48,7 @@
\,,,/
(o o)
------oOOo-(3)-oOOo-----
+-----oOOo-(4)-oOOo-----
plugin activated: tinkerpop.server
plugin activated: tinkerpop.utilities
plugin activated: tinkerpop.tinkergraph
@@ -59,7 +59,7 @@
\,,,/
(o o)
------oOOo-(3)-oOOo-----
+-----oOOo-(4)-oOOo-----
plugin activated: tinkerpop.server
plugin activated: tinkerpop.utilities
plugin activated: tinkerpop.tinkergraph
@@ -177,7 +177,7 @@
\,,,/
(o o)
------oOOo-(3)-oOOo-----
+-----oOOo-(4)-oOOo-----
plugin activated: tinkerpop.server
plugin activated: tinkerpop.utilities
plugin activated: tinkerpop.tinkergraph
@@ -189,7 +189,7 @@
\,,,/
(o o)
------oOOo-(3)-oOOo-----
+-----oOOo-(4)-oOOo-----
plugin activated: tinkerpop.server
plugin activated: tinkerpop.utilities
plugin activated: tinkerpop.tinkergraph
diff --git a/docs/src/reference/implementations-neo4j.asciidoc b/docs/src/reference/implementations-neo4j.asciidoc
index 174f93f..45fa9be 100644
--- a/docs/src/reference/implementations-neo4j.asciidoc
+++ b/docs/src/reference/implementations-neo4j.asciidoc
@@ -86,16 +86,23 @@
* Manipulating indices with link:http://neo4j.com/docs/developer-manual/current/#query-schema-index[Cypher].
* Manipulating indices with the Neo4j link:http://neo4j.com/docs/stable/tutorials-java-embedded-new-index.html[Java API].
-[gremlin-groovy]
+[source,groovy]
----
-graph = Neo4jGraph.open('/tmp/neo4j')
-g = traversal().with(graph)
-graph.cypher("CREATE INDEX ON :person(name)")
-graph.tx().commit() <1>
-g.addV('person').property('name','marko')
-g.addV('dog').property('name','puppy')
-g.V().hasLabel('person').has('name','marko').values('name')
-graph.close()
+gremlin> graph = Neo4jGraph.open('/tmp/neo4j')
+==>neo4jgraph[community single [/tmp/neo4j]]
+gremlin> g = traversal().withEmbedded(graph)
+==>graphtraversalsource[neo4jgraph[community single [/tmp/neo4j]], standard]
+gremlin> graph.cypher("CREATE INDEX ON :person(name)")
+gremlin> graph.tx().commit() //// (1)
+==>null
+gremlin> g.addV('person').property('name','marko')
+==>v[0]
+gremlin> g.addV('dog').property('name','puppy')
+==>v[1]
+gremlin> g.V().hasLabel('person').has('name','marko').values('name')
+==>marko
+gremlin> graph.close()
+==>null
----
<1> Schema mutations must happen in a different transaction than graph mutations
@@ -103,21 +110,31 @@
Below demonstrates the runtime benefits of indices and demonstrates how if there is no defined index (only vertex
labels), a linear scan of the vertex-label partition is still faster than a linear scan of all vertices.
-[gremlin-groovy]
+[source,groovy]
----
-graph = Neo4jGraph.open('/tmp/neo4j')
-g = traversal().with(graph)
-g.io('data/grateful-dead.xml').read().iterate()
-g.tx().commit()
-clock(1000) {g.V().hasLabel('artist').has('name','Garcia').iterate()} <1>
-graph.cypher("CREATE INDEX ON :artist(name)") <2>
-g.tx().commit()
-Thread.sleep(5000) <3>
-clock(1000) {g.V().hasLabel('artist').has('name','Garcia').iterate()} <4>
-clock(1000) {g.V().has('name','Garcia').iterate()} <5>
-graph.cypher("DROP INDEX ON :artist(name)") <6>
-g.tx().commit()
-graph.close()
+gremlin> graph = Neo4jGraph.open('/tmp/neo4j')
+==>neo4jgraph[community single [/tmp/neo4j]]
+gremlin> g = traversal().withEmbedded(graph)
+==>graphtraversalsource[neo4jgraph[community single [/tmp/neo4j]], standard]
+gremlin> g.io('data/grateful-dead.xml').read().iterate()
+gremlin> g.tx().commit()
+==>null
+gremlin> clock(1000) {g.V().hasLabel('artist').has('name','Garcia').iterate()} //// (1)
+==>0.35031228
+gremlin> graph.cypher("CREATE INDEX ON :artist(name)") //// (2)
+gremlin> g.tx().commit()
+==>null
+gremlin> Thread.sleep(5000) //// (3)
+==>null
+gremlin> clock(1000) {g.V().hasLabel('artist').has('name','Garcia').iterate()} //// (4)
+==>0.061846079
+gremlin> clock(1000) {g.V().has('name','Garcia').iterate()} //// (5)
+==>0.6680353569999999
+gremlin> graph.cypher("DROP INDEX ON :artist(name)") //// (6)
+gremlin> g.tx().commit()
+==>null
+gremlin> graph.close()
+==>null
----
<1> Find all artists whose name is Garcia which does a linear scan of the artist vertex-label partition.
@@ -134,14 +151,20 @@
NeoTechnology are the creators of the graph pattern-match query language link:https://neo4j.com/developer/cypher-query-language/[Cypher].
It is possible to leverage Cypher from within Gremlin by using the `Neo4jGraph.cypher()` graph traversal method.
-[gremlin-groovy]
+[source,groovy]
----
-graph = Neo4jGraph.open('/tmp/neo4j')
-g = traversal().with(graph)
-g.io('data/tinkerpop-modern.kryo').read().iterate()
-graph.cypher('MATCH (a {name:"marko"}) RETURN a')
-graph.cypher('MATCH (a {name:"marko"}) RETURN a').select('a').out('knows').values('name')
-graph.close()
+gremlin> graph = Neo4jGraph.open('/tmp/neo4j')
+==>neo4jgraph[community single [/tmp/neo4j]]
+gremlin> g = traversal().withEmbedded(graph)
+==>graphtraversalsource[neo4jgraph[community single [/tmp/neo4j]], standard]
+gremlin> g.io('data/tinkerpop-modern.kryo').read().iterate()
+gremlin> graph.cypher('MATCH (a {name:"marko"}) RETURN a')
+==>[a:v[0]]
+gremlin> graph.cypher('MATCH (a {name:"marko"}) RETURN a').select('a').out('knows').values('name')
+==>josh
+==>vadas
+gremlin> graph.close()
+==>null
----
Thus, like <<match-step,`match()`>>-step in Gremlin, it is possible to do a declarative pattern match and then move
@@ -165,26 +188,46 @@
An example use case is presented below.
-[gremlin-groovy]
+[source,groovy]
----
-graph = Neo4jGraph.open('/tmp/neo4j')
-g = traversal().with(graph)
-vertex = (Neo4jVertex) g.addV('human::animal').next() <1>
-vertex.label() <2>
-vertex.labels() <3>
-vertex.addLabel('organism') <4>
-vertex.label()
-vertex.removeLabel('human') <5>
-vertex.labels()
-vertex.addLabel('organism') <6>
-vertex.labels()
-vertex.removeLabel('human') <7>
-vertex.label()
-g.V().has(label,'organism') <8>
-g.V().has(label,of('organism')) <9>
-g.V().has(label,of('organism')).has(label,of('animal'))
-g.V().has(label,of('organism').and(of('animal')))
-graph.close()
+gremlin> graph = Neo4jGraph.open('/tmp/neo4j')
+==>neo4jgraph[community single [/tmp/neo4j]]
+gremlin> g = traversal().withEmbedded(graph)
+==>graphtraversalsource[neo4jgraph[community single [/tmp/neo4j]], standard]
+gremlin> vertex = (Neo4jVertex) g.addV('human::animal').next() //// (1)
+==>v[0]
+gremlin> vertex.label() //// (2)
+==>animal::human
+gremlin> vertex.labels() //// (3)
+==>animal
+==>human
+gremlin> vertex.addLabel('organism') //// (4)
+==>null
+gremlin> vertex.label()
+==>animal::human::organism
+gremlin> vertex.removeLabel('human') //// (5)
+==>null
+gremlin> vertex.labels()
+==>animal
+==>organism
+gremlin> vertex.addLabel('organism') //// (6)
+==>null
+gremlin> vertex.labels()
+==>animal
+==>organism
+gremlin> vertex.removeLabel('human') //// (7)
+==>null
+gremlin> vertex.label()
+==>animal::organism
+gremlin> g.V().has(label,'organism') //// (8)
+gremlin> g.V().has(label,of('organism')) //// (9)
+==>v[0]
+gremlin> g.V().has(label,of('organism')).has(label,of('animal'))
+==>v[0]
+gremlin> g.V().has(label,of('organism').and(of('animal')))
+==>v[0]
+gremlin> graph.close()
+==>null
----
<1> Typecasting to a `Neo4jVertex` is only required in Java.
diff --git a/docs/src/reference/implementations-spark.asciidoc b/docs/src/reference/implementations-spark.asciidoc
index 445f2d1..00057ba 100644
--- a/docs/src/reference/implementations-spark.asciidoc
+++ b/docs/src/reference/implementations-spark.asciidoc
@@ -49,15 +49,7 @@
g.V().out().out().values('name')
----
-For using lambdas in Gremlin-Groovy, simply provide `:remote connect` a `TraversalSource` which leverages SparkGraphComputer.
-
-[gremlin-groovy]
-----
-graph = GraphFactory.open('conf/hadoop/hadoop-gryo.properties')
-g = traversal().with(graph).withComputer(SparkGraphComputer)
-:remote connect tinkerpop.hadoop graph g
-:> g.V().group().by{it.value('name')[1]}.by('name')
-----
+NOTE: We no longer support lambda executions via `:remote` on the Gremlin Console starting in TinkerPop 4.
The `SparkGraphComputer` algorithm leverages Spark's caching abilities to reduce the amount of data shuffled across
the wire on each iteration of the <<vertexprogram,`VertexProgram`>>. When the graph is loaded as a Spark RDD
diff --git a/docs/src/reference/intro.asciidoc b/docs/src/reference/intro.asciidoc
index b4e6990..e37d815 100644
--- a/docs/src/reference/intro.asciidoc
+++ b/docs/src/reference/intro.asciidoc
@@ -219,7 +219,7 @@
\,,,/
(o o)
------oOOo-(3)-oOOo-----
+-----oOOo-(4)-oOOo-----
gremlin> graph = TinkerFactory.createModern() // <1>
==>tinkergraph[vertices:6 edges:6]
gremlin> g = traversal().with(graph) // <2>
@@ -364,18 +364,15 @@
<<gremlin-server,Gremlin Server>>. Gremlin Server exposes the graph as an endpoint to which different clients can
connect, essentially providing a remote GTM. Gremlin Server supports multiple methods for clients to interface with it:
-* Websockets with a link:https://tinkerpop.apache.org/docs/x.y.z/dev/provider/#_graph_driver_provider_requirements[custom sub-protocol]
-** String-based Gremlin scripts
-** Bytecode-based Gremlin traversals
-* HTTP for string-based scripts
+* link:https://tinkerpop.apache.org/docs/x.y.z/dev/provider/#_http_api[HTTP] for string-based scripts (both
+gremlin-lang and gremlin-groovy)
-Users are encouraged to use the bytecode-based approach with websockets because it allows them to write Gremlin
-in the language of their choice. Connecting looks somewhat similar to the <<connecting-embedded, embedded>> approach
-in that there is a need to create a `GraphTraversalSource`. In the embedded approach, the means for that object's
-creation is derived from a `Graph` object which spawns it. In this case, however, the `Graph` instance exists only on
-the server which means that there is no `Graph` instance to create locally. The approach is to instead create a
-`GraphTraversalSource` anonymously with `AnonymousTraversalSource` and then apply some "remote" options that describe
-the location of the Gremlin Server to connect to:
+Connecting looks somewhat similar to the <<connecting-embedded, embedded>> approach in that there is a need to create a
+`GraphTraversalSource`. In the embedded approach, the means for that object's creation is derived from a `Graph` object
+which spawns it. In this case, however, the `Graph` instance exists only on the server which means that there is no
+`Graph` instance to create locally. The approach is to instead create a `GraphTraversalSource` anonymously with
+`AnonymousTraversalSource` and then apply some "remote" options that describe the location of the Gremlin Server to
+connect to:
[source,java,tab]
----
@@ -399,19 +396,6 @@
def g = traversal().with(
DriverRemoteConnection.using('localhost', 8182))
----
-[source,csharp]
-----
-include::../../../gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Docs/Reference/IntroTests.cs[tags=traversalSourceUsing]
-
-include::../../../gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Docs/Reference/IntroTests.cs[tags=traversalSourceCreation]
-----
-[source,javascript]
-----
-const traversal = gremlin.process.AnonymousTraversalSource.traversal;
-
-const g = traversal().with(
- new DriverRemoteConnection('ws://localhost:8182/gremlin'));
-----
[source,python]
----
from gremlin_python.process.anonymous_traversal_source import traversal
@@ -419,15 +403,6 @@
g = traversal().with(
DriverRemoteConnection('ws://localhost:8182/gremlin'))
----
-[source,go]
-----
-import (
- gremlingo "github.com/apache/tinkerpop/gremlin-go/v3/driver"
-)
-
-remote, err := gremlingo.NewDriverRemoteConnection("ws://localhost:8182/gremlin")
-g := gremlingo.Traversal_().With(remote)
-----
As shown in the embedded approach in the previous section, once "g" is defined, writing Gremlin is structurally and
conceptually the same irrespective of programming language.
@@ -447,6 +422,9 @@
link:https://tinkerpop.apache.org/docs/x.y.z/dev/io/#graphson[GraphSON]. Users should prefer GraphBinary when available
in the programming language being used.
+IMPORTANT: 4.0.0-beta.1 Release - There is temporary support for GraphSON in the Java driver which will help with
+testing, but it is expected that the drivers will only support GraphBinary when 4.0 is fully released.
+
A good example is the `subgraph()`-step which returns a `Graph` instance as its result. The subgraph returned from
the server can be deserialized into an actual `Graph` instance on the client, which then means it is possible to
spawn a `GraphTraversalSource` from that to do local Gremlin traversals on the client-side. For non-JVM
@@ -454,9 +432,11 @@
no GTM to process Gremlin so there isn't much that can be done with such a result.
The second point is related to this issue. As there is no GTM, there is no "structure" API and thus graph elements like
-`Vertex` and `Edge` are "references" only. A "reference" means that they only contain the `id` and `label` of the
+`Vertex` and `Edge` are usually "references". A "reference" means that they only contain the `id` and `label` of the
element and not the properties. To be consistent, even JVM-based languages hold this limitation when talking to a
-remote Gremlin Server.
+remote Gremlin Server. However, you can alternatively get a "detached" element when using the `all` option for
+`materializeProperties`. In this case, the element will contain all of its properties, but will not be connected to any
+other element.
IMPORTANT: Most SQL developers would not write a query as `SELECT * FROM table`. They would instead write the
individual names of the fields they wanted in place of the wildcard. Writing "good" Gremlin is no different with this
@@ -465,15 +445,17 @@
The third and final point involves transactions. Under this model, one traversal is equivalent to a single transaction
and there is no way in TinkerPop to string together multiple traversals into the same transaction.
+IMPORTANT: 4.0.0-beta.1 Release - Remote transactions are not supported in this beta.
+
[[connecting-rgp]]
=== Remote Gremlin Provider
Remote Gremlin Providers (RGPs) are showing up more and more often in the graph database space. In TinkerPop terms,
this category of graph providers is defined by those who simply support the Gremlin language. Typically, these are
-server-based graphs, often cloud-based, which accept Gremlin scripts or bytecode as a request and return results.
-They will often implement Gremlin Server protocols, which enables TinkerPop drivers to connect to them as they would
-with Gremlin Server. Therefore, the typical connection approach is identical to the method of connection presented in
-the <<connecting-gremlin-server,previous section>> with the exact same caveats pointed out toward the end.
+server-based graphs, often cloud-based, which accept Gremlin scripts as a request and return results. They will often
+implement Gremlin Server protocols, which enables TinkerPop drivers to connect to them as they would with Gremlin
+Server. Therefore, the typical connection approach is identical to the method of connection presented in the
+<<connecting-gremlin-server,previous section>> with the exact same caveats pointed out toward the end.
Despite leveraging TinkerPop protocols and drivers as being typical, RGPs are not required to do so to be considered
TinkerPop-enabled. RGPs may well have their own drivers and protocols that may plug into
@@ -496,34 +478,18 @@
v2 = g.addV('person').property('name','stephen').next()
g.V(v1).addE('knows').to(v2).property('weight',0.75).iterate()
----
-[source,csharp]
-----
-include::../../../gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Docs/Reference/IntroTests.cs[tags=basicGremlinAdds]
-----
[source,java]
----
Vertex v1 = g.addV("person").property("name","marko").next();
Vertex v2 = g.addV("person").property("name","stephen").next();
g.V(v1).addE("knows").to(v2).property("weight",0.75).iterate();
----
-[source,javascript]
-----
-const v1 = g.addV('person').property('name','marko').next();
-const v2 = g.addV('person').property('name','stephen').next();
-g.V(v1).addE('knows').to(v2).property('weight',0.75).iterate();
-----
[source,python]
----
v1 = g.addV('person').property('name','marko').next()
v2 = g.addV('person').property('name','stephen').next()
g.V(v1).addE('knows').to(v2).property('weight',0.75).iterate()
----
-[source,go]
-----
-v1, err := g.AddV("person").Property("name", "marko").Next()
-v2, err := g.AddV("person").Property("name", "stephen").Next()
-g.V(v1).AddE("knows").To(v2).Property("weight", 0.75).Iterate()
-----
The first two lines add a vertex each with the vertex label of "person" and the associated "name" property. The third
line adds an edge with the "knows" label between them and an associated "weight" property. Note the use of `next()`
@@ -541,30 +507,16 @@
marko = g.V().has('person','name','marko').next()
peopleMarkoKnows = g.V().has('person','name','marko').out('knows').toList()
----
-[source,csharp]
-----
-include::../../../gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Docs/Reference/IntroTests.cs[tags=basicGremlinMarkoKnows]
-----
[source,java]
----
Vertex marko = g.V().has("person","name","marko").next()
List<Vertex> peopleMarkoKnows = g.V().has("person","name","marko").out("knows").toList()
----
-[source,javascript]
-----
-const marko = g.V().has('person','name','marko').next()
-const peopleMarkoKnows = g.V().has('person','name','marko').out('knows').toList()
-----
[source,python]
----
marko = g.V().has('person','name','marko').next()
peopleMarkoKnows = g.V().has('person','name','marko').out('knows').toList()
----
-[source,go]
-----
-marko, err := g.V().Has("person", "name", "marko").Next()
-peopleMarkoKnows, err := g.V().Has("person", "name", "marko").Out("knows").ToList()
-----
In all these examples presented so far there really isn't a lot of difference in how the Gremlin itself looks. There
are a few language syntax specific odds and ends, but for the most part Gremlin looks like Gremlin in all of the
@@ -611,7 +563,7 @@
prefer use of Gremlin with `g.addV()` or `g.V(1).properties()`.
Outside of considering these points, the best practice for ensuring the greatest level of compatibility across graphs
-is to avoid <<connecting-embedded,embedded>> mode and stick to the bytecode based approaches explained in the
+is to avoid <<connecting-embedded,embedded>> mode and stick to the traversal-based approaches explained in the
<<connecting-gremlin-server,Gremlin Server>> and the <<connecting-rgp,RGP>> sections above. It creates the least
opportunity to stray from the agnostic path as anything that can be done with those two modes also works in embedded
mode. If using embedded mode, simply write code as though the `Graph` instance is "remote" and not local to the JVM.
diff --git a/docs/src/reference/the-traversal.asciidoc b/docs/src/reference/the-traversal.asciidoc
index 68216d1..a3bcd28 100644
--- a/docs/src/reference/the-traversal.asciidoc
+++ b/docs/src/reference/the-traversal.asciidoc
@@ -54,6 +54,7 @@
[[transactions]]
== Traversal Transactions
+IMPORTANT: 4.0.0-beta.1 Release - Transactions are currently disabled in this beta release.
image:gremlin-coins.png[width=100,float=right] A link:http://en.wikipedia.org/wiki/Database_transaction[database transaction]
represents a unit of work to execute against the database. A traversals unit of work is affected by usage convention
@@ -276,13 +277,16 @@
script can have the ability to execute multiple transactions per request with complete control provided to the
developer to commit or rollback transactions as needed.
+IMPORTANT: 4.0.0-beta.1 Release - Transactions are currently disabled in this beta release.
+
There are two methods for sending scripts to Gremlin Server: sessionless and session-based. With sessionless requests
there will always be an attempt to close the transaction at the end of the request with a commit if there are no errors
or a rollback if there is a failure. It is therefore unnecessary to close transactions manually within scripts
themselves. By default, session-based requests do not have this quality. The transaction will be held open on the
server until the user closes it manually. There is an option to have automatic transaction management for sessions.
-More information on this topic can be found in the <<considering-transactions,Considering Transactions>> Section and
-the <<sessions,Considering Sessions>> Section.
+More information on this topic can be found in the <<considering-transactions,Considering Transactions>> Section.
+
+IMPORTANT: 4.0.0-beta.1 Release - Sessions have been removed. All scripts are now sessionless.
[[tx-rgp]]
=== Remote Gremlin Providers
@@ -3143,7 +3147,7 @@
link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#mergeE(java.util.Map)++[`mergeE(Map)`],
link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#mergeE(org.apache.tinkerpop.gremlin.process.traversal.Traversal)++[`mergeE(Traversal)`],
link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/Merge.html++[`Merge`],
-link:++https://tinkerpop.apache.org/docs/x.y.z/dev/provider/#_mergee++[Semantics]
+link:++https://tinkerpop.apache.org/docs/x.y.z/dev/provider/#merge-e-step++[`Semantics`]
[[mergevertex-step]]
=== MergeVertex Step
@@ -3344,7 +3348,7 @@
link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#mergeV(java.util.Map)++[`mergeV(Map)`],
link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#mergeV(org.apache.tinkerpop.gremlin.process.traversal.Traversal)++[`mergeV(Traversal)`],
link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/Merge.html++[`Merge`],
-link:++https://tinkerpop.apache.org/docs/x.y.z/dev/provider/#_mergee++[Semantics]
+link:++https://tinkerpop.apache.org/docs/x.y.z/dev/provider/#merge-v-step++[`Semantics`]
[[min-step]]
=== Min Step
@@ -3389,6 +3393,7 @@
the supplied predicate and if none of the items pass then the traverser is passed along the stream, otherwise it is
filtered. Empty lists are passed along but null or non-iterable traversers are filtered out.
+
NOTE: Prior to release 3.8.0, `none()` was a traversal discarding step primarily used by <<iterate-step,`iterate()`>>.
This step has since been renamed to <<discard-step,`discard()`>>
@@ -3404,7 +3409,6 @@
link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#none(org.apache.tinkerpop.gremlin.process.traversal.P)++[`none(P)`],
link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/P.html++[`P`]
-
[[not-step]]
=== Not Step
@@ -5975,26 +5979,27 @@
=== ElementIdStrategy
-`ElementIdStrategy` provides control over element identifiers. Some Graph implementations, such as TinkerGraph,
+`ElementIdStrategy` provides control over element identifiers. Some Graph implementations, such as `TinkerGraph`,
allow specification of custom identifiers when creating elements:
[gremlin-groovy]
----
-g = traversal().with(TinkerGraph.open())
+g = traversal().withEmbedded(TinkerGraph.open())
v = g.addV().property(id,'42a').next()
g.V('42a')
----
-Other `Graph` implementations, such as Neo4j, generate element identifiers automatically and cannot be assigned.
+Other `Graph` implementations generate element identifiers automatically and cannot be assigned.
As a helper, `ElementIdStrategy` can be used to make identifier assignment possible by using vertex and edge indices
-under the hood.
+under the hood. Note that this demonstration is using `TinkerGraph` for convenience, however in practice
+`ElementIdStrategy` offers little value in a `Graph` which allows custom identifiers.
[gremlin-groovy]
----
-graph = Neo4jGraph.open('/tmp/neo4j')
strategy = ElementIdStrategy.build().create()
-g = traversal().with(graph).withStrategies(strategy)
+g = traversal().withEmbedded(TinkerGraph.open()).withStrategies(strategy)
g.addV().property(id, '42a').id()
+g.V().elementMap()
----
IMPORTANT: The key that is used to store the assigned identifier should be indexed in the underlying graph
@@ -6383,158 +6388,57 @@
Fortunately, TinkerPop has developed `Translator` infrastructure that will convert Gremlin from one programming
language syntax to another.
-The functionality relevant to most users is actually a sub-function of `Translator` infrastructure and is more
-specifically a `ScriptTranslator` which takes Gremlin `Bytecode` of a traversal and generates a `String` representation
-of that `Bytecode` in the programming language syntax that the `ScriptTranslator` instance supports. The translation
-therefore allows Gremlin to be converted from the host programming language of the `Translator` to another.
+The `GremlinTranslator` class is capable of translating `gremlin-lang` syntax scripts into any of the following
+gremlin language syntaxes: Java, Python, .Net, Go, JavaScript, Groovy. There is additionally a special anonymizing
+translator which strips out arguments which could potentially contain sensitive information.
-The following translators are available, where the first column identifies the host programming language and the
-columns represent the language that Gremlin can be generated in:
+[source,java]
+----
+import org.apache.tinkerpop.gremlin.language.translator.GremlinTranslator;
+import org.apache.tinkerpop.gremlin.language.translator.Translator;
-[width="100%",cols="<,^,^,^,^,^,^",options="header"]
-|=========================================================
-| |Java |Groovy |Javascript |.NET |Python |Go
-|*Java* |- |X |X |X |X |X
-|*Groovy* | |X |X | |X |
-|*Javascript* | |X |- | | |
-|*.NET* | |X | |- | |
-|*Python* | |X | | |- |
-|*Go* | |X | | | |-
-|=========================================================
+// Java
+GremlinTranslator.translate("g.V().hasLabel('person', 'software', 'class')", Translator.JAVA).getTranslated();
+// Returns: "g.V().hasLabel(\"person\", \"software\", \"class\")"
-Each programming language has its own API for translation, but the pattern is quite similar from one to the next:
+// Python
+GremlinTranslator.translate("g.V().hasLabel('person', 'software', 'class')", Translator.PYTHON).getTranslated();
+// Returns: "g.V().has_label('person', 'software', 'class')"
-WARNING: While `Translator` implementations have been around for some time, they are still in their early stages from
-an interface perspective. API changes may occur in the near future.
+// .Net
+GremlinTranslator.translate("g.V().hasLabel('person', 'software', 'class')", Translator.DOTNET).getTranslated();
+// Returns: "g.V().HasLabel(\"person\", \"software\", \"class\")"
+
+// Go
+GremlinTranslator.translate("g.V().hasLabel('person', 'software', 'class')", Translator.GO).getTranslated();
+// Returns: "g.V().HasLabel(\"person\", \"software\", \"class\")"
+
+// JavaScript
+GremlinTranslator.translate("g.V().hasLabel('person', 'software', 'class')", Translator.JAVASCRIPT).getTranslated();
+// Returns: "g.V().hasLabel(\"person\", \"software\", \"class\")"
+
+// Groovy
+GremlinTranslator.translate("g.V().hasLabel('person', 'software', 'class')", Translator.GROOVY).getTranslated();
+// Returns: "g.V().hasLabel('person', 'software', 'class')"
+
+// Anonymized
+GremlinTranslator.translate("g.V().hasLabel('person', 'software', 'class')", Translator.ANONYMIZED).getTranslated();
+// Returns: "g.V().hasLabel(string0, string1, string2)"
+----
+
+Each GLV is capable of producing a `gremlin-lang` script from a Traversal, which can be fed into `GremlinTranslator` to
+convert into any of the supported syntaxes. Each GLV has a unique interface, but the pattern is quite similar from one
+to the next:
[source,java,tab]
----
-// gremlin-core module
-import org.apache.tinkerpop.gremlin.process.traversal.translator.*;
-
-GraphTraversalSource g = ...;
-Traversal<Vertex,Integer> t = g.V().has("person","name","marko").
- where(in("knows")).
- values("age").
- map(Lambda.function("it.get() + 1"));
-
-Translator.ScriptTranslator groovyTranslator = GroovyTranslator.of("g");
-System.out.println(groovyTranslator.translate(t).getScript());
-// OUTPUT: g.V().has("person","name","marko").where(__.in("knows")).values("age").map({it.get() + 1})
-
-Translator.ScriptTranslator dotnetTranslator = DotNetTranslator.of("g");
-System.out.println(dotnetTranslator.translate(t).getScript());
-// OUTPUT: g.V().Has("person","name","marko").Where(__.In("knows")).Values<object>("age").Map<object>(Lambda.Groovy("it.get() + 1"))
-
-Translator.ScriptTranslator pythonTranslator = PythonTranslator.of("g");
-System.out.println(pythonTranslator.translate(t).getScript());
-// OUTPUT: g.V().has('person','name','marko').where(__.in_('knows')).age.map(lambda: "it.get() + 1")
-
-Translator.ScriptTranslator javascriptTranslator = JavascriptTranslator.of("g");
-System.out.println(javascriptTranslator.translate(t).getScript());
-// OUTPUT: g.V().has("person","name","marko").where(__.in_("knows")).values("age").map(() => "it.get() + 1")
-
-Translator.ScriptTranslator golangTranslator = GolangTranslator.of("g");
-System.out.println(golangTranslator.translate(t).getScript());
-// OUTPUT: g.V().Has("person", "name", "marko").Where(gremlingo.T__.In("knows")).Values("age").Map(&gremlingo.Lambda{Script:"it.get() + 1", Language:""})
-----
-[source,javascript]
-----
-const g = ...;
-const t = g.V().has("person","name","marko").
- where(in_("knows")).
- values("age");
-
-// Groovy
-const translator = new gremlin.process.Translator('g');
-console.log(translator.translate(t));
-// OUTPUT: g.V().has('person','name','marko').where(__.in('knows')).values('age')
+GraphTraversal t = g.V().hasLabel("person");
+String script = t.asAdmin().getGremlinLang().getGremlin();
+// Returns: "g.V().hasLabel(\"person\")"
----
[source,python]
----
-from gremlin_python.process.translator import *
-
-g = ...
-t = (g.V().has('person','name','marko').
- where(__.in_("knows")).
- values("age"))
-
-# Groovy
-translator = Translator().of('g');
-print(translator.translate(t.bytecode));
-# OUTPUT: g.V().has('person','name','marko').where(__.in('knows')).values('age')
+t = g.V().has_label('person')
+script = t.gremlin_lang.get_gremlin()
+# Returns: "g.V().hasLabel('person')"
----
-[source,csharp]
-----
-var g = ...;
-var t = g.V().Has("person", "name", "marko").Where(In("knows")).Values<int>("age");
-
-// Groovy
-var translator = GroovyTranslator.Of("g");
-Console.WriteLine(translator.Translate(t));
-// OUTPUT: g.V().has('person', 'name', 'marko').where(__.in('knows')).values('age')
-----
-[source,go]
-----
-g := ...
-t := g.V().Has("person", "name", "marko").
- Where(T__.In("knows")).
- Values("age")
-
-// Groovy
-translator := NewTranslator("g")
-print(translator.Translate(t.Bytecode))
-// OUTPUT: g.V().has('person','name','marko').where(in('knows')).values('age')
-----
-
-The JVM-based translator has the added option of parameter extraction, where the translation process will attempt to
-identify opportunities to generate an output that would replace constant values with parameters. The parameters would
-then be extracted and returned as part of the `Script` object:
-
-[source,java]
-----
-Traversal<Vertex,Integer> t = g.V().has("person","name","marko").
- where(__.in("knows")).
- values("age");
-// specify true to attempt parameter extraction
-Translator.ScriptTranslator translator = GroovyTranslator.of("g", true);
-Script s = translator.translate(t);
-System.out.println(s.getScript());
-// OUTPUT: g.V().has(_args_0,_args_1,_args_2).where(__.in(_args_3)).values(_args_4)
-System.out.println(s.parameters);
-// OUTPUT: Optional[{_args_0=person, _args_2=marko, _args_1=name, _args_4=age, _args_3=knows}]
-----
-
-The `GroovyTranslator` can take a `TypeTranslator` argument which allows some customization of how types get
-converted to script form. The `DefaultTypeTranslator` is used if a specific implementation is not specified. A built-in
-alternative to this implementation is the `LanguageTypeTranslator` which will prefer use of the Gremlin language
-`datetime()` function rather than the JVM specific `Date` and `Timestamp` conversions. This translator can be helpful
-when generating scripts that will be sent to Gremlin Server or Remote Graph Providers supporting the `datetime()` form.
-
-The `PythonTranslator` can take a `TypeTranslator` argument to disable the syntactic sugar which the default translator
-applies to converted queries. The `DefaultTypeTranslator` is used if a specific implementation is not specified.
-
-[source,java]
-----
-Traversal<Vertex,String> t = g.V().range(0, 10).has("person","name","marko").
- limit(2).
- values("name");
-// default translator
-Translator.ScriptTranslator translator = PythonTranslator.of("g");
-String defaultQueryTranslation = translator.translate(t)
-System.out.println(defaultQueryTranslation);
-// OUTPUT: g.V()[0:10].has('person','name','marko')[0:2].name
-
-// no synantic sugar translator
-Translator.ScriptTranslator noSugarTranslator = PythonTranslator.of("g", new PythonTranslator.NoSugarTranslator(false));
-String noSugarTranslation = noSugarTranslator.translate(t)
-System.out.println(noSugarTranslation);
-// OUTPUT: g.V().range_(0,10).has('person','name','marko').limit(2).values('name')
-
-// With parameter extraction
-Translator.ScriptTranslator noSugarTranslatorWithParameters = PythonTranslator.of("g", new PythonTranslator.NoSugarTranslator(true));
-String noSugarTranslationWithParameters = noSugarTranslatorWithParameters.translate(t)
-System.out.println(noSugarTranslationWithParameters);
-// OUTPUT: g.V().range_(0,10).has(_args_0,_args_1,_args_2).limit(2).values(_args_1)
-----
-
diff --git a/docs/src/tutorials/getting-started/index.asciidoc b/docs/src/tutorials/getting-started/index.asciidoc
index e1b1f8e..0973056 100644
--- a/docs/src/tutorials/getting-started/index.asciidoc
+++ b/docs/src/tutorials/getting-started/index.asciidoc
@@ -65,7 +65,7 @@
\,,,/
(o o)
------oOOo-(3)-oOOo-----
+-----oOOo-(4)-oOOo-----
plugin activated: tinkerpop.server
plugin activated: tinkerpop.utilities
plugin activated: tinkerpop.tinkergraph
diff --git a/docs/src/tutorials/the-gremlin-console/index.asciidoc b/docs/src/tutorials/the-gremlin-console/index.asciidoc
index 14726e2..68c9385 100644
--- a/docs/src/tutorials/the-gremlin-console/index.asciidoc
+++ b/docs/src/tutorials/the-gremlin-console/index.asciidoc
@@ -160,7 +160,7 @@
[gremlin-groovy]
----
-:help :remote
+:help :plugin
----
The Gremlin Console can also provide you with code help via auto-complete functionality. Use the `<TAB>` key to
diff --git a/docs/src/upgrade/index.asciidoc b/docs/src/upgrade/index.asciidoc
index 419ee28..5f84447 100644
--- a/docs/src/upgrade/index.asciidoc
+++ b/docs/src/upgrade/index.asciidoc
@@ -28,6 +28,8 @@
equally useful to TinkerPop providers, who build libraries and other systems on the core APIs and protocols that
TinkerPop exposes.
+include::release-4.x.x.asciidoc[]
+
include::release-3.7.x.asciidoc[]
include::release-3.6.x.asciidoc[]
diff --git a/docs/src/upgrade/release-4.x.x.asciidoc b/docs/src/upgrade/release-4.x.x.asciidoc
new file mode 100644
index 0000000..7d551ff
--- /dev/null
+++ b/docs/src/upgrade/release-4.x.x.asciidoc
@@ -0,0 +1,527 @@
+////
+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.
+////
+
+= TinkerPop 4.0.0
+
+image::gremlins-wildest-dreams.png[width=185]
+
+*Gremlin's Wildest Dreams*
+
+== TinkerPop 4.0.0
+
+*Release Date: NOT OFFICIALLY RELEASED YET*
+
+Please see the link:https://github.com/apache/tinkerpop/blob/4.0.0/CHANGELOG.asciidoc#release-4-0-0[changelog] for a
+complete list of all the modifications that are part of this release.
+
+=== Upgrading for Users
+
+==== SLF4j 2.x
+
+TinkerPop has generally upgraded to SLF4j 2.x which brings with it some important changes to log initialization which
+may affect user applications that are upgrading from TinkerPop 3.x. Please see the
+[SLF4j documentation](https://www.slf4j.org/faq.html#changesInVersion200) that explains the differences and how they
+might apply.
+
+=== Upgrading for Providers
+
+==== Graph System Providers
+
+==== Graph Driver Providers
+
+== TinkerPop 4.0.0-beta.1
+
+*Release Date: January 17, 2025*
+
+Please see the link:https://github.com/apache/tinkerpop/blob/4.0.0-beta.1/CHANGELOG.asciidoc#release-4-0-0-beta-1[changelog] for a
+complete list of all the modifications that are part of this release.
+
+NOTE: 4.0.0-beta.1 is a beta/milestone release. It is for meant as a preview version to try out the new HTTP API
+features in the server and drivers (Java/Python only). As this is a beta version only, you can expect breaking changes to
+occur in future betas for 4.0.0 on the way to its General Availability release. Items that have important
+limitations and constraints pertinent to this beta will be highlighted through the documentation inside an
+"IMPORTANT" box that starts with "4.0 Beta Release".
+
+=== Upgrading for Users
+
+[[result-bulking-from-server]]
+==== Result Bulking from Server
+In previous versions, when a traversal is submitted through the DriverRemoteConnection (DRC) via the Bytecode processor,
+the results from the server were bulked as Traverser, which provides a form of result optimization across the wire.
+Starting with 4.0, with the removal of Bytecode and Traverser serializer, this optimization is now achieved via
+`GraphBinaryV4` response message serialization, and can be controlled through cluster setting or per request option.
+
+Per request option setting will always override cluster settings, and regardless of cluster or request option settings,
+bulking will only occur if the script processing language is set to `gremlin-lang` and the serializer is set to `GraphBinaryV4`.
+
+[source,java]
+----
+// cluster setting
+Cluster cluster = Cluster.build().bulkResults(true).create();
+
+// per request option
+GraphTraversalSource g = traversal().with(DriverRemoteConnection.using(cluster));
+List result = g.with("language", "gremlin-lang").with("bulkResults", true).inject(1).toList();
+----
+
+By default, the cluster setting of `bulkResults` is false. To remain consistent with previous behavior, remote traversal
+submitted through the DRC will always send a request option setting `bulkResults` to `true`. This implies that if `gremlin-lang`
+script engine and `GraphBinaryV4` serializer are used, then server will bulk results before sending regardless of cluster setting,
+and can only be disabled via per request option.
+
+==== BulkSet Behavior Changes
+Starting with 4.0, steps which return BulkSet (e.g. `aggregate()`) will have results returned in different format
+depending on embedded or remote usage.
+
+For embedded cases, a BulkSet will be returned as before.
+
+For remote cases, BulkSets will now be expanded into Lists upon deserialization with `gremlin-driver`. All other GLVs
+already expanded BulkSet to List prior to TinkerPop 4. Each element in the BulkSet will appear in the list the same
+number of times as specified by its bulk value.
+
+==== Configuration changes
+This is a placeholder to summarize configuration-related changes.
+
+* Gremlin Server
+** `maxContentLength` setting has been renamed to `maxRequestContentLength`.
+* Java GLV
+** `enableCompression` setting has been removed.
+** `bulkResults` has been added. See <<result-bulking-from-server, result bulking>> for more details.
+** `maxContentLength` setting has been renamed to `maxResponseContentLength` and now blocks incoming responses that are
+too large based on total response size.
+** `addInterceptorAfter`, `addInterceptorBefore`, `addInterceptor` and `removeInterceptor` have been added.
+See <<java-requestinterceptor, Changes to Java RequestInterceptor>> for more details.
+* Python GLV
+** `enableCompression` setting has been removed.
+** `bulk_results` has been added. See <<result-bulking-from-server, result bulking>> for more details.
+** `interceptors` has been added to the Python GLV to modify HTTP requests. See
+<<python-requestinterceptor, Addition of Python interceptor>> for more details.
+** `message_serializer` setting has been separated into `request_serializer` and `response_serializer`. See
+<<python-requestinterceptor, Addition of Python interceptor>> for more details.
+** `username` and `password` settings for the Python GLV has been replaced with `auth`.
+** `kerberized_service` setting has been removed.
+** `session` setting has been removed.
+
+==== Removal of :remote and :submit Console Commands
+
+The `:remote` and `:submit` commands, used to establish connections and send scripts to a remote `gremlin-server`, are
+no longer supported in `gremlin-console`. If sending a traversal, users should instead create a `RemoteTraversalSource`
+(see <<simplified-g-creation, Simplification to g Creation for examples>>).
+
+While a `RemoteTraversalSource` is the preferred method of executing remote traversals from `gremlin-console`, it
+remains possible to send scripts directly using a `gremlin-driver` `Client`.
+
+[gremlin-groovy]
+----
+cluster = Cluster.open('conf/remote.yaml')
+client = cluster.connect()
+
+client.submit("g.V()")
+
+client.close()
+cluster.close()
+----
+
+==== Removal of Gephi Console Plugin
+
+The Gephi Plugin for `gremlin-console` is no longer supported and has been removed. Apache TinkerPop no longer maintains
+any graph visualization tool, however there are a number of community-led alternatives available, many of which are
+listed on the link:https://tinkerpop.apache.org/community.html#powered-by[TinkerPop community page].
+
+[[java-requestinterceptor]]
+==== Changes to Java RequestInterceptor
+
+Because the underlying transport has been changed from WebSockets to HTTP, the usage of the `RequestInterceptor` has
+changed as well. The `RequestInterceptor` will now be run per request and will allow you to completely modify the HTTP
+request that is sent to the server. `Cluster` has four new methods added to it: `addInterceptorAfter`,
+`addInterceptorBefore`, `removeInterceptor` and `addInterceptor`. Each interceptor requires a name as it will be used
+to insert new interceptors in different positions.
+
+The interceptors work with a new class called HttpRequest. This is just a basic abstraction over a request but it also
+contains some useful strings for common headers. The initial `HttpRequest` that is passed to the first interceptor will
+contain a `RequestMessage`. `RequestMessage` is immutable and only certain keys can be added to them. If you want to
+customize the body by adding other fields, you will need to make a different copy of the `RequestMessage` or completely
+change the body to contain a different data type. The final interceptor must return a `HttpRequest` whose body contains
+a `byte[]`.
+
+After the initial HTTP request is generated, the interceptors will be called in order to allow the request to be
+modified. After each `RequestInterceptor` is run, the request is updated with the data from the final `HttpRequest` and
+that is sent to the endpoint. There is a default interceptor added to every `Cluster` called "serializer". This
+interceptor is responsible for serializing the request body is which what the server normally expects. This is intended
+to be an advanced customization technique that should only be used when needed.
+
+[[python-requestinterceptor]]
+==== Addition of Python interceptor
+
+HTTP interceptors have been added to `gremlin-python` to enable capability similar to that of Java GLV. These
+interceptors can be passed into either a `DriverRemoteConnection` or a `Client` using the interceptors parameter. An
+interceptor is a `Callable` that accepts one argument which is the HTTP request (dictionary containing header, payload
+and auth) or a list/tuple of these functions. The interceptors will run after the request serializer has run but before
+any auth functions run so the HTTP request may still get modified after your interceptors are run. In situations where
+you don't want the payload to be serialized, the `message_serializer` has been split into a `request_serializer` and a
+`response_serializer`. Simply set the `request_serializer` to `None` and this will prevent the `RequestMessage` from
+being serialized. Again, this is expected to be an advanced feature so some knowledge of implementation details will be
+required to make this work. For example, you'll need to know what payload formats are accepted by `aiohttp` for the
+request to be sent.
+
+==== Changes to deserialization for gremlin-javascript
+
+Starting from this version, `gremlin-javascript` will deserialize `Set` data into a ECMAScript 2015 Set. Previously,
+these were deserialized into arrays.
+
+==== Gremlin Grammar Changes
+
+A number of changes have been introduced to the Gremlin grammar to help make it be more consistent and easier to use.
+
+*`new` keyword is now optional*
+
+The `new` keyword is now optional in all cases where it was previously used. Both of the following examples are now
+valid syntax with the second being the preferred form going forward:
+
+[source,groovy]
+----
+g.V().withStrategies(new SubgraphStrategy(vertices: __.hasLabel('person')))
+
+g.V().withStrategies(SubgraphStrategy(vertices: __.hasLabel('person')))
+----
+
+In a future version, it is likely that the `new` keyword will be removed entirely from the grammar.
+
+*Refined variable support*
+
+The Gremlin grammar allows variables to be used in various places. Unlike Groovy, from which the Gremlin grammar is
+partially derived and which allows variables to be used for any argument to a method, Gremlin only allows for variables
+to be used when they refer to particular types. In making this change it did mean that all enums like, `Scope`, `Pop`,
+`Order`, etc. can no longer be used in that way and can therefore only be recognized as literal values.
+
+*Supports withoutStrategies()*
+
+The `withoutStrategies()` configuration step is now supported syntax for the grammar. While this option is not commonly
+used it is still a part of the Gremlin language and there are times where it is helpful to have this fine grained
+control over how a traversal works.
+
+[source,groovy]
+----
+g.V().withoutStrategies(CountStrategy)
+----
+
+See: link:https://issues.apache.org/jira/browse/TINKERPOP-2862[TINKERPOP-2862],
+link:https://issues.apache.org/jira/browse/TINKERPOP-3046[TINKERPOP-3046]
+
+==== Renamed none() to discard()
+
+The `none()` step, which was primarily used by `iterate()` to discard traversal results in remote contexts, has been
+renamed to `discard()`. In its place is a new list filtering step `none()`, which takes a predicate as an argument and
+passes lists with no elements matching the predicate.
+
+==== Improved handling of integer overflows
+
+Integer overflows caused by addition and multiplication operations will throw an exception instead of being silently
+skipped with incorrect result.
+
+==== SeedStrategy Construction
+
+The `SeedStrategy` public constructor has been removed for Java and has been replaced by the builder pattern common
+to all strategies. This change was made to ensure that the `SeedStrategy` could be constructed in a consistent manner.
+
+==== Removal of `gremlin-archetype`
+
+`gremlin-archetype`, which contained example projects demonstrating the use cases of TinkerPop, has been removed in
+favor of newer sample applications which can be found in each GLV's `examples` folder.
+
+==== Improved Translators
+
+The various Java `Translator` implementations allowing conversion of Gremlin traversals to string forms in various
+languages have been modified considerably. First, they have been moved from to the
+`org.apache.tinkerpop.gremlin.language.translator` package, because they now depend on the ANTLR grammar in
+`gremlin-language` to handled the translation process. Making this change allowed for a more accurate translation of
+Gremlin that doesn't need to rely on reflection and positional arguments to determine which step was intended for use.
+
+Another important change was the introduction of specific translators for Groovy and Java. While Groovy translation
+tends to work for most Java cases, there is syntax specific to Groovy where it does not. With a specific Java
+translator, the translation process can be more accurate and less error prone.
+
+The syntax for the translators has simplified as well. The translator function now takes a Gremlin string and a target
+language to translate to. Consider the following example:
+
+[source,text]
+----
+gremlin> GremlinTranslator.translate("g.V().out('knows')", Translator.GO)
+==>g.V().Out("knows")
+----
+
+Further note that Gremlin language variants produce `gremlin-language` compliant strings directly since bytecode was
+removed. As a result, all translators in .NET, Python, Go and Javascript have been removed.
+
+See: link:https://issues.apache.org/jira/browse/TINKERPOP-3028[TINKERPOP-3028]
+
+==== Change to `OptionsStrategy` in `gremlin-python`
+
+The `\\__init__()` syntax has been updated to be both more pythonic and more aligned to the `gremlin-lang` syntax.
+Previously, `OptionsStrategy()` took a single argument `options` which was a `dict` of all options to be set.
+Now, all options should be set directly as keyword arguments.
+
+For example:
+
+[source,python]
+----
+# 3.7 and before:
+g.with_strategies(OptionsStrategy(options={'key1': 'value1', 'key2': True}))
+# 4.x and newer:
+g.with_strategies(OptionsStrategy(key1='value1', key2=True))
+
+myOptions = {'key1': 'value1', 'key2': True}
+# 3.7 and before:
+g.with_strategies(OptionsStrategy(options=myOptions))
+# 4.x and newer:
+g.with_strategies(OptionsStrategy(**myOptions))
+----
+
+==== Custom Traversal Strategy Construction
+
+Traversal strategy construction has been updated such that it is no longer required to have concrete classes for each
+strategy being added to a graph traversal (use of concrete classes remains viable and is recommended for "native"
+TinkerPop strategies). To use strategies without a concrete class, `TraversalStrategyProxy` can be used in Java, and
+`TraversalStrategy` in Python.
+
+All the following examples will produce the script `g.withStrategies(new MyStrategy(config1:'my value',config2:123))`:
+
+[source,java]
+----
+Map<String, Object> configMap = new LinkedHashMap<>();
+ configMap.put("config1", "my value");
+ configMap.put("config2", 123);
+ TraversalStrategy strategyProxy = new TraversalStrategyProxy("MyStrategy", new MapConfiguration(configMap));
+
+ GraphTraversal traversal = g.withStrategies(strategyProxy);
+----
+
+[source,python]
+----
+g.with_strategies(TraversalStrategy(
+ strategy_name='MyStrategy',
+ config1='my value',
+ config2=123
+ ))
+----
+
+==== Changes to Serialization
+
+The GLVs will only support GraphBinaryV4 and GraphSON support will be removed. This means that the serializer option
+that was available in most GLVs has been removed. GraphBinary is a more compact format and has support for the same
+types. This should lead to increased performance for users upgrading from any version of GraphSON to GraphBinary.
+
+The number of serializable types has been reduced in V4. For example, only a single temporal type remains. You have two
+options when trying to work with data types whose serializer has been removed: first, you can attempt to convert the
+data to another type that still have a serializer or, second, the type may have been too specific and therefore removed
+in which case your provider should have a Provider Defined Type (PDT) for it. See the next paragraph for information on
+PDTs.
+
+Custom serializers have also been removed so if you previously included those as part of your application, they should
+now be removed. In its place, PDTs have been introduced. In particular, there is the Primitive PDT and the Composite
+PDT. Primitive PDTs are string-based representations of a primitive type supported by your provider. Composite types
+contain a map of fields. You should consult your provider's documentation to determine what types of fields a
+particular PDT may contain.
+
+==== Changes to Authentication and Authorization
+
+With the move to HTTP, the only authentication option supported out-of-the-box is HTTP basic access authentication
+(username/password). The SASL-based authentication mechanisms are no longer supported (e.g. Kerberos). Your graph
+system provider may choose to implement other authentication mechanisms over HTTP which you would have to use via a
+request interceptor. Refer to your provider's documentation to determine if other authentication mechanisms are
+available.
+
+==== Transactions Disabled
+
+IMPORTANT: 4.0.0-beta.1 Release - Transactions are currently disabled and use of `tx()` will return an error.
+
+==== Removal of Sessions
+
+Support for sessions has been removed. All requests are now "sessionless" with no shared state across subsequent requests.
+
+==== Result Bulking Changes
+
+Previous versions of the Gremlin Server would attempt to "bulk" the result if bytecode was used in the request. This
+"bulking" increased performance by sending similar results once with a count of occurrences. Starting in 4.0, Gremlin
+Server will bulk based on a newly introduced `bulked` field in the `RequestMessage`. It only applies to GraphBinary and
+`gremlin-lang` requests and other requests won't be bulked. This can be toggled in the language variants by setting a
+boolean value with `enableBulkedResult()` in the `Cluster` settings.
+
+==== Gremlin Java Changes
+
+Connection pooling has been updated to work with HTTP. Previously, connections could only be opened one at a time, but
+this has changed and now many connections can be opened at the same time. This supports bursty workloads where many
+queries may be issued within a short period of time. Connections are no longer closed based on how "busy" they are
+based on the `minInProcessPerConnection` and `minSimultaneousUsagePerConnection`, rather they are closed based on an
+idle timeout called `idleConnectionTimeout`. Because the number of connections can increase much faster and connections
+are closed based on a timeout, the `minConnectionPoolSize` option has been removed and there may be zero connections
+available if the driver has been idle for a while.
+
+The Java driver can currently handle a response that is a maximum of 2^31-1 (`Integer.MAX_VALUE`) bytes in size.
+Queries that return more data will have to be separated into multiple queries that return less data.
+
+==== GValue
+
+Parameterization was first added to gremlin-lang in TinkerPop 3.7.0, however was limited in that variables were
+immediately resolved to literals during the compilation of a gremlin script. This direct resolution of variables limited
+providers ability to detect and optimize recurring query patterns.
+
+With this update, a new class `GValue` is introduced which wraps a parameter name and value. Steps which will benefit
+from parameterization have been given overloads to accept GValues. Users can pass GValue's into their traversals to
+inject parameters.
+
+A `GValue` wraps a parameter name and value, and can be provided as input to parameterizable steps when building a
+`GraphTraversal`. The following examples will produce a gremlin script of `g.V().hasLabel(label)` with a parameter map
+of `["label": "person"]`:
+
+[source,java]
+----
+g.V().hasLabel(GValue.of("label", "person"));
+----
+
+[source,python]
+----
+g.V().has_label(GValue('label', 'person'))
+----
+
+Use of `GValue` in traversals with repeated patterns may lead to improved performance in certain graphs. Consult the
+documentation for your specific graph provider for recommendations on how to best utilize `GValue` in traversals.
+
+A new `DefaultVariableResolver` has also been introduced with this change. The grammar will now resolve variables into
+`GValue` which are passed to the constructed traversal, instead of directly resolving them to literals. The old variable
+resolution behavior can still be obtained via the `DirectVariableResolver` if desired.
+
+==== Gremlin Server Default Language
+
+`gremlin-lang` is now the default language and script engine in Gremlin-Server, replacing `gremlin-groovy`. Users may
+still explicitly set the `language` field of a request message to `"gremlin-groovy"` in cases where groovy scripts are
+required.
+
+=== Upgrading for Providers
+
+==== Renaming NoneStep to DiscardStep
+NoneStep, which was primarily used by `iterate()` to discard traversal results in remote contexts, has been renamed to
+DiscardStep. In its place is a new list filtering NoneStep, which takes a predicate as an argument and passes lists with
+no elements matching the predicate.
+
+==== Changes to Serialization
+
+The V4 versions of GraphBinary and GraphSON are being introduced. Support for the older versions of GraphBinary (V1)
+and GraphSON (V1-3) is removed. Upon the full release of 4.0, the GLVs will only use GraphBinary, however, the Gremlin
+Server will support both GraphSON and GraphBinary. The following is a list of the major changes to the GraphBinary
+format:
+
+* Removed type serializers:
+** Period
+** Date
+** TimeStamp
+** Instant
+** ZonedDateTime
+** OffsetTime
+** LocalDateTime
+** LocalDate
+** LocalTime
+** MonthDay
+** YearMonth
+** Year
+** ZoneOffset
+** BulkSet
+** Class
+** Binding
+** Bytecode
+** Barrier
+** Cardinality
+** Column
+** Operator
+** Order
+** Pick
+** Pop
+** Scope
+** DT
+** Lambda
+** P
+** Traverser
+** TextP
+** TraversalStrategy
+** Metrics
+** TraversalMetrics
+** InetAddress
+* OffsetDatetime has been renamed to Datetime. This type maps to `OffsetDateTime` in Java and a `datetime` in Python.
+* Byte is redefined from being unsigned byte to a signed byte.
+* List has a `0x02` value_flag used to denote bulking.
+* Map has a `0x02` value_flag used to denote ordering.
+* `Element` (Vertex, Edge, VertexProperty) labels have been changed from `String` to `List` of `String`.
+* `Element` (Vertex, Edge, VertexProperty) properties are no longer null and are `List` of `Property`.
+* Custom is replaced with Provider Defined Types
+
+One of the biggest differences is in datetime support. Previously, in the Java implementation, `java.util.Date`,
+`java.sql.Timestamp` and most types from the `java.time` package had serializers. This isn't the case in GraphSON 4
+as only `java.time.OffsetDateTime` is supported. Java provides methods to convert amongst these classes so they should
+be used to convert your data to and from `java.time.OffsetDateTime`.
+
+The `GraphSONSerializerProvider` is not used in GraphSON 4. The `GraphSONSerializerProvider` uses the
+`ToStringSerializer` for any unknown type and was used in previous GraphSON versions. Because GraphSON 4 is only
+intended to serialize specific types and not used as a general serializer, GraphSON 4 serializers will throw an error
+when encountering unknown types.
+
+==== Graph System Providers
+
+===== AbstractAuthenticatorHandler Constructor
+
+The deprecated one-arg constructor for `AbstractAuthenticationHandler` has been removed along with two-arg constructors
+for the implementations. Gremlin Server formerly supported the two-arg `Authenticator`, and `Settings` constructor for
+instantiating new custom instances. It now expects implementations of `AbstractAuthenticationHandler` to use a
+three-arg constructor that takes `Authenticator`, `Authorizer`, and `Settings`.
+
+===== GraphManager Changes
+
+The `beforeQueryStart()`, `onQueryError()`, and `onQuerySuccess()` of `GraphManager` have been removed. These were
+originally intended to give providers more insight into when execution occurs in the server and the outcome of that
+execution. However, they depended on `RequestMessage` containing a Request ID, which isn't the case anymore.
+
+===== Gremlin Server Updates
+
+The `OpProcessor` extension point of the server has been removed. In order to extend the functionality of the Gremlin
+Server, you have to implement your own `Channelizer`.
+
+If you are a provider that makes use of the Gremlin Server, you may need to update server configuration YAML files that
+you provide to your users. With the change from WebSockets to HTTP, some of the previous default values are invalid and
+some of the fields no longer exist. See link:https://tinkerpop.apache.org/docs/4.0.0/reference/#_configuring_2[options]
+for an updated list. One of the most important changes is to the `Channelizer` configuration as only the
+`HttpChannelizer` remains and the rest have been removed.
+
+===== Gremlin Server Default Language
+
+`gremlin-lang` is now the default language and script engine in Gremlin-Server, replacing `gremlin-groovy`. Users may
+still explicitly set the `language` field of a request message to `"gremlin-groovy"` in cases where groovy scripts are
+required.
+
+==== Graph Driver Providers
+
+===== Application Layer Protocol Support
+
+HTTP/1.1 is now the only supported application-layer protocol and WebSockets support is dropped. Please follow the
+instructions in the
+link:https://tinkerpop.apache.org/docs/4.0.0/dev/provider/#_graph_driver_provider_requirements[provider documentation]
+for more detailed information. The subprotocol remains fairly similar but has been adjusted to work better with HTTP.
+Also, the move to HTTP means that SASL has been removed as an authentication mechanism and only HTTP basic remains.
+
+===== Request Interceptor
+
+It is strongly recommended that every graph driver provider give a way for users to intercept and modify the HTTP
+request before it is sent off to the server. This capability is needed in cases where the graph system provider has
+additional functionality that can be enabled by modifying the HTTP request.
diff --git a/docs/static/images/gremlin-calendar.png b/docs/static/images/gremlin-calendar.png
new file mode 100644
index 0000000..3eecf37
--- /dev/null
+++ b/docs/static/images/gremlin-calendar.png
Binary files differ
diff --git a/docs/static/images/gremlin-fine.png b/docs/static/images/gremlin-fine.png
new file mode 100644
index 0000000..bd70d27
--- /dev/null
+++ b/docs/static/images/gremlin-fine.png
Binary files differ
diff --git a/docs/static/images/gremlin-string.png b/docs/static/images/gremlin-string.png
new file mode 100644
index 0000000..b5c1200
--- /dev/null
+++ b/docs/static/images/gremlin-string.png
Binary files differ
diff --git a/docs/static/images/gremlin-tag.png b/docs/static/images/gremlin-tag.png
new file mode 100644
index 0000000..74e838f
--- /dev/null
+++ b/docs/static/images/gremlin-tag.png
Binary files differ
diff --git a/docs/static/images/gremlin-with-collection.png b/docs/static/images/gremlin-with-collection.png
new file mode 100644
index 0000000..5c9cec5
--- /dev/null
+++ b/docs/static/images/gremlin-with-collection.png
Binary files differ
diff --git a/docs/static/images/gremlins-wildest-dreams.png b/docs/static/images/gremlins-wildest-dreams.png
new file mode 100644
index 0000000..05c9ee5
--- /dev/null
+++ b/docs/static/images/gremlins-wildest-dreams.png
Binary files differ
diff --git a/gremlin-annotations/pom.xml b/gremlin-annotations/pom.xml
index 20c844f..c233fee 100644
--- a/gremlin-annotations/pom.xml
+++ b/gremlin-annotations/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>tinkerpop</artifactId>
<groupId>org.apache.tinkerpop</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>gremlin-annotations</artifactId>
@@ -57,7 +57,7 @@
<dependency>
<groupId>com.google.testing.compile</groupId>
<artifactId>compile-testing</artifactId>
- <version>0.19</version>
+ <version>0.21.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
diff --git a/gremlin-annotations/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/GremlinDslProcessor.java b/gremlin-annotations/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/GremlinDslProcessor.java
index 295efcd..17f37db 100644
--- a/gremlin-annotations/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/GremlinDslProcessor.java
+++ b/gremlin-annotations/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/GremlinDslProcessor.java
@@ -273,7 +273,7 @@
.addModifiers(Modifier.PUBLIC)
.addAnnotation(Override.class)
.addStatement("$N clone = this.clone()", ctx.traversalSourceClazz)
- .addStatement("clone.getBytecode().addStep($T.addV)", GraphTraversal.Symbols.class)
+ .addStatement("clone.getGremlinLang().addStep($T.addV)", GraphTraversal.Symbols.class)
.addStatement("$N traversal = new $N(clone)", ctx.defaultTraversalClazz, ctx.defaultTraversalClazz)
.addStatement("return ($T) traversal.asAdmin().addStep(new $T(traversal, (String) null))", ctx.traversalClassName, AddVertexStartStep.class)
.returns(ParameterizedTypeName.get(ctx.traversalClassName, ClassName.get(Vertex.class), ClassName.get(Vertex.class)))
@@ -283,7 +283,7 @@
.addAnnotation(Override.class)
.addParameter(String.class, "label")
.addStatement("$N clone = this.clone()", ctx.traversalSourceClazz)
- .addStatement("clone.getBytecode().addStep($T.addV, label)", GraphTraversal.Symbols.class)
+ .addStatement("clone.getGremlinLang().addStep($T.addV, label)", GraphTraversal.Symbols.class)
.addStatement("$N traversal = new $N(clone)", ctx.defaultTraversalClazz, ctx.defaultTraversalClazz)
.addStatement("return ($T) traversal.asAdmin().addStep(new $T(traversal, label))", ctx.traversalClassName, AddVertexStartStep.class)
.returns(ParameterizedTypeName.get(ctx.traversalClassName, ClassName.get(Vertex.class), ClassName.get(Vertex.class)))
@@ -293,7 +293,7 @@
.addAnnotation(Override.class)
.addParameter(Traversal.class, "vertexLabelTraversal")
.addStatement("$N clone = this.clone()", ctx.traversalSourceClazz)
- .addStatement("clone.getBytecode().addStep($T.addV, vertexLabelTraversal)", GraphTraversal.Symbols.class)
+ .addStatement("clone.getGremlinLang().addStep($T.addV, vertexLabelTraversal)", GraphTraversal.Symbols.class)
.addStatement("$N traversal = new $N(clone)", ctx.defaultTraversalClazz, ctx.defaultTraversalClazz)
.addStatement("return ($T) traversal.asAdmin().addStep(new $T(traversal, vertexLabelTraversal))", ctx.traversalClassName, AddVertexStartStep.class)
.returns(ParameterizedTypeName.get(ctx.traversalClassName, ClassName.get(Vertex.class), ClassName.get(Vertex.class)))
@@ -303,7 +303,7 @@
.addAnnotation(Override.class)
.addParameter(String.class, "label")
.addStatement("$N clone = this.clone()", ctx.traversalSourceClazz)
- .addStatement("clone.getBytecode().addStep($T.addE, label)", GraphTraversal.Symbols.class)
+ .addStatement("clone.getGremlinLang().addStep($T.addE, label)", GraphTraversal.Symbols.class)
.addStatement("$N traversal = new $N(clone)", ctx.defaultTraversalClazz, ctx.defaultTraversalClazz)
.addStatement("return ($T) traversal.asAdmin().addStep(new $T(traversal, label))", ctx.traversalClassName, AddEdgeStartStep.class)
.returns(ParameterizedTypeName.get(ctx.traversalClassName, ClassName.get(Edge.class), ClassName.get(Edge.class)))
@@ -313,7 +313,7 @@
.addAnnotation(Override.class)
.addParameter(Traversal.class, "edgeLabelTraversal")
.addStatement("$N clone = this.clone()", ctx.traversalSourceClazz)
- .addStatement("clone.getBytecode().addStep($T.addE, edgeLabelTraversal)", GraphTraversal.Symbols.class)
+ .addStatement("clone.getGremlinLang().addStep($T.addE, edgeLabelTraversal)", GraphTraversal.Symbols.class)
.addStatement("$N traversal = new $N(clone)", ctx.defaultTraversalClazz, ctx.defaultTraversalClazz)
.addStatement("return ($T) traversal.asAdmin().addStep(new $T(traversal, edgeLabelTraversal))", ctx.traversalClassName, AddEdgeStartStep.class)
.returns(ParameterizedTypeName.get(ctx.traversalClassName, ClassName.get(Edge.class), ClassName.get(Edge.class)))
@@ -324,7 +324,7 @@
.addParameter(Object[].class, "vertexIds")
.varargs(true)
.addStatement("$N clone = this.clone()", ctx.traversalSourceClazz)
- .addStatement("clone.getBytecode().addStep($T.V, vertexIds)", GraphTraversal.Symbols.class)
+ .addStatement("clone.getGremlinLang().addStep($T.V, vertexIds)", GraphTraversal.Symbols.class)
.addStatement("$N traversal = new $N(clone)", ctx.defaultTraversalClazz, ctx.defaultTraversalClazz)
.addStatement("return ($T) traversal.asAdmin().addStep(new $T(traversal, $T.class, true, vertexIds))", ctx.traversalClassName, GraphStep.class, Vertex.class)
.returns(ParameterizedTypeName.get(ctx.traversalClassName, ClassName.get(Vertex.class), ClassName.get(Vertex.class)))
@@ -335,7 +335,7 @@
.addParameter(Object[].class, "edgeIds")
.varargs(true)
.addStatement("$N clone = this.clone()", ctx.traversalSourceClazz)
- .addStatement("clone.getBytecode().addStep($T.E, edgeIds)", GraphTraversal.Symbols.class)
+ .addStatement("clone.getGremlinLang().addStep($T.E, edgeIds)", GraphTraversal.Symbols.class)
.addStatement("$N traversal = new $N(clone)", ctx.defaultTraversalClazz, ctx.defaultTraversalClazz)
.addStatement("return ($T) traversal.asAdmin().addStep(new $T(traversal, $T.class, true, edgeIds))", ctx.traversalClassName, GraphStep.class, Edge.class)
.returns(ParameterizedTypeName.get(ctx.traversalClassName, ClassName.get(Edge.class), ClassName.get(Edge.class)))
@@ -347,7 +347,7 @@
.varargs(true)
.addTypeVariable(TypeVariableName.get("S"))
.addStatement("$N clone = this.clone()", ctx.traversalSourceClazz)
- .addStatement("clone.getBytecode().addStep($T.inject, starts)", GraphTraversal.Symbols.class)
+ .addStatement("clone.getGremlinLang().addStep($T.inject, starts)", GraphTraversal.Symbols.class)
.addStatement("$N traversal = new $N(clone)", ctx.defaultTraversalClazz, ctx.defaultTraversalClazz)
.addStatement("return ($T) traversal.asAdmin().addStep(new $T(traversal, starts))", ctx.traversalClassName, InjectStep.class)
.returns(ParameterizedTypeName.get(ctx.traversalClassName, TypeVariableName.get("S"), TypeVariableName.get("S")))
diff --git a/gremlin-annotations/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/SocialPackageTraversalSourceDsl.java b/gremlin-annotations/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/SocialPackageTraversalSourceDsl.java
index c9c8be6..5c00982 100644
--- a/gremlin-annotations/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/SocialPackageTraversalSourceDsl.java
+++ b/gremlin-annotations/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/SocialPackageTraversalSourceDsl.java
@@ -48,7 +48,7 @@
public GraphTraversal<Vertex, Vertex> persons(String... names) {
GraphTraversalSource clone = this.clone();
- clone.getBytecode().addStep(GraphTraversal.Symbols.V);
+ clone.getGremlinLang().addStep(GraphTraversal.Symbols.V);
GraphTraversal<Vertex, Vertex> traversal = new DefaultGraphTraversal<>(clone);
traversal.asAdmin().addStep(new GraphStep<>(traversal.asAdmin(), Vertex.class, true));
diff --git a/gremlin-archetype/gremlin-archetype-dsl/pom.xml b/gremlin-archetype/gremlin-archetype-dsl/pom.xml
deleted file mode 100644
index b199318..0000000
--- a/gremlin-archetype/gremlin-archetype-dsl/pom.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tinkerpop</groupId>
- <artifactId>gremlin-archetype</artifactId>
- <version>3.8.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>gremlin-archetype-dsl</artifactId>
- <name>Apache TinkerPop :: Archetype - DSL</name>
- <packaging>jar</packaging>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-archetype-plugin</artifactId>
- </plugin>
- </plugins>
-
- <!-- apply variable substitution on the following files using variables from this pom -->
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- <includes>
- <include>archetype-resources/pom.xml</include>
- <include>archetype-resources/README.asciidoc</include>
- </includes>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>false</filtering>
- <excludes>
- <exclude>archetype-resources/pom.xml</exclude>
- <exclude>archetype-resources/README.asciidoc</exclude>
- </excludes>
- </resource>
- </resources>
- </build>
-</project>
diff --git a/gremlin-archetype/gremlin-archetype-dsl/src/main/resources/META-INF/maven/archetype-metadata.xml b/gremlin-archetype/gremlin-archetype-dsl/src/main/resources/META-INF/maven/archetype-metadata.xml
deleted file mode 100644
index a159ee3..0000000
--- a/gremlin-archetype/gremlin-archetype-dsl/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<archetype-descriptor xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd" name="gremlin-archetype-tinkergraph"
- xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <fileSets>
- <fileSet filtered="true">
- <directory></directory>
- <includes>
- <include>README.asciidoc</include>
- </includes>
- <excludes>
- <exclude>**/*.xml</exclude>
- </excludes>
- </fileSet>
- <fileSet filtered="true" packaged="true">
- <directory>src/main/java</directory>
- </fileSet>
- <fileSet filtered="true" packaged="true">
- <directory>src/test/java</directory>
- </fileSet>
- </fileSets>
-
-</archetype-descriptor>
\ No newline at end of file
diff --git a/gremlin-archetype/gremlin-archetype-dsl/src/main/resources/archetype-resources/README.asciidoc b/gremlin-archetype/gremlin-archetype-dsl/src/main/resources/archetype-resources/README.asciidoc
deleted file mode 100644
index 1471018..0000000
--- a/gremlin-archetype/gremlin-archetype-dsl/src/main/resources/archetype-resources/README.asciidoc
+++ /dev/null
@@ -1,32 +0,0 @@
-////
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-////
-= Gremlin DSL
-
-This is a starter project that demonstrates how a basic
-link:http://tinkerpop.apache.org/docs/${project.version}/reference/#dsl[Domain Specific Language] (DSL) project is
-structured with Java and Maven. The DSL is built to work with the TinkerPop "modern" toy graph. Please see the unit
-tests in `SocialDslTest` for actual DSL usage.
-
-== Prerequisites
-
-* Java 11
-* link:https://maven.apache.org/[Maven 3.3+]
-
-== Building and Running
-
-[source,text]
-mvn clean install
diff --git a/gremlin-archetype/gremlin-archetype-dsl/src/main/resources/archetype-resources/pom.xml b/gremlin-archetype/gremlin-archetype-dsl/src/main/resources/archetype-resources/pom.xml
deleted file mode 100644
index 53078ce..0000000
--- a/gremlin-archetype/gremlin-archetype-dsl/src/main/resources/archetype-resources/pom.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>${groupId}</groupId>
- <artifactId>\${artifactId}</artifactId>
- <version>${version}</version>
-
- <name>Social DSL: Modern Graph</name>
-
- <packaging>jar</packaging>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.tinkerpop</groupId>
- <artifactId>tinkergraph-gremlin</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tinkerpop</groupId>
- <artifactId>gremlin-annotations</artifactId>
- <version>${project.version}</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>${logback.version}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.14.0</version>
- <configuration>
- <release>8</release>
- <source>8</source>
- <target>8</target>
- <compilerArgs>
- <arg>-parameters</arg>
- </compilerArgs>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
\ No newline at end of file
diff --git a/gremlin-archetype/gremlin-archetype-dsl/src/main/resources/archetype-resources/src/main/java/SocialTraversalDsl.java b/gremlin-archetype/gremlin-archetype-dsl/src/main/resources/archetype-resources/src/main/java/SocialTraversalDsl.java
deleted file mode 100644
index e4d48bc..0000000
--- a/gremlin-archetype/gremlin-archetype-dsl/src/main/resources/archetype-resources/src/main/java/SocialTraversalDsl.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package ${package};
-
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.GremlinDsl;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.GremlinDsl.AnonymousMethod;
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.process.traversal.P;
-
-/**
- * This Social DSL is meant to be used with the TinkerPop "modern" toy graph.
- * <p/>
- * All DSLs should extend {@code GraphTraversal.Admin} and be suffixed with "TraversalDsl". Simply add DSL traversal
- * methods to this interface. Use Gremlin's steps to build the underlying traversal in these methods to ensure
- * compatibility with the rest of the TinkerPop stack and provider implementations.
- * <p/>
- * Arguments provided to the {@code GremlinDsl} annotation are all optional. In this case, a {@code traversalSource} is
- * specified which points to a specific implementation to use. Had that argument not been specified then a default
- * {@code TraversalSource} would have been generated.
- */
-@GremlinDsl(traversalSource = "${package}.SocialTraversalSourceDsl")
-public interface SocialTraversalDsl<S, E> extends GraphTraversal.Admin<S, E> {
-
- /**
- * From a {@code Vertex} traverse "knows" edges to adjacent "person" vertices and filter those vertices on the
- * "name" property.
- *
- * @param personName the name of the person to filter on
- */
- public default GraphTraversal<S, Vertex> knows(String personName) {
- return ((SocialTraversalDsl) out("knows")).person().has("name", personName);
- }
-
- /**
- * From a {@code Vertex} traverse "knows" edges to adjacent "person" vertices and determine the youngest age of
- * those persons.
- */
- public default <E2 extends Number> GraphTraversal<S, E2> youngestFriendsAge() {
- return ((SocialTraversalDsl) out("knows")).person().values("age").min();
- }
-
- /**
- * Designed to be used as a filter for "person" vertices based on the number of "created" edges encountered.
- *
- * @param number the minimum number of projects a person created
- */
- public default GraphTraversal<S, Long> createdAtLeast(int number) {
- return outE("created").count().is(P.gte(number));
- }
-
- /**
- * Filters objects by the "person" label. This step is designed to work with incoming vertices.
- */
- @GremlinDsl.AnonymousMethod(returnTypeParameters = {"A", "A"}, methodTypeParameters = {"A"})
- public default GraphTraversal<S, E> person() {
- return hasLabel("person");
- }
-}
diff --git a/gremlin-archetype/gremlin-archetype-dsl/src/main/resources/archetype-resources/src/main/java/SocialTraversalSourceDsl.java b/gremlin-archetype/gremlin-archetype-dsl/src/main/resources/archetype-resources/src/main/java/SocialTraversalSourceDsl.java
deleted file mode 100644
index e4d1b8a..0000000
--- a/gremlin-archetype/gremlin-archetype-dsl/src/main/resources/archetype-resources/src/main/java/SocialTraversalSourceDsl.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package ${package};
-
-import org.apache.tinkerpop.gremlin.process.remote.RemoteConnection;
-import org.apache.tinkerpop.gremlin.process.traversal.P;
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategies;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.GremlinDsl;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.DefaultGraphTraversal;
-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.map.GraphStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.HasContainer;
-import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.T;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-
-/**
- * See {@code SocialTraversalDsl} for more information about this DSL.
- */
-public class SocialTraversalSourceDsl extends GraphTraversalSource {
-
- public SocialTraversalSourceDsl(final Graph graph, final TraversalStrategies traversalStrategies) {
- super(graph, traversalStrategies);
- }
-
- public SocialTraversalSourceDsl(final Graph graph) {
- super(graph);
- }
-
- public SocialTraversalSourceDsl(final RemoteConnection connection) {
- super(connection);
- }
-
- /**
- * Starts a traversal that finds all vertices with a "person" label and optionally allows filtering of those
- * vertices on the "name" property.
- *
- * @param names list of person names to filter on
- */
- public GraphTraversal<Vertex, Vertex> persons(String... names) {
- GraphTraversalSource clone = this.clone();
-
- // Manually add a "start" step for the traversal in this case the equivalent of V(). GraphStep is marked
- // as a "start" step by passing "true" in the constructor.
- clone.getBytecode().addStep(GraphTraversal.Symbols.V);
- GraphTraversal<Vertex, Vertex> traversal = new DefaultGraphTraversal<>(clone);
- traversal.asAdmin().addStep(new GraphStep<>(traversal.asAdmin(), Vertex.class, true));
-
- traversal = traversal.hasLabel("person");
- if (names.length > 0) traversal = traversal.has("name", P.within(names));
-
- return traversal;
- }
-}
diff --git a/gremlin-archetype/gremlin-archetype-dsl/src/main/resources/archetype-resources/src/test/java/SocialDslTest.java b/gremlin-archetype/gremlin-archetype-dsl/src/main/resources/archetype-resources/src/test/java/SocialDslTest.java
deleted file mode 100644
index cf70e0b..0000000
--- a/gremlin-archetype/gremlin-archetype-dsl/src/main/resources/archetype-resources/src/test/java/SocialDslTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package ${package};
-
-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.remote.EmbeddedRemoteConnection;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
-
-import org.junit.Test;
-
-import static org.apache.tinkerpop.gremlin.process.traversal.AnonymousTraversalSource.traversal;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-public class SocialDslTest {
-
- private Graph graph = TinkerFactory.createModern();
- private SocialTraversalSource social = traversal(SocialTraversalSource.class).with(graph);
-
- @Test
- public void shouldValidateThatMarkoKnowsJosh() {
- assertTrue(social.V().has("name","marko").knows("josh").hasNext());
- assertTrue(social.persons("marko").knows("josh").hasNext());
- }
-
- @Test
- public void shouldGetAgeOfYoungestFriendOfMarko() {
- assertEquals(27, social.V().has("name","marko").youngestFriendsAge().next().intValue());
- assertEquals(27, social.persons("marko").youngestFriendsAge().next().intValue());
- }
-
- @Test
- public void shouldAllowToUseLocalGraphAsRemoteWithParameter() {
- final Graph graph = EmptyGraph.instance();
- final GraphTraversalSource g = graph.traversal();
- final GraphTraversalSource simulatedRemoteG = traversal().with(new EmbeddedRemoteConnection(g));
- assertEquals(33, simulatedRemoteG.inject(GValue.of(null, 11), GValue.of("x", 22)).sum().next());
- }
-
- @Test
- public void shouldFindAllPersons() {
- assertEquals(4, social.persons().count().next().intValue());
- }
-
- @Test
- public void shouldFindAllPersonsWithTwoOrMoreProjects() {
- assertEquals(1, social.persons().filter(__.createdAtLeast(2)).count().next().intValue());
- }
-}
\ No newline at end of file
diff --git a/gremlin-archetype/gremlin-archetype-dsl/src/test/resources/projects/standard/archetype.properties b/gremlin-archetype/gremlin-archetype-dsl/src/test/resources/projects/standard/archetype.properties
deleted file mode 100644
index cf98705..0000000
--- a/gremlin-archetype/gremlin-archetype-dsl/src/test/resources/projects/standard/archetype.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-groupId=org.apache.tinkerpop
-artifactId=gremlin-archetype-dsl
-package=com.test.example
-version=1.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/gremlin-archetype/gremlin-archetype-dsl/src/test/resources/projects/standard/goal.txt b/gremlin-archetype/gremlin-archetype-dsl/src/test/resources/projects/standard/goal.txt
deleted file mode 100644
index 4a1a71d..0000000
--- a/gremlin-archetype/gremlin-archetype-dsl/src/test/resources/projects/standard/goal.txt
+++ /dev/null
@@ -1 +0,0 @@
-verify
\ No newline at end of file
diff --git a/gremlin-archetype/gremlin-archetype-server/pom.xml b/gremlin-archetype/gremlin-archetype-server/pom.xml
deleted file mode 100644
index 5990d21..0000000
--- a/gremlin-archetype/gremlin-archetype-server/pom.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tinkerpop</groupId>
- <artifactId>gremlin-archetype</artifactId>
- <version>3.8.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>gremlin-archetype-server</artifactId>
- <name>Apache TinkerPop :: Archetype - Server</name>
- <packaging>jar</packaging>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-archetype-plugin</artifactId>
- </plugin>
- </plugins>
-
- <!-- apply variable substitution on the following files using variables from this pom -->
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- <includes>
- <include>archetype-resources/pom.xml</include>
- <include>archetype-resources/README.asciidoc</include>
- </includes>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>false</filtering>
- <excludes>
- <exclude>archetype-resources/pom.xml</exclude>
- <exclude>archetype-resources/README.asciidoc</exclude>
- </excludes>
- </resource>
- </resources>
- </build>
-</project>
\ No newline at end of file
diff --git a/gremlin-archetype/gremlin-archetype-server/src/main/resources/META-INF/maven/archetype-metadata.xml b/gremlin-archetype/gremlin-archetype-server/src/main/resources/META-INF/maven/archetype-metadata.xml
deleted file mode 100644
index 93d66a8..0000000
--- a/gremlin-archetype/gremlin-archetype-server/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<archetype-descriptor xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd" name="gremlin-archetype-tinkergraph"
- xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <fileSets>
- <fileSet filtered="true">
- <directory></directory>
- <includes>
- <include>README.asciidoc</include>
- </includes>
- <excludes>
- <exclude>**/*.xml</exclude>
- </excludes>
- </fileSet>
- <fileSet filtered="true">
- <directory>conf/</directory>
- </fileSet>
- <fileSet filtered="true">
- <directory>scripts/</directory>
- </fileSet>
- <fileSet filtered="true" packaged="true">
- <directory>src/main/java</directory>
- </fileSet>
- <fileSet filtered="true" packaged="true">
- <directory>src/test/java</directory>
- </fileSet>
- <fileSet filtered="true" packaged="true">
- <directory>src/test/resources</directory>
- </fileSet>
- </fileSets>
-
-</archetype-descriptor>
\ No newline at end of file
diff --git a/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/README.asciidoc b/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/README.asciidoc
deleted file mode 100644
index 6dce08f..0000000
--- a/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/README.asciidoc
+++ /dev/null
@@ -1,66 +0,0 @@
-////
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-////
-= Gremlin Server Application
-
-This is a starter project that demonstrates how a basic
-link:http://tinkerpop.apache.org/docs/${project.version}/reference/#gremlin-server[Gremlin Server] project is structured
-with Maven. This project demonstrates how to connect to Gremlin Server with Java using remote traversals with the
-link:http://tinkerpop.apache.org/docs/${project.version}/reference/#connecting-via-remotegraph[Gremlin Driver] that is
-distributed by TinkerPop.
-
-== Prerequisites
-
-* Java 11
-* link:https://maven.apache.org/[Maven 3.3+]
-* Gremlin Server is link:http://archive.apache.org/dist/tinkerpop/[downloaded] and unpackaged
-
-== Building and Running
-
-Build the project as follows:
-
-[source,text]
-mvn clean package
-
-Start Gremlin Server in the directory it was unpackaged and specify usage of the "modern" graph configuration:
-
-[source,text]
-$ bin/gremlin-server.sh conf/gremlin-server-modern.yaml
-[INFO] GremlinServer -
- \,,,/
- (o o)
------oOOo-(3)-oOOo-----
-
-[INFO] GremlinServer - Configuring Gremlin Server from conf/gremlin-server-modern.yaml
-[INFO] MetricManager - Configured Metrics Slf4jReporter configured with interval=180000ms and loggerName=org.apache.tinkerpop.gremlin.server.Settings$Slf4jReporterMetrics
-[INFO] Graphs - Graph [graph] was successfully configured via [conf/tinkergraph-empty.properties].
-[INFO] ServerGremlinExecutor - Initialized Gremlin thread pool. Threads in pool named with pattern gremlin-*
-[INFO] ScriptEngines - Loaded gremlin-groovy ScriptEngine
-[INFO] GremlinExecutor - Initialized gremlin-groovy ScriptEngine with scripts/generate-modern.groovy
-[INFO] ServerGremlinExecutor - Initialized GremlinExecutor and configured ScriptEngines.
-[INFO] ServerGremlinExecutor - A GraphTraversalSource is now bound to [g] with graphtraversalsource[tinkergraph[vertices:0 edges:0], standard]
-[INFO] OpLoader - Adding the standard OpProcessor.
-[INFO] OpLoader - Adding the control OpProcessor.
-[INFO] OpLoader - Adding the session OpProcessor.
-[INFO] GremlinServer - Executing start up LifeCycleHook
-[INFO] Logger$info - Loading 'modern' graph data.
-[INFO] GremlinServer$1 - Gremlin Server configured with worker thread pool of 1, gremlin pool of 8 and boss thread pool of 1.
-[INFO] GremlinServer$1 - Channel started at port 8182.
-
-Run this project as follows:
-
-[source,text]
-mvn exec:java -Dexec.mainClass="${package}.App" -Dlogback.configurationFile=file:conf/logback.xml -Dport=8182
diff --git a/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/conf/logback-test.xml b/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/conf/logback-test.xml
deleted file mode 100644
index 5d94c3b..0000000
--- a/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/conf/logback-test.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<configuration>
- <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <pattern>[%p] %C - %m%n</pattern>
- </encoder>
- </appender>
- <root level="WARN">
- <appender-ref ref="stdout"/>
- </root>
-</configuration>
\ No newline at end of file
diff --git a/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/conf/logback.xml b/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/conf/logback.xml
deleted file mode 100644
index 8d11ce4..0000000
--- a/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/conf/logback.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<configuration>
- <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <pattern>[%p] %C - %m%n</pattern>
- </encoder>
- </appender>
- <root level="INFO">
- <appender-ref ref="stdout"/>
- </root>
-</configuration>
\ No newline at end of file
diff --git a/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/conf/tinkergraph-empty.properties b/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/conf/tinkergraph-empty.properties
deleted file mode 100644
index e09a13d..0000000
--- a/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/conf/tinkergraph-empty.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-gremlin.graph=org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph
-gremlin.tinkergraph.vertexIdManager=LONG
\ No newline at end of file
diff --git a/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/pom.xml b/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/pom.xml
deleted file mode 100644
index b8fe090..0000000
--- a/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/pom.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>\${groupId}</groupId>
- <artifactId>\${artifactId}</artifactId>
- <version>\${version}</version>
-
- <name>Getting started with Gremlin Server</name>
-
- <packaging>jar</packaging>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.tinkerpop</groupId>
- <artifactId>gremlin-driver</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>${logback.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tinkerpop</groupId>
- <artifactId>gremlin-server</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.14.0</version>
- <configuration>
- <release>8</release>
- <source>8</source>
- <target>8</target>
- <compilerArgs>
- <arg>-parameters</arg>
- </compilerArgs>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.22.0</version>
- <configuration>
- <systemPropertyVariables>
- <logback.configurationFile>file:conf/logback-test.properties</logback.configurationFile>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
\ No newline at end of file
diff --git a/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/scripts/generate-modern.groovy b/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/scripts/generate-modern.groovy
deleted file mode 100644
index 23b4a61..0000000
--- a/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/scripts/generate-modern.groovy
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-// an init script that returns a Map allows explicit setting of global bindings.
-def globals = [:]
-
-// Generates the modern graph into an "empty" TinkerGraph via LifeCycleHook.
-// Note that the name of the key in the "global" map is unimportant.
-globals << [hook : [
- onStartUp: { ctx ->
- ctx.logger.info("Loading 'modern' graph data.")
- TinkerFactory.generateModern(graph)
- }
-] as LifeCycleHook]
-
-// define the default TraversalSource to bind queries to - this one will be named "g".
-globals << [g : graph.traversal()]
\ No newline at end of file
diff --git a/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/src/main/java/App.java b/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/src/main/java/App.java
deleted file mode 100644
index 9e0127b..0000000
--- a/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/src/main/java/App.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package ${package};
-
-import org.apache.tinkerpop.gremlin.driver.Result;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class App {
- private static final Logger logger = LoggerFactory.getLogger(App.class);
-
- public static void main(String[] args) throws Exception {
- Service service = Service.instance();
- try {
- logger.info("Sending request....");
-
- // should print marko, josh and peter to the logs
- service.findCreatorsOfSoftware("lop").iterator().forEachRemaining(r -> logger.info(String.format(" - %s", r)));
- } catch (Exception ex) {
- logger.error("Could not execute traversal", ex);
- } finally {
- service.close();
- logger.info("Service closed and resources released");
- System.exit(0);
- }
- }
-}
\ No newline at end of file
diff --git a/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/src/main/java/Service.java b/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/src/main/java/Service.java
deleted file mode 100644
index 8eea04e..0000000
--- a/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/src/main/java/Service.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package ${package};
-
-import org.apache.tinkerpop.gremlin.driver.Cluster;
-import org.apache.tinkerpop.gremlin.driver.remote.DriverRemoteConnection;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-
-import java.util.List;
-
-import static org.apache.tinkerpop.gremlin.process.traversal.AnonymousTraversalSource.traversal;
-
-public class Service implements AutoCloseable {
-
- private final int port = Integer.parseInt(System.getProperty("port", "45940"));
-
- /**
- * There typically needs to be only one Cluster instance in an application.
- */
- private final Cluster cluster = Cluster.build().port(port).create();
-
- /**
- * Construct a remote GraphTraversalSource using the above created Cluster instance that will connect to Gremlin
- * Server.
- */
- private final GraphTraversalSource g = traversal().with(DriverRemoteConnection.using(cluster));
-
- /**
- * Create Service as a singleton given the simplicity of App.
- */
- private static final Service INSTANCE = new Service();
-
- private Service() {}
-
- public static Service instance() {
- return INSTANCE;
- }
-
- public List<Object> findCreatorsOfSoftware(String softwareName) throws Exception {
- return g.V().has("software", "name", softwareName).
- in("created").
- values("name").toList();
- }
-
- @Override
- public void close() throws Exception {
- cluster.close();
- }
-}
\ No newline at end of file
diff --git a/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/src/test/java/ServiceTest.java b/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/src/test/java/ServiceTest.java
deleted file mode 100644
index 6f4439f..0000000
--- a/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/src/test/java/ServiceTest.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package ${package};
-
-import org.apache.tinkerpop.gremlin.server.GremlinServer;
-import org.apache.tinkerpop.gremlin.server.Settings;
-
-import java.io.InputStream;
-import java.util.List;
-import java.util.Arrays;
-
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.CoreMatchers.is;
-
-/**
- * Basic test class that demonstrates how to start and stop an embedded Gremlin Server instance in a test. Note that
- * the server instance is not started or stopped in a thread-safe manner, but typically this is acceptable for most
- * testing use cases.
- */
-public class ServiceTest {
- private GremlinServer server;
-
- private static Service service = Service.instance();
-
- @Before
- public void setUp() throws Exception {
- startServer();
- }
-
- /**
- * Starts a new instance of Gremlin Server.
- */
- public void startServer() throws Exception {
- final InputStream stream = ServiceTest.class.getResourceAsStream("gremlin-server.yaml");
- this.server = new GremlinServer(Settings.read(stream));
-
- server.start().join();
- }
-
- @After
- public void tearDown() throws Exception {
- stopServer();
- }
-
- /**
- * Stops a current instance of Gremlin Server.
- */
- public void stopServer() throws Exception {
- server.stop().join();
- }
-
- @AfterClass
- public static void tearDownCase() throws Exception {
- service.close();
- }
-
- @Test
- public void shouldCreateGraph() throws Exception {
- final List<Object> result = service.findCreatorsOfSoftware("lop");
- assertThat(result, is(Arrays.asList("marko", "josh", "peter")));
- }
-}
\ No newline at end of file
diff --git a/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/src/test/resources/gremlin-server.yaml b/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/src/test/resources/gremlin-server.yaml
deleted file mode 100644
index 9d5278b..0000000
--- a/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/src/test/resources/gremlin-server.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-host: localhost
-port: 45940
-threadPoolWorker: 1
-gremlinPool: 8
-evaluationTimeout: 30000
-graphs: {
- graph: conf/tinkergraph-empty.properties}
-scriptEngines: {
- gremlin-groovy: {
- plugins: { org.apache.tinkerpop.gremlin.server.jsr223.GremlinServerGremlinPlugin: {},
- org.apache.tinkerpop.gremlin.tinkergraph.jsr223.TinkerGraphGremlinPlugin: {},
- org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin: {files: [scripts/generate-modern.groovy]}}}}
-serializers:
- - { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1 }
-metrics: {
- slf4jReporter: {enabled: true, interval: 180000}}
-strictTransactionManagement: false
-threadPoolBoss: 1
-maxInitialLineLength: 4096
-maxHeaderSize: 8192
-maxChunkSize: 8192
-maxContentLength: 65536
-maxAccumulationBufferComponents: 1024
-resultIterationBatchSize: 64
diff --git a/gremlin-archetype/gremlin-archetype-server/src/test/resources/projects/standard/archetype.properties b/gremlin-archetype/gremlin-archetype-server/src/test/resources/projects/standard/archetype.properties
deleted file mode 100644
index 26067b7..0000000
--- a/gremlin-archetype/gremlin-archetype-server/src/test/resources/projects/standard/archetype.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-groupId=org.apache.tinkerpop
-artifactId=gremlin-archetype-server
-package=com.test.example
-version=1.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/gremlin-archetype/gremlin-archetype-server/src/test/resources/projects/standard/goal.txt b/gremlin-archetype/gremlin-archetype-server/src/test/resources/projects/standard/goal.txt
deleted file mode 100644
index 4a1a71d..0000000
--- a/gremlin-archetype/gremlin-archetype-server/src/test/resources/projects/standard/goal.txt
+++ /dev/null
@@ -1 +0,0 @@
-verify
\ No newline at end of file
diff --git a/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml b/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml
deleted file mode 100644
index ebc75bb..0000000
--- a/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tinkerpop</groupId>
- <artifactId>gremlin-archetype</artifactId>
- <version>3.8.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>gremlin-archetype-tinkergraph</artifactId>
- <name>Apache TinkerPop :: Archetype - TinkerGraph</name>
- <packaging>jar</packaging>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-archetype-plugin</artifactId>
- </plugin>
- </plugins>
-
- <!-- apply variable substitution on the following files using variables from this pom -->
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- <includes>
- <include>archetype-resources/pom.xml</include>
- <include>archetype-resources/README.asciidoc</include>
- </includes>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>false</filtering>
- <excludes>
- <exclude>archetype-resources/pom.xml</exclude>
- <exclude>archetype-resources/README.asciidoc</exclude>
- </excludes>
- </resource>
- </resources>
- </build>
-</project>
\ No newline at end of file
diff --git a/gremlin-archetype/gremlin-archetype-tinkergraph/src/main/resources/META-INF/maven/archetype-metadata.xml b/gremlin-archetype/gremlin-archetype-tinkergraph/src/main/resources/META-INF/maven/archetype-metadata.xml
deleted file mode 100644
index a159ee3..0000000
--- a/gremlin-archetype/gremlin-archetype-tinkergraph/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<archetype-descriptor xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd" name="gremlin-archetype-tinkergraph"
- xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <fileSets>
- <fileSet filtered="true">
- <directory></directory>
- <includes>
- <include>README.asciidoc</include>
- </includes>
- <excludes>
- <exclude>**/*.xml</exclude>
- </excludes>
- </fileSet>
- <fileSet filtered="true" packaged="true">
- <directory>src/main/java</directory>
- </fileSet>
- <fileSet filtered="true" packaged="true">
- <directory>src/test/java</directory>
- </fileSet>
- </fileSets>
-
-</archetype-descriptor>
\ No newline at end of file
diff --git a/gremlin-archetype/gremlin-archetype-tinkergraph/src/main/resources/archetype-resources/README.asciidoc b/gremlin-archetype/gremlin-archetype-tinkergraph/src/main/resources/archetype-resources/README.asciidoc
deleted file mode 100644
index 6535647..0000000
--- a/gremlin-archetype/gremlin-archetype-tinkergraph/src/main/resources/archetype-resources/README.asciidoc
+++ /dev/null
@@ -1,32 +0,0 @@
-////
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-////
-= Simple TinkerPop Application
-
-This is a simple starter project that demonstrates how a basic TinkerPop project is structured with Maven. This project
-uses link:http://tinkerpop.apache.org/docs/${project.version}/reference/#tinkergraph-gremlin[TinkerGraph] as an
-embedded graph database, loads it with some data and then executes a shortest path calculation, printing the results.
-
-== Prerequisites
-
-* Java 11
-* link:https://maven.apache.org/[Maven 3.3+]
-
-== Building and Running
-
-[source,text]
-mvn clean package
-mvn exec:java -Dexec.mainClass="${package}.App"
diff --git a/gremlin-archetype/gremlin-archetype-tinkergraph/src/main/resources/archetype-resources/pom.xml b/gremlin-archetype/gremlin-archetype-tinkergraph/src/main/resources/archetype-resources/pom.xml
deleted file mode 100644
index 11cb60c..0000000
--- a/gremlin-archetype/gremlin-archetype-tinkergraph/src/main/resources/archetype-resources/pom.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>\${groupId}</groupId>
- <artifactId>\${artifactId}</artifactId>
- <version>\${version}</version>
-
- <name>Getting started with TinkerGraph</name>
-
- <packaging>jar</packaging>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.tinkerpop</groupId>
- <artifactId>tinkergraph-gremlin</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>${logback.version}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.14.0</version>
- <configuration>
- <release>8</release>
- <source>8</source>
- <target>8</target>
- <compilerArgs>
- <arg>-parameters</arg>
- </compilerArgs>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
\ No newline at end of file
diff --git a/gremlin-archetype/gremlin-archetype-tinkergraph/src/main/resources/archetype-resources/src/main/java/App.java b/gremlin-archetype/gremlin-archetype-tinkergraph/src/main/resources/archetype-resources/src/main/java/App.java
deleted file mode 100644
index ffda151..0000000
--- a/gremlin-archetype/gremlin-archetype-tinkergraph/src/main/resources/archetype-resources/src/main/java/App.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package ${package};
-
-import java.util.List;
-import java.util.ArrayList;
-
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.T;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-
-import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.*;
-import static org.apache.tinkerpop.gremlin.process.traversal.AnonymousTraversalSource.traversal;
-
-public class App {
-
- public static void main(String[] args) {
- // Create a new TinkerGraph and load some test data. The Graph instance is typically named "graph" as a
- // variable name. You will see this pattern consistently in TinkerPop documentation, the mailing list, etc.
- Graph graph = TinkerGraph.open();
- loadData(graph);
-
- // Create a GraphTraversalSource instance that is used to query the data in the Graph instance. This variable
- // is typically denoted as "g". In TinkerPop documentation you can always count on references to "g" as
- // being a object of this type.
- GraphTraversalSource g = traversal().with(graph);
-
- Vertex fromNode = findByName(g, "marko");
- Vertex toNode = findByName(g, "peter");
-
- List list = calculateShortestPathBetween(g, fromNode, toNode);
- System.out.println(list.toString());
- System.exit(0);
- }
-
- public static Vertex findByName(GraphTraversalSource g, String name) {
- return g.V().has("name", name).next();
- }
-
- public static List calculateShortestPathBetween(GraphTraversalSource g, Vertex fromNode, Vertex toNode) {
- ArrayList list = new ArrayList();
- g.V(fromNode).repeat(both().simplePath()).until(is(toNode)).limit(1).path().fill(list);
- return list;
- }
-
- public static void loadData(Graph graph) {
- // see org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory.generateModern()
- final Vertex marko = graph.addVertex(T.id, 1, T.label, "person", "name", "marko", "age", 29);
- final Vertex vadas = graph.addVertex(T.id, 2, T.label, "person", "name", "vadas", "age", 27);
- final Vertex lop = graph.addVertex(T.id, 3, T.label, "software", "name", "lop", "lang", "java");
- final Vertex josh = graph.addVertex(T.id, 4, T.label, "person", "name", "josh", "age", 32);
- final Vertex ripple = graph.addVertex(T.id, 5, T.label, "software", "name", "ripple", "lang", "java");
- final Vertex peter = graph.addVertex(T.id, 6, T.label, "person", "name", "peter", "age", 35);
- marko.addEdge("knows", vadas, T.id, 7, "weight", 0.5d);
- marko.addEdge("knows", josh, T.id, 8, "weight", 1.0d);
- marko.addEdge("created", lop, T.id, 9, "weight", 0.4d);
- josh.addEdge("created", ripple, T.id, 10, "weight", 1.0d);
- josh.addEdge("created", lop, T.id, 11, "weight", 0.4d);
- peter.addEdge("created", lop, T.id, 12, "weight", 0.2d);
- }
-}
\ No newline at end of file
diff --git a/gremlin-archetype/gremlin-archetype-tinkergraph/src/main/resources/archetype-resources/src/test/java/AppTest.java b/gremlin-archetype/gremlin-archetype-tinkergraph/src/main/resources/archetype-resources/src/test/java/AppTest.java
deleted file mode 100644
index 7b400b7..0000000
--- a/gremlin-archetype/gremlin-archetype-tinkergraph/src/main/resources/archetype-resources/src/test/java/AppTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package ${package};
-
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-
-public class AppTest {
-
- @Test
- public void shouldCreateGraph() {
- TinkerGraph graph = TinkerGraph.open();
- App.loadData(graph);
-
- GraphTraversalSource g = graph.traversal();
-
- assertEquals(6, g.V().count().next().intValue());
- assertEquals(6, g.E().count().next().intValue());
- }
-}
\ No newline at end of file
diff --git a/gremlin-archetype/gremlin-archetype-tinkergraph/src/test/resources/projects/standard/archetype.properties b/gremlin-archetype/gremlin-archetype-tinkergraph/src/test/resources/projects/standard/archetype.properties
deleted file mode 100644
index 9c3e51c..0000000
--- a/gremlin-archetype/gremlin-archetype-tinkergraph/src/test/resources/projects/standard/archetype.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-groupId=org.apache.tinkerpop
-artifactId=gremlin-archetype-tinkergraph
-package=com.test.example
-version=1.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/gremlin-archetype/gremlin-archetype-tinkergraph/src/test/resources/projects/standard/goal.txt b/gremlin-archetype/gremlin-archetype-tinkergraph/src/test/resources/projects/standard/goal.txt
deleted file mode 100644
index 4a1a71d..0000000
--- a/gremlin-archetype/gremlin-archetype-tinkergraph/src/test/resources/projects/standard/goal.txt
+++ /dev/null
@@ -1 +0,0 @@
-verify
\ No newline at end of file
diff --git a/gremlin-archetype/pom.xml b/gremlin-archetype/pom.xml
deleted file mode 100644
index 3306104..0000000
--- a/gremlin-archetype/pom.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>tinkerpop</artifactId>
- <groupId>org.apache.tinkerpop</groupId>
- <version>3.8.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>gremlin-archetype</artifactId>
- <name>Apache TinkerPop :: Gremlin Archetype</name>
- <packaging>pom</packaging>
-
- <modules>
- <module>gremlin-archetype-tinkergraph</module>
- <module>gremlin-archetype-server</module>
- <module>gremlin-archetype-dsl</module>
- </modules>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-archetype-plugin</artifactId>
- <version>3.1.0</version>
- <executions>
- <execution>
- <phase>integration-test</phase>
- <goals>
- <goal>integration-test</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <!-- without this configuration -DskipTests is useless -->
- <skip>${skipTests}</skip>
- </configuration>
- </plugin>
-
- <!--
- Variables are applied in two separate rounds. The first round applies variables from this pom.xml
- and the second round removes escaping from variables so that they can become variables during
- archetype generation
- -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <configuration>
- <escapeString>\</escapeString>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-</project>
\ No newline at end of file
diff --git a/gremlin-console/bin/gremlin.sh b/gremlin-console/bin/gremlin.sh
index bf31d07..b8cb4ab 120000
--- a/gremlin-console/bin/gremlin.sh
+++ b/gremlin-console/bin/gremlin.sh
@@ -1 +1 @@
-../target/apache-tinkerpop-gremlin-console-3.8.0-SNAPSHOT-standalone/bin/gremlin.sh
\ No newline at end of file
+../target/apache-tinkerpop-gremlin-console-4.0.0-SNAPSHOT-standalone/bin/gremlin.sh
\ No newline at end of file
diff --git a/gremlin-console/conf/neo4j-standalone.properties b/gremlin-console/conf/neo4j-standalone.properties
deleted file mode 100644
index 11922bf..0000000
--- a/gremlin-console/conf/neo4j-standalone.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-gremlin.graph=org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jGraph
-
-gremlin.neo4j.directory=/tmp/neo4j
-gremlin.neo4j.conf.dbms.auto_index.nodes.enabled=true
-#gremlin.neo4j.conf.dbms.auto_index.nodes.keys=
-gremlin.neo4j.conf.dbms.auto_index.relationships.enabled=true
-#gremlin.neo4j.conf.dbms.auto_index.relationships.keys=
diff --git a/gremlin-console/conf/remote-graph.properties b/gremlin-console/conf/remote-graph.properties
index 654365d..d65ab33 100644
--- a/gremlin-console/conf/remote-graph.properties
+++ b/gremlin-console/conf/remote-graph.properties
@@ -16,10 +16,12 @@
# under the License.
##############################################################
-# This configuration is meant for use with withRemote().
+# This configuration is meant for use with with() or connect().
#
-# g = traversal('conf/remote-graph.properties')
+# g = traversal().with('conf/remote-graph.properties')
+# g = connect('conf/remote-graph.properties')
#
+# todo: revisit compatible configs
# This file will work with:
# - gremlin-server.yaml
# - gremlin-server-classic.yaml
@@ -29,5 +31,5 @@
##############################################################
gremlin.remote.remoteConnectionClass=org.apache.tinkerpop.gremlin.driver.remote.DriverRemoteConnection
-gremlin.remote.driver.clusterFile=conf/remote-objects.yaml
+gremlin.remote.driver.clusterFile=conf/remote.yaml
gremlin.remote.driver.sourceName=g
\ No newline at end of file
diff --git a/gremlin-console/conf/remote-objects.yaml b/gremlin-console/conf/remote-objects.yaml
deleted file mode 100644
index 608f2a7..0000000
--- a/gremlin-console/conf/remote-objects.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-##############################################################
-# This configuration is meant to have Gremlin Server return
-# GraphBinary serialized objects. The TinkerGraph IoRegistry is
-# assigned as this is the configuration defined in the
-# pre-packaged Gremlin Server configuration files. The
-# client configuration for serializers should match server.
-#
-# This file will work with:
-# - gremlin-server.yaml
-# - gremlin-server-classic.yaml
-# - gremlin-server-modern.yaml
-# - gremlin-server-modern-py.yaml
-# - gremlin-server-modern-readonly.yaml
-# - gremlin-server-neo4j.yaml
-# - gremlin-server-spark.yaml
-##############################################################
-
-hosts: [localhost]
-port: 8182
-serializer: { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1 }
\ No newline at end of file
diff --git a/gremlin-console/conf/remote-secure.yaml b/gremlin-console/conf/remote-secure.yaml
index 61ce00f..9360315 100644
--- a/gremlin-console/conf/remote-secure.yaml
+++ b/gremlin-console/conf/remote-secure.yaml
@@ -17,8 +17,7 @@
##############################################################
# This configuration is meant to have Gremlin Server return
-# text serialized objects. The server will toString()
-# results giving a view into how scripts are executing.
+# serialized objects.
#
# This file will work with:
# - gremlin-server-secure.yaml
@@ -26,9 +25,11 @@
hosts: [localhost]
port: 8182
-username: stephen
-password: password
+auth: {
+ type: basic,
+ username: stephen,
+ password: password }
connectionPool: {
enableSsl: true,
sslEnabledProtocols: [TLSv1.2] }
-serializer: { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1, config: { serializeResultToString: true }}
\ No newline at end of file
+serializer: { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV4}
\ No newline at end of file
diff --git a/gremlin-console/conf/remote-sigv4.yaml b/gremlin-console/conf/remote-sigv4.yaml
new file mode 100644
index 0000000..0ffc324
--- /dev/null
+++ b/gremlin-console/conf/remote-sigv4.yaml
@@ -0,0 +1,31 @@
+# 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.
+
+##############################################################
+# This configuration is meant to have Gremlin Server with
+# sigv4 authentication.
+##############################################################
+
+hosts: [localhost]
+port: 8182
+auth: {
+ type: sigv4,
+ region: us-west1 }
+connectionPool: {
+ enableSsl: true,
+ sslEnabledProtocols: [TLSv1.2] }
+serializer: { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV4}
\ No newline at end of file
diff --git a/gremlin-console/conf/remote.yaml b/gremlin-console/conf/remote.yaml
index e0ac5c0..75659d5 100644
--- a/gremlin-console/conf/remote.yaml
+++ b/gremlin-console/conf/remote.yaml
@@ -17,18 +17,15 @@
##############################################################
# This configuration is meant to have Gremlin Server return
-# text serialized objects. The server will toString()
-# results giving a view into how scripts are executing.
+# serialized objects.
#
# This file will work with:
# - gremlin-server.yaml
# - gremlin-server-classic.yaml
# - gremlin-server-modern.yaml
-# - gremlin-server-modern-py.yaml
# - gremlin-server-modern-readonly.yaml
-# - gremlin-server-spark.yaml
##############################################################
hosts: [localhost]
port: 8182
-serializer: { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1, config: { serializeResultToString: true }}
+serializer: { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV4}
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index aad002e..c181a92 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>tinkerpop</artifactId>
<groupId>org.apache.tinkerpop</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>gremlin-console</artifactId>
<name>Apache TinkerPop :: Gremlin Console</name>
@@ -39,10 +39,6 @@
<artifactId>tinkergraph-gremlin</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- </dependency>
<!-- commons-codec is a dependency of httpclient - excluded in root pom to bring all commons-codec versions inline -->
<dependency>
<groupId>commons-codec</groupId>
@@ -61,7 +57,7 @@
<dependency>
<groupId>org.fusesource.jansi</groupId>
<artifactId>jansi</artifactId>
- <version>1.17.1</version>
+ <version>2.4.1</version>
</dependency>
<!-- TESTING -->
<dependency>
@@ -235,6 +231,13 @@
<shadedPattern>io.shaded.netty</shadedPattern>
</relocation>
</relocations>
+ <!-- exclude jdk21 classes for now -->
+ <filters>
+ <filter>
+ <artifact>ch.qos.logback:logback-core</artifact>
+ <excludes>versions/21/**</excludes>
+ </filter>
+ </filters>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"></transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">
diff --git a/gremlin-console/src/main/ext/plugins.txt b/gremlin-console/src/main/ext/plugins.txt
index 7eb2b23..caa8021 100644
--- a/gremlin-console/src/main/ext/plugins.txt
+++ b/gremlin-console/src/main/ext/plugins.txt
@@ -1,3 +1,3 @@
-org.apache.tinkerpop.gremlin.console.jsr223.DriverGremlinPlugin
+org.apache.tinkerpop.gremlin.console.jsr223.RemoteGremlinPlugin
org.apache.tinkerpop.gremlin.console.jsr223.UtilitiesGremlinPlugin
org.apache.tinkerpop.gremlin.tinkergraph.jsr223.TinkerGraphGremlinPlugin
\ No newline at end of file
diff --git a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
index 972bf06..e0636bc 100644
--- a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
+++ b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
@@ -22,24 +22,19 @@
import groovy.cli.picocli.OptionAccessor
import jline.TerminalFactory
import jline.console.history.FileHistory
-
import org.apache.groovy.groovysh.ExitNotification
import org.apache.groovy.groovysh.Groovysh
import org.apache.groovy.groovysh.InteractiveShellRunner
import org.apache.groovy.groovysh.commands.SetCommand
-import org.apache.tinkerpop.gremlin.console.commands.BytecodeCommand
import org.apache.tinkerpop.gremlin.console.commands.ClsCommand
import org.apache.tinkerpop.gremlin.console.commands.GremlinSetCommand
import org.apache.tinkerpop.gremlin.console.commands.InstallCommand
import org.apache.tinkerpop.gremlin.console.commands.PluginCommand
-import org.apache.tinkerpop.gremlin.console.commands.RemoteCommand
-import org.apache.tinkerpop.gremlin.console.commands.SubmitCommand
import org.apache.tinkerpop.gremlin.console.commands.UninstallCommand
import org.apache.tinkerpop.gremlin.groovy.loaders.GremlinLoader
import org.apache.tinkerpop.gremlin.jsr223.CoreGremlinPlugin
import org.apache.tinkerpop.gremlin.jsr223.GremlinPlugin
import org.apache.tinkerpop.gremlin.jsr223.ImportCustomizer
-import org.apache.tinkerpop.gremlin.jsr223.console.RemoteException
import org.apache.tinkerpop.gremlin.process.traversal.Failure
import org.apache.tinkerpop.gremlin.process.traversal.Traverser
import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement
@@ -53,7 +48,6 @@
import org.fusesource.jansi.Ansi
import sun.misc.Signal
import sun.misc.SignalHandler
-
/**
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
@@ -80,7 +74,7 @@
io.out.println()
io.out.println(" " + Colorizer.render(Preferences.gremlinColor, "\\,,,/"))
io.out.println(" " + Colorizer.render(Preferences.gremlinColor, "(o o)"))
- io.out.println("" + Colorizer.render(Preferences.gremlinColor, "-----oOOo-(3)-oOOo-----"))
+ io.out.println("" + Colorizer.render(Preferences.gremlinColor, "-----oOOo-(" + Gremlin.majorVersion() + ")-oOOo-----"))
}
final Mediator mediator = new Mediator(this)
@@ -108,9 +102,6 @@
groovy.register(new UninstallCommand(groovy, mediator))
groovy.register(new InstallCommand(groovy, mediator))
groovy.register(new PluginCommand(groovy, mediator))
- groovy.register(new RemoteCommand(groovy, mediator))
- groovy.register(new SubmitCommand(groovy, mediator))
- groovy.register(new BytecodeCommand(groovy, mediator))
groovy.register(new ClsCommand(groovy, mediator))
// hide output temporarily while imports execute
@@ -145,6 +136,7 @@
def pluggedIn = new PluggedIn((GremlinPlugin) plugin, groovy, io, false)
mediator.availablePlugins.put(plugin.class.name, pluggedIn)
+ pluggedIn.activate()
}
}
@@ -394,12 +386,7 @@
io.err.print(line.trim())
io.err.println()
if (line.trim().equals("y") || line.trim().equals("Y")) {
- if (err instanceof RemoteException && err.remoteStackTrace.isPresent()) {
- io.err.print(err.remoteStackTrace.get())
- io.err.flush()
- } else {
- e.printStackTrace(io.err)
- }
+ e.printStackTrace(io.err)
}
} else {
e.printStackTrace(io.err)
diff --git a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/GremlinGroovysh.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/GremlinGroovysh.groovy
index bb2f752..e3e6d08 100644
--- a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/GremlinGroovysh.groovy
+++ b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/GremlinGroovysh.groovy
@@ -23,10 +23,11 @@
import org.apache.groovy.groovysh.Groovysh
import org.apache.groovy.groovysh.ParseCode
import org.apache.groovy.groovysh.Parser
-import org.apache.groovy.groovysh.Parsing
import org.apache.groovy.groovysh.util.CommandArgumentParser
+import org.apache.groovy.groovysh.util.ScriptVariableAnalyzer
import org.apache.tinkerpop.gremlin.console.commands.GremlinSetCommand
import org.codehaus.groovy.control.CompilerConfiguration
+import org.codehaus.groovy.control.MultipleCompilationErrorsException
import org.codehaus.groovy.control.customizers.ASTTransformationCustomizer
import org.codehaus.groovy.tools.shell.IO
@@ -41,7 +42,6 @@
private final static CompilerConfiguration compilerConfig = new CompilerConfiguration(CompilerConfiguration.DEFAULT) {{
addCompilationCustomizers(new ASTTransformationCustomizer(ThreadInterrupt.class))
}}
- private Parsing remoteParser = new LocalSafeParser()
public GremlinGroovysh(final Mediator mediator, final IO io) {
super(io, compilerConfig)
@@ -83,65 +83,9 @@
mediator.evaluating.set(true)
try {
- if (mediator.localEvaluation)
- return super.execute(line)
- else {
- assert line != null
- if (line.trim().size() == 0) {
- return null
- }
-
- maybeRecordInput(line)
-
- Object result
-
- if (isExecutable(line)) {
- result = executeCommand(line)
- if (result != null) setLastResult(result)
- return result
- }
-
- List<String> current = new ArrayList<String>(buffers.current())
- current << line
-
- String importsSpec = this.getImportStatements()
-
- // determine if this script is complete or not - if not it's a multiline script
- def status = remoteParser.parse([importsSpec] + current)
-
- switch (status.code) {
- case ParseCode.COMPLETE:
- // concat script here because commands don't support multi-line
- def script = String.join(Parser.getNEWLINE(), current)
- setLastResult(mediator.currentRemote().submit([script]))
- buffers.clearSelected()
- break
- case ParseCode.INCOMPLETE:
- buffers.updateSelected(current)
- break
- case ParseCode.ERROR:
- throw status.cause
- default:
- // Should never happen
- throw new Error("Invalid parse status: $status.code")
- }
-
- return result
- }
+ return super.execute(line)
} finally {
mediator.evaluating.set(false)
}
}
-
- private void setLastResult(final Object result) {
- if (resultHook == null) {
- throw new IllegalStateException('Result hook is not set')
- }
-
- resultHook.call((Object)result)
-
- interp.context['_'] = result
-
- maybeRecordResult(result)
- }
}
diff --git a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/LocalSafeParser.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/LocalSafeParser.groovy
deleted file mode 100644
index 9935463..0000000
--- a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/LocalSafeParser.groovy
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.console
-
-import org.apache.groovy.groovysh.ParseCode
-import org.apache.groovy.groovysh.ParseStatus
-import org.apache.groovy.groovysh.Parsing
-import org.codehaus.groovy.control.CompilerConfiguration
-import org.codehaus.groovy.control.MultipleCompilationErrorsException
-import org.codehaus.groovy.control.messages.Message
-import org.codehaus.groovy.control.messages.SyntaxErrorMessage
-
-/**
- * A {@link Parsing} implementation that detects if a Groovy script is complete or incomplete. This implementation uses
- * the Groovy compiler to try to compile the script and analyzes any compilation errors to determine if the script is
- * incomplete. It does not evaluate the script, which prevents local execution and potential local failure.
- */
-class LocalSafeParser implements Parsing {
-
- // Try to compile the script
- private final CompilerConfiguration config = new CompilerConfiguration()
-
- // Create a custom GroovyClassLoader that doesn't write class files
- private final GroovyClassLoader gcl = new GroovyClassLoader(this.class.classLoader, config) {
- @Override
- public Class defineClass(String name, byte[] bytes) {
- // Skip writing to disk, just define the class in memory
- return super.defineClass(name, bytes, 0, bytes.length)
- }
- }
- /**
- * Parse the given buffer and determine if it's a complete Groovy script.
- *
- * @param buffer The list of strings representing the script lines
- * @return A ParseStatus indicating if the script is complete, incomplete, or has errors
- */
- @Override
- ParseStatus parse(Collection<String> buffer) {
- if (!buffer) {
- return new ParseStatus(ParseCode.COMPLETE)
- }
-
- // join the buffer lines into a single script
- def script = buffer.join('\n')
-
- try {
- // Parse the script without generating .class files
- gcl.parseClass(script)
- // If we get here, the script compiled successfully
- return new ParseStatus(ParseCode.COMPLETE)
- } catch (MultipleCompilationErrorsException e) {
- // Check if the errors indicate an incomplete script
- if (isIncompleteScript(e)) {
- return new ParseStatus(ParseCode.INCOMPLETE)
- } else {
- // Other compilation errors
- return new ParseStatus(ParseCode.ERROR, e)
- }
- } catch (Exception e) {
- // Any other exception is considered an error
- return new ParseStatus(ParseCode.ERROR, e)
- }
- }
-
- /**
- * Determine if the compilation errors indicate an incomplete script.
- *
- * @param e The compilation errors exception
- * @return true if the script is incomplete, false otherwise
- */
- private boolean isIncompleteScript(MultipleCompilationErrorsException e) {
- def errorCollector = e.errorCollector
-
- for (Message message : errorCollector.errors) {
- if (message instanceof SyntaxErrorMessage) {
- def syntaxException = message.cause
- def errorMessage = syntaxException.message
-
- // Check for common indicators of incomplete scripts
- if (isUnexpectedEOF(errorMessage) ||
- isUnclosedBracket(errorMessage) ||
- isUnclosedString(errorMessage) ||
- isUnexpectedInput(errorMessage)) {
- return true
- }
- }
- }
-
- return false
- }
-
- /**
- * Check if the error message indicates an unexpected end of file.
- */
- private boolean isUnexpectedEOF(String errorMessage) {
- errorMessage.contains('unexpected end of file') ||
- errorMessage.contains('Unexpected EOF')
- }
-
- /**
- * Check if the error message indicates an unclosed bracket.
- */
- private boolean isUnclosedBracket(String errorMessage) {
- errorMessage.contains("Missing '}'") ||
- errorMessage.contains("Missing ')'") ||
- errorMessage.contains("Missing ']'")
- }
-
- /**
- * Check if the error message indicates an unclosed string.
- */
- private boolean isUnclosedString(String errorMessage) {
- errorMessage.contains('String literal is not terminated') ||
- errorMessage.contains('Unterminated string literal')
- }
-
- /**
- * Check if the error message indicates unexpected input that might suggest
- * an incomplete script rather than a syntax error.
- */
- private boolean isUnexpectedInput(String errorMessage) {
- // Check for unexpected input but exclude cases where closing brackets are unexpected
- // as those typically indicate syntax errors rather than incomplete scripts
- (errorMessage.contains('Unexpected input: ') ||
- errorMessage.contains('Unexpected character: ')) &&
- !(errorMessage.contains("Unexpected input: '}'") ||
- errorMessage.contains("Unexpected input: ')'") ||
- errorMessage.contains("Unexpected input: ']'"))
- }
-}
diff --git a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Mediator.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Mediator.groovy
index a7bc9b3..f053cbe 100644
--- a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Mediator.groovy
+++ b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Mediator.groovy
@@ -18,8 +18,6 @@
*/
package org.apache.tinkerpop.gremlin.console
-import org.apache.tinkerpop.gremlin.jsr223.console.RemoteAcceptor
-
import java.util.concurrent.atomic.AtomicBoolean
import org.apache.commons.lang3.StringUtils
@@ -29,9 +27,6 @@
*/
class Mediator {
public final Map<String, PluggedIn> availablePlugins = [:]
- public final List<RemoteAcceptor> remotes = []
- public int position
- public boolean localEvaluation = true
/**
* Determines when the Console is evaluating/iterating input/result.
@@ -50,32 +45,6 @@
this.console = console
}
- public RemoteAcceptor currentRemote() { return remotes.get(position) }
-
- def addRemote(final RemoteAcceptor remote) {
- remotes.add(remote)
- position = remotes.size() - 1
- return remote
- }
-
- def removeCurrent() {
- final RemoteAcceptor toRemove = remotes.remove(position)
- position = 0
- return toRemove
- }
-
- def RemoteAcceptor nextRemote() {
- position++
- if (position >= remotes.size()) position = 0
- return currentRemote()
- }
-
- def RemoteAcceptor previousRemote() {
- position--
- if (position < 0) position = remotes.size() - 1
- return currentRemote()
- }
-
def showShellEvaluationOutput(final boolean show) {
console.showShellEvaluationOutput(show)
}
@@ -110,13 +79,6 @@
}
def void close() {
- remotes.each { remote ->
- try {
- remote.close()
- } catch (Exception ignored) {
-
- }
- }
+ // do cleanup if needed
}
-
}
diff --git a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/PluggedIn.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/PluggedIn.groovy
index 066596f..9d53780 100644
--- a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/PluggedIn.groovy
+++ b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/PluggedIn.groovy
@@ -23,11 +23,8 @@
import org.apache.tinkerpop.gremlin.jsr223.GremlinPlugin
import org.apache.tinkerpop.gremlin.jsr223.ImportCustomizer
import org.apache.tinkerpop.gremlin.jsr223.ScriptCustomizer
-import org.apache.tinkerpop.gremlin.jsr223.console.ConsoleCustomizer
import org.apache.tinkerpop.gremlin.jsr223.console.GremlinShellEnvironment
-import org.apache.tinkerpop.gremlin.jsr223.console.RemoteAcceptor
import org.codehaus.groovy.tools.shell.IO
-
/**
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
@@ -81,15 +78,6 @@
this.activated = false
}
- Optional<RemoteAcceptor> remoteAcceptor() {
- // find a consoleCustomizer if available
- if (!plugin.getCustomizers("gremlin-groovy").isPresent() || !plugin.getCustomizers("gremlin-groovy").get().any{ it instanceof ConsoleCustomizer })
- return Optional.empty()
-
- ConsoleCustomizer customizer = (ConsoleCustomizer) plugin.getCustomizers("gremlin-groovy").get().find{ it instanceof ConsoleCustomizer }
- return Optional.of(customizer.getRemoteAcceptor(new GroovyGremlinShellEnvironment()))
- }
-
public class GroovyGremlinShellEnvironment implements GremlinShellEnvironment {
@Override
diff --git a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/BytecodeCommand.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/BytecodeCommand.groovy
deleted file mode 100644
index 0a302b5..0000000
--- a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/BytecodeCommand.groovy
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.console.commands
-
-import org.apache.groovy.groovysh.ComplexCommandSupport
-import org.apache.groovy.groovysh.Groovysh
-import org.apache.tinkerpop.gremlin.console.Mediator
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal
-import org.apache.tinkerpop.gremlin.process.traversal.translator.GroovyTranslator
-import org.apache.tinkerpop.gremlin.structure.io.IoRegistry
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONVersion
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONXModuleV3
-import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper
-import org.apache.tinkerpop.shaded.jackson.databind.module.SimpleModule
-
-/**
- * Commands that help work with Gremlin bytecode.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-class BytecodeCommand extends ComplexCommandSupport {
-
- private final Mediator mediator
-
- private ObjectMapper mapper
-
- public BytecodeCommand(final Groovysh shell, final Mediator mediator) {
- super(shell, ":bytecode", ":bc", ["config", "from", "reset", "translate"])
- this.mediator = mediator
- do_reset()
- }
-
- def Object do_config = { List<String> arguments ->
- def resolvedArgs = arguments.collect{shell.interp.context.getVariable(it)}
- try {
- this.initMapper(resolvedArgs)
- return "Configured bytecode serializer"
- } catch (IllegalArgumentException iae) {
- return iae.message
- }
- }
-
- def Object do_from = { List<String> arguments ->
- mediator.showShellEvaluationOutput(false)
- def args = arguments.join(" ")
- def traversal = args.startsWith("@") ? shell.interp.context.getVariable(args.substring(1)) : shell.execute(args)
- if (!(traversal instanceof Traversal))
- return "Argument does not resolve to a Traversal instance, was: " + traversal.class.simpleName
-
- mediator.showShellEvaluationOutput(true)
- return mapper.writeValueAsString(traversal.asAdmin().bytecode)
- }
-
- def Object do_translate = { List<String> arguments ->
- def g = arguments[0]
- def args = arguments.drop(1).join(" ")
- def graphson = args.startsWith("@") ? shell.interp.context.getVariable(args.substring(1)) : args
- return GroovyTranslator.of(g).translate(mapper.readValue(graphson, Bytecode.class))
- }
-
- def Object do_reset = { List<String> arguments ->
- def (GraphSONMapper.Builder builder, boolean loadedTinkerGraph) = createDefaultBuilder()
-
- try {
- this.initMapper([builder.create()])
- return "Bytecode serializer reset to GraphSON 3.0 with extensions" +
- (loadedTinkerGraph ? " and TinkerGraph serializers" : "")
- } catch (IllegalArgumentException iae) {
- return iae.message
- }
- }
-
- private def static createDefaultBuilder() {
- def builder = GraphSONMapper.build().
- addCustomModule(GraphSONXModuleV3.build()).
- version(GraphSONVersion.V3_0)
-
- def loadedTinkerGraph = false
- try {
- def tinkergraphIoRegistry = Class.forName("org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3d0")
- builder.addRegistry(tinkergraphIoRegistry."instance"())
- loadedTinkerGraph = true
- } catch (Exception ignored) {
- // ok to skip if the registry isn't present
- }
- [builder, loadedTinkerGraph]
- }
-
- private initMapper(def args) {
- if (args.size() == 1 && args[0] instanceof GraphSONMapper) {
- this.mapper = ((GraphSONMapper) args[0]).createMapper()
- } else {
- GraphSONMapper.Builder builder = (GraphSONMapper.Builder) createDefaultBuilder()[0]
- args.each {
- if (it instanceof GraphSONMapper)
- throw new IllegalArgumentException("If specifying a GraphSONMapper it must be the only argument")
- else if (it instanceof IoRegistry)
- builder.addRegistry(it)
- else if (it instanceof SimpleModule)
- builder.addCustomModule(it)
- else
- throw new IllegalArgumentException("Configuration argument of ${it.class.simpleName} is ignored - must be IoRegistry, SimpleModule or a single GraphSONMapper")
- }
-
- this.mapper = builder.create().createMapper()
- }
- }
-}
diff --git a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/RemoteCommand.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/RemoteCommand.groovy
deleted file mode 100644
index c25c0c4..0000000
--- a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/RemoteCommand.groovy
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.console.commands
-
-import org.apache.groovy.groovysh.ComplexCommandSupport
-import org.apache.groovy.groovysh.Groovysh
-import org.apache.tinkerpop.gremlin.console.Mediator
-import org.apache.tinkerpop.gremlin.jsr223.console.RemoteAcceptor
-import org.apache.tinkerpop.gremlin.jsr223.console.RemoteException
-
-/**
- * Configure a remote connection to a Gremlin Server.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-class RemoteCommand extends ComplexCommandSupport {
- private final Mediator mediator
-
- public RemoteCommand(final Groovysh shell, final Mediator mediator) {
- super(shell, ":remote", ":rem", ["current", "connect", "config", "list", "next", "prev", "choose", "close", "console"], "current")
- this.mediator = mediator
- }
-
- def Object do_connect = { List<String> arguments ->
- if (arguments.size() == 0) return "Define the remote to configured (e.g. tinkerpop.server)"
-
- if (!mediator.availablePlugins.values().any {
- it.plugin.name == arguments[0]
- }) return "No plugin named ${arguments[0]}"
-
- def pluggedIn = mediator.availablePlugins.values().find { it.plugin.name == arguments[0] }
- if (!pluggedIn.activated) return "Plugin is available but not activated with ':plugin use ${arguments[0]}'"
-
- def Optional<RemoteAcceptor> remoteAcceptor = pluggedIn.remoteAcceptor()
- if (!remoteAcceptor.isPresent()) return "${arguments[0]} does not accept remote configuration"
-
- def remote = remoteAcceptor.get()
- try {
- def result = remote.connect(arguments.tail())
- mediator.addRemote(remote)
- return result
- } catch (RemoteException re) {
- remote.close()
- return re.message
- }
- }
-
- def Object do_config = { List<String> arguments ->
- if (mediator.remotes.size() == 0) return "Please add a remote first with [connect]"
- try {
- return mediator.currentRemote().configure(arguments)
- } catch (RemoteException re) {
- return re.message
- }
- }
-
- def Object do_current = {
- if (mediator.remotes.size() == 0) return "Please add a remote first with [connect]"
- return "Remote - ${mediator.currentRemote()}"
- }
-
- def Object do_choose = { List<String> arguments ->
- if (mediator.remotes.size() == 0) return "Please add a remote first with [connect]"
- if (arguments.size() != 1) return "Specify the numeric index of the remote"
-
- def pos
- try {
- pos = Integer.parseInt(arguments.first())
- } catch (Exception ex) {
- return "Index must be an integer value"
- }
-
- if (pos >= mediator.remotes.size() || pos < 0) return "Index is out of range - use [list] to see indices available"
-
- mediator.position = pos
- return mediator.currentRemote()
- }
-
- def Object do_next = {
- if (mediator.remotes.size() == 0) return "Please add a remote first with [connect]"
- mediator.nextRemote()
- }
-
- def Object do_prev = {
- if (mediator.remotes.size() == 0) return "Please add a remote first with [connect]"
- mediator.previousRemote()
- }
-
- def Object do_list = {
- def copy = []
- mediator.remotes.eachWithIndex { remote, i -> copy << (mediator.position == i ? "*" : "") + i + " - " + remote.toString() }
- return copy
- }
-
- def Object do_close = {
- if (mediator.remotes.size() == 0) return "Please add a remote first with [connect]"
-
- // the console is in remote evaluation mode. closing at this point will needs to exit that mode and then
- // kill the remote itself
- if (!mediator.localEvaluation) swapEvaluationMode()
-
- def removed = mediator.removeCurrent()
- removed.close()
- return "Removed - $removed"
- }
-
- def Object do_console = {
- if (mediator.remotes.size() == 0) return "Please add a remote first with [connect]"
- if (!mediator.currentRemote().allowRemoteConsole()) return "The ${mediator.currentRemote()} is not compatible with 'connect' - use ':>' instead"
- return swapEvaluationMode()
- }
-
- private String swapEvaluationMode() {
- mediator.localEvaluation = !mediator.localEvaluation
- if (mediator.localEvaluation)
- return "All scripts will now be evaluated locally - type ':remote console' to return to remote mode for ${mediator.currentRemote()}"
- else
- return "All scripts will now be sent to ${mediator.currentRemote()} - type ':remote console' to return to local mode"
- }
-}
diff --git a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/SubmitCommand.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/SubmitCommand.groovy
deleted file mode 100644
index a246e0e..0000000
--- a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/SubmitCommand.groovy
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.console.commands
-
-import org.apache.groovy.groovysh.CommandSupport
-import org.apache.groovy.groovysh.Groovysh
-import org.apache.tinkerpop.gremlin.console.Mediator
-
-/**
- * Submit a script to a Gremlin Server instance.
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-class SubmitCommand extends CommandSupport {
-
- private final Mediator mediator
-
- public SubmitCommand(final Groovysh shell, final Mediator mediator) {
- super(shell, ":submit", ":>")
- this.mediator = mediator
- }
-
- @Override
- def Object execute(final List<String> arguments) {
- if (mediator.remotes.size() == 0) return "No remotes are configured. Use :remote command."
- return mediator.currentRemote().submit(arguments)
- }
-}
\ No newline at end of file
diff --git a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/jsr223/GephiRemoteAcceptor.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/jsr223/GephiRemoteAcceptor.groovy
deleted file mode 100644
index b5f6ec3..0000000
--- a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/jsr223/GephiRemoteAcceptor.groovy
+++ /dev/null
@@ -1,371 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.console.jsr223
-
-import groovy.json.JsonOutput
-import groovy.json.JsonSlurper
-import groovy.transform.CompileStatic
-import org.apache.http.client.methods.CloseableHttpResponse
-import org.apache.http.client.methods.HttpUriRequest
-import org.apache.http.client.methods.RequestBuilder
-import org.apache.http.entity.StringEntity
-import org.apache.http.impl.client.CloseableHttpClient
-import org.apache.http.impl.client.HttpClients
-import org.apache.http.util.EntityUtils
-import org.apache.tinkerpop.gremlin.jsr223.console.GremlinShellEnvironment
-import org.apache.tinkerpop.gremlin.jsr223.console.RemoteAcceptor
-import org.apache.tinkerpop.gremlin.jsr223.console.RemoteException
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource
-import org.apache.tinkerpop.gremlin.structure.Edge
-import org.apache.tinkerpop.gremlin.structure.Graph
-import org.apache.tinkerpop.gremlin.structure.Vertex
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- * @author Randall Barnhart (randompi@gmail.com)
- */
-class GephiRemoteAcceptor implements RemoteAcceptor {
-
- private String host = "localhost"
- private int port = 8080
- private String workspace = "workspace1"
-
- private final GremlinShellEnvironment shell
-
- private final Random rand = new Random();
- boolean traversalSubmittedForViz = false
- long vizStepDelay
- private float[] vizStartRGBColor
- private float[] vizDefaultRGBColor
- private char vizColorToFade
- private float vizColorFadeRate
- private float vizStartSize
- private float vizSizeDecrementRate
- private Map vertexAttributes = [:]
-
- private CloseableHttpClient httpclient = HttpClients.createDefault();
-
- public GephiRemoteAcceptor(final GremlinShellEnvironment shell) {
- this.shell = shell
-
- // traversal visualization defaults
- vizStepDelay = 1000; // 1 second pause between viz of steps
- vizStartRGBColor = [0.0f, 1.0f, 0.5f] // light aqua green
- vizDefaultRGBColor = [0.6f, 0.6f, 0.6f] // light grey
- vizColorToFade = 'g' // will fade so blue is strongest
- vizColorFadeRate = 0.7 // the multiplicative rate to fade visited vertices
- vizStartSize = 10
- vizSizeDecrementRate = 0.33f
- }
-
- @Override
- connect(final List<String> args) throws RemoteException {
- if (args.size() >= 1)
- workspace = args[0]
-
- if (args.size() >= 2)
- host = args[1]
-
- if (args.size() >= 3) {
- try {
- port = Integer.parseInt(args[2])
- } catch (Exception ex) {
- throw new RemoteException("Port must be an integer value")
- }
- }
-
- def vizConfig = " with stepDelay:$vizStepDelay, startRGBColor:$vizStartRGBColor, " +
- "colorToFade:$vizColorToFade, colorFadeRate:$vizColorFadeRate, startSize:$vizStartSize," +
- "sizeDecrementRate:$vizSizeDecrementRate"
-
- return "Connection to Gephi - http://$host:$port/$workspace" + vizConfig
- }
-
- @Override
- Object configure(final List<String> args) throws RemoteException {
- if (args.size() < 2 && args[0] != "help")
- throw new RemoteException("Invalid config arguments - check syntax")
-
- if (args[0] == "help")
- return ":remote config [host <host>|port <port>|workspace <name>|stepDelay <ms>|startRGBColor <0.0,0.0,0.0>|colorToFade [r|g|b]|colorFadeRate <0.0>|sizeDecrementRate <0.0>|startSize <0.0>|visualTraversal <graph>|help]"
-
- if (args[0] == "host")
- host = args[1]
- else if (args[0] == "port") {
- try {
- port = Integer.parseInt(args[1])
- } catch (Exception ignored) {
- throw new RemoteException("Port must be an integer value")
- }
- } else if (args[0] == "workspace")
- workspace = args[1]
- else if (args[0] == "stepDelay")
- parseVizStepDelay(args[1])
- else if (args[0] == "startRGBColor")
- parseVizStartRGBColor(args[1])
- else if (args[0] == "colorToFade")
- parseVizColorToFade(args[1])
- else if (args[0] == "colorFadeRate")
- parseVizColorFadeRate(args[1])
- else if (args[0] == "sizeDecrementRate")
- parseVizSizeDecrementRate(args[1])
- else if (args[0] == "startSize")
- parseVizStartSize(args[1])
- else if (args[0] == "visualTraversal") {
- def graphVar = shell.getVariable(args[1])
- if (!(graphVar instanceof Graph))
- throw new RemoteException("Invalid argument to 'visualTraversal' - first parameter must be a Graph instance")
-
- def gVar = args.size() == 3 ? args[2] : "vg"
- def theG = graphVar.traversal().withStrategies(new GephiTraversalVisualizationStrategy(this))
- shell.setVariable(gVar, theG)
- } else
- throw new RemoteException("Invalid config arguments - check syntax")
-
- return "Connection to Gephi - http://$host:$port/$workspace" +
- " with stepDelay:$vizStepDelay, startRGBColor:$vizStartRGBColor, " +
- "colorToFade:$vizColorToFade, colorFadeRate:$vizColorFadeRate, startSize:$vizStartSize," +
- "sizeDecrementRate:$vizSizeDecrementRate"
- }
-
- @Override
- @CompileStatic
- Object submit(final List<String> args) throws RemoteException {
- final String line = String.join(" ", args)
- if (line.trim() == "clear") {
- clearGraph()
- shell.println("Gephi workspace cleared")
- return
- }
-
- // need to clear the vertex attributes
- vertexAttributes.clear()
-
- // this tells the GraphTraversalVisualizationStrategy that if the line eval's to a traversal it should
- // try to visualize it
- traversalSubmittedForViz = true
-
- // get the colors/sizes back to basics before trying visualize
- resetColorsSizes()
-
- final Object o = shell.execute(line)
- if (o instanceof Graph) {
- clearGraph()
- def graph = (Graph) o
- def g = graph.traversal()
- g.V().sideEffect { addVertexToGephi(g, it.get()) }.iterate()
- }
-
- traversalSubmittedForViz = false
- }
-
- @Override
- void close() throws IOException {
- httpclient.close()
- }
-
- /**
- * Visits the last set of vertices traversed and degrades their color and size.
- */
- def updateVisitedVertices(def List except = []) {
- vertexAttributes.keySet().findAll{ vertexId -> !except.contains(vertexId) }.each { String vertexId ->
- def attrs = vertexAttributes[vertexId]
- float currentColor = attrs.color
- currentColor *= vizColorFadeRate
-
- int currentSize = attrs["size"]
- currentSize = Math.max(vizStartSize, currentSize - (currentSize * vizSizeDecrementRate))
-
- vertexAttributes.get(vertexId).color = currentColor
- vertexAttributes.get(vertexId).size = currentSize
-
- changeVertexAttributes(vertexId)
- }
- }
-
- def changeVertexAttributes(def String vertexId) {
- def props = [:]
- props.put(vizColorToFade.toString(), vertexAttributes[vertexId].color)
- props.put("size", vertexAttributes[vertexId].size)
- updateGephiGraph([cn: [(vertexId): props]])
- }
-
- /**
- * Visit a vertex traversed and initialize its color and size.
- */
- def visitVertexInGephi(def Vertex v) {
- def props = [:]
- props.put('r', vizStartRGBColor[0])
- props.put('g', vizStartRGBColor[1])
- props.put('b', vizStartRGBColor[2])
- props.put('size', vizStartSize * 2.5)
- props.put('visited', 1)
-
- updateGephiGraph([cn: [(v.id().toString()): props]])
-
- vertexAttributes[v.id().toString()] = [color: vizStartRGBColor[fadeColorIndex()], size: vizStartSize * 2.5, touch: 1]
- }
-
- def fadeColorIndex() {
- if (vizColorToFade == 'r')
- return 0
- else if (vizColorToFade == 'g')
- return 1
- else if (vizColorToFade == 'b')
- return 2
- }
-
- def addVertexToGephi(def GraphTraversalSource g, def Vertex v, def boolean ignoreEdges = false) {
- // grab the first property value from the strategies of values
- def props = g.V(v).valueMap().next().collectEntries { kv -> [(kv.key): kv.value[0]] }
- props << [label: v.label()]
- props.put('r', vizDefaultRGBColor[0])
- props.put('g', vizDefaultRGBColor[1])
- props.put('b', vizDefaultRGBColor[2])
- props.put('x', rand.nextFloat())
- props.put('y', rand.nextFloat())
- props.put('size', 10)
- props.put('visited', 0)
-
- // only add if it does not exist in graph already
- if (!getFromGephiGraph([operation: "getNode", id: v.id().toString()]).isPresent())
- updateGephiGraph([an: [(v.id().toString()): props]])
-
- if (!ignoreEdges) {
- g.V(v).outE().sideEffect {
- addEdgeToGephi(g, it.get())
- }.iterate()
- }
- }
-
- @CompileStatic
- def addEdgeToGephi(def GraphTraversalSource g, def Edge e) {
- def props = g.E(e).valueMap().next()
- props.put('label', e.label())
- props.put('source', e.outVertex().id().toString())
- props.put('target', e.inVertex().id().toString())
- props.put('directed', true)
- props.put('visited', 0)
-
- // make sure the in vertex is there but don't add its edges - that will happen later as we are looping
- // all vertices in the graph
- addVertexToGephi(g, e.inVertex(), true)
-
- // both vertices are definitely there now, so add the edge
- updateGephiGraph([ae: [(e.id().toString()): props]])
- }
-
- def clearGraph() {
- updateGephiGraph([dn: [filter: "ALL"]])
- }
-
- def resetColorsSizes() {
- updateGephiGraph([cn: [filter: [nodeAttribute: [attribute: "visited", value: 1]],
- attributes: [size: 1, r: vizDefaultRGBColor[0], g: vizDefaultRGBColor[1], b: vizDefaultRGBColor[2]]]])
- updateGephiGraph([ce: [filter: [edgeAttribute: [attribute: "visited", value: 1]],
- attributes: [size: 1, r: vizDefaultRGBColor[0], g: vizDefaultRGBColor[1], b: vizDefaultRGBColor[2]]]])
- }
-
- def getFromGephiGraph(def Map queryArgs) {
- def requestBuilder = RequestBuilder.get("http://$host:$port/$workspace")
- queryArgs.each { requestBuilder = requestBuilder.addParameter(it.key, it.value) }
-
- def httpResp = makeRequest(requestBuilder.build())
- def resp = EntityUtils.toString(httpResp.entity)
-
- // gephi streaming plugin does not set the content type or respect the Accept header - treat as text
- if (resp.isEmpty())
- return Optional.empty()
- else
- return Optional.of(new JsonSlurper().parseText(resp))
- }
-
- def updateGephiGraph(def Map postBody) {
- def requestBuilder = RequestBuilder.post("http://$host:$port/$workspace")
- .addParameter("format", "JSON")
- .addParameter("operation", "updateGraph")
- .setEntity(new StringEntity(JsonOutput.toJson(postBody)))
- EntityUtils.consume(makeRequest(requestBuilder.build()).entity)
- }
-
- private CloseableHttpResponse makeRequest(HttpUriRequest request) {
- def httpResp = httpclient.execute(request)
- if (httpResp.getStatusLine().getStatusCode() == 200) {
- return httpResp
- } else {
- def resp = EntityUtils.toString(httpResp.entity)
- throw new RuntimeException("Unsuccessful request to Gephi - [${httpResp.getStatusLine().getStatusCode()}] ${httpResp.getStatusLine().getReasonPhrase()} - $resp")
- }
- }
-
- @Override
- public String toString() {
- return "Gephi - [$workspace]"
- }
-
- private void parseVizStepDelay(String arg) {
- try {
- vizStepDelay = Long.parseLong(arg)
- } catch (Exception ignored) {
- throw new RemoteException("The stepDelay must be a long value")
- }
- }
-
- private void parseVizStartRGBColor(String arg) {
- try {
- vizStartRGBColor = arg[1..-2].tokenize(',')*.toFloat()
- assert (vizStartRGBColor.length == 3)
- } catch (Exception ignored) {
- throw new RemoteException("The vizStartRGBColor must be an array of 3 float values, e.g. [0.0,1.0,0.5]")
- }
- }
-
- private void parseVizColorToFade(String arg) {
- try {
- vizColorToFade = arg.charAt(0).toLowerCase();
- assert (vizColorToFade == 'r' || vizColorToFade == 'g' || vizColorToFade == 'b')
- } catch (Exception ignored) {
- throw new RemoteException("The vizColorToFade must be one character value among: r, g, b, R, G, B")
- }
- }
-
- private void parseVizColorFadeRate(String arg) {
- try {
- vizColorFadeRate = Float.parseFloat(arg)
- } catch (Exception ignored) {
- throw new RemoteException("The colorFadeRate must be a float value")
- }
- }
-
- private void parseVizSizeDecrementRate(String arg) {
- try {
- vizSizeDecrementRate = Float.parseFloat(arg)
- } catch (Exception ignored) {
- throw new RemoteException("The sizeDecrementRate must be a float value")
- }
- }
-
- private void parseVizStartSize(String arg) {
- try {
- vizStartSize = Float.parseFloat(arg)
- } catch (Exception ignored) {
- throw new RemoteException("The startSize must be a float value")
- }
- }
-}
diff --git a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/jsr223/GephiTraversalVisualizationStrategy.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/jsr223/GephiTraversalVisualizationStrategy.groovy
deleted file mode 100644
index 4cb8ffd..0000000
--- a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/jsr223/GephiTraversalVisualizationStrategy.groovy
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.console.jsr223
-
-import groovy.transform.CompileStatic
-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.Traverser
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.HasStep
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.EdgeOtherVertexStep
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.EdgeVertexStep
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.GraphStep
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.VertexStep
-import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.AggregateGlobalStep
-import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.LambdaSideEffectStep
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.BulkSet
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.AbstractTraversalStrategy
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.finalization.ProfileStrategy
-import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper
-import org.apache.tinkerpop.gremlin.structure.Vertex
-
-import java.util.stream.Collectors
-
-/**
- * A strategy that works in conjunction with the {@link GephiRemoteAcceptor} to automatically inject visualization
- * steps after "vertex" steps to show the vertices traversed for a step. If the traversal was evaluated in the
- * console normally then the visualization strategy will not be applied. It must be {@code :submit} to the
- * console for the strategy to be applied.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-@CompileStatic
-class GephiTraversalVisualizationStrategy extends AbstractTraversalStrategy<TraversalStrategy.FinalizationStrategy>
- implements TraversalStrategy.FinalizationStrategy {
-
- private static final Set<Class<? extends TraversalStrategy.FinalizationStrategy>> POSTS = new HashSet<>();
-
- static {
- POSTS.add(ProfileStrategy.class);
- }
-
- private final GephiRemoteAcceptor acceptor
-
- private final String sideEffectKey = "viz-" + UUID.randomUUID()
-
- GephiTraversalVisualizationStrategy(final GephiRemoteAcceptor acceptor) {
- this.acceptor = acceptor
- }
-
- @Override
- void apply(final Traversal.Admin<?, ?> traversal) {
- if (TraversalHelper.onGraphComputer(traversal))
- return
-
- // only apply these strategies if the traversal was :submit to the acceptor - otherwise process as usual
- if (acceptor.traversalSubmittedForViz) {
- final List<GraphStep> graphSteps = TraversalHelper.getStepsOfAssignableClass(GraphStep.class, traversal)
- final List<VertexStep> vertexSteps = TraversalHelper.getStepsOfAssignableClass(VertexStep.class, traversal)
-
- def List<Step> addAfter = new ArrayList<>()
- addAfter.addAll(TraversalHelper.getStepsOfAssignableClass(EdgeOtherVertexStep.class, traversal))
- addAfter.addAll(TraversalHelper.getStepsOfAssignableClass(EdgeVertexStep.class, traversal))
- addAfter.addAll(vertexSteps.stream().filter { it.returnsVertex() }.collect(Collectors.toList()))
- addAfter.addAll(graphSteps.stream().filter { it.returnsVertex() }.collect(Collectors.toList()))
-
- // decay all vertices and visit each one to update their colors to the brightest
- addAfter.each { Step s ->
- TraversalHelper.insertAfterStep(new LambdaSideEffectStep(traversal, { Traverser traverser ->
- final BulkSet<Vertex> vertices = ((BulkSet<Vertex>) traverser.sideEffects(sideEffectKey))
- if (!vertices.isEmpty()) {
- acceptor.updateVisitedVertices()
- vertices.forEach { Vertex v, Long l -> acceptor.visitVertexInGephi(v) }
- vertices.clear()
- Thread.sleep(acceptor.vizStepDelay)
- }
- }), s, traversal)
- TraversalHelper.insertAfterStep(new AggregateGlobalStep(traversal, sideEffectKey), s, traversal)
- }
-
- // decay all vertices except those that made it through the filter - "this way you can watch
- // the Gremlins dying" - said daniel kuppitz. can't do this easily with generic FilterStep as
- // it creates odd behaviors when used with loop (extra decay that probably shouldn't be there.
- // todo: can this be better? maybe we shouldn't do this at all
- TraversalHelper.getStepsOfAssignableClass(HasStep.class, traversal).each { HasStep s ->
- TraversalHelper.insertAfterStep(new LambdaSideEffectStep(traversal, { Traverser traverser ->
- final BulkSet<Object> objects = ((BulkSet<Object>) traverser.sideEffects(sideEffectKey))
- if (!objects.isEmpty()) {
- final List<String> vertices = objects.findAll { Object o -> o instanceof Vertex }
- .collect { Object o -> ((Vertex) o).id().toString() }
- acceptor.updateVisitedVertices(vertices)
- objects.clear()
- Thread.sleep(acceptor.vizStepDelay)
- }
- }), s, traversal)
- TraversalHelper.insertAfterStep(new AggregateGlobalStep(traversal, sideEffectKey), s, traversal)
- }
- }
- }
-
- @Override
- public Set<Class<? extends TraversalStrategy.FinalizationStrategy>> applyPost() {
- return POSTS;
- }
-}
diff --git a/gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverGremlinPlugin.java b/gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverGremlinPlugin.java
deleted file mode 100644
index 476dc7d..0000000
--- a/gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverGremlinPlugin.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.console.jsr223;
-
-import org.apache.tinkerpop.gremlin.driver.Client;
-import org.apache.tinkerpop.gremlin.driver.Cluster;
-import org.apache.tinkerpop.gremlin.driver.Host;
-import org.apache.tinkerpop.gremlin.driver.LoadBalancingStrategy;
-import org.apache.tinkerpop.gremlin.util.MessageSerializer;
-import org.apache.tinkerpop.gremlin.driver.Result;
-import org.apache.tinkerpop.gremlin.driver.ResultSet;
-import org.apache.tinkerpop.gremlin.util.Tokens;
-import org.apache.tinkerpop.gremlin.driver.exception.ConnectionException;
-import org.apache.tinkerpop.gremlin.driver.exception.ResponseException;
-import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseResult;
-import org.apache.tinkerpop.gremlin.util.message.ResponseStatus;
-import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.driver.remote.DriverRemoteConnection;
-import org.apache.tinkerpop.gremlin.driver.remote.DriverRemoteTraversal;
-import org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1;
-import org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV1;
-import org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV2;
-import org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3;
-import org.apache.tinkerpop.gremlin.util.ser.GraphSONUntypedMessageSerializerV1;
-import org.apache.tinkerpop.gremlin.util.ser.MessageTextSerializer;
-import org.apache.tinkerpop.gremlin.util.ser.SerTokens;
-import org.apache.tinkerpop.gremlin.util.ser.SerializationException;
-import org.apache.tinkerpop.gremlin.util.ser.Serializers;
-import org.apache.tinkerpop.gremlin.jsr223.AbstractGremlinPlugin;
-import org.apache.tinkerpop.gremlin.jsr223.DefaultImportCustomizer;
-import org.apache.tinkerpop.gremlin.jsr223.ImportCustomizer;
-import org.apache.tinkerpop.gremlin.jsr223.console.ConsoleCustomizer;
-import org.apache.tinkerpop.gremlin.jsr223.console.GremlinShellEnvironment;
-import org.apache.tinkerpop.gremlin.jsr223.console.RemoteAcceptor;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class DriverGremlinPlugin extends AbstractGremlinPlugin {
-
- private static final String NAME = "tinkerpop.server";
-
- private static final ImportCustomizer imports = DefaultImportCustomizer.build()
- .addClassImports(Cluster.class,
- Client.class,
- Host.class,
- LoadBalancingStrategy.class,
- MessageSerializer.class,
- Result.class,
- ResultSet.class,
- Tokens.class,
- ConnectionException.class,
- ResponseException.class,
- RequestMessage.class,
- ResponseMessage.class,
- ResponseResult.class,
- ResponseStatus.class,
- ResponseStatusCode.class,
- GraphSONMessageSerializerV1.class,
- GraphSONUntypedMessageSerializerV1.class,
- GraphSONMessageSerializerV2.class,
- GraphSONMessageSerializerV3.class,
- GraphBinaryMessageSerializerV1.class,
- MessageTextSerializer.class,
- SerializationException.class,
- Serializers.class,
- SerTokens.class,
- DriverRemoteConnection.class,
- DriverRemoteTraversal.class).create();
-
- public DriverGremlinPlugin() {
- super(NAME, imports, new DriverConsoleCustomizer());
- }
-
- private static class DriverConsoleCustomizer implements ConsoleCustomizer {
- @Override
- public RemoteAcceptor getRemoteAcceptor(final GremlinShellEnvironment environment) {
- return new DriverRemoteAcceptor(environment);
- }
- }
-}
diff --git a/gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverRemoteAcceptor.java b/gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverRemoteAcceptor.java
deleted file mode 100644
index 20f20bc..0000000
--- a/gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverRemoteAcceptor.java
+++ /dev/null
@@ -1,281 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.console.jsr223;
-
-import org.apache.commons.lang3.exception.ExceptionUtils;
-import org.apache.tinkerpop.gremlin.driver.Client;
-import org.apache.tinkerpop.gremlin.driver.Cluster;
-import org.apache.tinkerpop.gremlin.driver.RequestOptions;
-import org.apache.tinkerpop.gremlin.driver.Result;
-import org.apache.tinkerpop.gremlin.driver.ResultSet;
-import org.apache.tinkerpop.gremlin.util.Tokens;
-import org.apache.tinkerpop.gremlin.driver.exception.NoHostAvailableException;
-import org.apache.tinkerpop.gremlin.driver.exception.ResponseException;
-import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.jsr223.console.GremlinShellEnvironment;
-import org.apache.tinkerpop.gremlin.jsr223.console.RemoteAcceptor;
-import org.apache.tinkerpop.gremlin.jsr223.console.RemoteException;
-import org.apache.tinkerpop.gremlin.structure.util.ElementHelper;
-import org.apache.tinkerpop.gremlin.util.Gremlin;
-
-import javax.security.sasl.SaslException;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.UUID;
-import java.util.concurrent.TimeoutException;
-import java.util.stream.Stream;
-
-/**
- * A {@link RemoteAcceptor} that takes input from the console and sends it to Gremlin Server over the standard
- * Java driver.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- */
-public class DriverRemoteAcceptor implements RemoteAcceptor {
- public static final int NO_TIMEOUT = 0;
- public static final String USER_AGENT = "Gremlin Console/" + Gremlin.version();
-
- private Cluster currentCluster;
- private Client currentClient;
- private int timeout = NO_TIMEOUT;
- private Map<String,String> aliases = new HashMap<>();
- private Optional<String> session = Optional.empty();
-
- private static final String TOKEN_RESET = "reset";
- private static final String TOKEN_SHOW = "show";
-
- private static final String TOKEN_NONE = "none";
- private static final String TOKEN_TIMEOUT = "timeout";
- private static final String TOKEN_ALIAS = "alias";
- private static final String TOKEN_SESSION = "session";
- private static final String TOKEN_SESSION_MANAGED = "session-managed";
- private static final String TOKEN_HELP = "help";
- private static final List<String> POSSIBLE_TOKENS = Arrays.asList(TOKEN_TIMEOUT, TOKEN_ALIAS, TOKEN_HELP);
-
- private final GremlinShellEnvironment shellEnvironment;
-
- public DriverRemoteAcceptor(final GremlinShellEnvironment shellEnvironment) {
- this.shellEnvironment = shellEnvironment;
- }
-
- @Override
- public Object connect(final List<String> args) throws RemoteException {
- if (args.size() < 1) throw new RemoteException("Expects the location of a configuration file or variable name for a Cluster object as an argument");
-
- try {
- final String fileOrVar = args.get(0);
- if (new File(fileOrVar).isFile())
- this.currentCluster = Cluster.open(fileOrVar);
- else if (shellEnvironment.getVariable(fileOrVar) != null) {
- final Object o = shellEnvironment.getVariable(fileOrVar);
- if (o instanceof Cluster) {
- this.currentCluster = (Cluster) o;
- }
- }
-
- if (null == currentCluster)
- throw new RemoteException("Expects the location of a configuration file or variable name for a Cluster object as an argument");
- final boolean useSession = args.size() >= 2 && (args.get(1).equals(TOKEN_SESSION) || args.get(1).equals(TOKEN_SESSION_MANAGED));
- if (useSession) {
- final String sessionName = args.size() == 3 ? args.get(2) : UUID.randomUUID().toString();
- session = Optional.of(sessionName);
-
- final boolean managed = args.get(1).equals(TOKEN_SESSION_MANAGED);
-
- this.currentClient = this.currentCluster.connect(sessionName, managed);
- } else {
- this.currentClient = this.currentCluster.connect();
- }
- this.currentClient.init();
- return String.format("Configured %s", this.currentCluster) + getSessionStringSegment();
- } catch (final FileNotFoundException ignored) {
- throw new RemoteException("The 'connect' option must be accompanied by a valid configuration file");
- } catch (final NoHostAvailableException nhae) {
- return String.format("Configured %s, but host not presently available. The Gremlin Console will attempt to reconnect on each query submission, " +
- "however, you may wish to close this remote and investigate the problem directly. %s", this.currentCluster, getSessionStringSegment());
- } catch (final Exception ex) {
- throw new RemoteException("Error during 'connect' - " + ex.getMessage(), ex);
- }
- }
-
- @Override
- public Object configure(final List<String> args) throws RemoteException {
- final String option = args.size() == 0 ? "" : args.get(0);
- if (!POSSIBLE_TOKENS.contains(option))
- throw new RemoteException(String.format("The 'config' option expects one of ['%s'] as an argument", String.join(",", POSSIBLE_TOKENS)));
-
- final List<String> arguments = args.subList(1, args.size());
-
- if (option.equals(TOKEN_HELP)) {
- return ":remote config [timeout [<ms>|none]|alias [reset|show|<alias> <actual>]|help]";
- } else if (option.equals(TOKEN_TIMEOUT)) {
- final String errorMessage = "The timeout option expects a positive integer representing milliseconds or 'none' as an argument";
- if (arguments.size() != 1) throw new RemoteException(errorMessage);
- try {
- // first check for MAX timeout then NONE and finally parse the config to int.
- timeout = arguments.get(0).equals(TOKEN_NONE) ? NO_TIMEOUT : Integer.parseInt(arguments.get(0));
- if (timeout < NO_TIMEOUT) throw new RemoteException("The value for the timeout cannot be less than " + NO_TIMEOUT);
- return timeout == NO_TIMEOUT ? "Remote timeout is disabled" : "Set remote timeout to " + timeout + "ms";
- } catch (Exception ignored) {
- throw new RemoteException(errorMessage);
- }
- } else if (option.equals(TOKEN_ALIAS)) {
- if (arguments.size() == 1 && arguments.get(0).equals(TOKEN_RESET)) {
- aliases.clear();
- return "Aliases cleared";
- }
-
- if (arguments.size() == 1 && arguments.get(0).equals(TOKEN_SHOW)) {
- return aliases;
- }
-
- if (arguments.size() % 2 != 0)
- throw new RemoteException("Arguments to alias must be 'reset' to clear any existing alias settings or key/value alias/binding pairs");
-
- final Map<String,Object> aliasMap = ElementHelper.asMap(arguments.toArray());
- aliases.clear();
- aliasMap.forEach((k,v) -> aliases.put(k, v.toString()));
- return aliases;
- }
-
- return this.toString();
- }
-
- @Override
- public Object submit(final List<String> args) throws RemoteException {
- final String line = getScript(String.join(" ", args), this.shellEnvironment);
-
- try {
- final List<Result> resultSet = send(line);
- this.shellEnvironment.setVariable(RESULT, resultSet);
- return resultSet.stream().map(result -> result.getObject()).iterator();
- } catch (SaslException sasl) {
- throw new RemoteException("Security error - check username/password and related settings", sasl);
- } catch (Exception ex) {
- // users may try to submit after initiating cluster on a dead host, if host remains unavailable after initiation, output this error message
- if (ex.getCause().getCause() instanceof NoHostAvailableException) {
- return String.format("Configured %s, but host not presently available. The Gremlin Console will attempt to reconnect on each query submission, " +
- "however, you may wish to close this remote and investigate the problem directly. %s", this.currentCluster, getSessionStringSegment());
- }
- final Optional<ResponseException> inner = findResponseException(ex);
- if (inner.isPresent()) {
- final ResponseException responseException = inner.get();
- if (responseException.getResponseStatusCode() == ResponseStatusCode.SERVER_ERROR_TIMEOUT) {
- throw new RemoteException(String.format("%s - try increasing the timeout with the :remote command", responseException.getMessage()));
- } else if (responseException.getResponseStatusCode() == ResponseStatusCode.SERVER_ERROR_SERIALIZATION)
- throw new RemoteException(String.format(
- "Server could not serialize the result requested. Server error - %s. Note that the class must be serializable by the client and server for proper operation.", responseException.getMessage()),
- responseException.getRemoteStackTrace().orElse(null));
- else
- throw new RemoteException(responseException.getMessage(), responseException.getRemoteStackTrace().orElse(null));
- } else if (ex.getCause() != null) {
- final Throwable rootCause = ExceptionUtils.getRootCause(ex);
- if (rootCause instanceof TimeoutException)
- throw new RemoteException("Host did not respond in a timely fashion - check the server status and submit again.");
- else
- throw new RemoteException(rootCause.getMessage());
- } else {
- throw new RemoteException(ex.getMessage());
- }
- }
- }
-
- @Override
- public void close() throws IOException {
- if (this.currentClient != null) this.currentClient.close();
- if (this.currentCluster != null) this.currentCluster.close();
- }
-
- public int getTimeout() {
- return timeout;
- }
-
- private List<Result> send(final String gremlin) throws SaslException {
- try {
- final RequestOptions.Builder options = RequestOptions.build();
- aliases.forEach(options::addAlias);
- if (timeout > NO_TIMEOUT)
- options.timeout(timeout);
-
- options.userAgent(USER_AGENT);
-
- final ResultSet rs = this.currentClient.submit(gremlin, options.create());
- final List<Result> results = rs.all().get();
- final Map<String, Object> statusAttributes = rs.statusAttributes().getNow(null);
-
- // Check for and print warnings
- if (null != statusAttributes && statusAttributes.containsKey(Tokens.STATUS_ATTRIBUTE_WARNINGS)) {
- final Object warningAttributeObject = statusAttributes.get(Tokens.STATUS_ATTRIBUTE_WARNINGS);
- if (warningAttributeObject instanceof List) {
- for (Object warningListItem : (List<?>)warningAttributeObject)
- shellEnvironment.errPrintln(String.valueOf(warningListItem));
- } else {
- shellEnvironment.errPrintln(String.valueOf(warningAttributeObject));
- }
- }
-
- return results;
- } catch (Exception e) {
- // handle security error as-is and unwrapped
- final Optional<Throwable> throwable = Stream.of(ExceptionUtils.getThrowables(e)).filter(t -> t instanceof SaslException).findFirst();
- if (throwable.isPresent())
- throw (SaslException) throwable.get();
-
- throw new IllegalStateException(e.getMessage(), e);
- }
- }
-
- @Override
- public boolean allowRemoteConsole() {
- return true;
- }
-
- @Override
- public String toString() {
- return "Gremlin Server - [" + this.currentCluster + "]" + getSessionStringSegment();
- }
-
- private Optional<ResponseException> findResponseException(final Throwable ex) {
- if (ex instanceof ResponseException)
- return Optional.of((ResponseException) ex);
-
- if (null == ex.getCause())
- return Optional.empty();
-
- return findResponseException(ex.getCause());
- }
-
- private String getSessionStringSegment() {
- return session.isPresent() ? String.format("-[%s]", session.get()) : "";
- }
-
- /**
- * Retrieve a script as defined in the shell context. This allows for multi-line scripts to be submitted.
- */
- public static String getScript(final String submittedScript, final GremlinShellEnvironment shellEnvironment) {
- return submittedScript.startsWith("@") ? shellEnvironment.getVariable(submittedScript.substring(1)).toString() : submittedScript;
- }
-}
diff --git a/gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/jsr223/GephiGremlinPlugin.java b/gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/jsr223/GephiGremlinPlugin.java
deleted file mode 100644
index aa9f9a2..0000000
--- a/gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/jsr223/GephiGremlinPlugin.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.console.jsr223;
-
-import org.apache.tinkerpop.gremlin.jsr223.AbstractGremlinPlugin;
-import org.apache.tinkerpop.gremlin.jsr223.console.ConsoleCustomizer;
-import org.apache.tinkerpop.gremlin.jsr223.console.GremlinShellEnvironment;
-import org.apache.tinkerpop.gremlin.jsr223.console.RemoteAcceptor;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class GephiGremlinPlugin extends AbstractGremlinPlugin {
- private static final String NAME = "tinkerpop.gephi";
-
- public GephiGremlinPlugin() {
- super(NAME, new GephiConsoleCustomizer());
- }
-
- private static class GephiConsoleCustomizer implements ConsoleCustomizer {
- @Override
- public RemoteAcceptor getRemoteAcceptor(final GremlinShellEnvironment gremlinShellEnvironment) {
- return new GephiRemoteAcceptor(gremlinShellEnvironment);
- }
- }
-}
diff --git a/gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/jsr223/RemoteGremlinPlugin.java b/gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/jsr223/RemoteGremlinPlugin.java
new file mode 100644
index 0000000..1dfb541
--- /dev/null
+++ b/gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/jsr223/RemoteGremlinPlugin.java
@@ -0,0 +1,58 @@
+/*
+ * 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.console.jsr223;
+
+import org.apache.tinkerpop.gremlin.driver.Client;
+import org.apache.tinkerpop.gremlin.driver.Cluster;
+import org.apache.tinkerpop.gremlin.driver.auth.Auth;
+import org.apache.tinkerpop.gremlin.driver.remote.DriverRemoteConnection;
+import org.apache.tinkerpop.gremlin.jsr223.AbstractGremlinPlugin;
+import org.apache.tinkerpop.gremlin.jsr223.DefaultImportCustomizer;
+import org.apache.tinkerpop.gremlin.jsr223.ImportCustomizer;
+import org.apache.tinkerpop.gremlin.process.traversal.AnonymousTraversalSource;
+
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+public class RemoteGremlinPlugin extends AbstractGremlinPlugin {
+
+ private static final String NAME = "tinkerpop.remote";
+
+ private static final ImportCustomizer imports = DefaultImportCustomizer.build()
+ .addClassImports(Cluster.class,
+ Client.class,
+ DriverRemoteConnection.class,
+ Auth.class)
+ .addMethodImports(allStaticMethods(AnonymousTraversalSource.class))
+ .addMethodImports(allStaticMethods(Auth.class))
+ .create();
+
+ public RemoteGremlinPlugin() {
+ super(NAME, new HashSet<>(Collections.singletonList("gremlin-groovy")), imports);
+ }
+
+ private static List<Method> allStaticMethods(final Class<?> clazz) {
+ return Stream.of(clazz.getMethods()).filter(m -> Modifier.isStatic(m.getModifiers())).collect(Collectors.toList());
+ }
+}
diff --git a/gremlin-console/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.jsr223.GremlinPlugin b/gremlin-console/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.jsr223.GremlinPlugin
index 631c889..6f2aeca 100644
--- a/gremlin-console/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.jsr223.GremlinPlugin
+++ b/gremlin-console/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.jsr223.GremlinPlugin
@@ -1,3 +1,2 @@
-org.apache.tinkerpop.gremlin.console.jsr223.DriverGremlinPlugin
-org.apache.tinkerpop.gremlin.console.jsr223.GephiGremlinPlugin
-org.apache.tinkerpop.gremlin.console.jsr223.UtilitiesGremlinPlugin
\ No newline at end of file
+org.apache.tinkerpop.gremlin.console.jsr223.RemoteGremlinPlugin
+org.apache.tinkerpop.gremlin.console.jsr223.UtilitiesGremlinPlugin
diff --git a/gremlin-console/src/main/resources/org/apache/tinkerpop/gremlin/console/commands/BytecodeCommand.properties b/gremlin-console/src/main/resources/org/apache/tinkerpop/gremlin/console/commands/BytecodeCommand.properties
deleted file mode 100644
index c895855..0000000
--- a/gremlin-console/src/main/resources/org/apache/tinkerpop/gremlin/console/commands/BytecodeCommand.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-command.description=Gremlin bytecode helper commands
-command.usage=[config <[GraphSONMapper|IoRegistry|SimpleModule]>|from <Traversal>|reset|translate <g> <bytecode>]
-command.help=Gremlin bytecode helper commands
\ No newline at end of file
diff --git a/gremlin-console/src/main/resources/org/apache/tinkerpop/gremlin/console/commands/RemoteCommand.properties b/gremlin-console/src/main/resources/org/apache/tinkerpop/gremlin/console/commands/RemoteCommand.properties
deleted file mode 100644
index 3591848..0000000
--- a/gremlin-console/src/main/resources/org/apache/tinkerpop/gremlin/console/commands/RemoteCommand.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-command.description=Define a remote connection
-command.usage=[current|connect <type-of-remote> [<args>]|config <args>|list|next|prev|choose <index>|close]
-command.help=Define and manage remote connections to use in conjunction with the :submit command, which will send Gremlin scripts to the specified remote agent for processing.
\ No newline at end of file
diff --git a/gremlin-console/src/main/resources/org/apache/tinkerpop/gremlin/console/commands/SubmitCommand.properties b/gremlin-console/src/main/resources/org/apache/tinkerpop/gremlin/console/commands/SubmitCommand.properties
deleted file mode 100644
index 448173f..0000000
--- a/gremlin-console/src/main/resources/org/apache/tinkerpop/gremlin/console/commands/SubmitCommand.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-command.description=Send a Gremlin script to Gremlin Server
-command.usage=<script>
-command.help=Send a Gremlin script to Gremlin Server given the connection established by the :remote command. Results will be stored in a "reserved" variable defined as "_l".
\ No newline at end of file
diff --git a/gremlin-console/src/main/static/LICENSE b/gremlin-console/src/main/static/LICENSE
index dbc7957..064c860 100644
--- a/gremlin-console/src/main/static/LICENSE
+++ b/gremlin-console/src/main/static/LICENSE
@@ -223,8 +223,7 @@
The Apache TinkerPop project bundles the following components under the MIT License:
- JCL 1.1.1 implemented over SLF4J (org.slf4j:jcl-over-slf4j:1.7.25 - http://www.slf4j.org) - for details, see licenses/slf4j
- SLF4J API Module (org.slf4j:slf4j-api:1.7.25 - http://www.slf4j.org) - for details, see licenses/slf4j
+ SLF4J API Module (org.slf4j:slf4j-api:2.0.16 - http://www.slf4j.org) - for details, see licenses/slf4j
Foundation stylesheet for CodeRay (http://foundation.zurb.com) - for details, see licenses/foundation
normalize.css 2.1.2 (http://necolas.github.io/normalize.css/) - for details, see licenses/normalize
@@ -238,5 +237,5 @@
The Apache TinkerPop project bundles the following components under the Eclipse Public License 1.0:
- logback-core (ch.qos.logback:logback-core:1.2.3 - https://logback.qos.ch) - for details, see licenses/logback
- logback-classic (ch.qos.logback:logback-classic:1.2.3 - https://logback.qos.ch) - for details, see licenses/logback
+ logback-core (ch.qos.logback:logback-core:1.3.15 - https://logback.qos.ch) - for details, see licenses/logback
+ logback-classic (ch.qos.logback:logback-classic:1.3.15 - https://logback.qos.ch) - for details, see licenses/logback
diff --git a/gremlin-console/src/main/static/NOTICE b/gremlin-console/src/main/static/NOTICE
index 9eb40f8..9a1bbe8 100644
--- a/gremlin-console/src/main/static/NOTICE
+++ b/gremlin-console/src/main/static/NOTICE
@@ -94,3 +94,22 @@
Objenesis 3.3 - shaded in gremlin-shaded to org.apache.tinkerpop.shaded.objenesis
------------------------------------------------------------------------
Copyright 2006-2022 Joe Walnes, Henri Tremblay, Leonardo Mesquita
+
+------------------------------------------------------------------------
+AWS SDK for Java 2.0
+------------------------------------------------------------------------
+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+
+This product includes software developed by
+Amazon Technologies, Inc (http://www.amazon.com/).
+
+**********************
+THIRD PARTY COMPONENTS
+**********************
+This software includes third party software subject to the following copyrights:
+- XML parsing and utility functions from JetS3t - Copyright 2006-2009 James Murty.
+- PKCS#1 PEM encoded private key parsing and utility functions from oauth.googlecode.com - Copyright 1998-2010 AOL Inc.
+- Apache Commons Lang - https://github.com/apache/commons-lang
+- Netty Reactive Streams - https://github.com/playframework/netty-reactive-streams
+- Jackson-core - https://github.com/FasterXML/jackson-core
+- Jackson-dataformat-cbor - https://github.com/FasterXML/jackson-dataformats-binary
diff --git a/gremlin-console/src/test/groovy/org/apache/tinkerpop/gremlin/console/GremlinGroovyshTest.groovy b/gremlin-console/src/test/groovy/org/apache/tinkerpop/gremlin/console/GremlinGroovyshTest.groovy
index 998fbbf..843abaf 100644
--- a/gremlin-console/src/test/groovy/org/apache/tinkerpop/gremlin/console/GremlinGroovyshTest.groovy
+++ b/gremlin-console/src/test/groovy/org/apache/tinkerpop/gremlin/console/GremlinGroovyshTest.groovy
@@ -18,23 +18,24 @@
*/
package org.apache.tinkerpop.gremlin.console
-import org.apache.tinkerpop.gremlin.console.commands.RemoteCommand
+
import org.apache.tinkerpop.gremlin.console.jsr223.AbstractGremlinServerIntegrationTest
-import org.apache.tinkerpop.gremlin.console.jsr223.DriverRemoteAcceptor
-import org.apache.tinkerpop.gremlin.console.jsr223.MockGroovyGremlinShellEnvironment
-import org.apache.tinkerpop.gremlin.jsr223.console.RemoteException
+import org.apache.tinkerpop.gremlin.console.jsr223.RemoteGremlinPlugin
+import org.apache.tinkerpop.gremlin.structure.io.Storage
+import org.apache.tinkerpop.gremlin.util.TestSupport
import org.codehaus.groovy.tools.shell.IO
import org.junit.Test
-import java.nio.file.Paths
+import java.nio.file.Files
-import static org.junit.Assert.fail;
+import static org.junit.Assert.assertTrue
class GremlinGroovyshTest extends AbstractGremlinServerIntegrationTest {
private IO testio
private ByteArrayOutputStream out
private ByteArrayOutputStream err
private GremlinGroovysh shell
+ private File propertiesFile
@Override
void setUp() {
@@ -43,143 +44,53 @@
err = new ByteArrayOutputStream()
testio = new IO(new ByteArrayInputStream(), out, err)
shell = new GremlinGroovysh(new Mediator(null), testio)
+
+ prepareConfigFiles()
+ }
+
+ @Test
+ void shouldGetResultFromRemote() {
+ shell.execute("import static org.apache.tinkerpop.gremlin.process.traversal.AnonymousTraversalSource.traversal")
+ shell.execute("g = traversal().with('" + Storage.toPath(propertiesFile) + "')")
+ out.reset()
+ shell.execute("g.V().count().next()")
+
+ // 6 vertices in modern graph
+ assertTrue(out.toString().endsWith("6" + System.lineSeparator()))
+ }
+
+ @Test
+ void shouldUseRemotePlugin() {
+ final RemoteGremlinPlugin plugin = new RemoteGremlinPlugin();
+ final PluggedIn pluggedIn = new PluggedIn(plugin, shell, testio, false)
+ pluggedIn.activate()
+
+ shell.execute("g = traversal().with('" + Storage.toPath(propertiesFile) + "')")
+ out.reset()
+ shell.execute("g.V().count().next()")
+
+ // 6 vertices in modern graph
+ assertTrue(out.toString().endsWith("6" + System.lineSeparator()))
}
@Override
void tearDown() {
super.tearDown()
shell.execute(":purge preferences") // for test cases where persistent preferences (interpreterMode) are set.
+
+ Files.deleteIfExists(propertiesFile.toPath())
}
- @Test
- void shouldEnableRemoteConsole() {
- setupRemote(shell)
- shell.execute(":remote console")
+ void prepareConfigFiles() {
+ final File configFile = TestSupport.generateTempFileFromResource(AbstractGremlinServerIntegrationTest.class, "remote.yaml", "")
+ propertiesFile = File.createTempFile("remote-graph", ".properties")
- assert (false == shell.mediator.localEvaluation)
- assert out.toString().startsWith("All scripts will now be sent to")
- }
-
- @Test
- void shouldGetSimpleResultFromRemoteConsole() {
- setupRemote(shell)
- shell.execute(":remote console")
- out.reset()
- shell.execute("1+1")
-
- assert ("2" == out.toString())
- }
-
- @Test
- void shouldGetGremlinResultFromRemoteConsole() {
- setupRemote(shell)
- shell.execute(":remote console")
- out.reset()
- shell.execute("g.V().count()")
-
- assert ("0" == out.toString())
- }
-
- @Test
- void shouldGetMultilineResultFromRemoteConsole() {
- setupRemote(shell)
- shell.execute(":remote console")
- out.reset()
- shell.execute("if (true) {")
- shell.execute("g.V().count() }")
-
- assert ("0" == out.toString())
- }
-
- @Test
- void shouldNotSubmitIncompleteLinesFromRemoteConsole() {
- setupRemote(shell)
- shell.execute(":remote console")
- shell.execute("if (0 == g.V().count().next()) {")
-
- assert (0 != shell.buffers.current().size())
- }
-
- /**
- * TINKERPOP-3040 - prior to 3.7.4, the console evaluated scripts locally before sending to the server which could
- * create a situation where there were classes needed locally for that eval to succeed for the script to be sent
- * and would therefore end in exception and not allow the send. the console shouldn't be evaluating scripts locally
- * to determine their validity. The console only wants to determine if they are complete for multi-line submission
- * on <enter>. This test simulates this situation by throwing an exception and asserting it is coming from the
- * server as a RemoteException. If it had executed locally we would have just gotten a DefaultTemporaryException.
- */
- @Test
- void shouldNotEvalToDetermineIncompleteLinesToSubmitForRemoteConsole() {
- setupRemote(shell)
- shell.execute(":remote console")
-
- try {
- shell.execute("throw new org.apache.tinkerpop.gremlin.server.util.DefaultTemporaryException('kaboom!!')")
- fail("Should have thrown a remote exception")
- } catch (RemoteException ex) {
- assert ("kaboom!!" == ex.message)
- }
- }
-
- @Test
- void shouldGetGremlinResultFromRemoteConsoleInInterpreterMode() {
- setupRemote(shell)
- shell.execute(":remote console")
- shell.execute(":set interpreterMode")
- out.reset()
- shell.execute("g.V().count()")
-
- assert ("0" == out.toString())
- }
-
- @Test
- void shouldGetMultilineResultFromRemoteConsoleInInterpreterMode() {
- setupRemote(shell)
- shell.execute(":remote console")
- shell.execute(":set interpreterMode")
- out.reset()
- shell.execute("if (true) {")
- shell.execute("g.V().count() }")
-
- assert ("0" == out.toString())
- }
-
- @Test
- void shouldOnlyExecuteOnceRemoteConsoleInInterpreterMode() {
- setupRemote(shell)
- shell.execute(":remote console")
- shell.execute(":set interpreterMode")
- out.reset()
- shell.execute("a = 1")
-
- assert "1" == out.toString()
- }
-
- private def setupRemote(GremlinGroovysh shell) {
- shell.setResultHook(handleResult)
- shell.register(new RemoteCommand(shell, shell.mediator))
- shell.mediator.addRemote(new DriverRemoteAcceptor(new MockGroovyGremlinShellEnvironment(shell)))
- shell.mediator.currentRemote().connect([Paths.get(AbstractGremlinServerIntegrationTest.class.getResource("remote.yaml").toURI()).toString()])
-
- server.getServerGremlinExecutor().getGremlinExecutor().getScriptEngineManager().put(
- "g",
- server.getServerGremlinExecutor().getGraphManager().getGraph("graph").traversal())
- }
-
- private def handleResult = { result ->
- if (result instanceof Iterator) {
- Iterator resultItr = (Iterator) result
-
- while (resultItr.hasNext()) {
- testio.out.print(resultItr.next())
- testio.out.flush()
- }
- } else if (result instanceof Number) {
- testio.out.print((Number) result)
- testio.out.flush()
- } else if (result instanceof String) {
- testio.out.print((String) result)
- testio.out.flush()
+ Files.deleteIfExists(propertiesFile.toPath())
+ Files.createFile(propertiesFile.toPath())
+ try (PrintStream out = new PrintStream(new FileOutputStream(propertiesFile.toPath().toString()))) {
+ out.print("gremlin.remote.remoteConnectionClass=org.apache.tinkerpop.gremlin.driver.remote.DriverRemoteConnection\n")
+ out.print("gremlin.remote.driver.clusterFile=" + Storage.toPath(configFile))
+ out.print("\ngremlin.remote.driver.sourceName=g\n")
}
}
}
diff --git a/gremlin-console/src/test/groovy/org/apache/tinkerpop/gremlin/console/LocalSafeParserTest.groovy b/gremlin-console/src/test/groovy/org/apache/tinkerpop/gremlin/console/LocalSafeParserTest.groovy
deleted file mode 100644
index 76b3596..0000000
--- a/gremlin-console/src/test/groovy/org/apache/tinkerpop/gremlin/console/LocalSafeParserTest.groovy
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.console
-
-import org.apache.groovy.groovysh.ParseCode
-import org.apache.groovy.groovysh.ParseStatus
-import org.junit.Before
-import org.junit.Test
-
-import static org.junit.Assert.assertEquals
-import static org.junit.Assert.assertNotNull
-
-/**
- * Unit tests for {@link LocalSafeParser}.
- */
-class LocalSafeParserTest {
-
- private LocalSafeParser parser
-
- @Before
- void setUp() {
- parser = new LocalSafeParser()
- }
-
- @Test
- void shouldReturnCompleteForEmptyBuffer() {
- def status = parser.parse([])
- assertEquals(ParseCode.COMPLETE, status.code)
- }
-
- @Test
- void shouldReturnCompleteForNullBuffer() {
- def status = parser.parse(null)
- assertEquals(ParseCode.COMPLETE, status.code)
- }
-
- @Test
- void shouldReturnCompleteForValidScript() {
- def script = ["def x = 1", "println x"]
- def status = parser.parse(script)
- assertEquals(ParseCode.COMPLETE, status.code)
- }
-
- @Test
- void shouldReturnCompleteForValidSingleLineScript() {
- def script = ["def x = 1; println x"]
- def status = parser.parse(script)
- assertEquals(ParseCode.COMPLETE, status.code)
- }
-
- @Test
- void shouldReturnIncompleteForUnclosedCurlyBracket() {
- def script = ["if (true) {", " println 'hello'"]
- def status = parser.parse(script)
- assertEquals(ParseCode.INCOMPLETE, status.code)
- }
-
- @Test
- void shouldReturnIncompleteForUnclosedParenthesis() {
- def script = ["println(1 + 2"]
- def status = parser.parse(script)
- assertEquals(ParseCode.INCOMPLETE, status.code)
- }
-
- @Test
- void shouldReturnIncompleteForUnclosedSquareBracket() {
- def script = ["def list = [1, 2, 3"]
- def status = parser.parse(script)
- assertEquals(ParseCode.INCOMPLETE, status.code)
- }
-
- @Test
- void shouldReturnIncompleteForUnclosedSingleQuoteString() {
- def script = ["def s = 'unclosed string"]
- def status = parser.parse(script)
- assertEquals(ParseCode.INCOMPLETE, status.code)
- }
-
- @Test
- void shouldReturnIncompleteForUnclosedDoubleQuoteString() {
- def script = ["def s = \"unclosed string"]
- def status = parser.parse(script)
- assertEquals(ParseCode.INCOMPLETE, status.code)
- }
-
- @Test
- void shouldReturnIncompleteForUnclosedTripleQuoteString() {
- def script = ["def s = '''unclosed triple quote string"]
- ParseStatus status = parser.parse(script)
- assertEquals(ParseCode.INCOMPLETE, status.code)
- }
-
- @Test
- void shouldReturnIncompleteForUnexpectedEOF() {
- def script = ["def method() {"]
- def status = parser.parse(script)
- assertEquals(ParseCode.INCOMPLETE, status.code)
- }
-
- @Test
- void shouldReturnIncompleteForUnexpectedInput() {
- def script = ["def x = 1 +"]
- def status = parser.parse(script)
- assertEquals(ParseCode.INCOMPLETE, status.code)
- }
-
- @Test
- void shouldReturnIncompleteForInvalidSyntax() {
- // Variable name cannot start with a number
- def script = ["def 1x = 1"]
- def status = parser.parse(script)
- assertEquals(ParseCode.INCOMPLETE, status.code)
- }
-
- @Test
- void shouldReturnCompleteForSyntaxError() {
- def script = ["def x = 1;", "x.nonExistentMethod()"]
- def status = parser.parse(script)
- assertEquals(ParseCode.COMPLETE, status.code)
- }
-
- @Test
- void shouldReturnErrorForUnexpectedClosingBracket() {
- def script = ["def x = 1}", "println x"]
- def status = parser.parse(script)
- assertEquals(ParseCode.ERROR, status.code)
- assertNotNull(status.cause)
- }
-
- @Test
- void shouldReturnIncompleteForMultilineIncompleteScript() {
- def script = [
- "def method() {",
- " if (true) {",
- " println 'hello'",
- " }"
- ]
-
- def status = parser.parse(script)
- assertEquals(ParseCode.INCOMPLETE, status.code)
- }
-
- @Test
- void shouldReturnCompleteForMultilineCompleteScript() {
- def script = [
- "def method() {",
- " if (true) {",
- " println 'hello'",
- " }",
- "}"
- ]
-
- def status = parser.parse(script)
- assertEquals(ParseCode.COMPLETE, status.code)
- }
-
- @Test
- void shouldReturnIncompleteForIncompleteGremlinTraversal() {
- def script = ["g.V().has("]
- def status = parser.parse(script)
- assertEquals(ParseCode.INCOMPLETE, status.code)
- }
-
- @Test
- void shouldReturnCompleteForCompleteGremlinTraversal() {
- def script = ["g.V().count()"]
- def status = parser.parse(script)
- assertEquals(ParseCode.COMPLETE, status.code)
- }
-}
\ No newline at end of file
diff --git a/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/AbstractGremlinServerIntegrationTest.java b/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/AbstractGremlinServerIntegrationTest.java
index 1cf4a78..3077f5f 100644
--- a/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/AbstractGremlinServerIntegrationTest.java
+++ b/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/AbstractGremlinServerIntegrationTest.java
@@ -25,6 +25,7 @@
import java.io.InputStream;
import java.nio.file.Paths;
+import java.util.Collections;
/**
* Starts and stops an instance for each executed test.
@@ -48,8 +49,12 @@
final Settings settings = Settings.read(stream);
final Settings overridenSettings = overrideSettings(settings);
- String prop = Paths.get(AbstractGremlinServerIntegrationTest.class.getResource("tinkergraph-empty.properties").toURI()).toString();
+ final String prop = Paths.get(AbstractGremlinServerIntegrationTest.class.getResource("tinkergraph-empty.properties").toURI()).toString();
overridenSettings.graphs.put("graph", prop);
+ final String script = Paths.get(AbstractGremlinServerIntegrationTest.class.getResource("generate.groovy").toURI()).toString();
+ overridenSettings.scriptEngines.get("gremlin-groovy").plugins
+ .get("org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin")
+ .put("files", Collections.singletonList(script));
this.server = new GremlinServer(overridenSettings);
diff --git a/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverRemoteAcceptorIntegrateTest.java b/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverRemoteAcceptorIntegrateTest.java
deleted file mode 100644
index 57b7979..0000000
--- a/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverRemoteAcceptorIntegrateTest.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.console.jsr223;
-
-import org.apache.groovy.groovysh.Groovysh;
-import org.apache.tinkerpop.gremlin.TestHelper;
-import org.apache.tinkerpop.gremlin.driver.Cluster;
-import org.apache.tinkerpop.gremlin.driver.Result;
-import org.apache.tinkerpop.gremlin.util.Tokens;
-import org.apache.tinkerpop.gremlin.jsr223.console.GremlinShellEnvironment;
-import org.apache.tinkerpop.gremlin.jsr223.console.RemoteException;
-import org.apache.tinkerpop.gremlin.server.Settings;
-import org.apache.tinkerpop.gremlin.structure.io.Storage;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TestName;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.startsWith;
-import static org.hamcrest.Matchers.contains;
-import static org.hamcrest.Matchers.hasSize;
-import static org.junit.Assert.assertEquals;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.fail;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class DriverRemoteAcceptorIntegrateTest extends AbstractGremlinServerIntegrationTest {
- private final Groovysh groovysh = new Groovysh();
- private DriverRemoteAcceptor acceptor;
-
- @Rule
- public TestName name = new TestName();
-
- /**
- * Configure specific Gremlin Server settings for specific tests.
- */
- @Override
- public Settings overrideSettings(final Settings settings) {
- try {
- final String tinkerGraphConfig = Storage.toPath(TestHelper.generateTempFileFromResource(this.getClass(), "tinkergraph-empty.properties", ".tmp"));
- settings.graphs.put("g", tinkerGraphConfig);
- return settings;
- } catch (Exception ex) {
- throw new RuntimeException(ex);
- }
- }
-
- @Before
- public void before() throws Exception {
- final GremlinShellEnvironment env = new MockGroovyGremlinShellEnvironment(groovysh);
- acceptor = new DriverRemoteAcceptor(env);
- }
-
- @After
- public void after() {
- try {
- acceptor.close();
- } catch (Exception ex) {
- ex.printStackTrace();
- }
- }
-
- @Test
- public void shouldConnectWithRemoteYaml() throws Exception {
- assertThat(acceptor.connect(Collections.singletonList(Storage.toPath(TestHelper.generateTempFileFromResource(this.getClass(), "remote.yaml", ".tmp")))).toString(), startsWith("Configured "));
- }
-
- @Test
- public void shouldConnectWithRemoteVariable() throws Exception {
- groovysh.getInterp().evaluate(Collections.singletonList("cluster = " + Cluster.class.getName() + ".open(\"" + Storage.toPath(TestHelper.generateTempFileFromResource(this.getClass(), "remote.yaml", ".tmp")) + "\")"));
- assertThat(acceptor.connect(Collections.singletonList("cluster")).toString(), startsWith("Configured "));
- }
-
- @Test
- public void shouldConnectAndSubmitSession() throws Exception {
- assertThat(acceptor.connect(Arrays.asList(Storage.toPath(TestHelper.generateTempFileFromResource(this.getClass(), "remote.yaml", ".tmp")), "session")).toString(), startsWith("Configured "));
- assertEquals("1", ((Iterator) acceptor.submit(Collections.singletonList("x = 1"))).next());
- assertEquals("0", ((Iterator) acceptor.submit(Collections.singletonList("x - 1"))).next());
- assertEquals("0", ((List<Result>) groovysh.getInterp().getContext().getProperty(DriverRemoteAcceptor.RESULT)).iterator().next().getString());
- }
-
- @Test
- public void shouldConnectAndSubmitManagedSession() throws Exception {
- assertThat(acceptor.connect(Arrays.asList(Storage.toPath(TestHelper.generateTempFileFromResource(this.getClass(), "remote.yaml", ".tmp")), "session-managed")).toString(), startsWith("Configured "));
- assertEquals("1", ((Iterator) acceptor.submit(Collections.singletonList("x = 1"))).next());
- assertEquals("0", ((Iterator) acceptor.submit(Collections.singletonList("x - 1"))).next());
- assertEquals("0", ((List<Result>) groovysh.getInterp().getContext().getProperty(DriverRemoteAcceptor.RESULT)).iterator().next().getString());
- }
-
- @Test
- public void shouldConnectAndSubmitSimple() throws Exception {
- assertThat(acceptor.connect(Collections.singletonList(Storage.toPath(TestHelper.generateTempFileFromResource(this.getClass(), "remote.yaml", ".tmp")))).toString(), startsWith("Configured "));
- assertEquals("2", ((Iterator) acceptor.submit(Collections.singletonList("1+1"))).next());
- assertEquals("2", ((List<Result>) groovysh.getInterp().getContext().getProperty(DriverRemoteAcceptor.RESULT)).iterator().next().getString());
- }
-
- @Test
- public void shouldConnectAndSubmitSimpleList() throws Exception {
- assertThat(acceptor.connect(Collections.singletonList(Storage.toPath(TestHelper.generateTempFileFromResource(this.getClass(), "remote.yaml", ".tmp")))).toString(), startsWith("Configured "));
- assertThat(IteratorUtils.list(((Iterator<String>) acceptor.submit(Collections.singletonList("[1,2,3,4,5]")))), contains("1", "2", "3", "4", "5"));
- assertThat(((List<Result>) groovysh.getInterp().getContext().getProperty(DriverRemoteAcceptor.RESULT)).stream().map(Result::getString).collect(Collectors.toList()), contains("1", "2", "3", "4", "5"));
- }
-
- @Test
- public void shouldConnectAndReturnVertices() throws Exception {
- assertThat(acceptor.connect(Collections.singletonList(Storage.toPath(TestHelper.generateTempFileFromResource(this.getClass(), "remote.yaml", ".tmp")))).toString(), startsWith("Configured "));
- assertThat(IteratorUtils.list(((Iterator<String>) acceptor.submit(Collections.singletonList("g.addVertex('name','stephen');g.addVertex('name','marko');g.traversal().V()")))), hasSize(2));
- assertThat(((List<Result>) groovysh.getInterp().getContext().getProperty(DriverRemoteAcceptor.RESULT)).stream().map(Result::getString).collect(Collectors.toList()), hasSize(2));
- }
-
- @Test
- public void shouldConnectAndReturnVerticesWithAnAlias() throws Exception {
- assertThat(acceptor.connect(Collections.singletonList(Storage.toPath(TestHelper.generateTempFileFromResource(this.getClass(), "remote.yaml", ".tmp")))).toString(), startsWith("Configured "));
- acceptor.configure(Arrays.asList("alias", "x", "g"));
- assertThat(IteratorUtils.list(((Iterator<String>) acceptor.submit(Collections.singletonList("x.addVertex('name','stephen');x.addVertex('name','marko');x.traversal().V()")))), hasSize(2));
- assertThat(((List<Result>) groovysh.getInterp().getContext().getProperty(DriverRemoteAcceptor.RESULT)).stream().map(Result::getString).collect(Collectors.toList()), hasSize(2));
- }
-
- @Test
- public void shouldConnectAndSubmitForNull() throws Exception {
- assertThat(acceptor.connect(Collections.singletonList(Storage.toPath(TestHelper.generateTempFileFromResource(this.getClass(), "remote.yaml", ".tmp")))).toString(), startsWith("Configured "));
- assertThat(IteratorUtils.list(((Iterator<String>) acceptor.submit(Collections.singletonList("g.traversal().V().drop().iterate();null")))), contains("null"));
- assertThat(((List<Result>) groovysh.getInterp().getContext().getProperty(DriverRemoteAcceptor.RESULT)).stream().map(Result::getObject).collect(Collectors.toList()), contains("null"));
- }
-
- @Test
- public void shouldConnectAndSubmitInSession() throws Exception {
- assertThat(acceptor.connect(Arrays.asList(Storage.toPath(TestHelper.generateTempFileFromResource(this.getClass(), "remote.yaml", ".tmp")), "session")).toString(), startsWith("Configured "));
- assertEquals("2", ((Iterator) acceptor.submit(Collections.singletonList("x=1+1"))).next());
- assertEquals("2", ((List<Result>) groovysh.getInterp().getContext().getProperty(DriverRemoteAcceptor.RESULT)).iterator().next().getString());
- assertEquals("4", ((Iterator) acceptor.submit(Collections.singletonList("x+2"))).next());
- assertEquals("4", ((List<Result>) groovysh.getInterp().getContext().getProperty(DriverRemoteAcceptor.RESULT)).iterator().next().getString());
- }
-
- @Test
- public void shouldConnectAndSubmitInNamedSession() throws Exception {
- assertThat(acceptor.connect(Arrays.asList(Storage.toPath(TestHelper.generateTempFileFromResource(this.getClass(), "remote.yaml", ".tmp")), "session", "AAA")).toString(), startsWith("Configured "));
- assertEquals("2", ((Iterator) acceptor.submit(Collections.singletonList("x=1+1"))).next());
- assertEquals("2", ((List<Result>) groovysh.getInterp().getContext().getProperty(DriverRemoteAcceptor.RESULT)).iterator().next().getString());
- assertEquals("4", ((Iterator) acceptor.submit(Collections.singletonList("x+2"))).next());
- assertEquals("4", ((List<Result>) groovysh.getInterp().getContext().getProperty(DriverRemoteAcceptor.RESULT)).iterator().next().getString());
- }
-
- @Test
- public void shouldConnectAndSubmitWithTimeout() throws Exception {
- assertThat(acceptor.connect(Collections.singletonList(Storage.toPath(TestHelper.generateTempFileFromResource(this.getClass(), "remote.yaml", ".tmp")))).toString(), startsWith("Configured "));
- try {
- acceptor.submit(Collections.singletonList(String.format("g.with(%s, 10).inject(0).sideEffect{Thread.sleep(10000)}", Tokens.ARGS_EVAL_TIMEOUT)));
- fail("Request should have timed out");
- } catch (RemoteException re) {
- assertThat(re.getMessage(), containsString("evaluationTimeout"));
- }
- }
-}
diff --git a/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverRemoteAcceptorTest.java b/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverRemoteAcceptorTest.java
deleted file mode 100644
index 84f4254..0000000
--- a/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverRemoteAcceptorTest.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.console.jsr223;
-
-import org.apache.groovy.groovysh.Groovysh;
-import org.apache.tinkerpop.gremlin.TestHelper;
-import org.apache.tinkerpop.gremlin.jsr223.console.RemoteException;
-import org.apache.tinkerpop.gremlin.structure.io.Storage;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Map;
-
-import static org.hamcrest.CoreMatchers.startsWith;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class DriverRemoteAcceptorTest {
-
- private final Groovysh groovysh = new Groovysh();
- private DriverRemoteAcceptor acceptor;
-
- @Before
- public void setUp() {
- acceptor = new DriverRemoteAcceptor(new MockGroovyGremlinShellEnvironment(groovysh));
- }
-
- @After
- public void tearDown() {
- try {
- acceptor.close();
- } catch (Exception ex) {
- ex.printStackTrace();
- }
- }
-
- @Test(expected = RemoteException.class)
- public void shouldNotConfigureWithBadCommand() throws Exception {
- acceptor.configure(Arrays.asList("test"));
- }
-
- @Test(expected = RemoteException.class)
- public void shouldNotConfigureWithUnevenPairsOfAliases() throws Exception {
- acceptor.configure(Arrays.asList("alias g social x"));
- }
-
- @Test
- public void shouldResetAliases() throws Exception {
- final Map<String,String> resetAliases = (Map<String,String>) acceptor.configure(Arrays.asList("alias", "g", "main.social"));
- assertEquals(1, resetAliases.size());
- assertEquals("main.social", resetAliases.get("g"));
-
- assertEquals("Aliases cleared", acceptor.configure(Arrays.asList("alias", "reset")));
-
- final Map<String,String> shownAliases = (Map<String,String>) acceptor.configure(Arrays.asList("alias", "show"));
- assertEquals(0, shownAliases.size());
- }
-
- @Test
- public void shouldAddOverwriteAndShowAliases() throws Exception {
- final Map<String,String> aliases = (Map<String,String>) acceptor.configure(Arrays.asList("alias", "g", "social", "graph", "main"));
- assertEquals(2, aliases.size());
- assertEquals("social", aliases.get("g"));
- assertEquals("main", aliases.get("graph"));
-
- final Map<String,String> resetAliases = (Map<String,String>) acceptor.configure(Arrays.asList("alias", "g", "main.social"));
- assertEquals(1, resetAliases.size());
- assertEquals("main.social", resetAliases.get("g"));
-
- final Map<String,String> shownAliases = (Map<String,String>) acceptor.configure(Arrays.asList("alias", "show"));
- assertEquals(1, shownAliases.size());
- assertEquals("main.social", shownAliases.get("g"));
- }
-
- @Test(expected = RemoteException.class)
- public void shouldNotConnectWithEmptyArgs() throws Exception {
- acceptor.connect(new ArrayList<>());
- }
-
- @Test(expected = RemoteException.class)
- public void shouldNotConnectWithTooManyArgs() throws Exception {
- acceptor.connect(Arrays.asList("two", "too", "many"));
- }
-
- @Test(expected = RemoteException.class)
- public void shouldNotConnectWithInvalidConfigFile() throws Exception {
- acceptor.connect(Arrays.asList("this-isnt-real.yaml"));
- }
-
- @Test
- public void shouldConfigureTimeoutToNone() throws Exception {
- acceptor.configure(Arrays.asList("timeout", "none"));
- assertEquals(DriverRemoteAcceptor.NO_TIMEOUT, acceptor.getTimeout());
- }
-
- @Test
- public void shouldConfigureTimeout() throws Exception {
- acceptor.configure(Arrays.asList("timeout", "123456"));
- assertEquals(123456, acceptor.getTimeout());
- }
-
- @Test(expected = RemoteException.class)
- public void shouldConfigureTimeoutNotLessThanNoTimeout() throws Exception {
- acceptor.configure(Arrays.asList("timeout", "-1"));
- }
-
- @Test
- public void shouldConnectWithError() throws Exception {
- // there is no gremlin server running for this test, so the driver will throw NoHostAvailableException, log an
- // error, and return with a message to the console.
- assertThat(acceptor.connect(Arrays.asList(Storage.toPath(TestHelper.generateTempFileFromResource(this.getClass(),
- "remote.yaml", ".tmp")))).toString(), startsWith("Configured "));
- }
-}
diff --git a/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/GephiRemoteAcceptorIntegrateTest.java b/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/GephiRemoteAcceptorIntegrateTest.java
deleted file mode 100644
index 7781d87..0000000
--- a/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/GephiRemoteAcceptorIntegrateTest.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.console.jsr223;
-
-import com.github.tomakehurst.wiremock.junit.WireMockRule;
-import org.apache.commons.io.input.NullInputStream;
-import org.apache.groovy.groovysh.Groovysh;
-import org.apache.tinkerpop.gremlin.console.GremlinGroovysh;
-import org.apache.tinkerpop.gremlin.console.Mediator;
-import org.apache.tinkerpop.gremlin.jsr223.console.RemoteException;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
-import org.codehaus.groovy.tools.shell.IO;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.ServerSocket;
-import java.util.Arrays;
-import java.util.Collections;
-
-import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
-import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
-import static com.github.tomakehurst.wiremock.client.WireMock.equalToJson;
-import static com.github.tomakehurst.wiremock.client.WireMock.get;
-import static com.github.tomakehurst.wiremock.client.WireMock.getRequestedFor;
-import static com.github.tomakehurst.wiremock.client.WireMock.post;
-import static com.github.tomakehurst.wiremock.client.WireMock.postRequestedFor;
-import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
-import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
-import static org.hamcrest.CoreMatchers.startsWith;
-import static org.hamcrest.MatcherAssert.assertThat;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class GephiRemoteAcceptorIntegrateTest {
- private static final Groovysh groovysh = new GremlinGroovysh(new Mediator(null), new IO());
- private static int port = pickOpenPort();
-
- private GephiRemoteAcceptor acceptor;
-
- private final InputStream inputStream = new NullInputStream(0);
- private final OutputStream outputStream = new ByteArrayOutputStream();
- private final OutputStream errorStream = new ByteArrayOutputStream();
- private final IO io = new IO(inputStream, outputStream, errorStream);
-
- @Rule
- public WireMockRule wireMockRule = new WireMockRule(port);
-
- static {
- final Graph graph = TinkerFactory.createModern();
- groovysh.getInterp().getContext().setProperty("graph", graph);
- }
-
- @Before
- public void before() throws Exception {
- acceptor = new GephiRemoteAcceptor(new MockGroovyGremlinShellEnvironment(groovysh, io));
- acceptor.configure(Arrays.asList("port", String.valueOf(port)));
- }
-
- @Test
- public void shouldConnectWithDefaults() throws RemoteException {
- assertThat(acceptor.connect(Collections.emptyList()).toString(), startsWith("Connection to Gephi - http://localhost:" + port + "/workspace1"));
- }
-
- @Test
- public void shouldSubmitGraph() throws RemoteException {
- stubFor(post(urlPathEqualTo("/workspace1"))
- .withQueryParam("format", equalTo("JSON"))
- .withQueryParam("operation", equalTo("updateGraph"))
- .willReturn(aResponse()
- .withStatus(200)));
-
- stubFor(get(urlPathEqualTo("/workspace1"))
- .withQueryParam("operation", equalTo("getNode"))
- .willReturn(aResponse()
- .withStatus(200)));
-
- acceptor.submit(Arrays.asList("g = org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph.open();g.addVertex();g"));
-
- wireMockRule.verify(4, postRequestedFor(urlPathEqualTo("/workspace1")));
- wireMockRule.verify(1, getRequestedFor(urlPathEqualTo("/workspace1")));
- }
-
- @Test
- public void shouldSubmitTraversalAfterConfigWithDefaultG() throws RemoteException {
- stubFor(post(urlPathEqualTo("/workspace1"))
- .withQueryParam("format", equalTo("JSON"))
- .withQueryParam("operation", equalTo("updateGraph"))
- .willReturn(aResponse()
- .withStatus(200)));
-
- acceptor.configure(Arrays.asList("visualTraversal", "graph"));
-
- // call iterate() as groovysh isn't rigged to auto-iterate
- acceptor.submit(Arrays.asList(
- "vg.V(2).in('knows').out('knows').has('age',org.apache.tinkerpop.gremlin.process.traversal.P.gt(30)).outE('created').has('weight',org.apache.tinkerpop.gremlin.process.traversal.P.gt(0.5d)).inV().iterate()"));
-
- wireMockRule.verify(18, postRequestedFor(urlPathEqualTo("/workspace1")));
- }
-
- @Test
- public void shouldSubmitTraversalAfterConfigWithDefinedG() throws RemoteException {
- stubFor(post(urlPathEqualTo("/workspace1"))
- .withQueryParam("format", equalTo("JSON"))
- .withQueryParam("operation", equalTo("updateGraph"))
- .willReturn(aResponse()
- .withStatus(200)));
-
- acceptor.configure(Arrays.asList("visualTraversal", "graph", "x"));
-
- // call iterate() as groovysh isn't rigged to auto-iterate
- acceptor.submit(Arrays.asList(
- "x.V(2).in('knows').out('knows').has('age',org.apache.tinkerpop.gremlin.process.traversal.P.gt(30)).outE('created').has('weight',org.apache.tinkerpop.gremlin.process.traversal.P.gt(0.5d)).inV().iterate()"));
-
- wireMockRule.verify(18, postRequestedFor(urlPathEqualTo("/workspace1")));
- }
-
- @Test
- public void shouldSubmitTraversalOverRepeat() throws RemoteException {
- stubFor(post(urlPathEqualTo("/workspace1"))
- .withQueryParam("format", equalTo("JSON"))
- .withQueryParam("operation", equalTo("updateGraph"))
- .willReturn(aResponse()
- .withStatus(200)));
-
- acceptor.configure(Arrays.asList("visualTraversal", "graph"));
-
- // call iterate() as groovysh isn't rigged to auto-iterate
- acceptor.submit(Arrays.asList(
- "vg.V(1).repeat(org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.__().out()).times(2).iterate()"));
-
- wireMockRule.verify(13, postRequestedFor(urlPathEqualTo("/workspace1")));
- }
-
- @Test
- public void shouldClearGraph() throws RemoteException {
- stubFor(post(urlPathEqualTo("/workspace1"))
- .withQueryParam("format", equalTo("JSON"))
- .withQueryParam("operation", equalTo("updateGraph"))
- .withRequestBody(equalToJson("{\"dn\":{\"filter\":\"ALL\"}}"))
- .willReturn(aResponse()
- .withStatus(200)));
-
- acceptor.submit(Arrays.asList("clear"));
-
- wireMockRule.verify(1, postRequestedFor(urlPathEqualTo("/workspace1")));
- }
-
- private static int pickOpenPort() {
- try (final ServerSocket socket = new ServerSocket(0)) {
- return socket.getLocalPort();
- } catch (IOException ioe) {
- throw new RuntimeException(ioe);
- }
- }
-}
diff --git a/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/UtilitiesGremlinPluginTest.java b/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/UtilitiesGremlinPluginTest.java
index 9b26f76..90cb357 100644
--- a/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/UtilitiesGremlinPluginTest.java
+++ b/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/UtilitiesGremlinPluginTest.java
@@ -43,7 +43,7 @@
private final IO io = new IO(inputStream, outputStream, errorStream);
@Test
- public void shouldFailWithoutUtilitiesPlugin() throws Exception {
+ public void shouldFailWithoutUtilitiesPlugin() {
final Groovysh groovysh = new Groovysh();
try {
groovysh.execute("describeGraph(g.class)");
@@ -53,7 +53,7 @@
}
@Test
- public void shouldPluginUtilities() throws Exception {
+ public void shouldPluginUtilities() {
final UtilitiesGremlinPlugin plugin = new UtilitiesGremlinPlugin();
final Groovysh groovysh = new Groovysh();
diff --git a/gremlin-console/src/test/python/setup.py b/gremlin-console/src/test/python/setup.py
index 4914991..a112185 100644
--- a/gremlin-console/src/test/python/setup.py
+++ b/gremlin-console/src/test/python/setup.py
@@ -26,12 +26,12 @@
name='gremlinconsoletest',
test_suite="tests",
setup_requires=[
- 'pytest-runner==5.2',
- 'importlib-metadata<3.0.0'
+ 'pytest-runner==6.0.0',
+ 'importlib-metadata<5.0.0'
],
tests_require=[
- 'pytest>=4.6.4,<5.0.0',
- 'mock>=3.0.5,<4.0.0',
- 'pexpect==4.8.0'
+ 'pytest>=4.6.4,<7.2.0',
+ 'mock>=3.0.5,<5.1.0',
+ 'pexpect==4.9.0'
]
)
diff --git a/gremlin-console/src/test/python/tests/test_console.py b/gremlin-console/src/test/python/tests/test_console.py
index b40b414..3bcccc9 100644
--- a/gremlin-console/src/test/python/tests/test_console.py
+++ b/gremlin-console/src/test/python/tests/test_console.py
@@ -83,7 +83,7 @@
child.expect("==>2\r\n")
TestConsole._expect_prompt(child)
TestConsole._send(child, "z")
- child.expect("==>argument=\[x, -i, =, --color, -D\]\r\n")
+ child.expect("==>argument=\\[x, -i, =, --color, -D\\]\r\n")
TestConsole._expect_prompt(child)
TestConsole._close(child)
@@ -97,7 +97,7 @@
child.expect("==>2\r\n")
TestConsole._expect_prompt(child)
TestConsole._send(child, "z")
- child.expect("==>argument=\[x, -i, =, --color, -D\]\r\n")
+ child.expect("==>argument=\\[x, -i, =, --color, -D\\]\r\n")
TestConsole._expect_prompt(child)
TestConsole._close(child)
@@ -111,7 +111,7 @@
child.expect("==>2\r\n")
TestConsole._expect_prompt(child)
TestConsole._send(child, "z")
- child.expect("==>argument=\[x, -i, =, --color, -D\]\r\n")
+ child.expect("==>argument=\\[x, -i, =, --color, -D\\]\r\n")
TestConsole._expect_prompt(child)
TestConsole._close(child)
@@ -122,7 +122,7 @@
def test_just_dash_e_file_not_found(self):
child = pexpect.spawn(TestConsole.gremlinsh + "-e=x-printed.script")
- child.expect("Gremlin file not found at \[=x-printed.script\]\.\r\n")
+ child.expect("Gremlin file not found at \\[=x-printed.script\\]\\.\r\n")
child.expect(pexpect.EOF)
def test_just_dash_dash_execute(self):
@@ -144,21 +144,21 @@
child = pexpect.spawn(TestConsole.gremlinsh + "-e y-printed.script 1 2 3 -e x-printed.script -e \"z-printed.script x -e = --color -D\"")
child.expect("6\r\n")
child.expect("2\r\n")
- child.expect("argument=\[x, -e, =, --color, -D\]\r\n")
+ child.expect("argument=\\[x, -e, =, --color, -D\\]\r\n")
TestConsole._close(child)
def test_dash_dash_execute_multiple_scripts(self):
child = pexpect.spawn(TestConsole.gremlinsh + "--execute y-printed.script 1 2 3 --execute x-printed.script --execute \"z-printed.script x -e = --color -D\"")
child.expect("6\r\n")
child.expect("2\r\n")
- child.expect("argument=\[x, -e, =, --color, -D\]\r\n")
+ child.expect("argument=\\[x, -e, =, --color, -D\\]\r\n")
TestConsole._close(child)
def test_mixed_execute_long_short_opts_with_multiple_scripts(self):
child = pexpect.spawn(TestConsole.gremlinsh + "--execute y-printed.script 1 2 3 -e x-printed.script --execute \"z-printed.script x -e = --color -D\"")
child.expect("6\r\n")
child.expect("2\r\n")
- child.expect("argument=\[x, -e, =, --color, -D\]\r\n")
+ child.expect("argument=\\[x, -e, =, --color, -D\\]\r\n")
TestConsole._close(child)
def test_no_mix_dash_i_and_dash_e(self):
@@ -175,9 +175,9 @@
def _expect_gremlin_header(child):
# skip/read the Gremlin graphics
child.expect("\r\n")
- child.expect(["plugin activated: tinkerpop.server", "plugin activated: tinkerpop.utilities", "plugin activated: tinkerpop.tinkergraph"])
- child.expect(["plugin activated: tinkerpop.server", "plugin activated: tinkerpop.utilities", "plugin activated: tinkerpop.tinkergraph"])
- child.expect(["plugin activated: tinkerpop.server", "plugin activated: tinkerpop.utilities", "plugin activated: tinkerpop.tinkergraph"])
+ child.expect(["plugin activated: tinkerpop.remote", "plugin activated: tinkerpop.utilities", "plugin activated: tinkerpop.tinkergraph"])
+ child.expect(["plugin activated: tinkerpop.remote", "plugin activated: tinkerpop.utilities", "plugin activated: tinkerpop.tinkergraph"])
+ child.expect(["plugin activated: tinkerpop.remote", "plugin activated: tinkerpop.utilities", "plugin activated: tinkerpop.tinkergraph"])
TestConsole._expect_prompt(child)
@staticmethod
diff --git a/gremlin-console/src/test/resources/org/apache/tinkerpop/gremlin/console/jsr223/generate.groovy b/gremlin-console/src/test/resources/org/apache/tinkerpop/gremlin/console/jsr223/generate.groovy
new file mode 100644
index 0000000..594402a
--- /dev/null
+++ b/gremlin-console/src/test/resources/org/apache/tinkerpop/gremlin/console/jsr223/generate.groovy
@@ -0,0 +1,33 @@
+/*
+ * 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.
+ */
+
+// an init script that returns a Map allows explicit setting of global bindings.
+def globals = [:]
+
+// Generates the modern graph into an "empty" TinkerGraph via LifeCycleHook.
+// Note that the name of the key in the "global" map is unimportant.
+globals << [hook : [
+ onStartUp: { ctx ->
+ ctx.logger.info("Loading 'modern' graph data.")
+ org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory.generateModern(graph)
+ }
+] as LifeCycleHook]
+
+// define the default TraversalSource to bind queries to - this one will be named "g".
+globals << [g : traversal().withEmbedded(graph)]
\ No newline at end of file
diff --git a/gremlin-console/src/test/resources/org/apache/tinkerpop/gremlin/console/jsr223/gremlin-server-integration.yaml b/gremlin-console/src/test/resources/org/apache/tinkerpop/gremlin/console/jsr223/gremlin-server-integration.yaml
index 16080e7..4bb6dcf 100644
--- a/gremlin-console/src/test/resources/org/apache/tinkerpop/gremlin/console/jsr223/gremlin-server-integration.yaml
+++ b/gremlin-console/src/test/resources/org/apache/tinkerpop/gremlin/console/jsr223/gremlin-server-integration.yaml
@@ -18,20 +18,15 @@
host: localhost
port: 45940
evaluationTimeout: 30000
-channelizer: org.apache.tinkerpop.gremlin.server.channel.WebSocketChannelizer
+channelizer: org.apache.tinkerpop.gremlin.server.channel.HttpChannelizer
scriptEngines: {
gremlin-groovy: {
plugins: { org.apache.tinkerpop.gremlin.server.jsr223.GremlinServerGremlinPlugin: {},
org.apache.tinkerpop.gremlin.tinkergraph.jsr223.TinkerGraphGremlinPlugin: {},
- org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin: {classImports: [java.lang.Math], methodImports: [java.lang.Math#*]}}}}
+ org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin: {classImports: [java.lang.Math], methodImports: [java.lang.Math#*]},
+ org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin: {}}}}
serializers:
- - { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1, config: { serializeResultToString: true }} # application/vnd.gremlin-v3.0+gryo-stringd
- - { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV1, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1] }} # application/vnd.gremlin-v1.0+json
- - { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3] }} # application/json,application/vnd.gremlin-v3.0+json
- - { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV2, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2] }} # application/vnd.gremlin-v2.0+json
-processors:
- - { className: org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: { sessionTimeout: 28800000 }}
- - { className: org.apache.tinkerpop.gremlin.server.op.traversal.TraversalOpProcessor}
+ - { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV4} # application/vnd.graphbinary-v4.0
metrics: {
consoleReporter: {enabled: true, interval: 180000},
csvReporter: {enabled: true, interval: 180000, fileName: /tmp/gremlin-server-metrics.csv},
@@ -41,7 +36,7 @@
maxInitialLineLength: 4096
maxHeaderSize: 8192
maxChunkSize: 8192
-maxContentLength: 65536
+maxRequestContentLength: 65536
maxAccumulationBufferComponents: 1024
resultIterationBatchSize: 64
writeBufferLowWaterMark: 32768
diff --git a/gremlin-console/src/test/resources/org/apache/tinkerpop/gremlin/console/jsr223/remote-graph.properties b/gremlin-console/src/test/resources/org/apache/tinkerpop/gremlin/console/jsr223/remote-graph.properties
new file mode 100644
index 0000000..d592bd6
--- /dev/null
+++ b/gremlin-console/src/test/resources/org/apache/tinkerpop/gremlin/console/jsr223/remote-graph.properties
@@ -0,0 +1,35 @@
+# 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.
+
+##############################################################
+# This configuration is meant for use with with() or connect().
+#
+# g = traversal().with('conf/remote-graph.properties')
+# g = connect('conf/remote-graph.properties')
+#
+# todo: revisit compatible configs
+# This file will work with:
+# - gremlin-server.yaml
+# - gremlin-server-classic.yaml
+# - gremlin-server-modern.yaml
+# - gremlin-server-modern-readonly.yaml
+# - gremlin-server-secure.yaml
+##############################################################
+
+gremlin.remote.remoteConnectionClass=org.apache.tinkerpop.gremlin.driver.remote.DriverRemoteConnection
+gremlin.remote.driver.clusterFile=remote.yaml
+gremlin.remote.driver.sourceName=g
\ No newline at end of file
diff --git a/gremlin-console/src/test/resources/org/apache/tinkerpop/gremlin/console/jsr223/remote.yaml b/gremlin-console/src/test/resources/org/apache/tinkerpop/gremlin/console/jsr223/remote.yaml
index 187e2c7..9a232e3 100644
--- a/gremlin-console/src/test/resources/org/apache/tinkerpop/gremlin/console/jsr223/remote.yaml
+++ b/gremlin-console/src/test/resources/org/apache/tinkerpop/gremlin/console/jsr223/remote.yaml
@@ -17,4 +17,4 @@
hosts: [localhost]
port: 45940
-serializer: { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1, config: { serializeResultToString: true }}
\ No newline at end of file
+serializer: { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV4}
\ No newline at end of file
diff --git a/gremlin-core/pom.xml b/gremlin-core/pom.xml
index 6a27e28..7d547d0 100644
--- a/gremlin-core/pom.xml
+++ b/gremlin-core/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>gremlin-core</artifactId>
<name>Apache TinkerPop :: Gremlin Core</name>
@@ -40,20 +40,24 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-configuration2</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
+ <!-- commons-configuration2 requires beanutils because we rely on file loaders -->
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
+ <version>1.10.0</version>
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/BindingsGremlinPlugin.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/BindingsGremlinPlugin.java
deleted file mode 100644
index 003f79d..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/BindingsGremlinPlugin.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.jsr223;
-
-import javax.script.Bindings;
-import javax.script.ScriptContext;
-import javax.script.SimpleBindings;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.function.Supplier;
-
-/**
- * A plugin that allows {@code Bindings} to be applied to a {@link GremlinScriptEngine} at the time of creation.
- * {@code Bindings} defined with this plugin will always be assigned as {@code ScriptContext.GLOBAL_SCOPE} and as such
- * will be visible to all {@link GremlinScriptEngine} instances.
- * <p/>
- * Note that bindings are applied in the order in which the {@code BindingsGremlinPlugin} instances are added to the
- * {@link GremlinScriptEngineManager}. Therefore if there are two plugins added and both include a variable called "x"
- * then the value of "x" will be the equal to the value provided by the second plugin that overrides the first.
- * <p/>
- * This {@link GremlinPlugin} is not enabled for the {@code ServiceLoader}. It is designed to be instantiated manually.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class BindingsGremlinPlugin extends AbstractGremlinPlugin {
- private static final String NAME = "tinkerpop.bindings";
-
- private BindingsGremlinPlugin(final Builder builder) {
- super(NAME, new DefaultBindingsCustomizer(builder.bindings));
- }
-
- BindingsGremlinPlugin(final Supplier<Bindings> bindingsSupplier) {
- super(NAME, new LazyBindingsCustomizer(bindingsSupplier));
- }
-
- /**
- * Builds a set of static bindings.
- */
- public static BindingsGremlinPlugin.Builder build() {
- return new Builder();
- }
-
- public static final class Builder {
-
- private Bindings bindings = new SimpleBindings();
-
- private Builder() {}
-
- public Builder bindings(final Map<String, Object> bindings) {
- this.bindings = new SimpleBindings(bindings);
- return this;
- }
-
- public BindingsGremlinPlugin create() {
- return new BindingsGremlinPlugin(this);
- }
- }
-}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/CoreImports.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/CoreImports.java
index 82e3ed7..d6b61ad 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/CoreImports.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/CoreImports.java
@@ -30,6 +30,8 @@
import org.apache.commons.configuration2.SubsetConfiguration;
import org.apache.commons.configuration2.XMLConfiguration;
import org.apache.commons.configuration2.builder.fluent.Configurations;
+import org.apache.tinkerpop.gremlin.language.translator.GremlinTranslator;
+import org.apache.tinkerpop.gremlin.language.translator.Translator;
import org.apache.tinkerpop.gremlin.process.computer.Computer;
import org.apache.tinkerpop.gremlin.process.computer.ComputerResult;
import org.apache.tinkerpop.gremlin.process.computer.GraphComputer;
@@ -56,7 +58,6 @@
import org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.verification.VertexProgramRestrictionStrategy;
import org.apache.tinkerpop.gremlin.process.remote.RemoteConnection;
import org.apache.tinkerpop.gremlin.process.traversal.AnonymousTraversalSource;
-import org.apache.tinkerpop.gremlin.process.traversal.Bindings;
import org.apache.tinkerpop.gremlin.process.traversal.DT;
import org.apache.tinkerpop.gremlin.process.traversal.IO;
import org.apache.tinkerpop.gremlin.process.traversal.Merge;
@@ -69,7 +70,6 @@
import org.apache.tinkerpop.gremlin.process.traversal.SackFunctions;
import org.apache.tinkerpop.gremlin.process.traversal.Scope;
import org.apache.tinkerpop.gremlin.process.traversal.TextP;
-import org.apache.tinkerpop.gremlin.process.traversal.Translator;
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;
@@ -83,12 +83,13 @@
import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.OptionsStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SeedStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.finalization.ReferenceElementStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SubgraphStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.finalization.MatchAlgorithmStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.finalization.ProfileStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.strategy.finalization.ReferenceElementStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.AdjacentToIncidentStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.ByModulatorOptimizationStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.CountStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.EarlyLimitStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.FilterRankingStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.IdentityRemovalStrategy;
@@ -98,18 +99,15 @@
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.MatchPredicateStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.OrderLimitStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.PathProcessorStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.CountStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.PathRetractionStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.ProductiveByStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.RepeatUnrollStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ComputerVerificationStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.EdgeLabelVerificationStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.LambdaRestrictionStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ReadOnlyStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ReservedKeysVerificationStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.StandardVerificationStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.translator.DotNetTranslator;
-import org.apache.tinkerpop.gremlin.process.traversal.translator.GroovyTranslator;
-import org.apache.tinkerpop.gremlin.process.traversal.translator.JavascriptTranslator;
-import org.apache.tinkerpop.gremlin.process.traversal.translator.PythonTranslator;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics;
import org.apache.tinkerpop.gremlin.structure.Column;
import org.apache.tinkerpop.gremlin.structure.Direction;
@@ -284,8 +282,10 @@
CLASS_IMPORTS.add(PathProcessorStrategy.class);
CLASS_IMPORTS.add(ComputerVerificationStrategy.class);
CLASS_IMPORTS.add(LambdaRestrictionStrategy.class);
+ CLASS_IMPORTS.add(PathRetractionStrategy.class);
CLASS_IMPORTS.add(ReadOnlyStrategy.class);
CLASS_IMPORTS.add(ReferenceElementStrategy.class);
+ CLASS_IMPORTS.add(RepeatUnrollStrategy.class);
CLASS_IMPORTS.add(SeedStrategy.class);
CLASS_IMPORTS.add(StandardVerificationStrategy.class);
CLASS_IMPORTS.add(EdgeLabelVerificationStrategy.class);
@@ -297,13 +297,6 @@
CLASS_IMPORTS.add(GraphTraversalSource.class);
CLASS_IMPORTS.add(Traversal.class);
CLASS_IMPORTS.add(TraversalMetrics.class);
- CLASS_IMPORTS.add(Translator.class);
- CLASS_IMPORTS.add(DotNetTranslator.class);
- CLASS_IMPORTS.add(GroovyTranslator.class);
- CLASS_IMPORTS.add(JavaTranslator.class);
- CLASS_IMPORTS.add(JavascriptTranslator.class);
- CLASS_IMPORTS.add(PythonTranslator.class);
- CLASS_IMPORTS.add(Bindings.class);
// graph computer
CLASS_IMPORTS.add(Computer.class);
CLASS_IMPORTS.add(ComputerResult.class);
@@ -335,6 +328,8 @@
CLASS_IMPORTS.add(java.time.OffsetDateTime.class);
CLASS_IMPORTS.add(java.sql.Timestamp.class);
CLASS_IMPORTS.add(java.util.UUID.class);
+ CLASS_IMPORTS.add(GremlinTranslator.class);
+ CLASS_IMPORTS.add(Translator.class);
/////////////
// METHODS //
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 f75169c..8102a4f 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
@@ -23,7 +23,6 @@
import org.apache.tinkerpop.gremlin.language.grammar.GremlinAntlrToJava;
import org.apache.tinkerpop.gremlin.language.grammar.GremlinQueryParser;
import org.apache.tinkerpop.gremlin.language.grammar.VariableResolver;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
import org.apache.tinkerpop.gremlin.process.traversal.GValueManager;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
@@ -49,8 +48,7 @@
* A {@link GremlinScriptEngine} implementation that evaluates Gremlin scripts using {@code gremlin-language}. As it
* uses {@code gremlin-language} and thus the ANTLR parser, it is not capable of process arbitrary scripts as the
* {@code GremlinGroovyScriptEngine} can and is therefore a more secure Gremlin evaluator. It is obviously restricted
- * to the capabilities of the ANTLR grammar so syntax that includes things like lambdas are not supported. For bytecode
- * evaluation it simply uses the {@link JavaTranslator}.
+ * to the capabilities of the ANTLR grammar so therefore syntax that includes things like lambdas are not supported.
* <p/>
* As an internal note, technically, this is an incomplete implementation of the {@link GremlinScriptEngine} in the
* traditional sense as a drop-in replacement for something like the {@code GremlinGroovyScriptEngine}. As a result,
@@ -65,8 +63,7 @@
* the {@code eval} method. Each cache is keyed on the original Gremlin string and holds the initialized parsed
* traversal for its value. If that Gremlin string is matched again in the future, it will use the one from the cache
* rather than parse again via the ANTLR grammar. In addition, if {@link GValue} instances were used in formation of
- * the traversal, it will substitute in new bindings given with the {@code eval}. This cache only applies to scripts,
- * not to {@link Bytecode}.
+ * the traversal, it will substitute in new bindings given with the {@code eval}.
*/
public class GremlinLangScriptEngine extends AbstractScriptEngine implements GremlinScriptEngine {
private volatile GremlinScriptEngineFactory factory;
@@ -127,27 +124,6 @@
}
/**
- * Bytecode is evaluated by the {@link JavaTranslator}.
- */
- @Override
- public Traversal.Admin eval(final Bytecode bytecode, final Bindings bindings, final String traversalSource) throws ScriptException {
- if (traversalSource.equals(HIDDEN_G))
- throw new IllegalArgumentException("The traversalSource cannot have the name " + HIDDEN_G + " - it is reserved");
-
- if (bindings.containsKey(HIDDEN_G))
- throw new IllegalArgumentException("Bindings cannot include " + HIDDEN_G + " - it is reserved");
-
- if (!bindings.containsKey(traversalSource))
- throw new IllegalArgumentException("The bindings available to the ScriptEngine do not contain a traversalSource named: " + traversalSource);
-
- final Object b = bindings.get(traversalSource);
- if (!(b instanceof TraversalSource))
- throw new IllegalArgumentException(traversalSource + " is of type " + b.getClass().getSimpleName() + " and is not an instance of TraversalSource");
-
- return JavaTranslator.of((TraversalSource) b).translate(bytecode);
- }
-
- /**
* Gremlin scripts evaluated by the grammar must be bound to "g" and should evaluate to a "g" in the
* {@code ScriptContext} that is of type {@link TraversalSource}
*/
@@ -191,13 +167,14 @@
try {
// parse the script
- final Traversal.Admin<?,?> traversal = (Traversal.Admin) GremlinQueryParser.parse(script, antlr);
+ final Object result = GremlinQueryParser.parse(script, antlr);
// add the traversal to the cache in its executable form - note that the cache is really just sparing us
// script parsing
- if (cacheEnabled) traversalCache.put(script, traversal.clone());
+ // Note that caching is skipped if the result is not a Traversal (ie the script is terminated with next())
+ if (cacheEnabled && result instanceof Traversal.Admin) traversalCache.put(script, ((Traversal.Admin<?,?>) result).clone());
- return traversal;
+ return result;
} catch (Exception ex) {
throw new ScriptException(ex);
}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/GremlinScriptEngine.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/GremlinScriptEngine.java
index 270eb78..bf02114 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/GremlinScriptEngine.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/GremlinScriptEngine.java
@@ -18,7 +18,7 @@
*/
package org.apache.tinkerpop.gremlin.jsr223;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
+import org.apache.tinkerpop.gremlin.process.traversal.GremlinLang;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import javax.script.Bindings;
@@ -37,31 +37,4 @@
@Override
public GremlinScriptEngineFactory getFactory();
-
- /**
- * Evaluates {@link Traversal} {@link Bytecode} against a traversal source in the global bindings of the
- * {@code ScriptEngine}.
- *
- * @param bytecode of the traversal to execute
- * @param traversalSource to execute the bytecode against which should be in the available bindings.
- */
- public default Traversal.Admin eval(final Bytecode bytecode, final String traversalSource) throws ScriptException {
- final Bindings bindings = this.createBindings();
- final ScriptContext ctx = this.getContext();
-
- final Bindings gbindings = ctx.getBindings(ScriptContext.GLOBAL_SCOPE);
- if (gbindings != null) bindings.putAll(gbindings);
-
- final Bindings ebindings = ctx.getBindings(ScriptContext.ENGINE_SCOPE);
- if (ebindings != null) bindings.putAll(ebindings);
-
- bindings.putAll(bytecode.getBindings());
- return eval(bytecode, bindings, traversalSource);
- }
-
- /**
- * Evaluates {@link Traversal} {@link Bytecode} with the specified {@code Bindings}. These {@code Bindings}
- * supplied to this method will be merged with global engine bindings and override them where keys match.
- */
- public Traversal.Admin eval(final Bytecode bytecode, final Bindings bindings, final String traversalSource) throws ScriptException;
}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/JavaTranslator.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/JavaTranslator.java
deleted file mode 100644
index fa56a2c..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/JavaTranslator.java
+++ /dev/null
@@ -1,392 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tinkerpop.gremlin.jsr223;
-
-import org.apache.commons.configuration2.BaseConfiguration;
-import org.apache.commons.configuration2.Configuration;
-import org.apache.commons.configuration2.MapConfiguration;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
-import org.apache.tinkerpop.gremlin.process.traversal.Translator;
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
-import org.apache.tinkerpop.gremlin.process.traversal.lambda.CardinalityValueTraversal;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.BulkSet;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.TraversalStrategyProxy;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.OptionsStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.util.BytecodeHelper;
-import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
-import org.apache.tinkerpop.gremlin.util.GremlinDisabledListDelimiterHandler;
-
-import java.lang.reflect.Array;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Parameter;
-import java.util.ArrayList;
-import java.util.HashMap;
-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 java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- */
-public final class JavaTranslator<S extends TraversalSource, T extends Traversal.Admin<?, ?>> implements Translator.StepTranslator<S, T> {
-
- private final S traversalSource;
- private final Class<?> anonymousTraversal;
- private static final Map<Class<?>, Map<String, List<ReflectedMethod>>> GLOBAL_METHOD_CACHE = new ConcurrentHashMap<>();
- private final Map<Class<?>, Map<String,Method>> localMethodCache = new ConcurrentHashMap<>();
- private final Method anonymousTraversalStart;
-
- private JavaTranslator(final S traversalSource) {
- this.traversalSource = traversalSource;
- this.anonymousTraversal = traversalSource.getAnonymousTraversalClass().orElse(null);
- this.anonymousTraversalStart = getStartMethodFromAnonymousTraversal();
- }
-
- public static <S extends TraversalSource, T extends Traversal.Admin<?, ?>> JavaTranslator<S, T> of(final S traversalSource) {
- return new JavaTranslator<>(traversalSource);
- }
-
- @Override
- public S getTraversalSource() {
- return this.traversalSource;
- }
-
- @Override
- public T translate(final Bytecode bytecode) {
- if (BytecodeHelper.isGraphOperation(bytecode))
- throw new IllegalArgumentException("JavaTranslator cannot translate traversal operations");
-
- TraversalSource dynamicSource = this.traversalSource;
- Traversal.Admin<?, ?> traversal = null;
- for (final Bytecode.Instruction instruction : bytecode.getSourceInstructions()) {
- dynamicSource = (TraversalSource) invokeMethod(dynamicSource, TraversalSource.class, instruction.getOperator(), instruction.getArguments());
- }
- boolean spawned = false;
- for (final Bytecode.Instruction instruction : bytecode.getStepInstructions()) {
- if (!spawned) {
- traversal = (Traversal.Admin) invokeMethod(dynamicSource, Traversal.class, instruction.getOperator(), instruction.getArguments());
- spawned = true;
- } else
- invokeMethod(traversal, Traversal.class, instruction.getOperator(), instruction.getArguments());
- }
- return (T) traversal;
- }
-
- @Override
- public String getTargetLanguage() {
- return "gremlin-java";
- }
-
- @Override
- public String toString() {
- return StringFactory.translatorString(this);
- }
-
- ////
-
- private Object translateObject(final Object object) {
- if (object instanceof Bytecode.Binding)
- return translateObject(((Bytecode.Binding) object).value());
- else if (object instanceof Bytecode) {
- // source based bytecode at this stage of translation could have special meaning, but generally this is
- // going to spawn a new anonymous traversal.
- final Bytecode bc = (Bytecode) object;
- if (!bc.getSourceInstructions().isEmpty()) {
- // currently, valid source instructions will be singly defined. would be odd to get this error. could
- // be just bad construction from a language variant if it appears. maybe better as an assertion but
- // third-party variants might benefit from this error
- if (bc.getSourceInstructions().size() != 1) {
- throw new IllegalStateException("More than one source instruction defined in bytecode");
- }
-
- final Bytecode.Instruction inst = bc.getSourceInstructions().get(0);
- if (inst.getOperator().equals(CardinalityValueTraversal.class.getSimpleName())) {
- return CardinalityValueTraversal.from(inst);
- } else {
- throw new IllegalStateException(String.format("Unknown source instruction for %s", inst.getOperator()));
- }
- } else {
- try {
- final Traversal.Admin<?, ?> traversal = (Traversal.Admin) this.anonymousTraversalStart.invoke(null);
- for (final Bytecode.Instruction instruction : bc.getStepInstructions()) {
- invokeMethod(traversal, Traversal.class, instruction.getOperator(), instruction.getArguments());
- }
- return traversal;
- } catch (final Throwable e) {
- throw new IllegalStateException(e.getMessage(), e);
- }
- }
- } else if (object instanceof TraversalStrategyProxy) {
- final Map<String, Object> map = new HashMap<>();
- final Configuration configuration = ((TraversalStrategyProxy) object).getConfiguration();
- configuration.getKeys().forEachRemaining(key -> map.put(key, translateObject(configuration.getProperty(key))));
- return invokeStrategyCreationMethod(object, map);
- } else if (object instanceof Map) {
- final Map<Object, Object> map = object instanceof Tree ?
- new Tree() :
- object instanceof LinkedHashMap ?
- new LinkedHashMap<>(((Map) object).size()) :
- new HashMap<>(((Map) object).size());
- for (final Map.Entry<?, ?> entry : ((Map<?, ?>) object).entrySet()) {
- map.put(translateObject(entry.getKey()), translateObject(entry.getValue()));
- }
- return map;
- } else if (object instanceof List) {
- final List<Object> list = new ArrayList<>(((List) object).size());
- for (final Object o : (List) object) {
- list.add(translateObject(o));
- }
- return list;
- } else if (object instanceof BulkSet) {
- final BulkSet<Object> bulkSet = new BulkSet<>();
- for (final Map.Entry<?, Long> entry : ((BulkSet<?>) object).asBulk().entrySet()) {
- bulkSet.add(translateObject(entry.getKey()), entry.getValue());
- }
- return bulkSet;
- } else if (object instanceof Set) {
- final Set<Object> set = object instanceof LinkedHashSet ?
- new LinkedHashSet<>(((Set) object).size()) :
- new HashSet<>(((Set) object).size());
- for (final Object o : (Set) object) {
- set.add(translateObject(o));
- }
- return set;
- } else
- return object;
- }
-
- private Object invokeStrategyCreationMethod(final Object delegate, final Map<String, Object> map) {
- final Class<?> strategyClass = ((TraversalStrategyProxy) delegate).getStrategyClass();
- final Map<String, Method> methodCache = localMethodCache.computeIfAbsent(strategyClass, k -> {
- final Map<String, Method> cacheEntry = new HashMap<>();
- try {
- cacheEntry.put("instance", strategyClass.getMethod("instance"));
- } catch (NoSuchMethodException ignored) {
- // nothing - the strategy may not be constructed this way
- }
-
- try {
- cacheEntry.put("create", strategyClass.getMethod("create", Configuration.class));
- } catch (NoSuchMethodException ignored) {
- // nothing - the strategy may not be constructed this way
- }
-
- if (cacheEntry.isEmpty())
- throw new IllegalStateException(String.format("%s does can only be constructed with instance() or create(Configuration)", strategyClass.getSimpleName()));
-
- return cacheEntry;
- });
-
- try {
- // special case zero-arg OptionStrategy
- if (strategyClass == OptionsStrategy.class && map.isEmpty()) {
- return OptionsStrategy.EMPTY;
- }
-
- final BaseConfiguration conf = new BaseConfiguration();
- conf.setListDelimiterHandler(GremlinDisabledListDelimiterHandler.instance());
- map.entrySet().forEach(entry -> conf.setProperty(entry.getKey(), entry.getValue()));
-
- return map.isEmpty() ?
- methodCache.get("instance").invoke(null) :
- methodCache.get("create").invoke(null, conf);
- } catch (final InvocationTargetException | IllegalAccessException e) {
- throw new IllegalStateException(e.getMessage(), e);
- }
- }
-
- private Object invokeMethod(final Object delegate, final Class<?> returnType, final String methodName, final Object... arguments) {
- // populate method cache for fast access to methods in subsequent calls
- final Map<String, List<ReflectedMethod>> methodCache = GLOBAL_METHOD_CACHE.getOrDefault(delegate.getClass(), new HashMap<>());
- if (methodCache.isEmpty()) buildMethodCache(delegate, methodCache);
-
- // create a copy of the argument array so as not to mutate the original bytecode - no need to create a new
- // object if there are no arguments.
- final Object[] argumentsCopy = arguments.length > 0 ? new Object[arguments.length] : arguments;
- for (int i = 0; i < arguments.length; i++) {
- argumentsCopy[i] = translateObject(arguments[i]);
- }
-
- // without this initial check iterating an invalid methodName will lead to a null pointer and a less than
- // great error message for the user.
- if (!methodCache.containsKey(methodName)) {
- throw new IllegalStateException(generateMethodNotFoundMessage(
- "Could not locate method", delegate, methodName, argumentsCopy));
- }
-
- boolean found = false;
- try {
- for (final ReflectedMethod methodx : methodCache.get(methodName)) {
- final Method method = methodx.method;
- if (returnType.isAssignableFrom(method.getReturnType())) {
- final Parameter[] parameters = methodx.parameters;
- if (parameters.length == argumentsCopy.length || methodx.hasVarArgs) {
- final Object[] newArguments = new Object[parameters.length];
- found = true;
- for (int i = 0; i < parameters.length; i++) {
- if (parameters[i].isVarArgs()) {
- final Class<?> parameterClass = parameters[i].getType().getComponentType();
- if (argumentsCopy.length > i && argumentsCopy[i] != null && !parameterClass.isAssignableFrom(argumentsCopy[i].getClass())) {
- found = false;
- break;
- }
- final Object[] varArgs = (Object[]) Array.newInstance(parameterClass, argumentsCopy.length - i);
- int counter = 0;
- for (int j = i; j < argumentsCopy.length; j++) {
- varArgs[counter++] = argumentsCopy[j];
- }
- newArguments[i] = varArgs;
- break;
- } else {
- // try to detect the right method by comparing the type of the parameter to the type
- // of the argument. doesn't always work so well because of null arguments which don't
- // bring their type in bytecode and rely on position. this doesn't seem to happen often
- // ...luckily...because method signatures tend to be sufficiently unique and do not
- // encourage whacky use - like g.V().has(null, null) is clearly invalid so we don't
- // even need to try to sort that out. on the other hand g.V().has('name',null) which
- // is valid hits like four different possible overloads, but we can rely on the most
- // generic one which takes Object as the second parameter. that seems to work in this
- // case, but it's a shame this isn't nicer. seems like nicer would mean a heavy
- // overhaul to Gremlin or to GLVs/bytecode and/or to serialization mechanisms.
- //
- // the check where argumentsCopy[i] is null could be accompanied by a type check for
- // allowable signatures like:
- // null == argumentsCopy[i] && parameters[i].getType() == Object.class
- // but that doesn't seem helpful. perhaps this approach is fine as long as we ensure
- // consistency of null calls to all overloads. in other words addV(String) must behave
- // the same as addV(Traversal) if null is used as the argument. so far, that seems to
- // be the case. if we find that is not happening we either fix that specific
- // inconsistency, start special casing those method finds here, or as mentioned above
- // do something far more drastic that doesn't involve reflection.
- if (i < argumentsCopy.length && (null == argumentsCopy[i] ||
- (argumentsCopy[i] != null && (
- parameters[i].getType().isAssignableFrom(argumentsCopy[i].getClass()) ||
- (parameters[i].getType().isPrimitive() &&
- (Number.class.isAssignableFrom(argumentsCopy[i].getClass()) ||
- argumentsCopy[i].getClass().equals(Boolean.class) ||
- argumentsCopy[i].getClass().equals(Byte.class) ||
- argumentsCopy[i].getClass().equals(Character.class))))))) {
- newArguments[i] = argumentsCopy[i];
- } else {
- found = false;
- break;
- }
- }
- }
-
- // special case has() where the first arg is null - sometimes this can end up with the T being
- // null and in 3.5.x that generates an exception which raises badly in the translator. it is
- // safer to force this to the String form by letting this "found" version pass. In java this
- // form of GraphTraversal can't be produced because of validations for has(T, ...) but in
- // other language it might be allowed which means that has((T) null, ...) from something like
- // python will end up as has((String) null, ...) which filters rather than generates an
- // exception. calling the T version even in a non-JVM language seems odd and more likely the
- // caller was shooting for the String one, but ugh who knows. this issue showcases again how
- // badly bytecode should either change to use gremlin-language and go away or bytecode should
- // get a safer way to be translated to a traversal with more explicit calls that don't rely
- // on reflection.
- if (methodName.equals(GraphTraversal.Symbols.has) && newArguments.length > 0 && null == newArguments[0] &&
- method.getParameterTypes()[0].isAssignableFrom(org.apache.tinkerpop.gremlin.structure.T.class)) {
- found = false;
- }
-
- if (found) {
- return 0 == newArguments.length ? method.invoke(delegate) : method.invoke(delegate, newArguments);
- }
- }
- }
- }
- } catch (final Throwable e) {
- if (found && (e instanceof InvocationTargetException)) {
- // get the target exception out for a better message, otherwise, it will be null.
- final InvocationTargetException ite = (InvocationTargetException) e;
- throw new IllegalStateException(generateMethodNotFoundMessage(
- ite.getTargetException().getMessage(), null, methodName, argumentsCopy), ite.getTargetException());
- } else {
- throw new IllegalStateException(generateMethodNotFoundMessage(
- e.getMessage(), null, methodName, argumentsCopy), e);
- }
- }
-
- // if it got down here then the method was in the cache but it was never called as it could not be found
- // for the supplied arguments
- throw new IllegalArgumentException(generateMethodNotFoundMessage(
- "Could not locate exact method given the supplied arguments", delegate, methodName, argumentsCopy));
- }
-
- /**
- * Generates the message used when a method cannot be located in the translation. Arguments are converted to
- * classes to avoid exposing data that might be sensitive.
- */
- private String generateMethodNotFoundMessage(final String message, final Object delegate,
- final String methodNameNotFound, final Object[] args) {
- final Object[] arguments = null == args ? new Object[0] : args;
- final String delegateClassName = delegate != null ? delegate.getClass().getSimpleName() : "";
- return message + ": " + delegateClassName + "." + methodNameNotFound + "(" +
- Stream.of(arguments).map(a -> null == a ? "null" : a.getClass().getSimpleName()).collect(Collectors.joining(", ")) + ")";
- }
-
- private synchronized static void buildMethodCache(final Object delegate, final Map<String, List<ReflectedMethod>> methodCache) {
- if (methodCache.isEmpty()) {
- for (final Method method : delegate.getClass().getMethods()) {
- final List<ReflectedMethod> list = methodCache.computeIfAbsent(method.getName(), k -> new ArrayList<>());
- list.add(new ReflectedMethod(method));
- }
- GLOBAL_METHOD_CACHE.put(delegate.getClass(), methodCache);
- }
- }
-
- private Method getStartMethodFromAnonymousTraversal() {
- if (this.anonymousTraversal != null) {
- try {
- return this.anonymousTraversal.getMethod("start");
- } catch (NoSuchMethodException ignored) {
- }
- }
-
- return null;
- }
-
- private static final class ReflectedMethod {
- private final Method method;
- private final Parameter[] parameters;
- private final boolean hasVarArgs;
-
- public ReflectedMethod(final Method m) {
- this.method = m;
-
- // the reflection getParameters() method calls clone() every time to get the Parameter array. caching it
- // saves a lot of extra processing
- this.parameters = m.getParameters();
-
- this.hasVarArgs = parameters.length > 0 && parameters[parameters.length - 1].isVarArgs();
- }
- }
-}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/TranslatorCustomizer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/TranslatorCustomizer.java
deleted file mode 100644
index 4468255..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/TranslatorCustomizer.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.jsr223;
-
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
-import org.apache.tinkerpop.gremlin.process.traversal.Translator;
-
-/**
- * Provides a way to customize and override {@link Bytecode} to script translation. Not all {@link GremlinScriptEngine}
- * will support this capability as translation is optional.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public interface TranslatorCustomizer extends Customizer {
-
- /**
- * Construct a {@link Translator.ScriptTranslator.TypeTranslator} that will be used by a
- * {@link Translator.ScriptTranslator} instance within the {@link GremlinScriptEngine} to translate
- * {@link Bytecode} to a script.
- */
- public Translator.ScriptTranslator.TypeTranslator createTypeTranslator();
-}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/console/ConsoleCustomizer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/console/ConsoleCustomizer.java
deleted file mode 100644
index 4ab851e..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/console/ConsoleCustomizer.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.jsr223.console;
-
-import org.apache.tinkerpop.gremlin.jsr223.Customizer;
-import org.apache.tinkerpop.gremlin.jsr223.GremlinPlugin;
-
-/**
- * A {@link Customizer} that allows a {@link RemoteAcceptor} to be used with a console implementation. Only one
- * {@code ConsoleCustomizer} can be added to a particular {@link GremlinPlugin}.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public interface ConsoleCustomizer extends Customizer {
- /**
- * Allows a plugin to utilize features of the {@code :remote} and {@code :submit} commands of the Gremlin Console.
- * This method does not need to be implemented if the plugin is not meant for the Console for some reason or
- * if it does not intend to take advantage of those commands.
- */
- public RemoteAcceptor getRemoteAcceptor(final GremlinShellEnvironment environment);
-}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/console/RemoteAcceptor.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/console/RemoteAcceptor.java
deleted file mode 100644
index c1a8c91..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/console/RemoteAcceptor.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.jsr223.console;
-
-import java.io.Closeable;
-import java.util.List;
-import java.util.Map;
-
-/**
- * The Gremlin Console supports the {@code :remote} and {@code :submit} commands which provide standardized ways
- * for plugins to provide "remote connections" to resources and a way to "submit" a command to those resources.
- * A "remote connection" does not necessarily have to be a remote server. It simply refers to a resource that is
- * external to the console.
- * <p/>
- * By implementing this interface and returning an instance of it through
- * {@link ConsoleCustomizer#getRemoteAcceptor(GremlinShellEnvironment)} a plugin can hook into those commands and
- * provide remoting features.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public interface RemoteAcceptor extends Closeable {
-
- public static final String RESULT = "result";
-
- /**
- * Gets called when {@code :remote} is used in conjunction with the "connect" option. It is up to the
- * implementation to decide how additional arguments on the line should be treated after "connect".
- *
- * @return an object to display as output to the user
- * @throws RemoteException if there is a problem with connecting
- */
- public Object connect(final List<String> args) throws RemoteException;
-
- /**
- * Gets called when {@code :remote} is used in conjunction with the {@code config} option. It is up to the
- * implementation to decide how additional arguments on the line should be treated after {@code config}.
- *
- * @return an object to display as output to the user
- * @throws RemoteException if there is a problem with configuration
- */
- public Object configure(final List<String> args) throws RemoteException;
-
- /**
- * Gets called when {@code :submit} is executed. It is up to the implementation to decide how additional
- * arguments on the line should be treated after {@code :submit}.
- *
- * @return an object to display as output to the user
- * @throws RemoteException if there is a problem with submission
- */
- public Object submit(final List<String> args) throws RemoteException;
-
- /**
- * If the {@code RemoteAcceptor} is used in the Gremlin Console, then this method might be called to determine
- * if it can be used in a fashion that supports the {@code :remote console} command. By default, this value is
- * set to {@code false}.
- * <p/>
- * A {@code RemoteAcceptor} should only return {@code true} for this method if it expects that all activities it
- * supports are executed through the {@code :submit} command. If the users interaction with the remote requires
- * working with both local and remote evaluation at the same time, it is likely best to keep this method return
- * {@code false}. A good example of this type of plugin would be the Gephi Plugin which uses {@code :remote config}
- * to configure a local {@code TraversalSource} to be used and expects calls to {@code :submit} for the same body
- * of analysis.
- */
- public default boolean allowRemoteConsole() {
- return false;
- }
-}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/console/RemoteException.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/console/RemoteException.java
deleted file mode 100644
index 4c59834..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/console/RemoteException.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.jsr223.console;
-
-import java.util.Optional;
-
-/**
- * A mapper {@code Exception} to be thrown when there are problems with processing a command given to a
- * {@link RemoteAcceptor}. The message provided to the exception will be displayed to the user in the Console.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class RemoteException extends Exception {
- private String remoteStackTrace = null;
-
- public RemoteException(final String message) {
- this(message, (String) null);
- }
-
- public RemoteException(final String message, final String remoteStackTrace) {
- super(message);
- this.remoteStackTrace = remoteStackTrace;
- }
-
- public RemoteException(final String message, final Throwable cause) {
- this(message, cause, null);
- }
-
- public RemoteException(final String message, final Throwable cause, final String remoteStackTrace) {
- super(message, cause);
- this.remoteStackTrace = remoteStackTrace;
- }
-
- public RemoteException(final Throwable cause) {
- super(cause);
- }
-
- /**
- * The stacktrace produced by the remote server.
- */
- public Optional<String> getRemoteStackTrace() {
- return Optional.ofNullable(remoteStackTrace);
- }
-}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/ArgumentVisitor.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/ArgumentVisitor.java
index 41177b0..eafcfaf 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/ArgumentVisitor.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/ArgumentVisitor.java
@@ -18,6 +18,7 @@
*/
package org.apache.tinkerpop.gremlin.language.grammar;
+import org.apache.tinkerpop.gremlin.process.traversal.step.GType;
import org.apache.tinkerpop.gremlin.process.traversal.step.GValue;
import java.util.Map;
import java.util.Objects;
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 1b0e1f3..9859d8f 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
@@ -351,7 +351,11 @@
* {@inheritDoc}
*/
@Override public T visitTraversalMethod_difference_Object(final GremlinParser.TraversalMethod_difference_ObjectContext ctx) { notImplemented(ctx); return null; }
- /**
+ /**
+ * {@inheritDoc}
+ */
+ @Override public T visitTraversalMethod_discard(final GremlinParser.TraversalMethod_discardContext ctx) { notImplemented(ctx); return null; }
+ /**
* {@inheritDoc}
*/
@Override public T visitTraversalMethod_disjunct_Object(final GremlinParser.TraversalMethod_disjunct_ObjectContext ctx) { notImplemented(ctx); return null; }
@@ -614,10 +618,6 @@
/**
* {@inheritDoc}
*/
- @Override public T visitTraversalMethod_discard(final GremlinParser.TraversalMethod_discardContext ctx) { notImplemented(ctx); return null; }
- /**
- * {@inheritDoc}
- */
@Override public T visitTraversalMethod_none_P(final GremlinParser.TraversalMethod_none_PContext ctx) { notImplemented(ctx); return null; }
/**
* {@inheritDoc}
@@ -1126,7 +1126,7 @@
/**
* {@inheritDoc}
*/
- @Override public T visitTraversalDT(GremlinParser.TraversalDTContext ctx) { notImplemented(ctx); return null; }
+ @Override public T visitTraversalDT(final GremlinParser.TraversalDTContext ctx) { notImplemented(ctx); return null; }
/**
* {@inheritDoc}
*/
@@ -1318,6 +1318,10 @@
/**
* {@inheritDoc}
*/
+ @Override public T visitNullableGenericLiteralMap(final GremlinParser.NullableGenericLiteralMapContext ctx) { notImplemented(ctx); return null; }
+ /**
+ * {@inheritDoc}
+ */
@Override public T visitIntegerLiteral(final GremlinParser.IntegerLiteralContext ctx) { notImplemented(ctx); return null; }
/**
* {@inheritDoc}
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 4c977fb..ec6a31a 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
@@ -689,9 +689,9 @@
return ctx.children
.stream()
.filter(Objects::nonNull)
- .filter(p -> p instanceof GremlinParser.StringNullableArgumentContext)
- .map(p -> (GremlinParser.StringNullableArgumentContext) p)
- .map(antlr.argumentVisitor::visitStringNullableArgument)
+ .filter(p -> p instanceof GremlinParser.StringNullableLiteralContext)
+ .map(p -> (GremlinParser.StringNullableLiteralContext) p)
+ .map(antlr.genericVisitor::visitStringNullableLiteral)
.toArray(Object[]::new);
}
}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/GremlinAntlrToJava.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/GremlinAntlrToJava.java
index ab6dbcc..bb50b32 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/GremlinAntlrToJava.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/GremlinAntlrToJava.java
@@ -19,7 +19,7 @@
package org.apache.tinkerpop.gremlin.language.grammar;
import org.antlr.v4.runtime.tree.ParseTree;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
+import org.apache.tinkerpop.gremlin.process.traversal.GremlinLang;
import org.apache.tinkerpop.gremlin.process.traversal.P;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
@@ -101,7 +101,7 @@
/**
* Constructs a new instance and is bound to an {@link EmptyGraph}. This form of construction is helpful for
- * generating {@link Bytecode} or for various forms of testing. {@link Traversal} instances constructed from this
+ * generating {@link GremlinLang} or for various forms of testing. {@link Traversal} instances constructed from this
* form will not be capable of iterating. Assumes that "g" is the name of the {@link GraphTraversalSource}.
*/
public GremlinAntlrToJava() {
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/NoOpTerminalVisitor.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/NoOpTerminalVisitor.java
index 21803b1..b79c15d 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/NoOpTerminalVisitor.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/NoOpTerminalVisitor.java
@@ -19,7 +19,7 @@
package org.apache.tinkerpop.gremlin.language.grammar;
import org.antlr.v4.runtime.tree.ParseTree;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
+import org.apache.tinkerpop.gremlin.process.traversal.GremlinLang;
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;
@@ -30,7 +30,7 @@
/**
* {@inheritDoc}
*
- * The same as parent visitor {@link GremlinAntlrToJava} but returns {@link Bytecode} instead of a {@link Traversal}
+ * The same as parent visitor {@link GremlinAntlrToJava} but returns {@link GremlinLang} instead of a {@link Traversal}
* or {@link GraphTraversalSource}, and uses an overridden terminal step visitor.
*/
public class NoOpTerminalVisitor extends GremlinAntlrToJava {
@@ -50,12 +50,12 @@
}
/**
- * Returns {@link Bytecode} of {@link Traversal} or {@link GraphTraversalSource}, overriding any terminal step
+ * Returns {@link GremlinLang} of {@link Traversal} or {@link GraphTraversalSource}, overriding any terminal step
* operations to prevent them from being executed using the {@link TraversalTerminalMethodVisitor} to append
- * terminal operations to bytecode.
+ * terminal operations to GremlinLang.
*
* @param ctx - the parse tree
- * @return - bytecode from the traversal or traversal source
+ * @return - gremlinLang from the traversal or traversal source
*/
@Override
public Object visitQuery(final GremlinParser.QueryContext ctx){
@@ -65,7 +65,7 @@
if (firstChild instanceof GremlinParser.TraversalSourceContext) {
if (childCount == 1) {
// handle traversalSource
- return gvisitor.visitTraversalSource((GremlinParser.TraversalSourceContext)firstChild).getBytecode();
+ return gvisitor.visitTraversalSource((GremlinParser.TraversalSourceContext)firstChild).getGremlinLang();
} else {
// handle traversalSource DOT transactionPart
throw new GremlinParserException("Transaction operation is not supported yet");
@@ -77,7 +77,7 @@
if (childCount == 1) {
// handle rootTraversal
return tvisitor.visitRootTraversal(
- (GremlinParser.RootTraversalContext)firstChild).asAdmin().getBytecode();
+ (GremlinParser.RootTraversalContext)firstChild).asAdmin().getGremlinLang();
} else {
// handle rootTraversal DOT traversalTerminalMethod
// could not keep all of these methods in one visitor due to the need of the terminal visitor to have a traversal,
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TerminalMethodToBytecodeVisitor.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TerminalMethodToBytecodeVisitor.java
index 2a32fc1..92da559 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TerminalMethodToBytecodeVisitor.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TerminalMethodToBytecodeVisitor.java
@@ -18,11 +18,11 @@
*/
package org.apache.tinkerpop.gremlin.language.grammar;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
+import org.apache.tinkerpop.gremlin.process.traversal.GremlinLang;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
/**
- * Handles terminal steps for {@link Bytecode} as they are not added this way naturally. They are normally treated as
+ * Handles terminal steps for {@link GremlinLang} as they are not added this way naturally. They are normally treated as
* the point of traversal execution.
*/
public class TerminalMethodToBytecodeVisitor extends TraversalTerminalMethodVisitor {
@@ -46,7 +46,7 @@
*/
@Override
public Object visitTraversalTerminalMethod_explain(final GremlinParser.TraversalTerminalMethod_explainContext ctx) {
- final Bytecode bc = this.traversal.asAdmin().getBytecode();
+ final GremlinLang bc = this.traversal.asAdmin().getGremlinLang();
bc.addStep("explain");
return bc;
}
@@ -58,7 +58,7 @@
*/
@Override
public Object visitTraversalTerminalMethod_iterate(final GremlinParser.TraversalTerminalMethod_iterateContext ctx) {
- final Bytecode bc = this.traversal.asAdmin().getBytecode();
+ final GremlinLang bc = this.traversal.asAdmin().getGremlinLang();
bc.addStep("iterate");
return bc;
}
@@ -70,7 +70,7 @@
*/
@Override
public Object visitTraversalTerminalMethod_hasNext(final GremlinParser.TraversalTerminalMethod_hasNextContext ctx) {
- final Bytecode bc = this.traversal.asAdmin().getBytecode();
+ final GremlinLang bc = this.traversal.asAdmin().getGremlinLang();
bc.addStep("hasNext");
return bc;
}
@@ -82,7 +82,7 @@
*/
@Override
public Object visitTraversalTerminalMethod_tryNext(final GremlinParser.TraversalTerminalMethod_tryNextContext ctx) {
- final Bytecode bc = this.traversal.asAdmin().getBytecode();
+ final GremlinLang bc = this.traversal.asAdmin().getGremlinLang();
bc.addStep("tryNext");
return bc;
}
@@ -94,7 +94,7 @@
*/
@Override
public Object visitTraversalTerminalMethod_next(final GremlinParser.TraversalTerminalMethod_nextContext ctx) {
- final Bytecode bc = this.traversal.asAdmin().getBytecode();
+ final GremlinLang bc = this.traversal.asAdmin().getGremlinLang();
if (ctx.getChildCount() == 3) {
bc.addStep("next");
} else {
@@ -113,7 +113,7 @@
*/
@Override
public Object visitTraversalTerminalMethod_toList(final GremlinParser.TraversalTerminalMethod_toListContext ctx) {
- final Bytecode bc = this.traversal.asAdmin().getBytecode();
+ final GremlinLang bc = this.traversal.asAdmin().getGremlinLang();
bc.addStep("toList");
return bc;
}
@@ -125,7 +125,7 @@
*/
@Override
public Object visitTraversalTerminalMethod_toSet(final GremlinParser.TraversalTerminalMethod_toSetContext ctx) {
- final Bytecode bc = this.traversal.asAdmin().getBytecode();
+ final GremlinLang bc = this.traversal.asAdmin().getGremlinLang();
bc.addStep("toSet");
return bc;
}
@@ -137,7 +137,7 @@
*/
@Override
public Object visitTraversalTerminalMethod_toBulkSet(final GremlinParser.TraversalTerminalMethod_toBulkSetContext ctx) {
- final Bytecode bc = this.traversal.asAdmin().getBytecode();
+ final GremlinLang bc = this.traversal.asAdmin().getGremlinLang();
bc.addStep("toBulkSet");
return bc;
}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalEnumParser.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalEnumParser.java
index e894f8b..0ce7a44 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalEnumParser.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalEnumParser.java
@@ -21,7 +21,11 @@
import org.antlr.v4.runtime.tree.ParseTree;
import org.apache.tinkerpop.gremlin.process.traversal.N;
import org.apache.tinkerpop.gremlin.process.traversal.Scope;
+import org.apache.tinkerpop.gremlin.structure.Column;
import org.apache.tinkerpop.gremlin.structure.Direction;
+import org.apache.tinkerpop.gremlin.structure.T;
+
+import java.util.function.Function;
/**
* Traversal enum parser parses all the enums like (e.g. {@link Scope} in graph traversal.
@@ -67,6 +71,16 @@
return Direction.directionValueOf(text);
}
+ public static Function parseTraversalFunctionFromContext(final GremlinParser.TraversalFunctionContext context) {
+ if (context.traversalT() != null) {
+ return TraversalEnumParser.parseTraversalEnumFromContext(T.class, context.traversalT());
+ } else if (context.traversalColumn() != null)
+ return TraversalEnumParser.parseTraversalEnumFromContext(Column.class, context.traversalColumn());
+ else {
+ throw new GremlinParserException("Unrecognized enum for traversal function");
+ }
+ }
+
/**
* Parsing of {@link N} requires some special handling because of java keyword collision.
*/
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 32462d5..b761c45 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.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.step.GType;
import org.apache.tinkerpop.gremlin.process.traversal.step.GValue;
import org.apache.tinkerpop.gremlin.structure.Column;
import org.apache.tinkerpop.gremlin.structure.Direction;
@@ -36,7 +37,6 @@
import java.util.Arrays;
import java.util.Map;
-
import java.util.function.BiFunction;
/**
@@ -565,6 +565,14 @@
* {@inheritDoc}
*/
@Override
+ public Traversal visitTraversalMethod_discard(final GremlinParser.TraversalMethod_discardContext ctx) {
+ return graphTraversal.discard();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
public GraphTraversal visitTraversalMethod_disjunct_Object(final GremlinParser.TraversalMethod_disjunct_ObjectContext ctx) {
return graphTraversal.disjunct(antlr.genericVisitor.visitGenericLiteral(ctx.genericLiteral()));
}
@@ -663,7 +671,7 @@
* {@inheritDoc}
*/
@Override
- public GraphTraversal visitTraversalMethod_from_String(final GremlinParser.TraversalMethod_from_StringContext ctx) {
+ public Traversal visitTraversalMethod_from_String(final GremlinParser.TraversalMethod_from_StringContext ctx) {
return graphTraversal.from(antlr.genericVisitor.parseString(ctx.stringLiteral()));
}
@@ -1178,14 +1186,6 @@
* {@inheritDoc}
*/
@Override
- public GraphTraversal visitTraversalMethod_discard(final GremlinParser.TraversalMethod_discardContext ctx) {
- return this.graphTraversal.discard();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
public GraphTraversal visitTraversalMethod_none_P(final GremlinParser.TraversalMethod_none_PContext ctx) {
return graphTraversal.none(antlr.traversalPredicateVisitor.visitTraversalPredicate(ctx.traversalPredicate()));
}
@@ -1762,7 +1762,7 @@
* {@inheritDoc}
*/
@Override
- public GraphTraversal visitTraversalMethod_to_String(final GremlinParser.TraversalMethod_to_StringContext ctx) {
+ public Traversal visitTraversalMethod_to_String(final GremlinParser.TraversalMethod_to_StringContext ctx) {
return graphTraversal.to(antlr.genericVisitor.parseString(ctx.stringLiteral()));
}
@@ -1845,7 +1845,7 @@
@Override
public GraphTraversal visitTraversalMethod_valueMap_boolean_String(final GremlinParser.TraversalMethod_valueMap_boolean_StringContext ctx) {
if (ctx.getChildCount() == 4) {
- return graphTraversal.valueMap((boolean) antlr.genericVisitor.visitBooleanLiteral(ctx.booleanLiteral()));
+ return graphTraversal.valueMap(antlr.genericVisitor.parseBoolean(ctx.booleanLiteral()));
} else {
return graphTraversal.valueMap((boolean) antlr.genericVisitor.visitBooleanLiteral(ctx.booleanLiteral()),
antlr.genericVisitor.parseStringVarargs(ctx.stringNullableLiteralVarargs()));
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 2708ebb..7fccb00 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
@@ -22,7 +22,6 @@
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 java.util.Map;
/**
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 04660ef..5bff3e0 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
@@ -19,10 +19,12 @@
package org.apache.tinkerpop.gremlin.language.translator;
import org.antlr.v4.runtime.tree.ParseTree;
+import org.antlr.v4.runtime.tree.TerminalNode;
import org.apache.commons.lang3.StringUtils;
import org.apache.tinkerpop.gremlin.language.grammar.GremlinParser;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.OptionsStrategy;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
import org.apache.tinkerpop.gremlin.util.DatetimeHelper;
import java.time.OffsetDateTime;
@@ -298,6 +300,8 @@
for (int ix = 1; ix < ctx.getChildCount(); ix++) {
if (ctx.getChild(ix) instanceof GremlinParser.StringArgumentContext) {
+ // note revisit tryAppendCastToString() method after GValue/.NET implementation in 4,
+ // in this case only ctx.variable() matters, (string) isn't needed for ctx.stringLiteral()
tryAppendCastToString((GremlinParser.StringArgumentContext) ctx.getChild(ix));
}
visit(ctx.getChild(ix));
@@ -1283,7 +1287,7 @@
}
private void tryAppendCastToString(final GremlinParser.StringArgumentContext ctx) {
- if (ctx.variable() != null) {
+ if (ctx.variable() != null || ctx.stringLiteral() != null) {
sb.append("(string) ");
}
}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/translator/GroovyTranslateVisitor.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/translator/GroovyTranslateVisitor.java
index ace8fce..31839ce 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/translator/GroovyTranslateVisitor.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/translator/GroovyTranslateVisitor.java
@@ -20,6 +20,7 @@
import org.antlr.v4.runtime.ParserRuleContext;
import org.apache.tinkerpop.gremlin.language.grammar.GremlinParser;
+import org.apache.tinkerpop.gremlin.language.grammar.GremlinParser.GenericLiteralVarargsContext;
import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceVertex;
/**
@@ -64,15 +65,13 @@
switch (lastCharacter) {
case 'b':
// parse B/b as byte
- sb.append("new Byte(");
+ sb.append("(byte)");
sb.append(integerLiteral, 0, lastCharIndex);
- sb.append(")");
break;
case 's':
// parse S/s as short
- sb.append("new Short(");
+ sb.append("(short)");
sb.append(integerLiteral, 0, lastCharIndex);
- sb.append(")");
break;
case 'n':
// parse N/n as BigInteger which for groovy is "g" shorthand
@@ -104,8 +103,13 @@
sb.append(floatLiteral, 0, lastCharIndex).append(lastCharacter);
break;
case 'm':
- // parse N/n as BigDecimal which for groovy is "g" shorthand
- sb.append(floatLiteral, 0, lastCharIndex).append("g");
+ // parse N/n as BigDecimal which for groovy is default for floating point numerics
+ if (!floatLiteral.contains(".")) {
+ // 1g is interpreted as BigInteger, so 'g' suffix can't be used here
+ sb.append("new BigDecimal(").append(floatLiteral, 0, lastCharIndex).append("L)");
+ } else {
+ sb.append(floatLiteral, 0, lastCharIndex);
+ }
break;
default:
// everything else just goes as specified
@@ -125,6 +129,18 @@
}
@Override
+ public Void visitUuidLiteral(final GremlinParser.UuidLiteralContext ctx) {
+ if (ctx.stringLiteral() == null) {
+ sb.append("UUID.randomUUID()");
+ return null;
+ }
+ sb.append("UUID.fromString(");
+ sb.append(ctx.stringLiteral().getText());
+ sb.append(")");
+ return null;
+ }
+
+ @Override
public Void visitNullLiteral(final GremlinParser.NullLiteralContext ctx) {
if (ctx.getParent() instanceof GremlinParser.GenericMapNullableArgumentContext) {
sb.append("null as Map");
@@ -215,26 +231,80 @@
private Void handleInject(final ParserRuleContext ctx) {
if (ctx.getChildCount() > 3 && ctx.getChild(2) instanceof GremlinParser.GenericLiteralVarargsContext) {
final GremlinParser.GenericLiteralVarargsContext varArgs = (GremlinParser.GenericLiteralVarargsContext) ctx.getChild(2);
- if (varArgs.getChildCount() > 2 && "null".equals(varArgs.getChild(2).getText())) {
- sb.append(ctx.getChild(0).getText());
- sb.append("(");
- for (int i = 0; i < varArgs.getChildCount(); i += 2) {
- if (i == 2) {
- sb.append("(Object) null");
- } else {
- visit(varArgs.getChild(i));
+ if (varArgs.getChildCount() == 1 && varArgs.getChild(0) instanceof GremlinParser.GenericLiteralExprContext) {
+ GremlinParser.GenericLiteralExprContext injectArgs = (GremlinParser.GenericLiteralExprContext) varArgs.getChild(0);
+ if (injectArgs.getChildCount() > 2 && "null".equals(injectArgs.getChild(2).getText())) {
+ sb.append(ctx.getChild(0).getText());
+ sb.append("(");
+ for (int i = 0; i < injectArgs.getChildCount(); i += 2) {
+ if (i == 2) {
+ sb.append("(Object) null");
+ } else {
+ visit(injectArgs.getChild(i));
+ }
+
+ if (i < injectArgs.getChildCount() - 1) {
+ sb.append(", ");
+ }
}
- if (i < varArgs.getChildCount() - 1) {
- sb.append(", ");
- }
+ sb.append(")");
+ return null;
}
-
- sb.append(")");
- return null;
}
}
return visitChildren(ctx);
}
+
+ @Override
+ public Void visitTraversalMethod_option_Merge_Map(final GremlinParser.TraversalMethod_option_Merge_MapContext ctx){
+ sb.append("option(");
+ visit(ctx.traversalMerge());
+ sb.append(", ");
+ tryCastMapNullableArgument(ctx.genericMapNullableArgument());
+ sb.append(")");
+ return null;
+ }
+
+ @Override
+ public Void visitTraversalMethod_mergeV_Map(final GremlinParser.TraversalMethod_mergeV_MapContext ctx){
+ sb.append("mergeV(");
+ tryCastMapNullableArgument(ctx.genericMapNullableArgument());
+ sb.append(")");
+ return null;
+ }
+
+ @Override
+ public Void visitTraversalSourceSpawnMethod_mergeV_Map(final GremlinParser.TraversalSourceSpawnMethod_mergeV_MapContext ctx){
+ sb.append("mergeV(");
+ tryCastMapNullableArgument(ctx.genericMapNullableArgument());
+ sb.append(")");
+ return null;
+ }
+
+ @Override
+ public Void visitTraversalMethod_mergeE_Map(final GremlinParser.TraversalMethod_mergeE_MapContext ctx){
+ sb.append("mergeE(");
+ tryCastMapNullableArgument(ctx.genericMapNullableArgument());
+ sb.append(")");
+ return null;
+ }
+
+ @Override
+ public Void visitTraversalSourceSpawnMethod_mergeE_Map(final GremlinParser.TraversalSourceSpawnMethod_mergeE_MapContext ctx){
+ sb.append("mergeE(");
+ tryCastMapNullableArgument(ctx.genericMapNullableArgument());
+ sb.append(")");
+ return null;
+ }
+
+ private void tryCastMapNullableArgument(GremlinParser.GenericMapNullableArgumentContext ctx) {
+ if (ctx.genericMapNullableLiteral() != null
+ && ctx.genericMapNullableLiteral().nullLiteral() != null) {
+ sb.append("(Map) null");
+ } else {
+ visit(ctx);
+ }
+ }
}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/translator/JavaTranslateVisitor.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/translator/JavaTranslateVisitor.java
index 18ae1bd..d798afb 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/translator/JavaTranslateVisitor.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/translator/JavaTranslateVisitor.java
@@ -64,6 +64,7 @@
final List<ParseTree> configs = ctx.children.stream().
filter(c -> c instanceof GremlinParser.ConfigurationContext).collect(Collectors.toList());
+
if (configs.size() > 0 && ctx.getChild(1).getText().equals(OptionsStrategy.class.getSimpleName())) {
for (int ix = 0; ix < configs.size(); ix++) {
sb.append(".with(\"");
@@ -246,6 +247,18 @@
}
@Override
+ public Void visitUuidLiteral(final GremlinParser.UuidLiteralContext ctx) {
+ if (ctx.stringLiteral() == null) {
+ sb.append("UUID.randomUUID()");
+ return null;
+ }
+ sb.append("UUID.fromString(");
+ sb.append(ctx.stringLiteral().getText());
+ sb.append(")");
+ return null;
+ }
+
+ @Override
public Void visitGenericRangeLiteral(final GremlinParser.GenericRangeLiteralContext ctx) {
throw new TranslatorException("Java does not support range literals");
}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/translator/PythonTranslateVisitor.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/translator/PythonTranslateVisitor.java
index 5c7e4e0..4b191cb 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/translator/PythonTranslateVisitor.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/translator/PythonTranslateVisitor.java
@@ -94,28 +94,6 @@
}
@Override
- public Void visitTraversalSourceSelfMethod_withoutStrategies(final GremlinParser.TraversalSourceSelfMethod_withoutStrategiesContext ctx) {
- sb.append(SymbolHelper.toPython(ctx.getChild(0).getText())).append("(*[");
- visit(ctx.classType());
-
- if (ctx.classTypeList() != null && ctx.classTypeList().getChildCount() > 0) {
- sb.append(", ");
- visit(ctx.classTypeList());
- }
-
- sb.append("])");
- return null;
- }
-
- @Override
- public Void visitClassType(final GremlinParser.ClassTypeContext ctx) {
- final Optional<? extends Class<? extends TraversalStrategy>> strategy = TraversalStrategies.GlobalCache.getRegisteredStrategyClass(ctx.getText());
- final String fqcn = strategy.map(Class::getName).orElse(ctx.getText());
- sb.append("GremlinType('").append(fqcn).append("')");
- return null;
- }
-
- @Override
public Void visitGenericMapLiteral(final GremlinParser.GenericMapLiteralContext ctx) {
sb.append("{ ");
for (int i = 0; i < ctx.mapEntry().size(); i++) {
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/strategy/decoration/VertexProgramStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/strategy/decoration/VertexProgramStrategy.java
index d28f604..b41ada7 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/strategy/decoration/VertexProgramStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/strategy/decoration/VertexProgramStrategy.java
@@ -104,7 +104,7 @@
// wrap all non-VertexComputing steps into a TraversalVertexProgramStep
currentStep = traversal.getStartStep();
while (!(currentStep instanceof EmptyStep)) {
- final Traversal.Admin<?, ?> computerTraversal = new DefaultTraversal<>(traversal.getBytecode());
+ final Traversal.Admin<?, ?> computerTraversal = new DefaultTraversal<>(traversal.getGremlinLang());
final Step<?, ?> firstLegalOLAPStep = getFirstLegalOLAPStep(currentStep);
final Step<?, ?> lastLegalOLAPStep = getLastLegalOLAPStep(currentStep);
if (!(firstLegalOLAPStep instanceof EmptyStep)) {
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/EmbeddedRemoteConnection.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/EmbeddedRemoteConnection.java
index b8b0b89..c54c7c1 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/EmbeddedRemoteConnection.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/EmbeddedRemoteConnection.java
@@ -18,16 +18,15 @@
*/
package org.apache.tinkerpop.gremlin.process.remote;
-import org.apache.tinkerpop.gremlin.jsr223.JavaTranslator;
+import org.apache.tinkerpop.gremlin.jsr223.GremlinLangScriptEngine;
import org.apache.tinkerpop.gremlin.process.remote.traversal.EmbeddedRemoteTraversal;
import org.apache.tinkerpop.gremlin.process.remote.traversal.RemoteTraversal;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
+import org.apache.tinkerpop.gremlin.process.traversal.GremlinLang;
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.GraphTraversalSource;
import org.apache.tinkerpop.gremlin.structure.Graph;
-import java.util.Iterator;
+import javax.script.Bindings;
import java.util.concurrent.CompletableFuture;
/**
@@ -41,7 +40,7 @@
* GraphTraversalSource g = graph.traversal();
*
* // setup the remote as normal but give it the embedded "g" so that it executes against that
- * GraphTraversalSource simulatedRemoteG = TraversalSourceFactory.traversal(new EmbeddedRemoteConnection(g));
+ * GraphTraversalSource simulatedRemoteG = traversal().with(new EmbeddedRemoteConnection(g));
* assertEquals(6, simulatedRemoteG.V().count().next().intValue());
* }
* </pre>
@@ -50,6 +49,7 @@
*/
public class EmbeddedRemoteConnection implements RemoteConnection {
+ private final GremlinLangScriptEngine scriptEngine = new GremlinLangScriptEngine();
private final GraphTraversalSource g;
public EmbeddedRemoteConnection(final GraphTraversalSource g) {
@@ -57,12 +57,16 @@
}
@Override
- public <E> CompletableFuture<RemoteTraversal<?, E>> submitAsync(final Bytecode bytecode) throws RemoteConnectionException {
+ public <E> CompletableFuture<RemoteTraversal<?, E>> submitAsync(final GremlinLang gremlinLang) throws RemoteConnectionException {
// default implementation for backward compatibility to 3.2.4 - this method will probably just become
// the new submit() in 3.3.x when the deprecation is removed
final CompletableFuture<RemoteTraversal<?, E>> promise = new CompletableFuture<>();
try {
- promise.complete(new EmbeddedRemoteTraversal(JavaTranslator.of(g).translate(bytecode)));
+ final Bindings b = scriptEngine.createBindings();
+ b.putAll(gremlinLang.getParameters());
+ b.put("g", g);
+
+ promise.complete(new EmbeddedRemoteTraversal((Traversal)scriptEngine.eval(gremlinLang.getGremlin(), b)));
} catch (Exception t) {
promise.completeExceptionally(t);
}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteConnection.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteConnection.java
index 639e286..92b4170 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteConnection.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteConnection.java
@@ -20,7 +20,7 @@
import org.apache.commons.configuration2.Configuration;
import org.apache.tinkerpop.gremlin.process.remote.traversal.RemoteTraversal;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
+import org.apache.tinkerpop.gremlin.process.traversal.GremlinLang;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.structure.Transaction;
@@ -49,11 +49,11 @@
}
/**
- * Submits {@link Traversal} {@link Bytecode} to a server and returns a promise of a {@link RemoteTraversal}.
+ * Submits {@link Traversal} {@link GremlinLang} to a server and returns a promise of a {@link RemoteTraversal}.
* The {@link RemoteTraversal} is an abstraction over two types of results that can be returned as part of the
* response from the server: the results of the {@link Traversal} itself and the side-effects that it produced.
*/
- public <E> CompletableFuture<RemoteTraversal<?, E>> submitAsync(final Bytecode bytecode) throws RemoteConnectionException;
+ public <E> CompletableFuture<RemoteTraversal<?, E>> submitAsync(final GremlinLang gremlinLang) throws RemoteConnectionException;
/**
* Create a {@link RemoteConnection} from a {@code Configuration} object. The configuration must contain a
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/AbstractRemoteTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/AbstractRemoteTraversal.java
index efd3db4..616a835 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/AbstractRemoteTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/AbstractRemoteTraversal.java
@@ -19,7 +19,7 @@
package org.apache.tinkerpop.gremlin.process.remote.traversal;
import org.apache.tinkerpop.gremlin.process.remote.traversal.step.map.RemoteStep;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
+import org.apache.tinkerpop.gremlin.process.traversal.GremlinLang;
import org.apache.tinkerpop.gremlin.process.traversal.GValueManager;
import org.apache.tinkerpop.gremlin.process.traversal.Step;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
@@ -59,7 +59,7 @@
}
@Override
- public Bytecode getBytecode() {
+ public GremlinLang getGremlinLang() {
throw new UnsupportedOperationException("Remote traversals do not support this method");
}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/RemoteTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/RemoteTraversal.java
index 69db6c5..0711dd5 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/RemoteTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/RemoteTraversal.java
@@ -20,12 +20,12 @@
import org.apache.tinkerpop.gremlin.process.remote.RemoteConnection;
import org.apache.tinkerpop.gremlin.process.remote.traversal.step.map.RemoteStep;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
+import org.apache.tinkerpop.gremlin.process.traversal.GremlinLang;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.AbstractStep;
/**
- * A {@link RemoteTraversal} is returned from {@link RemoteConnection#submitAsync(Bytecode)}. It is iterated from
+ * A {@link RemoteTraversal} is returned from {@link RemoteConnection#submitAsync(GremlinLang)}. It is iterated from
* within {@link RemoteStep} using {@link #nextTraverser()}. Implementations should typically be given a "result" from
* a remote source where the traversal was executed. The "result" should be an iterator which preferably has its data
* bulked.
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/step/map/RemoteStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/step/map/RemoteStep.java
index be623cd..71ad5c8 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/step/map/RemoteStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/step/map/RemoteStep.java
@@ -21,19 +21,15 @@
import org.apache.tinkerpop.gremlin.process.remote.RemoteConnection;
import org.apache.tinkerpop.gremlin.process.remote.RemoteConnectionException;
import org.apache.tinkerpop.gremlin.process.remote.traversal.RemoteTraversal;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
+import org.apache.tinkerpop.gremlin.process.traversal.GremlinLang;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.AbstractStep;
-import org.apache.tinkerpop.gremlin.process.traversal.util.BytecodeHelper;
-import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversal;
import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
import java.util.NoSuchElementException;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionException;
-import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
/**
@@ -81,12 +77,12 @@
}
/**
- * Submits the traversal asynchronously to a "remote" using {@link RemoteConnection#submitAsync(Bytecode)}.
+ * Submits the traversal asynchronously to a "remote" using {@link RemoteConnection#submitAsync(GremlinLang)}.
*/
public CompletableFuture<Traversal<?, E>> promise() {
try {
if (null == traversalFuture.get()) {
- traversalFuture.set(this.remoteConnection.submitAsync(this.traversal.getBytecode()).<Traversal<?, E>>thenApply(t -> {
+ traversalFuture.set(this.remoteConnection.submitAsync(this.traversal.getGremlinLang()).<Traversal<?, E>>thenApply(t -> {
this.remoteTraversal = (RemoteTraversal<?, E>) t;
return traversal;
}));
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/AnonymousTraversalSource.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/AnonymousTraversalSource.java
index b764eba..5fd7b4c 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/AnonymousTraversalSource.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/AnonymousTraversalSource.java
@@ -134,7 +134,7 @@
*/
public T with(final String configFile) throws Exception {
final Configurations configs = new Configurations();
- return with(configs.properties((configFile)));
+ return with(configs.properties(configFile));
}
/**
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Bindings.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Bindings.java
deleted file mode 100644
index 19c8737..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Bindings.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tinkerpop.gremlin.process.traversal;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Bindings are used to associate a variable with a value. They enable the creation of {@link Bytecode.Binding}
- * arguments in {@link Bytecode}. Use the Bindings instance when defining a binding via {@link Bindings#of(String, Object)}.
- * For instance:
- * <p>
- * <code>
- * b = Bindings.instance()
- * g = graph.traversal()
- * g.V().out(b.of("a","knows"))
- * // bindings can be reused over and over
- * g.V().out("knows").in(b.of("a","created"))
- * </code>
- * </p>
- *
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- */
-public final class Bindings {
-
- private static final Bindings INSTANCE = new Bindings();
- private static final ThreadLocal<Map<Object, String>> MAP = new ThreadLocal<>();
-
- private Bindings() {}
-
- public <V> V of(final String variable, final V value) {
- Map<Object, String> map = MAP.get();
- if (null == map) {
- map = new HashMap<>();
- MAP.set(map);
- }
- map.put(value, variable);
- return value;
- }
-
- protected static <V> String getBoundVariable(final V value) {
- final Map<Object, String> map = MAP.get();
-
- // once retrieved by bytecode, the binding should be removed. all this should occur during the addStep()
- // and related bytecode construction. using remove() solves the problem of TINKERPOP-2458
- return null == map ? null : map.remove(value);
- }
-
- protected static void clear() {
- final Map<Object, String> map = MAP.get();
- if (null != map)
- map.clear();
- }
-
- public static Bindings instance() {
- return INSTANCE;
- }
-
- @Override
- public String toString() {
- return "bindings[" + Thread.currentThread().getName() + "]";
- }
-}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Bytecode.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Bytecode.java
deleted file mode 100644
index ceb4e0a..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Bytecode.java
+++ /dev/null
@@ -1,351 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tinkerpop.gremlin.process.traversal;
-
-import org.apache.tinkerpop.gremlin.process.traversal.step.GValue;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.TraversalStrategyProxy;
-import org.apache.tinkerpop.gremlin.process.traversal.util.BytecodeHelper;
-import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-
-/**
- * When a {@link TraversalSource} is manipulated and then a {@link Traversal} is spawned and mutated, a language
- * agnostic representation of those mutations is recorded in a bytecode instance. Bytecode is simply a list
- * of ordered instructions where an instruction is a string operator and a (flattened) array of arguments.
- * Bytecode is used by {@link Translator} instances which are able to translate a traversal in one language to another
- * by analyzing the bytecode as opposed to the Java traversal object representation on heap.
- * <p>
- * Bytecode can be serialized between environments and machines by way of a GraphSON representation.
- * Thus, Gremlin-Python can create bytecode in Python and ship it to Gremlin-Java for evaluation in Java.
- *
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- */
-public class Bytecode implements Cloneable, Serializable {
-
- private static final Object[] EMPTY_ARRAY = new Object[]{};
-
- private List<Instruction> sourceInstructions = new ArrayList<>();
- private List<Instruction> stepInstructions = new ArrayList<>();
-
- public Bytecode() {}
-
- public Bytecode(final String sourceName, final Object... arguments) {
- this.sourceInstructions.add(new Instruction(sourceName, flattenArguments(arguments)));
- }
-
- /**
- * Add a {@link TraversalSource} instruction to the bytecode.
- *
- * @param sourceName the traversal source method name (e.g. withSack())
- * @param arguments the traversal source method arguments
- */
- public void addSource(final String sourceName, final Object... arguments) {
- if (sourceName.equals(TraversalSource.Symbols.withoutStrategies)) {
- if (arguments == null)
- this.sourceInstructions.add(new Instruction(sourceName, null));
- else {
- final Class<TraversalStrategy>[] classes = new Class[arguments.length];
- for (int i = 0; i < arguments.length; i++) {
- classes[i] = arguments[i] instanceof TraversalStrategyProxy ?
- ((TraversalStrategyProxy) arguments[i]).getStrategyClass() :
- (Class) arguments[i];
- }
- // Remove them first to avoid duplicating information, we will add them below
- BytecodeHelper.removeStrategies(this, TraversalSource.Symbols.withoutStrategies, classes);
- this.sourceInstructions.add(new Instruction(sourceName, classes));
- }
- } else if (TraversalSource.Symbols.withStrategies.equals(sourceName)) {
- final Class<TraversalStrategy>[] classes = new Class[arguments.length];
- for (int i = 0; i < arguments.length; i++) {
- if (!(arguments[i] instanceof TraversalStrategy)) {
- throw new IllegalArgumentException("The argument " + arguments[i] + " is not a TraversalStrategy");
- }
-
- classes[i] = arguments[i] instanceof TraversalStrategyProxy ?
- ((TraversalStrategyProxy) arguments[i]).getStrategyClass() :
- (Class) arguments[i].getClass();
- }
- BytecodeHelper.removeStrategies(this, TraversalSource.Symbols.withStrategies, classes);
- this.sourceInstructions.add(new Instruction(sourceName, flattenArguments(arguments)));
- } else {
- this.sourceInstructions.add(new Instruction(sourceName, flattenArguments(arguments)));
- }
- Bindings.clear();
- }
-
- /**
- * Add a {@link Traversal} instruction to the bytecode.
- *
- * @param stepName the traversal method name (e.g. out())
- * @param arguments the traversal method arguments
- */
- public void addStep(final String stepName, final Object... arguments) {
- this.stepInstructions.add(new Instruction(stepName, flattenArguments(arguments)));
- }
-
- /**
- * Get the {@link TraversalSource} instructions associated with this bytecode.
- *
- * @return an iterable of instructions
- */
- public List<Instruction> getSourceInstructions() {
- return this.sourceInstructions;
- }
-
- /**
- * Get the {@link Traversal} instructions associated with this bytecode.
- *
- * @return an iterable of instructions
- */
- public List<Instruction> getStepInstructions() {
- return this.stepInstructions;
- }
-
- /**
- * Get both the {@link TraversalSource} and {@link Traversal} instructions of this bytecode.
- * The traversal source instructions are provided prior to the traversal instructions.
- *
- * @return an interable of all the instructions in this bytecode
- */
- public Iterable<Instruction> getInstructions() {
- return () -> IteratorUtils.concat(this.sourceInstructions.iterator(), this.stepInstructions.iterator());
- }
-
- /**
- * Get all the bindings (in a nested, recursive manner) from all the arguments of all the instructions of this bytecode.
- *
- * @return a map of string variable and object value bindings
- */
- public Map<String, Object> getBindings() {
- final Map<String, Object> bindingsMap = new HashMap<>();
- for (final Instruction instruction : this.sourceInstructions) {
- for (final Object argument : instruction.getArguments()) {
- addArgumentBinding(bindingsMap, argument);
- }
- }
- for (final Instruction instruction : this.stepInstructions) {
- for (final Object argument : instruction.getArguments()) {
- addArgumentBinding(bindingsMap, argument);
- }
- }
- return bindingsMap;
- }
-
- public boolean isEmpty() {
- return this.sourceInstructions.isEmpty() && this.stepInstructions.isEmpty();
- }
-
- private static final void addArgumentBinding(final Map<String, Object> bindingsMap, final Object argument) {
- if (argument instanceof Binding)
- bindingsMap.put(((Binding) argument).key, ((Binding) argument).value);
- else if (argument instanceof Map) {
- for (final Map.Entry<?, ?> entry : ((Map<?, ?>) argument).entrySet()) {
- addArgumentBinding(bindingsMap, entry.getKey());
- addArgumentBinding(bindingsMap, entry.getValue());
- }
- } else if (argument instanceof Collection) {
- for (final Object item : (Collection) argument) {
- addArgumentBinding(bindingsMap, item);
- }
- } else if (argument instanceof Bytecode)
- bindingsMap.putAll(((Bytecode) argument).getBindings());
- }
-
- @Override
- public String toString() {
- return Arrays.asList(this.sourceInstructions, this.stepInstructions).toString();
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
- final Bytecode bytecode = (Bytecode) o;
- return Objects.equals(sourceInstructions, bytecode.sourceInstructions) &&
- Objects.equals(stepInstructions, bytecode.stepInstructions);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(sourceInstructions, stepInstructions);
- }
-
- @SuppressWarnings("CloneDoesntDeclareCloneNotSupportedException")
- @Override
- public Bytecode clone() {
- try {
- final Bytecode clone = (Bytecode) super.clone();
- clone.sourceInstructions = new ArrayList<>(this.sourceInstructions);
- clone.stepInstructions = new ArrayList<>(this.stepInstructions);
- return clone;
- } catch (final CloneNotSupportedException e) {
- throw new IllegalStateException(e.getMessage(), e);
- }
- }
-
- public static class Instruction implements Serializable {
-
- private final String operator;
- private final Object[] arguments;
-
- private Instruction(final String operator, final Object... arguments) {
- this.operator = operator;
- this.arguments = arguments;
- }
-
- public String getOperator() {
- return this.operator;
- }
-
- public Object[] getArguments() {
- return this.arguments;
- }
-
- @Override
- public String toString() {
- return this.operator + "(" + StringFactory.removeEndBrackets(Arrays.asList(this.arguments)) + ")";
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
- Instruction that = (Instruction) o;
- return Objects.equals(operator, that.operator) &&
- Arrays.equals(arguments, that.arguments);
- }
-
- @Override
- public int hashCode() {
- int result = Objects.hash(operator);
- result = 31 * result + Arrays.hashCode(arguments);
- return result;
- }
- }
-
- public static class Binding<V> implements Serializable {
-
- private final String key;
- private final V value;
-
- public Binding(final String key, final V value) {
- this.key = key;
- this.value = value;
- }
-
- public String variable() {
- return this.key;
- }
-
- public V value() {
- return this.value;
- }
-
- @Override
- public String toString() {
- return "binding[" + this.key + "=" + this.value + "]";
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
- Binding<?> binding = (Binding<?>) o;
- return Objects.equals(key, binding.key) &&
- Objects.equals(value, binding.value);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(key, value);
- }
- }
-
- /////
-
- private Object[] flattenArguments(final Object... arguments) {
- if (arguments == null || arguments.length == 0)
- return EMPTY_ARRAY;
- final List<Object> flatArguments = new ArrayList<>(arguments.length);
- for (final Object object : arguments) {
- if (object instanceof Object[]) {
- for (final Object nestObject : (Object[]) object) {
- flatArguments.add(convertArgument(nestObject, true));
- }
- } else
- flatArguments.add(convertArgument(object, true));
- }
- return flatArguments.toArray();
- }
-
- private Object convertArgument(final Object argument, final boolean searchBindings) {
- if (searchBindings) {
- final String variable = Bindings.getBoundVariable(argument);
- if (null != variable)
- return new Binding<>(variable, convertArgument(argument, false));
- }
- //
- if (argument instanceof Traversal) {
- // prevent use of "g" to spawn child traversals
- if (((Traversal) argument).asAdmin().getTraversalSource().isPresent())
- throw new IllegalStateException(String.format(
- "The child traversal of %s was not spawned anonymously - use the __ class rather than a TraversalSource to construct the child traversal", argument));
-
- return ((Traversal) argument).asAdmin().getBytecode();
- } else if (argument instanceof Map) {
- final Map<Object, Object> map = new LinkedHashMap<>(((Map) argument).size());
- for (final Map.Entry<?, ?> entry : ((Map<?, ?>) argument).entrySet()) {
- map.put(convertArgument(entry.getKey(), true), convertArgument(entry.getValue(), true));
- }
- return map;
- } else if (argument instanceof List) {
- final List<Object> list = new ArrayList<>(((List) argument).size());
- for (final Object item : (List) argument) {
- list.add(convertArgument(item, true));
- }
- return list;
- } else if (argument instanceof Set) {
- final Set<Object> set = new LinkedHashSet<>(((Set) argument).size());
- for (final Object item : (Set) argument) {
- set.add(convertArgument(item, true));
- }
- return set;
- } else if (argument instanceof GValue) {
- final String variable = ((GValue<?>) argument).getName();
- final Object value = ((GValue<?>) argument).get();
- return variable == null
- ? convertArgument(value, searchBindings)
- : new Binding<>(variable, convertArgument(value, false));
- } else
- return argument;
- }
-}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Failure.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Failure.java
index 8e11c87..07fe310 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Failure.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Failure.java
@@ -18,23 +18,18 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.FailStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.EmptyStep;
-import org.apache.tinkerpop.gremlin.process.traversal.translator.GroovyTranslator;
import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
-import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
public interface Failure {
- static Translator.ScriptTranslator TRANSLATOR = GroovyTranslator.of("");
-
String getMessage();
Map<String,Object> getMetadata();
@@ -79,13 +74,13 @@
}
// removes the starting period so that "__.out()" simply presents as "out()"
- lines.add(String.format("Traversal> %s", TRANSLATOR.translate(getTraversal()).getScript().substring(1)));
+ lines.add(String.format("Traversal> %s", getTraversal().getGremlinLang().getGremlin().substring(1)));
// not sure there is a situation where fail() would be used where it was not wrapped in a parent,
// but on the odd case that it is it can be handled
if (parentStep != EmptyStep.instance()) {
lines.add(String.format("Parent > %s [%s]",
- parentStep.getClass().getSimpleName(), TRANSLATOR.translate(parentStep.getTraversal()).getScript().substring(1)));
+ parentStep.getClass().getSimpleName(), getTraversal().getGremlinLang().getGremlin().substring(1)));
}
lines.add(String.format("Metadata > %s", getMetadata()));
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/GraphOp.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/GraphOp.java
index ad47929..2dd7ff9 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/GraphOp.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/GraphOp.java
@@ -22,7 +22,7 @@
import org.apache.tinkerpop.gremlin.structure.Transaction;
/**
- * A {@code GraphOp} or "graph operation" is a static {@link Bytecode} form that does not translate to a traversal
+ * A {@code GraphOp} or "graph operation" is a static {@link GremlinLang} form that does not translate to a traversal
* but instead refers to a specific function to perform on a graph instance.
*/
public enum GraphOp {
@@ -30,30 +30,30 @@
/**
* Commit a transaction.
*/
- TX_COMMIT(new Bytecode(GraphTraversalSource.Symbols.tx, Transaction.Symbols.commit)),
+ TX_COMMIT(new GremlinLang(GraphTraversalSource.Symbols.tx, Transaction.Symbols.commit)),
/**
* Rollback a transaction.
*/
- TX_ROLLBACK(new Bytecode(GraphTraversalSource.Symbols.tx, Transaction.Symbols.rollback));
+ TX_ROLLBACK(new GremlinLang(GraphTraversalSource.Symbols.tx, Transaction.Symbols.rollback));
- private final Bytecode bytecode;
+ private final GremlinLang gremlinLang;
- GraphOp(final Bytecode bc) {
- this.bytecode = bc;
+ GraphOp(final GremlinLang bc) {
+ this.gremlinLang = bc;
}
/**
- * Gets the {@link Bytecode} that represents this graph operation. There is no notion of immutable bytecode
+ * Gets the {@link GremlinLang} that represents this graph operation. There is no notion of immutable GremlinLang
* instances so it is important that the object returned here is not modified. If they are changed, the operations
* will no longer be recognized. In a future version, we should probably introduce the concept of immutable
- * bytecode to prevent this possibility - https://issues.apache.org/jira/browse/TINKERPOP-2545
+ * GremlinLang to prevent this possibility - https://issues.apache.org/jira/browse/TINKERPOP-2545
*/
- public Bytecode getBytecode() {
- return bytecode;
+ public GremlinLang getGremlinLang() {
+ return gremlinLang;
}
- public boolean equals(final Bytecode bc) {
- return bytecode.equals(bc);
+ public boolean equals(final GremlinLang bc) {
+ return gremlinLang.equals(bc);
}
}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/GremlinLang.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/GremlinLang.java
new file mode 100644
index 0000000..8bc8690
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/GremlinLang.java
@@ -0,0 +1,527 @@
+/*
+ * 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;
+
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.text.StringEscapeUtils;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
+import org.apache.tinkerpop.gremlin.process.traversal.step.GValue;
+import org.apache.tinkerpop.gremlin.process.traversal.strategy.TraversalStrategyProxy;
+import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.OptionsStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.util.ConnectiveP;
+import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversal;
+import org.apache.tinkerpop.gremlin.structure.Column;
+import org.apache.tinkerpop.gremlin.structure.T;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.util.NumberHelper;
+
+import javax.lang.model.SourceVersion;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.time.OffsetDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import static org.apache.tinkerpop.gremlin.util.DatetimeHelper.format;
+import static org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils.asIterator;
+
+/**
+ * This class helps to build a gremlin-lang compatible string representation based on a {@link TraversalSource}
+ * and then a {@link Traversal}.
+ */
+public class GremlinLang implements Cloneable, Serializable {
+
+ private static final Object[] EMPTY_ARRAY = new Object[]{};
+
+ private StringBuilder gremlin = new StringBuilder();
+ private Map<String, Object> parameters = new HashMap<>();
+ private static final AtomicInteger paramCount = new AtomicInteger(0);
+ private List<OptionsStrategy> optionsStrategies = new ArrayList<>();
+
+ public GremlinLang() {
+ }
+
+ public GremlinLang(final String sourceName, final Object... arguments) {
+ addToGremlin(sourceName, arguments);
+ }
+
+ private void addToGremlin(final String name, final Object... arguments) {
+ final Object[] flattenedArguments = flattenArguments(arguments);
+
+ // todo: figure out solution for AbstractLambdaTraversal
+ if ("CardinalityValueTraversal".equals(name)) {
+ gremlin.append("Cardinality.").append(flattenedArguments[0])
+ .append("(").append(flattenedArguments[1]).append(")");
+ return;
+ }
+
+ gremlin.append(".").append(name).append('(');
+
+ for (int i = 0; i < flattenedArguments.length; i++) {
+ if (i != 0) {
+ gremlin.append(',');
+ }
+ gremlin.append(argAsString(flattenedArguments[i]));
+ }
+
+ gremlin.append(')');
+ }
+
+ private String argAsString(final Object arg) {
+ if (arg == null)
+ return "null";
+
+ if (arg instanceof String)
+ return String.format("\"%s\"", StringEscapeUtils.escapeJava((String) arg));
+ if (arg instanceof Boolean)
+ return arg.toString();
+
+ if (arg instanceof Byte)
+ return String.format("%sB", arg);
+ if (arg instanceof Short)
+ return String.format("%sS", arg);
+ if (arg instanceof Integer)
+ return arg.toString();
+ if (arg instanceof Long)
+ return String.format("%sL", arg);
+
+ if (arg instanceof BigInteger)
+ return String.format("%sN", arg);
+ if (arg instanceof Float) {
+ if (NumberHelper.isNaN(arg))
+ return "NaN";
+ if (NumberHelper.isPositiveInfinity(arg))
+ return "+Infinity";
+ if (NumberHelper.isNegativeInfinity(arg))
+ return "-Infinity";
+
+ return String.format("%sF", arg);
+ }
+ if (arg instanceof Double) {
+ if (NumberHelper.isNaN(arg))
+ return "NaN";
+ if (NumberHelper.isPositiveInfinity(arg))
+ return "+Infinity";
+ if (NumberHelper.isNegativeInfinity(arg))
+ return "-Infinity";
+ return String.format("%sD", arg);
+ }
+ if (arg instanceof BigDecimal)
+ return String.format("%sM", arg);
+
+ if (arg instanceof OffsetDateTime)
+ return String.format("datetime(\"%s\")", format(((OffsetDateTime) arg).toInstant()));
+
+ if (arg instanceof UUID) {
+ return String.format("UUID(\"%s\")", arg);
+ }
+
+ if (arg instanceof Enum) {
+ // special handling for enums with additional interfaces
+ if (arg instanceof T)
+ return String.format("T.%s", arg);
+ if (arg instanceof N) {
+ return String.format("N.%s", arg).replace("_","");
+ }
+ if (arg instanceof Order)
+ return String.format("Order.%s", arg);
+ if (arg instanceof Column)
+ return String.format("Column.%s", arg);
+ if (arg instanceof Operator)
+ return String.format("Operator.%s", arg);
+ if (arg instanceof SackFunctions.Barrier)
+ return String.format("Barrier.%s", arg);
+
+ return String.format("%s.%s", arg.getClass().getSimpleName(), arg);
+ }
+
+ if (arg instanceof Vertex)
+ return argAsString(((Vertex) arg).id());
+
+ if (arg instanceof P) {
+ return asString((P<?>) arg);
+ }
+
+ if (arg instanceof GremlinLang || arg instanceof DefaultTraversal) {
+ final GremlinLang gremlinLang = arg instanceof GremlinLang ? (GremlinLang) arg : ((DefaultTraversal) arg).getGremlinLang();
+ parameters.putAll(gremlinLang.getParameters());
+ return gremlinLang.getGremlin("__");
+ }
+
+ if (arg instanceof GValue) {
+ final GValue gValue = (GValue) arg;
+ String key = gValue.getName();
+
+ if (key == null) {
+ return argAsString(((GValue<?>) arg).get());
+ }
+
+ if (!SourceVersion.isIdentifier(key)) {
+ throw new IllegalArgumentException(String.format("Invalid parameter name [%s].", key));
+ }
+
+ if (parameters.containsKey(key)) {
+ if (!Objects.equals(parameters.get(key), gValue.get())) {
+ throw new IllegalArgumentException(String.format("Parameter with name [%s] already defined.", key));
+ }
+ } else {
+ parameters.put(key, gValue.get());
+ }
+ return key;
+ }
+
+ if (arg instanceof Map) {
+ return asString((Map) arg);
+ }
+
+ if (arg instanceof Set) {
+ return asString((Set) arg);
+ }
+
+ // handle all iterables in similar way
+ if (arg instanceof List || arg instanceof Object[] || arg.getClass().isArray()) {
+ return asString(asIterator(arg));
+ }
+
+ if (arg instanceof Class) {
+ return ((Class) arg).getSimpleName();
+ }
+
+ return asParameter(arg);
+ }
+
+ private String asParameter(final Object arg) {
+ final String paramName = String.format("_%d", paramCount.getAndIncrement());
+ // todo: consider resetting paramCount when it's larger then 1_000_000
+ parameters.put(paramName, arg);
+ return paramName;
+ }
+
+ private String asString(final Iterator itty) {
+ final StringBuilder sb = new StringBuilder().append("[");
+
+ while (itty.hasNext()) {
+ sb.append(argAsString(itty.next()));
+ if (itty.hasNext())
+ sb.append(",");
+ }
+
+ return sb.append("]").toString();
+ }
+
+ private String asString(final Set<?> set) {
+ final StringBuilder sb = new StringBuilder().append("{");
+
+ final Iterator itty = asIterator(set);
+
+ while (itty.hasNext()) {
+ sb.append(argAsString(itty.next()));
+ if (itty.hasNext())
+ sb.append(",");
+ }
+
+ return sb.append("}").toString();
+ }
+
+ // borrowed from Groovy translator
+ private String asString(final P<?> p) {
+ final StringBuilder sb = new StringBuilder();
+ if (p instanceof TextP) {
+ sb.append("TextP.").append(p.getPredicateName()).append("(");
+ sb.append(argAsString(p.getValue()));
+ } else if (p instanceof ConnectiveP) {
+ // ConnectiveP gets some special handling because it's reduced to and(P, P, P) and we want it
+ // generated the way it was written which was P.and(P).and(P)
+ final List<P<?>> list = ((ConnectiveP) p).getPredicates();
+ final String connector = p.getPredicateName();
+ for (int i = 0; i < list.size(); i++) {
+ sb.append(argAsString(list.get(i)));
+
+ // for the first/last P there is no parent to close
+ if (i > 0 && i < list.size() - 1) sb.append(")");
+
+ // add the connector for all but last P
+ if (i < list.size() - 1) {
+ sb.append(".").append(connector).append("(");
+ }
+ }
+ } else if (p instanceof NotP) {
+ sb.append("P.not(");
+ sb.append(argAsString(p.negate())); // Wrap internal P in `P.not(%s)`
+ } else {
+ sb.append("P.").append(p.getPredicateName()).append("(");
+ sb.append(argAsString(p.getValue()));
+ }
+ sb.append(")");
+ return sb.toString();
+ }
+
+ private String asString(final Map<?, ?> map) {
+ final StringBuilder sb = new StringBuilder("[");
+ int size = map.size();
+
+ if (size == 0) {
+ sb.append(":");
+ } else {
+ for (Map.Entry<?, ?> entry : map.entrySet()) {
+ String key = argAsString(entry.getKey());
+ // special handling for non-string keys
+ if (entry.getKey() instanceof Enum && key.contains(".")) {
+ key = String.format("(%s)", key);
+ }
+
+ sb.append(key).append(":").append(argAsString(entry.getValue()));
+ if (--size > 0) {
+ sb.append(',');
+ }
+ }
+ }
+
+ sb.append("]");
+ return sb.toString();
+ }
+
+ /**
+ * Get gremlin-lang compatible representation of Traversal
+ * @return gremlin-lang compatible String
+ */
+ public String getGremlin() {
+ return getGremlin("g");
+ }
+
+ /**
+ * Get gremlin-lang compatible representation of Traversal.
+ * "g" is expected for gremlin-lang.
+ * "__" can be used for an anonymous {@link GraphTraversal}.
+ *
+ * @param g GraphTraversalSource name
+ * @return gremlin-lang compatible String
+ */
+ public String getGremlin(final String g) {
+ // special handling for CardinalityValueTraversal
+ if (gremlin.length() != 0 && gremlin.charAt(0) != '.') {
+ return gremlin.toString();
+ }
+ return g + gremlin;
+ }
+
+ /**
+ * Get parameters used in Traversal.
+ *
+ * @return parameters Map
+ */
+ public Map<String, Object> getParameters() {
+ return parameters;
+ }
+
+ /**
+ * The alias to set.
+ */
+ public void addG(final String g) {
+ parameters.put("g", g);
+ }
+
+ /**
+ * Reset parameter naming counter. Mainly intended to make testing easier
+ */
+ public void reset() {
+ paramCount.set(0);
+ }
+
+ /**
+ * Add a {@link TraversalSource} instruction to the GremlinLang.
+ *
+ * @param sourceName the traversal source method name (e.g. withSack())
+ * @param arguments the traversal source method arguments
+ */
+ public void addSource(final String sourceName, final Object... arguments) {
+ if (sourceName.equals(TraversalSource.Symbols.withStrategies) && arguments.length != 0) {
+ final String args = buildStrategyArgs(arguments);
+
+ // possible to have empty strategies list to send
+ if (!args.isEmpty()) {
+ gremlin.append('.').append(TraversalSource.Symbols.withStrategies).append('(').append(args).append(')');
+ }
+ return;
+ }
+
+ addToGremlin(sourceName, arguments);
+ }
+
+ private String buildStrategyArgs(final Object[] arguments) {
+ final StringBuilder sb = new StringBuilder();
+ for (int i = 0; i < arguments.length; i++) {
+ // special handling for OptionsStrategy
+ if (arguments[i] instanceof OptionsStrategy) {
+ optionsStrategies.add((OptionsStrategy) arguments[i]);
+ break;
+ }
+
+ Configuration configuration;
+ String strategyName;
+
+ // special handling for TraversalStrategyProxy
+ if (arguments[i] instanceof TraversalStrategyProxy) {
+ configuration = ((TraversalStrategy) arguments[i]).getConfiguration();
+ strategyName = ((TraversalStrategyProxy) arguments[i]).getStrategyName();
+ } else {
+ configuration = ((TraversalStrategy) arguments[i]).getConfiguration();
+ strategyName = arguments[i].getClass().getSimpleName();
+ }
+
+ if (configuration.isEmpty()) {
+ sb.append(strategyName);
+ } else {
+ sb.append("new ")
+ .append(strategyName)
+ .append("(");
+
+ configuration.getKeys().forEachRemaining(key -> {
+ if (!key.equals("strategy")) {
+ sb.append(key).append(":").append(argAsString(configuration.getProperty(key))).append(",");
+ }
+ });
+ // remove last comma
+ if (sb.lastIndexOf(",") == sb.length() - 1) {
+ sb.setLength(sb.length() - 1);
+ }
+
+ sb.append(')');
+ }
+
+ if (i != arguments.length - 1)
+ sb.append(',');
+ }
+
+ return sb.toString();
+ }
+
+ /**
+ * Add a {@link Traversal} instruction to the GremlinLang.
+ *
+ * @param stepName the traversal method name (e.g. out())
+ * @param arguments the traversal method arguments
+ */
+ public void addStep(final String stepName, final Object... arguments) {
+ addToGremlin(stepName, arguments);
+ }
+
+ /**
+ * Provides a way to get configuration of a Traversal.
+ *
+ * @return list of OptionsStrategy
+ */
+ public List<OptionsStrategy> getOptionsStrategies() {
+ return optionsStrategies;
+ }
+
+ public boolean isEmpty() {
+ return this.gremlin.length() == 0;
+ }
+
+ @Override
+ public String toString() {
+ return gremlin.toString();
+ }
+
+ // todo: clarify equality with parameters
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+ final GremlinLang gremlinLang = (GremlinLang) o;
+ return Objects.equals(gremlin.toString(), gremlinLang.gremlin.toString()) &&
+ Objects.equals(parameters, gremlinLang.parameters);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(gremlin, parameters);
+ }
+
+ @Override
+ public GremlinLang clone() {
+ try {
+ final GremlinLang clone = (GremlinLang) super.clone();
+ clone.parameters = new HashMap<>(parameters);
+ clone.gremlin = new StringBuilder(gremlin.length());
+ clone.gremlin.append(gremlin);
+ clone.optionsStrategies = new ArrayList<>(this.optionsStrategies);
+ return clone;
+ } catch (final CloneNotSupportedException e) {
+ throw new IllegalStateException(e.getMessage(), e);
+ }
+ }
+
+ private Object[] flattenArguments(final Object... arguments) {
+ if (arguments == null || arguments.length == 0)
+ return EMPTY_ARRAY;
+ final List<Object> flatArguments = new ArrayList<>(arguments.length);
+ for (final Object object : arguments) {
+ if (object instanceof Object[]) {
+ for (final Object nestObject : (Object[]) object) {
+ flatArguments.add(convertArgument(nestObject));
+ }
+ } else
+ flatArguments.add(convertArgument(object));
+ }
+ return flatArguments.toArray();
+ }
+
+ private Object convertArgument(final Object argument) {
+ if (argument instanceof Traversal) {
+ // prevent use of "g" to spawn child traversals
+ if (((Traversal) argument).asAdmin().getTraversalSource().isPresent())
+ throw new IllegalStateException(String.format(
+ "The child traversal of %s was not spawned anonymously - use the __ class rather than a TraversalSource to construct the child traversal", argument));
+
+ return ((Traversal) argument).asAdmin().getGremlinLang();
+ } else if (argument instanceof Map) {
+ final Map<Object, Object> map = new LinkedHashMap<>(((Map) argument).size());
+ for (final Map.Entry<?, ?> entry : ((Map<?, ?>) argument).entrySet()) {
+ map.put(convertArgument(entry.getKey()), convertArgument(entry.getValue()));
+ }
+ return map;
+ } else if (argument instanceof List) {
+ final List<Object> list = new ArrayList<>(((List) argument).size());
+ for (final Object item : (List) argument) {
+ list.add(convertArgument(item));
+ }
+ return list;
+ } else if (argument instanceof Set) {
+ final Set<Object> set = new LinkedHashSet<>(((Set) argument).size());
+ for (final Object item : (Set) argument) {
+ set.add(convertArgument(item));
+ }
+ return set;
+ } else
+ return argument;
+ }
+}
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 4fba110..e7e1b47 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
@@ -30,9 +30,7 @@
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.List;
import java.util.Map;
-import java.util.Optional;
import java.util.Set;
import java.util.function.Predicate;
import java.util.stream.Collectors;
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Translator.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Translator.java
deleted file mode 100644
index 29f846c..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Translator.java
+++ /dev/null
@@ -1,361 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tinkerpop.gremlin.process.traversal;
-
-import org.apache.tinkerpop.gremlin.process.traversal.lambda.CardinalityValueTraversal;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.TraversalStrategyProxy;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.apache.tinkerpop.gremlin.util.function.Lambda;
-
-import java.sql.Timestamp;
-import java.time.OffsetDateTime;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-import java.util.function.BiFunction;
-
-/**
- * A Translator will translate {@link Bytecode} into another representation. That representation may be a
- * Java instance via {@link StepTranslator} or a String script in some language via {@link ScriptTranslator}.
- * The parameterization of Translator is S (traversal source) and T (full translation).
- *
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- * @author Stark Arya (sandszhou.zj@alibaba-inc.com)
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public interface Translator<S, T> {
-
- /**
- * Get the {@link TraversalSource} representation rooting this translator.
- * For string-based translators ({@link ScriptTranslator}), this is typically a "g".
- * For java-based translators ({@link StepTranslator}), this is typically the {@link TraversalSource} instance
- * which the {@link Traversal} will be built from.
- *
- * @return the traversal source representation
- */
- public S getTraversalSource();
-
- /**
- * Translate {@link Bytecode} into a new representation. Typically, for language translations, the translation is
- * to a string representing the traversal in the respective scripting language.
- *
- * @param bytecode the bytecode representing traversal source and traversal manipulations.
- * @return the translated object
- */
- public T translate(final Bytecode bytecode);
-
- /**
- * Translates a {@link Traversal} into the specified form
- */
- public default T translate(final Traversal<?,?> t) {
- return translate(t.asAdmin().getBytecode());
- }
-
- /**
- * Get the language that the translator is converting the traversal byte code to.
- *
- * @return the language of the translation
- */
- public String getTargetLanguage();
-
- ///
-
- /**
- * Translates bytecode to a Script representation.
- */
- public interface ScriptTranslator extends Translator<String, Script> {
-
- /**
- * Provides a way for the {@link ScriptTranslator} to convert various data types to their string
- * representations in their target language.
- */
- public interface TypeTranslator extends BiFunction<String, Object, Script> { }
-
- public abstract class AbstractTypeTranslator implements ScriptTranslator.TypeTranslator {
- protected static final String ANONYMOUS_TRAVERSAL_PREFIX = "__";
- protected final boolean withParameters;
- protected final Script script;
-
- protected AbstractTypeTranslator(final boolean withParameters) {
- this.withParameters = withParameters;
- this.script = new Script();
- }
-
- @Override
- public Script apply(final String traversalSource, final Object o) {
- this.script.init();
- if (o instanceof Bytecode) {
- return produceScript(traversalSource, (Bytecode) o);
- } else {
- return convertToScript(o);
- }
- }
-
- /**
- * Gets the syntax for the spawn of an anonymous traversal which is traditionally the double underscore.
- */
- protected String getAnonymousTraversalPrefix() {
- return ANONYMOUS_TRAVERSAL_PREFIX;
- }
-
- /**
- * Gets the syntax for a {@code null} value as a string representation.
- */
- protected abstract String getNullSyntax();
-
- /**
- * Take the string argument and convert it to a string representation in the target language (i.e. escape,
- * enclose in appropriate quotes, etc.)
- */
- protected abstract String getSyntax(final String o);
-
- /**
- * Take the boolean argument and convert it to a string representation in the target language.
- */
- protected abstract String getSyntax(final Boolean o);
-
- /**
- * Take the {@code Date} argument and convert it to a string representation in the target language.
- */
- protected abstract String getSyntax(final Date o);
-
- /**
- * Take the {@code OffsetDateTime} argument and convert it to a string representation in the target language.
- */
- protected abstract String getSyntax(final OffsetDateTime o);
-
- /**
- * Take the {@code Timestamp} argument and convert it to a string representation in the target language.
- */
- protected abstract String getSyntax(final Timestamp o);
-
- /**
- * Take the {@code UUID} argument and convert it to a string representation in the target language.
- */
- protected abstract String getSyntax(final UUID o);
-
- /**
- * Take the {@link Lambda} argument and convert it to a string representation in the target language.
- */
- protected abstract String getSyntax(final Lambda o);
-
- /**
- * Take the {@link SackFunctions.Barrier} argument and convert it to a string representation in the target language.
- */
- protected abstract String getSyntax(final SackFunctions.Barrier o);
-
- /**
- * Take the {@link VertexProperty.Cardinality} argument and convert it to a string representation in the target language.
- */
- protected abstract String getSyntax(final VertexProperty.Cardinality o);
-
- /**
- * Take the {@link Pick} argument and convert it to a string representation in the target language.
- */
- protected abstract String getSyntax(final Pick o);
-
- /**
- * Take the numeric argument and convert it to a string representation in the target language. Languages
- * that can discern differences in types of numbers will wish to further check the type of the
- * {@code Number} instance itself (i.e. {@code Double}, {@code Integer}, etc.)
- */
- protected abstract String getSyntax(final Number o);
-
- /**
- * Take the {@code Set} and writes the syntax directly to the member {@link #script} variable.
- */
- protected abstract Script produceScript(final Set<?> o);
-
- /**
- * Take the {@code List} and writes the syntax directly to the member {@link #script} variable.
- */
- protected abstract Script produceScript(final List<?> o);
-
- /**
- * Take the {@code Map} and writes the syntax directly to the member {@link #script} variable.
- */
- protected abstract Script produceScript(final Map<?,?> o);
-
- /**
- * Take the {@code Class} and writes the syntax directly to the member {@link #script} variable.
- */
- protected abstract Script produceScript(final Class<?> o);
-
- /**
- * Take the {@code Enum} and writes the syntax directly to the member {@link #script} variable.
- */
- protected abstract Script produceScript(final Enum<?> o);
-
- /**
- * Take the {@link Vertex} and writes the syntax directly to the member {@link #script} variable.
- */
- protected abstract Script produceScript(final Vertex o);
-
- /**
- * Take the {@link Edge} and writes the syntax directly to the member {@link #script} variable.
- */
- protected abstract Script produceScript(final Edge o);
-
- /**
- * Take the {@link VertexProperty} and writes the syntax directly to the member {@link #script} variable.
- */
- protected abstract Script produceScript(final VertexProperty<?> o);
-
- /**
- * Take the {@link TraversalStrategyProxy} and writes the syntax directly to the member {@link #script} variable.
- */
- protected abstract Script produceScript(final TraversalStrategyProxy<?> o);
-
- /**
- * Take the {@link Bytecode} and writes the syntax directly to the member {@link #script} variable.
- */
- protected abstract Script produceScript(final String traversalSource, final Bytecode o);
-
- /**
- * Take the {@link P} and writes the syntax directly to the member {@link #script} variable. This
- * implementation should also consider {@link TextP}.
- */
- protected abstract Script produceScript(final P<?> p);
-
- /**
- * Take the {@link Bytecode} and write the syntax for it directly to the member {@link #script} variable.
- */
- protected abstract Script produceCardinalityValue(final Bytecode o);
-
- /**
- * For each operator argument, if withParameters set true, try parametrization as follows:
- *
- * -----------------------------------------------
- * if unpack, why ? ObjectType
- * -----------------------------------------------
- * (Yes) Bytecode.Binding
- * (Recursion, No) Bytecode
- * (Recursion, No) Traversal
- * (Yes) String
- * (Recursion, No) Set
- * (Recursion, No) List
- * (Recursion, No) Map
- * (Yes) Long
- * (Yes) Double
- * (Yes) Float
- * (Yes) Integer
- * (Yes) Timestamp
- * (Yes) Date
- * (Yes) Uuid
- * (Recursion, No) P
- * (Enumeration, No) SackFunctions.Barrier
- * (Enumeration, No) VertexProperty.Cardinality
- * (Enumeration, No) TraversalOptionParent.Pick
- * (Enumeration, No) Enum
- * (Recursion, No) Vertex
- * (Recursion, No) Edge
- * (Recursion, No) VertexProperty
- * (Yes) Lambda
- * (Recursion, No) TraversalStrategyProxy
- * (Enumeration, No) TraversalStrategy
- * (Yes) Other
- * -------------------------------------------------
- *
- * @param object
- * @return String Repres
- */
- protected Script convertToScript(final Object object) {
- if (object instanceof Bytecode.Binding) {
- return script.getBoundKeyOrAssign(withParameters, ((Bytecode.Binding) object).variable());
- } else if (object instanceof Bytecode) {
- final Bytecode bc = (Bytecode) object;
- if (bc.getSourceInstructions().size() == 1 &&
- bc.getSourceInstructions().get(0).getOperator().equals(CardinalityValueTraversal.class.getSimpleName())) {
- return produceCardinalityValue(bc);
- } else {
- return produceScript(getAnonymousTraversalPrefix(), bc);
- }
- } else if (object instanceof Traversal) {
- return convertToScript(((Traversal) object).asAdmin().getBytecode());
- } else if (object instanceof String) {
- final Object objectOrWrapper = withParameters ? object : getSyntax((String) object);
- return script.getBoundKeyOrAssign(withParameters, objectOrWrapper);
- } else if (object instanceof Boolean) {
- final Object objectOrWrapper = withParameters ? object : getSyntax((Boolean) object);
- return script.getBoundKeyOrAssign(withParameters, objectOrWrapper);
- } else if (object instanceof Set) {
- return produceScript((Set<?>) object);
- } else if (object instanceof List) {
- return produceScript((List<?>) object);
- } else if (object instanceof Map) {
- return produceScript((Map<?, ?>) object);
- } else if (object instanceof Number) {
- final Object objectOrWrapper = withParameters ? object : getSyntax((Number) object);
- return script.getBoundKeyOrAssign(withParameters, objectOrWrapper);
- } else if (object instanceof Class) {
- return produceScript((Class<?>) object);
- } else if (object instanceof Timestamp) {
- final Object objectOrWrapper = withParameters ? object : getSyntax((Timestamp) object);
- return script.getBoundKeyOrAssign(withParameters, objectOrWrapper);
- } else if (object instanceof Date) {
- final Object objectOrWrapper = withParameters ? object : getSyntax((Date) object);
- return script.getBoundKeyOrAssign(withParameters, objectOrWrapper);
- } else if (object instanceof OffsetDateTime) {
- final Object objectOrWrapper = withParameters ? object : getSyntax((OffsetDateTime) object);
- return script.getBoundKeyOrAssign(withParameters, objectOrWrapper);
- } else if (object instanceof UUID) {
- final Object objectOrWrapper = withParameters ? object : getSyntax((UUID) object);
- return script.getBoundKeyOrAssign(withParameters, objectOrWrapper);
- } else if (object instanceof P) {
- return produceScript((P<?>) object);
- } else if (object instanceof SackFunctions.Barrier) {
- return script.append(getSyntax((SackFunctions.Barrier) object));
- } else if (object instanceof VertexProperty.Cardinality) {
- return script.append(getSyntax((VertexProperty.Cardinality) object));
- } else if (object instanceof Pick) {
- return script.append(getSyntax((Pick) object));
- } else if (object instanceof Enum) {
- return produceScript((Enum<?>) object);
- } else if (object instanceof Vertex) {
- return produceScript((Vertex) object);
- } else if (object instanceof Edge) {
- return produceScript((Edge) object);
- } else if (object instanceof VertexProperty) {
- return produceScript((VertexProperty<?>) object);
- } else if (object instanceof Lambda) {
- final Object objectOrWrapper = withParameters ? object : getSyntax((Lambda) object);
- return script.getBoundKeyOrAssign(withParameters,objectOrWrapper);
- } else if (object instanceof TraversalStrategyProxy) {
- return produceScript((TraversalStrategyProxy<?>) object);
- } else if (object instanceof TraversalStrategy) {
- return convertToScript(new TraversalStrategyProxy(((TraversalStrategy) object)));
- } else {
- return null == object ? script.append(getNullSyntax()) : script.getBoundKeyOrAssign(withParameters, object);
- }
- }
- }
- }
-
- /**
- * Translates bytecode to actual steps.
- */
- public interface StepTranslator<S extends TraversalSource, T extends Traversal.Admin<?, ?>> extends Translator<S, T> {
-
- }
-}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Traversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Traversal.java
index ec9a162..f095d3a 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Traversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Traversal.java
@@ -35,6 +35,8 @@
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics;
import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.util.CloseableIterator;
+import org.apache.tinkerpop.gremlin.util.function.TraverserSetSupplier;
import java.io.Serializable;
import java.util.ArrayList;
@@ -53,8 +55,6 @@
import java.util.function.Supplier;
import java.util.stream.Stream;
import java.util.stream.StreamSupport;
-import org.apache.tinkerpop.gremlin.structure.util.CloseableIterator;
-import org.apache.tinkerpop.gremlin.util.function.TraverserSetSupplier;
/**
* A {@link Traversal} represents a directed walk over a {@link Graph}.
@@ -223,7 +223,7 @@
* @since 3.8.0
*/
public default Traversal<S, E> discard() {
- this.asAdmin().getBytecode().addStep(Symbols.discard);
+ this.asAdmin().getGremlinLang().addStep(Symbols.discard);
return this.asAdmin().addStep(new DiscardStep<>(this.asAdmin()));
}
@@ -233,7 +233,7 @@
* @return the updated traversal with respective {@link ProfileSideEffectStep}.
*/
public default Traversal<S, TraversalMetrics> profile() {
- this.asAdmin().getBytecode().addStep(Symbols.profile);
+ this.asAdmin().getGremlinLang().addStep(Symbols.profile);
return this.asAdmin()
.addStep(new ProfileSideEffectStep<>(this.asAdmin(), ProfileSideEffectStep.DEFAULT_METRICS_KEY))
.addStep(new SideEffectCapStep<Object, TraversalMetrics>(this.asAdmin(), ProfileSideEffectStep.DEFAULT_METRICS_KEY));
@@ -323,11 +323,11 @@
public interface Admin<S, E> extends Traversal<S, E> {
/**
- * Get the {@link Bytecode} associated with the construction of this traversal.
+ * Get the {@link GremlinLang} associated with the construction of this traversal.
*
* @return the byte code representation of the traversal
*/
- public Bytecode getBytecode();
+ public GremlinLang getGremlinLang();
/**
* Get the {@link GValueManager} associated with this traversal.
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalSource.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalSource.java
index 31f0701..307fae2 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalSource.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalSource.java
@@ -64,11 +64,11 @@
public Graph getGraph();
/**
- * Get the {@link Bytecode} associated with the current state of this traversal source.
+ * Get the {@link GremlinLang} associated with the current state of this traversal source.
*
* @return the traversal source byte code
*/
- public Bytecode getBytecode();
+ public GremlinLang getGremlinLang();
/////////////////////////////
@@ -130,7 +130,7 @@
public default TraversalSource withStrategies(final TraversalStrategy... traversalStrategies) {
final TraversalSource clone = this.clone();
clone.getStrategies().addStrategies(traversalStrategies);
- clone.getBytecode().addSource(TraversalSource.Symbols.withStrategies, traversalStrategies);
+ clone.getGremlinLang().addSource(TraversalSource.Symbols.withStrategies, traversalStrategies);
for (final TraversalStrategy traversalStrategy : traversalStrategies) {
if (traversalStrategy instanceof VertexProgramStrategy) {
((VertexProgramStrategy) traversalStrategy).addGraphComputerStrategies(clone);
@@ -149,7 +149,7 @@
public default TraversalSource withoutStrategies(final Class<? extends TraversalStrategy>... traversalStrategyClasses) {
final TraversalSource clone = this.clone();
clone.getStrategies().removeStrategies(traversalStrategyClasses);
- clone.getBytecode().addSource(TraversalSource.Symbols.withoutStrategies, traversalStrategyClasses);
+ clone.getGremlinLang().addSource(TraversalSource.Symbols.withoutStrategies, traversalStrategyClasses);
return clone;
}
@@ -197,7 +197,7 @@
public default <A> TraversalSource withSideEffect(final String key, final Supplier<A> initialValue, final BinaryOperator<A> reducer) {
final TraversalSource clone = this.clone();
SideEffectStrategy.addSideEffect(clone.getStrategies(), key, (A) initialValue, reducer);
- clone.getBytecode().addSource(TraversalSource.Symbols.withSideEffect, key, initialValue, reducer);
+ clone.getGremlinLang().addSource(TraversalSource.Symbols.withSideEffect, key, initialValue, reducer);
return clone;
}
@@ -213,7 +213,7 @@
public default <A> TraversalSource withSideEffect(final String key, final A initialValue, final BinaryOperator<A> reducer) {
final TraversalSource clone = this.clone();
SideEffectStrategy.addSideEffect(clone.getStrategies(), key, initialValue, reducer);
- clone.getBytecode().addSource(TraversalSource.Symbols.withSideEffect, key, initialValue, reducer);
+ clone.getGremlinLang().addSource(TraversalSource.Symbols.withSideEffect, key, initialValue, reducer);
return clone;
}
@@ -228,7 +228,7 @@
public default <A> TraversalSource withSideEffect(final String key, final Supplier<A> initialValue) {
final TraversalSource clone = this.clone();
SideEffectStrategy.addSideEffect(clone.getStrategies(), key, (A) initialValue, null);
- clone.getBytecode().addSource(TraversalSource.Symbols.withSideEffect, key, initialValue);
+ clone.getGremlinLang().addSource(TraversalSource.Symbols.withSideEffect, key, initialValue);
return clone;
}
@@ -243,7 +243,7 @@
public default <A> TraversalSource withSideEffect(final String key, final A initialValue) {
final TraversalSource clone = this.clone();
SideEffectStrategy.addSideEffect(clone.getStrategies(), key, initialValue, null);
- clone.getBytecode().addSource(TraversalSource.Symbols.withSideEffect, key, initialValue);
+ clone.getGremlinLang().addSource(TraversalSource.Symbols.withSideEffect, key, initialValue);
return clone;
}
@@ -259,7 +259,7 @@
public default <A> TraversalSource withSack(final Supplier<A> initialValue, final UnaryOperator<A> splitOperator, final BinaryOperator<A> mergeOperator) {
final TraversalSource clone = this.clone();
clone.getStrategies().addStrategies(SackStrategy.<A>build().initialValue(initialValue).splitOperator(splitOperator).mergeOperator(mergeOperator).create());
- clone.getBytecode().addSource(TraversalSource.Symbols.withSack, initialValue, splitOperator, mergeOperator);
+ clone.getGremlinLang().addSource(TraversalSource.Symbols.withSack, initialValue, splitOperator, mergeOperator);
return clone;
}
@@ -275,7 +275,7 @@
public default <A> TraversalSource withSack(final A initialValue, final UnaryOperator<A> splitOperator, final BinaryOperator<A> mergeOperator) {
final TraversalSource clone = this.clone();
clone.getStrategies().addStrategies(SackStrategy.<A>build().initialValue(new ConstantSupplier<>(initialValue)).splitOperator(splitOperator).mergeOperator(mergeOperator).create());
- clone.getBytecode().addSource(TraversalSource.Symbols.withSack, initialValue, splitOperator, mergeOperator);
+ clone.getGremlinLang().addSource(TraversalSource.Symbols.withSack, initialValue, splitOperator, mergeOperator);
return clone;
}
@@ -289,7 +289,7 @@
public default <A> TraversalSource withSack(final A initialValue) {
final TraversalSource clone = this.clone();
clone.getStrategies().addStrategies(SackStrategy.<A>build().initialValue(new ConstantSupplier<>(initialValue)).create());
- clone.getBytecode().addSource(TraversalSource.Symbols.withSack, initialValue);
+ clone.getGremlinLang().addSource(TraversalSource.Symbols.withSack, initialValue);
return clone;
}
@@ -303,7 +303,7 @@
public default <A> TraversalSource withSack(final Supplier<A> initialValue) {
final TraversalSource clone = this.clone();
clone.getStrategies().addStrategies(SackStrategy.<A>build().initialValue(initialValue).create());
- clone.getBytecode().addSource(TraversalSource.Symbols.withSack, initialValue);
+ clone.getGremlinLang().addSource(TraversalSource.Symbols.withSack, initialValue);
return clone;
}
@@ -318,7 +318,7 @@
public default <A> TraversalSource withSack(final Supplier<A> initialValue, final UnaryOperator<A> splitOperator) {
final TraversalSource clone = this.clone();
clone.getStrategies().addStrategies(SackStrategy.<A>build().initialValue(initialValue).splitOperator(splitOperator).create());
- clone.getBytecode().addSource(TraversalSource.Symbols.withSack, initialValue, splitOperator);
+ clone.getGremlinLang().addSource(TraversalSource.Symbols.withSack, initialValue, splitOperator);
return clone;
}
@@ -333,7 +333,7 @@
public default <A> TraversalSource withSack(final A initialValue, final UnaryOperator<A> splitOperator) {
final TraversalSource clone = this.clone();
clone.getStrategies().addStrategies(SackStrategy.<A>build().initialValue(new ConstantSupplier<>(initialValue)).splitOperator(splitOperator).create());
- clone.getBytecode().addSource(TraversalSource.Symbols.withSack, initialValue, splitOperator);
+ clone.getGremlinLang().addSource(TraversalSource.Symbols.withSack, initialValue, splitOperator);
return clone;
}
@@ -348,7 +348,7 @@
public default <A> TraversalSource withSack(final Supplier<A> initialValue, final BinaryOperator<A> mergeOperator) {
final TraversalSource clone = this.clone();
clone.getStrategies().addStrategies(SackStrategy.<A>build().initialValue(initialValue).mergeOperator(mergeOperator).create());
- clone.getBytecode().addSource(TraversalSource.Symbols.withSack, initialValue, mergeOperator);
+ clone.getGremlinLang().addSource(TraversalSource.Symbols.withSack, initialValue, mergeOperator);
return clone;
}
@@ -363,7 +363,7 @@
public default <A> TraversalSource withSack(final A initialValue, final BinaryOperator<A> mergeOperator) {
final TraversalSource clone = this.clone();
clone.getStrategies().addStrategies(SackStrategy.<A>build().initialValue(new ConstantSupplier<>(initialValue)).mergeOperator(mergeOperator).create());
- clone.getBytecode().addSource(TraversalSource.Symbols.withSack, initialValue, mergeOperator);
+ clone.getGremlinLang().addSource(TraversalSource.Symbols.withSack, initialValue, mergeOperator);
return clone;
}
@@ -373,7 +373,7 @@
/**
* The clone-method should be used to create immutable traversal sources with each call to a configuration "withXXX"-method.
- * The clone-method should clone the {@link Bytecode}, {@link TraversalStrategies}, mutate the cloned strategies accordingly,
+ * The clone-method should clone the {@link GremlinLang}, {@link TraversalStrategies}, mutate the cloned strategies accordingly,
* and then return the cloned traversal source leaving the original unaltered.
*
* @return the cloned traversal source
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
index cb70213..21e5c67 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
@@ -37,9 +37,9 @@
import org.apache.tinkerpop.gremlin.process.traversal.strategy.finalization.ProfileStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.finalization.ReferenceElementStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.AdjacentToIncidentStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.ByModulatorOptimizationStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.CountStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.EarlyLimitStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.ByModulatorOptimizationStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.FilterRankingStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.GValueReductionStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.IdentityRemovalStrategy;
@@ -61,8 +61,8 @@
import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalStrategies;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
import org.apache.tinkerpop.gremlin.util.MultiMap;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
import java.io.Serializable;
import java.util.ArrayList;
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 b7d50b6..a8620c2 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
@@ -191,6 +191,7 @@
import org.apache.tinkerpop.gremlin.process.traversal.step.map.VertexStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.AddPropertyStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.AggregateGlobalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.AggregateLocalStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.FailStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.GroupCountSideEffectStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.GroupSideEffectStep;
@@ -202,7 +203,6 @@
import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.SackValueStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.SideEffectCapStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.StartStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.AggregateLocalStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.SubgraphStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.TraversalSideEffectStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.TreeSideEffectStep;
@@ -290,7 +290,7 @@
* @since 3.0.0-incubating
*/
public default <E2> GraphTraversal<S, E2> map(final Function<Traverser<E>, E2> function) {
- this.asAdmin().getBytecode().addStep(Symbols.map, function);
+ this.asAdmin().getGremlinLang().addStep(Symbols.map, function);
return this.asAdmin().addStep(new LambdaMapStep<>(this.asAdmin(), function));
}
@@ -303,7 +303,7 @@
* @since 3.0.0-incubating
*/
public default <E2> GraphTraversal<S, E2> map(final Traversal<?, E2> mapTraversal) {
- this.asAdmin().getBytecode().addStep(Symbols.map, mapTraversal);
+ this.asAdmin().getGremlinLang().addStep(Symbols.map, mapTraversal);
return this.asAdmin().addStep(new TraversalMapStep<>(this.asAdmin(), mapTraversal));
}
@@ -318,7 +318,7 @@
* @since 3.0.0-incubating
*/
public default <E2> GraphTraversal<S, E2> flatMap(final Function<Traverser<E>, Iterator<E2>> function) {
- this.asAdmin().getBytecode().addStep(Symbols.flatMap, function);
+ this.asAdmin().getGremlinLang().addStep(Symbols.flatMap, function);
return this.asAdmin().addStep(new LambdaFlatMapStep<>(this.asAdmin(), function));
}
@@ -333,7 +333,7 @@
* @since 3.0.0-incubating
*/
public default <E2> GraphTraversal<S, E2> flatMap(final Traversal<?, E2> flatMapTraversal) {
- this.asAdmin().getBytecode().addStep(Symbols.flatMap, flatMapTraversal);
+ this.asAdmin().getGremlinLang().addStep(Symbols.flatMap, flatMapTraversal);
return this.asAdmin().addStep(new TraversalFlatMapStep<>(this.asAdmin(), flatMapTraversal));
}
@@ -345,7 +345,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, Object> id() {
- this.asAdmin().getBytecode().addStep(Symbols.id);
+ this.asAdmin().getGremlinLang().addStep(Symbols.id);
return this.asAdmin().addStep(new IdStep<>(this.asAdmin()));
}
@@ -357,7 +357,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, String> label() {
- this.asAdmin().getBytecode().addStep(Symbols.label);
+ this.asAdmin().getGremlinLang().addStep(Symbols.label);
return this.asAdmin().addStep(new LabelStep<>(this.asAdmin()));
}
@@ -368,7 +368,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, E> identity() {
- this.asAdmin().getBytecode().addStep(Symbols.identity);
+ this.asAdmin().getGremlinLang().addStep(Symbols.identity);
return this.asAdmin().addStep(new IdentityStep<>(this.asAdmin()));
}
@@ -380,7 +380,19 @@
* @since 3.0.0-incubating
*/
public default <E2> GraphTraversal<S, E2> constant(final E2 e) {
- this.asAdmin().getBytecode().addStep(Symbols.constant, e);
+ this.asAdmin().getGremlinLang().addStep(Symbols.constant, 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().getGremlinLang().addStep(GraphTraversal.Symbols.constant, e);
return this.asAdmin().addStep(new ConstantStep<E, E2>(this.asAdmin(), e));
}
@@ -395,7 +407,7 @@
public default GraphTraversal<S, Vertex> V(final Object... vertexIdsOrElements) {
// a single null is [null]
final Object[] ids = null == vertexIdsOrElements ? new Object[] { null } : vertexIdsOrElements;
- this.asAdmin().getBytecode().addStep(Symbols.V, ids);
+ this.asAdmin().getGremlinLang().addStep(Symbols.V, ids);
GraphStepContract<E, Vertex> step;
if (GValue.containsGValues(ids)) {
@@ -418,7 +430,7 @@
public default GraphTraversal<S, Edge> E(final Object... edgeIdsOrElements) {
// a single null is [null]
final Object[] ids = null == edgeIdsOrElements ? new Object[] { null } : edgeIdsOrElements;
- this.asAdmin().getBytecode().addStep(Symbols.E, ids);
+ this.asAdmin().getGremlinLang().addStep(Symbols.E, ids);
GraphStepContract<E, Edge> step;
if (GValue.containsGValues(ids)) {
@@ -452,7 +464,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, Vertex> to(final Direction direction, final String... edgeLabels) {
- this.asAdmin().getBytecode().addStep(Symbols.to, direction, edgeLabels);
+ this.asAdmin().getGremlinLang().addStep(Symbols.to, direction, edgeLabels);
return this.asAdmin().addStep(new VertexStep<>(this.asAdmin(), Vertex.class, direction, edgeLabels));
}
@@ -470,7 +482,7 @@
if (edgeLabels.length == 0) {
return to(direction);
}
- this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.to, direction, edgeLabels);
+ this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.to, direction, edgeLabels);
return this.asAdmin().addStep(new VertexStepPlaceholder<>(this.asAdmin(), Vertex.class, direction, edgeLabels));
}
@@ -494,7 +506,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, Vertex> out(final String... edgeLabels) {
- this.asAdmin().getBytecode().addStep(Symbols.out, edgeLabels);
+ this.asAdmin().getGremlinLang().addStep(Symbols.out, edgeLabels);
return this.asAdmin().addStep(new VertexStep<>(this.asAdmin(), Vertex.class, Direction.OUT, edgeLabels));
}
@@ -512,7 +524,7 @@
if (edgeLabels.length == 0) {
return out();
}
- this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.out, edgeLabels);
+ this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.out, edgeLabels);
return this.asAdmin().addStep(new VertexStepPlaceholder<>(this.asAdmin(), Vertex.class, Direction.OUT, edgeLabels));
}
@@ -537,7 +549,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, Vertex> in(final String... edgeLabels) {
- this.asAdmin().getBytecode().addStep(Symbols.in, edgeLabels);
+ this.asAdmin().getGremlinLang().addStep(Symbols.in, edgeLabels);
return this.asAdmin().addStep(new VertexStep<>(this.asAdmin(), Vertex.class, Direction.IN, edgeLabels));
}
@@ -554,7 +566,7 @@
if (edgeLabels.length == 0) {
return in();
}
- this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.in, edgeLabels);
+ this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.in, edgeLabels);
return this.asAdmin().addStep(new VertexStepPlaceholder<>(this.asAdmin(), Vertex.class, Direction.IN, edgeLabels));
}
@@ -578,7 +590,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, Vertex> both(final String... edgeLabels) {
- this.asAdmin().getBytecode().addStep(Symbols.both, edgeLabels);
+ this.asAdmin().getGremlinLang().addStep(Symbols.both, edgeLabels);
return this.asAdmin().addStep(new VertexStep<>(this.asAdmin(), Vertex.class, Direction.BOTH, edgeLabels));
}
@@ -595,7 +607,7 @@
if (edgeLabels.length == 0) {
return both();
}
- this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.both, edgeLabels);
+ this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.both, edgeLabels);
return this.asAdmin().addStep(new VertexStepPlaceholder<>(this.asAdmin(), Vertex.class, Direction.BOTH, edgeLabels));
}
@@ -621,7 +633,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, Edge> toE(final Direction direction, final String... edgeLabels) {
- this.asAdmin().getBytecode().addStep(Symbols.toE, direction, edgeLabels);
+ this.asAdmin().getGremlinLang().addStep(Symbols.toE, direction, edgeLabels);
return this.asAdmin().addStep(new VertexStep<>(this.asAdmin(), Edge.class, direction, edgeLabels));
}
@@ -640,7 +652,7 @@
if (edgeLabels.length == 0) {
return toE(direction);
}
- this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.toE, direction, edgeLabels);
+ this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.toE, direction, edgeLabels);
return this.asAdmin().addStep(new VertexStepPlaceholder<>(this.asAdmin(), Edge.class, direction, edgeLabels));
}
@@ -664,7 +676,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, Edge> outE(final String... edgeLabels) {
- this.asAdmin().getBytecode().addStep(Symbols.outE, edgeLabels);
+ this.asAdmin().getGremlinLang().addStep(Symbols.outE, edgeLabels);
return this.asAdmin().addStep(new VertexStep<>(this.asAdmin(), Edge.class, Direction.OUT, edgeLabels));
}
@@ -681,7 +693,7 @@
if (edgeLabels.length == 0) {
return outE();
}
- this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.outE, edgeLabels);
+ this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.outE, edgeLabels);
return this.asAdmin().addStep(new VertexStepPlaceholder<>(this.asAdmin(), Edge.class, Direction.OUT, edgeLabels));
}
@@ -705,7 +717,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, Edge> inE(final String... edgeLabels) {
- this.asAdmin().getBytecode().addStep(Symbols.inE, edgeLabels);
+ this.asAdmin().getGremlinLang().addStep(Symbols.inE, edgeLabels);
return this.asAdmin().addStep(new VertexStep<>(this.asAdmin(), Edge.class, Direction.IN, edgeLabels));
}
@@ -723,7 +735,7 @@
if (edgeLabels.length == 0) {
return inE();
}
- this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.inE, edgeLabels);
+ this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.inE, edgeLabels);
return this.asAdmin().addStep(new VertexStepPlaceholder<>(this.asAdmin(), Edge.class, Direction.IN, edgeLabels));
}
@@ -747,7 +759,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, Edge> bothE(final String... edgeLabels) {
- this.asAdmin().getBytecode().addStep(Symbols.bothE, edgeLabels);
+ this.asAdmin().getGremlinLang().addStep(Symbols.bothE, edgeLabels);
return this.asAdmin().addStep(new VertexStep<>(this.asAdmin(), Edge.class, Direction.BOTH, edgeLabels));
}
@@ -764,7 +776,7 @@
if (edgeLabels.length == 0) {
return bothE();
}
- this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.bothE, edgeLabels);
+ this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.bothE, edgeLabels);
return this.asAdmin().addStep(new VertexStepPlaceholder<>(this.asAdmin(), Edge.class, Direction.BOTH, edgeLabels));
}
@@ -777,7 +789,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, Vertex> toV(final Direction direction) {
- this.asAdmin().getBytecode().addStep(Symbols.toV, direction);
+ this.asAdmin().getGremlinLang().addStep(Symbols.toV, direction);
return this.asAdmin().addStep(new EdgeVertexStep(this.asAdmin(), direction));
}
@@ -789,7 +801,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, Vertex> inV() {
- this.asAdmin().getBytecode().addStep(Symbols.inV);
+ this.asAdmin().getGremlinLang().addStep(Symbols.inV);
return this.asAdmin().addStep(new EdgeVertexStep(this.asAdmin(), Direction.IN));
}
@@ -801,7 +813,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, Vertex> outV() {
- this.asAdmin().getBytecode().addStep(Symbols.outV);
+ this.asAdmin().getGremlinLang().addStep(Symbols.outV);
return this.asAdmin().addStep(new EdgeVertexStep(this.asAdmin(), Direction.OUT));
}
@@ -813,7 +825,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, Vertex> bothV() {
- this.asAdmin().getBytecode().addStep(Symbols.bothV);
+ this.asAdmin().getGremlinLang().addStep(Symbols.bothV);
return this.asAdmin().addStep(new EdgeVertexStep(this.asAdmin(), Direction.BOTH));
}
@@ -825,7 +837,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, Vertex> otherV() {
- this.asAdmin().getBytecode().addStep(Symbols.otherV);
+ this.asAdmin().getGremlinLang().addStep(Symbols.otherV);
return this.asAdmin().addStep(new EdgeOtherVertexStep(this.asAdmin()));
}
@@ -837,7 +849,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, E> order() {
- this.asAdmin().getBytecode().addStep(Symbols.order);
+ this.asAdmin().getGremlinLang().addStep(Symbols.order);
return this.asAdmin().addStep(new OrderGlobalStep<>(this.asAdmin()));
}
@@ -850,7 +862,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, E> order(final Scope scope) {
- this.asAdmin().getBytecode().addStep(Symbols.order, scope);
+ this.asAdmin().getGremlinLang().addStep(Symbols.order, scope);
return this.asAdmin().addStep(scope.equals(Scope.global) ? new OrderGlobalStep<>(this.asAdmin()) : new OrderLocalStep<>(this.asAdmin()));
}
@@ -865,7 +877,7 @@
* @since 3.0.0-incubating
*/
public default <E2> GraphTraversal<S, ? extends Property<E2>> properties(final String... propertyKeys) {
- this.asAdmin().getBytecode().addStep(Symbols.properties, propertyKeys);
+ this.asAdmin().getGremlinLang().addStep(Symbols.properties, propertyKeys);
return this.asAdmin().addStep(new PropertiesStep<>(this.asAdmin(), PropertyType.PROPERTY, propertyKeys));
}
@@ -880,7 +892,7 @@
* @since 3.0.0-incubating
*/
public default <E2> GraphTraversal<S, E2> values(final String... propertyKeys) {
- this.asAdmin().getBytecode().addStep(Symbols.values, propertyKeys);
+ this.asAdmin().getGremlinLang().addStep(Symbols.values, propertyKeys);
return this.asAdmin().addStep(new PropertiesStep<>(this.asAdmin(), PropertyType.VALUE, propertyKeys));
}
@@ -895,7 +907,7 @@
* @since 3.0.0-incubating
*/
public default <E2> GraphTraversal<S, Map<String, E2>> propertyMap(final String... propertyKeys) {
- this.asAdmin().getBytecode().addStep(Symbols.propertyMap, propertyKeys);
+ this.asAdmin().getGremlinLang().addStep(Symbols.propertyMap, propertyKeys);
return this.asAdmin().addStep(new PropertyMapStep<>(this.asAdmin(), WithOptions.none, PropertyType.PROPERTY, propertyKeys));
}
@@ -914,7 +926,7 @@
* @since 3.4.4
*/
public default <E2> GraphTraversal<S, Map<Object, E2>> elementMap(final String... propertyKeys) {
- this.asAdmin().getBytecode().addStep(Symbols.elementMap, propertyKeys);
+ this.asAdmin().getGremlinLang().addStep(Symbols.elementMap, propertyKeys);
return this.asAdmin().addStep(new ElementMapStep<>(this.asAdmin(), propertyKeys));
}
@@ -929,7 +941,7 @@
* @since 3.0.0-incubating
*/
public default <E2> GraphTraversal<S, Map<Object, E2>> valueMap(final String... propertyKeys) {
- this.asAdmin().getBytecode().addStep(Symbols.valueMap, propertyKeys);
+ this.asAdmin().getGremlinLang().addStep(Symbols.valueMap, propertyKeys);
return this.asAdmin().addStep(new PropertyMapStep<>(this.asAdmin(), WithOptions.none, PropertyType.VALUE, propertyKeys));
}
@@ -948,7 +960,7 @@
*/
@Deprecated
public default <E2> GraphTraversal<S, Map<Object, E2>> valueMap(final boolean includeTokens, final String... propertyKeys) {
- this.asAdmin().getBytecode().addStep(Symbols.valueMap, includeTokens, propertyKeys);
+ this.asAdmin().getGremlinLang().addStep(Symbols.valueMap, includeTokens, propertyKeys);
return this.asAdmin().addStep(new PropertyMapStep<>(this.asAdmin(), WithOptions.all, PropertyType.VALUE, propertyKeys));
}
@@ -960,7 +972,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, String> key() {
- this.asAdmin().getBytecode().addStep(Symbols.key);
+ this.asAdmin().getGremlinLang().addStep(Symbols.key);
return this.asAdmin().addStep(new PropertyKeyStep(this.asAdmin()));
}
@@ -972,7 +984,7 @@
* @since 3.0.0-incubating
*/
public default <E2> GraphTraversal<S, E2> value() {
- this.asAdmin().getBytecode().addStep(Symbols.value);
+ this.asAdmin().getGremlinLang().addStep(Symbols.value);
return this.asAdmin().addStep(new PropertyValueStep<>(this.asAdmin()));
}
@@ -984,7 +996,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, Path> path() {
- this.asAdmin().getBytecode().addStep(Symbols.path);
+ this.asAdmin().getGremlinLang().addStep(Symbols.path);
return this.asAdmin().addStep(new PathStep<>(this.asAdmin()));
}
@@ -998,7 +1010,7 @@
* @since 3.0.0-incubating
*/
public default <E2> GraphTraversal<S, Map<String, E2>> match(final Traversal<?, ?>... matchTraversals) {
- this.asAdmin().getBytecode().addStep(Symbols.match, matchTraversals);
+ this.asAdmin().getGremlinLang().addStep(Symbols.match, matchTraversals);
return this.asAdmin().addStep(new MatchStep<>(this.asAdmin(), ConnectiveStep.Connective.AND, matchTraversals));
}
@@ -1011,7 +1023,7 @@
* @since 3.0.0-incubating
*/
public default <E2> GraphTraversal<S, E2> sack() {
- this.asAdmin().getBytecode().addStep(Symbols.sack);
+ this.asAdmin().getGremlinLang().addStep(Symbols.sack);
return this.asAdmin().addStep(new SackStep<>(this.asAdmin()));
}
@@ -1024,7 +1036,7 @@
* @since 3.1.0-incubating
*/
public default GraphTraversal<S, Integer> loops() {
- this.asAdmin().getBytecode().addStep(Symbols.loops);
+ this.asAdmin().getGremlinLang().addStep(Symbols.loops);
return this.asAdmin().addStep(new LoopsStep<>(this.asAdmin(), null));
}
@@ -1037,7 +1049,7 @@
* @since 3.4.0
*/
public default GraphTraversal<S, Integer> loops(final String loopName) {
- this.asAdmin().getBytecode().addStep(Symbols.loops, loopName);
+ this.asAdmin().getGremlinLang().addStep(Symbols.loops, loopName);
return this.asAdmin().addStep(new LoopsStep<>(this.asAdmin(), loopName));
}
@@ -1052,7 +1064,7 @@
final String[] projectKeys = new String[otherProjectKeys.length + 1];
projectKeys[0] = projectKey;
System.arraycopy(otherProjectKeys, 0, projectKeys, 1, otherProjectKeys.length);
- this.asAdmin().getBytecode().addStep(Symbols.project, projectKey, otherProjectKeys);
+ this.asAdmin().getGremlinLang().addStep(Symbols.project, projectKey, otherProjectKeys);
return this.asAdmin().addStep(new ProjectStep<>(this.asAdmin(), projectKeys));
}
@@ -1073,7 +1085,7 @@
selectKeys[0] = selectKey1;
selectKeys[1] = selectKey2;
System.arraycopy(otherSelectKeys, 0, selectKeys, 2, otherSelectKeys.length);
- this.asAdmin().getBytecode().addStep(Symbols.select, pop, selectKey1, selectKey2, otherSelectKeys);
+ this.asAdmin().getGremlinLang().addStep(Symbols.select, pop, selectKey1, selectKey2, otherSelectKeys);
return this.asAdmin().addStep(new SelectStep<>(this.asAdmin(), pop, selectKeys));
}
@@ -1093,7 +1105,7 @@
selectKeys[0] = selectKey1;
selectKeys[1] = selectKey2;
System.arraycopy(otherSelectKeys, 0, selectKeys, 2, otherSelectKeys.length);
- this.asAdmin().getBytecode().addStep(Symbols.select, selectKey1, selectKey2, otherSelectKeys);
+ this.asAdmin().getGremlinLang().addStep(Symbols.select, selectKey1, selectKey2, otherSelectKeys);
return this.asAdmin().addStep(new SelectStep<>(this.asAdmin(), Pop.last, selectKeys));
}
@@ -1107,7 +1119,7 @@
* @since 3.0.0-incubating
*/
public default <E2> GraphTraversal<S, E2> select(final Pop pop, final String selectKey) {
- this.asAdmin().getBytecode().addStep(Symbols.select, pop, selectKey);
+ this.asAdmin().getGremlinLang().addStep(Symbols.select, pop, selectKey);
return this.asAdmin().addStep(new SelectOneStep<>(this.asAdmin(), pop, selectKey));
}
@@ -1122,7 +1134,7 @@
* @since 3.0.0-incubating
*/
public default <E2> GraphTraversal<S, E2> select(final String selectKey) {
- this.asAdmin().getBytecode().addStep(Symbols.select, selectKey);
+ this.asAdmin().getGremlinLang().addStep(Symbols.select, selectKey);
return this.asAdmin().addStep(new SelectOneStep<>(this.asAdmin(), Pop.last, selectKey));
}
@@ -1136,7 +1148,7 @@
* @since 3.3.3
*/
public default <E2> GraphTraversal<S, E2> select(final Pop pop, final Traversal<S, E2> keyTraversal) {
- this.asAdmin().getBytecode().addStep(Symbols.select, pop, keyTraversal);
+ this.asAdmin().getGremlinLang().addStep(Symbols.select, pop, keyTraversal);
return this.asAdmin().addStep(new TraversalSelectStep<>(this.asAdmin(), pop, keyTraversal));
}
@@ -1151,7 +1163,7 @@
* @since 3.3.3
*/
public default <E2> GraphTraversal<S, E2> select(final Traversal<S, E2> keyTraversal) {
- this.asAdmin().getBytecode().addStep(Symbols.select, keyTraversal);
+ this.asAdmin().getGremlinLang().addStep(Symbols.select, keyTraversal);
return this.asAdmin().addStep(new TraversalSelectStep<>(this.asAdmin(), null, keyTraversal));
}
@@ -1164,7 +1176,7 @@
* @since 3.1.0-incubating
*/
public default <E2> GraphTraversal<S, Collection<E2>> select(final Column column) {
- this.asAdmin().getBytecode().addStep(Symbols.select, column);
+ this.asAdmin().getGremlinLang().addStep(Symbols.select, column);
return this.asAdmin().addStep(new TraversalMapStep<>(this.asAdmin(), new ColumnTraversal(column)));
}
@@ -1177,7 +1189,7 @@
* @since 3.0.0-incubating
*/
public default <E2> GraphTraversal<S, E2> unfold() {
- this.asAdmin().getBytecode().addStep(Symbols.unfold);
+ this.asAdmin().getGremlinLang().addStep(Symbols.unfold);
return this.asAdmin().addStep(new UnfoldStep<>(this.asAdmin()));
}
@@ -1189,7 +1201,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, List<E>> fold() {
- this.asAdmin().getBytecode().addStep(Symbols.fold);
+ this.asAdmin().getGremlinLang().addStep(Symbols.fold);
return this.asAdmin().addStep(new FoldStep<>(this.asAdmin()));
}
@@ -1204,7 +1216,7 @@
* @since 3.0.0-incubating
*/
public default <E2> GraphTraversal<S, E2> fold(final E2 seed, final BiFunction<E2, E, E2> foldFunction) {
- this.asAdmin().getBytecode().addStep(Symbols.fold, seed, foldFunction);
+ this.asAdmin().getGremlinLang().addStep(Symbols.fold, seed, foldFunction);
return this.asAdmin().addStep(new FoldStep<>(this.asAdmin(), new ConstantSupplier<>(seed), foldFunction));
}
@@ -1217,7 +1229,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, Long> count() {
- this.asAdmin().getBytecode().addStep(Symbols.count);
+ this.asAdmin().getGremlinLang().addStep(Symbols.count);
return this.asAdmin().addStep(new CountGlobalStep<>(this.asAdmin()));
}
@@ -1230,7 +1242,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, Long> count(final Scope scope) {
- this.asAdmin().getBytecode().addStep(Symbols.count, scope);
+ this.asAdmin().getGremlinLang().addStep(Symbols.count, scope);
return this.asAdmin().addStep(scope.equals(Scope.global) ? new CountGlobalStep<>(this.asAdmin()) : new CountLocalStep<>(this.asAdmin()));
}
@@ -1243,7 +1255,7 @@
* @since 3.0.0-incubating
*/
public default <E2 extends Number> GraphTraversal<S, E2> sum() {
- this.asAdmin().getBytecode().addStep(Symbols.sum);
+ this.asAdmin().getGremlinLang().addStep(Symbols.sum);
return this.asAdmin().addStep(new SumGlobalStep<>(this.asAdmin()));
}
@@ -1256,7 +1268,7 @@
* @since 3.0.0-incubating
*/
public default <E2 extends Number> GraphTraversal<S, E2> sum(final Scope scope) {
- this.asAdmin().getBytecode().addStep(Symbols.sum, scope);
+ this.asAdmin().getGremlinLang().addStep(Symbols.sum, scope);
return this.asAdmin().addStep(scope.equals(Scope.global) ? new SumGlobalStep<>(this.asAdmin()) : new SumLocalStep<>(this.asAdmin()));
}
@@ -1268,7 +1280,7 @@
* @since 3.0.0-incubating
*/
public default <E2 extends Comparable> GraphTraversal<S, E2> max() {
- this.asAdmin().getBytecode().addStep(Symbols.max);
+ this.asAdmin().getGremlinLang().addStep(Symbols.max);
return this.asAdmin().addStep(new MaxGlobalStep<>(this.asAdmin()));
}
@@ -1280,7 +1292,7 @@
* @since 3.0.0-incubating
*/
public default <E2 extends Comparable> GraphTraversal<S, E2> max(final Scope scope) {
- this.asAdmin().getBytecode().addStep(Symbols.max, scope);
+ this.asAdmin().getGremlinLang().addStep(Symbols.max, scope);
return this.asAdmin().addStep(scope.equals(Scope.global) ? new MaxGlobalStep<>(this.asAdmin()) : new MaxLocalStep<>(this.asAdmin()));
}
@@ -1292,7 +1304,7 @@
* @since 3.0.0-incubating
*/
public default <E2 extends Comparable> GraphTraversal<S, E2> min() {
- this.asAdmin().getBytecode().addStep(Symbols.min);
+ this.asAdmin().getGremlinLang().addStep(Symbols.min);
return this.asAdmin().addStep(new MinGlobalStep<>(this.asAdmin()));
}
@@ -1304,7 +1316,7 @@
* @since 3.0.0-incubating
*/
public default <E2 extends Comparable> GraphTraversal<S, E2> min(final Scope scope) {
- this.asAdmin().getBytecode().addStep(Symbols.min, scope);
+ this.asAdmin().getGremlinLang().addStep(Symbols.min, scope);
return this.asAdmin().addStep(scope.equals(Scope.global) ? new MinGlobalStep<E2>(this.asAdmin()) : new MinLocalStep<>(this.asAdmin()));
}
@@ -1316,7 +1328,7 @@
* @since 3.0.0-incubating
*/
public default <E2 extends Number> GraphTraversal<S, E2> mean() {
- this.asAdmin().getBytecode().addStep(Symbols.mean);
+ this.asAdmin().getGremlinLang().addStep(Symbols.mean);
return this.asAdmin().addStep(new MeanGlobalStep<>(this.asAdmin()));
}
@@ -1328,7 +1340,7 @@
* @since 3.0.0-incubating
*/
public default <E2 extends Number> GraphTraversal<S, E2> mean(final Scope scope) {
- this.asAdmin().getBytecode().addStep(Symbols.mean, scope);
+ this.asAdmin().getGremlinLang().addStep(Symbols.mean, scope);
return this.asAdmin().addStep(scope.equals(Scope.global) ? new MeanGlobalStep(this.asAdmin()) : new MeanLocalStep(this.asAdmin()));
}
@@ -1341,7 +1353,7 @@
* @since 3.1.0-incubating
*/
public default <K, V> GraphTraversal<S, Map<K, V>> group() {
- this.asAdmin().getBytecode().addStep(Symbols.group);
+ this.asAdmin().getGremlinLang().addStep(Symbols.group);
return this.asAdmin().addStep(new GroupStep<>(this.asAdmin()));
}
@@ -1354,7 +1366,7 @@
* @since 3.0.0-incubating
*/
public default <K> GraphTraversal<S, Map<K, Long>> groupCount() {
- this.asAdmin().getBytecode().addStep(Symbols.groupCount);
+ this.asAdmin().getGremlinLang().addStep(Symbols.groupCount);
return this.asAdmin().addStep(new GroupCountStep<>(this.asAdmin()));
}
@@ -1366,7 +1378,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, Tree> tree() {
- this.asAdmin().getBytecode().addStep(Symbols.tree);
+ this.asAdmin().getGremlinLang().addStep(Symbols.tree);
return this.asAdmin().addStep(new TreeStep<>(this.asAdmin()));
}
@@ -1380,7 +1392,7 @@
*/
public default GraphTraversal<S, Vertex> addV(final String vertexLabel) {
if (null == vertexLabel) throw new IllegalArgumentException("vertexLabel cannot be null");
- this.asAdmin().getBytecode().addStep(Symbols.addV, vertexLabel);
+ this.asAdmin().getGremlinLang().addStep(Symbols.addV, vertexLabel);
return this.asAdmin().addStep(new AddVertexStepPlaceholder<>(this.asAdmin(), vertexLabel));
}
@@ -1393,7 +1405,7 @@
*/
public default GraphTraversal<S, Vertex> addV(final Traversal<?, String> vertexLabelTraversal) {
if (null == vertexLabelTraversal) throw new IllegalArgumentException("vertexLabelTraversal cannot be null");
- this.asAdmin().getBytecode().addStep(Symbols.addV, vertexLabelTraversal);
+ this.asAdmin().getGremlinLang().addStep(Symbols.addV, vertexLabelTraversal);
return this.asAdmin().addStep(new AddVertexStepPlaceholder<>(this.asAdmin(), vertexLabelTraversal.asAdmin()));
}
@@ -1407,7 +1419,7 @@
*/
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 AddVertexStepPlaceholder<>(this.asAdmin(), vertexLabel));
}
@@ -1419,7 +1431,7 @@
* @since 3.1.0-incubating
*/
public default GraphTraversal<S, Vertex> addV() {
- this.asAdmin().getBytecode().addStep(Symbols.addV);
+ this.asAdmin().getGremlinLang().addStep(Symbols.addV);
return this.asAdmin().addStep(new AddVertexStep<>(this.asAdmin(), (String) null));
}
@@ -1432,7 +1444,7 @@
* @since 3.6.0
*/
public default GraphTraversal<S, Vertex> mergeV() {
- this.asAdmin().getBytecode().addStep(Symbols.mergeV);
+ this.asAdmin().getGremlinLang().addStep(Symbols.mergeV);
return this.asAdmin().addStep(new MergeVertexStepPlaceholder<>(this.asAdmin(), false));
}
@@ -1446,7 +1458,7 @@
* @since 3.6.0
*/
public default GraphTraversal<S, Vertex> mergeV(final Map<Object, Object> searchCreate) {
- this.asAdmin().getBytecode().addStep(Symbols.mergeV, searchCreate);
+ this.asAdmin().getGremlinLang().addStep(Symbols.mergeV, searchCreate);
return this.asAdmin().addStep(new MergeVertexStepPlaceholder<>(this.asAdmin(), false, searchCreate));
}
@@ -1461,7 +1473,7 @@
* @since 3.6.0
*/
public default GraphTraversal<S, Vertex> mergeV(final Traversal<?, Map<Object, Object>> searchCreate) {
- this.asAdmin().getBytecode().addStep(Symbols.mergeV, searchCreate);
+ this.asAdmin().getGremlinLang().addStep(Symbols.mergeV, searchCreate);
final MergeVertexStepPlaceholder<S> step = null == searchCreate ? new MergeVertexStepPlaceholder<>(this.asAdmin(), false, (Map) null) :
new MergeVertexStepPlaceholder<>(this.asAdmin(), false, searchCreate.asAdmin());
return this.asAdmin().addStep(step);
@@ -1477,7 +1489,7 @@
* @since 3.8.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 MergeVertexStepPlaceholder<S> step = null == searchCreate ? new MergeVertexStepPlaceholder<>(this.asAdmin(), false, (Map) null) :
new MergeVertexStepPlaceholder<>(this.asAdmin(), false, searchCreate);
return this.asAdmin().addStep(step);
@@ -1490,7 +1502,7 @@
* @since 3.6.0
*/
public default GraphTraversal<S, Edge> mergeE() {
- this.asAdmin().getBytecode().addStep(Symbols.mergeE);
+ this.asAdmin().getGremlinLang().addStep(Symbols.mergeE);
final MergeEdgeStepPlaceholder<S> step = new MergeEdgeStepPlaceholder<>(this.asAdmin(), false);
return this.asAdmin().addStep(step);
}
@@ -1504,7 +1516,7 @@
*/
public default GraphTraversal<S, Edge> mergeE(final Map<Object, Object> searchCreate) {
// get a construction time exception if the Map is bad
- this.asAdmin().getBytecode().addStep(Symbols.mergeE, searchCreate);
+ this.asAdmin().getGremlinLang().addStep(Symbols.mergeE, searchCreate);
final MergeEdgeStepPlaceholder<S> step = new MergeEdgeStepPlaceholder<>(this.asAdmin(), false, searchCreate);
return this.asAdmin().addStep(step);
}
@@ -1517,7 +1529,7 @@
* @since 3.6.0
*/
public default GraphTraversal<S, Edge> mergeE(final Traversal<?, Map<Object, Object>> searchCreate) {
- this.asAdmin().getBytecode().addStep(Symbols.mergeE, searchCreate);
+ this.asAdmin().getGremlinLang().addStep(Symbols.mergeE, searchCreate);
final MergeEdgeStepPlaceholder<S> step = null == searchCreate ? new MergeEdgeStepPlaceholder<>(this.asAdmin(), false, (Map) null) :
new MergeEdgeStepPlaceholder<>(this.asAdmin(), false, searchCreate.asAdmin());
@@ -1533,7 +1545,7 @@
*/
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 MergeEdgeStepPlaceholder<S> step = null == searchCreate ? new MergeEdgeStepPlaceholder<>(this.asAdmin(), false, (Map) null) :
new MergeEdgeStepPlaceholder<>(this.asAdmin(), false, searchCreate);
return this.asAdmin().addStep(step);
@@ -1548,7 +1560,7 @@
* @since 3.1.0-incubating
*/
public default GraphTraversal<S, Edge> addE(final String edgeLabel) {
- this.asAdmin().getBytecode().addStep(Symbols.addE, edgeLabel);
+ this.asAdmin().getGremlinLang().addStep(Symbols.addE, edgeLabel);
// Use AddEdgeStepGValueContract even if label is not GValue in case `from(), `to()`, or `property()` steps with GValue are merged in.
return this.asAdmin().addStep(new AddEdgeStepPlaceholder<>(this.asAdmin(), edgeLabel));
}
@@ -1561,7 +1573,7 @@
* @since 3.3.1
*/
public default GraphTraversal<S, Edge> addE(final Traversal<?, String> edgeLabelTraversal) {
- this.asAdmin().getBytecode().addStep(Symbols.addE, edgeLabelTraversal);
+ this.asAdmin().getGremlinLang().addStep(Symbols.addE, edgeLabelTraversal);
// Use AddEdgeStepGValueContract even if label is not GValue in case `from(), `to()`, or `property()` steps with GValue are merged in.
return this.asAdmin().addStep(new AddEdgeStepPlaceholder<>(this.asAdmin(), null == edgeLabelTraversal ? null : edgeLabelTraversal.asAdmin()));
}
@@ -1575,7 +1587,7 @@
* @since 3.8.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);
AddEdgeStepPlaceholder<Edge> step = new AddEdgeStepPlaceholder<>(this.asAdmin(), edgeLabel);
return this.asAdmin().addStep(step);
}
@@ -1594,7 +1606,7 @@
throw new IllegalArgumentException(String.format(
"The from() step cannot follow %s", prev.getClass().getSimpleName()));
- this.asAdmin().getBytecode().addStep(Symbols.from, fromStepLabel);
+ this.asAdmin().getGremlinLang().addStep(Symbols.from, fromStepLabel);
((FromToModulating) prev).addFrom(fromStepLabel);
return this;
}
@@ -1614,7 +1626,7 @@
throw new IllegalArgumentException(String.format(
"The from() step cannot follow %s", prev.getClass().getSimpleName()));
- this.asAdmin().getBytecode().addStep(Symbols.from, fromVertex);
+ this.asAdmin().getGremlinLang().addStep(Symbols.from, fromVertex);
((FromToModulating) prev).addFrom(new GValueConstantTraversal<S, Vertex>(fromVertex));
return this;
}
@@ -1634,71 +1646,12 @@
throw new IllegalArgumentException(String.format(
"The from() step cannot follow %s", prev.getClass().getSimpleName()));
- this.asAdmin().getBytecode().addStep(Symbols.from, fromVertex);
+ this.asAdmin().getGremlinLang().addStep(Symbols.from, fromVertex);
((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;
- }
-
- /**
- * 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.8.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(Symbols.to, toVertex);
- ((FromToModulating) prev).addTo(new GValueConstantTraversal<S, Vertex>(toVertex));
- 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 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<?, Object> 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(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
* outgoing vertex of the newly added {@link Edge}.
*
@@ -1713,7 +1666,7 @@
throw new IllegalArgumentException(String.format(
"The from() step cannot follow %s", prev.getClass().getSimpleName()));
- this.asAdmin().getBytecode().addStep(Symbols.from, fromVertex);
+ this.asAdmin().getGremlinLang().addStep(Symbols.from, fromVertex);
((FromToModulating) prev).addFrom(fromVertex.asAdmin());
return this;
}
@@ -1725,24 +1678,16 @@
* @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 3.8.0
*/
- public default GraphTraversal<S, E> to(final Object toVertex) {
- if (toVertex instanceof String) {
- return this.to((String) toVertex);
- } else if (toVertex instanceof Traversal) {
- this.to((Traversal<?, Object>)toVertex);
- return this;
- }
+ 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(Symbols.to, toVertex);
- ((FromToModulating) prev).addTo(toVertex instanceof GValue ?
- new GValueConstantTraversal<>((GValue<Object>) toVertex) :
- __.constant(toVertex).asAdmin());
+
+ this.asAdmin().getGremlinLang().addStep(Symbols.to, toVertex);
+ ((FromToModulating) prev).addTo(new GValueConstantTraversal<S, Vertex>(toVertex));
return this;
}
@@ -1750,16 +1695,16 @@
* 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
+ * @param fromVertexOrId 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.3.0
*/
- public default GraphTraversal<S, E> from(final Object fromVertex) {
- if (fromVertex instanceof String) {
- return this.from((String) fromVertex);
- } else if (fromVertex instanceof Traversal) {
- this.from((Traversal<?, Object>)fromVertex);
+ public default GraphTraversal<S, E> from(final Object fromVertexOrId) {
+ if (fromVertexOrId instanceof String) {
+ return this.from((String) fromVertexOrId);
+ } else if (fromVertexOrId instanceof Traversal) {
+ this.from((Traversal<?, Object>)fromVertexOrId);
return this;
}
final Step<?,?> prev = this.asAdmin().getEndStep();
@@ -1767,10 +1712,79 @@
throw new IllegalArgumentException(String.format(
"The from() step cannot follow %s", prev.getClass().getSimpleName()));
- this.asAdmin().getBytecode().addStep(Symbols.from, fromVertex);
- ((FromToModulating) prev).addFrom(fromVertex instanceof GValue ?
- new GValueConstantTraversal<>((GValue<Object>) fromVertex) :
- __.constant(fromVertex).asAdmin());
+ // Convert vertex to id for the purposes of GremlinLang
+ Object fromId = fromVertexOrId instanceof Vertex ? ((Vertex) fromVertexOrId).id() : fromVertexOrId;
+ this.asAdmin().getGremlinLang().addStep(Symbols.from, fromId);
+ ((FromToModulating) prev).addFrom(fromVertexOrId instanceof GValue ?
+ new GValueConstantTraversal<>((GValue<Object>) fromVertexOrId) :
+ __.constant(fromVertexOrId).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().getGremlinLang().addStep(Symbols.to, toStepLabel);
+ ((FromToModulating) prev).addTo(toStepLabel);
+ 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 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<?, Object> 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 toVertexOrId 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> to(final Object toVertexOrId) {
+ if (toVertexOrId instanceof String) {
+ return this.to((String) toVertexOrId);
+ } else if (toVertexOrId instanceof Traversal) {
+ this.to((Traversal<?, Object>)toVertexOrId);
+ return this;
+ }
+ 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, toVertexOrId);
+ ((FromToModulating) prev).addTo(toVertexOrId instanceof GValue ?
+ new GValueConstantTraversal<>((GValue<Object>) toVertexOrId) :
+ __.constant(toVertexOrId).asAdmin());
return this;
}
@@ -1782,7 +1796,7 @@
* @since 3.3.1
*/
public default GraphTraversal<S, Double> math(final String expression) {
- this.asAdmin().getBytecode().addStep(Symbols.math, expression);
+ this.asAdmin().getGremlinLang().addStep(Symbols.math, expression);
return this.asAdmin().addStep(new MathStep<>(this.asAdmin(), expression));
}
@@ -1794,7 +1808,7 @@
* @since 3.6.0
*/
default GraphTraversal<S, Element> element() {
- this.asAdmin().getBytecode().addStep(Symbols.element);
+ this.asAdmin().getGremlinLang().addStep(Symbols.element);
return this.asAdmin().addStep(new ElementStep<>(this.asAdmin()));
}
@@ -1807,7 +1821,7 @@
* @since 3.6.0
*/
default <E> GraphTraversal<S, E> call(final String service) {
- this.asAdmin().getBytecode().addStep(Symbols.call, service);
+ this.asAdmin().getGremlinLang().addStep(Symbols.call, service);
final CallStep<S,E> call = new CallStep<>(this.asAdmin(), false, service);
return this.asAdmin().addStep(call);
}
@@ -1822,7 +1836,7 @@
* @since 3.6.0
*/
default <E> GraphTraversal<S, E> call(final String service, final Map params) {
- this.asAdmin().getBytecode().addStep(Symbols.call, service, params);
+ this.asAdmin().getGremlinLang().addStep(Symbols.call, service, params);
final CallStep<S,E> call = new CallStep<>(this.asAdmin(), false, service, params);
return this.asAdmin().addStep(call);
}
@@ -1837,7 +1851,7 @@
* @since 3.8.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);
return this.asAdmin().addStep(new CallStepPlaceholder<>(this.asAdmin(), false, service, params));
}
@@ -1851,7 +1865,7 @@
* @since 3.6.0
*/
default <E> GraphTraversal<S, E> call(final String service, final Traversal<?, Map<?,?>> childTraversal) {
- this.asAdmin().getBytecode().addStep(Symbols.call, service, childTraversal);
+ this.asAdmin().getGremlinLang().addStep(Symbols.call, service, childTraversal);
final CallStep<S,E> step = null == childTraversal ? new CallStep(this.asAdmin(), false, service) :
new CallStep(this.asAdmin(), false, service, new LinkedHashMap(), childTraversal.asAdmin());
return this.asAdmin().addStep(step);
@@ -1870,7 +1884,7 @@
* @since 3.6.0
*/
default <E> GraphTraversal<S, E> call(final String service, final Map params, final Traversal<?, Map<?,?>> childTraversal) {
- this.asAdmin().getBytecode().addStep(Symbols.call, service, params, childTraversal);
+ this.asAdmin().getGremlinLang().addStep(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);
@@ -1889,7 +1903,7 @@
* @since 3.8.0
*/
default <E> GraphTraversal<S, E> call(final String service, final GValue<Map<?,?>> params, final Traversal<S, Map<?,?>> childTraversal) {
- this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.call, service, params, childTraversal);
+ this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.call, service, params, childTraversal);
final CallStepPlaceholder<S,E> step = null == childTraversal ? new CallStepPlaceholder<>(this.asAdmin(), false, service, params) :
new CallStepPlaceholder<>(this.asAdmin(), false, service, params, childTraversal.asAdmin());
return this.asAdmin().addStep(step);
@@ -1905,7 +1919,7 @@
* @since 3.7.1
*/
public default GraphTraversal<S, String> concat(final Traversal<?, String> concatTraversal, final Traversal<?, String>... otherConcatTraversals) {
- this.asAdmin().getBytecode().addStep(Symbols.concat, concatTraversal, otherConcatTraversals);
+ this.asAdmin().getGremlinLang().addStep(Symbols.concat, concatTraversal, otherConcatTraversals);
return this.asAdmin().addStep(new ConcatStep<>(this.asAdmin(), concatTraversal, otherConcatTraversals));
}
@@ -1918,7 +1932,7 @@
* @since 3.7.0
*/
public default GraphTraversal<S, String> concat(final String... concatStrings) {
- this.asAdmin().getBytecode().addStep(Symbols.concat, concatStrings);
+ this.asAdmin().getGremlinLang().addStep(Symbols.concat, concatStrings);
return this.asAdmin().addStep(new ConcatStep<>(this.asAdmin(), concatStrings));
}
@@ -1930,7 +1944,7 @@
* @since 3.7.1
*/
public default GraphTraversal<S, String> asString() {
- this.asAdmin().getBytecode().addStep(Symbols.asString);
+ this.asAdmin().getGremlinLang().addStep(Symbols.asString);
return this.asAdmin().addStep(new AsStringGlobalStep<>(this.asAdmin()));
}
@@ -1943,7 +1957,7 @@
* @since 3.7.1
*/
public default <E2> GraphTraversal<S, E2> asString(final Scope scope) {
- this.asAdmin().getBytecode().addStep(Symbols.asString, scope);
+ this.asAdmin().getGremlinLang().addStep(Symbols.asString, scope);
return this.asAdmin().addStep(scope.equals(Scope.global) ? new AsStringGlobalStep<>(this.asAdmin()) : new AsStringLocalStep<>(this.asAdmin()));
}
@@ -1956,7 +1970,7 @@
* @since 3.7.1
*/
public default GraphTraversal<S, Integer> length() {
- this.asAdmin().getBytecode().addStep(Symbols.length);
+ this.asAdmin().getGremlinLang().addStep(Symbols.length);
return this.asAdmin().addStep(new LengthGlobalStep<>(this.asAdmin()));
}
@@ -1970,7 +1984,7 @@
* @since 3.7.1
*/
public default <E2> GraphTraversal<S, E2> length(final Scope scope) {
- this.asAdmin().getBytecode().addStep(Symbols.length, scope);
+ this.asAdmin().getGremlinLang().addStep(Symbols.length, scope);
return this.asAdmin().addStep(scope.equals(Scope.global) ? new LengthGlobalStep<>(this.asAdmin()) : new LengthLocalStep<>(this.asAdmin()));
}
@@ -1983,7 +1997,7 @@
* @since 3.7.1
*/
public default GraphTraversal<S, String> toLower() {
- this.asAdmin().getBytecode().addStep(Symbols.toLower);
+ this.asAdmin().getGremlinLang().addStep(Symbols.toLower);
return this.asAdmin().addStep(new ToLowerGlobalStep<>(this.asAdmin()));
}
@@ -1997,7 +2011,7 @@
* @since 3.7.1
*/
public default <E2> GraphTraversal<S, E2> toLower(final Scope scope) {
- this.asAdmin().getBytecode().addStep(Symbols.toLower, scope);
+ this.asAdmin().getGremlinLang().addStep(Symbols.toLower, scope);
return this.asAdmin().addStep(scope.equals(Scope.global) ? new ToLowerGlobalStep<>(this.asAdmin()) : new ToLowerLocalStep<>(this.asAdmin()));
}
@@ -2010,7 +2024,7 @@
* @since 3.7.1
*/
public default GraphTraversal<S, String> toUpper() {
- this.asAdmin().getBytecode().addStep(Symbols.toUpper);
+ this.asAdmin().getGremlinLang().addStep(Symbols.toUpper);
return this.asAdmin().addStep(new ToUpperGlobalStep<>(this.asAdmin()));
}
@@ -2024,7 +2038,7 @@
* @since 3.7.1
*/
public default <E2> GraphTraversal<S, E2> toUpper(final Scope scope) {
- this.asAdmin().getBytecode().addStep(Symbols.toUpper, scope);
+ this.asAdmin().getGremlinLang().addStep(Symbols.toUpper, scope);
return this.asAdmin().addStep(scope.equals(Scope.global) ? new ToUpperGlobalStep<>(this.asAdmin()) : new ToUpperLocalStep<>(this.asAdmin()));
}
@@ -2038,7 +2052,7 @@
* @since 3.7.1
*/
public default GraphTraversal<S, String> trim() {
- this.asAdmin().getBytecode().addStep(Symbols.trim);
+ this.asAdmin().getGremlinLang().addStep(Symbols.trim);
return this.asAdmin().addStep(new TrimGlobalStep<>(this.asAdmin()));
}
@@ -2053,7 +2067,7 @@
* @since 3.7.1
*/
public default <E2> GraphTraversal<S, E2> trim(final Scope scope) {
- this.asAdmin().getBytecode().addStep(Symbols.trim, scope);
+ this.asAdmin().getGremlinLang().addStep(Symbols.trim, scope);
return this.asAdmin().addStep(scope.equals(Scope.global) ? new TrimGlobalStep<>(this.asAdmin()) : new TrimLocalStep<>(this.asAdmin()));
}
@@ -2067,7 +2081,7 @@
* @since 3.7.1
*/
public default GraphTraversal<S, String> lTrim() {
- this.asAdmin().getBytecode().addStep(Symbols.lTrim);
+ this.asAdmin().getGremlinLang().addStep(Symbols.lTrim);
return this.asAdmin().addStep(new LTrimGlobalStep<>(this.asAdmin()));
}
@@ -2083,7 +2097,7 @@
* @since 3.7.1
*/
public default <E2> GraphTraversal<S, E2> lTrim(final Scope scope) {
- this.asAdmin().getBytecode().addStep(Symbols.lTrim, scope);
+ this.asAdmin().getGremlinLang().addStep(Symbols.lTrim, scope);
return this.asAdmin().addStep(scope.equals(Scope.global) ? new LTrimGlobalStep<>(this.asAdmin()) : new LTrimLocalStep<>(this.asAdmin()));
}
@@ -2097,7 +2111,7 @@
* @since 3.7.1
*/
public default GraphTraversal<S, String> rTrim() {
- this.asAdmin().getBytecode().addStep(Symbols.rTrim);
+ this.asAdmin().getGremlinLang().addStep(Symbols.rTrim);
return this.asAdmin().addStep(new RTrimGlobalStep<>(this.asAdmin()));
}
@@ -2112,7 +2126,7 @@
* @since 3.7.1
*/
public default <E2> GraphTraversal<S, E2> rTrim(final Scope scope) {
- this.asAdmin().getBytecode().addStep(Symbols.rTrim, scope);
+ this.asAdmin().getGremlinLang().addStep(Symbols.rTrim, scope);
return this.asAdmin().addStep(scope.equals(Scope.global) ? new RTrimGlobalStep<>(this.asAdmin()) : new RTrimLocalStep<>(this.asAdmin()));
}
@@ -2124,7 +2138,7 @@
* @since 3.7.1
*/
public default <E2> GraphTraversal<S, E2> reverse() {
- this.asAdmin().getBytecode().addStep(Symbols.reverse);
+ this.asAdmin().getGremlinLang().addStep(Symbols.reverse);
return this.asAdmin().addStep(new ReverseStep<>(this.asAdmin()));
}
@@ -2141,7 +2155,7 @@
* @since 3.7.1
*/
public default GraphTraversal<S, String> replace(final String oldChar, final String newChar) {
- this.asAdmin().getBytecode().addStep(Symbols.replace, oldChar, newChar);
+ this.asAdmin().getGremlinLang().addStep(Symbols.replace, oldChar, newChar);
return this.asAdmin().addStep(new ReplaceGlobalStep<>(this.asAdmin(), oldChar, newChar));
}
@@ -2159,7 +2173,7 @@
* @since 3.7.1
*/
public default <E2> GraphTraversal<S, E2> replace(final Scope scope, final String oldChar, final String newChar) {
- this.asAdmin().getBytecode().addStep(Symbols.replace, scope, oldChar, newChar);
+ this.asAdmin().getGremlinLang().addStep(Symbols.replace, scope, oldChar, newChar);
return this.asAdmin().addStep(scope.equals(Scope.global) ?
new ReplaceGlobalStep<>(this.asAdmin(), oldChar, newChar) : new ReplaceLocalStep<>(this.asAdmin(), oldChar, newChar));
}
@@ -2176,7 +2190,7 @@
* @since 3.7.1
*/
public default GraphTraversal<S, List<String>> split(final String separator) {
- this.asAdmin().getBytecode().addStep(Symbols.split, separator);
+ this.asAdmin().getGremlinLang().addStep(Symbols.split, separator);
return this.asAdmin().addStep(new SplitGlobalStep<>(this.asAdmin(), separator));
}
@@ -2193,7 +2207,7 @@
* @since 3.7.1
*/
public default <E2> GraphTraversal<S, List<E2>> split(final Scope scope, final String separator) {
- this.asAdmin().getBytecode().addStep(Symbols.split, scope, separator);
+ this.asAdmin().getGremlinLang().addStep(Symbols.split, scope, separator);
return this.asAdmin().addStep(scope.equals(Scope.global) ?
new SplitGlobalStep<>(this.asAdmin(), separator) : new SplitLocalStep<>(this.asAdmin(), separator));
}
@@ -2210,7 +2224,7 @@
* @since 3.7.1
*/
public default GraphTraversal<S, String> substring(final int startIndex) {
- this.asAdmin().getBytecode().addStep(Symbols.substring, startIndex);
+ this.asAdmin().getGremlinLang().addStep(Symbols.substring, startIndex);
return this.asAdmin().addStep(new SubstringGlobalStep<>(this.asAdmin(), startIndex));
}
@@ -2227,7 +2241,7 @@
* @since 3.7.1
*/
public default <E2> GraphTraversal<S, E2> substring(final Scope scope, final int startIndex) {
- this.asAdmin().getBytecode().addStep(Symbols.substring, scope, startIndex);
+ this.asAdmin().getGremlinLang().addStep(Symbols.substring, scope, startIndex);
return this.asAdmin().addStep(scope.equals(Scope.global) ?
new SubstringGlobalStep<>(this.asAdmin(), startIndex) : new SubstringLocalStep<>(this.asAdmin(), startIndex));
}
@@ -2247,7 +2261,7 @@
* @since 3.7.1
*/
public default GraphTraversal<S, String> substring(final int startIndex, final int endIndex) {
- this.asAdmin().getBytecode().addStep(Symbols.substring, startIndex, endIndex);
+ this.asAdmin().getGremlinLang().addStep(Symbols.substring, startIndex, endIndex);
return this.asAdmin().addStep(new SubstringGlobalStep<>(this.asAdmin(), startIndex, endIndex));
}
@@ -2267,7 +2281,7 @@
* @since 3.7.1
*/
public default <E2> GraphTraversal<S, E2> substring(final Scope scope, final int startIndex, final int endIndex) {
- this.asAdmin().getBytecode().addStep(Symbols.substring, scope, startIndex, endIndex);
+ this.asAdmin().getGremlinLang().addStep(Symbols.substring, scope, startIndex, endIndex);
return this.asAdmin().addStep(scope.equals(Scope.global) ?
new SubstringGlobalStep<>(this.asAdmin(), startIndex, endIndex) : new SubstringLocalStep<>(this.asAdmin(), startIndex, endIndex));
}
@@ -2280,7 +2294,7 @@
* @since 3.7.1
*/
public default GraphTraversal<S, String> format(final String format) {
- this.asAdmin().getBytecode().addStep(Symbols.format, format);
+ this.asAdmin().getGremlinLang().addStep(Symbols.format, format);
return this.asAdmin().addStep(new FormatStep<>(this.asAdmin(), format));
}
@@ -2292,7 +2306,7 @@
* @since 3.8.0
*/
public default GraphTraversal<S, Boolean> asBool() {
- this.asAdmin().getBytecode().addStep(Symbols.asBool);
+ this.asAdmin().getGremlinLang().addStep(Symbols.asBool);
return this.asAdmin().addStep(new AsBoolStep<>(this.asAdmin()));
}
@@ -2304,7 +2318,7 @@
* @since 3.7.1
*/
public default GraphTraversal<S, OffsetDateTime> asDate() {
- this.asAdmin().getBytecode().addStep(Symbols.asDate);
+ this.asAdmin().getGremlinLang().addStep(Symbols.asDate);
return this.asAdmin().addStep(new AsDateStep<>(this.asAdmin()));
}
@@ -2316,7 +2330,7 @@
* @since 3.8.0
*/
public default GraphTraversal<S, Number> asNumber() {
- this.asAdmin().getBytecode().addStep(Symbols.asNumber);
+ this.asAdmin().getGremlinLang().addStep(Symbols.asNumber);
return this.asAdmin().addStep(new AsNumberStep<>(this.asAdmin()));
}
@@ -2328,7 +2342,7 @@
* @since 3.8.0
*/
public default GraphTraversal<S, Number> asNumber(final N numberToken) {
- this.asAdmin().getBytecode().addStep(Symbols.asNumber, numberToken);
+ this.asAdmin().getGremlinLang().addStep(Symbols.asNumber, numberToken);
return this.asAdmin().addStep(new AsNumberStep<>(this.asAdmin(), numberToken));
}
@@ -2340,12 +2354,12 @@
* @since 3.7.1
*/
public default GraphTraversal<S, OffsetDateTime> dateAdd(final DT dateToken, final int value) {
- this.asAdmin().getBytecode().addStep(Symbols.dateAdd, dateToken, value);
+ this.asAdmin().getGremlinLang().addStep(Symbols.dateAdd, dateToken, value);
return this.asAdmin().addStep(new DateAddStep<>(this.asAdmin(), dateToken, value));
}
/**
- * Returns the difference between two {@link Date} in epoch time.
+ * Returns the difference between two {@link OffsetDateTime} in epoch time.
*
* @return the traversal with an appended {@link DateDiffStep}.
* @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#dateDiff-step" target="_blank">Reference Documentation - dateDiff Step</a>
@@ -2354,7 +2368,7 @@
*/
@Deprecated
public default GraphTraversal<S, Long> dateDiff(final Date value) {
- this.asAdmin().getBytecode().addStep(Symbols.dateDiff, value);
+ this.asAdmin().getGremlinLang().addStep(Symbols.dateDiff, value);
return this.asAdmin().addStep(new DateDiffStep<>(this.asAdmin(), value));
}
@@ -2366,7 +2380,7 @@
* @since 3.7.1
*/
public default GraphTraversal<S, Long> dateDiff(final OffsetDateTime value) {
- this.asAdmin().getBytecode().addStep(Symbols.dateDiff, value);
+ this.asAdmin().getGremlinLang().addStep(Symbols.dateDiff, value);
return this.asAdmin().addStep(new DateDiffStep<>(this.asAdmin(), value));
}
@@ -2379,7 +2393,7 @@
* @since 3.7.1
*/
public default GraphTraversal<S, Long> dateDiff(final Traversal<?, ?> dateTraversal) {
- this.asAdmin().getBytecode().addStep(Symbols.dateDiff, dateTraversal);
+ this.asAdmin().getGremlinLang().addStep(Symbols.dateDiff, dateTraversal);
return this.asAdmin().addStep(new DateDiffStep<>(this.asAdmin(), dateTraversal));
}
@@ -2391,19 +2405,7 @@
* @since 3.7.1
*/
public default GraphTraversal<S, Set<?>> difference(final Object values) {
- this.asAdmin().getBytecode().addStep(Symbols.difference, values);
- 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 3.8.0
- */
- public default GraphTraversal<S, Set<?>> difference(final GValue<Object> values) {
- this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.difference, values);
+ this.asAdmin().getGremlinLang().addStep(Symbols.difference, values);
return this.asAdmin().addStep(new DifferenceStep<>(this.asAdmin(), values));
}
@@ -2415,19 +2417,7 @@
* @since 3.7.1
*/
public default GraphTraversal<S, Set<?>> disjunct(final Object values) {
- this.asAdmin().getBytecode().addStep(Symbols.disjunct, values);
- 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 3.8.0
- */
- public default GraphTraversal<S, Set<?>> disjunct(final GValue<Object> values) {
- this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.disjunct, values);
+ this.asAdmin().getGremlinLang().addStep(Symbols.disjunct, values);
return this.asAdmin().addStep(new DisjunctStep<>(this.asAdmin(), values));
}
@@ -2439,19 +2429,7 @@
* @since 3.7.1
*/
public default GraphTraversal<S, Set<?>> intersect(final Object values) {
- this.asAdmin().getBytecode().addStep(Symbols.intersect, values);
- 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 3.8.0
- */
- public default GraphTraversal<S, Set<?>> intersect(final GValue<Object> values) {
- this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.intersect, values);
+ this.asAdmin().getGremlinLang().addStep(Symbols.intersect, values);
return this.asAdmin().addStep(new IntersectStep<>(this.asAdmin(), values));
}
@@ -2463,7 +2441,7 @@
* @since 3.7.1
*/
public default GraphTraversal<S, String> conjoin(final String delimiter) {
- this.asAdmin().getBytecode().addStep(Symbols.conjoin, delimiter);
+ this.asAdmin().getGremlinLang().addStep(Symbols.conjoin, delimiter);
return this.asAdmin().addStep(new ConjoinStep<>(this.asAdmin(), delimiter));
}
@@ -2475,7 +2453,7 @@
* @since 3.7.1
*/
public default <E2> GraphTraversal<S, E2> merge(final Object values) {
- this.asAdmin().getBytecode().addStep(Symbols.merge, values);
+ this.asAdmin().getGremlinLang().addStep(Symbols.merge, values);
return this.asAdmin().addStep(new MergeStep<>(this.asAdmin(), values));
}
@@ -2487,7 +2465,7 @@
* @since 3.7.1
*/
public default GraphTraversal<S, List<?>> combine(final Object values) {
- this.asAdmin().getBytecode().addStep(Symbols.combine, values);
+ this.asAdmin().getGremlinLang().addStep(Symbols.combine, values);
return this.asAdmin().addStep(new CombineStep<>(this.asAdmin(), values));
}
@@ -2499,7 +2477,7 @@
* @since 3.7.1
*/
public default GraphTraversal<S, List<List<?>>> product(final Object values) {
- this.asAdmin().getBytecode().addStep(Symbols.product, values);
+ this.asAdmin().getGremlinLang().addStep(Symbols.product, values);
return this.asAdmin().addStep(new ProductStep<>(this.asAdmin(), values));
}
@@ -2518,7 +2496,7 @@
if (predicate != null && predicate instanceof P && ((P<Traverser<E>>) predicate).isParameterized()) {
throw new IllegalArgumentException("Parameterized predicates are not supported by filter()");
}
- this.asAdmin().getBytecode().addStep(Symbols.filter, predicate);
+ this.asAdmin().getGremlinLang().addStep(Symbols.filter, predicate);
return this.asAdmin().addStep(new LambdaFilterStep<>(this.asAdmin(), predicate));
}
@@ -2532,7 +2510,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, E> filter(final Traversal<?, ?> filterTraversal) {
- this.asAdmin().getBytecode().addStep(Symbols.filter, filterTraversal);
+ this.asAdmin().getGremlinLang().addStep(Symbols.filter, filterTraversal);
return this.asAdmin().addStep(new TraversalFilterStep<>(this.asAdmin(), (Traversal) filterTraversal));
}
@@ -2556,7 +2534,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, E> or(final Traversal<?, ?>... orTraversals) {
- this.asAdmin().getBytecode().addStep(Symbols.or, orTraversals);
+ this.asAdmin().getGremlinLang().addStep(Symbols.or, orTraversals);
return this.asAdmin().addStep(new OrStep(this.asAdmin(), orTraversals));
}
@@ -2569,7 +2547,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, E> and(final Traversal<?, ?>... andTraversals) {
- this.asAdmin().getBytecode().addStep(Symbols.and, andTraversals);
+ this.asAdmin().getGremlinLang().addStep(Symbols.and, andTraversals);
return this.asAdmin().addStep(new AndStep(this.asAdmin(), andTraversals));
}
@@ -2584,7 +2562,7 @@
public default GraphTraversal<S, E> inject(final E... injections) {
// a single null is [null]
final E[] s = null == injections ? (E[]) new Object[] { null } : injections;
- this.asAdmin().getBytecode().addStep(Symbols.inject, s);
+ this.asAdmin().getGremlinLang().addStep(Symbols.inject, s);
return this.asAdmin().addStep(new InjectStep<>(this.asAdmin(), s));
}
@@ -2598,7 +2576,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, E> dedup(final Scope scope, final String... dedupLabels) {
- this.asAdmin().getBytecode().addStep(Symbols.dedup, scope, dedupLabels);
+ this.asAdmin().getGremlinLang().addStep(Symbols.dedup, scope, dedupLabels);
return this.asAdmin().addStep(scope.equals(Scope.global) ? new DedupGlobalStep<>(this.asAdmin(), dedupLabels) : new DedupLocalStep(this.asAdmin()));
}
@@ -2611,7 +2589,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, E> dedup(final String... dedupLabels) {
- this.asAdmin().getBytecode().addStep(Symbols.dedup, dedupLabels);
+ this.asAdmin().getGremlinLang().addStep(Symbols.dedup, dedupLabels);
return this.asAdmin().addStep(new DedupGlobalStep<>(this.asAdmin(), dedupLabels));
}
@@ -2630,7 +2608,7 @@
if (predicate != null && predicate.isParameterized()) {
throw new IllegalArgumentException("Parameterized predicates are not supported by where()");
}
- this.asAdmin().getBytecode().addStep(Symbols.where, startKey, predicate);
+ this.asAdmin().getGremlinLang().addStep(Symbols.where, startKey, predicate);
return this.asAdmin().addStep(new WherePredicateStep<>(this.asAdmin(), Optional.ofNullable(startKey), predicate));
}
@@ -2648,7 +2626,7 @@
if (predicate != null && predicate.isParameterized()) {
throw new IllegalArgumentException("Parameterized predicates are not supported by where()");
}
- this.asAdmin().getBytecode().addStep(Symbols.where, predicate);
+ this.asAdmin().getGremlinLang().addStep(Symbols.where, predicate);
return this.asAdmin().addStep(new WherePredicateStep<>(this.asAdmin(), Optional.empty(), predicate));
}
@@ -2663,7 +2641,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, E> where(final Traversal<?, ?> whereTraversal) {
- this.asAdmin().getBytecode().addStep(Symbols.where, whereTraversal);
+ this.asAdmin().getGremlinLang().addStep(Symbols.where, whereTraversal);
return TraversalHelper.getVariableLocations(whereTraversal.asAdmin()).isEmpty() ?
this.asAdmin().addStep(new TraversalFilterStep<>(this.asAdmin(), (Traversal) whereTraversal)) :
this.asAdmin().addStep(new WhereTraversalStep<>(this.asAdmin(), whereTraversal));
@@ -2684,7 +2662,7 @@
if (null == predicate)
return has(propertyKey, (Object) null);
- this.asAdmin().getBytecode().addStep(Symbols.has, propertyKey, predicate);
+ this.asAdmin().getGremlinLang().addStep(Symbols.has, propertyKey, predicate);
return TraversalHelper.addHasContainer(this.asAdmin(), new HasContainer(propertyKey, predicate));
}
@@ -2706,7 +2684,7 @@
if (null == predicate)
return has(accessor, (Object) null);
- this.asAdmin().getBytecode().addStep(Symbols.has, accessor, predicate);
+ this.asAdmin().getGremlinLang().addStep(Symbols.has, accessor, predicate);
return TraversalHelper.addHasContainer(this.asAdmin(), new HasContainer(accessor.getAccessor(), predicate));
}
@@ -2725,7 +2703,7 @@
else if (value instanceof Traversal)
return this.has(propertyKey, (Traversal) value);
else {
- this.asAdmin().getBytecode().addStep(Symbols.has, propertyKey, value);
+ this.asAdmin().getGremlinLang().addStep(Symbols.has, propertyKey, value);
return TraversalHelper.addHasContainer(this.asAdmin(), new HasContainer(propertyKey, P.eq(value)));
}
}
@@ -2748,7 +2726,7 @@
else if (value instanceof Traversal)
return this.has(accessor, (Traversal) value);
else {
- this.asAdmin().getBytecode().addStep(Symbols.has, accessor, value);
+ this.asAdmin().getGremlinLang().addStep(Symbols.has, accessor, value);
return TraversalHelper.addHasContainer(this.asAdmin(), new HasContainer(accessor.getAccessor(), P.eq(value)));
}
}
@@ -2764,7 +2742,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, E> has(final String label, final String propertyKey, final P<?> predicate) {
- this.asAdmin().getBytecode().addStep(Symbols.has, label, propertyKey, predicate);
+ this.asAdmin().getGremlinLang().addStep(Symbols.has, label, propertyKey, predicate);
TraversalHelper.addHasContainer(this.asAdmin(), new HasContainer(T.label.getAccessor(), P.eq(label)));
return TraversalHelper.addHasContainer(this.asAdmin(), new HasContainer(propertyKey, predicate));
}
@@ -2780,7 +2758,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, E> has(final String label, final String propertyKey, final Object value) {
- this.asAdmin().getBytecode().addStep(Symbols.has, label, propertyKey, value);
+ this.asAdmin().getGremlinLang().addStep(Symbols.has, label, 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)));
}
@@ -2804,7 +2782,7 @@
if (null == propertyTraversal)
return has(accessor, (Object) null);
- this.asAdmin().getBytecode().addStep(Symbols.has, accessor, propertyTraversal);
+ this.asAdmin().getGremlinLang().addStep(Symbols.has, accessor, propertyTraversal);
switch (accessor) {
case id:
return this.asAdmin().addStep(
@@ -2830,14 +2808,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, E> has(final String propertyKey, final Traversal<?, ?> propertyTraversal) {
- // the translation here of null to has(String, Object) is likely what was intended. a null Traversal doesn't
- // really make much sense. this should resolve issues with JavaTranslator grabbing this method when bytecode
- // uses null as the second argument. we've taken this tactic for other overloads of has() as well, so just
- // continuing with that pattern.
- if (null == propertyTraversal)
- return has(propertyKey, (Object) null);
-
- this.asAdmin().getBytecode().addStep(Symbols.has, propertyKey, propertyTraversal);
+ this.asAdmin().getGremlinLang().addStep(Symbols.has, propertyKey, propertyTraversal);
return this.asAdmin().addStep(
new TraversalFilterStep<>(this.asAdmin(), propertyTraversal.asAdmin().addStep(0,
new PropertiesStep(propertyTraversal.asAdmin(), PropertyType.VALUE, propertyKey))));
@@ -2852,7 +2823,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, E> has(final String propertyKey) {
- this.asAdmin().getBytecode().addStep(Symbols.has, propertyKey);
+ this.asAdmin().getGremlinLang().addStep(Symbols.has, propertyKey);
return this.asAdmin().addStep(new TraversalFilterStep(this.asAdmin(), __.values(propertyKey)));
}
@@ -2867,7 +2838,7 @@
* @since 3.8.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)));
}
@@ -2883,7 +2854,7 @@
* @since 3.8.0
*/
public default GraphTraversal<S, E> has(final GValue<String> label, final String propertyKey, final P<?> predicate) {
- this.asAdmin().getBytecode().addStep(Symbols.has, label.get(), propertyKey, predicate);
+ this.asAdmin().getGremlinLang().addStep(Symbols.has, label.get(), propertyKey, predicate);
TraversalHelper.addHasContainer(this.asAdmin(), new HasContainer(T.label.getAccessor(), P.eq(label)));
return TraversalHelper.addHasContainer(this.asAdmin(), new HasContainer(propertyKey, predicate));
}
@@ -2897,7 +2868,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, E> hasNot(final String propertyKey) {
- this.asAdmin().getBytecode().addStep(Symbols.hasNot, propertyKey);
+ this.asAdmin().getGremlinLang().addStep(Symbols.hasNot, propertyKey);
return this.asAdmin().addStep(new NotStep(this.asAdmin(), __.values(propertyKey)));
}
@@ -2911,7 +2882,7 @@
* @since 3.2.2
*/
public default GraphTraversal<S, E> hasLabel(final String label, final String... otherLabels) {
- this.asAdmin().getBytecode().addStep(Symbols.hasLabel, label, otherLabels);
+ this.asAdmin().getGremlinLang().addStep(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.
@@ -2933,7 +2904,7 @@
if (null == predicate) {
return hasLabel((String) null);
} else {
- this.asAdmin().getBytecode().addStep(Symbols.hasLabel, predicate);
+ this.asAdmin().getGremlinLang().addStep(Symbols.hasLabel, predicate);
return TraversalHelper.addHasContainer(this.asAdmin(), new HasContainer(T.label.getAccessor(), predicate));
}
}
@@ -2948,7 +2919,7 @@
* @since 3.8.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.
@@ -2968,13 +2939,24 @@
public default GraphTraversal<S, E> hasId(final Object id, final Object... otherIds) {
if (id instanceof P) {
return this.hasId((P<?>) id);
- }
- else {
- this.asAdmin().getBytecode().addStep(Symbols.hasId, id, otherIds);
+ } else {
+ this.asAdmin().getGremlinLang().addStep(Symbols.hasId, id, otherIds);
//using ArrayList given P.within() turns all arguments into lists
final List<Object> ids = new ArrayList<>();
- if (id instanceof Object[]) {
+
+ if (id instanceof GValue) {
+ // the logic for dealing with hasId([]) is sketchy historically, just trying to maintain what we were
+ // originally testing prior to GValue.
+ Object value = ((GValue) id).get();
+ if (value instanceof Object[]) {
+ ids.addAll(Arrays.asList(GValue.ensureGValues((Object[]) value)));
+ } else if (value instanceof Collection) {
+ ids.addAll(Arrays.asList(GValue.ensureGValues(((Collection<?>) value).toArray())));
+ } else {
+ ids.add(id);
+ }
+ } else if (id instanceof Object[]) {
Collections.addAll(ids, (Object[]) id);
} else if (id instanceof Collection) {
// as ids are unrolled when it's in array, they should also be unrolled when it's a list.
@@ -3025,7 +3007,7 @@
if (null == predicate)
return hasId((Object) null);
- this.asAdmin().getBytecode().addStep(Symbols.hasId, predicate);
+ this.asAdmin().getGremlinLang().addStep(Symbols.hasId, predicate);
return TraversalHelper.addHasContainer(this.asAdmin(), new HasContainer(T.id.getAccessor(), predicate));
}
@@ -3040,7 +3022,7 @@
* @since 3.2.2
*/
public default GraphTraversal<S, E> hasKey(final String label, final String... otherLabels) {
- this.asAdmin().getBytecode().addStep(Symbols.hasKey, label, otherLabels);
+ this.asAdmin().getGremlinLang().addStep(Symbols.hasKey, 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.
@@ -3069,7 +3051,7 @@
} else if (predicate.isParameterized()) {
throw new IllegalArgumentException("Parameterized predicates are not supported by hasKey()");
} else {
- this.asAdmin().getBytecode().addStep(Symbols.hasKey, predicate);
+ this.asAdmin().getGremlinLang().addStep(Symbols.hasKey, predicate);
return TraversalHelper.addHasContainer(this.asAdmin(), new HasContainer(T.key.getAccessor(), predicate));
}
}
@@ -3086,7 +3068,7 @@
if (value instanceof P)
return this.hasValue((P<?>) value);
else {
- this.asAdmin().getBytecode().addStep(Symbols.hasValue, value, otherValues);
+ this.asAdmin().getGremlinLang().addStep(Symbols.hasValue, value, otherValues);
final List<Object> values = new ArrayList<>();
if (value instanceof Object[]) {
Collections.addAll(values, (Object[]) value);
@@ -3123,7 +3105,7 @@
if (null == predicate) {
return hasValue((String) null);
} else {
- this.asAdmin().getBytecode().addStep(Symbols.hasValue, predicate);
+ this.asAdmin().getGremlinLang().addStep(Symbols.hasValue, predicate);
return TraversalHelper.addHasContainer(this.asAdmin(), new HasContainer(T.value.getAccessor(), predicate));
}
}
@@ -3137,7 +3119,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, E> is(final P<E> predicate) {
- this.asAdmin().getBytecode().addStep(Symbols.is, predicate);
+ this.asAdmin().getGremlinLang().addStep(Symbols.is, predicate);
return this.asAdmin().addStep(predicate.isParameterized() ? new IsStepPlaceholder<>(this.asAdmin(), predicate) : new IsStep<>(this.asAdmin(), predicate));
}
@@ -3151,7 +3133,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, E> is(final Object value) {
- this.asAdmin().getBytecode().addStep(Symbols.is, value);
+ this.asAdmin().getGremlinLang().addStep(Symbols.is, value);
P<E> predicate = value instanceof P ? (P<E>) value : P.eq((E) value);
return this.asAdmin().addStep(predicate.isParameterized() ? new IsStepPlaceholder<>(this.asAdmin(), predicate) : new IsStep<>(this.asAdmin(), predicate));
}
@@ -3165,7 +3147,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, E> not(final Traversal<?, ?> notTraversal) {
- this.asAdmin().getBytecode().addStep(Symbols.not, notTraversal);
+ this.asAdmin().getGremlinLang().addStep(Symbols.not, notTraversal);
return this.asAdmin().addStep(new NotStep<>(this.asAdmin(), (Traversal<E, ?>) notTraversal));
}
@@ -3178,7 +3160,20 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, E> coin(final double probability) {
- this.asAdmin().getBytecode().addStep(Symbols.coin, probability);
+ this.asAdmin().getGremlinLang().addStep(Symbols.coin, probability);
+ 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().getGremlinLang().addStep(GraphTraversal.Symbols.coin, probability);
return this.asAdmin().addStep(new CoinStep<>(this.asAdmin(), probability));
}
@@ -3193,7 +3188,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, E> range(final long low, final long high) {
- this.asAdmin().getBytecode().addStep(Symbols.range, low, high);
+ this.asAdmin().getGremlinLang().addStep(Symbols.range, low, high);
return this.asAdmin().addStep(new RangeGlobalStep<>(this.asAdmin(), low, high));
}
@@ -3208,7 +3203,7 @@
* @since 3.8.0
*/
public default GraphTraversal<S, E> range(final GValue<Long> low, final GValue<Long> high) {
- this.asAdmin().getBytecode().addStep(Symbols.range, low, high);
+ this.asAdmin().getGremlinLang().addStep(Symbols.range, low, high);
return this.asAdmin().addStep(new RangeGlobalStepPlaceholder(this.asAdmin(), low, high));
}
@@ -3225,7 +3220,7 @@
* @since 3.0.0-incubating
*/
public default <E2> GraphTraversal<S, E2> range(final Scope scope, final long low, final long high) {
- this.asAdmin().getBytecode().addStep(Symbols.range, scope, low, high);
+ this.asAdmin().getGremlinLang().addStep(Symbols.range, scope, low, high);
return this.asAdmin().addStep(scope.equals(Scope.global)
? new RangeGlobalStep<>(this.asAdmin(), low, high)
: new RangeLocalStep<>(this.asAdmin(), low, high));
@@ -3244,7 +3239,7 @@
* @since 3.8.0
*/
public default <E2> GraphTraversal<S, E2> range(final Scope scope, final GValue<Long> low, final GValue<Long> high) {
- this.asAdmin().getBytecode().addStep(Symbols.range, scope, low, high);
+ this.asAdmin().getGremlinLang().addStep(Symbols.range, scope, low, high);
return this.asAdmin().addStep(scope.equals(Scope.global)
? new RangeGlobalStepPlaceholder<>(this.asAdmin(), low, high)
: new RangeLocalStepPlaceholder<>(this.asAdmin(), low, high));
@@ -3260,7 +3255,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, E> limit(final long limit) {
- this.asAdmin().getBytecode().addStep(Symbols.limit, limit);
+ this.asAdmin().getGremlinLang().addStep(Symbols.limit, limit);
return this.asAdmin().addStep(new RangeGlobalStep<>(this.asAdmin(), 0, limit));
}
@@ -3274,7 +3269,7 @@
* @since 3.8.0
*/
public default GraphTraversal<S, E> limit(final GValue<Long> limit) {
- this.asAdmin().getBytecode().addStep(Symbols.limit, limit);
+ this.asAdmin().getGremlinLang().addStep(Symbols.limit, limit);
return this.asAdmin().addStep(new RangeGlobalStepPlaceholder<>(this.asAdmin(), GValue.of(null, 0l), limit));
}
@@ -3289,7 +3284,7 @@
* @since 3.0.0-incubating
*/
public default <E2> GraphTraversal<S, E2> limit(final Scope scope, final long limit) {
- this.asAdmin().getBytecode().addStep(Symbols.limit, scope, limit);
+ this.asAdmin().getGremlinLang().addStep(Symbols.limit, scope, limit);
return this.asAdmin().addStep(scope.equals(Scope.global)
? new RangeGlobalStep<>(this.asAdmin(), 0, limit)
: new RangeLocalStep<>(this.asAdmin(), 0, limit));
@@ -3306,7 +3301,7 @@
* @since 3.8.0
*/
public default <E2> GraphTraversal<S, E2> limit(final Scope scope, final GValue<Long> limit) {
- this.asAdmin().getBytecode().addStep(Symbols.limit, scope, limit);
+ this.asAdmin().getGremlinLang().addStep(Symbols.limit, scope, limit);
return this.asAdmin().addStep(scope.equals(Scope.global)
? new RangeGlobalStepPlaceholder<>(this.asAdmin(), GValue.of(null, 0l), limit)
: new RangeLocalStepPlaceholder<>(this.asAdmin(), GValue.of(null, 0l), limit));
@@ -3321,7 +3316,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, E> tail() {
- this.asAdmin().getBytecode().addStep(Symbols.tail);
+ this.asAdmin().getGremlinLang().addStep(Symbols.tail);
return this.asAdmin().addStep(new TailGlobalStep<>(this.asAdmin(), 1));
}
@@ -3335,7 +3330,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, E> tail(final long limit) {
- this.asAdmin().getBytecode().addStep(Symbols.tail, limit);
+ this.asAdmin().getGremlinLang().addStep(Symbols.tail, limit);
return this.asAdmin().addStep(new TailGlobalStep<>(this.asAdmin(), limit));
}
@@ -3349,7 +3344,7 @@
* @since 3.8.0
*/
public default GraphTraversal<S, E> tail(final GValue<Long> limit) {
- this.asAdmin().getBytecode().addStep(Symbols.tail, limit);
+ this.asAdmin().getGremlinLang().addStep(Symbols.tail, limit);
return this.asAdmin().addStep(new TailGlobalStepPlaceholder<>(this.asAdmin(), limit));
}
@@ -3363,7 +3358,7 @@
* @since 3.0.0-incubating
*/
public default <E2> GraphTraversal<S, E2> tail(final Scope scope) {
- this.asAdmin().getBytecode().addStep(Symbols.tail, scope);
+ this.asAdmin().getGremlinLang().addStep(Symbols.tail, scope);
return this.asAdmin().addStep(scope.equals(Scope.global)
? new TailGlobalStep<>(this.asAdmin(), 1)
: new TailLocalStep<>(this.asAdmin(), 1));
@@ -3380,7 +3375,7 @@
* @since 3.0.0-incubating
*/
public default <E2> GraphTraversal<S, E2> tail(final Scope scope, final long limit) {
- this.asAdmin().getBytecode().addStep(Symbols.tail, scope, limit);
+ this.asAdmin().getGremlinLang().addStep(Symbols.tail, scope, limit);
return this.asAdmin().addStep(scope.equals(Scope.global)
? new TailGlobalStep<>(this.asAdmin(), limit)
: new TailLocalStep<>(this.asAdmin(), limit));
@@ -3397,7 +3392,7 @@
* @since 3.8.0
*/
public default <E2> GraphTraversal<S, E2> tail(final Scope scope, final GValue<Long> limit) {
- this.asAdmin().getBytecode().addStep(Symbols.tail, scope, limit);
+ this.asAdmin().getGremlinLang().addStep(Symbols.tail, scope, limit);
Step<?, E2> step = scope.equals(Scope.global)
? new TailGlobalStepPlaceholder<>(this.asAdmin(), limit)
@@ -3414,7 +3409,7 @@
* @since 3.3.0
*/
public default GraphTraversal<S, E> skip(final long skip) {
- this.asAdmin().getBytecode().addStep(Symbols.skip, skip);
+ this.asAdmin().getGremlinLang().addStep(Symbols.skip, skip);
return this.asAdmin().addStep(new RangeGlobalStep<>(this.asAdmin(), skip, -1));
}
@@ -3427,7 +3422,7 @@
* @since 3.8.0
*/
public default GraphTraversal<S, E> skip(final GValue<Long> skip) {
- this.asAdmin().getBytecode().addStep(Symbols.skip, skip);
+ this.asAdmin().getGremlinLang().addStep(Symbols.skip, skip);
return this.asAdmin().addStep(new RangeGlobalStepPlaceholder<>(this.asAdmin(), skip, GValue.of(null, -1l)));
}
@@ -3441,7 +3436,7 @@
* @since 3.3.0
*/
public default <E2> GraphTraversal<S, E2> skip(final Scope scope, final long skip) {
- this.asAdmin().getBytecode().addStep(Symbols.skip, scope, skip);
+ this.asAdmin().getGremlinLang().addStep(Symbols.skip, scope, skip);
return this.asAdmin().addStep(scope.equals(Scope.global)
? new RangeGlobalStep<>(this.asAdmin(), skip, -1)
: new RangeLocalStep<>(this.asAdmin(), skip, -1));
@@ -3457,7 +3452,7 @@
* @since 3.8.0
*/
public default <E2> GraphTraversal<S, E2> skip(final Scope scope, final GValue<Long> skip) {
- this.asAdmin().getBytecode().addStep(Symbols.skip, scope, skip);
+ this.asAdmin().getGremlinLang().addStep(Symbols.skip, scope, skip);
return this.asAdmin().addStep(scope.equals(Scope.global)
? new RangeGlobalStepPlaceholder<>(this.asAdmin(), skip, GValue.of(null, -1l))
@@ -3473,7 +3468,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, E> timeLimit(final long timeLimit) {
- this.asAdmin().getBytecode().addStep(Symbols.timeLimit, timeLimit);
+ this.asAdmin().getGremlinLang().addStep(Symbols.timeLimit, timeLimit);
return this.asAdmin().addStep(new TimeLimitStep<E>(this.asAdmin(), timeLimit));
}
@@ -3485,7 +3480,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, E> simplePath() {
- this.asAdmin().getBytecode().addStep(Symbols.simplePath);
+ this.asAdmin().getGremlinLang().addStep(Symbols.simplePath);
return this.asAdmin().addStep(new PathFilterStep<E>(this.asAdmin(), true));
}
@@ -3497,7 +3492,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, E> cyclicPath() {
- this.asAdmin().getBytecode().addStep(Symbols.cyclicPath);
+ this.asAdmin().getGremlinLang().addStep(Symbols.cyclicPath);
return this.asAdmin().addStep(new PathFilterStep<E>(this.asAdmin(), false));
}
@@ -3510,7 +3505,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, E> sample(final int amountToSample) {
- this.asAdmin().getBytecode().addStep(Symbols.sample, amountToSample);
+ this.asAdmin().getGremlinLang().addStep(Symbols.sample, amountToSample);
return this.asAdmin().addStep(new SampleGlobalStep<>(this.asAdmin(), amountToSample));
}
@@ -3524,7 +3519,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, E> sample(final Scope scope, final int amountToSample) {
- this.asAdmin().getBytecode().addStep(Symbols.sample, scope, amountToSample);
+ this.asAdmin().getGremlinLang().addStep(Symbols.sample, scope, amountToSample);
return this.asAdmin().addStep(scope.equals(Scope.global)
? new SampleGlobalStep<>(this.asAdmin(), amountToSample)
: new SampleLocalStep<>(this.asAdmin(), amountToSample));
@@ -3540,7 +3535,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, E> drop() {
- this.asAdmin().getBytecode().addStep(Symbols.drop);
+ this.asAdmin().getGremlinLang().addStep(Symbols.drop);
return this.asAdmin().addStep(new DropStep<>(this.asAdmin()));
}
@@ -3556,7 +3551,7 @@
if (predicate != null && predicate.isParameterized()) {
throw new IllegalArgumentException("Parameterized predicates are not supported by all()");
}
- this.asAdmin().getBytecode().addStep(Symbols.all, predicate);
+ this.asAdmin().getGremlinLang().addStep(Symbols.all, predicate);
return this.asAdmin().addStep(new AllStep<>(this.asAdmin(), predicate));
}
@@ -3572,7 +3567,7 @@
if (predicate != null && predicate.isParameterized()) {
throw new IllegalArgumentException("Parameterized predicates are not supported by any()");
}
- this.asAdmin().getBytecode().addStep(Symbols.any, predicate);
+ this.asAdmin().getGremlinLang().addStep(Symbols.any, predicate);
return this.asAdmin().addStep(new AnyStep<>(this.asAdmin(), predicate));
}
@@ -3585,7 +3580,7 @@
* @since 3.8.0
*/
public default <S2> GraphTraversal<S, E> none(final P<S2> predicate) {
- this.asAdmin().getBytecode().addStep(Symbols.none, predicate);
+ this.asAdmin().getGremlinLang().addStep(Symbols.none, predicate);
return this.asAdmin().addStep(new NoneStep<>(this.asAdmin(), predicate));
}
@@ -3600,7 +3595,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, E> sideEffect(final Consumer<Traverser<E>> consumer) {
- this.asAdmin().getBytecode().addStep(Symbols.sideEffect, consumer);
+ this.asAdmin().getGremlinLang().addStep(Symbols.sideEffect, consumer);
return this.asAdmin().addStep(new LambdaSideEffectStep<>(this.asAdmin(), consumer));
}
@@ -3613,7 +3608,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, E> sideEffect(final Traversal<?, ?> sideEffectTraversal) {
- this.asAdmin().getBytecode().addStep(Symbols.sideEffect, sideEffectTraversal);
+ this.asAdmin().getGremlinLang().addStep(Symbols.sideEffect, sideEffectTraversal);
return this.asAdmin().addStep(new TraversalSideEffectStep<>(this.asAdmin(), (Traversal) sideEffectTraversal));
}
@@ -3628,7 +3623,7 @@
* @since 3.0.0-incubating
*/
public default <E2> GraphTraversal<S, E2> cap(final String sideEffectKey, final String... sideEffectKeys) {
- this.asAdmin().getBytecode().addStep(Symbols.cap, sideEffectKey, sideEffectKeys);
+ this.asAdmin().getGremlinLang().addStep(Symbols.cap, sideEffectKey, sideEffectKeys);
return this.asAdmin().addStep(new SideEffectCapStep<>(this.asAdmin(), sideEffectKey, sideEffectKeys));
}
@@ -3642,7 +3637,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, Edge> subgraph(final String sideEffectKey) {
- this.asAdmin().getBytecode().addStep(Symbols.subgraph, sideEffectKey);
+ this.asAdmin().getGremlinLang().addStep(Symbols.subgraph, sideEffectKey);
return this.asAdmin().addStep(new SubgraphStep(this.asAdmin(), sideEffectKey));
}
@@ -3656,7 +3651,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, E> aggregate(final String sideEffectKey) {
- this.asAdmin().getBytecode().addStep(Symbols.aggregate, sideEffectKey);
+ this.asAdmin().getGremlinLang().addStep(Symbols.aggregate, sideEffectKey);
return this.asAdmin().addStep(new AggregateGlobalStep<>(this.asAdmin(), sideEffectKey));
}
@@ -3670,7 +3665,7 @@
* @since 3.4.3
*/
public default GraphTraversal<S, E> aggregate(final Scope scope, final String sideEffectKey) {
- this.asAdmin().getBytecode().addStep(Symbols.aggregate, scope, sideEffectKey);
+ this.asAdmin().getGremlinLang().addStep(Symbols.aggregate, scope, sideEffectKey);
return this.asAdmin().addStep(scope == Scope.global ?
new AggregateGlobalStep<>(this.asAdmin(), sideEffectKey) : new AggregateLocalStep<>(this.asAdmin(), sideEffectKey));
}
@@ -3685,7 +3680,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, E> group(final String sideEffectKey) {
- this.asAdmin().getBytecode().addStep(Symbols.group, sideEffectKey);
+ this.asAdmin().getGremlinLang().addStep(Symbols.group, sideEffectKey);
return this.asAdmin().addStep(new GroupSideEffectStep<>(this.asAdmin(), sideEffectKey));
}
@@ -3699,7 +3694,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, E> groupCount(final String sideEffectKey) {
- this.asAdmin().getBytecode().addStep(Symbols.groupCount, sideEffectKey);
+ this.asAdmin().getGremlinLang().addStep(Symbols.groupCount, sideEffectKey);
return this.asAdmin().addStep(new GroupCountSideEffectStep<>(this.asAdmin(), sideEffectKey));
}
@@ -3712,7 +3707,7 @@
* @since 3.6.0
*/
public default GraphTraversal<S, E> fail() {
- this.asAdmin().getBytecode().addStep(Symbols.fail);
+ this.asAdmin().getGremlinLang().addStep(Symbols.fail);
return this.asAdmin().addStep(new FailStep<>(this.asAdmin()));
}
@@ -3726,7 +3721,7 @@
* @since 3.6.0
*/
public default GraphTraversal<S, E> fail(final String message) {
- this.asAdmin().getBytecode().addStep(Symbols.fail, message);
+ this.asAdmin().getGremlinLang().addStep(Symbols.fail, message);
return this.asAdmin().addStep(new FailStep<>(this.asAdmin(), message));
}
@@ -3739,7 +3734,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, E> tree(final String sideEffectKey) {
- this.asAdmin().getBytecode().addStep(Symbols.tree, sideEffectKey);
+ this.asAdmin().getGremlinLang().addStep(Symbols.tree, sideEffectKey);
return this.asAdmin().addStep(new TreeSideEffectStep<>(this.asAdmin(), sideEffectKey));
}
@@ -3752,7 +3747,7 @@
* @since 3.0.0-incubating
*/
public default <V, U> GraphTraversal<S, E> sack(final BiFunction<V, U, V> sackOperator) {
- this.asAdmin().getBytecode().addStep(Symbols.sack, sackOperator);
+ this.asAdmin().getGremlinLang().addStep(Symbols.sack, sackOperator);
return this.asAdmin().addStep(new SackValueStep<>(this.asAdmin(), sackOperator));
}
@@ -3767,7 +3762,7 @@
*/
@Deprecated
public default GraphTraversal<S, E> store(final String sideEffectKey) {
- this.asAdmin().getBytecode().addStep(Symbols.store, sideEffectKey);
+ this.asAdmin().getGremlinLang().addStep(Symbols.store, sideEffectKey);
return this.asAdmin().addStep(new AggregateLocalStep<>(this.asAdmin(), sideEffectKey));
}
@@ -3781,7 +3776,7 @@
* @since 3.2.0-incubating
*/
public default GraphTraversal<S, E> profile(final String sideEffectKey) {
- this.asAdmin().getBytecode().addStep(Traversal.Symbols.profile, sideEffectKey);
+ this.asAdmin().getGremlinLang().addStep(Traversal.Symbols.profile, sideEffectKey);
return this.asAdmin().addStep(new ProfileSideEffectStep<>(this.asAdmin(), sideEffectKey));
}
@@ -3829,9 +3824,9 @@
}
if (null == cardinality)
- this.asAdmin().getBytecode().addStep(Symbols.property, key, value, keyValues);
+ this.asAdmin().getGremlinLang().addStep(Symbols.property, key, value, keyValues);
else
- this.asAdmin().getBytecode().addStep(Symbols.property, cardinality, key, value, keyValues);
+ this.asAdmin().getGremlinLang().addStep(Symbols.property, cardinality, key, value, keyValues);
// if it can be detected that this call to property() is related to an addV/E() then we can attempt to fold
// the properties into that step to gain an optimization for those graphs that support such capabilities.
@@ -3984,7 +3979,7 @@
* @since 3.0.0-incubating
*/
public default <M, E2> GraphTraversal<S, E2> branch(final Traversal<?, M> branchTraversal) {
- this.asAdmin().getBytecode().addStep(Symbols.branch, branchTraversal);
+ this.asAdmin().getGremlinLang().addStep(Symbols.branch, branchTraversal);
final BranchStep<E, E2, M> branchStep = new BranchStep<>(this.asAdmin());
branchStep.setBranchTraversal((Traversal.Admin<E, M>) branchTraversal);
return this.asAdmin().addStep(branchStep);
@@ -3999,7 +3994,7 @@
* @since 3.0.0-incubating
*/
public default <M, E2> GraphTraversal<S, E2> branch(final Function<Traverser<E>, M> function) {
- this.asAdmin().getBytecode().addStep(Symbols.branch, function);
+ this.asAdmin().getGremlinLang().addStep(Symbols.branch, function);
final BranchStep<E, E2, M> branchStep = new BranchStep<>(this.asAdmin());
branchStep.setBranchTraversal((Traversal.Admin<E, M>) __.map(function));
return this.asAdmin().addStep(branchStep);
@@ -4016,7 +4011,7 @@
* @since 3.0.0-incubating
*/
public default <M, E2> GraphTraversal<S, E2> choose(final Traversal<?, M> choiceTraversal) {
- this.asAdmin().getBytecode().addStep(Symbols.choose, choiceTraversal);
+ this.asAdmin().getGremlinLang().addStep(Symbols.choose, choiceTraversal);
return this.asAdmin().addStep(new ChooseStep<>(this.asAdmin(), (Traversal.Admin<E, M>) choiceTraversal));
}
@@ -4033,7 +4028,7 @@
*/
public default <E2> GraphTraversal<S, E2> choose(final Traversal<?, ?> traversalPredicate,
final Traversal<?, E2> trueChoice, final Traversal<?, E2> falseChoice) {
- this.asAdmin().getBytecode().addStep(Symbols.choose, traversalPredicate, trueChoice, falseChoice);
+ this.asAdmin().getGremlinLang().addStep(Symbols.choose, traversalPredicate, trueChoice, falseChoice);
return this.asAdmin().addStep(new ChooseStep<E, E2, Boolean>(this.asAdmin(), (Traversal.Admin<E, ?>) traversalPredicate, (Traversal.Admin<E, E2>) trueChoice, (Traversal.Admin<E, E2>) falseChoice));
}
@@ -4049,7 +4044,7 @@
*/
public default <E2> GraphTraversal<S, E2> choose(final Traversal<?, ?> traversalPredicate,
final Traversal<?, E2> trueChoice) {
- this.asAdmin().getBytecode().addStep(Symbols.choose, traversalPredicate, trueChoice);
+ this.asAdmin().getGremlinLang().addStep(Symbols.choose, traversalPredicate, trueChoice);
return this.asAdmin().addStep(new ChooseStep<E, E2, Boolean>(this.asAdmin(), (Traversal.Admin<E, ?>) traversalPredicate, (Traversal.Admin<E, E2>) trueChoice, (Traversal.Admin<E, E2>) __.identity()));
}
@@ -4064,7 +4059,7 @@
* @since 3.8.0
*/
public default <E2> GraphTraversal<S, E2> choose(final T t) {
- this.asAdmin().getBytecode().addStep(Symbols.choose, t);
+ this.asAdmin().getGremlinLang().addStep(Symbols.choose, t);
return this.asAdmin().addStep(new ChooseStep<>(this.asAdmin(), new TokenTraversal<>(t)));
}
@@ -4081,7 +4076,7 @@
public default <M, E2> GraphTraversal<S, E2> choose(final Function<E, M> choiceFunction) {
if (choiceFunction instanceof T) return choose((T) choiceFunction);
- this.asAdmin().getBytecode().addStep(Symbols.choose, choiceFunction);
+ this.asAdmin().getGremlinLang().addStep(Symbols.choose, choiceFunction);
return this.asAdmin().addStep(new ChooseStep<>(this.asAdmin(), (Traversal.Admin<E, M>) __.map(new FunctionTraverser<>(choiceFunction))));
}
@@ -4100,7 +4095,7 @@
final Traversal<?, E2> trueChoice, final Traversal<?, E2> falseChoice) {
if (choosePredicate instanceof P) return choose((P) choosePredicate, trueChoice, falseChoice);
- this.asAdmin().getBytecode().addStep(Symbols.choose, choosePredicate, trueChoice, falseChoice);
+ this.asAdmin().getGremlinLang().addStep(Symbols.choose, choosePredicate, trueChoice, falseChoice);
return this.asAdmin().addStep(new ChooseStep<E, E2, Boolean>(this.asAdmin(), (Traversal.Admin<E, ?>) __.filter(new PredicateTraverser<>(choosePredicate)), (Traversal.Admin<E, E2>) trueChoice, (Traversal.Admin<E, E2>) falseChoice));
}
@@ -4120,7 +4115,7 @@
if (choosePredicate.isParameterized()) {
throw new IllegalArgumentException("Parameterized predicates are not supported by choose()");
}
- this.asAdmin().getBytecode().addStep(Symbols.choose, choosePredicate, trueChoice, falseChoice);
+ this.asAdmin().getGremlinLang().addStep(Symbols.choose, choosePredicate, trueChoice, falseChoice);
return this.asAdmin().addStep(new ChooseStep<E, E2, Boolean>(this.asAdmin(), (Traversal.Admin<E, ?>) __.is(choosePredicate), (Traversal.Admin<E, E2>) trueChoice, (Traversal.Admin<E, E2>) falseChoice));
}
@@ -4138,7 +4133,7 @@
final Traversal<?, E2> trueChoice) {
if (choosePredicate instanceof P) return choose((P) choosePredicate, trueChoice);
- this.asAdmin().getBytecode().addStep(Symbols.choose, choosePredicate, trueChoice);
+ this.asAdmin().getGremlinLang().addStep(Symbols.choose, choosePredicate, trueChoice);
return this.asAdmin().addStep(new ChooseStep<E, E2, Boolean>(this.asAdmin(), (Traversal.Admin<E, ?>) __.filter(new PredicateTraverser<>(choosePredicate)), (Traversal.Admin<E, E2>) trueChoice, (Traversal.Admin<E, E2>) __.identity()));
}
@@ -4157,7 +4152,7 @@
if (choosePredicate.isParameterized()) {
throw new IllegalArgumentException("Parameterized predicates are not supported by choose()");
}
- this.asAdmin().getBytecode().addStep(Symbols.choose, choosePredicate, trueChoice);
+ this.asAdmin().getGremlinLang().addStep(Symbols.choose, choosePredicate, trueChoice);
return this.asAdmin().addStep(new ChooseStep<E, E2, Boolean>(this.asAdmin(), (Traversal.Admin<E, ?>) __.is(choosePredicate), (Traversal.Admin<E, E2>) trueChoice, (Traversal.Admin<E, E2>) __.identity()));
}
@@ -4170,7 +4165,7 @@
* @since 3.0.0-incubating
*/
public default <E2> GraphTraversal<S, E2> optional(final Traversal<?, E2> optionalTraversal) {
- this.asAdmin().getBytecode().addStep(Symbols.optional, optionalTraversal);
+ this.asAdmin().getGremlinLang().addStep(Symbols.optional, optionalTraversal);
return this.asAdmin().addStep(new OptionalStep<>(this.asAdmin(), (Traversal.Admin<E2, E2>) optionalTraversal));
}
@@ -4183,7 +4178,7 @@
* @since 3.0.0-incubating
*/
public default <E2> GraphTraversal<S, E2> union(final Traversal<?, E2>... unionTraversals) {
- this.asAdmin().getBytecode().addStep(Symbols.union, unionTraversals);
+ this.asAdmin().getGremlinLang().addStep(Symbols.union, unionTraversals);
return this.asAdmin().addStep(new UnionStep<>(this.asAdmin(), Arrays.copyOf(unionTraversals, unionTraversals.length, Traversal.Admin[].class)));
}
@@ -4196,7 +4191,7 @@
* @since 3.0.0-incubating
*/
public default <E2> GraphTraversal<S, E2> coalesce(final Traversal<?, E2>... coalesceTraversals) {
- this.asAdmin().getBytecode().addStep(Symbols.coalesce, coalesceTraversals);
+ this.asAdmin().getGremlinLang().addStep(Symbols.coalesce, coalesceTraversals);
return this.asAdmin().addStep(new CoalesceStep<>(this.asAdmin(), Arrays.copyOf(coalesceTraversals, coalesceTraversals.length, Traversal.Admin[].class)));
}
@@ -4209,7 +4204,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, E> repeat(final Traversal<?, E> repeatTraversal) {
- this.asAdmin().getBytecode().addStep(Symbols.repeat, repeatTraversal);
+ this.asAdmin().getGremlinLang().addStep(Symbols.repeat, repeatTraversal);
return RepeatStep.addRepeatToTraversal(this, (Traversal.Admin<E, E>) repeatTraversal);
}
@@ -4223,7 +4218,7 @@
* @since 3.4.0
*/
public default GraphTraversal<S, E> repeat(final String loopName, final Traversal<?, E> repeatTraversal) {
- this.asAdmin().getBytecode().addStep(Symbols.repeat, loopName, repeatTraversal);
+ this.asAdmin().getGremlinLang().addStep(Symbols.repeat, loopName, repeatTraversal);
return RepeatStep.addRepeatToTraversal(this, loopName, (Traversal.Admin<E, E>) repeatTraversal);
}
@@ -4237,7 +4232,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, E> emit(final Traversal<?, ?> emitTraversal) {
- this.asAdmin().getBytecode().addStep(Symbols.emit, emitTraversal);
+ this.asAdmin().getGremlinLang().addStep(Symbols.emit, emitTraversal);
return RepeatStep.addEmitToTraversal(this, (Traversal.Admin<E, ?>) emitTraversal);
}
@@ -4253,7 +4248,7 @@
if (emitPredicate != null && emitPredicate instanceof P && ((P<Traverser<E>>) emitPredicate).isParameterized()) {
throw new IllegalArgumentException("Parameterized predicates are not supported by emit()");
}
- this.asAdmin().getBytecode().addStep(Symbols.emit, emitPredicate);
+ this.asAdmin().getGremlinLang().addStep(Symbols.emit, emitPredicate);
return RepeatStep.addEmitToTraversal(this, (Traversal.Admin<E, ?>) __.filter(emitPredicate));
}
@@ -4265,7 +4260,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, E> emit() {
- this.asAdmin().getBytecode().addStep(Symbols.emit);
+ this.asAdmin().getGremlinLang().addStep(Symbols.emit);
return RepeatStep.addEmitToTraversal(this, TrueTraversal.instance());
}
@@ -4278,7 +4273,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, E> until(final Traversal<?, ?> untilTraversal) {
- this.asAdmin().getBytecode().addStep(Symbols.until, untilTraversal);
+ this.asAdmin().getGremlinLang().addStep(Symbols.until, untilTraversal);
return RepeatStep.addUntilToTraversal(this, (Traversal.Admin<E, ?>) untilTraversal);
}
@@ -4294,7 +4289,7 @@
if (untilPredicate != null && untilPredicate instanceof P && ((P<Traverser<E>>) untilPredicate).isParameterized()) {
throw new IllegalArgumentException("Parameterized predicates are not supported by until()");
}
- this.asAdmin().getBytecode().addStep(Symbols.until, untilPredicate);
+ this.asAdmin().getGremlinLang().addStep(Symbols.until, untilPredicate);
return RepeatStep.addUntilToTraversal(this, (Traversal.Admin<E, ?>) __.filter(untilPredicate));
}
@@ -4307,7 +4302,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, E> times(final int maxLoops) {
- this.asAdmin().getBytecode().addStep(Symbols.times, maxLoops);
+ this.asAdmin().getGremlinLang().addStep(Symbols.times, maxLoops);
if (this.asAdmin().getEndStep() instanceof TimesModulating) {
((TimesModulating) this.asAdmin().getEndStep()).modulateTimes(maxLoops);
return this;
@@ -4324,7 +4319,7 @@
* @since 3.0.0-incubating
*/
public default <E2> GraphTraversal<S, E2> local(final Traversal<?, E2> localTraversal) {
- this.asAdmin().getBytecode().addStep(Symbols.local, localTraversal);
+ this.asAdmin().getGremlinLang().addStep(Symbols.local, localTraversal);
return this.asAdmin().addStep(new LocalStep<>(this.asAdmin(), localTraversal.asAdmin()));
}
@@ -4338,7 +4333,7 @@
* @since 3.2.0-incubating
*/
public default GraphTraversal<S, E> pageRank() {
- this.asAdmin().getBytecode().addStep(Symbols.pageRank);
+ this.asAdmin().getGremlinLang().addStep(Symbols.pageRank);
return this.asAdmin().addStep((Step<E, E>) new PageRankVertexProgramStep(this.asAdmin(), 0.85d));
}
@@ -4350,7 +4345,7 @@
* @since 3.2.0-incubating
*/
public default GraphTraversal<S, E> pageRank(final double alpha) {
- this.asAdmin().getBytecode().addStep(Symbols.pageRank, alpha);
+ this.asAdmin().getGremlinLang().addStep(Symbols.pageRank, alpha);
return this.asAdmin().addStep((Step<E, E>) new PageRankVertexProgramStep(this.asAdmin(), alpha));
}
@@ -4362,7 +4357,7 @@
* @since 3.2.0-incubating
*/
public default GraphTraversal<S, E> peerPressure() {
- this.asAdmin().getBytecode().addStep(Symbols.peerPressure);
+ this.asAdmin().getGremlinLang().addStep(Symbols.peerPressure);
return this.asAdmin().addStep((Step<E, E>) new PeerPressureVertexProgramStep(this.asAdmin()));
}
@@ -4374,7 +4369,7 @@
* @since 3.4.0
*/
public default GraphTraversal<S, E> connectedComponent() {
- this.asAdmin().getBytecode().addStep(Symbols.connectedComponent);
+ this.asAdmin().getGremlinLang().addStep(Symbols.connectedComponent);
return this.asAdmin().addStep((Step<E, E>) new ConnectedComponentVertexProgramStep(this.asAdmin()));
}
@@ -4392,7 +4387,7 @@
// HALTED_TRAVERSER stored in memory and stored as vertex properties); instead it just emits all vertices.
this.identity();
}
- this.asAdmin().getBytecode().addStep(Symbols.shortestPath);
+ this.asAdmin().getGremlinLang().addStep(Symbols.shortestPath);
return (GraphTraversal<S, Path>) ((Traversal.Admin) this.asAdmin())
.addStep(new ShortestPathVertexProgramStep(this.asAdmin()));
}
@@ -4420,7 +4415,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, E> as(final String stepLabel, final String... stepLabels) {
- this.asAdmin().getBytecode().addStep(Symbols.as, stepLabel, stepLabels);
+ this.asAdmin().getGremlinLang().addStep(Symbols.as, stepLabel, stepLabels);
if (this.asAdmin().getSteps().size() == 0) this.asAdmin().addStep(new StartStep<>(this.asAdmin()));
final Step<?, E> endStep = this.asAdmin().getEndStep();
endStep.addLabel(stepLabel);
@@ -4440,7 +4435,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, E> barrier() {
- this.asAdmin().getBytecode().addStep(Symbols.barrier);
+ this.asAdmin().getGremlinLang().addStep(Symbols.barrier);
return this.asAdmin().addStep(new NoOpBarrierStep<>(this.asAdmin(), Integer.MAX_VALUE));
}
@@ -4454,7 +4449,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, E> barrier(final int maxBarrierSize) {
- this.asAdmin().getBytecode().addStep(Symbols.barrier, maxBarrierSize);
+ this.asAdmin().getGremlinLang().addStep(Symbols.barrier, maxBarrierSize);
return this.asAdmin().addStep(new NoOpBarrierStep<>(this.asAdmin(), maxBarrierSize));
}
@@ -4475,7 +4470,7 @@
* @since 3.4.0
*/
public default <E2> GraphTraversal<S, E2> index() {
- this.asAdmin().getBytecode().addStep(Symbols.index);
+ this.asAdmin().getGremlinLang().addStep(Symbols.index);
return this.asAdmin().addStep(new IndexStep<>(this.asAdmin()));
}
@@ -4490,7 +4485,7 @@
* @since 3.2.0-incubating
*/
public default GraphTraversal<S, E> barrier(final Consumer<TraverserSet<Object>> barrierConsumer) {
- this.asAdmin().getBytecode().addStep(Symbols.barrier, barrierConsumer);
+ this.asAdmin().getGremlinLang().addStep(Symbols.barrier, barrierConsumer);
return this.asAdmin().addStep(new LambdaCollectingBarrierStep<>(this.asAdmin(), (Consumer) barrierConsumer, Integer.MAX_VALUE));
}
@@ -4507,7 +4502,7 @@
* @since 3.4.0
*/
public default GraphTraversal<S,E> with(final String key) {
- this.asAdmin().getBytecode().addStep(Symbols.with, key);
+ this.asAdmin().getGremlinLang().addStep(Symbols.with, key);
final Object[] configPair = { key, true };
((Configuring) this.asAdmin().getEndStep()).configure(configPair);
return this;
@@ -4524,7 +4519,7 @@
* @since 3.4.0
*/
public default GraphTraversal<S,E> with(final String key, final Object value) {
- this.asAdmin().getBytecode().addStep(Symbols.with, key, value);
+ this.asAdmin().getGremlinLang().addStep(Symbols.with, key, value);
final Object[] configPair = { key, value };
((Configuring) this.asAdmin().getEndStep()).configure(configPair);
return this;
@@ -4541,7 +4536,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, E> by() {
- this.asAdmin().getBytecode().addStep(Symbols.by);
+ this.asAdmin().getGremlinLang().addStep(Symbols.by);
((ByModulating) this.asAdmin().getEndStep()).modulateBy();
return this;
}
@@ -4556,7 +4551,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, E> by(final Traversal<?, ?> traversal) {
- this.asAdmin().getBytecode().addStep(Symbols.by, traversal);
+ this.asAdmin().getGremlinLang().addStep(Symbols.by, traversal);
((ByModulating) this.asAdmin().getEndStep()).modulateBy(traversal.asAdmin());
return this;
}
@@ -4571,7 +4566,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, E> by(final T token) {
- this.asAdmin().getBytecode().addStep(Symbols.by, token);
+ this.asAdmin().getGremlinLang().addStep(Symbols.by, token);
((ByModulating) this.asAdmin().getEndStep()).modulateBy(token);
return this;
}
@@ -4586,7 +4581,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, E> by(final String key) {
- this.asAdmin().getBytecode().addStep(Symbols.by, key);
+ this.asAdmin().getGremlinLang().addStep(Symbols.by, key);
((ByModulating) this.asAdmin().getEndStep()).modulateBy(key);
return this;
}
@@ -4601,7 +4596,7 @@
* @since 3.0.0-incubating
*/
public default <V> GraphTraversal<S, E> by(final Function<V, Object> function) {
- this.asAdmin().getBytecode().addStep(Symbols.by, function);
+ this.asAdmin().getGremlinLang().addStep(Symbols.by, function);
((ByModulating) this.asAdmin().getEndStep()).modulateBy(function);
return this;
}
@@ -4619,7 +4614,7 @@
* @since 3.0.0-incubating
*/
public default <V> GraphTraversal<S, E> by(final Traversal<?, ?> traversal, final Comparator<V> comparator) {
- this.asAdmin().getBytecode().addStep(Symbols.by, traversal, comparator);
+ this.asAdmin().getGremlinLang().addStep(Symbols.by, traversal, comparator);
((ByModulating) this.asAdmin().getEndStep()).modulateBy(traversal.asAdmin(), comparator);
return this;
}
@@ -4634,7 +4629,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, E> by(final Comparator<E> comparator) {
- this.asAdmin().getBytecode().addStep(Symbols.by, comparator);
+ this.asAdmin().getGremlinLang().addStep(Symbols.by, comparator);
((ByModulating) this.asAdmin().getEndStep()).modulateBy(comparator);
return this;
}
@@ -4649,7 +4644,7 @@
* @since 3.0.0-incubating
*/
public default GraphTraversal<S, E> by(final Order order) {
- this.asAdmin().getBytecode().addStep(Symbols.by, order);
+ this.asAdmin().getGremlinLang().addStep(Symbols.by, order);
((ByModulating) this.asAdmin().getEndStep()).modulateBy(order);
return this;
}
@@ -4665,7 +4660,7 @@
* @since 3.0.0-incubating
*/
public default <V> GraphTraversal<S, E> by(final String key, final Comparator<V> comparator) {
- this.asAdmin().getBytecode().addStep(Symbols.by, key, comparator);
+ this.asAdmin().getGremlinLang().addStep(Symbols.by, key, comparator);
((ByModulating) this.asAdmin().getEndStep()).modulateBy(key, comparator);
return this;
}
@@ -4681,7 +4676,7 @@
* @since 3.0.0-incubating
*/
public default <U> GraphTraversal<S, E> by(final Function<U, Object> function, final Comparator comparator) {
- this.asAdmin().getBytecode().addStep(Symbols.by, function, comparator);
+ this.asAdmin().getGremlinLang().addStep(Symbols.by, function, comparator);
((ByModulating) this.asAdmin().getEndStep()).modulateBy(function, comparator);
return this;
}
@@ -4703,7 +4698,7 @@
* @since 3.0.0-incubating
*/
public default <M, E2> GraphTraversal<S, E> option(final M token, final Traversal<?, E2> traversalOption) {
- this.asAdmin().getBytecode().addStep(Symbols.option, token, traversalOption);
+ this.asAdmin().getGremlinLang().addStep(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 ?
@@ -4735,7 +4730,7 @@
}
}
- this.asAdmin().getBytecode().addStep(Symbols.option, token, m);
+ this.asAdmin().getGremlinLang().addStep(Symbols.option, token, m);
((TraversalOptionParent<M, E, E2>) this.asAdmin().getEndStep()).addChildOption(token, (Traversal.Admin<E, E2>) new ConstantTraversal<>(m).asAdmin());
return this;
}
@@ -4759,7 +4754,7 @@
throw new IllegalStateException("option() with the Cardinality argument can only be used following mergeV()");
}
- this.asAdmin().getBytecode().addStep(Symbols.option, merge, m, cardinality);
+ this.asAdmin().getGremlinLang().addStep(Symbols.option, merge, m, cardinality);
// do explicit cardinality for every single pair in the map
for (Object k : m.keySet()) {
final Object o = m.get(k);
@@ -4779,7 +4774,7 @@
* @since 3.0.0-incubating
*/
public default <E2> GraphTraversal<S, E> option(final Traversal<?, E2> traversalOption) {
- this.asAdmin().getBytecode().addStep(Symbols.option, traversalOption);
+ this.asAdmin().getGremlinLang().addStep(Symbols.option, traversalOption);
((TraversalOptionParent<Object, E, E2>) this.asAdmin().getEndStep()).addChildOption(Pick.any, (Traversal.Admin<E, E2>) traversalOption.asAdmin());
return this;
}
@@ -4799,7 +4794,7 @@
if (m == null) {
return option(token, (Map) null);
}
- this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.option, token, m);
+ this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.option, token, m);
TraversalOptionParent<M, E, E2> endStep = (TraversalOptionParent<M, E, E2>) this.asAdmin().getEndStep();
endStep.addChildOption(token, (Traversal.Admin<E, E2>) new ConstantTraversal<>(m.get()).asAdmin());
if (endStep instanceof MergeStepContract) {
@@ -4829,7 +4824,7 @@
* @since 3.4.0
*/
public default GraphTraversal<S,E> read() {
- this.asAdmin().getBytecode().addStep(Symbols.read);
+ this.asAdmin().getGremlinLang().addStep(Symbols.read);
((ReadWriting) this.asAdmin().getEndStep()).setMode(ReadWriting.Mode.READING);
return this;
}
@@ -4844,7 +4839,7 @@
* @since 3.4.0
*/
public default GraphTraversal<S,E> write() {
- this.asAdmin().getBytecode().addStep(Symbols.write);
+ this.asAdmin().getGremlinLang().addStep(Symbols.write);
((ReadWriting) this.asAdmin().getEndStep()).setMode(ReadWriting.Mode.WRITING);
return this;
}
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 712080f..9e1d350 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
@@ -22,7 +22,7 @@
import org.apache.tinkerpop.gremlin.process.computer.GraphComputer;
import org.apache.tinkerpop.gremlin.process.remote.RemoteConnection;
import org.apache.tinkerpop.gremlin.process.remote.traversal.strategy.decoration.RemoteStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
+import org.apache.tinkerpop.gremlin.process.traversal.GremlinLang;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategies;
@@ -71,7 +71,7 @@
protected transient RemoteConnection connection;
protected final Graph graph;
protected TraversalStrategies strategies;
- protected Bytecode bytecode = new Bytecode();
+ protected GremlinLang gremlinLang = new GremlinLang();
////////////////
@@ -120,8 +120,8 @@
}
@Override
- public Bytecode getBytecode() {
- return this.bytecode;
+ public GremlinLang getGremlinLang() {
+ return this.gremlinLang;
}
@SuppressWarnings("CloneDoesntDeclareCloneNotSupportedException")
@@ -129,7 +129,7 @@
try {
final GraphTraversalSource clone = (GraphTraversalSource) super.clone();
clone.strategies = this.strategies.clone();
- clone.bytecode = this.bytecode.clone();
+ clone.gremlinLang = this.gremlinLang.clone();
return clone;
} catch (final CloneNotSupportedException e) {
throw new IllegalStateException(e.getMessage(), e);
@@ -296,14 +296,14 @@
return this;
final GraphTraversalSource clone = this.clone();
RequirementsStrategy.addRequirements(clone.getStrategies(), TraverserRequirement.ONE_BULK);
- clone.bytecode.addSource(Symbols.withBulk, useBulk);
+ clone.gremlinLang.addSource(Symbols.withBulk, useBulk);
return clone;
}
public GraphTraversalSource withPath() {
final GraphTraversalSource clone = this.clone();
RequirementsStrategy.addRequirements(clone.getStrategies(), TraverserRequirement.PATH);
- clone.bytecode.addSource(Symbols.withPath);
+ clone.gremlinLang.addSource(Symbols.withPath);
return clone;
}
@@ -318,7 +318,7 @@
public GraphTraversal<Vertex, Vertex> addV(final String vertexLabel) {
if (null == vertexLabel) throw new IllegalArgumentException("vertexLabel cannot be null");
final GraphTraversalSource clone = this.clone();
- clone.bytecode.addStep(GraphTraversal.Symbols.addV, vertexLabel);
+ clone.gremlinLang.addStep(GraphTraversal.Symbols.addV, vertexLabel);
final GraphTraversal.Admin<Vertex, Vertex> traversal = new DefaultGraphTraversal<>(clone);
return traversal.addStep(new AddVertexStartStepPlaceholder(traversal, vertexLabel));
}
@@ -332,7 +332,7 @@
public GraphTraversal<Vertex, Vertex> addV(final Traversal<?, String> vertexLabelTraversal) {
if (null == vertexLabelTraversal) throw new IllegalArgumentException("vertexLabelTraversal cannot be null");
final GraphTraversalSource clone = this.clone();
- clone.bytecode.addStep(GraphTraversal.Symbols.addV, vertexLabelTraversal);
+ clone.gremlinLang.addStep(GraphTraversal.Symbols.addV, vertexLabelTraversal);
final GraphTraversal.Admin<Vertex, Vertex> traversal = new DefaultGraphTraversal<>(clone);
return traversal.addStep(new AddVertexStartStepPlaceholder(traversal, vertexLabelTraversal.asAdmin()));
}
@@ -344,7 +344,7 @@
*/
public GraphTraversal<Vertex, Vertex> addV() {
final GraphTraversalSource clone = this.clone();
- clone.bytecode.addStep(GraphTraversal.Symbols.addV);
+ clone.gremlinLang.addStep(GraphTraversal.Symbols.addV);
final GraphTraversal.Admin<Vertex, Vertex> traversal = new DefaultGraphTraversal<>(clone);
return traversal.addStep(new AddVertexStartStepPlaceholder(traversal, (String) null));
}
@@ -358,7 +358,7 @@
public GraphTraversal<Vertex, Vertex> addV(final GValue<String> vertexLabel) {
if (null == vertexLabel) throw new IllegalArgumentException("vertexLabel cannot be null");
final GraphTraversalSource clone = this.clone();
- clone.bytecode.addStep(GraphTraversal.Symbols.addV, vertexLabel);
+ clone.gremlinLang.addStep(GraphTraversal.Symbols.addV, vertexLabel);
final GraphTraversal.Admin<Vertex, Vertex> traversal = new DefaultGraphTraversal<>(clone);
return traversal.addStep(new AddVertexStartStepPlaceholder(traversal, vertexLabel));
}
@@ -370,7 +370,7 @@
*/
public GraphTraversal<Edge, Edge> addE(final String label) {
final GraphTraversalSource clone = this.clone();
- clone.bytecode.addStep(GraphTraversal.Symbols.addE, label);
+ clone.gremlinLang.addStep(GraphTraversal.Symbols.addE, label);
final GraphTraversal.Admin<Edge, Edge> traversal = new DefaultGraphTraversal<>(clone);
return traversal.addStep(new AddEdgeStartStepPlaceholder(traversal, label));
}
@@ -382,7 +382,7 @@
*/
public GraphTraversal<Edge, Edge> addE(final Traversal<?, String> edgeLabelTraversal) {
final GraphTraversalSource clone = this.clone();
- clone.bytecode.addStep(GraphTraversal.Symbols.addE, edgeLabelTraversal);
+ clone.gremlinLang.addStep(GraphTraversal.Symbols.addE, edgeLabelTraversal);
final GraphTraversal.Admin<Edge, Edge> traversal = new DefaultGraphTraversal<>(clone);
return traversal.addStep(new AddEdgeStartStepPlaceholder(traversal, edgeLabelTraversal.asAdmin()));
}
@@ -394,7 +394,7 @@
*/
public GraphTraversal<Edge, Edge> addE(final GValue<String> label) {
final GraphTraversalSource clone = this.clone();
- clone.bytecode.addStep(GraphTraversal.Symbols.addE, label);
+ clone.gremlinLang.addStep(GraphTraversal.Symbols.addE, label);
final GraphTraversal.Admin<Edge, Edge> traversal = new DefaultGraphTraversal<>(clone);
return traversal.addStep(new AddEdgeStartStepPlaceholder(traversal, label));
}
@@ -410,7 +410,7 @@
*/
public GraphTraversal<Vertex, Vertex> mergeV(final Map<Object, Object> searchCreate) {
final GraphTraversalSource clone = 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 MergeVertexStepPlaceholder<>(traversal, true, searchCreate));
}
@@ -427,7 +427,7 @@
*/
public <S> GraphTraversal<S, Vertex> mergeV(final Traversal<?, Map<Object, Object>> searchCreate) {
final GraphTraversalSource clone = this.clone();
- clone.bytecode.addStep(GraphTraversal.Symbols.mergeV, searchCreate);
+ clone.gremlinLang.addStep(GraphTraversal.Symbols.mergeV, searchCreate);
final GraphTraversal.Admin<S, Vertex> traversal = new DefaultGraphTraversal<>(clone);
final MergeVertexStepPlaceholder<S> step = null == searchCreate ? new MergeVertexStepPlaceholder(traversal, true, (Map) null) :
@@ -447,7 +447,7 @@
*/
public GraphTraversal<Vertex, Vertex> mergeV(final GValue<Map<?, ?>> 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);
final MergeVertexStepPlaceholder<Vertex> step = null == searchCreate ? new MergeVertexStepPlaceholder(traversal, true, (Map) null) :
new MergeVertexStepPlaceholder(traversal, true, searchCreate);
@@ -464,7 +464,7 @@
*/
public GraphTraversal<Edge, Edge> mergeE(final Map<Object, Object> searchCreate) {
final GraphTraversalSource clone = 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 MergeEdgeStepPlaceholder<>(traversal, true, searchCreate));
}
@@ -478,7 +478,7 @@
*/
public GraphTraversal<Edge, Edge> mergeE(final Traversal<?, Map<Object, Object>> searchCreate) {
final GraphTraversalSource clone = 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);
final MergeEdgeStepPlaceholder step = null == searchCreate ? new MergeEdgeStepPlaceholder(traversal, true, (Map) null) :
@@ -496,7 +496,7 @@
*/
public GraphTraversal<Edge, Edge> mergeE(final GValue<Map<Object, 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);
final MergeEdgeStepPlaceholder<Edge> step = null == searchCreate ? new MergeEdgeStepPlaceholder(traversal, true, (Map) null) :
new MergeEdgeStepPlaceholder(traversal, true, searchCreate);
@@ -511,7 +511,7 @@
// a single null is [null]
final S[] s = null == starts ? (S[]) new Object[] { null } : starts;
final GraphTraversalSource clone = this.clone();
- clone.bytecode.addStep(GraphTraversal.Symbols.inject, s);
+ clone.gremlinLang.addStep(GraphTraversal.Symbols.inject, s);
final GraphTraversal.Admin<S, S> traversal = new DefaultGraphTraversal<>(clone);
return traversal.addStep(new InjectStep<S>(traversal, s));
}
@@ -526,7 +526,7 @@
// a single null is [null]
final Object[] ids = null == vertexIds ? new Object[] { null } : vertexIds;
final GraphTraversalSource clone = this.clone();
- clone.bytecode.addStep(GraphTraversal.Symbols.V, ids);
+ clone.gremlinLang.addStep(GraphTraversal.Symbols.V, ids);
final GraphTraversal.Admin<Vertex, Vertex> traversal = new DefaultGraphTraversal<>(clone);
GraphStepContract<Vertex, Vertex> step;
if (GValue.containsGValues(ids)) {
@@ -547,7 +547,7 @@
// a single null is [null]
final Object[] ids = null == edgeIds ? new Object[] { null } : edgeIds;
final GraphTraversalSource clone = this.clone();
- clone.bytecode.addStep(GraphTraversal.Symbols.E, ids);
+ clone.gremlinLang.addStep(GraphTraversal.Symbols.E, ids);
final GraphTraversal.Admin<Edge, Edge> traversal = new DefaultGraphTraversal<>(clone);
GraphStepContract<Edge, Edge> step;
if (GValue.containsGValues(ids)) {
@@ -565,7 +565,7 @@
*/
public <S> GraphTraversal<S, S> call() {
final GraphTraversalSource clone = this.clone();
- clone.bytecode.addStep(GraphTraversal.Symbols.call);
+ clone.gremlinLang.addStep(GraphTraversal.Symbols.call);
final GraphTraversal.Admin<S, S> traversal = new DefaultGraphTraversal<>(clone);
return traversal.addStep(new CallStep<>(traversal, true));
}
@@ -578,7 +578,7 @@
*/
public <S> GraphTraversal<S, S> call(final String service) {
final GraphTraversalSource clone = this.clone();
- clone.bytecode.addStep(GraphTraversal.Symbols.call, service);
+ clone.gremlinLang.addStep(GraphTraversal.Symbols.call, service);
final GraphTraversal.Admin<S, S> traversal = new DefaultGraphTraversal<>(clone);
return traversal.addStep(new CallStep<>(traversal, true, service));
}
@@ -593,7 +593,7 @@
*/
public <S> GraphTraversal<S, S> call(final String service, final Map params) {
final GraphTraversalSource clone = 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));
}
@@ -608,7 +608,7 @@
*/
public <S> GraphTraversal<S, S> call(final String service, final Traversal<S, Map> childTraversal) {
final GraphTraversalSource clone = this.clone();
- clone.bytecode.addStep(GraphTraversal.Symbols.call, service, childTraversal);
+ clone.gremlinLang.addStep(GraphTraversal.Symbols.call, service, childTraversal);
final GraphTraversal.Admin<S, S> traversal = new DefaultGraphTraversal<>(clone);
final CallStep<S,S> step = null == childTraversal ? new CallStep(traversal, true, service) :
new CallStep(traversal, true, service, new LinkedHashMap(), childTraversal.asAdmin());
@@ -628,7 +628,7 @@
*/
public <S> GraphTraversal<S, S> call(final String service, final Map params, final Traversal<S, Map> childTraversal) {
final GraphTraversalSource clone = this.clone();
- clone.bytecode.addStep(GraphTraversal.Symbols.call, service, params, childTraversal);
+ clone.gremlinLang.addStep(GraphTraversal.Symbols.call, service, params, childTraversal);
final GraphTraversal.Admin<S, S> traversal = new DefaultGraphTraversal<>(clone);
final CallStep<S,S> step = null == childTraversal ? new CallStep(traversal, true, service, params) :
new CallStep(traversal, true, service, params, childTraversal.asAdmin());
@@ -645,7 +645,7 @@
*/
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 CallStepPlaceholder<>(traversal, true, service, params));
}
@@ -660,7 +660,7 @@
*/
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, childTraversal);
+ clone.gremlinLang.addStep(GraphTraversal.Symbols.call, service, params, childTraversal);
final GraphTraversal.Admin<S, S> traversal = new DefaultGraphTraversal<>(clone);
return traversal.addStep(new CallStepPlaceholder<>(traversal, true, service, params, childTraversal.asAdmin()));
}
@@ -674,7 +674,7 @@
*/
public <S> GraphTraversal<S, S> union(final Traversal<?, S>... unionTraversals) {
final GraphTraversalSource clone = this.clone();
- clone.bytecode.addStep(GraphTraversal.Symbols.union, unionTraversals);
+ clone.gremlinLang.addStep(GraphTraversal.Symbols.union, unionTraversals);
final GraphTraversal.Admin traversal = new DefaultGraphTraversal(clone);
final UnionStep<?, S> step = new UnionStep<>(traversal, true, Arrays.copyOf(unionTraversals, unionTraversals.length, Traversal.Admin[].class));
return traversal.addStep(step);
@@ -696,7 +696,7 @@
*/
public <S> GraphTraversal<S, S> io(final String file) {
final GraphTraversalSource clone = this.clone();
- clone.bytecode.addStep(GraphTraversal.Symbols.io, file);
+ clone.gremlinLang.addStep(GraphTraversal.Symbols.io, file);
final GraphTraversal.Admin<S,S> traversal = new DefaultGraphTraversal<>(clone);
return traversal.addStep(new IoStep<S>(traversal, file));
}
@@ -708,13 +708,7 @@
if (null == this.connection)
return this.graph.tx();
else {
- // prevent child transactions and let the current Transaction object be bound to the
- // TraversalSource that spawned it
- final Transaction tx = this.connection.tx();
- if (tx == Transaction.NO_OP && this.connection instanceof Transaction)
- return (Transaction) this.connection;
- else
- return tx;
+ throw new UnsupportedOperationException("TinkerPop 4 does not yet support remote transactions");
}
}
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 ea86ad6..14418cf 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
@@ -113,6 +113,13 @@
}
/**
+ * @see GraphTraversal#constant(GValue)
+ */
+ public static <A> GraphTraversal<A, A> constant(final GValue<A> a) {
+ return __.<A>start().constant(a);
+ }
+
+ /**
* @see GraphTraversal#label()
*/
public static <A extends Element> GraphTraversal<A, String> label() {
@@ -979,10 +986,10 @@
}
/**
- * @see GraphTraversal#difference(GValue)
+ * @see GraphTraversal#discard()
*/
- public static <A> GraphTraversal<A, Set<?>> difference(final GValue<Object> values) {
- return __.<A>start().difference(values);
+ public static <A> GraphTraversal<A, A> discard() {
+ return __.<A>start().discard();
}
/**
@@ -993,13 +1000,6 @@
}
/**
- * @see GraphTraversal#disjunct(GValue)
- */
- public static <A> GraphTraversal<A, Set<?>> disjunct(final GValue<Object> values) {
- return __.<A>start().disjunct(values);
- }
-
- /**
* @see GraphTraversal#intersect(Object)
*/
public static <A> GraphTraversal<A, Set<?>> intersect(final Object values) {
@@ -1007,13 +1007,6 @@
}
/**
- * @see GraphTraversal#intersect(GValue)
- */
- public static <A> GraphTraversal<A, Set<?>> intersect(final GValue<Object> values) {
- return __.<A>start().intersect(values);
- }
-
- /**
* @see GraphTraversal#conjoin(String)
*/
public static <A> GraphTraversal<A, String> conjoin(final String values) {
@@ -1026,6 +1019,7 @@
public static <A, B> GraphTraversal<A, B> merge(final Object values) {
return __.<A>start().merge(values);
}
+
/**
* @see GraphTraversal#combine(Object)
*/
@@ -1275,13 +1269,6 @@
}
/**
- * @see GraphTraversal#discard()
- */
- public static <A> GraphTraversal<A, A> discard() {
- return __.<A>start().discard();
- }
-
- /**
* @see GraphTraversal#not(Traversal)
*/
public static <A> GraphTraversal<A, A> not(final Traversal<?, ?> notTraversal) {
@@ -1296,6 +1283,13 @@
}
/**
+ * @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)
*/
public static <A> GraphTraversal<A, A> range(final long low, final long high) {
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/AbstractLambdaTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/AbstractLambdaTraversal.java
index ba82923..314499f 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/AbstractLambdaTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/AbstractLambdaTraversal.java
@@ -18,8 +18,8 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.lambda;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
import org.apache.tinkerpop.gremlin.process.traversal.GValueManager;
+import org.apache.tinkerpop.gremlin.process.traversal.GremlinLang;
import org.apache.tinkerpop.gremlin.process.traversal.Step;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalSideEffects;
@@ -62,8 +62,8 @@
}
@Override
- public Bytecode getBytecode() {
- return null == this.bypassTraversal ? new Bytecode() : this.bypassTraversal.getBytecode();
+ public GremlinLang getGremlinLang() {
+ return null == this.bypassTraversal ? new GremlinLang() : this.bypassTraversal.getGremlinLang();
}
@Override
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/CardinalityValueTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/CardinalityValueTraversal.java
index c18e94d..f92be27 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/CardinalityValueTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/CardinalityValueTraversal.java
@@ -18,8 +18,7 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.lambda;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
-import org.apache.tinkerpop.gremlin.process.traversal.GValueManager;
+import org.apache.tinkerpop.gremlin.process.traversal.GremlinLang;
import org.apache.tinkerpop.gremlin.structure.VertexProperty;
import java.util.Objects;
@@ -30,22 +29,17 @@
private final Object value;
- private final Bytecode bytecode;
+ private final GremlinLang gremlinLang;
public CardinalityValueTraversal(final VertexProperty.Cardinality cardinality, final Object value) {
this.cardinality = cardinality;
this.value = value;
- this.bytecode = new Bytecode(CardinalityValueTraversal.class.getSimpleName(), cardinality.name(), value);
- }
-
- public static CardinalityValueTraversal from(final Bytecode.Instruction inst) {
- return new CardinalityValueTraversal(VertexProperty.Cardinality.valueOf(inst.getArguments()[0].toString()),
- inst.getArguments()[1]);
+ this.gremlinLang = new GremlinLang(CardinalityValueTraversal.class.getSimpleName(), cardinality.name(), value);
}
@Override
- public Bytecode getBytecode() {
- return this.bytecode;
+ public GremlinLang getGremlinLang() {
+ return this.gremlinLang;
}
public VertexProperty.Cardinality getCardinality() {
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 b22d88e..8a662b3 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 @@
*/
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, null) : GValue.of(null, end);
+ }
+
+ public ConstantTraversal(final GValue<E> end) {
+ this.end = null == end ? GValue.of(null, 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 0000000..817b267
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/GType.java
@@ -0,0 +1,105 @@
+/*
+ * 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.time.OffsetDateTime;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+
+/**
+ * An enum that describes types that are used in the Gremlin language.
+ */
+public enum GType {
+ BIG_DECIMAL(BigDecimal.class),
+ BIG_INTEGER(BigInteger.class),
+ BOOLEAN(Boolean.class),
+ BYTE(Byte.class),
+ CHARACTER(Character.class),
+ DATETIME(OffsetDateTime.class),
+ DOUBLE(Double.class),
+ FLOAT(Float.class),
+ INTEGER(Integer.class),
+ LIST(List.class),
+ LONG(Long.class),
+ MAP(Map.class),
+ SET(Set.class),
+ SHORT(Short.class),
+ STRING(String.class),
+ UNKNOWN(null),
+ UUID(UUID.class),
+ VERTEX(Vertex.class);
+
+ 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.
+ */
+ public boolean isNumeric() {
+ return this == BYTE || this == SHORT || this == INTEGER || this == LONG ||
+ this == FLOAT || this == DOUBLE || this == BIG_INTEGER || this == BIG_DECIMAL;
+ }
+
+ /**
+ * Returns {@code true} if the type is a collection.v
+ */
+ public boolean isCollection() {
+ return this == LIST || this == SET;
+ }
+
+ /**
+ * 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 Byte) return BYTE;
+ else if (object instanceof Short) return SHORT;
+ else if (object instanceof Character) return CHARACTER;
+ else if (object instanceof Integer) return INTEGER;
+ else if (object instanceof Boolean) return BOOLEAN;
+ else if (object instanceof Float) return FLOAT;
+ 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 BigInteger) return BIG_INTEGER;
+ else if (object instanceof BigDecimal) return BIG_DECIMAL;
+ else if (object instanceof OffsetDateTime) return DATETIME;
+ else if (object instanceof UUID) return UUID;
+ else return UNKNOWN;
+ }
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/RepeatStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/RepeatStep.java
index 17b8a2e..8670abd 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/RepeatStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/RepeatStep.java
@@ -183,14 +183,13 @@
@Override
public int hashCode() {
int result = super.hashCode();
+ result ^= Boolean.hashCode(this.untilFirst);
+ result ^= Boolean.hashCode(this.emitFirst) << 1;
// not a normal state, but prevents NPE during strategy application allowing the better
// user-friendly error message to show up at iteration
if (this.repeatTraversal != null)
- result ^= repeatTraversal.hashCode();
-
- result ^= Boolean.hashCode(this.untilFirst);
- result ^= Boolean.hashCode(this.emitFirst) << 1;
+ result ^= this.repeatTraversal.hashCode();
if (this.loopName != null)
result ^= this.loopName.hashCode();
if (this.untilTraversal != null)
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 e4a44ab..0efea04 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 @@
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,23 @@
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;
public CoinStep(final Traversal.Admin traversal, final double probability) {
super(traversal);
- this.probability = probability;
+ this.probability = GValue.ofDouble(null, probability);
+ }
+
+ public CoinStep(final Traversal.Admin traversal, final GValue<Double> probability) {
+ super(traversal);
+ this.probability = null == probability ? GValue.ofDouble(null,null) : probability;
}
@Override
@@ -47,7 +55,11 @@
}
public double getProbability() {
- return this.probability;
+ return probability.get();
+ }
+
+ public GValue<Double> getProbabilityGValue() {
+ return probability;
}
@Override
@@ -55,11 +67,11 @@
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 +85,7 @@
@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/filter/DiscardStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/DiscardStep.java
index 45baf81..2feaf9f 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/DiscardStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/DiscardStep.java
@@ -1,22 +1,21 @@
/*
- * 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
+ * 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
+ * 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.
+ * 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.filter;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/NoneStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/NoneStep.java
index f2090d6..79943b2 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/NoneStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/NoneStep.java
@@ -76,4 +76,4 @@
public Set<TraverserRequirement> getRequirements() {
return EnumSet.of(TraverserRequirement.OBJECT);
}
-}
\ No newline at end of file
+}
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 b3f448c..4e6a6bd 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
@@ -38,7 +38,7 @@
*/
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);
@@ -46,7 +46,7 @@
if (values instanceof Traversal) {
valueTraversal = integrateChild(((Traversal<S, E>) values).asAdmin());
} else {
- parameterItems = values;
+ parameterItems = values instanceof GValue ? (GValue<Object>) values : GValue.of(null, values);
}
}
@@ -54,9 +54,9 @@
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);
@@ -69,7 +69,11 @@
return (null == valueTraversal) ? Collections.emptyList() : Collections.singletonList(valueTraversal);
}
- public Object getParameterItems() {
+ 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 ce6818b..844a83a 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 @@
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 @@
* 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(null, 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 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,12 +59,12 @@
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;
@@ -67,6 +72,10 @@
}
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 9434cc3..1598e67 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 @@
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,36 @@
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, constant instanceof GValue ? (GValue) constant : GValue.of(null, constant));
+ }
+
+ public ConstantStep(final Traversal.Admin traversal, final GValue<E> constant) {
super(traversal);
- this.constant = constant;
+ this.constant = null == constant ? GValue.of(null, 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/DifferenceStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/DifferenceStep.java
index a1a5d8f..50cbbe4 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 @@
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,14 +37,15 @@
*/
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(null, values);
}
}
@@ -51,8 +53,12 @@
return parameterItems;
}
- public Traversal.Admin<S, E> getValueTraversal() {
- return valueTraversal;
+ public Traversal.Admin<S,E> getValueTraversal() {
+ return this.valueTraversal;
+ }
+
+ public GValue<Object> getParameterItemsGValue() {
+ return parameterItems;
}
@Override
@@ -61,7 +67,7 @@
@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 60eebf0..de3336e 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 @@
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 @@
*/
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(null, values);
}
}
@@ -51,7 +53,11 @@
}
public Object getParameterItems() {
- return this.parameterItems;
+ return parameterItems;
+ }
+
+ public GValue<Object> getParameterItemsGValue() {
+ return parameterItems;
}
@Override
@@ -60,7 +66,7 @@
@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/IntersectStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/IntersectStep.java
index 651dec7..110e052 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 @@
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 @@
*/
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 @@
if (values instanceof Traversal) {
valueTraversal = integrateChild(((Traversal<S, E>) values).asAdmin());
} else {
- parameterItems = values;
+ parameterItems = values instanceof GValue ? (GValue<Object>) values : GValue.of(null, values);
}
}
@@ -53,16 +54,20 @@
}
public Object getParameterItems() {
- return this.parameterItems;
+ return parameterItems;
+ }
+
+ public GValue<Object> getParameterItemsGValue() {
+ return parameterItems;
}
@Override
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/map/MergeEdgeStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeEdgeStep.java
index 1e9d47e..c43c248 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
@@ -389,7 +389,7 @@
return tryAttachVertex(v);
}
throw new IllegalArgumentException(
- String.format("Vertex could not be resolved from mergeE: %s", o));
+ String.format("Vertex does not exist for mergeE: %s", o));
}
/*
@@ -404,7 +404,7 @@
try (CloseableIterator<Vertex> it = CloseableIterator.of(getGraph().vertices(arg))) {
if (!it.hasNext())
throw new IllegalArgumentException(
- String.format("Vertex id could not be resolved from mergeE: %s", arg));
+ String.format("Vertex does not exist for mergeE: %s", arg));
return it.next();
}
}
@@ -419,7 +419,7 @@
return ((Attachable<Vertex>) v).attach(Attachable.Method.get(getGraph()));
} catch (IllegalStateException ise) {
throw new IllegalArgumentException(
- String.format("Vertex could not be resolved from mergeE: %s", v));
+ String.format("Vertex does not exist for mergeE: %s", v));
}
} else {
return v;
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 c524727..daae481 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
@@ -162,7 +162,6 @@
return children;
}
- @Override
public boolean isUsingPartitionStrategy() {
return usesPartitionStrategy;
}
@@ -408,5 +407,4 @@
}
return false;
}
-
}
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 d11fdf0..7a169b4 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 @@
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,18 +41,32 @@
*/
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);
if (values instanceof Traversal) {
valueTraversal = integrateChild(((Traversal<S, E>) values).asAdmin());
+ } else if (values instanceof GValue){
+ parameterItems = (GValue<Object>) values;
} else {
- parameterItems = values;
+ parameterItems = GValue.of(null, values);
}
}
+ public Traversal.Admin<S, E> getValueTraversal() {
+ return valueTraversal;
+ }
+
+ public Object getParameterItems() {
+ return parameterItems;
+ }
+
+ public GValue<Object> getParameterItemsGValue() {
+ return parameterItems;
+ }
+
@Override
public String getStepName() { return "merge"; }
@@ -61,7 +76,7 @@
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 +91,13 @@
} 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();
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 e54288e..279af65 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
@@ -58,7 +58,7 @@
public MergeVertexStep(final Traversal.Admin traversal, final boolean isStart, final Map<Object, Object> merge) {
super(traversal, isStart, merge);
}
-
+
public MergeVertexStep(final Traversal.Admin traversal, final boolean isStart, final Traversal.Admin<S,Map<Object, Object>> mergeTraversal) {
super(traversal, isStart, mergeTraversal);
}
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 b14c02b..6837333 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 @@
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 @@
*/
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,29 @@
if (values instanceof Traversal) {
valueTraversal = integrateChild(((Traversal<S, E>) values).asAdmin());
} else {
- parameterItems = values;
+ parameterItems = values instanceof GValue ? (GValue<Object>) values : GValue.of(null, values);
}
}
+ public Traversal.Admin<S,E> getValueTraversal() {
+ return this.valueTraversal;
+ }
+
+ public Object getParameterItems() {
+ return parameterItems;
+ }
+
+ public GValue<Object> getParameterItemsGValue() {
+ 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 0502f18..fa27d5a 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,29 +27,39 @@
*/
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 = GValue.ensureGValues(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<>(clone.injections);
+ clone.start = new ArrayIterator<>(GValue.resolveToValues(clone.injections));
return clone;
}
@Override
public void reset() {
super.reset();
- this.start = new ArrayIterator<>(this.injections);
+ this.start = new ArrayIterator<>(GValue.resolveToValues(this.injections));
}
- public S[] getInjections() {
+ /**
+ * Get the injections of the step.
+ */
+ public GValue<S>[] getInjectionsGValue() {
return this.injections;
}
+
+ /**
+ * Gets the injections of the step but unwraps the {@link GValue}.
+ */
+ public S[] getInjections() {
+ return (S[]) 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 d4545ea..72f03b5 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
@@ -228,5 +228,4 @@
}
return traverser;
}
-
}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/TraversalStrategyProxy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/TraversalStrategyProxy.java
index ea4415a..e1ac044 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/TraversalStrategyProxy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/TraversalStrategyProxy.java
@@ -20,16 +20,20 @@
package org.apache.tinkerpop.gremlin.process.traversal.strategy;
import org.apache.commons.configuration2.Configuration;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
+import org.apache.commons.configuration2.MapConfiguration;
+import org.apache.tinkerpop.gremlin.language.grammar.TraversalStrategyVisitor;
+import org.apache.tinkerpop.gremlin.process.traversal.GremlinLang;
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.structure.util.StringFactory;
import java.io.Serializable;
+import java.util.Collections;
/**
- * This class is for use with {@link Bytecode} and for serialization purposes. It is not meant for direct use with
+ * This class is for use with {@link GremlinLang} and for serialization purposes. It is not meant for direct use with
* {@link TraversalSource#withStrategies(TraversalStrategy[])}.
*
* @author Marko A. Rodriguez (http://markorodriguez.com)
@@ -37,23 +41,50 @@
public final class TraversalStrategyProxy<T extends TraversalStrategy> implements Serializable, TraversalStrategy {
private final Configuration configuration;
- private final Class<T> strategyClass;
+ private final String strategyName;
- public TraversalStrategyProxy(final T traversalStrategy) {
- this((Class<T>) traversalStrategy.getClass(), traversalStrategy.getConfiguration());
+ public TraversalStrategyProxy(final String strategyName) {
+ this(strategyName, new MapConfiguration(Collections.EMPTY_MAP));
}
- public TraversalStrategyProxy(final Class<T> strategyClass, final Configuration configuration) {
+ public TraversalStrategyProxy(final String strategyName, final Configuration configuration) {
this.configuration = configuration;
- this.strategyClass = strategyClass;
+ this.strategyName = strategyName;
+ }
+
+ public TraversalStrategyProxy(final T traversalStrategy) {
+ this(traversalStrategy.getClass().getSimpleName(), traversalStrategy.getConfiguration());
+ }
+
+ /**
+ * @deprecated
+ * This constructor has been deprecated since 4.0.0 as TraversalStrategyProxy is now based around strategy names,
+ * instead of strategy classes. Use {@link TraversalStrategyProxy#TraversalStrategyProxy(String, Configuration)}
+ * instead.
+ */
+ @Deprecated
+ public TraversalStrategyProxy(final Class<T> strategyClass, final Configuration configuration) {
+ this(strategyClass.getSimpleName(), configuration);
}
public Configuration getConfiguration() {
return this.configuration;
}
+ public String getStrategyName() {
+ return this.strategyName;
+ }
+
+ /**
+ * @deprecated
+ * As of 4.0.0, TraversalStrategyProxy is now based around strategy names, instead of strategy classes. For
+ * compatibility, this method will attempt to lookup the strategy name in {@link TraversalStrategies.GlobalCache}.
+ * Use of {@link TraversalStrategyProxy#getStrategyName()} is preferred. If a class object is needed, users should
+ * utilize a mapping of strategy name to strategy class which is appropriate for their environment.
+ */
+ @Deprecated
public Class<T> getStrategyClass() {
- return this.strategyClass;
+ return (Class<T>) TraversalStrategies.GlobalCache.getRegisteredStrategyClass(strategyName).get();
}
@Override
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 ce794b8..42aaf1a 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,11 +22,13 @@
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;
import org.javatuples.Triplet;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import java.util.function.BinaryOperator;
@@ -60,7 +62,13 @@
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
+ strategy.sideEffects.add(new Triplet<>(key, (Supplier & Serializable) (() -> {
+ Object initialValue = value instanceof Supplier ? ((Supplier) value).get() : value;
+ return GValue.valueOf(initialValue);
+ }), reducer));
}
public boolean contains(final String sideEffectKey) {
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/LazyBarrierStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/LazyBarrierStrategy.java
index aa46b59..1a51ea0 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/LazyBarrierStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/LazyBarrierStrategy.java
@@ -23,9 +23,9 @@
import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.step.Barrier;
import org.apache.tinkerpop.gremlin.process.traversal.step.PathProcessor;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.DiscardStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.DropStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.HasStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.DiscardStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.ElementStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.FlatMapStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.GraphStep;
@@ -113,7 +113,7 @@
(i > 0 || ((GraphStep) step).getIds().length >= BIG_START_SIZE ||
(((GraphStep) step).getIds().length == 0 && !(step.getNextStep() instanceof HasStep))))) {
- // NoneStep, EmptyStep signify the end of the traversal where no barriers are really going to be
+ // DiscardStep, EmptyStep signify the end of the traversal where no barriers are really going to be
// helpful after that. ProfileSideEffectStep means the traversal had profile() called on it and if
// we don't account for that a barrier will inject at the end of the traversal where it wouldn't
// be otherwise. LazyBarrierStrategy executes before the finalization strategy of ProfileStrategy
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/StandardVerificationStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/StandardVerificationStrategy.java
index 99e015d..9034e67 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/StandardVerificationStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/StandardVerificationStrategy.java
@@ -72,7 +72,7 @@
// The ProfileSideEffectStep must be one of the following
// (1) the last step
- // (2) 2nd last step when accompanied by the cap step or discard step (i.e. iterate() to nothing)
+ // (2) 2nd last step when accompanied by the cap step or none step (i.e. iterate() to nothing)
// (3) 3rd to last when the traversal ends with a RequirementsStep.
final Step<?, ?> endStep = traversal.asAdmin().getEndStep();
if (TraversalHelper.hasStepOfClass(ProfileSideEffectStep.class, traversal) &&
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/translator/AnonymizingTypeTranslator.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/translator/AnonymizingTypeTranslator.java
deleted file mode 100644
index 99dab66..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/translator/AnonymizingTypeTranslator.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tinkerpop.gremlin.process.traversal.translator;
-
-
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
-import org.apache.tinkerpop.gremlin.process.traversal.Script;
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-
-import java.sql.Timestamp;
-import java.time.OffsetDateTime;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-/**
- * This Translator will translate {@link Bytecode} into a representation that has been stripped of any user data
- * (anonymized). A default anonymizer is provided, but can be replaced with a custom anonymizer as needed. The
- * default anonymizer replaces any String, Numeric, Date, Timestamp, or UUID with a type-based token. Identical values
- * will receive the same token (e.g. if "foo" is assigned "string0" then all occurrences of "foo" will be replaced
- * with "string0").
- */
-public class AnonymizingTypeTranslator extends GroovyTranslator.DefaultTypeTranslator {
-
- /**
- * Customizable anonymizer interface.
- */
- public interface Anonymizer {
- /**
- * Return an anonymized token for the supplied object.
- *
- * @param obj a {@link Traversal} object of one of the following types: String, Long, Double, FLoat, Integer,
- * Class, TImestamp, Date, UUID, {@link Vertex}, {@link Edge}, {@link VertexProperty}
- * @return an anonymized version of the supplied object
- */
- Object anonymize(Object obj);
- }
-
- /**
- * This default implementation keeps a map from type (Java Class) to another map from instances to anonymized
- * token.
- */
- public static class DefaultAnonymizer implements Anonymizer {
- /*
- * Map<ClassName, Map<Object, AnonymizedValue>>
- */
- private final Map<String, Map<Object, String>> simpleNameToObjectCache = new HashMap<>();
-
- /**
- * Return an anonymized token for the supplied object of the form "type:instance#".
- */
- @Override
- public Object anonymize(final Object obj) {
- final String type = obj.getClass().getSimpleName();
-
- Map<Object, String> objectToAnonymizedString = simpleNameToObjectCache.get(type);
- if (objectToAnonymizedString != null){
- // this object type has been handled at least once before
- final String innerValue = objectToAnonymizedString.get(obj);
- if (innerValue != null){
- return innerValue;
- } else {
- final String anonymizedValue = type.toLowerCase() + objectToAnonymizedString.size();
- objectToAnonymizedString.put(obj, anonymizedValue);
- return anonymizedValue;
- }
- } else {
- objectToAnonymizedString = new HashMap<>();
- simpleNameToObjectCache.put(type, objectToAnonymizedString);
- final String anonymizedValue = type.toLowerCase() + objectToAnonymizedString.size();
- objectToAnonymizedString.put(obj, anonymizedValue);
- return anonymizedValue;
- }
- }
- }
-
- private final Anonymizer anonymizer;
-
- /**
- * Default constructor creates a {@link DefaultAnonymizer} + withParameters=false.
- */
- public AnonymizingTypeTranslator() {
- this(new DefaultAnonymizer(), false);
- }
-
- public AnonymizingTypeTranslator(final boolean withParameters) {
- this(new DefaultAnonymizer(), withParameters);
- }
-
- public AnonymizingTypeTranslator(final Anonymizer anonymizer, final boolean withParameters) {
- super(withParameters);
- this.anonymizer = anonymizer;
- }
-
- @Override
- protected String getSyntax(final String o) {
- return anonymizer.anonymize(o).toString();
- }
-
- @Override
- protected String getSyntax(final Date o) {
- return anonymizer.anonymize(o).toString();
- }
-
- @Override
- protected String getSyntax(final OffsetDateTime o) {
- return anonymizer.anonymize(o).toString();
- }
-
- @Override
- protected String getSyntax(final Timestamp o) {
- return anonymizer.anonymize(o).toString();
- }
-
- @Override
- protected String getSyntax(final UUID o) {
- return anonymizer.anonymize(o).toString();
- }
-
- @Override
- protected String getSyntax(final Number o) {
- return anonymizer.anonymize(o).toString();
- }
-
- @Override
- protected Script produceScript(final Class<?> o) {
- return script.append(anonymizer.anonymize(o).toString());
- }
-
-}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/translator/DotNetTranslator.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/translator/DotNetTranslator.java
deleted file mode 100644
index dc37963..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/translator/DotNetTranslator.java
+++ /dev/null
@@ -1,607 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tinkerpop.gremlin.process.traversal.translator;
-
-import org.apache.commons.lang3.EnumUtils;
-import org.apache.commons.text.StringEscapeUtils;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
-import org.apache.tinkerpop.gremlin.process.traversal.Merge;
-import org.apache.tinkerpop.gremlin.process.traversal.P;
-import org.apache.tinkerpop.gremlin.process.traversal.Pick;
-import org.apache.tinkerpop.gremlin.process.traversal.SackFunctions;
-import org.apache.tinkerpop.gremlin.process.traversal.Scope;
-import org.apache.tinkerpop.gremlin.process.traversal.Script;
-import org.apache.tinkerpop.gremlin.process.traversal.TextP;
-import org.apache.tinkerpop.gremlin.process.traversal.Translator;
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
-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.strategy.TraversalStrategyProxy;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.util.ConnectiveP;
-import org.apache.tinkerpop.gremlin.process.traversal.util.OrP;
-import org.apache.tinkerpop.gremlin.structure.Direction;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-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.structure.util.StringFactory;
-import org.apache.tinkerpop.gremlin.util.NumberHelper;
-import org.apache.tinkerpop.gremlin.util.function.Lambda;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-
-import java.sql.Timestamp;
-import java.time.OffsetDateTime;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.UUID;
-import java.util.function.BiPredicate;
-
-/**
- * Converts bytecode to a C# string of Gremlin.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public final class DotNetTranslator implements Translator.ScriptTranslator {
-
- private final String traversalSource;
- private final TypeTranslator typeTranslator;
-
- private static final List<String> methodsWithArgsNotNeedingGeneric = Arrays.asList(GraphTraversal.Symbols.group,
- GraphTraversal.Symbols.groupCount, GraphTraversal.Symbols.sack);
-
- private static final List<String> stringMethodsWithScopes = Arrays.asList(GraphTraversal.Symbols.asString,
- GraphTraversal.Symbols.length, GraphTraversal.Symbols.lTrim, GraphTraversal.Symbols.replace,
- GraphTraversal.Symbols.rTrim, GraphTraversal.Symbols.split, GraphTraversal.Symbols.substring,
- GraphTraversal.Symbols.toLower, GraphTraversal.Symbols.toUpper, GraphTraversal.Symbols.trim);
-
- private DotNetTranslator(final String traversalSource, final TypeTranslator typeTranslator) {
- this.traversalSource = traversalSource;
- this.typeTranslator = typeTranslator;
- }
-
- /**
- * Creates the translator with a {@code false} argument to {@code withParameters} using
- * {@link #of(String, boolean)}.
- */
- public static DotNetTranslator of(final String traversalSource) {
- return of(traversalSource, false);
- }
-
- /**
- * Creates the translator with the {@link DefaultTypeTranslator} passing the {@code withParameters} option to it
- * which will handle type translation in a fashion that should typically increase cache hits and reduce
- * compilation times if enabled at the sacrifice to rewriting of the script that could reduce readability.
- */
- public static DotNetTranslator of(final String traversalSource, final boolean withParameters) {
- return of(traversalSource, new DefaultTypeTranslator(withParameters));
- }
-
- /**
- * Creates the translator with a custom {@link TypeTranslator} instance.
- */
- public static DotNetTranslator of(final String traversalSource, final TypeTranslator typeTranslator) {
- return new DotNetTranslator(traversalSource, typeTranslator);
- }
-
- @Override
- public Script translate(final Bytecode bytecode) {
- return typeTranslator.apply(traversalSource, bytecode);
- }
-
- @Override
- public String getTargetLanguage() {
- return "gremlin-dotnet";
- }
-
- @Override
- public String toString() {
- return StringFactory.translatorString(this);
- }
-
- @Override
- public String getTraversalSource() {
- return this.traversalSource;
- }
-
- /**
- * Performs standard type translation for the TinkerPop types to C#.
- */
- public static class DefaultTypeTranslator extends AbstractTypeTranslator {
-
- public DefaultTypeTranslator(final boolean withParameters) {
- super(withParameters);
- }
-
- @Override
- protected String getNullSyntax() {
- return "null";
- }
-
- @Override
- protected String getSyntax(final String o) {
- return "\"" + StringEscapeUtils.escapeJava(o) + "\"";
- }
-
- @Override
- protected String getSyntax(final Boolean o) {
- return o.toString();
- }
-
- @Override
- protected String getSyntax(final Date o) {
- return "DateTimeOffset.FromUnixTimeMilliseconds(" + o.getTime() + ")";
- }
-
- @Override
- protected String getSyntax(final OffsetDateTime o) {
- return "DateTimeOffset.Parse(\"" + o.toString() + "\")";
- }
-
- @Override
- protected String getSyntax(final Timestamp o) {
- return "DateTimeOffset.FromUnixTimeMilliseconds(" + o.getTime() + ")";
- }
-
- @Override
- protected String getSyntax(final UUID o) {
- return "new Guid(\"" + o.toString() + "\")";
- }
-
- @Override
- protected String getSyntax(final Lambda o) {
- return "Lambda.Groovy(\"" + StringEscapeUtils.escapeEcmaScript(o.getLambdaScript().trim()) + "\")";
- }
-
- @Override
- protected String getSyntax(final SackFunctions.Barrier o) {
- return "Barrier." + SymbolHelper.toCSharp(o.toString());
- }
-
- @Override
- protected String getSyntax(final VertexProperty.Cardinality o) {
- return "Cardinality." + SymbolHelper.toCSharp(o.toString());
- }
-
- @Override
- protected String getSyntax(final Pick o) {
- return "Pick." + SymbolHelper.toCSharp(o.toString());
- }
-
- @Override
- protected String getSyntax(final Number o) {
- if (o instanceof Float || o instanceof Double) {
- if (NumberHelper.isNaN(o))
- return (o instanceof Float ? "Single" : "Double") + ".NaN";
- if (NumberHelper.isPositiveInfinity(o))
- return (o instanceof Float ? "Single" : "Double") + ".PositiveInfinity";
- if (NumberHelper.isNegativeInfinity(o))
- return (o instanceof Float ? "Single" : "Double") + ".NegativeInfinity";
- }
- return o.toString();
- }
-
- @Override
- protected Script produceCardinalityValue(final Bytecode o) {
- final Bytecode.Instruction inst = o.getSourceInstructions().get(0);
- final String card = inst.getArguments()[0].toString();
- script.append("CardinalityValue." + card.substring(0, 1).toUpperCase() + card.substring(1) + "(");
- convertToScript(inst.getArguments()[1]);
- script.append(")");
- return script;
- }
-
- @Override
- protected Script produceScript(final Set<?> o) {
- return produceScriptForHashSet(o, "object");
- }
-
- private Script produceScriptForHashSet(final Set<?> o, final String generic) {
- final Iterator<?> iterator = o.iterator();
- script.append("new HashSet<");
- script.append(generic);
- script.append("> {");
-
- while (iterator.hasNext()) {
- final Object nextItem = iterator.next();
- convertToScript(nextItem);
- if (iterator.hasNext())
- script.append(", ");
- }
-
- return script.append("}");
- }
-
- @Override
- protected Script produceScript(final List<?> o) {
- final Iterator<?> iterator = ((List<?>) o).iterator();
- script.append("new List<object> {");
-
- while (iterator.hasNext()) {
- final Object nextItem = iterator.next();
- convertToScript(nextItem);
- if (iterator.hasNext())
- script.append(", ");
- }
-
- return script.append("}");
- }
-
- @Override
- protected Script produceScript(final Map<?, ?> o) {
- script.append("new Dictionary<object,object> {");
- produceKeyValuesForMap(o);
- return script.append("}");
- }
-
- @Override
- protected Script produceScript(final Class<?> o) {
- return script.append(o.getCanonicalName());
- }
-
- @Override
- protected Script produceScript(final Enum<?> o) {
- final String e = o instanceof Direction ?
- o.name().substring(0,1).toUpperCase() + o.name().substring(1).toLowerCase() :
- o.name().substring(0,1).toUpperCase() + o.name().substring(1);
- return script.append(o.getDeclaringClass().getSimpleName() + "." + e);
- }
-
- @Override
- protected Script produceScript(final Vertex o) {
- script.append("new Vertex(");
- convertToScript(o.id());
- script.append(", ");
- convertToScript(o.label());
- return script.append(")");
- }
-
- @Override
- protected Script produceScript(final Edge o) {
- script.append("new Edge(");
- convertToScript(o.id());
- script.append(", new Vertex(");
- convertToScript(o.outVertex().id());
- script.append(", ");
- convertToScript(o.outVertex().label());
- script.append("), ");
- convertToScript(o.label());
- script.append(", new Vertex(");
- convertToScript(o.inVertex().id());
- script.append(", ");
- convertToScript(o.inVertex().label());
- return script.append("))");
- }
-
- @Override
- protected Script produceScript(final VertexProperty<?> o) {
- script.append("new VertexProperty(");
- convertToScript(o.id());
- script.append(", ");
- convertToScript(o.label());
- script.append(", ");
- convertToScript(o.value());
- script.append(", ");
- return script.append("null)");
- }
-
- @Override
- protected Script produceScript(final TraversalStrategyProxy<?> o) {
- if (o.getConfiguration().isEmpty()) {
- return script.append("new " + o.getStrategyClass().getSimpleName() + "()");
- } else {
- script.append("new " + o.getStrategyClass().getSimpleName() + "(");
- final Iterator<String> keys = IteratorUtils.stream(o.getConfiguration().getKeys()).iterator();
- while (keys.hasNext()) {
- final String k = keys.next();
- script.append(k);
- script.append(": ");
-
- // special handle PartitionStrategy since the Set it uses must be of String for readPartitions
- if (k.equals("readPartitions") && o.getStrategyClass().equals(PartitionStrategy.class))
- produceScriptForHashSet((Set) o.getConfiguration().getProperty(k), "string");
- else
- convertToScript(o.getConfiguration().getProperty(k));
-
- if (keys.hasNext())
- script.append(", ");
- }
-
- return script.append(")");
- }
- }
-
- private Script produceKeyValuesForMap(final Map<?,?> m) {
- final Iterator<? extends Map.Entry<?, ?>> itty = m.entrySet().iterator();
- while (itty.hasNext()) {
- final Map.Entry<?,?> entry = itty.next();
- script.append("{");
- convertToScript(entry.getKey());
- script.append(", ");
- convertToScript(entry.getValue());
- script.append("}");
- if (itty.hasNext())
- script.append(", ");
- }
- return script;
- }
-
- @Override
- protected Script produceScript(final String traversalSource, final Bytecode o) {
- script.append(traversalSource);
- int instructionPosition = 0;
- for (final Bytecode.Instruction instruction : o.getInstructions()) {
- final String methodName = instruction.getOperator();
- // perhaps too many if/then conditions for specifying generics. doesnt' seem like there is a clear
- // way to refactor this more nicely though.
- //
- // inject() only has types when called with it when its used as a start step
- if (0 == instruction.getArguments().length) {
- if (methodName.equals(GraphTraversal.Symbols.fold) && o.getSourceInstructions().size() + o.getStepInstructions().size() > 1 ||
- (methodName.equals(GraphTraversal.Symbols.inject) && instructionPosition > 0))
- script.append(".").append(resolveSymbol(methodName).replace("<object>", "")).append("()");
- else if (stringMethodsWithScopes.contains(methodName))
- // string functions with doesn't use generics if no scope is specified
- script.append(".").append(resolveSymbol(methodName).replace("<object>", "")).append("()");
- else
- script.append(".").append(resolveSymbol(methodName)).append("()");
- } else {
- if (methodsWithArgsNotNeedingGeneric.contains(methodName) ||
- (methodName.equals(GraphTraversal.Symbols.inject) && (Arrays.stream(instruction.getArguments()).noneMatch(Objects::isNull) || instructionPosition > 0)) ||
- (stringMethodsWithScopes.contains(methodName) && (Arrays.stream(instruction.getArguments()).noneMatch(EnumUtils.getEnumList(Scope.class)::contains))))
- script.append(".").append(resolveSymbol(methodName).replace("<object>", "").replace("<object,object>", "")).append("(");
- else
- script.append(".").append(resolveSymbol(methodName)).append("(");
-
- // have to special case withSack() because UnaryOperator and BinaryOperator signatures
- // make it impossible for the interpreter to figure out which function to call. specifically we need
- // to discern between:
- // withSack(A initialValue, UnaryOperator<A> splitOperator)
- // withSack(A initialValue, BinaryOperator<A> splitOperator)
- // and:
- // withSack(Supplier<A> initialValue, UnaryOperator<A> mergeOperator)
- // withSack(Supplier<A> initialValue, BinaryOperator<A> mergeOperator)
- if (methodName.equals(TraversalSource.Symbols.withSack) &&
- instruction.getArguments().length == 2 && instruction.getArguments()[1] instanceof Lambda) {
- final String castFirstArgTo = instruction.getArguments()[0] instanceof Lambda ? "ISupplier" : "";
- final Lambda secondArg = (Lambda) instruction.getArguments()[1];
- final String castSecondArgTo = secondArg.getLambdaArguments() == 1 ? "IUnaryOperator" : "IBinaryOperator";
- if (!castFirstArgTo.isEmpty())
- script.append(String.format("(%s) ", castFirstArgTo));
- convertToScript(instruction.getArguments()[0]);
- script.append(", (").append(castSecondArgTo).append(") ");
- convertToScript(instruction.getArguments()[1]);
- script.append(",");
- } else if (methodName.equals(GraphTraversal.Symbols.mergeE) || methodName.equals(GraphTraversal.Symbols.mergeV)) {
- // there must be at least one argument - if null go with Map
- final Object instArg = instruction.getArguments()[0];
- if (null == instArg) {
- script.append("(IDictionary<object,object>) null");
- } else {
- if (instArg instanceof Traversal || instArg instanceof Bytecode) {
- script.append("(ITraversal) ");
- } else {
- script.append("(IDictionary<object,object>) ");
- }
- convertToScript(instArg);
- }
- script.append(",");
- } else if (methodName.equals(GraphTraversalSource.Symbols.tx)) {
- final String command = resolveSymbol(instruction.getArguments()[0].toString());
- script.append(").").append(command).append("()");
- } else if (methodName.equals(GraphTraversal.Symbols.call)) {
- // call()
- // call(String)
- // call(String, Map)
- // call(String, Traversal)
- // call(String, Map, Traversal)
- final Object[] instArgs = instruction.getArguments();
- if (instArgs.length > 0) {
- // [0] always String
- convertToScript(instArgs[0]);
- script.append(",");
- }
- if (instArgs.length > 1) {
- // [1] could be Map or Traversal
- if (instArgs[1] instanceof Traversal || instArgs[1] instanceof Bytecode) {
- script.append("(ITraversal) ");
- } else {
- script.append("(IDictionary<object,object>) ");
- }
- convertToScript(instArgs[1]);
- script.append(",");
- }
- if (instArgs.length > 2) {
- // [2] always Traversal
- script.append("(ITraversal) ");
- convertToScript(instArgs[2]);
- script.append(",");
- }
- } else if (methodName.equals(GraphTraversal.Symbols.option) &&
- instruction.getArguments().length == 2 && instruction.getArguments()[0] instanceof Merge) {
- final Object[] instArgs = instruction.getArguments();
- // trying to catch option(Merge,Traversal|Map)
- convertToScript(instArgs[0]);
- script.append(", ");
- if (instArgs[1] instanceof Traversal || instArgs[1] instanceof Bytecode) {
- script.append("(ITraversal) ");
- } else {
- script.append("(IDictionary<object,object>) ");
- }
- convertToScript(instArgs[1]);
- script.append(",");
- } else {
- final Object[] instArgs = instruction.getArguments();
- for (int idx = 0; idx < instArgs.length; idx++) {
- final Object instArg = instArgs[idx];
- // overloads might have trouble with null in calling the right one. add more as we find
- // them i guess
- if (null == instArg) {
- if ((methodName.equals(GraphTraversal.Symbols.addV) && idx % 2 == 0) ||
- (methodName.equals(GraphTraversal.Symbols.hasLabel) && instArgs.length == 1 && idx == 0) ||
- (methodName.equals(GraphTraversal.Symbols.hasKey) && instArgs.length == 1 && idx == 0)) {
- script.append("(string) ");
- } else if (methodName.equals(GraphTraversal.Symbols.hasValue) && idx == 0) {
- script.append("(object) ");
- } else if (methodName.equals(GraphTraversal.Symbols.has)) {
- if (instArgs.length == 2) {
- if (null == instArgs[0] && idx == 0) {
- // need to avoid a null T accessor or else GraphTraversal gets
- // IllegalArgumentException and when called by way of reflection through
- // JavaTranslator
- script.append("(string)" );
- } else if ((instArgs[0] instanceof T || instArgs[0] instanceof String) && idx == 1) {
- script.append("(object) ");
- }
- } else if (instArgs.length == 3) {
- if ((instArgs[0] instanceof T || instArgs[0] instanceof String) && idx == 1) {
- script.append("(string) ");
- } else if ((instArgs[0] instanceof T || instArgs[0] instanceof String) && idx == 2) {
- script.append("(object) ");
- }
- }
- } else if (methodName.equals(GraphTraversal.Symbols.property)) {
- if (instArgs[0] instanceof VertexProperty.Cardinality && instArgs.length == 3) {
- script.append("(object) ");
- }
- }
- }
- convertToScript(instArg);
- script.append(",");
- }
- }
- script.setCharAtEnd(')');
- }
- instructionPosition++;
- }
- return script;
- }
-
- @Override
- protected Script produceScript(final P<?> p) {
- if (p instanceof TextP) {
- script.append("TextP.").append(SymbolHelper.toCSharp(p.getPredicateName())).append("(");
- convertToScript(p.getValue());
- } else if (p instanceof ConnectiveP) {
- // ConnectiveP gets some special handling because it's reduced to and(P, P, P) and we want it
- // generated the way it was written which was P.and(P).and(P)
- final List<P<?>> list = ((ConnectiveP) p).getPredicates();
- final String connector = p instanceof OrP ? "Or" : "And";
- for (int i = 0; i < list.size(); i++) {
- produceScript(list.get(i));
-
- // for the first/last P there is no parent to close
- if (i > 0 && i < list.size() - 1) script.append(")");
-
- // add teh connector for all but last P
- if (i < list.size() - 1) {
- script.append(".").append(connector).append("(");
- }
- }
- } else {
- script.append("P.").append(SymbolHelper.toCSharp(p.getPredicateName())).append("(");
- convertToScript(p.getValue());
- }
- script.append(")");
- return script;
- }
-
- protected String resolveSymbol(final String methodName) {
- return SymbolHelper.toCSharp(methodName);
- }
- }
-
- static final class SymbolHelper {
-
- private final static Map<String, String> TO_CS_MAP = new HashMap<>();
- private final static Map<String, String> FROM_CS_MAP = new HashMap<>();
-
- static {
- TO_CS_MAP.put(GraphTraversal.Symbols.asString, "AsString<object>");
- TO_CS_MAP.put(GraphTraversal.Symbols.branch, "Branch<object>");
- TO_CS_MAP.put(GraphTraversal.Symbols.call, "Call<object>");
- TO_CS_MAP.put(GraphTraversal.Symbols.cap, "Cap<object>");
- TO_CS_MAP.put(GraphTraversal.Symbols.choose, "Choose<object>");
- TO_CS_MAP.put(GraphTraversal.Symbols.coalesce, "Coalesce<object>");
- TO_CS_MAP.put(GraphTraversal.Symbols.constant, "Constant<object>");
- TO_CS_MAP.put(GraphTraversal.Symbols.elementMap, "ElementMap<object>");
- TO_CS_MAP.put(GraphTraversal.Symbols.flatMap, "FlatMap<object>");
- TO_CS_MAP.put(GraphTraversal.Symbols.fold, "Fold<object>");
- TO_CS_MAP.put(GraphTraversal.Symbols.group, "Group<object,object>");
- TO_CS_MAP.put(GraphTraversal.Symbols.groupCount, "GroupCount<object>");
- TO_CS_MAP.put(GraphTraversal.Symbols.index, "Index<object>");
- TO_CS_MAP.put(GraphTraversal.Symbols.inject, "Inject<object>");
- TO_CS_MAP.put(GraphTraversal.Symbols.io, "Io<object>");
- TO_CS_MAP.put(GraphTraversal.Symbols.length, "Length<object>");
- TO_CS_MAP.put(GraphTraversal.Symbols.limit, "Limit<object>");
- TO_CS_MAP.put(GraphTraversal.Symbols.local, "Local<object>");
- TO_CS_MAP.put(GraphTraversal.Symbols.lTrim, "LTrim<object>");
- TO_CS_MAP.put(GraphTraversal.Symbols.match, "Match<object>");
- TO_CS_MAP.put(GraphTraversal.Symbols.map, "Map<object>");
- TO_CS_MAP.put(GraphTraversal.Symbols.max, "Max<object>");
- TO_CS_MAP.put(GraphTraversal.Symbols.min, "Min<object>");
- TO_CS_MAP.put(GraphTraversal.Symbols.mean, "Mean<object>");
- TO_CS_MAP.put(GraphTraversal.Symbols.optional, "Optional<object>");
- TO_CS_MAP.put(GraphTraversal.Symbols.project, "Project<object>");
- TO_CS_MAP.put(GraphTraversal.Symbols.properties, "Properties<object>");
- TO_CS_MAP.put(GraphTraversal.Symbols.range, "Range<object>");
- TO_CS_MAP.put(GraphTraversal.Symbols.replace, "Replace<object>");
- TO_CS_MAP.put(GraphTraversal.Symbols.rTrim, "RTrim<object>");
- TO_CS_MAP.put(GraphTraversal.Symbols.sack, "Sack<object>");
- TO_CS_MAP.put(GraphTraversal.Symbols.select, "Select<object>");
- TO_CS_MAP.put(GraphTraversal.Symbols.skip, "Skip<object>");
- TO_CS_MAP.put(GraphTraversal.Symbols.split, "Split<object>");
- TO_CS_MAP.put(GraphTraversal.Symbols.substring, "Substring<object>");
- TO_CS_MAP.put(GraphTraversal.Symbols.sum, "Sum<object>");
- TO_CS_MAP.put(GraphTraversal.Symbols.tail, "Tail<object>");
- TO_CS_MAP.put(GraphTraversal.Symbols.toLower, "ToLower<object>");
- TO_CS_MAP.put(GraphTraversal.Symbols.toUpper, "ToUpper<object>");
- TO_CS_MAP.put(GraphTraversal.Symbols.trim, "Trim<object>");
- TO_CS_MAP.put(GraphTraversal.Symbols.unfold, "Unfold<object>");
- TO_CS_MAP.put(GraphTraversal.Symbols.union, "Union<object>");
- TO_CS_MAP.put(GraphTraversal.Symbols.value, "Value<object>");
- TO_CS_MAP.put(GraphTraversal.Symbols.valueMap, "ValueMap<object,object>");
- TO_CS_MAP.put(GraphTraversal.Symbols.values, "Values<object>");
- //
- TO_CS_MAP.forEach((k, v) -> FROM_CS_MAP.put(v, k));
- }
-
- private SymbolHelper() {
- // static methods only, do not instantiate
- }
-
- public static String toCSharp(final String symbol) {
- return TO_CS_MAP.getOrDefault(symbol, symbol.substring(0,1).toUpperCase() + symbol.substring(1));
- }
-
- public static String toJava(final String symbol) {
- return FROM_CS_MAP.getOrDefault(symbol, symbol.substring(0,1).toLowerCase() + symbol.substring(1));
- }
-
- }
-}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/translator/GolangTranslator.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/translator/GolangTranslator.java
deleted file mode 100644
index 49af5fb..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/translator/GolangTranslator.java
+++ /dev/null
@@ -1,404 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tinkerpop.gremlin.process.traversal.translator;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.text.StringEscapeUtils;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
-import org.apache.tinkerpop.gremlin.process.traversal.P;
-import org.apache.tinkerpop.gremlin.process.traversal.Pick;
-import org.apache.tinkerpop.gremlin.process.traversal.SackFunctions;
-import org.apache.tinkerpop.gremlin.process.traversal.Script;
-import org.apache.tinkerpop.gremlin.process.traversal.TextP;
-import org.apache.tinkerpop.gremlin.process.traversal.Translator;
-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.strategy.TraversalStrategyProxy;
-import org.apache.tinkerpop.gremlin.process.traversal.util.ConnectiveP;
-import org.apache.tinkerpop.gremlin.process.traversal.util.OrP;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
-import org.apache.tinkerpop.gremlin.util.NumberHelper;
-import org.apache.tinkerpop.gremlin.util.function.Lambda;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-
-import java.sql.Timestamp;
-import java.time.OffsetDateTime;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
-/**
- * Translates Gremlin {@link Bytecode} into a Golang string representation.
- *
- * @author Simon Zhao (simonz@bitquilltech.com)
- */
-public final class GolangTranslator implements Translator.ScriptTranslator {
- private final String traversalSource;
- private final TypeTranslator typeTranslator;
- private final static String GO_PACKAGE_NAME = "gremlingo.";
-
- private GolangTranslator(final String traversalSource, final TypeTranslator typeTranslator) {
- this.traversalSource = traversalSource;
- this.typeTranslator = typeTranslator;
- }
-
- /**
- * Creates the translator with a {@code false} argument to {@code withParameters} using
- * {@link #of(String, boolean)}.
- */
- public static GolangTranslator of(final String traversalSource) {
- return of(traversalSource, false);
- }
-
- /**
- * Creates the translator with the {@link DefaultTypeTranslator} passing the {@code withParameters} option to it
- * which will handle type translation in a fashion that should typically increase cache hits and reduce
- * compilation times if enabled at the sacrifice to rewriting of the script that could reduce readability.
- */
- public static GolangTranslator of(final String traversalSource, final boolean withParameters) {
- return of(traversalSource, new DefaultTypeTranslator(withParameters));
- }
-
- /**
- * Creates the translator with a custom {@link TypeTranslator} instance.
- */
- public static GolangTranslator of(final String traversalSource, final TypeTranslator typeTranslator) {
- return new GolangTranslator(traversalSource, typeTranslator);
- }
-
- @Override
- public String getTraversalSource() {
- return this.traversalSource;
- }
-
- @Override
- public Script translate(final Bytecode bytecode) {
- return typeTranslator.apply(traversalSource, bytecode);
- }
-
- @Override
- public String getTargetLanguage() {
- return "gremlin-go";
- }
-
- @Override
- public String toString() {
- return StringFactory.translatorString(this);
- }
-
- /**
- * Performs standard type translation for the TinkerPop types to Go.
- */
- public static class DefaultTypeTranslator extends AbstractTypeTranslator {
-
- public DefaultTypeTranslator(final boolean withParameters) {
- super(withParameters);
- }
-
- @Override
- protected String getNullSyntax() {
- return "nil";
- }
-
- @Override
- protected String getSyntax(final String o) {
- return "\"" + StringEscapeUtils.escapeJava(o) + "\"";
- }
-
- @Override
- protected String getSyntax(final Boolean o) {
- return o.toString();
- }
-
- @Override
- protected String getSyntax(final Date o) {
- return "time.UnixMilli(" + o.getTime() + ")";
- }
-
- @Override
- protected String getSyntax(final OffsetDateTime o) {
- final String zoneInfo = o.getOffset().getId().equals("Z") ? "UTC+00:00" : "UTC" + o.getOffset().getId();
- return "time.Date(" + o.getYear() +
- ", " + o.getMonthValue() +
- ", " + o.getDayOfMonth() +
- ", " + o.getHour() +
- ", " + o.getMinute() +
- ", " + o.getSecond() +
- ", " + o.getNano() +
- ", time.FixedZone(\""+ zoneInfo + "\", " + o.getOffset().getTotalSeconds() +")";
- }
-
- @Override
- protected String getSyntax(final Timestamp o) {
- return "time.UnixMilli(" + o.getTime() + ")";
- }
-
- @Override
- protected String getSyntax(final UUID o) {
- return "uuid.MustParse(\"" + o.toString() + "\")";
- }
-
- @Override
- protected String getSyntax(final Lambda o) {
- return "&gremlingo.Lambda{Script:\"" + o.getLambdaScript().trim() + "\", Language:\"\"}";
- }
-
- @Override
- protected String getSyntax(final Number o) {
- if (o instanceof Float || o instanceof Double) {
- if (NumberHelper.isNaN(o))
- return "math.NaN()";
- else if (NumberHelper.isPositiveInfinity(o))
- return "math.Inf(1)";
- else if (NumberHelper.isNegativeInfinity(o))
- return "math.Inf(-11)";
- }
- return o.toString();
- }
-
- @Override
- protected String getSyntax(final SackFunctions.Barrier o) {
- return GO_PACKAGE_NAME + "Barrier." + resolveSymbol(o.toString());
- }
-
- @Override
- protected String getSyntax(final VertexProperty.Cardinality o) {
- return GO_PACKAGE_NAME + "Cardinality." + resolveSymbol(o.toString());
- }
-
- @Override
- protected String getSyntax(final Pick o) {
- return GO_PACKAGE_NAME + "Pick." + resolveSymbol(o.toString());
- }
-
- @Override
- protected Script produceCardinalityValue(final Bytecode o) {
- final Bytecode.Instruction inst = o.getSourceInstructions().get(0);
- final String card = inst.getArguments()[0].toString();
- script.append(GO_PACKAGE_NAME + "CardinalityValue." + card.substring(0, 1).toUpperCase() + card.substring(1) + "(");
- convertToScript(inst.getArguments()[1]);
- script.append(")");
- return script;
- }
-
- @Override
- protected Script produceScript(final Set<?> o) {
- final Iterator<?> iterator = o.iterator();
- script.append(GO_PACKAGE_NAME + "NewSimpleSet(");
- while(iterator.hasNext()) {
- convertToScript(iterator.next());
- if (iterator.hasNext())
- script.append(", ");
- }
- return script.append(")");
- }
-
- @Override
- protected Script produceScript(final List<?> o) {
- final Iterator<?> iterator = o.iterator();
- script.append("[]interface{}{");
- while(iterator.hasNext()) {
- convertToScript(iterator.next());
- if (iterator.hasNext())
- script.append(", ");
- }
- script.append("}");
- return script;
- }
-
- @Override
- protected Script produceScript(final Map<?, ?> o) {
- script.append("map[interface{}]interface{}{");
- final Iterator<? extends Map.Entry<?, ?>> itty = o.entrySet().iterator();
- while (itty.hasNext()) {
- final Map.Entry<?,?> entry = itty.next();
- convertToScript(entry.getKey()).append(": ");
- convertToScript(entry.getValue());
- if (itty.hasNext())
- script.append(", ");
- }
- return script.append("}");
- }
-
- @Override
- protected Script produceScript(final Class<?> o) {
- return script.append(o.getCanonicalName());
- }
-
- @Override
- protected Script produceScript(final Enum<?> o) {
- return script.append(GO_PACKAGE_NAME + o.getDeclaringClass().getSimpleName() + "." + resolveSymbol(o.toString()));
- }
-
- @Override
- protected Script produceScript(final Vertex o) {
- script.append(GO_PACKAGE_NAME + "Vertex{Element{");
- convertToScript(o.id()).append(", ");
- return convertToScript(o.label()).append("}}");
- }
-
- @Override
- protected Script produceScript(final Edge o) {
- script.append(GO_PACKAGE_NAME + "Edge{Element{");
- convertToScript(o.id()).append(", ");
- convertToScript(o.label()).append("}, ");
- convertToScript(o.outVertex()).append(",");
- return convertToScript(o.inVertex()).append("}");
- }
-
- @Override
- protected Script produceScript(final VertexProperty<?> o) {
- script.append(GO_PACKAGE_NAME + "VertexProperty{");
- convertToScript(o.id()).append(", ");
- convertToScript(o.label()).append("}, ");
- return convertToScript(o.value()).append("}");
- }
-
- @Override
- protected Script produceScript(final TraversalStrategyProxy<?> o) {
- if (o.getConfiguration().isEmpty()) {
- return script.append(GO_PACKAGE_NAME + o.getStrategyClass().getSimpleName() + "()");
- } else {
- script.append(GO_PACKAGE_NAME + o.getStrategyClass().getSimpleName() + "(");
- script.append(GO_PACKAGE_NAME + o.getStrategyClass().getSimpleName() + "Config{");
- final Iterator<String> keys = IteratorUtils.stream(o.getConfiguration().getKeys()).iterator();
- while (keys.hasNext()) {
- final String k = keys.next();
- script.append(SymbolHelper.toGolang(k));
- script.append(": ");
-
- if (o.getConfiguration().getProperty(k) instanceof List) {
- List<Object> list =(List<Object>) o.getConfiguration().getProperty(k);
- Iterator iterator = list.iterator();
- script.append("[]string{");
- while(iterator.hasNext()) {
- convertToScript(iterator.next());
- if (iterator.hasNext())
- script.append(", ");
- }
- script.append("}");
- } else if (o.getConfiguration().getProperty(k) == null) {
- script.append("nil");
- } else {
- convertToScript(o.getConfiguration().getProperty(k));
- }
- if (keys.hasNext())
- script.append(", ");
- }
- return script.append("})");
- }
- }
-
- @Override
- protected Script produceScript(final String traversalSource, final Bytecode o) {
- final String source = traversalSource.equals("__") ? GO_PACKAGE_NAME + "T__" : traversalSource;
- script.append(source);
- for (final Bytecode.Instruction instruction : o.getInstructions()) {
- final String methodName = instruction.getOperator();
- final Object[] arguments = instruction.getArguments();
-
- if (methodName.equals(GraphTraversalSource.Symbols.tx)) {
- final String command = resolveSymbol(arguments[0].toString());
- script.append(".").append(resolveSymbol(methodName)).append("().").append(resolveSymbol(command)).append("()");
- } else {
- script.append(".").append(resolveSymbol(methodName)).append("(");
-
- for (int i = 0; i < arguments.length; i++) {
- convertToScript(arguments[i]);
- if (i != arguments.length - 1) {
- script.append(", ");
- }
- }
-
- script.append(")");
- }
- }
- return script;
- }
-
- @Override
- protected Script produceScript(final P<?> p) {
- if (p instanceof TextP) {
- script.append(GO_PACKAGE_NAME + "TextP.").append(resolveSymbol(p.getPredicateName())).append("(");
- convertToScript(p.getValue());
- } else if (p instanceof ConnectiveP) {
- // ConnectiveP gets some special handling because it's reduced to and(P, P, P) and we want it
- // generated the way it was written which was P.and(P).and(P)
- final List<P<?>> list = ((ConnectiveP) p).getPredicates();
- final String connector = p instanceof OrP ? "Or" : "And";
- for (int i = 0; i < list.size(); i++) {
- produceScript(list.get(i));
-
- // For the first/last P there is no parent to close.
- if (i > 0 && i < list.size() - 1) {
- script.append(")");
- }
-
- // Add the connector for all but last P.
- if (i < list.size() - 1) {
- script.append(".").append(connector).append("(");
- }
- }
- } else {
- script.append(GO_PACKAGE_NAME + "P.").append(resolveSymbol(p.getPredicateName())).append("(");
- convertToScript(p.getValue());
- }
- script.append(")");
- return script;
- }
-
- protected String resolveSymbol(final String methodName) {
- return SymbolHelper.toGolang(methodName);
- }
- }
-
- static final class SymbolHelper {
-
- private final static Map<String, String> TO_GO_MAP = new HashMap<>();
- private final static Map<String, String> FROM_GO_MAP = new HashMap<>();
-
- static {
- TO_GO_MAP.put("OUT", "Out");
- TO_GO_MAP.put("IN", "In");
- TO_GO_MAP.put("BOTH", "Both");
- TO_GO_MAP.forEach((k, v) -> FROM_GO_MAP.put(v, k));
- }
-
- private SymbolHelper() {
- // static methods only, do not instantiate
- }
-
- public static String toGolang(final String symbol) {
- return TO_GO_MAP.getOrDefault(symbol, StringUtils.capitalize(symbol));
- }
-
- public static String toJava(final String symbol) {
- return FROM_GO_MAP.getOrDefault(symbol, StringUtils.uncapitalize(symbol));
- }
-
- }
-}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/translator/GroovyTranslator.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/translator/GroovyTranslator.java
deleted file mode 100644
index 647073b..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/translator/GroovyTranslator.java
+++ /dev/null
@@ -1,486 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tinkerpop.gremlin.process.traversal.translator;
-
-import org.apache.commons.configuration2.ConfigurationConverter;
-import org.apache.commons.text.StringEscapeUtils;
-import org.apache.tinkerpop.gremlin.jsr223.CoreImports;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
-import org.apache.tinkerpop.gremlin.process.traversal.NotP;
-import org.apache.tinkerpop.gremlin.process.traversal.P;
-import org.apache.tinkerpop.gremlin.process.traversal.Pick;
-import org.apache.tinkerpop.gremlin.process.traversal.SackFunctions;
-import org.apache.tinkerpop.gremlin.process.traversal.Script;
-import org.apache.tinkerpop.gremlin.process.traversal.TextP;
-import org.apache.tinkerpop.gremlin.process.traversal.Translator;
-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.strategy.TraversalStrategyProxy;
-import org.apache.tinkerpop.gremlin.process.traversal.util.ConnectiveP;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
-import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceVertex;
-import org.apache.tinkerpop.gremlin.util.DatetimeHelper;
-import org.apache.tinkerpop.gremlin.util.NumberHelper;
-import org.apache.tinkerpop.gremlin.util.function.Lambda;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.sql.Timestamp;
-import java.time.Instant;
-import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-import java.util.stream.Collectors;
-
-/**
- * Converts bytecode to a Groovy string of Gremlin.
- *
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- * @author Stephen Mallette (http://stephen.genoprime.com)
- * @author Stark Arya (sandszhou.zj@alibaba-inc.com)
- */
-public final class GroovyTranslator implements Translator.ScriptTranslator {
-
- private final String traversalSource;
- private final TypeTranslator typeTranslator;
-
- private GroovyTranslator(final String traversalSource, final TypeTranslator typeTranslator) {
- this.traversalSource = traversalSource;
- this.typeTranslator = typeTranslator;
- }
-
- /**
- * Creates the translator with a {@code false} argument to {@code withParameters} using
- * {@link #of(String, boolean)}.
- */
- public static GroovyTranslator of(final String traversalSource) {
- return of(traversalSource, false);
- }
-
- /**
- * Creates the translator with the {@link DefaultTypeTranslator} passing the {@code withParameters} option to it
- * which will handle type translation in a fashion that should typically increase cache hits and reduce
- * compilation times if enabled at the sacrifice to rewriting of the script that could reduce readability.
- */
- public static GroovyTranslator of(final String traversalSource, final boolean withParameters) {
- return of(traversalSource, new DefaultTypeTranslator(withParameters));
- }
-
- /**
- * Creates the translator with a custom {@link TypeTranslator} instance.
- */
- public static GroovyTranslator of(final String traversalSource, final TypeTranslator typeTranslator) {
- return new GroovyTranslator(traversalSource, typeTranslator);
- }
-
- @Override
- public Script translate(final Bytecode bytecode) {
- return typeTranslator.apply(traversalSource, bytecode);
- }
-
- @Override
- public String getTargetLanguage() {
- return "gremlin-groovy";
- }
-
- @Override
- public String toString() {
- return StringFactory.translatorString(this);
- }
-
- @Override
- public String getTraversalSource() {
- return this.traversalSource;
- }
-
- /**
- * Performs standard type translation for the TinkerPop types to Groovy.
- */
- public static class DefaultTypeTranslator extends AbstractTypeTranslator {
-
- public DefaultTypeTranslator(final boolean withParameters) {
- super(withParameters);
- }
-
- @Override
- protected String getNullSyntax() {
- return "null";
- }
-
- @Override
- protected String getSyntax(final String o) {
- return (o.contains("\"") ? "\"\"\"" + StringEscapeUtils.escapeJava(o) + "\"\"\"" : "\"" + StringEscapeUtils.escapeJava(o) + "\"")
- .replace("$", "\\$");
- }
-
- @Override
- protected String getSyntax(final Boolean o) {
- return o.toString();
- }
-
- @Override
- protected String getSyntax(final Date o) {
- return "new Date(" + o.getTime() + "L)";
- }
-
- @Override
- protected String getSyntax(final OffsetDateTime o) {
- return "OffsetDateTime.parse('" + o.toString() + "')";
- }
-
- @Override
- protected String getSyntax(final Timestamp o) {
- return "new Timestamp(" + o.getTime() + "L)";
- }
-
- @Override
- protected String getSyntax(final UUID o) {
- return "UUID.fromString('" + o.toString() + "')";
- }
-
- @Override
- protected String getSyntax(final Lambda o) {
- final String lambdaString = o.getLambdaScript().trim();
- return lambdaString.startsWith("{") ? lambdaString : "{" + lambdaString + "}";
- }
-
- @Override
- protected String getSyntax(final SackFunctions.Barrier o) {
- return "SackFunctions.Barrier." + o.toString();
- }
-
- @Override
- protected String getSyntax(final VertexProperty.Cardinality o) {
- return "VertexProperty.Cardinality." + o.toString();
- }
-
- @Override
- protected String getSyntax(final Pick o) {
- return "Pick." + o.toString();
- }
-
- @Override
- protected String getSyntax(final Number o) {
- if (o instanceof Double || o instanceof Float) {
- if (NumberHelper.isNaN(o))
- return (o instanceof Double ? "Double" : "Float") + ".NaN";
- if (NumberHelper.isPositiveInfinity(o))
- return (o instanceof Double ? "Double" : "Float") + ".POSITIVE_INFINITY";
- if (NumberHelper.isNegativeInfinity(o))
- return (o instanceof Double ? "Double" : "Float") + ".NEGATIVE_INFINITY";
-
- return o + (o instanceof Double ? "d" : "f");
- }
- if (o instanceof Long)
- return o + "L";
- if (o instanceof Integer)
- return "(int) " + o;
- if (o instanceof Byte)
- return "(byte) " + o;
- if (o instanceof Short)
- return "(short) " + o;
- if (o instanceof BigInteger)
- return "new BigInteger('" + o.toString() + "')";
- if (o instanceof BigDecimal)
- return "new BigDecimal('" + o.toString() + "')";
-
- return o.toString();
- }
-
- @Override
- protected Script produceCardinalityValue(final Bytecode o) {
- final Bytecode.Instruction inst = o.getSourceInstructions().get(0);
- script.append("VertexProperty.Cardinality." + inst.getArguments()[0] + "(");
- convertToScript(inst.getArguments()[1]);
- script.append(")");
- return script;
- }
-
- @Override
- protected Script produceScript(final Set<?> o) {
- return produceScript(new ArrayList<>(o)).append(" as Set");
- }
-
- @Override
- protected Script produceScript(final List<?> o) {
- final Iterator<?> iterator = ((List<?>) o).iterator();
- script.append("[");
-
- while (iterator.hasNext()) {
- final Object nextItem = iterator.next();
- convertToScript(nextItem);
- if (iterator.hasNext())
- script.append(",").append(" ");
- }
-
- return script.append("]");
- }
-
- @Override
- protected Script produceScript(final Map<?, ?> o) {
- script.append("[");
- final Iterator<? extends Map.Entry<?, ?>> itty = ((Map<?, ?>) o).entrySet().iterator();
- while (itty.hasNext()) {
- final Map.Entry<?,?> entry = itty.next();
- final Object k = entry.getKey();
- final boolean wrap = !(k instanceof String);
- if (wrap) script.append("(");
- convertToScript(entry.getKey());
- if (wrap) script.append(")");
- script.append(":");
- convertToScript(entry.getValue());
- if (itty.hasNext())
- script.append(",");
- }
- return script.append("]");
- }
-
- /**
- * Gets the string representation of a class with the default implementation simply checking to see if the
- * {@code Class} is in {@link CoreImports} or not. If it is present that means it can be referenced using the
- * simple name otherwise it uses the canonical name.
- * <p/>
- * Those building custom {@link ScriptTranslator} instances might override this if they have other classes
- * that are not in {@link CoreImports} by default.
- */
- @Override
- protected Script produceScript(final Class<?> o) {
- return script.append(CoreImports.getClassImports().contains(o) ? o.getSimpleName() : o.getCanonicalName());
- }
-
- @Override
- protected Script produceScript(final Enum<?> o) {
- return script.append(o.getDeclaringClass().getSimpleName() + "." + o.toString());
- }
-
- @Override
- protected Script produceScript(final Vertex o) {
- script.append("new ReferenceVertex(");
- convertToScript(o.id());
- script.append(",");
- convertToScript(o.label());
- return script.append(")");
- }
-
- @Override
- protected Script produceScript(final Edge o) {
- script.append("new ReferenceEdge(");
- convertToScript(o.id());
- script.append(",");
- convertToScript(o.label());
- script.append(",new ReferenceVertex(");
- convertToScript(o.inVertex().id());
- script.append(",");
- convertToScript(o.inVertex().label());
- script.append("),new ReferenceVertex(");
- convertToScript(o.outVertex().id());
- script.append(",");
- convertToScript(o.outVertex().label());
- return script.append("))");
- }
-
- @Override
- protected Script produceScript(final VertexProperty<?> o) {
- script.append("new ReferenceVertexProperty(");
- convertToScript(o.id());
- script.append(",");
- convertToScript(o.label());
- script.append(",");
- convertToScript(o.value());
- return script.append(")");
- }
-
- @Override
- protected Script produceScript(final TraversalStrategyProxy<?> o) {
- if (o.getConfiguration().isEmpty()) {
- return produceScript(o.getStrategyClass());
- } else {
- script.append("new ");
- produceScript(o.getStrategyClass());
- script.append("(");
-
- final Iterator<Map.Entry<Object,Object>> itty = ConfigurationConverter.getMap(
- o.getConfiguration()).entrySet().iterator();
- while (itty.hasNext()) {
- final Map.Entry<Object,Object> entry = itty.next();
- script.append(entry.getKey().toString());
- script.append(": ");
- convertToScript(entry.getValue());
- if (itty.hasNext()) script.append(", ");
- }
-
- return script.append(")");
- }
- }
-
- @Override
- protected Script produceScript(final String traversalSource, final Bytecode bytecode) {
- script.append(traversalSource);
- for (final Bytecode.Instruction instruction : bytecode.getInstructions()) {
- final String methodName = instruction.getOperator();
- if (0 == instruction.getArguments().length) {
- script.append(".").append(methodName).append("()");
- } else {
- script.append(".").append(methodName).append("(");
-
- // special case inject(null, null) or else groovy might guess the JDK collection extension form
- if (methodName.equals(GraphTraversal.Symbols.inject)) {
- final Iterator<Object> itty = Arrays.stream(instruction.getArguments()).iterator();
- while (itty.hasNext()) {
- final Object o = itty.next();
- if (null == o) script.append("(Object)");
- convertToScript(o);
- if (itty.hasNext()) script.append(",");
- }
- } else if (methodName.equals(GraphTraversalSource.Symbols.tx)) {
- final String command = instruction.getArguments()[0].toString();
- script.append(").").append(command).append("(");
- } else {
- final Iterator<Object> itty = Arrays.stream(instruction.getArguments()).iterator();
- while (itty.hasNext()) {
- convertToScript(itty.next());
- if (itty.hasNext()) script.append(",");
- }
- }
- script.append(")");
- }
- }
- return script;
- }
-
- @Override
- protected Script produceScript(final P<?> p) {
- if (p instanceof TextP) {
- script.append("TextP.").append(p.getPredicateName()).append("(");
- convertToScript(p.getValue());
- } else if (p instanceof ConnectiveP) {
- // ConnectiveP gets some special handling because it's reduced to and(P, P, P) and we want it
- // generated the way it was written which was P.and(P).and(P)
- final List<P<?>> list = ((ConnectiveP) p).getPredicates();
- final String connector = p.getPredicateName();
- for (int i = 0; i < list.size(); i++) {
- produceScript(list.get(i));
-
- // for the first/last P there is no parent to close
- if (i > 0 && i < list.size() - 1) script.append(")");
-
- // add teh connector for all but last P
- if (i < list.size() - 1) {
- script.append(".").append(connector).append("(");
- }
- }
- } else if (p instanceof NotP) {
- script.append("P.not(");
- produceScript(p.negate());
- } else {
- script.append("P.").append(p.getPredicateName()).append("(");
- convertToScript(p.getValue());
- }
- script.append(")");
- return script;
- }
-
- private String convertMapToArguments(final Map<Object,Object> map) {
- return map.entrySet().stream().map(entry ->
- String.format("%s: %s", entry.getKey().toString(), convertToScript(entry.getValue()))).
- collect(Collectors.joining(", "));
- }
- }
-
- /**
- * An extension of the {@link DefaultTypeTranslator} that generates Gremlin that is compliant with
- * {@code gremlin-language} scripts. Specifically, it will convert {@code Date} and {@code Timestamp} to use the
- * {@code datetime()} function. Time zone offsets are resolved to where {@code 2018-03-22T00:35:44.741+1600}
- * would be converted to {@code datetime('2018-03-21T08:35:44.741Z')}. More commonly {@code 2018-03-22} would simply
- * generate {@code datetime('2018-03-22T00:00:00Z')}.
- * <p/>
- * In addition, it prefers use of {@code Vertex} when producing a {@link ReferenceVertex}.
- */
- public static class LanguageTypeTranslator extends DefaultTypeTranslator {
- public LanguageTypeTranslator(final boolean withParameters) {
- super(withParameters);
- }
-
- @Override
- protected String getSyntax(final Date o) {
- return getDatetimeSyntax(o.toInstant());
- }
-
- @Override
- protected String getSyntax(final OffsetDateTime o) {
- return getDatetimeSyntax(o.toInstant());
- }
-
- @Override
- protected String getSyntax(final Timestamp o) {
- return getDatetimeSyntax(o.toInstant());
- }
-
- @Override
- protected Script produceScript(final Vertex o) {
- script.append("new Vertex(");
- convertToScript(o.id());
- script.append(",");
- convertToScript(o.label());
- return script.append(")");
- }
-
- @Override
- protected String getSyntax(final Number o) {
- if (o instanceof Double || o instanceof Float) {
- if (NumberHelper.isNaN(o))
- return "NaN";
- if (NumberHelper.isPositiveInfinity(o))
- return "Infinity";
- if (NumberHelper.isNegativeInfinity(o))
- return "-Infinity";
-
- return o + (o instanceof Double ? "D" : "F");
- }
- if (o instanceof Long)
- return o + "L";
- if (o instanceof Integer)
- return o + "I";
- if (o instanceof Byte)
- return o + "B";
- if (o instanceof Short)
- return o + "S";
- if (o instanceof BigInteger)
- return o + "N";
- if (o instanceof BigDecimal)
- return o + "D";
-
- return o.toString();
- }
-
- private static String getDatetimeSyntax(final Instant i) {
- return String.format("datetime('%s')", DatetimeHelper.format(i));
- }
- }
-}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/translator/JavascriptTranslator.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/translator/JavascriptTranslator.java
deleted file mode 100644
index 643b8f4..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/translator/JavascriptTranslator.java
+++ /dev/null
@@ -1,415 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tinkerpop.gremlin.process.traversal.translator;
-
-import org.apache.commons.configuration2.ConfigurationConverter;
-import org.apache.commons.text.StringEscapeUtils;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
-import org.apache.tinkerpop.gremlin.process.traversal.P;
-import org.apache.tinkerpop.gremlin.process.traversal.Pick;
-import org.apache.tinkerpop.gremlin.process.traversal.SackFunctions;
-import org.apache.tinkerpop.gremlin.process.traversal.Script;
-import org.apache.tinkerpop.gremlin.process.traversal.Text;
-import org.apache.tinkerpop.gremlin.process.traversal.TextP;
-import org.apache.tinkerpop.gremlin.process.traversal.Translator;
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
-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.strategy.TraversalStrategyProxy;
-import org.apache.tinkerpop.gremlin.process.traversal.util.ConnectiveP;
-import org.apache.tinkerpop.gremlin.process.traversal.util.OrP;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
-import org.apache.tinkerpop.gremlin.util.NumberHelper;
-import org.apache.tinkerpop.gremlin.util.function.Lambda;
-
-import java.sql.Timestamp;
-import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-import java.util.function.BinaryOperator;
-import java.util.function.Supplier;
-import java.util.function.UnaryOperator;
-
-/**
- * Converts bytecode to a Javascript string of Gremlin.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public final class JavascriptTranslator implements Translator.ScriptTranslator {
-
- private final String traversalSource;
- private final TypeTranslator typeTranslator;
-
- private JavascriptTranslator(final String traversalSource, final TypeTranslator typeTranslator) {
- this.traversalSource = traversalSource;
- this.typeTranslator = typeTranslator;
- }
-
- /**
- * Creates the translator with a {@code false} argument to {@code withParameters} using
- * {@link #of(String, boolean)}.
- */
- public static JavascriptTranslator of(final String traversalSource) {
- return of(traversalSource, false);
- }
-
- /**
- * Creates the translator with the {@link DefaultTypeTranslator} passing the {@code withParameters} option to it
- * which will handle type translation in a fashion that should typically increase cache hits and reduce
- * compilation times if enabled at the sacrifice to rewriting of the script that could reduce readability.
- */
- public static JavascriptTranslator of(final String traversalSource, final boolean withParameters) {
- return of(traversalSource, new DefaultTypeTranslator(withParameters));
- }
-
- /**
- * Creates the translator with a custom {@link TypeTranslator} instance.
- */
- public static JavascriptTranslator of(final String traversalSource, final TypeTranslator typeTranslator) {
- return new JavascriptTranslator(traversalSource, typeTranslator);
- }
-
- @Override
- public Script translate(final Bytecode bytecode) {
- return typeTranslator.apply(traversalSource, bytecode);
- }
-
- @Override
- public String getTargetLanguage() {
- return "gremlin-javascript";
- }
-
- @Override
- public String toString() {
- return StringFactory.translatorString(this);
- }
-
- @Override
- public String getTraversalSource() {
- return this.traversalSource;
- }
-
- /**
- * Performs standard type translation for the TinkerPop types to Javascript.
- */
- public static class DefaultTypeTranslator extends AbstractTypeTranslator {
-
- public DefaultTypeTranslator(final boolean withParameters) {
- super(withParameters);
- }
-
- @Override
- protected String getNullSyntax() {
- return "null";
- }
-
- @Override
- protected String getSyntax(final String o) {
- return (o.contains("\"") ? "\"\"\"" + StringEscapeUtils.escapeJava(o) + "\"\"\"" : "\"" + StringEscapeUtils.escapeJava(o) + "\"")
- .replace("$", "\\$");
- }
-
- @Override
- protected String getSyntax(final Boolean o) {
- return o.toString();
- }
-
- @Override
- protected String getSyntax(final Date o) {
- return "new Date(" + o.getTime() + ")";
- }
-
- @Override
- protected String getSyntax(final OffsetDateTime o) {
- return "new Date('" + o.toString() + "')";
- }
-
- @Override
- protected String getSyntax(final Timestamp o) {
- return "new Date(" + o.getTime() + ")";
- }
-
- @Override
- protected String getSyntax(final UUID o) {
- return "'" + o.toString() + "'";
- }
-
- @Override
- protected String getSyntax(final Lambda o) {
- return "() => \"" + StringEscapeUtils.escapeEcmaScript(o.getLambdaScript().trim()) + "\"";
- }
-
- @Override
- protected String getSyntax(final SackFunctions.Barrier o) {
- return "Barrier." + o.toString();
- }
-
- @Override
- protected String getSyntax(final VertexProperty.Cardinality o) {
- return "Cardinality." + o.toString();
- }
-
- @Override
- protected String getSyntax(final Pick o) {
- return "Pick." + o.toString();
- }
-
- @Override
- protected String getSyntax(final Number o) {
- if (o instanceof Float || o instanceof Double) {
- if (NumberHelper.isNaN(o))
- return "Number.NaN";
- if (NumberHelper.isPositiveInfinity(o))
- return "Number.POSITIVE_INFINITY";
- if (NumberHelper.isNegativeInfinity(o))
- return "Number.NEGATIVE_INFINITY";
- }
- return o.toString();
- }
-
- @Override
- protected Script produceCardinalityValue(final Bytecode o) {
- final Bytecode.Instruction inst = o.getSourceInstructions().get(0);
- script.append("CardinalityValue." + inst.getArguments()[0] + "(");
- convertToScript(inst.getArguments()[1]);
- script.append(")");
- return script;
- }
-
- @Override
- protected Script produceScript(final Set<?> o) {
- return produceScript(new ArrayList<>(o));
- }
-
- @Override
- protected Script produceScript(final List<?> o) {
- final Iterator<?> iterator = ((List<?>) o).iterator();
- script.append("[");
-
- while (iterator.hasNext()) {
- final Object nextItem = iterator.next();
- convertToScript(nextItem);
- if (iterator.hasNext())
- script.append(",").append(" ");
- }
-
- return script.append("]");
- }
-
- @Override
- protected Script produceScript(final Map<?, ?> o) {
- script.append("new Map([");
- final Iterator<? extends Map.Entry<?, ?>> itty = ((Map<?, ?>) o).entrySet().iterator();
- while (itty.hasNext()) {
- final Map.Entry<?,?> entry = itty.next();
- script.append("[");
- convertToScript(entry.getKey());
- script.append(",");
- convertToScript(entry.getValue());
- script.append("]");
- if (itty.hasNext())
- script.append(",");
- }
- return script.append("])");
- }
-
- @Override
- protected Script produceScript(final Class<?> o) {
- return script.append(o.getCanonicalName());
- }
-
- @Override
- protected Script produceScript(final Enum<?> o) {
- return script.append(o.getDeclaringClass().getSimpleName() + "." + o.toString());
- }
-
- @Override
- protected Script produceScript(final Vertex o) {
- script.append("new Vertex(");
- convertToScript(o.id());
- script.append(",");
- convertToScript(o.label());
- return script.append(", null)");
- }
-
- @Override
- protected Script produceScript(final Edge o) {
- script.append("new Edge(");
- convertToScript(o.id());
- script.append(", new Vertex(");
- convertToScript(o.outVertex().id());
- script.append(",");
- convertToScript(o.outVertex().label());
- script.append(", null),");
- convertToScript(o.label());
- script.append(", new Vertex(");
- convertToScript(o.inVertex().id());
- script.append(",");
- convertToScript(o.inVertex().label());
- return script.append(",null),null)");
- }
-
- @Override
- protected Script produceScript(final VertexProperty<?> o) {
- script.append("new Property(");
- convertToScript(o.id());
- script.append(",");
- convertToScript(o.label());
- script.append(",");
- convertToScript(o.value());
- script.append(",");
- return script.append("null)");
- }
-
- @Override
- protected Script produceScript(final TraversalStrategyProxy<?> o) {
- if (o.getConfiguration().isEmpty()) {
- return script.append("new " + o.getStrategyClass().getSimpleName() + "()");
- } else {
- script.append("new " + o.getStrategyClass().getSimpleName() + "(");
- final Map<Object,Object> conf = ConfigurationConverter.getMap(o.getConfiguration());
- script.append("{");
- conf.entrySet().stream().forEach(entry -> {
- script.append(entry.getKey().toString());
- script.append(":");
- convertToScript(entry.getValue()).getScript();
- script.append(",");
- });
- script.setCharAtEnd('}');
- return script.append(")");
- }
- }
-
- @Override
- protected Script produceScript(final String traversalSource, final Bytecode o) {
- script.append(traversalSource);
- for (final Bytecode.Instruction instruction : o.getInstructions()) {
- final String methodName = instruction.getOperator();
- if (0 == instruction.getArguments().length) {
- script.append(".").append(resolveSymbol(methodName)).append("()");
- } else {
- script.append(".").append(resolveSymbol(methodName)).append("(");
-
- // have to special case withSack() for Groovy because UnaryOperator and BinaryOperator signatures
- // make it impossible for the interpreter to figure out which function to call. specifically we need
- // to discern between:
- // withSack(A initialValue, UnaryOperator<A> splitOperator)
- // withSack(A initialValue, BinaryOperator<A> splitOperator)
- // and:
- // withSack(Supplier<A> initialValue, UnaryOperator<A> mergeOperator)
- // withSack(Supplier<A> initialValue, BinaryOperator<A> mergeOperator)
- if (methodName.equals(TraversalSource.Symbols.withSack) &&
- instruction.getArguments().length == 2 && instruction.getArguments()[1] instanceof Lambda) {
- final String castFirstArgTo = instruction.getArguments()[0] instanceof Lambda ?
- Supplier.class.getName() : "";
- final Lambda secondArg = (Lambda) instruction.getArguments()[1];
- final String castSecondArgTo = secondArg.getLambdaArguments() == 1 ? UnaryOperator.class.getName() :
- BinaryOperator.class.getName();
- if (!castFirstArgTo.isEmpty())
- script.append(String.format("(%s) ", castFirstArgTo));
- convertToScript(instruction.getArguments()[0]);
- script.append(", (").append(castSecondArgTo).append(") ");
- convertToScript(instruction.getArguments()[1]);
- script.append(",");
- } else if (methodName.equals(GraphTraversalSource.Symbols.tx)) {
- final String command = instruction.getArguments()[0].toString();
- script.append(").").append(command).append("()");
- } else {
- for (final Object object : instruction.getArguments()) {
- convertToScript(object);
- script.append(",");
- }
- }
- script.setCharAtEnd(')');
- }
- }
- return script;
- }
-
- @Override
- protected Script produceScript(final P<?> p) {
- if (p instanceof TextP) {
- script.append("TextP.").append(p.getPredicateName()).append("(");
- convertToScript(p.getValue());
- } else if (p instanceof ConnectiveP) {
- // ConnectiveP gets some special handling because it's reduced to and(P, P, P) and we want it
- // generated the way it was written which was P.and(P).and(P)
- final List<P<?>> list = ((ConnectiveP) p).getPredicates();
- final String connector = p.getPredicateName();
- for (int i = 0; i < list.size(); i++) {
- produceScript(list.get(i));
-
- // for the first/last P there is no parent to close
- if (i > 0 && i < list.size() - 1) script.append(")");
-
- // add teh connector for all but last P
- if (i < list.size() - 1) {
- script.append(".").append(connector).append("(");
- }
- }
- } else {
- script.append("P.").append(p.getPredicateName()).append("(");
- convertToScript(p.getValue());
- }
- script.append(")");
- return script;
- }
-
- protected String resolveSymbol(final String methodName) {
- return SymbolHelper.toJavascript(methodName);
- }
- }
-
- static final class SymbolHelper {
-
- private final static Map<String, String> TO_JS_MAP = new HashMap<>();
- private final static Map<String, String> FROM_JS_MAP = new HashMap<>();
-
- static {
- TO_JS_MAP.put("from", "from_");
- TO_JS_MAP.put("in", "in_");
- TO_JS_MAP.put("with", "with_");
- //
- TO_JS_MAP.forEach((k, v) -> FROM_JS_MAP.put(v, k));
- }
-
- private SymbolHelper() {
- // static methods only, do not instantiate
- }
-
- public static String toJavascript(final String symbol) {
- return TO_JS_MAP.getOrDefault(symbol, symbol);
- }
-
- public static String toJava(final String symbol) {
- return FROM_JS_MAP.getOrDefault(symbol, symbol);
- }
-
- }
-}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/translator/PythonTranslator.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/translator/PythonTranslator.java
deleted file mode 100644
index 907ef24..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/translator/PythonTranslator.java
+++ /dev/null
@@ -1,490 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tinkerpop.gremlin.process.traversal.translator;
-
-import org.apache.commons.configuration2.ConfigurationConverter;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.text.StringEscapeUtils;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
-import org.apache.tinkerpop.gremlin.process.traversal.P;
-import org.apache.tinkerpop.gremlin.process.traversal.Pick;
-import org.apache.tinkerpop.gremlin.process.traversal.SackFunctions;
-import org.apache.tinkerpop.gremlin.process.traversal.Script;
-import org.apache.tinkerpop.gremlin.process.traversal.Text;
-import org.apache.tinkerpop.gremlin.process.traversal.TextP;
-import org.apache.tinkerpop.gremlin.process.traversal.Translator;
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
-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.strategy.TraversalStrategyProxy;
-import org.apache.tinkerpop.gremlin.process.traversal.util.ConnectiveP;
-import org.apache.tinkerpop.gremlin.process.traversal.util.OrP;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
-import org.apache.tinkerpop.gremlin.util.NumberHelper;
-import org.apache.tinkerpop.gremlin.util.function.Lambda;
-
-import java.lang.reflect.Method;
-import java.math.BigDecimal;
-import java.sql.Timestamp;
-import java.time.OffsetDateTime;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-import java.util.function.BiPredicate;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-/**
- * Translates Gremlin {@link Bytecode} into a Python string representation.
- *
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public final class PythonTranslator implements Translator.ScriptTranslator {
-
- private static final Set<String> STEP_NAMES = Stream.of(GraphTraversal.class.getMethods()).filter(
- method -> Traversal.class.isAssignableFrom(method.getReturnType())).map(Method::getName).
- collect(Collectors.toSet());
-
- private final String traversalSource;
- private final TypeTranslator typeTranslator;
-
- private PythonTranslator(final String traversalSource, final TypeTranslator typeTranslator) {
- this.traversalSource = traversalSource;
- this.typeTranslator = typeTranslator;
- }
-
- /**
- * Creates the translator with a {@code false} argument to {@code withParameters} using
- * {@link #of(String, boolean)}.
- */
- public static PythonTranslator of(final String traversalSource) {
- return of(traversalSource, false);
- }
-
- /**
- * Creates the translator with the {@link DefaultTypeTranslator} passing the {@code withParameters} option to it
- * which will handle type translation in a fashion that should typically increase cache hits and reduce
- * compilation times if enabled at the sacrifice to rewriting of the script that could reduce readability.
- */
- public static PythonTranslator of(final String traversalSource, final boolean withParameters) {
- return of(traversalSource, new DefaultTypeTranslator(withParameters));
- }
-
- /**
- * Creates the translator with a custom {@link TypeTranslator} instance.
- */
- public static PythonTranslator of(final String traversalSource, final TypeTranslator typeTranslator) {
- return new PythonTranslator(traversalSource, typeTranslator);
- }
-
- @Override
- public String getTraversalSource() {
- return this.traversalSource;
- }
-
- @Override
- public Script translate(final Bytecode bytecode) {
- return typeTranslator.apply(traversalSource, bytecode);
- }
-
- @Override
- public String getTargetLanguage() {
- return "gremlin-python";
- }
-
- @Override
- public String toString() {
- return StringFactory.translatorString(this);
- }
-
- ///////
-
- /**
- * Performs standard type translation for the TinkerPop types to Python.
- */
- public static class DefaultTypeTranslator extends AbstractTypeTranslator {
-
- public DefaultTypeTranslator(final boolean withParameters) {
- super(withParameters);
- }
-
- @Override
- protected String getNullSyntax() {
- return "None";
- }
-
- @Override
- protected String getSyntax(final String o) {
- return o.contains("'") || o.contains(System.lineSeparator()) ?
- "\"\"\"" + o + "\"\"\"" : "'" + o + "'";
- }
-
- @Override
- protected String getSyntax(final Boolean o) {
- return o ? "True" : "False";
- }
-
- @Override
- protected String getSyntax(final Date o) {
- return "datetime.datetime.utcfromtimestamp(" + o.getTime() + " / 1000.0)";
- }
-
- @Override
- protected String getSyntax(final OffsetDateTime o) {
- final String dt = o.toString();
- final String dtISOString = dt.endsWith("Z") ? dt.replace("Z", "+00:00") : dt;
- return "datetime.datetime.fromisoformat('" + dtISOString + "')";
- }
-
- @Override
- protected String getSyntax(final Timestamp o) {
- return "timestamp(" + o.getTime() + " / 1000.0)";
- }
-
- @Override
- protected String getSyntax(final UUID o) {
- return "UUID('" + o.toString() +"')";
- }
-
- @Override
- protected String getSyntax(final Lambda o) {
- final String lambdaString = o.getLambdaScript().trim();
- return "lambda: \"" + StringEscapeUtils.escapeJava(lambdaString) + "\"";
- }
-
- @Override
- protected String getSyntax(final Number o) {
- if (o instanceof Double || o instanceof Float || o instanceof BigDecimal) {
- if (NumberHelper.isNaN(o))
- return "float('nan')";
- if (NumberHelper.isPositiveInfinity(o))
- return "float('inf')";
- if (NumberHelper.isNegativeInfinity(o))
- return "float('-inf')";
-
- return "float(" + o + ")";
- }
- if (o instanceof Byte)
- return "SingleByte(" + o + ")";
-
- // for large numbers need to specify the type
- if (o.longValue() > Integer.MAX_VALUE) {
- return "long(" + o + ")";
- }
- // otherwise just use python int/bignum
- return o.toString();
- }
-
- @Override
- protected String getSyntax(final SackFunctions.Barrier o) {
- return "Barrier." + resolveSymbol(o.toString());
- }
-
- @Override
- protected String getSyntax(final VertexProperty.Cardinality o) {
- return "Cardinality." + resolveSymbol(o.toString());
- }
-
- @Override
- protected String getSyntax(final Pick o) {
- if (o.equals(Pick.any)) {
- // Translates to Pick.any_ due to any() being a built-in function in Python.
- return "Pick.any_";
- }
- return "Pick." + resolveSymbol(o.toString());
- }
-
- @Override
- protected Script produceScript(final Set<?> o) {
- final Iterator<?> iterator = o.iterator();
- script.append("set((");
- while(iterator.hasNext()) {
- convertToScript(iterator.next());
- if (iterator.hasNext())
- script.append(",");
- }
- return script.append("))");
- }
-
- @Override
- protected Script produceScript(final List<?> o) {
- final Iterator<?> iterator = o.iterator();
- script.append("[");
- while(iterator.hasNext()) {
- convertToScript(iterator.next());
- if (iterator.hasNext())
- script.append(",");
- }
- return script.append("]");
- }
-
- @Override
- protected Script produceScript(final Map<?, ?> o) {
- script.append("{");
- final Iterator<? extends Map.Entry<?, ?>> itty = o.entrySet().iterator();
- while (itty.hasNext()) {
- final Map.Entry<?,?> entry = itty.next();
- convertToScript(entry.getKey()).append(":");
- convertToScript(entry.getValue());
- if (itty.hasNext())
- script.append(",");
- }
- return script.append("}");
- }
-
- @Override
- protected Script produceScript(final Class<?> o) {
- return script.append("GremlinType('" + o.getCanonicalName() + "')");
- }
-
- @Override
- protected Script produceScript(final Enum<?> o) {
- return script.append(o.getDeclaringClass().getSimpleName() + "." + resolveSymbol(o.toString()));
- }
-
- @Override
- protected Script produceScript(final Vertex o) {
- script.append("Vertex(");
- convertToScript(o.id()).append(",");
- return convertToScript(o.label()).append(")");
- }
-
- @Override
- protected Script produceScript(final Edge o) {
- script.append("Edge(");
- convertToScript(o.id()).append(",");
- convertToScript(o.outVertex()).append(",");
- convertToScript(o.label()).append(",");
- return convertToScript(o.inVertex()).append(")");
- }
-
- @Override
- protected Script produceScript(final VertexProperty<?> o) {
- script.append("VertexProperty(");
- convertToScript(o.id()).append(",");
- convertToScript(o.label()).append(",");
- return convertToScript(o.value()).append(")");
- }
-
- @Override
- protected Script produceScript(final TraversalStrategyProxy<?> o) {
- if (o.getConfiguration().isEmpty())
- return script.append("TraversalStrategy('" + o.getStrategyClass().getSimpleName() + "', None, '" + o.getStrategyClass().getName() + "')");
- else {
- script.append("TraversalStrategy('").append(o.getStrategyClass().getSimpleName()).append("',");
- convertToScript(ConfigurationConverter.getMap(o.getConfiguration()));
- script.append(", '");
- script.append(o.getStrategyClass().getName());
- return script.append("')");
- }
- }
-
- @Override
- protected Script produceScript(final String traversalSource, final Bytecode o) {
- script.append(traversalSource);
- for (final Bytecode.Instruction instruction : o.getInstructions()) {
- final String methodName = instruction.getOperator();
- final Object[] arguments = instruction.getArguments();
- if (0 == arguments.length)
- script.append(".").append(resolveSymbol(methodName)).append("()");
- else if (methodName.equals("range") && 2 == arguments.length)
- if (((Number) arguments[0]).longValue() + 1 == ((Number) arguments[1]).longValue())
- script.append("[").append(arguments[0].toString()).append("]");
- else
- script.append("[").append(arguments[0].toString()).append(":").append(arguments[1].toString()).append("]");
- else if (methodName.equals("limit") && 1 == arguments.length)
- script.append("[0:").append(arguments[0].toString()).append("]");
- else if (methodName.equals("values") && 1 == arguments.length && script.getScript().length() > 3 && !STEP_NAMES.contains(arguments[0].toString()))
- script.append(".").append(arguments[0].toString());
- else if (methodName.equals(GraphTraversalSource.Symbols.tx)) {
- final String command = instruction.getArguments()[0].toString();
- script.append(".").append(methodName).append("().").append(command).append("()");
- } else {
- script.append(".").append(resolveSymbol(methodName)).append("(");
-
- // python has trouble with java varargs...wrapping in collection seems to solve the problem
- final boolean varargsBeware = instruction.getOperator().equals(TraversalSource.Symbols.withStrategies)
- || instruction.getOperator().equals(TraversalSource.Symbols.withoutStrategies);
- if (varargsBeware) script.append("*[");
-
- final Iterator<?> itty = Stream.of(arguments).iterator();
- while (itty.hasNext()) {
- convertToScript(itty.next());
- if (itty.hasNext()) script.append(",");
- }
-
- if (varargsBeware) script.append("]");
-
- script.append(")");
- }
- }
- return script;
- }
-
- @Override
- protected Script produceScript(final P<?> p) {
- if (p instanceof TextP) {
- // special case the RegexPredicate since it's named in python "not_regex"
- final BiPredicate<?, ?> tp = p.getBiPredicate();
- if (tp instanceof Text.RegexPredicate) {
- final String regexToken = ((Text.RegexPredicate) p.getBiPredicate()).isNegate() ? "not_regex" : "regex";
- script.append("TextP.").append(regexToken).append("(");
- } else {
- script.append("TextP.").append(p.getPredicateName()).append("(");
- }
- convertToScript(p.getValue());
- } else if (p instanceof ConnectiveP) {
- // ConnectiveP gets some special handling because it's reduced to and(P, P, P) and we want it
- // generated the way it was written which was P.and(P).and(P)
- final List<P<?>> list = ((ConnectiveP) p).getPredicates();
- final String connector = p instanceof OrP ? "or_" : "and_";
- for (int i = 0; i < list.size(); i++) {
- produceScript(list.get(i));
-
- // for the first/last P there is no parent to close
- if (i > 0 && i < list.size() - 1) script.append(")");
-
- // add the connector for all but last P
- if (i < list.size() - 1) {
- script.append(".").append(connector).append("(");
- }
- }
- } else {
- script.append("P.").append(resolveSymbol(p.getPredicateName())).append("(");
- convertToScript(p.getValue());
- }
- script.append(")");
- return script;
- }
-
- @Override
- protected Script produceCardinalityValue(final Bytecode o) {
- final Bytecode.Instruction inst = o.getSourceInstructions().get(0);
- script.append("CardinalityValue." + resolveSymbol(inst.getArguments()[0].toString()) + "(");
- convertToScript(inst.getArguments()[1]);
- script.append(")");
- return script;
- }
-
- protected String resolveSymbol(final String methodName) {
- return SymbolHelper.toPython(methodName);
- }
- }
-
- /**
- * Performs translation without for the syntax sugar to Python.
- */
- public static class NoSugarTranslator extends DefaultTypeTranslator {
-
- public NoSugarTranslator(final boolean withParameters) {
- super(withParameters);
- }
-
- @Override
- protected Script produceScript(final String traversalSource, final Bytecode o) {
- script.append(traversalSource);
- for (final Bytecode.Instruction instruction : o.getInstructions()) {
- final String methodName = instruction.getOperator();
- final Object[] arguments = instruction.getArguments();
- if (0 == arguments.length)
- script.append(".").append(resolveSymbol(methodName)).append("()");
- else {
- script.append(".").append(resolveSymbol(methodName)).append("(");
-
- // python has trouble with java varargs...wrapping in collection seems to solve
- // the problem
- final boolean varargsBeware = instruction.getOperator().equals(TraversalSource.Symbols.withStrategies)
- || instruction.getOperator().equals(TraversalSource.Symbols.withoutStrategies);
- if (varargsBeware)
- script.append("*[");
-
- final Iterator<?> itty = Stream.of(arguments).iterator();
- while (itty.hasNext()) {
- convertToScript(itty.next());
- if (itty.hasNext())
- script.append(",");
- }
-
- if (varargsBeware)
- script.append("]");
-
- script.append(")");
- }
- }
- return script;
- }
-
- }
- static final class SymbolHelper {
-
- private final static Map<String, String> TO_PYTHON_MAP = new HashMap<>();
-
- static {
- TO_PYTHON_MAP.put("global", "global_");
- TO_PYTHON_MAP.put("all", "all_");
- TO_PYTHON_MAP.put("and", "and_");
- TO_PYTHON_MAP.put("any", "any_");
- TO_PYTHON_MAP.put("as", "as_");
- TO_PYTHON_MAP.put("filter", "filter_");
- TO_PYTHON_MAP.put("format", "format_");
- TO_PYTHON_MAP.put("from", "from_");
- TO_PYTHON_MAP.put("id", "id_");
- TO_PYTHON_MAP.put("in", "in_");
- TO_PYTHON_MAP.put("is", "is_");
- TO_PYTHON_MAP.put("list", "list_");
- TO_PYTHON_MAP.put("max", "max_");
- TO_PYTHON_MAP.put("min", "min_");
- TO_PYTHON_MAP.put("or", "or_");
- TO_PYTHON_MAP.put("not", "not_");
- TO_PYTHON_MAP.put("range", "range_");
- TO_PYTHON_MAP.put("set", "set_");
- TO_PYTHON_MAP.put("sum", "sum_");
- TO_PYTHON_MAP.put("with", "with_");
- }
-
- private SymbolHelper() {
- // static methods only, do not instantiate
- }
-
- public static String toPython(final String symbol) {
- return TO_PYTHON_MAP.getOrDefault(symbol, convertCamelCaseToSnakeCase(symbol));
- }
-
- public static String convertCamelCaseToSnakeCase(final String camelCase) {
- if (StringUtils.isBlank(camelCase))
- return camelCase;
-
- // skip if this is a class/enum indicated by the first letter being upper case
- if (Character.isUpperCase(camelCase.charAt(0)))
- return camelCase;
-
- return camelCase.replaceAll("([A-Z])", "_$1").toLowerCase();
- }
- }
-}
\ No newline at end of file
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_LP_NL_O_P_S_SE_SL_Traverser.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_LP_NL_O_P_S_SE_SL_Traverser.java
index 1af9dbe..fd54ff7 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_LP_NL_O_P_S_SE_SL_Traverser.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_LP_NL_O_P_S_SE_SL_Traverser.java
@@ -18,18 +18,20 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.traverser;
-import org.apache.commons.collections.map.ReferenceMap;
+import org.apache.commons.collections4.map.AbstractReferenceMap;
+import org.apache.commons.collections4.map.ReferenceMap;
import org.apache.tinkerpop.gremlin.process.traversal.Step;
import org.apache.tinkerpop.gremlin.process.traversal.traverser.util.LabelledCounter;
import java.util.Iterator;
+import java.util.Map;
import java.util.Stack;
public class B_LP_NL_O_P_S_SE_SL_Traverser<T> extends B_LP_O_P_S_SE_SL_Traverser<T> {
protected Stack<LabelledCounter> nestedLoops;
- protected ReferenceMap loopNames = null;
+ protected ReferenceMap<String,Object> loopNames = null;
protected B_LP_NL_O_P_S_SE_SL_Traverser() {
}
@@ -37,7 +39,8 @@
public B_LP_NL_O_P_S_SE_SL_Traverser(final T t, final Step<T, ?> step, final long initialBulk) {
super(t, step, initialBulk);
this.nestedLoops = new Stack<>();
- this.loopNames = new ReferenceMap(ReferenceMap.HARD, ReferenceMap.WEAK);
+ this.loopNames = new ReferenceMap<>(AbstractReferenceMap.ReferenceStrength.HARD,
+ AbstractReferenceMap.ReferenceStrength.WEAK);
}
/////////////////
@@ -87,11 +90,12 @@
clone.nestedLoops.push((LabelledCounter) lc.clone());
if (this.loopNames != null) {
- clone.loopNames = new ReferenceMap(ReferenceMap.HARD, ReferenceMap.WEAK);
+ clone.loopNames = new ReferenceMap<>(AbstractReferenceMap.ReferenceStrength.HARD,
+ AbstractReferenceMap.ReferenceStrength.WEAK);
- final Iterator loopNamesIterator = this.loopNames.entrySet().iterator();
+ final Iterator<Map.Entry<String,Object>> loopNamesIterator = this.loopNames.entrySet().iterator();
while (loopNamesIterator.hasNext()) {
- final ReferenceMap.Entry pair = (ReferenceMap.Entry) loopNamesIterator.next();
+ final ReferenceMap.Entry<String,Object> pair = loopNamesIterator.next();
final int idx = this.nestedLoops.indexOf(pair.getValue());
if (idx != -1)
@@ -110,11 +114,12 @@
clone.nestedLoops.push((LabelledCounter) lc.clone());
if (this.loopNames != null) {
- clone.loopNames = new ReferenceMap(ReferenceMap.HARD, ReferenceMap.WEAK);
+ clone.loopNames = new ReferenceMap<>(AbstractReferenceMap.ReferenceStrength.HARD,
+ AbstractReferenceMap.ReferenceStrength.WEAK);
- final Iterator loopNamesIterator = this.loopNames.entrySet().iterator();
+ final Iterator<Map.Entry<String,Object>> loopNamesIterator = this.loopNames.entrySet().iterator();
while (loopNamesIterator.hasNext()) {
- final ReferenceMap.Entry pair = (ReferenceMap.Entry) loopNamesIterator.next();
+ final ReferenceMap.Entry<String,Object> pair = loopNamesIterator.next();
final int idx = this.nestedLoops.indexOf(pair.getValue());
if (idx != -1)
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_LP_NL_O_S_SE_SL_Traverser.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_LP_NL_O_S_SE_SL_Traverser.java
index 401bfd2..d14c8c1 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_LP_NL_O_S_SE_SL_Traverser.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_LP_NL_O_S_SE_SL_Traverser.java
@@ -18,18 +18,20 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.traverser;
-import org.apache.commons.collections.map.ReferenceMap;
+import org.apache.commons.collections4.map.ReferenceMap;
+import org.apache.commons.collections4.map.AbstractReferenceMap;
import org.apache.tinkerpop.gremlin.process.traversal.Step;
import org.apache.tinkerpop.gremlin.process.traversal.traverser.util.LabelledCounter;
import java.util.Iterator;
+import java.util.Map;
import java.util.Set;
import java.util.Stack;
public class B_LP_NL_O_S_SE_SL_Traverser<T> extends B_LP_O_S_SE_SL_Traverser<T> {
protected Stack<LabelledCounter> nestedLoops;
- protected ReferenceMap loopNames = null;
+ protected ReferenceMap<String,Object> loopNames = null;
protected B_LP_NL_O_S_SE_SL_Traverser() {
}
@@ -37,7 +39,8 @@
public B_LP_NL_O_S_SE_SL_Traverser(final T t, final Step<T, ?> step, final long initialBulk) {
super(t, step, initialBulk);
this.nestedLoops = new Stack<>();
- this.loopNames = new ReferenceMap(ReferenceMap.HARD, ReferenceMap.WEAK);
+ this.loopNames = new ReferenceMap<>(AbstractReferenceMap.ReferenceStrength.HARD,
+ AbstractReferenceMap.ReferenceStrength.WEAK);
}
/////////////////
@@ -91,11 +94,12 @@
clone.nestedLoops.push((LabelledCounter) lc.clone());
if (this.loopNames != null) {
- clone.loopNames = new ReferenceMap(ReferenceMap.HARD, ReferenceMap.WEAK);
+ clone.loopNames = new ReferenceMap<>(AbstractReferenceMap.ReferenceStrength.HARD,
+ AbstractReferenceMap.ReferenceStrength.WEAK);
- final Iterator loopNamesIterator = this.loopNames.entrySet().iterator();
+ final Iterator<Map.Entry<String,Object>> loopNamesIterator = this.loopNames.entrySet().iterator();
while (loopNamesIterator.hasNext()) {
- final ReferenceMap.Entry pair = (ReferenceMap.Entry) loopNamesIterator.next();
+ final ReferenceMap.Entry<String,Object> pair = loopNamesIterator.next();
final int idx = this.nestedLoops.indexOf(pair.getValue());
if (idx != -1)
@@ -114,11 +118,12 @@
clone.nestedLoops.push((LabelledCounter) lc.clone());
if (this.loopNames != null) {
- clone.loopNames = new ReferenceMap(ReferenceMap.HARD, ReferenceMap.WEAK);
+ clone.loopNames = new ReferenceMap<>(AbstractReferenceMap.ReferenceStrength.HARD,
+ AbstractReferenceMap.ReferenceStrength.WEAK);
- final Iterator loopNamesIterator = this.loopNames.entrySet().iterator();
+ final Iterator<Map.Entry<String,Object>> loopNamesIterator = this.loopNames.entrySet().iterator();
while (loopNamesIterator.hasNext()) {
- final ReferenceMap.Entry pair = (ReferenceMap.Entry) loopNamesIterator.next();
+ final ReferenceMap.Entry<String,Object> pair = loopNamesIterator.next();
final int idx = this.nestedLoops.indexOf(pair.getValue());
if (idx != -1)
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_NL_O_S_SE_SL_Traverser.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_NL_O_S_SE_SL_Traverser.java
index 6e18d12..ba1d543 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_NL_O_S_SE_SL_Traverser.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_NL_O_S_SE_SL_Traverser.java
@@ -18,17 +18,19 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.traverser;
-import org.apache.commons.collections.map.ReferenceMap;
+import org.apache.commons.collections4.map.AbstractReferenceMap;
+import org.apache.commons.collections4.map.ReferenceMap;
import org.apache.tinkerpop.gremlin.process.traversal.Step;
import org.apache.tinkerpop.gremlin.process.traversal.traverser.util.LabelledCounter;
import java.util.Iterator;
+import java.util.Map;
import java.util.Stack;
public class B_NL_O_S_SE_SL_Traverser<T> extends B_O_S_SE_SL_Traverser<T> {
protected Stack<LabelledCounter> nestedLoops;
- protected ReferenceMap loopNames = null;
+ protected ReferenceMap<String,Object> loopNames = null;
protected B_NL_O_S_SE_SL_Traverser() {
}
@@ -36,7 +38,8 @@
public B_NL_O_S_SE_SL_Traverser(final T t, final Step<T, ?> step, final long initialBulk) {
super(t, step, initialBulk);
this.nestedLoops = new Stack<>();
- this.loopNames = new ReferenceMap(ReferenceMap.HARD, ReferenceMap.WEAK);
+ this.loopNames = new ReferenceMap<>(AbstractReferenceMap.ReferenceStrength.HARD,
+ AbstractReferenceMap.ReferenceStrength.WEAK);
}
/////////////////
@@ -87,11 +90,12 @@
clone.nestedLoops.push((LabelledCounter) lc.clone());
if (this.loopNames != null) {
- clone.loopNames = new ReferenceMap(ReferenceMap.HARD, ReferenceMap.WEAK);
+ clone.loopNames = new ReferenceMap<>(AbstractReferenceMap.ReferenceStrength.HARD,
+ AbstractReferenceMap.ReferenceStrength.WEAK);
- final Iterator loopNamesIterator = this.loopNames.entrySet().iterator();
+ final Iterator<Map.Entry<String,Object>> loopNamesIterator = this.loopNames.entrySet().iterator();
while (loopNamesIterator.hasNext()) {
- final ReferenceMap.Entry pair = (ReferenceMap.Entry) loopNamesIterator.next();
+ final ReferenceMap.Entry<String,Object> pair = loopNamesIterator.next();
final int idx = this.nestedLoops.indexOf(pair.getValue());
if (idx != -1)
@@ -111,11 +115,12 @@
clone.nestedLoops.push((LabelledCounter) lc.clone());
if (this.loopNames != null) {
- clone.loopNames = new ReferenceMap(ReferenceMap.HARD, ReferenceMap.WEAK);
+ clone.loopNames = new ReferenceMap<>(AbstractReferenceMap.ReferenceStrength.HARD,
+ AbstractReferenceMap.ReferenceStrength.WEAK);
- final Iterator loopNamesIterator = this.loopNames.entrySet().iterator();
+ final Iterator<Map.Entry<String,Object>> loopNamesIterator = this.loopNames.entrySet().iterator();
while (loopNamesIterator.hasNext()) {
- final ReferenceMap.Entry pair = (ReferenceMap.Entry) loopNamesIterator.next();
+ final ReferenceMap.Entry<String,Object> pair = loopNamesIterator.next();
final int idx = this.nestedLoops.indexOf(pair.getValue());
if (idx != -1)
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/LP_NL_O_OB_P_S_SE_SL_Traverser.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/LP_NL_O_OB_P_S_SE_SL_Traverser.java
index 77157b8..ee22c6f 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/LP_NL_O_OB_P_S_SE_SL_Traverser.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/LP_NL_O_OB_P_S_SE_SL_Traverser.java
@@ -19,11 +19,13 @@
package org.apache.tinkerpop.gremlin.process.traversal.traverser;
-import org.apache.commons.collections.map.ReferenceMap;
+import org.apache.commons.collections4.map.AbstractReferenceMap;
+import org.apache.commons.collections4.map.ReferenceMap;
import org.apache.tinkerpop.gremlin.process.traversal.Step;
import org.apache.tinkerpop.gremlin.process.traversal.traverser.util.LabelledCounter;
import java.util.Iterator;
+import java.util.Map;
import java.util.Set;
import java.util.Stack;
@@ -38,7 +40,8 @@
public LP_NL_O_OB_P_S_SE_SL_Traverser(final T t, final Step<T, ?> step) {
super(t, step);
this.nestedLoops = new Stack<>();
- this.loopNames = new ReferenceMap(ReferenceMap.HARD, ReferenceMap.WEAK);
+ this.loopNames = new ReferenceMap<>(AbstractReferenceMap.ReferenceStrength.HARD,
+ AbstractReferenceMap.ReferenceStrength.WEAK);
}
/////////////////
@@ -88,11 +91,12 @@
clone.nestedLoops.push((LabelledCounter) lc.clone());
if (this.loopNames != null) {
- clone.loopNames = new ReferenceMap(ReferenceMap.HARD, ReferenceMap.WEAK);
+ clone.loopNames = new ReferenceMap<>(AbstractReferenceMap.ReferenceStrength.HARD,
+ AbstractReferenceMap.ReferenceStrength.WEAK);
- final Iterator loopNamesIterator = this.loopNames.entrySet().iterator();
+ final Iterator<Map.Entry<String,Object>> loopNamesIterator = this.loopNames.entrySet().iterator();
while (loopNamesIterator.hasNext()) {
- final ReferenceMap.Entry pair = (ReferenceMap.Entry) loopNamesIterator.next();
+ final ReferenceMap.Entry<String,Object> pair = loopNamesIterator.next();
final int idx = this.nestedLoops.indexOf(pair.getValue());
if (idx != -1)
@@ -111,11 +115,12 @@
clone.nestedLoops.push((LabelledCounter) lc.clone());
if (this.loopNames != null) {
- clone.loopNames = new ReferenceMap(ReferenceMap.HARD, ReferenceMap.WEAK);
+ clone.loopNames = new ReferenceMap<>(AbstractReferenceMap.ReferenceStrength.HARD,
+ AbstractReferenceMap.ReferenceStrength.WEAK);
- final Iterator loopNamesIterator = this.loopNames.entrySet().iterator();
+ final Iterator<Map.Entry<String,Object>> loopNamesIterator = this.loopNames.entrySet().iterator();
while (loopNamesIterator.hasNext()) {
- final ReferenceMap.Entry pair = (ReferenceMap.Entry) loopNamesIterator.next();
+ final ReferenceMap.Entry<String,Object> pair = loopNamesIterator.next();
final int idx = this.nestedLoops.indexOf(pair.getValue());
if (idx != -1)
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/LP_NL_O_OB_S_SE_SL_Traverser.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/LP_NL_O_OB_S_SE_SL_Traverser.java
index 14c2fe3..47a8058 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/LP_NL_O_OB_S_SE_SL_Traverser.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/LP_NL_O_OB_S_SE_SL_Traverser.java
@@ -19,18 +19,20 @@
package org.apache.tinkerpop.gremlin.process.traversal.traverser;
-import org.apache.commons.collections.map.ReferenceMap;
+import org.apache.commons.collections4.map.AbstractReferenceMap;
+import org.apache.commons.collections4.map.ReferenceMap;
import org.apache.tinkerpop.gremlin.process.traversal.Step;
import org.apache.tinkerpop.gremlin.process.traversal.traverser.util.LabelledCounter;
import java.util.Iterator;
+import java.util.Map;
import java.util.Set;
import java.util.Stack;
public class LP_NL_O_OB_S_SE_SL_Traverser<T> extends LP_O_OB_S_SE_SL_Traverser<T> {
protected Stack<LabelledCounter> nestedLoops;
- protected ReferenceMap loopNames = null;
+ protected ReferenceMap<String,Object> loopNames = null;
protected LP_NL_O_OB_S_SE_SL_Traverser() {
}
@@ -38,7 +40,8 @@
public LP_NL_O_OB_S_SE_SL_Traverser(final T t, final Step<T, ?> step) {
super(t, step);
this.nestedLoops = new Stack<>();
- this.loopNames = new ReferenceMap(ReferenceMap.HARD, ReferenceMap.WEAK);
+ this.loopNames = new ReferenceMap<>(AbstractReferenceMap.ReferenceStrength.HARD,
+ AbstractReferenceMap.ReferenceStrength.WEAK);
}
/////////////////
@@ -93,11 +96,12 @@
clone.nestedLoops.push((LabelledCounter) lc.clone());
if (this.loopNames != null) {
- clone.loopNames = new ReferenceMap(ReferenceMap.HARD, ReferenceMap.WEAK);
+ clone.loopNames = new ReferenceMap<>(AbstractReferenceMap.ReferenceStrength.HARD,
+ AbstractReferenceMap.ReferenceStrength.WEAK);
- final Iterator loopNamesIterator = this.loopNames.entrySet().iterator();
+ final Iterator<Map.Entry<String,Object>> loopNamesIterator = this.loopNames.entrySet().iterator();
while (loopNamesIterator.hasNext()) {
- final ReferenceMap.Entry pair = (ReferenceMap.Entry) loopNamesIterator.next();
+ final ReferenceMap.Entry<String,Object> pair = loopNamesIterator.next();
final int idx = this.nestedLoops.indexOf(pair.getValue());
if (idx != -1)
@@ -116,11 +120,12 @@
clone.nestedLoops.push((LabelledCounter) lc.clone());
if (this.loopNames != null) {
- clone.loopNames = new ReferenceMap(ReferenceMap.HARD, ReferenceMap.WEAK);
+ clone.loopNames = new ReferenceMap<>(AbstractReferenceMap.ReferenceStrength.HARD,
+ AbstractReferenceMap.ReferenceStrength.WEAK);
- final Iterator loopNamesIterator = this.loopNames.entrySet().iterator();
+ final Iterator<Map.Entry<String,Object>> loopNamesIterator = this.loopNames.entrySet().iterator();
while (loopNamesIterator.hasNext()) {
- final ReferenceMap.Entry pair = (ReferenceMap.Entry) loopNamesIterator.next();
+ final ReferenceMap.Entry<String,Object> pair = loopNamesIterator.next();
final int idx = this.nestedLoops.indexOf(pair.getValue());
if (idx != -1)
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/NL_O_OB_S_SE_SL_Traverser.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/NL_O_OB_S_SE_SL_Traverser.java
index c30e893..efcda13 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/NL_O_OB_S_SE_SL_Traverser.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/NL_O_OB_S_SE_SL_Traverser.java
@@ -19,18 +19,20 @@
package org.apache.tinkerpop.gremlin.process.traversal.traverser;
-import org.apache.commons.collections.map.ReferenceMap;
+import org.apache.commons.collections4.map.AbstractReferenceMap;
+import org.apache.commons.collections4.map.ReferenceMap;
import org.apache.tinkerpop.gremlin.process.traversal.Step;
import org.apache.tinkerpop.gremlin.process.traversal.traverser.util.LabelledCounter;
import java.util.Iterator;
+import java.util.Map;
import java.util.Set;
import java.util.Stack;
public class NL_O_OB_S_SE_SL_Traverser<T> extends O_OB_S_SE_SL_Traverser<T> {
protected Stack<LabelledCounter> nestedLoops;
- protected ReferenceMap loopNames;
+ protected ReferenceMap<String,Object> loopNames;
protected NL_O_OB_S_SE_SL_Traverser() {
}
@@ -38,7 +40,8 @@
public NL_O_OB_S_SE_SL_Traverser(final T t, final Step<T, ?> step) {
super(t, step);
this.nestedLoops = new Stack<>();
- this.loopNames = new ReferenceMap(ReferenceMap.HARD, ReferenceMap.WEAK);
+ this.loopNames = new ReferenceMap<>(AbstractReferenceMap.ReferenceStrength.HARD,
+ AbstractReferenceMap.ReferenceStrength.WEAK);
}
/////////////////
@@ -88,11 +91,12 @@
clone.nestedLoops.push((LabelledCounter) lc.clone());
if (this.loopNames != null) {
- clone.loopNames = new ReferenceMap(ReferenceMap.HARD, ReferenceMap.WEAK);
+ clone.loopNames = new ReferenceMap<>(AbstractReferenceMap.ReferenceStrength.HARD,
+ AbstractReferenceMap.ReferenceStrength.WEAK);
- final Iterator loopNamesIterator = this.loopNames.entrySet().iterator();
+ final Iterator<Map.Entry<String,Object>> loopNamesIterator = this.loopNames.entrySet().iterator();
while (loopNamesIterator.hasNext()) {
- final ReferenceMap.Entry pair = (ReferenceMap.Entry) loopNamesIterator.next();
+ final ReferenceMap.Entry<String,Object> pair = loopNamesIterator.next();
final int idx = this.nestedLoops.indexOf(pair.getValue());
if (idx != -1)
@@ -111,11 +115,12 @@
clone.nestedLoops.push((LabelledCounter) lc.clone());
if (this.loopNames != null) {
- clone.loopNames = new ReferenceMap(ReferenceMap.HARD, ReferenceMap.WEAK);
+ clone.loopNames = new ReferenceMap<>(AbstractReferenceMap.ReferenceStrength.HARD,
+ AbstractReferenceMap.ReferenceStrength.WEAK);
- final Iterator loopNamesIterator = this.loopNames.entrySet().iterator();
+ final Iterator<Map.Entry<String,Object>> loopNamesIterator = this.loopNames.entrySet().iterator();
while (loopNamesIterator.hasNext()) {
- final ReferenceMap.Entry pair = (ReferenceMap.Entry) loopNamesIterator.next();
+ final ReferenceMap.Entry<String,Object> pair = loopNamesIterator.next();
final int idx = this.nestedLoops.indexOf(pair.getValue());
if (idx != -1)
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/util/IndexedTraverserSet.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/util/IndexedTraverserSet.java
index 3df335b..39487c3 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/util/IndexedTraverserSet.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/util/IndexedTraverserSet.java
@@ -18,7 +18,8 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.traverser.util;
-import org.apache.commons.collections.map.MultiValueMap;
+import org.apache.commons.collections4.MultiValuedMap;
+import org.apache.commons.collections4.multimap.ArrayListValuedHashMap;
import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.apache.tinkerpop.gremlin.structure.util.Host;
@@ -33,7 +34,7 @@
*/
public class IndexedTraverserSet<S,I> extends TraverserSet<S> {
- private final MultiValueMap index = new MultiValueMap();
+ private final MultiValuedMap<I,Traverser.Admin<S>> index = new ArrayListValuedHashMap<>();
private final Function<S,I> indexingFunction;
public IndexedTraverserSet(final Function<S, I> indexingFunction) {
@@ -70,7 +71,7 @@
* @return
*/
public Collection<Traverser.Admin<S>> get(final I k) {
- final Collection<Traverser.Admin<S>> c = index.getCollection(k);
+ final Collection<Traverser.Admin<S>> c = index.get(k);
// if remove() is called on this class, then the MultiValueMap *may* (javadoc wasn't clear
// what the expectation was - used the word "typically") return an empty list if the last
@@ -87,7 +88,7 @@
@Override
public Traverser.Admin<S> remove() {
final Traverser.Admin<S> removed = super.remove();
- index.remove(indexingFunction.apply(removed.get()), removed);
+ index.removeMapping(indexingFunction.apply(removed.get()), removed);
return removed;
}
@@ -97,7 +98,7 @@
throw new IllegalArgumentException("The object to remove must be traverser");
final boolean removed = super.remove(traverser);
- if (removed) index.remove(indexingFunction.apply(((Traverser.Admin<S>) traverser).get()), traverser);
+ if (removed) index.removeMapping(indexingFunction.apply(((Traverser.Admin<S>) traverser).get()), traverser);
return removed;
}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/BytecodeHelper.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/BytecodeHelper.java
deleted file mode 100644
index 1bea420..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/BytecodeHelper.java
+++ /dev/null
@@ -1,462 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tinkerpop.gremlin.process.traversal.util;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import org.apache.tinkerpop.gremlin.process.computer.traversal.step.map.ConnectedComponentVertexProgramStep;
-import org.apache.tinkerpop.gremlin.process.computer.traversal.step.map.PageRankVertexProgramStep;
-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.Bytecode;
-import org.apache.tinkerpop.gremlin.process.traversal.GraphOp;
-import org.apache.tinkerpop.gremlin.process.traversal.Step;
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
-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.branch.BranchStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.branch.ChooseStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.branch.LocalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.branch.OptionalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.branch.RepeatStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.branch.UnionStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.AllStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.AndStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.AnyStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.CoinStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.DedupGlobalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.DropStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.HasStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.IsStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.LambdaFilterStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.DiscardStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.NoneStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.NotStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.OrStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.PathFilterStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.RangeGlobalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.SampleGlobalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.TailGlobalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.TimeLimitStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.TraversalFilterStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.WherePredicateStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.WhereTraversalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.AddEdgeStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.AddVertexStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.AsBoolStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.AsDateStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.AsNumberStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.AsStringGlobalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.AsStringLocalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.CallStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.CoalesceStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.CombineStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.ConcatStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.ConjoinStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.ConstantStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.CountGlobalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.CountLocalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.DateAddStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.DateDiffStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.DedupLocalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.DifferenceStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.DisjunctStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.EdgeVertexStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.ElementMapStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.ElementStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.FoldStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.FormatStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.GraphStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.GroupCountStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.GroupStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.IdStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.IndexStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.IntersectStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.LTrimGlobalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.LTrimLocalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.LabelStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.LambdaCollectingBarrierStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.LambdaFlatMapStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.LambdaMapStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.LengthGlobalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.LengthLocalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.LoopsStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.MatchStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.MathStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.MaxGlobalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.MaxLocalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.MeanGlobalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.MeanLocalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.MergeEdgeStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.MergeVertexStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.MinGlobalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.NoOpBarrierStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.OrderGlobalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.OrderLocalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.PathStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.ProductStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.ProjectStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.PropertiesStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.PropertyKeyStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.PropertyMapStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.PropertyValueStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.RTrimGlobalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.RTrimLocalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.RangeLocalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.ReplaceGlobalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.ReplaceLocalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.ReverseStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.SackStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.SampleLocalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.SelectOneStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.SelectStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.SplitGlobalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.SplitLocalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.SubstringGlobalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.SumGlobalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.SumLocalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.TailLocalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.ToLowerGlobalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.ToLowerLocalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.ToUpperGlobalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.ToUpperLocalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.TraversalFlatMapStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.TraversalMapStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.MergeStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.TraversalSelectStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.TreeStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.TrimGlobalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.TrimLocalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.UnfoldStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.VertexStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.AddPropertyStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.AggregateGlobalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.AggregateLocalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.FailStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.GroupCountSideEffectStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.GroupSideEffectStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.IdentityStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.InjectStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.IoStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.LambdaSideEffectStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.SackValueStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.SideEffectCapStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.SubgraphStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.TraversalSideEffectStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.TreeSideEffectStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.ProfileStep;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.TraversalStrategyProxy;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedFactory;
-import org.apache.tinkerpop.gremlin.util.function.Lambda;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Optional;
-import java.util.function.Predicate;
-import java.util.stream.Stream;
-
-/**
- * Utility class for parsing {@link Bytecode}.
- *
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public final class BytecodeHelper {
- private static final Map<String, List<Class<? extends Step>>> byteCodeSymbolStepMap;
-
- static {
- final Map<String, List<Class<? extends Step>>> operationStepMap = new HashMap<String, List<Class<? extends Step>>>() {{
- put(GraphTraversal.Symbols.map, Arrays.asList(LambdaMapStep.class, TraversalMapStep.class));
- put(GraphTraversal.Symbols.flatMap, Arrays.asList(LambdaFlatMapStep.class, TraversalFlatMapStep.class));
- put(GraphTraversal.Symbols.id, Collections.singletonList(IdStep.class));
- put(GraphTraversal.Symbols.label, Collections.singletonList(LabelStep.class));
- put(GraphTraversal.Symbols.identity, Collections.singletonList(IdentityStep.class));
- put(GraphTraversal.Symbols.constant, Collections.singletonList(ConstantStep.class));
- put(GraphTraversal.Symbols.V, Collections.singletonList(GraphStep.class));
- put(GraphTraversal.Symbols.E, Collections.singletonList(GraphStep.class));
- put(GraphTraversal.Symbols.to, Collections.emptyList());
- put(GraphTraversal.Symbols.out, Collections.singletonList(VertexStep.class));
- put(GraphTraversal.Symbols.in, Collections.singletonList(VertexStep.class));
- put(GraphTraversal.Symbols.both, Collections.singletonList(VertexStep.class));
- put(GraphTraversal.Symbols.toE, Collections.singletonList(VertexStep.class));
- put(GraphTraversal.Symbols.outE, Collections.singletonList(VertexStep.class));
- put(GraphTraversal.Symbols.inE, Collections.singletonList(VertexStep.class));
- put(GraphTraversal.Symbols.bothE, Collections.singletonList(VertexStep.class));
- put(GraphTraversal.Symbols.toV, Collections.singletonList(EdgeVertexStep.class));
- put(GraphTraversal.Symbols.outV, Collections.singletonList(EdgeVertexStep.class));
- put(GraphTraversal.Symbols.inV, Collections.singletonList(EdgeVertexStep.class));
- put(GraphTraversal.Symbols.bothV, Collections.singletonList(EdgeVertexStep.class));
- put(GraphTraversal.Symbols.otherV, Collections.singletonList(EdgeVertexStep.class));
- put(GraphTraversal.Symbols.order, Arrays.asList(OrderGlobalStep.class, OrderLocalStep.class));
- put(GraphTraversal.Symbols.properties, Collections.singletonList(PropertiesStep.class));
- put(GraphTraversal.Symbols.values, Collections.singletonList(PropertiesStep.class));
- put(GraphTraversal.Symbols.propertyMap, Collections.singletonList(PropertyMapStep.class));
- put(GraphTraversal.Symbols.valueMap, Collections.singletonList(PropertyMapStep.class));
- put(GraphTraversal.Symbols.elementMap, Collections.singletonList(ElementMapStep.class));
- put(GraphTraversal.Symbols.select, Arrays.asList(SelectStep.class, SelectOneStep.class,
- TraversalSelectStep.class, TraversalMapStep.class));
- put(GraphTraversal.Symbols.key, Collections.singletonList(PropertyKeyStep.class));
- put(GraphTraversal.Symbols.value, Collections.singletonList(PropertyValueStep.class));
- put(GraphTraversal.Symbols.path, Collections.singletonList(PathStep.class));
- put(GraphTraversal.Symbols.match, Collections.singletonList(MatchStep.class));
- put(GraphTraversal.Symbols.math, Collections.singletonList(MathStep.class));
- put(GraphTraversal.Symbols.sack, Arrays.asList(SackStep.class, SackValueStep.class));
- put(GraphTraversal.Symbols.loops, Collections.singletonList(LoopsStep.class));
- put(GraphTraversal.Symbols.project, Collections.singletonList(ProjectStep.class));
- put(GraphTraversal.Symbols.unfold, Collections.singletonList(UnfoldStep.class));
- put(GraphTraversal.Symbols.fold, Collections.singletonList(FoldStep.class));
- put(GraphTraversal.Symbols.count, Arrays.asList(CountGlobalStep.class, CountLocalStep.class));
- put(GraphTraversal.Symbols.sum, Arrays.asList(SumGlobalStep.class, SumLocalStep.class));
- put(GraphTraversal.Symbols.max, Arrays.asList(MaxGlobalStep.class, MaxLocalStep.class));
- put(GraphTraversal.Symbols.min, Arrays.asList(MinGlobalStep.class, MinGlobalStep.class));
- put(GraphTraversal.Symbols.mean, Arrays.asList(MeanGlobalStep.class, MeanLocalStep.class));
- put(GraphTraversal.Symbols.concat, Collections.singletonList(ConcatStep.class));
- put(GraphTraversal.Symbols.format, Collections.singletonList(FormatStep.class));
- put(GraphTraversal.Symbols.asString, Arrays.asList(AsStringGlobalStep.class, AsStringLocalStep.class));
- put(GraphTraversal.Symbols.length, Arrays.asList(LengthGlobalStep.class, LengthLocalStep.class));
- put(GraphTraversal.Symbols.toLower, Arrays.asList(ToLowerGlobalStep.class, ToLowerLocalStep.class));
- put(GraphTraversal.Symbols.toUpper, Arrays.asList(ToUpperGlobalStep.class, ToUpperLocalStep.class));
- put(GraphTraversal.Symbols.trim, Arrays.asList(TrimGlobalStep.class, TrimLocalStep.class));
- put(GraphTraversal.Symbols.lTrim, Arrays.asList(LTrimGlobalStep.class, LTrimLocalStep.class));
- put(GraphTraversal.Symbols.rTrim, Arrays.asList(RTrimGlobalStep.class, RTrimLocalStep.class));
- put(GraphTraversal.Symbols.reverse, Collections.singletonList(ReverseStep.class));
- put(GraphTraversal.Symbols.replace, Arrays.asList(ReplaceGlobalStep.class, ReplaceLocalStep.class));
- put(GraphTraversal.Symbols.substring, Arrays.asList(SubstringGlobalStep.class, ReplaceLocalStep.class));
- put(GraphTraversal.Symbols.split, Arrays.asList(SplitGlobalStep.class, SplitLocalStep.class));
- put(GraphTraversal.Symbols.asBool, Collections.singletonList(AsBoolStep.class));
- put(GraphTraversal.Symbols.asDate, Collections.singletonList(AsDateStep.class));
- put(GraphTraversal.Symbols.dateAdd, Collections.singletonList(DateAddStep.class));
- put(GraphTraversal.Symbols.dateDiff, Collections.singletonList(DateDiffStep.class));
- put(GraphTraversal.Symbols.asNumber, Collections.singletonList(AsNumberStep.class));
- put(GraphTraversal.Symbols.all, Collections.singletonList(AllStep.class));
- put(GraphTraversal.Symbols.any, Collections.singletonList(AnyStep.class));
- put(GraphTraversal.Symbols.none, Collections.singletonList(NoneStep.class));
- put(GraphTraversal.Symbols.combine, Collections.singletonList(CombineStep.class));
- put(GraphTraversal.Symbols.difference, Collections.singletonList(DifferenceStep.class));
- put(GraphTraversal.Symbols.disjunct, Collections.singletonList(DisjunctStep.class));
- put(GraphTraversal.Symbols.merge, Collections.singletonList(MergeStep.class));
- put(GraphTraversal.Symbols.conjoin, Collections.singletonList(ConjoinStep.class));
- put(GraphTraversal.Symbols.product, Collections.singletonList(ProductStep.class));
- put(GraphTraversal.Symbols.intersect, Collections.singletonList(IntersectStep.class));
- put(GraphTraversal.Symbols.group, Arrays.asList(GroupStep.class, GroupSideEffectStep.class));
- put(GraphTraversal.Symbols.groupCount, Arrays.asList(GroupCountStep.class, GroupCountSideEffectStep.class));
- put(GraphTraversal.Symbols.tree, Arrays.asList(TreeStep.class, TreeSideEffectStep.class));
- put(GraphTraversal.Symbols.addV, Collections.singletonList(AddVertexStep.class));
- put(GraphTraversal.Symbols.addE, Collections.singletonList(AddEdgeStep.class));
- put(GraphTraversal.Symbols.mergeV, Collections.singletonList(MergeVertexStep.class));
- put(GraphTraversal.Symbols.mergeE, Collections.singletonList(MergeEdgeStep.class));
- put(GraphTraversal.Symbols.from, Collections.emptyList());
- put(GraphTraversal.Symbols.filter, Arrays.asList(LambdaFilterStep.class, TraversalFilterStep.class));
- put(GraphTraversal.Symbols.or, Collections.singletonList(OrStep.class));
- put(GraphTraversal.Symbols.and, Collections.singletonList(AndStep.class));
- put(GraphTraversal.Symbols.inject, Collections.singletonList(InjectStep.class));
- put(GraphTraversal.Symbols.dedup, Arrays.asList(DedupGlobalStep.class, DedupLocalStep.class));
- put(GraphTraversal.Symbols.where, Arrays.asList(WherePredicateStep.class, WhereTraversalStep.class,
- TraversalFilterStep.class));
- put(GraphTraversal.Symbols.has, Collections.singletonList(HasStep.class));
- put(GraphTraversal.Symbols.hasNot, Collections.singletonList(NotStep.class));
- put(GraphTraversal.Symbols.hasLabel, Collections.singletonList(HasStep.class));
- put(GraphTraversal.Symbols.hasId, Collections.singletonList(HasStep.class));
- put(GraphTraversal.Symbols.hasKey, Collections.singletonList(HasStep.class));
- put(GraphTraversal.Symbols.hasValue, Collections.singletonList(HasStep.class));
- put(GraphTraversal.Symbols.is, Collections.singletonList(IsStep.class));
- put(GraphTraversal.Symbols.not, Collections.singletonList(NotStep.class));
- put(GraphTraversal.Symbols.range, Arrays.asList(RangeGlobalStep.class, RangeLocalStep.class));
- put(GraphTraversal.Symbols.limit, Arrays.asList(RangeGlobalStep.class, RangeLocalStep.class));
- put(GraphTraversal.Symbols.skip, Arrays.asList(RangeGlobalStep.class, RangeLocalStep.class));
- put(GraphTraversal.Symbols.tail, Arrays.asList(TailGlobalStep.class, TailLocalStep.class));
- put(GraphTraversal.Symbols.coin, Collections.singletonList(CoinStep.class));
- put(GraphTraversal.Symbols.io, Collections.singletonList(IoStep.class));
- put(GraphTraversal.Symbols.read, Collections.emptyList());
- put(GraphTraversal.Symbols.write, Collections.emptyList());
- put(GraphTraversal.Symbols.call, Collections.singletonList(CallStep.class));
- put(GraphTraversal.Symbols.element, Collections.singletonList(ElementStep.class));
- put(GraphTraversal.Symbols.timeLimit, Collections.singletonList(TimeLimitStep.class));
- put(GraphTraversal.Symbols.simplePath, Collections.singletonList(PathFilterStep.class));
- put(GraphTraversal.Symbols.cyclicPath, Collections.singletonList(PathFilterStep.class));
- put(GraphTraversal.Symbols.sample, Arrays.asList(SampleGlobalStep.class, SampleLocalStep.class));
- put(GraphTraversal.Symbols.drop, Collections.singletonList(DropStep.class));
- put(GraphTraversal.Symbols.sideEffect, Arrays.asList(LambdaSideEffectStep.class, TraversalSideEffectStep.class));
- put(GraphTraversal.Symbols.cap, Collections.singletonList(SideEffectCapStep.class));
- put(GraphTraversal.Symbols.property, Collections.singletonList(AddPropertyStep.class));
- put(GraphTraversal.Symbols.store, Collections.singletonList(AggregateLocalStep.class));
- put(GraphTraversal.Symbols.aggregate, Arrays.asList(AggregateLocalStep.class, AggregateGlobalStep.class));
- put(GraphTraversal.Symbols.fail, Collections.singletonList(FailStep.class));
- put(GraphTraversal.Symbols.subgraph, Collections.singletonList(SubgraphStep.class));
- put(GraphTraversal.Symbols.barrier, Arrays.asList(NoOpBarrierStep.class, LambdaCollectingBarrierStep.class));
- put(GraphTraversal.Symbols.index, Collections.singletonList(IndexStep.class));
- put(GraphTraversal.Symbols.local, Collections.singletonList(LocalStep.class));
- put(GraphTraversal.Symbols.emit, Collections.emptyList());
- put(GraphTraversal.Symbols.repeat, Collections.singletonList(RepeatStep.class));
- put(GraphTraversal.Symbols.until, Collections.emptyList());
- put(GraphTraversal.Symbols.branch, Collections.singletonList(BranchStep.class));
- put(GraphTraversal.Symbols.union, Collections.singletonList(UnionStep.class));
- put(GraphTraversal.Symbols.coalesce, Collections.singletonList(CoalesceStep.class));
- put(GraphTraversal.Symbols.choose, Collections.singletonList(ChooseStep.class));
- put(GraphTraversal.Symbols.optional, Collections.singletonList(OptionalStep.class));
- put(GraphTraversal.Symbols.pageRank, Collections.singletonList(PageRankVertexProgramStep.class));
- put(GraphTraversal.Symbols.peerPressure, Collections.singletonList(PeerPressureVertexProgramStep.class));
- put(GraphTraversal.Symbols.connectedComponent, Collections.singletonList(ConnectedComponentVertexProgramStep.class));
- put(GraphTraversal.Symbols.shortestPath, Collections.singletonList(ShortestPathVertexProgramStep.class));
- put(GraphTraversal.Symbols.program, Collections.singletonList(ProgramVertexProgramStep.class));
- put(GraphTraversal.Symbols.by, Collections.emptyList());
- put(GraphTraversal.Symbols.with, Collections.emptyList());
- put(GraphTraversal.Symbols.times, Collections.emptyList());
- put(GraphTraversal.Symbols.as, Collections.emptyList());
- put(GraphTraversal.Symbols.option, Collections.emptyList());
- put(Traversal.Symbols.profile, Collections.singletonList(ProfileStep.class));
- put(Traversal.Symbols.discard, Collections.singletonList(DiscardStep.class));
- put(TraversalSource.Symbols.withSack, Collections.emptyList());
- put(TraversalSource.Symbols.withoutStrategies, Collections.emptyList());
- put(TraversalSource.Symbols.withStrategies, Collections.emptyList());
- put(TraversalSource.Symbols.withSideEffect, Collections.emptyList());
- put(TraversalSource.Symbols.withRemote, Collections.emptyList());
- put(TraversalSource.Symbols.withComputer, Collections.emptyList());
- put(GraphTraversalSource.Symbols.withBulk, Collections.emptyList());
- put(GraphTraversalSource.Symbols.withPath, Collections.emptyList());
- put(GraphTraversalSource.Symbols.tx, Collections.emptyList());
- }};
- byteCodeSymbolStepMap = Collections.unmodifiableMap(operationStepMap);
- }
-
- private BytecodeHelper() {
- // public static methods only
- }
-
- /**
- * Parses {@link Bytecode} to find {@link TraversalStrategy} objects added in the source instructions.
- */
- public static <A extends TraversalStrategy> Iterator<A> findStrategies(final Bytecode bytecode, final Class<A> clazz) {
- return IteratorUtils.map(
- IteratorUtils.filter(bytecode.getSourceInstructions().iterator(),
- s -> s.getOperator().equals(TraversalSource.Symbols.withStrategies) && clazz.isAssignableFrom(s.getArguments()[0].getClass())),
- os -> (A) os.getArguments()[0]);
- }
-
- public static boolean removeStrategies(final Bytecode bytecode, final String operator, final Class<TraversalStrategy>[] clazzes) {
- return bytecode.getSourceInstructions().removeIf(
- s -> {
- if (!operator.equals(s.getOperator()) || clazzes.length != s.getArguments().length) {
- return false;
- }
- for (int i = 0; i < clazzes.length; i++) {
- final Class<?> sClass =
- s.getArguments()[i] instanceof TraversalStrategyProxy ?
- ((TraversalStrategyProxy) s.getArguments()[i]).getStrategyClass() :
- ((s.getArguments()[i] instanceof Class) ? (Class<?>) s.getArguments()[i] : s.getArguments()[i].getClass());
- if (!(clazzes[i].isAssignableFrom(sClass))) {
- return false;
- }
- }
- return true;
- }
- );
- }
-
- public static Bytecode filterInstructions(final Bytecode bytecode, final Predicate<Bytecode.Instruction> predicate) {
- final Bytecode clone = new Bytecode();
- for (final Bytecode.Instruction instruction : bytecode.getSourceInstructions()) {
- if (predicate.test(instruction))
- clone.addSource(instruction.getOperator(), instruction.getArguments());
- }
- for (final Bytecode.Instruction instruction : bytecode.getStepInstructions()) {
- if (predicate.test(instruction))
- clone.addStep(instruction.getOperator(), instruction.getArguments());
- }
- return clone;
- }
-
- /**
- * Checks if the bytecode is one of the standard {@link GraphOp} options.
- */
- public static boolean isGraphOperation(final Bytecode bytecode) {
- return Stream.of(GraphOp.values()).anyMatch(op -> op.equals(bytecode));
- }
-
- public static Optional<String> getLambdaLanguage(final Bytecode bytecode) {
- for (final Bytecode.Instruction instruction : bytecode.getInstructions()) {
- for (Object object : instruction.getArguments()) {
- if (object instanceof Lambda)
- return Optional.of(((Lambda) object).getLambdaLanguage());
- else if (object instanceof Bytecode) {
- final Optional<String> temp = BytecodeHelper.getLambdaLanguage((Bytecode) object);
- if (temp.isPresent())
- return temp;
- }
- }
- }
- return Optional.empty();
- }
-
- public static void removeBindings(final Bytecode bytecode) {
- for (final Bytecode.Instruction instruction : bytecode.getInstructions()) {
- final Object[] arguments = instruction.getArguments();
- for (int i = 0; i < arguments.length; i++) {
- if (arguments[i] instanceof Bytecode.Binding)
- arguments[i] = ((Bytecode.Binding) arguments[i]).value();
- else if (arguments[i] instanceof Bytecode)
- removeBindings((Bytecode) arguments[i]);
- }
- }
- }
-
- public static void detachElements(final Bytecode bytecode) {
- for (final Bytecode.Instruction instruction : bytecode.getInstructions()) {
- final Object[] arguments = instruction.getArguments();
- for (int i = 0; i < arguments.length; i++) {
- if (arguments[i] instanceof Bytecode)
- detachElements((Bytecode) arguments[i]);
- else if(arguments[i] instanceof List) {
- final List<Object> list = new ArrayList<>();
- for(final Object object : (List)arguments[i]) {
- list.add(DetachedFactory.detach(object, false));
- }
- arguments[i] = list;
- }
- else
- arguments[i] = DetachedFactory.detach(arguments[i], false);
- }
- }
- }
-
- /**
- * Returns a list of {@link Step} which can be added to the traversal for the provided operator.
- * <p>
- * Graph Traversal may or may not add the returned list of steps into the traversal. List only represents
- * possible steps added to traversal given an operator.
- * </p>
- *
- * @param operator Graph operator
- * @return List of possible {@link Step}(s)
- */
- public static List<Class<? extends Step>> findPossibleTraversalSteps(final String operator) {
- if (!byteCodeSymbolStepMap.containsKey(operator)) {
- throw new IllegalArgumentException("Unable to find Traversal steps for the graph operator: " + operator);
- }
- return byteCodeSymbolStepMap.get(operator);
- }
-}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversal.java
index 3a08fe6..6ac8e40 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversal.java
@@ -19,7 +19,7 @@
package org.apache.tinkerpop.gremlin.process.traversal.util;
import org.apache.tinkerpop.gremlin.process.computer.traversal.step.map.VertexProgramStep;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
+import org.apache.tinkerpop.gremlin.process.traversal.GremlinLang;
import org.apache.tinkerpop.gremlin.process.traversal.GValueManager;
import org.apache.tinkerpop.gremlin.process.traversal.Step;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
@@ -70,28 +70,28 @@
protected boolean locked = false;
protected boolean closed = false;
- protected Bytecode bytecode;
+ protected GremlinLang gremlinLang;
protected GValueManager gValueManager;
- private DefaultTraversal(final Graph graph, final TraversalStrategies traversalStrategies, final Bytecode bytecode) {
+ private DefaultTraversal(final Graph graph, final TraversalStrategies traversalStrategies, final GremlinLang gremlinLang) {
this.graph = graph;
this.strategies = traversalStrategies;
- this.bytecode = bytecode;
+ this.gremlinLang = gremlinLang;
this.gValueManager = new GValueManager();
this.g = null;
}
public DefaultTraversal(final Graph graph) {
- this(graph, TraversalStrategies.GlobalCache.getStrategies(graph.getClass()), new Bytecode());
+ this(graph, TraversalStrategies.GlobalCache.getStrategies(graph.getClass()), new GremlinLang());
}
public DefaultTraversal(final TraversalSource traversalSource) {
- this(traversalSource.getGraph(), traversalSource.getStrategies(), traversalSource.getBytecode());
+ this(traversalSource.getGraph(), traversalSource.getStrategies(), traversalSource.getGremlinLang());
this.g = traversalSource;
}
public DefaultTraversal(final TraversalSource traversalSource, final DefaultTraversal.Admin<S,E> traversal) {
- this(traversalSource.getGraph(), traversalSource.getStrategies(), traversal.getBytecode());
+ this(traversalSource.getGraph(), traversalSource.getStrategies(), traversal.getGremlinLang());
this.g = traversalSource;
steps.addAll(traversal.getSteps());
for (Step step : traversal.getSteps()) {
@@ -100,15 +100,15 @@
}
public DefaultTraversal() {
- this(EmptyGraph.instance(), TraversalStrategies.GlobalCache.getStrategies(EmptyGraph.class), new Bytecode());
+ this(EmptyGraph.instance(), TraversalStrategies.GlobalCache.getStrategies(EmptyGraph.class), new GremlinLang());
}
- public DefaultTraversal(final Bytecode bytecode) {
- this(EmptyGraph.instance(), TraversalStrategies.GlobalCache.getStrategies(EmptyGraph.class), bytecode);
+ public DefaultTraversal(final GremlinLang gremlinLang) {
+ this(EmptyGraph.instance(), TraversalStrategies.GlobalCache.getStrategies(EmptyGraph.class), gremlinLang);
}
- public Bytecode getBytecode() {
- return this.bytecode;
+ public GremlinLang getGremlinLang() {
+ return this.gremlinLang;
}
@Override
@@ -294,7 +294,7 @@
clone.unmodifiableSteps = Collections.unmodifiableList(clone.steps);
clone.sideEffects = this.sideEffects.clone();
clone.strategies = this.strategies;
- clone.bytecode = this.bytecode.clone();
+ clone.gremlinLang = this.gremlinLang.clone();
clone.gValueManager = this.gValueManager.clone();
for (final Step<?, ?> step : this.steps) {
final Step<?, ?> clonedStep = step.clone();
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/EmptyTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/EmptyTraversal.java
index aaf5402..3bfc975 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/EmptyTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/EmptyTraversal.java
@@ -18,7 +18,7 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.util;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
+import org.apache.tinkerpop.gremlin.process.traversal.GremlinLang;
import org.apache.tinkerpop.gremlin.process.traversal.GValueManager;
import org.apache.tinkerpop.gremlin.process.traversal.Step;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
@@ -54,8 +54,8 @@
}
- public Bytecode getBytecode() {
- return new Bytecode();
+ public GremlinLang getGremlinLang() {
+ return new GremlinLang();
}
@Override
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 ab693b9..5bf91c4 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 @@
* @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 @@
* @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 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 @@
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 @@
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 @@
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 @@
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 @@
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/main/java/org/apache/tinkerpop/gremlin/structure/VertexProperty.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexProperty.java
index af7a18a..962140a 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/binary/DataType.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/DataType.java
index c0738a3..e2522c0 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/DataType.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/DataType.java
@@ -28,9 +28,7 @@
INT(0x01),
LONG(0x02),
STRING(0X03),
- DATE(0X04),
- TIMESTAMP(0X05),
- CLASS(0X06),
+ DATETIME(0X04),
DOUBLE(0X07),
FLOAT(0X08),
LIST(0X09),
@@ -43,20 +41,9 @@
GRAPH(0X10),
VERTEX(0X11),
VERTEXPROPERTY(0X12),
- BARRIER(0X13),
- BINDING(0X14),
- BYTECODE(0X15),
- CARDINALITY(0X16),
- COLUMN(0X17),
DIRECTION(0X18),
- OPERATOR(0X19),
- ORDER(0X1A),
- PICK(0X1B),
- POP(0X1C),
- LAMBDA(0X1D),
- P(0X1E),
- SCOPE(0X1F),
T(0X20),
+ MERGE(0x2e),
TRAVERSER(0X21),
BIGDECIMAL(0X22),
BIGINTEGER(0X23),
@@ -64,33 +51,15 @@
BYTEBUFFER(0X25),
SHORT(0X26),
BOOLEAN(0x27),
- TEXTP(0x28),
- TRAVERSALSTRATEGY(0X29),
- BULKSET(0X2A),
+ BULKSET(0X2A), // todo:
TREE(0X2B),
- METRICS(0x2C),
- TRAVERSALMETRICS(0x2D),
- MERGE(0x2E),
- DT(0x2F),
N(0x30),
CHAR(0X80),
DURATION(0X81),
- INETADDRESS(0X82),
- INSTANT(0X83),
- LOCALDATE(0X84),
- LOCALDATETIME(0X85),
- LOCALTIME(0X86),
- MONTHDAY(0X87),
- OFFSETDATETIME(0X88),
- OFFSETTIME(0X89),
- PERIOD(0X8A),
- YEAR(0X8B),
- YEARMONTH(0X8C),
- ZONEDATETIME(0X8D),
- ZONEOFFSET(0X8E),
CUSTOM(0),
+ MARKER(0XFD),
UNSPECIFIED_NULL(0XFE);
private final int code;
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/GraphBinaryWriter.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/GraphBinaryWriter.java
index 80b1df0..70fde0e 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/GraphBinaryWriter.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/GraphBinaryWriter.java
@@ -45,7 +45,10 @@
private final TypeSerializerRegistry registry;
private final static byte VALUE_FLAG_NULL = 1;
private final static byte VALUE_FLAG_NONE = 0;
+ private final static byte VALUE_FLAG_ORDERED = 2;
+ private final static byte VALUE_FLAG_BULK = 2;
public final static byte VERSION_BYTE = (byte)0x81;
+ public final static byte BULKED_BYTE = (byte)0x01;
private final static byte[] unspecifiedNullBytes = new byte[] { DataType.UNSPECIFIED_NULL.getCodeByte(), 0x01};
private final static byte[] customTypeCodeBytes = new byte[] { DataType.CUSTOM.getCodeByte() };
@@ -135,4 +138,19 @@
public void writeValueFlagNone(Buffer buffer) {
buffer.writeByte(VALUE_FLAG_NONE);
}
+
+ /**
+ * Writes a single byte with value 2, representing an ordered value_flag.
+ */
+ public void writeValueFlagOrdered(Buffer buffer) {
+ buffer.writeByte(VALUE_FLAG_ORDERED);
+ }
+
+ /**
+ * Writes a single byte with value 2, representing an ordered value_flag.
+ */
+ public void writeValueFlagBulk(Buffer buffer) {
+ buffer.writeByte(VALUE_FLAG_BULK);
+ }
+
}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/Marker.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/Marker.java
new file mode 100644
index 0000000..8f7beaa
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/Marker.java
@@ -0,0 +1,41 @@
+/*
+ * 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.structure.io.binary;
+
+public class Marker {
+ private final byte value;
+
+ public static Marker END_OF_STREAM = new Marker((byte)0);
+
+ private Marker(final byte value) {
+ this.value = value;
+ }
+
+ public byte getValue() {
+ return value;
+ }
+
+ public static Marker of(final byte value) {
+ if (value != 0) {
+ throw new IllegalArgumentException();
+ }
+ return END_OF_STREAM;
+ }
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/TypeSerializerRegistry.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/TypeSerializerRegistry.java
index 435494f..8b14994 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/TypeSerializerRegistry.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/TypeSerializerRegistry.java
@@ -18,30 +18,12 @@
*/
package org.apache.tinkerpop.gremlin.structure.io.binary;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
-import org.apache.tinkerpop.gremlin.process.traversal.DT;
import org.apache.tinkerpop.gremlin.process.traversal.Merge;
-import org.apache.tinkerpop.gremlin.process.traversal.N;
-import org.apache.tinkerpop.gremlin.process.traversal.NotP;
-import org.apache.tinkerpop.gremlin.process.traversal.Operator;
-import org.apache.tinkerpop.gremlin.process.traversal.Order;
-import org.apache.tinkerpop.gremlin.process.traversal.P;
import org.apache.tinkerpop.gremlin.process.traversal.Path;
-import org.apache.tinkerpop.gremlin.process.traversal.Pick;
-import org.apache.tinkerpop.gremlin.process.traversal.Pop;
-import org.apache.tinkerpop.gremlin.process.traversal.SackFunctions;
-import org.apache.tinkerpop.gremlin.process.traversal.Scope;
-import org.apache.tinkerpop.gremlin.process.traversal.TextP;
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.N;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.BulkSet;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
-import org.apache.tinkerpop.gremlin.process.traversal.util.AndP;
-import org.apache.tinkerpop.gremlin.process.traversal.util.Metrics;
-import org.apache.tinkerpop.gremlin.process.traversal.util.OrP;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalExplanation;
-import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics;
-import org.apache.tinkerpop.gremlin.structure.Column;
import org.apache.tinkerpop.gremlin.structure.Direction;
import org.apache.tinkerpop.gremlin.structure.Edge;
import org.apache.tinkerpop.gremlin.structure.Graph;
@@ -52,79 +34,41 @@
import org.apache.tinkerpop.gremlin.structure.io.IoRegistry;
import org.apache.tinkerpop.gremlin.structure.io.binary.types.BigDecimalSerializer;
import org.apache.tinkerpop.gremlin.structure.io.binary.types.BigIntegerSerializer;
-import org.apache.tinkerpop.gremlin.structure.io.binary.types.BindingSerializer;
import org.apache.tinkerpop.gremlin.structure.io.binary.types.BulkSetSerializer;
import org.apache.tinkerpop.gremlin.structure.io.binary.types.ByteBufferSerializer;
-import org.apache.tinkerpop.gremlin.structure.io.binary.types.ByteCodeSerializer;
import org.apache.tinkerpop.gremlin.structure.io.binary.types.CharSerializer;
-import org.apache.tinkerpop.gremlin.structure.io.binary.types.ClassSerializer;
import org.apache.tinkerpop.gremlin.structure.io.binary.types.CustomTypeSerializer;
-import org.apache.tinkerpop.gremlin.structure.io.binary.types.DateSerializer;
import org.apache.tinkerpop.gremlin.structure.io.binary.types.DurationSerializer;
import org.apache.tinkerpop.gremlin.structure.io.binary.types.EdgeSerializer;
import org.apache.tinkerpop.gremlin.structure.io.binary.types.EnumSerializer;
import org.apache.tinkerpop.gremlin.structure.io.binary.types.GraphSerializer;
-import org.apache.tinkerpop.gremlin.structure.io.binary.types.InetAddressSerializer;
-import org.apache.tinkerpop.gremlin.structure.io.binary.types.InstantSerializer;
-import org.apache.tinkerpop.gremlin.structure.io.binary.types.LambdaSerializer;
import org.apache.tinkerpop.gremlin.structure.io.binary.types.ListSerializer;
-import org.apache.tinkerpop.gremlin.structure.io.binary.types.LocalDateSerializer;
-import org.apache.tinkerpop.gremlin.structure.io.binary.types.LocalDateTimeSerializer;
-import org.apache.tinkerpop.gremlin.structure.io.binary.types.LocalTimeSerializer;
import org.apache.tinkerpop.gremlin.structure.io.binary.types.MapEntrySerializer;
import org.apache.tinkerpop.gremlin.structure.io.binary.types.MapSerializer;
-import org.apache.tinkerpop.gremlin.structure.io.binary.types.MetricsSerializer;
-import org.apache.tinkerpop.gremlin.structure.io.binary.types.MonthDaySerializer;
+import org.apache.tinkerpop.gremlin.structure.io.binary.types.DateTimeSerializer;
import org.apache.tinkerpop.gremlin.structure.io.binary.types.NSerializer;
-import org.apache.tinkerpop.gremlin.structure.io.binary.types.OffsetDateTimeSerializer;
-import org.apache.tinkerpop.gremlin.structure.io.binary.types.OffsetTimeSerializer;
-import org.apache.tinkerpop.gremlin.structure.io.binary.types.PSerializer;
import org.apache.tinkerpop.gremlin.structure.io.binary.types.PathSerializer;
-import org.apache.tinkerpop.gremlin.structure.io.binary.types.PeriodSerializer;
import org.apache.tinkerpop.gremlin.structure.io.binary.types.PropertySerializer;
import org.apache.tinkerpop.gremlin.structure.io.binary.types.SetSerializer;
import org.apache.tinkerpop.gremlin.structure.io.binary.types.SingleTypeSerializer;
import org.apache.tinkerpop.gremlin.structure.io.binary.types.StringSerializer;
import org.apache.tinkerpop.gremlin.structure.io.binary.types.TransformSerializer;
import org.apache.tinkerpop.gremlin.structure.io.binary.types.TraversalExplanationSerializer;
-import org.apache.tinkerpop.gremlin.structure.io.binary.types.TraversalMetricsSerializer;
-import org.apache.tinkerpop.gremlin.structure.io.binary.types.TraversalStrategySerializer;
-import org.apache.tinkerpop.gremlin.structure.io.binary.types.TraverserSerializer;
import org.apache.tinkerpop.gremlin.structure.io.binary.types.TreeSerializer;
import org.apache.tinkerpop.gremlin.structure.io.binary.types.UUIDSerializer;
import org.apache.tinkerpop.gremlin.structure.io.binary.types.VertexPropertySerializer;
import org.apache.tinkerpop.gremlin.structure.io.binary.types.VertexSerializer;
-import org.apache.tinkerpop.gremlin.structure.io.binary.types.YearMonthSerializer;
-import org.apache.tinkerpop.gremlin.structure.io.binary.types.ZoneOffsetSerializer;
-import org.apache.tinkerpop.gremlin.structure.io.binary.types.ZonedDateTimeSerializer;
-import org.apache.tinkerpop.gremlin.util.function.Lambda;
import org.javatuples.Pair;
import java.io.IOException;
import java.lang.reflect.Modifier;
import java.math.BigDecimal;
import java.math.BigInteger;
-import java.net.Inet4Address;
-import java.net.Inet6Address;
-import java.net.InetAddress;
import java.nio.ByteBuffer;
-import java.sql.Timestamp;
import java.time.Duration;
-import java.time.Instant;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.MonthDay;
import java.time.OffsetDateTime;
-import java.time.OffsetTime;
-import java.time.Period;
-import java.time.Year;
-import java.time.YearMonth;
-import java.time.ZoneOffset;
-import java.time.ZonedDateTime;
import java.util.Arrays;
import java.util.Collection;
-import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
@@ -146,11 +90,9 @@
new RegistryEntry<>(Integer.class, SingleTypeSerializer.IntSerializer),
new RegistryEntry<>(Long.class, SingleTypeSerializer.LongSerializer),
new RegistryEntry<>(String.class, new StringSerializer()),
- new RegistryEntry<>(Date.class, DateSerializer.DateSerializer),
- new RegistryEntry<>(Timestamp.class, DateSerializer.TimestampSerializer),
- new RegistryEntry<>(Class.class, new ClassSerializer()),
new RegistryEntry<>(Double.class, SingleTypeSerializer.DoubleSerializer),
new RegistryEntry<>(Float.class, SingleTypeSerializer.FloatSerializer),
+ new RegistryEntry<>(BulkSet.class, new BulkSetSerializer()), // needs to register before list so ListSerializer is registered as LIST by overwrite
new RegistryEntry<>(List.class, new ListSerializer()),
new RegistryEntry<>(Map.class, new MapSerializer()),
new RegistryEntry<>(Set.class, new SetSerializer()),
@@ -161,40 +103,18 @@
new RegistryEntry<>(Property.class, new PropertySerializer()),
new RegistryEntry<>(Graph.class, new GraphSerializer()),
new RegistryEntry<>(Vertex.class, new VertexSerializer()),
- new RegistryEntry<>(SackFunctions.Barrier.class, EnumSerializer.BarrierSerializer),
- new RegistryEntry<>(Bytecode.Binding.class, new BindingSerializer()),
- new RegistryEntry<>(Bytecode.class, new ByteCodeSerializer()),
- new RegistryEntry<>(VertexProperty.Cardinality.class, EnumSerializer.CardinalitySerializer),
- new RegistryEntry<>(Column.class, EnumSerializer.ColumnSerializer),
new RegistryEntry<>(Direction.class, EnumSerializer.DirectionSerializer),
- new RegistryEntry<>(DT.class, EnumSerializer.DTSerializer),
+ new RegistryEntry<>(T.class, EnumSerializer.TSerializer),
new RegistryEntry<>(Merge.class, EnumSerializer.MergeSerializer),
new RegistryEntry<>(N.class, new NSerializer()),
- new RegistryEntry<>(Operator.class, EnumSerializer.OperatorSerializer),
- new RegistryEntry<>(Order.class, EnumSerializer.OrderSerializer),
- new RegistryEntry<>(Pick.class, EnumSerializer.PickSerializer),
- new RegistryEntry<>(Pop.class, EnumSerializer.PopSerializer),
- new RegistryEntry<>(Lambda.class, new LambdaSerializer()),
- new RegistryEntry<>(P.class, new PSerializer<>(DataType.P, P.class)),
- new RegistryEntry<>(AndP.class, new PSerializer<>(DataType.P, AndP.class)),
- new RegistryEntry<>(OrP.class, new PSerializer<>(DataType.P, OrP.class)),
- new RegistryEntry<>(NotP.class, new PSerializer<>(DataType.P, NotP.class)),
- new RegistryEntry<>(TextP.class, new PSerializer<>(DataType.TEXTP, TextP.class)),
- new RegistryEntry<>(Scope.class, EnumSerializer.ScopeSerializer),
- new RegistryEntry<>(T.class, EnumSerializer.TSerializer),
- new RegistryEntry<>(Traverser.class, new TraverserSerializer()),
- new RegistryEntry<>(Merge.class, EnumSerializer.MergeSerializer),
new RegistryEntry<>(BigDecimal.class, new BigDecimalSerializer()),
new RegistryEntry<>(BigInteger.class, new BigIntegerSerializer()),
new RegistryEntry<>(Byte.class, SingleTypeSerializer.ByteSerializer),
new RegistryEntry<>(ByteBuffer.class, new ByteBufferSerializer()),
new RegistryEntry<>(Short.class, SingleTypeSerializer.ShortSerializer),
new RegistryEntry<>(Boolean.class, SingleTypeSerializer.BooleanSerializer),
- new RegistryEntry<>(TraversalStrategy.class, new TraversalStrategySerializer()),
- new RegistryEntry<>(BulkSet.class, new BulkSetSerializer()),
new RegistryEntry<>(Tree.class, new TreeSerializer()),
- new RegistryEntry<>(Metrics.class, new MetricsSerializer()),
- new RegistryEntry<>(TraversalMetrics.class, new TraversalMetricsSerializer()),
+ new RegistryEntry<>(Marker.class, SingleTypeSerializer.MarkerSerializer),
// TransformSerializer implementations
new RegistryEntry<>(Map.Entry.class, new MapEntrySerializer()),
@@ -202,22 +122,7 @@
new RegistryEntry<>(Character.class, new CharSerializer()),
new RegistryEntry<>(Duration.class, new DurationSerializer()),
- new RegistryEntry<>(InetAddress.class, new InetAddressSerializer()),
- new RegistryEntry<>(Inet4Address.class, new InetAddressSerializer<>()),
- new RegistryEntry<>(Inet6Address.class, new InetAddressSerializer<>()),
- new RegistryEntry<>(Instant.class, new InstantSerializer()),
- new RegistryEntry<>(LocalDate.class, new LocalDateSerializer()),
- new RegistryEntry<>(LocalTime.class, new LocalTimeSerializer()),
- new RegistryEntry<>(LocalDateTime.class, new LocalDateTimeSerializer()),
- new RegistryEntry<>(MonthDay.class, new MonthDaySerializer()),
- new RegistryEntry<>(OffsetDateTime.class, new OffsetDateTimeSerializer()),
- new RegistryEntry<>(OffsetTime.class, new OffsetTimeSerializer()),
- new RegistryEntry<>(Period.class, new PeriodSerializer()),
- new RegistryEntry<>(Year.class, SingleTypeSerializer.YearSerializer),
- new RegistryEntry<>(YearMonth.class, new YearMonthSerializer()),
- new RegistryEntry<>(ZonedDateTime.class, new ZonedDateTimeSerializer()),
- new RegistryEntry<>(ZoneOffset.class, new ZoneOffsetSerializer())
-
+ new RegistryEntry<>(OffsetDateTime.class, new DateTimeSerializer())
};
public static final TypeSerializerRegistry INSTANCE = build().create();
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/BindingSerializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/BindingSerializer.java
deleted file mode 100644
index 1158358..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/BindingSerializer.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.io.binary.types;
-
-import org.apache.tinkerpop.gremlin.structure.io.binary.DataType;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryReader;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryWriter;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
-import org.apache.tinkerpop.gremlin.structure.io.Buffer;
-
-import java.io.IOException;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class BindingSerializer extends SimpleTypeSerializer<Bytecode.Binding> {
-
- public BindingSerializer() {
- super(DataType.BINDING);
- }
-
- @Override
- protected Bytecode.Binding readValue(final Buffer buffer, final GraphBinaryReader context) throws IOException {
- final String k = context.readValue(buffer, String.class, false);
- return new Bytecode.Binding<>(k, context.read(buffer));
- }
-
- @Override
- protected void writeValue(final Bytecode.Binding value, final Buffer buffer, final GraphBinaryWriter context) throws IOException {
- context.writeValue(value.variable(), buffer, false);
- context.write(value.value(), buffer);
- }
-}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/BulkSetSerializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/BulkSetSerializer.java
index 7811f73..09ff2dd 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/BulkSetSerializer.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/BulkSetSerializer.java
@@ -32,19 +32,12 @@
*/
public class BulkSetSerializer extends SimpleTypeSerializer<BulkSet> {
public BulkSetSerializer() {
- super(DataType.BULKSET);
+ super(DataType.LIST);
}
@Override
protected BulkSet readValue(final Buffer buffer, final GraphBinaryReader context) throws IOException {
- final int length = buffer.readInt();
-
- final BulkSet result = new BulkSet();
- for (int i = 0; i < length; i++) {
- result.add(context.read(buffer), buffer.readLong());
- }
-
- return result;
+ throw new UnsupportedOperationException("BulkSet is used as an internal serializer for bulk lists, deserializing into BulkSet is not supported");
}
@Override
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/ByteCodeSerializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/ByteCodeSerializer.java
deleted file mode 100644
index bf890f9..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/ByteCodeSerializer.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.io.binary.types;
-
-import org.apache.tinkerpop.gremlin.structure.io.binary.DataType;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryReader;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryWriter;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
-import org.apache.tinkerpop.gremlin.structure.io.Buffer;
-
-import java.io.IOException;
-import java.util.List;
-
-public class ByteCodeSerializer extends SimpleTypeSerializer<Bytecode> {
- public ByteCodeSerializer() {
- super(DataType.BYTECODE);
- }
-
- @Override
- protected Bytecode readValue(final Buffer buffer, final GraphBinaryReader context) throws IOException {
- final Bytecode result = new Bytecode();
-
- final int stepsLength = buffer.readInt();
- for (int i = 0; i < stepsLength; i++) {
- result.addStep(context.readValue(buffer, String.class, false), getInstructionArguments(buffer, context));
- }
-
- final int sourcesLength = buffer.readInt();
- for (int i = 0; i < sourcesLength; i++) {
- result.addSource(context.readValue(buffer, String.class, false), getInstructionArguments(buffer, context));
- }
-
- return result;
- }
-
- private static Object[] getInstructionArguments(final Buffer buffer, final GraphBinaryReader context) throws IOException {
- final int valuesLength = buffer.readInt();
- final Object[] values = new Object[valuesLength];
- for (int j = 0; j < valuesLength; j++) {
- values[j] = context.read(buffer);
- }
- return values;
- }
-
- @Override
- protected void writeValue(final Bytecode value, final Buffer buffer, final GraphBinaryWriter context) throws IOException {
- final List<Bytecode.Instruction> steps = value.getStepInstructions();
- final List<Bytecode.Instruction> sources = value.getSourceInstructions();
- // 2 buffers for the length + plus 2 buffers per each step and source
-
- writeInstructions(buffer, context, steps);
- writeInstructions(buffer, context, sources);
- }
-
- private void writeInstructions(final Buffer buffer, final GraphBinaryWriter context,
- final List<Bytecode.Instruction> instructions) throws IOException {
-
- context.writeValue(instructions.size(), buffer, false);
-
- for (Bytecode.Instruction instruction : instructions) {
- context.writeValue(instruction.getOperator(), buffer, false);
- fillArgumentsBuffer(instruction.getArguments(), buffer, context);
- }
- }
-
- private static void fillArgumentsBuffer(final Object[] arguments, final Buffer buffer, final GraphBinaryWriter context) throws IOException {
-
- context.writeValue(arguments.length, buffer, false);
-
- for (Object value : arguments) {
- context.write(value, buffer);
- }
- }
-}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/ClassSerializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/ClassSerializer.java
deleted file mode 100644
index 0b83287..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/ClassSerializer.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.io.binary.types;
-
-import org.apache.tinkerpop.gremlin.structure.io.binary.DataType;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryReader;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryWriter;
-import org.apache.tinkerpop.gremlin.structure.io.Buffer;
-
-import java.io.IOException;
-
-public class ClassSerializer extends SimpleTypeSerializer<Class> {
- public ClassSerializer() {
- super(DataType.CLASS);
- }
-
- @Override
- protected Class readValue(final Buffer buffer, final GraphBinaryReader context) throws IOException {
- final String name = context.readValue(buffer, String.class, false);
- try {
- return Class.forName(name);
- } catch (Exception ex) {
- throw new RuntimeException(ex);
- }
- }
-
- @Override
- protected void writeValue(final Class value, final Buffer buffer, final GraphBinaryWriter context) throws IOException {
- context.writeValue(value.getName(), buffer, false);
- }
-}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/DateSerializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/DateSerializer.java
deleted file mode 100644
index 1487383..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/DateSerializer.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.io.binary.types;
-
-import org.apache.tinkerpop.gremlin.structure.io.binary.DataType;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryReader;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryWriter;
-import org.apache.tinkerpop.gremlin.structure.io.Buffer;
-
-import java.sql.Timestamp;
-import java.util.Date;
-import java.util.function.Function;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class DateSerializer<T extends Date> extends SimpleTypeSerializer<T> {
-
- public static final DateSerializer<Date> DateSerializer = new DateSerializer<>(DataType.DATE, Date::new);
- public static final DateSerializer<Timestamp> TimestampSerializer = new DateSerializer<>(DataType.TIMESTAMP, Timestamp::new);
-
- private final Function<Long, T> reader;
-
- private DateSerializer(final DataType type, final Function<Long, T> reader) {
- super(type);
- this.reader = reader;
- }
-
- @Override
- protected T readValue(final Buffer buffer, final GraphBinaryReader context) {
- return reader.apply(buffer.readLong());
- }
-
- @Override
- protected void writeValue(final T value, final Buffer buffer, final GraphBinaryWriter context) {
- buffer.writeLong(value.getTime());
- }
-}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/DateTimeSerializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/DateTimeSerializer.java
new file mode 100644
index 0000000..416ceb8
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/DateTimeSerializer.java
@@ -0,0 +1,56 @@
+/*
+ * 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.structure.io.binary.types;
+
+import org.apache.tinkerpop.gremlin.structure.io.binary.DataType;
+import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryReader;
+import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryWriter;
+import org.apache.tinkerpop.gremlin.structure.io.Buffer;
+
+import java.io.IOException;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public class DateTimeSerializer extends SimpleTypeSerializer<OffsetDateTime> {
+ public DateTimeSerializer() {
+ super(DataType.DATETIME);
+ }
+
+ @Override
+ protected OffsetDateTime readValue(final Buffer buffer, final GraphBinaryReader context) throws IOException {
+ final LocalDate localDate = LocalDate.of(buffer.readInt(), buffer.readByte(), buffer.readByte());
+ final LocalTime localTime = LocalTime.ofNanoOfDay(buffer.readLong());
+ final LocalDateTime ldt = LocalDateTime.of(localDate, localTime);
+ final ZoneOffset zo = ZoneOffset.ofTotalSeconds(buffer.readInt());
+ return OffsetDateTime.of(ldt, zo);
+ }
+
+ @Override
+ protected void writeValue(final OffsetDateTime value, final Buffer buffer, final GraphBinaryWriter context) throws IOException {
+ buffer.writeInt(value.getYear()).writeByte(value.getMonthValue()).writeByte(value.getDayOfMonth());
+ buffer.writeLong(value.toLocalTime().toNanoOfDay());
+ buffer.writeInt(value.getOffset().getTotalSeconds());
+ }
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/EdgeSerializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/EdgeSerializer.java
index 09b7c10..839fbbf 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/EdgeSerializer.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/EdgeSerializer.java
@@ -18,7 +18,7 @@
*/
package org.apache.tinkerpop.gremlin.structure.io.binary.types;
-import org.apache.commons.collections.IteratorUtils;
+import org.apache.commons.collections4.IteratorUtils;
import org.apache.tinkerpop.gremlin.structure.Edge;
import org.apache.tinkerpop.gremlin.structure.Property;
import org.apache.tinkerpop.gremlin.structure.io.Buffer;
@@ -30,6 +30,7 @@
import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceEdge;
import java.io.IOException;
+import java.util.Collections;
import java.util.List;
/**
@@ -43,12 +44,15 @@
@Override
protected Edge readValue(final Buffer buffer, final GraphBinaryReader context) throws IOException {
final Object id = context.read(buffer);
- final String label = context.readValue(buffer, String.class, false);
+ // reading single string value for now according to GraphBinaryV4
+ final String label = (String) context.readValue(buffer, List.class, false).get(0);
final Object inVId = context.read(buffer);
- final String inVLabel = context.readValue(buffer, String.class, false);
+ // reading single string value for now according to GraphBinaryV4
+ final String inVLabel = (String) context.readValue(buffer, List.class, false).get(0);
final Object outVId = context.read(buffer);
- final String outVLabel = context.readValue(buffer, String.class, false);
+ // reading single string value for now according to GraphBinaryV4
+ final String outVLabel = (String) context.readValue(buffer, List.class, false).get(0);
// discard the parent vertex
context.read(buffer);
@@ -73,12 +77,16 @@
protected void writeValue(final Edge value, final Buffer buffer, final GraphBinaryWriter context) throws IOException {
context.write(value.id(), buffer);
- context.writeValue(value.label(), buffer, false);
+ // wrapping label into list here for now according to GraphBinaryV4, but we aren't allowing null label yet
+ if (value.label() == null) {
+ throw new IOException("Unexpected null value when nullable is false");
+ }
+ context.writeValue(Collections.singletonList(value.label()), buffer, false);
context.write(value.inVertex().id(), buffer);
- context.writeValue(value.inVertex().label(), buffer, false);
+ context.writeValue(Collections.singletonList(value.inVertex().label()), buffer, false);
context.write(value.outVertex().id(), buffer);
- context.writeValue(value.outVertex().label(), buffer, false);
+ context.writeValue(Collections.singletonList(value.outVertex().label()), buffer, false);
// we don't serialize the parent Vertex for edges.
context.write(null, buffer);
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/EnumSerializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/EnumSerializer.java
index 7ee0dd0..a0e0bf7 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/EnumSerializer.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/EnumSerializer.java
@@ -46,18 +46,9 @@
*/
public class EnumSerializer<E extends Enum> extends SimpleTypeSerializer<E> {
- public static final EnumSerializer<SackFunctions.Barrier> BarrierSerializer = new EnumSerializer<>(DataType.BARRIER, SackFunctions.Barrier::valueOf);
- public static final EnumSerializer<VertexProperty.Cardinality> CardinalitySerializer = new EnumSerializer<>(DataType.CARDINALITY, VertexProperty.Cardinality::valueOf);
- public static final EnumSerializer<Column> ColumnSerializer = new EnumSerializer<>(DataType.COLUMN, Column::valueOf);
public static final EnumSerializer<Direction> DirectionSerializer = new EnumSerializer<>(DataType.DIRECTION, Direction::valueOf);
- public static final EnumSerializer<DT> DTSerializer = new EnumSerializer<>(DataType.DT, DT::valueOf);
- public static final EnumSerializer<Merge> MergeSerializer = new EnumSerializer<>(DataType.MERGE, Merge::valueOf);
- public static final EnumSerializer<Operator> OperatorSerializer = new EnumSerializer<>(DataType.OPERATOR, Operator::valueOf);
- public static final EnumSerializer<Order> OrderSerializer = new EnumSerializer<>(DataType.ORDER, Order::valueOf);
- public static final EnumSerializer<Pick> PickSerializer = new EnumSerializer<>(DataType.PICK, Pick::valueOf);
- public static final EnumSerializer<Pop> PopSerializer = new EnumSerializer<>(DataType.POP, Pop::valueOf);
- public static final EnumSerializer<Scope> ScopeSerializer = new EnumSerializer<>(DataType.SCOPE, Scope::valueOf);
public static final EnumSerializer<T> TSerializer = new EnumSerializer<>(DataType.T, T::valueOf);
+ public static final EnumSerializer<Merge> MergeSerializer = new EnumSerializer<>(DataType.MERGE, Merge::valueOf);
private final Function<String, E> readFunc;
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/GraphSerializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/GraphSerializer.java
index f107b8a..c5d6cb2 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/GraphSerializer.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/GraphSerializer.java
@@ -35,6 +35,7 @@
import java.io.IOException;
import java.lang.reflect.Method;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -63,17 +64,18 @@
final Graph graph = (Graph) openMethod.invoke(null, conf);
final int vertexCount = context.readValue(buffer, Integer.class, false);
for (int ix = 0; ix < vertexCount; ix++) {
- final Vertex v = graph.addVertex(T.id, context.read(buffer), T.label, context.readValue(buffer, String.class, false));
+ final Vertex v = graph.addVertex(T.id, context.read(buffer), T.label, context.readValue(buffer, List.class, false).get(0));
final int vertexPropertyCount = context.readValue(buffer, Integer.class, false);
for (int iy = 0; iy < vertexPropertyCount; iy++) {
final Object id = context.read(buffer);
- final String label = context.readValue(buffer, String.class, false);
+ // reading single string value for now according to GraphBinaryV4
+ final String label = (String) context.readValue(buffer, List.class, false).get(0);
final Object val = context.read(buffer);
context.read(buffer); // toss parent as it's always null
final VertexProperty<Object> vp = v.property(VertexProperty.Cardinality.list, label, val, T.id, id);
- final List<Property> edgeProperties = context.readValue(buffer, ArrayList.class, false);
+ final List<Property> edgeProperties = context.readValue(buffer, List.class, false);
for (Property p : edgeProperties) {
vp.property(p.key(), p.value());
}
@@ -83,7 +85,8 @@
final int edgeCount = context.readValue(buffer, Integer.class, false);
for (int ix = 0; ix < edgeCount; ix++) {
final Object id = context.read(buffer);
- final String label = context.readValue(buffer, String.class, false);
+ // reading single string value for now according to GraphBinaryV4
+ final String label = (String) context.readValue(buffer, List.class, false).get(0);
final Object inId = context.read(buffer);
final Vertex inV = graph.vertices(inId).next();
context.read(buffer); // toss in label - always null in this context
@@ -131,12 +134,13 @@
final List<VertexProperty<Object>> vertexProperties = IteratorUtils.list(vertex.properties());
context.write(vertex.id(), buffer);
- context.writeValue(vertex.label(), buffer, false);
+ // serializing label as list here for now according to GraphBinaryV4
+ context.writeValue(Collections.singletonList(vertex.label()), buffer, false);
context.writeValue(vertexProperties.size(), buffer, false);
for (VertexProperty<Object> vp : vertexProperties) {
context.write(vp.id(), buffer);
- context.writeValue(vp.label(), buffer, false);
+ context.writeValue(Collections.singletonList(vp.label()), buffer, false);
context.write(vp.value(), buffer);
// maintain the VertexProperty format we have with this empty parent.........
@@ -149,7 +153,8 @@
private void writeEdge(Buffer buffer, GraphBinaryWriter context, Edge edge) throws IOException {
context.write(edge.id(), buffer);
- context.writeValue(edge.label(), buffer, false);
+ // serializing label as list here for now according to GraphBinaryV4
+ context.writeValue(Collections.singletonList(edge.label()), buffer, false);
context.write(edge.inVertex().id(), buffer);
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/InetAddressSerializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/InetAddressSerializer.java
deleted file mode 100644
index c6153c4..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/InetAddressSerializer.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.io.binary.types;
-
-import org.apache.tinkerpop.gremlin.structure.io.binary.DataType;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryReader;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryWriter;
-import org.apache.tinkerpop.gremlin.structure.io.Buffer;
-
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class InetAddressSerializer<T extends InetAddress> extends SimpleTypeSerializer<T> {
- public InetAddressSerializer() {
- super(DataType.INETADDRESS);
- }
-
- @Override
- protected T readValue(final Buffer buffer, final GraphBinaryReader context) throws IOException {
- final int length = buffer.readInt();
- final byte[] bytes = new byte[length];
- buffer.readBytes(bytes);
-
- try {
- return (T) InetAddress.getByAddress(bytes);
- } catch (UnknownHostException uhe) {
- throw new IOException("Cannot deserialize InetAddress value", uhe);
- }
- }
-
- @Override
- protected void writeValue(final T value, final Buffer buffer, final GraphBinaryWriter context) throws IOException {
- final byte[] bytes = value.getAddress();
- buffer.writeInt(bytes.length).writeBytes(bytes);
- }
-}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/InstantSerializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/InstantSerializer.java
deleted file mode 100644
index ce0b87b..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/InstantSerializer.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.io.binary.types;
-
-import org.apache.tinkerpop.gremlin.structure.io.binary.DataType;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryReader;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryWriter;
-import org.apache.tinkerpop.gremlin.structure.io.Buffer;
-
-import java.io.IOException;
-import java.time.Instant;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class InstantSerializer extends SimpleTypeSerializer<Instant> {
- public InstantSerializer() {
- super(DataType.INSTANT);
- }
-
- @Override
- protected Instant readValue(final Buffer buffer, final GraphBinaryReader context) throws IOException {
- return Instant.ofEpochSecond(buffer.readLong(), buffer.readInt());
- }
-
- @Override
- protected void writeValue(final Instant value, final Buffer buffer, final GraphBinaryWriter context) throws IOException {
- buffer.writeLong(value.getEpochSecond()).writeInt(value.getNano());
- }
-}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/LambdaSerializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/LambdaSerializer.java
deleted file mode 100644
index 50cbb52..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/LambdaSerializer.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.io.binary.types;
-
-import org.apache.tinkerpop.gremlin.structure.io.binary.DataType;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryReader;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryWriter;
-import org.apache.tinkerpop.gremlin.structure.io.Buffer;
-import org.apache.tinkerpop.gremlin.util.function.Lambda;
-
-import java.io.IOException;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class LambdaSerializer extends SimpleTypeSerializer<Lambda> {
- public LambdaSerializer() {
- super(DataType.LAMBDA);
- }
-
- @Override
- protected Lambda readValue(final Buffer buffer, final GraphBinaryReader context) throws IOException {
- final String lang = context.readValue(buffer, String.class, false);
- final String script = context.readValue(buffer, String.class, false);
- final int args = context.readValue(buffer, Integer.class, false);
-
- if (0 == args)
- return new Lambda.ZeroArgLambda<>(script, lang);
- else if (1 == args)
- return new Lambda.OneArgLambda<>(script, lang);
- else if (2 == args)
- return new Lambda.TwoArgLambda<>(script, lang);
- else
- return new Lambda.UnknownArgLambda(script, lang, args);
- }
-
- @Override
- protected void writeValue(final Lambda value, final Buffer buffer, final GraphBinaryWriter context) throws IOException {
- context.writeValue(value.getLambdaLanguage(), buffer, false);
- context.writeValue(value.getLambdaScript(), buffer, false);
- context.writeValue(value.getLambdaArguments(), buffer, false);
- }
-}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/ListSerializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/ListSerializer.java
index 74ac14b..68098f7 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/ListSerializer.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/ListSerializer.java
@@ -24,6 +24,7 @@
import org.apache.tinkerpop.gremlin.structure.io.Buffer;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.List;
public class ListSerializer extends SimpleTypeSerializer<List> {
@@ -34,6 +35,30 @@
}
@Override
+ public List readValue(final Buffer buffer, final GraphBinaryReader context, final boolean nullable) throws IOException {
+ if (nullable) {
+ final byte valueFlag = buffer.readByte();
+ if ((valueFlag & 1) == 1) {
+ return null;
+ }
+ if ((valueFlag & 2) == 2) {
+ final int length = buffer.readInt();
+ final ArrayList result = new ArrayList(length);
+ for (int i = 0; i < length; i++) {
+ Object item = context.read(buffer);
+ long bulk = buffer.readLong();
+ for (int j = 0; j < bulk; j++) {
+ result.add(item);
+ }
+ }
+ return result;
+ }
+ }
+
+ return readValue(buffer, context);
+ }
+
+ @Override
protected List readValue(final Buffer buffer, final GraphBinaryReader context) throws IOException {
// The collection is a List<>
return (List) collectionSerializer.readValue(buffer, context);
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/LocalDateSerializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/LocalDateSerializer.java
deleted file mode 100644
index 46a3a02..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/LocalDateSerializer.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.io.binary.types;
-
-import org.apache.tinkerpop.gremlin.structure.io.binary.DataType;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryReader;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryWriter;
-import org.apache.tinkerpop.gremlin.structure.io.Buffer;
-
-import java.io.IOException;
-import java.time.LocalDate;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class LocalDateSerializer extends SimpleTypeSerializer<LocalDate> {
- public LocalDateSerializer() {
- super(DataType.LOCALDATE);
- }
-
- @Override
- protected LocalDate readValue(final Buffer buffer, final GraphBinaryReader context) throws IOException {
- return LocalDate.of(buffer.readInt(), buffer.readByte(), buffer.readByte());
- }
-
- @Override
- protected void writeValue(final LocalDate value, final Buffer buffer, final GraphBinaryWriter context) throws IOException {
- buffer.writeInt(value.getYear()).writeByte(value.getMonthValue()).writeByte(value.getDayOfMonth());
- }
-}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/LocalDateTimeSerializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/LocalDateTimeSerializer.java
deleted file mode 100644
index c3e92c8..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/LocalDateTimeSerializer.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.io.binary.types;
-
-import org.apache.tinkerpop.gremlin.structure.io.binary.DataType;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryReader;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryWriter;
-import org.apache.tinkerpop.gremlin.structure.io.Buffer;
-
-import java.io.IOException;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class LocalDateTimeSerializer extends SimpleTypeSerializer<LocalDateTime> {
- public LocalDateTimeSerializer() {
- super(DataType.LOCALDATETIME);
- }
-
- @Override
- protected LocalDateTime readValue(final Buffer buffer, final GraphBinaryReader context) throws IOException {
- return LocalDateTime.of(context.readValue(buffer, LocalDate.class, false),
- context.readValue(buffer, LocalTime.class, false));
- }
-
- @Override
- protected void writeValue(final LocalDateTime value, final Buffer buffer, final GraphBinaryWriter context) throws IOException {
- context.writeValue(value.toLocalDate(), buffer, false);
- context.writeValue(value.toLocalTime(), buffer, false);
- }
-}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/LocalTimeSerializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/LocalTimeSerializer.java
deleted file mode 100644
index bb654ac..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/LocalTimeSerializer.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.io.binary.types;
-
-import org.apache.tinkerpop.gremlin.structure.io.binary.DataType;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryReader;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryWriter;
-import org.apache.tinkerpop.gremlin.structure.io.Buffer;
-
-import java.io.IOException;
-import java.time.LocalTime;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class LocalTimeSerializer extends SimpleTypeSerializer<LocalTime> {
- public LocalTimeSerializer() {
- super(DataType.LOCALTIME);
- }
-
- @Override
- protected LocalTime readValue(final Buffer buffer, final GraphBinaryReader context) throws IOException {
- return LocalTime.ofNanoOfDay(buffer.readLong());
- }
-
- @Override
- protected void writeValue(final LocalTime value, final Buffer buffer, final GraphBinaryWriter context) throws IOException {
- buffer.writeLong(value.toNanoOfDay());
- }
-}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/MapSerializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/MapSerializer.java
index c2b95d0..39fb132 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/MapSerializer.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/MapSerializer.java
@@ -24,16 +24,34 @@
import org.apache.tinkerpop.gremlin.structure.io.Buffer;
import java.io.IOException;
+import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Set;
public class MapSerializer extends SimpleTypeSerializer<Map> {
+
public MapSerializer() {
super(DataType.MAP);
}
@Override
+ public Map readValue(final Buffer buffer, final GraphBinaryReader context, final boolean nullable) throws IOException {
+ if (nullable) {
+ final byte valueFlag = buffer.readByte();
+ if ((valueFlag & 1) == 1) {
+ return null;
+ }
+ if ((valueFlag & 2) == 2) {
+ return readValue(buffer, context);
+ }
+
+ }
+
+ return readMap(buffer, context);
+ }
+
+ @Override
protected Map readValue(final Buffer buffer, final GraphBinaryReader context) throws IOException {
final int length = buffer.readInt();
@@ -45,6 +63,17 @@
return result;
}
+ private Map readMap(final Buffer buffer, final GraphBinaryReader context) throws IOException {
+ final int length = buffer.readInt();
+
+ final Map<Object,Object> result = new HashMap<>(length);
+ for (int i = 0; i < length; i++) {
+ result.put(context.read(buffer), context.read(buffer));
+ }
+
+ return result;
+ }
+
@Override
protected void writeValue(final Map value, final Buffer buffer, final GraphBinaryWriter context) throws IOException {
buffer.writeInt(value.size());
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/MetricsSerializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/MetricsSerializer.java
deleted file mode 100644
index bedf2cb..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/MetricsSerializer.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.io.binary.types;
-
-import org.apache.tinkerpop.gremlin.structure.io.binary.DataType;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryReader;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryWriter;
-import org.apache.tinkerpop.gremlin.process.traversal.util.Metrics;
-import org.apache.tinkerpop.gremlin.process.traversal.util.MutableMetrics;
-import org.apache.tinkerpop.gremlin.structure.io.Buffer;
-
-import java.io.IOException;
-import java.util.Collection;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-public class MetricsSerializer extends SimpleTypeSerializer<Metrics> {
- private static final CollectionSerializer collectionSerializer = new CollectionSerializer(DataType.LIST);
-
- public MetricsSerializer() {
- super(DataType.METRICS);
- }
-
- @Override
- protected Metrics readValue(final Buffer buffer, final GraphBinaryReader context) throws IOException {
- // Consider using a custom implementation, like "DefaultMetrics"
- final MutableMetrics result = new MutableMetrics(
- context.readValue(buffer, String.class, false),
- context.readValue(buffer, String.class, false));
- result.setDuration(context.readValue(buffer, Long.class, false), TimeUnit.NANOSECONDS);
- final Map<String, Long> counts = context.readValue(buffer, Map.class, false);
- counts.forEach(result::setCount);
- final Map<String, Object> annotations = context.readValue(buffer, Map.class, false);
- annotations.forEach(result::setAnnotation);
- final Collection<MutableMetrics> nestedMetrics = collectionSerializer.readValue(buffer, context);
- nestedMetrics.forEach(result::addNested);
- return result;
- }
-
- @Override
- protected void writeValue(final Metrics value, final Buffer buffer, final GraphBinaryWriter context) throws IOException {
- context.writeValue(value.getId(), buffer, false);
- context.writeValue(value.getName(), buffer, false);
- context.writeValue(value.getDuration(TimeUnit.NANOSECONDS), buffer, false);
- context.writeValue(value.getCounts(), buffer, false);
- context.writeValue(value.getAnnotations(), buffer, false);
-
- // Avoid changing type to List
- collectionSerializer.writeValue(value.getNested(), buffer, context);
- }
-}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/MonthDaySerializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/MonthDaySerializer.java
deleted file mode 100644
index 32c2c92..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/MonthDaySerializer.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.io.binary.types;
-
-import org.apache.tinkerpop.gremlin.structure.io.binary.DataType;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryReader;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryWriter;
-import org.apache.tinkerpop.gremlin.structure.io.Buffer;
-
-import java.io.IOException;
-import java.time.MonthDay;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class MonthDaySerializer extends SimpleTypeSerializer<MonthDay> {
- public MonthDaySerializer() {
- super(DataType.MONTHDAY);
- }
-
- @Override
- protected MonthDay readValue(final Buffer buffer, final GraphBinaryReader context) throws IOException {
- return MonthDay.of(buffer.readByte(), buffer.readByte());
- }
-
- @Override
- protected void writeValue(final MonthDay value, final Buffer buffer, final GraphBinaryWriter context) throws IOException {
- buffer.writeByte(value.getMonthValue()).writeByte(value.getDayOfMonth());
- }
-}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/OffsetDateTimeSerializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/OffsetDateTimeSerializer.java
deleted file mode 100644
index 90b1c79..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/OffsetDateTimeSerializer.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.io.binary.types;
-
-import org.apache.tinkerpop.gremlin.structure.io.binary.DataType;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryReader;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryWriter;
-import org.apache.tinkerpop.gremlin.structure.io.Buffer;
-
-import java.io.IOException;
-import java.time.LocalDateTime;
-import java.time.OffsetDateTime;
-import java.time.ZoneOffset;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class OffsetDateTimeSerializer extends SimpleTypeSerializer<OffsetDateTime> {
- public OffsetDateTimeSerializer() {
- super(DataType.OFFSETDATETIME);
- }
-
- @Override
- protected OffsetDateTime readValue(final Buffer buffer, final GraphBinaryReader context) throws IOException {
- final LocalDateTime ldt = context.readValue(buffer, LocalDateTime.class, false);
- final ZoneOffset zo = context.readValue(buffer, ZoneOffset.class, false);
- return OffsetDateTime.of(ldt, zo);
- }
-
- @Override
- protected void writeValue(final OffsetDateTime value, final Buffer buffer, final GraphBinaryWriter context) throws IOException {
- context.writeValue(value.toLocalDateTime(), buffer, false);
- context.writeValue(value.getOffset(), buffer, false);
- }
-}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/OffsetTimeSerializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/OffsetTimeSerializer.java
deleted file mode 100644
index f4dcfe6..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/OffsetTimeSerializer.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.io.binary.types;
-
-import org.apache.tinkerpop.gremlin.structure.io.binary.DataType;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryReader;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryWriter;
-import org.apache.tinkerpop.gremlin.structure.io.Buffer;
-
-import java.io.IOException;
-import java.time.LocalTime;
-import java.time.OffsetTime;
-import java.time.ZoneOffset;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class OffsetTimeSerializer extends SimpleTypeSerializer<OffsetTime> {
- public OffsetTimeSerializer() {
- super(DataType.OFFSETTIME);
- }
-
- @Override
- protected OffsetTime readValue(final Buffer buffer, final GraphBinaryReader context) throws IOException {
- final LocalTime ldt = context.readValue(buffer, LocalTime.class, false);
- final ZoneOffset zo = context.readValue(buffer, ZoneOffset.class, false);
- return OffsetTime.of(ldt, zo);
- }
-
- @Override
- protected void writeValue(final OffsetTime value, final Buffer buffer, final GraphBinaryWriter context) throws IOException {
- context.writeValue(value.toLocalTime(), buffer, false);
- context.writeValue(value.getOffset(), buffer, false);
- }
-}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/PeriodSerializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/PeriodSerializer.java
deleted file mode 100644
index 267e2cb..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/PeriodSerializer.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.io.binary.types;
-
-import org.apache.tinkerpop.gremlin.structure.io.binary.DataType;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryReader;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryWriter;
-import org.apache.tinkerpop.gremlin.structure.io.Buffer;
-
-import java.io.IOException;
-import java.time.Period;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class PeriodSerializer extends SimpleTypeSerializer<Period> {
- public PeriodSerializer() {
- super(DataType.PERIOD);
- }
-
- @Override
- protected Period readValue(final Buffer buffer, final GraphBinaryReader context) throws IOException {
- return Period.of(buffer.readInt(), buffer.readInt(), buffer.readInt());
- }
-
- @Override
- protected void writeValue(final Period value, final Buffer buffer, final GraphBinaryWriter context) throws IOException {
- buffer.writeInt(value.getYears()).writeInt(value.getMonths()).writeInt(value.getDays());
- }
-}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/SimpleTypeSerializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/SimpleTypeSerializer.java
index 8c7918f..23eba48 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/SimpleTypeSerializer.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/SimpleTypeSerializer.java
@@ -18,6 +18,7 @@
*/
package org.apache.tinkerpop.gremlin.structure.io.binary.types;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.BulkSet;
import org.apache.tinkerpop.gremlin.structure.io.binary.DataType;
import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryReader;
import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryWriter;
@@ -25,6 +26,7 @@
import org.apache.tinkerpop.gremlin.structure.io.Buffer;
import java.io.IOException;
+import java.util.LinkedHashMap;
/**
* Base class for serialization of types that don't contain type specific information only {type_code}, {value_flag}
@@ -61,10 +63,11 @@
/**
* Reads a non-nullable value according to the type format.
- * @param buffer A buffer which reader index has been set to the beginning of the {value}.
+ *
+ * @param buffer A buffer which reader index has been set to the beginning of the {value}.
* @param context The binary reader.
- * @return
* @throws IOException
+ * @since 4.0.0
*/
protected abstract T readValue(final Buffer buffer, final GraphBinaryReader context) throws IOException;
@@ -85,7 +88,13 @@
}
if (nullable) {
- context.writeValueFlagNone(buffer);
+ if (value instanceof LinkedHashMap) {
+ context.writeValueFlagOrdered(buffer);
+ } else if (value instanceof BulkSet) {
+ context.writeValueFlagBulk(buffer);
+ } else {
+ context.writeValueFlagNone(buffer);
+ }
}
writeValue(value, buffer, context);
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/SingleTypeSerializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/SingleTypeSerializer.java
index 4abadda..3133f69 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/SingleTypeSerializer.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/SingleTypeSerializer.java
@@ -22,6 +22,7 @@
import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryReader;
import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryWriter;
import org.apache.tinkerpop.gremlin.structure.io.Buffer;
+import org.apache.tinkerpop.gremlin.structure.io.binary.Marker;
import java.time.Year;
import java.util.function.BiConsumer;
@@ -46,8 +47,8 @@
new SingleTypeSerializer<>(DataType.BOOLEAN, Buffer::readBoolean, (v, b) -> b.writeBoolean(v));
public static final SingleTypeSerializer<Byte> ByteSerializer =
new SingleTypeSerializer<>(DataType.BYTE, Buffer::readByte, (v, b) -> b.writeByte(v));
- public static final SingleTypeSerializer<Year> YearSerializer =
- new SingleTypeSerializer<>(DataType.YEAR, bb -> Year.of(bb.readInt()), (v, b) -> b.writeInt(v.getValue()));
+ public static final SingleTypeSerializer<Marker> MarkerSerializer =
+ new SingleTypeSerializer<>(DataType.MARKER, bb -> Marker.of(bb.readByte()), (v, b) -> b.writeByte(v.getValue()));
private final Function<Buffer, T> readFunc;
private final BiConsumer<T, Buffer> writeFunc;
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/TraversalMetricsSerializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/TraversalMetricsSerializer.java
deleted file mode 100644
index ff7b360..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/TraversalMetricsSerializer.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.io.binary.types;
-
-import org.apache.tinkerpop.gremlin.structure.io.binary.DataType;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryReader;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryWriter;
-import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalMetrics;
-import org.apache.tinkerpop.gremlin.process.traversal.util.MutableMetrics;
-import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics;
-import org.apache.tinkerpop.gremlin.structure.io.Buffer;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-public class TraversalMetricsSerializer extends SimpleTypeSerializer<TraversalMetrics> {
- private static final CollectionSerializer collectionSerializer = new CollectionSerializer(DataType.LIST);
-
- public TraversalMetricsSerializer() {
- super(DataType.TRAVERSALMETRICS);
- }
-
- @Override
- protected TraversalMetrics readValue(Buffer buffer, GraphBinaryReader context) throws IOException {
- Long durationNanos = context.readValue(buffer, Long.class, false);
- final List<MutableMetrics> metrics = new ArrayList<>(collectionSerializer.readValue(buffer, context));
- return new DefaultTraversalMetrics(durationNanos, metrics);
- }
-
- @Override
- protected void writeValue(TraversalMetrics value, Buffer buffer, GraphBinaryWriter context) throws IOException {
- context.writeValue(value.getDuration(TimeUnit.NANOSECONDS), buffer, false);
- collectionSerializer.writeValue(value.getMetrics(), buffer, context);
- }
-}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/TraversalStrategySerializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/TraversalStrategySerializer.java
deleted file mode 100644
index 256e25d..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/TraversalStrategySerializer.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.io.binary.types;
-
-import org.apache.commons.configuration2.ConfigurationConverter;
-import org.apache.commons.configuration2.MapConfiguration;
-import org.apache.tinkerpop.gremlin.structure.io.binary.DataType;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryReader;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryWriter;
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.TraversalStrategyProxy;
-import org.apache.tinkerpop.gremlin.structure.io.Buffer;
-
-import java.io.IOException;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class TraversalStrategySerializer extends SimpleTypeSerializer<TraversalStrategy> {
-
- public TraversalStrategySerializer() {
- super(DataType.TRAVERSALSTRATEGY);
- }
-
- @Override
- protected TraversalStrategy readValue(final Buffer buffer, final GraphBinaryReader context) throws IOException {
- final Class<TraversalStrategy> clazz = context.readValue(buffer, Class.class, false);
- final Map config = context.readValue(buffer, Map.class, false);
-
- return new TraversalStrategyProxy(clazz, new MapConfiguration(config));
- }
-
- @Override
- protected void writeValue(final TraversalStrategy value, final Buffer buffer, final GraphBinaryWriter context) throws IOException {
- context.writeValue(value.getClass(), buffer, false);
- context.writeValue(translateToBytecode(ConfigurationConverter.getMap(value.getConfiguration())), buffer, false);
- }
-
- private static Map<Object,Object> translateToBytecode(final Map<Object,Object> conf) {
- final Map<Object,Object> newConf = new LinkedHashMap<>(conf.size());
- conf.entrySet().forEach(entry -> {
- if (entry.getValue() instanceof Traversal)
- newConf.put(entry.getKey(), ((Traversal) entry.getValue()).asAdmin().getBytecode());
- else
- newConf.put(entry.getKey(), entry.getValue());
- });
- return newConf;
- }
-}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/TraverserSerializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/TraverserSerializer.java
deleted file mode 100644
index 6361fb0..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/TraverserSerializer.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.io.binary.types;
-
-import org.apache.tinkerpop.gremlin.structure.io.binary.DataType;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryReader;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryWriter;
-import org.apache.tinkerpop.gremlin.process.remote.traversal.DefaultRemoteTraverser;
-import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
-import org.apache.tinkerpop.gremlin.structure.io.Buffer;
-
-import java.io.IOException;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class TraverserSerializer extends SimpleTypeSerializer<Traverser> {
-
- public TraverserSerializer() {
- super(DataType.TRAVERSER);
- }
-
- @Override
- protected Traverser readValue(final Buffer buffer, final GraphBinaryReader context) throws IOException {
- final long bulk = context.readValue(buffer, Long.class, false);
- final Object v = context.read(buffer);
- return new DefaultRemoteTraverser<>(v, bulk);
- }
-
- @Override
- protected void writeValue(final Traverser value, final Buffer buffer, final GraphBinaryWriter context) throws IOException {
- context.writeValue(value.bulk(), buffer, false);
- context.write(value.get(), buffer);
- }
-}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/VertexPropertySerializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/VertexPropertySerializer.java
index c904de6..a52deca 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/VertexPropertySerializer.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/VertexPropertySerializer.java
@@ -18,7 +18,7 @@
*/
package org.apache.tinkerpop.gremlin.structure.io.binary.types;
-import org.apache.commons.collections.IteratorUtils;
+import org.apache.commons.collections4.IteratorUtils;
import org.apache.tinkerpop.gremlin.structure.Property;
import org.apache.tinkerpop.gremlin.structure.io.binary.DataType;
import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryReader;
@@ -45,7 +45,7 @@
protected VertexProperty readValue(final Buffer buffer, final GraphBinaryReader context) throws IOException {
final DetachedVertexProperty.Builder builder = DetachedVertexProperty.build()
.setId(context.read(buffer))
- .setLabel(context.readValue(buffer, String.class, false))
+ .setLabel((String) context.readValue(buffer, List.class, false).get(0))
.setValue(context.read(buffer));
// discard the parent vertex - we only send "references"
@@ -62,7 +62,11 @@
@Override
protected void writeValue(final VertexProperty value, final Buffer buffer, final GraphBinaryWriter context) throws IOException {
context.write(value.id(), buffer);
- context.writeValue(value.label(), buffer, false);
+ // wrapping label into list here for now according to GraphBinaryV4, but we aren't allowing null label yet
+ if (value.label() == null) {
+ throw new IOException("Unexpected null value when nullable is false");
+ }
+ context.writeValue(Collections.singletonList(value.label()), buffer, false);
context.write(value.value(), buffer);
// we don't serialize the parent vertex, let's hold a place for it
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/VertexSerializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/VertexSerializer.java
index ff5b99e..8c16ce2 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/VertexSerializer.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/VertexSerializer.java
@@ -18,9 +18,8 @@
*/
package org.apache.tinkerpop.gremlin.structure.io.binary.types;
-import org.apache.commons.collections.IteratorUtils;
+import org.apache.commons.collections4.IteratorUtils;
import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
import org.apache.tinkerpop.gremlin.structure.io.Buffer;
import org.apache.tinkerpop.gremlin.structure.io.binary.DataType;
import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryReader;
@@ -30,6 +29,7 @@
import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceVertex;
import java.io.IOException;
+import java.util.Collections;
import java.util.List;
/**
@@ -43,7 +43,8 @@
@Override
protected Vertex readValue(final Buffer buffer, final GraphBinaryReader context) throws IOException {
final Object id = context.read(buffer);
- final String label = context.readValue(buffer, String.class, false);
+ // reading single string value for now according to GraphBinaryV4
+ final String label = (String) context.readValue(buffer, List.class, false).get(0);
final List<DetachedVertexProperty> properties = context.read(buffer);
final DetachedVertex.Builder builder = DetachedVertex.build().setId(id).setLabel(label);
@@ -60,7 +61,11 @@
@Override
protected void writeValue(final Vertex value, final Buffer buffer, final GraphBinaryWriter context) throws IOException {
context.write(value.id(), buffer);
- context.writeValue(value.label(), buffer, false);
+ // wrapping label into list here for now according to GraphBinaryV4, but we aren't allowing null label yet
+ if (value.label() == null) {
+ throw new IOException("Unexpected null value when nullable is false");
+ }
+ context.writeValue(Collections.singletonList(value.label()), buffer, false);
if (value instanceof ReferenceVertex) {
context.write(null, buffer);
}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/YearMonthSerializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/YearMonthSerializer.java
deleted file mode 100644
index 070c214..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/YearMonthSerializer.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.io.binary.types;
-
-import org.apache.tinkerpop.gremlin.structure.io.binary.DataType;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryReader;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryWriter;
-import org.apache.tinkerpop.gremlin.structure.io.Buffer;
-
-import java.io.IOException;
-import java.time.YearMonth;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class YearMonthSerializer extends SimpleTypeSerializer<YearMonth> {
- public YearMonthSerializer() {
- super(DataType.YEARMONTH);
- }
-
- @Override
- protected YearMonth readValue(final Buffer buffer, final GraphBinaryReader context) throws IOException {
- return YearMonth.of(buffer.readInt(), buffer.readByte());
- }
-
- @Override
- protected void writeValue(final YearMonth value, final Buffer buffer, final GraphBinaryWriter context) throws IOException {
- buffer.writeInt(value.getYear()).writeByte(value.getMonthValue());
- }
-}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/ZoneOffsetSerializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/ZoneOffsetSerializer.java
deleted file mode 100644
index 09b6e47..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/ZoneOffsetSerializer.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.io.binary.types;
-
-import org.apache.tinkerpop.gremlin.structure.io.binary.DataType;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryReader;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryWriter;
-import org.apache.tinkerpop.gremlin.structure.io.Buffer;
-
-import java.io.IOException;
-import java.time.ZoneOffset;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class ZoneOffsetSerializer extends SimpleTypeSerializer<ZoneOffset> {
-
- public ZoneOffsetSerializer() {
- super(DataType.ZONEOFFSET);
- }
-
- @Override
- protected ZoneOffset readValue(final Buffer buffer, final GraphBinaryReader context) throws IOException {
- return ZoneOffset.ofTotalSeconds(buffer.readInt());
- }
-
- @Override
- protected void writeValue(final ZoneOffset value, final Buffer buffer, final GraphBinaryWriter context) throws IOException {
- buffer.writeInt(value.getTotalSeconds());
- }
-}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/ZonedDateTimeSerializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/ZonedDateTimeSerializer.java
deleted file mode 100644
index c39dff7..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/ZonedDateTimeSerializer.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.io.binary.types;
-
-import org.apache.tinkerpop.gremlin.structure.io.binary.DataType;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryReader;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryWriter;
-import org.apache.tinkerpop.gremlin.structure.io.Buffer;
-
-import java.io.IOException;
-import java.time.LocalDateTime;
-import java.time.ZonedDateTime;
-import java.time.ZoneOffset;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class ZonedDateTimeSerializer extends SimpleTypeSerializer<ZonedDateTime> {
- public ZonedDateTimeSerializer() {
- super(DataType.ZONEDATETIME);
- }
-
- @Override
- protected ZonedDateTime readValue(final Buffer buffer, final GraphBinaryReader context) throws IOException {
- final LocalDateTime ldt = context.readValue(buffer, LocalDateTime.class, false);
- final ZoneOffset zo = context.readValue(buffer, ZoneOffset.class, false);
- return ZonedDateTime.of(ldt, zo);
- }
-
- @Override
- protected void writeValue(final ZonedDateTime value, final Buffer buffer, final GraphBinaryWriter context) throws IOException {
- context.writeValue(value.toLocalDateTime(), buffer, false);
- context.writeValue(value.getOffset(), buffer, false);
- }
-}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLWriter.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLWriter.java
index 1314db7..84ebfbb 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLWriter.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLWriter.java
@@ -32,7 +32,7 @@
import javax.xml.stream.XMLOutputFactory;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.tinkerpop.gremlin.structure.Direction;
import org.apache.tinkerpop.gremlin.structure.Edge;
import org.apache.tinkerpop.gremlin.structure.Element;
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java
index 9e65594..2fb95a9 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java
@@ -84,7 +84,9 @@
@Override
public ObjectMapper createMapper() {
final ObjectMapper om = new ObjectMapper(JsonFactory.builder().streamReadConstraints(streamReadConstraints).build());
- om.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS);
+ if (version != GraphSONVersion.V4_0) {
+ om.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS);
+ }
final GraphSONModule graphSONModule = version.getBuilder().create(normalize, typeInfo);
om.registerModule(graphSONModule);
@@ -94,7 +96,8 @@
if (loadCustomSerializers)
om.findAndRegisterModules();
- if ((version == GraphSONVersion.V3_0 || version == GraphSONVersion.V2_0) && typeInfo != TypeInfo.NO_TYPES) {
+ if ((version == GraphSONVersion.V4_0 || version == GraphSONVersion.V3_0 || version == GraphSONVersion.V2_0) &&
+ typeInfo != TypeInfo.NO_TYPES) {
final GraphSONTypeIdResolver graphSONTypeIdResolver = new GraphSONTypeIdResolver();
final TypeResolverBuilder typer = new GraphSONTypeResolverBuilder(version)
.typesEmbedding(this.typeInfo)
@@ -134,15 +137,20 @@
.typeProperty(GraphSONTokens.CLASS);
om.setDefaultTyping(typer);
}
- } else if (version == GraphSONVersion.V3_0) {
+ } else if (version == GraphSONVersion.V3_0 || version == GraphSONVersion.V4_0) {
} else {
throw new IllegalStateException("Unknown GraphSONVersion: " + version);
}
- // this provider toStrings all unknown classes and converts keys in Map objects that are Object to String.
- final DefaultSerializerProvider provider = new GraphSONSerializerProvider(version);
- om.setSerializerProvider(provider);
+ // Starting with GraphSONv4, only types that can be returned from the result of a traversal are supported. This
+ // differs to previous versions where a gremlin-groovy script could return any type. So if an unknown type is
+ // encountered, an error should be thrown.
+ if (version != GraphSONVersion.V4_0) {
+ // this provider toStrings all unknown classes and converts keys in Map objects that are Object to String.
+ final DefaultSerializerProvider provider = new GraphSONSerializerProvider(version);
+ om.setSerializerProvider(provider);
+ }
if (normalize)
om.enable(SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS);
@@ -199,7 +207,7 @@
private boolean loadCustomModules = false;
private boolean normalize = false;
private List<IoRegistry> registries = new ArrayList<>();
- private GraphSONVersion version = GraphSONVersion.V3_0;
+ private GraphSONVersion version = GraphSONVersion.V4_0;
private boolean includeDefaultXModule = false;
private StreamReadConstraints.Builder streamReadConstraintsBuilder = StreamReadConstraints.builder()
.maxNumberLength(DEFAULT_MAX_NUMBER_LENGTH);
@@ -218,7 +226,7 @@
}
/**
- * Set the version of GraphSON to use. The default is {@link GraphSONVersion#V3_0}.
+ * Set the version of GraphSON to use. The default is {@link GraphSONVersion#V4_0}.
*/
public Builder version(final GraphSONVersion version) {
this.version = version;
@@ -253,7 +261,7 @@
}
/**
- * Supply a default extension module of V2_0 and V3_0 for serialization/deserialization.
+ * Supply a default extension module of V2_0, V3_0 and V4_0 for serialization/deserialization.
*/
public Builder addDefaultXModule(final boolean includeDefaultXModule) {
this.includeDefaultXModule = includeDefaultXModule;
@@ -321,6 +329,8 @@
this.addCustomModule(GraphSONXModuleV2.build().create(this.normalize, typeInfo));
} else if (this.version == GraphSONVersion.V3_0) {
this.addCustomModule(GraphSONXModuleV3.build().create(this.normalize, typeInfo));
+ } else if (this.version == GraphSONVersion.V4_0) {
+ this.addCustomModule(GraphSONXModuleV4.build().create(this.normalize, typeInfo));
}
}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java
index de1b871..7271c1e 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java
@@ -19,11 +19,7 @@
package org.apache.tinkerpop.gremlin.structure.io.graphson;
import org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.decoration.VertexProgramStrategy;
-import org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.finalization.ComputerFinalizationStrategy;
import org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.optimization.GraphFilterStrategy;
-import org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.optimization.MessagePassingReductionStrategy;
-import org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.verification.VertexProgramRestrictionStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
import org.apache.tinkerpop.gremlin.process.traversal.DT;
import org.apache.tinkerpop.gremlin.process.traversal.Merge;
import org.apache.tinkerpop.gremlin.process.traversal.N;
@@ -52,10 +48,9 @@
import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SeedStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SubgraphStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.finalization.MatchAlgorithmStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.finalization.ProfileStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.finalization.ReferenceElementStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.AdjacentToIncidentStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.ByModulatorOptimizationStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.CountStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.EarlyLimitStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.FilterRankingStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.IdentityRemovalStrategy;
@@ -66,7 +61,6 @@
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.OrderLimitStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.PathProcessorStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.PathRetractionStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.CountStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.ProductiveByStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.RepeatUnrollStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ComputerVerificationStrategy;
@@ -91,6 +85,7 @@
import org.apache.tinkerpop.gremlin.structure.util.star.StarGraphGraphSONSerializerV1;
import org.apache.tinkerpop.gremlin.structure.util.star.StarGraphGraphSONSerializerV2;
import org.apache.tinkerpop.gremlin.structure.util.star.StarGraphGraphSONSerializerV3;
+import org.apache.tinkerpop.gremlin.structure.util.star.StarGraphGraphSONSerializerV4;
import org.apache.tinkerpop.gremlin.util.function.Lambda;
import java.time.Duration;
@@ -144,6 +139,131 @@
}
/**
+ * Version 4.0 of GraphSON.
+ */
+ static final class GraphSONModuleV4 extends GraphSONModule {
+
+ private static final Map<Class, String> TYPE_DEFINITIONS = Collections.unmodifiableMap(
+ new LinkedHashMap<Class, String>() {{
+ // Those don't have deserializers because handled by Jackson,
+ // but we still want to rename them in GraphSON
+ put(Integer.class, "Int32");
+ put(Long.class, "Int64");
+ put(Double.class, "Double");
+ put(Float.class, "Float");
+
+ // BulkSet is expanded to List during serialization but we want the List deserializer to be
+ // registered to g:List so this entry must be added before List.
+ put(BulkSet.class, "List");
+
+ put(Map.class, "Map");
+ put(List.class, "List");
+ put(Set.class, "Set");
+
+ // TinkerPop Graph objects
+ put(Vertex.class, "Vertex");
+ put(Edge.class, "Edge");
+ put(Property.class, "Property");
+ put(Path.class, "Path");
+ put(VertexProperty.class, "VertexProperty");
+ put(Tree.class, "Tree");
+ Stream.of(
+ Direction.class,
+ Merge.class,
+ T.class).forEach(e -> put(e, e.getSimpleName()));
+ }});
+
+ /**
+ * Constructs a new object.
+ */
+ protected GraphSONModuleV4(final boolean normalize, final TypeInfo typeInfo) {
+ super("graphson-4.0");
+
+ /////////////////////// SERIALIZERS ////////////////////////////
+
+ // graph
+ addSerializer(Edge.class, new GraphSONSerializersV4.EdgeJacksonSerializer(normalize, typeInfo));
+ addSerializer(Vertex.class, new GraphSONSerializersV4.VertexJacksonSerializer(normalize, typeInfo));
+ addSerializer(VertexProperty.class, new GraphSONSerializersV4.VertexPropertyJacksonSerializer(normalize, true));
+ addSerializer(Property.class, new GraphSONSerializersV4.PropertyJacksonSerializer());
+ addSerializer(Path.class, new GraphSONSerializersV4.PathJacksonSerializer());
+ addSerializer(DirectionalStarGraph.class, new StarGraphGraphSONSerializerV4(normalize));
+ addSerializer(Tree.class, new GraphSONSerializersV4.TreeJacksonSerializer());
+
+ // java.util - use the standard jackson serializers for collections when types aren't embedded
+ if (typeInfo != TypeInfo.NO_TYPES) {
+ addSerializer(Map.Entry.class, new JavaUtilSerializersV4.MapEntryJacksonSerializer());
+ addSerializer(Map.class, new JavaUtilSerializersV4.MapJacksonSerializer());
+ addSerializer(List.class, new JavaUtilSerializersV4.ListJacksonSerializer());
+ addSerializer(Set.class, new JavaUtilSerializersV4.SetJacksonSerializer());
+ }
+
+ // need to explicitly add serializers for these types because Jackson doesn't do it at all.
+ addSerializer(Integer.class, new GraphSONSerializersV4.IntegerGraphSONSerializer());
+ addSerializer(Double.class, new GraphSONSerializersV4.DoubleGraphSONSerializer());
+
+ // traversal
+ addSerializer(BulkSet.class, new TraversalSerializersV4.BulkSetJacksonSerializer());
+ Stream.of(
+ Direction.class,
+ Merge.class,
+ T.class).forEach(e -> addSerializer(e, new TraversalSerializersV4.EnumJacksonSerializer()));
+
+ /////////////////////// DESERIALIZERS ////////////////////////////
+
+ // Tinkerpop Graph
+ addDeserializer(Vertex.class, new GraphSONSerializersV4.VertexJacksonDeserializer());
+ addDeserializer(Edge.class, new GraphSONSerializersV4.EdgeJacksonDeserializer());
+ addDeserializer(Property.class, new GraphSONSerializersV4.PropertyJacksonDeserializer());
+ addDeserializer(Path.class, new GraphSONSerializersV4.PathJacksonDeserializer());
+ addDeserializer(VertexProperty.class, new GraphSONSerializersV4.VertexPropertyJacksonDeserializer());
+ addDeserializer(Tree.class, new GraphSONSerializersV4.TreeJacksonDeserializer());
+
+ // java.util - use the standard jackson serializers for collections when types aren't embedded
+ if (typeInfo != TypeInfo.NO_TYPES) {
+ addDeserializer(Map.class, new JavaUtilSerializersV4.MapJacksonDeserializer());
+ addDeserializer(List.class, new JavaUtilSerializersV4.ListJacksonDeserializer());
+ addDeserializer(Set.class, new JavaUtilSerializersV4.SetJacksonDeserializer());
+ }
+
+ // numbers
+ addDeserializer(Integer.class, new GraphSONSerializersV4.IntegerJackonsDeserializer());
+ addDeserializer(Double.class, new GraphSONSerializersV4.DoubleJacksonDeserializer());
+
+ // traversal
+ Stream.of(
+ Direction.values(),
+ T.values()).flatMap(Stream::of).forEach(e -> addDeserializer(e.getClass(), new TraversalSerializersV4.EnumJacksonDeserializer(e.getDeclaringClass())));
+ }
+
+ public static Builder build() {
+ return new Builder();
+ }
+
+ @Override
+ public Map<Class, String> getTypeDefinitions() {
+ return TYPE_DEFINITIONS;
+ }
+
+ @Override
+ public String getTypeNamespace() {
+ return GraphSONTokens.GREMLIN_TYPE_NAMESPACE;
+ }
+
+ static final class Builder implements GraphSONModuleBuilder {
+
+ private Builder() {
+ }
+
+ @Override
+ public GraphSONModule create(final boolean normalize, final TypeInfo typeInfo) {
+ return new GraphSONModuleV4(normalize, typeInfo);
+ }
+
+ }
+ }
+
+ /**
* Version 3.0 of GraphSON.
*/
static final class GraphSONModuleV3 extends GraphSONModule {
@@ -174,8 +294,6 @@
put(Traverser.class, "Traverser");
put(Tree.class, "Tree");
put(BulkSet.class, "BulkSet");
- put(Bytecode.class, "Bytecode");
- put(Bytecode.Binding.class, "Binding");
put(AndP.class, "P");
put(OrP.class, "P");
put(NotP.class, "P");
@@ -227,11 +345,6 @@
EarlyLimitStrategy.class,
EdgeLabelVerificationStrategy.class,
ReservedKeysVerificationStrategy.class,
- ReferenceElementStrategy.class,
- ComputerFinalizationStrategy.class,
- MessagePassingReductionStrategy.class,
- ProfileStrategy.class,
- VertexProgramRestrictionStrategy.class,
//
GraphFilterStrategy.class,
VertexProgramStrategy.class
@@ -275,7 +388,6 @@
// traversal
addSerializer(BulkSet.class, new TraversalSerializersV3.BulkSetJacksonSerializer());
addSerializer(Traversal.class, new TraversalSerializersV3.TraversalJacksonSerializer());
- addSerializer(Bytecode.class, new TraversalSerializersV3.BytecodeJacksonSerializer());
Stream.of(VertexProperty.Cardinality.class,
Column.class,
Direction.class,
@@ -291,7 +403,6 @@
addSerializer(N.class, new TraversalSerializersV3.NJacksonSerializer());
addSerializer(P.class, new TraversalSerializersV3.PJacksonSerializer());
addSerializer(Lambda.class, new TraversalSerializersV3.LambdaJacksonSerializer());
- addSerializer(Bytecode.Binding.class, new TraversalSerializersV3.BindingJacksonSerializer());
addSerializer(Traverser.class, new TraversalSerializersV3.TraverserJacksonSerializer());
addSerializer(TraversalStrategy.class, new TraversalSerializersV3.TraversalStrategyJacksonSerializer());
@@ -322,8 +433,6 @@
// traversal
addDeserializer(BulkSet.class, new TraversalSerializersV3.BulkSetJacksonDeserializer());
- addDeserializer(Bytecode.class, new TraversalSerializersV3.BytecodeJacksonDeserializer());
- addDeserializer(Bytecode.Binding.class, new TraversalSerializersV3.BindingJacksonDeserializer());
Stream.of(VertexProperty.Cardinality.values(),
Column.values(),
Direction.values(),
@@ -372,11 +481,6 @@
EarlyLimitStrategy.class,
EdgeLabelVerificationStrategy.class,
ReservedKeysVerificationStrategy.class,
- ReferenceElementStrategy.class,
- ComputerFinalizationStrategy.class,
- MessagePassingReductionStrategy.class,
- ProfileStrategy.class,
- VertexProgramRestrictionStrategy.class,
//
GraphFilterStrategy.class,
VertexProgramStrategy.class
@@ -438,8 +542,6 @@
put(TraversalExplanation.class, "TraversalExplanation");
put(Traverser.class, "Traverser");
put(Tree.class, "Tree");
- put(Bytecode.class, "Bytecode");
- put(Bytecode.Binding.class, "Binding");
put(AndP.class, "P");
put(OrP.class, "P");
put(NotP.class, "P");
@@ -491,11 +593,6 @@
EarlyLimitStrategy.class,
EdgeLabelVerificationStrategy.class,
ReservedKeysVerificationStrategy.class,
- ReferenceElementStrategy.class,
- ComputerFinalizationStrategy.class,
- MessagePassingReductionStrategy.class,
- ProfileStrategy.class,
- VertexProgramRestrictionStrategy.class,
//
GraphFilterStrategy.class,
VertexProgramStrategy.class
@@ -533,7 +630,6 @@
// traversal
addSerializer(Traversal.class, new TraversalSerializersV2.TraversalJacksonSerializer());
- addSerializer(Bytecode.class, new TraversalSerializersV2.BytecodeJacksonSerializer());
Stream.of(VertexProperty.Cardinality.class,
Column.class,
Direction.class,
@@ -549,7 +645,6 @@
addSerializer(N.class, new TraversalSerializersV2.NJacksonSerializer());
addSerializer(P.class, new TraversalSerializersV2.PJacksonSerializer());
addSerializer(Lambda.class, new TraversalSerializersV2.LambdaJacksonSerializer());
- addSerializer(Bytecode.Binding.class, new TraversalSerializersV2.BindingJacksonSerializer());
addSerializer(Traverser.class, new TraversalSerializersV2.TraverserJacksonSerializer());
addSerializer(TraversalStrategy.class, new TraversalSerializersV2.TraversalStrategyJacksonSerializer());
@@ -572,8 +667,6 @@
addDeserializer(Double.class, new GraphSONSerializersV2.DoubleJacksonDeserializer());
// traversal
- addDeserializer(Bytecode.class, new TraversalSerializersV2.BytecodeJacksonDeserializer());
- addDeserializer(Bytecode.Binding.class, new TraversalSerializersV2.BindingJacksonDeserializer());
Stream.of(VertexProperty.Cardinality.values(),
Column.values(),
Direction.values(),
@@ -622,11 +715,6 @@
EarlyLimitStrategy.class,
EdgeLabelVerificationStrategy.class,
ReservedKeysVerificationStrategy.class,
- ReferenceElementStrategy.class,
- ComputerFinalizationStrategy.class,
- MessagePassingReductionStrategy.class,
- ProfileStrategy.class,
- VertexProgramRestrictionStrategy.class,
//
GraphFilterStrategy.class,
VertexProgramStrategy.class
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONReader.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONReader.java
index 7b5c812..937adce 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONReader.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONReader.java
@@ -177,7 +177,7 @@
final Direction attachEdgesOfThisDirection) throws IOException {
// graphson v3 has special handling for generic Map instances, by forcing to linkedhashmap (which is probably
// what it should have been anyway) stargraph format can remain unchanged across all versions
- final Map<String, Object> vertexData = version == GraphSONVersion.V3_0 ?
+ final Map<String, Object> vertexData = ((version == GraphSONVersion.V3_0) || (version == GraphSONVersion.V4_0)) ?
mapper.readValue(inputStream, linkedHashMapTypeReference) : mapper.readValue(inputStream, mapTypeReference);
final StarGraph starGraph = StarGraphGraphSONDeserializer.readStarGraphVertex(vertexData);
if (vertexAttachMethod != null) vertexAttachMethod.apply(starGraph.getStarVertex());
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV4.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV4.java
new file mode 100644
index 0000000..7bfff07
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV4.java
@@ -0,0 +1,650 @@
+/*
+ * 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.structure.io.graphson;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Path;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.MutablePath;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
+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 org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.structure.util.Comparators;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdge;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedProperty;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertexProperty;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerationException;
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
+import org.apache.tinkerpop.shaded.jackson.core.JsonParser;
+import org.apache.tinkerpop.shaded.jackson.core.JsonProcessingException;
+import org.apache.tinkerpop.shaded.jackson.core.JsonToken;
+import org.apache.tinkerpop.shaded.jackson.databind.DeserializationContext;
+import org.apache.tinkerpop.shaded.jackson.databind.JavaType;
+import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
+import org.apache.tinkerpop.shaded.jackson.databind.deser.std.StdDeserializer;
+import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
+import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdKeySerializer;
+import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdScalarSerializer;
+import org.apache.tinkerpop.shaded.jackson.databind.type.TypeFactory;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * GraphSON serializers for graph-based objects such as vertices, edges, properties, and paths. These serializers
+ * present a generalized way to serialize the implementations of core interfaces.
+ *
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+class GraphSONSerializersV4 {
+
+ private GraphSONSerializersV4() {
+ }
+
+ ////////////////////////////// SERIALIZERS /////////////////////////////////
+
+ final static class VertexJacksonSerializer extends StdScalarSerializer<Vertex> {
+
+ private final boolean normalize;
+ private final TypeInfo typeInfo;
+
+ public VertexJacksonSerializer(final boolean normalize, final TypeInfo typeInfo) {
+ super(Vertex.class);
+ this.normalize = normalize;
+ this.typeInfo = typeInfo;
+ }
+
+ @Override
+ public void serialize(final Vertex vertex, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+ throws IOException {
+ jsonGenerator.writeStartObject();
+
+ jsonGenerator.writeObjectField(GraphSONTokens.ID, vertex.id());
+ writeLabel(jsonGenerator, GraphSONTokens.LABEL, vertex.label());
+ writeTypeForGraphObjectIfUntyped(jsonGenerator, typeInfo, GraphSONTokens.VERTEX);
+ writeProperties(vertex, jsonGenerator, serializerProvider);
+
+ jsonGenerator.writeEndObject();
+
+ }
+
+ private void writeProperties(final Vertex vertex, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider) throws IOException {
+ if (vertex.keys().size() == 0)
+ return;
+ jsonGenerator.writeFieldName(GraphSONTokens.PROPERTIES);
+ jsonGenerator.writeStartObject();
+
+ final List<String> keys = normalize ?
+ IteratorUtils.list(vertex.keys().iterator(), Comparator.naturalOrder()) : new ArrayList<>(vertex.keys());
+ for (String key : keys) {
+ final Iterator<VertexProperty<Object>> vertexProperties = normalize ?
+ IteratorUtils.list(vertex.properties(key), Comparators.PROPERTY_COMPARATOR).iterator() : vertex.properties(key);
+ if (vertexProperties.hasNext()) {
+ jsonGenerator.writeFieldName(key);
+
+ jsonGenerator.writeStartArray();
+ while (vertexProperties.hasNext()) {
+ // if you writeObject the property directly it treats it as a standalone VertexProperty which
+ // will write the label duplicating it. we really only want that for embedded types
+ if (typeInfo == TypeInfo.NO_TYPES) {
+ VertexPropertyJacksonSerializer.writeVertexProperty(vertexProperties.next(), jsonGenerator,
+ serializerProvider, normalize, false);
+ } else {
+ jsonGenerator.writeObject(vertexProperties.next());
+ }
+ }
+ jsonGenerator.writeEndArray();
+ }
+ }
+
+ jsonGenerator.writeEndObject();
+ }
+ }
+
+ final static class EdgeJacksonSerializer extends StdScalarSerializer<Edge> {
+
+ private final boolean normalize;
+
+ private final TypeInfo typeInfo;
+
+ public EdgeJacksonSerializer(final boolean normalize, final TypeInfo typeInfo) {
+ super(Edge.class);
+ this.normalize = normalize;
+ this.typeInfo = typeInfo;
+ }
+
+
+ @Override
+ public void serialize(final Edge edge, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+ throws IOException {
+ jsonGenerator.writeStartObject();
+
+ jsonGenerator.writeObjectField(GraphSONTokens.ID, edge.id());
+ writeLabel(jsonGenerator, GraphSONTokens.LABEL, edge.label());
+ writeTypeForGraphObjectIfUntyped(jsonGenerator, typeInfo, GraphSONTokens.EDGE);
+ writeVertex(GraphSONTokens.IN, edge.inVertex(), jsonGenerator);
+ writeVertex(GraphSONTokens.OUT, edge.outVertex(), jsonGenerator);
+ writeProperties(edge, jsonGenerator);
+
+ jsonGenerator.writeEndObject();
+ }
+
+ private static void writeVertex(final String vertexDirection, final Vertex v, final JsonGenerator jsonGenerator)
+ throws IOException {
+ jsonGenerator.writeFieldName(vertexDirection);
+ jsonGenerator.writeStartObject();
+ jsonGenerator.writeObjectField(GraphSONTokens.ID, v.id());
+ writeLabel(jsonGenerator, GraphSONTokens.LABEL, v.label());
+ jsonGenerator.writeEndObject();
+ }
+
+ private void writeProperties(final Edge edge, final JsonGenerator jsonGenerator) throws IOException {
+ final Iterator<Property<Object>> elementProperties = normalize ?
+ IteratorUtils.list(edge.properties(), Comparators.PROPERTY_COMPARATOR).iterator() : edge.properties();
+
+ if (elementProperties.hasNext()) {
+ jsonGenerator.writeFieldName(GraphSONTokens.PROPERTIES);
+ jsonGenerator.writeStartObject();
+
+ while (elementProperties.hasNext()) {
+ final Property prop = elementProperties.next();
+ jsonGenerator.writeFieldName(prop.key());
+ jsonGenerator.writeStartArray();
+
+ if (typeInfo == TypeInfo.NO_TYPES) {
+ jsonGenerator.writeObject(prop.value());
+ } else {
+ jsonGenerator.writeObject(prop);
+ }
+
+ jsonGenerator.writeEndArray();
+ }
+ jsonGenerator.writeEndObject();
+ }
+ }
+ }
+
+ final static class PropertyJacksonSerializer extends StdScalarSerializer<Property> {
+
+ public PropertyJacksonSerializer() {
+ super(Property.class);
+ }
+
+ @Override
+ public void serialize(final Property property, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+ throws IOException {
+ jsonGenerator.writeStartObject();
+ jsonGenerator.writeObjectField(GraphSONTokens.KEY, property.key());
+ jsonGenerator.writeObjectField(GraphSONTokens.VALUE, property.value());
+ jsonGenerator.writeEndObject();
+ }
+ }
+
+ final static class VertexPropertyJacksonSerializer extends StdScalarSerializer<VertexProperty> {
+
+ private final boolean normalize;
+ private final boolean includeLabel;
+
+ public VertexPropertyJacksonSerializer(final boolean normalize, final boolean includeLabel) {
+ super(VertexProperty.class);
+ this.normalize = normalize;
+ this.includeLabel = includeLabel;
+ }
+
+ @Override
+ public void serialize(final VertexProperty property, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+ throws IOException {
+ writeVertexProperty(property, jsonGenerator, serializerProvider, normalize, includeLabel);
+ }
+
+ private static void writeVertexProperty(final VertexProperty property, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider, final boolean normalize,
+ final boolean includeLabel)
+ throws IOException {
+ jsonGenerator.writeStartObject();
+
+ jsonGenerator.writeObjectField(GraphSONTokens.ID, property.id());
+ jsonGenerator.writeObjectField(GraphSONTokens.VALUE, property.value());
+ if (includeLabel) {
+ writeLabel(jsonGenerator, GraphSONTokens.LABEL, property.label());
+ }
+ tryWriteMetaProperties(property, jsonGenerator, normalize);
+
+ jsonGenerator.writeEndObject();
+ }
+
+ private static void tryWriteMetaProperties(final VertexProperty property, final JsonGenerator jsonGenerator,
+ final boolean normalize) throws IOException {
+ // when "detached" you can't check features of the graph it detached from so it has to be
+ // treated differently from a regular VertexProperty implementation.
+ if (property instanceof DetachedVertexProperty) {
+ // only write meta properties key if they exist
+ if (property.properties().hasNext()) {
+ writeMetaProperties(property, jsonGenerator, normalize);
+ }
+ } else {
+ // still attached - so we can check the features to see if it's worth even trying to write the
+ // meta properties key
+ if (property.graph().features().vertex().supportsMetaProperties() && property.properties().hasNext()) {
+ writeMetaProperties(property, jsonGenerator, normalize);
+ }
+ }
+ }
+
+ private static void writeMetaProperties(final VertexProperty property, final JsonGenerator jsonGenerator,
+ final boolean normalize) throws IOException {
+ jsonGenerator.writeFieldName(GraphSONTokens.PROPERTIES);
+ jsonGenerator.writeStartObject();
+
+ final Iterator<Property<Object>> metaProperties = normalize ?
+ IteratorUtils.list((Iterator<Property<Object>>) property.properties(), Comparators.PROPERTY_COMPARATOR).iterator() : property.properties();
+ while (metaProperties.hasNext()) {
+ final Property<Object> metaProperty = metaProperties.next();
+ jsonGenerator.writeObjectField(metaProperty.key(), metaProperty.value());
+ }
+
+ jsonGenerator.writeEndObject();
+ }
+ }
+
+ final static class PathJacksonSerializer extends StdScalarSerializer<Path> {
+
+ public PathJacksonSerializer() {
+ super(Path.class);
+ }
+
+ @Override
+ public void serialize(final Path path, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+ throws IOException, JsonGenerationException {
+ jsonGenerator.writeStartObject();
+
+ // prior to 3.7.5, the code was such that:
+ // paths shouldn't serialize with properties if the path contains graph elements
+ //
+ // however, there was the idea that v3 untyped should essentially match v1 which does include the
+ // properties. as of 3.7.5, we remove detachment to references and allow users to control the inclusion
+ // or exclusion of properties with the materializeProperties option.
+ jsonGenerator.writeObjectField(GraphSONTokens.LABELS, path.labels());
+ jsonGenerator.writeObjectField(GraphSONTokens.OBJECTS, path.objects());
+
+ jsonGenerator.writeEndObject();
+ }
+ }
+
+ final static class TreeJacksonSerializer extends StdScalarSerializer<Tree> {
+
+ public TreeJacksonSerializer() {
+ super(Tree.class);
+ }
+
+ @Override
+ public void serialize(final Tree tree, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider) throws IOException, JsonGenerationException {
+ jsonGenerator.writeStartArray();
+ final Set<Map.Entry<Element, Tree>> set = tree.entrySet();
+ for (Map.Entry<Element, Tree> entry : set) {
+ jsonGenerator.writeStartObject();
+ jsonGenerator.writeObjectField(GraphSONTokens.KEY, entry.getKey());
+ jsonGenerator.writeObjectField(GraphSONTokens.VALUE, entry.getValue());
+ jsonGenerator.writeEndObject();
+ }
+ jsonGenerator.writeEndArray();
+ }
+ }
+
+ final static class IntegerGraphSONSerializer extends StdScalarSerializer<Integer> {
+ public IntegerGraphSONSerializer() {
+ super(Integer.class);
+ }
+
+ @Override
+ public void serialize(final Integer integer, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider) throws IOException {
+ jsonGenerator.writeNumber(((Integer) integer).intValue());
+ }
+ }
+
+ final static class DoubleGraphSONSerializer extends StdScalarSerializer<Double> {
+ public DoubleGraphSONSerializer() {
+ super(Double.class);
+ }
+
+ @Override
+ public void serialize(final Double doubleValue, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider) throws IOException {
+ jsonGenerator.writeNumber(doubleValue);
+ }
+ }
+
+ /**
+ * Maps in the JVM can have {@link Object} as a key, but in JSON they must be a {@link String}.
+ */
+ final static class GraphSONKeySerializer extends StdKeySerializer {
+
+ @Override
+ public void serialize(final Object o, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider) throws IOException {
+ ser(o, jsonGenerator, serializerProvider);
+ }
+
+ @Override
+ public void serializeWithType(final Object o, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
+ ser(o, jsonGenerator, serializerProvider);
+ }
+
+ private void ser(final Object o, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider) throws IOException {
+ if (Element.class.isAssignableFrom(o.getClass()))
+ jsonGenerator.writeFieldName((((Element) o).id()).toString());
+ else
+ super.serialize(o, jsonGenerator, serializerProvider);
+ }
+ }
+
+
+ //////////////////////////// DESERIALIZERS ///////////////////////////
+
+ static class VertexJacksonDeserializer extends StdDeserializer<Vertex> {
+
+ public VertexJacksonDeserializer() {
+ super(Vertex.class);
+ }
+
+ public Vertex deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+ final DetachedVertex.Builder v = DetachedVertex.build();
+ while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
+ if (jsonParser.getCurrentName().equals(GraphSONTokens.ID)) {
+ jsonParser.nextToken();
+ v.setId(deserializationContext.readValue(jsonParser, Object.class));
+ } else if (jsonParser.getCurrentName().equals(GraphSONTokens.LABEL)) {
+ jsonParser.nextToken();
+ while (jsonParser.nextToken() != JsonToken.END_ARRAY) {
+ v.setLabel(jsonParser.getText());
+ }
+ } else if (jsonParser.getCurrentName().equals(GraphSONTokens.PROPERTIES)) {
+ jsonParser.nextToken();
+ while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
+ jsonParser.nextToken();
+ while (jsonParser.nextToken() != JsonToken.END_ARRAY) {
+ v.addProperty((DetachedVertexProperty) deserializationContext.readValue(jsonParser, VertexProperty.class));
+ }
+ }
+ }
+ }
+
+ return v.create();
+ }
+
+ @Override
+ public boolean isCachable() {
+ return true;
+ }
+ }
+
+ static class EdgeJacksonDeserializer extends StdDeserializer<Edge> {
+
+ public EdgeJacksonDeserializer() {
+ super(Edge.class);
+ }
+
+ @Override
+ public Edge deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+ final DetachedEdge.Builder e = DetachedEdge.build();
+ while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
+ if (jsonParser.getCurrentName().equals(GraphSONTokens.ID)) {
+ jsonParser.nextToken();
+ e.setId(deserializationContext.readValue(jsonParser, Object.class));
+ } else if (jsonParser.getCurrentName().equals(GraphSONTokens.LABEL)) {
+ jsonParser.nextToken();
+ while (jsonParser.nextToken() != JsonToken.END_ARRAY) {
+ e.setLabel(jsonParser.getText());
+ }
+ } else if (jsonParser.getCurrentName().equals(GraphSONTokens.OUT)) {
+ jsonParser.nextToken();
+ e.setOutV((DetachedVertex) deserializationContext.readValue(jsonParser, Vertex.class));
+ } else if (jsonParser.getCurrentName().equals(GraphSONTokens.IN)) {
+ jsonParser.nextToken();
+ e.setInV((DetachedVertex) deserializationContext.readValue(jsonParser, Vertex.class));
+ } else if (jsonParser.getCurrentName().equals(GraphSONTokens.PROPERTIES)) {
+ jsonParser.nextToken();
+ while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
+ jsonParser.nextToken();
+ while (jsonParser.nextToken() != JsonToken.END_ARRAY) {
+ e.addProperty(deserializationContext.readValue(jsonParser, Property.class));
+ }
+ }
+ }
+ }
+
+ return e.create();
+ }
+
+ @Override
+ public boolean isCachable() {
+ return true;
+ }
+ }
+
+ static class PropertyJacksonDeserializer extends StdDeserializer<Property> {
+
+ public PropertyJacksonDeserializer() {
+ super(Property.class);
+ }
+
+ @Override
+ public Property deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+ String key = null;
+ Object value = null;
+ while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
+ if (jsonParser.getCurrentName().equals(GraphSONTokens.KEY)) {
+ jsonParser.nextToken();
+ key = jsonParser.getText();
+ } else if (jsonParser.getCurrentName().equals(GraphSONTokens.VALUE)) {
+ jsonParser.nextToken();
+ value = deserializationContext.readValue(jsonParser, Object.class);
+ }
+ }
+
+ return new DetachedProperty<>(key, value);
+ }
+
+ @Override
+ public boolean isCachable() {
+ return true;
+ }
+ }
+
+ static class PathJacksonDeserializer extends StdDeserializer<Path> {
+ private static final JavaType setType = TypeFactory.defaultInstance().constructCollectionType(HashSet.class, String.class);
+
+ public PathJacksonDeserializer() {
+ super(Path.class);
+ }
+
+ @Override
+ public Path deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+ final Path p = MutablePath.make();
+
+ List<Object> labels = new ArrayList<>();
+ List<Object> objects = new ArrayList<>();
+ while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
+ if (jsonParser.getCurrentName().equals(GraphSONTokens.LABELS)) {
+ jsonParser.nextToken();
+ labels = deserializationContext.readValue(jsonParser, List.class);
+ } else if (jsonParser.getCurrentName().equals(GraphSONTokens.OBJECTS)) {
+ jsonParser.nextToken();
+ objects = deserializationContext.readValue(jsonParser, List.class);
+ }
+ }
+
+ for (int i = 0; i < objects.size(); i++) {
+ p.extend(objects.get(i), (Set<String>) labels.get(i));
+ }
+
+ return p;
+ }
+
+ @Override
+ public boolean isCachable() {
+ return true;
+ }
+ }
+
+ static class VertexPropertyJacksonDeserializer extends StdDeserializer<VertexProperty> {
+ private static final JavaType propertiesType = TypeFactory.defaultInstance().constructMapType(HashMap.class, String.class, Object.class);
+
+ protected VertexPropertyJacksonDeserializer() {
+ super(VertexProperty.class);
+ }
+
+ @Override
+ public VertexProperty deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+ final DetachedVertexProperty.Builder vp = DetachedVertexProperty.build();
+
+ while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
+ if (jsonParser.getCurrentName().equals(GraphSONTokens.ID)) {
+ jsonParser.nextToken();
+ vp.setId(deserializationContext.readValue(jsonParser, Object.class));
+ } else if (jsonParser.getCurrentName().equals(GraphSONTokens.LABEL)) {
+ jsonParser.nextToken();
+ while (jsonParser.nextToken() != JsonToken.END_ARRAY) {
+ vp.setLabel(jsonParser.getText());
+ }
+ } else if (jsonParser.getCurrentName().equals(GraphSONTokens.VALUE)) {
+ jsonParser.nextToken();
+ vp.setValue(deserializationContext.readValue(jsonParser, Object.class));
+ } else if (jsonParser.getCurrentName().equals(GraphSONTokens.PROPERTIES)) {
+ jsonParser.nextToken();
+ while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
+ final String key = jsonParser.getCurrentName();
+ jsonParser.nextToken();
+ final Object val = deserializationContext.readValue(jsonParser, Object.class);
+ vp.addProperty(new DetachedProperty(key, val));
+ }
+ }
+ }
+
+ return vp.create();
+ }
+
+ @Override
+ public boolean isCachable() {
+ return true;
+ }
+ }
+
+ static class TreeJacksonDeserializer extends StdDeserializer<Tree> {
+
+ public TreeJacksonDeserializer() {
+ super(Tree.class);
+ }
+
+ @Override
+ public Tree deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+ final List<Map> data = deserializationContext.readValue(jsonParser, List.class);
+ final Tree t = new Tree();
+ for (Map<String, Object> entry : data) {
+ t.put(entry.get(GraphSONTokens.KEY), entry.get(GraphSONTokens.VALUE));
+ }
+ return t;
+ }
+
+ @Override
+ public boolean isCachable() {
+ return true;
+ }
+ }
+
+ static class IntegerJackonsDeserializer extends StdDeserializer<Integer> {
+
+ protected IntegerJackonsDeserializer() {
+ super(Integer.class);
+ }
+
+ @Override
+ public Integer deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+ return jsonParser.getIntValue();
+ }
+
+ @Override
+ public boolean isCachable() {
+ return true;
+ }
+ }
+
+ static class DoubleJacksonDeserializer extends StdDeserializer<Double> {
+
+ protected DoubleJacksonDeserializer() {
+ super(Double.class);
+ }
+
+ @Override
+ public Double deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+ if (jsonParser.getCurrentToken().isNumeric())
+ return jsonParser.getDoubleValue();
+ else {
+ final String numberText = jsonParser.getValueAsString();
+ if ("NaN".equalsIgnoreCase(numberText))
+ return Double.NaN;
+ else if ("-Infinity".equals(numberText) || "-INF".equalsIgnoreCase(numberText))
+ return Double.NEGATIVE_INFINITY;
+ else if ("Infinity".equals(numberText) || "INF".equals(numberText))
+ return Double.POSITIVE_INFINITY;
+ else
+ throw new IllegalStateException("Double value unexpected: " + numberText);
+ }
+
+ }
+
+ @Override
+ public boolean isCachable() {
+ return true;
+ }
+ }
+
+ /**
+ * When doing untyped serialization graph objects get a special "type" field appended.
+ */
+ private static void writeTypeForGraphObjectIfUntyped(final JsonGenerator jsonGenerator, final TypeInfo typeInfo,
+ final String type) throws IOException {
+ if (typeInfo == TypeInfo.NO_TYPES) {
+ jsonGenerator.writeStringField(GraphSONTokens.TYPE, type);
+ }
+ }
+
+ /**
+ * Helper method for writing a label. Starting in v4, the label is an array of String that is inside an object. Only
+ * writes the array portion; that is, it assumes the object has already started.
+ */
+ private static void writeLabel(final JsonGenerator jsonGenerator, final String labelName, final String labelValue) throws IOException {
+ jsonGenerator.writeFieldName(labelName);
+ jsonGenerator.writeStartArray();
+ jsonGenerator.writeString(labelValue);
+ jsonGenerator.writeEndArray();
+ }
+}
\ No newline at end of file
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeDeserializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeDeserializer.java
index 082395a..9e8248f 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeDeserializer.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeDeserializer.java
@@ -149,7 +149,6 @@
localCopy.copyCurrentStructure(jsonParser);
}
valueDetected = true;
- continue;
}
}
@@ -196,7 +195,7 @@
}
}
} catch (Exception e) {
- throw deserializationContext.mappingException("Could not deserialize the JSON value as required. Nested exception: " + e.toString());
+ throw deserializationContext.mappingException("Could not deserialize the JSON value as required. Nested exception: " + e);
}
// Type pattern wasn't detected, however,
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeResolverBuilder.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeResolverBuilder.java
index 97bf71e..bfd9ece 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeResolverBuilder.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeResolverBuilder.java
@@ -61,9 +61,15 @@
public TypeSerializer buildTypeSerializer(final SerializationConfig config, final JavaType baseType,
final Collection<NamedType> subtypes) {
final TypeIdResolver idRes = this.idResolver(config, baseType, typeValidator, subtypes, true, false);
- return version == GraphSONVersion.V2_0 ?
- new GraphSONTypeSerializerV2(idRes, this.getTypeProperty(), typeInfo, valuePropertyName) :
- new GraphSONTypeSerializerV3(idRes, this.getTypeProperty(), typeInfo, valuePropertyName);
+ switch (version) {
+ case V2_0:
+ return new GraphSONTypeSerializerV2(idRes, this.getTypeProperty(), typeInfo, valuePropertyName);
+ case V3_0:
+ return new GraphSONTypeSerializerV3(idRes, this.getTypeProperty(), typeInfo, valuePropertyName);
+ case V4_0:
+ default:
+ return new GraphSONTypeSerializerV4(idRes, this.getTypeProperty(), typeInfo, valuePropertyName);
+ }
}
public GraphSONTypeResolverBuilder valuePropertyName(final String valuePropertyName) {
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV4.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV4.java
new file mode 100644
index 0000000..a6ba23b
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV4.java
@@ -0,0 +1,178 @@
+/*
+ * 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.structure.io.graphson;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Operator;
+import org.apache.tinkerpop.gremlin.process.traversal.Order;
+import org.apache.tinkerpop.gremlin.process.traversal.Path;
+import org.apache.tinkerpop.gremlin.process.traversal.Pick;
+import org.apache.tinkerpop.gremlin.process.traversal.Pop;
+import org.apache.tinkerpop.gremlin.process.traversal.SackFunctions;
+import org.apache.tinkerpop.gremlin.process.traversal.Scope;
+import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.BulkSet;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
+import org.apache.tinkerpop.gremlin.process.traversal.util.Metrics;
+import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics;
+import org.apache.tinkerpop.gremlin.structure.Column;
+import org.apache.tinkerpop.gremlin.structure.Direction;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Property;
+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.function.Lambda;
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
+import org.apache.tinkerpop.shaded.jackson.core.JsonToken;
+import org.apache.tinkerpop.shaded.jackson.core.type.WritableTypeId;
+import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeIdResolver;
+
+import java.io.IOException;
+import java.net.InetAddress;
+import java.nio.ByteBuffer;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * GraphSON 4.0 {@code TypeSerializer}.
+ *
+ * @author Kevin Gallardo (https://kgdo.me)
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public class GraphSONTypeSerializerV4 extends AbstractGraphSONTypeSerializer {
+
+ GraphSONTypeSerializerV4(final TypeIdResolver idRes, final String propertyName, final TypeInfo typeInfo,
+ final String valuePropertyName) {
+ super(idRes, propertyName, typeInfo, valuePropertyName);
+ }
+
+ @Override
+ public WritableTypeId writeTypePrefix(final JsonGenerator jsonGenerator, final WritableTypeId writableTypeId) throws IOException {
+ if (writableTypeId.valueShape == JsonToken.START_OBJECT) {
+ if (writableTypeId.forValue instanceof Map) {
+ writeTypePrefix(jsonGenerator, getTypeIdResolver().idFromValueAndType(writableTypeId.forValue, getClassFromObject(writableTypeId.forValue)));
+ jsonGenerator.writeStartArray();
+ } else {
+ jsonGenerator.writeStartObject();
+ }
+ } else if (writableTypeId.valueShape == JsonToken.START_ARRAY) {
+ if (writableTypeId.forValue instanceof List || writableTypeId.forValue instanceof Set) {
+ writeTypePrefix(jsonGenerator, getTypeIdResolver().idFromValueAndType(writableTypeId.forValue, getClassFromObject(writableTypeId.forValue)));
+ jsonGenerator.writeStartArray();
+ } else {
+ jsonGenerator.writeStartArray();
+ }
+ } else if (canWriteTypeId()) {
+ writeTypePrefix(jsonGenerator, getTypeIdResolver().idFromValueAndType(writableTypeId.forValue, getClassFromObject(writableTypeId.forValue)));
+ } else {
+ throw new IllegalStateException("Could not write prefix: shape[" + writableTypeId.valueShape + "] value[" + writableTypeId.forValue + "]");
+ }
+
+ return writableTypeId;
+ }
+
+ @Override
+ public WritableTypeId writeTypeSuffix(final JsonGenerator jsonGenerator, final WritableTypeId writableTypeId) throws IOException {
+ if (writableTypeId.valueShape == JsonToken.START_OBJECT) {
+ if (writableTypeId.forValue instanceof Map) {
+ jsonGenerator.writeEndArray();
+ writeTypeSuffix(jsonGenerator);
+ } else {
+ jsonGenerator.writeEndObject();
+ }
+ } else if (writableTypeId.valueShape == JsonToken.START_ARRAY) {
+ if (writableTypeId.forValue instanceof List || writableTypeId.forValue instanceof Set) {
+ jsonGenerator.writeEndArray();
+ writeTypeSuffix(jsonGenerator);
+ } else {
+ jsonGenerator.writeEndArray();
+ }
+ } else if (canWriteTypeId()) {
+ writeTypeSuffix(jsonGenerator);
+ } else {
+ throw new IllegalStateException("Could not write suffix: shape[" + writableTypeId.valueShape + "] value[" + writableTypeId.forValue + "]");
+ }
+
+ return writableTypeId;
+ }
+
+ @Override
+ protected Class getClassFromObject(final Object o) {
+ final Class c = o.getClass();
+ if (classMap.containsKey(c))
+ return classMap.get(c);
+
+ final Class mapped;
+ if (Map.class.isAssignableFrom(c)) {
+ if (Tree.class.isAssignableFrom(c))
+ mapped = Tree.class;
+ else
+ mapped = Map.class;
+ } else if (List.class.isAssignableFrom(c))
+ mapped = List.class;
+ else if (Set.class.isAssignableFrom(c) && !BulkSet.class.isAssignableFrom(c)) // we have special handling of BulkSet
+ mapped = Set.class;
+ else if (Vertex.class.isAssignableFrom(c))
+ mapped = Vertex.class;
+ else if (Edge.class.isAssignableFrom(c))
+ mapped = Edge.class;
+ else if (Path.class.isAssignableFrom(c))
+ mapped = Path.class;
+ else if (VertexProperty.class.isAssignableFrom(c))
+ mapped = VertexProperty.class;
+ else if (Metrics.class.isAssignableFrom(c))
+ mapped = Metrics.class;
+ else if (TraversalMetrics.class.isAssignableFrom(c))
+ mapped = TraversalMetrics.class;
+ else if (Property.class.isAssignableFrom(c))
+ mapped = Property.class;
+ else if (ByteBuffer.class.isAssignableFrom(c))
+ mapped = ByteBuffer.class;
+ else if (InetAddress.class.isAssignableFrom(c))
+ mapped = InetAddress.class;
+ else if (Lambda.class.isAssignableFrom(c))
+ mapped = Lambda.class;
+ else if (VertexProperty.Cardinality.class.isAssignableFrom(c))
+ mapped = VertexProperty.Cardinality.class;
+ else if (Column.class.isAssignableFrom(c))
+ mapped = Column.class;
+ else if (Direction.class.isAssignableFrom(c))
+ mapped = Direction.class;
+ else if (Operator.class.isAssignableFrom(c))
+ mapped = Operator.class;
+ else if (Order.class.isAssignableFrom(c))
+ mapped = Order.class;
+ else if (Pop.class.isAssignableFrom(c))
+ mapped = Pop.class;
+ else if (SackFunctions.Barrier.class.isAssignableFrom(c))
+ mapped = SackFunctions.Barrier.class;
+ else if (Pick.class.isAssignableFrom(c))
+ mapped = Pick.class;
+ else if (Scope.class.isAssignableFrom(c))
+ mapped = Scope.class;
+ else if (T.class.isAssignableFrom(c))
+ mapped = T.class;
+ else
+ mapped = c;
+
+ classMap.put(c, mapped);
+ return mapped;
+ }
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONVersion.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONVersion.java
index 9738496..09cfb69 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONVersion.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONVersion.java
@@ -26,7 +26,8 @@
public enum GraphSONVersion {
V1_0(GraphSONModule.GraphSONModuleV1.build(), "1.0"),
V2_0(GraphSONModule.GraphSONModuleV2.build(), "2.0"),
- V3_0(GraphSONModule.GraphSONModuleV3.build(), "3.0");
+ V3_0(GraphSONModule.GraphSONModuleV3.build(), "3.0"),
+ V4_0(GraphSONModule.GraphSONModuleV4.build(), "4.0");
private final GraphSONModule.GraphSONModuleBuilder builder;
private final String versionNumber;
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONXModuleV4.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONXModuleV4.java
new file mode 100644
index 0000000..dfceb7a
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONXModuleV4.java
@@ -0,0 +1,106 @@
+/*
+ * 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.structure.io.graphson;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.net.InetAddress;
+import java.nio.ByteBuffer;
+import java.time.Duration;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.MonthDay;
+import java.time.OffsetDateTime;
+import java.time.OffsetTime;
+import java.time.Period;
+import java.time.Year;
+import java.time.YearMonth;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * Version 4.0 of GraphSON extensions.
+ *
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public final class GraphSONXModuleV4 extends GraphSONModule {
+
+ private static final Map<Class, String> TYPE_DEFINITIONS = Collections.unmodifiableMap(
+ new LinkedHashMap<Class, String>() {{
+ put(ByteBuffer.class, "Binary");
+ put(Short.class, "Int16");
+ put(BigInteger.class, "BigInteger");
+ put(BigDecimal.class, "BigDecimal");
+ put(Byte.class, "Byte");
+ put(Character.class, "Char");
+
+ // Time serializers/deserializers
+ put(Duration.class, "Duration");
+ put(OffsetDateTime.class, "DateTime");
+ }});
+
+ /**
+ * Constructs a new object.
+ */
+ protected GraphSONXModuleV4(final boolean normalize) {
+ super("graphsonx-4.0");
+
+ /////////////////////// SERIALIZERS ////////////////////////////
+
+ // java.time
+ addSerializer(Duration.class, new JavaTimeSerializersV4.DurationJacksonSerializer());
+ addSerializer(OffsetDateTime.class, new JavaTimeSerializersV4.OffsetDateTimeJacksonSerializer());
+
+ /////////////////////// DESERIALIZERS ////////////////////////////
+
+ // java.time
+ addDeserializer(Duration.class, new JavaTimeSerializersV4.DurationJacksonDeserializer());
+ addDeserializer(OffsetDateTime.class, new JavaTimeSerializersV4.OffsetDateTimeJacksonDeserializer());
+ }
+
+ public static GraphSONModuleBuilder build() {
+ return new Builder();
+ }
+
+ @Override
+ public Map<Class, String> getTypeDefinitions() {
+ return TYPE_DEFINITIONS;
+ }
+
+ @Override
+ public String getTypeNamespace() {
+ return GraphSONTokens.GREMLIN_TYPE_NAMESPACE;
+ }
+
+ public static final class Builder implements GraphSONModuleBuilder {
+
+ private Builder() {
+ }
+
+ @Override
+ public GraphSONModule create(final boolean normalize, final TypeInfo typeInfo) {
+ return new GraphSONXModuleV4(normalize);
+ }
+ }
+}
\ No newline at end of file
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaTimeSerializersV4.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaTimeSerializersV4.java
new file mode 100644
index 0000000..1a1633d
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaTimeSerializersV4.java
@@ -0,0 +1,130 @@
+/*
+ * 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.structure.io.graphson;
+
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
+import org.apache.tinkerpop.shaded.jackson.core.JsonParser;
+import org.apache.tinkerpop.shaded.jackson.databind.DeserializationContext;
+import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
+import org.apache.tinkerpop.shaded.jackson.databind.deser.std.StdDeserializer;
+import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
+import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
+
+import java.io.IOException;
+import java.time.Duration;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.MonthDay;
+import java.time.OffsetDateTime;
+import java.time.OffsetTime;
+import java.time.Period;
+import java.time.Year;
+import java.time.YearMonth;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+
+/**
+ * GraphSON serializers for classes in {@code java.time.*} for the version 4.0 of GraphSON.
+ */
+final class JavaTimeSerializersV4 {
+
+ private JavaTimeSerializersV4() {}
+
+ /**
+ * Base class for serializing the {@code java.time.*} to ISO-8061 formats.
+ */
+ static abstract class AbstractJavaTimeSerializer<T> extends StdSerializer<T> {
+
+ public AbstractJavaTimeSerializer(final Class<T> clazz) {
+ super(clazz);
+ }
+
+ @Override
+ public void serialize(final T value, final JsonGenerator gen,
+ final SerializerProvider serializerProvider) throws IOException {
+ gen.writeString(value.toString());
+ }
+
+ @Override
+ public void serializeWithType(final T value, final JsonGenerator gen,
+ final SerializerProvider serializers, final TypeSerializer typeSer) throws IOException {
+ typeSer.writeTypePrefixForScalar(value, gen);
+ gen.writeString(value.toString());
+ typeSer.writeTypeSuffixForScalar(value, gen);
+ }
+ }
+ /**
+ * Base class for serializing the {@code java.time.*} from ISO-8061 formats.
+ */
+ abstract static class AbstractJavaTimeJacksonDeserializer<T> extends StdDeserializer<T> {
+ public AbstractJavaTimeJacksonDeserializer(final Class<T> clazz) {
+ super(clazz);
+ }
+
+ public abstract T parse(final String val);
+
+ @Override
+ public T deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException {
+ return parse(jsonParser.getText());
+ }
+
+ @Override
+ public boolean isCachable() {
+ return true;
+ }
+ }
+
+ final static class DurationJacksonSerializer extends AbstractJavaTimeSerializer<Duration> {
+
+ public DurationJacksonSerializer() {
+ super(Duration.class);
+ }
+ }
+
+ final static class DurationJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<Duration> {
+ public DurationJacksonDeserializer() {
+ super(Duration.class);
+ }
+
+ @Override
+ public Duration parse(final String val) {
+ return Duration.parse(val);
+ }
+ }
+
+ final static class OffsetDateTimeJacksonSerializer extends AbstractJavaTimeSerializer<OffsetDateTime> {
+
+ public OffsetDateTimeJacksonSerializer() {
+ super(OffsetDateTime.class);
+ }
+ }
+
+ final static class OffsetDateTimeJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<OffsetDateTime> {
+ public OffsetDateTimeJacksonDeserializer() {
+ super(OffsetDateTime.class);
+ }
+
+ @Override
+ public OffsetDateTime parse(final String val) {
+ return OffsetDateTime.parse(val);
+ }
+ }
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaUtilSerializersV4.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaUtilSerializersV4.java
new file mode 100644
index 0000000..03900e4
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaUtilSerializersV4.java
@@ -0,0 +1,199 @@
+/*
+ * 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.structure.io.graphson;
+
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
+import org.apache.tinkerpop.shaded.jackson.core.JsonParser;
+import org.apache.tinkerpop.shaded.jackson.core.JsonProcessingException;
+import org.apache.tinkerpop.shaded.jackson.core.JsonToken;
+import org.apache.tinkerpop.shaded.jackson.databind.DeserializationContext;
+import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
+import org.apache.tinkerpop.shaded.jackson.databind.deser.std.StdDeserializer;
+import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
+import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * GraphSON serializers for classes in {@code java.util.*} for the version 4.0 of GraphSON.
+ */
+final class JavaUtilSerializersV4 {
+
+ private JavaUtilSerializersV4() {}
+
+ ////////////////////////////// SERIALIZERS /////////////////////////////////
+
+ final static class MapJacksonSerializer extends StdSerializer<Map> {
+ public MapJacksonSerializer() {
+ super(Map.class);
+ }
+
+ @Override
+ public void serialize(final Map map, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+ throws IOException {
+ for(Map.Entry entry : (Set<Map.Entry>) map.entrySet()) {
+ jsonGenerator.writeObject(entry.getKey());
+ jsonGenerator.writeObject(entry.getValue());
+ }
+ }
+
+ @Override
+ public void serializeWithType(final Map map, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
+ typeSerializer.writeTypePrefixForObject(map, jsonGenerator);
+ serialize(map, jsonGenerator, serializerProvider);
+ typeSerializer.writeTypeSuffixForObject(map, jsonGenerator);
+ }
+ }
+
+ /**
+ * Coerces {@code Map.Entry} to a {@code Map} with a single entry in it.
+ */
+ final static class MapEntryJacksonSerializer extends StdSerializer<Map.Entry> {
+
+ public MapEntryJacksonSerializer() {
+ super(Map.Entry.class);
+ }
+
+ @Override
+ public void serialize(final Map.Entry entry, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+ throws IOException {
+ final Map<Object,Object> m = new HashMap<>();
+ if (entry != null) m.put(entry.getKey(), entry.getValue());
+ jsonGenerator.writeObject(m);
+ }
+
+ @Override
+ public void serializeWithType(final Map.Entry entry, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
+ serialize(entry, jsonGenerator, serializerProvider);
+ }
+ }
+
+ final static class SetJacksonSerializer extends StdSerializer<Set> {
+ public SetJacksonSerializer() {
+ super(Set.class);
+ }
+
+ @Override
+ public void serialize(final Set set, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+ throws IOException {
+ for(Object o : set) {
+ jsonGenerator.writeObject(o);
+ }
+ }
+
+ @Override
+ public void serializeWithType(final Set set, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
+ typeSerializer.writeTypePrefixForArray(set, jsonGenerator);
+ serialize(set, jsonGenerator, serializerProvider);
+ typeSerializer.writeTypeSuffixForArray(set, jsonGenerator);
+ }
+ }
+
+ final static class ListJacksonSerializer extends StdSerializer<List> {
+ public ListJacksonSerializer() {
+ super(List.class);
+ }
+
+ @Override
+ public void serialize(final List list, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+ throws IOException {
+ for(Object o : list) {
+ jsonGenerator.writeObject(o);
+ }
+ }
+
+ @Override
+ public void serializeWithType(final List list, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
+ typeSerializer.writeTypePrefixForArray(list, jsonGenerator);
+ serialize(list, jsonGenerator, serializerProvider);
+ typeSerializer.writeTypeSuffixForArray(list, jsonGenerator);
+ }
+ }
+
+ ////////////////////////////// DESERIALIZERS /////////////////////////////////
+
+
+ static class MapJacksonDeserializer extends StdDeserializer<Map> {
+
+ protected MapJacksonDeserializer() {
+ super(Map.class);
+ }
+
+ @Override
+ public Map deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+ final Map<Object,Object> m = new LinkedHashMap<>();
+
+ while (jsonParser.nextToken() != JsonToken.END_ARRAY) {
+ final Object key = deserializationContext.readValue(jsonParser, Object.class);
+ jsonParser.nextToken();
+ final Object val = deserializationContext.readValue(jsonParser, Object.class);
+ m.put(key, val);
+ }
+
+ return m;
+ }
+ }
+
+ static class SetJacksonDeserializer extends StdDeserializer<Set> {
+
+ protected SetJacksonDeserializer() {
+ super(Set.class);
+ }
+
+ @Override
+ public Set deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+ final Set<Object> s = new LinkedHashSet<>();
+
+ while (jsonParser.nextToken() != JsonToken.END_ARRAY) {
+ s.add(deserializationContext.readValue(jsonParser, Object.class));
+ }
+
+ return s;
+ }
+ }
+
+ static class ListJacksonDeserializer extends StdDeserializer<List> {
+
+ protected ListJacksonDeserializer() {
+ super(List.class);
+ }
+
+ @Override
+ public List deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+ final List<Object> s = new LinkedList<>();
+
+ while (jsonParser.nextToken() != JsonToken.END_ARRAY) {
+ s.add(deserializationContext.readValue(jsonParser, Object.class));
+ }
+
+ return s;
+ }
+ }
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV2.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV2.java
index ce57622..8541a43 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV2.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV2.java
@@ -22,7 +22,6 @@
import org.apache.commons.configuration2.BaseConfiguration;
import org.apache.commons.configuration2.ConfigurationConverter;
import org.apache.tinkerpop.gremlin.process.remote.traversal.DefaultRemoteTraverser;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
import org.apache.tinkerpop.gremlin.process.traversal.N;
import org.apache.tinkerpop.gremlin.process.traversal.NotP;
import org.apache.tinkerpop.gremlin.process.traversal.P;
@@ -48,7 +47,6 @@
import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
import java.io.IOException;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -74,7 +72,7 @@
@Override
public void serialize(final Traversal traversal, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
throws IOException {
- jsonGenerator.writeObject(traversal.asAdmin().getBytecode());
+ jsonGenerator.writeObject(traversal.asAdmin().getGremlinLang());
}
@Override
@@ -85,45 +83,6 @@
}
- final static class BytecodeJacksonSerializer extends StdScalarSerializer<Bytecode> {
-
- public BytecodeJacksonSerializer() {
- super(Bytecode.class);
- }
-
- @Override
- public void serialize(final Bytecode bytecode, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
- throws IOException {
- jsonGenerator.writeStartObject();
- if (bytecode.getSourceInstructions().iterator().hasNext()) {
- jsonGenerator.writeArrayFieldStart(GraphSONTokens.SOURCE);
- for (final Bytecode.Instruction instruction : bytecode.getSourceInstructions()) {
- jsonGenerator.writeStartArray();
- jsonGenerator.writeString(instruction.getOperator());
- for (final Object argument : instruction.getArguments()) {
- jsonGenerator.writeObject(argument);
- }
- jsonGenerator.writeEndArray();
- }
- jsonGenerator.writeEndArray();
- }
- if (bytecode.getStepInstructions().iterator().hasNext()) {
- jsonGenerator.writeArrayFieldStart(GraphSONTokens.STEP);
- for (final Bytecode.Instruction instruction : bytecode.getStepInstructions()) {
- jsonGenerator.writeStartArray();
- jsonGenerator.writeString(instruction.getOperator());
- for (final Object argument : instruction.getArguments()) {
- jsonGenerator.writeObject(argument);
- }
- jsonGenerator.writeEndArray();
- }
- jsonGenerator.writeEndArray();
- }
-
- jsonGenerator.writeEndObject();
- }
- }
-
static class EnumJacksonSerializer extends StdScalarSerializer<Enum> {
public EnumJacksonSerializer() {
@@ -205,23 +164,6 @@
}
- final static class BindingJacksonSerializer extends StdScalarSerializer<Bytecode.Binding> {
-
- public BindingJacksonSerializer() {
- super(Bytecode.Binding.class);
- }
-
- @Override
- public void serialize(final Bytecode.Binding binding, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
- throws IOException {
- jsonGenerator.writeStartObject();
- jsonGenerator.writeStringField(GraphSONTokens.KEY, binding.variable());
- jsonGenerator.writeObjectField(GraphSONTokens.VALUE, binding.value());
- jsonGenerator.writeEndObject();
- }
-
- }
-
final static class TraverserJacksonSerializer extends StdScalarSerializer<Traverser> {
public TraverserJacksonSerializer() {
@@ -265,53 +207,6 @@
// DESERIALIZERS //
//////////////////
- final static class BytecodeJacksonDeserializer extends StdDeserializer<Bytecode> {
-
- public BytecodeJacksonDeserializer() {
- super(Bytecode.class);
- }
-
- @Override
- public Bytecode deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
- final Bytecode bytecode = new Bytecode();
-
- while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
- final String current = jsonParser.getCurrentName();
- if (current.equals(GraphSONTokens.SOURCE) || current.equals(GraphSONTokens.STEP)) {
- jsonParser.nextToken();
-
- while (jsonParser.nextToken() != JsonToken.END_ARRAY) {
-
- // there should be a list now and the first item in the list is always string and is the step name
- // skip the start array
- jsonParser.nextToken();
-
- final String stepName = jsonParser.getText();
-
- // iterate through the rest of the list for arguments until it gets to the end
- final List<Object> arguments = new ArrayList<>();
- while (jsonParser.nextToken() != JsonToken.END_ARRAY) {
- // we don't know the types here, so let the deserializer figure that business out
- arguments.add(deserializationContext.readValue(jsonParser, Object.class));
- }
-
- // if it's not a "source" then it must be a "step"
- if (current.equals(GraphSONTokens.SOURCE))
- bytecode.addSource(stepName, arguments.toArray());
- else
- bytecode.addStep(stepName, arguments.toArray());
- }
- }
- }
- return bytecode;
- }
-
- @Override
- public boolean isCachable() {
- return true;
- }
- }
-
final static class EnumJacksonDeserializer<A extends Enum> extends StdDeserializer<A> {
public EnumJacksonDeserializer(final Class<A> enumClass) {
@@ -487,35 +382,6 @@
}
}
- final static class BindingJacksonDeserializer extends StdDeserializer<Bytecode.Binding> {
-
- public BindingJacksonDeserializer() {
- super(Bytecode.Binding.class);
- }
-
- @Override
- public Bytecode.Binding deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
- String k = null;
- Object v = null;
-
- while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
- if (jsonParser.getCurrentName().equals(GraphSONTokens.KEY)) {
- jsonParser.nextToken();
- k = jsonParser.getText();
- } else if (jsonParser.getCurrentName().equals(GraphSONTokens.VALUE)) {
- jsonParser.nextToken();
- v = deserializationContext.readValue(jsonParser, Object.class);
- }
- }
- return new Bytecode.Binding<>(k, v);
- }
-
- @Override
- public boolean isCachable() {
- return true;
- }
- }
-
static class TraverserJacksonDeserializer extends StdDeserializer<Traverser> {
public TraverserJacksonDeserializer() {
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV3.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV3.java
index 3fa7fab..fd5cd09 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV3.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV3.java
@@ -22,7 +22,6 @@
import org.apache.commons.configuration2.BaseConfiguration;
import org.apache.commons.configuration2.ConfigurationConverter;
import org.apache.tinkerpop.gremlin.process.remote.traversal.DefaultRemoteTraverser;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
import org.apache.tinkerpop.gremlin.process.traversal.N;
import org.apache.tinkerpop.gremlin.process.traversal.NotP;
import org.apache.tinkerpop.gremlin.process.traversal.P;
@@ -42,17 +41,14 @@
import org.apache.tinkerpop.shaded.jackson.core.JsonProcessingException;
import org.apache.tinkerpop.shaded.jackson.core.JsonToken;
import org.apache.tinkerpop.shaded.jackson.databind.DeserializationContext;
-import org.apache.tinkerpop.shaded.jackson.databind.JavaType;
import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
import org.apache.tinkerpop.shaded.jackson.databind.deser.std.StdDeserializer;
import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdScalarSerializer;
import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
-import org.apache.tinkerpop.shaded.jackson.databind.type.TypeFactory;
import java.io.IOException;
import java.lang.reflect.Method;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -81,7 +77,7 @@
@Override
public void serialize(final Traversal traversal, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
throws IOException {
- jsonGenerator.writeObject(traversal.asAdmin().getBytecode());
+ jsonGenerator.writeObject(traversal.asAdmin().getGremlinLang());
}
@Override
@@ -92,45 +88,6 @@
}
- final static class BytecodeJacksonSerializer extends StdScalarSerializer<Bytecode> {
-
- public BytecodeJacksonSerializer() {
- super(Bytecode.class);
- }
-
- @Override
- public void serialize(final Bytecode bytecode, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
- throws IOException {
- jsonGenerator.writeStartObject();
- if (bytecode.getSourceInstructions().iterator().hasNext()) {
- jsonGenerator.writeArrayFieldStart(GraphSONTokens.SOURCE);
- for (final Bytecode.Instruction instruction : bytecode.getSourceInstructions()) {
- jsonGenerator.writeStartArray();
- jsonGenerator.writeString(instruction.getOperator());
- for (final Object argument : instruction.getArguments()) {
- jsonGenerator.writeObject(argument);
- }
- jsonGenerator.writeEndArray();
- }
- jsonGenerator.writeEndArray();
- }
- if (bytecode.getStepInstructions().iterator().hasNext()) {
- jsonGenerator.writeArrayFieldStart(GraphSONTokens.STEP);
- for (final Bytecode.Instruction instruction : bytecode.getStepInstructions()) {
- jsonGenerator.writeStartArray();
- jsonGenerator.writeString(instruction.getOperator());
- for (final Object argument : instruction.getArguments()) {
- jsonGenerator.writeObject(argument);
- }
- jsonGenerator.writeEndArray();
- }
- jsonGenerator.writeEndArray();
- }
-
- jsonGenerator.writeEndObject();
- }
- }
-
static class EnumJacksonSerializer extends StdScalarSerializer<Enum> {
public EnumJacksonSerializer() {
@@ -223,23 +180,6 @@
}
}
- final static class BindingJacksonSerializer extends StdScalarSerializer<Bytecode.Binding> {
-
- public BindingJacksonSerializer() {
- super(Bytecode.Binding.class);
- }
-
- @Override
- public void serialize(final Bytecode.Binding binding, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
- throws IOException {
- jsonGenerator.writeStartObject();
- jsonGenerator.writeStringField(GraphSONTokens.KEY, binding.variable());
- jsonGenerator.writeObjectField(GraphSONTokens.VALUE, binding.value());
- jsonGenerator.writeEndObject();
- }
-
- }
-
final static class TraverserJacksonSerializer extends StdScalarSerializer<Traverser> {
public TraverserJacksonSerializer() {
@@ -283,55 +223,6 @@
// DESERIALIZERS //
//////////////////
- final static class BytecodeJacksonDeserializer extends StdDeserializer<Bytecode> {
- private static final JavaType listJavaType = TypeFactory.defaultInstance().constructCollectionType(ArrayList.class, Object.class);
- private static final JavaType listListJavaType = TypeFactory.defaultInstance().constructCollectionType(ArrayList.class, listJavaType);
-
- public BytecodeJacksonDeserializer() {
- super(Bytecode.class);
- }
-
- @Override
- public Bytecode deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
- final Bytecode bytecode = new Bytecode();
-
- while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
- final String current = jsonParser.getCurrentName();
- if (current.equals(GraphSONTokens.SOURCE) || current.equals(GraphSONTokens.STEP)) {
- jsonParser.nextToken();
-
- while (jsonParser.nextToken() != JsonToken.END_ARRAY) {
-
- // there should be a list now and the first item in the list is always string and is the step name
- // skip the start array
- jsonParser.nextToken();
-
- final String stepName = jsonParser.getText();
-
- // iterate through the rest of the list for arguments until it gets to the end
- final List<Object> arguments = new ArrayList<>();
- while (jsonParser.nextToken() != JsonToken.END_ARRAY) {
- // we don't know the types here, so let the deserializer figure that business out
- arguments.add(deserializationContext.readValue(jsonParser, Object.class));
- }
-
- // if it's not a "source" then it must be a "step"
- if (current.equals(GraphSONTokens.SOURCE))
- bytecode.addSource(stepName, arguments.toArray());
- else
- bytecode.addStep(stepName, arguments.toArray());
- }
- }
- }
- return bytecode;
- }
-
- @Override
- public boolean isCachable() {
- return true;
- }
- }
-
final static class EnumJacksonDeserializer<A extends Enum> extends StdDeserializer<A> {
public EnumJacksonDeserializer(final Class<A> enumClass) {
@@ -580,35 +471,6 @@
}
}
- final static class BindingJacksonDeserializer extends StdDeserializer<Bytecode.Binding> {
-
- public BindingJacksonDeserializer() {
- super(Bytecode.Binding.class);
- }
-
- @Override
- public Bytecode.Binding deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
- String k = null;
- Object v = null;
-
- while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
- if (jsonParser.getCurrentName().equals(GraphSONTokens.KEY)) {
- jsonParser.nextToken();
- k = jsonParser.getText();
- } else if (jsonParser.getCurrentName().equals(GraphSONTokens.VALUE)) {
- jsonParser.nextToken();
- v = deserializationContext.readValue(jsonParser, Object.class);
- }
- }
- return new Bytecode.Binding<>(k, v);
- }
-
- @Override
- public boolean isCachable() {
- return true;
- }
- }
-
static class TraverserJacksonDeserializer extends StdDeserializer<Traverser> {
public TraverserJacksonDeserializer() {
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV4.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV4.java
new file mode 100644
index 0000000..1754ee6
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV4.java
@@ -0,0 +1,102 @@
+/*
+ * 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.structure.io.graphson;
+
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.BulkSet;
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
+import org.apache.tinkerpop.shaded.jackson.core.JsonParser;
+import org.apache.tinkerpop.shaded.jackson.core.JsonProcessingException;
+import org.apache.tinkerpop.shaded.jackson.databind.DeserializationContext;
+import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
+import org.apache.tinkerpop.shaded.jackson.databind.deser.std.StdDeserializer;
+import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdScalarSerializer;
+
+import java.io.IOException;
+
+/**
+ * @author Marko A. Rodriguez (http://markorodriguez.com)
+ */
+final class TraversalSerializersV4 {
+
+ private TraversalSerializersV4() {
+ }
+
+ /////////////////
+ // SERIALIZERS //
+ ////////////////
+
+ static class EnumJacksonSerializer extends StdScalarSerializer<Enum> {
+
+ public EnumJacksonSerializer() {
+ super(Enum.class);
+ }
+
+ @Override
+ public void serialize(final Enum enumInstance, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+ throws IOException {
+ jsonGenerator.writeString(enumInstance.name());
+ }
+
+ }
+
+ final static class BulkSetJacksonSerializer extends StdScalarSerializer<BulkSet> {
+
+ public BulkSetJacksonSerializer() {
+ super(BulkSet.class);
+ }
+
+ @Override
+ public void serialize(final BulkSet bulkSet, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+ throws IOException {
+ jsonGenerator.writeStartArray();
+ for (Object element : bulkSet) {
+ jsonGenerator.writeObject(element);
+ }
+ jsonGenerator.writeEndArray();
+ }
+ }
+
+ ///////////////////
+ // DESERIALIZERS //
+ //////////////////
+
+ final static class EnumJacksonDeserializer<A extends Enum> extends StdDeserializer<A> {
+
+ public EnumJacksonDeserializer(final Class<A> enumClass) {
+ super(enumClass);
+ }
+
+ @Override
+ public A deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+ final Class<A> enumClass = (Class<A>) this._valueClass;
+ final String enumName = jsonParser.getText();
+ for (final Enum a : enumClass.getEnumConstants()) {
+ if (a.name().equals(enumName))
+ return (A) a;
+ }
+ throw new IOException("Unknown enum type: " + enumClass);
+ }
+
+ @Override
+ public boolean isCachable() {
+ return true;
+ }
+ }
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializersV1.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializersV1.java
index 4200825..8a25325 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializersV1.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializersV1.java
@@ -19,12 +19,10 @@
package org.apache.tinkerpop.gremlin.structure.io.gryo;
import org.apache.tinkerpop.gremlin.process.remote.traversal.DefaultRemoteTraverser;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
import org.apache.tinkerpop.gremlin.process.traversal.P;
import org.apache.tinkerpop.gremlin.process.traversal.Path;
import org.apache.tinkerpop.gremlin.process.traversal.Text;
import org.apache.tinkerpop.gremlin.process.traversal.TextP;
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
import org.apache.tinkerpop.gremlin.process.traversal.util.AndP;
import org.apache.tinkerpop.gremlin.process.traversal.util.ConnectiveP;
import org.apache.tinkerpop.gremlin.process.traversal.util.OrP;
@@ -135,45 +133,6 @@
}
}
- public final static class BytecodeSerializer implements SerializerShim<Bytecode> {
- @Override
- public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final Bytecode bytecode) {
- writeInstructions(kryo, output, bytecode.getSourceInstructions());
- writeInstructions(kryo, output, bytecode.getStepInstructions());
- }
-
- @Override
- public <I extends InputShim> Bytecode read(final KryoShim<I, ?> kryo, final I input, final Class<Bytecode> clazz) {
- final Bytecode bytecode = new Bytecode();
- final int sourceInstructionCount = input.readInt();
- for (int ix = 0; ix < sourceInstructionCount; ix++) {
- final String operator = input.readString();
- final Object[] args = operator.equals(TraversalSource.Symbols.withoutStrategies) ?
- kryo.readObject(input, Class[].class) :
- kryo.readObject(input, Object[].class);
- bytecode.addSource(operator, args);
- }
-
- final int stepInstructionCount = input.readInt();
- for (int ix = 0; ix < stepInstructionCount; ix++) {
- final String operator = input.readString();
- final Object[] args = kryo.readObject(input, Object[].class);
- bytecode.addStep(operator, args);
- }
-
- return bytecode;
- }
-
- private static <O extends OutputShim> void writeInstructions(final KryoShim<?, O> kryo, final O output,
- final List<Bytecode.Instruction> instructions) {
- output.writeInt(instructions.size());
- for (Bytecode.Instruction inst : instructions) {
- output.writeString(inst.getOperator());
- kryo.writeObject(output, inst.getArguments());
- }
- }
- }
-
public final static class PSerializer implements SerializerShim<P> {
@Override
public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final P p) {
@@ -292,21 +251,6 @@
}
}
- public final static class BindingSerializer implements SerializerShim<Bytecode.Binding> {
- @Override
- public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final Bytecode.Binding binding) {
- output.writeString(binding.variable());
- kryo.writeClassAndObject(output, binding.value());
- }
-
- @Override
- public <I extends InputShim> Bytecode.Binding read(final KryoShim<I, ?> kryo, final I input, final Class<Bytecode.Binding> clazz) {
- final String var = input.readString();
- final Object val = kryo.readClassAndObject(input);
- return new Bytecode.Binding(var, val);
- }
- }
-
public final static class DefaultRemoteTraverserSerializer implements SerializerShim<DefaultRemoteTraverser> {
@Override
public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final DefaultRemoteTraverser remoteTraverser) {
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializersV3.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializersV3.java
index f22ec60..7b01f25 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializersV3.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializersV3.java
@@ -19,12 +19,10 @@
package org.apache.tinkerpop.gremlin.structure.io.gryo;
import org.apache.tinkerpop.gremlin.process.remote.traversal.DefaultRemoteTraverser;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
import org.apache.tinkerpop.gremlin.process.traversal.P;
import org.apache.tinkerpop.gremlin.process.traversal.Path;
import org.apache.tinkerpop.gremlin.process.traversal.Text;
import org.apache.tinkerpop.gremlin.process.traversal.TextP;
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
import org.apache.tinkerpop.gremlin.process.traversal.util.AndP;
import org.apache.tinkerpop.gremlin.process.traversal.util.ConnectiveP;
import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalMetrics;
@@ -250,45 +248,6 @@
}
}
- public final static class BytecodeSerializer implements SerializerShim<Bytecode> {
- @Override
- public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final Bytecode bytecode) {
- writeInstructions(kryo, output, bytecode.getSourceInstructions());
- writeInstructions(kryo, output, bytecode.getStepInstructions());
- }
-
- @Override
- public <I extends InputShim> Bytecode read(final KryoShim<I, ?> kryo, final I input, final Class<Bytecode> clazz) {
- final Bytecode bytecode = new Bytecode();
- final int sourceInstructionCount = input.readInt();
- for (int ix = 0; ix < sourceInstructionCount; ix++) {
- final String operator = input.readString();
- final Object[] args = operator.equals(TraversalSource.Symbols.withoutStrategies) ?
- kryo.readObject(input, Class[].class) :
- kryo.readObject(input, Object[].class);
- bytecode.addSource(operator, args);
- }
-
- final int stepInstructionCount = input.readInt();
- for (int ix = 0; ix < stepInstructionCount; ix++) {
- final String operator = input.readString();
- final Object[] args = kryo.readObject(input, Object[].class);
- bytecode.addStep(operator, args);
- }
-
- return bytecode;
- }
-
- private static <O extends OutputShim> void writeInstructions(final KryoShim<?, O> kryo, final O output,
- final List<Bytecode.Instruction> instructions) {
- output.writeInt(instructions.size());
- for (Bytecode.Instruction inst : instructions) {
- output.writeString(inst.getOperator());
- kryo.writeObject(output, inst.getArguments());
- }
- }
- }
-
public final static class PSerializer implements SerializerShim<P> {
@Override
public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final P p) {
@@ -407,21 +366,6 @@
}
}
- public final static class BindingSerializer implements SerializerShim<Bytecode.Binding> {
- @Override
- public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final Bytecode.Binding binding) {
- output.writeString(binding.variable());
- kryo.writeClassAndObject(output, binding.value());
- }
-
- @Override
- public <I extends InputShim> Bytecode.Binding read(final KryoShim<I, ?> kryo, final I input, final Class<Bytecode.Binding> clazz) {
- final String var = input.readString();
- final Object val = kryo.readClassAndObject(input);
- return new Bytecode.Binding(var, val);
- }
- }
-
public final static class DefaultRemoteTraverserSerializer implements SerializerShim<DefaultRemoteTraverser> {
@Override
public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final DefaultRemoteTraverser remoteTraverser) {
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 e96cb64..0bf3cea 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
@@ -18,6 +18,7 @@
*/
package org.apache.tinkerpop.gremlin.structure.io.gryo;
+import org.apache.commons.collections4.map.ReferenceMap;
import org.apache.tinkerpop.gremlin.process.computer.GraphFilter;
import org.apache.tinkerpop.gremlin.process.computer.MapReduce;
import org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.decoration.VertexProgramStrategy;
@@ -25,7 +26,6 @@
import org.apache.tinkerpop.gremlin.process.computer.util.ComputerGraph;
import org.apache.tinkerpop.gremlin.process.computer.util.MapMemory;
import org.apache.tinkerpop.gremlin.process.remote.traversal.DefaultRemoteTraverser;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
import org.apache.tinkerpop.gremlin.process.traversal.Contains;
import org.apache.tinkerpop.gremlin.process.traversal.DT;
import org.apache.tinkerpop.gremlin.process.traversal.Merge;
@@ -62,6 +62,7 @@
import org.apache.tinkerpop.gremlin.process.traversal.strategy.finalization.MatchAlgorithmStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.AdjacentToIncidentStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.ByModulatorOptimizationStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.CountStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.EarlyLimitStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.FilterRankingStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.IdentityRemovalStrategy;
@@ -72,29 +73,29 @@
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.OrderLimitStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.PathProcessorStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.PathRetractionStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.CountStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.ProductiveByStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.RepeatUnrollStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.EdgeLabelVerificationStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.LambdaRestrictionStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ReadOnlyStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ReservedKeysVerificationStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.traverser.B_LP_O_P_S_SE_SL_Traverser;
import org.apache.tinkerpop.gremlin.process.traversal.traverser.B_LP_NL_O_P_S_SE_SL_Traverser;
-import org.apache.tinkerpop.gremlin.process.traversal.traverser.B_LP_O_S_SE_SL_Traverser;
import org.apache.tinkerpop.gremlin.process.traversal.traverser.B_LP_NL_O_S_SE_SL_Traverser;
-import org.apache.tinkerpop.gremlin.process.traversal.traverser.B_O_S_SE_SL_Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.traverser.B_LP_O_P_S_SE_SL_Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.traverser.B_LP_O_S_SE_SL_Traverser;
import org.apache.tinkerpop.gremlin.process.traversal.traverser.B_NL_O_S_SE_SL_Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.traverser.B_O_S_SE_SL_Traverser;
import org.apache.tinkerpop.gremlin.process.traversal.traverser.B_O_Traverser;
-import org.apache.tinkerpop.gremlin.process.traversal.traverser.LP_O_OB_P_S_SE_SL_Traverser;
-import org.apache.tinkerpop.gremlin.process.traversal.traverser.LP_NL_O_OB_S_SE_SL_Traverser;
-import org.apache.tinkerpop.gremlin.process.traversal.traverser.LP_O_OB_S_SE_SL_Traverser;
import org.apache.tinkerpop.gremlin.process.traversal.traverser.LP_NL_O_OB_P_S_SE_SL_Traverser;
-import org.apache.tinkerpop.gremlin.process.traversal.traverser.O_OB_S_SE_SL_Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.traverser.LP_NL_O_OB_S_SE_SL_Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.traverser.LP_O_OB_P_S_SE_SL_Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.traverser.LP_O_OB_S_SE_SL_Traverser;
import org.apache.tinkerpop.gremlin.process.traversal.traverser.NL_O_OB_S_SE_SL_Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.traverser.O_OB_S_SE_SL_Traverser;
import org.apache.tinkerpop.gremlin.process.traversal.traverser.O_Traverser;
import org.apache.tinkerpop.gremlin.process.traversal.traverser.ProjectedTraverser;
import org.apache.tinkerpop.gremlin.process.traversal.traverser.util.IndexedTraverserSet;
+import org.apache.tinkerpop.gremlin.process.traversal.traverser.util.LabelledCounter;
import org.apache.tinkerpop.gremlin.process.traversal.traverser.util.TraverserSet;
import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalMetrics;
import org.apache.tinkerpop.gremlin.process.traversal.util.ImmutableMetrics;
@@ -129,8 +130,6 @@
import org.apache.tinkerpop.shaded.kryo.ClassResolver;
import org.apache.tinkerpop.shaded.kryo.KryoSerializable;
import org.apache.tinkerpop.shaded.kryo.serializers.JavaSerializer;
-import org.apache.tinkerpop.gremlin.process.traversal.traverser.util.LabelledCounter;
-import org.apache.commons.collections.map.ReferenceMap;
import org.javatuples.Pair;
import org.javatuples.Triplet;
@@ -329,12 +328,13 @@
add(GryoTypeReg.of(ProjectedTraverser.class, 168));
add(GryoTypeReg.of(DefaultRemoteTraverser.class, 123, new GryoSerializersV3.DefaultRemoteTraverserSerializer()));
- add(GryoTypeReg.of(Bytecode.class, 122, new GryoSerializersV3.BytecodeSerializer()));
+ // 122 was Bytecode until it was removed for 4.x
+ // 126 was Bytecode.Binding until it was removed 4.x
+
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));
add(GryoTypeReg.of(Lambda.class, 125, new GryoSerializersV3.LambdaSerializer()));
- add(GryoTypeReg.of(Bytecode.Binding.class, 126, new GryoSerializersV3.BindingSerializer()));
add(GryoTypeReg.of(Order.class, 127));
add(GryoTypeReg.of(Scope.class, 128));
add(GryoTypeReg.of(VertexProperty.Cardinality.class, 131));
@@ -429,7 +429,6 @@
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())); // ***LAST ID***
// placeholder serializers for classes that don't live here in core. this will allow them to be used if
@@ -539,12 +538,13 @@
add(GryoTypeReg.of(ProjectedTraverser.class, 164));
add(GryoTypeReg.of(DefaultRemoteTraverser.class, 123, new GryoSerializersV1.DefaultRemoteTraverserSerializer()));
- add(GryoTypeReg.of(Bytecode.class, 122, new GryoSerializersV1.BytecodeSerializer()));
+ // 122 was Bytecode until it was removed for 4.x
+ // 126 was Bytecode.Binding until it was removed 4.x
+
add(GryoTypeReg.of(P.class, 124, new GryoSerializersV1.PSerializer()));
add(GryoTypeReg.of(TextP.class, 186, new GryoSerializersV1.TextPSerializer()));
add(GryoTypeReg.of(Text.RegexPredicate.class, 197));
add(GryoTypeReg.of(Lambda.class, 125, new GryoSerializersV1.LambdaSerializer()));
- add(GryoTypeReg.of(Bytecode.Binding.class, 126, new GryoSerializersV1.BindingSerializer()));
add(GryoTypeReg.of(Order.class, 127));
add(GryoTypeReg.of(Scope.class, 128));
add(GryoTypeReg.of(VertexProperty.Cardinality.class, 131));
@@ -644,7 +644,6 @@
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())); // ***LAST ID***
}};
}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/ElementHelper.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/ElementHelper.java
index a5e3765..40dc701 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/ElementHelper.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/ElementHelper.java
@@ -18,6 +18,7 @@
*/
package org.apache.tinkerpop.gremlin.structure.util;
+import org.apache.tinkerpop.gremlin.process.traversal.step.GValue;
import org.apache.tinkerpop.gremlin.structure.Edge;
import org.apache.tinkerpop.gremlin.structure.Element;
import org.apache.tinkerpop.gremlin.structure.Graph;
@@ -549,12 +550,15 @@
public static boolean idExists(final Object id, final Object... providedIds) {
if (0 == providedIds.length) return true;
+ //unbox any GValues which may be present in providedIds
+ Object[] idValues = GValue.resolveToValues(GValue.ensureGValues(providedIds));
+
// it is OK to evaluate equality of ids via toString() now given that the toString() the test suite
// enforces the value of id.()toString() to be a first class representation of the identifier
- if (1 == providedIds.length) {
- return id != null && providedIds[0] != null && id.toString().equals(providedIds[0].toString());
+ if (1 == idValues.length) {
+ return id != null && idValues[0] != null && id.toString().equals(idValues[0].toString());
} else {
- for (final Object temp : providedIds) {
+ for (final Object temp : idValues) {
if (id != null && temp != null && temp.toString().equals(id.toString()))
return true;
}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/StringFactory.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/StringFactory.java
index 49206cf..e81ec08 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/StringFactory.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/StringFactory.java
@@ -28,7 +28,6 @@
import org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.decoration.VertexProgramStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.Path;
import org.apache.tinkerpop.gremlin.process.traversal.Step;
-import org.apache.tinkerpop.gremlin.process.traversal.Translator;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalSideEffects;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
@@ -185,10 +184,6 @@
return traversalStrategyProxy.getStrategyClass().getSimpleName();
}
- public static String translatorString(final Translator translator) {
- return "translator" + L_BRACKET + translator.getTraversalSource() + ":" + translator.getTargetLanguage() + R_BRACKET;
- }
-
public static String vertexProgramString(final VertexProgram vertexProgram, final String internalString) {
return vertexProgram.getClass().getSimpleName() + L_BRACKET + internalString + R_BRACKET;
}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphGraphSONSerializerV4.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphGraphSONSerializerV4.java
new file mode 100644
index 0000000..07555b8
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphGraphSONSerializerV4.java
@@ -0,0 +1,165 @@
+/*
+ * 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.structure.util.star;
+
+import org.apache.tinkerpop.gremlin.structure.Direction;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Property;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONUtil;
+import org.apache.tinkerpop.gremlin.structure.util.Comparators;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerationException;
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
+import org.apache.tinkerpop.shaded.jackson.core.JsonProcessingException;
+import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
+import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
+import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public class StarGraphGraphSONSerializerV4 extends StdSerializer<DirectionalStarGraph> {
+ private final boolean normalize;
+ public StarGraphGraphSONSerializerV4(final boolean normalize) {
+ super(DirectionalStarGraph.class);
+ this.normalize = normalize;
+ }
+
+ @Override
+ public void serialize(final DirectionalStarGraph starGraph, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider) throws IOException, JsonGenerationException {
+ ser(starGraph, jsonGenerator, serializerProvider, null);
+ }
+
+ @Override
+ public void serializeWithType(final DirectionalStarGraph starGraph, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider,
+ final TypeSerializer typeSerializer) throws IOException, JsonProcessingException {
+ ser(starGraph, jsonGenerator, serializerProvider, typeSerializer);
+ }
+
+ private void ser(final DirectionalStarGraph directionalStarGraph, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider,
+ final TypeSerializer typeSerializer) throws IOException, JsonProcessingException {
+ final StarGraph starGraph = directionalStarGraph.getStarGraphToSerialize();
+ GraphSONUtil.writeStartObject(starGraph, jsonGenerator, typeSerializer);
+ GraphSONUtil.writeWithType(GraphSONTokens.ID, starGraph.starVertex.id, jsonGenerator, serializerProvider, typeSerializer);
+ jsonGenerator.writeStringField(GraphSONTokens.LABEL, starGraph.starVertex.label);
+ if (directionalStarGraph.getDirection() != null) writeEdges(directionalStarGraph, jsonGenerator, serializerProvider, typeSerializer, Direction.IN);
+ if (directionalStarGraph.getDirection() != null) writeEdges(directionalStarGraph, jsonGenerator, serializerProvider, typeSerializer, Direction.OUT);
+ if (starGraph.starVertex.vertexProperties != null && !starGraph.starVertex.vertexProperties.isEmpty()) {
+ jsonGenerator.writeFieldName(GraphSONTokens.PROPERTIES);
+ GraphSONUtil.writeStartObject(starGraph, jsonGenerator, typeSerializer);
+ final Set<String> keys = normalize ? new TreeSet<>(starGraph.starVertex.vertexProperties.keySet()) : starGraph.starVertex.vertexProperties.keySet();
+ for (final String k : keys) {
+ final List<VertexProperty> vp = starGraph.starVertex.vertexProperties.get(k);
+ jsonGenerator.writeFieldName(k);
+ GraphSONUtil.writeStartArray(k, jsonGenerator, typeSerializer);
+
+ final List<VertexProperty> vertexProperties = normalize ?sort(vp, Comparators.PROPERTY_COMPARATOR) : vp;
+ for (final VertexProperty property : vertexProperties) {
+ GraphSONUtil.writeStartObject(property, jsonGenerator, typeSerializer);
+ GraphSONUtil.writeWithType(GraphSONTokens.ID, property.id(), jsonGenerator, serializerProvider, typeSerializer);
+ GraphSONUtil.writeWithType(GraphSONTokens.VALUE, property.value(), jsonGenerator, serializerProvider, typeSerializer);
+
+ final Iterator<Property> metaProperties = normalize ?
+ IteratorUtils.list(property.properties(), Comparators.PROPERTY_COMPARATOR).iterator() : property.properties();
+ if (metaProperties.hasNext()) {
+ jsonGenerator.writeFieldName(GraphSONTokens.PROPERTIES);
+ GraphSONUtil.writeStartObject(metaProperties, jsonGenerator, typeSerializer);
+
+ while (metaProperties.hasNext()) {
+ final Property<Object> meta = metaProperties.next();
+ GraphSONUtil.writeWithType(meta.key(), meta.value(), jsonGenerator, serializerProvider, typeSerializer);
+ }
+ GraphSONUtil.writeEndObject(metaProperties, jsonGenerator, typeSerializer);
+ }
+ GraphSONUtil.writeEndObject(property, jsonGenerator, typeSerializer);
+ }
+ GraphSONUtil.writeEndArray(k, jsonGenerator, typeSerializer);
+ }
+ GraphSONUtil.writeEndObject(starGraph, jsonGenerator, typeSerializer);
+ }
+ GraphSONUtil.writeEndObject(starGraph, jsonGenerator, typeSerializer);
+ }
+
+ private void writeEdges(final DirectionalStarGraph directionalStarGraph, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider,
+ final TypeSerializer typeSerializer,
+ final Direction direction) throws IOException, JsonProcessingException {
+ // only write edges if there are some AND if the user requested them to be serialized AND if they match
+ // the direction being serialized by the format
+ final StarGraph starGraph = directionalStarGraph.getStarGraphToSerialize();
+ final Direction edgeDirectionToSerialize = directionalStarGraph.getDirection();
+ final Map<String, List<Edge>> starEdges = direction.equals(Direction.OUT) ? starGraph.starVertex.outEdges : starGraph.starVertex.inEdges;
+ final boolean writeEdges = null != starEdges && edgeDirectionToSerialize != null
+ && (edgeDirectionToSerialize == direction || edgeDirectionToSerialize == Direction.BOTH);
+ if (writeEdges) {
+ jsonGenerator.writeFieldName(direction == Direction.IN ? GraphSONTokens.IN_E : GraphSONTokens.OUT_E);
+ GraphSONUtil.writeStartObject(directionalStarGraph, jsonGenerator, typeSerializer);
+ final Set<String> keys = normalize ? new TreeSet<>(starEdges.keySet()) : starEdges.keySet();
+ for (final String k : keys) {
+ final List<Edge> edges = starEdges.get(k);
+ jsonGenerator.writeFieldName(k);
+ GraphSONUtil.writeStartArray(k, jsonGenerator, typeSerializer);
+
+ final List<Edge> edgesToWrite = normalize ? sort(edges, Comparators.EDGE_COMPARATOR) : edges;
+ for (final Edge edge : edgesToWrite) {
+ GraphSONUtil.writeStartObject(edge, jsonGenerator, typeSerializer);
+ GraphSONUtil.writeWithType(GraphSONTokens.ID, edge.id(), jsonGenerator, serializerProvider, typeSerializer);
+ GraphSONUtil.writeWithType(direction.equals(Direction.OUT) ? GraphSONTokens.IN : GraphSONTokens.OUT,
+ direction.equals(Direction.OUT) ? edge.inVertex().id() : edge.outVertex().id(),
+ jsonGenerator, serializerProvider, typeSerializer);
+
+ final Iterator<Property<Object>> edgeProperties = normalize ?
+ IteratorUtils.list(edge.properties(), Comparators.PROPERTY_COMPARATOR).iterator() : edge.properties();
+ if (edgeProperties.hasNext()) {
+ jsonGenerator.writeFieldName(GraphSONTokens.PROPERTIES);
+ GraphSONUtil.writeStartObject(edge, jsonGenerator, typeSerializer);
+ while (edgeProperties.hasNext()) {
+ final Property<Object> meta = edgeProperties.next();
+ GraphSONUtil.writeWithType(meta.key(), meta.value(), jsonGenerator, serializerProvider, typeSerializer);
+ }
+ GraphSONUtil.writeEndObject(edge, jsonGenerator, typeSerializer);
+ }
+ GraphSONUtil.writeEndObject(edge, jsonGenerator, typeSerializer);
+ }
+ GraphSONUtil.writeEndArray(k, jsonGenerator, typeSerializer);
+ }
+ GraphSONUtil.writeEndObject(directionalStarGraph, jsonGenerator, typeSerializer);
+ }
+ }
+
+ private static <S> List<S> sort(final List<S> listToSort, final Comparator comparator) {
+ Collections.sort(listToSort, comparator);
+ return listToSort;
+ }
+
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/Gremlin.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/Gremlin.java
index f2daa8e..878eaa9 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/Gremlin.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/Gremlin.java
@@ -24,7 +24,7 @@
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
public final class Gremlin {
- private final static String gremlinVersion = "3.8.0-SNAPSHOT"; // DO NOT MODIFY - Configured automatically by Maven Replacer Plugin
+ private final static String gremlinVersion = "4.0.0-SNAPSHOT"; // DO NOT MODIFY - Configured automatically by Maven Replacer Plugin
private Gremlin() {
}
@@ -37,6 +37,11 @@
return gremlinVersion;
}
+ /**
+ * Gets the current major version of tinkerpop.
+ */
+ public static String majorVersion() { return version().split("\\.")[0]; }
+
public static void main(final String[] arguments) throws IOException {
System.out.println("gremlin " + version());
}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/iterator/IteratorUtils.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/iterator/IteratorUtils.java
index eb4073d..cc8ce75 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/iterator/IteratorUtils.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/iterator/IteratorUtils.java
@@ -454,7 +454,7 @@
else if (o instanceof Object[])
itty = new ArrayIterator<>((Object[]) o);
else if (o != null && o.getClass().isArray()) // handle for primitive array
- itty = new org.apache.commons.collections.iterators.ArrayIterator(o);
+ itty = new org.apache.commons.collections4.iterators.ArrayIterator(o);
else if (o instanceof Stream)
itty = ((Stream) o).iterator();
else if (o instanceof Map)
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/jsr223/GremlinLangScriptEngineTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/jsr223/GremlinLangScriptEngineTest.java
index d442f52..22dd496 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/jsr223/GremlinLangScriptEngineTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/jsr223/GremlinLangScriptEngineTest.java
@@ -18,8 +18,16 @@
*/
package org.apache.tinkerpop.gremlin.jsr223;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.MapConfiguration;
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.dsl.graph.GraphTraversal;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
+import org.apache.tinkerpop.gremlin.process.traversal.strategy.AbstractTraversalStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.strategy.TraversalStrategyProxy;
+import org.apache.tinkerpop.gremlin.process.traversal.strategy.TraversalStrategyProxyTest;
import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
import org.junit.Test;
@@ -28,11 +36,17 @@
import javax.script.SimpleBindings;
import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.IsInstanceOf.instanceOf;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
public class GremlinLangScriptEngineTest {
@@ -47,7 +61,7 @@
public void shouldEvalGremlinScript() throws ScriptException {
final Object result = scriptEngine.eval("g.V()");
assertThat(result, instanceOf(Traversal.Admin.class));
- assertEquals(g.V().asAdmin().getBytecode(), ((Traversal.Admin) result).getBytecode());
+ assertEquals(g.V().asAdmin().getGremlinLang(), ((Traversal.Admin) result).getGremlinLang());
}
@Test
@@ -60,13 +74,55 @@
final Object result = scriptEngine.eval("g.V(x, y, z)", b);
assertThat(result, instanceOf(Traversal.Admin.class));
- assertEquals(g.V(100, 1000, 10000).asAdmin().getBytecode(), ((Traversal.Admin) result).getBytecode());
+ assertEquals(g.V(100, 1000, 10000).asAdmin().getGremlinLang(), ((Traversal.Admin) result).getGremlinLang());
+ }
+
+ public static class TestStrategy<S extends TraversalStrategy> extends AbstractTraversalStrategy<S> {
+ private final Configuration configuration;
+
+ private TestStrategy(final Configuration configuration) {
+ this.configuration = configuration;
+ }
+ @Override
+ public void apply(Traversal.Admin traversal) {
+ // Do nothing
+ }
+
+ @Override
+ public Configuration getConfiguration() {
+ return configuration;
+ }
+
+ public static TestStrategy create(Configuration configuration) {
+ return new TestStrategy(configuration);
+ }
}
@Test
- public void shouldEvalGremlinBytecode() throws ScriptException {
- final Object result = scriptEngine.eval(g.V().asAdmin().getBytecode(), "g");
- assertThat(result, instanceOf(Traversal.Admin.class));
- assertEquals(g.V().asAdmin().getBytecode(), ((Traversal.Admin) result).getBytecode());
+ public void shouldReconstructCustomRegisteredStrategy() throws ScriptException {
+ TraversalStrategies.GlobalCache.registerStrategy(TestStrategy.class);
+
+ GraphTraversal traversal = (GraphTraversal) scriptEngine.eval("g.withStrategies(new TestStrategy(stringKey:\"stringValue\",intKey:1,booleanKey:true)).V()");
+
+ TestStrategy reconstructedStrategy = traversal.asAdmin().getStrategies().getStrategy(TestStrategy.class).get();
+
+ assertNotNull(reconstructedStrategy);
+
+ MapConfiguration expectedConfig = new MapConfiguration(new HashMap<String, Object>() {{
+ put("stringKey", "stringValue");
+ put("intKey", 1);
+ put("booleanKey", true);
+ }});
+
+ Set<String> expectedKeys = new HashSet<>();
+ Set<String> actualKeys = new HashSet<>();
+ expectedConfig.getKeys().forEachRemaining((key) -> expectedKeys.add(key));
+ reconstructedStrategy.getConfiguration().getKeys().forEachRemaining((key) -> actualKeys.add(key));
+
+ assertEquals(expectedKeys, actualKeys);
+
+ expectedKeys.forEach((key) -> {
+ assertEquals(expectedConfig.get(Object.class, key), reconstructedStrategy.getConfiguration().get(Object.class, key));
+ });
}
}
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/jsr223/ImportGremlinPluginTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/jsr223/ImportGremlinPluginTest.java
index b2a1a3c..1e9d921 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/jsr223/ImportGremlinPluginTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/jsr223/ImportGremlinPluginTest.java
@@ -61,16 +61,17 @@
@Test
public void shouldImportWildcardMethod() throws Exception {
- final Method zeroArgs = Gremlin.class.getMethod("version");
+ final Method version = Gremlin.class.getMethod("version");
+ final Method majorVersion = Gremlin.class.getMethod("majorVersion");
final ImportGremlinPlugin module = ImportGremlinPlugin.build()
.methodImports(Collections.singletonList(Gremlin.class.getCanonicalName() + "#*")).create();
final DefaultImportCustomizer customizer = (DefaultImportCustomizer) module.getCustomizers().get()[0];
assertEquals(1, module.getCustomizers().get().length);
- assertThat(customizer.getMethodImports(), hasItems(zeroArgs));
+ assertThat(customizer.getMethodImports(), hasItems(version, majorVersion));
// will also have the static main() method
- assertEquals(2, customizer.getMethodImports().size());
+ assertEquals(3, customizer.getMethodImports().size());
}
@Test
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 21dfe98..94fcf26 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
@@ -65,7 +65,7 @@
put("x", null);
}};
- @Parameterized.Parameters(name = "{0}")
+ @Parameterized.Parameters(name = "{1}")
public static Iterable<Object[]> generateTestParameters() {
return Arrays.asList(new Object[][]{
{Boolean.class, "x", new VariableResolverException("x"), createAntlr(VariableResolver.NoVariableResolver.instance())},
@@ -117,7 +117,7 @@
{Object.class, "x", GValue.of("x", now), createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", now)))},
{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.DefaultVariableResolver(ElementHelper.asMap("x", now)))},
+ {Object.class, "[1,2,3]", Arrays.asList(1, 2, 3), createAntlr(VariableResolver.NoVariableResolver.instance())},
{Object.class, "x", GValue.of("x", P.eq(100)), createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", P.eq(100))))},
{Object.class, "x", P.eq(100), createAntlr(new VariableResolver.DirectVariableResolver(ElementHelper.asMap("x", P.eq(100))))},
});
@@ -189,4 +189,4 @@
}
private static class StringNullable { }
-}
+}
\ No newline at end of file
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/GeneralLiteralVisitorTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/GeneralLiteralVisitorTest.java
index 9e2d95b..f258bd4 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/GeneralLiteralVisitorTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/GeneralLiteralVisitorTest.java
@@ -37,7 +37,6 @@
import java.time.LocalDateTime;
import java.time.OffsetDateTime;
import java.time.ZoneOffset;
-import java.time.ZonedDateTime;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/GraphTraversalSourceVisitorTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/GraphTraversalSourceVisitorTest.java
index 1407f31..1b02447 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/GraphTraversalSourceVisitorTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/GraphTraversalSourceVisitorTest.java
@@ -21,7 +21,6 @@
import org.antlr.v4.runtime.CharStreams;
import org.antlr.v4.runtime.CommonTokenStream;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
import org.junit.Before;
import org.junit.Test;
@@ -69,6 +68,6 @@
final GremlinParser.TraversalSourceContext ctx = parser.traversalSource();
final GraphTraversalSource result = new GraphTraversalSourceVisitor(antlrToLanguage).visitTraversalSource(ctx);
- assertEquals(traversalSource.getBytecode(), result.getBytecode());
+ assertEquals(traversalSource.getGremlinLang(), result.getGremlinLang());
}
}
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 7b57e9e..a286e2e 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
@@ -44,8 +44,8 @@
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().getBytecode(),
- t.asAdmin().getBytecode());
+ assertEquals(g.V().has("name", P.gt(50)).asAdmin().getGremlinLang(),
+ t.asAdmin().getGremlinLang());
}
@Test
@@ -57,16 +57,16 @@
"z", 50)));
GraphTraversal<?, ?> t = (GraphTraversal<?, ?>) GremlinQueryParser.parse("g.V().has('name',gt(z))", gremlinAntlrToJava);
- assertEquals(g.V().has("name", P.gt(50)).asAdmin().getBytecode(),
- t.asAdmin().getBytecode());
+ assertEquals(g.V().has("name", P.gt(50)).asAdmin().getGremlinLang(),
+ t.asAdmin().getGremlinLang());
t = (GraphTraversal<?, ?>) GremlinQueryParser.parse("g.V(x).has('name',gt(z))", gremlinAntlrToJava);
- assertEquals(g.V(100).has("name", P.gt(50)).asAdmin().getBytecode(),
- t.asAdmin().getBytecode());
+ assertEquals(g.V(100).has("name", P.gt(50)).asAdmin().getGremlinLang(),
+ t.asAdmin().getGremlinLang());
t = (GraphTraversal<?, ?>) GremlinQueryParser.parse("g.V(x, y, 300).has('name',gt(z))", gremlinAntlrToJava);
- assertEquals(g.V(100, 200, 300).has("name", P.gt(50)).asAdmin().getBytecode(),
- t.asAdmin().getBytecode());
+ assertEquals(g.V(100, 200, 300).has("name", P.gt(50)).asAdmin().getGremlinLang(),
+ t.asAdmin().getGremlinLang());
}
@Test(expected = GremlinParserException.class)
@@ -96,8 +96,8 @@
VariableResolver.NullVariableResolver.instance());
final GraphTraversal<?, ?> t = (GraphTraversal<?, ?>) GremlinQueryParser.parse("g.V().has('name',gt(z))", gremlinAntlrToJava);
- assertEquals(g.V().has("name", P.gt(null)).asAdmin().getBytecode(),
- t.asAdmin().getBytecode());
+ assertEquals(g.V().has("name", P.gt(null)).asAdmin().getGremlinLang(),
+ t.asAdmin().getGremlinLang());
}
@Test
@@ -107,8 +107,8 @@
VariableResolver.NullVariableResolver.instance());
final GraphTraversal<?, ?> t = (GraphTraversal<?, ?>) GremlinQueryParser.parse("g.V(a,b,c).has('name',gt(z))", gremlinAntlrToJava);
- assertEquals(g.V(null, null, null).has("name", P.gt(null)).asAdmin().getBytecode(),
- t.asAdmin().getBytecode());
+ assertEquals(g.V(null, null, null).has("name", P.gt(null)).asAdmin().getGremlinLang(),
+ t.asAdmin().getGremlinLang());
}
@Test(expected = GremlinParserException.class)
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalMethodVisitorTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalMethodVisitorTest.java
index 6660eaa..328006d 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalMethodVisitorTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalMethodVisitorTest.java
@@ -70,8 +70,8 @@
}
private void compare(Object expected, Object actual) {
- assertEquals(((DefaultGraphTraversal) expected).asAdmin().getBytecode(),
- ((DefaultGraphTraversal) actual).asAdmin().getBytecode());
+ assertEquals(((DefaultGraphTraversal) expected).asAdmin().getGremlinLang(),
+ ((DefaultGraphTraversal) actual).asAdmin().getGremlinLang());
}
@Test
@@ -164,7 +164,7 @@
@Test
public void shouldParseTraversalMethod_both_MultiString() throws Exception {
- compare(g.V().both(new String[]{"a", "b"}), eval("g.V().both('a', 'b')"));
+ compare(g.V().both("a", "b"), eval("g.V().both('a', 'b')"));
}
@Test
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalRootVisitorTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalRootVisitorTest.java
index 1ba4cb0..9283afe 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalRootVisitorTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalRootVisitorTest.java
@@ -78,7 +78,7 @@
}
@Test
- public void shouldParseTraversalMethod_none() {
+ public void shouldParseTraversalMethod_discard() {
compare(g.V().discard(), eval("g.V().discard()"));
compare(g.V().union(__.identity().discard()), eval("g.V().union(__.identity().discard())"));
}
@@ -186,10 +186,10 @@
compare(g.V().map(__.id().fold().all(gt(1))), eval("g.V().map(__.id().fold().all(gt(1)))"));
}
-// @Test
-// public void shouldParseTraversalMethod_and() {
-// compare(g.V().map(__.and(outE("knows"))), eval("g.V().map(__.and(outE('knows')))"));
-// }
+ @Test
+ public void shouldParseTraversalMethod_and() {
+ compare(g.V().map(__.and(outE("knows"))), eval("g.V().map(__.and(outE('knows')))"));
+ }
@Test
public void shouldParseTraversalMethod_any_P() {
@@ -1093,11 +1093,6 @@
}
@Test
- public void shouldParseTraversalMethod_GValue() {
- compare(g.V().map(__.to(Direction.OUT, GValue.ofString("foo", "bar"))), eval("g.V().map(__.to(Direction.OUT,foo))"));
- }
-
- @Test
public void shouldParseTraversalMethod_Direction() {
compare(g.V().map(__.to(Direction.OUT)), eval("g.V().map(__.to(Direction.OUT))"));
}
@@ -1474,6 +1469,7 @@
public void shouldParseTraversalMethod_conjoin() {
compare(g.V().map(__.conjoin("test")), eval("g.V().map(__.conjoin(\"test\"))"));
}
+
@Test
public void shouldParseTraversalMethod_merge() {
compare(g.V().map(__.merge("test")), eval("g.V().map(__.merge(\"test\"))"));
@@ -1547,8 +1543,8 @@
}
private void compare(Object expected, Object actual) {
- assertEquals(((DefaultGraphTraversal) expected).asAdmin().getBytecode(),
- ((DefaultGraphTraversal) actual).asAdmin().getBytecode());
+ assertEquals(((DefaultGraphTraversal) expected).asAdmin().getGremlinLang(),
+ ((DefaultGraphTraversal) actual).asAdmin().getGremlinLang());
}
private Object eval(String query) {
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalSourceSelfMethodVisitorTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalSourceSelfMethodVisitorTest.java
index 92ee518..68ce72c 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalSourceSelfMethodVisitorTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalSourceSelfMethodVisitorTest.java
@@ -41,7 +41,7 @@
@RunWith(Parameterized.class)
public class TraversalSourceSelfMethodVisitorTest {
- private static final GraphTraversalSource g = traversal().withEmbedded(EmptyGraph.instance());
+ private static final GraphTraversalSource g = traversal().with(EmptyGraph.instance());
@Parameterized.Parameter(value = 0)
public String script;
@@ -90,6 +90,6 @@
final GremlinParser.TraversalSourceSelfMethodContext ctx = parser.traversalSourceSelfMethod();
final GraphTraversalSource source = new TraversalSourceSelfMethodVisitor(g, new GremlinAntlrToJava()).visitTraversalSourceSelfMethod(ctx);
- assertEquals(expected.getBytecode(), source.getBytecode());
+ assertEquals(expected.getGremlinLang(), source.getGremlinLang());
}
}
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 d04b4d1..e254c96 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
@@ -48,6 +48,7 @@
public static Collection<Object[]> data() {
return Arrays.asList(new Object[][]{
{"g.V(l1)", Collections.singletonList("l1")},
+ {"g.V().hasLabel('person').has('key', y).as('a').out('knows').as('b').select('a', 'b')", Collections.singletonList("y")},
{"g.V().hasLabel('person').has('name', x).as('a').out(y).as('b').select('a', 'b')", Arrays.asList("x", "y")},
{"g.V().hasLabel('person').has('key', y).as('a').out('knows').as('b').select('a', 'b')", Collections.singletonList("y")},
{"g.V(x).map(out(y).count())", Arrays.asList("x", "y")},
@@ -157,8 +158,8 @@
"g.inject(string0)",
"g.Inject<object>(Guid.Parse(\"f47af10b-58cc-4372-a567-0f02b2f3d479\"))",
"g.Inject(uuid.MustParse(\"f47af10b-58cc-4372-a567-0f02b2f3d479\"))",
- null,
- null,
+ "g.inject(UUID.fromString(\"f47af10b-58cc-4372-a567-0f02b2f3d479\"))",
+ "g.inject(UUID.fromString(\"f47af10b-58cc-4372-a567-0f02b2f3d479\"))",
"g.inject(\"f47af10b-58cc-4372-a567-0f02b2f3d479\")",
"g.inject(uuid.UUID('f47af10b-58cc-4372-a567-0f02b2f3d479'))"},
{"g.inject(UUID())",
@@ -166,8 +167,8 @@
"g.inject(string0)",
"g.Inject<object>(Guid.NewGuid())",
"g.Inject(uuid.New())",
- null,
- null,
+ "g.inject(UUID.randomUUID())",
+ "g.inject(UUID.randomUUID())",
"g.inject(uuid.v4())",
"g.inject(uuid.uuid4())"},
{"g.with(\"x\n\\\"yz\")",
@@ -328,7 +329,7 @@
"g.with(string0, bigdecimal0)",
"g.With(\"x\", (decimal) 1.0)",
"g.With(\"x\", gremlingo.ParseBigDecimal(\"1.0\"))",
- "g.with('x', 1.0g)",
+ "g.with('x', 1.0)",
"g.with(\"x\", new BigDecimal(\"1.0\"))",
"g.with_(\"x\", 1.0)",
"g.with_('x', 1.0)"},
@@ -337,7 +338,7 @@
"g.with(string0, bigdecimal0)",
"g.With(\"x\", (decimal) -1.0)",
"g.With(\"x\", gremlingo.ParseBigDecimal(\"-1.0\"))",
- "g.with('x', -1.0g)",
+ "g.with('x', -1.0)",
"g.with(\"x\", new BigDecimal(\"-1.0\"))",
"g.with_(\"x\", -1.0)",
"g.with_('x', -1.0)"},
@@ -346,7 +347,7 @@
"g.with(string0, bigdecimal0)",
"g.With(\"x\", (decimal) -1.0)",
"g.With(\"x\", gremlingo.ParseBigDecimal(\"-1.0\"))",
- "g.with('x', -1.0g)",
+ "g.with('x', -1.0)",
"g.with(\"x\", new BigDecimal(\"-1.0\"))",
"g.with_(\"x\", -1.0)",
"g.with_('x', -1.0)"},
@@ -355,7 +356,7 @@
"g.with(string0, byte0)",
"g.With(\"x\", (byte) 1)",
"g.With(\"x\", int8(1))",
- "g.with('x', new Byte(1))",
+ "g.with('x', (byte)1)",
"g.with(\"x\", new Byte(1))",
"g.with_(\"x\", 1)",
"g.with_('x', 1)"},
@@ -364,7 +365,7 @@
"g.with(string0, byte0)",
"g.With(\"x\", (byte) 1)",
"g.With(\"x\", int8(1))",
- "g.with('x', new Byte(1))",
+ "g.with('x', (byte)1)",
"g.with(\"x\", new Byte(1))",
"g.with_(\"x\", 1)",
"g.with_('x', 1)"},
@@ -373,7 +374,7 @@
"g.with(string0, byte0)",
"g.With(\"x\", (byte) -1)",
"g.With(\"x\", int8(-1))",
- "g.with('x', new Byte(-1))",
+ "g.with('x', (byte)-1)",
"g.with(\"x\", new Byte(-1))",
"g.with_(\"x\", -1)",
"g.with_('x', -1)"},
@@ -382,7 +383,7 @@
"g.with(string0, short0)",
"g.With(\"x\", (short) 1)",
"g.With(\"x\", int16(1))",
- "g.with('x', new Short(1))",
+ "g.with('x', (short)1)",
"g.with(\"x\", new Short(1))",
"g.with_(\"x\", 1)",
"g.with_('x', 1)"},
@@ -391,7 +392,7 @@
"g.with(string0, short0)",
"g.With(\"x\", (short) -1)",
"g.With(\"x\", int16(-1))",
- "g.with('x', new Short(-1))",
+ "g.with('x', (short)-1)",
"g.with(\"x\", new Short(-1))",
"g.with_(\"x\", -1)",
"g.with_('x', -1)"},
@@ -400,7 +401,7 @@
"g.with(string0, short0)",
"g.With(\"x\", (short) 1)",
"g.With(\"x\", int16(1))",
- "g.with('x', new Short(1))",
+ "g.with('x', (short)1)",
"g.with(\"x\", new Short(1))",
"g.with_(\"x\", 1)",
"g.with_('x', 1)"},
@@ -694,11 +695,11 @@
null,
"g.withoutStrategies(ReadOnlyStrategy.class)",
"g.withoutStrategies(ReadOnlyStrategy)", // javascript needs TINKERPOP-3055
- "g.without_strategies(*[GremlinType('org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ReadOnlyStrategy')])"},
+ "g.without_strategies(ReadOnlyStrategy)"},
{"g.withStrategies(ReservedKeysVerificationStrategy(throwException: true, keys: [\"age\"])).addV(\"person\").property(\"age\", 29).property(\"name\", \"marko\")",
"g.withStrategies(ReservedKeysVerificationStrategy(throwException:true, keys:[\"age\"])).addV(\"person\").property(\"age\", 29).property(\"name\", \"marko\")",
"g.withStrategies(ReservedKeysVerificationStrategy(throwException:boolean0, keys:list0)).addV(string0).property(string1, number0).property(string2, string3)",
- "g.WithStrategies(new ReservedKeysVerificationStrategy(throwException: true, keys: new List<object> { \"age\" })).AddV(\"person\").Property(\"age\", 29).Property(\"name\", \"marko\")",
+ "g.WithStrategies(new ReservedKeysVerificationStrategy(throwException: true, keys: new List<object> { \"age\" })).AddV((string) \"person\").Property(\"age\", 29).Property(\"name\", \"marko\")",
"g.WithStrategies(gremlingo.ReservedKeysVerificationStrategy(gremlingo.ReservedKeysVerificationStrategyConfig{ThrowException: true, Keys: []string{\"age\"}})).AddV(\"person\").Property(\"age\", 29).Property(\"name\", \"marko\")",
"g.withStrategies(new ReservedKeysVerificationStrategy(throwException:true, keys:[\"age\"])).addV(\"person\").property(\"age\", 29).property(\"name\", \"marko\")",
"g.withStrategies(ReservedKeysVerificationStrategy.build().throwException(true).keys(new ArrayList<Object>() {{ add(\"age\"); }}).create()).addV(\"person\").property(\"age\", 29).property(\"name\", \"marko\")",
@@ -713,7 +714,7 @@
null,
"g.withoutStrategies(ReadOnlyStrategy.class, PathRetractionStrategy.class, FilterRankingStrategy.class)",
"g.withoutStrategies(ReadOnlyStrategy, PathRetractionStrategy, FilterRankingStrategy)", // javascript - needs TINKERPOP-3055
- "g.without_strategies(*[GremlinType('org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ReadOnlyStrategy'), GremlinType('org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.PathRetractionStrategy'), GremlinType('org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.FilterRankingStrategy')])"},
+ "g.without_strategies(ReadOnlyStrategy, PathRetractionStrategy, FilterRankingStrategy)"},
{"g.inject(0..5)",
null,
"g.inject(number0..number1)",
@@ -759,6 +760,15 @@
"g.inject(\"123.4\").asNumber(N.bigInt)",
"g.inject(\"123.4\").asNumber(N.bigInt)",
"g.inject('123.4').as_number(N.big_int)"},
+ {"g.inject(null, null).inject(null, null)",
+ null,
+ "g.inject(object0, object0).inject(object0, object0)",
+ "g.Inject<object>(null, null).Inject(null, null)",
+ "g.Inject(nil, nil).Inject(nil, nil)",
+ "g.inject(null, (Object) null).inject(null, (Object) null)",
+ "g.inject(null, null).inject(null, null)",
+ "g.inject(null, null).inject(null, null)",
+ "g.inject(None, None).inject(None, None)"},
{"g.V().hasLabel(null)",
null,
"g.V().hasLabel(string0)",
@@ -767,7 +777,7 @@
null,
null,
null,
- "g.V().has_label(None)",},
+ "g.V().has_label(None)"},
{"g.V().hasLabel(null, null)",
null,
"g.V().hasLabel(string0, string0)",
@@ -1245,6 +1255,15 @@
null,
null,
"g.V().has_label(x, y)"},
+ {"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.mergeV([name:\"alice\", T.label:\"person\"]).option(Merge.onCreate, [age:Cardinality.single(81)])",
null,
"g.mergeV(map0).option(Merge.onCreate, map1)",
@@ -1299,6 +1318,15 @@
null,
null,
null},
+ {"g.call(\"--list\").with(\"service\", __.constant(\"tinker.search\"))",
+ "g.call(\"--list\").with(\"service\", __.constant(\"tinker.search\"))",
+ "g.call(string0).with(string1, __.constant(string2))",
+ "g.Call<object>((string) \"--list\").With(\"service\", __.Constant<object>(\"tinker.search\"))",
+ "g.Call(\"--list\").With(\"service\", gremlingo.T__.Constant(\"tinker.search\"))",
+ "g.call(\"--list\").with(\"service\", __.constant(\"tinker.search\"))",
+ "g.call(\"--list\").with(\"service\", __.constant(\"tinker.search\"))",
+ "g.call(\"--list\").with_(\"service\", __.constant(\"tinker.search\"))",
+ "g.call('--list').with_('service', __.constant('tinker.search'))"},
});
}
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/remote/EmbeddedRemoteConnectionTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/remote/EmbeddedRemoteConnectionTest.java
new file mode 100644
index 0000000..345195d
--- /dev/null
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/remote/EmbeddedRemoteConnectionTest.java
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.remote;
+
+import org.apache.tinkerpop.gremlin.process.traversal.P;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
+import org.apache.tinkerpop.gremlin.process.traversal.step.GValue;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
+import org.junit.Test;
+
+import static org.apache.tinkerpop.gremlin.process.traversal.AnonymousTraversalSource.traversal;
+import static org.junit.Assert.assertEquals;
+
+public class EmbeddedRemoteConnectionTest {
+ @Test
+ public void shouldAllowToUseLocalGraphAsRemote() {
+ final Graph graph = EmptyGraph.instance();
+ final GraphTraversalSource g = graph.traversal();
+ final GraphTraversalSource simulatedRemoteG = traversal().with(new EmbeddedRemoteConnection(g));
+ assertEquals(0, simulatedRemoteG.V().count().next().intValue());
+ }
+
+ @Test
+ public void shouldAllowToUseLocalGraphAsRemoteWithParameter() {
+ final Graph graph = EmptyGraph.instance();
+ final GraphTraversalSource g = graph.traversal();
+ final GraphTraversalSource simulatedRemoteG = traversal().with(new EmbeddedRemoteConnection(g));
+ assertEquals(11, (long) simulatedRemoteG.inject( 11).is(P.eq(GValue.of(11))).next());
+ }
+}
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/BytecodeTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/BytecodeTest.java
deleted file mode 100644
index bc00a23..0000000
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/BytecodeTest.java
+++ /dev/null
@@ -1,272 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tinkerpop.gremlin.process.traversal;
-
-import org.apache.commons.configuration2.MapConfiguration;
-import org.apache.tinkerpop.gremlin.process.computer.Computer;
-import org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.decoration.VertexProgramStrategy;
-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.dsl.graph.__;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SubgraphStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ReadOnlyStrategy;
-import org.apache.tinkerpop.gremlin.structure.Column;
-import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.junit.Test;
-
-import java.util.HashMap;
-import java.util.List;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertTrue;
-
-/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- */
-public class BytecodeTest {
-
- @Test
- public void shouldHaveProperHashAndEquality() {
- final GraphTraversalSource g = EmptyGraph.instance().traversal();
- final Traversal.Admin traversal1 = g.V().out().repeat(__.out().in()).times(2).groupCount().by(__.outE().count()).select(Column.keys).order().by(Order.desc).asAdmin();
- final Traversal.Admin traversal2 = g.V().out().repeat(__.out().in()).times(2).groupCount().by(__.outE().count()).select(Column.keys).order().by(Order.desc).asAdmin();
- final Traversal.Admin traversal3 = g.V().out().repeat(__.out().in()).times(2).groupCount().by(__.outE().count()).select(Column.values).order().by(Order.desc).asAdmin();
-
- assertEquals(traversal1, traversal2);
- assertNotEquals(traversal1, traversal3);
- assertNotEquals(traversal2, traversal3);
- //
- assertEquals(traversal1.hashCode(), traversal2.hashCode());
- assertNotEquals(traversal1.hashCode(), traversal3.hashCode());
- assertNotEquals(traversal2.hashCode(), traversal3.hashCode());
- //
- assertEquals(traversal1.getBytecode(), traversal2.getBytecode());
- assertNotEquals(traversal1.getBytecode(), traversal3.getBytecode());
- assertNotEquals(traversal2.getBytecode(), traversal3.getBytecode());
- //
- assertEquals(traversal1.getBytecode().hashCode(), traversal2.getBytecode().hashCode());
- assertNotEquals(traversal1.getBytecode().hashCode(), traversal3.getBytecode().hashCode());
- assertNotEquals(traversal2.getBytecode().hashCode(), traversal3.getBytecode().hashCode());
-
- }
-
- @Test
- public void shouldCloneCorrectly() {
- final GraphTraversalSource g = EmptyGraph.instance().traversal();
- final Bytecode bytecode = g.V().out().asAdmin().getBytecode();
- final Bytecode bytecodeClone = bytecode.clone();
- assertEquals(bytecode, bytecodeClone);
- assertEquals(bytecode.hashCode(), bytecodeClone.hashCode());
- bytecodeClone.addStep("in", "created"); // mutate the clone and the original should stay the same
- assertNotEquals(bytecode, bytecodeClone);
- assertNotEquals(bytecode.hashCode(), bytecodeClone.hashCode());
- assertEquals(2, IteratorUtils.count(bytecode.getInstructions()));
- assertEquals(3, IteratorUtils.count(bytecodeClone.getInstructions()));
- }
-
- @Test
- public void shouldIncludeBindingsInEquality() {
- final Bindings b = Bindings.instance();
- final GraphTraversalSource g = EmptyGraph.instance().traversal();
-
- final Bytecode bytecode1 = g.V().out(b.of("a", "created")).asAdmin().getBytecode();
- final Bytecode bytecode2 = g.V().out(b.of("a", "knows")).asAdmin().getBytecode();
- final Bytecode bytecode3 = g.V().out(b.of("b", "knows")).asAdmin().getBytecode();
- final Bytecode bytecode4 = g.V().out(b.of("b", "knows")).asAdmin().getBytecode();
-
- assertNotEquals(bytecode1, bytecode2);
- assertNotEquals(bytecode1, bytecode3);
- assertNotEquals(bytecode2, bytecode3);
- assertNotEquals(bytecode2, bytecode4);
- assertNotEquals(bytecode1, bytecode4);
- assertEquals(bytecode3, bytecode4);
-
- assertEquals(1, bytecode1.getBindings().size());
- assertEquals("created", bytecode1.getBindings().get("a"));
- }
-
- @Test
- public void shouldIncludeBindingsInNestedTraversals() {
- // adding the choose() step as part of TINKERPOP-2458
- final Bindings b = Bindings.instance();
- final GraphTraversalSource g = EmptyGraph.instance().traversal();
- final Bytecode bytecode = g.V().in(b.of("a","created")).
- choose(__.out().count()).
- option(b.of("two", 2), __.values("name")).
- option(b.of("three",3), __.values("age")).
- where(__.out(b.of("b","knows")).
- has("age",b.of("c",P.gt(32))).
- map(__.values(b.of("d","name")))).
- in(b.of("a", "created")).asAdmin().getBytecode();
- assertEquals(6, bytecode.getBindings().size());
- assertEquals("created", bytecode.getBindings().get("a"));
- assertEquals("knows", bytecode.getBindings().get("b"));
- assertEquals(P.gt(32), bytecode.getBindings().get("c"));
- assertEquals("name", bytecode.getBindings().get("d"));
- assertEquals(2, bytecode.getBindings().get("two"));
- assertEquals(3, bytecode.getBindings().get("three"));
-
- Bytecode.Binding binding = (Bytecode.Binding) bytecode.getStepInstructions().get(1).getArguments()[0];
- assertEquals("a", binding.variable());
- assertEquals("created", binding.value());
- binding = (Bytecode.Binding) bytecode.getStepInstructions().get(3).getArguments()[0];
- assertEquals("two", binding.variable());
- assertEquals(2, binding.value());
- binding = (Bytecode.Binding) bytecode.getStepInstructions().get(4).getArguments()[0];
- assertEquals("three", binding.variable());
- assertEquals(3, binding.value());
- binding = (Bytecode.Binding) ((Bytecode) bytecode.getStepInstructions().get(5).getArguments()[0]).getStepInstructions().get(0).getArguments()[0];
- assertEquals("b", binding.variable());
- assertEquals("knows", binding.value());
- binding = (Bytecode.Binding) ((Bytecode) bytecode.getStepInstructions().get(5).getArguments()[0]).getStepInstructions().get(1).getArguments()[1];
- assertEquals("c", binding.variable());
- assertEquals(P.gt(32), binding.value());
- binding = (Bytecode.Binding) ((Bytecode) ((Bytecode) bytecode.getStepInstructions().get(5).getArguments()[0]).getStepInstructions().get(2).getArguments()[0]).getStepInstructions().get(0).getArguments()[0];
- assertEquals("d", binding.variable());
- assertEquals("name", binding.value());
- binding = (Bytecode.Binding) bytecode.getStepInstructions().get(6).getArguments()[0];
- assertEquals("a", binding.variable());
- assertEquals("created", binding.value());
- }
-
-
- @Test
- public void testOnlySingleInstructionPerStrategyOnBytecode() throws Exception {
- GraphTraversalSource g = EmptyGraph.instance().traversal();
- assertFalse(g.getStrategies().getStrategy(SubgraphStrategy.class).isPresent());
- g = g.withStrategies(SubgraphStrategy.create(new MapConfiguration(new HashMap<String, Object>() {{
- put("vertices", __.hasLabel("person"));
- put("vertexProperties", __.limit(0));
- put("edges", __.hasLabel("knows"));
- }})));
- assertTrue(g.getStrategies().getStrategy(SubgraphStrategy.class).isPresent());
- Bytecode bytecode = g.getBytecode();
- assertEquals(1, bytecode.getSourceInstructions().get(0).getArguments().length);
- assertEquals(SubgraphStrategy.class, bytecode.getSourceInstructions().get(0).getArguments()[0].getClass());
-
- // Test applying another withStrategies with same strategy does not add a new entry.
- g = g.withStrategies(SubgraphStrategy.create(new MapConfiguration(new HashMap<String, Object>() {{
- put("vertices", __.hasLabel("person"));
- put("vertexProperties", __.limit(0));
- put("edges", __.hasLabel("knows"));
- }})));
- assertEquals(1, bytecode.getSourceInstructions().get(0).getArguments().length);
- assertEquals(SubgraphStrategy.class, bytecode.getSourceInstructions().get(0).getArguments()[0].getClass());
-
- g = g.withoutStrategies(SubgraphStrategy.class);
- assertFalse(g.getStrategies().getStrategy(SubgraphStrategy.class).isPresent());
- bytecode = g.getBytecode();
- assertEquals(2, bytecode.getSourceInstructions().size());
- // 1 withStrategies instruction
- assertEquals(1, bytecode.getSourceInstructions().get(0).getArguments().length);
- // 1 withoutStrategies instruction
- assertEquals(1, bytecode.getSourceInstructions().get(1).getArguments().length);
-
- // Reset everything
- g = EmptyGraph.instance().traversal();
- assertFalse(g.getStrategies().getStrategy(ReadOnlyStrategy.class).isPresent());
- g = g.withStrategies(ReadOnlyStrategy.instance())
- .withStrategies(ReadOnlyStrategy.instance())
- .withStrategies(SubgraphStrategy.build().edges(__.hasLabel("knows")).create())
- .withStrategies(SubgraphStrategy.build().edges(__.hasLabel("knows")).create());
- assertTrue(g.getStrategies().getStrategy(ReadOnlyStrategy.class).isPresent());
- assertTrue(g.getStrategies().getStrategy(SubgraphStrategy.class).isPresent());
- bytecode = g.getBytecode();
- // Two instructions for two unique withStrategies() steps
- assertEquals(2, bytecode.getSourceInstructions().size());
- assertEquals(1, bytecode.getSourceInstructions().get(0).getArguments().length);
- assertEquals(1, bytecode.getSourceInstructions().get(1).getArguments().length);
- assertEquals(2, g.getStrategies().toList().size());
-
- g = g.withoutStrategies(ReadOnlyStrategy.class).withoutStrategies(ReadOnlyStrategy.class);
- assertFalse(g.getStrategies().getStrategy(ReadOnlyStrategy.class).isPresent());
- assertEquals(1, g.getStrategies().toList().size());
- bytecode = g.getBytecode();
- // 2 withStrategies instructions above, 1 withoutStrategies instruction
- assertEquals(3, bytecode.getSourceInstructions().size());
- // 1 withoutStrategies instruction, no duplicates
- assertEquals(1, bytecode.getSourceInstructions().get(2).getArguments().length);
- }
-
- @Test
- public void shouldConvertStrategies() {
- final GraphTraversalSource g = EmptyGraph.instance().traversal();
- Bytecode bytecode = g.withStrategies(ReadOnlyStrategy.instance()).getBytecode();
- assertEquals(ReadOnlyStrategy.instance(), bytecode.getSourceInstructions().get(0).getArguments()[0]);
- bytecode = g.withStrategies(SubgraphStrategy.build().edges(__.hasLabel("knows")).create()).getBytecode();
- assertEquals(SubgraphStrategy.build().edges(__.hasLabel("knows")).create().getEdgeCriterion().asAdmin().getBytecode(),
- ((SubgraphStrategy) bytecode.getSourceInstructions().iterator().next().getArguments()[0]).getEdgeCriterion().asAdmin().getBytecode());
- }
-
- @Test
- public void shouldConvertComputer() {
- final GraphTraversalSource g = EmptyGraph.instance().traversal();
- Bytecode bytecode = g.withComputer(Computer.compute().workers(10)).getBytecode();
- assertEquals(VertexProgramStrategy.build().create(), bytecode.getSourceInstructions().get(0).getArguments()[0]);
- assertEquals(VertexProgramStrategy.build().workers(10).create().getConfiguration().getInt(VertexProgramStrategy.WORKERS),
- ((VertexProgramStrategy) bytecode.getSourceInstructions().iterator().next().getArguments()[0]).getConfiguration().getInt(VertexProgramStrategy.WORKERS));
- }
-
- @Test
- public void shouldNotHaveHashCollisionsWithBindings() {
- // ideally we should be using guava's EqualsTester to test equals/hashCode but the equals/hashCode contract allows hash collisions.
- // Yet we should avoid hash collisions in case these objects are being used in data structures that rely on hashCode
- final Bytecode.Binding<String> first = new Bytecode.Binding<>("3", "7");
- final Bytecode.Binding<String> second = new Bytecode.Binding<>("7", "3");
- assertNotEquals(first, second);
- assertNotEquals(first.hashCode(), second.hashCode());
- }
-
- @Test
- public void shouldNotHaveHashCollisions() {
- // ideally we should be using guava's EqualsTester to test equals/hashCode but the equals/hashCode contract allows hash collisions.
- // Yet we should avoid hash collisions in case these objects are being used in data structures that rely on hashCode
- final Bytecode first = new Bytecode();
- first.addSource("3", "7");
- first.addStep("7", "3");
- final Bytecode second = new Bytecode();
- second.addSource("7", "3");
- second.addStep("3", "7");
- assertNotEquals(first, second);
- assertNotEquals(first.hashCode(), second.hashCode());
- }
-
- @Test
- public void shouldHandleArrays() {
- final Bytecode b = new Bytecode();
- b.addStep(GraphTraversal.Symbols.property, "k", new Object[] { new String[] {"A", "B", "C"}});
- assertEquals(1, b.getStepInstructions().size());
- assertEquals(2, b.getStepInstructions().get(0).getArguments().length);
- }
-
- @Test
- public void shouldAvoidArgumentsNpe() {
- final Bytecode first = new Bytecode();
- try {
- first.addSource("3", null);
- first.addSource(TraversalSource.Symbols.withoutStrategies, null);
- } catch (Exception e) {
- e.getCause().printStackTrace(System.err);
- }
- }
-}
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/GremlinLangTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/GremlinLangTest.java
new file mode 100644
index 0000000..09a8a21
--- /dev/null
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/GremlinLangTest.java
@@ -0,0 +1,169 @@
+/*
+ * 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;
+
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
+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.strategy.decoration.SeedStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SubgraphStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ReadOnlyStrategy;
+import org.apache.tinkerpop.gremlin.structure.T;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex;
+import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
+import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceEdge;
+import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceVertex;
+import org.apache.tinkerpop.gremlin.util.DatetimeHelper;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.UUID;
+
+import static org.apache.tinkerpop.gremlin.process.traversal.AnonymousTraversalSource.traversal;
+import static org.apache.tinkerpop.gremlin.process.traversal.Scope.local;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.both;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.hasLabel;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.out;
+import static org.apache.tinkerpop.gremlin.util.CollectionUtil.asMap;
+import static org.junit.Assert.assertEquals;
+
+@RunWith(Parameterized.class)
+public class GremlinLangTest {
+
+ private static final GraphTraversalSource g = traversal().with(EmptyGraph.instance());
+
+ @Parameterized.Parameter(value = 0)
+ public Traversal traversal;
+
+ @Parameterized.Parameter(value = 1)
+ public String expected;
+
+ @Test
+ public void doTest() {
+ final String gremlin = traversal.asAdmin().getGremlinLang().getGremlin();
+ assertEquals(expected, gremlin);
+ }
+
+ private static GraphTraversalSource newG() {
+ final GraphTraversalSource g = traversal().with(EmptyGraph.instance());
+ g.getGremlinLang().reset();
+ return g;
+ }
+
+ @Parameterized.Parameters(name = "{0}")
+ public static Iterable<Object[]> generateTestParameters() {
+ return Arrays.asList(new Object[][]{
+ {g.V().count(), "g.V().count()"},
+ {g.addV("test"), "g.addV(\"test\")"},
+ {g.addV("t\"'est"), "g.addV(\"t\\\"'est\")"},
+ {g.inject(true, (byte) 1, (short) 2, 3, 4L, 5f, 6d, BigInteger.valueOf(7L), BigDecimal.valueOf(8L)),
+ "g.inject(true,1B,2S,3,4L,5.0F,6.0D,7N,8M)"},
+ {g.inject(Double.POSITIVE_INFINITY, Double.NEGATIVE_INFINITY),
+ "g.inject(+Infinity,-Infinity)"},
+ {g.inject(DatetimeHelper.parse("2018-03-21T08:35:44.741Z")),
+ "g.inject(datetime(\"2018-03-21T08:35:44.741Z\"))"},
+ {g.inject(asMap("age", VertexProperty.Cardinality.list(33))),
+ "g.inject([\"age\":Cardinality.list(33)])"},
+ {g.inject(new HashMap<>()), "g.inject([:])"},
+ {g.inject(UUID.fromString("bfa9bbe8-c3a3-4017-acc3-cd02dda55e3e")), "g.inject(UUID(\"bfa9bbe8-c3a3-4017-acc3-cd02dda55e3e\"))"},
+ {g.V(1).out("knows").values("name"), "g.V(1).out(\"knows\").values(\"name\")"},
+ {g.V().has(T.label, "person"), "g.V().has(T.label,\"person\")"},
+ {g.addE("knows").from(new DetachedVertex(1, "test1", Collections.emptyList())).to(new DetachedVertex(6, "test2", Collections.emptyList())),
+ "g.addE(\"knows\").from(1).to(6)"},
+ {newG().E(new ReferenceEdge(1, "test label", new ReferenceVertex(1, "v1"), new ReferenceVertex(1, "v1"))),
+ "g.E(_0)"},
+ {g.V().hasId(P.within(Collections.emptyList())).count(), "g.V().hasId(P.within([])).count()"},
+ {g.V(1).outE().has("weight", P.inside(0.0, 0.6)), "g.V(1).outE().has(\"weight\",P.gt(0.0D).and(P.lt(0.6D)))"},
+ {g.withSack(1.0, Operator.sum).V(1).local(__.out("knows").barrier(SackFunctions.Barrier.normSack)).in("knows").barrier().sack(),
+ "g.withSack(1.0D,Operator.sum).V(1).local(__.out(\"knows\").barrier(Barrier.normSack)).in(\"knows\").barrier().sack()"},
+ {g.inject(Arrays.asList(1, 2, 3)).skip(local, 1), "g.inject([1,2,3]).skip(Scope.local,1L)"},
+ {g.V().repeat(both()).times(10), "g.V().repeat(__.both()).times(10)"},
+ {g.V().has("name", "marko").
+ project("name", "friendsNames").
+ by("name").
+ by(out("knows").values("name").fold()),
+ "g.V().has(\"name\",\"marko\")." +
+ "project(\"name\",\"friendsNames\")." +
+ "by(\"name\")." +
+ "by(__.out(\"knows\").values(\"name\").fold())"},
+ {g.inject(new int[]{5, 6}).union(__.V(Arrays.asList(1, 2)), __.V(Arrays.asList(3L, new int[]{4}))),
+ "g.inject([5,6]).union(__.V([1,2]),__.V([3L,[4]]))"},
+ {g.with("evaluationTimeout", 1000).V(), "g.V()"},
+ {g.withSideEffect("a", 1).V(), "g.withSideEffect(\"a\",1).V()"},
+ {g.withStrategies(ReadOnlyStrategy.instance()).V(), "g.withStrategies(ReadOnlyStrategy).V()"},
+ {g.withoutStrategies(ReadOnlyStrategy.class).V(), "g.withoutStrategies(ReadOnlyStrategy).V()"},
+ {g.withStrategies(new SeedStrategy(999999)).V().order().by("name").coin(0.5),
+ "g.withStrategies(new SeedStrategy(seed:999999L)).V().order().by(\"name\").coin(0.5D)"},
+ {g.withStrategies(SubgraphStrategy.build().vertices(hasLabel("person")).create()).V(),
+ "g.withStrategies(new SubgraphStrategy(checkAdjacentVertices:true,vertices:__.hasLabel(\"person\"))).V()",},
+ {g.withStrategies(SubgraphStrategy.build().vertices(__.has("name", P.within("josh", "lop", "ripple"))).create()).V(),
+ "g.withStrategies(new SubgraphStrategy(checkAdjacentVertices:true,vertices:__.has(\"name\",P.within([\"josh\",\"lop\",\"ripple\"])))).V()"},
+ {g.inject(GValue.of("x", "x")).V(GValue.of("ids", new int[]{1, 2, 3})), "g.inject(x).V(ids)"},
+ {newG().inject(GValue.of(null, "test1"), GValue.of("xx2", "test2")), "g.inject(\"test1\",xx2)"},
+ {newG().inject(new HashSet<>(Arrays.asList(1, 2))), "g.inject({1,2})"},
+ });
+ }
+
+ public static class ParameterTests {
+
+ @Test(expected = IllegalArgumentException.class)
+ public void shouldCheckParameterNameDontNeedEscaping() {
+ g.V(GValue.of("\"", new int[]{1, 2, 3}));
+ }
+
+ @Test(expected = IllegalArgumentException.class)
+ public void shouldCheckParameterNameIsNotNumber() {
+ g.V(GValue.of("1", new int[]{1, 2, 3}));
+ }
+
+ @Test(expected = IllegalArgumentException.class)
+ public void shouldCheckParameterNameIsValidIdentifier() {
+ g.V(GValue.of("1a", new int[]{1, 2, 3}));
+ }
+
+ @Test(expected = IllegalArgumentException.class)
+ public void shouldCheckParameterNameIsNotReserved() {
+ g.V(GValue.of("_1", new int[]{1, 2, 3}));
+ }
+
+ @Test(expected = IllegalArgumentException.class)
+ public void shouldNowAllowParameterNameDuplicates() {
+ final GremlinLang gremlin = g.inject(GValue.of("ids", new int[]{1, 2})).V(GValue.of("ids", new int[]{2, 3}))
+ .asAdmin().getGremlinLang();
+ }
+
+ @Test
+ public void shouldAllowToUseSameParameterTwice() {
+ final int[] value = new int[]{1, 2, 3};
+ final GValue<int[]> gValue = GValue.of("ids", value);
+ final GremlinLang gremlin = g.inject(gValue).V(gValue).asAdmin().getGremlinLang();
+
+ assertEquals("g.inject(ids).V(ids)", gremlin.getGremlin());
+ assertEquals(value, gremlin.getParameters().get("ids"));
+ }
+ }
+}
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalTest.java
index d880af7..fa4f9b2 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalTest.java
@@ -271,8 +271,8 @@
}
@Override
- public Bytecode getBytecode() {
- return new Bytecode();
+ public GremlinLang getGremlinLang() {
+ return new GremlinLang();
}
@Override
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSourceTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSourceTest.java
index 3094cbc..cf1ab59 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSourceTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSourceTest.java
@@ -20,33 +20,32 @@
import org.apache.commons.configuration2.MapConfiguration;
import org.apache.tinkerpop.gremlin.process.remote.RemoteConnection;
+import org.apache.tinkerpop.gremlin.process.traversal.GremlinLang;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.Order;
+import org.apache.tinkerpop.gremlin.process.traversal.step.GValue;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SubgraphStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ReadOnlyStrategy;
import org.apache.tinkerpop.gremlin.structure.T;
-import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
import org.apache.tinkerpop.gremlin.util.CollectionUtil;
import org.junit.Test;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import static org.apache.tinkerpop.gremlin.process.traversal.AnonymousTraversalSource.traversal;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.collection.IsIterableContainingInAnyOrder.containsInAnyOrder;
+import static org.hamcrest.core.Is.is;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import static org.mockito.Answers.RETURNS_DEEP_STUBS;
-import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
/**
* @author Stephen Mallette (http://stephen.genoprime.com)
@@ -151,4 +150,31 @@
final List<Object> l = g.V().values("name").order().by(Order.shuffle).limit(3).toList();
assertThat(l, containsInAnyOrder("peter", "lop", "josh"));
}
+
+ @Test
+ public void shouldContainReuseableGremlinLang() {
+ final Pattern paramPatter = Pattern.compile("xx\\d+");
+ assertThat(g.getGremlinLang().getOptionsStrategies().isEmpty(), is(true));
+ g.with("a", "1").V();
+ assertThat(g.getGremlinLang().getOptionsStrategies().isEmpty(), is(true));
+ g.with("b", "2").V();
+ assertThat(g.getGremlinLang().getOptionsStrategies().isEmpty(), is(true));
+
+ assertThat(g.getGremlinLang().getParameters().isEmpty(), is(true));
+ GremlinLang lang = g.V(GValue.of("xx1", 11)).asAdmin().getGremlinLang();
+ assertThat(g.getGremlinLang().getParameters().isEmpty(), is(true));
+ assertThat(lang.getParameters().size(), is(1));
+ assertThat(lang.getParameters().values(), containsInAnyOrder(11));
+ Matcher paramMatcher = paramPatter.matcher(lang.getGremlin());
+ paramMatcher.find();
+ assertThat(lang.getParameters().keySet(), containsInAnyOrder(paramMatcher.group()));
+
+ lang = g.V(GValue.of("xx2", 22)).asAdmin().getGremlinLang();
+ assertThat(g.getGremlinLang().getParameters().isEmpty(), is(true));
+ assertThat(lang.getParameters().size(), is(1));
+ assertThat(lang.getParameters().values(), containsInAnyOrder(22));
+ paramMatcher = paramPatter.matcher(lang.getGremlin());
+ paramMatcher.find();
+ assertThat(lang.getParameters().keySet(), containsInAnyOrder(paramMatcher.group()));
+ }
}
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalTest.java
index ed0a8cd..ad1515d 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalTest.java
@@ -18,30 +18,26 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.dsl.graph;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
import org.apache.tinkerpop.gremlin.process.traversal.Merge;
-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.step.GValue;
+import org.apache.tinkerpop.gremlin.structure.Direction;
import org.apache.tinkerpop.gremlin.structure.T;
import org.apache.tinkerpop.gremlin.structure.VertexProperty;
import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
+import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceVertex;
import org.apache.tinkerpop.gremlin.util.CollectionUtil;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.lang.reflect.Method;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.List;
+import java.util.LinkedHashMap;
import java.util.Map;
-import java.util.Random;
import java.util.Set;
-import java.util.function.Consumer;
import static org.apache.tinkerpop.gremlin.process.traversal.AnonymousTraversalSource.traversal;
import static org.junit.Assert.assertEquals;
@@ -56,7 +52,6 @@
private static Set<String> NO_GRAPH = new HashSet<>(Arrays.asList("asAdmin", "by", "read", "write", "with", "option", "iterate", "to", "from", "profile", "pageRank", "connectedComponent", "peerPressure", "shortestPath", "program", "discard"));
private static Set<String> NO_ANONYMOUS = new HashSet<>(Arrays.asList("start", "__"));
- private static Set<String> IGNORES_BYTECODE = new HashSet<>(Arrays.asList("asAdmin", "read", "write", "iterate"));
@Test(expected = IllegalArgumentException.class)
public void shouldFailPropertyWithNullVertexId() {
@@ -143,116 +138,44 @@
}
@Test
- public void shouldGenerateCorrespondingBytecodeFromGraphTraversalMethods() throws Exception {
- final long seed = System.currentTimeMillis();
- final Random random = new Random(seed);
- logger.info("***RANDOM*** GraphTraversalTest.shouldGenerateCorrespondingBytecodeFromGraphTraversalMethods - seed is {}", seed);
-
- for (Method stepMethod : GraphTraversal.class.getMethods()) {
- if (Traversal.class.isAssignableFrom(stepMethod.getReturnType()) && !IGNORES_BYTECODE.contains(stepMethod.getName())) {
- final GraphTraversal.Admin<?, ?> traversal = new DefaultGraphTraversal<>();
- Object[] arguments = new Object[stepMethod.getParameterCount()];
- final List<Object> list = new ArrayList<>();
- boolean doTest = true;
- ///
- if (stepMethod.getName().equals("by"))
- traversal.order();
- else if (stepMethod.getName().equals("with"))
- randomPossibleStep(random, traversal,
- GraphTraversal::V, GraphTraversal::shortestPath, GraphTraversal::pageRank,
- GraphTraversal::connectedComponent, GraphTraversal::peerPressure);
- else if (stepMethod.getName().equals("option"))
- traversal.branch(__.identity().out(randomString(random)));
- else if (stepMethod.getName().equals("to") || stepMethod.getName().equals("from"))
- traversal.addE(randomString(random));
-
- if (stepMethod.getName().equals("range") && !GValue.class.isAssignableFrom(stepMethod.getParameterTypes()[1])) { // skip GValue case
- if (Scope.class.isAssignableFrom(stepMethod.getParameterTypes()[0])) {
- list.add(arguments[0] = Scope.local);
- list.add(arguments[1] = (long) (Math.abs(random.nextInt(10))));
- list.add(arguments[2] = (long) (Math.abs(random.nextInt(10) + 100)));
- } else {
- list.add(arguments[0] = (long) (Math.abs(random.nextInt(10))));
- list.add(arguments[1] = (long) (Math.abs(random.nextInt(10) + 100)));
- }
- } else if (stepMethod.getName().equals("math")) {
- list.add(arguments[0] = random.nextInt(100) + " + " + random.nextInt(100));
- } else if (stepMethod.getName().equals("project")) {
- // project has two arguments [String, String[]]
- list.add(arguments[0] = randomString(random));
- arguments[1] = new String[random.nextInt(10) + 1];
- for (int j = 0; j < ((String[]) arguments[1]).length; j++) {
- ((String[]) arguments[1])[j] = arguments[0] + randomString(random); // adds argument[0] to avoid getting its duplicate in argument[1]
- }
- // remove duplicates in argument[1] if any
- arguments[1] = Arrays.stream((String[]) arguments[1]).distinct().toArray(String[]::new);
- list.addAll(Arrays.asList((String[]) arguments[1]));
- } else {
- for (int i = 0; i < stepMethod.getParameterTypes().length; i++) {
- final Class<?> type = stepMethod.getParameterTypes()[i];
- if (int.class.isAssignableFrom(type))
- list.add(arguments[i] = Math.abs(random.nextInt(100)));
- else if (long.class.isAssignableFrom(type))
- list.add(arguments[i] = (long) (Math.abs(random.nextInt(100))));
- else if (double.class.isAssignableFrom(type))
- list.add(arguments[i] = Math.abs(random.nextDouble()));
- else if (String.class.isAssignableFrom(type))
- list.add(arguments[i] = randomString(random));
- else if (boolean.class.isAssignableFrom(type))
- list.add(arguments[i] = random.nextBoolean());
- else if (String[].class.isAssignableFrom(type)) {
- arguments[i] = new String[random.nextInt(10) + 1];
- for (int j = 0; j < ((String[]) arguments[i]).length; j++) {
- list.add(((String[]) arguments[i])[j] = randomString(random));
- }
- } else if (Traversal.class.isAssignableFrom(type))
- list.add(arguments[i] = __.out(randomString(random)).in(randomString(random)).groupCount(randomString(random)));
- else if (Traversal[].class.isAssignableFrom(type)) {
- arguments[i] = new Traversal[random.nextInt(5) + 1];
- for (int j = 0; j < ((Traversal[]) arguments[i]).length; j++) {
- list.add(((Traversal[]) arguments[i])[j] = __.as(randomString(random)).out(randomString(random)).both(randomString(random)).has(randomString(random)).store(randomString(random)));
- }
- } else if (P.class.isAssignableFrom(type))
- list.add(arguments[i] = P.gte(stepMethod.getName().contains("where") ? randomString(random) : random.nextInt()));
- else if (Enum.class.isAssignableFrom(type))
- list.add(arguments[i] = type.getEnumConstants()[0]);
- else {
- // System.out.println(type);
- doTest = false;
- break;
- }
- }
- }
- if (doTest) {
- stepMethod.invoke(traversal, arguments);
- // System.out.print(stepMethod.getName() + "---");
- final Bytecode.Instruction instruction = traversal.getBytecode().getStepInstructions().get(traversal.getBytecode().getStepInstructions().size() - 1);
- // System.out.println(instruction);
- assertEquals(stepMethod.getName(), instruction.getOperator());
- assertEquals(list.size(), instruction.getArguments().length);
- for (int i = 0; i < list.size(); i++) {
- assertEquals(list.get(i) instanceof Traversal ? ((Traversal) list.get(i)).asAdmin().getBytecode() : list.get(i), instruction.getArguments()[i]);
- }
- }
- }
- }
- }
-
- private static void randomPossibleStep(final Random random, final GraphTraversal t, final Consumer<GraphTraversal>... possible) {
- possible[random.nextInt(possible.length)].accept(t);
- }
-
- private static String randomString(final Random random) {
- String s = "";
- for (int i = 0; i < random.nextInt(10) + 1; i++) {
- s = (s + (char) (random.nextInt(100) + 1)).trim();
- }
- final String temp = "" + random.nextBoolean();
- return temp.substring(temp.length() - (random.nextInt(2) + 1)) + s.replace("\"", "x").replace(",", "y").replace("'", "z");
- }
-
public void hasIdShouldUnrollListOfIds() {
assertEquals(g.V().hasId(1,2,3,4,5,6,7,8),
g.V().hasId(new Integer[]{1, 2, 3}, new Integer[]{4, 5}, Arrays.asList(6, 7), 8));
}
+
+ @Test
+ public void hasIdShouldUnrollGValueListOfIds() {
+ assertEquals(
+ g.V().hasId(
+ GValue.ofInteger(null, 1), GValue.ofInteger(null, 2), GValue.ofInteger(null, 3),
+ GValue.ofInteger(null, 4), GValue.ofInteger(null, 5), GValue.ofInteger(null, 6),
+ GValue.ofInteger(null, 7), GValue.ofInteger("d", 8)
+ ),
+ g.V().hasId(
+ GValue.of("a", new Integer[]{1, 2, 3}), GValue.of("b", new Integer[]{4, 5}),
+ GValue.of("c", Arrays.asList(6, 7)), GValue.ofInteger("d", 8)));
+ }
+
+ @Test
+ public void shouldExtractIdFromVertex() {
+ GraphTraversal VStart = g.V(1, new ReferenceVertex(2));
+ assertEquals("g.V(1,2)", VStart.asAdmin().getGremlinLang().getGremlin());
+
+ GraphTraversal VMid = g.inject("foo").V(1, new ReferenceVertex(2));
+ assertEquals("g.inject(\"foo\").V(1,2)", VMid.asAdmin().getGremlinLang().getGremlin());
+
+ GraphTraversal fromTo = g.addE("Edge").from(new ReferenceVertex(1)).to(new ReferenceVertex(2));
+ assertEquals("g.addE(\"Edge\").from(1).to(2)", fromTo.asAdmin().getGremlinLang().getGremlin());
+
+ Map mergeMap = new LinkedHashMap();
+ mergeMap.put(T.label, "knows");
+ mergeMap.put(Direction.OUT, new ReferenceVertex(1));
+ mergeMap.put(Direction.IN, new ReferenceVertex(2));
+
+ GraphTraversal mergeEStart = g.mergeE(mergeMap);
+ assertEquals("g.mergeE([(T.label):\"knows\",(Direction.OUT):1,(Direction.IN):2])", mergeEStart.asAdmin().getGremlinLang().getGremlin());
+
+ GraphTraversal mergeEMid = g.inject("foo").mergeE(mergeMap);
+ assertEquals("g.inject(\"foo\").mergeE([(T.label):\"knows\",(Direction.OUT):1,(Direction.IN):2])", mergeEMid.asAdmin().getGremlinLang().getGremlin());
+ }
}
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 0000000..539cbfc
--- /dev/null
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/GTypeTest.java
@@ -0,0 +1,91 @@
+/*
+ * 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.time.OffsetDateTime;
+import java.util.Collections;
+import java.util.UUID;
+
+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.BYTE.isNumeric(), is(true));
+ assertThat(GType.SHORT.isNumeric(), is(true));
+ assertThat(GType.INTEGER.isNumeric(), is(true));
+ assertThat(GType.FLOAT.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.VERTEX.isNumeric(), is(false));
+ assertThat(GType.CHARACTER.isNumeric(), is(false));
+ assertThat(GType.DATETIME.isNumeric(), is(false));
+ assertThat(GType.LIST.isNumeric(), is(false));
+ assertThat(GType.MAP.isNumeric(), is(false));
+ assertThat(GType.SET.isNumeric(), is(false));
+ assertThat(GType.UUID.isNumeric(), is(false));
+ assertThat(GType.UNKNOWN.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.BIG_INTEGER, GType.getType(BigInteger.ONE));
+ assertEquals(GType.BIG_DECIMAL, GType.getType(BigDecimal.ONE));
+ assertEquals(GType.BYTE, GType.getType((byte) 123));
+ assertEquals(GType.CHARACTER, GType.getType('A'));
+ assertEquals(GType.DATETIME, GType.getType(OffsetDateTime.now()));
+ assertEquals(GType.FLOAT, GType.getType(123.45f));
+ assertEquals(GType.SHORT, GType.getType((short) 123));
+ assertEquals(GType.UUID, GType.getType(UUID.randomUUID()));
+ }
+
+ @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/filter/DedupGlobalStepTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/DedupGlobalStepTest.java
index 77c8522..ad94b46 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/DedupGlobalStepTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/DedupGlobalStepTest.java
@@ -29,7 +29,8 @@
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
-import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertEquals;
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/NoneStepTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/NoneStepTest.java
index f7c1f37..8713efe 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/NoneStepTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/NoneStepTest.java
@@ -87,4 +87,4 @@
assertEquals(6L, __.__(validOne, null, containsNull, validEmpty, invalidIncorrectType, validIncorrectType, valueTooSmall, validTwo, validThree)
.none(P.lte(3)).count().next().longValue());
}
-}
\ No newline at end of file
+}
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 1286752..f7dd4bb 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 @@
@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"));
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/RangeLocalStepTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/RangeLocalStepTest.java
index c7ef28e..8035010 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/RangeLocalStepTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/RangeLocalStepTest.java
@@ -24,20 +24,21 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.commons.lang3.tuple.Pair;
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.__;
-import org.apache.tinkerpop.gremlin.process.traversal.step.GValue;
-import org.apache.tinkerpop.gremlin.process.traversal.step.GValueStepTest;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.RangeStepPlaceholder;
+
import org.junit.Test;
import static org.apache.tinkerpop.gremlin.process.traversal.step.map.RangeLocalStep.applyRange;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
+import org.apache.tinkerpop.gremlin.process.traversal.step.GValue;
+import org.apache.tinkerpop.gremlin.process.traversal.step.GValueStepTest;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.RangeStepPlaceholder;
/**
* @author Daniel Kuppitz (http://gremlin.guru)
@@ -61,52 +62,6 @@
);
}
- @Override
- protected List<Pair<Traversal, Set<String>>> getGValueTraversals() {
- return List.of(
- Pair.of(__.limit(Scope.local, GValue.of("limit", HIGH_VALUE)), Set.of("limit")),
- Pair.of(__.skip(Scope.local, GValue.of("skip", HIGH_VALUE)), Set.of("skip")),
- Pair.of(__.range(Scope.local, GValue.of(LOW_NAME, LOW_VALUE), GValue.of(HIGH_NAME, HIGH_VALUE)), Set.of(LOW_NAME, HIGH_NAME))
- );
- }
-
- @Test
- public void getLowHighRangeNonGValue() {
- GraphTraversal.Admin<Object, Object> traversal = __.range(Scope.local, LOW_VALUE, HIGH_VALUE).asAdmin();
- assertEquals((Long) LOW_VALUE, ((RangeLocalStep) traversal.getSteps().get(0)).getLowRange());
- assertEquals((Long) HIGH_VALUE, ((RangeLocalStep) traversal.getSteps().get(0)).getHighRange());
- verifyNoVariables(traversal);
- }
-
- @Test
- public void getLowHighRangeGValueSafeShouldNotPinVariables() {
- GraphTraversal.Admin<Object, Object> traversal = __.range(Scope.local, GValue.of(LOW_NAME, LOW_VALUE), GValue.of(HIGH_NAME, HIGH_VALUE)).asAdmin();
- assertEquals(LOW_VALUE, ((RangeStepPlaceholder.RangeLocalStepPlaceholder) traversal.getSteps().get(0)).getLowRangeGValueSafe());
- assertEquals(HIGH_VALUE, ((RangeStepPlaceholder.RangeLocalStepPlaceholder) traversal.getSteps().get(0)).getHighRangeGValueSafe());
- verifyVariables(traversal, Set.of(), Set.of(LOW_NAME, HIGH_NAME));
- }
-
- @Test
- public void getLowShouldPinVariable() {
- GraphTraversal.Admin<Object, Object> traversal = __.range(Scope.local, GValue.of(LOW_NAME, LOW_VALUE), GValue.of(HIGH_NAME, HIGH_VALUE)).asAdmin();
- assertEquals((Long) LOW_VALUE, ((RangeStepPlaceholder.RangeLocalStepPlaceholder) traversal.getSteps().get(0)).getLowRange());
- verifyVariables(traversal, Set.of(LOW_NAME), Set.of(HIGH_NAME));
- }
-
- @Test
- public void getHighShouldPinVariable() {
- GraphTraversal.Admin<Object, Object> traversal = __.range(Scope.local, GValue.of(LOW_NAME, LOW_VALUE), GValue.of(HIGH_NAME, HIGH_VALUE)).asAdmin();
- assertEquals((Long) HIGH_VALUE, ((RangeStepPlaceholder.RangeLocalStepPlaceholder) traversal.getSteps().get(0)).getHighRange());
- verifyVariables(traversal, Set.of(HIGH_NAME), Set.of(LOW_NAME));
- }
-
- @Test
- public void getLowHighRangeGValueFromConcreteStep() {
- GraphTraversal.Admin<Object, Object> traversal = __.range(Scope.local, GValue.of(LOW_NAME, LOW_VALUE), GValue.of(HIGH_NAME, HIGH_VALUE)).asAdmin();
- assertEquals((Long) LOW_VALUE, ((RangeStepPlaceholder.RangeLocalStepPlaceholder) traversal.getSteps().get(0)).asConcreteStep().getLowRange());
- assertEquals((Long) HIGH_VALUE, ((RangeStepPlaceholder.RangeLocalStepPlaceholder) traversal.getSteps().get(0)).asConcreteStep().getHighRange());
- }
-
@Test
public void applyRangeShouldReturnCollectionForSingleElementFromList() {
// Test that range(local) returns a collection even for single element results
@@ -197,4 +152,50 @@
// Test that unbounded range (high = -1) works correctly
assertEquals(List.of(3, 4, 5), applyRange(List.of(1, 2, 3, 4, 5), 2, -1));
}
+
+ @Override
+ protected List<Pair<Traversal, Set<String>>> getGValueTraversals() {
+ return List.of(
+ Pair.of(__.limit(Scope.local, GValue.of("limit", HIGH_VALUE)), Set.of("limit")),
+ Pair.of(__.skip(Scope.local, GValue.of("skip", HIGH_VALUE)), Set.of("skip")),
+ Pair.of(__.range(Scope.local, GValue.of(LOW_NAME, LOW_VALUE), GValue.of(HIGH_NAME, HIGH_VALUE)), Set.of(LOW_NAME, HIGH_NAME))
+ );
+ }
+
+ @Test
+ public void getLowHighRangeNonGValue() {
+ GraphTraversal.Admin<Object, Object> traversal = __.range(Scope.local, LOW_VALUE, HIGH_VALUE).asAdmin();
+ assertEquals((Long) LOW_VALUE, ((RangeLocalStep) traversal.getSteps().get(0)).getLowRange());
+ assertEquals((Long) HIGH_VALUE, ((RangeLocalStep) traversal.getSteps().get(0)).getHighRange());
+ verifyNoVariables(traversal);
+ }
+
+ @Test
+ public void getLowHighRangeGValueSafeShouldNotPinVariables() {
+ GraphTraversal.Admin<Object, Object> traversal = __.range(Scope.local, GValue.of(LOW_NAME, LOW_VALUE), GValue.of(HIGH_NAME, HIGH_VALUE)).asAdmin();
+ assertEquals(LOW_VALUE, ((RangeStepPlaceholder.RangeLocalStepPlaceholder) traversal.getSteps().get(0)).getLowRangeGValueSafe());
+ assertEquals(HIGH_VALUE, ((RangeStepPlaceholder.RangeLocalStepPlaceholder) traversal.getSteps().get(0)).getHighRangeGValueSafe());
+ verifyVariables(traversal, Set.of(), Set.of(LOW_NAME, HIGH_NAME));
+ }
+
+ @Test
+ public void getLowShouldPinVariable() {
+ GraphTraversal.Admin<Object, Object> traversal = __.range(Scope.local, GValue.of(LOW_NAME, LOW_VALUE), GValue.of(HIGH_NAME, HIGH_VALUE)).asAdmin();
+ assertEquals((Long) LOW_VALUE, ((RangeStepPlaceholder.RangeLocalStepPlaceholder) traversal.getSteps().get(0)).getLowRange());
+ verifyVariables(traversal, Set.of(LOW_NAME), Set.of(HIGH_NAME));
+ }
+
+ @Test
+ public void getHighShouldPinVariable() {
+ GraphTraversal.Admin<Object, Object> traversal = __.range(Scope.local, GValue.of(LOW_NAME, LOW_VALUE), GValue.of(HIGH_NAME, HIGH_VALUE)).asAdmin();
+ assertEquals((Long) HIGH_VALUE, ((RangeStepPlaceholder.RangeLocalStepPlaceholder) traversal.getSteps().get(0)).getHighRange());
+ verifyVariables(traversal, Set.of(HIGH_NAME), Set.of(LOW_NAME));
+ }
+
+ @Test
+ public void getLowHighRangeGValueFromConcreteStep() {
+ GraphTraversal.Admin<Object, Object> traversal = __.range(Scope.local, GValue.of(LOW_NAME, LOW_VALUE), GValue.of(HIGH_NAME, HIGH_VALUE)).asAdmin();
+ assertEquals((Long) LOW_VALUE, ((RangeStepPlaceholder.RangeLocalStepPlaceholder) traversal.getSteps().get(0)).asConcreteStep().getLowRange());
+ assertEquals((Long) HIGH_VALUE, ((RangeStepPlaceholder.RangeLocalStepPlaceholder) traversal.getSteps().get(0)).asConcreteStep().getHighRange());
+ }
}
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/TraversalStrategyProxyTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/TraversalStrategyProxyTest.java
new file mode 100644
index 0000000..dceb746
--- /dev/null
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/TraversalStrategyProxyTest.java
@@ -0,0 +1,64 @@
+/*
+ * 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.strategy;
+
+import org.apache.commons.configuration2.MapConfiguration;
+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.dsl.graph.GraphTraversal;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
+import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
+import org.junit.Test;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
+
+public class TraversalStrategyProxyTest {
+
+ private static class TestStrategy<S extends TraversalStrategy> extends AbstractTraversalStrategy<S> {
+ @Override
+ public void apply(Traversal.Admin traversal) {
+ // Do nothing
+ }
+ }
+
+ @Test
+ public void shouldAddCustomStrategyToGremlinScript() {
+ TraversalStrategyProxy strategyProxy = new TraversalStrategyProxy("TestStrategy");
+ GraphTraversalSource g = EmptyGraph.instance().traversal();
+ GraphTraversal traversal = g.withStrategies(strategyProxy).V();
+ assertEquals("g.withStrategies(TestStrategy).V()", traversal.asAdmin().getGremlinLang().getGremlin());
+ }
+
+ @Test
+ public void shouldAddCustomStrategyWithConfigToGremlinScript() {
+ Map<String, Object> configMap = new LinkedHashMap<>();
+ configMap.put("stringKey", "stringValue");
+ configMap.put("intKey", 1);
+ configMap.put("booleanKey", true);
+ TraversalStrategyProxy strategyProxy = new TraversalStrategyProxy("TestStrategy", new MapConfiguration(configMap));
+
+ GraphTraversalSource g = EmptyGraph.instance().traversal();
+ GraphTraversal traversal = g.withStrategies(strategyProxy).V();
+
+ assertEquals("g.withStrategies(new TestStrategy(stringKey:\"stringValue\",intKey:1,booleanKey:true)).V()", traversal.asAdmin().getGremlinLang().getGremlin());
+ }
+}
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ConnectiveStrategyTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ConnectiveStrategyTest.java
index 5bd9e66..9e53d37 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ConnectiveStrategyTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ConnectiveStrategyTest.java
@@ -18,14 +18,12 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration;
-import org.apache.tinkerpop.gremlin.process.traversal.GValueManager;
-import org.apache.tinkerpop.gremlin.process.traversal.Translator;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategies;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
+import org.apache.tinkerpop.gremlin.process.traversal.GValueManager;
import org.apache.tinkerpop.gremlin.process.traversal.step.GValue;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.GValueManagerVerifier;
-import org.apache.tinkerpop.gremlin.process.traversal.translator.GroovyTranslator;
import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalStrategies;
import org.apache.tinkerpop.gremlin.util.CollectionUtil;
import org.junit.Test;
@@ -48,8 +46,6 @@
@RunWith(Parameterized.class)
public static class StandardTest {
- private static final Translator.ScriptTranslator translator = GroovyTranslator.of("__");
-
@Parameterized.Parameter(value = 0)
public Traversal.Admin original;
@@ -65,7 +61,7 @@
@Test
public void doTest() {
- final String repr = translator.translate(original.getBytecode()).getScript();
+ final String repr = original.getGremlinLang().getGremlin("__");
applyConnectiveStrategy(original);
assertEquals(repr, optimized, original);
}
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ElementIdStrategyTraverseTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ElementIdStrategyTraverseTest.java
index a722f52..a5a7bc7 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ElementIdStrategyTraverseTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ElementIdStrategyTraverseTest.java
@@ -19,15 +19,14 @@
package org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration;
import org.apache.tinkerpop.gremlin.process.traversal.Step;
-import org.apache.tinkerpop.gremlin.process.traversal.Translator;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.DefaultGraphTraversal;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.PropertiesStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.GraphStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.PropertiesStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.AddEdgeStepContract;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.AddVertexStepContract;
-import org.apache.tinkerpop.gremlin.process.traversal.translator.GroovyTranslator;
+
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.junit.Test;
@@ -36,10 +35,10 @@
import java.util.Arrays;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
import static org.mockito.Mockito.mock;
-import static org.hamcrest.MatcherAssert.assertThat;
/**
* @author Stephen Mallette (http://stephen.genoprime.com)
@@ -48,7 +47,6 @@
@RunWith(Parameterized.class)
public class ElementIdStrategyTraverseTest {
private static Traversal traversalWithAddV;
- private static final Translator.ScriptTranslator translator = GroovyTranslator.of("__");
static {
final Graph mockedGraph = mock(Graph.class);
@@ -84,7 +82,7 @@
@Test
public void shouldAlterTraversalToIncludeIdWhereNecessary() {
- final String repr = translator.translate(traversal.getBytecode()).getScript();
+ final String repr = traversal.getGremlinLang().getGremlin("__");
final ElementIdStrategy strategy = ElementIdStrategy.build().create();
strategy.apply(traversal.asAdmin());
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/EventStrategyTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/EventStrategyTest.java
index 7c139cd..0088640 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/EventStrategyTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/EventStrategyTest.java
@@ -18,13 +18,11 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration;
-import org.apache.tinkerpop.gremlin.process.traversal.Translator;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.DefaultGraphTraversal;
import org.apache.tinkerpop.gremlin.process.traversal.step.Mutating;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.event.ConsoleMutationListener;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.event.MutationListener;
-import org.apache.tinkerpop.gremlin.process.traversal.translator.GroovyTranslator;
import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -33,8 +31,6 @@
import java.util.Arrays;
import java.util.concurrent.atomic.AtomicInteger;
-import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.addV;
-import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.unfold;
import static org.junit.Assert.assertEquals;
/**
@@ -43,8 +39,6 @@
*/
@RunWith(Parameterized.class)
public class EventStrategyTest {
- private static final Translator.ScriptTranslator translator = GroovyTranslator.of("__");
-
@Parameterized.Parameters(name = "{0}")
public static Iterable<Object[]> data() {
return Arrays.asList(new Object[][]{
@@ -72,7 +66,7 @@
@Test
public void shouldEventOnMutatingSteps() {
- final String repr = translator.translate(traversal.getBytecode()).getScript();
+ final String repr = traversal.getGremlinLang().getGremlin();
final MutationListener listener1 = new ConsoleMutationListener(EmptyGraph.instance());
final EventStrategy eventStrategy = EventStrategy.build()
.addListener(listener1).create();
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/PartitionStrategyTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/PartitionStrategyTest.java
index 462f2f2..372a442 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/PartitionStrategyTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/PartitionStrategyTest.java
@@ -20,7 +20,6 @@
import org.apache.tinkerpop.gremlin.process.traversal.Contains;
import org.apache.tinkerpop.gremlin.process.traversal.Step;
-import org.apache.tinkerpop.gremlin.process.traversal.Translator;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.DefaultGraphTraversal;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
@@ -31,7 +30,6 @@
import org.apache.tinkerpop.gremlin.process.traversal.step.map.AddVertexStepContract;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.HasContainer;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.GValueManagerVerifier;
-import org.apache.tinkerpop.gremlin.process.traversal.translator.GroovyTranslator;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
import org.apache.tinkerpop.gremlin.structure.Element;
import org.apache.tinkerpop.gremlin.structure.Graph;
@@ -48,11 +46,11 @@
import java.util.List;
import java.util.Set;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.IsInstanceOf.instanceOf;
import static org.hamcrest.core.IsIterableContaining.hasItem;
import static org.hamcrest.core.IsNot.not;
import static org.junit.Assert.assertEquals;
-import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.fail;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
@@ -66,7 +64,6 @@
@RunWith(Parameterized.class)
public static class PartitionStrategyTraverseTest {
- private static final Translator.ScriptTranslator translator = GroovyTranslator.of("__");
@Parameterized.Parameters(name = "{0}")
public static Iterable<Object[]> data() {
@@ -111,7 +108,7 @@
@Test
public void shouldIncludeAdditionalHasStepsAndAppendPartitionOnMutatingSteps() {
- final String repr = translator.translate(traversal.getBytecode()).getScript();
+ final String repr = traversal.getGremlinLang().getGremlin();
final PartitionStrategy strategy = PartitionStrategy.build()
.partitionKey("p").writePartition("a").readPartitions("a").create();
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyTest.java
index 60d0581..6cd283a 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyTest.java
@@ -20,7 +20,6 @@
import org.apache.tinkerpop.gremlin.process.traversal.P;
import org.apache.tinkerpop.gremlin.process.traversal.Step;
-import org.apache.tinkerpop.gremlin.process.traversal.Translator;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategies;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.DefaultGraphTraversal;
@@ -34,7 +33,6 @@
import org.apache.tinkerpop.gremlin.process.traversal.strategy.GValueManagerVerifier;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.InlineFilterStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.StandardVerificationStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.translator.GroovyTranslator;
import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalStrategies;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
import org.apache.tinkerpop.gremlin.structure.Vertex;
@@ -68,8 +66,6 @@
*/
@RunWith(Enclosed.class)
public class SubgraphStrategyTest {
- private static final Translator.ScriptTranslator translator = GroovyTranslator.of("__");
-
@RunWith(Parameterized.class)
public static class TraverseTest {
private static final GraphTraversalSource g = EmptyGraph.instance().traversal();
@@ -103,7 +99,7 @@
@Test
public void shouldSubgraph() {
- final String repr = translator.translate(traversal.getBytecode()).getScript();
+ final String repr = traversal.getGremlinLang().getGremlin();
final SubgraphStrategy strategy = SubgraphStrategy.build().edges(__.has("edge")).vertices(__.has("vertex")).create();
strategy.apply(traversal);
@@ -123,7 +119,7 @@
@Test
public void doTest() {
- final String repr = translator.translate(original.getBytecode()).getScript();
+ final String repr = original.getGremlinLang().getGremlin();
final TraversalStrategies originalStrategies = new DefaultTraversalStrategies();
originalStrategies.addStrategies(SubgraphStrategy.build().
vertices(__.and(has("name", "marko"), has("age", 29))).
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/VertexProgramStrategyTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/VertexProgramStrategyTest.java
index 5edeff4..6e669b4 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/VertexProgramStrategyTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/VertexProgramStrategyTest.java
@@ -24,17 +24,14 @@
import org.apache.tinkerpop.gremlin.process.computer.traversal.step.map.TraversalVertexProgramStep;
import org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.decoration.VertexProgramStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.Step;
-import org.apache.tinkerpop.gremlin.process.traversal.Translator;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategies;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.DefaultGraphTraversal;
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.strategy.verification.ComputerVerificationStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.translator.GroovyTranslator;
import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalStrategies;
import org.apache.tinkerpop.gremlin.process.traversal.util.EmptyTraversal;
-import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -48,7 +45,6 @@
*/
@RunWith(Parameterized.class)
public class VertexProgramStrategyTest {
- private static final Translator.ScriptTranslator translator = GroovyTranslator.of("__");
@Parameterized.Parameter(value = 0)
public Traversal.Admin original;
@@ -59,7 +55,7 @@
@Test
public void doTest() {
- final String repr = translator.translate(original.getBytecode()).getScript();
+ final String repr = original.getGremlinLang().getGremlin();
final TraversalStrategies strategies = new DefaultTraversalStrategies();
strategies.addStrategies(new VertexProgramStrategy(Computer.compute()), ComputerVerificationStrategy.instance());
original.asAdmin().setStrategies(strategies);
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/AdjacentToIncidentStrategyTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/AdjacentToIncidentStrategyTest.java
index 109a340..48ce34e 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/AdjacentToIncidentStrategyTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/AdjacentToIncidentStrategyTest.java
@@ -18,13 +18,12 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization;
+
import org.apache.tinkerpop.gremlin.process.traversal.Step;
-import org.apache.tinkerpop.gremlin.process.traversal.Translator;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
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.strategy.GValueManagerVerifier;
-import org.apache.tinkerpop.gremlin.process.traversal.translator.GroovyTranslator;
import org.junit.Test;
import org.junit.experimental.runners.Enclosed;
import org.junit.runner.RunWith;
@@ -40,7 +39,6 @@
*/
@RunWith(Enclosed.class)
public class AdjacentToIncidentStrategyTest {
- private static final Translator.ScriptTranslator translator = GroovyTranslator.of("__");
@RunWith(Parameterized.class)
public static class StandardTest {
@@ -76,7 +74,7 @@
@Test
public void doTest() {
- final String repr = translator.translate(original.getBytecode()).getScript();
+ final String repr = original.getGremlinLang().getGremlin();
GValueManagerVerifier.verify(original.asAdmin(), AdjacentToIncidentStrategy.instance())
.afterApplying()
.managerIsEmpty();
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/ByModulatorOptimizationStrategyTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/ByModulatorOptimizationStrategyTest.java
index 6d60205..133779f 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/ByModulatorOptimizationStrategyTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/ByModulatorOptimizationStrategyTest.java
@@ -20,12 +20,10 @@
import org.apache.tinkerpop.gremlin.process.traversal.P;
import org.apache.tinkerpop.gremlin.process.traversal.Scope;
-import org.apache.tinkerpop.gremlin.process.traversal.Translator;
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.strategy.GValueManagerVerifier;
-import org.apache.tinkerpop.gremlin.process.traversal.translator.GroovyTranslator;
import org.apache.tinkerpop.gremlin.structure.T;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -43,7 +41,6 @@
*/
@RunWith(Parameterized.class)
public class ByModulatorOptimizationStrategyTest {
- private static final Translator.ScriptTranslator translator = GroovyTranslator.of("__");
@Parameterized.Parameter
public Traversal.Admin original;
@@ -178,7 +175,7 @@
@Test
public void doTest() {
- final String repr = translator.translate(original.getBytecode()).getScript();
+ final String repr = original.getGremlinLang().getGremlin();
GValueManagerVerifier.verify(original.asAdmin(), ByModulatorOptimizationStrategy.instance())
.afterApplying()
.managerIsEmpty();
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/CountStrategyTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/CountStrategyTest.java
index 6aad8c7..97d7ad7 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/CountStrategyTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/CountStrategyTest.java
@@ -20,14 +20,12 @@
import org.apache.tinkerpop.gremlin.process.traversal.GValueManager;
import org.apache.tinkerpop.gremlin.process.traversal.P;
-import org.apache.tinkerpop.gremlin.process.traversal.Translator;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
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.filter.RangeGlobalStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.IsStepContract;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.GValueManagerVerifier;
-import org.apache.tinkerpop.gremlin.process.traversal.translator.GroovyTranslator;
import org.junit.Test;
import org.junit.experimental.runners.Enclosed;
import org.junit.runner.RunWith;
@@ -53,7 +51,6 @@
*/
@RunWith(Enclosed.class)
public class CountStrategyTest {
- private static final Translator.ScriptTranslator translator = GroovyTranslator.of("__");
@RunWith(Parameterized.class)
public static class StandardTest {
@@ -160,7 +157,7 @@
@Test
public void doTest() {
- final String repr = translator.translate(original.getBytecode()).getScript();
+ final String repr = original.getGremlinLang().getGremlin();
GValueManagerVerifier.verify(original.asAdmin(), CountStrategy.instance())
.afterApplying()
.managerIsEmpty();
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/EarlyLimitStrategyTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/EarlyLimitStrategyTest.java
index a33dc1d..2d6f139 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/EarlyLimitStrategyTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/EarlyLimitStrategyTest.java
@@ -20,7 +20,6 @@
package org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization;
import org.apache.tinkerpop.gremlin.process.traversal.GValueManager;
-import org.apache.tinkerpop.gremlin.process.traversal.Translator;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategies;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
@@ -31,7 +30,6 @@
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.RangeGlobalStepContract;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.GValueManagerVerifier;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.finalization.ProfileStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.translator.GroovyTranslator;
import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalStrategies;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
import org.apache.tinkerpop.gremlin.util.CollectionUtil;
@@ -56,7 +54,6 @@
*/
@RunWith(Enclosed.class)
public class EarlyLimitStrategyTest {
- private static final Translator.ScriptTranslator translator = GroovyTranslator.of("__");
@RunWith(Parameterized.class)
public static class StandardTest {
@@ -103,7 +100,7 @@
@Test
public void doTest() {
- final String repr = translator.translate(original.getBytecode()).getScript();
+ final String repr = original.getGremlinLang().getGremlin();
final TraversalStrategies strategies = new DefaultTraversalStrategies();
strategies.addStrategies(EarlyLimitStrategy.instance());
for (final TraversalStrategy strategy : this.otherStrategies) {
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/FilterRankingStrategyTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/FilterRankingStrategyTest.java
index 5054ca6..e7c3e19 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/FilterRankingStrategyTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/FilterRankingStrategyTest.java
@@ -20,14 +20,12 @@
import org.apache.tinkerpop.gremlin.process.traversal.GValueManager;
import org.apache.tinkerpop.gremlin.process.traversal.P;
-import org.apache.tinkerpop.gremlin.process.traversal.Translator;
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.dsl.graph.__;
import org.apache.tinkerpop.gremlin.process.traversal.step.GValue;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.GValueManagerVerifier;
-import org.apache.tinkerpop.gremlin.process.traversal.translator.GroovyTranslator;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.util.CollectionUtil;
import org.apache.tinkerpop.gremlin.util.function.Lambda;
@@ -60,7 +58,6 @@
*/
@RunWith(Enclosed.class)
public class FilterRankingStrategyTest {
- private static final Translator.ScriptTranslator translator = GroovyTranslator.of("__");
@RunWith(Parameterized.class)
public static class StandardTest {
@@ -223,7 +220,7 @@
@Test
public void doTest() {
- final String repr = translator.translate(original.getBytecode()).getScript();
+ final String repr = original.getGremlinLang().getGremlin();
GValueManagerVerifier.verify(original.asAdmin(), FilterRankingStrategy.instance(), otherStrategies)
.afterApplying()
.managerIsEmpty();
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/IdentityRemovalStrategyTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/IdentityRemovalStrategyTest.java
index d18d97e..0cb6f2a 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/IdentityRemovalStrategyTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/IdentityRemovalStrategyTest.java
@@ -18,11 +18,9 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization;
-import org.apache.tinkerpop.gremlin.process.traversal.Translator;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.GValueManagerVerifier;
-import org.apache.tinkerpop.gremlin.process.traversal.translator.GroovyTranslator;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -39,7 +37,6 @@
*/
@RunWith(Parameterized.class)
public class IdentityRemovalStrategyTest {
- private static final Translator.ScriptTranslator translator = GroovyTranslator.of("__");
@Parameterized.Parameter(value = 0)
public Traversal.Admin original;
@@ -70,7 +67,7 @@
@Test
public void doTest() {
- final String repr = translator.translate(original.getBytecode()).getScript();
+ final String repr = original.getGremlinLang().getGremlin("__");
GValueManagerVerifier.verify(original.asAdmin(), IdentityRemovalStrategy.instance())
.afterApplying()
.managerIsEmpty();
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/IncidentToAdjacentStrategyTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/IncidentToAdjacentStrategyTest.java
index 0fc14f3..aa289f8 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/IncidentToAdjacentStrategyTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/IncidentToAdjacentStrategyTest.java
@@ -19,13 +19,11 @@
package org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization;
import org.apache.tinkerpop.gremlin.process.traversal.Step;
-import org.apache.tinkerpop.gremlin.process.traversal.Translator;
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.strategy.GValueManagerVerifier;
-import org.apache.tinkerpop.gremlin.process.traversal.translator.GroovyTranslator;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.junit.Test;
import org.junit.experimental.runners.Enclosed;
@@ -43,7 +41,6 @@
*/
@RunWith(Enclosed.class)
public class IncidentToAdjacentStrategyTest {
- private static final Translator.ScriptTranslator translator = GroovyTranslator.of("__");
@RunWith(Parameterized.class)
public static class StandardTest {
@@ -82,7 +79,7 @@
@Test
public void doTest() {
- final String repr = translator.translate(original.getBytecode()).getScript();
+ final String repr = original.getGremlinLang().getGremlin("__");
GValueManagerVerifier.verify(original.asAdmin(), IncidentToAdjacentStrategy.instance())
.afterApplying()
.managerIsEmpty();
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategyTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategyTest.java
index bf9d853..9dffb56 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategyTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategyTest.java
@@ -21,9 +21,7 @@
import org.apache.tinkerpop.gremlin.process.traversal.GValueManager;
import org.apache.tinkerpop.gremlin.process.traversal.P;
-import org.apache.tinkerpop.gremlin.process.traversal.Translator;
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.dsl.graph.GraphTraversal;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
@@ -32,7 +30,6 @@
import org.apache.tinkerpop.gremlin.process.traversal.step.util.HasContainer;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.GValueManagerVerifier;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.ConnectiveStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.translator.GroovyTranslator;
import org.apache.tinkerpop.gremlin.structure.T;
import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
import org.junit.Test;
@@ -69,7 +66,6 @@
*/
@RunWith(Enclosed.class)
public class InlineFilterStrategyTest {
- private static final Translator.ScriptTranslator translator = GroovyTranslator.of("__");
@RunWith(Parameterized.class)
public static class StandardTest {
@@ -152,7 +148,7 @@
@Test
public void doTest() {
- final String repr = translator.translate(original.getBytecode()).getScript();
+ final String repr = original.getGremlinLang().getGremlin("__");
GValueManagerVerifier.verify(original.asAdmin(), InlineFilterStrategy.instance(), extras)
.afterApplying()
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/LazyBarrierStrategyTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/LazyBarrierStrategyTest.java
index 9a43058..273618b 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/LazyBarrierStrategyTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/LazyBarrierStrategyTest.java
@@ -19,12 +19,10 @@
package org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization;
import org.apache.tinkerpop.gremlin.process.traversal.P;
-import org.apache.tinkerpop.gremlin.process.traversal.Translator;
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.dsl.graph.__;
-import org.apache.tinkerpop.gremlin.process.traversal.translator.GroovyTranslator;
import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalStrategies;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -41,8 +39,6 @@
*/
@RunWith(Parameterized.class)
public class LazyBarrierStrategyTest {
- private static final Translator.ScriptTranslator translator = GroovyTranslator.of("__");
-
@Parameterized.Parameters(name = "{0}")
public static Iterable<Object[]> data() {
return generateTestParameters();
@@ -59,7 +55,7 @@
@Test
public void doTest() {
- final String repr = translator.translate(original.getBytecode()).getScript();
+ final String repr = original.getGremlinLang().getGremlin("__");
final TraversalStrategies strategies = new DefaultTraversalStrategies();
strategies.addStrategies(LazyBarrierStrategy.instance());
for (final TraversalStrategy strategy : this.otherStrategies) {
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/MatchPredicateStrategyTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/MatchPredicateStrategyTest.java
index 00dc8fc..ed01873 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/MatchPredicateStrategyTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/MatchPredicateStrategyTest.java
@@ -19,12 +19,10 @@
package org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization;
import org.apache.tinkerpop.gremlin.process.traversal.P;
-import org.apache.tinkerpop.gremlin.process.traversal.Translator;
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.dsl.graph.__;
-import org.apache.tinkerpop.gremlin.process.traversal.translator.GroovyTranslator;
import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalStrategies;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -43,7 +41,6 @@
*/
@RunWith(Parameterized.class)
public class MatchPredicateStrategyTest {
- private static final Translator.ScriptTranslator translator = GroovyTranslator.of("__");
@Parameterized.Parameter(value = 0)
public Traversal.Admin original;
@@ -56,7 +53,7 @@
@Test
public void doTest() {
- final String repr = translator.translate(original.getBytecode()).getScript();
+ final String repr = original.getGremlinLang().getGremlin("__");
final TraversalStrategies strategies = new DefaultTraversalStrategies();
strategies.addStrategies(MatchPredicateStrategy.instance());
for (final TraversalStrategy strategy : this.otherStrategies) {
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/OrderLimitStrategyTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/OrderLimitStrategyTest.java
index 14bfa64..d2182d4 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/OrderLimitStrategyTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/OrderLimitStrategyTest.java
@@ -20,14 +20,12 @@
package org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization;
import org.apache.tinkerpop.gremlin.process.computer.traversal.step.map.TraversalVertexProgramStep;
-import org.apache.tinkerpop.gremlin.process.traversal.Translator;
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.__;
import org.apache.tinkerpop.gremlin.process.traversal.step.GValue;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.OrderGlobalStep;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.GValueManagerVerifier;
-import org.apache.tinkerpop.gremlin.process.traversal.translator.GroovyTranslator;
import org.apache.tinkerpop.gremlin.process.traversal.util.EmptyTraversal;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
import org.junit.Test;
@@ -46,7 +44,6 @@
*/
@RunWith(Enclosed.class)
public class OrderLimitStrategyTest {
- private static final Translator.ScriptTranslator translator = GroovyTranslator.of("__");
@RunWith(Parameterized.class)
public static class StandardTest {
@@ -59,7 +56,7 @@
@Test
public void doTest() {
- final String repr = translator.translate(traversal.getBytecode()).getScript();
+ final String repr = traversal.getGremlinLang().getGremlin();
traversal.asAdmin().setParent(new TraversalVertexProgramStep(EmptyTraversal.instance(), EmptyTraversal.instance())); // trick it
GValueManagerVerifier.verify(traversal, OrderLimitStrategy.instance()).
afterApplying().variablesArePreserved();
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/PathProcessorStrategyTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/PathProcessorStrategyTest.java
index 2c6b61a..7d5a94d 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/PathProcessorStrategyTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/PathProcessorStrategyTest.java
@@ -22,19 +22,17 @@
import org.apache.tinkerpop.gremlin.process.computer.traversal.step.map.TraversalVertexProgramStep;
import org.apache.tinkerpop.gremlin.process.traversal.P;
import org.apache.tinkerpop.gremlin.process.traversal.Pop;
-import org.apache.tinkerpop.gremlin.process.traversal.Translator;
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.dsl.graph.DefaultGraphTraversal;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
import org.apache.tinkerpop.gremlin.process.traversal.lambda.ConstantTraversal;
-import org.apache.tinkerpop.gremlin.process.traversal.lambda.ValueTraversal;
import org.apache.tinkerpop.gremlin.process.traversal.lambda.IdentityTraversal;
-import org.apache.tinkerpop.gremlin.process.traversal.step.GValue;
+import org.apache.tinkerpop.gremlin.process.traversal.lambda.ValueTraversal;
import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
+import org.apache.tinkerpop.gremlin.process.traversal.step.GValue;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.GValueManagerVerifier;
-import org.apache.tinkerpop.gremlin.process.traversal.translator.GroovyTranslator;
import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalStrategies;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.junit.Test;
@@ -56,7 +54,6 @@
*/
@RunWith(Enclosed.class)
public class PathProcessorStrategyTest {
- private static final Translator.ScriptTranslator translator = GroovyTranslator.of("__");
private static final Collection<TraversalStrategy> withProductiveByStrategy =
Stream.concat(Stream.of(ProductiveByStrategy.instance()),
TraversalStrategies.GlobalCache.getStrategies(Graph.class).toList().stream()).collect(Collectors.toList());
@@ -74,7 +71,7 @@
@Test
public void doTest() {
- final String repr = translator.translate(original.getBytecode()).getScript();
+ final String repr = original.getGremlinLang().getGremlin("__");
final Traversal.Admin<?, ?> rootTraversal = new DefaultGraphTraversal<>();
final TraversalParent parent = new TraversalVertexProgramStep(rootTraversal, this.original.asAdmin());
rootTraversal.addStep(parent.asStep());
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/PathRetractionStrategyTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/PathRetractionStrategyTest.java
index 80ee82d..5f48964 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/PathRetractionStrategyTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/PathRetractionStrategyTest.java
@@ -23,16 +23,13 @@
import org.apache.tinkerpop.gremlin.process.traversal.P;
import org.apache.tinkerpop.gremlin.process.traversal.Scope;
import org.apache.tinkerpop.gremlin.process.traversal.Step;
-import org.apache.tinkerpop.gremlin.process.traversal.Translator;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategies;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
import org.apache.tinkerpop.gremlin.process.traversal.step.PathProcessor;
import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
-import org.apache.tinkerpop.gremlin.process.traversal.translator.GroovyTranslator;
import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalStrategies;
-
import org.apache.tinkerpop.gremlin.structure.T;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -68,7 +65,6 @@
*/
@RunWith(Parameterized.class)
public class PathRetractionStrategyTest {
- private static final Translator.ScriptTranslator translator = GroovyTranslator.of("__");
/**
* Always need LazyBarrierStrategy because it will trigger barrier() additions in PathRetractionStrategy.
@@ -92,7 +88,7 @@
@Test
public void doTest() {
- final String repr = translator.translate(original.getBytecode()).getScript();
+ final String repr = original.getGremlinLang().getGremlin("__");
for (final TraversalStrategies currentStrategies : this.strategies) {
final Traversal.Admin<?, ?> currentTraversal = this.original.clone();
currentTraversal.setStrategies(currentStrategies);
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/ProductiveByStrategyTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/ProductiveByStrategyTest.java
index 30e7683..440e02d 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/ProductiveByStrategyTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/ProductiveByStrategyTest.java
@@ -20,13 +20,11 @@
import org.apache.tinkerpop.gremlin.process.traversal.P;
import org.apache.tinkerpop.gremlin.process.traversal.Scope;
-import org.apache.tinkerpop.gremlin.process.traversal.Translator;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategies;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
import org.apache.tinkerpop.gremlin.process.traversal.lambda.ConstantTraversal;
import org.apache.tinkerpop.gremlin.process.traversal.lambda.ValueTraversal;
-import org.apache.tinkerpop.gremlin.process.traversal.translator.GroovyTranslator;
import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalStrategies;
import org.apache.tinkerpop.gremlin.structure.T;
import org.junit.Test;
@@ -47,7 +45,6 @@
@RunWith(Parameterized.class)
public class ProductiveByStrategyTest {
- private static final Translator.ScriptTranslator translator = GroovyTranslator.of("__");
private static final Traversal<Object,Object> ageValueTraversal = new ValueTraversal<>("age");
private static final Traversal<Object,Object> nameValueTraversal = new ValueTraversal<>("name");
private static final Traversal<Object,Object> nullTraversal = new ConstantTraversal<>(null);
@@ -70,7 +67,7 @@
@Test
public void doTest() {
- final String repr = translator.translate(original.getBytecode()).getScript();
+ final String repr = original.getGremlinLang().getGremlin("__");
applyProductiveByStrategy(original);
assertEquals(repr, optimized, original);
}
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RepeatUnrollStrategyTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RepeatUnrollStrategyTest.java
index 32cf92a..36ca8d1 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RepeatUnrollStrategyTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RepeatUnrollStrategyTest.java
@@ -19,7 +19,6 @@
package org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization;
-import org.apache.tinkerpop.gremlin.process.traversal.Translator;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategies;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
@@ -28,7 +27,6 @@
import org.apache.tinkerpop.gremlin.process.traversal.step.GValue;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.NoOpBarrierStep;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.GValueManagerVerifier;
-import org.apache.tinkerpop.gremlin.process.traversal.translator.GroovyTranslator;
import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalStrategies;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
import org.apache.tinkerpop.gremlin.structure.Vertex;
@@ -52,7 +50,6 @@
*/
@RunWith(Enclosed.class)
public class RepeatUnrollStrategyTest {
- private static final Translator.ScriptTranslator translator = GroovyTranslator.of("__");
@RunWith(Parameterized.class)
public static class StandardTest {
@@ -67,7 +64,7 @@
@Test
public void doTest() {
- final String repr = translator.translate(original.getBytecode()).getScript();
+ final String repr = original.getGremlinLang().getGremlin("__");
final TraversalStrategies strategiesWithLazy = new DefaultTraversalStrategies();
strategiesWithLazy.addStrategies(RepeatUnrollStrategy.instance());
Traversal.Admin<?, ?> clonedOriginal = this.original.clone();
@@ -100,7 +97,6 @@
s.getTraversal().removeStep(s);
});
assertEquals("Without LazyBarrierStrategy: " + repr, optimizedWithoutBarriers, clonedOriginal);
-
}
@Parameterized.Parameters(name = "{0}")
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/ComputerVerificationStrategyTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/ComputerVerificationStrategyTest.java
index 3d80c2f..574ff4b 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/ComputerVerificationStrategyTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/ComputerVerificationStrategyTest.java
@@ -20,11 +20,9 @@
import org.apache.tinkerpop.gremlin.process.computer.traversal.step.map.TraversalVertexProgramStep;
import org.apache.tinkerpop.gremlin.process.traversal.P;
-import org.apache.tinkerpop.gremlin.process.traversal.Translator;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategies;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
-import org.apache.tinkerpop.gremlin.process.traversal.translator.GroovyTranslator;
import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalStrategies;
import org.apache.tinkerpop.gremlin.process.traversal.util.EmptyTraversal;
import org.junit.Test;
@@ -45,7 +43,6 @@
*/
@RunWith(Parameterized.class)
public class ComputerVerificationStrategyTest {
- private static final Translator.ScriptTranslator translator = GroovyTranslator.of("__");
@Parameterized.Parameters(name = "{0}")
public static Iterable<Object[]> data() {
@@ -70,7 +67,7 @@
@Test
public void shouldBeVerifiedIllegal() {
- final String repr = translator.translate(traversal.getBytecode()).getScript();
+ final String repr = traversal.getGremlinLang().getGremlin();
final TraversalStrategies strategies = new DefaultTraversalStrategies();
strategies.addStrategies(ComputerVerificationStrategy.instance());
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/EdgeLabelVerificationStrategyTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/EdgeLabelVerificationStrategyTest.java
index 1e9d52f..2d24d96 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/EdgeLabelVerificationStrategyTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/EdgeLabelVerificationStrategyTest.java
@@ -19,11 +19,9 @@
package org.apache.tinkerpop.gremlin.process.traversal.strategy.verification;
import nl.altindag.log.LogCaptor;
-import org.apache.tinkerpop.gremlin.process.traversal.Translator;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategies;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
-import org.apache.tinkerpop.gremlin.process.traversal.translator.GroovyTranslator;
import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalStrategies;
import org.apache.tinkerpop.gremlin.structure.Direction;
import org.junit.AfterClass;
@@ -46,7 +44,6 @@
*/
@RunWith(Parameterized.class)
public class EdgeLabelVerificationStrategyTest {
- private static final Translator.ScriptTranslator translator = GroovyTranslator.of("__");
private final static Predicate<String> MSG_PREDICATE = Pattern.compile(
"^The provided traversal contains a vertex step without any specified edge label: VertexStep.*")
@@ -93,7 +90,7 @@
@Test
public void shouldIgnore() {
- final String repr = translator.translate(traversal.getBytecode()).getScript();
+ final String repr = traversal.getGremlinLang().getGremlin();
final TraversalStrategies strategies = new DefaultTraversalStrategies();
strategies.addStrategies(EdgeLabelVerificationStrategy.build().create());
final Traversal traversal = this.traversal.asAdmin().clone();
@@ -104,7 +101,7 @@
@Test
public void shouldOnlyThrow() {
- final String repr = translator.translate(traversal.getBytecode()).getScript();
+ final String repr = traversal.getGremlinLang().getGremlin();
final TraversalStrategies strategies = new DefaultTraversalStrategies();
strategies.addStrategies(EdgeLabelVerificationStrategy.build().throwException().create());
final Traversal traversal = this.traversal.asAdmin().clone();
@@ -124,7 +121,7 @@
@Test
public void shouldOnlyLog() {
- final String repr = translator.translate(traversal.getBytecode()).getScript();
+ final String repr = traversal.getGremlinLang().getGremlin();
final TraversalStrategies strategies = new DefaultTraversalStrategies();
strategies.addStrategies(EdgeLabelVerificationStrategy.build().logWarning().create());
final Traversal traversal = this.traversal.asAdmin().clone();
@@ -138,7 +135,7 @@
@Test
public void shouldThrowAndLog() {
- final String repr = translator.translate(traversal.getBytecode()).getScript();
+ final String repr = traversal.getGremlinLang().getGremlin();
final TraversalStrategies strategies = new DefaultTraversalStrategies();
strategies.addStrategies(EdgeLabelVerificationStrategy.build().throwException().logWarning().create());
final Traversal traversal = this.traversal.asAdmin().clone();
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/LambdaRestrictionStrategyTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/LambdaRestrictionStrategyTest.java
index ef2b960..4ba5cad 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/LambdaRestrictionStrategyTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/LambdaRestrictionStrategyTest.java
@@ -20,13 +20,11 @@
import org.apache.tinkerpop.gremlin.process.traversal.Order;
import org.apache.tinkerpop.gremlin.process.traversal.Scope;
-import org.apache.tinkerpop.gremlin.process.traversal.Translator;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategies;
import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.finalization.ProfileStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.translator.GroovyTranslator;
import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalStrategies;
import org.apache.tinkerpop.gremlin.structure.T;
import org.apache.tinkerpop.gremlin.util.function.Lambda;
@@ -48,7 +46,6 @@
*/
@RunWith(Parameterized.class)
public class LambdaRestrictionStrategyTest {
- private static final Translator.ScriptTranslator translator = GroovyTranslator.of("__");
@Parameterized.Parameters(name = "{0}")
public static Iterable<Object[]> data() {
@@ -87,7 +84,7 @@
@Test
public void shouldBeVerifiedIllegal() {
- final String repr = translator.translate(traversal.getBytecode()).getScript();
+ final String repr = traversal.getGremlinLang().getGremlin();
final TraversalStrategies strategies = new DefaultTraversalStrategies();
strategies.addStrategies(ProfileStrategy.instance());
strategies.addStrategies(LambdaRestrictionStrategy.instance());
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/ReadOnlyStrategyTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/ReadOnlyStrategyTest.java
index 7984630..92ac53c 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/ReadOnlyStrategyTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/ReadOnlyStrategyTest.java
@@ -18,10 +18,8 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.strategy.verification;
-import org.apache.tinkerpop.gremlin.process.traversal.Translator;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.DefaultGraphTraversal;
-import org.apache.tinkerpop.gremlin.process.traversal.translator.GroovyTranslator;
import org.apache.tinkerpop.gremlin.structure.VertexProperty;
import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
import org.junit.Test;
@@ -39,7 +37,6 @@
*/
@RunWith(Parameterized.class)
public class ReadOnlyStrategyTest {
- private static final Translator.ScriptTranslator translator = GroovyTranslator.of("__");
@Parameterized.Parameters(name = "{0}")
public static Iterable<Object[]> data() {
@@ -61,7 +58,7 @@
@Test
public void shouldBeVerifiedIllegal() {
- final String repr = translator.translate(traversal.getBytecode()).getScript();
+ final String repr = traversal.getGremlinLang().getGremlin();
try {
ReadOnlyStrategy.instance().apply(this.traversal.asAdmin());
fail("The strategy should have found a mutating step: " + repr);
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/ReservedKeysVerificationStrategyTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/ReservedKeysVerificationStrategyTest.java
index fa08502..83feb00 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/ReservedKeysVerificationStrategyTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/ReservedKeysVerificationStrategyTest.java
@@ -19,11 +19,9 @@
package org.apache.tinkerpop.gremlin.process.traversal.strategy.verification;
import nl.altindag.log.LogCaptor;
-import org.apache.tinkerpop.gremlin.process.traversal.Translator;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategies;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
-import org.apache.tinkerpop.gremlin.process.traversal.translator.GroovyTranslator;
import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalStrategies;
import org.apache.tinkerpop.gremlin.structure.T;
import org.junit.AfterClass;
@@ -47,7 +45,6 @@
*/
@RunWith(Parameterized.class)
public class ReservedKeysVerificationStrategyTest {
- private static final Translator.ScriptTranslator translator = GroovyTranslator.of("__");
private final static Predicate<String> MSG_PREDICATE = Pattern.compile(
".*that is setting a property key to a reserved word.*")
@@ -93,7 +90,6 @@
@Test
public void shouldIgnore() {
- final String repr = translator.translate(traversal.getBytecode()).getScript();
final TraversalStrategies strategies = new DefaultTraversalStrategies();
strategies.addStrategies(ReservedKeysVerificationStrategy.build().create());
final Traversal traversal = this.traversal.asAdmin().clone();
@@ -104,7 +100,7 @@
@Test
public void shouldOnlyThrow() {
- final String repr = translator.translate(traversal.getBytecode()).getScript();
+ final String repr = traversal.getGremlinLang().getGremlin("__");
final TraversalStrategies strategies = new DefaultTraversalStrategies();
final ReservedKeysVerificationStrategy.Builder builder = ReservedKeysVerificationStrategy.build().throwException();
if (repr.equals("__.addV().property(\"x\",\"xyz\",\"not-allowed\",\"xxx\")"))
@@ -127,7 +123,7 @@
@Test
public void shouldOnlyLog() {
- final String repr = translator.translate(traversal.getBytecode()).getScript();
+ final String repr = traversal.getGremlinLang().getGremlin("__");
final TraversalStrategies strategies = new DefaultTraversalStrategies();
final ReservedKeysVerificationStrategy.Builder builder = ReservedKeysVerificationStrategy.build().logWarning();
if (repr.equals("__.addV().property(\"x\",\"xyz\",\"not-allowed\",\"xxx\")"))
@@ -144,7 +140,7 @@
@Test
public void shouldThrowAndLog() {
- final String repr = translator.translate(traversal.getBytecode()).getScript();
+ final String repr = traversal.getGremlinLang().getGremlin("__");
final TraversalStrategies strategies = new DefaultTraversalStrategies();
final ReservedKeysVerificationStrategy.Builder builder = ReservedKeysVerificationStrategy.build().
throwException().logWarning();
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/StandardVerificationStrategyTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/StandardVerificationStrategyTest.java
index 6bc20e4..edec3fb 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/StandardVerificationStrategyTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/StandardVerificationStrategyTest.java
@@ -18,12 +18,10 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.strategy.verification;
-import org.apache.tinkerpop.gremlin.process.traversal.Translator;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategies;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.RequirementsStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.translator.GroovyTranslator;
import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalStrategies;
import org.apache.tinkerpop.gremlin.util.TestSupport;
@@ -37,8 +35,8 @@
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.repeat;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.sum;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.fail;
import static org.hamcrest.core.IsInstanceOf.instanceOf;
+import static org.junit.Assert.fail;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
@@ -46,7 +44,6 @@
*/
@RunWith(Parameterized.class)
public class StandardVerificationStrategyTest {
- private static final Translator.ScriptTranslator translator = GroovyTranslator.of("__");
@Parameterized.Parameters(name = "{0}")
public static Iterable<Object[]> data() throws Exception {
@@ -71,7 +68,7 @@
@Test
public void shouldBeVerified() {
- final String repr = translator.translate(traversal.getBytecode()).getScript();
+ final String repr = traversal.getGremlinLang().getGremlin();
final Traversal copy = copyAndConfigureTraversal(traversal);
if (legalTraversal) {
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/translator/AnonymizingTypeTranslatorTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/translator/AnonymizingTypeTranslatorTest.java
deleted file mode 100644
index 1ce4b3a..0000000
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/translator/AnonymizingTypeTranslatorTest.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tinkerpop.gremlin.process.traversal.translator;
-
-import org.apache.tinkerpop.gremlin.language.grammar.GremlinQueryParser;
-import org.apache.tinkerpop.gremlin.language.grammar.NoOpTerminalVisitor;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
-import org.apache.tinkerpop.gremlin.process.traversal.Translator;
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
-import org.javatuples.Pair;
-import org.junit.Assert;
-import org.junit.Test;
-
-import java.sql.Timestamp;
-import java.time.LocalDateTime;
-import java.time.OffsetDateTime;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.UUID;
-
-import static java.time.ZoneOffset.UTC;
-import static org.apache.tinkerpop.gremlin.process.traversal.AnonymousTraversalSource.traversal;
-import static org.junit.Assert.assertEquals;
-
-public class AnonymizingTypeTranslatorTest {
- private static final GraphTraversalSource g = traversal().withEmbedded(EmptyGraph.instance());
-
- private void testAnonymize(final String query, final String expected) {
- try {
- final Bytecode bc = (Bytecode) GremlinQueryParser.parse(query, new NoOpTerminalVisitor());
- final Translator.ScriptTranslator translator = GroovyTranslator.of("g", new AnonymizingTypeTranslator());
- final String converted = translator.translate(bc).getScript();
- Assert.assertEquals(expected, converted);
- } catch (Exception ex) {
- throw ex instanceof RuntimeException ? (RuntimeException) ex : new RuntimeException(ex);
- }
- }
-
- private void testAnonymize(final Traversal<?,?> t, final String expected) {
- final Translator.ScriptTranslator translator = GroovyTranslator.of("g", new AnonymizingTypeTranslator());
- final String converted = translator.translate(t).getScript();
- Assert.assertEquals(expected, converted);
- }
-
- @Test
- public void testBasicAnonymize() {
-
- Arrays.asList(
-
- new Pair<>("g.V().hasLabel('person')",
- "g.V().hasLabel(string0)"),
- new Pair<>("g.V('3').valueMap(true).unfold().toList()",
- "g.V(string0).valueMap(true).unfold().toList()"),
- new Pair<>("g.V().has('code','AUS').out().out().out().has('code','AGR').path().by('code').toList()",
- "g.V().has(string0,string1).out().out().out().has(string0,string2).path().by(string0).toList()"),
- new Pair<>("g.V().has('length', 10L)",
- "g.V().has(string0,long0)"),
- new Pair<>("g.V().hasId(between('1','3'))",
- "g.V().hasId(P.gte(string0).and(P.lt(string1)))"),
- new Pair<>("g.V().hasId(between(1.0d,6.0d))",
- "g.V().hasId(P.gte(double0).and(P.lt(double1)))"),
- new Pair<>("g.V().where(label().is(eq('airport'))).count().toList()",
- "g.V().where(__.label().is(P.eq(string0))).count().toList()"),
- new Pair<>("g.V().has(label,'person').count()",
- "g.V().has(T.label,string0).count()"),
- new Pair<>("g.V().has('runways',inside(1,3)).values('code','airport').toList()",
- "g.V().has(string0,P.gt(integer0).and(P.lt(integer1))).values(string1,string2).toList()"),
- new Pair<>("g.V().hasId(within(100..115)).out().hasId(lte(46)).count().toList()",
- "g.V().hasId(P.within([integer0, integer1, integer2, integer3, integer4, integer5, integer6, integer7, integer8, integer9, integer10, integer11, integer12, integer13, integer14, integer15])).out().hasId(P.lte(integer16)).count().toList()"),
- new Pair<>("g.V().out('nothing').tryNext()",
- "g.V().out(string0).tryNext()"),
- new Pair<>("g.V().out('created').next(2)",
- "g.V().out(string0).next(integer0)"),
- new Pair<>("g.V().out('created').toList()",
- "g.V().out(string0).toList()"),
- new Pair<>("g.V().out('created').toSet()",
- "g.V().out(string0).toSet()"),
- new Pair<>("g.V().out('created').explain()",
- "g.V().out(string0).explain()"),
- new Pair<>("g.V().out('created').toBulkSet()",
- "g.V().out(string0).toBulkSet()"),
- new Pair<>("g.V(1).property('city','santa fe').property('state','new mexico').valueMap()",
- "g.V(integer0).property(string0,string1).property(string2,string3).valueMap()"),
- new Pair<>("g.V().values('name').order().by(Order.desc)",
- "g.V().values(string0).order().by(Order.desc)"),
- new Pair<>("g.V(1).property(Cardinality.single, 'x', 'y')",
- "g.V(integer0).property(VertexProperty.Cardinality.single,string0,string1)"),
- new Pair<>("g.V().as('x').out('created')",
- "g.V().as(string0).out(string1)"),
- new Pair<>("g.V(3,4,5).aggregate('x').has('name','josh').as('a').select('x').unfold().hasLabel('software').addE('createdBy').to('a')",
- "g.V(integer0,integer1,integer2).aggregate(string0).has(string1,string2).as(string3).select(string0).unfold().hasLabel(string4).addE(string5).to(string3)")
-
- ).forEach(test -> testAnonymize(test.getValue0(), test.getValue1()));
-
- }
-
- @Test
- public void shouldTranslateDate() {
- final Calendar c = Calendar.getInstance();
- c.set(1975, Calendar.SEPTEMBER, 7);
- final Date d = c.getTime();
- testAnonymize(g.inject(d), "g.inject(date0)");
- }
-
- @Test
- public void shouldTranslateOffsetDateTime() {
- final OffsetDateTime d = OffsetDateTime.of(LocalDateTime.of(2018, 03, 22, 00, 35, 44, 741000000), UTC);
- testAnonymize(g.inject(d), "g.inject(offsetdatetime0)");
- }
-
- @Test
- public void shouldTranslateTimestamp() {
- final Calendar c = Calendar.getInstance();
- c.set(1975, Calendar.SEPTEMBER, 7);
- final Timestamp t = new Timestamp(c.getTime().getTime());
- testAnonymize(g.inject(t), "g.inject(timestamp0)");
- }
-
- @Test
- public void shouldTranslateUuid() {
- final UUID uuid = UUID.fromString("ffffffff-fd49-1e4b-0000-00000d4b8a1d");
- testAnonymize(g.inject(uuid), "g.inject(uuid0)");
- }
-
-}
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/translator/DotNetTranslatorTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/translator/DotNetTranslatorTest.java
deleted file mode 100644
index 2306a53..0000000
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/translator/DotNetTranslatorTest.java
+++ /dev/null
@@ -1,353 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tinkerpop.gremlin.process.traversal.translator;
-
-import org.apache.tinkerpop.gremlin.process.traversal.GraphOp;
-import org.apache.tinkerpop.gremlin.process.traversal.Merge;
-import org.apache.tinkerpop.gremlin.process.traversal.Order;
-import org.apache.tinkerpop.gremlin.process.traversal.P;
-import org.apache.tinkerpop.gremlin.process.traversal.Pop;
-import org.apache.tinkerpop.gremlin.process.traversal.Scope;
-import org.apache.tinkerpop.gremlin.process.traversal.TextP;
-import org.apache.tinkerpop.gremlin.process.traversal.Translator;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SeedStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SubgraphStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ReadOnlyStrategy;
-import org.apache.tinkerpop.gremlin.structure.Column;
-import org.apache.tinkerpop.gremlin.structure.Direction;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-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.structure.util.detached.DetachedEdge;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex;
-import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
-import org.junit.Test;
-
-import java.time.LocalDateTime;
-import java.time.OffsetDateTime;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.UUID;
-
-import static java.time.ZoneOffset.UTC;
-import static org.apache.tinkerpop.gremlin.process.traversal.AnonymousTraversalSource.traversal;
-import static org.apache.tinkerpop.gremlin.process.traversal.Order.asc;
-import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.hasLabel;
-import static org.junit.Assert.assertEquals;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class DotNetTranslatorTest {
- private static final GraphTraversalSource g = traversal().withEmbedded(EmptyGraph.instance());
- private static final Translator.ScriptTranslator translator = DotNetTranslator.of("g");
-
- @Test
- public void shouldTranslateStrategies() throws Exception {
- assertEquals("g.WithStrategies(new ReadOnlyStrategy()," +
- "new SubgraphStrategy(checkAdjacentVertices: false, vertices: __.HasLabel(\"person\"))," +
- "new SeedStrategy(seed: 999999)).V().Has(\"name\")",
- translator.translate(g.withStrategies(ReadOnlyStrategy.instance(),
- SubgraphStrategy.build().checkAdjacentVertices(false).vertices(hasLabel("person")).create(),
- SeedStrategy.build().seed(999999).create()).
- V().has("name").asAdmin().getBytecode()).getScript());
- }
-
- @Test
- public void shouldTranslateMaps() {
- final String script = translator.translate(g.V().id().is(new LinkedHashMap<Object,Object>() {{
- put(3, "32");
- put(Arrays.asList(1, 2, 3.1d), 4);
- }}).asAdmin().getBytecode()).getScript();
- assertEquals("g.V().Id().Is(new Dictionary<object,object> {{3, \"32\"}, {new List<object> {1, 2, 3.1}, 4}})", script);
- }
-
- @Test
- public void shouldTranslateValues() {
- final String script = translator.translate(g.V().values("name").asAdmin().getBytecode()).getScript();
- assertEquals("g.V().Values<object>(\"name\")", script);
- }
-
- @Test
- public void shouldTranslateValue() {
- final String script = translator.translate(g.V().properties().order().by(T.value, asc).value().asAdmin().getBytecode()).getScript();
- assertEquals("g.V().Properties<object>().Order().By(T.Value,Order.Asc).Value<object>()", script);
- }
-
- @Test
- public void shouldTranslateInject() {
- String script = translator.translate(g.inject(10,20,null,20,10,10).asAdmin().getBytecode()).getScript();
- assertEquals("g.Inject<object>(10,20,null,20,10,10)", script);
- script = translator.translate(g.inject().asAdmin().getBytecode()).getScript();
- assertEquals("g.Inject<object>()", script);
- script = translator.translate(g.inject((Object) null).asAdmin().getBytecode()).getScript();
- assertEquals("g.Inject<object>(null)", script);
- script = translator.translate(g.inject(null, null).asAdmin().getBytecode()).getScript();
- assertEquals("g.Inject<object>(null,null)", script);
- script = translator.translate(g.V().values("age").inject().asAdmin().getBytecode()).getScript();
- assertEquals("g.V().Values<object>(\"age\").Inject()", script);
- script = translator.translate(g.V().values("age").inject(null).asAdmin().getBytecode()).getScript();
- assertEquals("g.V().Values<object>(\"age\").Inject(null)", script);
- script = translator.translate(g.V().values("age").inject(null, null).asAdmin().getBytecode()).getScript();
- assertEquals("g.V().Values<object>(\"age\").Inject(null,null)", script);
- }
-
- @Test
- public void shouldTranslateGroup() {
- final String script = translator.translate(g.V().group("x").group().by("name").asAdmin().getBytecode()).getScript();
- assertEquals("g.V().Group(\"x\").Group<object,object>().By(\"name\")", script);
- }
-
- @Test
- public void shouldTranslateGroupCount() {
- final String script = translator.translate(g.V().groupCount("x").groupCount().by("name").asAdmin().getBytecode()).getScript();
- assertEquals("g.V().GroupCount(\"x\").GroupCount<object>().By(\"name\")", script);
- }
-
- @Test
- public void shouldTranslateDate() {
- final OffsetDateTime d = OffsetDateTime.of(LocalDateTime.of(2018, 03, 22, 00, 35, 44, 741000000), UTC);
- assertTranslation(String.format("DateTimeOffset.Parse(\"%s\")", d), d);
- }
-
- @Test
- public void shouldTranslateUuid() {
- final UUID uuid = UUID.fromString("ffffffff-fd49-1e4b-0000-00000d4b8a1d");
- assertTranslation(String.format("new Guid(\"%s\")", uuid), uuid);
- }
-
- @Test
- public void shouldTranslateP() {
- assertTranslation("P.Gt(1).And(P.Gt(2)).And(P.Gt(3))", P.gt(1).and(P.gt(2)).and(P.gt(3)));
- }
-
- @Test
- public void shouldTranslateTextP() {
- assertTranslation("TextP.Containing(\"ark\")", TextP.containing("ark"));
- assertTranslation("TextP.Regex(\"ark\")", TextP.regex("ark"));
- assertTranslation("TextP.NotRegex(\"ark\")", TextP.notRegex("ark"));
- }
-
- @Test
- public void shouldTranslateColumn() {
- assertTranslation("Column.Keys", Column.keys);
- }
-
- @Test
- public void shouldTranslateDirection() {
- assertTranslation("Direction.Both", Direction.BOTH);
- }
-
- @Test
- public void shouldTranslateOrder() {
- assertTranslation("Order.Desc", Order.desc);
- }
-
- @Test
- public void shouldTranslatePop() {
- assertTranslation("Pop.Last", Pop.last);
- }
-
- @Test
- public void shouldTranslateScope() {
- assertTranslation("Scope.Local", Scope.local);
- }
-
- @Test
- public void shouldHaveValidToString() {
- assertEquals("translator[h:gremlin-dotnet]", DotNetTranslator.of("h").toString());
- }
-
- @Test
- public void shouldTranslateHasLabelNull() {
- String script = translator.translate(g.V().hasLabel(null).asAdmin().getBytecode()).getScript();
- assertEquals("g.V().HasLabel((string) null)", script);
- script = translator.translate(g.V().hasLabel((String) null, null).asAdmin().getBytecode()).getScript();
- assertEquals("g.V().HasLabel(null,null)", script);
- script = translator.translate(g.V().hasLabel(null, "person").asAdmin().getBytecode()).getScript();
- assertEquals("g.V().HasLabel(null,\"person\")", script);
- script = translator.translate(g.V().hasLabel(null, "person", null).asAdmin().getBytecode()).getScript();
- assertEquals("g.V().HasLabel(null,\"person\",null)", script);
- script = translator.translate(g.V().has(T.label, (Object) null).asAdmin().getBytecode()).getScript();
- assertEquals("g.V().Has(T.Label,(object) null)", script);
- }
-
- @Test
- public void shouldTranslateCardinalityWithProperty() {
- assertEquals("g.V().HasLabel(\"person\").Property(Cardinality.Single,\"name\",(object) null)", translator.translate(
- g.V().hasLabel("person").property(VertexProperty.Cardinality.single, "name", null)).getScript());
- }
-
- @Test
- public void shouldTranslateCardinalityValue() {
- assertTranslation("CardinalityValue.Set(\"test\")", VertexProperty.Cardinality.set("test"));
- }
-
- @Test
- public void shouldTranslateHasNull() {
- String script = translator.translate(g.V().has("k", (Object) null).asAdmin().getBytecode()).getScript();
- assertEquals("g.V().Has(\"k\",(object) null)", script);
- script = translator.translate(g.V().has("l", "k", (Object) null).asAdmin().getBytecode()).getScript();
- assertEquals("g.V().Has(\"l\",\"k\",(object) null)", script);
- }
-
- @Test
- public void shouldTranslateMergeVNull() {
- String script = translator.translate(g.mergeV((Map) null).option(Merge.onCreate, (Map) null).mergeV(__.identity()).asAdmin().getBytecode()).getScript();
- assertEquals("g.MergeV((IDictionary<object,object>) null).Option(Merge.OnCreate, (IDictionary<object,object>) null).MergeV((ITraversal) __.Identity())", script);
- }
-
- @Test
- public void shouldEscapeStrings() {
- final String script = translator.translate(g.addV("customer")
- .property("customer_id", 501L)
- .property("name", "Foo\u0020Bar")
- .property("age", 25)
- .property("special", "`~!@#$%^&*()-_=+[{]}\\|;:'\",<.>/?")
- .asAdmin().getBytecode()).getScript();
-
- assertEquals("g.AddV(\"customer\")" +
- ".Property(\"customer_id\",501)" +
- ".Property(\"name\",\"Foo Bar\")" +
- ".Property(\"age\",25)" +
- ".Property(\"special\",\"`~!@#$%^&*()-_=+[{]}\\\\|;:'\\\",<.>/?\")",
- script);
- }
-
- @Test
- public void shouldTranslateVertexAndEdge() {
- final Object id1 = "customer:10:foo\u0020bar\u0020\u0024100#90"; // customer:10:foo bar $100#90
- final Vertex vertex1 = DetachedVertex.build().setLabel("customer").setId(id1)
- .create();
- final String script1 = translator.translate(g.inject(vertex1).asAdmin().getBytecode()).getScript();
- assertEquals("g.Inject(new Vertex(" +
- "\"customer:10:foo bar $100#90\", " +
- "\"customer\"))",
- script1);
-
- final Object id2 = "user:20:foo\\u0020bar\\u005c\\u0022mr\\u005c\\u0022\\u00241000#50"; // user:20:foo\u0020bar\u005c\u0022mr\u005c\u0022\u00241000#50
- final Vertex vertex2 = DetachedVertex.build().setLabel("user").setId(id2)
- .create();
- final String script2 = translator.translate(g.inject(vertex2).asAdmin().getBytecode()).getScript();
- assertEquals("g.Inject(new Vertex(" +
- "\"user:20:foo\\\\u0020bar\\\\u005c\\\\u0022mr\\\\u005c\\\\u0022\\\\u00241000#50\", " +
- "\"user\"))",
- script2);
-
- final Object id3 = "knows:30:foo\u0020bar\u0020\u0024100:\\u0020\\u0024500#70";
- final Edge edge = DetachedEdge.build().setLabel("knows").setId(id3)
- .setOutV((DetachedVertex) vertex1)
- .setInV((DetachedVertex) vertex2)
- .create();
- final String script3 = translator.translate(g.inject(edge).asAdmin().getBytecode()).getScript();
- assertEquals("g.Inject(" +
- "new Edge(\"knows:30:foo bar $100:\\\\u0020\\\\u0024500#70\", " +
- "new Vertex(\"customer:10:foo bar $100#90\", \"customer\"), " +
- "\"knows\", " +
- "new Vertex(\"user:20:foo\\\\u0020bar\\\\u005c\\\\u0022mr\\\\u005c\\\\u0022\\\\u00241000#50\", \"user\")))",
- script3);
-
- final String script4 = translator.translate(
- g.addE("knows").from(vertex1).to(vertex2).property("when", "2018/09/21")
- .asAdmin().getBytecode()).getScript();
- assertEquals("g.AddE(\"knows\")" +
- ".From(new Vertex(\"customer:10:foo bar $100#90\", \"customer\"))" +
- ".To(new Vertex(\"user:20:foo\\\\u0020bar\\\\u005c\\\\u0022mr\\\\u005c\\\\u0022\\\\u00241000#50\", \"user\"))" +
- ".Property(\"when\",\"2018/09/21\")",
- script4);
- }
-
- @Test
- public void shouldTranslateStringFunctionWithAndWithoutScopes(){
- assertEquals("g.Inject(1).AsString()",
- translator.translate(g.inject(1).asString().asAdmin().getBytecode()).getScript());
- assertEquals("g.Inject(1).AsString<object>(Scope.Local)",
- translator.translate(g.inject(1).asString(Scope.local).asAdmin().getBytecode()).getScript());
-
- assertEquals("g.Inject(\"hello\").Length()",
- translator.translate(g.inject("hello").length().asAdmin().getBytecode()).getScript());
- assertEquals("g.Inject(\"hello\").Length<object>(Scope.Local)",
- translator.translate(g.inject("hello").length(Scope.local).asAdmin().getBytecode()).getScript());
-
- assertEquals("g.Inject(\"hello\").LTrim()",
- translator.translate(g.inject("hello").lTrim().asAdmin().getBytecode()).getScript());
- assertEquals("g.Inject(\"hello\").LTrim<object>(Scope.Local)",
- translator.translate(g.inject("hello").lTrim(Scope.local).asAdmin().getBytecode()).getScript());
-
- assertEquals("g.Inject(\"hello\").RTrim()",
- translator.translate(g.inject("hello").rTrim().asAdmin().getBytecode()).getScript());
- assertEquals("g.Inject(\"hello\").RTrim<object>(Scope.Local)",
- translator.translate(g.inject("hello").rTrim(Scope.local).asAdmin().getBytecode()).getScript());
-
- assertEquals("g.Inject(\"hello\").ToUpper()",
- translator.translate(g.inject("hello").toUpper().asAdmin().getBytecode()).getScript());
- assertEquals("g.Inject(\"hello\").ToUpper<object>(Scope.Local)",
- translator.translate(g.inject("hello").toUpper(Scope.local).asAdmin().getBytecode()).getScript());
-
- assertEquals("g.Inject(\"hello\").ToLower()",
- translator.translate(g.inject("hello").toLower().asAdmin().getBytecode()).getScript());
- assertEquals("g.Inject(\"hello\").ToLower<object>(Scope.Local)",
- translator.translate(g.inject("hello").toLower(Scope.local).asAdmin().getBytecode()).getScript());
-
- assertEquals("g.Inject(\"hello\").Trim()",
- translator.translate(g.inject("hello").trim().asAdmin().getBytecode()).getScript());
- assertEquals("g.Inject(\"hello\").Trim<object>(Scope.Local)",
- translator.translate(g.inject("hello").trim(Scope.local).asAdmin().getBytecode()).getScript());
-
- assertEquals("g.Inject(\"hello\").Replace(\"o\",\"a\")",
- translator.translate(g.inject("hello").replace("o", "a").asAdmin().getBytecode()).getScript());
- assertEquals("g.Inject(\"hello\").Replace<object>(Scope.Local,\"o\",\"a\")",
- translator.translate(g.inject("hello").replace(Scope.local, "o", "a").asAdmin().getBytecode()).getScript());
-
- assertEquals("g.Inject(\"hello\").Split(\"o\")",
- translator.translate(g.inject("hello").split("o").asAdmin().getBytecode()).getScript());
- assertEquals("g.Inject(\"hello\").Split<object>(Scope.Local,\"o\")",
- translator.translate(g.inject("hello").split(Scope.local, "o").asAdmin().getBytecode()).getScript());
-
- assertEquals("g.Inject(\"hello\").Substring(1)",
- translator.translate(g.inject("hello").substring(1).asAdmin().getBytecode()).getScript());
- assertEquals("g.Inject(\"hello\").Substring<object>(Scope.Local,1)",
- translator.translate(g.inject("hello").substring(Scope.local, 1).asAdmin().getBytecode()).getScript());
-
- assertEquals("g.Inject(\"hello\").Substring(1,2)",
- translator.translate(g.inject("hello").substring(1, 2).asAdmin().getBytecode()).getScript());
- assertEquals("g.Inject(\"hello\").Substring<object>(Scope.Local,1,2)",
- translator.translate(g.inject("hello").substring(Scope.local, 1, 2).asAdmin().getBytecode()).getScript());
- }
-
- @Test
- public void shouldTranslateTx() {
- String script = translator.translate(GraphOp.TX_COMMIT.getBytecode()).getScript();
- assertEquals("g.Tx().Commit()", script);
- script = translator.translate(GraphOp.TX_ROLLBACK.getBytecode()).getScript();
- assertEquals("g.Tx().Rollback()", script);
- }
-
- private void assertTranslation(final String expectedTranslation, final Object... objs) {
- final String script = translator.translate(g.inject(objs).asAdmin().getBytecode()).getScript();
- assertEquals(String.format("g.Inject(%s)", expectedTranslation), script);
- }
-}
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/translator/GolangTranslatorTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/translator/GolangTranslatorTest.java
deleted file mode 100644
index 6ca23f8..0000000
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/translator/GolangTranslatorTest.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tinkerpop.gremlin.process.traversal.translator;
-
-import org.apache.commons.text.StringEscapeUtils;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
-import org.apache.tinkerpop.gremlin.process.traversal.GraphOp;
-import org.apache.tinkerpop.gremlin.process.traversal.Translator;
-import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SeedStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SubgraphStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ReadOnlyStrategy;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
-import org.apache.tinkerpop.gremlin.util.function.Lambda;
-import org.junit.Test;
-
-import java.util.Arrays;
-
-import static org.apache.tinkerpop.gremlin.process.traversal.AnonymousTraversalSource.traversal;
-import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.hasLabel;
-import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.inE;
-import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.outE;
-import static org.apache.tinkerpop.gremlin.util.DatetimeHelper.datetime;
-import static org.junit.Assert.assertEquals;
-
-public class GolangTranslatorTest {
- private static final GraphTraversalSource g = traversal().withEmbedded(EmptyGraph.instance());
- private static final Translator.ScriptTranslator translator = GolangTranslator.of("g");
-
- @Test
- public void shouldHaveValidToString() {
- assertEquals("translator[h:gremlin-go]", GolangTranslator.of("h").toString());
- }
-
- @Test
- public void shouldTranslateOption() {
- final String gremlinAsGo = translator.translate(
- g.V().has("person", "name", "marko").asAdmin().getBytecode()).getScript();
- assertEquals("g.V().Has(\"person\", \"name\", \"marko\")", gremlinAsGo);
- }
-
- @Test
- public void shouldTranslateCardinality() {
- final String gremlinAsGo = translator.translate(
- g.addV("person").property(VertexProperty.Cardinality.list, "name", "marko").asAdmin().getBytecode()).getScript();
- assertEquals("g.AddV(\"person\").Property(gremlingo.Cardinality.List, \"name\", \"marko\")", gremlinAsGo);
- }
-
- @Test
- public void shouldTranslateCardinalityValue() {
- assertEquals("g.Inject(gremlingo.CardinalityValue.Set(\"test\"))", translator.translate(
- g.inject(VertexProperty.Cardinality.set("test")).asAdmin().getBytecode()).getScript());
- }
-
- @Test
- public void shouldTranslateMultilineStrings() {
- final String gremlinAsGo = translator.translate(
- g.addV().property("text", "a" + System.lineSeparator() + "\"and\"" + System.lineSeparator() + "b").asAdmin().getBytecode()).getScript();
- final String escapedSeparator = StringEscapeUtils.escapeJava(System.lineSeparator());
- final String expected = "g.AddV().Property(\"text\", \"a" + escapedSeparator + StringEscapeUtils.escapeJava("\"and\"") + escapedSeparator + "b\")";
- assertEquals(expected, gremlinAsGo);
- }
-
- @Test
- public void shouldTranslateChildTraversals() {
- final String gremlinAsGo = translator.translate(
- g.V().has("person", "name", "marko").
- where(outE()).asAdmin().getBytecode()).getScript();
- assertEquals("g.V().Has(\"person\", \"name\", \"marko\").Where(gremlingo.T__.OutE())", gremlinAsGo);
- }
-
- @Test
- public void shouldTranslateGoNamedSteps() {
- final String gremlinAsGo = translator.translate(
- g.V().has("person", "name", "marko").
- where(outE().count().is(2).and(__.not(inE().count().is(3)))).asAdmin().getBytecode()).getScript();
- assertEquals("g.V().Has(\"person\", \"name\", \"marko\").Where(gremlingo.T__.OutE().Count().Is(2).And(gremlingo.T__.Not(gremlingo.T__.InE().Count().Is(3))))", gremlinAsGo);
- }
-
- @Test
- public void shouldTranslateStrategies() {
- assertEquals("g.WithStrategies(gremlingo.ReadOnlyStrategy(), gremlingo.SubgraphStrategy(gremlingo.SubgraphStrategyConfig{CheckAdjacentVertices: false, Vertices: gremlingo.T__.HasLabel(\"person\")}), gremlingo.SeedStrategy(gremlingo.SeedStrategyConfig{Seed: 999999})).V().Has(\"name\")",
- translator.translate(g.withStrategies(ReadOnlyStrategy.instance(),
- SubgraphStrategy.build().checkAdjacentVertices(false).vertices(hasLabel("person")).create(),
- SeedStrategy.build().seed(999999).create()).
- V().has("name").asAdmin().getBytecode()).getScript());
- }
-
- @Test
- public void shouldTranslateLambdas() {
- final Bytecode bytecode = g.withSideEffect("lengthSum", 0).withSack(1)
- .V()
- .filter(Lambda.predicate("x -> x.get().label() == 'person'", "gremlin-groovy"))
- .flatMap(Lambda.function("it.get().vertices(Direction.OUT)", "gremlin-groovy"))
- .map(Lambda.<Traverser<Object>, Integer>function("x -> x : len(x.get().value('name'))", "gremlin-groovy"))
- .sideEffect(Lambda.consumer("x -> x.sideEffects(\"lengthSum\", x.sideEffects('lengthSum') + x.get()) ", "gremlin-groovy"))
- .order().by(Lambda.comparator("a,b -> a == b ? 0 : (a > b) ? 1 : -1)", "gremlin-groovy"))
- .sack(Lambda.biFunction("a,b -> a + b", "gremlin-groovy"))
- .asAdmin().getBytecode();
- assertEquals("g.WithSideEffect(\"lengthSum\", 0).WithSack(1).V()." +
- "Filter(&gremlingo.Lambda{Script:\"x -> x.get().label() == 'person'\", Language:\"\"})." +
- "FlatMap(&gremlingo.Lambda{Script:\"it.get().vertices(Direction.OUT)\", Language:\"\"})." +
- "Map(&gremlingo.Lambda{Script:\"x -> x : len(x.get().value('name'))\", Language:\"\"})." +
- "SideEffect(&gremlingo.Lambda{Script:\"x -> x.sideEffects(\"lengthSum\", x.sideEffects('lengthSum') + x.get())\", Language:\"\"})." +
- "Order().By(&gremlingo.Lambda{Script:\"a,b -> a == b ? 0 : (a > b) ? 1 : -1)\", Language:\"\"})." +
- "Sack(&gremlingo.Lambda{Script:\"a,b -> a + b\", Language:\"\"})",
- translator.translate(bytecode).getScript());
- }
-
- @Test
- public void shouldTranslateArrayOfArray() {
- assertEquals("g.Inject([]interface{}{[]interface{}{1, 2}, []interface{}{3, 4}})",
- translator.translate(g.inject(Arrays.asList(Arrays.asList(1,2),Arrays.asList(3,4))).asAdmin().getBytecode()).getScript());
- }
-
- @Test
- public void shouldTranslateTx() {
- String script = translator.translate(GraphOp.TX_COMMIT.getBytecode()).getScript();
- assertEquals("g.Tx().Commit()", script);
- script = translator.translate(GraphOp.TX_ROLLBACK.getBytecode()).getScript();
- assertEquals("g.Tx().Rollback()", script);
- }
-
- @Test
- public void shouldTranslateOffsetDateTimeUTC() {
- final String gremlinAsGo = translator.translate(
- g.inject(datetime("2023-08-02T01:23:45.678Z")).asAdmin().getBytecode()).getScript();
- assertEquals("g.Inject(time.Date(2023, 8, 2, 1, 23, 45, 678000000, time.FixedZone(\"UTC+00:00\", 0))", gremlinAsGo);
- }
-
- @Test
- public void shouldTranslateOffsetDateTime() {
- final String gremlinAsGo = translator.translate(
- g.inject(datetime("2023-08-02T01:23:45.678-07:30")).asAdmin().getBytecode()).getScript();
- assertEquals("g.Inject(time.Date(2023, 8, 2, 1, 23, 45, 678000000, time.FixedZone(\"UTC-07:30\", -27000))", gremlinAsGo);
- }
-}
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/translator/GroovyTranslatorTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/translator/GroovyTranslatorTest.java
deleted file mode 100644
index dc97b23..0000000
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/translator/GroovyTranslatorTest.java
+++ /dev/null
@@ -1,373 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tinkerpop.gremlin.process.traversal.translator;
-
-import org.apache.tinkerpop.gremlin.process.traversal.GraphOp;
-import org.apache.tinkerpop.gremlin.process.traversal.Order;
-import org.apache.tinkerpop.gremlin.process.traversal.Pop;
-import org.apache.tinkerpop.gremlin.process.traversal.Scope;
-import org.apache.tinkerpop.gremlin.process.traversal.Script;
-import org.apache.tinkerpop.gremlin.process.traversal.Translator;
-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.dsl.graph.GraphTraversalSource;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SubgraphStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ReadOnlyStrategy;
-import org.apache.tinkerpop.gremlin.structure.Column;
-import org.apache.tinkerpop.gremlin.structure.Direction;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdge;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex;
-import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
-import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceVertex;
-import org.apache.tinkerpop.gremlin.util.function.Lambda;
-import org.junit.Test;
-
-import java.sql.Timestamp;
-import java.time.LocalDateTime;
-import java.time.OffsetDateTime;
-import java.time.ZonedDateTime;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.Date;
-import java.util.LinkedHashMap;
-import java.util.UUID;
-import java.util.function.Function;
-
-import static java.time.ZoneOffset.UTC;
-import static org.apache.tinkerpop.gremlin.process.traversal.AnonymousTraversalSource.traversal;
-import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.hasLabel;
-import static org.junit.Assert.assertEquals;
-
-/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class GroovyTranslatorTest {
- private static final GraphTraversalSource g = traversal().withEmbedded(EmptyGraph.instance());
- private static final Translator.ScriptTranslator translator = GroovyTranslator.of("g");
-
- @Test
- public void shouldTranslateStrategies() {
- assertEquals("g.withStrategies(ReadOnlyStrategy,new SubgraphStrategy(checkAdjacentVertices: false, vertices: __.hasLabel(\"person\"))).V().has(\"name\")",
- translator.translate(g.withStrategies(ReadOnlyStrategy.instance(),
- SubgraphStrategy.build().checkAdjacentVertices(false).vertices(hasLabel("person")).create()).
- V().has("name")).getScript());
- }
-
- @Test
- public void shouldTranslateConfusingSacks() {
- final Traversal<Vertex,Double> tConstantUnary = g.withSack(1.0, Lambda.unaryOperator("it + 1")).V().sack();
- final String scriptConstantUnary = translator.translate(tConstantUnary).getScript();
- assertEquals("g.withSack(1.0d,{it + 1}).V().sack()", scriptConstantUnary);
-
- final Traversal<Vertex,Double> tSupplierUnary = g.withSack(Lambda.supplier("1.0d"), Lambda.<Double>unaryOperator("it + 1")).V().sack();
- final String scriptSupplierUnary = translator.translate(tSupplierUnary).getScript();
- assertEquals("g.withSack({1.0d},{it + 1}).V().sack()", scriptSupplierUnary);
-
- final Traversal<Vertex,Double> tConstantBinary = g.withSack(1.0, Lambda.binaryOperator("x,y -> x + y + 1")).V().sack();
- final String scriptConstantBinary = translator.translate(tConstantBinary).getScript();
- assertEquals("g.withSack(1.0d,{x,y -> x + y + 1}).V().sack()", scriptConstantBinary);
-
- final Traversal<Vertex,Double> tSupplierBinary = g.withSack(Lambda.supplier("1.0d"), Lambda.<Double>binaryOperator("x,y -> x + y + 1")).V().sack();
- final String scriptSupplierBinary = translator.translate(tSupplierBinary).getScript();
- assertEquals("g.withSack({1.0d},{x,y -> x + y + 1}).V().sack()", scriptSupplierBinary);
- }
-
- @Test
- public void shouldTranslateStringSupplierLambdas() {
- final GraphTraversal.Admin<Vertex, Integer> t = g.withSideEffect("lengthSum", 0).withSack(1)
- .V()
- .filter(Lambda.predicate("it.get().label().equals('person')"))
- .flatMap(Lambda.function("it.get().vertices(Direction.OUT)"))
- .map(Lambda.<Traverser<Object>, Integer>function("it.get().value('name').length()"))
- .sideEffect(Lambda.consumer("{ x -> x.sideEffects(\"lengthSum\", x.<Integer>sideEffects('lengthSum') + x.get()) }"))
- .order().by(Lambda.comparator("a,b -> a <=> b"))
- .sack(Lambda.biFunction("{ a,b -> a + b }"))
- .asAdmin();
-
- final String script = translator.translate(t.getBytecode()).getScript();
- assertEquals( "g.withSideEffect(\"lengthSum\",(int) 0).withSack((int) 1)" +
- ".V()" +
- ".filter({it.get().label().equals('person')})" +
- ".flatMap({it.get().vertices(Direction.OUT)})" +
- ".map({it.get().value('name').length()})" +
- ".sideEffect({ x -> x.sideEffects(\"lengthSum\", x.<Integer>sideEffects('lengthSum') + x.get()) })" +
- ".order().by({a,b -> a <=> b})" +
- ".sack({ a,b -> a + b })",
- script);
- }
-
- @Test
- public void shouldTranslateMaps() {
- final String script = translator.translate(g.V().id().is(new LinkedHashMap<Object,Object>() {{
- put(3, "32");
- put(Arrays.asList(1, 2, 3.1d), 4);
- put("x", 4);
- put("+x", 8);
- }})).getScript();
- assertEquals("g.V().id().is([((int) 3):\"32\",([(int) 1, (int) 2, 3.1d]):(int) 4,\"x\":(int) 4,\"+x\":(int) 8])", script);
- }
-
- @Test
- public void shouldTranslateEmptyMaps() {
- final Function identity = new Lambda.OneArgLambda("it.get()", "gremlin-groovy");
- final String script = translator.translate(g.inject(Collections.emptyMap()).map(identity)).getScript();
- assertEquals("g.inject([]).map({it.get()})", script);
- }
-
- @Test
- public void shouldTranslateDate() {
- final OffsetDateTime d = OffsetDateTime.of(LocalDateTime.of(2018, 03, 22, 00, 35, 44, 741000000), UTC);
- assertTranslation(String.format("OffsetDateTime.parse('%s')", d), d);
- }
-
- @Test
- public void shouldTranslateTimestamp() {
- final Calendar c = Calendar.getInstance();
- c.set(1975, Calendar.SEPTEMBER, 7);
- final Timestamp t = new Timestamp(c.getTime().getTime());
- assertTranslation(String.format("new Timestamp(%sL)", t.getTime()), t);
- }
-
- @Test
- public void shouldTranslateUuid() {
- final UUID uuid = UUID.fromString("ffffffff-fd49-1e4b-0000-00000d4b8a1d");
- assertTranslation(String.format("UUID.fromString('%s')", uuid), uuid);
- }
-
- @Test
- public void shouldTranslateColumn() {
- assertTranslation("Column.keys", Column.keys);
- }
-
- @Test
- public void shouldTranslateCardinalityValue() {
- assertTranslation("VertexProperty.Cardinality.set(\"test\")", VertexProperty.Cardinality.set("test"));
- }
-
- @Test
- public void shouldTranslateDateUsingLanguageTypeTranslator() {
- final Translator.ScriptTranslator t = GroovyTranslator.of("g",
- new GroovyTranslator.LanguageTypeTranslator(false));
- final OffsetDateTime date = OffsetDateTime.of(LocalDateTime.of(2018, 03, 22, 00, 35, 44, 741000000), UTC);
- assertEquals("g.inject(datetime('2018-03-22T00:35:44.741Z'))",
- t.translate(g.inject(date)).getScript());
- }
-
- @Test
- public void shouldTranslateVertexUsingLanguageTypeTranslator() {
- final Translator.ScriptTranslator t = GroovyTranslator.of("g",
- new GroovyTranslator.LanguageTypeTranslator(false));
-
- assertEquals("g.addE(\"knows\").from(new Vertex(1I,\"person\"))",
- t.translate(g.addE("knows").from(new ReferenceVertex(1, "person"))).getScript());
- }
-
- @Test
- public void shouldTranslateMapsUsingLanguageTypeTranslator() {
- final Translator.ScriptTranslator t = GroovyTranslator.of("g",
- new GroovyTranslator.LanguageTypeTranslator(false));
- final String script = t.translate(g.V().id().is(new LinkedHashMap<Object,Object>() {{
- put(3, "32");
- put(Arrays.asList(1, 2, 3.1d), 4);
- put("x", 4);
- put("+x", 8);
- }})).getScript();
- assertEquals("g.V().id().is([(3I):\"32\",([1I, 2I, 3.1D]):4I,\"x\":4I,\"+x\":8I])", script);
- }
-
- @Test
- public void shouldTranslateDirection() {
- assertTranslation("Direction.BOTH", Direction.BOTH);
- }
-
- @Test
- public void shouldTranslateOrder() {
- assertTranslation("Order.desc", Order.desc);
- }
-
- @Test
- public void shouldTranslatePop() {
- assertTranslation("Pop.last", Pop.last);
- }
-
- @Test
- public void shouldTranslateScope() {
- assertTranslation("Scope.local", Scope.local);
- }
-
- @Test
- public void shouldTranslateNaN() {
- assertTranslation("Double.NaN", Double.NaN);
- }
-
- @Test
- public void shouldTranslatePosInf() {
- assertTranslation("Double.POSITIVE_INFINITY", Double.POSITIVE_INFINITY);
- }
-
- @Test
- public void shouldTranslateNegInf() {
- assertTranslation("Double.NEGATIVE_INFINITY", Double.NEGATIVE_INFINITY);
- }
-
- @Test
- public void shouldIncludeCustomTypeTranslationForSomethingSilly() throws Exception {
- final SillyClass notSillyEnough = SillyClass.from("not silly enough", 100);
-
- // without type translation we get uglinesss
- final String scriptBad = translator.
- translate(g.inject(notSillyEnough)).getScript();
- assertEquals(String.format("g.inject(%s)", "not silly enough:100"), scriptBad);
-
- // with type translation we get valid gremlin
- final String scriptGood = GroovyTranslator.of("g", new SillyClassTranslator(false)).
- translate(g.inject(notSillyEnough)).getScript();
- assertEquals(String.format("g.inject(org.apache.tinkerpop.gremlin.groovy.jsr223.GroovyTranslatorTest.SillyClass.from('%s', (int) %s))", notSillyEnough.getX(), notSillyEnough.getY()), scriptGood);
- }
-
- @Test
- public void shouldHaveValidToString() {
- assertEquals("translator[h:gremlin-groovy]", GroovyTranslator.of("h").toString());
- }
-
- @Test
- public void shouldEscapeStrings() {
- final String script = translator.translate(g.addV("customer")
- .property("customer_id", 501L)
- .property("name", "Foo\u0020Bar")
- .property("age", 25)
- .property("special", "`~!@#$%^&*()-_=+[{]}\\|;:'\",<.>/?")
- ).getScript();
-
- assertEquals("g.addV(\"customer\")" +
- ".property(\"customer_id\",501L)" +
- ".property(\"name\",\"Foo Bar\")" +
- ".property(\"age\",(int) 25)" +
- ".property(\"special\",\"\"\"`~!@#\\$%^&*()-_=+[{]}\\\\|;:'\\\",<.>/?\"\"\")",
- script);
- }
-
- @Test
- public void shouldTranslateVertexAndEdge() {
- final Object id1 = "customer:10:foo\u0020bar\u0020\u0024100#90"; // customer:10:foo bar $100#90
- final Vertex vertex1 = DetachedVertex.build().setLabel("customer").setId(id1)
- .create();
- final String script1 = translator.translate(g.inject(vertex1)).getScript();
- assertEquals("g.inject(new ReferenceVertex(" +
- "\"customer:10:foo bar \\$100#90\"," +
- "\"customer\"))",
- script1);
-
- final Object id2 = "user:20:foo\\u0020bar\\u005c\\u0022mr\\u005c\\u0022\\u00241000#50"; // user:20:foo\u0020bar\u005c\u0022mr\u005c\u0022\u00241000#50
- final Vertex vertex2 = DetachedVertex.build().setLabel("user").setId(id2)
- .create();
- final String script2 = translator.translate(g.inject(vertex2)).getScript();
- assertEquals("g.inject(new ReferenceVertex(" +
- "\"user:20:foo\\\\u0020bar\\\\u005c\\\\u0022mr\\\\u005c\\\\u0022\\\\u00241000#50\"," +
- "\"user\"))",
- script2);
-
- final Object id3 = "knows:30:foo\u0020bar\u0020\u0024100:\\u0020\\u0024500#70";
- final Edge edge = DetachedEdge.build().setLabel("knows").setId(id3)
- .setOutV((DetachedVertex) vertex1)
- .setInV((DetachedVertex) vertex2)
- .create();
- final String script3 = translator.translate(g.inject(edge)).getScript();
- assertEquals("g.inject(new ReferenceEdge(" +
- "\"knows:30:foo bar \\$100:\\\\u0020\\\\u0024500#70\"," +
- "\"knows\"," +
- "new ReferenceVertex(\"user:20:foo\\\\u0020bar\\\\u005c\\\\u0022mr\\\\u005c\\\\u0022\\\\u00241000#50\",\"user\")," +
- "new ReferenceVertex(\"customer:10:foo bar \\$100#90\",\"customer\")))",
- script3);
-
- final String script4 = translator.translate(
- g.addE("knows").from(vertex1).to(vertex2).property("when", "2018/09/21")
- ).getScript();
- assertEquals("g.addE(\"knows\")" +
- ".from(new ReferenceVertex(\"customer:10:foo bar \\$100#90\",\"customer\"))" +
- ".to(new ReferenceVertex(\"user:20:foo\\\\u0020bar\\\\u005c\\\\u0022mr\\\\u005c\\\\u0022\\\\u00241000#50\",\"user\"))" +
- ".property(\"when\",\"2018/09/21\")",
- script4);
- }
-
- @Test
- public void shouldTranslateTx() {
- String script = translator.translate(GraphOp.TX_COMMIT.getBytecode()).getScript();
- assertEquals("g.tx().commit()", script);
- script = translator.translate(GraphOp.TX_ROLLBACK.getBytecode()).getScript();
- assertEquals("g.tx().rollback()", script);
- }
-
- private void assertTranslation(final String expectedTranslation, final Object... objs) {
- final String script = translator.translate(g.inject(objs)).getScript();
- assertEquals(String.format("g.inject(%s)", expectedTranslation), script);
- }
-
- public static class SillyClass {
-
- private final String x;
- private final int y;
-
- private SillyClass(final String x, final int y) {
- this.x = x;
- this.y = y;
- }
-
- public static SillyClass from(final String x, final int y) {
- return new SillyClass(x, y);
- }
-
- public String getX() {
- return x;
- }
-
- public int getY() {
- return y;
- }
-
- @Override
- public String toString() {
- return x + ":" + String.valueOf(y);
- }
- }
-
- public static class SillyClassTranslator extends GroovyTranslator.DefaultTypeTranslator {
-
- public SillyClassTranslator(final boolean withParameters) {
- super(withParameters);
- }
-
- @Override
- protected Script convertToScript(final Object object) {
- if (object instanceof SillyClass) {
- return script.append(String.format("org.apache.tinkerpop.gremlin.groovy.jsr223.GroovyTranslatorTest.SillyClass.from('%s', (int) %s)",
- ((SillyClass) object).getX(), ((SillyClass) object).getY()));
- } else {
- return super.convertToScript(object);
- }
- }
- }
-}
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/translator/JavascriptTranslatorTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/translator/JavascriptTranslatorTest.java
deleted file mode 100644
index 22c2e24..0000000
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/translator/JavascriptTranslatorTest.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tinkerpop.gremlin.process.traversal.translator;
-
-import org.apache.tinkerpop.gremlin.process.traversal.GraphOp;
-import org.apache.tinkerpop.gremlin.process.traversal.Order;
-import org.apache.tinkerpop.gremlin.process.traversal.Pop;
-import org.apache.tinkerpop.gremlin.process.traversal.Scope;
-import org.apache.tinkerpop.gremlin.process.traversal.TextP;
-import org.apache.tinkerpop.gremlin.process.traversal.Translator;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SeedStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SubgraphStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ReadOnlyStrategy;
-import org.apache.tinkerpop.gremlin.structure.Column;
-import org.apache.tinkerpop.gremlin.structure.Direction;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdge;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex;
-import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
-import org.junit.Test;
-
-import java.time.LocalDateTime;
-import java.time.OffsetDateTime;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.LinkedHashMap;
-import java.util.UUID;
-
-import static java.time.ZoneOffset.UTC;
-import static org.apache.tinkerpop.gremlin.process.traversal.AnonymousTraversalSource.traversal;
-import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.hasLabel;
-import static org.junit.Assert.assertEquals;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class JavascriptTranslatorTest {
- private static final GraphTraversalSource g = traversal().withEmbedded(EmptyGraph.instance());
- private static final Translator.ScriptTranslator translator = JavascriptTranslator.of("g");
-
- @Test
- public void shouldTranslateStrategies() throws Exception {
- assertEquals("g.withStrategies(new ReadOnlyStrategy()," +
- "new SubgraphStrategy({checkAdjacentVertices:false,vertices:__.hasLabel(\"person\")})," +
- "new SeedStrategy({seed:999999})).V().has(\"name\")",
- translator.translate(g.withStrategies(ReadOnlyStrategy.instance(),
- SubgraphStrategy.build().checkAdjacentVertices(false).vertices(hasLabel("person")).create(),
- SeedStrategy.build().seed(999999).create()).
- V().has("name").asAdmin().getBytecode()).getScript());
- }
-
- @Test
- public void shouldTranslateMaps() {
- final String script = translator.translate(g.V().id().is(new LinkedHashMap<Object,Object>() {{
- put(3, "32");
- put(Arrays.asList(1, 2, 3.1d), 4);
- }}).asAdmin().getBytecode()).getScript();
- assertEquals("g.V().id().is(new Map([[3,\"32\"],[[1, 2, 3.1],4]]))", script);
- }
-
- @Test
- public void shouldTranslateDate() {
- final OffsetDateTime d = OffsetDateTime.of(LocalDateTime.of(2018, 03, 22, 00, 35, 44, 741000000), UTC);
- assertTranslation(String.format("new Date('%s')", d), d);
- }
-
- @Test
- public void shouldTranslateUuid() {
- final UUID uuid = UUID.fromString("ffffffff-fd49-1e4b-0000-00000d4b8a1d");
- assertTranslation(String.format("'%s'", uuid), uuid);
- }
-
- @Test
- public void shouldTranslateColumn() {
- assertTranslation("Column.keys", Column.keys);
- }
-
- @Test
- public void shouldTranslateDirection() {
- assertTranslation("Direction.BOTH", Direction.BOTH);
- }
-
- @Test
- public void shouldTranslateOrder() {
- assertTranslation("Order.desc", Order.desc);
- }
-
- @Test
- public void shouldTranslatePop() {
- assertTranslation("Pop.last", Pop.last);
- }
-
- @Test
- public void shouldTranslateTextP() {
- assertTranslation("TextP.containing(\"ark\")", TextP.containing("ark"));
- assertTranslation("TextP.regex(\"ark\")", TextP.regex("ark"));
- assertTranslation("TextP.notRegex(\"ark\")", TextP.notRegex("ark"));
- }
-
- @Test
- public void shouldTranslateScope() {
- assertTranslation("Scope.local", Scope.local);
- }
-
- @Test
- public void shouldTranslateCardinalityValue() {
- assertTranslation("CardinalityValue.set(\"test\")", VertexProperty.Cardinality.set("test"));
- }
-
- @Test
- public void shouldHaveValidToString() {
- assertEquals("translator[h:gremlin-javascript]", JavascriptTranslator.of("h").toString());
- }
-
- @Test
- public void shouldHaveNull() {
-// assertEquals("g.inject(null,null)", translator.translate(g.inject(null, null).asAdmin().getBytecode()).getScript());
-// assertEquals("g.V()", translator.translate(g.V().asAdmin().getBytecode()).getScript());
- assertEquals("g.V(null)", translator.translate(g.V(null).asAdmin().getBytecode()).getScript());
- assertEquals("g.V(null,null)", translator.translate(g.V(null, null).asAdmin().getBytecode()).getScript());
- assertEquals("g.E()", translator.translate(g.E().asAdmin().getBytecode()).getScript());
- assertEquals("g.E(null)", translator.translate(g.E(null).asAdmin().getBytecode()).getScript());
- assertEquals("g.E(null,null)", translator.translate(g.E(null, null).asAdmin().getBytecode()).getScript());
- }
-
- @Test
- public void shouldEscapeStrings() {
- final String script = translator.translate(g.addV("customer")
- .property("customer_id", 501L)
- .property("name", "Foo\u0020Bar")
- .property("age", 25)
- .property("special", "`~!@#$%^&*()-_=+[{]}\\|;:'\",<.>/?")
- .asAdmin().getBytecode()).getScript();
-
- assertEquals("g.addV(\"customer\")" +
- ".property(\"customer_id\",501)" +
- ".property(\"name\",\"Foo Bar\")" +
- ".property(\"age\",25)" +
- ".property(\"special\",\"\"\"`~!@#\\$%^&*()-_=+[{]}\\\\|;:'\\\",<.>/?\"\"\")",
- script);
- }
-
- @Test
- public void shouldTranslateVertexAndEdge() {
- final Object id1 = "customer:10:foo\u0020bar\u0020\u0024100#90"; // customer:10:foo bar $100#90
- final Vertex vertex1 = DetachedVertex.build().setLabel("customer").setId(id1)
- .create();
- final String script1 = translator.translate(g.inject(vertex1).asAdmin().getBytecode()).getScript();
- assertEquals("g.inject(new Vertex(" +
- "\"customer:10:foo bar \\$100#90\"," +
- "\"customer\", null))",
- script1);
-
- final Object id2 = "user:20:foo\\u0020bar\\u005c\\u0022mr\\u005c\\u0022\\u00241000#50"; // user:20:foo\u0020bar\u005c\u0022mr\u005c\u0022\u00241000#50
- final Vertex vertex2 = DetachedVertex.build().setLabel("user").setId(id2)
- .create();
- final String script2 = translator.translate(g.inject(vertex2).asAdmin().getBytecode()).getScript();
- assertEquals("g.inject(new Vertex(" +
- "\"user:20:foo\\\\u0020bar\\\\u005c\\\\u0022mr\\\\u005c\\\\u0022\\\\u00241000#50\"," +
- "\"user\", null))",
- script2);
-
- final Object id3 = "knows:30:foo\u0020bar\u0020\u0024100:\\u0020\\u0024500#70";
- final Edge edge = DetachedEdge.build().setLabel("knows").setId(id3)
- .setOutV((DetachedVertex) vertex1)
- .setInV((DetachedVertex) vertex2)
- .create();
- final String script3 = translator.translate(g.inject(edge).asAdmin().getBytecode()).getScript();
- assertEquals("g.inject(" +
- "new Edge(\"knows:30:foo bar \\$100:\\\\u0020\\\\u0024500#70\", " +
- "new Vertex(\"customer:10:foo bar \\$100#90\",\"customer\", null)," +
- "\"knows\", " +
- "new Vertex(\"user:20:foo\\\\u0020bar\\\\u005c\\\\u0022mr\\\\u005c\\\\u0022\\\\u00241000#50\",\"user\",null)," +
- "null))",
- script3);
-
- final String script4 = translator.translate(
- g.addE("knows").from(vertex1).to(vertex2).property("when", "2018/09/21")
- .asAdmin().getBytecode()).getScript();
- assertEquals("g.addE(\"knows\")" +
- ".from_(new Vertex(\"customer:10:foo bar \\$100#90\",\"customer\", null))" +
- ".to(new Vertex(\"user:20:foo\\\\u0020bar\\\\u005c\\\\u0022mr\\\\u005c\\\\u0022\\\\u00241000#50\",\"user\", null))" +
- ".property(\"when\",\"2018/09/21\")",
- script4);
- }
-
- @Test
- public void shouldTranslateTx() {
- String script = translator.translate(GraphOp.TX_COMMIT.getBytecode()).getScript();
- assertEquals("g.tx().commit()", script);
- script = translator.translate(GraphOp.TX_ROLLBACK.getBytecode()).getScript();
- assertEquals("g.tx().rollback()", script);
- }
-
- private void assertTranslation(final String expectedTranslation, final Object... objs) {
- final String script = translator.translate(g.inject(objs).asAdmin().getBytecode()).getScript();
- assertEquals(String.format("g.inject(%s)", expectedTranslation), script);
- }
-}
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/translator/ParameterizedGroovyTranslatorTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/translator/ParameterizedGroovyTranslatorTest.java
deleted file mode 100644
index cf1da86..0000000
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/translator/ParameterizedGroovyTranslatorTest.java
+++ /dev/null
@@ -1,367 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tinkerpop.gremlin.process.traversal.translator;
-
-import org.apache.tinkerpop.gremlin.jsr223.TranslatorCustomizer;
-import org.apache.tinkerpop.gremlin.process.traversal.P;
-import org.apache.tinkerpop.gremlin.process.traversal.Script;
-import org.apache.tinkerpop.gremlin.process.traversal.Translator;
-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.dsl.graph.GraphTraversalSource;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SubgraphStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ReadOnlyStrategy;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.T;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdge;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex;
-import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
-import org.apache.tinkerpop.gremlin.util.function.Lambda;
-import org.junit.Test;
-
-import javax.script.Bindings;
-import javax.script.SimpleBindings;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.LinkedHashSet;
-import java.util.LinkedHashMap;
-import java.util.function.Function;
-
-import static org.apache.tinkerpop.gremlin.process.traversal.AnonymousTraversalSource.traversal;
-import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.hasLabel;
-import static org.junit.Assert.assertEquals;
-
-/**
- * test {@link GroovyTranslator} which return parameterized result, covers:
- * - parameterized script checking
- * - binding checking
- * - eval result checking
- *
- * <p>
- * {@link GroovyTranslatorTest } is used to test {@link GroovyTranslator}, both test cases looks the same
- * <p>
- *
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- * @author Stephen Mallette (http://stephen.genoprime.com)
- * @author Stark Arya (sandszhou.zj@alibaba-inc.com)
- */
-public class ParameterizedGroovyTranslatorTest {
-
- private static final GraphTraversalSource g = traversal().withEmbedded(EmptyGraph.instance());
- private static final Translator.ScriptTranslator translator = GroovyTranslator.of("g", true);
-
- @Test
- public void shouldHandleStrategies() throws Exception {
- assertEquals("g.withStrategies(ReadOnlyStrategy,new SubgraphStrategy(checkAdjacentVertices: _args_0, vertices: __.hasLabel(_args_1))).V().has(_args_2)",
- translator.translate(g.withStrategies(ReadOnlyStrategy.instance(),
- SubgraphStrategy.build().checkAdjacentVertices(false).vertices(hasLabel("person")).create()).
- V().has("name").asAdmin().getBytecode()).getScript());
- }
-
- @Test
- public void shouldSupportStringSupplierLambdas() {
- final GraphTraversal.Admin<Vertex, Integer> t = g.withSideEffect("lengthSum", 0).withSack(1)
- .V()
- .filter(Lambda.predicate("it.get().label().equals('person')"))
- .flatMap(Lambda.function("it.get().vertices(Direction.OUT)"))
- .map(Lambda.<Traverser<Object>, Integer>function("it.get().value('name').length()"))
- .sideEffect(Lambda.consumer("{ x -> x.sideEffects(\"lengthSum\", x.<Integer>sideEffects('lengthSum') + x.get()) }"))
- .order().by(Lambda.comparator("a,b -> a <=> b"))
- .sack(Lambda.biFunction("{ a,b -> a + b }"))
- .asAdmin();
- final Script script = translator.translate(t.getBytecode());
- final Bindings bindings = new SimpleBindings();
- script.getParameters().ifPresent(bindings::putAll);
- assertEquals(9, bindings.size());
- assertEquals("lengthSum", bindings.get("_args_0"));
- assertEquals(Integer.valueOf(0), bindings.get("_args_1"));
- assertEquals(Integer.valueOf(1), bindings.get("_args_2"));
- assertEquals(Lambda.predicate("it.get().label().equals('person')"), bindings.get("_args_3"));
- assertEquals(Lambda.function("it.get().vertices(Direction.OUT)"), bindings.get("_args_4"));
- assertEquals(Lambda.<Traverser<Object>, Integer>function("it.get().value('name').length()"), bindings.get("_args_5"));
- assertEquals(Lambda.consumer("{ x -> x.sideEffects(\"lengthSum\", x.<Integer>sideEffects('lengthSum') + x.get()) }"), bindings.get("_args_6"));
- assertEquals(Lambda.comparator("a,b -> a <=> b"), bindings.get("_args_7"));
- assertEquals(Lambda.biFunction("{ a,b -> a + b }"), bindings.get("_args_8"));
- assertEquals("g.withSideEffect(_args_0,_args_1).withSack(_args_2)" +
- ".V()" +
- ".filter(_args_3)" +
- ".flatMap(_args_4)" +
- ".map(_args_5)" +
- ".sideEffect(_args_6)" +
- ".order().by(_args_7)" +
- ".sack(_args_8)",
- script.getScript());
- }
-
- @Test
- public void shouldHandleArray() {
- final Script script = translator.translate(g.V().has(T.id, P.within(new ArrayList() {{
- add(1);
- add(2);
- add(3);
- add(4);
- add(5);
- }})).asAdmin().getBytecode());
- final Bindings bindings = new SimpleBindings();
- script.getParameters().ifPresent(bindings::putAll);
- assertEquals(5, bindings.size());
- assertEquals(Integer.valueOf(1), bindings.get("_args_0"));
- assertEquals(Integer.valueOf(2), bindings.get("_args_1"));
- assertEquals(Integer.valueOf(3), bindings.get("_args_2"));
- assertEquals(Integer.valueOf(4), bindings.get("_args_3"));
- assertEquals(Integer.valueOf(5), bindings.get("_args_4"));
- assertEquals("g.V().has(T.id,P.within([_args_0, _args_1, _args_2, _args_3, _args_4]))", script.getScript());
- }
-
- @Test
- public void shouldHandleSet() {
- final Script script = translator.translate(g.V().id().is(new LinkedHashSet<Object>() {{
- add(3);
- add(Arrays.asList(1, 2, 3.1d));
- add(3);
- add("3");
- }}).asAdmin().getBytecode());
- final Bindings bindings = new SimpleBindings();
- script.getParameters().ifPresent(bindings::putAll);
- assertEquals(5, bindings.size());
- assertEquals(Integer.valueOf(3), bindings.get("_args_0"));
- assertEquals(Integer.valueOf(1), bindings.get("_args_1"));
- assertEquals(Integer.valueOf(2), bindings.get("_args_2"));
- assertEquals(Double.valueOf(3.1), bindings.get("_args_3"));
- assertEquals("3", bindings.get("_args_4"));
-
- assertEquals("g.V().id().is([_args_0, [_args_1, _args_2, _args_3], _args_4] as Set)", script.getScript());
- }
-
- @Test
- public void shouldHandleMaps() {
- final Script script = translator.translate(g.V().id().is(new LinkedHashMap<Object,Object>() {{
- put(3, "32");
- put(Arrays.asList(1, 2, 3.1d), 4);
- }}).asAdmin().getBytecode());
- final Bindings bindings = new SimpleBindings();
- script.getParameters().ifPresent(bindings::putAll);
- assertEquals(6, bindings.size());
- assertEquals(Integer.valueOf(3), bindings.get("_args_0"));
- assertEquals("32", bindings.get("_args_1"));
- assertEquals(Integer.valueOf(1), bindings.get("_args_2"));
- assertEquals(Integer.valueOf(2), bindings.get("_args_3"));
- assertEquals(Double.valueOf(3.1), bindings.get("_args_4"));
- assertEquals(Integer.valueOf(4), bindings.get("_args_5"));
- assertEquals("g.V().id().is([(_args_0):_args_1,([_args_2, _args_3, _args_4]):_args_5])", script.getScript());
- }
-
- @Test
- public void shouldHandleEmptyMaps() {
- final Function identity = new Lambda.OneArgLambda("it.get()", "gremlin-groovy");
- final Script script = translator.translate(g.inject(Collections.emptyMap()).map(identity).asAdmin().getBytecode());
- final Bindings bindings = new SimpleBindings();
- script.getParameters().ifPresent(bindings::putAll);
- assertEquals(1, bindings.size());
- assertEquals(identity, bindings.get("_args_0"));
- assertEquals("g.inject([]).map(_args_0)", script.getScript());
- }
-
- @Test
- public void shouldIncludeCustomTypeTranslationForSomethingSilly() throws Exception {
- final ParameterizedSillyClass notSillyEnough = ParameterizedSillyClass.from("not silly enough", 100);
-
- // without type translation we get uglinesss
- final Script parameterizedScriptBad = translator.translate(g.inject(notSillyEnough).asAdmin().getBytecode());
- final Bindings bindings = new SimpleBindings();
- parameterizedScriptBad.getParameters().ifPresent(bindings::putAll);
- assertEquals(String.format("g.inject(%s)", "_args_0"), parameterizedScriptBad.getScript());
- assertEquals(1, bindings.size());
- assertEquals(notSillyEnough, bindings.get("_args_0"));
- bindings.clear();
-
- // with type translation we get valid gremlin
- final Script parameterizedScriptGood = GroovyTranslator.of("g", new ParameterizedSillyClassTranslatorCustomizer().createTypeTranslator()).
- translate(g.inject(notSillyEnough).asAdmin().getBytecode());
- parameterizedScriptGood.getParameters().ifPresent(bindings::putAll);
- assertEquals(2, bindings.size());
- assertEquals(notSillyEnough.getX(), bindings.get("_args_0"));
- assertEquals(notSillyEnough.getY(), bindings.get("_args_1"));
- assertEquals("g.inject(org.apache.tinkerpop.gremlin.process.traversal.translator.ParameterizedGroovyTranslatorTest.ParameterizedSillyClass.from(_args_0,_args_1))",
- parameterizedScriptGood.getScript());
- }
-
- @Test
- public void shouldHaveValidToString() {
- assertEquals("translator[h:gremlin-groovy]", GroovyTranslator.of("h", true).toString());
- }
-
- @Test
- public void shouldEscapeStrings() {
- final Script script = translator.translate(g.addV("customer")
- .property("customer_id", 501L)
- .property("name", "Foo\u0020Bar")
- .property("age", 25)
- .property("special", "`~!@#$%^&*()-_=+[{]}\\|;:'\",<.>/?")
- .asAdmin().getBytecode());
- final Bindings bindings = new SimpleBindings();
- script.getParameters().ifPresent(bindings::putAll);
- assertEquals(9, bindings.size());
- assertEquals("customer", bindings.get("_args_0"));
- assertEquals("customer_id", bindings.get("_args_1"));
- assertEquals(Long.valueOf(501), bindings.get("_args_2"));
- assertEquals("name", bindings.get("_args_3"));
- assertEquals("Foo\u0020Bar", bindings.get("_args_4"));
- assertEquals("age", bindings.get("_args_5"));
- assertEquals(Integer.valueOf(25), bindings.get("_args_6"));
- assertEquals("special", bindings.get("_args_7"));
- assertEquals("`~!@#$%^&*()-_=+[{]}\\|;:'\",<.>/?", bindings.get("_args_8"));
- assertEquals("g.addV(_args_0).property(_args_1,_args_2).property(_args_3,_args_4).property(_args_5,_args_6).property(_args_7,_args_8)", script.getScript());
- }
-
- @Test
- public void shouldHandleVertexAndEdge() {
- final Object id1 = "customer:10:foo\u0020bar\u0020\u0024100#90"; // customer:10:foo bar $100#90
- final Vertex vertex1 = DetachedVertex.build().setLabel("customer").setId(id1)
- .create();
- final Script script1 = translator.translate(g.inject(vertex1).asAdmin().getBytecode());
- final Bindings bindings = new SimpleBindings();
- script1.getParameters().ifPresent(bindings::putAll);
- assertEquals(2, bindings.size());
- assertEquals(id1, bindings.get("_args_0"));
- assertEquals("customer", bindings.get("_args_1"));
- assertEquals("g.inject(new ReferenceVertex(_args_0,_args_1))", script1.getScript());
- bindings.clear();
-
- final Object id2 = "user:20:foo\\u0020bar\\u005c\\u0022mr\\u005c\\u0022\\u00241000#50"; // user:20:foo\u0020bar\u005c\u0022mr\u005c\u0022\u00241000#50
- final Vertex vertex2 = DetachedVertex.build().setLabel("user").setId(id2)
- .create();
- final Script script2 = translator.translate(g.inject(vertex2).asAdmin().getBytecode());
- script2.getParameters().ifPresent(bindings::putAll);
- assertEquals(2, bindings.size());
- assertEquals(id2, bindings.get("_args_0"));
- assertEquals("user", bindings.get("_args_1"));
- assertEquals("g.inject(new ReferenceVertex(_args_0,_args_1))", script2.getScript());
- bindings.clear();
-
- final Object id3 = "knows:30:foo\u0020bar\u0020\u0024100:\\u0020\\u0024500#70";
- final Edge edge = DetachedEdge.build().setLabel("knows").setId(id3)
- .setOutV((DetachedVertex) vertex1)
- .setInV((DetachedVertex) vertex2)
- .create();
- final Script script3 = translator.translate(g.inject(edge).asAdmin().getBytecode());
- script3.getParameters().ifPresent(bindings::putAll);
- assertEquals(6, bindings.size());
- assertEquals(id3, bindings.get("_args_0"));
- assertEquals("knows", bindings.get("_args_1"));
- assertEquals(id2, bindings.get("_args_2"));
- assertEquals("user", bindings.get("_args_3"));
- assertEquals(id1, bindings.get("_args_4"));
- assertEquals("customer", bindings.get("_args_5"));
- assertEquals("g.inject(new ReferenceEdge(_args_0,_args_1,new ReferenceVertex(_args_2,_args_3),new ReferenceVertex(_args_4,_args_5)))", script3.getScript());
- bindings.clear();
-
- final Script script4 = translator.translate(
- g.addE("knows").from(vertex1).to(vertex2).property("when", "2018/09/21")
- .asAdmin().getBytecode());
- script4.getParameters().ifPresent(bindings::putAll);
- assertEquals(7, bindings.size());
- assertEquals("knows", bindings.get("_args_0"));
- assertEquals(id1, bindings.get("_args_1"));
- assertEquals("customer", bindings.get("_args_2"));
- assertEquals(id2, bindings.get("_args_3"));
- assertEquals("user", bindings.get("_args_4"));
- assertEquals("when", bindings.get("_args_5"));
- assertEquals("2018/09/21", bindings.get("_args_6"));
- assertEquals("g.addE(_args_0).from(new ReferenceVertex(_args_1,_args_2)).to(new ReferenceVertex(_args_3,_args_4)).property(_args_5,_args_6)", script4.getScript());
- bindings.clear();
-
- final Script script5 = translator.translate(g.V().has("age").asAdmin().getBytecode());
- script5.getParameters().ifPresent(bindings::putAll);
- assertEquals(1, bindings.size());
- assertEquals("age", bindings.get("_args_0"));
- assertEquals("g.V().has(_args_0)", script5.getScript());
- }
-
- public static class ParameterizedSillyClass {
-
- private final String x;
- private final int y;
-
- private ParameterizedSillyClass(final String x, final int y) {
- this.x = x;
- this.y = y;
- }
-
- public static ParameterizedSillyClass from(final String x, final int y) {
- return new ParameterizedSillyClass(x, y);
- }
-
- public String getX() {
- return x;
- }
-
- public int getY() {
- return y;
- }
-
- public Object[] getArguments() {
- return new Object[] {x,y};
- }
-
- @Override
- public String toString() {
- return String.format("org.apache.tinkerpop.gremlin.groovy.jsr223.ParameterizedGroovyTranslatorTest.ParameterizedSillyClass.from('%s', (int) %s)", getX(), getY());
- }
- }
-
- public static class ParameterizedSillyClassTranslator extends GroovyTranslator.DefaultTypeTranslator {
- public ParameterizedSillyClassTranslator(final boolean withParameters) {
- super(withParameters);
- }
-
- @Override
- protected Script convertToScript(final Object object) {
- if (object instanceof ParameterizedSillyClass) {
- ParameterizedSillyClass obj = (ParameterizedSillyClass) object;
- script.append(obj.getClass().getCanonicalName());
- if (0 == obj.getArguments().length) {
- script.append(".").append("from").append("()");
- } else {
- script.append(".").append("from").append("(");
- for (final Object argument: obj.getArguments()) {
- convertToScript(argument);
- script.append(",");
- }
- script.setCharAtEnd(')');
- }
- return script;
- } else {
- return super.convertToScript(object);
- }
- }
- }
-
- public static class ParameterizedSillyClassTranslatorCustomizer implements TranslatorCustomizer {
-
- @Override
- public Translator.ScriptTranslator.TypeTranslator createTypeTranslator() {
- return new ParameterizedSillyClassTranslator(true);
- }
- }
-}
-
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/translator/PythonTranslatorTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/translator/PythonTranslatorTest.java
deleted file mode 100644
index 89bda92..0000000
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/translator/PythonTranslatorTest.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.process.traversal.translator;
-
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
-import org.apache.tinkerpop.gremlin.process.traversal.Merge;
-import org.apache.tinkerpop.gremlin.process.traversal.GraphOp;
-import org.apache.tinkerpop.gremlin.process.traversal.TextP;
-import org.apache.tinkerpop.gremlin.process.traversal.Translator;
-import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SeedStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SubgraphStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ReadOnlyStrategy;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
-import org.apache.tinkerpop.gremlin.util.function.Lambda;
-import org.junit.Test;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.apache.tinkerpop.gremlin.process.traversal.AnonymousTraversalSource.traversal;
-import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.hasLabel;
-import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.inE;
-import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.outE;
-import static org.apache.tinkerpop.gremlin.util.DatetimeHelper.datetime;
-import static org.junit.Assert.assertEquals;
-
-public class PythonTranslatorTest {
- private static final GraphTraversalSource g = traversal().withEmbedded(EmptyGraph.instance());
- private static final Translator.ScriptTranslator translator = PythonTranslator.of("g");
- private static final Translator.ScriptTranslator noSugarTranslator = PythonTranslator.of("g", new PythonTranslator.NoSugarTranslator(false));
-
- @Test
- public void shouldHaveValidToString() {
- assertEquals("translator[h:gremlin-python]", PythonTranslator.of("h").toString());
- }
-
- @Test
- public void shouldTranslateOption() {
- final String gremlinAsPython = translator.translate(
- g.V().has("person", "name", "marko").asAdmin().getBytecode()).getScript();
- assertEquals("g.V().has('person','name','marko')", gremlinAsPython);
- }
-
- @Test
- public void shouldTranslateValues() {
- final String gremlinAsPython = translator.translate(
- g.V().values("age").asAdmin().getBytecode()).getScript();
- assertEquals("g.V().age", gremlinAsPython);
- }
-
- @Test
- public void shouldTranslateDiscard() {
- final String gremlinAsPython = translator.translate(
- g.V().discard().asAdmin().getBytecode()).getScript();
- assertEquals("g.V().discard()", gremlinAsPython);
- }
-
- @Test
- public void shouldTranslateCardinality() {
- final String gremlinAsPython = translator.translate(
- g.addV("person").property(VertexProperty.Cardinality.list, "name", "marko").asAdmin().getBytecode()).getScript();
- assertEquals("g.add_v('person').property(Cardinality.list_,'name','marko')", gremlinAsPython);
- }
-
- @Test
- public void shouldTranslateCardinalityValue() {
- final Map<Object, Object> m = new HashMap<>();
- m.put("name", VertexProperty.Cardinality.set("marko"));
- final String gremlinAsPython = translator.translate(
- g.mergeV(new HashMap<>()).option(Merge.onMatch, m).asAdmin().getBytecode()).getScript();
- assertEquals("g.merge_v({}).option(Merge.on_match,{'name':CardinalityValue.set_('marko')})", gremlinAsPython);
- }
-
- @Test
- public void shouldTranslateMultilineStrings() {
- final String gremlinAsPython = translator.translate(
- g.addV().property("text", "a"+ System.lineSeparator() + "\"and\"" + System.lineSeparator() + "b").asAdmin().getBytecode()).getScript();
- assertEquals("g.add_v().property('text',\"\"\"a" + System.lineSeparator() + "\"and\"" + System.lineSeparator() + "b\"\"\")", gremlinAsPython);
- }
-
- @Test
- public void shouldTranslateChildTraversals() {
- final String gremlinAsPython = translator.translate(
- g.V().has("person", "name", "marko").
- where(outE()).asAdmin().getBytecode()).getScript();
- assertEquals("g.V().has('person','name','marko').where(__.out_e())", gremlinAsPython);
- }
-
- @Test
- public void shouldTranslatePythonNamedSteps() {
- final String gremlinAsPython = translator.translate(
- g.V().has("person", "name", "marko").
- where(outE().count().is(2).and(__.not(inE().count().is(3)))).asAdmin().getBytecode()).getScript();
- assertEquals("g.V().has('person','name','marko').where(__.out_e().count().is_(2).and_(__.not_(__.in_e().count().is_(3))))", gremlinAsPython);
- }
-
- @Test
- public void shouldTranslateTextP() {
- assertTranslation("TextP.containing('ark')", TextP.containing("ark"));
- assertTranslation("TextP.regex('ark')", TextP.regex("ark"));
- assertTranslation("TextP.not_regex('ark')", TextP.notRegex("ark"));
- }
-
- @Test
- public void shouldTranslateStrategies() {
- assertEquals("g.with_strategies(*[TraversalStrategy('ReadOnlyStrategy', None, 'org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ReadOnlyStrategy'),TraversalStrategy('SubgraphStrategy',{'checkAdjacentVertices':False,'vertices':__.has_label('person')}, 'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SubgraphStrategy'),TraversalStrategy('SeedStrategy',{'seed':999999}, 'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SeedStrategy')]).V().has('name')",
- translator.translate(g.withStrategies(ReadOnlyStrategy.instance(),
- SubgraphStrategy.build().checkAdjacentVertices(false).vertices(hasLabel("person")).create(),
- SeedStrategy.build().seed(999999).create()).
- V().has("name").asAdmin().getBytecode()).getScript());
- }
-
- @Test
- public void shouldTranslateLambdas() {
- final Bytecode bytecode = g.withSideEffect("lengthSum", 0).withSack(1)
- .V()
- .filter(Lambda.predicate("x -> x.get().label() == 'person'", "gremlin-groovy"))
- .flatMap(Lambda.function("it.get().vertices(Direction.OUT)", "gremlin-groovy"))
- .map(Lambda.<Traverser<Object>, Integer>function("x -> x : len(x.get().value('name'))", "gremlin-groovy"))
- .sideEffect(Lambda.consumer("x -> x.sideEffects(\"lengthSum\", x.sideEffects('lengthSum') + x.get()) ", "gremlin-groovy"))
- .order().by(Lambda.comparator("a,b -> a == b ? 0 : (a > b) ? 1 : -1)", "gremlin-groovy"))
- .sack(Lambda.biFunction("a,b -> a + b", "gremlin-groovy"))
- .asAdmin().getBytecode();
- assertEquals("g.with_side_effect('lengthSum',0).with_sack(1).V().filter_(lambda: \"x -> x.get().label() == 'person'\").flat_map(lambda: \"it.get().vertices(Direction.OUT)\").map(lambda: \"x -> x : len(x.get().value('name'))\").side_effect(lambda: \"x -> x.sideEffects(\\\"lengthSum\\\", x.sideEffects('lengthSum') + x.get())\").order().by(lambda: \"a,b -> a == b ? 0 : (a > b) ? 1 : -1)\").sack(lambda: \"a,b -> a + b\")",
- translator.translate(bytecode).getScript());
- }
-
- @Test
- public void shouldTranslateWithSyntaxSugar() {
- final String gremlinAsPython = translator.translate(g.V().range(0, 10).has("person", "name", "marko").limit(2).values("name").asAdmin().getBytecode())
- .getScript();
- assertEquals("g.V()[0:10].has('person','name','marko')[0:2].name", gremlinAsPython);
- }
-
- @Test
- public void shouldTranslateWithoutSyntaxSugar() {
- final String gremlinAsPython = noSugarTranslator
- .translate(g.V().range(0, 10).has("person", "name", "marko").limit(2).values("name").asAdmin().getBytecode())
- .getScript();
- assertEquals("g.V().range_(0,10).has('person','name','marko').limit(2).values('name')", gremlinAsPython);
- }
-
- @Test
- public void shouldTranslateTx() {
- String script = translator.translate(GraphOp.TX_COMMIT.getBytecode()).getScript();
- assertEquals("g.tx().commit()", script);
- script = translator.translate(GraphOp.TX_ROLLBACK.getBytecode()).getScript();
- assertEquals("g.tx().rollback()", script);
- }
-
- private void assertTranslation(final String expectedTranslation, final Object... objs) {
- final String script = translator.translate(g.inject(objs).asAdmin().getBytecode()).getScript();
- assertEquals(String.format("g.inject(%s)", expectedTranslation), script);
- }
-
- @Test
- public void shouldTranslateOffsetDateTimeUTC() {
- final String gremlinAsPython = translator.translate(
- g.inject(datetime("2023-08-02T01:23:45.678Z")).asAdmin().getBytecode()).getScript();
- assertEquals("g.inject(datetime.datetime.fromisoformat('2023-08-02T01:23:45.678+00:00'))", gremlinAsPython);
- }
-
- @Test
- public void shouldTranslateOffsetDateTime() {
- final String gremlinAsPython = translator.translate(
- g.inject(datetime("2023-08-02T01:23:45.678-07:00")).asAdmin().getBytecode()).getScript();
- assertEquals("g.inject(datetime.datetime.fromisoformat('2023-08-02T01:23:45.678-07:00'))", gremlinAsPython);
- }
-}
\ No newline at end of file
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/util/BytecodeHelperTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/util/BytecodeHelperTest.java
deleted file mode 100644
index 75aa1fb..0000000
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/util/BytecodeHelperTest.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.process.traversal.util;
-
-import java.lang.reflect.Modifier;
-import java.util.Arrays;
-import java.util.List;
-import org.apache.tinkerpop.gremlin.process.traversal.Bindings;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
-import org.apache.tinkerpop.gremlin.process.traversal.Step;
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
-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.dsl.graph.__;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.OptionsStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ReadOnlyStrategy;
-import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
-import org.apache.tinkerpop.gremlin.util.function.Lambda;
-import org.junit.Assert;
-import org.junit.Test;
-
-import java.util.Iterator;
-import java.util.Optional;
-import java.util.stream.Stream;
-
-import static org.apache.tinkerpop.gremlin.process.traversal.GraphOp.TX_COMMIT;
-import static org.apache.tinkerpop.gremlin.process.traversal.GraphOp.TX_ROLLBACK;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class BytecodeHelperTest {
- private static final GraphTraversalSource g = EmptyGraph.instance().traversal();
- private static final List<Class<?>> TRAVERSAL_SYMBOLS_CLASSES = Arrays.asList(
- Traversal.Symbols.class, GraphTraversal.Symbols.class,
- TraversalSource.Symbols.class, GraphTraversalSource.Symbols.class
- );
- private static final List<String> MODULATING_OPERATORS = Arrays.asList(
- GraphTraversal.Symbols.to, GraphTraversal.Symbols.from, GraphTraversal.Symbols.read,
- GraphTraversal.Symbols.write, GraphTraversal.Symbols.emit, GraphTraversal.Symbols.until,
- GraphTraversal.Symbols.by, GraphTraversal.Symbols.with, GraphTraversal.Symbols.times,
- GraphTraversal.Symbols.as, GraphTraversal.Symbols.option, TraversalSource.Symbols.withSack,
- TraversalSource.Symbols.withStrategies, TraversalSource.Symbols.withoutStrategies,
- TraversalSource.Symbols.withSideEffect, TraversalSource.Symbols.withRemote,
- TraversalSource.Symbols.withComputer, GraphTraversalSource.Symbols.withBulk,
- GraphTraversalSource.Symbols.withPath
- );
-
- @Test
- public void shouldFindStrategy() {
- final Iterator<OptionsStrategy> itty = BytecodeHelper.findStrategies(g.with("x").with("y", 100).V().asAdmin().getBytecode(), OptionsStrategy.class);
- int counter = 0;
-
- final OptionsStrategy strategy = itty.next();
- if (strategy.getOptions().keySet().contains("x")) {
- assertThat(strategy.getOptions().get("x"), is(true));
- counter++;
- }
-
- if (strategy.getOptions().keySet().contains("y")) {
- assertEquals(100, strategy.getOptions().get("y"));
- counter++;
- }
- assertEquals(2, counter);
- assertFalse(itty.hasNext()); // There should only be a single source instruction per strategy.
- }
-
- @Test
- public void shouldNotFindStrategy() {
- final Iterator<ReadOnlyStrategy> itty = BytecodeHelper.findStrategies(g.with("x").with("y", 100).V().asAdmin().getBytecode(), ReadOnlyStrategy.class);
- assertThat(itty.hasNext(), is(false));
- }
-
- @Test
- public void shouldNotFindGremlinGroovyLambdaLanguage() {
- final Optional<String> lambda = BytecodeHelper.getLambdaLanguage(g.V().out("knows").map(Lambda.function("it.get()")).asAdmin().getBytecode());
- assertThat(lambda.isPresent(), is(true));
- }
-
- @Test
- public void shouldNotFindLambdaLanguage() {
- final Optional<String> lambda = BytecodeHelper.getLambdaLanguage(g.V().out("knows").map(__.identity()).asAdmin().getBytecode());
- assertThat(lambda.isPresent(), is(false));
- }
-
- @Test
- public void shouldRemoveBindings() {
- final Bindings b = Bindings.instance();
- final Bytecode bc = g.V(b.of("x", 1)).out(b.of("y", "knows")).asAdmin().getBytecode();
- final Bytecode filteredBeforeRemoved = BytecodeHelper.filterInstructions(
- bc, i -> Stream.of(i.getArguments()).anyMatch(o -> o instanceof Bytecode.Binding));
- assertEquals(2, filteredBeforeRemoved.getStepInstructions().size());
-
- BytecodeHelper.removeBindings(bc);
- final Bytecode filteredAfterRemoved = BytecodeHelper.filterInstructions(
- bc, i -> Stream.of(i.getArguments()).anyMatch(o -> o instanceof Bytecode.Binding));
- assertEquals(0, filteredAfterRemoved.getStepInstructions().size());
- }
-
- @Test
- public void shouldDetermineOperation() {
- assertThat(BytecodeHelper.isGraphOperation(TX_COMMIT.getBytecode()), is(true));
- assertThat(BytecodeHelper.isGraphOperation(TX_ROLLBACK.getBytecode()), is(true));
- assertThat(BytecodeHelper.isGraphOperation(g.V().out("knows").asAdmin().getBytecode()), is(false));
- }
-
- @Test
- public void findPossibleTraversalSteps() {
- TRAVERSAL_SYMBOLS_CLASSES.stream().map(Class::getDeclaredFields).flatMap(Arrays::stream).filter(field -> {
- final int modifier = field.getModifiers();
- // We are interested in public static final string fields defined in the class
- return Modifier.isStatic(modifier) && Modifier.isPublic(modifier) && Modifier.isFinal(modifier);
- }).forEach(field -> {
- try {
- final List<Class<? extends Step>> steps = BytecodeHelper.findPossibleTraversalSteps((String) field.get(null));
- assertNotNull(steps);
- } catch (Exception ex) {
- Assert.fail(String.format("Error while finding possible Traversal step for operator %s. Exception: %s", field.getName(), ex));
- }
- });
- }
-
- @Test
- public void findPossibleTraversalStepsForModulatorOperators() {
- MODULATING_OPERATORS.forEach(operator -> {
- try {
- final List<Class<? extends Step>> steps = BytecodeHelper.findPossibleTraversalSteps(operator);
- assertNotNull(steps);
- assertThat(steps.size(), is(0));
- } catch (Exception ex) {
- Assert.fail(String.format("Error while finding possible Traversal step for operator %s. Exception: %s", operator, ex));
- }
- });
- }
-}
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalTest.java
index 3f0e57a..555a12f 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalTest.java
@@ -107,7 +107,7 @@
clone.getSideEffects().set("m", 2);
assertEquals(1, original.getSideEffects().<Integer>get("m").intValue());
assertEquals(2, clone.getSideEffects().<Integer>get("m").intValue());
- assertNotSame(original.bytecode, clone.bytecode);
+ assertNotSame(original.gremlinLang, clone.gremlinLang);
assertEquals(original.closed, clone.closed);
}
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperEmbeddedTypeTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperEmbeddedTypeTest.java
index 7bdb01e..69dd2a0 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperEmbeddedTypeTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperEmbeddedTypeTest.java
@@ -20,14 +20,11 @@
import org.apache.commons.configuration2.BaseConfiguration;
import org.apache.commons.configuration2.Configuration;
-import org.apache.tinkerpop.gremlin.process.remote.traversal.DefaultRemoteTraverser;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
import org.apache.tinkerpop.gremlin.process.traversal.Compare;
import org.apache.tinkerpop.gremlin.process.traversal.P;
import org.apache.tinkerpop.gremlin.process.traversal.PBiPredicate;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.MatchStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.BulkSet;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.TraversalStrategyProxy;
@@ -92,6 +89,9 @@
.typeInfo(TypeInfo.PARTIAL_TYPES).create().createMapper()},
{"v3", GraphSONMapper.build().version(GraphSONVersion.V3_0)
.addCustomModule(GraphSONXModuleV3.build())
+ .typeInfo(TypeInfo.PARTIAL_TYPES).create().createMapper()},
+ {"v4", GraphSONMapper.build().version(GraphSONVersion.V4_0)
+ .addCustomModule(GraphSONXModuleV4.build())
.typeInfo(TypeInfo.PARTIAL_TYPES).create().createMapper()}
});
}
@@ -105,7 +105,7 @@
@Test
public void shouldHandleBoolean() throws Exception {
- assumeThat(version, either(startsWith("v2")).or(startsWith("v3")));
+ assumeThat(version, not(startsWith("v1")));
final boolean b = true;
assertEquals(b, serializeDeserialize(mapper, b, Boolean.class));
@@ -113,7 +113,7 @@
@Test
public void shouldHandleString() throws Exception {
- assumeThat(version, either(startsWith("v2")).or(startsWith("v3")));
+ assumeThat(version, not(startsWith("v1")));
final String s = "simple";
assertEquals(s, serializeDeserialize(mapper, s, String.class));
@@ -121,7 +121,7 @@
@Test
public void shouldHandleTraversalExplanation() throws Exception {
- assumeThat(version, not(startsWith("v1")));
+ assumeThat(version, either(startsWith("v2")).or(startsWith("v3")));
final TraversalExplanation o = __().out().outV().outE().explain();
final TraversalExplanation deser = serializeDeserialize(mapper, o, TraversalExplanation.class);
@@ -130,15 +130,16 @@
@Test
public void shouldHandleBulkSet() throws Exception {
- // only supported on V3
- assumeThat(version, not(anyOf(startsWith("v1"), startsWith("v2"))));
+ // only supported on V4
+ assumeThat(version, not(anyOf(startsWith("v1"), startsWith("v2"), startsWith("v3"))));
final BulkSet<String> bs = new BulkSet<>();
bs.add("test1", 1);
bs.add("test2", 2);
bs.add("test3", 3);
- assertEquals(bs, serializeDeserialize(mapper, bs, BulkSet.class));
+ final List<String> expandedBs = new ArrayList<>(bs);
+ assertEquals(expandedBs, serializeDeserializeAuto(mapper, bs));
}
@Test
@@ -156,7 +157,7 @@
@Test
public void shouldHandleMap() throws Exception {
- assumeThat(version, startsWith("v3"));
+ assumeThat(version, either(startsWith("v3")).or(startsWith("v4")));
final Map<Object,Object> o = new LinkedHashMap<>();
o.put("string key", "string value");
@@ -171,7 +172,7 @@
@Test
public void shouldHandleList() throws Exception {
- assumeThat(version, startsWith("v3"));
+ assumeThat(version, either(startsWith("v3")).or(startsWith("v4")));
final List<Object> o = new ArrayList<>();
o.add("test");
@@ -188,7 +189,7 @@
@Test
public void shouldHandleSet() throws Exception {
- assumeThat(version, startsWith("v3"));
+ assumeThat(version, either(startsWith("v3")).or(startsWith("v4")));
final Set<Object> o = new LinkedHashSet<>();
o.add("test");
@@ -253,22 +254,6 @@
}
@Test
- public void shouldHandleBytecodeBinding() throws Exception {
- assumeThat(version, either(startsWith("v2")).or(startsWith("v3")));
-
- final Bytecode.Binding<String> o = new Bytecode.Binding<>("test", "testing");
- assertEquals(o, serializeDeserialize(mapper, o, Bytecode.Binding.class));
- }
-
- @Test
- public void shouldHandleTraverser() throws Exception {
- assumeThat(version, either(startsWith("v2")).or(startsWith("v3")));
-
- final Traverser<String> o = new DefaultRemoteTraverser<>("test", 100);
- assertEquals(o, serializeDeserialize(mapper, o, Traverser.class));
- }
-
- @Test
public void shouldHandleDuration() throws Exception {
final Duration o = Duration.ZERO;
assertEquals(o, serializeDeserialize(mapper, o, Duration.class));
@@ -276,30 +261,40 @@
@Test
public void shouldHandleInstant() throws Exception {
+ assumeThat(version, not(startsWith("v4")));
+
final Instant o = Instant.ofEpochMilli(System.currentTimeMillis());
assertEquals(o, serializeDeserialize(mapper, o, Instant.class));
}
@Test
public void shouldHandleLocalDate() throws Exception {
+ assumeThat(version, not(startsWith("v4")));
+
final LocalDate o = LocalDate.now();
assertEquals(o, serializeDeserialize(mapper, o, LocalDate.class));
}
@Test
public void shouldHandleLocalDateTime() throws Exception {
+ assumeThat(version, not(startsWith("v4")));
+
final LocalDateTime o = LocalDateTime.now();
assertEquals(o, serializeDeserialize(mapper, o, LocalDateTime.class));
}
@Test
public void shouldHandleLocalTime() throws Exception {
+ assumeThat(version, not(startsWith("v4")));
+
final LocalTime o = LocalTime.now();
assertEquals(o, serializeDeserialize(mapper, o, LocalTime.class));
}
@Test
public void shouldHandleMonthDay() throws Exception {
+ assumeThat(version, not(startsWith("v4")));
+
final MonthDay o = MonthDay.now();
assertEquals(o, serializeDeserialize(mapper, o, MonthDay.class));
}
@@ -312,43 +307,55 @@
@Test
public void shouldHandleOffsetTime() throws Exception {
+ assumeThat(version, not(startsWith("v4")));
+
final OffsetTime o = OffsetTime.now();
assertEquals(o, serializeDeserialize(mapper, o, OffsetTime.class));
}
@Test
public void shouldHandlePeriod() throws Exception {
+ assumeThat(version, not(startsWith("v4")));
+
final Period o = Period.ofDays(3);
assertEquals(o, serializeDeserialize(mapper, o, Period.class));
}
@Test
public void shouldHandleYear() throws Exception {
+ assumeThat(version, not(startsWith("v4")));
+
final Year o = Year.now();
assertEquals(o, serializeDeserialize(mapper, o, Year.class));
}
@Test
public void shouldHandleYearMonth() throws Exception {
+ assumeThat(version, not(startsWith("v4")));
+
final YearMonth o = YearMonth.now();
assertEquals(o, serializeDeserialize(mapper, o, YearMonth.class));
}
@Test
public void shouldHandleZonedDateTime() throws Exception {
+ assumeThat(version, not(startsWith("v4")));
+
final ZonedDateTime o = ZonedDateTime.now();
assertEquals(o, serializeDeserialize(mapper, o, ZonedDateTime.class));
}
@Test
public void shouldHandleZonedOffset() throws Exception {
+ assumeThat(version, not(startsWith("v4")));
+
final ZoneOffset o = ZonedDateTime.now().getOffset();
assertEquals(o, serializeDeserialize(mapper, o, ZoneOffset.class));
}
@Test
public void shouldHandleBigInteger() throws Exception {
- assumeThat(version, either(startsWith("v2")).or(startsWith("v3")));
+ assumeThat(version, not(startsWith("v1")));
final BigInteger o = new BigInteger("123456789987654321123456789987654321");
assertEquals(o, serializeDeserialize(mapper, o, BigInteger.class));
@@ -356,27 +363,35 @@
@Test
public void shouldReadBigIntegerAsString() throws Exception {
- assumeThat(version, either(startsWith("v2")).or(startsWith("v3")));
+ assumeThat(version, not(startsWith("v1")));
final BigInteger o = new BigInteger("123456789987654321123456789987654321");
- assertEquals(o, mapper.readValue("{\"@type\": \"gx:BigInteger\", \"@value\": \"123456789987654321123456789987654321\"}", Object.class));
+ if (version.startsWith("v4")) {
+ assertEquals(o, mapper.readValue("{\"@type\": \"g:BigInteger\", \"@value\": \"123456789987654321123456789987654321\"}", Object.class));
+ } else {
+ assertEquals(o, mapper.readValue("{\"@type\": \"gx:BigInteger\", \"@value\": \"123456789987654321123456789987654321\"}", Object.class));
+ }
}
@Test
public void shouldReadBigIntegerAsNumber() throws Exception {
- assumeThat(version, either(startsWith("v2")).or(startsWith("v3")));
+ assumeThat(version, not(startsWith("v1")));
// this was the original GraphSON 2.0/3.0 format published for BigInteger but jackson is flexible enough to
// do it as a string. the string approach is probably better for most language variants so while this tests
// enforces this approach but leaves open the opportunity to accept either. at some point in the future
// perhaps it can switch fully - TINKERPOP-2156
final BigInteger o = new BigInteger("123456789987654321123456789987654321");
- assertEquals(o, mapper.readValue("{\"@type\": \"gx:BigInteger\", \"@value\": 123456789987654321123456789987654321}", Object.class));
+ if (version.startsWith("v4")) {
+ assertEquals(o, mapper.readValue("{\"@type\": \"g:BigInteger\", \"@value\": 123456789987654321123456789987654321}", Object.class));
+ } else {
+ assertEquals(o, mapper.readValue("{\"@type\": \"gx:BigInteger\", \"@value\": 123456789987654321123456789987654321}", Object.class));
+ }
}
@Test
public void shouldHandleBigDecimal() throws Exception {
- assumeThat(version, either(startsWith("v2")).or(startsWith("v3")));
+ assumeThat(version, not(startsWith("v1")));
final BigDecimal o = new BigDecimal("123456789987654321123456789987654321");
assertEquals(o, serializeDeserialize(mapper, o, BigDecimal.class));
@@ -442,94 +457,31 @@
@Test
public void shouldReadBigDecimalAsString() throws Exception {
- assumeThat(version, either(startsWith("v2")).or(startsWith("v3")));
+ assumeThat(version, not(startsWith("v1")));
final BigDecimal o = new BigDecimal("123456789987654321123456789987654321");
- assertEquals(o, mapper.readValue("{\"@type\": \"gx:BigDecimal\", \"@value\": \"123456789987654321123456789987654321\"}", Object.class));
+
+ if (version.startsWith("v4")) {
+ assertEquals(o, mapper.readValue("{\"@type\": \"g:BigDecimal\", \"@value\": \"123456789987654321123456789987654321\"}", Object.class));
+ } else {
+ assertEquals(o, mapper.readValue("{\"@type\": \"gx:BigDecimal\", \"@value\": \"123456789987654321123456789987654321\"}", Object.class));
+ }
}
@Test
public void shouldReadBigDecimalAsNumber() throws Exception {
- assumeThat(version, either(startsWith("v2")).or(startsWith("v3")));
+ assumeThat(version, not(startsWith("v1")));
// this was the original GraphSON 2.0/3.0 format published for BigDecimal but jackson is flexible enough to
// do it as a string. the string approach is probably better for most language variants so while this tests
// enforces this approach but leaves open the opportunity to accept either. at some point in the future
// perhaps it can switch fully - TINKERPOP-2156
final BigDecimal o = new BigDecimal("123456789987654321123456789987654321");
- assertEquals(o, mapper.readValue("{\"@type\": \"gx:BigDecimal\", \"@value\": 123456789987654321123456789987654321}", Object.class));
- }
-
- @Test
- public void shouldReadBytecodeWithHaltedTraverserStrategy() throws Exception {
- assumeThat(version, either(startsWith("v2")).or(startsWith("v3")));
-
- final HaltedTraverserStrategy strat = HaltedTraverserStrategy.detached();
- final Bytecode expected = EmptyGraph.instance().traversal().withStrategies(strat).V().asAdmin().getBytecode();
- final Bytecode actual = mapper.readValue("{\"@type\":\"g:Bytecode\",\"@value\":{\"source\":[[\"withStrategies\",{\"@type\":\"g:HaltedTraverserStrategy\",\"@value\":{\"conf\": { \"haltedTraverserFactory\":\"org.apache.tinkerpop.gremlin.structure.util.detached.DetachedFactory\" },\"fqcn\":\"org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.HaltedTraverserStrategy\"}}]],\"step\":[[\"V\"]]}}", Bytecode.class);
- assertEquals(expected.getSourceInstructions().size(), actual.getSourceInstructions().size());
- assertEquals(expected.getSourceInstructions().get(0).getOperator(), actual.getSourceInstructions().get(0).getOperator());
- assertEquals(expected.getSourceInstructions().get(0).getArguments().length, actual.getSourceInstructions().get(0).getArguments().length);
- assertEquals(1, actual.getSourceInstructions().get(0).getArguments().length);
- assertEquals(expected.getSourceInstructions().get(0).getArguments()[0].getClass(), ((TraversalStrategyProxy) actual.getSourceInstructions().get(0).getArguments()[0]).getStrategyClass());
- assertEquals(((HaltedTraverserStrategy) expected.getSourceInstructions().get(0).getArguments()[0]).getHaltedTraverserFactory().getCanonicalName(), ((TraversalStrategyProxy) actual.getSourceInstructions().get(0).getArguments()[0]).getConfiguration().getProperty("haltedTraverserFactory"));
- }
-
- @Test
- public void shouldHandleSeedStrategy() throws Exception {
- assumeThat(version, either(startsWith("v2")).or(startsWith("v3")));
-
- final SeedStrategy o = new SeedStrategy(999);
- final TraversalStrategyProxy strategyProxy = serializeDeserialize(mapper, o, TraversalStrategyProxy.class);
- assertThat(strategyProxy, instanceOf(TraversalStrategyProxy.class));
- assertEquals(SeedStrategy.class, strategyProxy.getStrategyClass());
- assertEquals(999, strategyProxy.getConfiguration().getInt("seed"));
- }
-
- @Test
- public void shouldHandleHaltedTraverserStrategy() throws Exception {
- assumeThat(version, either(startsWith("v2")).or(startsWith("v3")));
-
- final HaltedTraverserStrategy o = HaltedTraverserStrategy.detached();
- final TraversalStrategyProxy strategyProxy = serializeDeserialize(mapper, o, TraversalStrategyProxy.class);
- assertThat(strategyProxy, instanceOf(TraversalStrategyProxy.class));
- assertEquals(HaltedTraverserStrategy.class, strategyProxy.getStrategyClass());
- assertEquals(o.getHaltedTraverserFactory().getCanonicalName(), strategyProxy.getConfiguration().getString("haltedTraverserFactory"));
- }
-
- @Test
- public void shouldHandleMatchAlgorithmStrategy() throws Exception {
- assumeThat(version, either(startsWith("v2")).or(startsWith("v3")));
-
- final MatchAlgorithmStrategy o = MatchAlgorithmStrategy.build().algorithm(MatchStep.GreedyMatchAlgorithm.class).create();
- final TraversalStrategyProxy strategyProxy = serializeDeserialize(mapper, o, TraversalStrategyProxy.class);
- assertThat(strategyProxy, instanceOf(TraversalStrategyProxy.class));
- assertEquals(MatchAlgorithmStrategy.class, strategyProxy.getStrategyClass());
- assertEquals(o.getConfiguration().getProperty("matchAlgorithm"), strategyProxy.getConfiguration().getString("matchAlgorithm"));
- }
-
- @Test
- public void shouldHandleTraversalStrategyProxy() throws Exception {
- assumeThat(version, either(startsWith("v2")).or(startsWith("v3")));
-
- final TraversalStrategyProxy o = new TraversalStrategyProxy(DummyTraversalStrategy.instance());
- final TraversalStrategyProxy strategyProxy = serializeDeserialize(mapper, o, TraversalStrategyProxy.class);
- assertThat(strategyProxy, instanceOf(TraversalStrategyProxy.class));
- assertEquals(DummyTraversalStrategy.class, strategyProxy.getStrategyClass());
- DummyTraversalStrategy.instance().getConfiguration().getKeys().forEachRemaining(
- k -> assertEquals(DummyTraversalStrategy.instance().getConfiguration().getProperty(k), strategyProxy.getConfiguration().getProperty(k)));
- }
-
- @Test
- public void shouldHandleTraversalStrategyProxyWithConfig() throws Exception {
- assumeThat(version, either(startsWith("v2")).or(startsWith("v3")));
-
- final TraversalStrategyProxy o = new TraversalStrategyProxy(DummyConfiguredTraversalStrategy.instance());
- final TraversalStrategyProxy strategyProxy = serializeDeserialize(mapper, o, TraversalStrategyProxy.class);
- assertThat(strategyProxy, instanceOf(TraversalStrategyProxy.class));
- assertEquals(DummyConfiguredTraversalStrategy.class, strategyProxy.getStrategyClass());
- DummyConfiguredTraversalStrategy.instance().getConfiguration().getKeys().forEachRemaining(
- k -> assertEquals(DummyConfiguredTraversalStrategy.instance().getConfiguration().getProperty(k), strategyProxy.getConfiguration().getProperty(k)));
+ if (version.startsWith("v4")) {
+ assertEquals(o, mapper.readValue("{\"@type\": \"g:BigDecimal\", \"@value\": 123456789987654321123456789987654321}", Object.class));
+ } else {
+ assertEquals(o, mapper.readValue("{\"@type\": \"gx:BigDecimal\", \"@value\": 123456789987654321123456789987654321}", Object.class));
+ }
}
@Test
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperPartialEmbeddedTypeTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperPartialEmbeddedTypeTest.java
index 4b07c95..99b45a8 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperPartialEmbeddedTypeTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperPartialEmbeddedTypeTest.java
@@ -18,12 +18,9 @@
*/
package org.apache.tinkerpop.gremlin.structure.io.graphson;
-import org.apache.tinkerpop.gremlin.process.remote.traversal.DefaultRemoteTraverser;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
import org.apache.tinkerpop.gremlin.process.traversal.P;
import org.apache.tinkerpop.gremlin.process.traversal.TextP;
import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
-import org.apache.tinkerpop.shaded.jackson.databind.JsonMappingException;
import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -34,6 +31,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.time.Instant;
+import java.time.OffsetDateTime;
import java.time.ZoneOffset;
import java.time.ZonedDateTime;
import java.util.ArrayList;
@@ -45,7 +43,6 @@
import java.util.UUID;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.IsInstanceOf.instanceOf;
import static org.hamcrest.core.StringContains.containsString;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
@@ -68,6 +65,9 @@
.typeInfo(TypeInfo.PARTIAL_TYPES).create().createMapper()},
{"v3", GraphSONMapper.build().version(GraphSONVersion.V3_0)
.addCustomModule(GraphSONXModuleV3.build())
+ .typeInfo(TypeInfo.PARTIAL_TYPES).create().createMapper()},
+ {"v4", GraphSONMapper.build().version(GraphSONVersion.V4_0)
+ .addCustomModule(GraphSONXModuleV4.build())
.typeInfo(TypeInfo.PARTIAL_TYPES).create().createMapper()}
});
}
@@ -79,36 +79,6 @@
public ObjectMapper mapper;
@Test
- public void elementOrderShouldNotMatter() throws Exception {
- final String bytecodeJSONFail1 = "{\"@type\":\"g:Bytecode\",\"@value\":{\"step\":[[\"addV\",\"poc_int\"],[\"property\",\"bigint1value\",{\"@type\":\"g:Int32\",\"@value\":-4294967295}]]}}";
- final String bytecodeJSONFail2 = "{\"@value\":{\"step\":[[\"addV\",\"poc_int\"],[\"property\",\"bigint1value\",{\"@value\":-4294967295,\"@type\":\"g:Int32\"}]]},\"@type\":\"g:Bytecode\"}";
-
- // first validate the failures of TINKERPOP-1738 - prior to the jackson fix on 2.9.4 one of these would have
- // passed based on the ordering of the properties
- try {
- mapper.readValue(bytecodeJSONFail1, Bytecode.class);
- fail("Should have thrown an error because 'bigint1value' is not an int32");
- } catch (Exception ex) {
- assertThat(ex, instanceOf(JsonMappingException.class));
- }
-
- try {
- mapper.readValue(bytecodeJSONFail2, Bytecode.class);
- fail("Should have thrown an error because 'bigint1value' is not an int32");
- } catch (Exception ex) {
- assertThat(ex, instanceOf(JsonMappingException.class));
- }
-
- // now do a legit parsing based on order
- final String bytecodeJSON1 = "{\"@type\":\"g:Bytecode\",\"@value\":{\"step\":[[\"addV\",\"poc_int\"],[\"property\",\"bigint1value\",{\"@type\":\"g:Int64\",\"@value\":-4294967295}]]}}";
- final String bytecodeJSON2 = "{\"@value\":{\"step\":[[\"addV\",\"poc_int\"],[\"property\",\"bigint1value\",{\"@value\":-4294967295,\"@type\":\"g:Int64\"}]]},\"@type\":\"g:Bytecode\"}";
-
- final Bytecode bytecode1 = mapper.readValue(bytecodeJSON1, Bytecode.class);
- final Bytecode bytecode2 = mapper.readValue(bytecodeJSON2, Bytecode.class);
- assertEquals(bytecode1, bytecode2);
- }
-
- @Test
public void shouldSerializeDeserializeNestedCollectionsAndMapAndTypedValuesCorrectly() throws Exception {
// Trying to fail the TypeDeserializer type detection
final UUID uuid = UUID.randomUUID();
@@ -176,7 +146,7 @@
@Test
public void shouldFailIfTypeSpecifiedIsNotSameTypeInPayload() {
- final ZoneOffset o = ZonedDateTime.now().getOffset();
+ final OffsetDateTime o = OffsetDateTime.now();
final ByteArrayOutputStream stream = new ByteArrayOutputStream();
try {
mapper.writeValue(stream, o);
@@ -185,7 +155,11 @@
mapper.readValue(inputStream, Instant.class);
fail("Should have failed decoding the value");
} catch (Exception e) {
- assertThat(e.getMessage(), containsString("Could not deserialize the JSON value as required. Nested exception: java.lang.InstantiationException: Cannot deserialize the value with the detected type contained in the JSON ('" + GraphSONTokens.GREMLINX_TYPE_NAMESPACE + ":ZoneOffset') to the type specified in parameter to the object mapper (class java.time.Instant). Those types are incompatible."));
+ if (version.startsWith("v4")) {
+ assertThat(e.getMessage(), containsString("Could not deserialize the JSON value as required. Nested exception: java.lang.InstantiationException: Cannot deserialize the value with the detected type contained in the JSON ('" + GraphSONTokens.GREMLIN_TYPE_NAMESPACE + ":DateTime') to the type specified in parameter to the object mapper (class java.time.Instant). Those types are incompatible."));
+ } else {
+ assertThat(e.getMessage(), containsString("Could not deserialize the JSON value as required. Nested exception: java.lang.InstantiationException: Cannot deserialize the value with the detected type contained in the JSON ('" + GraphSONTokens.GREMLINX_TYPE_NAMESPACE + ":OffsetDateTime') to the type specified in parameter to the object mapper (class java.time.Instant). Those types are incompatible."));
+ }
}
}
@@ -302,13 +276,9 @@
}
@Test
- public void shouldHandleDefaultRemoteTraverser() throws Exception {
- final DefaultRemoteTraverser<String> o = new DefaultRemoteTraverser<>("test", 100);
- assertEquals(o, serializeDeserialize(mapper, o, Traverser.class));
- }
-
- @Test
public void shouldHandleVariantsOfP() throws Exception {
+ if (version.startsWith("v4")) return;
+
final List<P> variantsOfP = Arrays.asList(
P.between(1,2),
P.eq(1),
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperTest.java
index 21089da..27ad64a 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperTest.java
@@ -53,7 +53,10 @@
import java.util.HashSet;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.__;
+import static org.hamcrest.core.IsNot.not;
+import static org.hamcrest.core.StringStartsWith.startsWith;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assume.assumeThat;
/**
* @author Stephen Mallette (http://stephen.genoprime.com)
@@ -68,6 +71,7 @@
{"v2", GraphSONMapper.build().version(GraphSONVersion.V2_0).addCustomModule(GraphSONXModuleV2.build()).typeInfo(TypeInfo.NO_TYPES).create().createMapper()},
{"v2-default", GraphSONMapper.build().version(GraphSONVersion.V2_0).addDefaultXModule(true).typeInfo(TypeInfo.NO_TYPES).create().createMapper()}, // alternate construction of v2
{"v3", GraphSONMapper.build().version(GraphSONVersion.V3_0).addCustomModule(GraphSONXModuleV3.build()).typeInfo(TypeInfo.NO_TYPES).create().createMapper()},
+ {"v4", GraphSONMapper.build().version(GraphSONVersion.V4_0).addCustomModule(GraphSONXModuleV4.build()).typeInfo(TypeInfo.NO_TYPES).create().createMapper()},
});
}
@@ -91,6 +95,8 @@
assertEquals("{\"id\":123,\"label\":\"person\",\"type\":\"vertex\",\"properties\":{\"name\":[{\"id\":1,\"value\":\"alice\"}],\"age\":[{\"id\":1,\"value\":\"31\"}]}}", json);
else if (version.startsWith("v2"))
assertEquals("{\"id\":123,\"label\":\"person\",\"properties\":{\"name\":[{\"id\":1,\"value\":\"alice\",\"label\":\"name\"}],\"age\":[{\"id\":1,\"value\":\"31\",\"label\":\"age\"}]}}", json);
+ else if (version.startsWith("v4"))
+ assertEquals("{\"id\":123,\"label\":[\"person\"],\"type\":\"vertex\",\"properties\":{\"name\":[{\"id\":1,\"value\":\"alice\"}],\"age\":[{\"id\":1,\"value\":\"31\"}]}}", json);
else
throw new IllegalStateException("Version not accounted for in asserts");
}
@@ -109,6 +115,8 @@
assertEquals("{\"id\":123,\"label\":\"knows\",\"type\":\"edge\",\"inVLabel\":\"person\",\"outVLabel\":\"person\",\"inV\":2,\"outV\":1,\"properties\":{\"weight\":0.5}}", json);
else if (version.startsWith("v2"))
assertEquals("{\"id\":123,\"label\":\"knows\",\"inVLabel\":\"person\",\"outVLabel\":\"person\",\"inV\":2,\"outV\":1,\"properties\":{\"weight\":{\"key\":\"weight\",\"value\":0.5}}}", json);
+ else if (version.startsWith("v4"))
+ assertEquals("{\"id\":123,\"label\":[\"knows\"],\"type\":\"edge\",\"inV\":{\"id\":2,\"label\":[\"person\"]},\"outV\":{\"id\":1,\"label\":[\"person\"]},\"properties\":{\"weight\":[0.5]}}", json);
else
throw new IllegalStateException("Version not accounted for in asserts");
}
@@ -128,7 +136,11 @@
put("current", true);
}}, v);
final String json = mapper.writeValueAsString(p);
- assertEquals("{\"id\":123,\"value\":\"alice\",\"label\":\"name\",\"properties\":{\"current\":true}}", json);
+ if (version.startsWith("v4")) {
+ assertEquals("{\"id\":123,\"value\":\"alice\",\"label\":[\"name\"],\"properties\":{\"current\":true}}", json);
+ } else {
+ assertEquals("{\"id\":123,\"value\":\"alice\",\"label\":\"name\",\"properties\":{\"current\":true}}", json);
+ }
}
@Test
@@ -136,7 +148,11 @@
final DetachedVertex v = new DetachedVertex(321L, "person", Collections.emptyMap());
final VertexProperty p = new DetachedVertexProperty(123L, "name", "alice", Collections.emptyMap(), v);
final String json = mapper.writeValueAsString(p);
- assertEquals("{\"id\":123,\"value\":\"alice\",\"label\":\"name\"}", json);
+ if (version.startsWith("v4")) {
+ assertEquals("{\"id\":123,\"value\":\"alice\",\"label\":[\"name\"]}", json);
+ } else {
+ assertEquals("{\"id\":123,\"value\":\"alice\",\"label\":\"name\"}", json);
+ }
}
@Test
@@ -151,12 +167,16 @@
if (version.startsWith("v1") || version.startsWith("v3"))
assertEquals("{\"labels\":[[\"a\"],[\"b\"],[\"c\"]],\"objects\":[{\"id\":123,\"label\":\"person\",\"type\":\"vertex\",\"properties\":{\"name\":[{\"id\":1,\"value\":\"alice\"}],\"age\":[{\"id\":1,\"value\":\"31\"}]}},123,\"alice\"]}", json);
+ else if (version.startsWith("v4"))
+ assertEquals("{\"labels\":[[\"a\"],[\"b\"],[\"c\"]],\"objects\":[{\"id\":123,\"label\":[\"person\"],\"type\":\"vertex\",\"properties\":{\"name\":[{\"id\":1,\"value\":\"alice\"}],\"age\":[{\"id\":1,\"value\":\"31\"}]}},123,\"alice\"]}", json);
else
assertEquals("{\"labels\":[[\"a\"],[\"b\"],[\"c\"]],\"objects\":[{\"id\":123,\"label\":\"person\",\"properties\":{\"name\":[{\"id\":1,\"value\":\"alice\",\"label\":\"name\"}],\"age\":[{\"id\":1,\"value\":\"31\",\"label\":\"age\"}]}},123,\"alice\"]}", json);
}
@Test
public void shouldHandleTraversalExplanation() throws Exception {
+ assumeThat(version, not(startsWith("v4")));
+
final TraversalExplanation te = __().out().outV().outE().explain();
final String json = mapper.writeValueAsString(te);
assertEquals("{\"original\":[\"InjectStep([])\",\"VertexStep(OUT,vertex)\",\"EdgeVertexStep(OUT)\",\"VertexStep(OUT,edge)\"],\"intermediate\":[],\"final\":[\"InjectStep([])\",\"VertexStep(OUT,vertex)\",\"EdgeVertexStep(OUT)\",\"VertexStep(OUT,edge)\"]}", json);
@@ -171,6 +191,8 @@
@Test
public void shouldHandleInstant()throws Exception {
+ assumeThat(version, not(startsWith("v4")));
+
final Instant o = Instant.ofEpochMilli(System.currentTimeMillis());
final String json = mapper.writeValueAsString(o);
assertEquals("\"" + o.toString() + "\"", json);
@@ -178,6 +200,8 @@
@Test
public void shouldHandleLocalDate()throws Exception {
+ assumeThat(version, not(startsWith("v4")));
+
final LocalDate o = LocalDate.now();
final String json = mapper.writeValueAsString(o);
assertEquals("\"" + o.toString() + "\"", json);
@@ -185,6 +209,8 @@
@Test
public void shouldHandleLocalDateTime()throws Exception {
+ assumeThat(version, not(startsWith("v4")));
+
final LocalDateTime o = LocalDateTime.now();
final String json = mapper.writeValueAsString(o);
assertEquals("\"" + o.toString() + "\"", json);
@@ -192,6 +218,8 @@
@Test
public void shouldHandleLocalTime()throws Exception {
+ assumeThat(version, not(startsWith("v4")));
+
final LocalTime o = LocalTime.now();
final String json = mapper.writeValueAsString(o);
assertEquals("\"" + o.toString() + "\"", json);
@@ -199,6 +227,8 @@
@Test
public void shouldHandleMonthDay()throws Exception {
+ assumeThat(version, not(startsWith("v4")));
+
final MonthDay o = MonthDay.now();
final String json = mapper.writeValueAsString(o);
assertEquals("\"" + o.toString() + "\"", json);
@@ -213,6 +243,8 @@
@Test
public void shouldHandleOffsetTime()throws Exception {
+ assumeThat(version, not(startsWith("v4")));
+
final OffsetTime o = OffsetTime.now();
final String json = mapper.writeValueAsString(o);
assertEquals("\"" + o.toString() + "\"", json);
@@ -220,6 +252,8 @@
@Test
public void shouldHandlePeriod()throws Exception {
+ assumeThat(version, not(startsWith("v4")));
+
final Period o = Period.ofDays(3);
final String json = mapper.writeValueAsString(o);
assertEquals("\"" + o.toString() + "\"", json);
@@ -227,6 +261,8 @@
@Test
public void shouldHandleYear()throws Exception {
+ assumeThat(version, not(startsWith("v4")));
+
final Year o = Year.now();
final String json = mapper.writeValueAsString(o);
assertEquals("\"" + o.toString() + "\"", json);
@@ -234,6 +270,8 @@
@Test
public void shouldHandleYearMonth()throws Exception {
+ assumeThat(version, not(startsWith("v4")));
+
final YearMonth o = YearMonth.now();
final String json = mapper.writeValueAsString(o);
assertEquals("\"" + o.toString() + "\"", json);
@@ -241,6 +279,8 @@
@Test
public void shouldHandleZonedDateTime()throws Exception {
+ assumeThat(version, not(startsWith("v4")));
+
final ZonedDateTime o = ZonedDateTime.now();
final String json = mapper.writeValueAsString(o);
assertEquals("\"" + o.toString() + "\"", json);
@@ -248,6 +288,8 @@
@Test
public void shouldHandleZoneOffset()throws Exception {
+ assumeThat(version, not(startsWith("v4")));
+
final ZoneOffset o = ZonedDateTime.now().getOffset();
final String json = mapper.writeValueAsString(o);
assertEquals("\"" + o.toString() + "\"", json);
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapperTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapperTest.java
index e502a6e..8b42afd 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapperTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapperTest.java
@@ -19,7 +19,7 @@
package org.apache.tinkerpop.gremlin.structure.io.gryo;
import org.apache.tinkerpop.gremlin.process.remote.traversal.DefaultRemoteTraverser;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
+import org.apache.tinkerpop.gremlin.process.traversal.GremlinLang;
import org.apache.tinkerpop.gremlin.process.traversal.Merge;
import org.apache.tinkerpop.gremlin.process.traversal.TextP;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalExplanation;
@@ -350,12 +350,6 @@
}
@Test
- public void shouldHandleBytecode() throws Exception {
- final Bytecode bytecode = __().out().outV().outE().asAdmin().getBytecode();
- assertEquals(bytecode.toString(), serializeDeserialize(bytecode, Bytecode.class).toString());
- }
-
- @Test
public void shouldHandleClass() throws Exception {
final Class<?> clazz = java.io.File.class;
assertEquals(clazz, serializeDeserialize(clazz, Class.class));
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 ae67e66..bc9b770 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
@@ -35,6 +35,7 @@
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
+
import static org.junit.Assert.assertTrue;
public class CollectionUtilTest {
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/util/GremlinTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/util/GremlinTest.java
index 1504682..974bcf8 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/util/GremlinTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/util/GremlinTest.java
@@ -22,6 +22,7 @@
import org.junit.Test;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
/**
* @author Stephen Mallette (http://stephen.genoprime.com)
@@ -34,8 +35,23 @@
@Test
public void shouldGetVersion() {
- // the manifests lib should be solid at doing this job - can get by with a
- // light testing here - this will be good for at least version 3
- assertEquals('3', Gremlin.version().charAt(0));
+ String versionString = Gremlin.version();
+ //Remove suffixes such as -SNAPSHOT from version for test
+ if (versionString.contains("-")) {
+ versionString = versionString.substring(0, versionString.indexOf("-"));
+ }
+ String[] version = versionString.replace("-SNAPSHOT", "").split("\\.");
+
+ assertEquals("Gremlin.version() should be in format of x.y.z", 3, version.length);
+ assertTrue("Major version should be greater than 3", Integer.parseInt(version[0]) > 3);
+ assertTrue("Minor version should be a positive int", Integer.parseInt(version[1]) >= 0);
+ assertTrue("Patch version should be a positive int", Integer.parseInt(version[2]) >= 0);
+ }
+
+ @Test
+ public void shouldGetMajorVersion() {
+ String majorVersion = Gremlin.majorVersion();
+
+ assertTrue("Major version should be greater than 3", Integer.parseInt(majorVersion) > 3);
}
}
diff --git a/gremlin-dotnet/build/generate.groovy b/gremlin-dotnet/build/generate.groovy
index 1a86a51..72409f3 100644
--- a/gremlin-dotnet/build/generate.groovy
+++ b/gremlin-dotnet/build/generate.groovy
@@ -65,7 +65,6 @@
'using Gremlin.Net.Process.Traversal;\n' +
'using Gremlin.Net.Process.Traversal.Strategy.Optimization;\n' +
'using Gremlin.Net.Process.Traversal.Strategy.Verification;\n' +
- 'using Gremlin.Net.Process.Traversal.Strategy.Finalization;\n' +
'using Gremlin.Net.Process.Traversal.Strategy.Decoration;\n')
writer.writeLine('namespace Gremlin.Net.IntegrationTest.Gherkin\n' +
'{\n' +
diff --git a/gremlin-dotnet/pom.xml b/gremlin-dotnet/pom.xml
index b8a7bd3..e00f0f4 100644
--- a/gremlin-dotnet/pom.xml
+++ b/gremlin-dotnet/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>gremlin-dotnet</artifactId>
<name>Apache TinkerPop :: Gremlin.Net</name>
diff --git a/gremlin-dotnet/src/Gremlin.Net.Template/Gremlin.Net.Template.csproj b/gremlin-dotnet/src/Gremlin.Net.Template/Gremlin.Net.Template.csproj
index 8f6e451..f9603f3 100644
--- a/gremlin-dotnet/src/Gremlin.Net.Template/Gremlin.Net.Template.csproj
+++ b/gremlin-dotnet/src/Gremlin.Net.Template/Gremlin.Net.Template.csproj
@@ -29,7 +29,7 @@
<ProjectReference Include="../Gremlin.Net/Gremlin.Net.csproj" />
<!-- do not edit the version directly - maven updates it automatically -->
- <PackageReference Include="Gremlin.Net" Version="3.8.0-SNAPSHOT" />
+ <PackageReference Include="Gremlin.Net" Version="4.0.0-SNAPSHOT" />
</ItemGroup>
</Project>
diff --git a/gremlin-dotnet/src/Gremlin.Net.Template/Gremlin.Net.Template.nuspec b/gremlin-dotnet/src/Gremlin.Net.Template/Gremlin.Net.Template.nuspec
index b1d9593..f409106 100644
--- a/gremlin-dotnet/src/Gremlin.Net.Template/Gremlin.Net.Template.nuspec
+++ b/gremlin-dotnet/src/Gremlin.Net.Template/Gremlin.Net.Template.nuspec
@@ -5,7 +5,7 @@
<title>Gremlin.Net Template</title>
<!-- do not edit the version directly - maven updates it automatically -->
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<description>Gremlin.Net template to create a console application with dotnet new.</description>
<authors>Apache TinkerPop</authors>
diff --git a/gremlin-dotnet/src/Gremlin.Net/Driver/Tokens.cs b/gremlin-dotnet/src/Gremlin.Net/Driver/Tokens.cs
index 58803d8..ad87fda 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Driver/Tokens.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Driver/Tokens.cs
@@ -33,7 +33,7 @@
/// <summary>
/// Current TinkerPop version.
/// </summary>
- public static string GremlinVersion = "3.8.0-SNAPSHOT"; // DO NOT MODIFY - Configured automatically by Maven Replacer Plugin
+ public static string GremlinVersion = "4.0.0-SNAPSHOT"; // DO NOT MODIFY - Configured automatically by Maven Replacer Plugin
/// <summary>
/// The key for the unique identifier of the request.
diff --git a/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj b/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
index bbd9276..df9cac5 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
+++ b/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
@@ -27,7 +27,7 @@
<PropertyGroup Label="Package">
<!-- do not edit the version directly - maven updates it automatically -->
- <Version>3.8.0-SNAPSHOT</Version>
+ <Version>4.0.0-SNAPSHOT</Version>
<Title>Gremlin.Net</Title>
<Authors>Apache TinkerPop</Authors>
<Description>Gremlin.Net for Apache TinkerPop™ is a language variant and driver for .NET.
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs
index eb3f60e..83b55f0 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs
@@ -91,6 +91,13 @@
}
else
{
+ for (int i = 0; i < vertexIdsOrElements.Length; i++)
+ {
+ if (vertexIdsOrElements[i] is Vertex vertex)
+ {
+ vertexIdsOrElements[i] = vertex.Id;
+ }
+ }
var args = new List<object?>(vertexIdsOrElements.Length);
args.AddRange(vertexIdsOrElements);
Bytecode.AddStep("V", args.ToArray());
@@ -903,7 +910,7 @@
/// </summary>
public GraphTraversal<TStart, TEnd> From (object? fromStepVertexIdOrLabel)
{
- Bytecode.AddStep("from", fromStepVertexIdOrLabel);
+ Bytecode.AddStep("from", fromStepVertexIdOrLabel is Vertex vertex ? vertex.Id : fromStepVertexIdOrLabel);
return Wrap<TStart, TEnd>(this);
}
@@ -930,7 +937,7 @@
/// </summary>
public GraphTraversal<TStart, TEnd> From (Vertex? fromVertex)
{
- Bytecode.AddStep("from", fromVertex);
+ Bytecode.AddStep("from", fromVertex?.Id);
return Wrap<TStart, TEnd>(this);
}
@@ -1477,8 +1484,14 @@
/// <summary>
/// Adds the mergeE step to this <see cref="GraphTraversal{SType, EType}" />.
/// </summary>
- public GraphTraversal<TStart, Edge> MergeE (IDictionary<object,object>? m)
+ public GraphTraversal<TStart, Edge> MergeE (IDictionary<object,object?>? m)
{
+ if (m != null && m[Direction.Out] is Vertex outV) {
+ m[Direction.Out] = outV.Id;
+ }
+ if (m != null && m[Direction.In] is Vertex inV) {
+ m[Direction.In] = inV.Id;
+ }
Bytecode.AddStep("mergeE", m);
return Wrap<TStart, Edge>(this);
}
@@ -2244,7 +2257,7 @@
/// </summary>
public GraphTraversal<TStart, TEnd> To (object? toStepVertexIdOrLabel)
{
- Bytecode.AddStep("to", toStepVertexIdOrLabel);
+ Bytecode.AddStep("to", toStepVertexIdOrLabel is Vertex vertex ? vertex.Id : toStepVertexIdOrLabel );
return Wrap<TStart, TEnd>(this);
}
@@ -2271,7 +2284,7 @@
/// </summary>
public GraphTraversal<TStart, TEnd> To (Vertex? toVertex)
{
- Bytecode.AddStep("to", toVertex);
+ Bytecode.AddStep("to", toVertex?.Id);
return Wrap<TStart, TEnd>(this);
}
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversalSource.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversalSource.cs
index f0c9bfc..0ab9cbf 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversalSource.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversalSource.cs
@@ -328,6 +328,13 @@
}
else
{
+ for (int i = 0; i < vertexIds.Length; i++)
+ {
+ if (vertexIds[i] is Vertex vertex)
+ {
+ vertexIds[i] = vertex.Id;
+ }
+ }
var args = new List<object?>(vertexIds.Length);
args.AddRange(vertexIds);
traversal.Bytecode.AddStep("V", args.ToArray());
@@ -361,8 +368,14 @@
/// Spawns a <see cref="GraphTraversal{SType, EType}" /> off this graph traversal source and adds the mergeE step to that
/// traversal.
/// </summary>
- public GraphTraversal<Edge, Edge> MergeE(IDictionary<object,object>? m)
+ public GraphTraversal<Edge, Edge> MergeE(IDictionary<object,object?>? m)
{
+ if (m != null && m[Direction.Out] is Vertex outV) {
+ m[Direction.Out] = outV.Id;
+ }
+ if (m != null && m[Direction.In] is Vertex inV) {
+ m[Direction.In] = inV.Id;
+ }
var traversal = new GraphTraversal<Edge, Edge>(TraversalStrategies, new Bytecode(Bytecode));
traversal.Bytecode.AddStep("mergeE", m);
return traversal;
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Strategy/Decoration/HaltedTraverserStrategy.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Strategy/Decoration/HaltedTraverserStrategy.cs
index 2eb3cbb..ffa38fc 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Strategy/Decoration/HaltedTraverserStrategy.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Strategy/Decoration/HaltedTraverserStrategy.cs
@@ -32,11 +32,11 @@
{
}
- public HaltedTraverserStrategy(string? haltedTraverserFactory = null)
+ public HaltedTraverserStrategy(string? haltedTraverserFactoryName = null)
: this()
{
- if (haltedTraverserFactory != null)
- Configuration["haltedTraverserFactory"] = haltedTraverserFactory;
+ if (haltedTraverserFactoryName != null)
+ Configuration["haltedTraverserFactory"] = haltedTraverserFactoryName;
}
}
#pragma warning restore 1591
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Strategy/Finalization/ComputerFinalizationStrategy.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Strategy/Finalization/ComputerFinalizationStrategy.cs
deleted file mode 100644
index 572a180..0000000
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Strategy/Finalization/ComputerFinalizationStrategy.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-#region License
-
-/*
- * 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.
- */
-
-#endregion
-
-namespace Gremlin.Net.Process.Traversal.Strategy.Optimization
-{
- /// <summary>
- /// A strategy.
- /// </summary>
- public class ComputerFinalizationStrategy : AbstractTraversalStrategy
- {
- private const string JavaFqcn = ComputerFinalizationNamespace + nameof(ComputerFinalizationStrategy);
-
- /// <summary>
- /// Initializes a new instance of the <see cref="ComputerFinalizationStrategy" /> class.
- /// </summary>
- public ComputerFinalizationStrategy() : base(JavaFqcn)
- {
- }
- }
-}
\ No newline at end of file
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Strategy/Finalization/ProfileStrategy.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Strategy/Finalization/ProfileStrategy.cs
deleted file mode 100644
index 7e49e56..0000000
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Strategy/Finalization/ProfileStrategy.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-#region License
-
-/*
- * 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.
- */
-
-#endregion
-
-namespace Gremlin.Net.Process.Traversal.Strategy.Finalization
-{
- /// <summary>
- /// A strategy.
- /// </summary>
- public class ProfileStrategy : AbstractTraversalStrategy
- {
- private const string JavaFqcn = FinalizationNamespace + nameof(ProfileStrategy);
-
- /// <summary>
- /// Initializes a new instance of the <see cref="ProfileStrategy" /> class.
- /// </summary>
- public ProfileStrategy() : base(JavaFqcn)
- {
- }
- }
-}
\ No newline at end of file
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Strategy/Finalization/ReferenceElementStrategy.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Strategy/Finalization/ReferenceElementStrategy.cs
deleted file mode 100644
index e2d7fbe..0000000
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Strategy/Finalization/ReferenceElementStrategy.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-#region License
-
-/*
- * 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.
- */
-
-#endregion
-
-namespace Gremlin.Net.Process.Traversal.Strategy.Finalization
-{
- /// <summary>
- /// A strategy that detaches traversers with graph elements as references.
- /// </summary>
- public class ReferenceElementStrategy : AbstractTraversalStrategy
- {
- private const string JavaFqcn = FinalizationNamespace + nameof(ReferenceElementStrategy);
-
- /// <summary>
- /// Initializes a new instance of the <see cref="ReferenceElementStrategy" /> class.
- /// </summary>
- public ReferenceElementStrategy() : base(JavaFqcn)
- {
- }
- }
-}
\ No newline at end of file
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Strategy/Optimization/ByModulatorOptimizationStrategy.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Strategy/Optimization/ByModulatorOptimizationStrategy.cs
deleted file mode 100644
index 2ec32d0..0000000
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Strategy/Optimization/ByModulatorOptimizationStrategy.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-#region License
-
-/*
- * 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.
- */
-
-#endregion
-
-namespace Gremlin.Net.Process.Traversal.Strategy.Optimization
-{
- /// <summary>
- /// A strategy.
- /// </summary>
- public class ByModulatorOptimizationStrategy : AbstractTraversalStrategy
- {
- private const string JavaFqcn = OptimizationNamespace + nameof(ByModulatorOptimizationStrategy);
-
- /// <summary>
- /// Initializes a new instance of the <see cref="ByModulatorOptimizationStrategy" /> class.
- /// </summary>
- public ByModulatorOptimizationStrategy() : base(JavaFqcn)
- {
- }
- }
-}
\ No newline at end of file
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Strategy/Optimization/MessagePassingReductionStrategy.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Strategy/Optimization/MessagePassingReductionStrategy.cs
deleted file mode 100644
index 7de3a74..0000000
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Strategy/Optimization/MessagePassingReductionStrategy.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-#region License
-
-/*
- * 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.
- */
-
-#endregion
-
-namespace Gremlin.Net.Process.Traversal.Strategy.Optimization
-{
- /// <summary>
- /// A strategy.
- /// </summary>
- public class MessagePassingReductionStrategy : AbstractTraversalStrategy
- {
- private const string JavaFqcn = ComputerOptimizationNamespace + nameof(MessagePassingReductionStrategy);
-
- /// <summary>
- /// Initializes a new instance of the <see cref="MessagePassingReductionStrategy" /> class.
- /// </summary>
- public MessagePassingReductionStrategy() : base(JavaFqcn)
- {
- }
- }
-}
\ No newline at end of file
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Strategy/Verification/ComputerVerificationStrategy.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Strategy/Verification/ComputerVerificationStrategy.cs
deleted file mode 100644
index 2012b1f..0000000
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Strategy/Verification/ComputerVerificationStrategy.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-#region License
-
-/*
- * 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.
- */
-
-#endregion
-
-namespace Gremlin.Net.Process.Traversal.Strategy.Verification
-{
- /// <summary>
- /// A strategy.
- /// </summary>
- public class ComputerVerificationStrategy : AbstractTraversalStrategy
- {
- private const string JavaFqcn = VerificationNamespace + nameof(ComputerVerificationStrategy);
-
- /// <summary>
- /// Initializes a new instance of the <see cref="ComputerVerificationStrategy" /> class.
- /// </summary>
- public ComputerVerificationStrategy() : base(JavaFqcn)
- {
- }
- }
-}
\ No newline at end of file
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Strategy/Verification/StandardVerificationStrategy.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Strategy/Verification/StandardVerificationStrategy.cs
deleted file mode 100644
index 84c1eaa..0000000
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Strategy/Verification/StandardVerificationStrategy.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-#region License
-
-/*
- * 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.
- */
-
-#endregion
-
-namespace Gremlin.Net.Process.Traversal.Strategy.Verification
-{
- /// <summary>
- /// A strategy
- /// </summary>
- public class StandardVerificationStrategy : AbstractTraversalStrategy
- {
- private const string JavaFqcn = VerificationNamespace + nameof(StandardVerificationStrategy);
-
- /// <summary>
- /// Initializes a new instance of the <see cref="StandardVerificationStrategy" /> class.
- /// </summary>
- public StandardVerificationStrategy() : base(JavaFqcn)
- {
- }
- }
-}
\ No newline at end of file
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Strategy/Verification/VertexProgramRestrictionStrategy.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Strategy/Verification/VertexProgramRestrictionStrategy.cs
deleted file mode 100644
index 85ad59e..0000000
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Strategy/Verification/VertexProgramRestrictionStrategy.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-#region License
-
-/*
- * 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.
- */
-
-#endregion
-
-namespace Gremlin.Net.Process.Traversal.Strategy.Verification
-{
- /// <summary>
- /// A strategy
- /// </summary>
- public class VertexProgramRestrictionStrategy : AbstractTraversalStrategy
- {
- private const string JavaFqcn = ComputerVerificationNamespace + nameof(VertexProgramRestrictionStrategy);
-
- /// <summary>
- /// Initializes a new instance of the <see cref="VertexProgramRestrictionStrategy" /> class.
- /// </summary>
- public VertexProgramRestrictionStrategy() : base(JavaFqcn)
- {
- }
- }
-}
\ No newline at end of file
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/__.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/__.cs
index edf0d76..58f9cc2 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/__.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/__.cs
@@ -143,14 +143,6 @@
}
/// <summary>
- /// Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the none step to that traversal.
- /// </summary>
- public static GraphTraversal<object, object> None(P? predicate)
- {
- return new GraphTraversal<object, object>().None(predicate);
- }
-
- /// <summary>
/// Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the as step to that traversal.
/// </summary>
public static GraphTraversal<object, object> As(string label, params string[] labels)
@@ -1083,7 +1075,7 @@
/// <summary>
/// Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the mergeE step to that traversal.
/// </summary>
- public static GraphTraversal<object, Edge> MergeE (IDictionary<object,object>? m)
+ public static GraphTraversal<object, Edge> MergeE (IDictionary<object,object?>? m)
{
return new GraphTraversal<object, Edge>().MergeE(m);
}
@@ -1137,6 +1129,14 @@
}
/// <summary>
+ /// Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the none step to that traversal.
+ /// </summary>
+ public static GraphTraversal<object, object> None(P? predicate)
+ {
+ return new GraphTraversal<object, object>().None(predicate);
+ }
+
+ /// <summary>
/// Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the not step to that traversal.
/// </summary>
public static GraphTraversal<object, object> Not(ITraversal notTraversal)
diff --git a/gremlin-dotnet/src/pom.xml b/gremlin-dotnet/src/pom.xml
index 5c67faa..69b75d4 100644
--- a/gremlin-dotnet/src/pom.xml
+++ b/gremlin-dotnet/src/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-dotnet</artifactId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>gremlin-dotnet-source</artifactId>
<name>Apache TinkerPop :: Gremlin.Net - Source</name>
@@ -121,9 +121,10 @@
<id>gremlin-dotnet</id>
<activation>
<activeByDefault>false</activeByDefault>
- <file>
- <exists>.glv</exists>
- </file>
+ <!-- TODO re-enable after gremlin-dotnet is implemented -->
+<!-- <file>-->
+<!-- <exists>.glv</exists>-->
+<!-- </file>-->
</activation>
<properties>
<packaging.type>dotnet-library</packaging.type>
diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
index 2ffe19a..2c9f219 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
@@ -237,13 +237,13 @@
switch (comparison) {
case "containing":
- Assert.Contains(expectedMessage, _error.Message);
+ Assert.Contains(expectedMessage.ToUpper(), _error.Message.ToUpper());
break;
case "starting":
- Assert.StartsWith(expectedMessage, _error.Message);
+ Assert.StartsWith(expectedMessage.ToUpper(), _error.Message.ToUpper());
break;
case "ending":
- Assert.EndsWith(expectedMessage, _error.Message);
+ Assert.EndsWith(expectedMessage.ToUpper(), _error.Message.ToUpper());
break;
default:
throw new NotSupportedException(
diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs
index f9787aec..ef69672 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs
@@ -36,7 +36,6 @@
using Gremlin.Net.Process.Traversal;
using Gremlin.Net.Process.Traversal.Strategy.Optimization;
using Gremlin.Net.Process.Traversal.Strategy.Verification;
-using Gremlin.Net.Process.Traversal.Strategy.Finalization;
using Gremlin.Net.Process.Traversal.Strategy.Decoration;
namespace Gremlin.Net.IntegrationTest.Gherkin
@@ -119,7 +118,7 @@
{"g_VX2X_optionalXinXknowsXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V(p["vid2"]).Optional<object>(__.In("knows"))}},
{"g_V_hasLabelXpersonX_optionalXoutXknowsX_optionalXoutXcreatedXXX_path", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasLabel("person").Optional<object>(__.Out("knows").Optional<object>(__.Out("created"))).Path()}},
{"g_V_optionalXout_optionalXoutXX_path", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Optional<object>(__.Out().Optional<object>(__.Out())).Path()}},
- {"g_VX1X_optionalXaddVXdogXX_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").Property("lang", "java").As("ripple").AddV("person").Property("name", "peter").Property("age", 35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight", 0.5d).AddE("knows").From("marko").To("josh").Property("weight", 1.0d).AddE("created").From("marko").To("lop").Property("weight", 0.4d).AddE("created").From("josh").To("ripple").Property("weight", 1.0d).AddE("created").From("josh").To("lop").Property("weight", 0.4d).AddE("created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.V(p["vid1"]).Optional<object>(__.AddV("dog")).Label(), (g,p) =>g.V()}},
+ {"g_VX1X_optionalXaddVXdogXX_label", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29).As("marko").AddV((string) "person").Property("name", "vadas").Property("age", 27).As("vadas").AddV((string) "software").Property("name", "lop").Property("lang", "java").As("lop").AddV((string) "person").Property("name", "josh").Property("age", 32).As("josh").AddV((string) "software").Property("name", "ripple").Property("lang", "java").As("ripple").AddV((string) "person").Property("name", "peter").Property("age", 35).As("peter").AddE((string) "knows").From("marko").To("vadas").Property("weight", 0.5d).AddE((string) "knows").From("marko").To("josh").Property("weight", 1.0d).AddE((string) "created").From("marko").To("lop").Property("weight", 0.4d).AddE((string) "created").From("josh").To("ripple").Property("weight", 1.0d).AddE((string) "created").From("josh").To("lop").Property("weight", 0.4d).AddE((string) "created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.V(p["vid1"]).Optional<object>(__.AddV((string) "dog")).Label(), (g,p) =>g.V()}},
{"g_V_repeatXoutX_timesX2X_emit_path", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Repeat(__.Out()).Times(2).Emit().Path()}},
{"g_V_repeatXoutX_timesX2X_repeatXinX_timesX2X_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Repeat(__.Out()).Times(2).Repeat(__.In()).Times(2).Values<object>("name")}},
{"g_V_repeatXoutE_inVX_timesX2X_path_by_name_by_label", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Repeat(__.OutE().InV()).Times(2).Path().By("name").By(T.Label)}},
@@ -168,7 +167,7 @@
{"g_VX1_2X_unionXoutE_count__inE_count__outE_weight_sumX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V(p["vid1"], p["vid2"]).Union<object>(__.OutE().Count(), __.InE().Count(), __.OutE().Values<object>("weight").Sum<object>())}},
{"g_VX1_2X_localXunionXoutE_count__inE_count__outE_weight_sumXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V(p["vid1"], p["vid2"]).Local<object>(__.Union<object>(__.OutE().Count(), __.InE().Count(), __.OutE().Values<object>("weight").Sum<object>()))}},
{"g_VX1_2X_localXunionXcountXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V(p["vid1"], p["vid2"]).Local<object>(__.Union<object>(__.Count()))}},
- {"g_unionXaddVXpersonX_propertyXname_aliceX_addVXpersonX_propertyXname_bobX_addVXpersonX_propertyXname_chrisX_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Union<object>(__.AddV("person").Property("name", "alice"), __.AddV("person").Property("name", "bob"), __.AddV("person").Property("name", "chris")).Values<object>("name")}},
+ {"g_unionXaddVXpersonX_propertyXname_aliceX_addVXpersonX_propertyXname_bobX_addVXpersonX_propertyXname_chrisX_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Union<object>(__.AddV((string) "person").Property("name", "alice"), __.AddV((string) "person").Property("name", "bob"), __.AddV((string) "person").Property("name", "chris")).Values<object>("name")}},
{"g_V_aggregateXxX_byXnameX_byXageX_capXxX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Aggregate("x").By("name").By("age").Cap<object>("x")}},
{"g_V_aggregateXScope_local_xX_byXnameX_byXageX_capXxX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Aggregate(Scope.Local, "x").By("name").By("age").Cap<object>("x")}},
{"g_V_valuesXageX_allXgtX32XX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("age").All(P.Gt(32))}},
@@ -218,7 +217,7 @@
{"g_V_both_both_dedup_byXlabelX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Both().Both().Dedup().By(T.Label)}},
{"g_V_group_byXlabelX_byXbothE_weight_dedup_foldX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Group<object, object>().By(T.Label).By(__.BothE().Values<object>("weight").Dedup().Order().By(Order.Asc).Fold())}},
{"g_V_asXaX_both_asXbX_dedupXa_bX_byXlabelX_selectXa_bX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().As("a").Both().As("b").Dedup("a", "b").By(T.Label).Select<object>("a", "b")}},
- {"g_V_asXaX_out_asXbX_in_asXcX_dedupXa_bX_path_byXnameX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "alice").As("a").AddV("person").Property("name", "bob").As("b").AddV("person").Property("name", "carol").As("c").AddE("knows").From("a").To("b").AddE("likes").From("a").To("b").AddE("likes").From("a").To("c"), (g,p) =>g.V().As("a").Out().As("b").In().As("c").Dedup("a", "b").Path().By("name")}},
+ {"g_V_asXaX_out_asXbX_in_asXcX_dedupXa_bX_path_byXnameX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "alice").As("a").AddV((string) "person").Property("name", "bob").As("b").AddV((string) "person").Property("name", "carol").As("c").AddE((string) "knows").From("a").To("b").AddE((string) "likes").From("a").To("b").AddE((string) "likes").From("a").To("c"), (g,p) =>g.V().As("a").Out().As("b").In().As("c").Dedup("a", "b").Path().By("name")}},
{"g_V_outE_asXeX_inV_asXvX_selectXeX_order_byXweight_ascX_selectXvX_valuesXnameX_dedup", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().OutE().As("e").InV().As("v").Select<object>("e").Order().By("weight", Order.Asc).Select<object>("v").Values<object>("name").Dedup()}},
{"g_V_both_both_dedup_byXoutE_countX_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Both().Both().Dedup().By(__.OutE().Count()).Values<object>("name")}},
{"g_V_groupCount_selectXvaluesX_unfold_dedup", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().GroupCount<object>().Select<object>(Column.Values).Unfold<object>().Dedup()}},
@@ -233,8 +232,8 @@
{"g_V_both_dedup_age_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Both().Dedup().By("age").Values<object>("name")}},
{"g_VX1X_asXaX_both_asXbX_both_asXcX_dedupXa_bX_age_selectXa_b_cX_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V(p["vid1"]).As("a").Both().As("b").Both().As("c").Dedup("a", "b").By("age").Select<object>("a", "b", "c").By("name")}},
{"g_VX1X_valuesXageX_dedupXlocalX_unfold", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V(p["vid1"]).Values<object>("age").Dedup(Scope.Local).Unfold<object>()}},
- {"g_V_properties_dedup_count", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "josh").AddV("person").Property("name", "josh").AddV("person").Property("name", "josh"), (g,p) =>g.V().Properties<object>("name").Dedup().Count()}},
- {"g_V_properties_dedup_byXvalueX_count", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "josh").AddV("person").Property("name", "josh").AddV("person").Property("name", "josh"), (g,p) =>g.V().Properties<object>("name").Dedup().By(T.Value).Count()}},
+ {"g_V_properties_dedup_count", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "josh").AddV((string) "person").Property("name", "josh").AddV((string) "person").Property("name", "josh"), (g,p) =>g.V().Properties<object>("name").Dedup().Count()}},
+ {"g_V_properties_dedup_byXvalueX_count", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "josh").AddV((string) "person").Property("name", "josh").AddV((string) "person").Property("name", "josh"), (g,p) =>g.V().Properties<object>("name").Dedup().By(T.Value).Count()}},
{"g_V_both_hasXlabel_softwareX_dedup_byXlangX_byXnameX_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Both().Has(T.Label, "software").Dedup().By("lang").By("name").Values<object>("name")}},
{"g_V_count_discard", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Count().Discard()}},
{"g_V_hasLabelXpersonX_discard", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasLabel("person").Discard()}},
@@ -245,10 +244,10 @@
{"g_V_discard_fold_discard", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Discard().Fold().Discard()}},
{"g_V_discard_fold_constantX1X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Discard().Fold().Constant<object>(1)}},
{"g_V_projectXxX_byXcoalesceXage_isXgtX29XX_discardXX_selectXxX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Project<object>("x").By(__.Coalesce<object>(__.Values<object>("age").Is(P.Gt(29)), __.Discard())).Select<object>("x")}},
- {"g_V_drop", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV().As("a").AddV().As("b").AddE("knows").To("a"), (g,p) =>g.V().Drop(), (g,p) =>g.V(), (g,p) =>g.E()}},
- {"g_V_outE_drop", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV().As("a").AddV().As("b").AddE("knows").To("a"), (g,p) =>g.V().OutE().Drop(), (g,p) =>g.V(), (g,p) =>g.E()}},
+ {"g_V_drop", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV().As("a").AddV().As("b").AddE((string) "knows").To("a"), (g,p) =>g.V().Drop(), (g,p) =>g.V(), (g,p) =>g.E()}},
+ {"g_V_outE_drop", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV().As("a").AddV().As("b").AddE((string) "knows").To("a"), (g,p) =>g.V().OutE().Drop(), (g,p) =>g.V(), (g,p) =>g.E()}},
{"g_V_properties_drop", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV().Property("name", "bob").AddV().Property("name", "alice"), (g,p) =>g.V().Properties<object>().Drop(), (g,p) =>g.V(), (g,p) =>g.V().Properties<object>()}},
- {"g_E_propertiesXweightX_drop", 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").Property("lang", "java").As("ripple").AddV("person").Property("name", "peter").Property("age", 35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight", 0.5d).AddE("knows").From("marko").To("josh").Property("weight", 1.0d).AddE("created").From("marko").To("lop").Property("weight", 0.4d).AddE("created").From("josh").To("ripple").Property("weight", 1.0d).AddE("created").From("josh").To("lop").Property("weight", 0.4d).AddE("created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.E().Properties<object>("weight").Drop(), (g,p) =>g.E().Properties<object>()}},
+ {"g_E_propertiesXweightX_drop", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29).As("marko").AddV((string) "person").Property("name", "vadas").Property("age", 27).As("vadas").AddV((string) "software").Property("name", "lop").Property("lang", "java").As("lop").AddV((string) "person").Property("name", "josh").Property("age", 32).As("josh").AddV((string) "software").Property("name", "ripple").Property("lang", "java").As("ripple").AddV((string) "person").Property("name", "peter").Property("age", 35).As("peter").AddE((string) "knows").From("marko").To("vadas").Property("weight", 0.5d).AddE((string) "knows").From("marko").To("josh").Property("weight", 1.0d).AddE((string) "created").From("marko").To("lop").Property("weight", 0.4d).AddE((string) "created").From("josh").To("ripple").Property("weight", 1.0d).AddE((string) "created").From("josh").To("lop").Property("weight", 0.4d).AddE((string) "created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.E().Properties<object>("weight").Drop(), (g,p) =>g.E().Properties<object>()}},
{"g_V_properties_propertiesXstartTimeX_drop", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV().Property("name", "bob").Property(Cardinality.List, "location", "ny", "startTime", 2014, "endTime", 2016).Property(Cardinality.List, "location", "va", "startTime", 2016).AddV().Property("name", "alice").Property(Cardinality.List, "location", "va", "startTime", 2014, "endTime", 2016).Property(Cardinality.List, "location", "ny", "startTime", 2016), (g,p) =>g.V().Properties<object>().Properties<object>("startTime").Drop(), (g,p) =>g.V().Properties<object>().Properties<object>(), (g,p) =>g.V().Properties<object>().Properties<object>("startTime")}},
{"g_V_filterXisX0XX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Filter(__.Is(0))}},
{"g_V_filterXconstantX0XX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Filter(__.Constant<object>(0))}},
@@ -300,8 +299,8 @@
{"g_V_hasXname_not_endingWithXasXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Has("name", TextP.NotEndingWith("as"))}},
{"g_V_hasXname_regexXrMarXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Has("name", TextP.Regex("^mar"))}},
{"g_V_hasXname_notRegexXrMarXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Has("name", TextP.NotRegex("^mar"))}},
- {"g_V_hasXname_regexXTinkerXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("software").Property("name", "Apache TinkerPop©"), (g,p) =>g.V().Has("name", TextP.Regex("Tinker")).Values<object>("name")}},
- {"g_V_hasXname_regexXTinkerUnicodeXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("software").Property("name", "Apache TinkerPop©"), (g,p) =>g.V().Has("name", TextP.Regex("Tinker.*\u00A9")).Values<object>("name")}},
+ {"g_V_hasXname_regexXTinkerXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "software").Property("name", "Apache TinkerPop©"), (g,p) =>g.V().Has("name", TextP.Regex("Tinker")).Values<object>("name")}},
+ {"g_V_hasXname_regexXTinkerUnicodeXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "software").Property("name", "Apache TinkerPop©"), (g,p) =>g.V().Has("name", TextP.Regex("Tinker.*\u00A9")).Values<object>("name")}},
{"g_V_hasXp_neqXvXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Has("p", P.Neq("v"))}},
{"g_V_hasXage_gtX18X_andXltX30XXorXgtx35XXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Has("age", P.Gt(18).And(P.Lt(30)).Or(P.Gt(35)))}},
{"g_V_hasXage_gtX18X_andXltX30XXorXltx35XXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Has("age", P.Gt(18).And(P.Lt(30)).And(P.Lt(35)))}},
@@ -321,6 +320,7 @@
{"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)}},
{"g_V_hasIdXmarkovar_vadasvarX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasId(p["vid1"], p["vid2"])}},
+ {"g_V_hasIdXmarkovar_vadasvar_petervarX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasId(p["vid1"], p["vid2"])}},
{"g_V_hasIdX2AsString_nullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasId(p["vid2"], null)}},
{"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"])}},
@@ -535,30 +535,30 @@
{"g_withoutStrategiesXOptionsStrategyX_V", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithoutStrategies(typeof(OptionsStrategy)).V()}},
{"g_withStrategiesXOrderLimitStrategyX_V", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithStrategies(new OrderLimitStrategy()).V()}},
{"g_withoutStrategiesXOrderLimitStrategyX_V", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithoutStrategies(typeof(OrderLimitStrategy)).V()}},
- {"g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_V_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("_partition", "a").Property("name", "alice").AddV("person").Property("_partition", "b").Property("name", "bob"), (g,p) =>g.WithStrategies(new PartitionStrategy(partitionKey: "_partition", writePartition: "a", readPartitions: new HashSet<string> { "a" })).V().Values<object>("name")}},
- {"g_withStrategiesXPartitionStrategyXwrite_a_read_a_bXX_V_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("_partition", "a").Property("name", "alice").AddV("person").Property("_partition", "b").Property("name", "bob"), (g,p) =>g.WithStrategies(new PartitionStrategy(partitionKey: "_partition", writePartition: "a", readPartitions: new HashSet<string> { "a", "b" })).V().Values<object>("name")}},
- {"g_withStrategiesXPartitionStrategyXwrite_a_read_cXX_V_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("_partition", "a").Property("name", "alice").AddV("person").Property("_partition", "b").Property("name", "bob"), (g,p) =>g.WithStrategies(new PartitionStrategy(partitionKey: "_partition", writePartition: "a", readPartitions: new HashSet<string> { "c" })).V().Values<object>("name")}},
- {"g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_V_bothE_weight", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("_partition", "a").Property("name", "alice").As("a").AddV("person").Property("_partition", "b").Property("name", "bob").As("b").AddE("knows").From("a").To("b").Property("_partition", "a").Property("weight", 1.0d).AddE("knows").From("b").To("a").Property("_partition", "b").Property("weight", 2.0d), (g,p) =>g.WithStrategies(new PartitionStrategy(partitionKey: "_partition", writePartition: "a", readPartitions: new HashSet<string> { "a" })).V().BothE().Values<object>("weight")}},
- {"g_withStrategiesXPartitionStrategyXwrite_a_read_bXX_V_bothE_weight", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("_partition", "a").Property("name", "alice").As("a").AddV("person").Property("_partition", "b").Property("name", "bob").As("b").AddE("knows").From("a").To("b").Property("_partition", "a").Property("weight", 1.0d).AddE("knows").From("b").To("a").Property("_partition", "b").Property("weight", 2.0d), (g,p) =>g.WithStrategies(new PartitionStrategy(partitionKey: "_partition", writePartition: "a", readPartitions: new HashSet<string> { "b" })).V().BothE().Values<object>("weight")}},
- {"g_withStrategiesXPartitionStrategyXwrite_a_read_a_bXX_V_bothE_dedup_weight", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("_partition", "a").Property("name", "alice").As("a").AddV("person").Property("_partition", "b").Property("name", "bob").As("b").AddE("knows").From("a").To("b").Property("_partition", "a").Property("weight", 1.0d).AddE("knows").From("b").To("a").Property("_partition", "b").Property("weight", 2.0d), (g,p) =>g.WithStrategies(new PartitionStrategy(partitionKey: "_partition", writePartition: "a", readPartitions: new HashSet<string> { "a", "b" })).V().BothE().Dedup().Values<object>("weight")}},
- {"g_withStrategiesXPartitionStrategyXwrite_a_read_cXX_V_bothE_weight", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("_partition", "a").Property("name", "alice").As("a").AddV("person").Property("_partition", "b").Property("name", "bob").As("b").AddE("knows").From("a").To("b").Property("_partition", "a").Property("weight", 1.0d).AddE("knows").From("b").To("a").Property("_partition", "b").Property("weight", 2.0d), (g,p) =>g.WithStrategies(new PartitionStrategy(partitionKey: "_partition", writePartition: "a", readPartitions: new HashSet<string> { "c" })).V().BothE().Values<object>("weight")}},
- {"g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_V_both_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("_partition", "a").Property("name", "alice").As("a").AddV("person").Property("_partition", "b").Property("name", "bob").As("b").AddE("knows").From("a").To("b").Property("_partition", "a").Property("weight", 1.0d).AddE("knows").From("b").To("a").Property("_partition", "b").Property("weight", 2.0d), (g,p) =>g.WithStrategies(new PartitionStrategy(partitionKey: "_partition", writePartition: "a", readPartitions: new HashSet<string> { "a" })).V().Both().Values<object>("name")}},
- {"g_withStrategiesXPartitionStrategyXwrite_a_read_bXX_V_both_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("_partition", "a").Property("name", "alice").As("a").AddV("person").Property("_partition", "b").Property("name", "bob").As("b").AddE("knows").From("a").To("b").Property("_partition", "a").Property("weight", 1.0d).AddE("knows").From("b").To("a").Property("_partition", "b").Property("weight", 2.0d), (g,p) =>g.WithStrategies(new PartitionStrategy(partitionKey: "_partition", writePartition: "a", readPartitions: new HashSet<string> { "b" })).V().Both().Values<object>("name")}},
- {"g_withStrategiesXPartitionStrategyXwrite_a_read_a_bXX_V_both_dedup_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("_partition", "a").Property("name", "alice").As("a").AddV("person").Property("_partition", "b").Property("name", "bob").As("b").AddE("knows").From("a").To("b").Property("_partition", "a").Property("weight", 1.0d).AddE("knows").From("b").To("a").Property("_partition", "b").Property("weight", 2.0d), (g,p) =>g.WithStrategies(new PartitionStrategy(partitionKey: "_partition", writePartition: "a", readPartitions: new HashSet<string> { "a", "b" })).V().Both().Dedup().Values<object>("name")}},
- {"g_withStrategiesXPartitionStrategyXwrite_a_read_cXX_V_both_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("_partition", "a").Property("name", "alice").As("a").AddV("person").Property("_partition", "b").Property("name", "bob").As("b").AddE("knows").From("a").To("b").Property("_partition", "a").Property("weight", 1.0d).AddE("knows").From("b").To("a").Property("_partition", "b").Property("weight", 2.0d), (g,p) =>g.WithStrategies(new PartitionStrategy(partitionKey: "_partition", writePartition: "a", readPartitions: new HashSet<string> { "c" })).V().Both().Values<object>("name")}},
- {"g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_V_out_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("_partition", "a").Property("name", "alice").As("a").AddV("person").Property("_partition", "b").Property("name", "bob").As("b").AddE("knows").From("a").To("b").Property("_partition", "a").Property("weight", 1.0d).AddE("knows").From("b").To("a").Property("_partition", "b").Property("weight", 2.0d), (g,p) =>g.WithStrategies(new PartitionStrategy(partitionKey: "_partition", writePartition: "a", readPartitions: new HashSet<string> { "a" })).V().Out().Values<object>("name")}},
- {"g_withStrategiesXPartitionStrategyXwrite_a_read_bXX_V_in_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("_partition", "a").Property("name", "alice").As("a").AddV("person").Property("_partition", "b").Property("name", "bob").As("b").AddE("knows").From("a").To("b").Property("_partition", "a").Property("weight", 1.0d).AddE("knows").From("b").To("a").Property("_partition", "b").Property("weight", 2.0d), (g,p) =>g.WithStrategies(new PartitionStrategy(partitionKey: "_partition", writePartition: "a", readPartitions: new HashSet<string> { "b" })).V().In().Values<object>("name")}},
- {"g_withStrategiesXPartitionStrategyXwrite_a_read_a_bXX_V_out_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("_partition", "a").Property("name", "alice").As("a").AddV("person").Property("_partition", "b").Property("name", "bob").As("b").AddE("knows").From("a").To("b").Property("_partition", "a").Property("weight", 1.0d).AddE("knows").From("b").To("a").Property("_partition", "b").Property("weight", 2.0d), (g,p) =>g.WithStrategies(new PartitionStrategy(partitionKey: "_partition", writePartition: "a", readPartitions: new HashSet<string> { "a", "b" })).V().Out().Values<object>("name")}},
- {"g_withStrategiesXPartitionStrategyXwrite_a_read_cXX_V_out_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("_partition", "a").Property("name", "alice").As("a").AddV("person").Property("_partition", "b").Property("name", "bob").As("b").AddE("knows").From("a").To("b").Property("_partition", "a").Property("weight", 1.0d).AddE("knows").From("b").To("a").Property("_partition", "b").Property("weight", 2.0d), (g,p) =>g.WithStrategies(new PartitionStrategy(partitionKey: "_partition", writePartition: "a", readPartitions: new HashSet<string> { "c" })).V().Out().Values<object>("name")}},
- {"g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_addVXpersonX_propertyXname_aliceX_addXselfX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithStrategies(new PartitionStrategy(partitionKey: "_partition", writePartition: "a", readPartitions: new HashSet<string> { "a" })).AddV("person").Property("name", "alice").AddE("self"), (g,p) =>g.V().Has("person", "name", "alice").Has("_partition", "a"), (g,p) =>g.V(), (g,p) =>g.E().Has("_partition", "a"), (g,p) =>g.E()}},
- {"g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_injectXzeroX_addVXpersonX_propertyXname_aliceX_addXselfX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithStrategies(new PartitionStrategy(partitionKey: "_partition", writePartition: "a", readPartitions: new HashSet<string> { "a" })).Inject<object>(0).AddV("person").Property("name", "alice").AddE("self"), (g,p) =>g.V().Has("person", "name", "alice").Has("_partition", "a"), (g,p) =>g.V(), (g,p) =>g.E().Has("_partition", "a"), (g,p) =>g.E()}},
+ {"g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_V_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("_partition", "a").Property("name", "alice").AddV((string) "person").Property("_partition", "b").Property("name", "bob"), (g,p) =>g.WithStrategies(new PartitionStrategy(partitionKey: "_partition", writePartition: "a", readPartitions: new HashSet<string> { "a" })).V().Values<object>("name")}},
+ {"g_withStrategiesXPartitionStrategyXwrite_a_read_a_bXX_V_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("_partition", "a").Property("name", "alice").AddV((string) "person").Property("_partition", "b").Property("name", "bob"), (g,p) =>g.WithStrategies(new PartitionStrategy(partitionKey: "_partition", writePartition: "a", readPartitions: new HashSet<string> { "a", "b" })).V().Values<object>("name")}},
+ {"g_withStrategiesXPartitionStrategyXwrite_a_read_cXX_V_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("_partition", "a").Property("name", "alice").AddV((string) "person").Property("_partition", "b").Property("name", "bob"), (g,p) =>g.WithStrategies(new PartitionStrategy(partitionKey: "_partition", writePartition: "a", readPartitions: new HashSet<string> { "c" })).V().Values<object>("name")}},
+ {"g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_V_bothE_weight", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("_partition", "a").Property("name", "alice").As("a").AddV((string) "person").Property("_partition", "b").Property("name", "bob").As("b").AddE((string) "knows").From("a").To("b").Property("_partition", "a").Property("weight", 1.0d).AddE((string) "knows").From("b").To("a").Property("_partition", "b").Property("weight", 2.0d), (g,p) =>g.WithStrategies(new PartitionStrategy(partitionKey: "_partition", writePartition: "a", readPartitions: new HashSet<string> { "a" })).V().BothE().Values<object>("weight")}},
+ {"g_withStrategiesXPartitionStrategyXwrite_a_read_bXX_V_bothE_weight", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("_partition", "a").Property("name", "alice").As("a").AddV((string) "person").Property("_partition", "b").Property("name", "bob").As("b").AddE((string) "knows").From("a").To("b").Property("_partition", "a").Property("weight", 1.0d).AddE((string) "knows").From("b").To("a").Property("_partition", "b").Property("weight", 2.0d), (g,p) =>g.WithStrategies(new PartitionStrategy(partitionKey: "_partition", writePartition: "a", readPartitions: new HashSet<string> { "b" })).V().BothE().Values<object>("weight")}},
+ {"g_withStrategiesXPartitionStrategyXwrite_a_read_a_bXX_V_bothE_dedup_weight", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("_partition", "a").Property("name", "alice").As("a").AddV((string) "person").Property("_partition", "b").Property("name", "bob").As("b").AddE((string) "knows").From("a").To("b").Property("_partition", "a").Property("weight", 1.0d).AddE((string) "knows").From("b").To("a").Property("_partition", "b").Property("weight", 2.0d), (g,p) =>g.WithStrategies(new PartitionStrategy(partitionKey: "_partition", writePartition: "a", readPartitions: new HashSet<string> { "a", "b" })).V().BothE().Dedup().Values<object>("weight")}},
+ {"g_withStrategiesXPartitionStrategyXwrite_a_read_cXX_V_bothE_weight", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("_partition", "a").Property("name", "alice").As("a").AddV((string) "person").Property("_partition", "b").Property("name", "bob").As("b").AddE((string) "knows").From("a").To("b").Property("_partition", "a").Property("weight", 1.0d).AddE((string) "knows").From("b").To("a").Property("_partition", "b").Property("weight", 2.0d), (g,p) =>g.WithStrategies(new PartitionStrategy(partitionKey: "_partition", writePartition: "a", readPartitions: new HashSet<string> { "c" })).V().BothE().Values<object>("weight")}},
+ {"g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_V_both_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("_partition", "a").Property("name", "alice").As("a").AddV((string) "person").Property("_partition", "b").Property("name", "bob").As("b").AddE((string) "knows").From("a").To("b").Property("_partition", "a").Property("weight", 1.0d).AddE((string) "knows").From("b").To("a").Property("_partition", "b").Property("weight", 2.0d), (g,p) =>g.WithStrategies(new PartitionStrategy(partitionKey: "_partition", writePartition: "a", readPartitions: new HashSet<string> { "a" })).V().Both().Values<object>("name")}},
+ {"g_withStrategiesXPartitionStrategyXwrite_a_read_bXX_V_both_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("_partition", "a").Property("name", "alice").As("a").AddV((string) "person").Property("_partition", "b").Property("name", "bob").As("b").AddE((string) "knows").From("a").To("b").Property("_partition", "a").Property("weight", 1.0d).AddE((string) "knows").From("b").To("a").Property("_partition", "b").Property("weight", 2.0d), (g,p) =>g.WithStrategies(new PartitionStrategy(partitionKey: "_partition", writePartition: "a", readPartitions: new HashSet<string> { "b" })).V().Both().Values<object>("name")}},
+ {"g_withStrategiesXPartitionStrategyXwrite_a_read_a_bXX_V_both_dedup_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("_partition", "a").Property("name", "alice").As("a").AddV((string) "person").Property("_partition", "b").Property("name", "bob").As("b").AddE((string) "knows").From("a").To("b").Property("_partition", "a").Property("weight", 1.0d).AddE((string) "knows").From("b").To("a").Property("_partition", "b").Property("weight", 2.0d), (g,p) =>g.WithStrategies(new PartitionStrategy(partitionKey: "_partition", writePartition: "a", readPartitions: new HashSet<string> { "a", "b" })).V().Both().Dedup().Values<object>("name")}},
+ {"g_withStrategiesXPartitionStrategyXwrite_a_read_cXX_V_both_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("_partition", "a").Property("name", "alice").As("a").AddV((string) "person").Property("_partition", "b").Property("name", "bob").As("b").AddE((string) "knows").From("a").To("b").Property("_partition", "a").Property("weight", 1.0d).AddE((string) "knows").From("b").To("a").Property("_partition", "b").Property("weight", 2.0d), (g,p) =>g.WithStrategies(new PartitionStrategy(partitionKey: "_partition", writePartition: "a", readPartitions: new HashSet<string> { "c" })).V().Both().Values<object>("name")}},
+ {"g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_V_out_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("_partition", "a").Property("name", "alice").As("a").AddV((string) "person").Property("_partition", "b").Property("name", "bob").As("b").AddE((string) "knows").From("a").To("b").Property("_partition", "a").Property("weight", 1.0d).AddE((string) "knows").From("b").To("a").Property("_partition", "b").Property("weight", 2.0d), (g,p) =>g.WithStrategies(new PartitionStrategy(partitionKey: "_partition", writePartition: "a", readPartitions: new HashSet<string> { "a" })).V().Out().Values<object>("name")}},
+ {"g_withStrategiesXPartitionStrategyXwrite_a_read_bXX_V_in_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("_partition", "a").Property("name", "alice").As("a").AddV((string) "person").Property("_partition", "b").Property("name", "bob").As("b").AddE((string) "knows").From("a").To("b").Property("_partition", "a").Property("weight", 1.0d).AddE((string) "knows").From("b").To("a").Property("_partition", "b").Property("weight", 2.0d), (g,p) =>g.WithStrategies(new PartitionStrategy(partitionKey: "_partition", writePartition: "a", readPartitions: new HashSet<string> { "b" })).V().In().Values<object>("name")}},
+ {"g_withStrategiesXPartitionStrategyXwrite_a_read_a_bXX_V_out_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("_partition", "a").Property("name", "alice").As("a").AddV((string) "person").Property("_partition", "b").Property("name", "bob").As("b").AddE((string) "knows").From("a").To("b").Property("_partition", "a").Property("weight", 1.0d).AddE((string) "knows").From("b").To("a").Property("_partition", "b").Property("weight", 2.0d), (g,p) =>g.WithStrategies(new PartitionStrategy(partitionKey: "_partition", writePartition: "a", readPartitions: new HashSet<string> { "a", "b" })).V().Out().Values<object>("name")}},
+ {"g_withStrategiesXPartitionStrategyXwrite_a_read_cXX_V_out_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("_partition", "a").Property("name", "alice").As("a").AddV((string) "person").Property("_partition", "b").Property("name", "bob").As("b").AddE((string) "knows").From("a").To("b").Property("_partition", "a").Property("weight", 1.0d).AddE((string) "knows").From("b").To("a").Property("_partition", "b").Property("weight", 2.0d), (g,p) =>g.WithStrategies(new PartitionStrategy(partitionKey: "_partition", writePartition: "a", readPartitions: new HashSet<string> { "c" })).V().Out().Values<object>("name")}},
+ {"g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_addVXpersonX_propertyXname_aliceX_addXselfX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithStrategies(new PartitionStrategy(partitionKey: "_partition", writePartition: "a", readPartitions: new HashSet<string> { "a" })).AddV((string) "person").Property("name", "alice").AddE((string) "self"), (g,p) =>g.V().Has("person", "name", "alice").Has("_partition", "a"), (g,p) =>g.V(), (g,p) =>g.E().Has("_partition", "a"), (g,p) =>g.E()}},
+ {"g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_injectXzeroX_addVXpersonX_propertyXname_aliceX_addXselfX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithStrategies(new PartitionStrategy(partitionKey: "_partition", writePartition: "a", readPartitions: new HashSet<string> { "a" })).Inject<object>(0).AddV((string) "person").Property("name", "alice").AddE((string) "self"), (g,p) =>g.V().Has("person", "name", "alice").Has("_partition", "a"), (g,p) =>g.V(), (g,p) =>g.E().Has("_partition", "a"), (g,p) =>g.E()}},
{"g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_mergeV", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithStrategies(new PartitionStrategy(partitionKey: "_partition", writePartition: "a", readPartitions: new HashSet<string> { "a" })).MergeV((IDictionary<object, object>) p["xx1"]), (g,p) =>g.V().Has("person", "name", "alice").Has("_partition", "a"), (g,p) =>g.V()}},
{"g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_injectX0X_mergeV", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithStrategies(new PartitionStrategy(partitionKey: "_partition", writePartition: "a", readPartitions: new HashSet<string> { "a" })).Inject<object>(0).MergeV((IDictionary<object, object>) p["xx1"]), (g,p) =>g.V().Has("person", "name", "alice").Has("_partition", "a"), (g,p) =>g.V()}},
- {"g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_mergeE", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("_partition", "a").Property("name", "alice").AddV("person").Property("_partition", "a").Property("name", "bob"), (g,p) =>g.WithStrategies(new PartitionStrategy(partitionKey: "_partition", writePartition: "a", readPartitions: new HashSet<string> { "a" })).MergeE((IDictionary<object, object>) p["xx1"]), (g,p) =>g.E().Has("knows", "_partition", "a"), (g,p) =>g.E()}},
- {"g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_injectX0XmergeE", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("_partition", "a").Property("name", "alice").AddV("person").Property("_partition", "a").Property("name", "bob"), (g,p) =>g.WithStrategies(new PartitionStrategy(partitionKey: "_partition", writePartition: "a", readPartitions: new HashSet<string> { "a" })).Inject<object>(0).MergeE((IDictionary<object, object>) p["xx1"]), (g,p) =>g.E().Has("knows", "_partition", "a"), (g,p) =>g.E()}},
- {"g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_mergeVXlabel_person_name_aliceX_optionXonMatch_name_bobX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("_partition", "a").Property("name", "alice").AddV("person").Property("_partition", "b").Property("name", "alice"), (g,p) =>g.WithStrategies(new PartitionStrategy(partitionKey: "_partition", writePartition: "a", readPartitions: new HashSet<string> { "a" })).MergeV((IDictionary<object, object>) p["xx1"]).Option(Merge.OnMatch, (IDictionary<object, object>) p["xx2"]), (g,p) =>g.V().Has("person", "name", "bob").Has("_partition", "a"), (g,p) =>g.V()}},
- {"g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_mergeV_optionXonCreateX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("_partition", "b").Property("name", "alice"), (g,p) =>g.WithStrategies(new PartitionStrategy(partitionKey: "_partition", writePartition: "a", readPartitions: new HashSet<string> { "a" })).MergeV((IDictionary<object, object>) p["xx1"]).Option(Merge.OnCreate, (IDictionary<object, object>) p["xx2"]), (g,p) =>g.V().Has("name", "alice").Has("age", 35).Has("_partition", "a"), (g,p) =>g.V()}},
- {"g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_injectX0X__mergeV_optionXonCreateX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("_partition", "b").Property("name", "alice"), (g,p) =>g.WithStrategies(new PartitionStrategy(partitionKey: "_partition", writePartition: "a", readPartitions: new HashSet<string> { "a" })).Inject<object>(0).MergeV((IDictionary<object, object>) p["xx1"]).Option(Merge.OnCreate, (IDictionary<object, object>) p["xx2"]), (g,p) =>g.V().Has("name", "alice").Has("age", 35).Has("_partition", "a"), (g,p) =>g.V()}},
+ {"g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_mergeE", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("_partition", "a").Property("name", "alice").AddV((string) "person").Property("_partition", "a").Property("name", "bob"), (g,p) =>g.WithStrategies(new PartitionStrategy(partitionKey: "_partition", writePartition: "a", readPartitions: new HashSet<string> { "a" })).MergeE((IDictionary<object, object>) p["xx1"]), (g,p) =>g.E().Has("knows", "_partition", "a"), (g,p) =>g.E()}},
+ {"g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_injectX0XmergeE", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("_partition", "a").Property("name", "alice").AddV((string) "person").Property("_partition", "a").Property("name", "bob"), (g,p) =>g.WithStrategies(new PartitionStrategy(partitionKey: "_partition", writePartition: "a", readPartitions: new HashSet<string> { "a" })).Inject<object>(0).MergeE((IDictionary<object, object>) p["xx1"]), (g,p) =>g.E().Has("knows", "_partition", "a"), (g,p) =>g.E()}},
+ {"g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_mergeVXlabel_person_name_aliceX_optionXonMatch_name_bobX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("_partition", "a").Property("name", "alice").AddV((string) "person").Property("_partition", "b").Property("name", "alice"), (g,p) =>g.WithStrategies(new PartitionStrategy(partitionKey: "_partition", writePartition: "a", readPartitions: new HashSet<string> { "a" })).MergeV((IDictionary<object, object>) p["xx1"]).Option(Merge.OnMatch, (IDictionary<object, object>) p["xx2"]), (g,p) =>g.V().Has("person", "name", "bob").Has("_partition", "a"), (g,p) =>g.V()}},
+ {"g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_mergeV_optionXonCreateX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("_partition", "b").Property("name", "alice"), (g,p) =>g.WithStrategies(new PartitionStrategy(partitionKey: "_partition", writePartition: "a", readPartitions: new HashSet<string> { "a" })).MergeV((IDictionary<object, object>) p["xx1"]).Option(Merge.OnCreate, (IDictionary<object, object>) p["xx2"]), (g,p) =>g.V().Has("name", "alice").Has("age", 35).Has("_partition", "a"), (g,p) =>g.V()}},
+ {"g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_injectX0X__mergeV_optionXonCreateX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("_partition", "b").Property("name", "alice"), (g,p) =>g.WithStrategies(new PartitionStrategy(partitionKey: "_partition", writePartition: "a", readPartitions: new HashSet<string> { "a" })).Inject<object>(0).MergeV((IDictionary<object, object>) p["xx1"]).Option(Merge.OnCreate, (IDictionary<object, object>) p["xx2"]), (g,p) =>g.V().Has("name", "alice").Has("age", 35).Has("_partition", "a"), (g,p) =>g.V()}},
{"g_withStrategiesXPathProcessorStrategyX_V_asXaX_selectXaX_byXvaluesXnameXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithStrategies(new PathProcessorStrategy()).V().As("a").Select<object>("a").By(__.Values<object>("name"))}},
{"g_withoutStrategiesXPathProcessorStrategyX_V_asXaX_selectXaX_byXvaluesXnameXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithoutStrategies(typeof(PathProcessorStrategy)).V().As("a").Select<object>("a").By(__.Values<object>("name"))}},
{"g_withStrategiesXPathRetractionStrategyX_V", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithStrategies(new PathRetractionStrategy()).V()}},
@@ -571,9 +571,9 @@
{"g_withoutStrategiesXProfileStrategyX_V", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithoutStrategies(typeof(ProfileStrategy)).V()}},
{"g_withStrategiesXReadOnlyStrategyX_V", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithStrategies(new ReadOnlyStrategy()).V()}},
{"g_withStrategiesXReadOnlyStrategyX_V_outXknowsX_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithStrategies(new ReadOnlyStrategy()).V().Out("knows").Values<object>("name")}},
- {"g_withStrategiesXReadOnlyStrategyX_addVXpersonX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithStrategies(new ReadOnlyStrategy()).AddV("person")}},
- {"g_withStrategiesXReadOnlyStrategyX_addVXpersonX_fromXVX1XX_toXVX2XX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithStrategies(new ReadOnlyStrategy()).AddE("link").From(__.V(p["vid1"])).To(__.V(p["vid2"]))}},
- {"g_withStrategiesXReadOnlyStrategyX_V_addVXpersonX_fromXVX1XX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithStrategies(new ReadOnlyStrategy()).V().AddE("link").From(__.V(p["vid1"]))}},
+ {"g_withStrategiesXReadOnlyStrategyX_addVXpersonX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithStrategies(new ReadOnlyStrategy()).AddV((string) "person")}},
+ {"g_withStrategiesXReadOnlyStrategyX_addVXpersonX_fromXVX1XX_toXVX2XX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithStrategies(new ReadOnlyStrategy()).AddE((string) "link").From(__.V(p["vid1"])).To(__.V(p["vid2"]))}},
+ {"g_withStrategiesXReadOnlyStrategyX_V_addVXpersonX_fromXVX1XX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithStrategies(new ReadOnlyStrategy()).V().AddE((string) "link").From(__.V(p["vid1"]))}},
{"g_withStrategiesXReadOnlyStrategyX_V_propertyXname_joshX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithStrategies(new ReadOnlyStrategy()).V().Property("name", "josh")}},
{"g_withStrategiesXReadOnlyStrategyX_E_propertyXweight_0X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithStrategies(new ReadOnlyStrategy()).E().Property("weight", 0)}},
{"g_V_classic_recommendation", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Has("name", "DARK STAR").As("a").Out("followedBy").Aggregate("stash").In("followedBy").Where(P.Neq("a").And(P.Not(P.Within("stash")))).GroupCount<object>().Unfold<object>().Project<object>("x", "y", "z").By(__.Select<object>(Column.Keys).Values<object>("name")).By(__.Select<object>(Column.Keys).Values<object>("performances")).By(__.Select<object>(Column.Values)).Order().By(__.Select<object>("z"), Order.Desc).By(__.Select<object>("y"), Order.Asc).Limit<object>(5).Aggregate(Scope.Local, "m").Select<object>("x")}},
@@ -582,9 +582,9 @@
{"g_withoutStrategiesXReferenceElementStrategyX_V", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithoutStrategies(typeof(ReferenceElementStrategy)).V()}},
{"g_withStrategiesXRepeatUnrollStrategyX_V_repeatXoutX_timesX2X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithStrategies(new RepeatUnrollStrategy()).V().Repeat(__.Out()).Times(2)}},
{"g_withoutStrategiesXRepeatUnrollStrategyX_V_repeatXoutX_timesX2X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithoutStrategies(typeof(RepeatUnrollStrategy)).V().Repeat(__.Out()).Times(2)}},
- {"g_withStrategiesXReservedKeysVerificationStrategyXthrowException_trueXX_addVXpersonX_propertyXid_123X_propertyXname_markoX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithStrategies(new ReservedKeysVerificationStrategy(throwException: true)).AddV("person").Property("id", 123).Property("name", "marko")}},
- {"g_withStrategiesXReservedKeysVerificationStrategyXthrowException_trueXX_addVXpersonX_propertyXage_29X_propertyXname_markoX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithStrategies(new ReservedKeysVerificationStrategy(throwException: true, keys: new HashSet<string> { "age" })).AddV("person").Property("age", 29).Property("name", "marko")}},
- {"g_withoutStrategiesXReservedKeysVerificationStrategyX_addVXpersonX_propertyXid_123X_propertyXname_markoX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithoutStrategies(typeof(ReservedKeysVerificationStrategy)).AddV("person").Property("id", 123).Property("name", "marko").Values<object>()}},
+ {"g_withStrategiesXReservedKeysVerificationStrategyXthrowException_trueXX_addVXpersonX_propertyXid_123X_propertyXname_markoX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithStrategies(new ReservedKeysVerificationStrategy(throwException: true)).AddV((string) "person").Property("id", 123).Property("name", "marko")}},
+ {"g_withStrategiesXReservedKeysVerificationStrategyXthrowException_trueXX_addVXpersonX_propertyXage_29X_propertyXname_markoX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithStrategies(new ReservedKeysVerificationStrategy(throwException: true, keys: new HashSet<string> { "age" })).AddV((string) "person").Property("age", 29).Property("name", "marko")}},
+ {"g_withoutStrategiesXReservedKeysVerificationStrategyX_addVXpersonX_propertyXid_123X_propertyXname_markoX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithoutStrategies(typeof(ReservedKeysVerificationStrategy)).AddV((string) "person").Property("id", 123).Property("name", "marko").Values<object>()}},
{"g_withoutStrategiesXSeedStrategyX_V", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithoutStrategies(typeof(SeedStrategy)).V()}},
{"g_withStrategiesXStandardVerificationStrategyX_V", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithStrategies(new StandardVerificationStrategy()).V()}},
{"g_withoutStrategiesXStandardVerificationStrategyX_V", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithoutStrategies(typeof(StandardVerificationStrategy)).V()}},
@@ -654,39 +654,39 @@
{"g_withoutStrategiesXVertexProgramRestrictionStrategyX_V", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithoutStrategies(typeof(VertexProgramRestrictionStrategy)).WithStrategies(new VertexProgramStrategy()).V()}},
{"g_withStrategiesXVertexProgramStrategyX_V", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithStrategies(new VertexProgramStrategy()).V()}},
{"g_withoutStrategiesXVertexProgramStrategyX_V", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithoutStrategies(typeof(VertexProgramStrategy)).V()}},
- {"g_VX1X_asXaX_outXcreatedX_addEXcreatedByX_toXaX", 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").Property("lang", "java").As("ripple").AddV("person").Property("name", "peter").Property("age", 35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight", 0.5d).AddE("knows").From("marko").To("josh").Property("weight", 1.0d).AddE("created").From("marko").To("lop").Property("weight", 0.4d).AddE("created").From("josh").To("ripple").Property("weight", 1.0d).AddE("created").From("josh").To("lop").Property("weight", 0.4d).AddE("created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.V(p["vid1"]).As("a").Out("created").AddE("createdBy").To("a"), (g,p) =>g.E(), (g,p) =>g.V(p["vid1"]).InE()}},
- {"g_VX1X_asXaX_outXcreatedX_addEXcreatedByX_toXaX_propertyXweight_2X", 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").Property("lang", "java").As("ripple").AddV("person").Property("name", "peter").Property("age", 35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight", 0.5d).AddE("knows").From("marko").To("josh").Property("weight", 1.0d).AddE("created").From("marko").To("lop").Property("weight", 0.4d).AddE("created").From("josh").To("ripple").Property("weight", 1.0d).AddE("created").From("josh").To("lop").Property("weight", 0.4d).AddE("created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.V(p["vid1"]).As("a").Out("created").AddE("createdBy").To("a").Property("weight", 2.0d), (g,p) =>g.E(), (g,p) =>g.V(p["vid1"]).BothE(), (g,p) =>g.V(p["vid1"]).InE().Has("weight", 2.0d)}},
- {"g_V_outE_propertyXweight_nullX", 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").Property("lang", "java").As("ripple").AddV("person").Property("name", "peter").Property("age", 35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight", 0.5d).AddE("knows").From("marko").To("josh").Property("weight", 1.0d).AddE("created").From("marko").To("lop").Property("weight", 0.4d).AddE("created").From("josh").To("ripple").Property("weight", 1.0d).AddE("created").From("josh").To("lop").Property("weight", 0.4d).AddE("created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.V().OutE().Property("weight", null), (g,p) =>g.E().Properties<object>("weight")}},
- {"g_V_aggregateXxX_asXaX_selectXxX_unfold_addEXexistsWithX_toXaX_propertyXtime_nowX", 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").Property("lang", "java").As("ripple").AddV("person").Property("name", "peter").Property("age", 35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight", 0.5d).AddE("knows").From("marko").To("josh").Property("weight", 1.0d).AddE("created").From("marko").To("lop").Property("weight", 0.4d).AddE("created").From("josh").To("ripple").Property("weight", 1.0d).AddE("created").From("josh").To("lop").Property("weight", 0.4d).AddE("created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.V().Aggregate("x").As("a").Select<object>("x").Unfold<object>().AddE("existsWith").To("a").Property("time", "now"), (g,p) =>g.E(), (g,p) =>g.V(p["vid1"]).BothE(), (g,p) =>g.V(p["vid1"]).InE("existsWith"), (g,p) =>g.V(p["vid1"]).OutE("existsWith"), (g,p) =>g.V(p["vid1"]).BothE("existsWith").Has("time", "now"), (g,p) =>g.V(p["vid2"]).BothE(), (g,p) =>g.V(p["vid2"]).InE("existsWith"), (g,p) =>g.V(p["vid2"]).OutE("existsWith"), (g,p) =>g.V(p["vid2"]).BothE("existsWith").Has("time", "now"), (g,p) =>g.V(p["vid3"]).BothE(), (g,p) =>g.V(p["vid3"]).InE("existsWith"), (g,p) =>g.V(p["vid3"]).OutE("existsWith"), (g,p) =>g.V(p["vid3"]).BothE("existsWith").Has("time", "now"), (g,p) =>g.V(p["vid4"]).BothE(), (g,p) =>g.V(p["vid4"]).InE("existsWith"), (g,p) =>g.V(p["vid4"]).OutE("existsWith"), (g,p) =>g.V(p["vid4"]).BothE("existsWith").Has("time", "now"), (g,p) =>g.V(p["vid5"]).BothE(), (g,p) =>g.V(p["vid5"]).InE("existsWith"), (g,p) =>g.V(p["vid5"]).OutE("existsWith"), (g,p) =>g.V(p["vid5"]).BothE("existsWith").Has("time", "now"), (g,p) =>g.V(p["vid6"]).BothE(), (g,p) =>g.V(p["vid6"]).InE("existsWith"), (g,p) =>g.V(p["vid6"]).OutE("existsWith"), (g,p) =>g.V(p["vid6"]).BothE("existsWith").Has("time", "now")}},
- {"g_V_asXaX_outXcreatedX_inXcreatedX_whereXneqXaXX_asXbX_addEXcodeveloperX_fromXaX_toXbX_propertyXyear_2009X", 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").Property("lang", "java").As("ripple").AddV("person").Property("name", "peter").Property("age", 35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight", 0.5d).AddE("knows").From("marko").To("josh").Property("weight", 1.0d).AddE("created").From("marko").To("lop").Property("weight", 0.4d).AddE("created").From("josh").To("ripple").Property("weight", 1.0d).AddE("created").From("josh").To("lop").Property("weight", 0.4d).AddE("created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.V().As("a").Out("created").In("created").Where(P.Neq("a")).As("b").AddE("codeveloper").From("a").To("b").Property("year", 2009), (g,p) =>g.E(), (g,p) =>g.V(p["vid1"]).BothE(), (g,p) =>g.V(p["vid1"]).InE("codeveloper"), (g,p) =>g.V(p["vid1"]).OutE("codeveloper"), (g,p) =>g.V(p["vid1"]).BothE("codeveloper").Has("year", 2009), (g,p) =>g.V(p["vid2"]).BothE(), (g,p) =>g.V(p["vid4"]).BothE(), (g,p) =>g.V(p["vid4"]).InE("codeveloper"), (g,p) =>g.V(p["vid4"]).OutE("codeveloper"), (g,p) =>g.V(p["vid4"]).BothE("codeveloper").Has("year", 2009), (g,p) =>g.V(p["vid6"]).BothE(), (g,p) =>g.V(p["vid6"]).InE("codeveloper"), (g,p) =>g.V(p["vid6"]).OutE("codeveloper"), (g,p) =>g.V(p["vid6"]).BothE("codeveloper").Has("year", 2009)}},
- {"g_V_asXaX_inXcreatedX_addEXcreatedByX_fromXaX_propertyXyear_2009X_propertyXacl_publicX", 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").Property("lang", "java").As("ripple").AddV("person").Property("name", "peter").Property("age", 35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight", 0.5d).AddE("knows").From("marko").To("josh").Property("weight", 1.0d).AddE("created").From("marko").To("lop").Property("weight", 0.4d).AddE("created").From("josh").To("ripple").Property("weight", 1.0d).AddE("created").From("josh").To("lop").Property("weight", 0.4d).AddE("created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.V().As("a").In("created").AddE("createdBy").From("a").Property("year", 2009).Property("acl", "public"), (g,p) =>g.E(), (g,p) =>g.V(p["vid1"]).BothE(), (g,p) =>g.V(p["vid1"]).InE("createdBy"), (g,p) =>g.V(p["vid1"]).OutE("createdBy"), (g,p) =>g.V(p["vid1"]).BothE("createdBy").Has("year", 2009).Has("acl", "public"), (g,p) =>g.V(p["vid2"]).BothE(), (g,p) =>g.V(p["vid3"]).BothE(), (g,p) =>g.V(p["vid3"]).InE("createdBy"), (g,p) =>g.V(p["vid3"]).OutE("createdBy"), (g,p) =>g.V(p["vid3"]).BothE("createdBy").Has("year", 2009).Has("acl", "public"), (g,p) =>g.V(p["vid4"]).BothE(), (g,p) =>g.V(p["vid4"]).InE("createdBy"), (g,p) =>g.V(p["vid4"]).OutE("createdBy"), (g,p) =>g.V(p["vid4"]).BothE("createdBy").Has("year", 2009).Has("acl", "public"), (g,p) =>g.V(p["vid5"]).BothE(), (g,p) =>g.V(p["vid5"]).InE("createdBy"), (g,p) =>g.V(p["vid5"]).OutE("createdBy"), (g,p) =>g.V(p["vid5"]).BothE("createdBy").Has("year", 2009).Has("acl", "public"), (g,p) =>g.V(p["vid6"]).BothE(), (g,p) =>g.V(p["vid6"]).InE("createdBy"), (g,p) =>g.V(p["vid6"]).OutE("createdBy"), (g,p) =>g.V(p["vid6"]).BothE("createdBy").Has("year", 2009).Has("acl", "public")}},
- {"g_withSideEffectXb_bX_VXaX_addEXknowsX_toXbX_propertyXweight_0_5X", 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").Property("lang", "java").As("ripple").AddV("person").Property("name", "peter").Property("age", 35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight", 0.5d).AddE("knows").From("marko").To("josh").Property("weight", 1.0d).AddE("created").From("marko").To("lop").Property("weight", 0.4d).AddE("created").From("josh").To("ripple").Property("weight", 1.0d).AddE("created").From("josh").To("lop").Property("weight", 0.4d).AddE("created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.V(p["vid1"]).AddE("knows").To("b").Property("weight", 0.5d), (g,p) =>g.E(), (g,p) =>g.V(p["vid1"]).BothE(), (g,p) =>g.V(p["vid1"]).InE("knows"), (g,p) =>g.V(p["vid1"]).OutE("knows"), (g,p) =>g.V(p["vid1"]).BothE("knows").Has("weight", 0.5), (g,p) =>g.V(p["vid6"]).BothE(), (g,p) =>g.V(p["vid6"]).InE("knows"), (g,p) =>g.V(p["vid6"]).OutE("knows"), (g,p) =>g.V(p["vid6"]).BothE("knows").Has("weight", 0.5)}},
- {"g_addV_asXfirstX_repeatXaddEXnextX_toXaddVX_inVX_timesX5X_addEXnextX_toXselectXfirstXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV().As("first").Repeat(__.AddE("next").To(__.AddV()).InV()).Times(5).AddE("next").To(__.Select<object>("first")), (g,p) =>g.V(), (g,p) =>g.E(), (g,p) =>g.E().HasLabel("next"), (g,p) =>g.V().Limit<object>(1).BothE(), (g,p) =>g.V().Limit<object>(1).InE(), (g,p) =>g.V().Limit<object>(1).OutE()}},
- {"g_V_hasXname_markoX_asXaX_outEXcreatedX_asXbX_inV_addEXselectXbX_labelX_toXaX", 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").Property("lang", "java").As("ripple").AddV("person").Property("name", "peter").Property("age", 35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight", 0.5d).AddE("knows").From("marko").To("josh").Property("weight", 1.0d).AddE("created").From("marko").To("lop").Property("weight", 0.4d).AddE("created").From("josh").To("ripple").Property("weight", 1.0d).AddE("created").From("josh").To("lop").Property("weight", 0.4d).AddE("created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.V().Has("name", "marko").As("a").OutE("created").As("b").InV().AddE(__.Select<object>("b").Label()).To("a"), (g,p) =>g.E(), (g,p) =>g.V(p["vid1"]).BothE(), (g,p) =>g.V(p["vid1"]).InE("created"), (g,p) =>g.V(p["vid1"]).In("created").Has("name", "lop"), (g,p) =>g.V(p["vid1"]).OutE("created")}},
- {"g_addEXV_outE_label_groupCount_orderXlocalX_byXvalues_descX_selectXkeysX_unfold_limitX1XX_fromXV_hasXname_vadasXX_toXV_hasXname_lopXX", 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").Property("lang", "java").As("ripple").AddV("person").Property("name", "peter").Property("age", 35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight", 0.5d).AddE("knows").From("marko").To("josh").Property("weight", 1.0d).AddE("created").From("marko").To("lop").Property("weight", 0.4d).AddE("created").From("josh").To("ripple").Property("weight", 1.0d).AddE("created").From("josh").To("lop").Property("weight", 0.4d).AddE("created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.AddE(__.V().OutE().Label().GroupCount<object>().Order(Scope.Local).By(Column.Values, Order.Desc).Select<object>(Column.Keys).Unfold<object>().Limit<object>(1)).From(__.V().Has("name", "vadas")).To(__.V().Has("name", "lop")), (g,p) =>g.E(), (g,p) =>g.V(p["vid2"]).BothE(), (g,p) =>g.V(p["vid2"]).InE("knows"), (g,p) =>g.V(p["vid2"]).OutE("created"), (g,p) =>g.V(p["vid2"]).Out("created").Has("name", "lop")}},
- {"g_addEXknowsX_fromXaX_toXbX_propertyXweight_0_1X", 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").Property("lang", "java").As("ripple").AddV("person").Property("name", "peter").Property("age", 35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight", 0.5d).AddE("knows").From("marko").To("josh").Property("weight", 1.0d).AddE("created").From("marko").To("lop").Property("weight", 0.4d).AddE("created").From("josh").To("ripple").Property("weight", 1.0d).AddE("created").From("josh").To("lop").Property("weight", 0.4d).AddE("created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.AddE("knows").From(p["vid1"]).To(p["vid6"]).Property("weight", p["xx1"]), (g,p) =>g.E(), (g,p) =>g.V(p["vid1"]).OutE("knows"), (g,p) =>g.V(p["vid1"]).Out("knows").Has("name", "peter")}},
- {"g_addEXknowsvarX_fromXaX_toXbX_propertyXweight_0_1X", 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").Property("lang", "java").As("ripple").AddV("person").Property("name", "peter").Property("age", 35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight", 0.5d).AddE("knows").From("marko").To("josh").Property("weight", 1.0d).AddE("created").From("marko").To("lop").Property("weight", 0.4d).AddE("created").From("josh").To("ripple").Property("weight", 1.0d).AddE("created").From("josh").To("lop").Property("weight", 0.4d).AddE("created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.AddE((string) p["xx1"]).From(p["vid1"]).To(p["vid6"]).Property("weight", p["xx2"]), (g,p) =>g.E(), (g,p) =>g.V(p["vid1"]).OutE("knows"), (g,p) =>g.V(p["vid1"]).Out("knows").Has("name", "peter")}},
- {"g_VXaX_addEXknowsX_toXbX_propertyXweight_0_1X", 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").Property("lang", "java").As("ripple").AddV("person").Property("name", "peter").Property("age", 35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight", 0.5d).AddE("knows").From("marko").To("josh").Property("weight", 1.0d).AddE("created").From("marko").To("lop").Property("weight", 0.4d).AddE("created").From("josh").To("ripple").Property("weight", 1.0d).AddE("created").From("josh").To("lop").Property("weight", 0.4d).AddE("created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.V(p["vid1"]).AddE("knows").To(p["vid6"]).Property("weight", p["xx1"]), (g,p) =>g.E(), (g,p) =>g.V(p["vid1"]).OutE("knows"), (g,p) =>g.V(p["vid1"]).Out("knows").Has("name", "peter")}},
- {"g_addEXknowsXpropertyXweight_nullXfromXV_hasXname_markoXX_toXV_hasXname_vadasXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").Property("age", 29).AddV("person").Property("name", "vadas").Property("age", 27), (g,p) =>g.AddE("knows").Property("weight", null).From(__.V().Has("name", "marko")).To(__.V().Has("name", "vadas")), (g,p) =>g.E().Has("knows", "weight", (object) null)}},
- {"g_addEXknowsvarXpropertyXweight_nullXfromXV_hasXname_markoXX_toXV_hasXname_vadasXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").Property("age", 29).AddV("person").Property("name", "vadas").Property("age", 27), (g,p) =>g.AddE((string) p["xx1"]).Property("weight", null).From(__.V().Has("name", "marko")).To(__.V().Has("name", "vadas")), (g,p) =>g.E().Has("knows", "weight", (object) null)}},
- {"g_unionXaddEXknowsvarXpropertyXweight_nullXfromXV_hasXname_markoXX_toXV_hasXname_vadasXXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").Property("age", 29).AddV("person").Property("name", "vadas").Property("age", 27), (g,p) =>g.Union<object>(__.AddE((string) p["xx1"]).Property("weight", 1).From(__.V().Has("name", "marko")).To(__.V().Has("name", "vadas"))), (g,p) =>g.E().Has("knows", "weight", 1)}},
- {"g_VX1X_addVXanimalX_propertyXage_selectXaX_byXageXX_propertyXname_puppyX", 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").Property("lang", "java").As("ripple").AddV("person").Property("name", "peter").Property("age", 35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight", 0.5d).AddE("knows").From("marko").To("josh").Property("weight", 1.0d).AddE("created").From("marko").To("lop").Property("weight", 0.4d).AddE("created").From("josh").To("ripple").Property("weight", 1.0d).AddE("created").From("josh").To("lop").Property("weight", 0.4d).AddE("created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.V(p["vid1"]).As("a").AddV("animal").Property("age", __.Select<object>("a").By("age")).Property("name", "puppy"), (g,p) =>g.V().Has("animal", "age", 29)}},
- {"g_V_addVXanimalX_propertyXage_0X", 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").Property("lang", "java").As("ripple").AddV("person").Property("name", "peter").Property("age", 35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight", 0.5d).AddE("knows").From("marko").To("josh").Property("weight", 1.0d).AddE("created").From("marko").To("lop").Property("weight", 0.4d).AddE("created").From("josh").To("ripple").Property("weight", 1.0d).AddE("created").From("josh").To("lop").Property("weight", 0.4d).AddE("created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.V().AddV("animal").Property("age", 0), (g,p) =>g.V().Has("animal", "age", 0)}},
- {"g_V_addVXanimalvarX_propertyXage_0varX", 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").Property("lang", "java").As("ripple").AddV("person").Property("name", "peter").Property("age", 35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight", 0.5d).AddE("knows").From("marko").To("josh").Property("weight", 1.0d).AddE("created").From("marko").To("lop").Property("weight", 0.4d).AddE("created").From("josh").To("ripple").Property("weight", 1.0d).AddE("created").From("josh").To("lop").Property("weight", 0.4d).AddE("created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.V().AddV((string) p["xx1"]).Property("age", p["xx2"]), (g,p) =>g.V().Has("animal", "age", 0)}},
- {"g_addVXpersonX_propertyXname_stephenX", 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").Property("lang", "java").As("ripple").AddV("person").Property("name", "peter").Property("age", 35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight", 0.5d).AddE("knows").From("marko").To("josh").Property("weight", 1.0d).AddE("created").From("marko").To("lop").Property("weight", 0.4d).AddE("created").From("josh").To("ripple").Property("weight", 1.0d).AddE("created").From("josh").To("lop").Property("weight", 0.4d).AddE("created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.AddV("person").Property("name", "stephen"), (g,p) =>g.V().Has("person", "name", "stephen")}},
- {"g_addVXpersonvarX_propertyXname_stephenvarX", 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").Property("lang", "java").As("ripple").AddV("person").Property("name", "peter").Property("age", 35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight", 0.5d).AddE("knows").From("marko").To("josh").Property("weight", 1.0d).AddE("created").From("marko").To("lop").Property("weight", 0.4d).AddE("created").From("josh").To("ripple").Property("weight", 1.0d).AddE("created").From("josh").To("lop").Property("weight", 0.4d).AddE("created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.AddV((string) p["xx1"]).Property("name", p["xx2"]), (g,p) =>g.V().Has("person", "name", "stephen")}},
- {"g_V_hasLabelXpersonX_propertyXname_nullX", 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").Property("lang", "java").As("ripple").AddV("person").Property("name", "peter").Property("age", 35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight", 0.5d).AddE("knows").From("marko").To("josh").Property("weight", 1.0d).AddE("created").From("marko").To("lop").Property("weight", 0.4d).AddE("created").From("josh").To("ripple").Property("weight", 1.0d).AddE("created").From("josh").To("lop").Property("weight", 0.4d).AddE("created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.V().HasLabel("person").Property(Cardinality.Single, "name", (object) null), (g,p) =>g.V().Properties<object>("name")}},
- {"g_addVXpersonX_propertyXsingle_name_stephenX_propertyXsingle_name_stephenmX", 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").Property("lang", "java").As("ripple").AddV("person").Property("name", "peter").Property("age", 35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight", 0.5d).AddE("knows").From("marko").To("josh").Property("weight", 1.0d).AddE("created").From("marko").To("lop").Property("weight", 0.4d).AddE("created").From("josh").To("ripple").Property("weight", 1.0d).AddE("created").From("josh").To("lop").Property("weight", 0.4d).AddE("created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.AddV("person").Property(Cardinality.Single, "name", "stephen").Property(Cardinality.Single, "name", "stephenm"), (g,p) =>g.V().Has("person", "name", "stephen"), (g,p) =>g.V().Has("person", "name", "stephenm")}},
- {"get_g_addVXpersonX_propertyXsingle_name_stephenX_propertyXsingle_name_stephenm_since_2010X", 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").Property("lang", "java").As("ripple").AddV("person").Property("name", "peter").Property("age", 35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight", 0.5d).AddE("knows").From("marko").To("josh").Property("weight", 1.0d).AddE("created").From("marko").To("lop").Property("weight", 0.4d).AddE("created").From("josh").To("ripple").Property("weight", 1.0d).AddE("created").From("josh").To("lop").Property("weight", 0.4d).AddE("created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.AddV("person").Property(Cardinality.Single, "name", "stephen").Property(Cardinality.Single, "name", "stephenm", "since", 2010), (g,p) =>g.V().Has("person", "name", "stephen"), (g,p) =>g.V().Has("person", "name", "stephenm"), (g,p) =>g.V().Has("person", "name", "stephenm").Properties<object>("name").Has("since", 2010)}},
- {"g_V_hasXname_markoX_propertyXfriendWeight_outEXknowsX_weight_sum__acl_privateX", 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").Property("lang", "java").As("ripple").AddV("person").Property("name", "peter").Property("age", 35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight", 0.5d).AddE("knows").From("marko").To("josh").Property("weight", 1.0d).AddE("created").From("marko").To("lop").Property("weight", 0.4d).AddE("created").From("josh").To("ripple").Property("weight", 1.0d).AddE("created").From("josh").To("lop").Property("weight", 0.4d).AddE("created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.V().Has("name", "marko").Property("friendWeight", __.OutE("knows").Values<object>("weight").Sum<object>(), "acl", "private"), (g,p) =>g.V().Has("person", "name", "marko").Has("friendWeight", 1.5), (g,p) =>g.V().Has("person", "name", "marko").Properties<object>("friendWeight").Has("acl", "private"), (g,p) =>g.V().Has("person", "name", "marko").Properties<object>("friendWeight").Count()}},
- {"g_addVXanimalX_propertyXname_mateoX_propertyXname_gateoX_propertyXname_cateoX_propertyXage_5X", 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").Property("lang", "java").As("ripple").AddV("person").Property("name", "peter").Property("age", 35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight", 0.5d).AddE("knows").From("marko").To("josh").Property("weight", 1.0d).AddE("created").From("marko").To("lop").Property("weight", 0.4d).AddE("created").From("josh").To("ripple").Property("weight", 1.0d).AddE("created").From("josh").To("lop").Property("weight", 0.4d).AddE("created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.AddV("animal").Property("name", "mateo").Property("name", "gateo").Property("name", "cateo").Property("age", 5), (g,p) =>g.V().HasLabel("animal").Has("name", "mateo").Has("name", "gateo").Has("name", "cateo").Has("age", 5)}},
- {"g_withSideEffectXa_markoX_addV_propertyXname_selectXaXX_name", 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").Property("lang", "java").As("ripple").AddV("person").Property("name", "peter").Property("age", 35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight", 0.5d).AddE("knows").From("marko").To("josh").Property("weight", 1.0d).AddE("created").From("marko").To("lop").Property("weight", 0.4d).AddE("created").From("josh").To("ripple").Property("weight", 1.0d).AddE("created").From("josh").To("lop").Property("weight", 0.4d).AddE("created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.WithSideEffect("a", "marko").AddV().Property("name", __.Select<object>("a")).Values<object>("name"), (g,p) =>g.V().Has("name", "marko")}},
- {"g_addVXpersonX_propertyXsingle_name_stephenX_propertyXsingle_name_stephenm_since_2010X", 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").Property("lang", "java").As("ripple").AddV("person").Property("name", "peter").Property("age", 35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight", 0.5d).AddE("knows").From("marko").To("josh").Property("weight", 1.0d).AddE("created").From("marko").To("lop").Property("weight", 0.4d).AddE("created").From("josh").To("ripple").Property("weight", 1.0d).AddE("created").From("josh").To("lop").Property("weight", 0.4d).AddE("created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.AddV("person").Property(Cardinality.Single, "name", "stephen").Property(Cardinality.Single, "name", "stephenm", "since", 2010), (g,p) =>g.V().Has("name", "stephen"), (g,p) =>g.V().Has("name", "stephenm"), (g,p) =>g.V().Has("name", "stephenm").Properties<object>("name").Has("since", 2010)}},
- {"g_V_addVXanimalX_propertyXname_valuesXnameXX_propertyXname_an_animalX_propertyXvaluesXnameX_labelX", 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").Property("lang", "java").As("ripple").AddV("person").Property("name", "peter").Property("age", 35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight", 0.5d).AddE("knows").From("marko").To("josh").Property("weight", 1.0d).AddE("created").From("marko").To("lop").Property("weight", 0.4d).AddE("created").From("josh").To("ripple").Property("weight", 1.0d).AddE("created").From("josh").To("lop").Property("weight", 0.4d).AddE("created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.V().AddV("animal").Property("name", __.Values<object>("name")).Property("name", "an animal").Property(__.Values<object>("name"), __.Label()), (g,p) =>g.V().HasLabel("animal").Has("name", "marko").Has("name", "an animal").Has("marko", "person"), (g,p) =>g.V().HasLabel("animal").Has("name", "vadas").Has("name", "an animal").Has("vadas", "person"), (g,p) =>g.V().HasLabel("animal").Has("name", "lop").Has("name", "an animal").Has("lop", "software"), (g,p) =>g.V().HasLabel("animal").Has("name", "josh").Has("name", "an animal").Has("josh", "person"), (g,p) =>g.V().HasLabel("animal").Has("name", "ripple").Has("name", "an animal").Has("ripple", "software"), (g,p) =>g.V().HasLabel("animal").Has("name", "peter").Has("name", "an animal").Has("peter", "person")}},
- {"g_withSideEffectXa_testX_V_hasLabelXsoftwareX_propertyXtemp_selectXaXX_valueMapXname_tempX", 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").Property("lang", "java").As("ripple").AddV("person").Property("name", "peter").Property("age", 35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight", 0.5d).AddE("knows").From("marko").To("josh").Property("weight", 1.0d).AddE("created").From("marko").To("lop").Property("weight", 0.4d).AddE("created").From("josh").To("ripple").Property("weight", 1.0d).AddE("created").From("josh").To("lop").Property("weight", 0.4d).AddE("created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.WithSideEffect("a", "test").V().HasLabel("software").Property("temp", __.Select<object>("a")).ValueMap<object, object>("name", "temp")}},
- {"g_withSideEffectXa_nameX_addV_propertyXselectXaX_markoX_name", 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").Property("lang", "java").As("ripple").AddV("person").Property("name", "peter").Property("age", 35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight", 0.5d).AddE("knows").From("marko").To("josh").Property("weight", 1.0d).AddE("created").From("marko").To("lop").Property("weight", 0.4d).AddE("created").From("josh").To("ripple").Property("weight", 1.0d).AddE("created").From("josh").To("lop").Property("weight", 0.4d).AddE("created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.WithSideEffect("a", "name").AddV().Property(__.Select<object>("a"), "marko").Values<object>("name"), (g,p) =>g.V().Has("name", "marko")}},
- {"g_V_asXaX_hasXname_markoX_outXcreatedX_asXbX_addVXselectXaX_labelX_propertyXtest_selectXbX_labelX_valueMap_withXtokensX", 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").Property("lang", "java").As("ripple").AddV("person").Property("name", "peter").Property("age", 35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight", 0.5d).AddE("knows").From("marko").To("josh").Property("weight", 1.0d).AddE("created").From("marko").To("lop").Property("weight", 0.4d).AddE("created").From("josh").To("ripple").Property("weight", 1.0d).AddE("created").From("josh").To("lop").Property("weight", 0.4d).AddE("created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.V().As("a").Has("name", "marko").Out("created").As("b").AddV(__.Select<object>("a").Label()).Property("test", __.Select<object>("b").Label()).ValueMap<object, object>().With(WithOptions.Tokens), (g,p) =>g.V().Has("person", "test", "software")}},
- {"g_addVXV_hasXname_markoX_propertiesXnameX_keyX_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").Property("lang", "java").As("ripple").AddV("person").Property("name", "peter").Property("age", 35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight", 0.5d).AddE("knows").From("marko").To("josh").Property("weight", 1.0d).AddE("created").From("marko").To("lop").Property("weight", 0.4d).AddE("created").From("josh").To("ripple").Property("weight", 1.0d).AddE("created").From("josh").To("lop").Property("weight", 0.4d).AddE("created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.AddV(__.V().Has("name", "marko").Properties<object>("name").Key()).Label()}},
+ {"g_VX1X_asXaX_outXcreatedX_addEXcreatedByX_toXaX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29).As("marko").AddV((string) "person").Property("name", "vadas").Property("age", 27).As("vadas").AddV((string) "software").Property("name", "lop").Property("lang", "java").As("lop").AddV((string) "person").Property("name", "josh").Property("age", 32).As("josh").AddV((string) "software").Property("name", "ripple").Property("lang", "java").As("ripple").AddV((string) "person").Property("name", "peter").Property("age", 35).As("peter").AddE((string) "knows").From("marko").To("vadas").Property("weight", 0.5d).AddE((string) "knows").From("marko").To("josh").Property("weight", 1.0d).AddE((string) "created").From("marko").To("lop").Property("weight", 0.4d).AddE((string) "created").From("josh").To("ripple").Property("weight", 1.0d).AddE((string) "created").From("josh").To("lop").Property("weight", 0.4d).AddE((string) "created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.V(p["vid1"]).As("a").Out("created").AddE((string) "createdBy").To("a"), (g,p) =>g.E(), (g,p) =>g.V(p["vid1"]).InE()}},
+ {"g_VX1X_asXaX_outXcreatedX_addEXcreatedByX_toXaX_propertyXweight_2X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29).As("marko").AddV((string) "person").Property("name", "vadas").Property("age", 27).As("vadas").AddV((string) "software").Property("name", "lop").Property("lang", "java").As("lop").AddV((string) "person").Property("name", "josh").Property("age", 32).As("josh").AddV((string) "software").Property("name", "ripple").Property("lang", "java").As("ripple").AddV((string) "person").Property("name", "peter").Property("age", 35).As("peter").AddE((string) "knows").From("marko").To("vadas").Property("weight", 0.5d).AddE((string) "knows").From("marko").To("josh").Property("weight", 1.0d).AddE((string) "created").From("marko").To("lop").Property("weight", 0.4d).AddE((string) "created").From("josh").To("ripple").Property("weight", 1.0d).AddE((string) "created").From("josh").To("lop").Property("weight", 0.4d).AddE((string) "created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.V(p["vid1"]).As("a").Out("created").AddE((string) "createdBy").To("a").Property("weight", 2.0d), (g,p) =>g.E(), (g,p) =>g.V(p["vid1"]).BothE(), (g,p) =>g.V(p["vid1"]).InE().Has("weight", 2.0d)}},
+ {"g_V_outE_propertyXweight_nullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29).As("marko").AddV((string) "person").Property("name", "vadas").Property("age", 27).As("vadas").AddV((string) "software").Property("name", "lop").Property("lang", "java").As("lop").AddV((string) "person").Property("name", "josh").Property("age", 32).As("josh").AddV((string) "software").Property("name", "ripple").Property("lang", "java").As("ripple").AddV((string) "person").Property("name", "peter").Property("age", 35).As("peter").AddE((string) "knows").From("marko").To("vadas").Property("weight", 0.5d).AddE((string) "knows").From("marko").To("josh").Property("weight", 1.0d).AddE((string) "created").From("marko").To("lop").Property("weight", 0.4d).AddE((string) "created").From("josh").To("ripple").Property("weight", 1.0d).AddE((string) "created").From("josh").To("lop").Property("weight", 0.4d).AddE((string) "created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.V().OutE().Property("weight", null), (g,p) =>g.E().Properties<object>("weight")}},
+ {"g_V_aggregateXxX_asXaX_selectXxX_unfold_addEXexistsWithX_toXaX_propertyXtime_nowX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29).As("marko").AddV((string) "person").Property("name", "vadas").Property("age", 27).As("vadas").AddV((string) "software").Property("name", "lop").Property("lang", "java").As("lop").AddV((string) "person").Property("name", "josh").Property("age", 32).As("josh").AddV((string) "software").Property("name", "ripple").Property("lang", "java").As("ripple").AddV((string) "person").Property("name", "peter").Property("age", 35).As("peter").AddE((string) "knows").From("marko").To("vadas").Property("weight", 0.5d).AddE((string) "knows").From("marko").To("josh").Property("weight", 1.0d).AddE((string) "created").From("marko").To("lop").Property("weight", 0.4d).AddE((string) "created").From("josh").To("ripple").Property("weight", 1.0d).AddE((string) "created").From("josh").To("lop").Property("weight", 0.4d).AddE((string) "created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.V().Aggregate("x").As("a").Select<object>("x").Unfold<object>().AddE((string) "existsWith").To("a").Property("time", "now"), (g,p) =>g.E(), (g,p) =>g.V(p["vid1"]).BothE(), (g,p) =>g.V(p["vid1"]).InE("existsWith"), (g,p) =>g.V(p["vid1"]).OutE("existsWith"), (g,p) =>g.V(p["vid1"]).BothE("existsWith").Has("time", "now"), (g,p) =>g.V(p["vid2"]).BothE(), (g,p) =>g.V(p["vid2"]).InE("existsWith"), (g,p) =>g.V(p["vid2"]).OutE("existsWith"), (g,p) =>g.V(p["vid2"]).BothE("existsWith").Has("time", "now"), (g,p) =>g.V(p["vid3"]).BothE(), (g,p) =>g.V(p["vid3"]).InE("existsWith"), (g,p) =>g.V(p["vid3"]).OutE("existsWith"), (g,p) =>g.V(p["vid3"]).BothE("existsWith").Has("time", "now"), (g,p) =>g.V(p["vid4"]).BothE(), (g,p) =>g.V(p["vid4"]).InE("existsWith"), (g,p) =>g.V(p["vid4"]).OutE("existsWith"), (g,p) =>g.V(p["vid4"]).BothE("existsWith").Has("time", "now"), (g,p) =>g.V(p["vid5"]).BothE(), (g,p) =>g.V(p["vid5"]).InE("existsWith"), (g,p) =>g.V(p["vid5"]).OutE("existsWith"), (g,p) =>g.V(p["vid5"]).BothE("existsWith").Has("time", "now"), (g,p) =>g.V(p["vid6"]).BothE(), (g,p) =>g.V(p["vid6"]).InE("existsWith"), (g,p) =>g.V(p["vid6"]).OutE("existsWith"), (g,p) =>g.V(p["vid6"]).BothE("existsWith").Has("time", "now")}},
+ {"g_V_asXaX_outXcreatedX_inXcreatedX_whereXneqXaXX_asXbX_addEXcodeveloperX_fromXaX_toXbX_propertyXyear_2009X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29).As("marko").AddV((string) "person").Property("name", "vadas").Property("age", 27).As("vadas").AddV((string) "software").Property("name", "lop").Property("lang", "java").As("lop").AddV((string) "person").Property("name", "josh").Property("age", 32).As("josh").AddV((string) "software").Property("name", "ripple").Property("lang", "java").As("ripple").AddV((string) "person").Property("name", "peter").Property("age", 35).As("peter").AddE((string) "knows").From("marko").To("vadas").Property("weight", 0.5d).AddE((string) "knows").From("marko").To("josh").Property("weight", 1.0d).AddE((string) "created").From("marko").To("lop").Property("weight", 0.4d).AddE((string) "created").From("josh").To("ripple").Property("weight", 1.0d).AddE((string) "created").From("josh").To("lop").Property("weight", 0.4d).AddE((string) "created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.V().As("a").Out("created").In("created").Where(P.Neq("a")).As("b").AddE((string) "codeveloper").From("a").To("b").Property("year", 2009), (g,p) =>g.E(), (g,p) =>g.V(p["vid1"]).BothE(), (g,p) =>g.V(p["vid1"]).InE("codeveloper"), (g,p) =>g.V(p["vid1"]).OutE("codeveloper"), (g,p) =>g.V(p["vid1"]).BothE("codeveloper").Has("year", 2009), (g,p) =>g.V(p["vid2"]).BothE(), (g,p) =>g.V(p["vid4"]).BothE(), (g,p) =>g.V(p["vid4"]).InE("codeveloper"), (g,p) =>g.V(p["vid4"]).OutE("codeveloper"), (g,p) =>g.V(p["vid4"]).BothE("codeveloper").Has("year", 2009), (g,p) =>g.V(p["vid6"]).BothE(), (g,p) =>g.V(p["vid6"]).InE("codeveloper"), (g,p) =>g.V(p["vid6"]).OutE("codeveloper"), (g,p) =>g.V(p["vid6"]).BothE("codeveloper").Has("year", 2009)}},
+ {"g_V_asXaX_inXcreatedX_addEXcreatedByX_fromXaX_propertyXyear_2009X_propertyXacl_publicX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29).As("marko").AddV((string) "person").Property("name", "vadas").Property("age", 27).As("vadas").AddV((string) "software").Property("name", "lop").Property("lang", "java").As("lop").AddV((string) "person").Property("name", "josh").Property("age", 32).As("josh").AddV((string) "software").Property("name", "ripple").Property("lang", "java").As("ripple").AddV((string) "person").Property("name", "peter").Property("age", 35).As("peter").AddE((string) "knows").From("marko").To("vadas").Property("weight", 0.5d).AddE((string) "knows").From("marko").To("josh").Property("weight", 1.0d).AddE((string) "created").From("marko").To("lop").Property("weight", 0.4d).AddE((string) "created").From("josh").To("ripple").Property("weight", 1.0d).AddE((string) "created").From("josh").To("lop").Property("weight", 0.4d).AddE((string) "created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.V().As("a").In("created").AddE((string) "createdBy").From("a").Property("year", 2009).Property("acl", "public"), (g,p) =>g.E(), (g,p) =>g.V(p["vid1"]).BothE(), (g,p) =>g.V(p["vid1"]).InE("createdBy"), (g,p) =>g.V(p["vid1"]).OutE("createdBy"), (g,p) =>g.V(p["vid1"]).BothE("createdBy").Has("year", 2009).Has("acl", "public"), (g,p) =>g.V(p["vid2"]).BothE(), (g,p) =>g.V(p["vid3"]).BothE(), (g,p) =>g.V(p["vid3"]).InE("createdBy"), (g,p) =>g.V(p["vid3"]).OutE("createdBy"), (g,p) =>g.V(p["vid3"]).BothE("createdBy").Has("year", 2009).Has("acl", "public"), (g,p) =>g.V(p["vid4"]).BothE(), (g,p) =>g.V(p["vid4"]).InE("createdBy"), (g,p) =>g.V(p["vid4"]).OutE("createdBy"), (g,p) =>g.V(p["vid4"]).BothE("createdBy").Has("year", 2009).Has("acl", "public"), (g,p) =>g.V(p["vid5"]).BothE(), (g,p) =>g.V(p["vid5"]).InE("createdBy"), (g,p) =>g.V(p["vid5"]).OutE("createdBy"), (g,p) =>g.V(p["vid5"]).BothE("createdBy").Has("year", 2009).Has("acl", "public"), (g,p) =>g.V(p["vid6"]).BothE(), (g,p) =>g.V(p["vid6"]).InE("createdBy"), (g,p) =>g.V(p["vid6"]).OutE("createdBy"), (g,p) =>g.V(p["vid6"]).BothE("createdBy").Has("year", 2009).Has("acl", "public")}},
+ {"g_withSideEffectXb_bX_VXaX_addEXknowsX_toXbX_propertyXweight_0_5X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29).As("marko").AddV((string) "person").Property("name", "vadas").Property("age", 27).As("vadas").AddV((string) "software").Property("name", "lop").Property("lang", "java").As("lop").AddV((string) "person").Property("name", "josh").Property("age", 32).As("josh").AddV((string) "software").Property("name", "ripple").Property("lang", "java").As("ripple").AddV((string) "person").Property("name", "peter").Property("age", 35).As("peter").AddE((string) "knows").From("marko").To("vadas").Property("weight", 0.5d).AddE((string) "knows").From("marko").To("josh").Property("weight", 1.0d).AddE((string) "created").From("marko").To("lop").Property("weight", 0.4d).AddE((string) "created").From("josh").To("ripple").Property("weight", 1.0d).AddE((string) "created").From("josh").To("lop").Property("weight", 0.4d).AddE((string) "created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.V(p["vid1"]).AddE((string) "knows").To("b").Property("weight", 0.5d), (g,p) =>g.E(), (g,p) =>g.V(p["vid1"]).BothE(), (g,p) =>g.V(p["vid1"]).InE("knows"), (g,p) =>g.V(p["vid1"]).OutE("knows"), (g,p) =>g.V(p["vid1"]).BothE("knows").Has("weight", 0.5), (g,p) =>g.V(p["vid6"]).BothE(), (g,p) =>g.V(p["vid6"]).InE("knows"), (g,p) =>g.V(p["vid6"]).OutE("knows"), (g,p) =>g.V(p["vid6"]).BothE("knows").Has("weight", 0.5)}},
+ {"g_addV_asXfirstX_repeatXaddEXnextX_toXaddVX_inVX_timesX5X_addEXnextX_toXselectXfirstXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV().As("first").Repeat(__.AddE((string) "next").To(__.AddV()).InV()).Times(5).AddE((string) "next").To(__.Select<object>("first")), (g,p) =>g.V(), (g,p) =>g.E(), (g,p) =>g.E().HasLabel("next"), (g,p) =>g.V().Limit<object>(1).BothE(), (g,p) =>g.V().Limit<object>(1).InE(), (g,p) =>g.V().Limit<object>(1).OutE()}},
+ {"g_V_hasXname_markoX_asXaX_outEXcreatedX_asXbX_inV_addEXselectXbX_labelX_toXaX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29).As("marko").AddV((string) "person").Property("name", "vadas").Property("age", 27).As("vadas").AddV((string) "software").Property("name", "lop").Property("lang", "java").As("lop").AddV((string) "person").Property("name", "josh").Property("age", 32).As("josh").AddV((string) "software").Property("name", "ripple").Property("lang", "java").As("ripple").AddV((string) "person").Property("name", "peter").Property("age", 35).As("peter").AddE((string) "knows").From("marko").To("vadas").Property("weight", 0.5d).AddE((string) "knows").From("marko").To("josh").Property("weight", 1.0d).AddE((string) "created").From("marko").To("lop").Property("weight", 0.4d).AddE((string) "created").From("josh").To("ripple").Property("weight", 1.0d).AddE((string) "created").From("josh").To("lop").Property("weight", 0.4d).AddE((string) "created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.V().Has("name", "marko").As("a").OutE("created").As("b").InV().AddE(__.Select<object>("b").Label()).To("a"), (g,p) =>g.E(), (g,p) =>g.V(p["vid1"]).BothE(), (g,p) =>g.V(p["vid1"]).InE("created"), (g,p) =>g.V(p["vid1"]).In("created").Has("name", "lop"), (g,p) =>g.V(p["vid1"]).OutE("created")}},
+ {"g_addEXV_outE_label_groupCount_orderXlocalX_byXvalues_descX_selectXkeysX_unfold_limitX1XX_fromXV_hasXname_vadasXX_toXV_hasXname_lopXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29).As("marko").AddV((string) "person").Property("name", "vadas").Property("age", 27).As("vadas").AddV((string) "software").Property("name", "lop").Property("lang", "java").As("lop").AddV((string) "person").Property("name", "josh").Property("age", 32).As("josh").AddV((string) "software").Property("name", "ripple").Property("lang", "java").As("ripple").AddV((string) "person").Property("name", "peter").Property("age", 35).As("peter").AddE((string) "knows").From("marko").To("vadas").Property("weight", 0.5d).AddE((string) "knows").From("marko").To("josh").Property("weight", 1.0d).AddE((string) "created").From("marko").To("lop").Property("weight", 0.4d).AddE((string) "created").From("josh").To("ripple").Property("weight", 1.0d).AddE((string) "created").From("josh").To("lop").Property("weight", 0.4d).AddE((string) "created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.AddE(__.V().OutE().Label().GroupCount<object>().Order(Scope.Local).By(Column.Values, Order.Desc).Select<object>(Column.Keys).Unfold<object>().Limit<object>(1)).From(__.V().Has("name", "vadas")).To(__.V().Has("name", "lop")), (g,p) =>g.E(), (g,p) =>g.V(p["vid2"]).BothE(), (g,p) =>g.V(p["vid2"]).InE("knows"), (g,p) =>g.V(p["vid2"]).OutE("created"), (g,p) =>g.V(p["vid2"]).Out("created").Has("name", "lop")}},
+ {"g_addEXknowsX_fromXaX_toXbX_propertyXweight_0_1X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29).As("marko").AddV((string) "person").Property("name", "vadas").Property("age", 27).As("vadas").AddV((string) "software").Property("name", "lop").Property("lang", "java").As("lop").AddV((string) "person").Property("name", "josh").Property("age", 32).As("josh").AddV((string) "software").Property("name", "ripple").Property("lang", "java").As("ripple").AddV((string) "person").Property("name", "peter").Property("age", 35).As("peter").AddE((string) "knows").From("marko").To("vadas").Property("weight", 0.5d).AddE((string) "knows").From("marko").To("josh").Property("weight", 1.0d).AddE((string) "created").From("marko").To("lop").Property("weight", 0.4d).AddE((string) "created").From("josh").To("ripple").Property("weight", 1.0d).AddE((string) "created").From("josh").To("lop").Property("weight", 0.4d).AddE((string) "created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.AddE((string) "knows").From(p["vid1"]).To(p["vid6"]).Property("weight", p["xx1"]), (g,p) =>g.E(), (g,p) =>g.V(p["vid1"]).OutE("knows"), (g,p) =>g.V(p["vid1"]).Out("knows").Has("name", "peter")}},
+ {"g_addEXknowsvarX_fromXaX_toXbX_propertyXweight_0_1X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29).As("marko").AddV((string) "person").Property("name", "vadas").Property("age", 27).As("vadas").AddV((string) "software").Property("name", "lop").Property("lang", "java").As("lop").AddV((string) "person").Property("name", "josh").Property("age", 32).As("josh").AddV((string) "software").Property("name", "ripple").Property("lang", "java").As("ripple").AddV((string) "person").Property("name", "peter").Property("age", 35).As("peter").AddE((string) "knows").From("marko").To("vadas").Property("weight", 0.5d).AddE((string) "knows").From("marko").To("josh").Property("weight", 1.0d).AddE((string) "created").From("marko").To("lop").Property("weight", 0.4d).AddE((string) "created").From("josh").To("ripple").Property("weight", 1.0d).AddE((string) "created").From("josh").To("lop").Property("weight", 0.4d).AddE((string) "created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.AddE((string) p["xx1"]).From(p["vid1"]).To(p["vid6"]).Property("weight", p["xx2"]), (g,p) =>g.E(), (g,p) =>g.V(p["vid1"]).OutE("knows"), (g,p) =>g.V(p["vid1"]).Out("knows").Has("name", "peter")}},
+ {"g_VXaX_addEXknowsX_toXbX_propertyXweight_0_1X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29).As("marko").AddV((string) "person").Property("name", "vadas").Property("age", 27).As("vadas").AddV((string) "software").Property("name", "lop").Property("lang", "java").As("lop").AddV((string) "person").Property("name", "josh").Property("age", 32).As("josh").AddV((string) "software").Property("name", "ripple").Property("lang", "java").As("ripple").AddV((string) "person").Property("name", "peter").Property("age", 35).As("peter").AddE((string) "knows").From("marko").To("vadas").Property("weight", 0.5d).AddE((string) "knows").From("marko").To("josh").Property("weight", 1.0d).AddE((string) "created").From("marko").To("lop").Property("weight", 0.4d).AddE((string) "created").From("josh").To("ripple").Property("weight", 1.0d).AddE((string) "created").From("josh").To("lop").Property("weight", 0.4d).AddE((string) "created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.V(p["vid1"]).AddE((string) "knows").To(p["vid6"]).Property("weight", p["xx1"]), (g,p) =>g.E(), (g,p) =>g.V(p["vid1"]).OutE("knows"), (g,p) =>g.V(p["vid1"]).Out("knows").Has("name", "peter")}},
+ {"g_addEXknowsXpropertyXweight_nullXfromXV_hasXname_markoXX_toXV_hasXname_vadasXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29).AddV((string) "person").Property("name", "vadas").Property("age", 27), (g,p) =>g.AddE((string) "knows").Property("weight", null).From(__.V().Has("name", "marko")).To(__.V().Has("name", "vadas")), (g,p) =>g.E().Has("knows", "weight", (object) null)}},
+ {"g_addEXknowsvarXpropertyXweight_nullXfromXV_hasXname_markoXX_toXV_hasXname_vadasXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29).AddV((string) "person").Property("name", "vadas").Property("age", 27), (g,p) =>g.AddE((string) p["xx1"]).Property("weight", null).From(__.V().Has("name", "marko")).To(__.V().Has("name", "vadas")), (g,p) =>g.E().Has("knows", "weight", (object) null)}},
+ {"g_unionXaddEXknowsvarXpropertyXweight_nullXfromXV_hasXname_markoXX_toXV_hasXname_vadasXXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29).AddV((string) "person").Property("name", "vadas").Property("age", 27), (g,p) =>g.Union<object>(__.AddE((string) p["xx1"]).Property("weight", 1).From(__.V().Has("name", "marko")).To(__.V().Has("name", "vadas"))), (g,p) =>g.E().Has("knows", "weight", 1)}},
+ {"g_VX1X_addVXanimalX_propertyXage_selectXaX_byXageXX_propertyXname_puppyX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29).As("marko").AddV((string) "person").Property("name", "vadas").Property("age", 27).As("vadas").AddV((string) "software").Property("name", "lop").Property("lang", "java").As("lop").AddV((string) "person").Property("name", "josh").Property("age", 32).As("josh").AddV((string) "software").Property("name", "ripple").Property("lang", "java").As("ripple").AddV((string) "person").Property("name", "peter").Property("age", 35).As("peter").AddE((string) "knows").From("marko").To("vadas").Property("weight", 0.5d).AddE((string) "knows").From("marko").To("josh").Property("weight", 1.0d).AddE((string) "created").From("marko").To("lop").Property("weight", 0.4d).AddE((string) "created").From("josh").To("ripple").Property("weight", 1.0d).AddE((string) "created").From("josh").To("lop").Property("weight", 0.4d).AddE((string) "created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.V(p["vid1"]).As("a").AddV((string) "animal").Property("age", __.Select<object>("a").By("age")).Property("name", "puppy"), (g,p) =>g.V().Has("animal", "age", 29)}},
+ {"g_V_addVXanimalX_propertyXage_0X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29).As("marko").AddV((string) "person").Property("name", "vadas").Property("age", 27).As("vadas").AddV((string) "software").Property("name", "lop").Property("lang", "java").As("lop").AddV((string) "person").Property("name", "josh").Property("age", 32).As("josh").AddV((string) "software").Property("name", "ripple").Property("lang", "java").As("ripple").AddV((string) "person").Property("name", "peter").Property("age", 35).As("peter").AddE((string) "knows").From("marko").To("vadas").Property("weight", 0.5d).AddE((string) "knows").From("marko").To("josh").Property("weight", 1.0d).AddE((string) "created").From("marko").To("lop").Property("weight", 0.4d).AddE((string) "created").From("josh").To("ripple").Property("weight", 1.0d).AddE((string) "created").From("josh").To("lop").Property("weight", 0.4d).AddE((string) "created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.V().AddV((string) "animal").Property("age", 0), (g,p) =>g.V().Has("animal", "age", 0)}},
+ {"g_V_addVXanimalvarX_propertyXage_0varX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29).As("marko").AddV((string) "person").Property("name", "vadas").Property("age", 27).As("vadas").AddV((string) "software").Property("name", "lop").Property("lang", "java").As("lop").AddV((string) "person").Property("name", "josh").Property("age", 32).As("josh").AddV((string) "software").Property("name", "ripple").Property("lang", "java").As("ripple").AddV((string) "person").Property("name", "peter").Property("age", 35).As("peter").AddE((string) "knows").From("marko").To("vadas").Property("weight", 0.5d).AddE((string) "knows").From("marko").To("josh").Property("weight", 1.0d).AddE((string) "created").From("marko").To("lop").Property("weight", 0.4d).AddE((string) "created").From("josh").To("ripple").Property("weight", 1.0d).AddE((string) "created").From("josh").To("lop").Property("weight", 0.4d).AddE((string) "created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.V().AddV((string) p["xx1"]).Property("age", p["xx2"]), (g,p) =>g.V().Has("animal", "age", 0)}},
+ {"g_addVXpersonX_propertyXname_stephenX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29).As("marko").AddV((string) "person").Property("name", "vadas").Property("age", 27).As("vadas").AddV((string) "software").Property("name", "lop").Property("lang", "java").As("lop").AddV((string) "person").Property("name", "josh").Property("age", 32).As("josh").AddV((string) "software").Property("name", "ripple").Property("lang", "java").As("ripple").AddV((string) "person").Property("name", "peter").Property("age", 35).As("peter").AddE((string) "knows").From("marko").To("vadas").Property("weight", 0.5d).AddE((string) "knows").From("marko").To("josh").Property("weight", 1.0d).AddE((string) "created").From("marko").To("lop").Property("weight", 0.4d).AddE((string) "created").From("josh").To("ripple").Property("weight", 1.0d).AddE((string) "created").From("josh").To("lop").Property("weight", 0.4d).AddE((string) "created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.AddV((string) "person").Property("name", "stephen"), (g,p) =>g.V().Has("person", "name", "stephen")}},
+ {"g_addVXpersonvarX_propertyXname_stephenvarX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29).As("marko").AddV((string) "person").Property("name", "vadas").Property("age", 27).As("vadas").AddV((string) "software").Property("name", "lop").Property("lang", "java").As("lop").AddV((string) "person").Property("name", "josh").Property("age", 32).As("josh").AddV((string) "software").Property("name", "ripple").Property("lang", "java").As("ripple").AddV((string) "person").Property("name", "peter").Property("age", 35).As("peter").AddE((string) "knows").From("marko").To("vadas").Property("weight", 0.5d).AddE((string) "knows").From("marko").To("josh").Property("weight", 1.0d).AddE((string) "created").From("marko").To("lop").Property("weight", 0.4d).AddE((string) "created").From("josh").To("ripple").Property("weight", 1.0d).AddE((string) "created").From("josh").To("lop").Property("weight", 0.4d).AddE((string) "created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.AddV((string) p["xx1"]).Property("name", p["xx2"]), (g,p) =>g.V().Has("person", "name", "stephen")}},
+ {"g_V_hasLabelXpersonX_propertyXname_nullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29).As("marko").AddV((string) "person").Property("name", "vadas").Property("age", 27).As("vadas").AddV((string) "software").Property("name", "lop").Property("lang", "java").As("lop").AddV((string) "person").Property("name", "josh").Property("age", 32).As("josh").AddV((string) "software").Property("name", "ripple").Property("lang", "java").As("ripple").AddV((string) "person").Property("name", "peter").Property("age", 35).As("peter").AddE((string) "knows").From("marko").To("vadas").Property("weight", 0.5d).AddE((string) "knows").From("marko").To("josh").Property("weight", 1.0d).AddE((string) "created").From("marko").To("lop").Property("weight", 0.4d).AddE((string) "created").From("josh").To("ripple").Property("weight", 1.0d).AddE((string) "created").From("josh").To("lop").Property("weight", 0.4d).AddE((string) "created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.V().HasLabel("person").Property(Cardinality.Single, "name", (object) null), (g,p) =>g.V().Properties<object>("name")}},
+ {"g_addVXpersonX_propertyXsingle_name_stephenX_propertyXsingle_name_stephenmX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29).As("marko").AddV((string) "person").Property("name", "vadas").Property("age", 27).As("vadas").AddV((string) "software").Property("name", "lop").Property("lang", "java").As("lop").AddV((string) "person").Property("name", "josh").Property("age", 32).As("josh").AddV((string) "software").Property("name", "ripple").Property("lang", "java").As("ripple").AddV((string) "person").Property("name", "peter").Property("age", 35).As("peter").AddE((string) "knows").From("marko").To("vadas").Property("weight", 0.5d).AddE((string) "knows").From("marko").To("josh").Property("weight", 1.0d).AddE((string) "created").From("marko").To("lop").Property("weight", 0.4d).AddE((string) "created").From("josh").To("ripple").Property("weight", 1.0d).AddE((string) "created").From("josh").To("lop").Property("weight", 0.4d).AddE((string) "created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.AddV((string) "person").Property(Cardinality.Single, "name", "stephen").Property(Cardinality.Single, "name", "stephenm"), (g,p) =>g.V().Has("person", "name", "stephen"), (g,p) =>g.V().Has("person", "name", "stephenm")}},
+ {"get_g_addVXpersonX_propertyXsingle_name_stephenX_propertyXsingle_name_stephenm_since_2010X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29).As("marko").AddV((string) "person").Property("name", "vadas").Property("age", 27).As("vadas").AddV((string) "software").Property("name", "lop").Property("lang", "java").As("lop").AddV((string) "person").Property("name", "josh").Property("age", 32).As("josh").AddV((string) "software").Property("name", "ripple").Property("lang", "java").As("ripple").AddV((string) "person").Property("name", "peter").Property("age", 35).As("peter").AddE((string) "knows").From("marko").To("vadas").Property("weight", 0.5d).AddE((string) "knows").From("marko").To("josh").Property("weight", 1.0d).AddE((string) "created").From("marko").To("lop").Property("weight", 0.4d).AddE((string) "created").From("josh").To("ripple").Property("weight", 1.0d).AddE((string) "created").From("josh").To("lop").Property("weight", 0.4d).AddE((string) "created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.AddV((string) "person").Property(Cardinality.Single, "name", "stephen").Property(Cardinality.Single, "name", "stephenm", "since", 2010), (g,p) =>g.V().Has("person", "name", "stephen"), (g,p) =>g.V().Has("person", "name", "stephenm"), (g,p) =>g.V().Has("person", "name", "stephenm").Properties<object>("name").Has("since", 2010)}},
+ {"g_V_hasXname_markoX_propertyXfriendWeight_outEXknowsX_weight_sum__acl_privateX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29).As("marko").AddV((string) "person").Property("name", "vadas").Property("age", 27).As("vadas").AddV((string) "software").Property("name", "lop").Property("lang", "java").As("lop").AddV((string) "person").Property("name", "josh").Property("age", 32).As("josh").AddV((string) "software").Property("name", "ripple").Property("lang", "java").As("ripple").AddV((string) "person").Property("name", "peter").Property("age", 35).As("peter").AddE((string) "knows").From("marko").To("vadas").Property("weight", 0.5d).AddE((string) "knows").From("marko").To("josh").Property("weight", 1.0d).AddE((string) "created").From("marko").To("lop").Property("weight", 0.4d).AddE((string) "created").From("josh").To("ripple").Property("weight", 1.0d).AddE((string) "created").From("josh").To("lop").Property("weight", 0.4d).AddE((string) "created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.V().Has("name", "marko").Property("friendWeight", __.OutE("knows").Values<object>("weight").Sum<object>(), "acl", "private"), (g,p) =>g.V().Has("person", "name", "marko").Has("friendWeight", 1.5), (g,p) =>g.V().Has("person", "name", "marko").Properties<object>("friendWeight").Has("acl", "private"), (g,p) =>g.V().Has("person", "name", "marko").Properties<object>("friendWeight").Count()}},
+ {"g_addVXanimalX_propertyXname_mateoX_propertyXname_gateoX_propertyXname_cateoX_propertyXage_5X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29).As("marko").AddV((string) "person").Property("name", "vadas").Property("age", 27).As("vadas").AddV((string) "software").Property("name", "lop").Property("lang", "java").As("lop").AddV((string) "person").Property("name", "josh").Property("age", 32).As("josh").AddV((string) "software").Property("name", "ripple").Property("lang", "java").As("ripple").AddV((string) "person").Property("name", "peter").Property("age", 35).As("peter").AddE((string) "knows").From("marko").To("vadas").Property("weight", 0.5d).AddE((string) "knows").From("marko").To("josh").Property("weight", 1.0d).AddE((string) "created").From("marko").To("lop").Property("weight", 0.4d).AddE((string) "created").From("josh").To("ripple").Property("weight", 1.0d).AddE((string) "created").From("josh").To("lop").Property("weight", 0.4d).AddE((string) "created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.AddV((string) "animal").Property("name", "mateo").Property("name", "gateo").Property("name", "cateo").Property("age", 5), (g,p) =>g.V().HasLabel("animal").Has("name", "mateo").Has("name", "gateo").Has("name", "cateo").Has("age", 5)}},
+ {"g_withSideEffectXa_markoX_addV_propertyXname_selectXaXX_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29).As("marko").AddV((string) "person").Property("name", "vadas").Property("age", 27).As("vadas").AddV((string) "software").Property("name", "lop").Property("lang", "java").As("lop").AddV((string) "person").Property("name", "josh").Property("age", 32).As("josh").AddV((string) "software").Property("name", "ripple").Property("lang", "java").As("ripple").AddV((string) "person").Property("name", "peter").Property("age", 35).As("peter").AddE((string) "knows").From("marko").To("vadas").Property("weight", 0.5d).AddE((string) "knows").From("marko").To("josh").Property("weight", 1.0d).AddE((string) "created").From("marko").To("lop").Property("weight", 0.4d).AddE((string) "created").From("josh").To("ripple").Property("weight", 1.0d).AddE((string) "created").From("josh").To("lop").Property("weight", 0.4d).AddE((string) "created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.WithSideEffect("a", "marko").AddV().Property("name", __.Select<object>("a")).Values<object>("name"), (g,p) =>g.V().Has("name", "marko")}},
+ {"g_addVXpersonX_propertyXsingle_name_stephenX_propertyXsingle_name_stephenm_since_2010X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29).As("marko").AddV((string) "person").Property("name", "vadas").Property("age", 27).As("vadas").AddV((string) "software").Property("name", "lop").Property("lang", "java").As("lop").AddV((string) "person").Property("name", "josh").Property("age", 32).As("josh").AddV((string) "software").Property("name", "ripple").Property("lang", "java").As("ripple").AddV((string) "person").Property("name", "peter").Property("age", 35).As("peter").AddE((string) "knows").From("marko").To("vadas").Property("weight", 0.5d).AddE((string) "knows").From("marko").To("josh").Property("weight", 1.0d).AddE((string) "created").From("marko").To("lop").Property("weight", 0.4d).AddE((string) "created").From("josh").To("ripple").Property("weight", 1.0d).AddE((string) "created").From("josh").To("lop").Property("weight", 0.4d).AddE((string) "created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.AddV((string) "person").Property(Cardinality.Single, "name", "stephen").Property(Cardinality.Single, "name", "stephenm", "since", 2010), (g,p) =>g.V().Has("name", "stephen"), (g,p) =>g.V().Has("name", "stephenm"), (g,p) =>g.V().Has("name", "stephenm").Properties<object>("name").Has("since", 2010)}},
+ {"g_V_addVXanimalX_propertyXname_valuesXnameXX_propertyXname_an_animalX_propertyXvaluesXnameX_labelX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29).As("marko").AddV((string) "person").Property("name", "vadas").Property("age", 27).As("vadas").AddV((string) "software").Property("name", "lop").Property("lang", "java").As("lop").AddV((string) "person").Property("name", "josh").Property("age", 32).As("josh").AddV((string) "software").Property("name", "ripple").Property("lang", "java").As("ripple").AddV((string) "person").Property("name", "peter").Property("age", 35).As("peter").AddE((string) "knows").From("marko").To("vadas").Property("weight", 0.5d).AddE((string) "knows").From("marko").To("josh").Property("weight", 1.0d).AddE((string) "created").From("marko").To("lop").Property("weight", 0.4d).AddE((string) "created").From("josh").To("ripple").Property("weight", 1.0d).AddE((string) "created").From("josh").To("lop").Property("weight", 0.4d).AddE((string) "created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.V().AddV((string) "animal").Property("name", __.Values<object>("name")).Property("name", "an animal").Property(__.Values<object>("name"), __.Label()), (g,p) =>g.V().HasLabel("animal").Has("name", "marko").Has("name", "an animal").Has("marko", "person"), (g,p) =>g.V().HasLabel("animal").Has("name", "vadas").Has("name", "an animal").Has("vadas", "person"), (g,p) =>g.V().HasLabel("animal").Has("name", "lop").Has("name", "an animal").Has("lop", "software"), (g,p) =>g.V().HasLabel("animal").Has("name", "josh").Has("name", "an animal").Has("josh", "person"), (g,p) =>g.V().HasLabel("animal").Has("name", "ripple").Has("name", "an animal").Has("ripple", "software"), (g,p) =>g.V().HasLabel("animal").Has("name", "peter").Has("name", "an animal").Has("peter", "person")}},
+ {"g_withSideEffectXa_testX_V_hasLabelXsoftwareX_propertyXtemp_selectXaXX_valueMapXname_tempX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29).As("marko").AddV((string) "person").Property("name", "vadas").Property("age", 27).As("vadas").AddV((string) "software").Property("name", "lop").Property("lang", "java").As("lop").AddV((string) "person").Property("name", "josh").Property("age", 32).As("josh").AddV((string) "software").Property("name", "ripple").Property("lang", "java").As("ripple").AddV((string) "person").Property("name", "peter").Property("age", 35).As("peter").AddE((string) "knows").From("marko").To("vadas").Property("weight", 0.5d).AddE((string) "knows").From("marko").To("josh").Property("weight", 1.0d).AddE((string) "created").From("marko").To("lop").Property("weight", 0.4d).AddE((string) "created").From("josh").To("ripple").Property("weight", 1.0d).AddE((string) "created").From("josh").To("lop").Property("weight", 0.4d).AddE((string) "created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.WithSideEffect("a", "test").V().HasLabel("software").Property("temp", __.Select<object>("a")).ValueMap<object, object>("name", "temp")}},
+ {"g_withSideEffectXa_nameX_addV_propertyXselectXaX_markoX_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29).As("marko").AddV((string) "person").Property("name", "vadas").Property("age", 27).As("vadas").AddV((string) "software").Property("name", "lop").Property("lang", "java").As("lop").AddV((string) "person").Property("name", "josh").Property("age", 32).As("josh").AddV((string) "software").Property("name", "ripple").Property("lang", "java").As("ripple").AddV((string) "person").Property("name", "peter").Property("age", 35).As("peter").AddE((string) "knows").From("marko").To("vadas").Property("weight", 0.5d).AddE((string) "knows").From("marko").To("josh").Property("weight", 1.0d).AddE((string) "created").From("marko").To("lop").Property("weight", 0.4d).AddE((string) "created").From("josh").To("ripple").Property("weight", 1.0d).AddE((string) "created").From("josh").To("lop").Property("weight", 0.4d).AddE((string) "created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.WithSideEffect("a", "name").AddV().Property(__.Select<object>("a"), "marko").Values<object>("name"), (g,p) =>g.V().Has("name", "marko")}},
+ {"g_V_asXaX_hasXname_markoX_outXcreatedX_asXbX_addVXselectXaX_labelX_propertyXtest_selectXbX_labelX_valueMap_withXtokensX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29).As("marko").AddV((string) "person").Property("name", "vadas").Property("age", 27).As("vadas").AddV((string) "software").Property("name", "lop").Property("lang", "java").As("lop").AddV((string) "person").Property("name", "josh").Property("age", 32).As("josh").AddV((string) "software").Property("name", "ripple").Property("lang", "java").As("ripple").AddV((string) "person").Property("name", "peter").Property("age", 35).As("peter").AddE((string) "knows").From("marko").To("vadas").Property("weight", 0.5d).AddE((string) "knows").From("marko").To("josh").Property("weight", 1.0d).AddE((string) "created").From("marko").To("lop").Property("weight", 0.4d).AddE((string) "created").From("josh").To("ripple").Property("weight", 1.0d).AddE((string) "created").From("josh").To("lop").Property("weight", 0.4d).AddE((string) "created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.V().As("a").Has("name", "marko").Out("created").As("b").AddV(__.Select<object>("a").Label()).Property("test", __.Select<object>("b").Label()).ValueMap<object, object>().With(WithOptions.Tokens), (g,p) =>g.V().Has("person", "test", "software")}},
+ {"g_addVXV_hasXname_markoX_propertiesXnameX_keyX_label", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29).As("marko").AddV((string) "person").Property("name", "vadas").Property("age", 27).As("vadas").AddV((string) "software").Property("name", "lop").Property("lang", "java").As("lop").AddV((string) "person").Property("name", "josh").Property("age", 32).As("josh").AddV((string) "software").Property("name", "ripple").Property("lang", "java").As("ripple").AddV((string) "person").Property("name", "peter").Property("age", 35).As("peter").AddE((string) "knows").From("marko").To("vadas").Property("weight", 0.5d).AddE((string) "knows").From("marko").To("josh").Property("weight", 1.0d).AddE((string) "created").From("marko").To("lop").Property("weight", 0.4d).AddE((string) "created").From("josh").To("ripple").Property("weight", 1.0d).AddE((string) "created").From("josh").To("lop").Property("weight", 0.4d).AddE((string) "created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.AddV(__.V().Has("name", "marko").Properties<object>("name").Key()).Label()}},
{"g_addV_propertyXlabel_personX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV().Property(T.Label, "person"), (g,p) =>g.V().HasLabel("person")}},
{"g_addV_propertyXlabel_personvarX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV().Property(T.Label, p["xx1"]), (g,p) =>g.V().HasLabel("person")}},
{"g_addV_propertyXid_1X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV().Property(T.Id, 1), (g,p) =>g.V().HasId("1")}},
@@ -695,14 +695,14 @@
{"g_addV_propertyXsingle_mapX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV().Property(Cardinality.Single, new Dictionary<object, object> {{ "name", "foo" }, { "age", 42 }}), (g,p) =>g.V().Has("name", "foo")}},
{"g_V_hasXname_fooX_propertyXname_setXbarX_age_43X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV().Property(Cardinality.Single, "name", "foo").Property("age", 42), (g,p) =>g.V().Has("name", "foo").Property(new Dictionary<object, object> {{ "name", CardinalityValue.Set("bar") }, { "age", 43 }}), (g,p) =>g.V().Has("name", "foo"), (g,p) =>g.V().Has("name", "bar"), (g,p) =>g.V().Has("age", 43), (g,p) =>g.V().Has("age", 42)}},
{"g_V_hasXname_fooX_propertyXset_name_bar_age_singleX43XX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV().Property(Cardinality.Single, "name", "foo").Property("age", 42), (g,p) =>g.V().Has("name", "foo").Property(Cardinality.Set, new Dictionary<object, object> {{ "name", "bar" }, { "age", CardinalityValue.Single(43) }}), (g,p) =>g.V().Has("name", "foo"), (g,p) =>g.V().Has("name", "bar"), (g,p) =>g.V().Has("age", 43), (g,p) =>g.V().Has("age", 42)}},
- {"g_addV_propertyXnullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property(null), (g,p) =>g.V().HasLabel("person").Values<object>()}},
- {"g_addV_propertyXemptyX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property(new Dictionary<object, object> {}), (g,p) =>g.V().HasLabel("person").Values<object>()}},
- {"g_addV_propertyXset_nullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("foo").Property(Cardinality.Set, null), (g,p) =>g.V().HasLabel("foo").Values<object>()}},
- {"g_addV_propertyXset_emptyX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("foo").Property(Cardinality.Set, new Dictionary<object, object> {}), (g,p) =>g.V().HasLabel("person").Values<object>()}},
- {"g_addVXpersonX_propertyXname_joshX_propertyXage_nullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "josh").Property("age", null), (g,p) =>g.V().Has("person", "age", (object) null)}},
- {"g_addVXpersonX_propertyXname_markoX_propertyXfriendWeight_null_acl_nullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").Property("friendWeight", null, "acl", null), (g,p) =>g.V().Has("person", "name", "marko").Has("friendWeight", (object) null), (g,p) =>g.V().Has("person", "name", "marko").Properties<object>("friendWeight").Has("acl", (object) null), (g,p) =>g.V().Has("person", "name", "marko").Properties<object>("friendWeight").Count()}},
- {"g_V_hasXperson_name_aliceX_propertyXsingle_age_unionXage_constantX1XX_sumX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "alice").Property(Cardinality.Single, "age", 50), (g,p) =>g.V().Has("person", "name", "alice").Property("age", __.Union<object>(__.Values<object>("age"), __.Constant<object>(1)).Sum<object>()), (g,p) =>g.V().Has("person", "age", 50), (g,p) =>g.V().Has("person", "age", 51)}},
- {"g_V_limitX3X_addVXsoftwareX_aggregateXa1X_byXlabelX_aggregateXa2X_byXlabelX_capXa1_a2X_selectXa_bX_byXunfoldX_foldX", 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").Property("lang", "java").As("ripple").AddV("person").Property("name", "peter").Property("age", 35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight", 0.5d).AddE("knows").From("marko").To("josh").Property("weight", 1.0d).AddE("created").From("marko").To("lop").Property("weight", 0.4d).AddE("created").From("josh").To("ripple").Property("weight", 1.0d).AddE("created").From("josh").To("lop").Property("weight", 0.4d).AddE("created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.V().Limit<object>(3).AddV("software").Aggregate("a1").By(T.Label).Aggregate("a2").By(T.Label).Cap<object>("a1", "a2").Select<object>("a1", "a2").By(__.Unfold<object>().Fold())}},
+ {"g_addV_propertyXnullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property(null), (g,p) =>g.V().HasLabel("person").Values<object>()}},
+ {"g_addV_propertyXemptyX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property(new Dictionary<object, object> {}), (g,p) =>g.V().HasLabel("person").Values<object>()}},
+ {"g_addV_propertyXset_nullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "foo").Property(Cardinality.Set, null), (g,p) =>g.V().HasLabel("foo").Values<object>()}},
+ {"g_addV_propertyXset_emptyX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "foo").Property(Cardinality.Set, new Dictionary<object, object> {}), (g,p) =>g.V().HasLabel("person").Values<object>()}},
+ {"g_addVXpersonX_propertyXname_joshX_propertyXage_nullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "josh").Property("age", null), (g,p) =>g.V().Has("person", "age", (object) null)}},
+ {"g_addVXpersonX_propertyXname_markoX_propertyXfriendWeight_null_acl_nullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("friendWeight", null, "acl", null), (g,p) =>g.V().Has("person", "name", "marko").Has("friendWeight", (object) null), (g,p) =>g.V().Has("person", "name", "marko").Properties<object>("friendWeight").Has("acl", (object) null), (g,p) =>g.V().Has("person", "name", "marko").Properties<object>("friendWeight").Count()}},
+ {"g_V_hasXperson_name_aliceX_propertyXsingle_age_unionXage_constantX1XX_sumX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "alice").Property(Cardinality.Single, "age", 50), (g,p) =>g.V().Has("person", "name", "alice").Property("age", __.Union<object>(__.Values<object>("age"), __.Constant<object>(1)).Sum<object>()), (g,p) =>g.V().Has("person", "age", 50), (g,p) =>g.V().Has("person", "age", 51)}},
+ {"g_V_limitX3X_addVXsoftwareX_aggregateXa1X_byXlabelX_aggregateXa2X_byXlabelX_capXa1_a2X_selectXa_bX_byXunfoldX_foldX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29).As("marko").AddV((string) "person").Property("name", "vadas").Property("age", 27).As("vadas").AddV((string) "software").Property("name", "lop").Property("lang", "java").As("lop").AddV((string) "person").Property("name", "josh").Property("age", 32).As("josh").AddV((string) "software").Property("name", "ripple").Property("lang", "java").As("ripple").AddV((string) "person").Property("name", "peter").Property("age", 35).As("peter").AddE((string) "knows").From("marko").To("vadas").Property("weight", 0.5d).AddE((string) "knows").From("marko").To("josh").Property("weight", 1.0d).AddE((string) "created").From("marko").To("lop").Property("weight", 0.4d).AddE((string) "created").From("josh").To("ripple").Property("weight", 1.0d).AddE((string) "created").From("josh").To("lop").Property("weight", 0.4d).AddE((string) "created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.V().Limit<object>(3).AddV((string) "software").Aggregate("a1").By(T.Label).Aggregate("a2").By(T.Label).Cap<object>("a1", "a2").Select<object>("a1", "a2").By(__.Unfold<object>().Fold())}},
{"g_injectX1X_asBool", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>(1).AsBool()}},
{"g_injectX3_14X_asBool", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>(3.14).AsBool()}},
{"g_injectXneg_1X_asBool", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>(-1).AsBool()}},
@@ -822,12 +822,12 @@
{"g_hasLabelXsoftwareX_asXaX_valuesXnameX_concatXunsesX_concatXselectXaXvaluesXlangX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasLabel("software").As("a").Values<object>("name").Concat(" uses ").Concat(__.Select<object>("a").Values<object>("lang"))}},
{"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").Property("lang", "java").As("ripple").AddV("person").Property("name", "peter").Property("age", 35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight", 0.5d).AddE("knows").From("marko").To("josh").Property("weight", 1.0d).AddE("created").From("marko").To("lop").Property("weight", 0.4d).AddE("created").From("josh").To("ripple").Property("weight", 1.0d).AddE("created").From("josh").To("lop").Property("weight", 0.4d).AddE("created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.AddV(__.Constant<object>("prefix_").Concat(__.V(p["vid1"]).Label())).Label()}},
+ {"g_addVXconstantXprefix_X_concatXVX1X_labelX_label", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29).As("marko").AddV((string) "person").Property("name", "vadas").Property("age", 27).As("vadas").AddV((string) "software").Property("name", "lop").Property("lang", "java").As("lop").AddV((string) "person").Property("name", "josh").Property("age", 32).As("josh").AddV((string) "software").Property("name", "ripple").Property("lang", "java").As("ripple").AddV((string) "person").Property("name", "peter").Property("age", 35).As("peter").AddE((string) "knows").From("marko").To("vadas").Property("weight", 0.5d).AddE((string) "knows").From("marko").To("josh").Property("weight", 1.0d).AddE((string) "created").From("marko").To("lop").Property("weight", 0.4d).AddE((string) "created").From("josh").To("ripple").Property("weight", 1.0d).AddE((string) "created").From("josh").To("lop").Property("weight", 0.4d).AddE((string) "created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.AddV(__.Constant<object>("prefix_").Concat(__.V(p["vid1"]).Label())).Label()}},
{"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_conjoinX_X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("age").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_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>(new List<object> { "marko" }).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")}},
@@ -915,7 +915,7 @@
{"g_V_EXnullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().E(null)}},
{"g_V_EXlistXnullXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().E(p["xx1"])}},
{"g_injectX1X_EX11_nullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>(1).E(p["eid11"], null)}},
- {"g_injectX1X_coalesceXEX_hasLabelXtestsX_addEXtestsX_from_V_hasXnameX_XjoshXX_toXV_hasXnameX_XvadasXXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "josh").AddV("person").Property("name", "vadas"), (g,p) =>g.Inject<object>(1).Coalesce<object>(__.E().HasLabel("tests"), __.AddE("tests").From(__.V().Has("name", "josh")).To(__.V().Has("name", "vadas"))), (g,p) =>g.E().HasLabel("tests")}},
+ {"g_injectX1X_coalesceXEX_hasLabelXtestsX_addEXtestsX_from_V_hasXnameX_XjoshXX_toXV_hasXnameX_XvadasXXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "josh").AddV((string) "person").Property("name", "vadas"), (g,p) =>g.Inject<object>(1).Coalesce<object>(__.E().HasLabel("tests"), __.AddE((string) "tests").From(__.V().Has("name", "josh")).To(__.V().Has("name", "vadas"))), (g,p) =>g.E().HasLabel("tests")}},
{"g_VX1X_outE_inV", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V(p["vid1"]).OutE().InV()}},
{"g_VX2X_inE_outV", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V(p["vid2"]).InE().OutV()}},
{"g_V_outE_hasXweight_1X_outV", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().OutE().Has("weight", 1.0).OutV()}},
@@ -927,6 +927,7 @@
{"g_VX1X_outEXknows_createdX_inV", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V(p["vid1"]).OutE("knows", "created").InV()}},
{"g_VX1X_outEXknowsX_bothV", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V(p["vid1"]).OutE("knows").BothV()}},
{"g_VX1X_outEXknowsX_bothV_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V(p["vid1"]).OutE("knows").BothV().Values<object>("name")}},
+ {"g_V_toEXout_knowsvarX_valuesXweightX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().ToE(Direction.Out, (string) p["xx1"]).Values<object>("weight")}},
{"g_VX1X_properties_element", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V(p["vid2"]).Properties<object>().Element().Limit<object>(1)}},
{"g_V_properties_element", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Properties<object>().Element()}},
{"g_V_propertiesXageX_element", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Properties<object>("age").Element()}},
@@ -983,8 +984,8 @@
{"g_injectX__feature__X_lTrim", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>(" feature ").LTrim()}},
{"g_injectXListXa_bXX_lTrim", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>(new List<object> { "a", "b" }).LTrim()}},
{"g_injectXListX1_2XX_lTrimXlocalX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>(new List<object> { 1, 2 }).LTrim<object>(Scope.Local)}},
- {"g_V_valuesXnameX_lTrim", 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 ").Property("lang", "java").As("ripple").AddV("person").Property("name", "peter").Property("age", 35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight", 0.5d).AddE("knows").From("marko").To("josh").Property("weight", 1.0d).AddE("created").From("marko").To("lop").Property("weight", 0.4d).AddE("created").From("josh").To("ripple").Property("weight", 1.0d).AddE("created").From("josh").To("lop").Property("weight", 0.4d).AddE("created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.V().Values<object>("name").LTrim()}},
- {"g_V_valuesXnameX_order_fold_lTrimXlocalX", 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 ").Property("lang", "java").As("ripple").AddV("person").Property("name", "peter").Property("age", 35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight", 0.5d).AddE("knows").From("marko").To("josh").Property("weight", 1.0d).AddE("created").From("marko").To("lop").Property("weight", 0.4d).AddE("created").From("josh").To("ripple").Property("weight", 1.0d).AddE("created").From("josh").To("lop").Property("weight", 0.4d).AddE("created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.V().Values<object>("name").Order().Fold().LTrim<object>(Scope.Local)}},
+ {"g_V_valuesXnameX_lTrim", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", " marko ").Property("age", 29).As("marko").AddV((string) "person").Property("name", " vadas ").Property("age", 27).As("vadas").AddV((string) "software").Property("name", " lop").Property("lang", "java").As("lop").AddV((string) "person").Property("name", "josh ").Property("age", 32).As("josh").AddV((string) "software").Property("name", " ripple ").Property("lang", "java").As("ripple").AddV((string) "person").Property("name", "peter").Property("age", 35).As("peter").AddE((string) "knows").From("marko").To("vadas").Property("weight", 0.5d).AddE((string) "knows").From("marko").To("josh").Property("weight", 1.0d).AddE((string) "created").From("marko").To("lop").Property("weight", 0.4d).AddE((string) "created").From("josh").To("ripple").Property("weight", 1.0d).AddE((string) "created").From("josh").To("lop").Property("weight", 0.4d).AddE((string) "created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.V().Values<object>("name").LTrim()}},
+ {"g_V_valuesXnameX_order_fold_lTrimXlocalX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", " marko ").Property("age", 29).As("marko").AddV((string) "person").Property("name", " vadas ").Property("age", 27).As("vadas").AddV((string) "software").Property("name", " lop").Property("lang", "java").As("lop").AddV((string) "person").Property("name", "josh ").Property("age", 32).As("josh").AddV((string) "software").Property("name", " ripple ").Property("lang", "java").As("ripple").AddV((string) "person").Property("name", "peter").Property("age", 35).As("peter").AddE((string) "knows").From("marko").To("vadas").Property("weight", 0.5d).AddE((string) "knows").From("marko").To("josh").Property("weight", 1.0d).AddE((string) "created").From("marko").To("lop").Property("weight", 0.4d).AddE((string) "created").From("josh").To("ripple").Property("weight", 1.0d).AddE((string) "created").From("josh").To("lop").Property("weight", 0.4d).AddE((string) "created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.V().Values<object>("name").Order().Fold().LTrim<object>(Scope.Local)}},
{"g_injectXfeature_test_nullX_length", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>("feature", "test", null).Length()}},
{"g_injectXfeature_test_nullX_lengthXlocalX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>("feature", "test", null).Length<object>(Scope.Local)}},
{"g_injectXListXa_bXX_length", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>(new List<object> { "a", "b" }).Length()}},
@@ -1104,94 +1105,94 @@
{"g_injectX3_threeX_mergeXfive_three_7X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>(new List<object> { 3, "three" }).Merge(new List<object> { "five", "three", 7 })}},
{"g_V_asXnameX_projectXnameX_byXnameX_mergeXother_blueprintX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().As("name").Project<object>("name").By("name").Merge(new Dictionary<object, object> {{ "other", "blueprint" }})}},
{"g_V_hasXname_markoX_elementMap_mergeXV_hasXname_lopX_elementMapX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Has("name", "marko").ElementMap<object>().Merge(__.V().Has("name", "lop").ElementMap<object>())}},
- {"g_V_mergeEXlabel_selfX_optionXonMatch_emptyX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").Property("age", 29).AddE("self"), (g,p) =>g.V().MergeE((IDictionary<object, object>) p["xx1"]).Option(Merge.OnMatch, (IDictionary<object, object>) new Dictionary<object, object> {}), (g,p) =>g.E(), (g,p) =>g.E().Properties<object>(), (g,p) =>g.V()}},
- {"g_V_mergeEXlabel_selfX_optionXonMatch_nullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").Property("age", 29).AddE("self"), (g,p) =>g.V().MergeE((IDictionary<object, object>) p["xx1"]).Option(Merge.OnMatch, (IDictionary<object, object>) null), (g,p) =>g.E(), (g,p) =>g.E().Properties<object>(), (g,p) =>g.V()}},
- {"g_V_mergeEXemptyX_optionXonCreate_nullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").Property("age", 29), (g,p) =>g.V().As("v").MergeE((IDictionary<object, object>) p["xx1"]).Option(Merge.OnCreate, (IDictionary<object, object>) null).Option(Merge.OutV, (ITraversal) __.Select<object>("v")).Option(Merge.InV, (ITraversal) __.Select<object>("v")), (g,p) =>g.E(), (g,p) =>g.V()}},
- {"g_V_mergeE_inlineXemptyX_optionXonCreate_nullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").Property("age", 29), (g,p) =>g.V().As("v").MergeE((IDictionary<object, object>) new Dictionary<object, object> {{ T.Label, "self" }, { Direction.Out, Merge.OutV }, { Direction.In, Merge.InV }}).Option(Merge.OnCreate, (IDictionary<object, object>) null).Option(Merge.OutV, (ITraversal) __.Select<object>("v")).Option(Merge.InV, (ITraversal) __.Select<object>("v")), (g,p) =>g.E(), (g,p) =>g.V()}},
- {"g_mergeEXemptyX_exists", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").Property("age", 29).AddE("self"), (g,p) =>g.MergeE((IDictionary<object, object>) new Dictionary<object, object> {}), (g,p) =>g.E(), (g,p) =>g.V()}},
- {"g_mergeEXemptyX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").Property("age", 29), (g,p) =>g.MergeE((IDictionary<object, object>) new Dictionary<object, object> {})}},
- {"g_V_mergeEXemptyX_two_exist", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").Property("age", 29).AddV("person").Property("name", "vadas").Property("age", 27), (g,p) =>g.V().As("v").MergeE((IDictionary<object, object>) p["xx1"]).Option(Merge.OutV, (ITraversal) __.Select<object>("v")).Option(Merge.InV, (ITraversal) __.Select<object>("v")), (g,p) =>g.E(), (g,p) =>g.V()}},
- {"g_V_mergeE_inlineXemptyX_two_exist", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").Property("age", 29).AddV("person").Property("name", "vadas").Property("age", 27), (g,p) =>g.V().As("v").MergeE((IDictionary<object, object>) new Dictionary<object, object> {{ T.Label, "self" }, { Direction.Out, Merge.OutV }, { Direction.In, Merge.InV }}).Option(Merge.OutV, (ITraversal) __.Select<object>("v")).Option(Merge.InV, (ITraversal) __.Select<object>("v")), (g,p) =>g.E(), (g,p) =>g.V()}},
- {"g_mergeEXnullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").Property("age", 29), (g,p) =>g.MergeE((IDictionary<object, object>) null)}},
- {"g_mergeEXnullvarX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").Property("age", 29), (g,p) =>g.MergeE((IDictionary<object, object>) p["xx1"])}},
- {"g_V_limitX1X_mergeEXnullvarX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").Property("age", 29), (g,p) =>g.V().Limit<object>(1).MergeE((IDictionary<object, object>) p["xx1"])}},
- {"g_V_mergeEXnullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").Property("age", 29), (g,p) =>g.V().MergeE((IDictionary<object, object>) null)}},
- {"g_mergeEXlabel_knows_out_marko_in_vadasX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").AddV("person").Property("name", "vadas"), (g,p) =>g.MergeE((IDictionary<object, object>) p["xx1"]), (g,p) =>g.V().Has("person", "name", "marko").Out("knows").Has("person", "name", "vadas")}},
- {"g_withSideEffectXa_label_knows_out_marko_in_vadasX_mergeEXselectXaXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").AddV("person").Property("name", "vadas"), (g,p) =>g.MergeE((ITraversal) __.Select<object>("a")), (g,p) =>g.V().Has("person", "name", "marko").Out("knows").Has("person", "name", "vadas")}},
- {"g_mergeEXlabel_knows_out_marko1_in_vadas1X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").AddV("person").Property("name", "vadas"), (g,p) =>g.MergeE((IDictionary<object, object>) p["xx1"]), (g,p) =>g.V().Has("person", "name", "marko").Out("knows").Has("person", "name", "vadas")}},
- {"g_mergeEXlabel_knows_out_marko_in_vadas_weight_05X_exists", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").As("a").AddV("person").Property("name", "vadas").As("b").AddE("knows").From("a").To("b"), (g,p) =>g.MergeE((IDictionary<object, object>) p["xx1"]), (g,p) =>g.V().Has("person", "name", "marko").OutE("knows").Has("weight", 0.5).InV().Has("person", "name", "vadas"), (g,p) =>g.V().Has("person", "name", "marko").Out("knows").Has("person", "name", "vadas")}},
+ {"g_V_mergeEXlabel_selfX_optionXonMatch_emptyX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29).AddE((string) "self"), (g,p) =>g.V().MergeE((IDictionary<object, object>) p["xx1"]).Option(Merge.OnMatch, (IDictionary<object, object>) new Dictionary<object, object> {}), (g,p) =>g.E(), (g,p) =>g.E().Properties<object>(), (g,p) =>g.V()}},
+ {"g_V_mergeEXlabel_selfX_optionXonMatch_nullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29).AddE((string) "self"), (g,p) =>g.V().MergeE((IDictionary<object, object>) p["xx1"]).Option(Merge.OnMatch, (IDictionary<object, object>) null), (g,p) =>g.E(), (g,p) =>g.E().Properties<object>(), (g,p) =>g.V()}},
+ {"g_V_mergeEXemptyX_optionXonCreate_nullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29), (g,p) =>g.V().As("v").MergeE((IDictionary<object, object>) p["xx1"]).Option(Merge.OnCreate, (IDictionary<object, object>) null).Option(Merge.OutV, (ITraversal) __.Select<object>("v")).Option(Merge.InV, (ITraversal) __.Select<object>("v")), (g,p) =>g.E(), (g,p) =>g.V()}},
+ {"g_V_mergeE_inlineXemptyX_optionXonCreate_nullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29), (g,p) =>g.V().As("v").MergeE((IDictionary<object, object>) new Dictionary<object, object> {{ T.Label, "self" }, { Direction.Out, Merge.OutV }, { Direction.In, Merge.InV }}).Option(Merge.OnCreate, (IDictionary<object, object>) null).Option(Merge.OutV, (ITraversal) __.Select<object>("v")).Option(Merge.InV, (ITraversal) __.Select<object>("v")), (g,p) =>g.E(), (g,p) =>g.V()}},
+ {"g_mergeEXemptyX_exists", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29).AddE((string) "self"), (g,p) =>g.MergeE((IDictionary<object, object>) new Dictionary<object, object> {}), (g,p) =>g.E(), (g,p) =>g.V()}},
+ {"g_mergeEXemptyX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29), (g,p) =>g.MergeE((IDictionary<object, object>) new Dictionary<object, object> {})}},
+ {"g_V_mergeEXemptyX_two_exist", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29).AddV((string) "person").Property("name", "vadas").Property("age", 27), (g,p) =>g.V().As("v").MergeE((IDictionary<object, object>) p["xx1"]).Option(Merge.OutV, (ITraversal) __.Select<object>("v")).Option(Merge.InV, (ITraversal) __.Select<object>("v")), (g,p) =>g.E(), (g,p) =>g.V()}},
+ {"g_V_mergeE_inlineXemptyX_two_exist", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29).AddV((string) "person").Property("name", "vadas").Property("age", 27), (g,p) =>g.V().As("v").MergeE((IDictionary<object, object>) new Dictionary<object, object> {{ T.Label, "self" }, { Direction.Out, Merge.OutV }, { Direction.In, Merge.InV }}).Option(Merge.OutV, (ITraversal) __.Select<object>("v")).Option(Merge.InV, (ITraversal) __.Select<object>("v")), (g,p) =>g.E(), (g,p) =>g.V()}},
+ {"g_mergeEXnullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29), (g,p) =>g.MergeE((IDictionary<object, object>) null)}},
+ {"g_mergeEXnullvarX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29), (g,p) =>g.MergeE((IDictionary<object, object>) p["xx1"])}},
+ {"g_V_limitX1X_mergeEXnullvarX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29), (g,p) =>g.V().Limit<object>(1).MergeE((IDictionary<object, object>) p["xx1"])}},
+ {"g_V_mergeEXnullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29), (g,p) =>g.V().MergeE((IDictionary<object, object>) null)}},
+ {"g_mergeEXlabel_knows_out_marko_in_vadasX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").AddV((string) "person").Property("name", "vadas"), (g,p) =>g.MergeE((IDictionary<object, object>) p["xx1"]), (g,p) =>g.V().Has("person", "name", "marko").Out("knows").Has("person", "name", "vadas")}},
+ {"g_withSideEffectXa_label_knows_out_marko_in_vadasX_mergeEXselectXaXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").AddV((string) "person").Property("name", "vadas"), (g,p) =>g.MergeE((ITraversal) __.Select<object>("a")), (g,p) =>g.V().Has("person", "name", "marko").Out("knows").Has("person", "name", "vadas")}},
+ {"g_mergeEXlabel_knows_out_marko1_in_vadas1X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").AddV((string) "person").Property("name", "vadas"), (g,p) =>g.MergeE((IDictionary<object, object>) p["xx1"]), (g,p) =>g.V().Has("person", "name", "marko").Out("knows").Has("person", "name", "vadas")}},
+ {"g_mergeEXlabel_knows_out_marko_in_vadas_weight_05X_exists", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").As("a").AddV((string) "person").Property("name", "vadas").As("b").AddE((string) "knows").From("a").To("b"), (g,p) =>g.MergeE((IDictionary<object, object>) p["xx1"]), (g,p) =>g.V().Has("person", "name", "marko").OutE("knows").Has("weight", 0.5).InV().Has("person", "name", "vadas"), (g,p) =>g.V().Has("person", "name", "marko").Out("knows").Has("person", "name", "vadas")}},
{"g_mergeEXlabel_knows_out_marko_in_vadas_weight_05X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.MergeE((IDictionary<object, object>) p["xx1"])}},
{"g_mergeEXlabel_knows_out_marko_in_vadasX_optionXonCreate_created_YX_optionXonMatch_created_NX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.MergeE((IDictionary<object, object>) p["xx1"]).Option(Merge.OnCreate, (IDictionary<object, object>) p["xx2"]).Option(Merge.OnMatch, (IDictionary<object, object>) p["xx3"])}},
- {"g_mergeEXlabel_knows_out_marko_in_vadasX_optionXonCreate_created_YX_optionXonMatch_created_NX_exists", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").As("a").AddV("person").Property("name", "vadas").As("b").AddE("knows").From("a").To("b"), (g,p) =>g.MergeE((IDictionary<object, object>) p["xx1"]).Option(Merge.OnCreate, (IDictionary<object, object>) p["xx2"]).Option(Merge.OnMatch, (IDictionary<object, object>) p["xx3"]), (g,p) =>g.V(), (g,p) =>g.E().HasLabel("knows").Has("created", "Y"), (g,p) =>g.E().HasLabel("knows").Has("created", "N")}},
- {"g_mergeEXlabel_knows_out_marko_in_vadasX_optionXonCreate_created_YX_optionXonMatch_created_NX_exists_updated", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").As("a").AddV("person").Property("name", "vadas").As("b").AddE("knows").From("a").To("b").Property("created", "Y"), (g,p) =>g.MergeE((IDictionary<object, object>) p["xx1"]).Option(Merge.OnCreate, (IDictionary<object, object>) p["xx2"]).Option(Merge.OnMatch, (IDictionary<object, object>) p["xx3"]), (g,p) =>g.V(), (g,p) =>g.E().HasLabel("knows").Has("created", "Y"), (g,p) =>g.E().HasLabel("knows").Has("created", "N")}},
- {"g_V_hasXperson_name_marko_X_mergeEXlabel_knowsX_optionXonCreate_created_YX_optionXonMatch_created_NX_exists_updated", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").As("a").AddV("person").Property("name", "vadas").As("b").AddE("knows").From("a").To("b").Property("created", "Y").AddE("knows").From("a").To("b"), (g,p) =>g.V().Has("person", "name", "marko").MergeE((IDictionary<object, object>) p["xx1"]).Option(Merge.OnCreate, (IDictionary<object, object>) p["xx2"]).Option(Merge.OnMatch, (IDictionary<object, object>) p["xx3"]), (g,p) =>g.V(), (g,p) =>g.E(), (g,p) =>g.E().HasLabel("knows").Has("created", "Y"), (g,p) =>g.E().HasLabel("knows").Has("created", "N")}},
- {"g_withSideEffectXlabel_knows_out_marko_in_vadasX_injectX1X_selectXmX_mergeE", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").AddV("person").Property("name", "vadas"), (g,p) =>g.Inject<object>(1).Select<object>("m").MergeE(), (g,p) =>g.V().Has("person", "name", "marko").Out("knows").Has("person", "name", "vadas")}},
- {"g_mergeEXlabel_knows_in_vadasX_optionXonCreate_created_YX_optionXonMatch_created_NX_exists_updated", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").As("a").AddV("person").Property("name", "vadas").As("b").AddE("knows").From("a").To("b").Property("created", "Y").AddE("knows").From("b").To("a").Property("created", "Y"), (g,p) =>g.MergeE((IDictionary<object, object>) p["xx1"]).Option(Merge.OnCreate, (IDictionary<object, object>) p["xx2"]).Option(Merge.OnMatch, (IDictionary<object, object>) p["xx3"]), (g,p) =>g.V(), (g,p) =>g.E(), (g,p) =>g.E().HasLabel("knows").Has("created", "Y"), (g,p) =>g.E().HasLabel("knows").Has("created", "N").InV().Has("name", "vadas")}},
- {"g_mergeEXlabel_knows_out_vadasX_optionXonCreate_created_YX_optionXonMatch_created_NX_exists_updated", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").As("a").AddV("person").Property("name", "vadas").As("b").AddE("knows").From("a").To("b").Property("created", "Y").AddE("knows").From("b").To("a").Property("created", "Y"), (g,p) =>g.MergeE((IDictionary<object, object>) p["xx1"]).Option(Merge.OnCreate, (IDictionary<object, object>) p["xx2"]).Option(Merge.OnMatch, (IDictionary<object, object>) p["xx3"]), (g,p) =>g.V(), (g,p) =>g.E(), (g,p) =>g.E().HasLabel("knows").Has("created", "Y"), (g,p) =>g.E().HasLabel("knows").Has("created", "N").OutV().Has("name", "vadas")}},
- {"g_mergeEXout_vadasX_optionXonCreate_created_YX_optionXonMatch_created_NX_exists_updated", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").As("a").AddV("person").Property("name", "vadas").As("b").AddE("knows").From("a").To("b").Property("created", "Y").AddE("knows").From("b").To("a").Property("created", "Y"), (g,p) =>g.MergeE((IDictionary<object, object>) p["xx1"]).Option(Merge.OnCreate, (IDictionary<object, object>) p["xx2"]).Option(Merge.OnMatch, (IDictionary<object, object>) p["xx3"]), (g,p) =>g.V(), (g,p) =>g.E(), (g,p) =>g.E().HasLabel("knows").Has("created", "Y"), (g,p) =>g.E().HasLabel("knows").Has("created", "N").OutV().Has("name", "vadas")}},
- {"g_V_hasXperson_name_marko_X_mergeEXlabel_self_out_vadas1_in_vadas1X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").AddV("person").Property("name", "vadas"), (g,p) =>g.V().Has("person", "name", "marko").MergeE((IDictionary<object, object>) p["xx1"]), (g,p) =>g.V(), (g,p) =>g.E(), (g,p) =>g.E().HasLabel("self").BothV().Has("name", "vadas")}},
- {"g_withSideEffectXc_created_YX_withSideEffectXm_matchedX_mergeEXlabel_knows_out_marko_in_vadasX_optionXonCreate_selectXcXX_optionXonMatch_selectXmXX_exists", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").As("a").AddV("person").Property("name", "vadas").As("b").AddE("knows").From("a").To("b"), (g,p) =>g.MergeE((IDictionary<object, object>) p["xx1"]).Option(Merge.OnCreate, (ITraversal) __.Select<object>("c")).Option(Merge.OnMatch, (ITraversal) __.Select<object>("m")), (g,p) =>g.V(), (g,p) =>g.E().HasLabel("knows").Has("created", "Y"), (g,p) =>g.E().HasLabel("knows").Has("created", "N")}},
- {"g_withSideEffectXc_created_YX_withSideEffectXm_matchedX_mergeEXlabel_knows_out_marko_in_vadasX_optionXonCreate_selectXcXX_optionXonMatch_selectXmXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").As("a").AddV("person").Property("name", "vadas").As("b"), (g,p) =>g.MergeE((IDictionary<object, object>) p["xx1"]).Option(Merge.OnCreate, (ITraversal) __.Select<object>("c")).Option(Merge.OnMatch, (ITraversal) __.Select<object>("m")), (g,p) =>g.V(), (g,p) =>g.E(), (g,p) =>g.E().HasLabel("knows").Has("created", "Y"), (g,p) =>g.E().HasLabel("knows").Has("created", "N")}},
- {"g_withSideEffectXc_created_YX_withSideEffectXm_matchedX_mergeEXlabel_knows_out_marko1_in_vadas1X_optionXonCreate_selectXcXX_optionXonMatch_selectXmXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").As("a").AddV("person").Property("name", "vadas").As("b"), (g,p) =>g.MergeE((IDictionary<object, object>) p["xx1"]).Option(Merge.OnCreate, (ITraversal) __.Select<object>("c")).Option(Merge.OnMatch, (ITraversal) __.Select<object>("m")), (g,p) =>g.V(), (g,p) =>g.E(), (g,p) =>g.E().HasLabel("knows").Has("created", "Y"), (g,p) =>g.E().HasLabel("knows").Has("created", "N")}},
- {"g_mergeEXlabel_knows_out_marko_in_vadasX_aliased_direction", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").AddV("person").Property("name", "vadas"), (g,p) =>g.MergeE((IDictionary<object, object>) p["xx1"]), (g,p) =>g.V().Has("person", "name", "marko").Out("knows").Has("person", "name", "vadas")}},
- {"g_withSideEffectXm1_label_knows_out_marko_in_vadas_m2_label_self_out_vadas_in_vadasX_unionXselectXm1X_selectXm2XX_mergeE", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").AddV("person").Property("name", "vadas"), (g,p) =>g.Union<object>(__.Select<object>("m1"), __.Select<object>("m2")).MergeE(), (g,p) =>g.V(), (g,p) =>g.E(), (g,p) =>g.V().Has("person", "name", "marko").Out("knows").Has("person", "name", "vadas"), (g,p) =>g.V().Has("person", "name", "vadas").Out("self").Has("person", "name", "vadas")}},
- {"g_withSideEffectXc_created_YX_withSideEffectXm_matchedX_mergeEXlabel_knows_out_marko_in_vadasX_optionXonCreate_selectXcXX_optionXonMatch_sideEffectXpropertiesXweightX_dropX_selectXmXX_exists", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").As("a").AddV("person").Property("name", "vadas").As("b").AddE("knows").Property("weight", 1.0d).From("a").To("b"), (g,p) =>g.MergeE((IDictionary<object, object>) p["xx1"]).Option(Merge.OnCreate, (ITraversal) __.Select<object>("c")).Option(Merge.OnMatch, (ITraversal) __.SideEffect(__.Properties<object>("weight").Drop()).Select<object>("m")), (g,p) =>g.V(), (g,p) =>g.E().HasLabel("knows").Has("created", "Y"), (g,p) =>g.E().HasLabel("knows").Has("created", "N"), (g,p) =>g.E().HasLabel("knows").Has("weight")}},
- {"g_mergeE_with_outVinV_options_map", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").AddV("person").Property("name", "vadas"), (g,p) =>g.MergeE((IDictionary<object, object>) p["xx1"]).Option(Merge.OutV, (IDictionary<object, object>) p["xx2"]).Option(Merge.InV, (IDictionary<object, object>) p["xx3"]), (g,p) =>g.V(), (g,p) =>g.V().Has("name", "marko").Out("knows").Has("name", "vadas")}},
- {"g_mergeE_inline_with_outVinV_options_map", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").AddV("person").Property("name", "vadas"), (g,p) =>g.MergeE((IDictionary<object, object>) new Dictionary<object, object> {{ Direction.Out, Merge.OutV }, { Direction.In, Merge.InV }, { T.Label, "knows" }}).Option(Merge.OutV, (IDictionary<object, object>) p["xx1"]).Option(Merge.InV, (IDictionary<object, object>) p["xx2"]), (g,p) =>g.V(), (g,p) =>g.V().Has("name", "marko").Out("knows").Has("name", "vadas")}},
- {"g_mergeE_with_outVinV_options_select", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").AddV("person").Property("name", "vadas"), (g,p) =>g.V(p["vid1"]).As("x").V(p["vid2"]).As("y").MergeE((IDictionary<object, object>) p["xx1"]).Option(Merge.OutV, (ITraversal) __.Select<object>("x")).Option(Merge.InV, (ITraversal) __.Select<object>("y")), (g,p) =>g.V(), (g,p) =>g.V().Has("name", "marko").Out("knows").Has("name", "vadas")}},
- {"g_mergeE_inline_with_outVinV_options_select", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").AddV("person").Property("name", "vadas"), (g,p) =>g.V(p["vid1"]).As("x").V(p["vid2"]).As("y").MergeE((IDictionary<object, object>) new Dictionary<object, object> {{ Direction.Out, Merge.OutV }, { Direction.In, Merge.InV }, { T.Label, "knows" }}).Option(Merge.OutV, (ITraversal) __.Select<object>("x")).Option(Merge.InV, (ITraversal) __.Select<object>("y")), (g,p) =>g.V(), (g,p) =>g.V().Has("name", "marko").Out("knows").Has("name", "vadas")}},
- {"g_mergeE_with_eid_specified_and_inheritance_1", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").AddV("person").Property("name", "vadas"), (g,p) =>g.MergeE((IDictionary<object, object>) p["xx1"]).Option(Merge.OnCreate, (IDictionary<object, object>) p["xx2"]), (g,p) =>g.V(), (g,p) =>g.E(), (g,p) =>g.E("201"), (g,p) =>g.V().Has("name", "marko").Out("knows").Has("name", "vadas")}},
- {"g_mergeE_with_eid_specified_and_inheritance_2", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").AddV("person").Property("name", "vadas"), (g,p) =>g.MergeE((IDictionary<object, object>) p["xx1"]).Option(Merge.OnCreate, (IDictionary<object, object>) p["xx2"]), (g,p) =>g.V(), (g,p) =>g.E(), (g,p) =>g.E("201"), (g,p) =>g.V().Has("name", "marko").Out("knows").Has("name", "vadas")}},
- {"g_mergeE_outV_override_prohibited", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").AddV("person").Property("name", "vadas"), (g,p) =>g.MergeE((IDictionary<object, object>) p["xx1"]).Option(Merge.OnCreate, (IDictionary<object, object>) p["xx2"])}},
- {"g_mergeE_inV_override_prohibited", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").AddV("person").Property("name", "vadas"), (g,p) =>g.MergeE((IDictionary<object, object>) p["xx1"]).Option(Merge.OnCreate, (IDictionary<object, object>) p["xx2"])}},
- {"g_mergeE_label_override_prohibited", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").AddV("person").Property("name", "vadas"), (g,p) =>g.MergeE((IDictionary<object, object>) p["xx1"]).Option(Merge.OnCreate, (IDictionary<object, object>) p["xx2"])}},
- {"g_mergeE_id_override_prohibited", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").AddV("person").Property("name", "vadas"), (g,p) =>g.MergeE((IDictionary<object, object>) p["xx1"]).Option(Merge.OnCreate, (IDictionary<object, object>) p["xx2"])}},
+ {"g_mergeEXlabel_knows_out_marko_in_vadasX_optionXonCreate_created_YX_optionXonMatch_created_NX_exists", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").As("a").AddV((string) "person").Property("name", "vadas").As("b").AddE((string) "knows").From("a").To("b"), (g,p) =>g.MergeE((IDictionary<object, object>) p["xx1"]).Option(Merge.OnCreate, (IDictionary<object, object>) p["xx2"]).Option(Merge.OnMatch, (IDictionary<object, object>) p["xx3"]), (g,p) =>g.V(), (g,p) =>g.E().HasLabel("knows").Has("created", "Y"), (g,p) =>g.E().HasLabel("knows").Has("created", "N")}},
+ {"g_mergeEXlabel_knows_out_marko_in_vadasX_optionXonCreate_created_YX_optionXonMatch_created_NX_exists_updated", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").As("a").AddV((string) "person").Property("name", "vadas").As("b").AddE((string) "knows").From("a").To("b").Property("created", "Y"), (g,p) =>g.MergeE((IDictionary<object, object>) p["xx1"]).Option(Merge.OnCreate, (IDictionary<object, object>) p["xx2"]).Option(Merge.OnMatch, (IDictionary<object, object>) p["xx3"]), (g,p) =>g.V(), (g,p) =>g.E().HasLabel("knows").Has("created", "Y"), (g,p) =>g.E().HasLabel("knows").Has("created", "N")}},
+ {"g_V_hasXperson_name_marko_X_mergeEXlabel_knowsX_optionXonCreate_created_YX_optionXonMatch_created_NX_exists_updated", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").As("a").AddV((string) "person").Property("name", "vadas").As("b").AddE((string) "knows").From("a").To("b").Property("created", "Y").AddE((string) "knows").From("a").To("b"), (g,p) =>g.V().Has("person", "name", "marko").MergeE((IDictionary<object, object>) p["xx1"]).Option(Merge.OnCreate, (IDictionary<object, object>) p["xx2"]).Option(Merge.OnMatch, (IDictionary<object, object>) p["xx3"]), (g,p) =>g.V(), (g,p) =>g.E(), (g,p) =>g.E().HasLabel("knows").Has("created", "Y"), (g,p) =>g.E().HasLabel("knows").Has("created", "N")}},
+ {"g_withSideEffectXlabel_knows_out_marko_in_vadasX_injectX1X_selectXmX_mergeE", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").AddV((string) "person").Property("name", "vadas"), (g,p) =>g.Inject<object>(1).Select<object>("m").MergeE(), (g,p) =>g.V().Has("person", "name", "marko").Out("knows").Has("person", "name", "vadas")}},
+ {"g_mergeEXlabel_knows_in_vadasX_optionXonCreate_created_YX_optionXonMatch_created_NX_exists_updated", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").As("a").AddV((string) "person").Property("name", "vadas").As("b").AddE((string) "knows").From("a").To("b").Property("created", "Y").AddE((string) "knows").From("b").To("a").Property("created", "Y"), (g,p) =>g.MergeE((IDictionary<object, object>) p["xx1"]).Option(Merge.OnCreate, (IDictionary<object, object>) p["xx2"]).Option(Merge.OnMatch, (IDictionary<object, object>) p["xx3"]), (g,p) =>g.V(), (g,p) =>g.E(), (g,p) =>g.E().HasLabel("knows").Has("created", "Y"), (g,p) =>g.E().HasLabel("knows").Has("created", "N").InV().Has("name", "vadas")}},
+ {"g_mergeEXlabel_knows_out_vadasX_optionXonCreate_created_YX_optionXonMatch_created_NX_exists_updated", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").As("a").AddV((string) "person").Property("name", "vadas").As("b").AddE((string) "knows").From("a").To("b").Property("created", "Y").AddE((string) "knows").From("b").To("a").Property("created", "Y"), (g,p) =>g.MergeE((IDictionary<object, object>) p["xx1"]).Option(Merge.OnCreate, (IDictionary<object, object>) p["xx2"]).Option(Merge.OnMatch, (IDictionary<object, object>) p["xx3"]), (g,p) =>g.V(), (g,p) =>g.E(), (g,p) =>g.E().HasLabel("knows").Has("created", "Y"), (g,p) =>g.E().HasLabel("knows").Has("created", "N").OutV().Has("name", "vadas")}},
+ {"g_mergeEXout_vadasX_optionXonCreate_created_YX_optionXonMatch_created_NX_exists_updated", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").As("a").AddV((string) "person").Property("name", "vadas").As("b").AddE((string) "knows").From("a").To("b").Property("created", "Y").AddE((string) "knows").From("b").To("a").Property("created", "Y"), (g,p) =>g.MergeE((IDictionary<object, object>) p["xx1"]).Option(Merge.OnCreate, (IDictionary<object, object>) p["xx2"]).Option(Merge.OnMatch, (IDictionary<object, object>) p["xx3"]), (g,p) =>g.V(), (g,p) =>g.E(), (g,p) =>g.E().HasLabel("knows").Has("created", "Y"), (g,p) =>g.E().HasLabel("knows").Has("created", "N").OutV().Has("name", "vadas")}},
+ {"g_V_hasXperson_name_marko_X_mergeEXlabel_self_out_vadas1_in_vadas1X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").AddV((string) "person").Property("name", "vadas"), (g,p) =>g.V().Has("person", "name", "marko").MergeE((IDictionary<object, object>) p["xx1"]), (g,p) =>g.V(), (g,p) =>g.E(), (g,p) =>g.E().HasLabel("self").BothV().Has("name", "vadas")}},
+ {"g_withSideEffectXc_created_YX_withSideEffectXm_matchedX_mergeEXlabel_knows_out_marko_in_vadasX_optionXonCreate_selectXcXX_optionXonMatch_selectXmXX_exists", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").As("a").AddV((string) "person").Property("name", "vadas").As("b").AddE((string) "knows").From("a").To("b"), (g,p) =>g.MergeE((IDictionary<object, object>) p["xx1"]).Option(Merge.OnCreate, (ITraversal) __.Select<object>("c")).Option(Merge.OnMatch, (ITraversal) __.Select<object>("m")), (g,p) =>g.V(), (g,p) =>g.E().HasLabel("knows").Has("created", "Y"), (g,p) =>g.E().HasLabel("knows").Has("created", "N")}},
+ {"g_withSideEffectXc_created_YX_withSideEffectXm_matchedX_mergeEXlabel_knows_out_marko_in_vadasX_optionXonCreate_selectXcXX_optionXonMatch_selectXmXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").As("a").AddV((string) "person").Property("name", "vadas").As("b"), (g,p) =>g.MergeE((IDictionary<object, object>) p["xx1"]).Option(Merge.OnCreate, (ITraversal) __.Select<object>("c")).Option(Merge.OnMatch, (ITraversal) __.Select<object>("m")), (g,p) =>g.V(), (g,p) =>g.E(), (g,p) =>g.E().HasLabel("knows").Has("created", "Y"), (g,p) =>g.E().HasLabel("knows").Has("created", "N")}},
+ {"g_withSideEffectXc_created_YX_withSideEffectXm_matchedX_mergeEXlabel_knows_out_marko1_in_vadas1X_optionXonCreate_selectXcXX_optionXonMatch_selectXmXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").As("a").AddV((string) "person").Property("name", "vadas").As("b"), (g,p) =>g.MergeE((IDictionary<object, object>) p["xx1"]).Option(Merge.OnCreate, (ITraversal) __.Select<object>("c")).Option(Merge.OnMatch, (ITraversal) __.Select<object>("m")), (g,p) =>g.V(), (g,p) =>g.E(), (g,p) =>g.E().HasLabel("knows").Has("created", "Y"), (g,p) =>g.E().HasLabel("knows").Has("created", "N")}},
+ {"g_mergeEXlabel_knows_out_marko_in_vadasX_aliased_direction", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").AddV((string) "person").Property("name", "vadas"), (g,p) =>g.MergeE((IDictionary<object, object>) p["xx1"]), (g,p) =>g.V().Has("person", "name", "marko").Out("knows").Has("person", "name", "vadas")}},
+ {"g_withSideEffectXm1_label_knows_out_marko_in_vadas_m2_label_self_out_vadas_in_vadasX_unionXselectXm1X_selectXm2XX_mergeE", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").AddV((string) "person").Property("name", "vadas"), (g,p) =>g.Union<object>(__.Select<object>("m1"), __.Select<object>("m2")).MergeE(), (g,p) =>g.V(), (g,p) =>g.E(), (g,p) =>g.V().Has("person", "name", "marko").Out("knows").Has("person", "name", "vadas"), (g,p) =>g.V().Has("person", "name", "vadas").Out("self").Has("person", "name", "vadas")}},
+ {"g_withSideEffectXc_created_YX_withSideEffectXm_matchedX_mergeEXlabel_knows_out_marko_in_vadasX_optionXonCreate_selectXcXX_optionXonMatch_sideEffectXpropertiesXweightX_dropX_selectXmXX_exists", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").As("a").AddV((string) "person").Property("name", "vadas").As("b").AddE((string) "knows").Property("weight", 1.0d).From("a").To("b"), (g,p) =>g.MergeE((IDictionary<object, object>) p["xx1"]).Option(Merge.OnCreate, (ITraversal) __.Select<object>("c")).Option(Merge.OnMatch, (ITraversal) __.SideEffect(__.Properties<object>("weight").Drop()).Select<object>("m")), (g,p) =>g.V(), (g,p) =>g.E().HasLabel("knows").Has("created", "Y"), (g,p) =>g.E().HasLabel("knows").Has("created", "N"), (g,p) =>g.E().HasLabel("knows").Has("weight")}},
+ {"g_mergeE_with_outVinV_options_map", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").AddV((string) "person").Property("name", "vadas"), (g,p) =>g.MergeE((IDictionary<object, object>) p["xx1"]).Option(Merge.OutV, (IDictionary<object, object>) p["xx2"]).Option(Merge.InV, (IDictionary<object, object>) p["xx3"]), (g,p) =>g.V(), (g,p) =>g.V().Has("name", "marko").Out("knows").Has("name", "vadas")}},
+ {"g_mergeE_inline_with_outVinV_options_map", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").AddV((string) "person").Property("name", "vadas"), (g,p) =>g.MergeE((IDictionary<object, object>) new Dictionary<object, object> {{ Direction.Out, Merge.OutV }, { Direction.In, Merge.InV }, { T.Label, "knows" }}).Option(Merge.OutV, (IDictionary<object, object>) p["xx1"]).Option(Merge.InV, (IDictionary<object, object>) p["xx2"]), (g,p) =>g.V(), (g,p) =>g.V().Has("name", "marko").Out("knows").Has("name", "vadas")}},
+ {"g_mergeE_with_outVinV_options_select", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").AddV((string) "person").Property("name", "vadas"), (g,p) =>g.V(p["vid1"]).As("x").V(p["vid2"]).As("y").MergeE((IDictionary<object, object>) p["xx1"]).Option(Merge.OutV, (ITraversal) __.Select<object>("x")).Option(Merge.InV, (ITraversal) __.Select<object>("y")), (g,p) =>g.V(), (g,p) =>g.V().Has("name", "marko").Out("knows").Has("name", "vadas")}},
+ {"g_mergeE_inline_with_outVinV_options_select", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").AddV((string) "person").Property("name", "vadas"), (g,p) =>g.V(p["vid1"]).As("x").V(p["vid2"]).As("y").MergeE((IDictionary<object, object>) new Dictionary<object, object> {{ Direction.Out, Merge.OutV }, { Direction.In, Merge.InV }, { T.Label, "knows" }}).Option(Merge.OutV, (ITraversal) __.Select<object>("x")).Option(Merge.InV, (ITraversal) __.Select<object>("y")), (g,p) =>g.V(), (g,p) =>g.V().Has("name", "marko").Out("knows").Has("name", "vadas")}},
+ {"g_mergeE_with_eid_specified_and_inheritance_1", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").AddV((string) "person").Property("name", "vadas"), (g,p) =>g.MergeE((IDictionary<object, object>) p["xx1"]).Option(Merge.OnCreate, (IDictionary<object, object>) p["xx2"]), (g,p) =>g.V(), (g,p) =>g.E(), (g,p) =>g.E("201"), (g,p) =>g.V().Has("name", "marko").Out("knows").Has("name", "vadas")}},
+ {"g_mergeE_with_eid_specified_and_inheritance_2", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").AddV((string) "person").Property("name", "vadas"), (g,p) =>g.MergeE((IDictionary<object, object>) p["xx1"]).Option(Merge.OnCreate, (IDictionary<object, object>) p["xx2"]), (g,p) =>g.V(), (g,p) =>g.E(), (g,p) =>g.E("201"), (g,p) =>g.V().Has("name", "marko").Out("knows").Has("name", "vadas")}},
+ {"g_mergeE_outV_override_prohibited", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").AddV((string) "person").Property("name", "vadas"), (g,p) =>g.MergeE((IDictionary<object, object>) p["xx1"]).Option(Merge.OnCreate, (IDictionary<object, object>) p["xx2"])}},
+ {"g_mergeE_inV_override_prohibited", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").AddV((string) "person").Property("name", "vadas"), (g,p) =>g.MergeE((IDictionary<object, object>) p["xx1"]).Option(Merge.OnCreate, (IDictionary<object, object>) p["xx2"])}},
+ {"g_mergeE_label_override_prohibited", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").AddV((string) "person").Property("name", "vadas"), (g,p) =>g.MergeE((IDictionary<object, object>) p["xx1"]).Option(Merge.OnCreate, (IDictionary<object, object>) p["xx2"])}},
+ {"g_mergeE_id_override_prohibited", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").AddV((string) "person").Property("name", "vadas"), (g,p) =>g.MergeE((IDictionary<object, object>) p["xx1"]).Option(Merge.OnCreate, (IDictionary<object, object>) p["xx2"])}},
{"g_mergeV_mergeE_combination_new_vertices", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.MergeV((IDictionary<object, object>) p["xx1"]).As("outV").MergeV((IDictionary<object, object>) p["xx2"]).As("inV").MergeE((IDictionary<object, object>) p["xx3"]).Option(Merge.OutV, (ITraversal) __.Select<object>("outV")).Option(Merge.InV, (ITraversal) __.Select<object>("inV")), (g,p) =>g.V(), (g,p) =>g.E(), (g,p) =>g.V().Has("name", "marko").Out("knows").Has("name", "vadas")}},
- {"g_mergeV_mergeE_combination_existing_vertices", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").AddV("person").Property("name", "vadas"), (g,p) =>g.MergeV((IDictionary<object, object>) p["xx1"]).As("outV").MergeV((IDictionary<object, object>) p["xx2"]).As("inV").MergeE((IDictionary<object, object>) p["xx3"]).Option(Merge.OutV, (ITraversal) __.Select<object>("outV")).Option(Merge.InV, (ITraversal) __.Select<object>("inV")), (g,p) =>g.V(), (g,p) =>g.E(), (g,p) =>g.V().Has("name", "marko").Out("knows").Has("name", "vadas")}},
- {"g_V_asXvX_mergeEXxx1X_optionXMerge_onMatch_xx2X_optionXMerge_outV_selectXvXX_optionXMerge_inV_selectXvXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").Property("age", 29), (g,p) =>g.V().As("v").MergeE((IDictionary<object, object>) p["xx1"]).Option(Merge.OnMatch, (IDictionary<object, object>) p["xx2"]).Option(Merge.OutV, (ITraversal) __.Select<object>("v")).Option(Merge.InV, (ITraversal) __.Select<object>("v"))}},
- {"g_V_mergeEXlabel_knows_out_marko_in_vadasX_optionXonMatch_sideEffectXpropertyXweight_0XX_constantXemptyXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").As("a").AddV("person").Property("name", "vadas").As("b").AddE("knows").Property("weight", 1).From("a").To("b"), (g,p) =>g.V().MergeE((IDictionary<object, object>) p["xx1"]).Option(Merge.OnMatch, (ITraversal) __.SideEffect(__.Property("weight", 0)).Constant<object>(new Dictionary<object, object> {})), (g,p) =>g.V(), (g,p) =>g.E(), (g,p) =>g.E().HasLabel("knows").Has("weight", 0)}},
- {"g_mergeEXlabel_knows_out_marko_in_vadasX_optionXonMatch_sideEffectXpropertyXweight_0XX_constantXemptyXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").As("a").AddV("person").Property("name", "vadas").As("b").AddE("knows").Property("weight", 1).From("a").To("b"), (g,p) =>g.MergeE((IDictionary<object, object>) p["xx1"]).Option(Merge.OnMatch, (ITraversal) __.SideEffect(__.Property("weight", 0)).Constant<object>(new Dictionary<object, object> {})), (g,p) =>g.V(), (g,p) =>g.E().HasLabel("knows").Has("weight", 1), (g,p) =>g.E().HasLabel("knows").Has("weight", 0), (g,p) =>g.V().Has("weight")}},
- {"g_unionXselectXmapX_selectXmapX_constantXcreated_NXX_fold_asXmX_mergeEXselectXmX_limitXlocal_1X_unfoldX_optionXonCreate_selectXmX_rangeXlocal_1_2X_unfoldX_optionXonMatch_selectXmX_tailXlocalX_unfoldX_to_match", 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").Property("lang", "java").As("ripple").AddV("person").Property("name", "peter").Property("age", 35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight", 0.5d).AddE("knows").From("marko").To("josh").Property("weight", 1.0d).AddE("created").From("marko").To("lop").Property("weight", 0.4d).AddE("created").From("josh").To("ripple").Property("weight", 1.0d).AddE("created").From("josh").To("lop").Property("weight", 0.4d).AddE("created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.Union<object>(__.Select<object>("map"), __.Select<object>("map"), __.Constant<object>(new Dictionary<object, object> {{ "created", "N" }})).Fold().As("m").MergeE((ITraversal) __.Select<object>("m").Limit<object>(Scope.Local, 1).Unfold<object>()).Option(Merge.OnCreate, (ITraversal) __.Select<object>("m").Range<object>(Scope.Local, 1, 2).Unfold<object>()).Option(Merge.OnMatch, (ITraversal) __.Select<object>("m").Tail<object>(Scope.Local).Unfold<object>()), (g,p) =>g.V(), (g,p) =>g.E(), (g,p) =>g.E().Has("created", "N"), (g,p) =>g.V().Has("person", "name", "marko").OutE("knows").Has("created", "N").InV().Has("person", "name", "vadas")}},
- {"g_unionXselectXmapX_selectXmapX_constantXcreated_NXX_fold_asXmX_mergeEXselectXmX_limitXlocal_1X_unfoldX_optionXonCreate_selectXmX_rangeXlocal_1_2X_unfoldX_optionXonMatch_selectXmX_tailXlocalX_unfoldX_to_create", 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").Property("lang", "java").As("ripple").AddV("person").Property("name", "peter").Property("age", 35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight", 0.5d).AddE("knows").From("marko").To("josh").Property("weight", 1.0d).AddE("created").From("marko").To("lop").Property("weight", 0.4d).AddE("created").From("josh").To("ripple").Property("weight", 1.0d).AddE("created").From("josh").To("lop").Property("weight", 0.4d).AddE("created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.Union<object>(__.Select<object>("map"), __.Select<object>("map"), __.Constant<object>(new Dictionary<object, object> {{ "created", "N" }})).Fold().As("m").MergeE((ITraversal) __.Select<object>("m").Limit<object>(Scope.Local, 1).Unfold<object>()).Option(Merge.OnCreate, (ITraversal) __.Select<object>("m").Range<object>(Scope.Local, 1, 2).Unfold<object>()).Option(Merge.OnMatch, (ITraversal) __.Select<object>("m").Tail<object>(Scope.Local).Unfold<object>()), (g,p) =>g.V(), (g,p) =>g.E(), (g,p) =>g.E().HasNot("created"), (g,p) =>g.V().Has("person", "name", "marko").OutE("knows").HasNot("created").InV().Has("person", "name", "vadas"), (g,p) =>g.V().Has("person", "name", "vadas").OutE("self").HasNot("weight").InV().Has("person", "name", "vadas")}},
- {"g_mergeEXlabel_knows_out_marko_in_vadasX_optionXonMatch_weight_nullX_allowed", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").As("a").AddV("person").Property("name", "vadas").As("b").AddE("knows").From("a").To("b").Property("weight", 1.0d), (g,p) =>g.MergeE((IDictionary<object, object>) p["xx1"]).Option(Merge.OnMatch, (IDictionary<object, object>) p["xx2"]), (g,p) =>g.V(), (g,p) =>g.E().HasLabel("knows"), (g,p) =>g.E().HasLabel("knows").Has("weight", (object) null)}},
- {"g_mergeEXlabel_knows_out_marko_in_vadasX_optionXonMatch_weight_nullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").As("a").AddV("person").Property("name", "vadas").As("b").AddE("knows").From("a").To("b").Property("weight", 1.0d), (g,p) =>g.MergeE((IDictionary<object, object>) p["xx1"]).Option(Merge.OnMatch, (IDictionary<object, object>) p["xx2"]), (g,p) =>g.V(), (g,p) =>g.E().HasLabel("knows"), (g,p) =>g.E().HasLabel("knows").Has("weight")}},
- {"g_mergeVXemptyX_optionXonMatch_nullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").Property("age", 29), (g,p) =>g.MergeV((IDictionary<object, object>) new Dictionary<object, object> {}).Option(Merge.OnMatch, (IDictionary<object, object>) null), (g,p) =>g.V().Has("person", "name", "marko").Has("age", 29)}},
- {"g_V_mergeVXemptyX_optionXonMatch_nullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").Property("age", 29), (g,p) =>g.V().MergeV((IDictionary<object, object>) new Dictionary<object, object> {}).Option(Merge.OnMatch, (IDictionary<object, object>) null), (g,p) =>g.V().Has("person", "name", "marko").Has("age", 29)}},
- {"g_mergeVXnullX_optionXonCreate_label_null_name_markoX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").Property("age", 29), (g,p) =>g.MergeV((IDictionary<object, object>) p["xx1"])}},
- {"g_V_mergeVXnullX_optionXonCreate_label_null_name_markoX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").Property("age", 29), (g,p) =>g.V().MergeV((IDictionary<object, object>) p["xx1"])}},
- {"g_mergeVXlabel_person_name_stephenX_optionXonCreate_nullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").Property("age", 29), (g,p) =>g.MergeV((IDictionary<object, object>) p["xx1"]).Option(Merge.OnCreate, (IDictionary<object, object>) null), (g,p) =>g.V(), (g,p) =>g.V().Has("person", "name", "marko"), (g,p) =>g.V().Has("person", "name", "stephen")}},
- {"g_V_mergeVXlabel_person_name_stephenX_optionXonCreate_nullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").Property("age", 29), (g,p) =>g.V().MergeV((IDictionary<object, object>) p["xx1"]).Option(Merge.OnCreate, (IDictionary<object, object>) null), (g,p) =>g.V(), (g,p) =>g.V().Has("person", "name", "marko"), (g,p) =>g.V().Has("person", "name", "stephen")}},
- {"g_mergeVXnullX_optionXonCreate_emptyX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").Property("age", 29), (g,p) =>g.MergeV((IDictionary<object, object>) null).Option(Merge.OnCreate, (IDictionary<object, object>) new Dictionary<object, object> {}), (g,p) =>g.V()}},
- {"g_V_mergeVXnullX_optionXonCreate_emptyX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").Property("age", 29), (g,p) =>g.V().MergeV((IDictionary<object, object>) null).Option(Merge.OnCreate, (IDictionary<object, object>) new Dictionary<object, object> {}), (g,p) =>g.V()}},
+ {"g_mergeV_mergeE_combination_existing_vertices", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").AddV((string) "person").Property("name", "vadas"), (g,p) =>g.MergeV((IDictionary<object, object>) p["xx1"]).As("outV").MergeV((IDictionary<object, object>) p["xx2"]).As("inV").MergeE((IDictionary<object, object>) p["xx3"]).Option(Merge.OutV, (ITraversal) __.Select<object>("outV")).Option(Merge.InV, (ITraversal) __.Select<object>("inV")), (g,p) =>g.V(), (g,p) =>g.E(), (g,p) =>g.V().Has("name", "marko").Out("knows").Has("name", "vadas")}},
+ {"g_V_asXvX_mergeEXxx1X_optionXMerge_onMatch_xx2X_optionXMerge_outV_selectXvXX_optionXMerge_inV_selectXvXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29), (g,p) =>g.V().As("v").MergeE((IDictionary<object, object>) p["xx1"]).Option(Merge.OnMatch, (IDictionary<object, object>) p["xx2"]).Option(Merge.OutV, (ITraversal) __.Select<object>("v")).Option(Merge.InV, (ITraversal) __.Select<object>("v"))}},
+ {"g_V_mergeEXlabel_knows_out_marko_in_vadasX_optionXonMatch_sideEffectXpropertyXweight_0XX_constantXemptyXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").As("a").AddV((string) "person").Property("name", "vadas").As("b").AddE((string) "knows").Property("weight", 1).From("a").To("b"), (g,p) =>g.V().MergeE((IDictionary<object, object>) p["xx1"]).Option(Merge.OnMatch, (ITraversal) __.SideEffect(__.Property("weight", 0)).Constant<object>(new Dictionary<object, object> {})), (g,p) =>g.V(), (g,p) =>g.E(), (g,p) =>g.E().HasLabel("knows").Has("weight", 0)}},
+ {"g_mergeEXlabel_knows_out_marko_in_vadasX_optionXonMatch_sideEffectXpropertyXweight_0XX_constantXemptyXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").As("a").AddV((string) "person").Property("name", "vadas").As("b").AddE((string) "knows").Property("weight", 1).From("a").To("b"), (g,p) =>g.MergeE((IDictionary<object, object>) p["xx1"]).Option(Merge.OnMatch, (ITraversal) __.SideEffect(__.Property("weight", 0)).Constant<object>(new Dictionary<object, object> {})), (g,p) =>g.V(), (g,p) =>g.E().HasLabel("knows").Has("weight", 1), (g,p) =>g.E().HasLabel("knows").Has("weight", 0), (g,p) =>g.V().Has("weight")}},
+ {"g_unionXselectXmapX_selectXmapX_constantXcreated_NXX_fold_asXmX_mergeEXselectXmX_limitXlocal_1X_unfoldX_optionXonCreate_selectXmX_rangeXlocal_1_2X_unfoldX_optionXonMatch_selectXmX_tailXlocalX_unfoldX_to_match", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29).As("marko").AddV((string) "person").Property("name", "vadas").Property("age", 27).As("vadas").AddV((string) "software").Property("name", "lop").Property("lang", "java").As("lop").AddV((string) "person").Property("name", "josh").Property("age", 32).As("josh").AddV((string) "software").Property("name", "ripple").Property("lang", "java").As("ripple").AddV((string) "person").Property("name", "peter").Property("age", 35).As("peter").AddE((string) "knows").From("marko").To("vadas").Property("weight", 0.5d).AddE((string) "knows").From("marko").To("josh").Property("weight", 1.0d).AddE((string) "created").From("marko").To("lop").Property("weight", 0.4d).AddE((string) "created").From("josh").To("ripple").Property("weight", 1.0d).AddE((string) "created").From("josh").To("lop").Property("weight", 0.4d).AddE((string) "created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.Union<object>(__.Select<object>("map"), __.Select<object>("map"), __.Constant<object>(new Dictionary<object, object> {{ "created", "N" }})).Fold().As("m").MergeE((ITraversal) __.Select<object>("m").Limit<object>(Scope.Local, 1).Unfold<object>()).Option(Merge.OnCreate, (ITraversal) __.Select<object>("m").Range<object>(Scope.Local, 1, 2).Unfold<object>()).Option(Merge.OnMatch, (ITraversal) __.Select<object>("m").Tail<object>(Scope.Local).Unfold<object>()), (g,p) =>g.V(), (g,p) =>g.E(), (g,p) =>g.E().Has("created", "N"), (g,p) =>g.V().Has("person", "name", "marko").OutE("knows").Has("created", "N").InV().Has("person", "name", "vadas")}},
+ {"g_unionXselectXmapX_selectXmapX_constantXcreated_NXX_fold_asXmX_mergeEXselectXmX_limitXlocal_1X_unfoldX_optionXonCreate_selectXmX_rangeXlocal_1_2X_unfoldX_optionXonMatch_selectXmX_tailXlocalX_unfoldX_to_create", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29).As("marko").AddV((string) "person").Property("name", "vadas").Property("age", 27).As("vadas").AddV((string) "software").Property("name", "lop").Property("lang", "java").As("lop").AddV((string) "person").Property("name", "josh").Property("age", 32).As("josh").AddV((string) "software").Property("name", "ripple").Property("lang", "java").As("ripple").AddV((string) "person").Property("name", "peter").Property("age", 35).As("peter").AddE((string) "knows").From("marko").To("vadas").Property("weight", 0.5d).AddE((string) "knows").From("marko").To("josh").Property("weight", 1.0d).AddE((string) "created").From("marko").To("lop").Property("weight", 0.4d).AddE((string) "created").From("josh").To("ripple").Property("weight", 1.0d).AddE((string) "created").From("josh").To("lop").Property("weight", 0.4d).AddE((string) "created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.Union<object>(__.Select<object>("map"), __.Select<object>("map"), __.Constant<object>(new Dictionary<object, object> {{ "created", "N" }})).Fold().As("m").MergeE((ITraversal) __.Select<object>("m").Limit<object>(Scope.Local, 1).Unfold<object>()).Option(Merge.OnCreate, (ITraversal) __.Select<object>("m").Range<object>(Scope.Local, 1, 2).Unfold<object>()).Option(Merge.OnMatch, (ITraversal) __.Select<object>("m").Tail<object>(Scope.Local).Unfold<object>()), (g,p) =>g.V(), (g,p) =>g.E(), (g,p) =>g.E().HasNot("created"), (g,p) =>g.V().Has("person", "name", "marko").OutE("knows").HasNot("created").InV().Has("person", "name", "vadas"), (g,p) =>g.V().Has("person", "name", "vadas").OutE("self").HasNot("weight").InV().Has("person", "name", "vadas")}},
+ {"g_mergeEXlabel_knows_out_marko_in_vadasX_optionXonMatch_weight_nullX_allowed", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").As("a").AddV((string) "person").Property("name", "vadas").As("b").AddE((string) "knows").From("a").To("b").Property("weight", 1.0d), (g,p) =>g.MergeE((IDictionary<object, object>) p["xx1"]).Option(Merge.OnMatch, (IDictionary<object, object>) p["xx2"]), (g,p) =>g.V(), (g,p) =>g.E().HasLabel("knows"), (g,p) =>g.E().HasLabel("knows").Has("weight", (object) null)}},
+ {"g_mergeEXlabel_knows_out_marko_in_vadasX_optionXonMatch_weight_nullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").As("a").AddV((string) "person").Property("name", "vadas").As("b").AddE((string) "knows").From("a").To("b").Property("weight", 1.0d), (g,p) =>g.MergeE((IDictionary<object, object>) p["xx1"]).Option(Merge.OnMatch, (IDictionary<object, object>) p["xx2"]), (g,p) =>g.V(), (g,p) =>g.E().HasLabel("knows"), (g,p) =>g.E().HasLabel("knows").Has("weight")}},
+ {"g_mergeVXemptyX_optionXonMatch_nullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29), (g,p) =>g.MergeV((IDictionary<object, object>) new Dictionary<object, object> {}).Option(Merge.OnMatch, (IDictionary<object, object>) null), (g,p) =>g.V().Has("person", "name", "marko").Has("age", 29)}},
+ {"g_V_mergeVXemptyX_optionXonMatch_nullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29), (g,p) =>g.V().MergeV((IDictionary<object, object>) new Dictionary<object, object> {}).Option(Merge.OnMatch, (IDictionary<object, object>) null), (g,p) =>g.V().Has("person", "name", "marko").Has("age", 29)}},
+ {"g_mergeVXnullX_optionXonCreate_label_null_name_markoX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29), (g,p) =>g.MergeV((IDictionary<object, object>) p["xx1"])}},
+ {"g_V_mergeVXnullX_optionXonCreate_label_null_name_markoX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29), (g,p) =>g.V().MergeV((IDictionary<object, object>) p["xx1"])}},
+ {"g_mergeVXlabel_person_name_stephenX_optionXonCreate_nullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29), (g,p) =>g.MergeV((IDictionary<object, object>) p["xx1"]).Option(Merge.OnCreate, (IDictionary<object, object>) null), (g,p) =>g.V(), (g,p) =>g.V().Has("person", "name", "marko"), (g,p) =>g.V().Has("person", "name", "stephen")}},
+ {"g_V_mergeVXlabel_person_name_stephenX_optionXonCreate_nullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29), (g,p) =>g.V().MergeV((IDictionary<object, object>) p["xx1"]).Option(Merge.OnCreate, (IDictionary<object, object>) null), (g,p) =>g.V(), (g,p) =>g.V().Has("person", "name", "marko"), (g,p) =>g.V().Has("person", "name", "stephen")}},
+ {"g_mergeVXnullX_optionXonCreate_emptyX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29), (g,p) =>g.MergeV((IDictionary<object, object>) null).Option(Merge.OnCreate, (IDictionary<object, object>) new Dictionary<object, object> {}), (g,p) =>g.V()}},
+ {"g_V_mergeVXnullX_optionXonCreate_emptyX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29), (g,p) =>g.V().MergeV((IDictionary<object, object>) null).Option(Merge.OnCreate, (IDictionary<object, object>) new Dictionary<object, object> {}), (g,p) =>g.V()}},
{"g_mergeVXemptyX_no_existing", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.MergeV((IDictionary<object, object>) new Dictionary<object, object> {}), (g,p) =>g.V()}},
{"g_injectX0X_mergeVXemptyX_no_existing", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>(0).MergeV((IDictionary<object, object>) new Dictionary<object, object> {}), (g,p) =>g.V()}},
- {"g_mergeVXemptyX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").Property("age", 29), (g,p) =>g.MergeV((IDictionary<object, object>) new Dictionary<object, object> {}), (g,p) =>g.V().Has("person", "name", "marko").Has("age", 29)}},
- {"g_V_mergeVXemptyX_two_exist", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").Property("age", 29).AddV("person").Property("name", "vadas").Property("age", 27), (g,p) =>g.V().MergeV((IDictionary<object, object>) new Dictionary<object, object> {}), (g,p) =>g.V(), (g,p) =>g.V().Has("person", "name", "marko").Has("age", 29), (g,p) =>g.V().Has("person", "name", "vadas").Has("age", 27)}},
- {"g_mergeVXnullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").Property("age", 29), (g,p) =>g.MergeV((IDictionary<object, object>) null), (g,p) =>g.V()}},
- {"g_mergeVXnullvarX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").Property("age", 29), (g,p) =>g.MergeV((IDictionary<object, object>) p["xx1"]), (g,p) =>g.V()}},
- {"g_V_mergeVXnullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").Property("age", 29), (g,p) =>g.V().MergeV((IDictionary<object, object>) null), (g,p) =>g.V()}},
- {"g_mergeVXlabel_person_name_stephenX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").Property("age", 29), (g,p) =>g.MergeV((IDictionary<object, object>) p["xx1"]), (g,p) =>g.V().Has("person", "name", "stephen")}},
- {"g_mergeVXlabel_person_name_markoX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").Property("age", 29), (g,p) =>g.MergeV((IDictionary<object, object>) p["xx1"]), (g,p) =>g.V().Has("person", "name", "marko")}},
- {"g_mergeVXlabel_person_name_stephenX_optionXonCreate_label_person_name_stephen_age_19X_option", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").Property("age", 29), (g,p) =>g.MergeV((IDictionary<object, object>) p["xx1"]).Option(Merge.OnCreate, (IDictionary<object, object>) p["xx2"]), (g,p) =>g.V().Has("person", "name", "stephen").Has("age", 19)}},
- {"g_mergeVXlabel_person_name_markoX_optionXonMatch_age_19X_option", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").Property("age", 29), (g,p) =>g.MergeV((IDictionary<object, object>) p["xx1"]).Option(Merge.OnMatch, (IDictionary<object, object>) p["xx2"]), (g,p) =>g.V().Has("person", "name", "marko").Has("age", 19)}},
- {"g_withSideEffectXc_label_person_name_stephenX_withSideEffectXm_label_person_name_stephen_age_19X_mergeVXselectXcXX_optionXonCreate_selectXmXX_option", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").Property("age", 29), (g,p) =>g.MergeV((ITraversal) __.Select<object>("c")).Option(Merge.OnCreate, (ITraversal) __.Select<object>("m")), (g,p) =>g.V().Has("person", "name", "stephen").Has("age", 19)}},
- {"g_withSideEffectXc_label_person_name_markoX_withSideEffectXm_age_19X_mergeVXselectXcXX_optionXonMatch_selectXmXX_option", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").Property("age", 29), (g,p) =>g.MergeV((ITraversal) __.Select<object>("c")).Option(Merge.OnMatch, (ITraversal) __.Select<object>("m")), (g,p) =>g.V().Has("person", "name", "marko").Has("age", 19)}},
- {"g_mergeVXlabel_person_name_markoX_propertyXname_vadas_acl_publicX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").Property("age", 29), (g,p) =>g.MergeV((IDictionary<object, object>) p["xx1"]).Property("name", "vadas", "acl", "public"), (g,p) =>g.V().Properties<object>("name").HasValue("vadas").Has("acl", "public")}},
- {"g_injectX0X_mergeVXlabel_person_name_stephenX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").Property("age", 29), (g,p) =>g.Inject<object>(0).MergeV((IDictionary<object, object>) p["xx1"]), (g,p) =>g.V().Has("person", "name", "stephen")}},
- {"g_injectX0X_mergeVXlabel_person_name_markoX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").Property("age", 29), (g,p) =>g.Inject<object>(0).MergeV((IDictionary<object, object>) p["xx1"]), (g,p) =>g.V().Has("person", "name", "marko")}},
- {"g_injectX0X_mergeVXlabel_person_name_stephenX_optionXonCreate_label_person_name_stephen_age_19X_option", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").Property("age", 29), (g,p) =>g.Inject<object>(0).MergeV((IDictionary<object, object>) p["xx1"]).Option(Merge.OnCreate, (IDictionary<object, object>) p["xx2"]), (g,p) =>g.V().Has("person", "name", "stephen").Has("age", 19)}},
- {"g_injectX0X_mergeVXlabel_person_name_markoX_optionXonMatch_age_19X_option", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").Property("age", 29), (g,p) =>g.Inject<object>(0).MergeV((IDictionary<object, object>) p["xx1"]).Option(Merge.OnMatch, (IDictionary<object, object>) p["xx2"]), (g,p) =>g.V().Has("person", "name", "marko").Has("age", 19)}},
- {"g_withSideEffectXc_label_person_name_stephenX_withSideEffectXm_label_person_name_stephen_age_19X_injectX0X_mergeVXselectXcXX_optionXonCreate_selectXmXX_option", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").Property("age", 29), (g,p) =>g.Inject<object>(0).MergeV((ITraversal) __.Select<object>("c")).Option(Merge.OnCreate, (ITraversal) __.Select<object>("m")), (g,p) =>g.V().Has("person", "name", "stephen").Has("age", 19)}},
- {"g_withSideEffectXc_label_person_name_markoX_withSideEffectXm_age_19X_injectX0X_mergeVXselectXcXX_optionXonMatch_selectXmXX_option", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").Property("age", 29), (g,p) =>g.Inject<object>(0).MergeV((ITraversal) __.Select<object>("c")).Option(Merge.OnMatch, (ITraversal) __.Select<object>("m")), (g,p) =>g.V().Has("person", "name", "marko").Has("age", 19)}},
- {"g_injectX0X_mergeVXlabel_person_name_markoX_propertyXname_vadas_acl_publicX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").Property("age", 29), (g,p) =>g.Inject<object>(0).MergeV((IDictionary<object, object>) p["xx1"]).Property("name", "vadas", "acl", "public"), (g,p) =>g.V().Properties<object>("name").HasValue("vadas").Has("acl", "public")}},
- {"g_injectXlabel_person_name_marko_label_person_name_stephenX_mergeVXidentityX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").Property("age", 29), (g,p) =>g.Inject<object>(new Dictionary<object, object> {{ T.Label, "person" }, { "name", "marko" }}, new Dictionary<object, object> {{ T.Label, "person" }, { "name", "stephen" }}).MergeV((ITraversal) __.Identity()), (g,p) =>g.V().Has("person", "name", "stephen"), (g,p) =>g.V().Has("person", "name", "marko"), (g,p) =>g.V()}},
- {"g_injectXlabel_person_name_marko_label_person_name_stephenX_mergeV", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").Property("age", 29), (g,p) =>g.Inject<object>(new Dictionary<object, object> {{ T.Label, "person" }, { "name", "marko" }}, new Dictionary<object, object> {{ T.Label, "person" }, { "name", "stephen" }}).MergeV(), (g,p) =>g.V().Has("person", "name", "stephen"), (g,p) =>g.V().Has("person", "name", "marko"), (g,p) =>g.V()}},
- {"g_mergeVXlabel_person_name_stephenX_propertyXlist_name_steveX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property(Cardinality.List, "name", "stephen"), (g,p) =>g.MergeV((IDictionary<object, object>) p["xx1"]).Property(Cardinality.List, "name", "steve"), (g,p) =>g.V(), (g,p) =>g.V().Properties<object>("name").HasValue("steve"), (g,p) =>g.V().Properties<object>("name").HasValue("stephen"), (g,p) =>g.V().Properties<object>("name")}},
- {"g_mergeXlabel_person_name_vadasX_optionXonMatch_age_35X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "vadas").Property("age", 29).AddV("person").Property("name", "vadas").Property("age", 27), (g,p) =>g.MergeV((IDictionary<object, object>) p["xx1"]).Option(Merge.OnMatch, (IDictionary<object, object>) p["xx2"]), (g,p) =>g.V().Has("age", 35), (g,p) =>g.V()}},
- {"g_V_mapXmergeXlabel_person_name_joshXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "vadas").Property("age", 29).AddV("person").Property("name", "stephen").Property("age", 27), (g,p) =>g.V().Map<object>(__.MergeV((IDictionary<object, object>) p["xx1"])), (g,p) =>g.V().Has("person", "name", "josh"), (g,p) =>g.V()}},
- {"g_withSideEffectXc_label_person_name_markoX_withSideEffectXm_age_19X_mergeVXselectXcXX_optionXonMatch_sideEffectXpropertiesXageX_dropX_selectXmXX_option", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").Property(Cardinality.List, "age", 29).Property(Cardinality.List, "age", 31).Property(Cardinality.List, "age", 32), (g,p) =>g.MergeV((ITraversal) __.Select<object>("c")).Option(Merge.OnMatch, (ITraversal) __.SideEffect(__.Properties<object>("age").Drop()).Select<object>("m")), (g,p) =>g.V().Has("person", "name", "marko").Has("age", 19), (g,p) =>g.V().Has("person", "name", "marko").Has("age")}},
- {"g_withSideEffectXm_age_19X_V_hasXperson_name_markoX_mergeVXselectXcXX_optionXonMatch_sideEffectXpropertiesXageX_dropX_selectXmXX_option", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").Property(Cardinality.List, "age", 29).Property(Cardinality.List, "age", 31).Property(Cardinality.List, "age", 32), (g,p) =>g.V().Has("person", "name", "marko").MergeV((IDictionary<object, object>) new Dictionary<object, object> {}).Option(Merge.OnMatch, (ITraversal) __.SideEffect(__.Properties<object>("age").Drop()).Select<object>("m")), (g,p) =>g.V().Has("person", "name", "marko").Has("age", 19), (g,p) =>g.V().Has("person", "name", "marko").Properties<object>("age")}},
- {"g_mergeV_onCreate_inheritance_existing", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "mike").Property(T.Id, "1"), (g,p) =>g.MergeV((IDictionary<object, object>) p["xx1"]).Option(Merge.OnCreate, (IDictionary<object, object>) p["xx2"]), (g,p) =>g.V(), (g,p) =>g.V("1").Has("person", "name", "mike")}},
+ {"g_mergeVXemptyX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29), (g,p) =>g.MergeV((IDictionary<object, object>) new Dictionary<object, object> {}), (g,p) =>g.V().Has("person", "name", "marko").Has("age", 29)}},
+ {"g_V_mergeVXemptyX_two_exist", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29).AddV((string) "person").Property("name", "vadas").Property("age", 27), (g,p) =>g.V().MergeV((IDictionary<object, object>) new Dictionary<object, object> {}), (g,p) =>g.V(), (g,p) =>g.V().Has("person", "name", "marko").Has("age", 29), (g,p) =>g.V().Has("person", "name", "vadas").Has("age", 27)}},
+ {"g_mergeVXnullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29), (g,p) =>g.MergeV((IDictionary<object, object>) null), (g,p) =>g.V()}},
+ {"g_mergeVXnullvarX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29), (g,p) =>g.MergeV((IDictionary<object, object>) p["xx1"]), (g,p) =>g.V()}},
+ {"g_V_mergeVXnullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29), (g,p) =>g.V().MergeV((IDictionary<object, object>) null), (g,p) =>g.V()}},
+ {"g_mergeVXlabel_person_name_stephenX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29), (g,p) =>g.MergeV((IDictionary<object, object>) p["xx1"]), (g,p) =>g.V().Has("person", "name", "stephen")}},
+ {"g_mergeVXlabel_person_name_markoX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29), (g,p) =>g.MergeV((IDictionary<object, object>) p["xx1"]), (g,p) =>g.V().Has("person", "name", "marko")}},
+ {"g_mergeVXlabel_person_name_stephenX_optionXonCreate_label_person_name_stephen_age_19X_option", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29), (g,p) =>g.MergeV((IDictionary<object, object>) p["xx1"]).Option(Merge.OnCreate, (IDictionary<object, object>) p["xx2"]), (g,p) =>g.V().Has("person", "name", "stephen").Has("age", 19)}},
+ {"g_mergeVXlabel_person_name_markoX_optionXonMatch_age_19X_option", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29), (g,p) =>g.MergeV((IDictionary<object, object>) p["xx1"]).Option(Merge.OnMatch, (IDictionary<object, object>) p["xx2"]), (g,p) =>g.V().Has("person", "name", "marko").Has("age", 19)}},
+ {"g_withSideEffectXc_label_person_name_stephenX_withSideEffectXm_label_person_name_stephen_age_19X_mergeVXselectXcXX_optionXonCreate_selectXmXX_option", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29), (g,p) =>g.MergeV((ITraversal) __.Select<object>("c")).Option(Merge.OnCreate, (ITraversal) __.Select<object>("m")), (g,p) =>g.V().Has("person", "name", "stephen").Has("age", 19)}},
+ {"g_withSideEffectXc_label_person_name_markoX_withSideEffectXm_age_19X_mergeVXselectXcXX_optionXonMatch_selectXmXX_option", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29), (g,p) =>g.MergeV((ITraversal) __.Select<object>("c")).Option(Merge.OnMatch, (ITraversal) __.Select<object>("m")), (g,p) =>g.V().Has("person", "name", "marko").Has("age", 19)}},
+ {"g_mergeVXlabel_person_name_markoX_propertyXname_vadas_acl_publicX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29), (g,p) =>g.MergeV((IDictionary<object, object>) p["xx1"]).Property("name", "vadas", "acl", "public"), (g,p) =>g.V().Properties<object>("name").HasValue("vadas").Has("acl", "public")}},
+ {"g_injectX0X_mergeVXlabel_person_name_stephenX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29), (g,p) =>g.Inject<object>(0).MergeV((IDictionary<object, object>) p["xx1"]), (g,p) =>g.V().Has("person", "name", "stephen")}},
+ {"g_injectX0X_mergeVXlabel_person_name_markoX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29), (g,p) =>g.Inject<object>(0).MergeV((IDictionary<object, object>) p["xx1"]), (g,p) =>g.V().Has("person", "name", "marko")}},
+ {"g_injectX0X_mergeVXlabel_person_name_stephenX_optionXonCreate_label_person_name_stephen_age_19X_option", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29), (g,p) =>g.Inject<object>(0).MergeV((IDictionary<object, object>) p["xx1"]).Option(Merge.OnCreate, (IDictionary<object, object>) p["xx2"]), (g,p) =>g.V().Has("person", "name", "stephen").Has("age", 19)}},
+ {"g_injectX0X_mergeVXlabel_person_name_markoX_optionXonMatch_age_19X_option", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29), (g,p) =>g.Inject<object>(0).MergeV((IDictionary<object, object>) p["xx1"]).Option(Merge.OnMatch, (IDictionary<object, object>) p["xx2"]), (g,p) =>g.V().Has("person", "name", "marko").Has("age", 19)}},
+ {"g_withSideEffectXc_label_person_name_stephenX_withSideEffectXm_label_person_name_stephen_age_19X_injectX0X_mergeVXselectXcXX_optionXonCreate_selectXmXX_option", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29), (g,p) =>g.Inject<object>(0).MergeV((ITraversal) __.Select<object>("c")).Option(Merge.OnCreate, (ITraversal) __.Select<object>("m")), (g,p) =>g.V().Has("person", "name", "stephen").Has("age", 19)}},
+ {"g_withSideEffectXc_label_person_name_markoX_withSideEffectXm_age_19X_injectX0X_mergeVXselectXcXX_optionXonMatch_selectXmXX_option", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29), (g,p) =>g.Inject<object>(0).MergeV((ITraversal) __.Select<object>("c")).Option(Merge.OnMatch, (ITraversal) __.Select<object>("m")), (g,p) =>g.V().Has("person", "name", "marko").Has("age", 19)}},
+ {"g_injectX0X_mergeVXlabel_person_name_markoX_propertyXname_vadas_acl_publicX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29), (g,p) =>g.Inject<object>(0).MergeV((IDictionary<object, object>) p["xx1"]).Property("name", "vadas", "acl", "public"), (g,p) =>g.V().Properties<object>("name").HasValue("vadas").Has("acl", "public")}},
+ {"g_injectXlabel_person_name_marko_label_person_name_stephenX_mergeVXidentityX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29), (g,p) =>g.Inject<object>(new Dictionary<object, object> {{ T.Label, "person" }, { "name", "marko" }}, new Dictionary<object, object> {{ T.Label, "person" }, { "name", "stephen" }}).MergeV((ITraversal) __.Identity()), (g,p) =>g.V().Has("person", "name", "stephen"), (g,p) =>g.V().Has("person", "name", "marko"), (g,p) =>g.V()}},
+ {"g_injectXlabel_person_name_marko_label_person_name_stephenX_mergeV", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29), (g,p) =>g.Inject<object>(new Dictionary<object, object> {{ T.Label, "person" }, { "name", "marko" }}, new Dictionary<object, object> {{ T.Label, "person" }, { "name", "stephen" }}).MergeV(), (g,p) =>g.V().Has("person", "name", "stephen"), (g,p) =>g.V().Has("person", "name", "marko"), (g,p) =>g.V()}},
+ {"g_mergeVXlabel_person_name_stephenX_propertyXlist_name_steveX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property(Cardinality.List, "name", "stephen"), (g,p) =>g.MergeV((IDictionary<object, object>) p["xx1"]).Property(Cardinality.List, "name", "steve"), (g,p) =>g.V(), (g,p) =>g.V().Properties<object>("name").HasValue("steve"), (g,p) =>g.V().Properties<object>("name").HasValue("stephen"), (g,p) =>g.V().Properties<object>("name")}},
+ {"g_mergeXlabel_person_name_vadasX_optionXonMatch_age_35X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "vadas").Property("age", 29).AddV((string) "person").Property("name", "vadas").Property("age", 27), (g,p) =>g.MergeV((IDictionary<object, object>) p["xx1"]).Option(Merge.OnMatch, (IDictionary<object, object>) p["xx2"]), (g,p) =>g.V().Has("age", 35), (g,p) =>g.V()}},
+ {"g_V_mapXmergeXlabel_person_name_joshXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "vadas").Property("age", 29).AddV((string) "person").Property("name", "stephen").Property("age", 27), (g,p) =>g.V().Map<object>(__.MergeV((IDictionary<object, object>) p["xx1"])), (g,p) =>g.V().Has("person", "name", "josh"), (g,p) =>g.V()}},
+ {"g_withSideEffectXc_label_person_name_markoX_withSideEffectXm_age_19X_mergeVXselectXcXX_optionXonMatch_sideEffectXpropertiesXageX_dropX_selectXmXX_option", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property(Cardinality.List, "age", 29).Property(Cardinality.List, "age", 31).Property(Cardinality.List, "age", 32), (g,p) =>g.MergeV((ITraversal) __.Select<object>("c")).Option(Merge.OnMatch, (ITraversal) __.SideEffect(__.Properties<object>("age").Drop()).Select<object>("m")), (g,p) =>g.V().Has("person", "name", "marko").Has("age", 19), (g,p) =>g.V().Has("person", "name", "marko").Has("age")}},
+ {"g_withSideEffectXm_age_19X_V_hasXperson_name_markoX_mergeVXselectXcXX_optionXonMatch_sideEffectXpropertiesXageX_dropX_selectXmXX_option", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property(Cardinality.List, "age", 29).Property(Cardinality.List, "age", 31).Property(Cardinality.List, "age", 32), (g,p) =>g.V().Has("person", "name", "marko").MergeV((IDictionary<object, object>) new Dictionary<object, object> {}).Option(Merge.OnMatch, (ITraversal) __.SideEffect(__.Properties<object>("age").Drop()).Select<object>("m")), (g,p) =>g.V().Has("person", "name", "marko").Has("age", 19), (g,p) =>g.V().Has("person", "name", "marko").Properties<object>("age")}},
+ {"g_mergeV_onCreate_inheritance_existing", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "mike").Property(T.Id, "1"), (g,p) =>g.MergeV((IDictionary<object, object>) p["xx1"]).Option(Merge.OnCreate, (IDictionary<object, object>) p["xx2"]), (g,p) =>g.V(), (g,p) =>g.V("1").Has("person", "name", "mike")}},
{"g_mergeV_onCreate_inheritance_new_1", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.MergeV((IDictionary<object, object>) p["xx1"]).Option(Merge.OnCreate, (IDictionary<object, object>) p["xx2"]), (g,p) =>g.V(), (g,p) =>g.V("1").Has("person", "name", "mike")}},
{"g_mergeV_onCreate_inheritance_new_2", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.MergeV((IDictionary<object, object>) p["xx1"]).Option(Merge.OnCreate, (IDictionary<object, object>) p["xx2"]), (g,p) =>g.V(), (g,p) =>g.V("1").Has("person", "name", "mike")}},
{"g_mergeV_label_override_prohibited", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.MergeV((IDictionary<object, object>) p["xx1"]).Option(Merge.OnCreate, (IDictionary<object, object>) p["xx2"])}},
@@ -1202,21 +1203,21 @@
{"g_mergeV_hidden_id_key_onCreate_prohibited", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.MergeV((IDictionary<object, object>) new Dictionary<object, object> {}).Option(Merge.OnCreate, (IDictionary<object, object>) p["xx1"])}},
{"g_mergeV_hidden_label_key_onCreate_prohibited", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.MergeV((IDictionary<object, object>) new Dictionary<object, object> {}).Option(Merge.OnCreate, (IDictionary<object, object>) p["xx1"])}},
{"g_mergeV_hidden_label_value_onCreate_prohibited", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.MergeV((IDictionary<object, object>) new Dictionary<object, object> {}).Option(Merge.OnCreate, (IDictionary<object, object>) p["xx1"])}},
- {"g_mergeV_hidden_id_key_onMatch_matched_prohibited", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("vertex"), (g,p) =>g.MergeV((IDictionary<object, object>) new Dictionary<object, object> {}).Option(Merge.OnMatch, (IDictionary<object, object>) p["xx1"])}},
- {"g_mergeV_hidden_label_key_matched_onMatch_matched_prohibited", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("vertex"), (g,p) =>g.MergeV((IDictionary<object, object>) new Dictionary<object, object> {}).Option(Merge.OnMatch, (IDictionary<object, object>) p["xx1"])}},
- {"g_mergeVXname_markoX_optionXonMatch_age_listX33XX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").Property(Cardinality.List, "age", 29).Property(Cardinality.List, "age", 31).Property(Cardinality.List, "age", 32), (g,p) =>g.MergeV((IDictionary<object, object>) new Dictionary<object, object> {{ "name", "marko" }}).Option(Merge.OnMatch, (IDictionary<object, object>) new Dictionary<object, object> {{ "age", CardinalityValue.List(33) }}), (g,p) =>g.V().Has("person", "name", "marko").Has("age", 33), (g,p) =>g.V().Has("person", "name", "marko").Has("age"), (g,p) =>g.V().Has("person", "name", "marko").Properties<object>("age")}},
- {"g_mergeVXname_markoX_optionXonMatch_age_setX33XX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").Property(Cardinality.List, "age", 29).Property(Cardinality.List, "age", 31).Property(Cardinality.List, "age", 32), (g,p) =>g.MergeV((IDictionary<object, object>) new Dictionary<object, object> {{ "name", "marko" }}).Option(Merge.OnMatch, (IDictionary<object, object>) new Dictionary<object, object> {{ "age", CardinalityValue.Set(33) }}), (g,p) =>g.V().Has("person", "name", "marko").Has("age", 33), (g,p) =>g.V().Has("person", "name", "marko").Has("age"), (g,p) =>g.V().Has("person", "name", "marko").Properties<object>("age")}},
- {"g_mergeVXname_markoX_optionXonMatch_age_setX31XX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").Property(Cardinality.List, "age", 29).Property(Cardinality.List, "age", 31).Property(Cardinality.List, "age", 32), (g,p) =>g.MergeV((IDictionary<object, object>) new Dictionary<object, object> {{ "name", "marko" }}).Option(Merge.OnMatch, (IDictionary<object, object>) new Dictionary<object, object> {{ "age", CardinalityValue.Set(31) }}), (g,p) =>g.V().Has("person", "name", "marko").Has("age", 31), (g,p) =>g.V().Has("person", "name", "marko").Has("age"), (g,p) =>g.V().Has("person", "name", "marko").Properties<object>("age")}},
- {"g_mergeVXname_markoX_optionXonMatch_age_singleX33XX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").Property(Cardinality.List, "age", 29).Property(Cardinality.List, "age", 31).Property(Cardinality.List, "age", 32), (g,p) =>g.MergeV((IDictionary<object, object>) new Dictionary<object, object> {{ "name", "marko" }}).Option(Merge.OnMatch, (IDictionary<object, object>) new Dictionary<object, object> {{ "age", CardinalityValue.Single(33) }}), (g,p) =>g.V().Has("person", "name", "marko").Has("age", 33), (g,p) =>g.V().Has("person", "name", "marko").Has("age"), (g,p) =>g.V().Has("person", "name", "marko").Properties<object>("age")}},
- {"g_mergeVXname_markoX_optionXonMatch_age_33_singleX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").Property(Cardinality.List, "age", 29).Property(Cardinality.List, "age", 31).Property(Cardinality.List, "age", 32), (g,p) =>g.MergeV((IDictionary<object, object>) new Dictionary<object, object> {{ "name", "marko" }}).Option(Merge.OnMatch, new Dictionary<object, object> {{ "age", 33 }}, Cardinality.Single), (g,p) =>g.V().Has("person", "name", "marko").Has("age", 33), (g,p) =>g.V().Has("person", "name", "marko").Has("age"), (g,p) =>g.V().Has("person", "name", "marko").Properties<object>("age")}},
- {"g_mergeVXname_markoX_optionXonMatch_name_allen_age_setX31X_singleX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").Property(Cardinality.List, "age", 29).Property(Cardinality.List, "age", 31).Property(Cardinality.List, "age", 32), (g,p) =>g.MergeV((IDictionary<object, object>) new Dictionary<object, object> {{ "name", "marko" }}).Option(Merge.OnMatch, new Dictionary<object, object> {{ "name", "allen" }, { "age", CardinalityValue.Set(31) }}, Cardinality.Single), (g,p) =>g.V().Has("person", "name", "marko"), (g,p) =>g.V().Has("person", "name", "allen").Has("age", 31), (g,p) =>g.V().Has("person", "name", "allen").Has("age"), (g,p) =>g.V().Has("person", "name", "allen").Properties<object>("age")}},
- {"g_mergeVXname_markoX_optionXonMatch_name_allen_age_singleX31X_singleX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").Property(Cardinality.List, "age", 29).Property(Cardinality.List, "age", 31).Property(Cardinality.List, "age", 32), (g,p) =>g.MergeV((IDictionary<object, object>) new Dictionary<object, object> {{ "name", "marko" }}).Option(Merge.OnMatch, new Dictionary<object, object> {{ "name", "allen" }, { "age", CardinalityValue.Single(31) }}, Cardinality.Single), (g,p) =>g.V().Has("person", "name", "marko"), (g,p) =>g.V().Has("person", "name", "allen").Has("age", 33), (g,p) =>g.V().Has("person", "name", "allen").Has("age", 31), (g,p) =>g.V().Has("person", "name", "allen").Has("age"), (g,p) =>g.V().Has("person", "name", "allen").Properties<object>("age")}},
+ {"g_mergeV_hidden_id_key_onMatch_matched_prohibited", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "vertex"), (g,p) =>g.MergeV((IDictionary<object, object>) new Dictionary<object, object> {}).Option(Merge.OnMatch, (IDictionary<object, object>) p["xx1"])}},
+ {"g_mergeV_hidden_label_key_matched_onMatch_matched_prohibited", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "vertex"), (g,p) =>g.MergeV((IDictionary<object, object>) new Dictionary<object, object> {}).Option(Merge.OnMatch, (IDictionary<object, object>) p["xx1"])}},
+ {"g_mergeVXname_markoX_optionXonMatch_age_listX33XX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property(Cardinality.List, "age", 29).Property(Cardinality.List, "age", 31).Property(Cardinality.List, "age", 32), (g,p) =>g.MergeV((IDictionary<object, object>) new Dictionary<object, object> {{ "name", "marko" }}).Option(Merge.OnMatch, (IDictionary<object, object>) new Dictionary<object, object> {{ "age", CardinalityValue.List(33) }}), (g,p) =>g.V().Has("person", "name", "marko").Has("age", 33), (g,p) =>g.V().Has("person", "name", "marko").Has("age"), (g,p) =>g.V().Has("person", "name", "marko").Properties<object>("age")}},
+ {"g_mergeVXname_markoX_optionXonMatch_age_setX33XX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property(Cardinality.List, "age", 29).Property(Cardinality.List, "age", 31).Property(Cardinality.List, "age", 32), (g,p) =>g.MergeV((IDictionary<object, object>) new Dictionary<object, object> {{ "name", "marko" }}).Option(Merge.OnMatch, (IDictionary<object, object>) new Dictionary<object, object> {{ "age", CardinalityValue.Set(33) }}), (g,p) =>g.V().Has("person", "name", "marko").Has("age", 33), (g,p) =>g.V().Has("person", "name", "marko").Has("age"), (g,p) =>g.V().Has("person", "name", "marko").Properties<object>("age")}},
+ {"g_mergeVXname_markoX_optionXonMatch_age_setX31XX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property(Cardinality.List, "age", 29).Property(Cardinality.List, "age", 31).Property(Cardinality.List, "age", 32), (g,p) =>g.MergeV((IDictionary<object, object>) new Dictionary<object, object> {{ "name", "marko" }}).Option(Merge.OnMatch, (IDictionary<object, object>) new Dictionary<object, object> {{ "age", CardinalityValue.Set(31) }}), (g,p) =>g.V().Has("person", "name", "marko").Has("age", 31), (g,p) =>g.V().Has("person", "name", "marko").Has("age"), (g,p) =>g.V().Has("person", "name", "marko").Properties<object>("age")}},
+ {"g_mergeVXname_markoX_optionXonMatch_age_singleX33XX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property(Cardinality.List, "age", 29).Property(Cardinality.List, "age", 31).Property(Cardinality.List, "age", 32), (g,p) =>g.MergeV((IDictionary<object, object>) new Dictionary<object, object> {{ "name", "marko" }}).Option(Merge.OnMatch, (IDictionary<object, object>) new Dictionary<object, object> {{ "age", CardinalityValue.Single(33) }}), (g,p) =>g.V().Has("person", "name", "marko").Has("age", 33), (g,p) =>g.V().Has("person", "name", "marko").Has("age"), (g,p) =>g.V().Has("person", "name", "marko").Properties<object>("age")}},
+ {"g_mergeVXname_markoX_optionXonMatch_age_33_singleX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property(Cardinality.List, "age", 29).Property(Cardinality.List, "age", 31).Property(Cardinality.List, "age", 32), (g,p) =>g.MergeV((IDictionary<object, object>) new Dictionary<object, object> {{ "name", "marko" }}).Option(Merge.OnMatch, new Dictionary<object, object> {{ "age", 33 }}, Cardinality.Single), (g,p) =>g.V().Has("person", "name", "marko").Has("age", 33), (g,p) =>g.V().Has("person", "name", "marko").Has("age"), (g,p) =>g.V().Has("person", "name", "marko").Properties<object>("age")}},
+ {"g_mergeVXname_markoX_optionXonMatch_name_allen_age_setX31X_singleX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property(Cardinality.List, "age", 29).Property(Cardinality.List, "age", 31).Property(Cardinality.List, "age", 32), (g,p) =>g.MergeV((IDictionary<object, object>) new Dictionary<object, object> {{ "name", "marko" }}).Option(Merge.OnMatch, new Dictionary<object, object> {{ "name", "allen" }, { "age", CardinalityValue.Set(31) }}, Cardinality.Single), (g,p) =>g.V().Has("person", "name", "marko"), (g,p) =>g.V().Has("person", "name", "allen").Has("age", 31), (g,p) =>g.V().Has("person", "name", "allen").Has("age"), (g,p) =>g.V().Has("person", "name", "allen").Properties<object>("age")}},
+ {"g_mergeVXname_markoX_optionXonMatch_name_allen_age_singleX31X_singleX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property(Cardinality.List, "age", 29).Property(Cardinality.List, "age", 31).Property(Cardinality.List, "age", 32), (g,p) =>g.MergeV((IDictionary<object, object>) new Dictionary<object, object> {{ "name", "marko" }}).Option(Merge.OnMatch, new Dictionary<object, object> {{ "name", "allen" }, { "age", CardinalityValue.Single(31) }}, Cardinality.Single), (g,p) =>g.V().Has("person", "name", "marko"), (g,p) =>g.V().Has("person", "name", "allen").Has("age", 33), (g,p) =>g.V().Has("person", "name", "allen").Has("age", 31), (g,p) =>g.V().Has("person", "name", "allen").Has("age"), (g,p) =>g.V().Has("person", "name", "allen").Properties<object>("age")}},
{"g_mergeVXname_aliceX_optionXonCreate_age_singleX81XX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.MergeV((IDictionary<object, object>) new Dictionary<object, object> {{ "name", "alice" }, { T.Label, "person" }}).Option(Merge.OnCreate, (IDictionary<object, object>) new Dictionary<object, object> {{ "age", CardinalityValue.Single(81) }}), (g,p) =>g.V().Has("person", "name", "alice").Has("age", 81), (g,p) =>g.V().Has("person", "name", "alice").Has("age"), (g,p) =>g.V().Has("person", "name", "alice").Properties<object>("age")}},
{"g_mergeVXname_aliceX_optionXonCreate_age_setX81XX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.MergeV((IDictionary<object, object>) new Dictionary<object, object> {{ "name", "alice" }, { T.Label, "person" }}).Option(Merge.OnCreate, (IDictionary<object, object>) new Dictionary<object, object> {{ "age", CardinalityValue.Set(81) }}), (g,p) =>g.V().Has("person", "name", "alice").Has("age", 81), (g,p) =>g.V().Has("person", "name", "alice").Has("age"), (g,p) =>g.V().Has("person", "name", "alice").Properties<object>("age")}},
{"g_mergeVXname_aliceX_optionXonCreate_age_singleX81X_age_81_setX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.MergeV((IDictionary<object, object>) new Dictionary<object, object> {{ "name", "alice" }, { T.Label, "person" }}).Option(Merge.OnCreate, new Dictionary<object, object> {{ "age", 81 }}, Cardinality.Set), (g,p) =>g.V().Has("person", "name", "alice").Has("age", 81), (g,p) =>g.V().Has("person", "name", "alice").Has("age"), (g,p) =>g.V().Has("person", "name", "alice").Properties<object>("age")}},
{"g_mergeV_hidden_label_key_onMatch_matched_prohibited", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.MergeV((IDictionary<object, object>) new Dictionary<object, object> {}).Option(Merge.OnMatch, (IDictionary<object, object>) p["xx1"])}},
- {"g_injectXlist1_list2_list3X_fold_asXmX_mergeVXselectXmX_limitXlocal_1X_unfoldX_optionXonCreate_selectXmX_rangeXlocal_1_2X_unfoldX_optionXonMatch_selectXmX_tailXlocalX_unfoldX_to_match", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").Property("age", 29), (g,p) =>g.Inject<object>(new Dictionary<object, object> {{ T.Label, "person" }, { "name", "marko" }}, new Dictionary<object, object> {{ T.Label, "person" }, { "name", "marko" }}, new Dictionary<object, object> {{ "created", "N" }}).Fold().As("m").MergeV((ITraversal) __.Select<object>("m").Limit<object>(Scope.Local, 1).Unfold<object>()).Option(Merge.OnCreate, (ITraversal) __.Select<object>("m").Range<object>(Scope.Local, 1, 2).Unfold<object>()).Option(Merge.OnMatch, (ITraversal) __.Select<object>("m").Tail<object>(Scope.Local).Unfold<object>()), (g,p) =>g.V().Has("person", "name", "marko").Has("created", "N"), (g,p) =>g.V()}},
- {"g_injectXlist1_list2_list3X_fold_asXmX_mergeVXselectXmX_limitXlocal_1X_unfoldX_optionXonCreate_selectXmX_rangeXlocal_1_2X_unfoldX_optionXonMatch_selectXmX_tailXlocalX_unfoldX_to_create", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").Property("age", 29), (g,p) =>g.Inject<object>(new Dictionary<object, object> {{ T.Label, "person" }, { "name", "stephen" }}, new Dictionary<object, object> {{ T.Label, "person" }, { "name", "stephen" }}, new Dictionary<object, object> {{ "created", "N" }}).Fold().As("m").MergeV((ITraversal) __.Select<object>("m").Limit<object>(Scope.Local, 1).Unfold<object>()).Option(Merge.OnCreate, (ITraversal) __.Select<object>("m").Range<object>(Scope.Local, 1, 2).Unfold<object>()).Option(Merge.OnMatch, (ITraversal) __.Select<object>("m").Tail<object>(Scope.Local).Unfold<object>()), (g,p) =>g.V().Has("person", "name", "stephen").HasNot("created"), (g,p) =>g.V()}},
+ {"g_injectXlist1_list2_list3X_fold_asXmX_mergeVXselectXmX_limitXlocal_1X_unfoldX_optionXonCreate_selectXmX_rangeXlocal_1_2X_unfoldX_optionXonMatch_selectXmX_tailXlocalX_unfoldX_to_match", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29), (g,p) =>g.Inject<object>(new Dictionary<object, object> {{ T.Label, "person" }, { "name", "marko" }}, new Dictionary<object, object> {{ T.Label, "person" }, { "name", "marko" }}, new Dictionary<object, object> {{ "created", "N" }}).Fold().As("m").MergeV((ITraversal) __.Select<object>("m").Limit<object>(Scope.Local, 1).Unfold<object>()).Option(Merge.OnCreate, (ITraversal) __.Select<object>("m").Range<object>(Scope.Local, 1, 2).Unfold<object>()).Option(Merge.OnMatch, (ITraversal) __.Select<object>("m").Tail<object>(Scope.Local).Unfold<object>()), (g,p) =>g.V().Has("person", "name", "marko").Has("created", "N"), (g,p) =>g.V()}},
+ {"g_injectXlist1_list2_list3X_fold_asXmX_mergeVXselectXmX_limitXlocal_1X_unfoldX_optionXonCreate_selectXmX_rangeXlocal_1_2X_unfoldX_optionXonMatch_selectXmX_tailXlocalX_unfoldX_to_create", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29), (g,p) =>g.Inject<object>(new Dictionary<object, object> {{ T.Label, "person" }, { "name", "stephen" }}, new Dictionary<object, object> {{ T.Label, "person" }, { "name", "stephen" }}, new Dictionary<object, object> {{ "created", "N" }}).Fold().As("m").MergeV((ITraversal) __.Select<object>("m").Limit<object>(Scope.Local, 1).Unfold<object>()).Option(Merge.OnCreate, (ITraversal) __.Select<object>("m").Range<object>(Scope.Local, 1, 2).Unfold<object>()).Option(Merge.OnMatch, (ITraversal) __.Select<object>("m").Tail<object>(Scope.Local).Unfold<object>()), (g,p) =>g.V().Has("person", "name", "stephen").HasNot("created"), (g,p) =>g.V()}},
{"g_V_age_min", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("age").Min<object>()}},
{"g_V_foo_min", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("foo").Min<object>()}},
{"g_V_name_min", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("name").Min<object>()}},
@@ -1317,8 +1318,8 @@
{"g_injectX__feature__X_rTrim", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>(" feature ").RTrim()}},
{"g_injectXListXa_bXX_rTrim", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>(new List<object> { "a", "b" }).RTrim()}},
{"g_injectXListX1_2XX_rTrimXlocalX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>(new List<object> { 1, 2 }).RTrim<object>(Scope.Local)}},
- {"g_V_valuesXnameX_rTrim", 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 ").Property("lang", "java").As("ripple").AddV("person").Property("name", "peter").Property("age", 35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight", 0.5d).AddE("knows").From("marko").To("josh").Property("weight", 1.0d).AddE("created").From("marko").To("lop").Property("weight", 0.4d).AddE("created").From("josh").To("ripple").Property("weight", 1.0d).AddE("created").From("josh").To("lop").Property("weight", 0.4d).AddE("created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.V().Values<object>("name").RTrim()}},
- {"g_V_valuesXnameX_order_fold_rTrimXlocalX", 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 ").Property("lang", "java").As("ripple").AddV("person").Property("name", "peter").Property("age", 35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight", 0.5d).AddE("knows").From("marko").To("josh").Property("weight", 1.0d).AddE("created").From("marko").To("lop").Property("weight", 0.4d).AddE("created").From("josh").To("ripple").Property("weight", 1.0d).AddE("created").From("josh").To("lop").Property("weight", 0.4d).AddE("created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.V().Values<object>("name").Order().Fold().RTrim<object>(Scope.Local)}},
+ {"g_V_valuesXnameX_rTrim", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", " marko ").Property("age", 29).As("marko").AddV((string) "person").Property("name", " vadas ").Property("age", 27).As("vadas").AddV((string) "software").Property("name", " lop").Property("lang", "java").As("lop").AddV((string) "person").Property("name", "josh ").Property("age", 32).As("josh").AddV((string) "software").Property("name", " ripple ").Property("lang", "java").As("ripple").AddV((string) "person").Property("name", "peter").Property("age", 35).As("peter").AddE((string) "knows").From("marko").To("vadas").Property("weight", 0.5d).AddE((string) "knows").From("marko").To("josh").Property("weight", 1.0d).AddE((string) "created").From("marko").To("lop").Property("weight", 0.4d).AddE((string) "created").From("josh").To("ripple").Property("weight", 1.0d).AddE((string) "created").From("josh").To("lop").Property("weight", 0.4d).AddE((string) "created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.V().Values<object>("name").RTrim()}},
+ {"g_V_valuesXnameX_order_fold_rTrimXlocalX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", " marko ").Property("age", 29).As("marko").AddV((string) "person").Property("name", " vadas ").Property("age", 27).As("vadas").AddV((string) "software").Property("name", " lop").Property("lang", "java").As("lop").AddV((string) "person").Property("name", "josh ").Property("age", 32).As("josh").AddV((string) "software").Property("name", " ripple ").Property("lang", "java").As("ripple").AddV((string) "person").Property("name", "peter").Property("age", 35).As("peter").AddE((string) "knows").From("marko").To("vadas").Property("weight", 0.5d).AddE((string) "knows").From("marko").To("josh").Property("weight", 1.0d).AddE((string) "created").From("marko").To("lop").Property("weight", 0.4d).AddE((string) "created").From("josh").To("ripple").Property("weight", 1.0d).AddE((string) "created").From("josh").To("lop").Property("weight", 0.4d).AddE((string) "created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.V().Values<object>("name").Order().Fold().RTrim<object>(Scope.Local)}},
{"g_injectXthat_this_test_nullX_replaceXh_jX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>("that", "this", "test", null).Replace("h", "j")}},
{"g_injectXthat_this_test_nullX_fold_replaceXlocal_h_jX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>("that", "this", "test", null).Fold().Replace<object>(Scope.Local, "h", "j")}},
{"g_injectXListXa_bXcX_replaceXa_bX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>(new List<object> { "a", "b" }).Replace("a", "b")}},
@@ -1401,8 +1402,8 @@
{"g_V_asXa_nX_selectXa_nX_byXageX_byXnameX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().As("a", "n").Select<object>("a", "n").By("age").By("name")}},
{"g_withStrategiesXProductiveByStrategyX_V_asXaX_selectXaX_byXageX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithStrategies(new ProductiveByStrategy()).V().As("a").Select<object>("a").By("age")}},
{"g_withSideEffectXk_nullX_injectXxX_selectXkX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithSideEffect("k", null).Inject<object>("x").Select<object>("k")}},
- {"g_V_out_in_selectXall_a_a_aX_byXunfold_name_foldX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("A").Property("name", "a1").As("a1").AddV("B").Property("name", "b1").As("b1").AddE("ab").From("a1").To("b1"), (g,p) =>g.V().As("a").Out().As("a").In().As("a").Select<object>(Pop.All, "a", "a", "a").By(__.Unfold<object>().Values<object>("name").Fold())}},
- {"g_V_asXlabelX_aggregateXlocal_xX_selectXxX_selectXlabelX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().As("label").Aggregate(Scope.Local, "x").Barrier().Select<object>("x").Select<object>("label")}},
+ {"g_V_out_in_selectXall_a_a_aX_byXunfold_name_foldX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "A").Property("name", "a1").As("a1").AddV((string) "B").Property("name", "b1").As("b1").AddE((string) "ab").From("a1").To("b1"), (g,p) =>g.V().As("a").Out().As("a").In().As("a").Select<object>(Pop.All, "a", "a", "a").By(__.Unfold<object>().Values<object>("name").Fold())}},
+ {"g_withoutStrategiesXLazyBarrierStrategyX_V_asXlabelX_aggregateXlocal_xX_selectXxX_selectXlabelX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithoutStrategies(typeof(LazyBarrierStrategy)).V().As("label").Aggregate(Scope.Local, "x").Select<object>("x").Select<object>("label")}},
{"g_V_name_asXaX_selectXfirst_aX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("name").As("a").Select<object>(Pop.First, "a")}},
{"g_V_name_asXaX_selectXlast_aX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("name").As("a").Select<object>(Pop.Last, "a")}},
{"g_V_name_asXaX_selectXmixed_aX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("name").As("a").Select<object>(Pop.Mixed, "a")}},
@@ -1483,9 +1484,9 @@
{"g_injectXfeature_test_nullX_toLower", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>("FEATURE", "tESt", null).ToLower()}},
{"g_injectXfeature_test_nullX_toLowerXlocalX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>(new List<object> { "FEATURE", "tESt", null }).ToLower<object>(Scope.Local)}},
{"g_injectXListXa_bXX_toLower", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>(new List<object> { "a", "b" }).ToLower()}},
- {"g_V_valuesXnameX_toLower", 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").Property("lang", "java").As("ripple").AddV("person").Property("name", "PETER").Property("age", 35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight", 0.5d).AddE("knows").From("marko").To("josh").Property("weight", 1.0d).AddE("created").From("marko").To("lop").Property("weight", 0.4d).AddE("created").From("josh").To("ripple").Property("weight", 1.0d).AddE("created").From("josh").To("lop").Property("weight", 0.4d).AddE("created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.V().Values<object>("name").ToLower()}},
- {"g_V_valuesXnameX_toLowerXlocalX", 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").Property("lang", "java").As("ripple").AddV("person").Property("name", "PETER").Property("age", 35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight", 0.5d).AddE("knows").From("marko").To("josh").Property("weight", 1.0d).AddE("created").From("marko").To("lop").Property("weight", 0.4d).AddE("created").From("josh").To("ripple").Property("weight", 1.0d).AddE("created").From("josh").To("lop").Property("weight", 0.4d).AddE("created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.V().Values<object>("name").ToLower<object>(Scope.Local)}},
- {"g_V_valuesXnameX_order_fold_toLowerXlocalX", 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").Property("lang", "java").As("ripple").AddV("person").Property("name", "PETER").Property("age", 35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight", 0.5d).AddE("knows").From("marko").To("josh").Property("weight", 1.0d).AddE("created").From("marko").To("lop").Property("weight", 0.4d).AddE("created").From("josh").To("ripple").Property("weight", 1.0d).AddE("created").From("josh").To("lop").Property("weight", 0.4d).AddE("created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.V().Values<object>("name").Order().Fold().ToLower<object>(Scope.Local)}},
+ {"g_V_valuesXnameX_toLower", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "MARKO").Property("age", 29).As("marko").AddV((string) "person").Property("name", "VADAS").Property("age", 27).As("vadas").AddV((string) "software").Property("name", "LOP").Property("lang", "java").As("lop").AddV((string) "person").Property("name", "JOSH").Property("age", 32).As("josh").AddV((string) "software").Property("name", "RIPPLE").Property("lang", "java").As("ripple").AddV((string) "person").Property("name", "PETER").Property("age", 35).As("peter").AddE((string) "knows").From("marko").To("vadas").Property("weight", 0.5d).AddE((string) "knows").From("marko").To("josh").Property("weight", 1.0d).AddE((string) "created").From("marko").To("lop").Property("weight", 0.4d).AddE((string) "created").From("josh").To("ripple").Property("weight", 1.0d).AddE((string) "created").From("josh").To("lop").Property("weight", 0.4d).AddE((string) "created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.V().Values<object>("name").ToLower()}},
+ {"g_V_valuesXnameX_toLowerXlocalX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "MARKO").Property("age", 29).As("marko").AddV((string) "person").Property("name", "VADAS").Property("age", 27).As("vadas").AddV((string) "software").Property("name", "LOP").Property("lang", "java").As("lop").AddV((string) "person").Property("name", "JOSH").Property("age", 32).As("josh").AddV((string) "software").Property("name", "RIPPLE").Property("lang", "java").As("ripple").AddV((string) "person").Property("name", "PETER").Property("age", 35).As("peter").AddE((string) "knows").From("marko").To("vadas").Property("weight", 0.5d).AddE((string) "knows").From("marko").To("josh").Property("weight", 1.0d).AddE((string) "created").From("marko").To("lop").Property("weight", 0.4d).AddE((string) "created").From("josh").To("ripple").Property("weight", 1.0d).AddE((string) "created").From("josh").To("lop").Property("weight", 0.4d).AddE((string) "created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.V().Values<object>("name").ToLower<object>(Scope.Local)}},
+ {"g_V_valuesXnameX_order_fold_toLowerXlocalX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "MARKO").Property("age", 29).As("marko").AddV((string) "person").Property("name", "VADAS").Property("age", 27).As("vadas").AddV((string) "software").Property("name", "LOP").Property("lang", "java").As("lop").AddV((string) "person").Property("name", "JOSH").Property("age", 32).As("josh").AddV((string) "software").Property("name", "RIPPLE").Property("lang", "java").As("ripple").AddV((string) "person").Property("name", "PETER").Property("age", 35).As("peter").AddE((string) "knows").From("marko").To("vadas").Property("weight", 0.5d).AddE((string) "knows").From("marko").To("josh").Property("weight", 1.0d).AddE((string) "created").From("marko").To("lop").Property("weight", 0.4d).AddE((string) "created").From("josh").To("ripple").Property("weight", 1.0d).AddE((string) "created").From("josh").To("lop").Property("weight", 0.4d).AddE((string) "created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.V().Values<object>("name").Order().Fold().ToLower<object>(Scope.Local)}},
{"g_injectXfeature_test_nullX_toUpper", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>("feature", "tESt", null).ToUpper()}},
{"g_injectXfeature_test_nullX_toUpperXlocalX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>(new List<object> { "feature", "tESt", null }).ToUpper<object>(Scope.Local)}},
{"g_injectXfeature_test_nullX_asString_toUpper", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>("feature", "tESt", null).AsString().ToUpper()}},
@@ -1497,8 +1498,8 @@
{"g_injectX__feature___test__nullX_trimXlocalX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>(new List<object> { " feature ", " one test ", null, "", " ", " abc", "abc ", " abc ", " " }).Trim<object>(Scope.Local)}},
{"g_injectXListXa_bXX_trim", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>(new List<object> { "a", "b" }).Trim()}},
{"g_injectXListX1_2XX_trimXlocalX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>(new List<object> { 1, 2 }).Trim<object>(Scope.Local)}},
- {"g_V_valuesXnameX_trim", 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 ").Property("lang", "java").As("ripple").AddV("person").Property("name", "peter").Property("age", 35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight", 0.5d).AddE("knows").From("marko").To("josh").Property("weight", 1.0d).AddE("created").From("marko").To("lop").Property("weight", 0.4d).AddE("created").From("josh").To("ripple").Property("weight", 1.0d).AddE("created").From("josh").To("lop").Property("weight", 0.4d).AddE("created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.V().Values<object>("name").Trim()}},
- {"g_V_valuesXnameX_order_fold_trimXlocalX", 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 ").Property("lang", "java").As("ripple").AddV("person").Property("name", "peter").Property("age", 35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight", 0.5d).AddE("knows").From("marko").To("josh").Property("weight", 1.0d).AddE("created").From("marko").To("lop").Property("weight", 0.4d).AddE("created").From("josh").To("ripple").Property("weight", 1.0d).AddE("created").From("josh").To("lop").Property("weight", 0.4d).AddE("created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.V().Values<object>("name").Order().Fold().Trim<object>(Scope.Local)}},
+ {"g_V_valuesXnameX_trim", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", " marko ").Property("age", 29).As("marko").AddV((string) "person").Property("name", " vadas ").Property("age", 27).As("vadas").AddV((string) "software").Property("name", " lop").Property("lang", "java").As("lop").AddV((string) "person").Property("name", "josh ").Property("age", 32).As("josh").AddV((string) "software").Property("name", " ripple ").Property("lang", "java").As("ripple").AddV((string) "person").Property("name", "peter").Property("age", 35).As("peter").AddE((string) "knows").From("marko").To("vadas").Property("weight", 0.5d).AddE((string) "knows").From("marko").To("josh").Property("weight", 1.0d).AddE((string) "created").From("marko").To("lop").Property("weight", 0.4d).AddE((string) "created").From("josh").To("ripple").Property("weight", 1.0d).AddE((string) "created").From("josh").To("lop").Property("weight", 0.4d).AddE((string) "created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.V().Values<object>("name").Trim()}},
+ {"g_V_valuesXnameX_order_fold_trimXlocalX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", " marko ").Property("age", 29).As("marko").AddV((string) "person").Property("name", " vadas ").Property("age", 27).As("vadas").AddV((string) "software").Property("name", " lop").Property("lang", "java").As("lop").AddV((string) "person").Property("name", "josh ").Property("age", 32).As("josh").AddV((string) "software").Property("name", " ripple ").Property("lang", "java").As("ripple").AddV((string) "person").Property("name", "peter").Property("age", 35).As("peter").AddE((string) "knows").From("marko").To("vadas").Property("weight", 0.5d).AddE((string) "knows").From("marko").To("josh").Property("weight", 1.0d).AddE((string) "created").From("marko").To("lop").Property("weight", 0.4d).AddE((string) "created").From("josh").To("ripple").Property("weight", 1.0d).AddE((string) "created").From("josh").To("lop").Property("weight", 0.4d).AddE((string) "created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.V().Values<object>("name").Order().Fold().Trim<object>(Scope.Local)}},
{"g_V_localXoutE_foldX_unfold", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Local<object>(__.OutE().Fold()).Unfold<object>()}},
{"g_V_valueMap_unfold_mapXselectXkeysXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().ValueMap<object, object>().Unfold<object>().Map<object>(__.Select<object>(Column.Keys))}},
{"g_VX1X_repeatXboth_simplePathX_untilXhasIdX6XX_path_byXnameX_unfold", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V(p["vid1"]).Repeat(__.Both().SimplePath()).Until(__.HasId(p["vid6"])).Path().By("name").Unfold<object>()}},
@@ -1541,7 +1542,7 @@
{"g_VX1X_out_out_out", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V(p["vid1"]).Out().Out().Out()}},
{"g_VX1X_out_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V(p["vid1"]).Out().Values<object>("name")}},
{"g_VX1X_to_XOUT_knowsX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V(p["vid1"]).To(Direction.Out, "knows")}},
- {"g_VX1_2_3_4X_name", 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").Property("lang", "java").As("ripple").AddV("person").Property("name", "peter").Property("age", 35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight", 0.5d).AddE("knows").From("marko").To("josh").Property("weight", 1.0d).AddE("created").From("marko").To("lop").Property("weight", 0.4d).AddE("created").From("josh").To("ripple").Property("weight", 1.0d).AddE("created").From("josh").To("lop").Property("weight", 0.4d).AddE("created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.V().Has("software", "name", "lop").Drop(), (g,p) =>g.V(p["vid1"], p["vid2"], p["vid3"], p["vid4"])}},
+ {"g_VX1_2_3_4X_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29).As("marko").AddV((string) "person").Property("name", "vadas").Property("age", 27).As("vadas").AddV((string) "software").Property("name", "lop").Property("lang", "java").As("lop").AddV((string) "person").Property("name", "josh").Property("age", 32).As("josh").AddV((string) "software").Property("name", "ripple").Property("lang", "java").As("ripple").AddV((string) "person").Property("name", "peter").Property("age", 35).As("peter").AddE((string) "knows").From("marko").To("vadas").Property("weight", 0.5d).AddE((string) "knows").From("marko").To("josh").Property("weight", 1.0d).AddE((string) "created").From("marko").To("lop").Property("weight", 0.4d).AddE((string) "created").From("josh").To("ripple").Property("weight", 1.0d).AddE((string) "created").From("josh").To("lop").Property("weight", 0.4d).AddE((string) "created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.V().Has("software", "name", "lop").Drop(), (g,p) =>g.V(p["vid1"], p["vid2"], p["vid3"], p["vid4"])}},
{"g_V_hasLabelXpersonX_V_hasLabelXsoftwareX_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasLabel("person").V().HasLabel("software").Values<object>("name")}},
{"g_V_hasLabelXloopsX_bothEXselfX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasLabel("loops").BothE("self")}},
{"g_V_hasLabelXloopsX_bothXselfX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasLabel("loops").Both("self")}},
@@ -1550,7 +1551,7 @@
{"g_VX1X_V_valuesXnameX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V(p["vid1"]).V().Values<object>("name")}},
{"g_V_outXknowsX_V_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Out("knows").V().Values<object>("name")}},
{"g_V_hasXname_GarciaX_inXsungByX_asXsongX_V_hasXname_Willie_DixonX_inXwrittenByX_whereXeqXsongXX_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Has("artist", "name", "Garcia").In("sungBy").As("song").V().Has("artist", "name", "Willie_Dixon").In("writtenBy").Where(P.Eq("song")).Values<object>("name")}},
- {"g_V_hasLabelXpersonX_asXpX_VXsoftwareX_addInEXuses_pX", 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").Property("lang", "java").As("ripple").AddV("person").Property("name", "peter").Property("age", 35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight", 0.5d).AddE("knows").From("marko").To("josh").Property("weight", 1.0d).AddE("created").From("marko").To("lop").Property("weight", 0.4d).AddE("created").From("josh").To("ripple").Property("weight", 1.0d).AddE("created").From("josh").To("lop").Property("weight", 0.4d).AddE("created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.V().HasLabel("person").As("p").V(p["xx1"]).AddE("uses").From("p"), (g,p) =>g.E().HasLabel("uses"), (g,p) =>g.V(p["vid1"]).OutE("uses"), (g,p) =>g.V(p["vid2"]).OutE("uses"), (g,p) =>g.V(p["vid3"]).InE("uses"), (g,p) =>g.V(p["vid4"]).OutE("uses"), (g,p) =>g.V(p["vid5"]).InE("uses"), (g,p) =>g.V(p["vid6"]).OutE("uses")}},
+ {"g_V_hasLabelXpersonX_asXpX_VXsoftwareX_addInEXuses_pX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("age", 29).As("marko").AddV((string) "person").Property("name", "vadas").Property("age", 27).As("vadas").AddV((string) "software").Property("name", "lop").Property("lang", "java").As("lop").AddV((string) "person").Property("name", "josh").Property("age", 32).As("josh").AddV((string) "software").Property("name", "ripple").Property("lang", "java").As("ripple").AddV((string) "person").Property("name", "peter").Property("age", 35).As("peter").AddE((string) "knows").From("marko").To("vadas").Property("weight", 0.5d).AddE((string) "knows").From("marko").To("josh").Property("weight", 1.0d).AddE((string) "created").From("marko").To("lop").Property("weight", 0.4d).AddE((string) "created").From("josh").To("ripple").Property("weight", 1.0d).AddE((string) "created").From("josh").To("lop").Property("weight", 0.4d).AddE((string) "created").From("peter").To("lop").Property("weight", 0.2d), (g,p) =>g.V().HasLabel("person").As("p").V(p["xx1"]).AddE((string) "uses").From("p"), (g,p) =>g.E().HasLabel("uses"), (g,p) =>g.V(p["vid1"]).OutE("uses"), (g,p) =>g.V(p["vid2"]).OutE("uses"), (g,p) =>g.V(p["vid3"]).InE("uses"), (g,p) =>g.V(p["vid4"]).OutE("uses"), (g,p) =>g.V(p["vid5"]).InE("uses"), (g,p) =>g.V(p["vid6"]).OutE("uses")}},
{"InjectXnullX_eqXnullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>(null).Is(P.Eq(null))}},
{"InjectXnullX_neqXnullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>(null).Is(P.Neq(null))}},
{"InjectXnullX_ltXnullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>(null).Is(P.Lt(null))}},
@@ -1646,8 +1647,8 @@
{"g_V_values_order", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>().Order()}},
{"g_V_properties_order", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Properties<object>().Order()}},
{"g_V_properties_order_id", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Properties<object>().Order().Id()}},
- {"g_E_properties_order_value", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "alice").As("a").AddE("self").From("a").To("a").Property("weight", 0.5d).Property("a", 10).AddE("self").From("a").To("a").Property("weight", 1.0d).Property("a", 11).AddE("self").From("a").To("a").Property("weight", 0.4d).Property("a", 12).AddE("self").From("a").To("a").Property("weight", 1.0d).Property("a", 13).AddE("self").From("a").To("a").Property("weight", 0.4d).Property("a", 14).AddE("self").From("a").To("a").Property("weight", 0.2d).Property("a", 15), (g,p) =>g.E().Properties<object>().Order().Value<object>()}},
- {"g_E_properties_order_byXdescX_value", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "alice").As("a").AddE("self").From("a").To("a").Property("weight", 0.5d).Property("a", 10).AddE("self").From("a").To("a").Property("weight", 1.0d).Property("a", 11).AddE("self").From("a").To("a").Property("weight", 0.4d).Property("a", 12).AddE("self").From("a").To("a").Property("weight", 1.0d).Property("a", 13).AddE("self").From("a").To("a").Property("weight", 0.4d).Property("a", 14).AddE("self").From("a").To("a").Property("weight", 0.2d).Property("a", 15), (g,p) =>g.E().Properties<object>().Order().By(Order.Desc).Value<object>()}},
+ {"g_E_properties_order_value", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "alice").As("a").AddE((string) "self").From("a").To("a").Property("weight", 0.5d).Property("a", 10).AddE((string) "self").From("a").To("a").Property("weight", 1.0d).Property("a", 11).AddE((string) "self").From("a").To("a").Property("weight", 0.4d).Property("a", 12).AddE((string) "self").From("a").To("a").Property("weight", 1.0d).Property("a", 13).AddE((string) "self").From("a").To("a").Property("weight", 0.4d).Property("a", 14).AddE((string) "self").From("a").To("a").Property("weight", 0.2d).Property("a", 15), (g,p) =>g.E().Properties<object>().Order().Value<object>()}},
+ {"g_E_properties_order_byXdescX_value", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "alice").As("a").AddE((string) "self").From("a").To("a").Property("weight", 0.5d).Property("a", 10).AddE((string) "self").From("a").To("a").Property("weight", 1.0d).Property("a", 11).AddE((string) "self").From("a").To("a").Property("weight", 0.4d).Property("a", 12).AddE((string) "self").From("a").To("a").Property("weight", 1.0d).Property("a", 13).AddE((string) "self").From("a").To("a").Property("weight", 0.4d).Property("a", 14).AddE((string) "self").From("a").To("a").Property("weight", 0.2d).Property("a", 15), (g,p) =>g.E().Properties<object>().Order().By(Order.Desc).Value<object>()}},
{"g_inject_order", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>("zzz", "foo", new List<object> { "a", "b", "c", "d" }, 1, new List<object> { "a", "b", "c" }, new Dictionary<object, object> {{ "a", "a" }, { "b", "b" }}, null, 2.0d, new Dictionary<object, object> {{ "a", "a" }, { "b", false }, { "c", "c" }}, "bar", true, false, Double.PositiveInfinity, Double.NaN, Double.NegativeInfinity).Order()}},
{"g_inject_order_byXdescX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>("zzz", "foo", new List<object> { "a", "b", "c", "d" }, 1, new List<object> { "a", "b", "c" }, new Dictionary<object, object> {{ "a", "a" }, { "b", "b" }}, null, 2.0d, new Dictionary<object, object> {{ "a", "a" }, { "b", false }, { "c", "c" }}, "bar", true, false, Double.PositiveInfinity, Double.NaN, Double.NegativeInfinity).Order().By(Order.Desc)}},
{"g_V_out_out_order_byXascX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Out().Out().Order().By(Order.Asc)}},
@@ -1802,7 +1803,7 @@
{"g_V_sackXassignX_byXageX_byXnameX_sack", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Sack(Operator.Assign).By("age").By("name").Sack<object>()}},
{"g_V_sideEffectXidentityX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().SideEffect(__.Identity())}},
{"g_V_sideEffectXidentity_valuesXnameXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().SideEffect(__.Identity().Values<object>("name"))}},
- {"g_V_sideEffectXpropertyXage_22X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("age", 21), (g,p) =>g.V().SideEffect(__.Property("age", 22)), (g,p) =>g.V().Has("age", 21), (g,p) =>g.V().Has("age", 22)}},
+ {"g_V_sideEffectXpropertyXage_22X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("age", 21), (g,p) =>g.V().SideEffect(__.Property("age", 22)), (g,p) =>g.V().Has("age", 21), (g,p) =>g.V().Has("age", 22)}},
{"g_V_group_byXvaluesXnameX_sideEffectXconstantXzyxXX_substringX1XX_byXconstantX1X_sideEffectXconstantXxyzXXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Group<object, object>().By(__.Values<object>("name").SideEffect(__.Constant<object>("zyx")).Substring(0, 1)).By(__.Constant<object>(1).SideEffect(__.Constant<object>("xyz")))}},
{"g_withSideEffectXx_setX_V_both_both_sideEffectXstoreXxX_byXnameXX_capXxX_unfold", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithSideEffect("x", new HashSet<object> { }).V().Both().Both().SideEffect(__.Store("x").By("name")).Cap<object>("x").Unfold<object>()}},
{"g_V_hasXageX_groupCountXaX_byXnameX_out_capXaX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Has("age").GroupCount("a").By("name").Out().Cap<object>("a")}},
diff --git a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Process/Traversal/Translator/GroovyTranslatorTests.cs b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Process/Traversal/Translator/GroovyTranslatorTests.cs
index c7b7a6a..94932d9 100644
--- a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Process/Traversal/Translator/GroovyTranslatorTests.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Process/Traversal/Translator/GroovyTranslatorTests.cs
@@ -35,7 +35,7 @@
public class GroovyTranslatorTests
{
private readonly GraphTraversalSource _g = AnonymousTraversalSource.Traversal().With(null);
-
+
[Fact]
public void ShouldTranslateStepsWithSingleArguments()
{
diff --git a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Process/Traversal/TraversalTests.cs b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Process/Traversal/TraversalTests.cs
index 0ed745b..63489f4 100644
--- a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Process/Traversal/TraversalTests.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Process/Traversal/TraversalTests.cs
@@ -26,6 +26,7 @@
using System.Linq;
using Xunit;
using Gremlin.Net.Process.Traversal;
+using Gremlin.Net.Structure;
namespace Gremlin.Net.UnitTest.Process.Traversal
{
@@ -179,5 +180,73 @@
var expectedObjs = UnfoldBulks(objs, bulks);
Assert.Equal(expectedObjs, traversedObjs);
}
+
+ [Fact]
+ public void ShouldExtractIdFromVertex()
+ {
+ var g = AnonymousTraversalSource.Traversal().With(null);
+
+ // Test basic V() step with mixed ID types
+ var vStart = g.V(1, new Vertex(2));
+ var vStartBytecode = vStart.Bytecode;
+ Assert.Single(vStartBytecode.StepInstructions);
+ Assert.Equal("V", vStartBytecode.StepInstructions[0].OperatorName);
+ Assert.Equal(1, (int)vStartBytecode.StepInstructions[0].Arguments[0]);
+ Assert.Equal(2, (int)vStartBytecode.StepInstructions[0].Arguments[1]); // ID should be extracted from Vertex
+
+ // Test V() step in the middle of a traversal
+ var vMid = g.Inject("foo").V(1, new Vertex(2));
+ var vMidBytecode = vMid.Bytecode;
+ Assert.Equal(2, vMidBytecode.StepInstructions.Count);
+ Assert.Equal("inject", vMidBytecode.StepInstructions[0].OperatorName);
+ Assert.Equal("foo", (string)vMidBytecode.StepInstructions[0].Arguments[0]);
+ Assert.Equal("V", vMidBytecode.StepInstructions[1].OperatorName);
+ Assert.Equal(1, (int)vMidBytecode.StepInstructions[1].Arguments[0]);
+ Assert.Equal(2, (int)vMidBytecode.StepInstructions[1].Arguments[1]); // ID should be extracted from Vertex
+
+ // Test edge creation with from/to vertices
+ var fromTo = g.AddE("Edge").From(new Vertex(1)).To(new Vertex(2));
+ var fromToBytecode = fromTo.Bytecode;
+ Assert.Equal(3, fromToBytecode.StepInstructions.Count);
+ Assert.Equal("addE", fromToBytecode.StepInstructions[0].OperatorName);
+ Assert.Equal("Edge", (string)fromToBytecode.StepInstructions[0].Arguments[0]);
+ Assert.Equal("from", fromToBytecode.StepInstructions[1].OperatorName);
+ Assert.Equal(1, (int)fromToBytecode.StepInstructions[1].Arguments[0]); // ID should be extracted from Vertex
+ Assert.Equal("to", fromToBytecode.StepInstructions[2].OperatorName);
+ Assert.Equal(2, (int)fromToBytecode.StepInstructions[2].Arguments[0]); // ID should be extracted from Vertex
+
+ // Test mergeE() with Vertex in dictionary
+ var mergeMap = new Dictionary<object, object>
+ {
+ { T.Label, "knows" },
+ { Direction.Out, new Vertex(1) },
+ { Direction.In, new Vertex(2) }
+ };
+
+ var mergeEStart = g.MergeE(mergeMap);
+ var mergeEStartBytecode = mergeEStart.Bytecode;
+ Assert.Single(mergeEStartBytecode.StepInstructions);
+ Assert.Equal("mergeE", mergeEStartBytecode.StepInstructions[0].OperatorName);
+
+ // Check that the dictionary contains extracted IDs
+ var mergeMapArg = (Dictionary<object, object>)mergeEStartBytecode.StepInstructions[0].Arguments[0];
+ Assert.Equal("knows", (string)mergeMapArg[T.Label]);
+ Assert.Equal(1, (int)mergeMapArg[Direction.Out]); // ID should be extracted from Vertex
+ Assert.Equal(2, (int)mergeMapArg[Direction.In]); // ID should be extracted from Vertex
+
+ // Test mergeE() in the middle of a traversal
+ var mergeEMid = g.Inject("foo").MergeE(mergeMap);
+ var mergeEMidBytecode = mergeEMid.Bytecode;
+ Assert.Equal(2, mergeEMidBytecode.StepInstructions.Count);
+ Assert.Equal("inject", mergeEMidBytecode.StepInstructions[0].OperatorName);
+ Assert.Equal("foo", (string)mergeEMidBytecode.StepInstructions[0].Arguments[0]);
+ Assert.Equal("mergeE", mergeEMidBytecode.StepInstructions[1].OperatorName);
+
+ // Check that the dictionary contains extracted IDs
+ var mergeMapArg2 = (Dictionary<object, object>)mergeEMidBytecode.StepInstructions[1].Arguments[0];
+ Assert.Equal("knows", (string)mergeMapArg2[T.Label]);
+ Assert.Equal(1, (int)mergeMapArg2[Direction.Out]); // ID should be extracted from Vertex
+ Assert.Equal(2, (int)mergeMapArg2[Direction.In]); // ID should be extracted from Vertex
+ }
}
}
\ No newline at end of file
diff --git a/gremlin-dotnet/test/pom.xml b/gremlin-dotnet/test/pom.xml
index eb2a915..4e18f40 100644
--- a/gremlin-dotnet/test/pom.xml
+++ b/gremlin-dotnet/test/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-dotnet</artifactId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>gremlin-dotnet-tests</artifactId>
<name>Apache TinkerPop :: Gremlin.Net - Tests</name>
@@ -76,9 +76,10 @@
<id>gremlin-dotnet</id>
<activation>
<activeByDefault>false</activeByDefault>
- <file>
- <exists>.glv</exists>
- </file>
+ <!-- TODO re-enable after gremlin-dotnet is implemented -->
+<!-- <file>-->
+<!-- <exists>.glv</exists>-->
+<!-- </file>-->
</activation>
<build>
<finalName>${project.artifactId}-${project.version}</finalName>
diff --git a/gremlin-driver/pom.xml b/gremlin-driver/pom.xml
index 55cbec3..53e04d0 100644
--- a/gremlin-driver/pom.xml
+++ b/gremlin-driver/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>gremlin-driver</artifactId>
<name>Apache TinkerPop :: Gremlin Driver</name>
@@ -50,6 +50,36 @@
<artifactId>logback-classic</artifactId>
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>http-auth-aws</artifactId>
+ <version>${awssdk.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>http-client-spi</artifactId>
+ <version>${awssdk.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>http-auth-spi</artifactId>
+ <version>${awssdk.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>auth</artifactId>
+ <version>${awssdk.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>utils</artifactId>
+ <version>${awssdk.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>protocol-core</artifactId>
+ <version>${awssdk.version}</version>
+ </dependency>
<!-- TinkerGraph is an optional dependency that is only required if doing deserialization of Graph instances -->
<dependency>
<groupId>org.apache.tinkerpop</groupId>
@@ -65,12 +95,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.tinkerpop</groupId>
- <artifactId>gremlin-socket-server</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
@@ -154,9 +178,8 @@
<artifactSet>
<!-- exclude logging stuff from uberjar - shading prevents proper logger initialization -->
<excludes>
- <exclude>ch.qos.logback:logback-classic</exclude>
+ <exclude>ch.qos.logback:*</exclude>
<exclude>org.slf4j:slf4j-api</exclude>
- <exclude>org.slf4j:jcl-over-slf4j</exclude>
</excludes>
</artifactSet>
<relocations>
diff --git a/gremlin-driver/src/main/java/examples/Connections.java b/gremlin-driver/src/main/java/examples/Connections.java
index 458d5c8..0c6eb51 100644
--- a/gremlin-driver/src/main/java/examples/Connections.java
+++ b/gremlin-driver/src/main/java/examples/Connections.java
@@ -19,7 +19,6 @@
package examples;
-import org.apache.tinkerpop.gremlin.driver.Channelizer;
import org.apache.tinkerpop.gremlin.driver.Client;
import org.apache.tinkerpop.gremlin.driver.Cluster;
import org.apache.tinkerpop.gremlin.driver.remote.DriverRemoteConnection;
@@ -30,7 +29,7 @@
import org.apache.tinkerpop.gremlin.structure.io.binary.TypeSerializerRegistry;
import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
import org.apache.tinkerpop.gremlin.util.MessageSerializer;
-import org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1;
+import org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV4;
import static org.apache.tinkerpop.gremlin.process.traversal.AnonymousTraversalSource.traversal;
@@ -76,12 +75,10 @@
// See reference/#gremlin-java-configuration for full list of configurations
private static void withCluster() throws Exception {
Cluster cluster = Cluster.build("localhost").
- channelizer(Channelizer.WebSocketChannelizer.class).
- keepAliveInterval(180000).
maxConnectionPoolSize(8).
path("/gremlin").
port(8182).
- serializer(new GraphBinaryMessageSerializerV1()).
+ serializer(new GraphBinaryMessageSerializerV4()).
create();
GraphTraversalSource g = traversal().withRemote(DriverRemoteConnection.using(cluster, "g"));
@@ -97,7 +94,7 @@
private static void withSerializer() throws Exception {
IoRegistry registry = new FakeIoRegistry(); // an IoRegistry instance exposed by a specific graph provider
TypeSerializerRegistry typeSerializerRegistry = TypeSerializerRegistry.build().addRegistry(registry).create();
- MessageSerializer serializer = new GraphBinaryMessageSerializerV1(typeSerializerRegistry);
+ MessageSerializer serializer = new GraphBinaryMessageSerializerV4(typeSerializerRegistry);
Cluster cluster = Cluster.build("localhost").
serializer(serializer).
create();
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/AuthProperties.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/AuthProperties.java
deleted file mode 100644
index 2c1b4d4..0000000
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/AuthProperties.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Properties to supply to the {@link Cluster} for authentication purposes.
- */
-public class AuthProperties {
-
- /**
- * An enum of the available authorization properties.
- */
- public enum Property {
- /**
- * The username.
- */
- USERNAME,
-
- /**
- * The password.
- */
- PASSWORD,
-
- /**
- * The protocol for which the authentication is being performed (e.g., "ldap").
- */
- PROTOCOL,
-
- /**
- * The name used as the index into the configuration for the {@code LoginContext}.
- */
- JAAS_ENTRY
- }
-
- private final Map<Property, String> properties = new HashMap<>();
-
- /**
- * Adds a {@link Property} with value to the authorization property set.
- */
- public AuthProperties with(final Property key, final String value) {
- properties.put(key, value);
- return this;
- }
-
- /**
- * Gets a property given the key.
- */
- public String get(final Property key) {
- return properties.get(key);
- }
-}
\ No newline at end of file
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Channelizer.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Channelizer.java
index 6bafcd7..250bbf3 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Channelizer.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Channelizer.java
@@ -18,38 +18,37 @@
*/
package org.apache.tinkerpop.gremlin.driver;
-import org.apache.tinkerpop.gremlin.driver.exception.ConnectionException;
-import org.apache.tinkerpop.gremlin.driver.handler.HttpGremlinRequestEncoder;
-import org.apache.tinkerpop.gremlin.driver.handler.HttpGremlinResponseDecoder;
-import org.apache.tinkerpop.gremlin.driver.handler.WebSocketClientHandler;
-import org.apache.tinkerpop.gremlin.driver.handler.WebSocketGremlinRequestEncoder;
-import org.apache.tinkerpop.gremlin.driver.handler.WebSocketGremlinResponseDecoder;
import io.netty.channel.Channel;
import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelInitializer;
import io.netty.channel.ChannelPipeline;
import io.netty.channel.socket.SocketChannel;
-import io.netty.handler.codec.http.HttpHeaders;
import io.netty.handler.codec.http.HttpClientCodec;
import io.netty.handler.codec.http.HttpObjectAggregator;
-import io.netty.handler.codec.http.DefaultHttpHeaders;
-import io.netty.handler.codec.http.websocketx.CloseWebSocketFrame;
-import io.netty.handler.codec.http.websocketx.WebSocketVersion;
-import io.netty.handler.codec.http.websocketx.extensions.compression.WebSocketClientCompressionHandler;
+import io.netty.handler.codec.http.HttpResponseStatus;
import io.netty.handler.ssl.SslContext;
import io.netty.handler.ssl.SslHandler;
import io.netty.handler.timeout.IdleStateHandler;
+import org.apache.tinkerpop.gremlin.driver.exception.ConnectionException;
+import org.apache.tinkerpop.gremlin.driver.handler.GremlinResponseHandler;
+import org.apache.tinkerpop.gremlin.driver.handler.HttpContentDecompressionHandler;
+import org.apache.tinkerpop.gremlin.driver.handler.HttpGremlinRequestEncoder;
+import org.apache.tinkerpop.gremlin.driver.handler.HttpGremlinResponseDecoder;
+import org.apache.tinkerpop.gremlin.driver.handler.IdleConnectionHandler;
+import org.apache.tinkerpop.gremlin.driver.handler.InactiveChannelHandler;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
+import java.util.Collections;
import java.util.Optional;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicReference;
-import static java.lang.Math.toIntExact;
+import static io.netty.handler.codec.http.HttpClientCodec.DEFAULT_FAIL_ON_MISSING_RESPONSE;
+import static io.netty.handler.codec.http.HttpClientCodec.DEFAULT_PARSE_HTTP_AFTER_CONNECT_REQUEST;
+import static io.netty.handler.codec.http.HttpObjectDecoder.DEFAULT_ALLOW_DUPLICATE_CONTENT_LENGTHS;
+import static io.netty.handler.codec.http.HttpObjectDecoder.DEFAULT_INITIAL_BUFFER_SIZE;
+import static io.netty.handler.codec.http.HttpObjectDecoder.DEFAULT_MAX_HEADER_SIZE;
+import static io.netty.handler.codec.http.HttpObjectDecoder.DEFAULT_MAX_INITIAL_LINE_LENGTH;
+import static io.netty.handler.codec.http.HttpObjectDecoder.DEFAULT_VALIDATE_HEADERS;
/**
* Client-side channel initializer interface. It is responsible for constructing the Netty {@code ChannelPipeline}
@@ -62,27 +61,27 @@
/**
* Initializes the {@code Channelizer}. Called just after construction.
*/
- public void init(final Connection connection);
+ void init(final Connection connection);
/**
* Called on {@link Connection#closeAsync()} to perform an {@code Channelizer} specific functions. Note that the
* {@link Connection} already calls {@code Channel.close()} so there is no need to call that method here.
* An implementation will typically use this method to send a {@code Channelizer} specific message to the
- * server to notify of shutdown coming from the client side (e.g. a "close" websocket frame).
+ * server to notify of shutdown coming from the client side.
*/
- public void close(final Channel channel);
+ void close(final Channel channel);
/**
* Called after the channel connects. The {@code Channelizer} may need to perform some functions, such as a
* handshake.
*/
- public default void connected() {
+ default void connected() {
}
/**
* Gets the scheme to use to construct the URL and by default uses HTTP.
*/
- public default String getScheme(final boolean sslEnabled) {
+ default String getScheme(final boolean sslEnabled) {
return sslEnabled ? "https" : "http";
}
@@ -92,11 +91,24 @@
abstract class AbstractChannelizer extends ChannelInitializer<SocketChannel> implements Channelizer {
protected Connection connection;
protected Cluster cluster;
- private ConcurrentMap<UUID, ResultQueue> pending;
+ protected SslHandler sslHandler;
+ private AtomicReference<ResultQueue> pending;
- protected static final String PIPELINE_GREMLIN_SASL_HANDLER = "gremlin-sasl-handler";
protected static final String PIPELINE_GREMLIN_HANDLER = "gremlin-handler";
- public static final String PIPELINE_SSL_HANDLER = "gremlin-ssl-handler";
+ protected static final String PIPELINE_SSL_HANDLER = "gremlin-ssl-handler";
+ protected static final String PIPELINE_IDLE_STATE_HANDLER = "idle-state-handler";
+ protected static final String PIPELINE_IDLE_CONNECTION_HANDLER = "idle-connection-handler";
+ protected static final String PIPELINE_HTTP_CODEC = "http-codec";
+ protected static final String PIPELINE_HTTP_AGGREGATOR = "http-aggregator";
+ protected static final String PIPELINE_HTTP_ENCODER = "gremlin-encoder";
+ protected static final String PIPELINE_HTTP_DECODER = "gremlin-decoder";
+ protected static final String PIPELINE_HTTP_DECOMPRESSION_HANDLER = "http-decompression-handler";
+
+ private static final String HANDSHAKE_ERROR = "Could not complete connection setup to the server. Ensure that SSL is correctly " +
+ "configured at both the client and the server. Ensure that client http handshake " +
+ "protocol matches the server. Ensure that the server is still reachable.";
+
+ private static final InactiveChannelHandler inactiveChannelHandler = new InactiveChannelHandler();
public boolean supportsSsl() {
return cluster.connectionPoolSettings().enableSsl;
@@ -121,7 +133,7 @@
}
@Override
- protected void initChannel(final SocketChannel socketChannel) throws Exception {
+ protected void initChannel(final SocketChannel socketChannel) {
final ChannelPipeline pipeline = socketChannel.pipeline();
final Optional<SslContext> sslCtx;
if (supportsSsl()) {
@@ -135,143 +147,65 @@
}
if (sslCtx.isPresent()) {
- final SslHandler sslHandler = sslCtx.get().newHandler(socketChannel.alloc(), connection.getUri().getHost(), connection.getUri().getPort());
+ sslHandler = sslCtx.get().newHandler(socketChannel.alloc(), connection.getUri().getHost(), connection.getUri().getPort());
// TINKERPOP-2814. Remove the SSL handshake timeout so that handshakes that take longer than 10000ms
// (Netty default) but less than connectionSetupTimeoutMillis can succeed. This means the SSL handshake
// will instead be capped by connectionSetupTimeoutMillis.
sslHandler.setHandshakeTimeoutMillis(0);
pipeline.addLast(PIPELINE_SSL_HANDLER, sslHandler);
+ } else {
+ pipeline.addLast(PIPELINE_SSL_HANDLER, inactiveChannelHandler);
}
configure(pipeline);
- pipeline.addLast(PIPELINE_GREMLIN_SASL_HANDLER, new Handler.GremlinSaslAuthenticationHandler(cluster.authProperties()));
- pipeline.addLast(PIPELINE_GREMLIN_HANDLER, new Handler.GremlinResponseHandler(pending));
- }
- }
-
- /**
- * WebSocket {@link Channelizer} implementation.
- */
- public final class WebSocketChannelizer extends AbstractChannelizer {
- private static final Logger logger = LoggerFactory.getLogger(WebSocketChannelizer.class);
- private WebSocketClientHandler handler;
-
- private WebSocketGremlinRequestEncoder gremlinRequestEncoder;
- private WebSocketGremlinResponseDecoder gremlinResponseDecoder;
-
- @Override
- public void init(final Connection connection) {
- super.init(connection);
- gremlinRequestEncoder = new WebSocketGremlinRequestEncoder(true, cluster.getSerializer());
- gremlinResponseDecoder = new WebSocketGremlinResponseDecoder(cluster.getSerializer());
- }
-
- /**
- * Sends a {@code CloseWebSocketFrame} to the server for the specified channel.
- */
- @Override
- public void close(final Channel channel) {
- if (channel.isOpen()) {
- if (logger.isDebugEnabled()) {
- logger.debug("Sending CloseWS frame to server from channel={}", channel.id().asShortText());
- }
- channel.writeAndFlush(new CloseWebSocketFrame());
- }
- }
-
- @Override
- public boolean supportsSsl() {
- final String scheme = connection.getUri().getScheme();
- return "wss".equalsIgnoreCase(scheme);
- }
-
- @Override
- public void configure(final ChannelPipeline pipeline) {
- final String scheme = connection.getUri().getScheme();
- if (!"ws".equalsIgnoreCase(scheme) && !"wss".equalsIgnoreCase(scheme))
- throw new IllegalStateException("Unsupported scheme (only ws: or wss: supported): " + scheme);
-
- if (!supportsSsl() && "wss".equalsIgnoreCase(scheme))
- throw new IllegalStateException("To use wss scheme ensure that enableSsl is set to true in configuration");
-
- final int maxContentLength = cluster.connectionPoolSettings().maxContentLength;
- final HttpHeaders httpHeaders = new DefaultHttpHeaders();
- if(connection.getCluster().isUserAgentOnConnectEnabled()) {
- httpHeaders.set(UserAgent.USER_AGENT_HEADER_NAME, UserAgent.USER_AGENT);
- }
- handler = new WebSocketClientHandler(
- new WebSocketClientHandler.InterceptedWebSocketClientHandshaker13(
- connection.getUri(), WebSocketVersion.V13, null, true,
- httpHeaders, maxContentLength, true, false, -1,
- cluster.getRequestInterceptor()), cluster.getConnectionSetupTimeout(), supportsSsl());
-
- final int keepAliveInterval = toIntExact(TimeUnit.SECONDS.convert(
- cluster.connectionPoolSettings().keepAliveInterval, TimeUnit.MILLISECONDS));
-
- pipeline.addLast("http-codec", new HttpClientCodec());
- pipeline.addLast("aggregator", new HttpObjectAggregator(maxContentLength));
- if (connection.getCluster().enableCompression()) {
- // Add compression extension for WebSocket defined in https://tools.ietf.org/html/rfc7692
- pipeline.addLast(WebSocketClientCompressionHandler.INSTANCE);
- }
- pipeline.addLast("idle-state-Handler", new IdleStateHandler(0, keepAliveInterval, 0));
- pipeline.addLast("ws-handler", handler);
- pipeline.addLast("gremlin-encoder", gremlinRequestEncoder);
- pipeline.addLast("gremlin-decoder", gremlinResponseDecoder);
+ pipeline.addLast(PIPELINE_GREMLIN_HANDLER, new GremlinResponseHandler(pending));
}
@Override
public void connected() {
- try {
- // Block until the handshake is complete either successfully or with an error. The handshake future
- // will complete with a timeout exception after some time so it is guaranteed that this future will
- // complete.
- // If future completed with an exception more than likely, SSL is enabled on the server, but the client
- // forgot to enable it or perhaps the server is not configured for websockets.
- handler.handshakeFuture().sync();
- } catch (Exception ex) {
- String errMsg = "";
- if (ex instanceof TimeoutException) {
- errMsg = "Timed out while waiting to complete the connection setup. Consider increasing the " +
- "WebSocket handshake timeout duration.";
- } else {
- errMsg = "Could not complete connection setup to the server. Ensure that SSL is correctly " +
- "configured at both the client and the server. Ensure that client WebSocket handshake " +
- "protocol matches the server. Ensure that the server is still reachable.";
+ if (supportsSsl()) {
+ try {
+ // Block until the handshake is complete either successfully or with an error.
+ sslHandler.handshakeFuture().sync();
+ } catch (Exception ex) {
+ throw new ConnectionException(connection.getUri(), HANDSHAKE_ERROR, ex);
}
- throw new ConnectionException(connection.getUri(), errMsg, ex);
}
}
-
- @Override
- public String getScheme(boolean sslEnabled) {
- return sslEnabled ? "wss" : "ws";
- }
}
/**
* Sends requests over the HTTP endpoint. Client functionality is governed by the limitations of the HTTP endpoint,
* meaning that sessions are not available and as such {@code tx()} (i.e. transactions) are not available over this
- * channelizer. Only sessionless requests are possible. Some driver configuration options may not be relevant when
- * using HTTP, such as {@link Tokens#ARGS_BATCH_SIZE} since HTTP does not stream results back in that fashion.
+ * channelizer. Only sessionless requests are possible.
*/
- public final class HttpChannelizer extends AbstractChannelizer {
-
- private HttpClientCodec handler;
+ final class HttpChannelizer extends AbstractChannelizer {
+ /**
+ * This response is used as a signal for determining if all content of the response has been read.
+ */
+ public static final ResponseMessage LAST_CONTENT_READ_RESPONSE =
+ ResponseMessage.build().code(HttpResponseStatus.NO_CONTENT).result(Collections.emptyList()).create();
private HttpGremlinRequestEncoder gremlinRequestEncoder;
private HttpGremlinResponseDecoder gremlinResponseDecoder;
+ private HttpContentDecompressionHandler httpCompressionDecoder;
+ private IdleStateHandler idleStateHandler;
+ private IdleConnectionHandler idleConnectionHandler;
+
@Override
public void init(final Connection connection) {
super.init(connection);
- // server does not support sessions so this channerlizer can't support the SessionedClient
- if (connection.getClient() instanceof Client.SessionedClient)
- throw new IllegalStateException(String.format("Cannot use sessions or tx() with %s", HttpChannelizer.class.getSimpleName()));
-
- gremlinRequestEncoder = new HttpGremlinRequestEncoder(cluster.getSerializer(), cluster.getRequestInterceptor(), cluster.isUserAgentOnConnectEnabled());
+ httpCompressionDecoder = new HttpContentDecompressionHandler();
+ gremlinRequestEncoder = new HttpGremlinRequestEncoder(cluster.getSerializer(), cluster.getRequestInterceptors(),
+ cluster.isUserAgentOnConnectEnabled(), cluster.isBulkResultsEnabled(), connection.getUri());
gremlinResponseDecoder = new HttpGremlinResponseDecoder(cluster.getSerializer());
+ if (cluster.getIdleConnectionTimeout() > 0) {
+ final int idleConnectionTimeout = (int) (cluster.getIdleConnectionTimeout() / 1000);
+ idleStateHandler = new IdleStateHandler(idleConnectionTimeout, idleConnectionTimeout, 0);
+ idleConnectionHandler = new IdleConnectionHandler();
+ }
}
@Override
@@ -294,13 +228,23 @@
if (!supportsSsl() && "https".equalsIgnoreCase(scheme))
throw new IllegalStateException("To use https scheme ensure that enableSsl is set to true in configuration");
- final int maxContentLength = cluster.connectionPoolSettings().maxContentLength;
- handler = new HttpClientCodec();
+ if (cluster.getIdleConnectionTimeout() > 0) {
+ // idle connection handling is enabled
+ pipeline.addLast(PIPELINE_IDLE_STATE_HANDLER, idleStateHandler);
+ pipeline.addLast(PIPELINE_IDLE_CONNECTION_HANDLER, idleConnectionHandler);
+ }
- pipeline.addLast("http-codec", handler);
- pipeline.addLast("aggregator", new HttpObjectAggregator(maxContentLength));
- pipeline.addLast("gremlin-encoder", gremlinRequestEncoder);
- pipeline.addLast("gremlin-decoder", gremlinResponseDecoder);
+ final HttpClientCodec handler = new HttpClientCodec(DEFAULT_MAX_INITIAL_LINE_LENGTH, DEFAULT_MAX_HEADER_SIZE,
+ 1024 * 1024, DEFAULT_FAIL_ON_MISSING_RESPONSE,
+ DEFAULT_VALIDATE_HEADERS, DEFAULT_INITIAL_BUFFER_SIZE, DEFAULT_PARSE_HTTP_AFTER_CONNECT_REQUEST,
+ DEFAULT_ALLOW_DUPLICATE_CONTENT_LENGTHS, false);
+
+ pipeline.addLast(PIPELINE_HTTP_CODEC, handler);
+ pipeline.addLast(PIPELINE_HTTP_AGGREGATOR, new HttpObjectAggregator(cluster.getMaxResponseContentLength() > 0
+ ? (int) cluster.getMaxResponseContentLength() : Integer.MAX_VALUE));
+ pipeline.addLast(PIPELINE_HTTP_ENCODER, gremlinRequestEncoder);
+ pipeline.addLast(PIPELINE_HTTP_DECOMPRESSION_HANDLER, httpCompressionDecoder);
+ pipeline.addLast(PIPELINE_HTTP_DECODER, gremlinResponseDecoder);
}
}
}
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java
index 989a00d..33df22b 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java
@@ -18,32 +18,22 @@
*/
package org.apache.tinkerpop.gremlin.driver;
-import io.netty.handler.codec.http.websocketx.WebSocketClientHandshakeException;
import org.apache.commons.lang3.exception.ExceptionUtils;
-import org.apache.tinkerpop.gremlin.util.Tokens;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.apache.tinkerpop.gremlin.driver.exception.ConnectionException;
import org.apache.tinkerpop.gremlin.driver.exception.NoHostAvailableException;
-import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
-import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.net.ssl.SSLException;
import java.net.ConnectException;
import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.Optional;
import java.util.Random;
-import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionException;
import java.util.concurrent.ConcurrentHashMap;
@@ -52,11 +42,8 @@
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Consumer;
-import java.util.function.Supplier;
import java.util.stream.Collectors;
-import static org.apache.tinkerpop.gremlin.driver.RequestOptions.getRequestOptions;
-
/**
* A {@code Client} is constructed from a {@link Cluster} and represents a way to send messages to Gremlin Server.
* This class itself is a base class as there are different implementations that provide differing kinds of
@@ -69,18 +56,16 @@
public abstract class Client {
private static final Logger logger = LoggerFactory.getLogger(Client.class);
- public static final String TOO_MANY_IN_FLIGHT_REQUESTS = "Number of active requests exceeds pool size. " +
+ public static final String TOO_MANY_IN_FLIGHT_REQUESTS = "Number of active requests (%s) exceeds pool size (%s). " +
"Consider increasing the value for maxConnectionPoolSize.";
protected final Cluster cluster;
protected volatile boolean initialized;
- protected final Client.Settings settings;
private static final Random random = new Random();
- Client(final Cluster cluster, final Client.Settings settings) {
+ Client(final Cluster cluster) {
this.cluster = cluster;
- this.settings = settings;
}
/**
@@ -114,94 +99,7 @@
* @param graphOrTraversalSource rebinds the specified global Gremlin Server variable to "g"
*/
public Client alias(final String graphOrTraversalSource) {
- return alias(makeDefaultAliasMap(graphOrTraversalSource));
- }
-
- /**
- * Creates a {@code Client} that supplies the specified set of aliases, thus allowing the user to re-name
- * one or more globally defined {@link Graph} or {@link TraversalSource} server bindings for the context of
- * the created {@code Client}.
- */
- public Client alias(final Map<String, String> aliases) {
- return new AliasClusteredClient(this, aliases, settings);
- }
-
- /**
- * Submit a {@link Traversal} to the server for remote execution.Results are returned as {@link Traverser}
- * instances and are therefore bulked, meaning that to properly iterate the contents of the result each
- * {@link Traverser#bulk()} must be examined to determine the number of times that object should be presented in
- * iteration.
- */
- public ResultSet submit(final Traversal traversal) {
- try {
- return submitAsync(traversal).get();
- } catch (RuntimeException re) {
- throw re;
- } catch (Exception ex) {
- throw new RuntimeException(ex);
- }
- }
-
- /**
- * An asynchronous version of {@link #submit(Traversal)}. Results are returned as {@link Traverser} instances and
- * are therefore bulked, meaning that to properly iterate the contents of the result each {@link Traverser#bulk()}
- * must be examined to determine the number of times that object should be presented in iteration.
- */
- public CompletableFuture<ResultSet> submitAsync(final Traversal traversal) {
- throw new UnsupportedOperationException("This implementation does not support Traversal submission - use a sessionless Client created with from the alias() method");
- }
-
- /**
- * Submit a {@link Bytecode} to the server for remote execution. Results are returned as {@link Traverser}
- * instances and are therefore bulked, meaning that to properly iterate the contents of the result each
- * {@link Traverser#bulk()} must be examined to determine the number of times that object should be presented in
- * iteration.
- */
- public ResultSet submit(final Bytecode bytecode) {
- try {
- return submitAsync(bytecode).get();
- } catch (RuntimeException re) {
- throw re;
- } catch (Exception ex) {
- throw new RuntimeException(ex);
- }
- }
-
- /**
- * A version of {@link #submit(Bytecode)} which provides the ability to set per-request options.
- *
- * @param bytecode request in the form of gremlin {@link Bytecode}
- * @param options for the request
- * @see #submit(Bytecode)
- */
- public ResultSet submit(final Bytecode bytecode, final RequestOptions options) {
- try {
- return submitAsync(bytecode, options).get();
- } catch (RuntimeException re) {
- throw re;
- } catch (Exception ex) {
- throw new RuntimeException(ex);
- }
- }
-
- /**
- * An asynchronous version of {@link #submit(Traversal)}. Results are returned as {@link Traverser} instances and
- * are therefore bulked, meaning that to properly iterate the contents of the result each {@link Traverser#bulk()}
- * must be examined to determine the number of times that object should be presented in iteration.
- */
- public CompletableFuture<ResultSet> submitAsync(final Bytecode bytecode) {
- throw new UnsupportedOperationException("This implementation does not support Traversal submission - use a sessionless Client created with from the alias() method");
- }
-
- /**
- * A version of {@link #submit(Bytecode)} which provides the ability to set per-request options.
- *
- * @param bytecode request in the form of gremlin {@link Bytecode}
- * @param options for the request
- * @see #submitAsync(Bytecode)
- */
- public CompletableFuture<ResultSet> submitAsync(final Bytecode bytecode, final RequestOptions options) {
- throw new UnsupportedOperationException("This implementation does not support Traversal submission - use a sessionless Client created with from the alias() method");
+ return new AliasClusteredClient(this, graphOrTraversalSource);
}
/**
@@ -307,32 +205,8 @@
@Deprecated
public CompletableFuture<ResultSet> submitAsync(final String gremlin, final String graphOrTraversalSource,
final Map<String, Object> parameters) {
- Map<String, String> aliases = null;
- if (graphOrTraversalSource != null && !graphOrTraversalSource.isEmpty()) {
- aliases = makeDefaultAliasMap(graphOrTraversalSource);
- }
-
- return submitAsync(gremlin, aliases, parameters);
- }
-
- /**
- * The asynchronous version of {@link #submit(String, Map)}} where the returned future will complete when the
- * write of the request completes.
- *
- * @param gremlin the gremlin script to execute
- * @param parameters a map of parameters that will be bound to the script on execution
- * @param aliases aliases the specified global Gremlin Server variable some other name that then be used in the
- * script where the key is the alias name and the value represents the global variable on the
- * server
- * @deprecated As of release 3.4.0, replaced by {@link #submitAsync(String, RequestOptions)}.
- */
- @Deprecated
- public CompletableFuture<ResultSet> submitAsync(final String gremlin, final Map<String, String> aliases,
- final Map<String, Object> parameters) {
final RequestOptions.Builder options = RequestOptions.build();
- if (aliases != null && !aliases.isEmpty()) {
- aliases.forEach(options::addAlias);
- }
+ options.addG(graphOrTraversalSource);
if (parameters != null && !parameters.isEmpty()) {
parameters.forEach(options::addParameter);
@@ -355,18 +229,16 @@
// need to call buildMessage() right away to get client specific configurations, that way request specific
// ones can override as needed
- final RequestMessage.Builder request = buildMessage(RequestMessage.build(Tokens.OPS_EVAL))
- .add(Tokens.ARGS_GREMLIN, gremlin)
- .add(Tokens.ARGS_BATCH_SIZE, batchSize);
+ final RequestMessage.Builder request = buildMessage(RequestMessage.build(gremlin))
+ .addChunkSize(batchSize);
// apply settings if they were made available
- options.getTimeout().ifPresent(timeout -> request.add(Tokens.ARGS_EVAL_TIMEOUT, timeout));
- options.getParameters().ifPresent(params -> request.addArg(Tokens.ARGS_BINDINGS, params));
- options.getAliases().ifPresent(aliases -> request.addArg(Tokens.ARGS_ALIASES, aliases));
- options.getOverrideRequestId().ifPresent(request::overrideRequestId);
- options.getUserAgent().ifPresent(userAgent -> request.addArg(Tokens.ARGS_USER_AGENT, userAgent));
- options.getLanguage().ifPresent(lang -> request.addArg(Tokens.ARGS_LANGUAGE, lang));
- options.getMaterializeProperties().ifPresent(mp -> request.addArg(Tokens.ARGS_MATERIALIZE_PROPERTIES, mp));
+ options.getTimeout().ifPresent(timeout -> request.addTimeoutMillis(timeout));
+ options.getParameters().ifPresent(params -> request.addBindings(params));
+ options.getG().ifPresent(g -> request.addG(g));
+ options.getLanguage().ifPresent(lang -> request.addLanguage(lang));
+ options.getMaterializeProperties().ifPresent(mp -> request.addMaterializeProperties(mp));
+ options.getBulkResults().ifPresent(bulked -> request.addBulkResults(Boolean.parseBoolean(bulked)));
return submitAsync(request.create());
}
@@ -408,39 +280,24 @@
}
/**
- * Gets the {@link Client.Settings}.
- */
- public Settings getSettings() {
- return settings;
- }
-
- /**
* Gets the {@link Cluster} that spawned this {@code Client}.
*/
public Cluster getCluster() {
return cluster;
}
- protected Map<String, String> makeDefaultAliasMap(final String graphOrTraversalSource) {
- final Map<String, String> aliases = new HashMap<>();
- aliases.put("g", graphOrTraversalSource);
- return aliases;
- }
-
/**
- * A {@code Client} implementation that does not operate in a session. Requests are sent to multiple servers
- * given a {@link LoadBalancingStrategy}. Transactions are automatically committed
- * (or rolled-back on error) after each request.
+ * A {@code Client} implementation. Requests are sent to multiple servers given a {@link LoadBalancingStrategy}.
+ * Transactions are automatically committed (or rolled-back on error) after each request.
*/
public final static class ClusteredClient extends Client {
- Supplier<ConnectionFactory> connectionFactorySupplier = ConnectionFactory.DefaultConnectionFactory::new;
final ConcurrentMap<Host, ConnectionPool> hostConnectionPools = new ConcurrentHashMap<>();
private final AtomicReference<CompletableFuture<Void>> closing = new AtomicReference<>(null);
private Throwable initializationFailure = null;
- ClusteredClient(final Cluster cluster, final Client.Settings settings) {
- super(cluster, settings);
+ ClusteredClient(final Cluster cluster) {
+ super(cluster);
}
@Override
@@ -483,17 +340,7 @@
*/
@Override
public Client alias(final String graphOrTraversalSource) {
- final Map<String, String> aliases = new HashMap<>();
- aliases.put("g", graphOrTraversalSource);
- return alias(aliases);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Client alias(final Map<String, String> aliases) {
- return new AliasClusteredClient(this, aliases, settings);
+ return new AliasClusteredClient(this, graphOrTraversalSource);
}
/**
@@ -559,8 +406,7 @@
private void throwNoHostAvailableException() {
final Throwable rootCause = ExceptionUtils.getRootCause(initializationFailure);
// allow the certain exceptions to propagate as a cause
- if (rootCause instanceof SSLException || rootCause instanceof ConnectException ||
- rootCause instanceof WebSocketClientHandshakeException) {
+ if (rootCause instanceof SSLException || rootCause instanceof ConnectException) {
throw new NoHostAvailableException(initializationFailure);
} else {
throw new NoHostAvailableException();
@@ -584,11 +430,10 @@
return closing.get();
}
- private Consumer<Host> initializeConnectionSetupForHost = host -> {
+ private final Consumer<Host> initializeConnectionSetupForHost = host -> {
try {
// hosts that don't initialize connection pools will come up as a dead host.
- hostConnectionPools.put(host, new ConnectionPool(host, ClusteredClient.this,
- Optional.empty(), Optional.empty(), connectionFactorySupplier.get()));
+ hostConnectionPools.put(host, new ConnectionPool(host, ClusteredClient.this));
// hosts are not marked as available at cluster initialization and are made available here instead.
host.makeAvailable();
@@ -638,67 +483,25 @@
*/
public static class AliasClusteredClient extends Client {
private final Client client;
- private final Map<String, String> aliases = new HashMap<>();
+ private final String graphOrTraversalSource;
final CompletableFuture<Void> close = new CompletableFuture<>();
- AliasClusteredClient(final Client client, final Map<String, String> aliases, final Client.Settings settings) {
- super(client.cluster, settings);
+ AliasClusteredClient(final Client client, final String graphOrTraversalSource) {
+ super(client.cluster);
this.client = client;
- this.aliases.putAll(aliases);
- }
-
- @Override
- public CompletableFuture<ResultSet> submitAsync(final Bytecode bytecode) {
- return submitAsync(bytecode, getRequestOptions(bytecode));
- }
-
- @Override
- public CompletableFuture<ResultSet> submitAsync(final Bytecode bytecode, final RequestOptions options) {
- try {
- // need to call buildMessage() right away to get client specific configurations, that way request specific
- // ones can override as needed
- final RequestMessage.Builder request = buildMessage(RequestMessage.build(Tokens.OPS_BYTECODE)
- .processor("traversal")
- .addArg(Tokens.ARGS_GREMLIN, bytecode));
-
- // apply settings if they were made available
- options.getBatchSize().ifPresent(batchSize -> request.add(Tokens.ARGS_BATCH_SIZE, batchSize));
- options.getTimeout().ifPresent(timeout -> request.add(Tokens.ARGS_EVAL_TIMEOUT, timeout));
- options.getOverrideRequestId().ifPresent(request::overrideRequestId);
- options.getUserAgent().ifPresent(userAgent -> request.add(Tokens.ARGS_USER_AGENT, userAgent));
- options.getMaterializeProperties().ifPresent(mp -> request.addArg(Tokens.ARGS_MATERIALIZE_PROPERTIES, mp));
-
- return submitAsync(request.create());
- } catch (RuntimeException re) {
- throw re;
- } catch (Exception ex) {
- throw new RuntimeException(ex);
- }
+ this.graphOrTraversalSource = graphOrTraversalSource;
}
@Override
public CompletableFuture<ResultSet> submitAsync(final RequestMessage msg) {
final RequestMessage.Builder builder = RequestMessage.from(msg);
- // only add aliases which aren't already present. if they are present then they represent request level
- // overrides which should be mucked with
- if (!aliases.isEmpty()) {
- final Map original = (Map) msg.getArgs().getOrDefault(Tokens.ARGS_ALIASES, Collections.emptyMap());
- aliases.forEach((k, v) -> {
- if (!original.containsKey(k))
- builder.addArg(Tokens.ARGS_ALIASES, aliases);
- });
- }
+ builder.addG(graphOrTraversalSource);
return super.submitAsync(builder.create());
}
@Override
- public CompletableFuture<ResultSet> submitAsync(final Traversal traversal) {
- return submitAsync(traversal.asAdmin().getBytecode());
- }
-
- @Override
public synchronized Client init() {
if (close.isDone()) throw new IllegalStateException("Client is closed");
@@ -711,8 +514,7 @@
@Override
public RequestMessage.Builder buildMessage(final RequestMessage.Builder builder) {
if (close.isDone()) throw new IllegalStateException("Client is closed");
- if (!aliases.isEmpty())
- builder.addArg(Tokens.ARGS_ALIASES, aliases);
+ builder.addG(graphOrTraversalSource);
return client.buildMessage(builder);
}
@@ -755,275 +557,9 @@
* {@inheritDoc}
*/
@Override
- public Client alias(final Map<String, String> aliases) {
+ public Client alias(final String graphOrTraversalSource) {
if (close.isDone()) throw new IllegalStateException("Client is closed");
- return new AliasClusteredClient(client, aliases, settings);
- }
- }
-
- /**
- * A {@code Client} implementation that operates in the context of a session. Requests are sent to a single
- * server, where each request is bound to the same thread with the same set of bindings across requests.
- * Transaction are not automatically committed. It is up the client to issue commit/rollback commands.
- */
- public final static class SessionedClient extends Client {
- private final String sessionId;
- private final boolean manageTransactions;
- private final boolean maintainStateAfterException;
-
- private ConnectionPool connectionPool;
-
- private final AtomicReference<CompletableFuture<Void>> closing = new AtomicReference<>(null);
-
- SessionedClient(final Cluster cluster, final Client.Settings settings) {
- super(cluster, settings);
- this.sessionId = settings.getSession().get().sessionId;
- this.manageTransactions = settings.getSession().get().manageTransactions;
- this.maintainStateAfterException = settings.getSession().get().maintainStateAfterException;
- }
-
- /**
- * Returns the session identifier bound to this {@code Client}.
- */
- public String getSessionId() {
- return sessionId;
- }
-
- /**
- * Adds the {@link Tokens#ARGS_SESSION} value to every {@link RequestMessage}.
- */
- @Override
- public RequestMessage.Builder buildMessage(final RequestMessage.Builder builder) {
- builder.processor("session");
- builder.addArg(Tokens.ARGS_SESSION, sessionId);
- builder.addArg(Tokens.ARGS_MANAGE_TRANSACTION, manageTransactions);
- builder.addArg(Tokens.ARGS_MAINTAIN_STATE_AFTER_EXCEPTION, maintainStateAfterException);
- return builder;
- }
-
- /**
- * Since the session is bound to a single host, simply borrow a connection from that pool.
- */
- @Override
- protected Connection chooseConnection(final RequestMessage msg) throws TimeoutException, ConnectionException {
- return connectionPool.borrowConnection(cluster.connectionPoolSettings().maxWaitForConnection, TimeUnit.MILLISECONDS);
- }
-
- /**
- * Randomly choose an available {@link Host} to bind the session too and initialize the {@link ConnectionPool}.
- */
- @Override
- protected void initializeImplementation() {
- // chooses a host at random from all hosts
- if (cluster.allHosts().isEmpty()) {
- throw new IllegalStateException("No available host in the cluster");
- }
-
- final List<Host> hosts = new ArrayList<>(cluster.allHosts());
- Collections.shuffle(hosts);
- // if a host has been marked as available, use it instead
- Optional<Host> host = hosts.stream().filter(Host::isAvailable).findFirst();
- final Host selectedHost = host.orElse(hosts.get(0));
-
- // only mark host as available if we can initialize the connection pool successfully
- try {
- connectionPool = new ConnectionPool(selectedHost, this, Optional.of(1), Optional.of(1));
- selectedHost.makeAvailable();
- } catch (RuntimeException ex) {
- logger.error("Could not initialize client for {}", host, ex);
- throw new NoHostAvailableException(ex);
- }
- }
-
- @Override
- public boolean isClosing() {
- return closing.get() != null;
- }
-
- /**
- * Close the bound {@link ConnectionPool}.
- */
- @Override
- public synchronized CompletableFuture<Void> closeAsync() {
- if (closing.get() != null)
- return closing.get();
-
- // the connection pool may not have been initialized if requests weren't sent across it. in those cases
- // we just need to return a pre-completed future
- final CompletableFuture<Void> connectionPoolClose = null == connectionPool ?
- CompletableFuture.completedFuture(null) : connectionPool.closeAsync();
- closing.set(connectionPoolClose);
- return connectionPoolClose;
- }
- }
-
- /**
- * Settings given to {@link Cluster#connect(Client.Settings)} that configures how a {@link Client} will behave.
- */
- public static class Settings {
- private final Optional<SessionSettings> session;
-
- private Settings(final Builder builder) {
- this.session = builder.session;
- }
-
- public static Builder build() {
- return new Builder();
- }
-
- /**
- * Determines if the {@link Client} is to be constructed with a session. If the value is present, then a
- * session is expected.
- */
- public Optional<SessionSettings> getSession() {
- return session;
- }
-
- public static class Builder {
- private Optional<SessionSettings> session = Optional.empty();
-
- private Builder() {
- }
-
- /**
- * Enables a session. By default this will create a random session name and configure transactions to be
- * unmanaged. This method will override settings provided by calls to the other overloads of
- * {@code useSession}.
- */
- public Builder useSession(final boolean enabled) {
- session = enabled ? Optional.of(SessionSettings.build().create()) : Optional.empty();
- return this;
- }
-
- /**
- * Enables a session. By default this will create a session with the provided name and configure
- * transactions to be unmanaged. This method will override settings provided by calls to the other
- * overloads of {@code useSession}.
- */
- public Builder useSession(final String sessionId) {
- session = sessionId != null && !sessionId.isEmpty() ?
- Optional.of(SessionSettings.build().sessionId(sessionId).create()) : Optional.empty();
- return this;
- }
-
- /**
- * Enables a session. This method will override settings provided by calls to the other overloads of
- * {@code useSession}.
- */
- public Builder useSession(final SessionSettings settings) {
- session = Optional.ofNullable(settings);
- return this;
- }
-
- public Settings create() {
- return new Settings(this);
- }
-
- }
- }
-
- /**
- * Settings for a {@link Client} that involve a session.
- */
- public static class SessionSettings {
- private final boolean manageTransactions;
- private final String sessionId;
- private final boolean forceClosed;
- private final boolean maintainStateAfterException;
-
- private SessionSettings(final Builder builder) {
- manageTransactions = builder.manageTransactions;
- sessionId = builder.sessionId;
- forceClosed = builder.forceClosed;
- maintainStateAfterException = builder.maintainStateAfterException;
- }
-
- /**
- * If enabled, transactions will be "managed" such that each request will represent a complete transaction.
- */
- public boolean manageTransactions() {
- return manageTransactions;
- }
-
- /**
- * Provides the identifier of the session.
- */
- public String getSessionId() {
- return sessionId;
- }
-
- /**
- * Determines if the session will be force closed. See {@link Builder#forceClosed(boolean)} for more details
- * on what that means.
- */
- public boolean isForceClosed() {
- return forceClosed;
- }
-
- public boolean maintainStateAfterException() {
- return maintainStateAfterException;
- }
-
- public static SessionSettings.Builder build() {
- return new SessionSettings.Builder();
- }
-
- public static class Builder {
- private boolean manageTransactions = false;
- private String sessionId = UUID.randomUUID().toString();
- private boolean forceClosed = false;
- private boolean maintainStateAfterException = false;
-
- private Builder() {
- }
-
- /**
- * When {@code true} an exception within a session will not close the session and remove the state bound to
- * that session. This setting is for the {@code UnifiedChannelizer} and when set to {@code true} will allow
- * sessions to behave similar to how they did under the {@code OpProcessor} approach original to Gremlin
- * Server. By default this value is {@code false}.
- */
- public Builder maintainStateAfterException(final boolean maintainStateAfterException) {
- this.maintainStateAfterException = maintainStateAfterException;
- return this;
- }
-
- /**
- * If enabled, transactions will be "managed" such that each request will represent a complete transaction.
- * By default this value is {@code false}.
- */
- public Builder manageTransactions(final boolean manage) {
- manageTransactions = manage;
- return this;
- }
-
- /**
- * Provides the identifier of the session. This value cannot be null or empty. By default it is set to
- * a random {@code UUID}.
- */
- public Builder sessionId(final String sessionId) {
- if (null == sessionId || sessionId.isEmpty())
- throw new IllegalArgumentException("sessionId cannot be null or empty");
- this.sessionId = sessionId;
- return this;
- }
-
- /**
- * Determines if the session should be force closed when the client is closed. Force closing will not
- * attempt to close open transactions from existing running jobs and leave it to the underlying graph to
- * decided how to proceed with those orphaned transactions. Setting this to {@code true} tends to lead to
- * faster close operation which can be desirable if Gremlin Server has a long session timeout and a long
- * script evaluation timeout as attempts to close long run jobs can occur more rapidly. By default, this
- * value is {@code false}.
- */
- public Builder forceClosed(final boolean forced) {
- this.forceClosed = forced;
- return this;
- }
-
- public SessionSettings create() {
- return new SessionSettings(this);
- }
+ return new AliasClusteredClient(client, graphOrTraversalSource);
}
}
}
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
index f8180c6..6b7607b 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
@@ -18,28 +18,29 @@
*/
package org.apache.tinkerpop.gremlin.driver;
+import io.netty.bootstrap.Bootstrap;
import io.netty.buffer.PooledByteBufAllocator;
import io.netty.channel.ChannelOption;
-import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.channel.nio.NioEventLoopGroup;
import io.netty.handler.ssl.SslContext;
import io.netty.handler.ssl.SslContextBuilder;
import io.netty.handler.ssl.SslProvider;
import io.netty.handler.ssl.util.InsecureTrustManagerFactory;
import io.netty.util.concurrent.Future;
import org.apache.commons.configuration2.Configuration;
-import org.apache.tinkerpop.gremlin.util.MessageSerializer;
-import org.apache.tinkerpop.gremlin.util.Tokens;
-import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.util.ser.Serializers;
-import io.netty.bootstrap.Bootstrap;
-import io.netty.channel.nio.NioEventLoopGroup;
import org.apache.commons.lang3.concurrent.BasicThreadFactory;
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.tinkerpop.gremlin.driver.auth.Auth;
+import org.apache.tinkerpop.gremlin.driver.interceptor.PayloadSerializingInterceptor;
+import org.apache.tinkerpop.gremlin.util.MessageSerializer;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV4;
+import org.apache.tinkerpop.gremlin.util.ser.Serializers;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.net.ssl.KeyManagerFactory;
import javax.net.ssl.TrustManagerFactory;
-
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
@@ -59,6 +60,7 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+import java.util.LinkedList;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
@@ -69,7 +71,6 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Supplier;
-import java.util.function.UnaryOperator;
import java.util.stream.Collectors;
/**
@@ -78,9 +79,10 @@
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
public final class Cluster {
+ public static final String SERIALIZER_INTERCEPTOR_NAME = "serializer";
private static final Logger logger = LoggerFactory.getLogger(Cluster.class);
- private Manager manager;
+ private final Manager manager;
private Cluster(final Builder builder) {
this.manager = new Manager(builder);
@@ -92,23 +94,7 @@
}
/**
- * Creates a {@link Client.ClusteredClient} instance to this {@code Cluster}, meaning requests will be routed to
- * one or more servers (depending on the cluster configuration), where each request represents the entirety of a
- * transaction. A commit or rollback (in case of error) is automatically executed at the end of the request.
- * <p/>
- * Note that calling this method does not imply that a connection is made to the server itself at this point.
- * Therefore, if there is only one server specified in the {@code Cluster} and that server is not available an
- * error will not be raised at this point. Connections get initialized in the {@link Client} when a request is
- * submitted or can be directly initialized via {@link Client#init()}.
- */
- public <T extends Client> T connect() {
- final Client client = new Client.ClusteredClient(this, Client.Settings.build().create());
- manager.trackClient(client);
- return (T) client;
- }
-
- /**
- * Creates a {@link Client.SessionedClient} instance to this {@code Cluster}, meaning requests will be routed to
+ * Creates a SessionedClient instance to this {@code Cluster}, meaning requests will be routed to
* a single server (randomly selected from the cluster), where the same bindings will be available on each request.
* Requests are bound to the same thread on the server and thus transactions may extend beyond the bounds of a
* single request. The transactions are managed by the user and must be committed or rolled-back manually.
@@ -121,11 +107,11 @@
* @param sessionId user supplied id for the session which should be unique (a UUID is ideal).
*/
public <T extends Client> T connect(final String sessionId) {
- return connect(sessionId, false);
+ throw new UnsupportedOperationException("not implemented");
}
/**
- * Creates a {@link Client.SessionedClient} instance to this {@code Cluster}, meaning requests will be routed to
+ * Creates a SessionedClient instance to this {@code Cluster}, meaning requests will be routed to
* a single server (randomly selected from the cluster), where the same bindings will be available on each request.
* Requests are bound to the same thread on the server and thus transactions may extend beyond the bounds of a
* single request. If {@code manageTransactions} is set to {@code false} then transactions are managed by the
@@ -141,19 +127,14 @@
* @param manageTransactions enables auto-transactions when set to true
*/
public <T extends Client> T connect(final String sessionId, final boolean manageTransactions) {
- final Client.SessionSettings sessionSettings = Client.SessionSettings.build()
- .manageTransactions(manageTransactions)
- .sessionId(sessionId).create();
- final Client.Settings settings = Client.Settings.build().useSession(sessionSettings).create();
- return connect(settings);
+ throw new UnsupportedOperationException("not implemented");
}
/**
* Creates a new {@link Client} based on the settings provided.
*/
- public <T extends Client> T connect(final Client.Settings settings) {
- final Client client = settings.getSession().isPresent() ? new Client.SessionedClient(this, settings) :
- new Client.ClusteredClient(this, settings);
+ public <T extends Client> T connect() {
+ final Client client = new Client.ClusteredClient(this);
manager.trackClient(client);
return (T) client;
}
@@ -171,6 +152,10 @@
return new Builder(address);
}
+ public static Builder build(final RequestInterceptor serializingInterceptor) {
+ return new Builder(serializingInterceptor);
+ }
+
public static Builder build(final File configurationFile) throws FileNotFoundException {
final Settings settings = Settings.read(new FileInputStream(configurationFile));
return getBuilderFromSettings(settings);
@@ -178,14 +163,13 @@
private static Builder getBuilderFromSettings(final Settings settings) {
final List<String> addresses = settings.hosts;
- if (addresses.size() == 0)
+ if (addresses.isEmpty())
throw new IllegalStateException("At least one value must be specified to the hosts setting");
final Builder builder = new Builder(settings.hosts.get(0))
.port(settings.port)
.path(settings.path)
.enableSsl(settings.connectionPool.enableSsl)
- .keepAliveInterval(settings.connectionPool.keepAliveInterval)
.keyStore(settings.connectionPool.keyStore)
.keyStorePassword(settings.connectionPool.keyStorePassword)
.keyStoreType(settings.connectionPool.keyStoreType)
@@ -199,28 +183,18 @@
.workerPoolSize(settings.workerPoolSize)
.reconnectInterval(settings.connectionPool.reconnectInterval)
.resultIterationBatchSize(settings.connectionPool.resultIterationBatchSize)
- .channelizer(settings.connectionPool.channelizer)
- .maxContentLength(settings.connectionPool.maxContentLength)
+ .maxResponseContentLength(settings.connectionPool.maxResponseContentLength)
.maxWaitForConnection(settings.connectionPool.maxWaitForConnection)
- .maxInProcessPerConnection(settings.connectionPool.maxInProcessPerConnection)
- .minInProcessPerConnection(settings.connectionPool.minInProcessPerConnection)
- .maxSimultaneousUsagePerConnection(settings.connectionPool.maxSimultaneousUsagePerConnection)
- .minSimultaneousUsagePerConnection(settings.connectionPool.minSimultaneousUsagePerConnection)
.maxConnectionPoolSize(settings.connectionPool.maxSize)
- .minConnectionPoolSize(settings.connectionPool.minSize)
.connectionSetupTimeoutMillis(settings.connectionPool.connectionSetupTimeoutMillis)
+ .idleConnectionTimeoutMillis(settings.connectionPool.idleConnectionTimeout)
.enableUserAgentOnConnect(settings.enableUserAgentOnConnect)
- .enableCompression(settings.enableCompression)
+ .bulkResults(settings.bulkResults)
.validationRequest(settings.connectionPool.validationRequest);
- if (settings.username != null && settings.password != null)
- builder.credentials(settings.username, settings.password);
-
- if (settings.jaasEntry != null)
- builder.jaasEntry(settings.jaasEntry);
-
- if (settings.protocol != null)
- builder.protocol(settings.protocol);
+ if (!settings.auth.type.isEmpty()) {
+ builder.auth(Auth.from(settings.auth));
+ }
// the first address was added above in the constructor, so skip it if there are more
if (addresses.size() > 1)
@@ -315,20 +289,6 @@
}
/**
- * Size of the pool for handling request/response operations.
- */
- public int getNioPoolSize() {
- return manager.nioPoolSize;
- }
-
- /**
- * Size of the pool for handling background work.
- */
- public int getWorkerPoolSize() {
- return manager.workerPoolSize;
- }
-
- /**
* Get the {@link MessageSerializer} MIME types supported.
*/
public String[] getSerializers() {
@@ -343,36 +303,6 @@
}
/**
- * Gets the minimum number of in-flight requests that can occur on a {@link Connection} before it is considered
- * for closing on return to the {@link ConnectionPool}.
- */
- public int getMinInProcessPerConnection() {
- return manager.connectionPoolSettings.minInProcessPerConnection;
- }
-
- /**
- * Gets the maximum number of in-flight requests that can occur on a {@link Connection}.
- */
- public int getMaxInProcessPerConnection() {
- return manager.connectionPoolSettings.maxInProcessPerConnection;
- }
-
- /**
- * Gets the maximum number of times that a {@link Connection} can be borrowed from the pool simultaneously.
- */
- public int maxSimultaneousUsagePerConnection() {
- return manager.connectionPoolSettings.maxSimultaneousUsagePerConnection;
- }
-
- /**
- * Gets the minimum number of times that a {@link Connection} should be borrowed from the pool before it falls
- * under consideration for closing.
- */
- public int minSimultaneousUsagePerConnection() {
- return manager.connectionPoolSettings.minSimultaneousUsagePerConnection;
- }
-
- /**
* Gets the maximum size that the {@link ConnectionPool} can grow.
*/
public int maxConnectionPoolSize() {
@@ -380,13 +310,6 @@
}
/**
- * Gets the minimum size of the {@link ConnectionPool}.
- */
- public int minConnectionPoolSize() {
- return manager.connectionPoolSettings.minSize;
- }
-
- /**
* Gets the override for the server setting that determines how many results are returned per batch.
*/
public int getResultIterationBatchSize() {
@@ -408,41 +331,17 @@
}
/**
- * Gets the maximum size in bytes of any request sent to the server.
+ * Gets the maximum size in bytes of any request received from the server.
*/
- public int getMaxContentLength() {
- return manager.connectionPoolSettings.maxContentLength;
+ public long getMaxResponseContentLength() {
+ return manager.connectionPoolSettings.maxResponseContentLength;
}
/**
- * Gets the {@link Channelizer} implementation to use on the client when creating a {@link Connection}.
+ * Get time in milliseconds that the driver will allow a channel to not receive read or writes before it automatically closes.
*/
- public String getChannelizer() {
- return manager.connectionPoolSettings.channelizer;
- }
-
- /**
- * Gets time in milliseconds to wait between retries when attempting to reconnect to a dead host.
- */
- public int getReconnectInterval() {
- return manager.connectionPoolSettings.reconnectInterval;
- }
-
- /**
- * Gets time in milliseconds to wait after the last message is sent over a connection before sending a keep-alive
- * message to the server.
- */
- public long getKeepAliveInterval() {
- return manager.connectionPoolSettings.keepAliveInterval;
- }
-
- /**
- * Gets time duration of time in milliseconds provided for connection setup to complete which includes WebSocket
- * handshake and SSL handshake. Beyond this duration an exception would be thrown if the handshake is not complete
- * by then.
- */
- public long getConnectionSetupTimeout() {
- return manager.connectionPoolSettings.connectionSetupTimeoutMillis;
+ public long getIdleConnectionTimeout() {
+ return manager.connectionPoolSettings.idleConnectionTimeout;
}
/**
@@ -474,8 +373,8 @@
return manager.serializer;
}
- UnaryOperator<FullHttpRequest> getRequestInterceptor() {
- return manager.interceptor;
+ List<Pair<String, ? extends RequestInterceptor>> getRequestInterceptors() {
+ return manager.interceptors;
}
ScheduledExecutorService executor() {
@@ -498,10 +397,6 @@
return manager.loadBalancingStrategy;
}
- AuthProperties authProperties() {
- return manager.authProps;
- }
-
RequestMessage.Builder validationRequest() {
return manager.validationRequest.get();
}
@@ -580,32 +475,27 @@
}
/**
- * Checks if cluster is configured to use per-message deflate compression
+ * Checks if cluster is configured to bulk results
*/
- public boolean enableCompression() {
- return manager.enableCompression();
+ public boolean isBulkResultsEnabled() {
+ return manager.isBulkResultsEnabled();
}
public final static class Builder {
- private List<InetAddress> addresses = new ArrayList<>();
+ private static int INTERCEPTOR_NOT_FOUND = -1;
+
+ private final List<InetAddress> addresses = new ArrayList<>();
private int port = 8182;
private String path = "/gremlin";
private MessageSerializer<?> serializer = null;
private int nioPoolSize = Runtime.getRuntime().availableProcessors();
private int workerPoolSize = Runtime.getRuntime().availableProcessors() * 2;
- private int minConnectionPoolSize = ConnectionPool.MIN_POOL_SIZE;
private int maxConnectionPoolSize = ConnectionPool.MAX_POOL_SIZE;
- private int minSimultaneousUsagePerConnection = ConnectionPool.MIN_SIMULTANEOUS_USAGE_PER_CONNECTION;
- private int maxSimultaneousUsagePerConnection = ConnectionPool.MAX_SIMULTANEOUS_USAGE_PER_CONNECTION;
- private int maxInProcessPerConnection = Connection.MAX_IN_PROCESS;
- private int minInProcessPerConnection = Connection.MIN_IN_PROCESS;
private int maxWaitForConnection = Connection.MAX_WAIT_FOR_CONNECTION;
private int maxWaitForClose = Connection.MAX_WAIT_FOR_CLOSE;
- private int maxContentLength = Connection.MAX_CONTENT_LENGTH;
+ private long maxResponseContentLength = Connection.MAX_RESPONSE_CONTENT_LENGTH;
private int reconnectInterval = Connection.RECONNECT_INTERVAL;
private int resultIterationBatchSize = Connection.RESULT_ITERATION_BATCH_SIZE;
- private long keepAliveInterval = Connection.KEEP_ALIVE_INTERVAL;
- private String channelizer = Channelizer.WebSocketChannelizer.class.getName();
private boolean enableSsl = false;
private String keyStore = null;
private String keyStorePassword = null;
@@ -619,18 +509,25 @@
private boolean sslSkipCertValidation = false;
private SslContext sslContext = null;
private LoadBalancingStrategy loadBalancingStrategy = new LoadBalancingStrategy.RoundRobin();
- private UnaryOperator<FullHttpRequest> interceptor = HandshakeInterceptor.NO_OP;
- private AuthProperties authProps = new AuthProperties();
+ private LinkedList<Pair<String, ? extends RequestInterceptor>> interceptors = new LinkedList<>();
private long connectionSetupTimeoutMillis = Connection.CONNECTION_SETUP_TIMEOUT_MILLIS;
+ private long idleConnectionTimeoutMillis = Connection.CONNECTION_IDLE_TIMEOUT_MILLIS;
private boolean enableUserAgentOnConnect = true;
- private boolean enableCompression = true;
+ private boolean bulkResults = false;
private Builder() {
- // empty to prevent direct instantiation
+ addInterceptor(SERIALIZER_INTERCEPTOR_NAME,
+ new PayloadSerializingInterceptor(new GraphBinaryMessageSerializerV4()));
}
private Builder(final String address) {
addContactPoint(address);
+ addInterceptor(SERIALIZER_INTERCEPTOR_NAME,
+ new PayloadSerializingInterceptor(new GraphBinaryMessageSerializerV4()));
+ }
+
+ private Builder(final RequestInterceptor bodySerializer) {
+ addInterceptor(SERIALIZER_INTERCEPTOR_NAME, bodySerializer);
}
/**
@@ -706,15 +603,6 @@
}
/**
- * Length of time in milliseconds to wait on an idle connection before sending a keep-alive request. Set to
- * zero to disable this feature.
- */
- public Builder keepAliveInterval(final long keepAliveInterval) {
- this.keepAliveInterval = keepAliveInterval;
- return this;
- }
-
- /**
* The file location of the private key in JKS or PKCS#12 format.
*/
public Builder keyStore(final String keyStore) {
@@ -793,53 +681,6 @@
}
/**
- * The minimum number of in-flight requests that can occur on a {@link Connection} before it is considered
- * for closing on return to the {@link ConnectionPool}.
- */
- public Builder minInProcessPerConnection(final int minInProcessPerConnection) {
- this.minInProcessPerConnection = minInProcessPerConnection;
- return this;
- }
-
- /**
- * The maximum number of in-flight requests that can occur on a {@link Connection}. This represents an
- * indication of how busy a {@link Connection} is allowed to be. This number is linked to the
- * {@link #maxSimultaneousUsagePerConnection} setting, but is slightly different in that it refers to
- * the total number of requests on a {@link Connection}. In other words, a {@link Connection} might
- * be borrowed once to have multiple requests executed against it. This number controls the maximum
- * number of requests whereas {@link #maxSimultaneousUsagePerConnection} controls the times borrowed.
- */
- public Builder maxInProcessPerConnection(final int maxInProcessPerConnection) {
- this.maxInProcessPerConnection = maxInProcessPerConnection;
- return this;
- }
-
- /**
- * The maximum number of times that a {@link Connection} can be borrowed from the pool simultaneously.
- * This represents an indication of how busy a {@link Connection} is allowed to be. Set too large and the
- * {@link Connection} may queue requests too quickly, rather than wait for an available {@link Connection}
- * or create a fresh one. If set too small, the {@link Connection} will show as busy very quickly thus
- * forcing waits for available {@link Connection} instances in the pool when there is more capacity available.
- */
- public Builder maxSimultaneousUsagePerConnection(final int maxSimultaneousUsagePerConnection) {
- this.maxSimultaneousUsagePerConnection = maxSimultaneousUsagePerConnection;
- return this;
- }
-
- /**
- * The minimum number of times that a {@link Connection} should be borrowed from the pool before it falls
- * under consideration for closing. If a {@link Connection} is not busy and the
- * {@link #minConnectionPoolSize} is exceeded, then there is no reason to keep that connection open. Set
- * too large and {@link Connection} that isn't busy will continue to consume resources when it is not being
- * used. Set too small and {@link Connection} instances will be destroyed when the driver might still be
- * busy.
- */
- public Builder minSimultaneousUsagePerConnection(final int minSimultaneousUsagePerConnection) {
- this.minSimultaneousUsagePerConnection = minSimultaneousUsagePerConnection;
- return this;
- }
-
- /**
* The maximum size that the {@link ConnectionPool} can grow.
*/
public Builder maxConnectionPoolSize(final int maxSize) {
@@ -848,15 +689,6 @@
}
/**
- * The minimum size of the {@link ConnectionPool}. When the {@link Client} is started, {@link Connection}
- * objects will be initially constructed to this size.
- */
- public Builder minConnectionPoolSize(final int minSize) {
- this.minConnectionPoolSize = minSize;
- return this;
- }
-
- /**
* Override the server setting that determines how many results are returned per batch.
*/
public Builder resultIterationBatchSize(final int size) {
@@ -883,30 +715,14 @@
}
/**
- * The maximum size in bytes of any request sent to the server. This number should not exceed the same
- * setting defined on the server.
+ * The maximum size in bytes of any response received from the server.
*/
- public Builder maxContentLength(final int maxContentLength) {
- this.maxContentLength = maxContentLength;
+ public Builder maxResponseContentLength(final long maxResponseContentLength) {
+ this.maxResponseContentLength = maxResponseContentLength;
return this;
}
/**
- * Specify the {@link Channelizer} implementation to use on the client when creating a {@link Connection}.
- */
- public Builder channelizer(final String channelizerClass) {
- this.channelizer = channelizerClass;
- return this;
- }
-
- /**
- * Specify the {@link Channelizer} implementation to use on the client when creating a {@link Connection}.
- */
- public Builder channelizer(final Class channelizerClass) {
- return channelizer(channelizerClass.getName());
- }
-
- /**
* Specify a valid Gremlin script that can be used to test remote operations. This script should be designed
* to return quickly with the least amount of overhead possible. By default, the script sends an empty string.
* If the graph does not support that sort of script because it requires all scripts to include a reference
@@ -934,57 +750,82 @@
}
/**
- * Specifies an {@link HandshakeInterceptor} that will allow manipulation of the {@code FullHttpRequest} prior
- * to its being sent to the server.
- * @deprecated As of release 3.6.6, replaced with {@link #requestInterceptor(RequestInterceptor)}.
+ * Adds a {@link RequestInterceptor} after another one that will allow manipulation of the {@code HttpRequest}
+ * prior to its being sent to the server.
*/
- @Deprecated
- public Builder handshakeInterceptor(final HandshakeInterceptor interceptor) {
- // when this deprecated method is removed, the interceptor can have its type promoted from
- // UnaryOperator<FullHttpRequest> to RequestInterceptor
- this.interceptor = interceptor;
+ public Builder addInterceptorAfter(final String priorInterceptorName, final String nameOfInterceptor,
+ final RequestInterceptor interceptor) {
+ final int index = getInterceptorIndex(priorInterceptorName);
+ if (INTERCEPTOR_NOT_FOUND == index) {
+ throw new IllegalArgumentException(priorInterceptorName + " interceptor not found");
+ } else if (getInterceptorIndex(nameOfInterceptor) != INTERCEPTOR_NOT_FOUND) {
+ throw new IllegalArgumentException(nameOfInterceptor + " interceptor already exists");
+ }
+ interceptors.add(index + 1, Pair.of(nameOfInterceptor, interceptor));
+
return this;
}
/**
- * Specifies an {@link HandshakeInterceptor} that will allow manipulation of the {@code FullHttpRequest} prior
- * to its being sent to the server. For websockets the interceptor is only called on the handshake.
+ * Adds a {@link RequestInterceptor} before another one that will allow manipulation of the {@code HttpRequest}
+ * prior to its being sent to the server.
*/
- public Builder requestInterceptor(final RequestInterceptor interceptor) {
- this.interceptor = interceptor;
+ public Builder addInterceptorBefore(final String subsequentInterceptorName, final String nameOfInterceptor,
+ final RequestInterceptor interceptor) {
+ final int index = getInterceptorIndex(subsequentInterceptorName);
+ if (INTERCEPTOR_NOT_FOUND == index) {
+ throw new IllegalArgumentException(subsequentInterceptorName + " interceptor not found");
+ } else if (getInterceptorIndex(nameOfInterceptor) != INTERCEPTOR_NOT_FOUND) {
+ throw new IllegalArgumentException(nameOfInterceptor + " interceptor already exists");
+ } else if (index == 0) {
+ interceptors.addFirst(Pair.of(nameOfInterceptor, interceptor));
+ } else {
+ interceptors.add(index - 1, Pair.of(nameOfInterceptor, interceptor));
+ }
+
return this;
}
/**
- * Specifies parameters for authentication to Gremlin Server.
+ * Adds a {@link RequestInterceptor} to the end of the list that will allow manipulation of the
+ * {@code HttpRequest} prior to its being sent to the server.
*/
- public Builder authProperties(final AuthProperties authProps) {
- this.authProps = authProps;
+ public Builder addInterceptor(final String name, final RequestInterceptor interceptor) {
+ if (getInterceptorIndex(name) != INTERCEPTOR_NOT_FOUND) {
+ throw new IllegalArgumentException(name + " interceptor already exists");
+ }
+ interceptors.add(Pair.of(name, interceptor));
return this;
}
/**
- * Sets the {@link AuthProperties.Property#USERNAME} and {@link AuthProperties.Property#PASSWORD} properties
- * for authentication to Gremlin Server.
+ * Removes a {@link RequestInterceptor} from the list. This can be used to remove the default interceptors that
+ * aren't needed.
*/
- public Builder credentials(final String username, final String password) {
- authProps = authProps.with(AuthProperties.Property.USERNAME, username).with(AuthProperties.Property.PASSWORD, password);
+ public Builder removeInterceptor(final String name) {
+ final int index = getInterceptorIndex(name);
+ if (index == INTERCEPTOR_NOT_FOUND) {
+ throw new IllegalArgumentException(name + " interceptor not found");
+ }
+ interceptors.remove(index);
return this;
}
- /**
- * Sets the {@link AuthProperties.Property#PROTOCOL} properties for authentication to Gremlin Server.
- */
- public Builder protocol(final String protocol) {
- this.authProps = authProps.with(AuthProperties.Property.PROTOCOL, protocol);
- return this;
+ private int getInterceptorIndex(final String name) {
+ for (int i = 0; i < interceptors.size(); i++) {
+ if (interceptors.get(i).getLeft().equals(name)) {
+ return i;
+ }
+ }
+
+ return INTERCEPTOR_NOT_FOUND;
}
/**
- * Sets the {@link AuthProperties.Property#JAAS_ENTRY} properties for authentication to Gremlin Server.
+ * Adds an Auth {@link RequestInterceptor} to the end of list of interceptors.
*/
- public Builder jaasEntry(final String jaasEntry) {
- this.authProps = authProps.with(AuthProperties.Property.JAAS_ENTRY, jaasEntry);
+ public Builder auth(final Auth auth) {
+ addInterceptor(auth.getClass().getSimpleName().toLowerCase() + "-auth", auth);
return this;
}
@@ -1031,6 +872,14 @@
}
/**
+ * Sets the time in milliseconds that the driver will allow a channel to not receive read or writes before it automatically closes.
+ */
+ public Builder idleConnectionTimeoutMillis(final long idleConnectionTimeoutMillis) {
+ this.idleConnectionTimeoutMillis = idleConnectionTimeoutMillis;
+ return this;
+ }
+
+ /**
* Configures whether cluster will send a user agent during
* web socket handshakes
* @param enableUserAgentOnConnect true enables the useragent. false disables the useragent.
@@ -1041,10 +890,11 @@
}
/**
- * Configures use of per-message deflate compression. Defaults to true.
+ * Configures whether cluster will enable result bulking to optimize performance.
+ * @param bulkResults true enables bulking.
*/
- public Builder enableCompression(final boolean enableCompression) {
- this.enableCompression = enableCompression;
+ public Builder bulkResults(final boolean bulkResults) {
+ this.bulkResults = bulkResults;
return this;
}
@@ -1053,8 +903,8 @@
}
public Cluster create() {
- if (addresses.size() == 0) addContactPoint("localhost");
- if (null == serializer) serializer = Serializers.GRAPHBINARY_V1.simpleInstance();
+ if (addresses.isEmpty()) addContactPoint("localhost");
+ if (null == serializer) serializer = Serializers.GRAPHBINARY_V4.simpleInstance();
return new Cluster(this);
}
}
@@ -1092,10 +942,9 @@
private final MessageSerializer<?> serializer;
private final Settings.ConnectionPoolSettings connectionPoolSettings;
private final LoadBalancingStrategy loadBalancingStrategy;
- private final AuthProperties authProps;
private final Optional<SslContext> sslContextOptional;
private final Supplier<RequestMessage.Builder> validationRequest;
- private final UnaryOperator<FullHttpRequest> interceptor;
+ private final List<Pair<String, ? extends RequestInterceptor>> interceptors;
/**
* Thread pool for requests.
@@ -1117,7 +966,7 @@
private final int port;
private final String path;
private final boolean enableUserAgentOnConnect;
- private final boolean enableCompression;
+ private final boolean bulkResults;
private final AtomicReference<CompletableFuture<Void>> closeFuture = new AtomicReference<>();
@@ -1127,22 +976,16 @@
validateBuilder(builder);
this.loadBalancingStrategy = builder.loadBalancingStrategy;
- this.authProps = builder.authProps;
this.contactPoints = builder.getContactPoints();
- this.interceptor = builder.interceptor;
+ this.interceptors = builder.interceptors;
this.enableUserAgentOnConnect = builder.enableUserAgentOnConnect;
- this.enableCompression = builder.enableCompression;
+ this.bulkResults = builder.bulkResults;
connectionPoolSettings = new Settings.ConnectionPoolSettings();
- connectionPoolSettings.maxInProcessPerConnection = builder.maxInProcessPerConnection;
- connectionPoolSettings.minInProcessPerConnection = builder.minInProcessPerConnection;
- connectionPoolSettings.maxSimultaneousUsagePerConnection = builder.maxSimultaneousUsagePerConnection;
- connectionPoolSettings.minSimultaneousUsagePerConnection = builder.minSimultaneousUsagePerConnection;
connectionPoolSettings.maxSize = builder.maxConnectionPoolSize;
- connectionPoolSettings.minSize = builder.minConnectionPoolSize;
connectionPoolSettings.maxWaitForConnection = builder.maxWaitForConnection;
connectionPoolSettings.maxWaitForClose = builder.maxWaitForClose;
- connectionPoolSettings.maxContentLength = builder.maxContentLength;
+ connectionPoolSettings.maxResponseContentLength = builder.maxResponseContentLength;
connectionPoolSettings.reconnectInterval = builder.reconnectInterval;
connectionPoolSettings.resultIterationBatchSize = builder.resultIterationBatchSize;
connectionPoolSettings.enableSsl = builder.enableSsl;
@@ -1155,10 +998,9 @@
connectionPoolSettings.sslCipherSuites = builder.sslCipherSuites;
connectionPoolSettings.sslEnabledProtocols = builder.sslEnabledProtocols;
connectionPoolSettings.sslSkipCertValidation = builder.sslSkipCertValidation;
- connectionPoolSettings.keepAliveInterval = builder.keepAliveInterval;
- connectionPoolSettings.channelizer = builder.channelizer;
connectionPoolSettings.validationRequest = builder.validationRequest;
connectionPoolSettings.connectionSetupTimeoutMillis = builder.connectionSetupTimeoutMillis;
+ connectionPoolSettings.idleConnectionTimeout = builder.idleConnectionTimeoutMillis;
sslContextOptional = Optional.ofNullable(builder.sslContext);
@@ -1183,48 +1025,24 @@
// we distinguish between the hostScheduler and the connectionScheduler because you can end in deadlock
// if all the possible jobs the driver allows for go to a single thread pool.
- this.connectionScheduler = new ScheduledThreadPoolExecutor(contactPoints.size() + 1,
+ this.connectionScheduler = new ScheduledThreadPoolExecutor(Runtime.getRuntime().availableProcessors(),
new BasicThreadFactory.Builder().namingPattern("gremlin-driver-conn-scheduler-%d").build());
- validationRequest = () -> RequestMessage.build(Tokens.OPS_EVAL).add(Tokens.ARGS_GREMLIN, builder.validationRequest);
+ validationRequest = () -> RequestMessage.build(builder.validationRequest);
}
private void validateBuilder(final Builder builder) {
- if (builder.minInProcessPerConnection < 0)
- throw new IllegalArgumentException("minInProcessPerConnection must be greater than or equal to zero");
-
- if (builder.maxInProcessPerConnection < 1)
- throw new IllegalArgumentException("maxInProcessPerConnection must be greater than zero");
-
- if (builder.minInProcessPerConnection > builder.maxInProcessPerConnection)
- throw new IllegalArgumentException("maxInProcessPerConnection cannot be less than minInProcessPerConnection");
-
- if (builder.minSimultaneousUsagePerConnection < 0)
- throw new IllegalArgumentException("minSimultaneousUsagePerConnection must be greater than or equal to zero");
-
- if (builder.maxSimultaneousUsagePerConnection < 1)
- throw new IllegalArgumentException("maxSimultaneousUsagePerConnection must be greater than zero");
-
- if (builder.minSimultaneousUsagePerConnection > builder.maxSimultaneousUsagePerConnection)
- throw new IllegalArgumentException("maxSimultaneousUsagePerConnection cannot be less than minSimultaneousUsagePerConnection");
-
- if (builder.minConnectionPoolSize < 0)
- throw new IllegalArgumentException("minConnectionPoolSize must be greater than or equal to zero");
-
if (builder.maxConnectionPoolSize < 1)
throw new IllegalArgumentException("maxConnectionPoolSize must be greater than zero");
- if (builder.minConnectionPoolSize > builder.maxConnectionPoolSize)
- throw new IllegalArgumentException("maxConnectionPoolSize cannot be less than minConnectionPoolSize");
-
if (builder.maxWaitForConnection < 1)
throw new IllegalArgumentException("maxWaitForConnection must be greater than zero");
if (builder.maxWaitForClose < 1)
throw new IllegalArgumentException("maxWaitForClose must be greater than zero");
- if (builder.maxContentLength < 1)
- throw new IllegalArgumentException("maxContentLength must be greater than zero");
+ if (builder.maxResponseContentLength < 0)
+ throw new IllegalArgumentException("maxResponseContentLength must be greater than or equal to zero");
if (builder.reconnectInterval < 1)
throw new IllegalArgumentException("reconnectInterval must be greater than zero");
@@ -1241,12 +1059,11 @@
if (builder.connectionSetupTimeoutMillis < 1)
throw new IllegalArgumentException("connectionSetupTimeoutMillis must be greater than zero");
- try {
- Class.forName(builder.channelizer);
- } catch (Exception ex) {
- throw new IllegalArgumentException("The channelizer specified [" + builder.channelizer +
- "] could not be instantiated - it should be the fully qualified classname of a Channelizer implementation available on the classpath", ex);
- }
+ // zero value will disable idle connection detection
+ // non-zero will be converted to seconds so any value between 1 and 999 is invalid as it will be less than 1 second
+ if (builder.idleConnectionTimeoutMillis != 0 && builder.idleConnectionTimeoutMillis < 1000)
+ throw new IllegalArgumentException("idleConnectionTimeoutMillis must be zero or greater than or equal to 1000");
+
}
synchronized void init() {
@@ -1328,10 +1145,10 @@
}
/**
- * Checks if cluster is configured to use per-message deflate compression
+ * Checks if cluster is configured to send bulked results
*/
- public boolean enableCompression() {
- return enableCompression;
+ public boolean isBulkResultsEnabled() {
+ return bulkResults;
}
}
}
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java
index 749789a..f39ccb8 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java
@@ -18,7 +18,7 @@
*/
package org.apache.tinkerpop.gremlin.driver;
-import org.apache.tinkerpop.gremlin.util.Tokens;
+import org.apache.tinkerpop.gremlin.driver.handler.IdleConnectionHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.tinkerpop.gremlin.driver.exception.ConnectionException;
@@ -31,17 +31,12 @@
import java.net.URI;
import java.time.Instant;
-import java.util.UUID;
import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
/**
@@ -50,41 +45,32 @@
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
final class Connection {
+ public static final int MAX_WAIT_FOR_CONNECTION = 16000;
+ public static final int MAX_WAIT_FOR_CLOSE = 3000;
+ public static final long MAX_RESPONSE_CONTENT_LENGTH = Integer.MAX_VALUE;
+ public static final int RECONNECT_INTERVAL = 1000;
+ public static final int RESULT_ITERATION_BATCH_SIZE = 64;
+ public static final long CONNECTION_SETUP_TIMEOUT_MILLIS = 15000;
+ public static final long CONNECTION_IDLE_TIMEOUT_MILLIS = 180000;
private static final Logger logger = LoggerFactory.getLogger(Connection.class);
private final Channel channel;
private final URI uri;
- private final ConcurrentMap<UUID, ResultQueue> pending = new ConcurrentHashMap<>();
+ private final AtomicReference<ResultQueue> pending = new AtomicReference<>();
private final Cluster cluster;
private final Client client;
private final ConnectionPool pool;
private final String creatingThread;
private final String createdTimestamp;
- public static final int MAX_IN_PROCESS = 4;
- public static final int MIN_IN_PROCESS = 1;
- public static final int MAX_WAIT_FOR_CONNECTION = 16000;
- public static final int MAX_WAIT_FOR_CLOSE = 3000;
- public static final int MAX_CONTENT_LENGTH = 10 * 1024 * 1024;
-
- public static final int RECONNECT_INTERVAL = 1000;
- public static final int RESULT_ITERATION_BATCH_SIZE = 64;
- public static final long KEEP_ALIVE_INTERVAL = 180000;
- public final static long CONNECTION_SETUP_TIMEOUT_MILLIS = 15000;
-
/**
- * When a {@code Connection} is borrowed from the pool, this number is incremented to indicate the number of
- * times it has been taken and is decremented when it is returned. This number is one indication as to how
- * busy a particular {@code Connection} is.
+ * Is a {@code Connection} borrowed from the pool.
*/
- public final AtomicInteger borrowed = new AtomicInteger(0);
+ private final AtomicBoolean isBorrowed = new AtomicBoolean(false);
/**
* This boolean guards the replace of the connection and ensures that it only occurs once.
*/
public final AtomicBoolean isBeingReplaced = new AtomicBoolean(false);
- private final AtomicReference<Class<Channelizer>> channelizerClass = new AtomicReference<>(null);
-
- private final int maxInProcess;
private final String connectionLabel;
@@ -93,12 +79,11 @@
private final AtomicReference<CompletableFuture<Void>> closeFuture = new AtomicReference<>();
private final AtomicBoolean shutdownInitiated = new AtomicBoolean(false);
- public Connection(final URI uri, final ConnectionPool pool, final int maxInProcess) throws ConnectionException {
+ public Connection(final URI uri, final ConnectionPool pool) throws ConnectionException {
this.uri = uri;
this.cluster = pool.getCluster();
this.client = pool.getClient();
this.pool = pool;
- this.maxInProcess = maxInProcess;
this.creatingThread = Thread.currentThread().getName();
this.createdTimestamp = Instant.now().toString();
connectionLabel = "Connection{host=" + pool.host + "}";
@@ -106,13 +91,12 @@
if (cluster.isClosing())
throw new IllegalStateException("Cannot open a connection with the cluster after close() is called");
+ if (client.isClosing())
+ throw new IllegalStateException("Cannot open a connection with the client after close() is called");
+
final Bootstrap b = this.cluster.getFactory().createBootstrap();
try {
- if (channelizerClass.get() == null) {
- channelizerClass.compareAndSet(null, (Class<Channelizer>) Class.forName(cluster.connectionPoolSettings().channelizer));
- }
-
- channelizer = channelizerClass.get().newInstance();
+ channelizer = new Channelizer.HttpChannelizer();
channelizer.init(this);
b.channel(NioSocketChannel.class).handler(channelizer);
@@ -125,36 +109,27 @@
channel.closeFuture().addListener((ChannelFutureListener) future -> {
logger.debug("OnChannelClose callback called for channel {}", channel);
- // if the closeFuture is not set, it means that closeAsync() wasn't called which means that the
- // close did not come from the client side. it means the server closed the channel for some reason.
- // it's important to distinguish that difference in debugging
+ // if the closeFuture is not set, it means that closeAsync() wasn't called
if (thisConnection.closeFuture.get() == null) {
- logger.error(String.format(
- "Server closed the Connection on channel %s - scheduling removal from %s",
- channel.id().asShortText(), thisConnection.pool.getPoolInfo(thisConnection)));
+ if (!channel.hasAttr(IdleConnectionHandler.IDLE_STATE_EVENT)) {
+ // if idle state event is not present, it means the server closed the channel for some reason.
+ // it's important to distinguish that difference in debugging
+ logger.error(String.format(
+ "Server closed the Connection on channel %s - scheduling removal from %s",
+ channel.id().asShortText(), thisConnection.pool.getPoolInfo(thisConnection)));
+ }
// delegate the task to scheduler thread and free up the event loop
- thisConnection.cluster.connectionScheduler().submit(() -> thisConnection.pool.definitelyDestroyConnection(thisConnection));
+ thisConnection.cluster.connectionScheduler().submit(() -> thisConnection.pool.destroyConnection(thisConnection));
}
});
-
- logger.info("Created new connection for {}", uri);
+ logger.debug("Created new connection for {}", uri);
} catch (Exception ex) {
throw new ConnectionException(uri, "Could not open " + getConnectionInfo(true), ex);
}
}
/**
- * A connection can only have so many things in process happening on it at once, where "in process" refers to
- * the maximum number of in-process requests less the number of pending responses.
- */
- public int availableInProcess() {
- // no need for a negative available amount - not sure that the pending size can ever exceed maximum, but
- // better to avoid the negatives that would ensue if it did
- return Math.max(0, maxInProcess - pending.size());
- }
-
- /**
* Consider a connection as dead if the underlying channel is not connected.
* <p>
* Note: A dead connection does not necessarily imply that the server is unavailable. Additional checks
@@ -164,6 +139,10 @@
return (channel != null && !channel.isActive());
}
+ public AtomicBoolean isBorrowed() {
+ return isBorrowed;
+ }
+
boolean isClosing() {
return closeFuture.get() != null;
}
@@ -176,11 +155,7 @@
return cluster;
}
- Client getClient() {
- return client;
- }
-
- ConcurrentMap<UUID, ResultQueue> getPending() {
+ AtomicReference<ResultQueue> getPending() {
return pending;
}
@@ -210,12 +185,8 @@
}
public ChannelPromise write(final RequestMessage requestMessage, final CompletableFuture<ResultSet> resultQueueSetup) {
- // dont allow the same request id to be used as one that is already in the queue
- if (pending.containsKey(requestMessage.getRequestId()))
- throw new IllegalStateException(String.format("There is already a request pending with an id of: %s", requestMessage.getRequestId()));
-
// once there is a completed write, then create a traverser for the result set and complete
- // the promise so that the client knows that it can start checking for results.
+ // the promise so that the client knows that that it can start checking for results.
final Connection thisConnection = this;
final ChannelPromise requestPromise = channel.newPromise()
@@ -253,7 +224,8 @@
}, cluster.executor());
final ResultQueue handler = new ResultQueue(resultLinkedBlockingQueue, readCompleted);
- pending.put(requestMessage.getRequestId(), handler);
+ // pending.put(requestMessage.getRequestId(), handler);
+ pending.set(handler);
// resultQueueSetup should only be completed by a worker since the application code might have sync
// completion stages attached to it which and we do not want the event loop threads to process those
@@ -285,7 +257,7 @@
}
private boolean isOkToClose() {
- return pending.isEmpty() || (channel != null && !channel.isOpen()) || !pool.host.isAvailable();
+ return pending.get() == null || (channel != null && !channel.isOpen()) || !pool.host.isAvailable();
}
/**
@@ -307,38 +279,6 @@
// guess). that seems to put the executor thread in a monitor state that it doesn't recover from. since all
// the code in here is behind shutdownInitiated the synchronized doesn't seem necessary
if (shutdownInitiated.compareAndSet(false, true)) {
- // the session close message was removed in 3.5.0 after deprecation at 3.3.11. That removal was perhaps
- // a bit hasty as session semantics may still require this message in certain cases. Until we can look
- // at this in more detail, it seems best to bring back the old functionality to the driver.
- if (client instanceof Client.SessionedClient) {
- final boolean forceClose = client.getSettings().getSession().get().isForceClosed();
- final RequestMessage closeMessage = client.buildMessage(
- RequestMessage.build(Tokens.OPS_CLOSE).addArg(Tokens.ARGS_FORCE, forceClose)).create();
-
- final CompletableFuture<ResultSet> closed = new CompletableFuture<>();
-
- // TINKERPOP-2822 should investigate this write more carefully to check for sensible behavior
- // in the event the Channel was not created but we try to send the close message
- write(closeMessage, closed);
-
- try {
- // make sure we get a response here to validate that things closed as expected. on error, we'll let
- // the server try to clean up on its own. the primary error here should probably be related to
- // protocol issues which should not be something a user has to fuss with.
- closed.join().all().get(cluster.getMaxWaitForClose(), TimeUnit.MILLISECONDS);
- } catch (TimeoutException ex) {
- final String msg = String.format(
- "Timeout while trying to close connection on %s - force closing - server will close session on shutdown or expiration.",
- ((Client.SessionedClient) client).getSessionId());
- logger.warn(msg, ex);
- } catch (Exception ex) {
- final String msg = String.format(
- "Encountered an error trying to close connection on %s - force closing - server will close session on shutdown or expiration.",
- ((Client.SessionedClient) client).getSessionId());
- logger.warn(msg, ex);
- }
- }
-
// take a defensive posture here in the event the channelizer didn't get initialized somehow and a
// close() on the Connection is still called
if (channelizer != null)
@@ -393,9 +333,9 @@
public String getConnectionInfo(final boolean showHost) {
return showHost ?
String.format("Connection{channel=%s host=%s isDead=%s borrowed=%s pending=%s markedReplaced=%s closing=%s created=%s thread=%s}",
- getChannelId(), pool.host.toString(), isDead(), this.borrowed.get(), getPending().size(), this.isBeingReplaced, isClosing(), createdTimestamp, creatingThread) :
+ getChannelId(), pool.host.toString(), isDead(), this.isBorrowed().get(), getPending().get() == null ? 0 : 1, this.isBeingReplaced, isClosing(), createdTimestamp, creatingThread) :
String.format("Connection{channel=%s isDead=%s borrowed=%s pending=%s markedReplaced=%s closing=%s created=%s thread=%s}",
- getChannelId(), isDead(), this.borrowed.get(), getPending().size(), this.isBeingReplaced, isClosing(), createdTimestamp, creatingThread);
+ getChannelId(), isDead(), this.isBorrowed().get(), getPending().get() == null ? 0 : 1, this.isBeingReplaced, isClosing(), createdTimestamp, creatingThread);
}
/**
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ConnectionFactory.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ConnectionFactory.java
index 0771402..5fe45a5 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ConnectionFactory.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ConnectionFactory.java
@@ -30,12 +30,12 @@
/**
* Create a connection for the specified {@link ConnectionPool}.
*/
- public default Connection create(final ConnectionPool pool) throws ConnectionException {
- return new Connection(pool.host.getHostUri(), pool, pool.settings().maxInProcessPerConnection);
+ default Connection create(final ConnectionPool pool) throws ConnectionException {
+ return new Connection(pool.host.getHostUri(), pool);
}
/**
* Default implementation.
*/
- public static class DefaultConnectionFactory implements ConnectionFactory { }
+ class DefaultConnectionFactory implements ConnectionFactory { }
}
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ConnectionPool.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ConnectionPool.java
index 97128fb..6272c34 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ConnectionPool.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ConnectionPool.java
@@ -18,6 +18,8 @@
*/
package org.apache.tinkerpop.gremlin.driver;
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.tinkerpop.gremlin.driver.exception.ConnectionException;
@@ -42,7 +44,6 @@
import java.util.concurrent.locks.Condition;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
-import java.util.stream.Collectors;
/**
* @author Stephen Mallette (http://stephen.genoprime.com)
@@ -50,10 +51,7 @@
final class ConnectionPool {
private static final Logger logger = LoggerFactory.getLogger(ConnectionPool.class);
- public static final int MIN_POOL_SIZE = 2;
- public static final int MAX_POOL_SIZE = 8;
- public static final int MIN_SIMULTANEOUS_USAGE_PER_CONNECTION = 8;
- public static final int MAX_SIMULTANEOUS_USAGE_PER_CONNECTION = 16;
+ public static final int MAX_POOL_SIZE = 128;
// A small buffer in millis used for comparing if a connection was created within a certain amount of time.
private static final int CONNECTION_SETUP_TIME_DELTA = 25;
@@ -62,12 +60,9 @@
private final Client client;
private final List<Connection> connections;
private final AtomicInteger open;
+ private final Queue<Connection> availableConnections = new ConcurrentLinkedQueue<>();
private final Set<Connection> bin = new CopyOnWriteArraySet<>();
- private final int minPoolSize;
private final int maxPoolSize;
- private final int minSimultaneousUsagePerConnection;
- private final int maxSimultaneousUsagePerConnection;
- private final int minInProcess;
private final String poolLabel;
private final AtomicInteger scheduledForCreation = new AtomicInteger();
@@ -75,7 +70,7 @@
private final AtomicReference<CompletableFuture<Void>> closeFuture = new AtomicReference<>();
- private volatile int waiter = 0;
+ private final AtomicInteger waiter = new AtomicInteger();
private final Lock waitLock = new ReentrantLock(true);
private final Condition hasAvailableConnection = waitLock.newCondition();
ConnectionFactory connectionFactory;
@@ -83,7 +78,7 @@
/**
* The result of a connection attempt. A null value for failureCause means that the connection attempt was successful.
*/
- public class ConnectionResult {
+ public static class ConnectionResult {
private long timeOfConnectionAttempt;
private Throwable failureCause;
@@ -96,16 +91,14 @@
}
public ConnectionPool(final Host host, final Client client) {
- this(host, client, Optional.empty(), Optional.empty());
+ this(host, client, Optional.empty());
}
- public ConnectionPool(final Host host, final Client client, final Optional<Integer> overrideMinPoolSize,
- final Optional<Integer> overrideMaxPoolSize) {
- this(host, client, overrideMinPoolSize, overrideMaxPoolSize, new ConnectionFactory.DefaultConnectionFactory());
+ public ConnectionPool(final Host host, final Client client, final Optional<Integer> overrideMaxPoolSize) {
+ this(host, client, overrideMaxPoolSize, new ConnectionFactory.DefaultConnectionFactory());
}
- ConnectionPool(final Host host, final Client client, final Optional<Integer> overrideMinPoolSize,
- final Optional<Integer> overrideMaxPoolSize, final ConnectionFactory connectionFactory) {
+ ConnectionPool(final Host host, final Client client, final Optional<Integer> overrideMaxPoolSize, final ConnectionFactory connectionFactory) {
this.host = host;
this.client = client;
this.cluster = client.cluster;
@@ -113,68 +106,43 @@
poolLabel = "Connection Pool {host=" + host + "}";
final Settings.ConnectionPoolSettings settings = settings();
- this.minPoolSize = overrideMinPoolSize.orElse(settings.minSize);
this.maxPoolSize = overrideMaxPoolSize.orElse(settings.maxSize);
- this.minSimultaneousUsagePerConnection = settings.minSimultaneousUsagePerConnection;
- this.maxSimultaneousUsagePerConnection = settings.maxSimultaneousUsagePerConnection;
- this.minInProcess = settings.minInProcessPerConnection;
this.connections = new CopyOnWriteArrayList<>();
this.open = new AtomicInteger();
try {
- final List<CompletableFuture<Void>> connectionCreationFutures = new ArrayList<>();
- for (int i = 0; i < minPoolSize; i++) {
- connectionCreationFutures.add(CompletableFuture.runAsync(() -> {
- final ConnectionResult result = new ConnectionResult();
- try {
- this.connections.add(connectionFactory.create(this));
- this.open.incrementAndGet();
- } catch (ConnectionException e) {
- result.setFailureCause(e);
- throw new CompletionException(e);
- } finally {
- result.setTimeNow();
- if ((latestConnectionResult.get() == null) ||
- (latestConnectionResult.get().getTime() < result.getTime())) {
- latestConnectionResult.set(result);
- }
+ // attempt a single connection to ensure the host is viable
+ // if there is no traffic, it will eventually be closed by IdleConnectionHandler
+ CompletableFuture.runAsync(() -> {
+ final ConnectionResult result = new ConnectionResult();
+ try {
+ final Connection conn = connectionFactory.create(this);
+ this.connections.add(conn);
+ this.availableConnections.add(conn);
+ this.open.incrementAndGet();
+ } catch (ConnectionException e) {
+ result.setFailureCause(e);
+ throw new CompletionException(e);
+ } finally {
+ result.setTimeNow();
+ if ((latestConnectionResult.get() == null) ||
+ (latestConnectionResult.get().getTime() < result.getTime())) {
+ latestConnectionResult.set(result);
}
- }, cluster.connectionScheduler()));
- }
-
- CompletableFuture.allOf(connectionCreationFutures.toArray(new CompletableFuture[0])).join();
+ }
+ }, cluster.connectionScheduler()).join();
} catch (CancellationException ce) {
- logger.warn("Initialization of connections cancelled for {}", this.getPoolInfo(), ce);
+ logger.warn("Initialization of connection pool cancelled for {}", this.getPoolInfo(), ce);
throw ce;
} catch (CompletionException ce) {
- // Some connections might have been initialized, let's respect those as of 3.7.5
- if (connections.isEmpty()) {
- // Close the connection pool since we have zero connections
- this.closeAsync();
-
- final String errMsg = "Could not initialize " + minPoolSize + " (minPoolSize) connections in pool for "
- + this.host + ". " +
- " Successful connections=" + this.connections.size() +
- ". Closing the connection pool.";
-
- Throwable cause;
- Throwable result = ce;
-
- if (null != (cause = result.getCause())) {
- result = cause;
- }
-
- throw new CompletionException(errMsg, result);
- } else {
- // warn that the error may have the driver below the min pool size. expect recovery, but no point
- // going to NoHostAvailableException for potentially a single connection error.
- logger.warn("ConnectionPool for " + this.host + " initialized with " + connections.size() +
- " expected minPoolSize was " + minPoolSize + " - will attempt to recover", ce);
- }
+ // Close the connection pool gracefully to close any open connections.
+ this.closeAsync();
+ final Throwable result = ce.getCause() == null ? ce : ce.getCause();
+ throw new CompletionException("Could not initialize connection in pool. Closing the connection pool.", result);
}
- logger.info("Opening connection pool on {} with core size of {}", host, minPoolSize);
+ logger.info("Opening connection pool on {}", host);
}
public Settings.ConnectionPoolSettings settings() {
@@ -182,75 +150,60 @@
}
public Connection borrowConnection(final long timeout, final TimeUnit unit) throws TimeoutException, ConnectionException {
- logger.debug("Borrowing connection from pool on {} - timeout in {} {}", host, timeout, unit);
+ logger.debug("Borrowing connection from pool on {} - timeout in {} {} with {}", host, timeout, unit, Thread.currentThread());
if (isClosed()) throw new ConnectionException(host.getHostUri(), host.getAddress(), "Pool is shutdown");
- if (connections.isEmpty()) {
- logger.debug("Tried to borrow connection but the pool was empty for {} - scheduling pool creation and waiting for connection", host);
- for (int i = 0; i < minPoolSize; i++) {
- // If many connections are borrowed at the same time there needs to be a check to make sure no
- // additional ones get scheduled for creation
- if (scheduledForCreation.get() < minPoolSize) {
- scheduledForCreation.incrementAndGet();
- newConnection();
- }
+ // Get valid connection
+ Connection availableConnection;
+ try {
+ // acquire lock before attempting to obtain an available connection and potentially waiting for one
+ // to prevent race conditions with other threads that are releasing or creating new connections
+ // otherwise signal may be called before await which would result in timeouts
+ waitLock.lock();
+ availableConnection = getAvailableConnection();
+ if (availableConnection == null) {
+ availableConnection = waitForConnection(timeout, unit);
}
-
- return waitForConnection(timeout, unit);
+ } finally {
+ waitLock.unlock();
}
- // Get the least used valid connection
- final Connection leastUsedConn = getLeastUsedValidConnection();
-
- if (null == leastUsedConn) {
- if (isClosed())
- throw new ConnectionException(host.getHostUri(), host.getAddress(), "Pool is shutdown");
- logger.debug("Pool was initialized but a connection could not be selected earlier - waiting for connection on {}", host);
- return waitForConnection(timeout, unit);
+ if (logger.isDebugEnabled()) {
+ logger.debug("Borrowed {} on {} with {}", availableConnection.getConnectionInfo(), host, Thread.currentThread());
}
-
- if (logger.isDebugEnabled())
- logger.debug("Return least used {} on {}", leastUsedConn.getConnectionInfo(), host);
- return leastUsedConn;
+ return availableConnection;
}
public void returnConnection(final Connection connection) throws ConnectionException {
logger.debug("Attempting to return {} on {}", connection, host);
if (isClosed()) throw new ConnectionException(host.getHostUri(), host.getAddress(), "Pool is shutdown");
- final int borrowed = connection.borrowed.decrementAndGet();
+ connection.isBorrowed().set(false);
if (connection.isDead()) {
logger.debug("Marking {} as dead", this.host);
this.replaceConnection(connection);
} else {
- if (bin.contains(connection) && borrowed == 0) {
+ if (bin.contains(connection)) {
logger.debug("{} is already in the bin and it has no inflight requests so it is safe to close", connection);
if (bin.remove(connection))
connection.closeAsync();
return;
}
- // destroy a connection that exceeds the minimum pool size - it does not have the right to live if it
- // isn't busy. replace a connection that has a low available in process count which likely means that
- // it's backing up with requests that might never have returned. consider the maxPoolSize in this condition
- // because if it is equal to 1 (which it is for a session) then there is no need to replace the connection
- // as it will be responsible for every single request. if neither of these scenarios are met then let the
- // world know the connection is available.
+ // Destroy any extra connections that exceeded the maximum pool size. Idle connections will be removed
+ // based on their idle timeout so that isn't handled here.
final int poolSize = connections.size();
- final int availableInProcess = connection.availableInProcess();
- if (poolSize > minPoolSize && borrowed <= minSimultaneousUsagePerConnection) {
+ if (poolSize > maxPoolSize) {
if (logger.isDebugEnabled())
- logger.debug("On {} pool size of {} > minPoolSize {} and borrowed of {} <= minSimultaneousUsagePerConnection {} so destroy {}",
- host, poolSize, minPoolSize, borrowed, minSimultaneousUsagePerConnection, connection.getConnectionInfo());
+ logger.debug("destroy {}", connection.getConnectionInfo());
destroyConnection(connection);
- } else if (availableInProcess < minInProcess && maxPoolSize > 1) {
- if (logger.isDebugEnabled())
- logger.debug("On {} availableInProcess {} < minInProcess {} so replace {}", host, availableInProcess, minInProcess, connection.getConnectionInfo());
- replaceConnection(connection);
- } else
+ } else {
+ logger.debug("Pool size is {} - returning connection to pool: {}", poolSize, connection);
+ availableConnections.add(connection);
announceAvailableConnection();
+ }
}
}
@@ -272,7 +225,7 @@
public synchronized CompletableFuture<Void> closeAsync() {
if (closeFuture.get() != null) return closeFuture.get();
- logger.info("Signalled closing of connection pool on {} with core size of {}", host, minPoolSize);
+ logger.info("Signalled closing of connection pool on {} with current connection size of {}", host, connections.size());
announceAllAvailableConnection();
final CompletableFuture<Void> future = killAvailableConnections();
@@ -323,7 +276,7 @@
}
considerNewConnection();
- definitelyDestroyConnection(connection);
+ destroyConnection(connection);
}
private void considerNewConnection() {
@@ -344,6 +297,9 @@
}
private void newConnection() {
+ if (logger.isTraceEnabled()) {
+ logger.trace("Scheduling creation of new connection for connection pool {} using scheduler {}", this.getPoolInfo(), cluster.connectionScheduler());
+ }
cluster.connectionScheduler().submit(() -> {
// seems like this should be decremented first because if addConnectionIfUnderMaximum fails there is
// nothing that wants to decrement this number and so it leaves things in a state where you could
@@ -379,7 +335,10 @@
final ConnectionResult result = new ConnectionResult();
try {
- connections.add(connectionFactory.create(this));
+ final Connection conn = connectionFactory.create(this);
+ logger.debug("Created connection {}", conn.getConnectionInfo());
+ connections.add(conn);
+ availableConnections.add(conn);
} catch (Exception ex) {
open.decrementAndGet();
logger.error(String.format(
@@ -400,35 +359,21 @@
return true;
}
- private boolean destroyConnection(final Connection connection) {
- while (true) {
- final int opened = open.get();
- if (opened <= minPoolSize)
- return false;
-
- if (open.compareAndSet(opened, opened - 1))
- break;
- }
-
- definitelyDestroyConnection(connection);
- return true;
- }
-
- public void definitelyDestroyConnection(final Connection connection) {
+ public void destroyConnection(final Connection connection) {
// only add to the bin for future removal if its not already there.
if (!bin.contains(connection) && !connection.isClosing()) {
bin.add(connection);
connections.remove(connection);
+ availableConnections.remove(connection);
open.decrementAndGet();
}
// only close the connection for good once it is done being borrowed or when it is dead
- if (connection.isDead() || connection.borrowed.get() == 0) {
+ if (connection.isDead() || !connection.isBorrowed().get()) {
if (bin.remove(connection)) {
final CompletableFuture<Void> closeFuture = connection.closeAsync();
- closeFuture.whenComplete((v, t) -> {
- logger.debug("Destroyed {}{}{}", connection.getConnectionInfo(), System.lineSeparator(), this.getPoolInfo());
- });
+ closeFuture.whenComplete((v, t) ->
+ logger.debug("Destroyed {}{}{}", connection.getConnectionInfo(), System.lineSeparator(), this.getPoolInfo()));
}
}
}
@@ -441,6 +386,7 @@
try {
awaitAvailableConnection(remaining, unit);
} catch (InterruptedException e) {
+ logger.warn("Wait was interrupted", e);
Thread.currentThread().interrupt();
to = 0;
}
@@ -448,16 +394,16 @@
if (isClosed())
throw new ConnectionException(host.getHostUri(), host.getAddress(), "Pool is shutdown");
- final Connection leastUsed = getLeastUsedValidConnection();
+ final Connection conn = getAvailableConnection();
- if (leastUsed != null) {
+ if (conn != null) {
if (logger.isDebugEnabled())
- logger.debug("Return least used {} on {} after waiting", leastUsed.getConnectionInfo(), host);
- return leastUsed;
+ logger.debug("Return {} on {} after waiting on {}", conn.getConnectionInfo(), host, Thread.currentThread());
+ return conn;
}
remaining = to - TimeUtil.timeSince(start, unit);
- logger.debug("Continue to wait for connection on {} if {} > 0", host, remaining);
+ logger.debug("Continue to wait for connection on {} if {} > 0 on {}", host, remaining, Thread.currentThread());
} while (remaining > 0);
final StringBuilder cause = new StringBuilder("Potential Cause: ");
@@ -469,7 +415,7 @@
// Assumes that the root cause will give better information about why the connection failed.
cause.append(ExceptionHelper.getRootCause(res.getFailureCause()).getMessage());
} else if (open.get() >= maxPoolSize) {
- cause.append(Client.TOO_MANY_IN_FLIGHT_REQUESTS);
+ cause.append(String.format(Client.TOO_MANY_IN_FLIGHT_REQUESTS, open.get(), maxPoolSize));
} else {
cause.setLength(0);
}
@@ -482,7 +428,7 @@
// user if the pool was running at maximum.
final String timeoutErrorMessage = String.format(
"Timed-out (%s %s) waiting for connection on %s. %s%s%s",
- timeout, unit, host, cause.toString(), System.lineSeparator(), this.getPoolInfo());
+ timeout, unit, host, cause, System.lineSeparator(), this.getPoolInfo());
logger.error(timeoutErrorMessage);
@@ -511,7 +457,7 @@
// let the load-balancer know that the host is acting poorly
if (!host.isAvailable()) {
// if the host is unavailable then we should release the connections
- connections.forEach(this::definitelyDestroyConnection);
+ connections.forEach(this::destroyConnection);
this.cluster.loadBalancingStrategy().onUnavailable(host);
}
}
@@ -554,9 +500,7 @@
private void announceAvailableConnection() {
logger.debug("Announce connection available on {}", host);
-
- if (waiter == 0)
- return;
+ logConnectionPoolStatus();
waitLock.lock();
try {
@@ -567,58 +511,49 @@
}
/**
- * Get the least-used connection from the pool. Also triggers consideration of a new connection if the least-used
+ * Get an available connection from the pool. Also triggers consideration of a new connection if the least-used
* connection has hit the usage maximum or no valid connection could be retrieved from the pool.
*
- * @return The least-used connection from the pool. Returns null if no valid connection could be retrieved from the
+ * @return an available connection from the pool. Returns null if no valid connection could be retrieved from the
* pool.
*/
- private synchronized Connection getLeastUsedValidConnection() {
- int minInFlight = Integer.MAX_VALUE;
- Connection leastBusy = null;
- for (Connection connection : connections) {
- final int inFlight = connection.borrowed.get();
- if (!connection.isDead() && inFlight < minInFlight && inFlight < maxSimultaneousUsagePerConnection) {
- minInFlight = inFlight;
- leastBusy = connection;
+ private Connection getAvailableConnection() {
+ Connection available = null;
+
+ // remove head of queue until we can borrow a connection or the queue is empty
+ Connection head = availableConnections.poll();
+ while (head != null) {
+ // try to borrow connection
+ if (!head.isDead() && !head.isBorrowed().get() && head.isBorrowed().compareAndSet(false, true)) {
+ available = head;
+ break;
}
+ head = availableConnections.poll();
}
- if (leastBusy != null) {
- // Increment borrow count and consider making a new connection if least used connection hits usage maximum
- if (leastBusy.borrowed.incrementAndGet() >= maxSimultaneousUsagePerConnection
- && connections.size() < maxPoolSize) {
- if (logger.isDebugEnabled())
- logger.debug("Least used {} on {} reached maxSimultaneousUsagePerConnection but pool size {} < maxPoolSize - consider new connection",
- leastBusy.getConnectionInfo(), host, connections.size());
- considerNewConnection();
- }
- } else if (connections.size() < maxPoolSize) {
- // A safeguard for scenarios where consideration of a new connection was somehow not triggered by an
- // existing connection hitting the usage maximum
+ if (available == null && connections.size() < maxPoolSize) {
considerNewConnection();
}
- return leastBusy;
+ return available;
}
-
+
private void awaitAvailableConnection(long timeout, TimeUnit unit) throws InterruptedException {
logger.debug("Wait {} {} for an available connection on {} with {}", timeout, unit, host, Thread.currentThread());
+ logConnectionPoolStatus();
- waitLock.lock();
- waiter++;
+ waiter.incrementAndGet();
try {
hasAvailableConnection.await(timeout, unit);
} finally {
- waiter--;
- waitLock.unlock();
+ waiter.decrementAndGet();
}
}
private void announceAllAvailableConnection() {
- if (waiter == 0)
- return;
-
+ logger.debug("Announce to all connection available on {}", host);
+ logConnectionPoolStatus();
+
waitLock.lock();
try {
hasAvailableConnection.signalAll();
@@ -628,14 +563,6 @@
}
/**
- * Returns the set of Channel IDs maintained by the connection pool.
- * Currently, only used for testing.
- */
- Set<String> getConnectionIDs() {
- return connections.stream().map(Connection::getChannelId).collect(Collectors.toSet());
- }
-
- /**
* Gets a message that describes the state of the connection pool.
*/
public String getPoolInfo() {
@@ -657,8 +584,8 @@
} else {
final int connectionCount = connections.size();
sb.append(System.lineSeparator());
- sb.append(String.format("Connection Pool Status (size=%s max=%s min=%s toCreate=%s bin=%s)",
- connectionCount, maxPoolSize, minPoolSize, this.scheduledForCreation.get(), bin.size()));
+ sb.append(String.format("Connection Pool Status (size=%s available=%s max=%s toCreate=%s bin=%s waiter=%s)",
+ connectionCount, availableConnections.size(), maxPoolSize, this.scheduledForCreation.get(), bin.size(), waiter.get()));
sb.append(System.lineSeparator());
appendConnections(sb, connectionToCallout, (CopyOnWriteArrayList<Connection>) connections);
@@ -689,6 +616,12 @@
}
}
+ private void logConnectionPoolStatus() {
+ if (logger.isTraceEnabled()) {
+ logger.trace("Connection Pool status: {} ", this.getPoolInfo());
+ }
+ }
+
@Override
public String toString() {
return poolLabel;
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Handler.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Handler.java
deleted file mode 100644
index c76a20e..0000000
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Handler.java
+++ /dev/null
@@ -1,282 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver;
-
-import io.netty.util.AttributeMap;
-import org.apache.commons.lang3.exception.ExceptionUtils;
-import org.apache.tinkerpop.gremlin.driver.exception.ResponseException;
-import org.apache.tinkerpop.gremlin.util.Tokens;
-import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.SimpleChannelInboundHandler;
-import io.netty.util.Attribute;
-import io.netty.util.AttributeKey;
-import io.netty.util.ReferenceCountUtil;
-import org.apache.tinkerpop.gremlin.util.ser.SerializationException;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.net.InetSocketAddress;
-import java.security.PrivilegedExceptionAction;
-import java.security.PrivilegedActionException;
-import java.util.Base64;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentMap;
-
-import javax.security.auth.Subject;
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.NameCallback;
-import javax.security.auth.callback.PasswordCallback;
-import javax.security.auth.login.LoginContext;
-import javax.security.auth.login.LoginException;
-import javax.security.sasl.Sasl;
-import javax.security.sasl.SaslClient;
-import javax.security.sasl.SaslException;
-
-/**
- * Holder for internal handler classes used in constructing the channel pipeline.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-final class Handler {
-
- /**
- * Generic SASL handler that will authenticate against the gremlin server.
- */
- static class GremlinSaslAuthenticationHandler extends SimpleChannelInboundHandler<ResponseMessage> implements CallbackHandler {
- private static final Logger logger = LoggerFactory.getLogger(GremlinSaslAuthenticationHandler.class);
- private static final AttributeKey<Subject> subjectKey = AttributeKey.valueOf("subject");
- private static final AttributeKey<SaslClient> saslClientKey = AttributeKey.valueOf("saslclient");
- private static final Map<String, String> SASL_PROPERTIES = new HashMap<String, String>() {{ put(Sasl.SERVER_AUTH, "true"); }};
- private static final byte[] NULL_CHALLENGE = new byte[0];
-
- private static final Base64.Encoder BASE64_ENCODER = Base64.getEncoder();
- private static final Base64.Decoder BASE64_DECODER = Base64.getDecoder();
-
- private final AuthProperties authProps;
-
- public GremlinSaslAuthenticationHandler(final AuthProperties authProps) {
- this.authProps = authProps;
- }
-
- @Override
- protected void channelRead0(final ChannelHandlerContext channelHandlerContext, final ResponseMessage response) throws Exception {
- // We are only interested in AUTHENTICATE responses here. Everything else can
- // get passed down the pipeline
- if (response.getStatus().getCode() == ResponseStatusCode.AUTHENTICATE) {
- final Attribute<SaslClient> saslClient = ((AttributeMap) channelHandlerContext).attr(saslClientKey);
- final Attribute<Subject> subject = ((AttributeMap) channelHandlerContext).attr(subjectKey);
- final RequestMessage.Builder messageBuilder = RequestMessage.build(Tokens.OPS_AUTHENTICATION);
- // First time through we don't have a sasl client
- if (saslClient.get() == null) {
- subject.set(login());
- try {
- saslClient.set(saslClient(getHostName(channelHandlerContext)));
- } catch (SaslException saslException) {
- // push the sasl error into a failure response from the server. this ensures that standard
- // processing for the ResultQueue is kept. without this SaslException trap and subsequent
- // conversion to an authentication failure, the close() of the connection might not
- // succeed as it will appear as though pending messages remain present in the queue on the
- // connection and the shutdown won't proceed
- final ResponseMessage clientSideError = ResponseMessage.build(response.getRequestId())
- .code(ResponseStatusCode.FORBIDDEN).statusMessage(saslException.getMessage()).create();
- channelHandlerContext.fireChannelRead(clientSideError);
- return;
- }
-
- messageBuilder.addArg(Tokens.ARGS_SASL_MECHANISM, getMechanism());
- messageBuilder.addArg(Tokens.ARGS_SASL, saslClient.get().hasInitialResponse() ?
- BASE64_ENCODER.encodeToString(evaluateChallenge(subject, saslClient, NULL_CHALLENGE)) : null);
- } else {
- // the server sends base64 encoded sasl as well as the byte array. the byte array will eventually be
- // phased out, but is present now for backward compatibility in 3.2.x
- final String base64sasl = response.getStatus().getAttributes().containsKey(Tokens.ARGS_SASL) ?
- response.getStatus().getAttributes().get(Tokens.ARGS_SASL).toString() :
- BASE64_ENCODER.encodeToString((byte[]) response.getResult().getData());
-
- messageBuilder.addArg(Tokens.ARGS_SASL, BASE64_ENCODER.encodeToString(
- evaluateChallenge(subject, saslClient, BASE64_DECODER.decode(base64sasl))));
- }
- channelHandlerContext.writeAndFlush(messageBuilder.create());
- } else {
- // SimpleChannelInboundHandler will release the frame if we don't retain it explicitly.
- ReferenceCountUtil.retain(response);
- channelHandlerContext.fireChannelRead(response);
- }
- }
-
- public void handle(final Callback[] callbacks) {
- for (Callback callback : callbacks) {
- if (callback instanceof NameCallback) {
- if (authProps.get(AuthProperties.Property.USERNAME) != null) {
- ((NameCallback)callback).setName(authProps.get(AuthProperties.Property.USERNAME));
- }
- } else if (callback instanceof PasswordCallback) {
- if (authProps.get(AuthProperties.Property.PASSWORD) != null) {
- ((PasswordCallback)callback).setPassword(authProps.get(AuthProperties.Property.PASSWORD).toCharArray());
- }
- } else {
- logger.warn("SASL handler got a callback of type " + callback.getClass().getCanonicalName());
- }
- }
- }
-
- private byte[] evaluateChallenge(final Attribute<Subject> subject, final Attribute<SaslClient> saslClient,
- final byte[] challenge) throws SaslException {
-
- if (subject.get() == null) {
- return saslClient.get().evaluateChallenge(challenge);
- } else {
- // If we have a subject then run this as a privileged action using the subject
- try {
- return Subject.doAs(subject.get(), (PrivilegedExceptionAction<byte[]>) () -> saslClient.get().evaluateChallenge(challenge));
- } catch (PrivilegedActionException e) {
- throw (SaslException)e.getException();
- }
- }
- }
-
- private Subject login() throws LoginException {
- // Login if the user provided us with an entry into the JAAS config file
- if (authProps.get(AuthProperties.Property.JAAS_ENTRY) != null) {
- final LoginContext login = new LoginContext(authProps.get(AuthProperties.Property.JAAS_ENTRY));
- login.login();
- return login.getSubject();
- }
- return null;
- }
-
- private SaslClient saslClient(final String hostname) throws SaslException {
- return Sasl.createSaslClient(new String[] { getMechanism() }, null, authProps.get(AuthProperties.Property.PROTOCOL),
- hostname, SASL_PROPERTIES, this);
- }
-
- private String getHostName(final ChannelHandlerContext channelHandlerContext) {
- return ((InetSocketAddress)channelHandlerContext.channel().remoteAddress()).getAddress().getHostName();
- }
-
- /**
- * Work out the Sasl mechanism based on the user supplied parameters.
- * If we have a username and password use PLAIN otherwise GSSAPI
- * ToDo: have gremlin-server provide the mechanism(s) it is configured with, so that additional mechanisms can
- * be supported in the driver and confusing GSSException messages from the driver are avoided
- */
- private String getMechanism() {
- if ((authProps.get(AuthProperties.Property.USERNAME) != null) &&
- (authProps.get(AuthProperties.Property.PASSWORD) != null)) {
- return "PLAIN";
- } else {
- return "GSSAPI";
- }
- }
- }
-
- /**
- * Takes a map of requests pending responses and writes responses to the {@link ResultQueue} of a request
- * as the {@link ResponseMessage} objects are deserialized.
- */
- static class GremlinResponseHandler extends SimpleChannelInboundHandler<ResponseMessage> {
- private static final Logger logger = LoggerFactory.getLogger(GremlinResponseHandler.class);
- private final ConcurrentMap<UUID, ResultQueue> pending;
-
- public GremlinResponseHandler(final ConcurrentMap<UUID, ResultQueue> pending) {
- this.pending = pending;
- }
-
- @Override
- public void channelInactive(final ChannelHandlerContext ctx) throws Exception {
- // occurs when the server shuts down in a disorderly fashion, otherwise in an orderly shutdown the server
- // should fire off a close message which will properly release the driver.
- super.channelInactive(ctx);
-
- // the channel isn't going to get anymore results as it is closed so release all pending requests
- pending.values().forEach(val -> val.markError(new IllegalStateException("Connection to server is no longer active")));
- pending.clear();
- }
-
- @Override
- protected void channelRead0(final ChannelHandlerContext channelHandlerContext, final ResponseMessage response) throws Exception {
- final ResponseStatusCode statusCode = response.getStatus().getCode();
- final ResultQueue queue = pending.get(response.getRequestId());
- if (statusCode == ResponseStatusCode.SUCCESS || statusCode == ResponseStatusCode.PARTIAL_CONTENT) {
- final Object data = response.getResult().getData();
-
- // this is a "result" from the server which is either the result of a script or a
- // serialized traversal
- if (data instanceof List) {
- // unrolls the collection into individual results to be handled by the queue.
- final List<Object> listToUnroll = (List<Object>) data;
- listToUnroll.forEach(item -> queue.add(new Result(item)));
- } else {
- // since this is not a list it can just be added to the queue
- queue.add(new Result(response.getResult().getData()));
- }
- } else {
- // this is a "success" but represents no results otherwise it is an error
- if (statusCode != ResponseStatusCode.NO_CONTENT) {
- final Map<String,Object> attributes = response.getStatus().getAttributes();
- final String stackTrace = attributes.containsKey(Tokens.STATUS_ATTRIBUTE_STACK_TRACE) ?
- (String) attributes.get(Tokens.STATUS_ATTRIBUTE_STACK_TRACE) : null;
- final List<String> exceptions = attributes.containsKey(Tokens.STATUS_ATTRIBUTE_EXCEPTIONS) ?
- (List<String>) attributes.get(Tokens.STATUS_ATTRIBUTE_EXCEPTIONS) : null;
- queue.markError(new ResponseException(response.getStatus().getCode(), response.getStatus().getMessage(),
- exceptions, stackTrace, cleanStatusAttributes(attributes)));
- }
- }
-
- // as this is a non-PARTIAL_CONTENT code - the stream is done.
- if (statusCode != ResponseStatusCode.PARTIAL_CONTENT) {
- pending.remove(response.getRequestId()).markComplete(response.getStatus().getAttributes());
- }
- }
-
- @Override
- public void exceptionCaught(final ChannelHandlerContext ctx, final Throwable cause) throws Exception {
- // if this happens enough times (like the client is unable to deserialize a response) the pending
- // messages queue will not clear. wonder if there is some way to cope with that. of course, if
- // there are that many failures someone would take notice and hopefully stop the client.
- logger.error("Could not process the response", cause);
-
- // the channel took an error because of something pretty bad so release all the futures out there
- pending.values().forEach(val -> val.markError(cause));
- pending.clear();
-
- // serialization exceptions should not close the channel - that's worth a retry
- if (!IteratorUtils.anyMatch(ExceptionUtils.getThrowableList(cause).iterator(), t -> t instanceof SerializationException))
- if (ctx.channel().isActive()) ctx.close();
- }
-
- private Map<String,Object> cleanStatusAttributes(final Map<String,Object> statusAttributes) {
- final Map<String,Object> m = new HashMap<>();
- statusAttributes.forEach((k,v) -> {
- if (!k.equals(Tokens.STATUS_ATTRIBUTE_EXCEPTIONS) && !k.equals(Tokens.STATUS_ATTRIBUTE_STACK_TRACE))
- m.put(k,v);
- });
- return m;
- }
- }
-
-}
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/HandshakeInterceptor.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/HandshakeInterceptor.java
deleted file mode 100644
index 9b51321..0000000
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/HandshakeInterceptor.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver;
-
-import io.netty.handler.codec.http.FullHttpRequest;
-
-import java.util.function.UnaryOperator;
-
-/**
- * This function is called when the websocket handshake is attempted and the first {@code FullHttpRequest} is sent to
- * the server. The interceptor allows this message to be modified as needed before it is sent to the server.
- * Implementations are supplied to {@link Cluster.Builder#handshakeInterceptor(HandshakeInterceptor)}.
- * @deprecated As of release 3.6.6, replaced by {@link RequestInterceptor}.
- */
-@Deprecated
-public interface HandshakeInterceptor extends UnaryOperator<FullHttpRequest> {
-
- /**
- * The default implementation of a {@link HandshakeInterceptor} and behaves as a no-op.
- */
- public static final HandshakeInterceptor NO_OP = o -> o;
-}
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Host.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Host.java
index ef65e3a..8f9b6e5 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Host.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Host.java
@@ -26,7 +26,6 @@
import java.net.URISyntaxException;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Function;
@@ -49,8 +48,7 @@
Host(final InetSocketAddress address, final Cluster cluster) {
this.cluster = cluster;
this.address = address;
- this.hostUri = makeUriFromAddress(address, cluster.getPath(), cluster.connectionPoolSettings().enableSsl,
- cluster.getChannelizer());
+ this.hostUri = makeUriFromAddress(address, cluster.getPath(), cluster.connectionPoolSettings().enableSsl);
hostLabel = String.format("Host{address=%s, hostUri=%s}", address, hostUri);
}
@@ -113,13 +111,8 @@
makeAvailable();
}
- private static URI makeUriFromAddress(final InetSocketAddress addy, final String path, final boolean ssl, final String channelizerClass) {
- final Channelizer channelizer;
- try {
- channelizer = (Channelizer) Class.forName(channelizerClass).newInstance();
- } catch (Exception ex) {
- throw new RuntimeException(String.format("Invalid Channelizer instance: %s", channelizerClass));
- }
+ private static URI makeUriFromAddress(final InetSocketAddress addy, final String path, final boolean ssl) {
+ final Channelizer channelizer = new Channelizer.HttpChannelizer();
try {
final String scheme = channelizer.getScheme(ssl);
@@ -134,13 +127,13 @@
return hostLabel;
}
- public static interface Listener {
- public void onAvailable(final Host host);
+ public interface Listener {
+ void onAvailable(final Host host);
- public void onUnavailable(final Host host);
+ void onUnavailable(final Host host);
- public void onNew(final Host host);
+ void onNew(final Host host);
- public void onRemove(final Host host);
+ void onRemove(final Host host);
}
}
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/HttpRequest.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/HttpRequest.java
new file mode 100644
index 0000000..0d10a1a
--- /dev/null
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/HttpRequest.java
@@ -0,0 +1,136 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.driver;
+
+import java.net.URI;
+import java.util.Map;
+
+/**
+ * HttpRequest represents the data that will be used to create the actual request to the remote endpoint. It will be
+ * passed to different {@link RequestInterceptor} that can update its values. The body can be anything as the
+ * interceptor may change what the payload is. Also contains some convenience Strings for common HTTP header key and
+ * values and HTTP methods.
+ */
+public class HttpRequest {
+ public static class Headers {
+ // Add as needed. Headers are case-insensitive; lower case for now to match Netty.
+ public static final String ACCEPT = "accept";
+ public static final String ACCEPT_ENCODING = "accept-encoding";
+ public static final String AUTHORIZATION = "authorization";
+ public static final String CONTENT_TYPE = "content-type";
+ public static final String CONTENT_LENGTH = "content-length";
+ public static final String DEFLATE = "deflate";
+ public static final String HOST = "host";
+ public static final String USER_AGENT = "user-agent";
+ }
+
+ public static class Method {
+ public static final String GET = "GET";
+ public static final String POST = "POST";
+ }
+
+ private final Map<String, String> headers;
+ private Object body;
+ private URI uri;
+ private String method;
+
+ /**
+ * Constructor that defaults the method to {@code POST}.
+ */
+ public HttpRequest(final Map<String, String> headers, final Object body, final URI uri) {
+ this(headers, body, uri, Method.POST);
+ }
+
+ /**
+ * Full constructor.
+ */
+ public HttpRequest(final Map<String, String> headers, final Object body, final URI uri, final String method) {
+ this.headers = headers;
+ this.body = body;
+ this.uri = uri;
+ this.method = method;
+ }
+
+ /**
+ * Get the headers of the request.
+ *
+ * @return a map of headers. This can be used to directly update the entries.
+ */
+ public Map<String, String> headers() {
+ return headers;
+ }
+
+ /**
+ * Get the body of the request.
+ *
+ * @return an Object representing the body.
+ */
+ public Object getBody() {
+ return body;
+ }
+
+ /**
+ * Get the URI of the request.
+ *
+ * @return the request URI.
+ */
+ public URI getUri() {
+ return uri;
+ }
+
+ /**
+ * Get the HTTP method of the request. The standard {@code /gremlin} endpoint only supports {@code POST}.
+ *
+ * @return the HTTP method.
+ */
+ public String getMethod() {
+ return method;
+ }
+
+ /**
+ * Set the HTTP body of the request. During processing, the body can be any type but the final interceptor must set
+ * the body to a {@code byte[]}.
+ *
+ * @return this HttpRequest for method chaining.
+ */
+ public HttpRequest setBody(final Object body) {
+ this.body = body;
+ return this;
+ }
+
+ /**
+ * Set the HTTP method of the request.
+ *
+ * @return this HttpRequest for method chaining.
+ */
+ public HttpRequest setMethod(final String method) {
+ this.method = method;
+ return this;
+ }
+
+ /**
+ * Set the URI of the request.
+ *
+ * @return this HttpRequest for method chaining.
+ */
+ public HttpRequest setUri(final URI uri) {
+ this.uri = uri;
+ return this;
+ }
+}
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/RequestInterceptor.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/RequestInterceptor.java
index 0aae506..84fbc77 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/RequestInterceptor.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/RequestInterceptor.java
@@ -18,19 +18,14 @@
*/
package org.apache.tinkerpop.gremlin.driver;
-import io.netty.handler.codec.http.FullHttpRequest;
-
import java.util.function.UnaryOperator;
/**
- * This function is called a {@code FullHttpRequest} constructed and allow it to be modified as needed before it is
- * sent to the server. Implementations are supplied to {@link Cluster.Builder#requestInterceptor(RequestInterceptor)}.
- * When this method is called is dependent on the {@link Channelizer} implementation.
+ * Interceptors are run as a list to allow modification of the HTTP request before it is sent to the server. The first
+ * interceptor will be provided with a {@link HttpRequest} that holds a
+ * {@link org.apache.tinkerpop.gremlin.util.message.RequestMessage} in the body. The final interceptor should contain a
+ * {@code byte[]} in the body.
*/
-public interface RequestInterceptor extends UnaryOperator<FullHttpRequest> {
+public interface RequestInterceptor extends UnaryOperator<HttpRequest> {
- /**
- * The default implementation of a {@link RequestInterceptor} and behaves as a no-op.
- */
- public static final RequestInterceptor NO_OP = o -> o;
}
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/RequestOptions.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/RequestOptions.java
index f439157..a7fc2a2 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/RequestOptions.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/RequestOptions.java
@@ -18,22 +18,21 @@
*/
package org.apache.tinkerpop.gremlin.driver;
-import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
+import org.apache.tinkerpop.gremlin.process.traversal.GremlinLang;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.OptionsStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.util.BytecodeHelper;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.Optional;
-import java.util.UUID;
import static org.apache.tinkerpop.gremlin.util.Tokens.ARGS_BATCH_SIZE;
+import static org.apache.tinkerpop.gremlin.util.Tokens.BULK_RESULTS;
import static org.apache.tinkerpop.gremlin.util.Tokens.ARGS_EVAL_TIMEOUT;
+import static org.apache.tinkerpop.gremlin.util.Tokens.ARGS_G;
+import static org.apache.tinkerpop.gremlin.util.Tokens.ARGS_LANGUAGE;
import static org.apache.tinkerpop.gremlin.util.Tokens.ARGS_MATERIALIZE_PROPERTIES;
-import static org.apache.tinkerpop.gremlin.util.Tokens.ARGS_USER_AGENT;
-import static org.apache.tinkerpop.gremlin.util.Tokens.REQUEST_ID;
/**
* Options that can be supplied on a per request basis.
@@ -44,32 +43,26 @@
public static final RequestOptions EMPTY = RequestOptions.build().create();
- private final Map<String,String> aliases;
+ private final String graphOrTraversalSource;
private final Map<String, Object> parameters;
private final Integer batchSize;
private final Long timeout;
- private final UUID overrideRequestId;
- private final String userAgent;
private final String language;
private final String materializeProperties;
+ private final String bulkResults;
private RequestOptions(final Builder builder) {
- this.aliases = builder.aliases;
+ this.graphOrTraversalSource = builder.graphOrTraversalSource;
this.parameters = builder.parameters;
this.batchSize = builder.batchSize;
this.timeout = builder.timeout;
- this.overrideRequestId = builder.overrideRequestId;
- this.userAgent = builder.userAgent;
this.language = builder.language;
this.materializeProperties = builder.materializeProperties;
+ this.bulkResults = builder.bulkResults;
}
- public Optional<UUID> getOverrideRequestId() {
- return Optional.ofNullable(overrideRequestId);
- }
-
- public Optional<Map<String, String>> getAliases() {
- return Optional.ofNullable(aliases);
+ public Optional<String> getG() {
+ return Optional.ofNullable(graphOrTraversalSource);
}
public Optional<Map<String, Object>> getParameters() {
@@ -84,59 +77,60 @@
return Optional.ofNullable(timeout);
}
- public Optional<String> getUserAgent() {
- return Optional.ofNullable(userAgent);
- }
-
public Optional<String> getLanguage() {
return Optional.ofNullable(language);
}
public Optional<String> getMaterializeProperties() { return Optional.ofNullable(materializeProperties); }
+ public Optional<String> getBulkResults() { return Optional.ofNullable(bulkResults); }
+
public static Builder build() {
return new Builder();
}
- public static RequestOptions getRequestOptions(final Bytecode bytecode) {
- final Iterator<OptionsStrategy> itty = BytecodeHelper.findStrategies(bytecode, OptionsStrategy.class);
- final Builder builder = RequestOptions.build();
+ public static RequestOptions getRequestOptions(final GremlinLang gremlinLang) {
+ final Iterator<OptionsStrategy> itty = gremlinLang.getOptionsStrategies().iterator();
+ final RequestOptions.Builder builder = RequestOptions.build();
while (itty.hasNext()) {
final OptionsStrategy optionsStrategy = itty.next();
- final Map<String,Object> options = optionsStrategy.getOptions();
+ final Map<String, Object> options = optionsStrategy.getOptions();
if (options.containsKey(ARGS_EVAL_TIMEOUT))
builder.timeout(((Number) options.get(ARGS_EVAL_TIMEOUT)).longValue());
- if (options.containsKey(REQUEST_ID))
- builder.overrideRequestId((UUID) options.get(REQUEST_ID));
if (options.containsKey(ARGS_BATCH_SIZE))
builder.batchSize(((Number) options.get(ARGS_BATCH_SIZE)).intValue());
- if (options.containsKey(ARGS_USER_AGENT))
- builder.userAgent((String) options.get(ARGS_USER_AGENT));
if (options.containsKey(ARGS_MATERIALIZE_PROPERTIES))
builder.materializeProperties((String) options.get(ARGS_MATERIALIZE_PROPERTIES));
+ if (options.containsKey(ARGS_LANGUAGE))
+ builder.language((String) options.get(ARGS_LANGUAGE));
+ if (options.containsKey(BULK_RESULTS))
+ builder.bulkResults((boolean) options.get(BULK_RESULTS));
+ }
+ // request the server to bulk results by default when using DRC through request options
+ if (builder.bulkResults == null)
+ builder.bulkResults(true);
+
+ final Map<String, Object> parameters = gremlinLang.getParameters();
+ if (parameters != null && !parameters.isEmpty()) {
+ parameters.forEach(builder::addParameter);
}
return builder.create();
}
public static final class Builder {
- private Map<String,String> aliases = null;
+ private String graphOrTraversalSource = null;
private Map<String, Object> parameters = null;
private Integer batchSize = null;
private Long timeout = null;
- private UUID overrideRequestId = null;
- private String userAgent = null;
private String materializeProperties = null;
private String language = null;
- private boolean maintainStateAfterException = false;
+ private String bulkResults = null;
/**
* The aliases to set on the request.
*/
- public Builder addAlias(final String aliasName, final String actualName) {
- if (null == aliases)
- aliases = new HashMap<>();
-
- aliases.put(aliasName, actualName);
+ public Builder addG(final String graphOrTraversalSource) {
+ this.graphOrTraversalSource = graphOrTraversalSource;
return this;
}
@@ -147,15 +141,15 @@
if (null == parameters)
parameters = new HashMap<>();
- parameters.put(name, value);
- return this;
- }
+ if (ARGS_G.equals(name)) {
+ this.graphOrTraversalSource = (String) value;
+ }
- /**
- * Overrides the identifier to be sent on the request.
- */
- public Builder overrideRequestId(final UUID overrideRequestId) {
- this.overrideRequestId = overrideRequestId;
+ if (ARGS_LANGUAGE.equals(name)) {
+ this.language = (String) value;
+ }
+
+ parameters.put(name, value);
return this;
}
@@ -179,14 +173,6 @@
}
/**
- * Sets the userAgent identifier to be sent on the request.
- */
- public Builder userAgent(final String userAgent) {
- this.userAgent = userAgent;
- return this;
- }
-
- /**
* Sets the language identifier to be sent on the request.
*/
public Builder language(final String language) {
@@ -202,9 +188,16 @@
return this;
}
+ /**
+ * Sets the bulkResults flag to be sent on the request. A value of turn will enable server to bulk results.
+ */
+ public Builder bulkResults(final boolean bulking) {
+ this.bulkResults = String.valueOf(bulking);
+ return this;
+ }
+
public RequestOptions create() {
return new RequestOptions(this);
}
-
}
}
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Result.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Result.java
index 4c34aad..0d55e52 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Result.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Result.java
@@ -18,13 +18,13 @@
*/
package org.apache.tinkerpop.gremlin.driver;
-import org.apache.tinkerpop.gremlin.util.message.ResponseResult;
import org.apache.tinkerpop.gremlin.process.traversal.Path;
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 org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.util.message.ResponseResult;
import java.util.Iterator;
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java
index c73cc5a..203a319 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java
@@ -18,14 +18,13 @@
*/
package org.apache.tinkerpop.gremlin.driver;
+import org.apache.tinkerpop.gremlin.driver.handler.GremlinResponseHandler;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.javatuples.Pair;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
import java.util.List;
-import java.util.Map;
import java.util.Queue;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ConcurrentLinkedQueue;
@@ -33,13 +32,13 @@
import java.util.concurrent.atomic.AtomicReference;
/**
- * A queue of incoming {@link Result} objects. The queue is updated by the {@link Handler.GremlinResponseHandler}
+ * A queue of incoming {@link Result} objects. The queue is updated by the {@link GremlinResponseHandler}
* until a response terminator is identified.
*
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
@SuppressWarnings("ThrowableResultOfMethodCallIgnored")
-final class ResultQueue {
+public final class ResultQueue {
private final LinkedBlockingQueue<Result> resultLinkedBlockingQueue;
@@ -49,8 +48,6 @@
private final Queue<Pair<CompletableFuture<List<Result>>,Integer>> waiting = new ConcurrentLinkedQueue<>();
- private Map<String,Object> statusAttributes = null;
-
public ResultQueue(final LinkedBlockingQueue<Result> resultLinkedBlockingQueue, final CompletableFuture<Void> readComplete) {
this.resultLinkedBlockingQueue = resultLinkedBlockingQueue;
this.readComplete = readComplete;
@@ -94,24 +91,18 @@
resultLinkedBlockingQueue.drainTo(collection);
}
- void markComplete(final Map<String,Object> statusAttributes) {
- this.statusAttributes = null == statusAttributes ? Collections.emptyMap() : statusAttributes;
-
+ public void markComplete() {
this.readComplete.complete(null);
this.drainAllWaiting();
}
- void markError(final Throwable throwable) {
+ public void markError(final Throwable throwable) {
error.set(throwable);
this.readComplete.completeExceptionally(throwable);
this.drainAllWaiting();
}
- Map<String,Object> getStatusAttributes() {
- return statusAttributes;
- }
-
/**
* Completes the next waiting future if there is one.
*/
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultSet.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultSet.java
index 4d60b8d..d74eb6e 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultSet.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultSet.java
@@ -21,15 +21,12 @@
import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.Iterator;
import java.util.List;
-import java.util.Map;
import java.util.NoSuchElementException;
import java.util.Spliterator;
import java.util.Spliterators;
import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionException;
import java.util.concurrent.ExecutorService;
import java.util.stream.Stream;
import java.util.stream.StreamSupport;
@@ -77,22 +74,6 @@
}
/**
- * Returns a future that will complete when {@link #allItemsAvailable()} is {@code true} and will contain the
- * attributes from the response.
- */
- public CompletableFuture<Map<String,Object>> statusAttributes() {
- return readCompleted.handleAsync((unusedInput, throwable) -> {
- if (throwable != null) {
- throw throwable instanceof CompletionException ?
- (CompletionException)throwable: new CompletionException(throwable);
- } else {
- return (null == resultQueue.getStatusAttributes() ?
- Collections.emptyMap() : resultQueue.getStatusAttributes());
- }
- }, executor);
- }
-
- /**
* Determines if all items have been returned to the client.
*/
public boolean allItemsAvailable() {
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Settings.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Settings.java
index 12be922..314894c 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Settings.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Settings.java
@@ -20,7 +20,7 @@
import org.apache.commons.configuration2.Configuration;
import org.apache.tinkerpop.gremlin.util.MessageSerializer;
-import org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1;
+import org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV4;
import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
import org.yaml.snakeyaml.LoaderOptions;
import org.yaml.snakeyaml.TypeDescription;
@@ -41,10 +41,10 @@
*
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
-final class Settings {
+public final class Settings {
/**
- * The port of the Gremlin Server to connect to which defaults to {@code 8192}. The same port will be applied for
+ * The port of the Gremlin Server to connect to which defaults to {@code 8182}. The same port will be applied for
* all {@link #hosts}.
*/
public int port = 8182;
@@ -71,6 +71,11 @@
public ConnectionPoolSettings connectionPool = new ConnectionPoolSettings();
/**
+ * Settings for authentication.
+ */
+ public AuthSettings auth = new AuthSettings();
+
+ /**
* The size of the thread pool defaulted to the number of available processors.
*/
public int nioPoolSize = Runtime.getRuntime().availableProcessors();
@@ -81,34 +86,14 @@
public int workerPoolSize = Runtime.getRuntime().availableProcessors() * 2;
/**
- * The username to submit on requests that require authentication.
- */
- public String username = null;
-
- /**
- * The password to submit on requests that require authentication.
- */
- public String password = null;
-
- /**
- * The JAAS to submit on requests that require authentication.
- */
- public String jaasEntry = null;
-
- /**
- * The JAAS protocol to submit on requests that require authentication.
- */
- public String protocol = null;
-
- /**
* Toggles if user agent should be sent in web socket handshakes.
*/
public boolean enableUserAgentOnConnect = true;
/**
- * Configures use of per-message deflate compression. Defaults to true.
+ * Toggles if result from server is bulked. Default is false.
*/
- public boolean enableCompression = true;
+ public boolean bulkResults = false;
/**
* Read configuration from a file into a new {@link Settings} object.
@@ -144,23 +129,11 @@
if (conf.containsKey("workerPoolSize"))
settings.workerPoolSize = conf.getInt("workerPoolSize");
- if (conf.containsKey("username"))
- settings.username = conf.getString("username");
-
- if (conf.containsKey("password"))
- settings.password = conf.getString("password");
-
- if (conf.containsKey("jaasEntry"))
- settings.jaasEntry = conf.getString("jaasEntry");
-
- if (conf.containsKey("protocol"))
- settings.protocol = conf.getString("protocol");
-
if (conf.containsKey("enableUserAgentOnConnect"))
settings.enableUserAgentOnConnect = conf.getBoolean("enableUserAgentOnConnect");
- if (conf.containsKey("enableCompression"))
- settings.enableCompression = conf.getBoolean("enableCompression");
+ if (conf.containsKey("bulkResults"))
+ settings.bulkResults = conf.getBoolean("bulkResults");
if (conf.containsKey("hosts"))
settings.hosts = conf.getList("hosts").stream().map(Object::toString).collect(Collectors.toList());
@@ -185,9 +158,6 @@
if (IteratorUtils.count(connectionPoolConf.getKeys()) > 0) {
final ConnectionPoolSettings cpSettings = new ConnectionPoolSettings();
- if (connectionPoolConf.containsKey("channelizer"))
- cpSettings.channelizer = connectionPoolConf.getString("channelizer");
-
if (connectionPoolConf.containsKey("enableSsl"))
cpSettings.enableSsl = connectionPoolConf.getBoolean("enableSsl");
@@ -220,32 +190,17 @@
if (connectionPoolConf.containsKey("sslSkipCertValidation"))
cpSettings.sslSkipCertValidation = connectionPoolConf.getBoolean("sslSkipCertValidation");
- if (connectionPoolConf.containsKey("minSize"))
- cpSettings.minSize = connectionPoolConf.getInt("minSize");
-
if (connectionPoolConf.containsKey("maxSize"))
cpSettings.maxSize = connectionPoolConf.getInt("maxSize");
- if (connectionPoolConf.containsKey("minSimultaneousUsagePerConnection"))
- cpSettings.minSimultaneousUsagePerConnection = connectionPoolConf.getInt("minSimultaneousUsagePerConnection");
-
- if (connectionPoolConf.containsKey("maxSimultaneousUsagePerConnection"))
- cpSettings.maxSimultaneousUsagePerConnection = connectionPoolConf.getInt("maxSimultaneousUsagePerConnection");
-
- if (connectionPoolConf.containsKey("maxInProcessPerConnection"))
- cpSettings.maxInProcessPerConnection = connectionPoolConf.getInt("maxInProcessPerConnection");
-
- if (connectionPoolConf.containsKey("minInProcessPerConnection"))
- cpSettings.minInProcessPerConnection = connectionPoolConf.getInt("minInProcessPerConnection");
-
if (connectionPoolConf.containsKey("maxWaitForConnection"))
cpSettings.maxWaitForConnection = connectionPoolConf.getInt("maxWaitForConnection");
if (connectionPoolConf.containsKey("maxWaitForClose"))
cpSettings.maxWaitForClose = connectionPoolConf.getInt("maxWaitForClose");
- if (connectionPoolConf.containsKey("maxContentLength"))
- cpSettings.maxContentLength = connectionPoolConf.getInt("maxContentLength");
+ if (connectionPoolConf.containsKey("maxResponseContentLength"))
+ cpSettings.maxResponseContentLength = connectionPoolConf.getInt("maxResponseContentLength");
if (connectionPoolConf.containsKey("reconnectInterval"))
cpSettings.reconnectInterval = connectionPoolConf.getInt("reconnectInterval");
@@ -253,18 +208,34 @@
if (connectionPoolConf.containsKey("resultIterationBatchSize"))
cpSettings.resultIterationBatchSize = connectionPoolConf.getInt("resultIterationBatchSize");
- if (connectionPoolConf.containsKey("keepAliveInterval"))
- cpSettings.keepAliveInterval = connectionPoolConf.getLong("keepAliveInterval");
-
if (connectionPoolConf.containsKey("validationRequest"))
cpSettings.validationRequest = connectionPoolConf.getString("validationRequest");
if (connectionPoolConf.containsKey("connectionSetupTimeoutMillis"))
cpSettings.connectionSetupTimeoutMillis = connectionPoolConf.getLong("connectionSetupTimeoutMillis");
+ if (connectionPoolConf.containsKey("idleConnectionTimeout"))
+ cpSettings.idleConnectionTimeout = connectionPoolConf.getLong("idleConnectionTimeout");
+
settings.connectionPool = cpSettings;
}
+ final Configuration authConf = conf.subset("auth");
+ if (IteratorUtils.count(authConf.getKeys()) > 0) {
+ final AuthSettings authSettings = new AuthSettings();
+
+ if (authConf.containsKey("type"))
+ authSettings.type = authConf.getString("type");
+
+ if (authConf.containsKey("username"))
+ authSettings.username = authConf.getString("username");
+
+ if (authConf.containsKey("password"))
+ authSettings.password = authConf.getString("password");
+
+ settings.auth = authSettings;
+ }
+
return settings;
}
@@ -330,47 +301,11 @@
public boolean sslSkipCertValidation = false;
/**
- * The minimum size of a connection pool for a {@link Host}. By default this is set to 2.
- */
- public int minSize = ConnectionPool.MIN_POOL_SIZE;
-
- /**
- * The maximum size of a connection pool for a {@link Host}. By default this is set to 8.
+ * The maximum size of a connection pool for a {@link Host}. By default this is set to 128.
*/
public int maxSize = ConnectionPool.MAX_POOL_SIZE;
/**
- * Length of time in milliseconds to wait on an idle connection before sending a keep-alive request. Set to
- * zero to disable this feature.
- */
- public long keepAliveInterval = Connection.KEEP_ALIVE_INTERVAL;
-
- /**
- * A connection under low use can be destroyed. This setting determines the threshold for determining when
- * that connection can be released and is defaulted to 8.
- */
- public int minSimultaneousUsagePerConnection = ConnectionPool.MIN_SIMULTANEOUS_USAGE_PER_CONNECTION;
-
- /**
- * If a connection is over used, then it might mean that is necessary to expand the pool by adding a new
- * connection. This setting determines the threshold for a connections over use and is defaulted to 16
- */
- public int maxSimultaneousUsagePerConnection = ConnectionPool.MAX_SIMULTANEOUS_USAGE_PER_CONNECTION;
-
- /**
- * The maximum number of requests in flight on a connection where the default is 4.
- */
- public int maxInProcessPerConnection = Connection.MAX_IN_PROCESS;
-
- /**
- * A connection has available in-process requests which is calculated by subtracting the number of current
- * in-flight requests on a connection and subtracting that from the {@link #maxInProcessPerConnection}. When
- * that number drops below this configuration setting, the connection is recommended for replacement. The
- * default for this setting is 1.
- */
- public int minInProcessPerConnection = Connection.MIN_IN_PROCESS;
-
- /**
* The amount of time in milliseconds to wait for a new connection before timing out where the default value
* is 3000.
*/
@@ -384,10 +319,10 @@
public int maxWaitForClose = Connection.MAX_WAIT_FOR_CLOSE;
/**
- * The maximum length in bytes that a message can be sent to the server. This number can be no greater than
- * the setting of the same name in the server configuration. The default value is 65536.
+ * The maximum length in bytes of a response message that can be received from the server. The default value is
+ * {@link Integer#MAX_VALUE}.
*/
- public int maxContentLength = Connection.MAX_CONTENT_LENGTH;
+ public long maxResponseContentLength = Connection.MAX_RESPONSE_CONTENT_LENGTH;
/**
* The amount of time in milliseconds to wait before trying to reconnect to a dead host. The default value is
@@ -402,16 +337,9 @@
public int resultIterationBatchSize = Connection.RESULT_ITERATION_BATCH_SIZE;
/**
- * The constructor for the channel that connects to the server. This value should be the fully qualified
- * class name of a Gremlin Driver {@link Channelizer} implementation. By default this value is set to
- * {@link Channelizer.WebSocketChannelizer}.
- */
- public String channelizer = Channelizer.WebSocketChannelizer.class.getName();
-
- /**
* A valid Gremlin script that can be used to test remote operations.
*/
- public String validationRequest = "''";
+ public String validationRequest = "g.inject(0)";
/**
* Duration of time in milliseconds provided for connection setup to complete which includes WebSocket
@@ -419,15 +347,23 @@
* complete by then.
*/
public long connectionSetupTimeoutMillis = Connection.CONNECTION_SETUP_TIMEOUT_MILLIS;
+
+ /**
+ * Time in milliseconds that the driver will allow a channel to not receive read or writes before it automatically closes.
+ * Note that while this value is to be provided as milliseconds it will resolve to
+ * second precision. Set this value to 0 to disable this feature.
+ */
+ public long idleConnectionTimeout = Connection.CONNECTION_IDLE_TIMEOUT_MILLIS;
+
}
public static class SerializerSettings {
/**
* The fully qualified class name of the {@link MessageSerializer} that will be used to communicate with the
* server. Note that the serializer configured on the client should be supported by the server configuration.
- * By default the setting is configured to {@link GraphBinaryMessageSerializerV1}.
+ * By default the setting is configured to {@link GraphBinaryMessageSerializerV4}.
*/
- public String className = GraphBinaryMessageSerializerV1.class.getCanonicalName();
+ public String className = GraphBinaryMessageSerializerV4.class.getCanonicalName();
/**
* The configuration for the specified serializer with the {@link #className}.
@@ -441,4 +377,29 @@
return serializer;
}
}
+
+ public static class AuthSettings {
+ /**
+ * Type of Auth to submit on requests that require authentication.
+ */
+ public String type = "";
+ /**
+ * The username to submit on requests that require authentication.
+ */
+ public String username = null;
+ /**
+ * The password to submit on requests that require authentication.
+ */
+ public String password = null;
+
+ /**
+ * The region setting for sigv4 authentication.
+ */
+ public String region = null;
+
+ /**
+ * The service name setting for sigv4 authentication.
+ */
+ public String serviceName = null;
+ }
}
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/auth/Auth.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/auth/Auth.java
new file mode 100644
index 0000000..7b438f8
--- /dev/null
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/auth/Auth.java
@@ -0,0 +1,56 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.driver.auth;
+
+import org.apache.tinkerpop.gremlin.driver.RequestInterceptor;
+import org.apache.tinkerpop.gremlin.driver.Settings;
+import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
+
+public interface Auth extends RequestInterceptor {
+ String AUTH_BASIC = "basic";
+ String AUTH_SIGV4 = "sigv4";
+
+ static Auth basic(final String username, final String password) {
+ return new Basic(username, password);
+ }
+
+ static Auth sigv4(final String regionName, final String serviceName) {
+ return new Sigv4(regionName, serviceName);
+ }
+
+ static Auth sigv4(final String regionName, final AwsCredentialsProvider awsCredentialsProvider, final String serviceName) {
+ return new Sigv4(regionName, awsCredentialsProvider, serviceName);
+ }
+
+ static Auth from(Settings.AuthSettings settings) {
+ if (settings.type.equals(AUTH_BASIC)) {
+ return basic(settings.username, settings.password);
+ }
+ if (settings.type.equals(AUTH_SIGV4)) {
+ return sigv4(settings.region, settings.serviceName);
+ }
+ throw new IllegalArgumentException("Unknown auth type: " + settings.type);
+ }
+
+ class AuthenticationException extends RuntimeException {
+ public AuthenticationException(Exception cause) {
+ super(cause);
+ }
+ }
+}
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/auth/Basic.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/auth/Basic.java
new file mode 100644
index 0000000..f69d624
--- /dev/null
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/auth/Basic.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.driver.auth;
+
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpHeaderNames;
+import org.apache.tinkerpop.gremlin.driver.HttpRequest;
+
+import java.util.Base64;
+
+public class Basic implements Auth {
+
+ private final String username;
+ private final String password;
+
+ public Basic(final String username, final String password) {
+ this.username = username;
+ this.password = password;
+ }
+
+ @Override
+ public HttpRequest apply(final HttpRequest httpRequest) {
+ final String valueToEncode = username + ":" + password;
+ httpRequest.headers().put(HttpRequest.Headers.AUTHORIZATION,
+ "Basic " + Base64.getEncoder().encodeToString(valueToEncode.getBytes()));
+ return httpRequest;
+ }
+}
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/auth/Sigv4.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/auth/Sigv4.java
new file mode 100644
index 0000000..1c57322
--- /dev/null
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/auth/Sigv4.java
@@ -0,0 +1,209 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.driver.auth;
+
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import org.apache.tinkerpop.gremlin.driver.HttpRequest;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import software.amazon.awssdk.auth.credentials.AwsCredentials;
+import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
+import software.amazon.awssdk.auth.credentials.AwsSessionCredentials;
+import software.amazon.awssdk.auth.credentials.DefaultCredentialsProvider;
+import software.amazon.awssdk.http.ContentStreamProvider;
+import software.amazon.awssdk.http.SdkHttpMethod;
+import software.amazon.awssdk.http.SdkHttpRequest;
+import software.amazon.awssdk.http.auth.aws.signer.AwsV4HttpSigner;
+import software.amazon.awssdk.http.auth.spi.signer.SignedRequest;
+import software.amazon.awssdk.utils.http.SdkHttpUtils;
+
+import static software.amazon.awssdk.http.auth.aws.internal.signer.util.SignerConstant.AUTHORIZATION;
+import static software.amazon.awssdk.http.auth.aws.internal.signer.util.SignerConstant.HOST;
+import static software.amazon.awssdk.http.auth.aws.internal.signer.util.SignerConstant.X_AMZ_CONTENT_SHA256;
+import static software.amazon.awssdk.http.auth.aws.internal.signer.util.SignerConstant.X_AMZ_DATE;
+import static software.amazon.awssdk.http.auth.aws.internal.signer.util.SignerConstant.X_AMZ_SECURITY_TOKEN;
+
+/**
+ * A {@link org.apache.tinkerpop.gremlin.driver.RequestInterceptor} that provides headers required for SigV4. Because
+ * the signing process requires final header and body data, this interceptor should almost always be last.
+ */
+public class Sigv4 implements Auth {
+ private static final Logger logger = LoggerFactory.getLogger(Sigv4.class);
+ private final AwsCredentialsProvider awsCredentialsProvider;
+ private final AwsV4HttpSigner aws4Signer;
+ private final String serviceName;
+ private final String regionName;
+
+ public Sigv4(final String regionName, final String serviceName) {
+ this(regionName, DefaultCredentialsProvider.create(), serviceName);
+ }
+
+ public Sigv4(final String regionName, final AwsCredentialsProvider awsCredentialsProvider, final String serviceName) {
+ this.awsCredentialsProvider = awsCredentialsProvider;
+
+ aws4Signer = AwsV4HttpSigner.create();
+ this.regionName = regionName;
+ this.serviceName = serviceName;
+ }
+
+ @Override
+ public HttpRequest apply(final HttpRequest httpRequest) {
+ try {
+ final ContentStreamProvider content = toContentStream(httpRequest);
+ // Convert Http request into an AWS SDK signable request
+ final SdkHttpRequest awsSignableRequest = toSignableRequest(httpRequest);
+ final AwsCredentials credentials = awsCredentialsProvider.resolveCredentials();
+
+ // Sign the AWS SDK signable request (which internally adds some HTTP headers)
+ final SignedRequest signed = aws4Signer.sign(r -> r.identity(credentials)
+ .request(awsSignableRequest)
+ .payload(content)
+ .putProperty(AwsV4HttpSigner.SERVICE_SIGNING_NAME, this.serviceName)
+ .putProperty(AwsV4HttpSigner.REGION_NAME, this.regionName));
+
+ final Map<String, String> headers = httpRequest.headers();
+ setSignedHeaders(headers, signed);
+ setSessionToken(headers, credentials);
+ } catch (final Exception ex) {
+ logger.error("Error signing HTTP request: {}", ex.getMessage(), ex);
+ throw new AuthenticationException(ex);
+ }
+ return httpRequest;
+ }
+
+ private void setSessionToken(final Map<String, String> headers, final AwsCredentials credentials) {
+ // extract session token if temporary credentials are provided
+ if ((credentials instanceof AwsSessionCredentials)) {
+ final String sessionToken = ((AwsSessionCredentials) credentials).sessionToken();
+ if (sessionToken != null && !sessionToken.isEmpty()) {
+ headers.put(X_AMZ_SECURITY_TOKEN, sessionToken);
+ }
+ }
+ }
+
+ private void setSignedHeaders(final Map<String, String> headers, final SignedRequest signed) {
+ headers.remove(HttpRequest.Headers.HOST);
+ headers.put(HOST, signed.request().host());
+ final Map<String, List<String>> signedHeaders = signed.request().headers();
+ headers.put(X_AMZ_DATE, getSingleHeaderValue(signedHeaders, X_AMZ_DATE));
+ headers.put(AUTHORIZATION, getSingleHeaderValue(signedHeaders, AUTHORIZATION));
+ headers.put(X_AMZ_CONTENT_SHA256, getSingleHeaderValue(signedHeaders, X_AMZ_CONTENT_SHA256));
+ }
+
+ private String getSingleHeaderValue(final Map<String, List<String>> headers, final String headerName) {
+ final Set<String> headerValues = new HashSet<>(headers.containsKey(headerName) ? headers.get(headerName) : Collections.emptySet());
+ if (headerValues.size() != 1) {
+ throw new IllegalArgumentException(String.format("Expected 1 header %s but found %d", headerName, headerValues.size()));
+ }
+ return headerValues.iterator().next();
+ }
+
+ private ContentStreamProvider toContentStream(final HttpRequest httpRequest) {
+ // carry over the entity (or an empty entity, if no entity is provided)
+ if (!(httpRequest.getBody() instanceof byte[])) {
+ throw new IllegalArgumentException("Expected byte[] in HttpRequest body but got " + httpRequest.getBody().getClass());
+ }
+ final byte[] body = (byte[]) httpRequest.getBody();
+ return (body.length != 0) ? ContentStreamProvider.fromByteArray(body) : ContentStreamProvider.fromUtf8String("");
+ }
+
+ private SdkHttpRequest toSignableRequest(final HttpRequest request) {
+
+ // make sure the request contains the minimal required set of information
+ checkNotNull(request.getUri(), "The request URI must not be null");
+ checkNotNull(request.getMethod(), "The request method must not be null");
+
+ // convert the headers to the internal API format
+ final Map<String, String> headers = request.headers();
+ final Map<String, List<String>> headersInternal = new HashMap<>();
+
+ // we don't want to add the Host header as the Signer always adds the host header.
+ for (Map.Entry<String, String> header : headers.entrySet()) {
+ // Skip adding the Host header as the signing process will add one.
+ if (!header.getKey().equalsIgnoreCase(HttpRequest.Headers.HOST)) {
+ headersInternal.put(header.getKey(), Collections.singletonList(header.getValue()));
+ }
+ }
+
+ // convert the parameters to the internal API format
+ final URI uri = request.getUri();
+ final Map<String, List<String>> parametersInternal = extractParametersFromQueryString(uri.getQuery());
+
+ final URI endpointUri = URI.create(uri.getScheme() + "://" + uri.getHost());
+
+ // create the HTTP AWS SdkHttpRequest and carry over information
+ return SdkHttpRequest.builder()
+ .uri(endpointUri)
+ .encodedPath(uri.getPath())
+ .method(SdkHttpMethod.fromValue(request.getMethod()))
+ .headers(headersInternal)
+ .rawQueryParameters(parametersInternal)
+ .build();
+ }
+
+ private HashMap<String, List<String>> extractParametersFromQueryString(final String queryStr) {
+
+ final HashMap<String, List<String>> parameters = new HashMap<>();
+
+ if (queryStr == null) {
+ return parameters;
+ }
+
+ // convert the parameters to the internal API format
+ for (final String queryParam : queryStr.split("&")) {
+
+ if (!queryParam.isEmpty()) {
+ final String[] keyValuePair = queryParam.split("=", 2);
+
+ // parameters are encoded in the HTTP request, we need to decode them here
+ final String key = SdkHttpUtils.urlDecode(keyValuePair[0]);
+ final String value;
+
+ if (keyValuePair.length == 2) {
+ value = SdkHttpUtils.urlDecode(keyValuePair[1]);
+ } else {
+ value = "";
+ }
+
+ // insert the parameter key into the map, if not yet present
+ if (!parameters.containsKey(key)) {
+ parameters.put(key, new ArrayList<>());
+ }
+
+ // append the parameter value to the list for the given key
+ parameters.get(key).add(value);
+ }
+ }
+
+ return parameters;
+ }
+
+ private void checkNotNull(final Object obj, final String errMsg) {
+ if (obj == null) {
+ throw new IllegalArgumentException(errMsg);
+ }
+ }
+}
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/exception/ResponseException.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/exception/ResponseException.java
index fc4b5d5..84d2265 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/exception/ResponseException.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/exception/ResponseException.java
@@ -18,64 +18,34 @@
*/
package org.apache.tinkerpop.gremlin.driver.exception;
-import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import io.netty.handler.codec.http.HttpResponseStatus;
/**
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
public class ResponseException extends Exception {
- private final ResponseStatusCode responseStatusCode;
- private final String remoteStackTrace;
- private final List<String> remoteExceptionHierarchy;
- private final Map<String,Object> attributes;
+ private final HttpResponseStatus responseStatusCode;
+ private final String remoteException;
- public ResponseException(final ResponseStatusCode responseStatusCode, final String serverMessage) {
- this(responseStatusCode, serverMessage, null, null);
+ public ResponseException(final HttpResponseStatus responseStatusCode, final String serverMessage) {
+ this(responseStatusCode, serverMessage, null);
}
- public ResponseException(final ResponseStatusCode responseStatusCode, final String serverMessage,
- final List<String> remoteExceptionHierarchy, final String remoteStackTrace) {
- this(responseStatusCode, serverMessage, remoteExceptionHierarchy, remoteStackTrace, null);
- }
-
- public ResponseException(final ResponseStatusCode responseStatusCode, final String serverMessage,
- final List<String> remoteExceptionHierarchy, final String remoteStackTrace,
- final Map<String,Object> statusAttributes) {
+ public ResponseException(final HttpResponseStatus responseStatusCode, final String serverMessage,
+ final String remoteException) {
super(serverMessage);
this.responseStatusCode = responseStatusCode;
- this.remoteExceptionHierarchy = remoteExceptionHierarchy != null ? Collections.unmodifiableList(remoteExceptionHierarchy) : null;
- this.remoteStackTrace = remoteStackTrace;
- this.attributes = statusAttributes != null ? Collections.unmodifiableMap(statusAttributes) : null;
+ this.remoteException = remoteException;
}
- public ResponseStatusCode getResponseStatusCode() {
+ public HttpResponseStatus getResponseStatusCode() {
return responseStatusCode;
}
/**
- * The stacktrace produced by the remote server.
+ * The exception generated by the server.
*/
- public Optional<String> getRemoteStackTrace() {
- return Optional.ofNullable(remoteStackTrace);
- }
-
- /**
- * The list of exceptions generated by the server starting with the top-most one followed by its "cause". That
- * cause is then followed by its cause and so on down the line.
- */
- public Optional<List<String>> getRemoteExceptionHierarchy() {
- return Optional.ofNullable(remoteExceptionHierarchy);
- }
-
- /**
- * Gets any status attributes from the response.
- */
- public Optional<Map<String, Object>> getStatusAttributes() {
- return Optional.ofNullable(attributes);
+ public String getRemoteException() {
+ return remoteException;
}
}
\ No newline at end of file
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/GremlinResponseHandler.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/GremlinResponseHandler.java
new file mode 100644
index 0000000..d32acec
--- /dev/null
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/GremlinResponseHandler.java
@@ -0,0 +1,135 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.driver.handler;
+
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.SimpleChannelInboundHandler;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.util.AttributeKey;
+import javax.net.ssl.SSLException;
+import org.apache.commons.lang3.exception.ExceptionUtils;
+import org.apache.tinkerpop.gremlin.driver.Result;
+import org.apache.tinkerpop.gremlin.driver.ResultQueue;
+import org.apache.tinkerpop.gremlin.driver.exception.ResponseException;
+import org.apache.tinkerpop.gremlin.process.remote.traversal.DefaultRemoteTraverser;
+import org.apache.tinkerpop.gremlin.util.ExceptionHelper;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.util.ser.SerializationException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
+
+import static org.apache.tinkerpop.gremlin.driver.Channelizer.HttpChannelizer.LAST_CONTENT_READ_RESPONSE;
+
+/**
+ * Takes a map of requests pending responses and writes responses to the {@link ResultQueue} of a request
+ * as the {@link ResponseMessage} objects are deserialized.
+ */
+public class GremlinResponseHandler extends SimpleChannelInboundHandler<ResponseMessage> {
+ public static final AttributeKey<Throwable> INBOUND_SSL_EXCEPTION = AttributeKey.valueOf("inboundSslException");
+ private static final Logger logger = LoggerFactory.getLogger(GremlinResponseHandler.class);
+ private static final AttributeKey<ResponseException> CAUGHT_EXCEPTION = AttributeKey.valueOf("caughtException");
+ private final AtomicReference<ResultQueue> pending;
+
+ public GremlinResponseHandler(final AtomicReference<ResultQueue> pending) {
+ this.pending = pending;
+ }
+
+ @Override
+ public void channelInactive(final ChannelHandlerContext ctx) throws Exception {
+ // occurs when the server shuts down in a disorderly fashion, otherwise in an orderly shutdown the server
+ // should fire off a close message which will properly release the driver.
+ super.channelInactive(ctx);
+
+ final ResultQueue current = pending.getAndSet(null);
+ if (current != null) {
+ current.markError(new IllegalStateException("Connection to server is no longer active"));
+ }
+ }
+
+ @Override
+ protected void channelRead0(final ChannelHandlerContext channelHandlerContext, final ResponseMessage response) {
+ final HttpResponseStatus statusCode = response.getStatus() == null ? null : response.getStatus().getCode();
+ final ResultQueue queue = pending.get();
+
+ if ((null == statusCode) || (statusCode == HttpResponseStatus.OK)) {
+ final List<Object> data = response.getResult().getData();
+ final boolean bulked = channelHandlerContext.channel().attr(HttpGremlinResponseStreamDecoder.IS_BULKED).get();
+ // unrolls the collection into individual results to be handled by the queue.
+ if (bulked) {
+ for (Iterator<Object> iter = data.iterator(); iter.hasNext(); ) {
+ final Object obj = iter.next();
+ final long bulk = (long) iter.next();
+ DefaultRemoteTraverser<Object> item = new DefaultRemoteTraverser<>(obj, bulk);
+ queue.add(new Result(item));
+ }
+ } else {
+ data.forEach(item -> queue.add(new Result(item)));
+ }
+
+ } else {
+ // this is a "success" but represents no results otherwise it is an error
+ if (statusCode != HttpResponseStatus.NO_CONTENT) {
+ // Save the error because there could be a subsequent HttpContent coming (probably just trailers). All
+ // content should be read first before marking the queue or else this channel might get reused too early.
+ channelHandlerContext.channel().attr(CAUGHT_EXCEPTION).set(
+ new ResponseException(response.getStatus().getCode(), response.getStatus().getMessage(),
+ response.getStatus().getException())
+ );
+ }
+ }
+
+ // Stream is done when the last content signaling response message is read.
+ if (LAST_CONTENT_READ_RESPONSE == response) {
+ final ResultQueue resultQueue = pending.getAndSet(null);
+ if (resultQueue != null) {
+ if (null == channelHandlerContext.channel().attr(CAUGHT_EXCEPTION).get()) {
+ resultQueue.markComplete();
+ } else {
+ resultQueue.markError(channelHandlerContext.channel().attr(CAUGHT_EXCEPTION).getAndSet(null));
+ }
+ }
+ }
+ }
+
+ @Override
+ public void exceptionCaught(final ChannelHandlerContext ctx, final Throwable cause) {
+ // if this happens enough times (like the client is unable to deserialize a response) the pending
+ // messages queue will not clear. wonder if there is some way to cope with that. of course, if
+ // there are that many failures someone would take notice and hopefully stop the client.
+ logger.error("Could not process the response", cause);
+
+ final ResultQueue pendingQueue = pending.getAndSet(null);
+ if (pendingQueue != null) pendingQueue.markError(cause);
+
+ if (ExceptionHelper.getRootCause(cause) instanceof SSLException) {
+ // inbound ssl error can happen with tls 1.3 because client certification auth can fail after the handshake completes
+ // store the inbound ssl error so that outbound can retrieve it
+ ctx.channel().attr(INBOUND_SSL_EXCEPTION).set(cause);
+ }
+
+ // serialization exceptions should not close the channel - that's worth a retry
+ if (!IteratorUtils.anyMatch(ExceptionUtils.getThrowableList(cause).iterator(), t -> t instanceof SerializationException))
+ if (ctx.channel().isActive()) ctx.close();
+ }
+}
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/HttpContentDecompressionHandler.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/HttpContentDecompressionHandler.java
new file mode 100644
index 0000000..7e0e7a8
--- /dev/null
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/HttpContentDecompressionHandler.java
@@ -0,0 +1,103 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.driver.handler;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufUtil;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandlerAdapter;
+import io.netty.handler.codec.http.HttpContent;
+import io.netty.handler.codec.http.HttpHeaderNames;
+import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.HttpResponse;
+import io.netty.handler.codec.http.LastHttpContent;
+import io.netty.util.AttributeKey;
+import io.netty.util.ReferenceCountUtil;
+
+import java.util.Arrays;
+import java.util.zip.DataFormatException;
+import java.util.zip.Inflater;
+
+/**
+ * Handles decompression of content when the response contains the "Content-Encoding" header. Currently supports "deflate".
+ * This class is specifically meant to work with serialized GraphBinary chunks as they need to be inflated per chunk such
+ * that the chunk ends with a Marker.END_OF_STREAM.
+ */
+@ChannelHandler.Sharable
+public class HttpContentDecompressionHandler extends ChannelInboundHandlerAdapter {
+ private static final AttributeKey<Inflater> INFLATER = AttributeKey.valueOf("inflater");
+ private static final int MIN_BUFFER_SIZE = 16; // Don't want a buffer too small as it could cause lots of resizing.
+
+ @Override
+ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
+ Object out = msg;
+
+ if (msg instanceof HttpResponse && (hasDeflateTransferEncoding(((HttpResponse) msg).headers()))) {
+ ctx.attr(INFLATER).set(new Inflater());
+ }
+
+ if (msg instanceof HttpContent) {
+ final Inflater decompressor = ctx.attr(INFLATER).get();
+ if (null == decompressor) {
+ super.channelRead(ctx, msg);
+ return;
+ }
+
+ final ByteBuf chunk = ((HttpContent) msg).content();
+ decompressor.setInput(ByteBufUtil.getBytes(chunk));
+ final int decompressedSizeEstimate = chunk.readableBytes() * 8;
+ byte[] outBuf = new byte[Math.max(decompressedSizeEstimate, MIN_BUFFER_SIZE)];
+
+ try {
+ int writeIdx = 0;
+ int bytesWritten = decompressor.inflate(outBuf, writeIdx, outBuf.length);
+
+ while (bytesWritten == (outBuf.length - writeIdx)) {
+ writeIdx += bytesWritten;
+ outBuf = Arrays.copyOf(outBuf, outBuf.length * 2);
+ bytesWritten = decompressor.inflate(outBuf, writeIdx, outBuf.length - writeIdx);
+ }
+
+ writeIdx += bytesWritten;
+ out = ((HttpContent) msg).replace(Unpooled.wrappedBuffer(outBuf).writerIndex(writeIdx));
+ ReferenceCountUtil.release(msg);
+
+ if (out instanceof LastHttpContent) { ctx.attr(INFLATER).getAndSet(null).end(); }
+ } catch (DataFormatException dfe) {
+ ctx.attr(INFLATER).getAndSet(null).end();
+ ctx.fireExceptionCaught(dfe);
+ return;
+ }
+ }
+
+ super.channelRead(ctx, out);
+ }
+
+ private boolean hasDeflateTransferEncoding(HttpHeaders headers) {
+ for (String value : headers.getAll(HttpHeaderNames.CONTENT_ENCODING)) {
+ if ("deflate".equals(value)) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+}
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/HttpGremlinRequestEncoder.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/HttpGremlinRequestEncoder.java
index 67f7e3d..9c75d41 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/HttpGremlinRequestEncoder.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/HttpGremlinRequestEncoder.java
@@ -19,73 +19,117 @@
package org.apache.tinkerpop.gremlin.driver.handler;
import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.Channel;
import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.MessageToMessageEncoder;
import io.netty.handler.codec.http.DefaultFullHttpRequest;
import io.netty.handler.codec.http.FullHttpRequest;
-import io.netty.handler.codec.http.HttpHeaderNames;
import io.netty.handler.codec.http.HttpMethod;
+import io.netty.handler.codec.http.HttpResponseStatus;
import io.netty.handler.codec.http.HttpVersion;
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.tinkerpop.gremlin.driver.HttpRequest;
+import org.apache.tinkerpop.gremlin.driver.RequestInterceptor;
import org.apache.tinkerpop.gremlin.driver.UserAgent;
+import org.apache.tinkerpop.gremlin.driver.auth.Auth.AuthenticationException;
import org.apache.tinkerpop.gremlin.driver.exception.ResponseException;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
+import org.apache.tinkerpop.gremlin.process.traversal.GremlinLang;
import org.apache.tinkerpop.gremlin.util.MessageSerializer;
+import org.apache.tinkerpop.gremlin.util.Tokens;
import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.util.ser.SerTokens;
+import java.net.InetSocketAddress;
+import java.net.URI;
+import java.util.HashMap;
import java.util.List;
-import java.util.function.UnaryOperator;
+import java.util.Map;
+
+import static org.apache.tinkerpop.gremlin.driver.handler.InactiveChannelHandler.REQUEST_SENT;
/**
* Converts {@link RequestMessage} to a {@code HttpRequest}.
*/
@ChannelHandler.Sharable
public final class HttpGremlinRequestEncoder extends MessageToMessageEncoder<RequestMessage> {
+
private final MessageSerializer<?> serializer;
private final boolean userAgentEnabled;
- private final UnaryOperator<FullHttpRequest> interceptor;
+ private final boolean bulkResults;
+ private final List<Pair<String, ? extends RequestInterceptor>> interceptors;
+ private final URI uri;
- @Deprecated
- public HttpGremlinRequestEncoder(final MessageSerializer<?> serializer, final UnaryOperator<FullHttpRequest> interceptor) {
+ public HttpGremlinRequestEncoder(final MessageSerializer<?> serializer,
+ final List<Pair<String, ? extends RequestInterceptor>> interceptors,
+ final boolean userAgentEnabled, boolean bulkResults, final URI uri) {
this.serializer = serializer;
- this.interceptor = interceptor;
- this.userAgentEnabled = true;
- }
-
- public HttpGremlinRequestEncoder(final MessageSerializer<?> serializer, final UnaryOperator<FullHttpRequest> interceptor, boolean userAgentEnabled) {
- this.serializer = serializer;
- this.interceptor = interceptor;
+ this.interceptors = interceptors;
this.userAgentEnabled = userAgentEnabled;
+ this.bulkResults = bulkResults;
+ this.uri = uri;
}
@Override
protected void encode(final ChannelHandlerContext channelHandlerContext, final RequestMessage requestMessage, final List<Object> objects) throws Exception {
final String mimeType = serializer.mimeTypesSupported()[0];
- // only GraphSON3 and GraphBinary recommended for serialization of Bytecode requests
- if (requestMessage.getArg("gremlin") instanceof Bytecode &&
- !mimeType.equals(SerTokens.MIME_GRAPHSON_V3) &&
- !mimeType.equals(SerTokens.MIME_GRAPHBINARY_V1)) {
- throw new ResponseException(ResponseStatusCode.REQUEST_ERROR_SERIALIZATION, String.format(
- "An error occurred during serialization of this request [%s] - it could not be sent to the server - Reason: only GraphSON3 and GraphBinary recommended for serialization of Bytecode requests, but used %s",
- requestMessage, serializer.getClass().getName()));
+ if (requestMessage.getField("gremlin") instanceof GremlinLang) {
+ throw new ResponseException(HttpResponseStatus.BAD_REQUEST, String.format(
+ "An error occurred during serialization of this request [%s] - it could not be sent to the server - Reason: GremlinLang is not intended to be send as query.",
+ requestMessage));
}
+ final InetSocketAddress remoteAddress = getRemoteAddress(channelHandlerContext.channel());
try {
- final ByteBuf buffer = serializer.serializeRequestAsBinary(requestMessage, channelHandlerContext.alloc());
- final FullHttpRequest request = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.POST, "/", buffer);
- request.headers().add(HttpHeaderNames.CONTENT_TYPE, mimeType);
- request.headers().add(HttpHeaderNames.CONTENT_LENGTH, buffer.readableBytes());
- request.headers().add(HttpHeaderNames.ACCEPT, mimeType);
+ Map<String, String> headersMap = new HashMap<>();
+ headersMap.put(HttpRequest.Headers.HOST, remoteAddress.getAddress().getHostAddress());
+ headersMap.put(HttpRequest.Headers.ACCEPT, mimeType);
+ headersMap.put(HttpRequest.Headers.ACCEPT_ENCODING, HttpRequest.Headers.DEFLATE);
if (userAgentEnabled) {
- request.headers().add(HttpHeaderNames.USER_AGENT, UserAgent.USER_AGENT);
+ headersMap.put(HttpRequest.Headers.USER_AGENT, UserAgent.USER_AGENT);
}
- objects.add(interceptor.apply(request));
- } catch (Exception ex) {
- throw new ResponseException(ResponseStatusCode.REQUEST_ERROR_SERIALIZATION, String.format(
- "An error occurred during serialization of this request [%s] - it could not be sent to the server - Reason: %s",
+ if (bulkResults) {
+ headersMap.put(Tokens.BULK_RESULTS, "true");
+ }
+ HttpRequest gremlinRequest = new HttpRequest(headersMap, requestMessage, uri);
+
+ for (final Pair<String, ? extends RequestInterceptor> interceptor : interceptors) {
+ gremlinRequest = interceptor.getRight().apply(gremlinRequest);
+ }
+
+ final FullHttpRequest finalRequest = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.POST,
+ uri.getPath(), convertBody(gremlinRequest));
+ gremlinRequest.headers().forEach((k, v) -> finalRequest.headers().add(k, v));
+
+ objects.add(finalRequest);
+ channelHandlerContext.channel().attr(REQUEST_SENT).set(true);
+ } catch (AuthenticationException ex) {
+ throw new ResponseException(HttpResponseStatus.BAD_REQUEST, String.format(
+ "An error occurred during authentication [%s] - it could not be sent to the server - Reason: %s",
requestMessage, ex));
}
}
+
+ private static InetSocketAddress getRemoteAddress(Channel channel) {
+ final InetSocketAddress remoteAddress = (InetSocketAddress) channel.remoteAddress();
+ if (remoteAddress == null) {
+ final Throwable sslException = channel.attr(GremlinResponseHandler.INBOUND_SSL_EXCEPTION).get();
+ if (sslException != null) {
+ throw new RuntimeException("Request cannot be serialized because the channel is not connected due to an ssl error.", sslException);
+ }
+ throw new RuntimeException("Request cannot be serialized because the channel is not connected");
+ }
+ return remoteAddress;
+ }
+
+ private static ByteBuf convertBody(final HttpRequest request) {
+ final Object body = request.getBody();
+ if (body instanceof byte[]) {
+ request.headers().put(HttpRequest.Headers.CONTENT_LENGTH, String.valueOf(((byte[]) body).length));
+ return Unpooled.wrappedBuffer((byte[]) body);
+ } else {
+ throw new IllegalArgumentException("Final body must be byte[] but found "
+ + body.getClass().getSimpleName());
+ }
+ }
}
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/HttpGremlinResponseDecoder.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/HttpGremlinResponseDecoder.java
index 9b46db2..0a512ae 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/HttpGremlinResponseDecoder.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/HttpGremlinResponseDecoder.java
@@ -18,28 +18,35 @@
*/
package org.apache.tinkerpop.gremlin.driver.handler;
-import io.netty.buffer.ByteBufInputStream;
-import io.netty.channel.ChannelHandler;
+import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.MessageToMessageDecoder;
+import io.netty.handler.codec.TooLongFrameException;
+import io.netty.handler.codec.http.DefaultHttpObject;
import io.netty.handler.codec.http.FullHttpResponse;
+import io.netty.handler.codec.http.HttpContent;
+import io.netty.handler.codec.http.HttpHeaderNames;
+import io.netty.handler.codec.http.HttpResponse;
import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.handler.codec.http.LastHttpContent;
+import io.netty.util.Attribute;
+import io.netty.util.AttributeKey;
+import io.netty.util.AttributeMap;
+import io.netty.util.CharsetUtil;
import org.apache.tinkerpop.gremlin.util.MessageSerializer;
-import org.apache.tinkerpop.gremlin.util.Tokens;
import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
import org.apache.tinkerpop.gremlin.util.ser.SerTokens;
+import org.apache.tinkerpop.gremlin.util.ser.SerializationException;
import org.apache.tinkerpop.shaded.jackson.databind.JsonNode;
import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
import java.util.List;
-import java.util.UUID;
-/**
- * Converts {@code HttpResponse} to a {@link ResponseMessage}.
- */
-@ChannelHandler.Sharable
-public final class HttpGremlinResponseDecoder extends MessageToMessageDecoder<FullHttpResponse> {
+import static org.apache.tinkerpop.gremlin.driver.Channelizer.HttpChannelizer.LAST_CONTENT_READ_RESPONSE;
+import static org.apache.tinkerpop.gremlin.driver.handler.HttpGremlinResponseStreamDecoder.IS_BULKED;
+
+public class HttpGremlinResponseDecoder extends MessageToMessageDecoder<FullHttpResponse> {
+ private static final String MESSAGE_NAME = "message";
private final MessageSerializer<?> serializer;
private final ObjectMapper mapper = new ObjectMapper();
@@ -48,15 +55,36 @@
}
@Override
- protected void decode(final ChannelHandlerContext channelHandlerContext, final FullHttpResponse httpResponse, final List<Object> objects) throws Exception {
- if (httpResponse.status() == HttpResponseStatus.OK) {
- objects.add(serializer.deserializeResponse(httpResponse.content()));
- } else {
- final JsonNode root = mapper.readTree(new ByteBufInputStream(httpResponse.content()));
- objects.add(ResponseMessage.build(UUID.fromString(root.get(Tokens.REQUEST_ID).asText()))
- .code(ResponseStatusCode.SERVER_ERROR)
- .statusMessage(root.get(SerTokens.TOKEN_MESSAGE).asText())
- .create());
+ protected void decode(ChannelHandlerContext ctx, FullHttpResponse msg, List<Object> out) throws Exception {
+ // A value must be set in order to signal to the InactiveChannelHandler that data has been received.
+ ctx.channel().attr(InactiveChannelHandler.BYTES_READ).set(0);
+
+ final ByteBuf content = msg.content();
+ ResponseMessage response;
+
+ try {
+ // no more chunks expected
+ if (isError(msg.status()) && !serializer.mimeTypesSupported()[0].equals(msg.headers().get(HttpHeaderNames.CONTENT_TYPE))) {
+ final String json = content.toString(CharsetUtil.UTF_8);
+ final JsonNode node = mapper.readTree(json);
+ final String message = node.has(MESSAGE_NAME) ? node.get(MESSAGE_NAME).asText() : "";
+ response = ResponseMessage.build()
+ .code(msg.status())
+ .statusMessage(message.isEmpty() ? msg.status().reasonPhrase() : message)
+ .create();
+ } else {
+ response = serializer.deserializeBinaryResponse(content);
+ }
+
+ ctx.channel().attr(IS_BULKED).set(response.getResult().isBulked());
+ out.add(response);
+ out.add(LAST_CONTENT_READ_RESPONSE);
+ } catch (SerializationException e) {
+ throw new RuntimeException(e);
}
}
-}
+
+ private static boolean isError(final HttpResponseStatus status) {
+ return status != HttpResponseStatus.OK;
+ }
+}
\ No newline at end of file
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/HttpGremlinResponseStreamDecoder.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/HttpGremlinResponseStreamDecoder.java
new file mode 100644
index 0000000..36f08e5
--- /dev/null
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/HttpGremlinResponseStreamDecoder.java
@@ -0,0 +1,119 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.driver.handler;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToMessageDecoder;
+import io.netty.handler.codec.TooLongFrameException;
+import io.netty.handler.codec.http.DefaultHttpObject;
+import io.netty.handler.codec.http.HttpContent;
+import io.netty.handler.codec.http.HttpHeaderNames;
+import io.netty.handler.codec.http.HttpResponse;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.handler.codec.http.LastHttpContent;
+import io.netty.util.Attribute;
+import io.netty.util.AttributeKey;
+import io.netty.util.AttributeMap;
+import io.netty.util.CharsetUtil;
+import org.apache.tinkerpop.gremlin.util.MessageSerializer;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.util.ser.SerTokens;
+import org.apache.tinkerpop.gremlin.util.ser.SerializationException;
+import org.apache.tinkerpop.shaded.jackson.databind.JsonNode;
+import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
+
+import java.util.List;
+
+import static org.apache.tinkerpop.gremlin.driver.Channelizer.HttpChannelizer.LAST_CONTENT_READ_RESPONSE;
+
+public class HttpGremlinResponseStreamDecoder extends MessageToMessageDecoder<DefaultHttpObject> {
+
+ public static final AttributeKey<Boolean> IS_BULKED = AttributeKey.valueOf("isBulked");
+ private static final AttributeKey<Boolean> IS_FIRST_CHUNK = AttributeKey.valueOf("isFirstChunk");
+ private static final AttributeKey<HttpResponseStatus> RESPONSE_STATUS = AttributeKey.valueOf("responseStatus");
+ private static final AttributeKey<String> RESPONSE_ENCODING = AttributeKey.valueOf("responseSerializer");
+ private static final AttributeKey<Long> BYTES_READ = AttributeKey.valueOf("bytesRead");
+
+ private final MessageSerializer<?> serializer;
+ private final long maxResponseContentLength;
+ private final ObjectMapper mapper = new ObjectMapper();
+
+ public HttpGremlinResponseStreamDecoder(final MessageSerializer<?> serializer, final long maxResponseContentLength) {
+ this.serializer = serializer;
+ this.maxResponseContentLength = maxResponseContentLength;
+ }
+
+ @Override
+ protected void decode(ChannelHandlerContext ctx, DefaultHttpObject msg, List<Object> out) throws Exception {
+ final Attribute<Boolean> isFirstChunk = ((AttributeMap) ctx).attr(IS_FIRST_CHUNK);
+ final Attribute<Boolean> isBulked = ((AttributeMap) ctx).attr(IS_BULKED);
+ final Attribute<HttpResponseStatus> responseStatus = ((AttributeMap) ctx).attr(RESPONSE_STATUS);
+ final Attribute<String> responseEncoding = ((AttributeMap) ctx).attr(RESPONSE_ENCODING);
+
+ if (msg instanceof HttpResponse) {
+ ctx.channel().attr(BYTES_READ).set(0L);
+
+ final HttpResponse resp = (HttpResponse) msg;
+ responseStatus.set(resp.status());
+ responseEncoding.set(resp.headers().get(HttpHeaderNames.CONTENT_TYPE));
+
+ isFirstChunk.set(true);
+ }
+
+ if (msg instanceof HttpContent) {
+ ByteBuf content = ((HttpContent) msg).content();
+ Attribute<Long> bytesRead = ctx.channel().attr(BYTES_READ);
+ bytesRead.set(bytesRead.get() + content.readableBytes());
+ if (maxResponseContentLength > 0 && bytesRead.get() > maxResponseContentLength) {
+ throw new TooLongFrameException("Response exceeded " + maxResponseContentLength + " bytes.");
+ }
+
+ try {
+ // no more chunks expected
+ if (isError(responseStatus.get()) && !SerTokens.MIME_GRAPHBINARY_V4.equals(responseEncoding.get())) {
+ final JsonNode node = mapper.readTree(content.toString(CharsetUtil.UTF_8));
+ final String message = node.get("message").asText();
+ final ResponseMessage response = ResponseMessage.build()
+ .code(responseStatus.get()).statusMessage(message)
+ .create();
+
+ out.add(response);
+ } else {
+ final ResponseMessage chunk = serializer.readChunk(content, isFirstChunk.get());
+ if (isFirstChunk.get()){
+ isBulked.set(chunk.getResult().isBulked());
+ }
+ isFirstChunk.set(false);
+ out.add(chunk);
+ }
+
+ if (msg instanceof LastHttpContent) {
+ out.add(LAST_CONTENT_READ_RESPONSE);
+ }
+ } catch (SerializationException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+
+ private static boolean isError(final HttpResponseStatus status) {
+ return status != HttpResponseStatus.OK;
+ }
+}
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/IdleConnectionHandler.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/IdleConnectionHandler.java
new file mode 100644
index 0000000..fb42531
--- /dev/null
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/IdleConnectionHandler.java
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.driver.handler;
+
+import io.netty.channel.ChannelDuplexHandler;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.timeout.IdleStateEvent;
+import io.netty.util.AttributeKey;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Detects {@link IdleStateEvent}s and closes the channel with the goal of releasing resources that haven't been used in a while.
+ */
+@ChannelHandler.Sharable
+public class IdleConnectionHandler extends ChannelDuplexHandler {
+ private static final Logger logger = LoggerFactory.getLogger(IdleConnectionHandler.class);
+ public static final AttributeKey<IdleStateEvent> IDLE_STATE_EVENT = AttributeKey.valueOf("idleStateEvent");
+
+ /**
+ * Detects if an {@link IdleStateEvent} has occurred and closes the channel.
+ */
+ @Override
+ public void userEventTriggered(final ChannelHandlerContext ctx, final Object evt) {
+ if (evt instanceof IdleStateEvent) {
+ final IdleStateEvent e = (IdleStateEvent) evt;
+ logger.info("Detected IdleStateEvent {} - closing channel {}", e, ctx.channel().id().asShortText());
+ ctx.channel().attr(IDLE_STATE_EVENT).set(e);
+ ctx.close();
+ }
+ }
+}
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/InactiveChannelHandler.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/InactiveChannelHandler.java
new file mode 100644
index 0000000..f38dd77
--- /dev/null
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/InactiveChannelHandler.java
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.driver.handler;
+
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandlerAdapter;
+import io.netty.util.AttributeKey;
+
+/**
+ * Handler used to detect if the channel has become inactive and throw an error in certain scenarios.
+ */
+@ChannelHandler.Sharable
+public class InactiveChannelHandler extends ChannelInboundHandlerAdapter {
+ public static final AttributeKey<Integer> BYTES_READ = AttributeKey.valueOf("bytesRead");
+ public static final AttributeKey<Boolean> REQUEST_SENT = AttributeKey.valueOf("requestSent");
+
+ @Override
+ public void channelInactive(ChannelHandlerContext ctx) throws Exception {
+ // If the server requires SSL/TLS, then it will simply shut down the connection if it doesn't get the right
+ // handshake. This happens after the TCP connection has already been created. If no packets were received from
+ // the server and the connection closes after an HTTP request was sent, then there is a good chance that this is
+ // because the server expected a SSL/TLS handshake.
+ if ((null == ctx.channel().attr(BYTES_READ).get()) && (null != ctx.channel().attr(REQUEST_SENT).get())) {
+ // BYTES_READ is set by the HttpGremlinResponseStreamDecoder when any data is received. If it isn't set,
+ // it can be assumed that no bytes were received when the connection closed.
+ String errMsg;
+ if (ctx.channel().hasAttr(IdleConnectionHandler.IDLE_STATE_EVENT)) {
+ errMsg = "Idle timeout occurred before response could be received from server - consider increasing idleConnectionTimeout";
+ } else {
+ errMsg = "Connection to server closed unexpectedly. Ensure that the server is still" +
+ " reachable. The server may be expecting SSL to be enabled.";
+ }
+ ctx.fireExceptionCaught(new RuntimeException(errMsg));
+ } else {
+ super.channelInactive(ctx);
+ }
+ }
+}
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketClientHandler.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketClientHandler.java
deleted file mode 100644
index 55df38f..0000000
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketClientHandler.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver.handler;
-
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelFuture;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelPromise;
-import io.netty.handler.codec.http.FullHttpRequest;
-import io.netty.handler.codec.http.HttpHeaders;
-import io.netty.handler.codec.http.websocketx.PingWebSocketFrame;
-import io.netty.handler.codec.http.websocketx.WebSocketClientHandshaker13;
-import io.netty.handler.codec.http.websocketx.WebSocketClientProtocolHandler;
-import io.netty.handler.codec.http.websocketx.WebSocketClientHandshaker;
-import io.netty.handler.codec.http.websocketx.WebSocketVersion;
-import io.netty.handler.ssl.SslHandler;
-import io.netty.handler.ssl.SslHandshakeCompletionEvent;
-import io.netty.handler.timeout.IdleState;
-import io.netty.handler.timeout.IdleStateEvent;
-import io.netty.util.concurrent.Promise;
-
-import java.net.URI;
-import java.util.concurrent.TimeoutException;
-import java.util.function.UnaryOperator;
-
-import javax.net.ssl.SSLHandshakeException;
-
-import org.apache.tinkerpop.gremlin.driver.Channelizer;
-import org.apache.tinkerpop.gremlin.driver.Cluster;
-import org.apache.tinkerpop.gremlin.driver.HandshakeInterceptor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Wrapper over {@link WebSocketClientProtocolHandler}. This wrapper provides a future which represents the termination
- * of a WS handshake (both success and failure).
- */
-public final class WebSocketClientHandler extends WebSocketClientProtocolHandler {
- private static final Logger logger = LoggerFactory.getLogger(WebSocketClientHandler.class);
-
- private final long connectionSetupTimeoutMillis;
- private ChannelPromise handshakeFuture;
- private boolean sslHandshakeCompleted;
- private boolean useSsl;
-
- public WebSocketClientHandler(final WebSocketClientHandshaker handshaker, final long timeoutMillis, final boolean useSsl) {
- super(handshaker, /*handleCloseFrames*/true, /*dropPongFrames*/true, timeoutMillis);
- this.connectionSetupTimeoutMillis = timeoutMillis;
- this.useSsl = useSsl;
- }
-
- public ChannelFuture handshakeFuture() {
- return handshakeFuture;
- }
-
- @Override
- public void handlerAdded(final ChannelHandlerContext ctx) {
- super.handlerAdded(ctx);
- handshakeFuture = ctx.newPromise();
- }
-
- @Override
- public void exceptionCaught(final ChannelHandlerContext ctx, final Throwable cause) throws Exception {
- if (!handshakeFuture.isDone()) {
- handshakeFuture.setFailure(cause);
- }
-
- // let the GremlinResponseHandler take care of exception logging, channel closing, and cleanup
- ctx.fireExceptionCaught(cause);
- }
-
- @Override
- public void channelInactive(final ChannelHandlerContext ctx) throws Exception {
- if (!handshakeFuture.isDone()) {
- // channel was closed before the handshake could be completed.
- handshakeFuture.setFailure(
- new RuntimeException(String.format("WebSocket channel=[%s] closed before the handshake could complete." +
- " Server logs could contain the reason for abrupt connection disconnect or the " +
- "server might not be reachable from the client anymore.",
- ctx.channel().id().asShortText())));
- }
-
- super.channelInactive(ctx);
- }
-
- @Override
- public void userEventTriggered(final ChannelHandlerContext ctx, final Object event) throws Exception {
- if (event instanceof IdleStateEvent) {
- IdleStateEvent e = (IdleStateEvent) event;
- if (e.state() == IdleState.READER_IDLE) {
- logger.warn("WebSocket connection {} has been idle for too long.", ctx.channel());
- } else if (e.state() == IdleState.WRITER_IDLE) {
- logger.debug("Sending ping frame to the server");
- ctx.writeAndFlush(new PingWebSocketFrame());
- }
- } else if (ClientHandshakeStateEvent.HANDSHAKE_COMPLETE.equals(event)) {
- if (!handshakeFuture.isDone()) {
- handshakeFuture.setSuccess();
- }
- } else if (ClientHandshakeStateEvent.HANDSHAKE_TIMEOUT.equals(event)) {
- if (!handshakeFuture.isDone()) {
- TimeoutException te = new TimeoutException(
- String.format((useSsl && !sslHandshakeCompleted) ?
- "SSL handshake not completed in stipulated time=[%s]ms" :
- "WebSocket handshake not completed in stipulated time=[%s]ms",
- connectionSetupTimeoutMillis));
- handshakeFuture.setFailure(te);
- logger.error(te.getMessage());
- }
-
- if (useSsl && !sslHandshakeCompleted) {
- SslHandler handler = ((SslHandler) ctx.pipeline().get(Channelizer.AbstractChannelizer.PIPELINE_SSL_HANDLER));
- ((Promise<Channel>) handler.handshakeFuture()).tryFailure(new SSLHandshakeException("SSL handshake timed out."));
- }
- } else if (event instanceof SslHandshakeCompletionEvent) {
- sslHandshakeCompleted = true;
- } else {
- super.userEventTriggered(ctx, event);
- }
- }
-
- /**
- * Extension to the Netty implementation that allows for the {@link #newHandshakeRequest()} to be modified by way
- * of a {@link HandshakeInterceptor} that is supplied to the {@link Cluster} when it is created.
- */
- public static class InterceptedWebSocketClientHandshaker13 extends WebSocketClientHandshaker13 {
-
- private final UnaryOperator<FullHttpRequest> interceptor;
-
- public InterceptedWebSocketClientHandshaker13(final URI webSocketURL, final WebSocketVersion version,
- final String subprotocol, final boolean allowExtensions,
- final HttpHeaders customHeaders, final int maxFramePayloadLength,
- final boolean performMasking, final boolean allowMaskMismatch,
- final long forceCloseTimeoutMillis, final UnaryOperator<FullHttpRequest> interceptor) {
- super(webSocketURL, version, subprotocol, allowExtensions, customHeaders, maxFramePayloadLength,
- performMasking, allowMaskMismatch, forceCloseTimeoutMillis);
- this.interceptor = interceptor;
- }
-
- @Override
- protected FullHttpRequest newHandshakeRequest() {
- return this.interceptor.apply(super.newHandshakeRequest());
- }
- }
-}
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketGremlinRequestEncoder.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketGremlinRequestEncoder.java
deleted file mode 100644
index 05226f7..0000000
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketGremlinRequestEncoder.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver.handler;
-
-import org.apache.tinkerpop.gremlin.util.MessageSerializer;
-import org.apache.tinkerpop.gremlin.driver.exception.ResponseException;
-import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.util.ser.MessageTextSerializer;
-import io.netty.buffer.ByteBuf;
-import io.netty.channel.ChannelHandler;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.MessageToMessageEncoder;
-import io.netty.handler.codec.http.websocketx.BinaryWebSocketFrame;
-import io.netty.handler.codec.http.websocketx.TextWebSocketFrame;
-
-import java.util.List;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-@ChannelHandler.Sharable
-public final class WebSocketGremlinRequestEncoder extends MessageToMessageEncoder<RequestMessage> {
- private final boolean binaryEncoding;
-
- private final MessageSerializer<?> serializer;
-
- public WebSocketGremlinRequestEncoder(final boolean binaryEncoding, final MessageSerializer<?> serializer) {
- this.binaryEncoding = binaryEncoding;
- this.serializer = serializer;
- }
-
- @Override
- protected void encode(final ChannelHandlerContext channelHandlerContext, final RequestMessage requestMessage, final List<Object> objects) throws Exception {
- try {
- if (binaryEncoding) {
- final ByteBuf encodedMessage = serializer.serializeRequestAsBinary(requestMessage, channelHandlerContext.alloc());
- objects.add(new BinaryWebSocketFrame(encodedMessage));
- } else {
- final MessageTextSerializer<?> textSerializer = (MessageTextSerializer<?>) serializer;
- objects.add(new TextWebSocketFrame(textSerializer.serializeRequestAsString(requestMessage, channelHandlerContext.alloc())));
- }
- } catch (Exception ex) {
- throw new ResponseException(ResponseStatusCode.REQUEST_ERROR_SERIALIZATION, String.format(
- "An error occurred during serialization of this request [%s] - it could not be sent to the server - Reason: %s",
- requestMessage, ex));
- }
- }
-}
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketGremlinResponseDecoder.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketGremlinResponseDecoder.java
deleted file mode 100644
index 3ef1eed..0000000
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketGremlinResponseDecoder.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver.handler;
-
-import org.apache.tinkerpop.gremlin.util.MessageSerializer;
-import org.apache.tinkerpop.gremlin.util.ser.MessageTextSerializer;
-import io.netty.channel.ChannelHandler;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.MessageToMessageDecoder;
-import io.netty.handler.codec.http.websocketx.BinaryWebSocketFrame;
-import io.netty.handler.codec.http.websocketx.TextWebSocketFrame;
-import io.netty.handler.codec.http.websocketx.WebSocketFrame;
-
-import java.util.List;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-@ChannelHandler.Sharable
-public final class WebSocketGremlinResponseDecoder extends MessageToMessageDecoder<WebSocketFrame> {
- private final MessageSerializer<?> serializer;
-
- public WebSocketGremlinResponseDecoder(final MessageSerializer<?> serializer) {
- this.serializer = serializer;
- }
-
- @Override
- protected void decode(final ChannelHandlerContext channelHandlerContext, final WebSocketFrame webSocketFrame, final List<Object> objects) throws Exception {
- if (webSocketFrame instanceof BinaryWebSocketFrame) {
- final BinaryWebSocketFrame tf = (BinaryWebSocketFrame) webSocketFrame;
- objects.add(serializer.deserializeResponse(tf.content()));
- } else if (webSocketFrame instanceof TextWebSocketFrame) {
- final TextWebSocketFrame tf = (TextWebSocketFrame) webSocketFrame;
- final MessageTextSerializer<?> textSerializer = (MessageTextSerializer<?>) serializer;
- objects.add(textSerializer.deserializeResponse(tf.text()));
- } else {
- throw new RuntimeException(String.format("WebSocket channel does not handle this type of message: %s", webSocketFrame.getClass().getName()));
- }
- }
-}
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/interceptor/PayloadSerializingInterceptor.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/interceptor/PayloadSerializingInterceptor.java
new file mode 100644
index 0000000..1361617
--- /dev/null
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/interceptor/PayloadSerializingInterceptor.java
@@ -0,0 +1,73 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.driver.interceptor;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.buffer.ByteBufUtil;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import org.apache.tinkerpop.gremlin.driver.HttpRequest;
+import org.apache.tinkerpop.gremlin.driver.RequestInterceptor;
+import org.apache.tinkerpop.gremlin.driver.exception.ResponseException;
+import org.apache.tinkerpop.gremlin.util.MessageSerializer;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV4;
+import org.apache.tinkerpop.gremlin.util.ser.SerializationException;
+import org.apache.tinkerpop.gremlin.util.ser.Serializers;
+
+import java.util.Map;
+
+/**
+ * A {@link RequestInterceptor} that serializes the request body usng the provided {@link MessageSerializer}. This
+ * interceptor should be run before other interceptors that need to calculate values based on the request body.
+ */
+public class PayloadSerializingInterceptor implements RequestInterceptor {
+ // Should be thread-safe as the GraphBinaryWriter/GraphSONMessageSerializer doesn't maintain state.
+ private final MessageSerializer serializer;
+
+ public PayloadSerializingInterceptor(final MessageSerializer serializer) {
+ this.serializer = serializer;
+ }
+
+ @Override
+ public HttpRequest apply(HttpRequest httpRequest) {
+ if (!(httpRequest.getBody() instanceof RequestMessage)) {
+ throw new IllegalArgumentException("Only RequestMessage serialization is supported");
+ }
+
+ final RequestMessage request = (RequestMessage) httpRequest.getBody();
+ final ByteBuf requestBuf;
+ try {
+ requestBuf = serializer.serializeRequestAsBinary(request, ByteBufAllocator.DEFAULT);
+ } catch (SerializationException se) {
+ throw new RuntimeException(new ResponseException(HttpResponseStatus.BAD_REQUEST, String.format(
+ "An error occurred during serialization of this request [%s] - it could not be sent to the server - Reason: %s",
+ request, se)));
+ }
+
+ // Convert from ByteBuf to bytes[] because that's what the final request body should contain.
+ final byte[] requestBytes = ByteBufUtil.getBytes(requestBuf);
+ requestBuf.release();
+
+ httpRequest.setBody(requestBytes);
+ httpRequest.headers().put(HttpRequest.Headers.CONTENT_TYPE, serializer.mimeTypesSupported()[0]);
+
+ return httpRequest;
+ }
+}
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteConnection.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteConnection.java
index ee2364e..c89ac51 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteConnection.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteConnection.java
@@ -24,20 +24,14 @@
import org.apache.tinkerpop.gremlin.process.remote.RemoteConnection;
import org.apache.tinkerpop.gremlin.process.remote.RemoteConnectionException;
import org.apache.tinkerpop.gremlin.process.remote.traversal.RemoteTraversal;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
+import org.apache.tinkerpop.gremlin.process.traversal.GremlinLang;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
import org.apache.tinkerpop.gremlin.structure.Transaction;
import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
import java.util.Optional;
-import java.util.UUID;
import java.util.concurrent.CompletableFuture;
-import static org.apache.tinkerpop.gremlin.util.Tokens.ARGS_BATCH_SIZE;
-import static org.apache.tinkerpop.gremlin.util.Tokens.ARGS_EVAL_TIMEOUT;
-import static org.apache.tinkerpop.gremlin.util.Tokens.ARGS_USER_AGENT;
-import static org.apache.tinkerpop.gremlin.util.Tokens.REQUEST_ID;
-import static org.apache.tinkerpop.gremlin.util.Tokens.ARGS_MATERIALIZE_PROPERTIES;
import static org.apache.tinkerpop.gremlin.driver.RequestOptions.getRequestOptions;
/**
@@ -76,7 +70,7 @@
cluster = conf.containsKey(GREMLIN_REMOTE_DRIVER_CLUSTERFILE) ?
Cluster.open(conf.getString(GREMLIN_REMOTE_DRIVER_CLUSTERFILE)) : Cluster.open(conf.subset("clusterConfiguration"));
- client = cluster.connect(Client.Settings.build().create()).alias(remoteTraversalSourceName);
+ client = cluster.connect().alias(remoteTraversalSourceName);
} catch (Exception ex) {
throw new IllegalStateException(ex);
}
@@ -89,7 +83,7 @@
}
private DriverRemoteConnection(final Cluster cluster, final boolean tryCloseCluster, final String remoteTraversalSourceName) {
- client = cluster.connect(Client.Settings.build().create()).alias(remoteTraversalSourceName);
+ client = cluster.connect().alias(remoteTraversalSourceName);
this.remoteTraversalSourceName = remoteTraversalSourceName;
this.tryCloseCluster = tryCloseCluster;
attachElements = false;
@@ -104,7 +98,7 @@
attachElements = conf.containsKey(GREMLIN_REMOTE + "attachment");
- client = cluster.connect(Client.Settings.build().create()).alias(remoteTraversalSourceName);
+ client = cluster.connect().alias(remoteTraversalSourceName);
tryCloseCluster = false;
tryCloseClient = true;
this.conf = Optional.of(conf);
@@ -221,9 +215,11 @@
}
@Override
- public <E> CompletableFuture<RemoteTraversal<?, E>> submitAsync(final Bytecode bytecode) throws RemoteConnectionException {
+ public <E> CompletableFuture<RemoteTraversal<?, E>> submitAsync(final GremlinLang gremlinLang) throws RemoteConnectionException {
try {
- return client.submitAsync(bytecode, getRequestOptions(bytecode)).thenApply(rs -> new DriverRemoteTraversal<>(rs, client, attachElements, conf));
+ gremlinLang.addG(remoteTraversalSourceName);
+ return client.submitAsync(gremlinLang.getGremlin(), getRequestOptions(gremlinLang))
+ .thenApply(rs -> new DriverRemoteTraversal<>(rs, client, attachElements, conf));
} catch (Exception ex) {
throw new RemoteConnectionException(ex);
}
@@ -233,10 +229,7 @@
* If the connection is bound to a session, then get the session identifier from it.
*/
Optional<String> getSessionId() {
- if (client instanceof Client.SessionedClient) {
- Client.SessionedClient c = (Client.SessionedClient) client;
- return Optional.of(c.getSessionId());
- }
+ // todo: not implemented
return Optional.empty();
}
@@ -255,14 +248,15 @@
}
/**
- * Constructs a new {@link DriverRemoteTransaction}.
+ * Constructs a new {@link DriverRemoteTransaction}. Not yet supported in TinkerPop 4.
*/
- @Override
- public Transaction tx() {
- final DriverRemoteConnection session = new DriverRemoteConnection(
- client.getCluster().connect(UUID.randomUUID().toString()), remoteTraversalSourceName, true);
- return new DriverRemoteTransaction(session);
- }
+// @Override
+// public Transaction tx() {
+// // todo: not implemented
+// final DriverRemoteConnection session = new DriverRemoteConnection(
+// client.getCluster().connect(), remoteTraversalSourceName, true);
+// return new DriverRemoteTransaction(session);
+// }
@Override
public String toString() {
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteTransaction.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteTransaction.java
deleted file mode 100644
index bc11583..0000000
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteTransaction.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver.remote;
-
-import org.apache.tinkerpop.gremlin.process.remote.RemoteConnection;
-import org.apache.tinkerpop.gremlin.process.remote.RemoteConnectionException;
-import org.apache.tinkerpop.gremlin.process.remote.traversal.RemoteTraversal;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
-import org.apache.tinkerpop.gremlin.process.traversal.GraphOp;
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
-import org.apache.tinkerpop.gremlin.structure.Transaction;
-
-import java.util.concurrent.CompletableFuture;
-import java.util.function.Consumer;
-
-import static org.apache.tinkerpop.gremlin.process.traversal.GraphOp.TX_COMMIT;
-import static org.apache.tinkerpop.gremlin.process.traversal.GraphOp.TX_ROLLBACK;
-
-/**
- * A remote {@link Transaction} implementation that is implemented with the Java driver. It is also a proxy for a
- * {@link RemoteConnection} that is bound to a session.
- * <p/>
- * For users, starting a transaction with {@link #begin()} will produce a {@link TraversalSource} that can be used
- * across multiple threads sending the bytecode based requests to a remote session. It is worth noting that the session
- * will process these requests in a serial fashion and not in parallel. Calling {@link #commit()} or
- * {@link #rollback()} will also close the session and no additional traversal can be executed on the
- * {@link TraversalSource}. A fresh call to {@link #begin()} will be required to open a fresh session to work with.
- * The default behavior of {@link #close()} is to commit the transaction.
- */
-public class DriverRemoteTransaction implements Transaction, RemoteConnection {
-
- private final DriverRemoteConnection sessionBasedConnection;
-
- protected Consumer<Transaction> closeConsumer = CLOSE_BEHAVIOR.COMMIT;
-
- public DriverRemoteTransaction(final DriverRemoteConnection sessionBasedConnection) {
- this.sessionBasedConnection = sessionBasedConnection;
- }
-
- @Override
- public <T extends TraversalSource> T begin(final Class<T> traversalSourceClass) {
- if (!isOpen())
- throw new IllegalStateException("Transaction cannot begin as the session is already closed - create a new Transaction");
-
- try {
- return traversalSourceClass.getConstructor(RemoteConnection.class).newInstance(this);
- } catch (final Exception e) {
- throw new IllegalStateException(e.getMessage(), e);
- }
- }
-
- /**
- * By virtue of creating a {@code DriverRemoteTransaction}, the transaction is considered open. There is no need
- * to call this method. Calling it when the transaction is closed will result in exception.
- */
- @Override
- public void open() {
- // no need to issue a command to open the transaction, the server is already in such a state if the
- if (!isOpen())
- throw new IllegalStateException("Transaction cannot be opened as the session is already closed - create a new Transaction");
- }
-
- @Override
- public void commit() {
- closeRemoteTransaction(TX_COMMIT, "Transaction commit for %s failed");
- }
-
- @Override
- public void rollback() {
- closeRemoteTransaction(TX_ROLLBACK, "Transaction rollback for %s failed");
- }
-
- private void closeRemoteTransaction(final GraphOp closeTxWith, final String failureMsg) {
- try {
- // kinda weird but we hasNext() the graph command here to ensure that it runs to completion or
- // else you don't guarantee that we have the returned NO_CONTENT message in hand before proceeding
- // which could mean the transaction is still in the process of committing. not sure why iterate()
- // doesn't quite work in this context.
- this.sessionBasedConnection.submitAsync(closeTxWith.getBytecode()).join().hasNext();
- this.sessionBasedConnection.close();
- } catch (Exception ex) {
- throw new RuntimeException(String.format(failureMsg, sessionBasedConnection.getSessionId()), ex);
- }
- }
-
- @Override
- public boolean isOpen() {
- // for tx purposes closing is a good enough check
- return !sessionBasedConnection.client.isClosing();
- }
-
- /**
- * The default close behavior for this {@link Transaction} implementation is to {@link #commit()}.
- */
- @Override
- public void close() {
- this.closeConsumer.accept(this);
- }
-
- /**
- * This {@link Transaction} implementation is not auto-managed and therefore this method is not supported.
- */
- @Override
- public void readWrite() {
- throw new UnsupportedOperationException("Remote transaction behaviors are not auto-managed - they are always manually controlled");
- }
-
- /**
- * This {@link Transaction} implementation is not auto-managed and therefore this method is not supported.
- */
- @Override
- public Transaction onReadWrite(final Consumer<Transaction> consumer) {
- throw new UnsupportedOperationException("Remote transaction behaviors are not configurable - they are always manually controlled");
- }
-
- @Override
- public Transaction onClose(final Consumer<Transaction> consumer) {
- this.closeConsumer = consumer;
- return this;
- }
-
- /**
- * There is no support for remote transaction listeners.
- */
- @Override
- public void addTransactionListener(final Consumer<Status> listener) {
- throw new UnsupportedOperationException("Remote transactions cannot have listeners attached");
- }
-
- /**
- * There is no support for remote transaction listeners.
- */
- @Override
- public void removeTransactionListener(final Consumer<Status> listener) {
- throw new UnsupportedOperationException("Remote transactions cannot have listeners attached");
- }
-
- /**
- * There is no support for remote transaction listeners.
- */
- @Override
- public void clearTransactionListeners() {
- throw new UnsupportedOperationException("Remote transactions cannot have listeners attached");
- }
-
- /**
- * It is not possible to have child transactions, therefore this method always returns {@link Transaction#NO_OP}.
- */
- @Override
- public Transaction tx() {
- return Transaction.NO_OP;
- }
-
- @Override
- public <E> CompletableFuture<RemoteTraversal<?, E>> submitAsync(final Bytecode bytecode) throws RemoteConnectionException {
- return sessionBasedConnection.submitAsync(bytecode);
- }
-}
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteTraversal.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteTraversal.java
index 54e7cc8..6521f1e 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteTraversal.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteTraversal.java
@@ -23,6 +23,7 @@
import org.apache.tinkerpop.gremlin.driver.Result;
import org.apache.tinkerpop.gremlin.driver.ResultSet;
import org.apache.tinkerpop.gremlin.process.remote.traversal.AbstractRemoteTraversal;
+import org.apache.tinkerpop.gremlin.process.remote.traversal.DefaultRemoteTraverser;
import org.apache.tinkerpop.gremlin.process.remote.traversal.RemoteTraverser;
import org.apache.tinkerpop.gremlin.process.remote.traversal.step.map.RemoteStep;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
@@ -112,7 +113,10 @@
@Override
public Traverser.Admin<E> next() {
- return (RemoteTraverser<E>) inner.next().getObject();
+ final Object next = inner.next().getObject();
+ return next instanceof RemoteTraverser
+ ? (RemoteTraverser<E>) next
+ : new DefaultRemoteTraverser<>((E) next, 1);
}
}
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/simple/AbstractClient.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/simple/AbstractClient.java
index c353f45..856e022 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/simple/AbstractClient.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/simple/AbstractClient.java
@@ -26,12 +26,7 @@
import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
-import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
import java.util.function.Consumer;
@@ -51,7 +46,7 @@
@Override
public void submit(final RequestMessage requestMessage, final Consumer<ResponseMessage> callback) throws Exception {
- callbackResponseHandler.callbackByRequestId.put(requestMessage.getRequestId(), callback);
+ callbackResponseHandler.callback = callback;
writeAndFlush(requestMessage);
}
@@ -63,33 +58,12 @@
return submitAsync(requestMessage).get(180, TimeUnit.SECONDS);
}
- @Override
- public CompletableFuture<List<ResponseMessage>> submitAsync(final RequestMessage requestMessage) throws Exception {
- final List<ResponseMessage> results = new ArrayList<>();
- final CompletableFuture<List<ResponseMessage>> f = new CompletableFuture<>();
- callbackResponseHandler.callbackByRequestId.put(requestMessage.getRequestId(), response -> {
- if (f.isDone())
- throw new RuntimeException("A terminating message was already encountered - no more messages should have been received");
-
- results.add(response);
-
- // check if the current message is terminating - if it is then we can mark complete
- if (response.getStatus().getCode().isFinalResponse()) {
- f.complete(results);
- }
- });
-
- writeAndFlush(requestMessage);
-
- return f;
- }
-
static class CallbackResponseHandler extends SimpleChannelInboundHandler<ResponseMessage> {
- public Map<UUID, Consumer<ResponseMessage>> callbackByRequestId = new HashMap<>();
+ public Consumer<ResponseMessage> callback;
@Override
protected void channelRead0(final ChannelHandlerContext channelHandlerContext, final ResponseMessage response) throws Exception {
- callbackByRequestId.get(response.getRequestId()).accept(response);
+ callback.accept(response);
}
}
}
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/simple/SimpleClient.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/simple/SimpleClient.java
index 43ace82..779a0fd 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/simple/SimpleClient.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/simple/SimpleClient.java
@@ -18,7 +18,6 @@
*/
package org.apache.tinkerpop.gremlin.driver.simple;
-import org.apache.tinkerpop.gremlin.util.Tokens;
import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
@@ -33,19 +32,19 @@
public interface SimpleClient extends Closeable {
public default void submit(final String gremlin, final Consumer<ResponseMessage> callback) throws Exception {
- submit(RequestMessage.build(Tokens.OPS_EVAL).addArg(Tokens.ARGS_GREMLIN, gremlin).create(), callback);
+ submit(RequestMessage.build(gremlin).create(), callback);
}
public void submit(final RequestMessage requestMessage, final Consumer<ResponseMessage> callback) throws Exception;
public default List<ResponseMessage> submit(final String gremlin) throws Exception {
- return submit(RequestMessage.build(Tokens.OPS_EVAL).addArg(Tokens.ARGS_GREMLIN, gremlin).create());
+ return submit(RequestMessage.build(gremlin).create());
}
public List<ResponseMessage> submit(final RequestMessage requestMessage) throws Exception;
public default CompletableFuture<List<ResponseMessage>> submitAsync(final String gremlin) throws Exception {
- return submitAsync(RequestMessage.build(Tokens.OPS_EVAL).addArg(Tokens.ARGS_GREMLIN, gremlin).create());
+ return submitAsync(RequestMessage.build(gremlin).create());
}
public CompletableFuture<List<ResponseMessage>> submitAsync(final RequestMessage requestMessage) throws Exception;
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/simple/SimpleHttpClient.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/simple/SimpleHttpClient.java
new file mode 100644
index 0000000..232f94d
--- /dev/null
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/simple/SimpleHttpClient.java
@@ -0,0 +1,165 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.driver.simple;
+
+import io.netty.buffer.PooledByteBufAllocator;
+import io.netty.channel.ChannelOption;
+import io.netty.handler.ssl.SslContext;
+import io.netty.handler.ssl.SslContextBuilder;
+import io.netty.handler.ssl.util.InsecureTrustManagerFactory;
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.tinkerpop.gremlin.driver.Channelizer;
+import org.apache.tinkerpop.gremlin.driver.handler.HttpContentDecompressionHandler;
+import org.apache.tinkerpop.gremlin.driver.handler.HttpGremlinResponseStreamDecoder;
+import org.apache.tinkerpop.gremlin.driver.handler.HttpGremlinRequestEncoder;
+import org.apache.tinkerpop.gremlin.driver.interceptor.PayloadSerializingInterceptor;
+import org.apache.tinkerpop.gremlin.util.MessageSerializer;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import io.netty.bootstrap.Bootstrap;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelInitializer;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.socket.SocketChannel;
+import io.netty.channel.socket.nio.NioSocketChannel;
+import io.netty.handler.codec.http.HttpClientCodec;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV4;
+import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * A simple, non-thread safe Gremlin Server client using HTTP. Typical use is for testing and demonstration.
+ */
+public class SimpleHttpClient extends AbstractClient {
+ private static final Logger logger = LoggerFactory.getLogger(SimpleHttpClient.class);
+ private final Channel channel;
+
+ public SimpleHttpClient() {
+ this(URI.create("http://localhost:8182/gremlin"));
+ }
+
+ public SimpleHttpClient(final URI uri) {
+ super("simple-http-client-%d");
+ final Bootstrap b = new Bootstrap().group(group);
+ b.option(ChannelOption.ALLOCATOR, PooledByteBufAllocator.DEFAULT);
+
+ final String protocol = uri.getScheme();
+ if (!"http".equalsIgnoreCase(protocol) && !"https".equalsIgnoreCase(protocol))
+ throw new IllegalArgumentException("Unsupported protocol: " + protocol);
+ final String host = uri.getHost();
+ final int port;
+ if (uri.getPort() == -1) {
+ if ("http".equalsIgnoreCase(protocol)) {
+ port = 80;
+ } else if ("https".equalsIgnoreCase(protocol)) {
+ port = 443;
+ } else {
+ port = -1;
+ }
+ } else {
+ port = uri.getPort();
+ }
+
+ try {
+ final boolean ssl = "https".equalsIgnoreCase(protocol);
+ final SslContext sslCtx;
+ if (ssl) {
+ sslCtx = SslContextBuilder.forClient()
+ .trustManager(InsecureTrustManagerFactory.INSTANCE).build();
+ } else {
+ sslCtx = null;
+ }
+
+ final MessageSerializer<GraphBinaryMapper> serializer = new GraphBinaryMessageSerializerV4();
+ b.channel(NioSocketChannel.class)
+ .handler(new ChannelInitializer<SocketChannel>() {
+ @Override
+ protected void initChannel(final SocketChannel ch) {
+ final ChannelPipeline p = ch.pipeline();
+ if (sslCtx != null) {
+ p.addLast(sslCtx.newHandler(ch.alloc(), host, port));
+ }
+ p.addLast(
+ new HttpClientCodec(),
+ new HttpContentDecompressionHandler(),
+ new HttpGremlinResponseStreamDecoder(serializer, Integer.MAX_VALUE),
+ new HttpGremlinRequestEncoder(serializer,
+ Collections.singletonList(
+ Pair.of("serializer", new PayloadSerializingInterceptor(
+ new GraphBinaryMessageSerializerV4()))),
+ false, false, uri),
+ callbackResponseHandler);
+ }
+ });
+
+ channel = b.connect(uri.getHost(), uri.getPort()).sync().channel();
+ } catch (Exception ex) {
+ throw new RuntimeException(ex);
+ }
+ }
+
+ @Override
+ public CompletableFuture<List<ResponseMessage>> submitAsync(final RequestMessage requestMessage) throws Exception {
+ final List<ResponseMessage> results = new ArrayList<>();
+ final CompletableFuture<List<ResponseMessage>> f = new CompletableFuture<>();
+ callbackResponseHandler.callback = response -> {
+ // message with trailers
+ if (f.isDone())
+ throw new RuntimeException("A terminating message was already encountered - no more messages should have been received");
+
+ results.add(response);
+
+ // check if the current message is terminating - if it is then we can mark complete
+ if (Channelizer.HttpChannelizer.LAST_CONTENT_READ_RESPONSE == response) {
+ f.complete(results);
+ }
+ };
+
+ writeAndFlush(requestMessage);
+
+ return f;
+ }
+
+ @Override
+ public void writeAndFlush(final RequestMessage requestMessage) throws Exception {
+ channel.writeAndFlush(requestMessage);
+ }
+
+ @Override
+ public void close() throws IOException {
+ try {
+ channel.close().get(30, TimeUnit.SECONDS);
+ } catch (Exception ex) {
+ logger.error("Failure closing simple WebSocketClient", ex);
+ } finally {
+ if (!group.shutdownGracefully().awaitUninterruptibly(30, TimeUnit.SECONDS)) {
+ logger.error("Could not cleanly shutdown thread pool on WebSocketClient");
+ }
+ }
+ }
+}
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/simple/WebSocketClient.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/simple/WebSocketClient.java
deleted file mode 100644
index a5de7fb..0000000
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/simple/WebSocketClient.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver.simple;
-
-import io.netty.buffer.PooledByteBufAllocator;
-import io.netty.channel.ChannelOption;
-import io.netty.handler.codec.http.EmptyHttpHeaders;
-import io.netty.handler.ssl.SslContext;
-import io.netty.handler.ssl.SslContextBuilder;
-import io.netty.handler.ssl.util.InsecureTrustManagerFactory;
-import org.apache.tinkerpop.gremlin.util.MessageSerializer;
-import org.apache.tinkerpop.gremlin.driver.handler.WebSocketClientHandler;
-import org.apache.tinkerpop.gremlin.driver.handler.WebSocketGremlinRequestEncoder;
-import org.apache.tinkerpop.gremlin.driver.handler.WebSocketGremlinResponseDecoder;
-import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
-import io.netty.bootstrap.Bootstrap;
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelInitializer;
-import io.netty.channel.ChannelPipeline;
-import io.netty.channel.socket.SocketChannel;
-import io.netty.channel.socket.nio.NioSocketChannel;
-import io.netty.handler.codec.http.HttpClientCodec;
-import io.netty.handler.codec.http.HttpObjectAggregator;
-import io.netty.handler.codec.http.websocketx.WebSocketClientHandshakerFactory;
-import io.netty.handler.codec.http.websocketx.WebSocketVersion;
-import org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryMapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.net.URI;
-import java.util.concurrent.TimeUnit;
-
-/**
- * A simple, non-thread safe Gremlin Server client using websockets. Typical use is for testing and demonstration.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class WebSocketClient extends AbstractClient {
- private static final Logger logger = LoggerFactory.getLogger(WebSocketClient.class);
- private final Channel channel;
-
- public WebSocketClient() {
- this(URI.create("ws://localhost:8182/gremlin"));
- }
-
- public WebSocketClient(final URI uri) {
- super("ws-client-%d");
- final Bootstrap b = new Bootstrap().group(group);
- b.option(ChannelOption.ALLOCATOR, PooledByteBufAllocator.DEFAULT);
-
- final String protocol = uri.getScheme();
- if (!"ws".equalsIgnoreCase(protocol) && !"wss".equalsIgnoreCase(protocol))
- throw new IllegalArgumentException("Unsupported protocol: " + protocol);
- final String host = uri.getHost();
- final int port;
- if (uri.getPort() == -1) {
- if ("ws".equalsIgnoreCase(protocol)) {
- port = 80;
- } else if ("wss".equalsIgnoreCase(protocol)) {
- port = 443;
- } else {
- port = -1;
- }
- } else {
- port = uri.getPort();
- }
-
- try {
- final boolean ssl = "wss".equalsIgnoreCase(protocol);
- final SslContext sslCtx;
- if (ssl) {
- sslCtx = SslContextBuilder.forClient()
- .trustManager(InsecureTrustManagerFactory.INSTANCE).build();
- } else {
- sslCtx = null;
- }
- final WebSocketClientHandler wsHandler = new WebSocketClientHandler(WebSocketClientHandshakerFactory.newHandshaker(
- uri, WebSocketVersion.V13, null, true, EmptyHttpHeaders.INSTANCE, 65536), 10000, false);
- final MessageSerializer<GraphBinaryMapper> serializer = new GraphBinaryMessageSerializerV1();
- b.channel(NioSocketChannel.class)
- .handler(new ChannelInitializer<SocketChannel>() {
- @Override
- protected void initChannel(final SocketChannel ch) {
- final ChannelPipeline p = ch.pipeline();
- if (sslCtx != null) {
- p.addLast(sslCtx.newHandler(ch.alloc(), host, port));
- }
- p.addLast(
- new HttpClientCodec(),
- new HttpObjectAggregator(65536),
- wsHandler,
- new WebSocketGremlinRequestEncoder(true, serializer),
- new WebSocketGremlinResponseDecoder(serializer),
- callbackResponseHandler);
- }
- });
-
- channel = b.connect(uri.getHost(), uri.getPort()).sync().channel();
- wsHandler.handshakeFuture().get(30, TimeUnit.SECONDS);
- } catch (Exception ex) {
- throw new RuntimeException(ex);
- }
- }
-
- @Override
- public void writeAndFlush(final RequestMessage requestMessage) throws Exception {
- channel.writeAndFlush(requestMessage);
- }
-
- @Override
- public void close() throws IOException {
- try {
- channel.close().get(30, TimeUnit.SECONDS);
- } catch (Exception ex) {
- logger.error("Failure closing simple WebSocketClient", ex);
- } finally {
- if (!group.shutdownGracefully().awaitUninterruptibly(30, TimeUnit.SECONDS)) {
- logger.error("Could not cleanly shutdown thread pool on WebSocketClient");
- }
- }
- }
-}
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/util/ConfigurationEvaluator.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/util/ConfigurationEvaluator.java
index fea23bf..b055fb0 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/util/ConfigurationEvaluator.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/util/ConfigurationEvaluator.java
@@ -32,12 +32,7 @@
*/
public class ConfigurationEvaluator {
- private final List<Integer> minConnectionPoolSizeRange = Arrays.asList(4,8,12,16,32,64,96,128,192,256,384,512);
private final List<Integer> maxConnectionPoolSizeRange = Arrays.asList(16,32,64,96,128,192,256,384,512);
- private final List<Integer> minSimultaneousUsagePerConnectionRange = Arrays.asList(4,8,16,24,32,64,96,128);
- private final List<Integer> maxSimultaneousUsagePerConnectionRange = Arrays.asList(4,8,16,24,32,64,96,128);
- private final List<Integer> minInProcessPerConnectionRange = Arrays.asList(2,4,8,16,32,64,96,128);
- private final List<Integer> maxInProcessPerConnectionRange = Arrays.asList(16,32,64,96,128);
private final List<Integer> workerPoolSizeRange = Arrays.asList(1,2,3,4,8,16,32);
private final List<Integer> nioPoolSizeRange = Arrays.asList(1,2,4);
private final List<Integer> parallelismSizeRange = Arrays.asList(1,2,4,8,16);
@@ -49,43 +44,23 @@
for (int ir = 0; ir < nioPoolSizeRange.size(); ir++) {
for (int is = 0; is < parallelismSizeRange.size(); is++) {
for (int it = 0; it < workerPoolSizeRange.size(); it++) {
- for (int iu = 0; iu < minInProcessPerConnectionRange.size(); iu++) {
- for (int iv = 0; iv < maxInProcessPerConnectionRange.size(); iv++) {
- for (int iw = 0; iw < minConnectionPoolSizeRange.size(); iw++) {
- for (int ix = 0; ix < maxConnectionPoolSizeRange.size(); ix++) {
- for (int iy = 0; iy < minSimultaneousUsagePerConnectionRange.size(); iy++) {
- for (int iz = 0; iz < maxSimultaneousUsagePerConnectionRange.size(); iz++) {
- if (minConnectionPoolSizeRange.get(iw) <= maxConnectionPoolSizeRange.get(ix)
- && minInProcessPerConnectionRange.get(iu) <= maxInProcessPerConnectionRange.get(iv)
- && minSimultaneousUsagePerConnectionRange.get(iy) <= maxSimultaneousUsagePerConnectionRange.get(iz)
- && maxSimultaneousUsagePerConnectionRange.get(iz) <= maxInProcessPerConnectionRange.get(iv)) {
- final String s = String.join(",", String.valueOf(ir), String.valueOf(is), String.valueOf(it), String.valueOf(iu), String.valueOf(iv), String.valueOf(iw), String.valueOf(ix), String.valueOf(iy), String.valueOf(iz));
- if (!configsTried.contains(s)) {
- final Object[] argsToProfiler =
- Stream.of("nioPoolSize", nioPoolSizeRange.get(ir).toString(),
- "parallelism", parallelismSizeRange.get(is).toString(),
- "workerPoolSize", workerPoolSizeRange.get(it).toString(),
- "minInProcessPerConnection", minInProcessPerConnectionRange.get(iu).toString(),
- "maxInProcessPerConnection", maxInProcessPerConnectionRange.get(iv).toString(),
- "minConnectionPoolSize", minConnectionPoolSizeRange.get(iw).toString(),
- "maxConnectionPoolSize", maxConnectionPoolSizeRange.get(ix).toString(),
- "minSimultaneousUsagePerConnection", minSimultaneousUsagePerConnectionRange.get(iy).toString(),
- "maxSimultaneousUsagePerConnection", maxSimultaneousUsagePerConnectionRange.get(iz).toString(),
- "noExit", Boolean.TRUE.toString()).toArray();
+ for (int ix = 0; ix < maxConnectionPoolSizeRange.size(); ix++) {
+ final String s = String.join(",", String.valueOf(ir), String.valueOf(is), String.valueOf(it), String.valueOf(ix));
+ if (!configsTried.contains(s)) {
+ final Object[] argsToProfiler =
+ Stream.of("nioPoolSize", nioPoolSizeRange.get(ir).toString(),
+ "parallelism", parallelismSizeRange.get(is).toString(),
+ "workerPoolSize", workerPoolSizeRange.get(it).toString(),
+ "maxConnectionPoolSize", maxConnectionPoolSizeRange.get(ix).toString(),
+ "noExit", Boolean.TRUE.toString()).toArray();
- final Object[] withExtraArgs = args.length > 0 ? Stream.concat(Stream.of(args), Stream.of(argsToProfiler)).toArray() : argsToProfiler;
+ final Object[] withExtraArgs = args.length > 0 ? Stream.concat(Stream.of(args), Stream.of(argsToProfiler)).toArray() : argsToProfiler;
- final String[] stringProfilerArgs = Arrays.copyOf(withExtraArgs, withExtraArgs.length, String[].class);
- System.out.println("Testing with: " + Arrays.toString(stringProfilerArgs));
- ProfilingApplication.main(stringProfilerArgs);
- TimeUnit.SECONDS.sleep(5);
- configsTried.add(s);
- }
- }
- }
- }
- }
- }
+ final String[] stringProfilerArgs = Arrays.copyOf(withExtraArgs, withExtraArgs.length, String[].class);
+ System.out.println("Testing with: " + Arrays.toString(stringProfilerArgs));
+ ProfilingApplication.main(stringProfilerArgs);
+ TimeUnit.SECONDS.sleep(5);
+ configsTried.add(s);
}
}
}
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/util/ProfilingApplication.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/util/ProfilingApplication.java
index c962ec4..dfc7e09 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/util/ProfilingApplication.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/util/ProfilingApplication.java
@@ -20,11 +20,10 @@
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.concurrent.BasicThreadFactory;
-import org.apache.tinkerpop.gremlin.driver.Channelizer;
import org.apache.tinkerpop.gremlin.driver.Client;
import org.apache.tinkerpop.gremlin.driver.Cluster;
-import org.apache.tinkerpop.gremlin.util.ser.Serializers;
import org.apache.tinkerpop.gremlin.structure.util.ElementHelper;
+import org.apache.tinkerpop.gremlin.util.ser.Serializers;
import java.io.BufferedWriter;
import java.io.File;
@@ -195,32 +194,20 @@
final int executions = Integer.parseInt(options.getOrDefault("executions", "10").toString());
final int nioPoolSize = Integer.parseInt(options.getOrDefault("nioPoolSize", "1").toString());
final int requests = Integer.parseInt(options.getOrDefault("requests", "10000").toString());
- final int minConnectionPoolSize = Integer.parseInt(options.getOrDefault("minConnectionPoolSize", "256").toString());
final int maxConnectionPoolSize = Integer.parseInt(options.getOrDefault("maxConnectionPoolSize", "256").toString());
- final int minSimultaneousUsagePerConnection = Integer.parseInt(options.getOrDefault("minSimultaneousUsagePerConnection", "8").toString());
- final int maxSimultaneousUsagePerConnection = Integer.parseInt(options.getOrDefault("maxSimultaneousUsagePerConnection", "32").toString());
- final int maxInProcessPerConnection = Integer.parseInt(options.getOrDefault("maxInProcessPerConnection", "64").toString());
- final int minInProcessPerConnection = Integer.parseInt(options.getOrDefault("minInProcessPerConnection", "16").toString());
final int maxWaitForConnection = Integer.parseInt(options.getOrDefault("maxWaitForConnection", "3000").toString());
final int workerPoolSize = Integer.parseInt(options.getOrDefault("workerPoolSize", Runtime.getRuntime().availableProcessors() * 2).toString());
final int tooSlowThreshold = Integer.parseInt(options.getOrDefault("tooSlowThreshold", "125").toString());
- final String channelizer = options.getOrDefault("channelizer", Channelizer.WebSocketChannelizer.class.getName()).toString();
- final String serializer = options.getOrDefault("serializer", Serializers.GRAPHBINARY_V1.name()).toString();
+ final String serializer = options.getOrDefault("serializer", Serializers.GRAPHBINARY_V4.name()).toString();
final int pauseBetweenRuns = Integer.parseInt(options.getOrDefault("pauseBetweenRuns", "1000").toString());
final boolean suppressStackTraces = Boolean.parseBoolean(options.getOrDefault("suppressStackTraces", "false").toString());
final boolean exercise = Boolean.parseBoolean(options.getOrDefault("exercise", "false").toString());
- final String script = options.getOrDefault("script", "1+1").toString();
+ final String script = options.getOrDefault("script", "g.inject(1)").toString();
final Cluster cluster = Cluster.build(host)
- .minConnectionPoolSize(minConnectionPoolSize)
.maxConnectionPoolSize(maxConnectionPoolSize)
- .minSimultaneousUsagePerConnection(minSimultaneousUsagePerConnection)
- .maxSimultaneousUsagePerConnection(maxSimultaneousUsagePerConnection)
- .minInProcessPerConnection(minInProcessPerConnection)
- .maxInProcessPerConnection(maxInProcessPerConnection)
.nioPoolSize(nioPoolSize)
- .channelizer(channelizer)
.maxWaitForConnection(maxWaitForConnection)
.serializer(Serializers.valueOf(serializer))
.workerPoolSize(workerPoolSize).create();
@@ -249,7 +236,7 @@
final File f = null == fileName ? null : new File(fileName.toString());
if (f != null && f.length() == 0) {
try (final PrintWriter writer = new PrintWriter(new BufferedWriter(new FileWriter(f, true)))) {
- writer.println("parallelism\tnioPoolSize\tminConnectionPoolSize\tmaxConnectionPoolSize\tminSimultaneousUsagePerConnection\tmaxSimultaneousUsagePerConnection\tminInProcessPerConnection\tmaxInProcessPerConnection\tworkerPoolSize\trequestPerSecond");
+ writer.println("parallelism\tnioPoolSize\tmaxConnectionPoolSize\tworkerPoolSize\trequestPerSecond");
}
}
@@ -280,7 +267,7 @@
System.out.println(String.format("avg req/sec: %s", averageRequestPerSecond));
if (f != null) {
try (final PrintWriter writer = new PrintWriter(new BufferedWriter(new FileWriter(f, true)))) {
- writer.println(String.join("\t", String.valueOf(parallelism), String.valueOf(nioPoolSize), String.valueOf(minConnectionPoolSize), String.valueOf(maxConnectionPoolSize), String.valueOf(minSimultaneousUsagePerConnection), String.valueOf(maxSimultaneousUsagePerConnection), String.valueOf(minInProcessPerConnection), String.valueOf(maxInProcessPerConnection), String.valueOf(workerPoolSize), String.valueOf(averageRequestPerSecond)));
+ writer.println(String.join("\t", String.valueOf(parallelism), String.valueOf(nioPoolSize), String.valueOf(maxConnectionPoolSize), String.valueOf(workerPoolSize), String.valueOf(averageRequestPerSecond)));
}
}
} else if (TestType.LATENCY == testType) {
diff --git a/gremlin-driver/src/main/static/LICENSE b/gremlin-driver/src/main/static/LICENSE
index 2a6fc08..a5e016e 100644
--- a/gremlin-driver/src/main/static/LICENSE
+++ b/gremlin-driver/src/main/static/LICENSE
@@ -221,7 +221,7 @@
The Apache TinkerPop project bundles the following components under the MIT License:
- SLF4J API Module (org.slf4j:slf4j-api:1.7.25 - http://www.slf4j.org)
+ SLF4J API Module (org.slf4j:slf4j-api:2.0.16 - http://www.slf4j.org)
- shaded to org.shaded.slf4j
- for details, see licenses/slf4j
@@ -231,5 +231,5 @@
The Apache TinkerPop project bundles the following components under the Eclipse Public License 1.0:
- logback-core (ch.qos.logback:logback-core:1.2.3 - https://logback.qos.ch) - for details, see licenses/logback
- logback-classic (ch.qos.logback:logback-classic:1.2.3 - https://logback.qos.ch) - for details, see licenses/logback
\ No newline at end of file
+ logback-core (ch.qos.logback:logback-core:1.3.15 - https://logback.qos.ch) - for details, see licenses/logback
+ logback-classic (ch.qos.logback:logback-classic:1.3.15 - https://logback.qos.ch) - for details, see licenses/logback
\ No newline at end of file
diff --git a/gremlin-driver/src/main/static/NOTICE b/gremlin-driver/src/main/static/NOTICE
index f787078..ee6c118 100644
--- a/gremlin-driver/src/main/static/NOTICE
+++ b/gremlin-driver/src/main/static/NOTICE
@@ -57,3 +57,22 @@
Objenesis 3.3 - shaded in gremlin-shaded to org.apache.tinkerpop.shaded.objenesis
------------------------------------------------------------------------
Copyright 2006-2022 Joe Walnes, Henri Tremblay, Leonardo Mesquita
+
+------------------------------------------------------------------------
+AWS SDK for Java 2.0
+------------------------------------------------------------------------
+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+
+This product includes software developed by
+Amazon Technologies, Inc (http://www.amazon.com/).
+
+**********************
+THIRD PARTY COMPONENTS
+**********************
+This software includes third party software subject to the following copyrights:
+- XML parsing and utility functions from JetS3t - Copyright 2006-2009 James Murty.
+- PKCS#1 PEM encoded private key parsing and utility functions from oauth.googlecode.com - Copyright 1998-2010 AOL Inc.
+- Apache Commons Lang - https://github.com/apache/commons-lang
+- Netty Reactive Streams - https://github.com/playframework/netty-reactive-streams
+- Jackson-core - https://github.com/FasterXML/jackson-core
+- Jackson-dataformat-cbor - https://github.com/FasterXML/jackson-dataformats-binary
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/AbstractResultQueueTest.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/AbstractResultQueueTest.java
index d87fd00..806fa33 100644
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/AbstractResultQueueTest.java
+++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/AbstractResultQueueTest.java
@@ -94,7 +94,7 @@
}
}
- if (markDone) resultQueue.markComplete(Collections.emptyMap());
+ if (markDone) resultQueue.markComplete();
}, "ResultQueueTest-job-submitter");
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ClusterBuilderTest.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ClusterBuilderTest.java
index 32871e1..dca023d 100644
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ClusterBuilderTest.java
+++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ClusterBuilderTest.java
@@ -38,24 +38,12 @@
@Parameterized.Parameters(name = "{0}")
public static Iterable<Object[]> data() {
return Arrays.asList(new Object[][]{
- {"maxInProcessPerConnection0", Cluster.build().maxInProcessPerConnection(0), "maxInProcessPerConnection must be greater than zero"},
- {"maxInProcessPerConnectionNeg1", Cluster.build().maxInProcessPerConnection(-1), "maxInProcessPerConnection must be greater than zero"},
- {"minInProcessPerConnectionNeg1", Cluster.build().minInProcessPerConnection(-1), "minInProcessPerConnection must be greater than or equal to zero"},
- {"minInProcessPerConnectionLtMax", Cluster.build().minInProcessPerConnection(100).maxInProcessPerConnection(99), "maxInProcessPerConnection cannot be less than minInProcessPerConnection"},
- {"maxSimultaneousUsagePerConnection0", Cluster.build().maxSimultaneousUsagePerConnection(0), "maxSimultaneousUsagePerConnection must be greater than zero"},
- {"maxSimultaneousUsagePerConnectionNeg1", Cluster.build().maxSimultaneousUsagePerConnection(-1), "maxSimultaneousUsagePerConnection must be greater than zero"},
- {"minSimultaneousUsagePerConnectionNeg1", Cluster.build().minSimultaneousUsagePerConnection(-1), "minSimultaneousUsagePerConnection must be greater than or equal to zero"},
- {"minSimultaneousUsagePerConnectionLtMax", Cluster.build().minSimultaneousUsagePerConnection(100).maxSimultaneousUsagePerConnection(99), "maxSimultaneousUsagePerConnection cannot be less than minSimultaneousUsagePerConnection"},
{"maxConnectionPoolSize0", Cluster.build().maxConnectionPoolSize(0), "maxConnectionPoolSize must be greater than zero"},
{"maxConnectionPoolSizeNeg1", Cluster.build().maxConnectionPoolSize(-1), "maxConnectionPoolSize must be greater than zero"},
- {"minConnectionPoolSizeNeg1", Cluster.build().minConnectionPoolSize(-1), "minConnectionPoolSize must be greater than or equal to zero"},
- {"minConnectionPoolSizeLteMax", Cluster.build().minConnectionPoolSize(100).maxConnectionPoolSize(99), "maxConnectionPoolSize cannot be less than minConnectionPoolSize"},
- {"minConnectionPoolSizeLteMax", Cluster.build().minConnectionPoolSize(100).maxConnectionPoolSize(99), "maxConnectionPoolSize cannot be less than minConnectionPoolSize"},
{"maxConnectionPoolSize0", Cluster.build().maxWaitForConnection(0), "maxWaitForConnection must be greater than zero"},
{"maxWaitForClose0", Cluster.build().maxWaitForClose(0), "maxWaitForClose must be greater than zero"},
{"maxWaitForCloseNeg1", Cluster.build().maxWaitForClose(-1), "maxWaitForClose must be greater than zero"},
- {"maxContentLength0", Cluster.build().maxContentLength(0), "maxContentLength must be greater than zero"},
- {"maxContentLengthNeg1", Cluster.build().maxContentLength(-1), "maxContentLength must be greater than zero"},
+ {"maxResponseContentLengthNeg1", Cluster.build().maxResponseContentLength(-1), "maxResponseContentLength must be greater than or equal to zero"},
{"reconnectInterval0", Cluster.build().reconnectInterval(0), "reconnectInterval must be greater than zero"},
{"reconnectIntervalNeg1", Cluster.build().reconnectInterval(-1), "reconnectInterval must be greater than zero"},
{"resultIterationBatchSize0", Cluster.build().resultIterationBatchSize(0), "resultIterationBatchSize must be greater than zero"},
@@ -63,9 +51,11 @@
{"nioPoolSize0", Cluster.build().nioPoolSize(0), "nioPoolSize must be greater than zero"},
{"nioPoolSizeNeg1", Cluster.build().nioPoolSize(-1), "nioPoolSize must be greater than zero"},
{"connectionSetupTimeoutMillis0", Cluster.build().connectionSetupTimeoutMillis(0), "connectionSetupTimeoutMillis must be greater than zero"},
+ {"idleConnectionTimeoutMillisNeg1", Cluster.build().idleConnectionTimeoutMillis(-1), "idleConnectionTimeoutMillis must be zero or greater than or equal to 1000"},
+ {"idleConnectionTimeoutMillisOne", Cluster.build().idleConnectionTimeoutMillis(1), "idleConnectionTimeoutMillis must be zero or greater than or equal to 1000"},
+ {"idleConnectionTimeoutMillis999", Cluster.build().idleConnectionTimeoutMillis(999), "idleConnectionTimeoutMillis must be zero or greater than or equal to 1000"},
{"workerPoolSize0", Cluster.build().workerPoolSize(0), "workerPoolSize must be greater than zero"},
- {"workerPoolSizeNeg1", Cluster.build().workerPoolSize(-1), "workerPoolSize must be greater than zero"},
- {"channelizer", Cluster.build().channelizer("MissingChannelizer"), "The channelizer specified [MissingChannelizer] could not be instantiated - it should be the fully qualified classname of a Channelizer implementation available on the classpath"}});
+ {"workerPoolSizeNeg1", Cluster.build().workerPoolSize(-1), "workerPoolSize must be greater than zero"}});
}
@Parameterized.Parameter(value = 0)
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ClusterConfigTest.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ClusterConfigTest.java
index 03b8fce..9ae6555 100644
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ClusterConfigTest.java
+++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ClusterConfigTest.java
@@ -20,8 +20,7 @@
import org.apache.commons.configuration2.BaseConfiguration;
import org.apache.commons.configuration2.Configuration;
-import org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV2;
-import org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3;
+import org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV4;
import org.apache.tinkerpop.shaded.jackson.core.StreamReadConstraints;
import org.junit.Test;
@@ -33,37 +32,18 @@
public class ClusterConfigTest {
@Test
- public void shouldPropagateSerializerConstraintsForGraphSON3() {
+ public void shouldPropagateSerializerConstraintsForGraphSON4() {
final Configuration config = new BaseConfiguration();
config.setProperty("serializer.config.maxNumberLength", 999);
config.setProperty("serializer.config.maxStringLength", 123456);
config.setProperty("serializer.config.maxNestingDepth", 55);
config.setProperty("hosts", Arrays.asList("localhost"));
- config.setProperty("serializer.className", GraphSONMessageSerializerV3.class.getCanonicalName());
+ config.setProperty("serializer.className", GraphSONMessageSerializerV4.class.getCanonicalName());
final Cluster cluster = Cluster.open(config);
- assertTrue(cluster.getSerializer() instanceof GraphSONMessageSerializerV3);
- final GraphSONMessageSerializerV3 serV3 = (GraphSONMessageSerializerV3) cluster.getSerializer();
- final StreamReadConstraints constraints = serV3.getMapper().getFactory().streamReadConstraints();
-
- assertEquals(999, constraints.getMaxNumberLength());
- assertEquals(123456, constraints.getMaxStringLength());
- assertEquals(55, constraints.getMaxNestingDepth());
- }
-
- @Test
- public void shouldPropagateSerializerConstraintsForGraphSON2() {
- final Configuration config = new BaseConfiguration();
- config.setProperty("serializer.config.maxNumberLength", 999);
- config.setProperty("serializer.config.maxStringLength", 123456);
- config.setProperty("serializer.config.maxNestingDepth", 55);
- config.setProperty("hosts", Arrays.asList("localhost"));
-
- config.setProperty("serializer.className", GraphSONMessageSerializerV2.class.getCanonicalName());
- final Cluster cluster = Cluster.open(config);
- assertTrue(cluster.getSerializer() instanceof GraphSONMessageSerializerV2);
- final GraphSONMessageSerializerV2 serV2 = (GraphSONMessageSerializerV2) cluster.getSerializer();
- final StreamReadConstraints constraints = serV2.getMapper().getFactory().streamReadConstraints();
+ assertTrue(cluster.getSerializer() instanceof GraphSONMessageSerializerV4);
+ final GraphSONMessageSerializerV4 serV4 = (GraphSONMessageSerializerV4) cluster.getSerializer();
+ final StreamReadConstraints constraints = serV4.getMapper().getFactory().streamReadConstraints();
assertEquals(999, constraints.getMaxNumberLength());
assertEquals(123456, constraints.getMaxStringLength());
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ClusterTest.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ClusterTest.java
new file mode 100644
index 0000000..4a56ed7
--- /dev/null
+++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ClusterTest.java
@@ -0,0 +1,143 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.driver;
+
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.tinkerpop.gremlin.driver.interceptor.PayloadSerializingInterceptor;
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.apache.tinkerpop.gremlin.driver.Cluster.SERIALIZER_INTERCEPTOR_NAME;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.IsInstanceOf.instanceOf;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+/**
+ * Test Cluster and Cluster.Builder.
+ */
+public class ClusterTest {
+ private static final RequestInterceptor TEST_INTERCEPTOR = httpRequest -> new HttpRequest(null, null, null);
+
+ @Test
+ public void shouldNotAllowModifyingRelativeToNonExistentInterceptor() {
+ try {
+ Cluster.build().addInterceptorAfter("none", "test", req -> req);
+ fail("Should not have allowed interceptor to be added.");
+ } catch (Exception e) {
+ assertThat(e, instanceOf(IllegalArgumentException.class));
+ assertEquals("none interceptor not found", e.getMessage());
+ }
+
+ try {
+ Cluster.build().addInterceptorBefore("none", "test", req -> req);
+ fail("Should not have allowed interceptor to be added.");
+ } catch (Exception e) {
+ assertThat(e, instanceOf(IllegalArgumentException.class));
+ assertEquals("none interceptor not found", e.getMessage());
+ }
+
+ try {
+ Cluster.build().removeInterceptor("nonexistent");
+ fail("Should not have allowed interceptor to be removed.");
+ } catch (Exception e) {
+ assertThat(e, instanceOf(IllegalArgumentException.class));
+ assertEquals("nonexistent interceptor not found", e.getMessage());
+ }
+ }
+
+ @Test
+ public void shouldAddToInterceptorToBeginningIfBeforeFirst() {
+ final Cluster testCluster = Cluster.build()
+ .addInterceptor("b", req -> req)
+ .addInterceptorBefore(SERIALIZER_INTERCEPTOR_NAME, "a", TEST_INTERCEPTOR)
+ .create();
+ assertEquals("a", testCluster.getRequestInterceptors().get(0).getLeft());
+ assertEquals(TEST_INTERCEPTOR, testCluster.getRequestInterceptors().get(0).getRight());
+ assertEquals(SERIALIZER_INTERCEPTOR_NAME, testCluster.getRequestInterceptors().get(1).getLeft());
+ }
+
+ @Test
+ public void shouldAddToInterceptorAfter() {
+ final Cluster testCluster = Cluster.build()
+ .addInterceptor("b", req -> req)
+ .addInterceptorAfter(SERIALIZER_INTERCEPTOR_NAME, "a", TEST_INTERCEPTOR)
+ .create();
+ assertEquals(SERIALIZER_INTERCEPTOR_NAME, testCluster.getRequestInterceptors().get(0).getLeft());
+ assertEquals("a", testCluster.getRequestInterceptors().get(1).getLeft());
+ assertEquals(TEST_INTERCEPTOR, testCluster.getRequestInterceptors().get(1).getRight());
+ assertEquals("b", testCluster.getRequestInterceptors().get(2).getLeft());
+
+ }
+
+ @Test
+ public void shouldAddToInterceptorLast() {
+ final Cluster testCluster = Cluster.build()
+ .addInterceptor("c", req -> req)
+ .addInterceptor("b", req -> req)
+ .addInterceptor("a", req -> req)
+ .create();
+ assertEquals(SERIALIZER_INTERCEPTOR_NAME, testCluster.getRequestInterceptors().get(0).getLeft());
+ assertEquals("c", testCluster.getRequestInterceptors().get(1).getLeft());
+ assertEquals("b", testCluster.getRequestInterceptors().get(2).getLeft());
+ assertEquals("a", testCluster.getRequestInterceptors().get(3).getLeft());
+ }
+
+ @Test
+ public void shouldNotAllowAddingDuplicateName() {
+ try {
+ Cluster.build().addInterceptor("name", req -> req).addInterceptor("name", req -> req);
+ fail("Should not have allowed interceptor to be added.");
+ } catch (Exception e) {
+ assertThat(e, instanceOf(IllegalArgumentException.class));
+ assertEquals("name interceptor already exists", e.getMessage());
+ }
+
+ try {
+ Cluster.build().addInterceptor("name", req -> req).addInterceptorAfter("name", "name", req -> req);
+ fail("Should not have allowed interceptor to be added.");
+ } catch (Exception e) {
+ assertThat(e, instanceOf(IllegalArgumentException.class));
+ assertEquals("name interceptor already exists", e.getMessage());
+ }
+
+ try {
+ Cluster.build().addInterceptor("name", req -> req).addInterceptorBefore("name", "name", req -> req);
+ fail("Should not have allowed interceptor to be added.");
+ } catch (Exception e) {
+ assertThat(e, instanceOf(IllegalArgumentException.class));
+ assertEquals("name interceptor already exists", e.getMessage());
+ }
+ }
+
+ @Test
+ public void shouldContainBodySerializerByDefault() {
+ final List<Pair<String, ? extends RequestInterceptor>> interceptors = Cluster.build().create().getRequestInterceptors();
+ assertEquals(1, interceptors.size());
+ assertTrue(interceptors.get(0).getRight() instanceof PayloadSerializingInterceptor);
+ }
+
+ @Test
+ public void shouldRemoveDefaultSerializer() {
+ final Cluster testCluster = Cluster.build().removeInterceptor(SERIALIZER_INTERCEPTOR_NAME).create();
+ assertEquals(0, testCluster.getRequestInterceptors().size());
+ }
+}
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ConnectionPoolTest.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ConnectionPoolTest.java
new file mode 100644
index 0000000..1c8941b
--- /dev/null
+++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ConnectionPoolTest.java
@@ -0,0 +1,99 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.driver;
+
+import org.apache.commons.lang3.concurrent.BasicThreadFactory;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+public class ConnectionPoolTest {
+
+ @Test
+ public void shouldCreateAndScalePool() throws TimeoutException {
+ final AtomicInteger connectionsCreated = new AtomicInteger(0);
+
+ final Connection mockConn0 = mock(Connection.class);
+ when(mockConn0.isBorrowed()).thenReturn(new AtomicBoolean(false));
+ final Connection mockConn1 = mock(Connection.class);
+ when(mockConn1.isBorrowed()).thenReturn(new AtomicBoolean(false));
+ final List<Connection> mockConns = Arrays.asList(mockConn0, mockConn1);
+
+ final ConnectionFactory connectionFactory = mock(ConnectionFactory.class);
+ when(connectionFactory.create(any(ConnectionPool.class)))
+ .thenAnswer(i -> mockConns.get(connectionsCreated.getAndIncrement()));
+
+ final Cluster cluster = mock(Cluster.class);
+ when(cluster.connectionPoolSettings()).thenReturn(new Settings.ConnectionPoolSettings());
+ final ScheduledThreadPoolExecutor connectionScheduler = new ScheduledThreadPoolExecutor(2,
+ new BasicThreadFactory.Builder().namingPattern("gremlin-driver-conn-scheduler-%d").build());
+ when(cluster.connectionScheduler()).thenReturn(connectionScheduler);
+
+ final Host host = mock(Host.class);
+
+ final Client client = new Client.ClusteredClient(cluster);
+
+ // create pool - starts with 1 connection
+ final ConnectionPool connectionPool = new ConnectionPool(host, client, Optional.of(2), connectionFactory);
+ // try to borrow a connection.
+ final Connection conn0 = connectionPool.borrowConnection(100, TimeUnit.MILLISECONDS);
+
+ assertNotNull(connectionPool);
+ assertNotNull(conn0);
+ assertEquals(1, connectionsCreated.get());
+
+ // try to borrow connection. conn0 is mocked as borrowed, so should create new one
+ when(mockConn0.isBorrowed()).thenReturn(new AtomicBoolean(true));
+ final Connection conn1 = connectionPool.borrowConnection(100, TimeUnit.MILLISECONDS);
+
+ assertNotNull(conn1);
+ assertEquals(2, connectionsCreated.get());
+
+ // mark conn1 as borrowed and try to get one more connection
+ when(mockConn1.isBorrowed()).thenReturn(new AtomicBoolean(true));
+ try {
+ connectionPool.borrowConnection(1000, TimeUnit.MILLISECONDS);
+ fail("Pool already at fool capacity, connection can't be added");
+ } catch (TimeoutException te) {
+ assertEquals(2, connectionsCreated.get());
+ }
+
+ // return conn0 to pool, can be borrowed again
+ connectionPool.returnConnection(conn0);
+ when(mockConn0.isBorrowed()).thenReturn(new AtomicBoolean(false));
+ final Connection conn00 = connectionPool.borrowConnection(100, TimeUnit.MILLISECONDS);
+
+ assertNotNull(conn00);
+ assertEquals(2, connectionsCreated.get());
+ }
+}
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/HostTest.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/HostTest.java
index 2c20261..066a775 100644
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/HostTest.java
+++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/HostTest.java
@@ -35,7 +35,7 @@
final InetSocketAddress addy = new InetSocketAddress("localhost", 8182);
final Host host = new Host(addy, Cluster.open());
final URI webSocketUri = host.getHostUri();
- assertEquals("ws://localhost:8182/gremlin", webSocketUri.toString());
+ assertEquals("http://localhost:8182/gremlin", webSocketUri.toString());
}
@Test
@@ -43,7 +43,7 @@
final InetSocketAddress addy = new InetSocketAddress("localhost", 8183);
final Host host = new Host(addy, Cluster.build().port(8183).path("/argh").create());
final URI webSocketUri = host.getHostUri();
- assertEquals("ws://localhost:8183/argh", webSocketUri.toString());
+ assertEquals("http://localhost:8183/argh", webSocketUri.toString());
}
}
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/RequestMessageTest.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/RequestMessageTest.java
deleted file mode 100644
index a6ccb58..0000000
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/RequestMessageTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver;
-
-import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
-import org.junit.Assert;
-import org.junit.Test;
-
-import java.util.UUID;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class RequestMessageTest {
-
- @Test
- public void shouldOverrideRequest() {
- final UUID request = UUID.randomUUID();
- final RequestMessage msg = RequestMessage.build("op").overrideRequestId(request).create();
- assertEquals(request, msg.getRequestId());
- }
-
- @Test
- public void shouldSetProcessor() {
- final RequestMessage msg = RequestMessage.build("op").processor("ppp").create();
- assertEquals("ppp", msg.getProcessor());
- }
-
- @Test
- public void shouldSetOpWithDefaults() {
- final RequestMessage msg = RequestMessage.build("op").create();
- Assert.assertEquals("", msg.getProcessor()); // standard op processor
- assertNotNull(msg.getRequestId());
- assertEquals("op", msg.getOp());
- assertNotNull(msg.getArgs());
- }
-
- @Test
- public void shouldReturnEmptyOptionalArg() {
- final RequestMessage msg = RequestMessage.build("op").create();
- assertFalse(msg.optionalArgs("test").isPresent());
- }
-
- @Test
- public void shouldReturnArgAsOptional() {
- final RequestMessage msg = RequestMessage.build("op").add("test", "testing").create();
- assertEquals("testing", msg.optionalArgs("test").get());
- }
-}
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultQueueTest.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultQueueTest.java
index 4ca4664..b487d5d 100644
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultQueueTest.java
+++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultQueueTest.java
@@ -41,10 +41,6 @@
*/
public class ResultQueueTest extends AbstractResultQueueTest {
- private static final Map<String,Object> ATTRIBUTES = new HashMap<String,Object>() {{
- put("this", "that");
- }};
-
@Test
public void shouldGetSizeUntilError() throws Exception {
final Thread t = addToQueue(100, 10, true, false, 1);
@@ -135,7 +131,7 @@
resultQueue.add(new Result("test3"));
assertThat(future.isDone(), is(false));
- resultQueue.markComplete(ATTRIBUTES);
+ resultQueue.markComplete();
assertThat(future.isDone(), is(true));
final List<Result> results = future.get();
@@ -145,7 +141,6 @@
assertEquals(3, results.size());
assertThat(resultQueue.isEmpty(), is(true));
- assertEquals("that", resultQueue.getStatusAttributes().get("this"));
}
@Test
@@ -243,7 +238,7 @@
resultQueue.add(new Result("test2"));
resultQueue.add(new Result("test3"));
- resultQueue.markComplete(ATTRIBUTES);
+ resultQueue.markComplete();
// you might want 30 but there are only three
final CompletableFuture<List<Result>> future = resultQueue.await(30);
@@ -256,7 +251,6 @@
assertEquals(3, results.size());
assertThat(resultQueue.isEmpty(), is(true));
- assertEquals("that", resultQueue.getStatusAttributes().get("this"));
}
@Test
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultSetTest.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultSetTest.java
index 50e8769..f32ee28 100644
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultSetTest.java
+++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultSetTest.java
@@ -22,10 +22,8 @@
import org.junit.Before;
import org.junit.Test;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
-import java.util.Map;
import java.util.NoSuchElementException;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
@@ -43,10 +41,6 @@
*/
public class ResultSetTest extends AbstractResultQueueTest {
- private static final Map<String,Object> ATTRIBUTES = new HashMap<String,Object>() {{
- put("this", "that");
- }};
-
private ResultSet resultSet;
@Before
@@ -55,13 +49,6 @@
}
@Test
- public void shouldReturnEmptyMapForNoResponseAttributes() throws Exception {
- final CompletableFuture<Map<String,Object>> attrs = resultSet.statusAttributes();
- readCompleted.complete(null);
- assertThat(attrs.get().isEmpty(), is(true));
- }
-
- @Test
public void shouldHaveAllItemsAvailableAsynchronouslyOnReadComplete() throws InterruptedException {
final CompletableFuture<Void> all = resultSet.allItemsAvailableAsync();
assertThat(all.isDone(), is(false));
@@ -83,25 +70,6 @@
}
@Test
- public void shouldHaveStatusAttributesCompleteOnReadComplete() throws InterruptedException {
- final CompletableFuture<Map<String,Object>> attrbFut = resultSet.statusAttributes();
- readCompleted.complete(null);
- // flush all tasks in pool
- pool.awaitTermination(2, TimeUnit.SECONDS);
- assertThat(attrbFut.isDone(), is(true));
- }
-
- @Test
- public void shouldHaveStatusAttributesCompleteOnReadCompleteExceptionally() throws InterruptedException {
- final CompletableFuture<Map<String,Object>> attrbFut = resultSet.statusAttributes();
- readCompleted.completeExceptionally(new RuntimeException());
- // flush all tasks in pool
- pool.awaitTermination(2, TimeUnit.SECONDS);
- assertThat(attrbFut.isDone(), is(true));
- assertThat(attrbFut.isCompletedExceptionally(), is(true));
- }
-
- @Test
public void shouldHaveAllItemsAvailableOnReadComplete() throws InterruptedException {
assertThat(resultSet.allItemsAvailable(), is(false));
readCompleted.complete(null);
@@ -154,7 +122,7 @@
resultQueue.add(new Result("test3"));
assertThat(future.isDone(), is(false));
- resultQueue.markComplete(ATTRIBUTES);
+ resultQueue.markComplete();
assertThat(future.isDone(), is(true));
final List<Result> results = future.get();
@@ -165,8 +133,6 @@
assertThat(resultSet.allItemsAvailable(), is(true));
assertEquals(0, resultSet.getAvailableItemCount());
-
- assertEquals("that", resultQueue.getStatusAttributes().get("this"));
}
@Test
@@ -177,7 +143,7 @@
resultQueue.add(new Result("test3"));
assertThat(future.isDone(), is(false));
- resultQueue.markComplete(ATTRIBUTES);
+ resultQueue.markComplete();
final List<Result> results = future.get();
assertEquals("test1", results.get(0).getString());
@@ -188,8 +154,6 @@
assertThat(future.isDone(), is(true));
assertThat(resultSet.allItemsAvailable(), is(true));
assertEquals(0, resultSet.getAvailableItemCount());
-
- assertEquals("that", resultQueue.getStatusAttributes().get("this"));
}
@Test
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/SettingsTest.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/SettingsTest.java
index 26eb8a9..0416bfa 100644
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/SettingsTest.java
+++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/SettingsTest.java
@@ -21,6 +21,7 @@
import static org.hamcrest.core.Is.is;
import static org.junit.Assert.assertEquals;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertTrue;
import org.apache.commons.configuration2.BaseConfiguration;
import org.apache.commons.configuration2.Configuration;
@@ -39,15 +40,14 @@
conf.setProperty("port", 8000);
conf.setProperty("nioPoolSize", 16);
conf.setProperty("workerPoolSize", 32);
- conf.setProperty("username", "user1");
- conf.setProperty("password", "password1");
- conf.setProperty("jaasEntry", "JaasIt");
- conf.setProperty("protocol", "protocol0");
+ conf.setProperty("auth.type", "basic");
+ conf.setProperty("auth.username", "user1");
+ conf.setProperty("auth.password", "password1");
conf.setProperty("hosts", Arrays.asList("255.0.0.1", "255.0.0.2", "255.0.0.3"));
conf.setProperty("serializer.className", "my.serializers.MySerializer");
conf.setProperty("serializer.config.any", "thing");
conf.setProperty("enableUserAgentOnConnect", false);
- conf.setProperty("enableCompression", false);
+ conf.setProperty("bulkResults", true);
conf.setProperty("connectionPool.enableSsl", true);
conf.setProperty("connectionPool.keyStore", "server.jks");
conf.setProperty("connectionPool.keyStorePassword", "password2");
@@ -58,34 +58,33 @@
conf.setProperty("connectionPool.sslEnabledProtocols", Arrays.asList("TLSv1.1","TLSv1.2"));
conf.setProperty("connectionPool.sslCipherSuites", Arrays.asList("TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384", "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384"));
conf.setProperty("connectionPool.sslSkipCertValidation", true);
- conf.setProperty("connectionPool.minSize", 100);
conf.setProperty("connectionPool.maxSize", 200);
conf.setProperty("connectionPool.minSimultaneousUsagePerConnection", 300);
conf.setProperty("connectionPool.maxSimultaneousUsagePerConnection", 400);
conf.setProperty("connectionPool.maxInProcessPerConnection", 500);
conf.setProperty("connectionPool.minInProcessPerConnection", 600);
conf.setProperty("connectionPool.maxWaitForConnection", 700);
- conf.setProperty("connectionPool.maxContentLength", 800);
+ conf.setProperty("connectionPool.maxResponseContentLength", 800);
conf.setProperty("connectionPool.reconnectInterval", 900);
conf.setProperty("connectionPool.resultIterationBatchSize", 1100);
conf.setProperty("connectionPool.channelizer", "channelizer0");
conf.setProperty("connectionPool.validationRequest", "g.inject()");
conf.setProperty("connectionPool.connectionSetupTimeoutMillis", 15000);
+ conf.setProperty("connectionPool.idleConnectionTimeout", 160000);
final Settings settings = Settings.from(conf);
assertEquals(8000, settings.port);
assertEquals(16, settings.nioPoolSize);
assertEquals(32, settings.workerPoolSize);
- assertEquals("user1", settings.username);
- assertEquals("password1", settings.password);
- assertEquals("JaasIt", settings.jaasEntry);
- assertEquals("protocol0", settings.protocol);
+ assertEquals("basic", settings.auth.type);
+ assertEquals("user1", settings.auth.username);
+ assertEquals("password1", settings.auth.password);
assertEquals(Arrays.asList("255.0.0.1", "255.0.0.2", "255.0.0.3"), settings.hosts);
assertEquals("my.serializers.MySerializer", settings.serializer.className);
assertEquals("thing", settings.serializer.config.get("any"));
assertEquals(false, settings.enableUserAgentOnConnect);
- assertEquals(false, settings.enableCompression);
+ assertTrue(settings.bulkResults);
assertThat(settings.connectionPool.enableSsl, is(true));
assertEquals("server.jks", settings.connectionPool.keyStore);
assertEquals("password2", settings.connectionPool.keyStorePassword);
@@ -96,18 +95,13 @@
assertEquals(Arrays.asList("TLSv1.1","TLSv1.2"), settings.connectionPool.sslEnabledProtocols);
assertEquals(Arrays.asList("TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384", "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384"), settings.connectionPool.sslCipherSuites);
assertThat(settings.connectionPool.sslSkipCertValidation, is(true));
- assertEquals(100, settings.connectionPool.minSize);
assertEquals(200, settings.connectionPool.maxSize);
- assertEquals(300, settings.connectionPool.minSimultaneousUsagePerConnection);
- assertEquals(400, settings.connectionPool.maxSimultaneousUsagePerConnection);
- assertEquals(500, settings.connectionPool.maxInProcessPerConnection);
- assertEquals(600, settings.connectionPool.minInProcessPerConnection);
assertEquals(700, settings.connectionPool.maxWaitForConnection);
- assertEquals(800, settings.connectionPool.maxContentLength);
+ assertEquals(800, settings.connectionPool.maxResponseContentLength);
assertEquals(900, settings.connectionPool.reconnectInterval);
assertEquals(15000, settings.connectionPool.connectionSetupTimeoutMillis);
+ assertEquals(160000, settings.connectionPool.idleConnectionTimeout);
assertEquals(1100, settings.connectionPool.resultIterationBatchSize);
- assertEquals("channelizer0", settings.connectionPool.channelizer);
assertEquals("g.inject()", settings.connectionPool.validationRequest);
}
}
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/WebSocketClientBehaviorIntegrateTest.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/WebSocketClientBehaviorIntegrateTest.java
deleted file mode 100644
index 5cd461a..0000000
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/WebSocketClientBehaviorIntegrateTest.java
+++ /dev/null
@@ -1,601 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver;
-
-import nl.altindag.log.LogCaptor;
-import org.apache.tinkerpop.gremlin.socket.server.SimpleSocketServer;
-import org.apache.tinkerpop.gremlin.socket.server.SocketServerSettings;
-import org.apache.tinkerpop.gremlin.socket.server.TestChannelizers;
-import org.apache.tinkerpop.gremlin.socket.server.TestWSGremlinInitializer;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TestName;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.apache.tinkerpop.gremlin.driver.exception.NoHostAvailableException;
-import org.apache.tinkerpop.gremlin.util.ser.Serializers;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.util.ExceptionHelper;
-
-import java.io.IOException;
-import java.nio.file.FileSystems;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import static org.hamcrest.core.Is.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-public class WebSocketClientBehaviorIntegrateTest {
- private static final Logger logger = LoggerFactory.getLogger(WebSocketClientBehaviorIntegrateTest.class);
-
- @Rule
- public TestName name = new TestName();
-
- private static LogCaptor logCaptor;
-
- private final SocketServerSettings settings;
-
- private SimpleSocketServer server;
-
- public WebSocketClientBehaviorIntegrateTest() throws IOException {
- settings = SocketServerSettings.read(FileSystems.getDefault().getPath("..","gremlin-tools", "gremlin-socket-server", "conf", "test-ws-gremlin.yaml"));
- settings.SERIALIZER = "GraphSONV2";
- }
-
- @BeforeClass
- public static void setupLogCaptor() {
- logCaptor = LogCaptor.forRoot();
- }
-
- @AfterClass
- public static void tearDown() {
- logCaptor.close();
- }
-
- @Before
- public void setUp() throws InterruptedException {
- logCaptor.clearLogs();
-
- server = new SimpleSocketServer(settings);
- if (name.getMethodName().equals("shouldAttemptHandshakeForLongerThanDefaultNettySslHandshakeTimeout") ||
- name.getMethodName().equals("shouldPrintCorrectErrorForRegularWebSocketHandshakeTimeout")) {
- server.start(new TestChannelizers.TestWSNoOpInitializer());
- } else if (name.getMethodName().equals("shouldContinueRunningRemainingConnectionsIfServerThrottlesNewConnections") ||
- name.getMethodName().equals("shouldReturnCorrectExceptionIfServerThrottlesNewConnectionsAndMaxWaitExceeded")) {
- server.start(new TestChannelizers.TestConnectionThrottlingInitializer(settings));
- } else {
- server.start(new TestWSGremlinInitializer(settings));
- }
- }
-
- @After
- public void shutdown() {
- server.stop();
- }
-
- /**
- * Tests that client is correctly sending user agent during web socket handshake by having the server return
- * the captured user agent.
- */
- @Test
- public void shouldIncludeUserAgentInHandshakeRequest() {
- final Cluster cluster = Cluster.build("localhost").port(settings.PORT)
- .minConnectionPoolSize(1)
- .maxConnectionPoolSize(1)
- .serializer(Serializers.GRAPHSON_V2)
- .create();
- final Client.ClusteredClient client = cluster.connect();
-
- // trigger the testing server to return captured user agent
- String returnedUserAgent = client.submit("1", RequestOptions.build()
- .overrideRequestId(settings.USER_AGENT_REQUEST_ID).create()).one().getString();
- assertEquals(UserAgent.USER_AGENT, returnedUserAgent);
- }
-
- /**
- * Tests that no user agent is sent to server when that behaviour is disabled.
- */
- @Test
- public void shouldNotIncludeUserAgentInHandshakeRequestIfDisabled() {
- final Cluster cluster = Cluster.build("localhost").port(settings.PORT)
- .minConnectionPoolSize(1)
- .maxConnectionPoolSize(1)
- .serializer(Serializers.GRAPHSON_V2)
- .enableUserAgentOnConnect(false)
- .create();
- final Client.ClusteredClient client = cluster.connect();
-
- // trigger the testing server to return captured user agent
- String returnedUserAgent = client.submit("1", RequestOptions.build()
- .overrideRequestId(settings.USER_AGENT_REQUEST_ID).create()).one().getString();
- assertEquals("", returnedUserAgent);
- }
-
- /**
- * Tests that client is correctly requesting permessage deflate compression is used
- */
- @Test
- public void shouldRequestCompressionByDefault() {
- final Cluster cluster = Cluster.build("localhost").port(settings.PORT)
- .minConnectionPoolSize(1)
- .maxConnectionPoolSize(1)
- .serializer(Serializers.GRAPHSON_V2)
- .create();
- final Client.ClusteredClient client = cluster.connect();
-
- // trigger the testing server to return captured sec-websocket-extensions header
- String returnedWsExtensions = client.submit("1", RequestOptions.build()
- .overrideRequestId(settings.SEC_WEBSOCKET_EXTENSIONS).create()).one().getString();
- assertTrue(returnedWsExtensions.contains("permessage-deflate;"));
- }
-
- /**
- * Tests that client is correctly requesting permessage deflate compression is used
- */
- @Test
- public void shouldRequestCompressionWhenEnabled() {
- final Cluster cluster = Cluster.build("localhost").port(settings.PORT)
- .minConnectionPoolSize(1)
- .maxConnectionPoolSize(1)
- .serializer(Serializers.GRAPHSON_V2)
- .enableCompression(true)
- .create();
- final Client.ClusteredClient client = cluster.connect();
-
- // trigger the testing server to return captured sec-websocket-extensions header
- String returnedWsExtensions = client.submit("1", RequestOptions.build()
- .overrideRequestId(settings.SEC_WEBSOCKET_EXTENSIONS).create()).one().getString();
- assertTrue(returnedWsExtensions.contains("permessage-deflate;"));
- }
-
- /**
- * Tests that no user agent is sent to server when that behaviour is disabled.
- */
- @Test
- public void shouldNotRequestCompressionWhenDisabled() {
- final Cluster cluster = Cluster.build("localhost").port(settings.PORT)
- .minConnectionPoolSize(1)
- .maxConnectionPoolSize(1)
- .serializer(Serializers.GRAPHSON_V2)
- .enableCompression(false)
- .create();
- final Client.ClusteredClient client = cluster.connect();
-
- // trigger the testing server to return captured sec-websocket-extensions header
- String returnedWsExtensions = client.submit("1", RequestOptions.build()
- .overrideRequestId(settings.SEC_WEBSOCKET_EXTENSIONS).create()).one().getString();
- assertFalse(returnedWsExtensions.contains("permessage-deflate;"));
- }
-
- /**
- * Constructs a deadlock situation when initializing a {@link Client} object in sessionless form that leads to
- * hanging behavior in low resource environments (TINKERPOP-2504) and for certain configurations of the
- * {@link Cluster} object where there are simply not enough threads to properly allow the {@link Host} and its
- * related {@link ConnectionPool} objects to spin up properly - see TINKERPOP-2550.
- */
- @Test
- public void shouldNotDeadlockOnInitialization() throws Exception {
- // it seems you can add the same host more than once so while kinda weird it is helpful in faithfully
- // recreating the deadlock situation, though it can/will happen with just one host. workerPoolSize at
- // "1" also helps faithfully reproduce the problem though it can happen at larger pool sizes depending
- // on the timing/interleaving of tasks. the larger connection pool sizes may not be required given the
- // other settings at play but again, just trying to make sure the deadlock state is consistently produced
- // and a larger pool size will mean more time to elapse scheduling connection creation tasks which may
- // further improve chances of scheduling conflicts that produce the deadlock.
- //
- // to force this test to a fail state, change ClusteredClient.initializeImplementation() to use the
- // standard Cluster.executor rather than the hostExecutor (which is a single threaded independent thread
- // pool used just for the purpose of initializing the hosts).
- final Cluster cluster = Cluster.build("localhost").
- addContactPoint("localhost").
- addContactPoint("localhost").port(settings.PORT).
- workerPoolSize(1).
- minConnectionPoolSize(32).maxConnectionPoolSize(32).create();
-
- final AtomicBoolean failed = new AtomicBoolean(false);
- final ExecutorService executor = Executors.newSingleThreadExecutor();
- executor.submit(() -> {
- try {
- final Client client = cluster.connect();
-
- // test will hang in init() where the Host and ConnectionPool are started up
- client.init();
- } catch (Exception ex) {
- // should not "fail" - just hang and then timeout during the executor shutdown as there is
- // a deadlock state, but we have this here just in case. a failed assertion of this value
- // below could be interesting
- logger.error("Client initialization failed with exception which was unexpected", ex);
- failed.set(true);
- } finally {
- cluster.close();
- }
- });
-
- executor.shutdown();
-
- // 30 seconds should be ample time, even for travis. the deadlock state happens quite immediately in
- // testing and in most situations this test should zip by in subsecond pace
- assertThat(executor.awaitTermination(30, TimeUnit.SECONDS), is(true));
- assertThat(failed.get(), is(false));
- }
-
- /**
- * Test a scenario when server closes a connection which does not have any active requests. Such connection
- * should be destroyed and replaced by another connection on next request.
- */
- @Test
- public void shouldRemoveConnectionFromPoolWhenServerClose_WithNoPendingRequests() throws InterruptedException {
- final Cluster cluster = Cluster.build("localhost").port(settings.PORT)
- .minConnectionPoolSize(1)
- .maxConnectionPoolSize(1)
- .serializer(Serializers.GRAPHSON_V2)
- .create();
- final Client.ClusteredClient client = cluster.connect();
-
- // Initialize the client preemptively
- client.init();
-
- // assert number of connections opened
- final ConnectionPool channelPool = client.hostConnectionPools.values().stream().findFirst().get();
- assertEquals(1, channelPool.getConnectionIDs().size());
-
- final String originalConnectionID = channelPool.getConnectionIDs().iterator().next();
- logger.info("On client init ConnectionIDs: " + channelPool.getConnectionIDs());
-
- // trigger the testing server to send a WS close frame
- Vertex v = client.submit("1", RequestOptions.build()
- .overrideRequestId(settings.SINGLE_VERTEX_DELAYED_CLOSE_CONNECTION_REQUEST_ID).create())
- .one().getVertex();
-
- assertNotNull(v);
-
- // assert connection is not closed yet
- assertEquals(1, channelPool.getConnectionIDs().size());
-
- // wait for server to send the close WS frame
- Thread.sleep(6000);
-
- // assert that original connection is not part of the connection pool any more
- assertThat("The original connection should have been closed by the server.",
- channelPool.getConnectionIDs().contains(originalConnectionID), is(false));
-
- // assert sanity after connection replacement
- v = client.submit("1",
- RequestOptions.build().overrideRequestId(settings.SINGLE_VERTEX_REQUEST_ID).create())
- .one().getVertex();
- assertNotNull(v);
- }
-
- /**
- * Tests a scenario when the connection a faulty connection replaced by a new connection.
- * Ensures that the creation of a new replacement channel only happens once.
- */
- @Test
- public void shouldRemoveConnectionFromPoolWhenServerClose_WithPendingRequests() throws InterruptedException, ExecutionException {
- final Cluster cluster = Cluster.build("localhost").port(settings.PORT)
- .minConnectionPoolSize(1)
- .maxConnectionPoolSize(1)
- .serializer(Serializers.GRAPHSON_V2)
- .create();
-
- final Client.ClusteredClient client = cluster.connect();
-
- // Initialize the client preemptively
- client.init();
-
- // assert number of connections opened
- final ConnectionPool channelPool = client.hostConnectionPools.values().stream().findFirst().get();
- assertEquals(1, channelPool.getConnectionIDs().size());
-
- // Send two requests in flight. Both should error out.
- final CompletableFuture<ResultSet> req1 = client.submitAsync("1", RequestOptions.build()
- .overrideRequestId(settings.CLOSE_CONNECTION_REQUEST_ID).create());
- final CompletableFuture<ResultSet> req2 = client.submitAsync("1", RequestOptions.build()
- .overrideRequestId(settings.CLOSE_CONNECTION_REQUEST_ID_2).create());
-
-
- // assert both are sent on same connection
- assertEquals(1, channelPool.getConnectionIDs().size());
-
- // trigger write for both requests
- req1.get();
- req2.get();
-
- // wait for close message to arrive from server
- Thread.sleep(2000);
-
- // Assert that we should consider creating a connection only once, since only one connection is being closed.
- assertEquals(1, logCaptor.getLogs().stream().filter(str -> str.contains("Considering new connection on")).count());
-
- // assert sanity after connection replacement
- final Vertex v = client.submit("1",
- RequestOptions.build().overrideRequestId(settings.SINGLE_VERTEX_REQUEST_ID).create())
- .one().getVertex();
- assertNotNull(v);
- }
-
- /**
- * Tests the scenario when client intentionally closes the connection. In this case, the
- * connection should not be recycled.
- */
- @Test
- public void shouldNotCreateReplacementConnectionWhenClientClosesConnection() throws ExecutionException, InterruptedException {
- final Cluster cluster = Cluster.build("localhost").port(settings.PORT)
- .minConnectionPoolSize(1)
- .maxConnectionPoolSize(1)
- .serializer(Serializers.GRAPHSON_V2)
- .create();
- final Client.ClusteredClient client = cluster.connect();
-
- // Initialize the client preemptively
- client.init();
-
- // Clearing logCaptor before attempting to close the connection is in response to an issue where this test can
- // be polluted by logs from a previous test when running on slow hardware.
- logCaptor.clearLogs();
-
- // assert number of connections opened
- final ConnectionPool channelPool = client.hostConnectionPools.values().stream().findFirst().get();
- assertEquals(1, channelPool.getConnectionIDs().size());
-
- // close the connection pool in an authentic manner
- channelPool.closeAsync().get();
-
- // wait for channel closure callback to trigger
- Thread.sleep(2000);
-
- assertEquals("OnClose callback should be called but only once", 1,
- logCaptor.getLogs().stream().filter(str -> str.contains("OnChannelClose callback called for channel")).count());
-
- assertEquals("No new connection creation should be started", 0,
- logCaptor.getLogs().stream().filter(str -> str.contains("Considering new connection on")).count());
- }
-
- /**
- * (TINKERPOP-2814) Tests to make sure that the SSL handshake is now capped by connectionSetupTimeoutMillis and not
- * the default Netty SSL handshake timeout of 10,000ms.
- */
- @Test
- public void shouldAttemptHandshakeForLongerThanDefaultNettySslHandshakeTimeout() {
- final Cluster cluster = Cluster.build("localhost").port(settings.PORT)
- .minConnectionPoolSize(1)
- .maxConnectionPoolSize(1)
- .connectionSetupTimeoutMillis(20000) // needs to be larger than 10000ms.
- .enableSsl(true)
- .create();
-
- final Client.ClusteredClient client = cluster.connect();
- final long start = System.currentTimeMillis();
-
- Exception caught = null;
- try {
- client.submit("1");
- } catch (Exception e) {
- caught = e;
- } finally {
- // Test against 15000ms which should give a big enough buffer to avoid timing issues.
- assertTrue(System.currentTimeMillis() - start > 15000);
- assertTrue(caught != null);
- assertTrue(caught instanceof NoHostAvailableException);
- assertTrue(logCaptor.getLogs().stream().anyMatch(str -> str.contains("SSL handshake not completed")));
- }
-
- cluster.close();
- }
-
- /**
- * Tests to make sure that the correct error message is logged when a non-SSL connection attempt times out.
- */
- @Test
- public void shouldPrintCorrectErrorForRegularWebSocketHandshakeTimeout() throws InterruptedException {
- final Cluster cluster = Cluster.build("localhost").port(settings.PORT)
- .minConnectionPoolSize(1)
- .maxConnectionPoolSize(1)
- .connectionSetupTimeoutMillis(120)
- .create();
-
- final Client.ClusteredClient client = cluster.connect();
-
- Exception caught = null;
- try {
- client.submit("1");
- } catch (Exception e) {
- caught = e;
- } finally {
- assertTrue(caught != null);
- assertTrue(caught instanceof NoHostAvailableException);
- Thread.sleep(150);
- assertTrue(logCaptor.getLogs().stream().anyMatch(str -> str.contains("WebSocket handshake not completed")));
- }
-
- cluster.close();
- }
-
- /**
- * Tests that if a server throttles new connections (doesn't allow new connections to be made) then all requests
- * will run and complete on the connections that are already open.
- */
- @Test
- public void shouldContinueRunningRemainingConnectionsIfServerThrottlesNewConnections() throws ExecutionException, InterruptedException, TimeoutException {
- final Cluster cluster = Cluster.build("localhost").port(settings.PORT)
- .minConnectionPoolSize(1)
- .maxConnectionPoolSize(5)
- .maxWaitForConnection(15000) // large value ensures that request will eventually find a connection.
- .connectionSetupTimeoutMillis(1000)
- .minInProcessPerConnection(0)
- .maxInProcessPerConnection(1)
- .minSimultaneousUsagePerConnection(0)
- .maxSimultaneousUsagePerConnection(1)
- .serializer(Serializers.GRAPHSON_V2)
- .create();
-
- final Client.ClusteredClient client = cluster.connect();
-
- final List<CompletableFuture<ResultSet>> results = new ArrayList<CompletableFuture<ResultSet>>();
- for (int i = 0; i < 5; i++) {
- results.add(client.submitAsync("500"));
- }
-
- for (CompletableFuture<ResultSet> result : results) {
- assertNotNull(result.get(60000, TimeUnit.MILLISECONDS).one().getVertex());
- }
-
- cluster.close();
- }
-
- /**
- * Tests that if a server throttles new connections (doesn't allow new connections to be made) then any request
- * that can't find a connection within its maxWaitForConnection will return an informative exception regarding
- * the inability to open new connections.
- */
- @Test
- public void shouldReturnCorrectExceptionIfServerThrottlesNewConnectionsAndMaxWaitExceeded() {
- final Cluster cluster = Cluster.build("localhost").port(settings.PORT)
- .minConnectionPoolSize(1)
- .maxConnectionPoolSize(5)
- .maxWaitForConnection(250) // small value ensures that requests will return TimeoutException.
- .connectionSetupTimeoutMillis(100)
- .minInProcessPerConnection(0)
- .maxInProcessPerConnection(1)
- .minSimultaneousUsagePerConnection(0)
- .maxSimultaneousUsagePerConnection(1)
- .serializer(Serializers.GRAPHSON_V2)
- .create();
-
- final Client.ClusteredClient client = cluster.connect();
-
- for (int i = 0; i < 5; i++) {
- try {
- client.submitAsync("3000");
- } catch (Exception e) {
- final Throwable rootCause = ExceptionHelper.getRootCause(e);
- assertTrue(rootCause instanceof TimeoutException);
- assertTrue(rootCause.getMessage().contains("WebSocket handshake not completed"));
- }
- }
-
- cluster.close();
- }
-
- /**
- * Tests that the client continues to work if the server temporarily goes down between two requests.
- */
- @Test
- public void shouldContinueRunningIfServerGoesDownTemporarily() throws InterruptedException {
- final Cluster cluster = Cluster.build("localhost").port(settings.PORT)
- .minConnectionPoolSize(1)
- .serializer(Serializers.GRAPHSON_V2)
- .create();
-
- final Client.ClusteredClient client = cluster.connect();
- final Object lock = new Object();
-
- final ScheduledExecutorService scheduledPool = Executors.newScheduledThreadPool(1);
- scheduledPool.schedule(() -> {
- try {
- server.stopSync();
- server = new SimpleSocketServer(settings);
- server.start(new TestWSGremlinInitializer(settings));
- synchronized (lock) {
- lock.notify();
- }
- } catch (InterruptedException ignored) {
- // Ignored.
- }
- }, 1000, TimeUnit.MILLISECONDS);
-
- synchronized (lock) {
- assertNotNull(client.submit("1").one().getVertex());
- lock.wait(30000);
- }
-
- assertNotNull(client.submit("1").one().getVertex());
-
- cluster.close();
- }
-
- /**
- * Tests that if the host is unavailable then the client will return an exception that contains information about
- * the status of the host.
- */
- @Test
- public void shouldReturnCorrectExceptionIfServerGoesDown() throws InterruptedException {
- final Cluster cluster = Cluster.build("localhost").port(settings.PORT)
- .minConnectionPoolSize(1)
- .maxWaitForConnection(500)
- .connectionSetupTimeoutMillis(100)
- .serializer(Serializers.GRAPHSON_V2)
- .create();
-
- final Client.ClusteredClient client = cluster.connect();
- client.submit("1");
-
- server.stopSync();
-
- try {
- client.submit("1");
- } catch (Exception e) {
- final Throwable rootCause = ExceptionHelper.getRootCause(e);
- assertTrue(rootCause instanceof TimeoutException);
- assertTrue(rootCause.getMessage().contains("Connection refused"));
- }
-
- cluster.close();
- }
-
- /**
- * Tests that client is correctly sending all overridable per request settings (requestId, batchSize,
- * evaluationTimeout, and userAgent) to the server.
- */
- @Test
- public void shouldSendPerRequestSettingsToServer() {
- final Cluster cluster = Cluster.build("localhost").port(settings.PORT)
- .minConnectionPoolSize(1)
- .maxConnectionPoolSize(1)
- .serializer(Serializers.GRAPHSON_V2)
- .create();
- final Client.ClusteredClient client = cluster.connect();
-
- // trigger the testing server to return captured request settings
- String response = client.submit("1", RequestOptions.build()
- .overrideRequestId(settings.PER_REQUEST_SETTINGS_REQUEST_ID)
- .timeout(1234).userAgent("helloWorld").batchSize(12)
- .materializeProperties("tokens").create()).one().getString();
-
- String expectedResponse = String.format("requestId=%s evaluationTimeout=%d, batchSize=%d, userAgent=%s, materializeProperties=%s",
- settings.PER_REQUEST_SETTINGS_REQUEST_ID, 1234, 12, "helloWorld", "tokens");
- assertEquals(expectedResponse, response);
- }
-}
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/auth/Sigv4Test.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/auth/Sigv4Test.java
new file mode 100644
index 0000000..afcf4a4
--- /dev/null
+++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/auth/Sigv4Test.java
@@ -0,0 +1,127 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.tinkerpop.gremlin.driver.auth;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import org.apache.tinkerpop.gremlin.driver.HttpRequest;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
+import software.amazon.awssdk.auth.credentials.AwsSessionCredentials;
+import software.amazon.awssdk.http.auth.aws.internal.signer.util.SignerConstant;
+
+import static org.hamcrest.CoreMatchers.allOf;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.startsWith;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThrows;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.when;
+import static software.amazon.awssdk.http.auth.aws.internal.signer.util.SignerConstant.AUTHORIZATION;
+import static software.amazon.awssdk.http.auth.aws.internal.signer.util.SignerConstant.X_AMZ_CONTENT_SHA256;
+import static software.amazon.awssdk.http.auth.aws.internal.signer.util.SignerConstant.X_AMZ_DATE;
+import static software.amazon.awssdk.http.auth.aws.internal.signer.util.SignerConstant.X_AMZ_SECURITY_TOKEN;
+
+public class Sigv4Test {
+ private static final String REGION = "us-west-2";
+ private static final String SERVICE_NAME = "service-name";
+ private static final byte[] REQUEST_BODY = "{\"gremlin\":\"2-1\"}".getBytes(StandardCharsets.UTF_8);
+ private static final String HOST = "localhost";
+ private static final String URI_WITH_QUERY_PARAMS = "http://" + HOST + ":8182?a=1&b=2";
+ private static final String KEY = "foo";
+ private static final String SECRET = "bar";
+ @Rule
+ public MockitoRule mockitoRule = MockitoJUnit.rule();
+ @Mock
+ private AwsCredentialsProvider credentialsProvider;
+ private Sigv4 sigv4;
+
+ @Before
+ public void setup() {
+ sigv4 = new Sigv4(REGION, credentialsProvider, SERVICE_NAME);
+ }
+
+ @Test
+ public void shouldAddSignedHeaders() throws Exception {
+ when(credentialsProvider.resolveCredentials()).thenReturn(AwsBasicCredentials.create(KEY, SECRET));
+ HttpRequest httpRequest = createRequest();
+ sigv4.apply(httpRequest);
+ validateExpectedHeaders(httpRequest);
+ }
+
+ @Test
+ public void shouldAddSignedHeadersAndSessionToken() throws Exception {
+ String sessionToken = "foobarz";
+ when(credentialsProvider.resolveCredentials()).thenReturn(AwsSessionCredentials.create(KEY, SECRET, sessionToken));
+ HttpRequest httpRequest = createRequest();
+ sigv4.apply(httpRequest);
+ validateExpectedHeaders(httpRequest);
+ assertEquals(sessionToken, httpRequest.headers().get(X_AMZ_SECURITY_TOKEN));
+ }
+
+ @Test
+ public void shouldThrowIfRequestNonByteArray() {
+ Auth.AuthenticationException ex = assertThrows(Auth.AuthenticationException.class,
+ () -> sigv4.apply(new HttpRequest(new HashMap<>(), "not byte array", new URI(URI_WITH_QUERY_PARAMS))));
+ assertTrue(ex.getMessage().contains("Expected byte[] in HttpRequest body"));
+ }
+
+ @Test
+ public void shouldThrowIfNoRequestMethod() {
+ Auth.AuthenticationException ex = assertThrows(Auth.AuthenticationException.class,
+ () -> sigv4.apply(new HttpRequest(new HashMap<>(), REQUEST_BODY, new URI(URI_WITH_QUERY_PARAMS), null)));
+ assertTrue(ex.getMessage().contains("The request method must not be null"));
+ }
+
+ @Test
+ public void shouldThrowIfNoRequestURI() {
+ Auth.AuthenticationException ex = assertThrows(Auth.AuthenticationException.class,
+ () -> sigv4.apply(new HttpRequest(new HashMap<>(), REQUEST_BODY, null)));
+ assertTrue(ex.getMessage().contains("The request URI must not be null"));
+ }
+
+ private HttpRequest createRequest() throws URISyntaxException {
+ HttpRequest httpRequest = new HttpRequest(new HashMap<>(), REQUEST_BODY, new URI(URI_WITH_QUERY_PARAMS));
+ httpRequest.headers().put("Content-Type", "application/json");
+ httpRequest.headers().put("Host", "this-should-be-ignored-for-signed-host-header");
+ return httpRequest;
+ }
+
+ private void validateExpectedHeaders(HttpRequest httpRequest) {
+ assertEquals(HOST, httpRequest.headers().get(SignerConstant.HOST));
+ assertNotNull(httpRequest.headers().get(X_AMZ_DATE));
+ assertNotNull(httpRequest.headers().get(X_AMZ_CONTENT_SHA256));
+ assertThat(httpRequest.headers().get(AUTHORIZATION),
+ allOf(startsWith("AWS4-HMAC-SHA256 Credential=" + KEY),
+ containsString("/" + REGION + "/service-name/aws4_request"),
+ containsString("Signature=")));
+ }
+
+}
\ No newline at end of file
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/handler/HttpContentDecompressionHandlerTest.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/handler/HttpContentDecompressionHandlerTest.java
new file mode 100644
index 0000000..61b29a3
--- /dev/null
+++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/handler/HttpContentDecompressionHandlerTest.java
@@ -0,0 +1,222 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.driver.handler;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.embedded.EmbeddedChannel;
+import io.netty.handler.codec.http.DefaultFullHttpResponse;
+import io.netty.handler.codec.http.DefaultHttpContent;
+import io.netty.handler.codec.http.DefaultHttpHeaders;
+import io.netty.handler.codec.http.DefaultHttpResponse;
+import io.netty.handler.codec.http.FullHttpResponse;
+import io.netty.handler.codec.http.HttpContent;
+import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.HttpResponse;
+import io.netty.util.CharsetUtil;
+import org.junit.Test;
+
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Random;
+import java.util.zip.DataFormatException;
+import java.util.zip.Deflater;
+
+import static io.netty.handler.codec.http.HttpHeaderNames.CONTENT_ENCODING;
+import static io.netty.handler.codec.http.HttpHeaderValues.DEFLATE;
+import static io.netty.handler.codec.http.HttpResponseStatus.OK;
+import static io.netty.handler.codec.http.HttpVersion.HTTP_1_1;
+import static io.netty.handler.codec.http.LastHttpContent.EMPTY_LAST_CONTENT;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+public class HttpContentDecompressionHandlerTest {
+ @Test
+ public void shouldNotDecompressIfResponseDoesNotContainContentEncoding() {
+ final HttpContentDecompressionHandler decompressionHandler = new HttpContentDecompressionHandler();
+ final EmbeddedChannel testChannel = new EmbeddedChannel(decompressionHandler);
+ final ByteBuf content = testChannel.alloc().buffer();
+ content.writeCharSequence("abc", CharsetUtil.UTF_8);
+ final HttpHeaders headers = new DefaultHttpHeaders();
+ final FullHttpResponse response = new DefaultFullHttpResponse(HTTP_1_1, OK, content, headers, headers);
+
+ testChannel.writeInbound(response);
+
+ final FullHttpResponse inbound = testChannel.readInbound();
+ assertEquals("abc", inbound.content().toString(CharsetUtil.UTF_8));
+ }
+
+ @Test
+ public void shouldDecompressIfResponseDoesContainContentEncoding() {
+ final HttpContentDecompressionHandler decompressionHandler = new HttpContentDecompressionHandler();
+ final EmbeddedChannel testChannel = new EmbeddedChannel(decompressionHandler);
+ final ByteBuf content = testChannel.alloc().buffer();
+ content.writeBytes(new byte[] {0x78, (byte) 0x9c, 0x4b, 0x4c, 0x4c, 0x4, 0x0, 0x2, 0x49, 0x1, 0x24});
+ final HttpHeaders headers = new DefaultHttpHeaders().add(CONTENT_ENCODING, DEFLATE);
+ final FullHttpResponse response = new DefaultFullHttpResponse(HTTP_1_1, OK, content, headers, new DefaultHttpHeaders());
+
+ testChannel.writeInbound(response);
+
+ final ByteBuf incomingContent = ((FullHttpResponse) testChannel.readInbound()).content();
+ assertTrue("aaa".contentEquals(incomingContent.readCharSequence(incomingContent.readableBytes(), CharsetUtil.UTF_8)));
+ }
+
+ @Test
+ public void shouldDecompressLargeChunk() throws Exception {
+ final int largeArraySize = 64 * 1024 * 1024;
+ final int compressedSize = 65239; // pre-calculated compressed size of test data.
+ final byte[] largeArray = new byte[largeArraySize];
+ Arrays.fill(largeArray, (byte) 0x65);
+
+ final Deflater compressor = new Deflater();
+ compressor.setInput(largeArray);
+ compressor.finish();
+ final byte[] compressedArray = new byte[compressedSize];
+ compressor.deflate(compressedArray, 0, compressedArray.length, Deflater.FULL_FLUSH);
+
+ final HttpContentDecompressionHandler decompressionHandler = new HttpContentDecompressionHandler();
+ final EmbeddedChannel testChannel = new EmbeddedChannel(decompressionHandler);
+ final HttpHeaders headers = new DefaultHttpHeaders().add(CONTENT_ENCODING, DEFLATE);
+ final FullHttpResponse inbound = new DefaultFullHttpResponse(
+ HTTP_1_1, OK, Unpooled.wrappedBuffer(compressedArray, 0, compressedArray.length), headers, new DefaultHttpHeaders());
+
+ testChannel.writeInbound(inbound);
+
+ final FullHttpResponse response = testChannel.readInbound();
+ final byte[] contentBytes = new byte[response.content().readableBytes()];
+ response.content().readBytes(contentBytes);
+ response.release();
+
+ assertArrayEquals(largeArray, contentBytes);
+ }
+
+ @Test
+ public void shouldDecompressContentInMultipleChunks() throws Exception {
+ final HttpContentDecompressionHandler decompressionHandler = new HttpContentDecompressionHandler();
+ final EmbeddedChannel testChannel = new EmbeddedChannel(decompressionHandler);
+
+ final HttpHeaders headers = new DefaultHttpHeaders().add(CONTENT_ENCODING, DEFLATE);
+ final HttpResponse response = new DefaultHttpResponse(HTTP_1_1, OK, headers);
+
+ final Deflater compressor = new Deflater();
+ final List<byte[]> decompressedChunks = new ArrayList<>();
+
+ int len;
+ final byte[] compressionBuffer = new byte[100];
+ compressor.setInput("aaa".getBytes(StandardCharsets.UTF_8));
+ len = compressor.deflate(compressionBuffer, 0, compressionBuffer.length, Deflater.SYNC_FLUSH);
+ decompressedChunks.add(Arrays.copyOfRange(compressionBuffer, 0, len));
+
+ compressor.setInput("bbb".getBytes(StandardCharsets.UTF_8));
+ len = compressor.deflate(compressionBuffer, 0, compressionBuffer.length, Deflater.SYNC_FLUSH);
+ decompressedChunks.add(Arrays.copyOfRange(compressionBuffer, 0, len));
+
+ compressor.setInput("ccc".getBytes(StandardCharsets.UTF_8));
+ len = compressor.deflate(compressionBuffer, 0, compressionBuffer.length, Deflater.SYNC_FLUSH);
+ decompressedChunks.add(Arrays.copyOfRange(compressionBuffer, 0, len));
+ compressor.reset();
+
+ testChannel.writeInbound(response);
+ for (int i = 0; i < 3; i++) {
+ byte[] chunk = decompressedChunks.get(i);
+ testChannel.writeInbound(new DefaultHttpContent(Unpooled.wrappedBuffer(chunk, 0, chunk.length)));
+ }
+ testChannel.writeInbound(EMPTY_LAST_CONTENT);
+
+ assertEquals(5, testChannel.inboundMessages().size());
+
+ testChannel.readInbound(); // Discard beginning HttpResponse.
+
+ final ByteBuf firstContent = testChannel.<HttpContent>readInbound().content();
+ assertTrue("aaa".contentEquals(firstContent.readCharSequence(firstContent.readableBytes(), CharsetUtil.UTF_8)));
+
+ final ByteBuf secondContent = testChannel.<HttpContent>readInbound().content();
+ assertTrue("bbb".contentEquals(secondContent.readCharSequence(secondContent.readableBytes(), CharsetUtil.UTF_8)));
+
+ final ByteBuf thirdContent = testChannel.<HttpContent>readInbound().content();
+ assertTrue("ccc".contentEquals(thirdContent.readCharSequence(thirdContent.readableBytes(), CharsetUtil.UTF_8)));
+ }
+
+ @Test
+ public void shouldHandleEmptyFrameDecompression() throws Exception {
+ final Deflater compressor = new Deflater();
+ compressor.setInput(new byte[0]);
+ compressor.finish();
+ final byte[] compressedArray = new byte[8]; // length of when zlib encodes empty buffer.
+ compressor.deflate(compressedArray);
+
+ final HttpContentDecompressionHandler decompressionHandler = new HttpContentDecompressionHandler();
+ final EmbeddedChannel testChannel = new EmbeddedChannel(decompressionHandler);
+ final HttpHeaders headers = new DefaultHttpHeaders().add(CONTENT_ENCODING, DEFLATE);
+ final FullHttpResponse in = new DefaultFullHttpResponse(HTTP_1_1, OK, Unpooled.wrappedBuffer(compressedArray), headers, new DefaultHttpHeaders());
+
+ testChannel.writeInbound(in);
+ final FullHttpResponse result = testChannel.readInbound();
+ assertEquals(0, result.content().readableBytes());
+ }
+
+ @Test
+ public void shouldFireExceptionWhenContentIncorrectlyCompressed() {
+ final HttpContentDecompressionHandler decompressionHandler = new HttpContentDecompressionHandler();
+ final EmbeddedChannel testChannel = new EmbeddedChannel(decompressionHandler);
+ final ByteBuf content = testChannel.alloc().buffer();
+ content.writeCharSequence("abc", CharsetUtil.UTF_8);
+ final HttpHeaders headers = new DefaultHttpHeaders().add(CONTENT_ENCODING, DEFLATE);
+ final FullHttpResponse response = new DefaultFullHttpResponse(HTTP_1_1, OK, content, headers, headers);
+
+ try {
+ testChannel.writeInbound(response);
+ fail("Expected exception.");
+ } catch (Exception e) {
+ assertTrue(e instanceof DataFormatException);
+ }
+ }
+
+ @Test
+ public void shouldHandleUncompressedBinary() throws Exception {
+ final int arraySize = 128;
+ final byte[] largeArray = new byte[arraySize];
+ new Random().nextBytes(largeArray);
+
+ final Deflater compressor = new Deflater();
+ compressor.setInput(largeArray);
+ compressor.finish();
+ final byte[] compressedArray = new byte[arraySize + 50]; // Added buffer since binary probably won't compress.
+ final int len = compressor.deflate(compressedArray, 0, compressedArray.length, Deflater.FULL_FLUSH);
+
+ final HttpContentDecompressionHandler decompressionHandler = new HttpContentDecompressionHandler();
+ final EmbeddedChannel testChannel = new EmbeddedChannel(decompressionHandler);
+ final HttpHeaders headers = new DefaultHttpHeaders().add(CONTENT_ENCODING, DEFLATE);
+ final FullHttpResponse inbound = new DefaultFullHttpResponse(
+ HTTP_1_1, OK, Unpooled.wrappedBuffer(compressedArray, 0, len), headers, new DefaultHttpHeaders());
+
+ testChannel.writeInbound(inbound);
+
+ final FullHttpResponse response = testChannel.readInbound();
+ final byte[] contentBytes = new byte[response.content().readableBytes()];
+ response.content().readBytes(contentBytes);
+ response.release();
+
+ assertArrayEquals(largeArray, contentBytes);
+ }
+}
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/handler/HttpGremlinResponseStreamDecoderTest.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/handler/HttpGremlinResponseStreamDecoderTest.java
new file mode 100644
index 0000000..caa91c3
--- /dev/null
+++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/handler/HttpGremlinResponseStreamDecoderTest.java
@@ -0,0 +1,137 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.driver.handler;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.embedded.EmbeddedChannel;
+import io.netty.handler.codec.TooLongFrameException;
+import io.netty.handler.codec.http.DefaultFullHttpResponse;
+import io.netty.handler.codec.http.DefaultHttpHeaders;
+import io.netty.handler.codec.http.FullHttpResponse;
+import io.netty.handler.codec.http.HttpObjectAggregator;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.handler.codec.http.HttpServerCodec;
+import io.netty.handler.codec.http.HttpVersion;
+import java.util.Collections;
+
+import io.netty.util.AttributeKey;
+import org.apache.commons.lang3.RandomStringUtils;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.util.ser.SerializationException;
+import org.apache.tinkerpop.gremlin.util.ser.Serializers;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+public class HttpGremlinResponseStreamDecoderTest {
+
+ @Test
+ public void shouldSucceedIfResponseSizeUnderMaxResponseContentLength() throws SerializationException {
+ final String content = "this response is smaller than the max allowed";
+ final FullHttpResponse httpResponse = createResponse(content);
+ final EmbeddedChannel testChannel = initializeChannel(httpResponse.content().readableBytes() + 1);
+
+ testChannel.writeInbound(httpResponse);
+ final ResponseMessage inbound = testChannel.readInbound();
+ assertEquals(content, inbound.getResult().getData().get(0));
+ }
+
+ @Test
+ public void shouldSucceedIfResponseSizeEqualToMaxResponseContentLength() throws SerializationException {
+ final String content = "this response is equal to the max allowed";
+ final FullHttpResponse httpResponse = createResponse(content);
+ final EmbeddedChannel testChannel = initializeChannel(httpResponse.content().readableBytes());
+
+ testChannel.writeInbound(httpResponse);
+ final ResponseMessage inbound = testChannel.readInbound();
+ assertEquals(content, inbound.getResult().getData().get(0));
+ }
+
+ @Test
+ public void shouldSucceedIfMaxResponseContentLengthZero() throws SerializationException {
+ final String largeResponse = RandomStringUtils.random(3000);
+ final FullHttpResponse httpResponse = createResponse(largeResponse);
+ final EmbeddedChannel testChannel = initializeChannel(0);
+
+ testChannel.writeInbound(httpResponse);
+ final ResponseMessage inbound = testChannel.readInbound();
+ assertEquals(largeResponse, inbound.getResult().getData().get(0));
+ }
+
+ @Test
+ public void shouldThrowIfResponseSizeLargerThanMaxResponseContentLength() throws SerializationException {
+ final FullHttpResponse httpResponse = createResponse("this response is larger than the max allowed");
+ final EmbeddedChannel testChannel = initializeChannel(httpResponse.content().readableBytes() - 1);
+
+ try {
+ testChannel.writeInbound(httpResponse);
+ fail("Expected TooLongFrameException");
+ } catch (TooLongFrameException e) {
+ assertEquals("Response exceeded 60 bytes.", e.getMessage());
+ }
+ }
+
+ @Test
+ public void shouldSetBulkedFlagCtxValueWithEachResponse() throws SerializationException {
+ final EmbeddedChannel testChannel = initializeChannel(Integer.MAX_VALUE);
+
+ final FullHttpResponse httpResponse1 = createBulkedResponse(true);
+ testChannel.writeInbound(httpResponse1);
+ final boolean bulked1 = (boolean) testChannel.pipeline().channel().attr(AttributeKey.valueOf("isBulked")).get();
+ assertTrue(bulked1);
+
+ final FullHttpResponse httpResponse2 = createBulkedResponse(false);
+ testChannel.writeInbound(httpResponse2);
+ final boolean bulked2 = (boolean) testChannel.pipeline().channel().attr(AttributeKey.valueOf("isBulked")).get();
+ assertFalse(bulked2);
+
+ final FullHttpResponse httpResponse3 = createBulkedResponse(true);
+ testChannel.writeInbound(httpResponse3);
+ final boolean bulked3 = (boolean) testChannel.pipeline().channel().attr(AttributeKey.valueOf("isBulked")).get();
+ assertTrue(bulked3);
+
+ final FullHttpResponse httpResponse4 = createBulkedResponse(false);
+ testChannel.writeInbound(httpResponse4);
+ final boolean bulked4 = (boolean) testChannel.pipeline().channel().attr(AttributeKey.valueOf("isBulked")).get();
+ assertFalse(bulked4);
+ }
+
+ private FullHttpResponse createResponse(String content) throws SerializationException {
+ final ResponseMessage response = ResponseMessage.build().code(HttpResponseStatus.OK).result(Collections.singletonList(content)).create();
+ final ByteBuf buffer = Serializers.GRAPHBINARY_V4.simpleInstance().serializeResponseAsBinary(response, ByteBufAllocator.DEFAULT);
+ return new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, HttpResponseStatus.OK, buffer, new DefaultHttpHeaders(), new DefaultHttpHeaders());
+ }
+
+ private FullHttpResponse createBulkedResponse(final boolean bulkedFlag) throws SerializationException {
+ final ResponseMessage response = ResponseMessage.build().code(HttpResponseStatus.OK).bulked(bulkedFlag).result(Collections.singletonList("test bulked")).create();
+ final ByteBuf buffer = Serializers.GRAPHBINARY_V4.simpleInstance().serializeResponseAsBinary(response, ByteBufAllocator.DEFAULT);
+ return new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, HttpResponseStatus.OK, buffer, new DefaultHttpHeaders(), new DefaultHttpHeaders());
+ }
+
+ private EmbeddedChannel initializeChannel(final long maxResponseContentLength) {
+ final HttpGremlinResponseStreamDecoder decoder = new HttpGremlinResponseStreamDecoder(Serializers.GRAPHBINARY_V4.simpleInstance(), maxResponseContentLength);
+ final EmbeddedChannel testChannel = new EmbeddedChannel(new HttpServerCodec(), new HttpObjectAggregator(Integer.MAX_VALUE), decoder);
+ return testChannel;
+ }
+
+}
\ No newline at end of file
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/handler/IdleConnectionHandlerTest.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/handler/IdleConnectionHandlerTest.java
new file mode 100644
index 0000000..f59f4ad
--- /dev/null
+++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/handler/IdleConnectionHandlerTest.java
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.tinkerpop.gremlin.driver.handler;
+
+import io.netty.channel.embedded.EmbeddedChannel;
+import io.netty.handler.timeout.IdleStateEvent;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class IdleConnectionHandlerTest {
+ private EmbeddedChannel testChannel;
+
+ @Before
+ public void setup() {
+ testChannel = new EmbeddedChannel(new IdleConnectionHandler());
+ }
+
+ @After
+ public void teardown() {
+ // if any exceptions happened, throw them otherwise the test will only silently fail
+ testChannel.checkException();
+ }
+
+
+ @Test
+ public void userEventTriggered_setsIdleStateEventAttribute() {
+ testChannel.pipeline().fireUserEventTriggered(IdleStateEvent.WRITER_IDLE_STATE_EVENT);
+ assertTrue(testChannel.hasAttr(IdleConnectionHandler.IDLE_STATE_EVENT));
+ }
+
+ @Test
+ public void userEventTriggered_notIdleStateEvent_doesNotSetAttribute() {
+ testChannel.pipeline().fireUserEventTriggered("some other event");
+ assertFalse(testChannel.hasAttr(IdleConnectionHandler.IDLE_STATE_EVENT));
+ }
+}
\ No newline at end of file
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteConnectionTest.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteConnectionTest.java
index be58789..5d9c7a6 100644
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteConnectionTest.java
+++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteConnectionTest.java
@@ -24,8 +24,6 @@
import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
import org.junit.Test;
-import java.util.UUID;
-
import static org.apache.tinkerpop.gremlin.driver.RequestOptions.getRequestOptions;
import static org.junit.Assert.assertEquals;
@@ -37,19 +35,15 @@
@Test
public void shouldBuildRequestOptions() {
- final UUID requestId = UUID.fromString("34a9f45f-8854-4d33-8b40-92a8171ee495");
final RequestOptions options = getRequestOptions(
g.with("x").
with("y", 100).
with(Tokens.ARGS_BATCH_SIZE, 1000).
- with(Tokens.REQUEST_ID, requestId).
with(Tokens.ARGS_EVAL_TIMEOUT, 100000L).
with(Tokens.ARGS_USER_AGENT, "test").
- V().asAdmin().getBytecode());
- assertEquals(requestId, options.getOverrideRequestId().get());
+ V().asAdmin().getGremlinLang());
assertEquals(1000, options.getBatchSize().get().intValue());
assertEquals(100000L, options.getTimeout().get().longValue());
- assertEquals("test", options.getUserAgent().get());
}
@Test
@@ -57,7 +51,7 @@
final RequestOptions options = getRequestOptions(
g.with(Tokens.ARGS_BATCH_SIZE, 100).
with(Tokens.ARGS_EVAL_TIMEOUT, 1000).
- V().asAdmin().getBytecode());
+ V().asAdmin().getGremlinLang());
assertEquals(Integer.valueOf(100), options.getBatchSize().get());
assertEquals(Long.valueOf(1000), options.getTimeout().get());
}
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/util/PerformanceTest.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/util/PerformanceTest.java
deleted file mode 100644
index 87bf48b..0000000
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/util/PerformanceTest.java
+++ /dev/null
@@ -1,252 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tinkerpop.gremlin.util;
-
-import org.apache.tinkerpop.gremlin.driver.Client;
-import org.apache.tinkerpop.gremlin.driver.Cluster;
-import org.apache.tinkerpop.gremlin.driver.ResultSet;
-import org.apache.tinkerpop.gremlin.driver.remote.DriverRemoteConnection;
-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.dsl.graph.__;
-import java.time.Duration;
-import java.time.Instant;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-
-import static org.apache.tinkerpop.gremlin.process.traversal.AnonymousTraversalSource.traversal;
-
-/**
- * DO NOT USE - THIS WILL BE DELETED
- * This file is intended for generating Performance test results only.
- * It is not to be used in a production setting.
- * It is being made available as a reference to the test results for
- * anyone that wants see the code used to obtain the performance metrics.
- */
-class PerformanceTest {
- private static final int SAMPLE_SIZE = 55;
- private static final int VALUE_MAP_REPEATS = 500;
- private static final String HOST = "localhost";
- private static final int PORT = 45940;
- private static final int POOLING_CONTENT_LENGTH = 25 * 1024 * 1024;
- private static final int MAX_CONTENT_LENGTH = 300 * 1024 * 1024;
- private static final String REMOTE_TRAVERSAL_SOURCE = "ggrateful";
- private static final int POOLING_TRAVERSAL_SIZE = 10;
- private static final List<Integer> POOL_SIZE = new ArrayList<>();
- private static final List<Integer> POOL_QUERY_COUNT = new ArrayList<>();
- static {
- POOL_SIZE.add(1);
- POOL_SIZE.add(2);
- POOL_SIZE.add(4);
- POOL_SIZE.add(8);
- POOL_QUERY_COUNT.add(50);
- POOL_QUERY_COUNT.add(100);
- POOL_QUERY_COUNT.add(250);
- POOL_QUERY_COUNT.add(500);
- }
-
- private static void main(String[] args) {
- // executePerformanceTests();
- System.exit(0);
- }
-
- private static DriverRemoteConnection getDriverRemoteConnection(final Integer poolSize) {
- return DriverRemoteConnection.using(getCluster(poolSize), REMOTE_TRAVERSAL_SOURCE);
- }
-
- private static Cluster getCluster(final Integer poolSize) {
-
- return (poolSize == null) ? Cluster.build(HOST).port(PORT).maxContentLength(MAX_CONTENT_LENGTH).create()
- :Cluster.build(HOST).port(PORT).maxContentLength(POOLING_CONTENT_LENGTH).maxConnectionPoolSize(poolSize).create();
- }
-
- private static Client getClient(final Cluster cluster) {
- return cluster.connect().alias(REMOTE_TRAVERSAL_SOURCE);
- }
-
- private static GraphTraversalSource getGraphTraversalSource(final DriverRemoteConnection connection) {
- return traversal().withRemote(connection);
- }
-
- private static String[] getArgs(final int repeats) {
- final String[] args = new String[repeats];
- for (int i = 0; i < repeats; i++) {
- args[i] = Integer.toString(i);
- }
- return args;
- }
-
- private static GraphTraversal<?, ?> getProjectTraversal(final GraphTraversalSource g, final int repeats,
- final String[] args) {
- GraphTraversal<?, ?> traversal = g.V().project(args[0], Arrays.copyOfRange(args, 1, repeats));
- for (int i = 0; i < repeats; i++) {
- traversal = traversal.by(__.valueMap(true));
- }
- return traversal;
- }
-
- private static void executePerformanceTests() {
- System.out.println("~~~~~~~ PERFORMANCE TESTS STARTED ~~~~~~~");
- System.out.println("~~~~~~~ RUNNING ONE ITEM PERFORMANCE TEST ~~~~~~~");
- executeGetNextPerformanceTest();
- System.out.println("~~~~~~~ RUNNING LIST PERFORMANCE TEST ~~~~~~~");
- executeGetToListPerformanceTest();
- System.out.println("~~~~~~~ RUNNING THROUGHPUT PERFORMANCE TEST ~~~~~~~");
- POOL_QUERY_COUNT.forEach(queryCount -> {
- POOL_SIZE.forEach(poolSize -> {
- System.out.println("~~~ Pool size " + poolSize + ", query count " + queryCount + " ~~~");
- executeThroughputPerformanceTest(poolSize, queryCount);
- });
- });
- System.out.println("~~~~~~~ PERFORMANCE TESTS COMPLETE ~~~~~~~");
- }
-
- private static void executeThroughputPerformanceTest(final int poolSize, final int queryCount) {
- final DriverRemoteConnection connection = getDriverRemoteConnection(poolSize);
- final GraphTraversalSource g = getGraphTraversalSource(connection);
- final Client client = getClient(getCluster(poolSize));
- final List<Duration> durations = new ArrayList<>();
- for (int i = 0; i < SAMPLE_SIZE; i++) {
- try {
- final List<CompletableFuture<ResultSet>> results = new ArrayList<>();
- final Instant start = Instant.now();
- for (int j = 0; j < queryCount; j++) {
- final String[] args = getArgs(POOLING_TRAVERSAL_SIZE);
- results.add(client.submitAsync(getProjectTraversal(g, POOLING_TRAVERSAL_SIZE, args).asAdmin().getBytecode()));
- }
- for (final CompletableFuture<ResultSet> result : results) {
- result.get().all().get();
- }
- final Instant end = Instant.now();
- durations.add(Duration.between(start, end));
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- final TimingData data = getTimingDataFromDurationList(durations);
- System.out.println(data.toThroughput("Pooling", queryCount));
- }
-
- private static void executeGetNextPerformanceTest() {
- GraphTraversalSource g = getGraphTraversalSource(getDriverRemoteConnection(null));
- final List<Duration> durations = new ArrayList<>();
- for (int i = 0; i < SAMPLE_SIZE; i++) {
- try {
- final String[] args = getArgs(VALUE_MAP_REPEATS);
- final Instant starts = Instant.now();
- // execute and retrieve(timed)
- getProjectTraversal(g, VALUE_MAP_REPEATS, args).next();
- final Instant ends = Instant.now();
- durations.add(Duration.between(starts, ends));
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- final TimingData data = getTimingDataFromDurationList(durations);
- System.out.println(data.toStringMillis("One Item"));
- }
-
- private static void executeGetToListPerformanceTest() {
- final GraphTraversalSource g = getGraphTraversalSource(getDriverRemoteConnection(null));
- final List<Duration> durations = new ArrayList<>();
- for (int i = 0; i < SAMPLE_SIZE; i++) {
- try {
- final String[] args = getArgs(VALUE_MAP_REPEATS);
- final Instant starts = Instant.now();
- // execute and retrieve(timed)
- getProjectTraversal(g, VALUE_MAP_REPEATS, args).toList();
- final Instant ends = Instant.now();
- durations.add(Duration.between(starts, ends));
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- final TimingData data = getTimingDataFromDurationList(durations);
- System.out.println(data.toStringMillis("List"));
- }
-
- private static TimingData getTimingDataFromDurationList(final List<Duration> durations) {
- Collections.sort(durations);
- for (int i = 0; i < 5; i++) {
- durations.remove(durations.size() - 1);
- }
- return new TimingData(
- durations.stream().reduce(Duration.ZERO, Duration::plus).dividedBy(durations.size()),
- durations.get(durations.size() / 2),
- durations.get((int) (durations.size() * 0.90)),
- durations.get((int) (durations.size() * 0.95)),
- durations.get((int) (durations.size() * 0.10)),
- durations.get((int) (durations.size() * 0.05)),
- durations.get(0),
- durations.get(durations.size() - 1)
- );
- }
-}
-
-
-class TimingData {
- final Duration AVG;
- final Duration MEDIAN;
- final Duration PERCENTILE_90;
- final Duration PERCENTILE_95;
- final Duration PERCENTILE_10;
- final Duration PERCENTILE_5;
- final Duration MIN;
- final Duration MAX;
-
- TimingData(Duration avg, Duration median, Duration percentile_90, Duration percentile_95, Duration percentile_10, Duration percentile_5, Duration min,
- Duration max) {
- AVG = avg;
- MEDIAN = median;
- PERCENTILE_90 = percentile_90;
- PERCENTILE_95 = percentile_95;
- PERCENTILE_10 = percentile_10;
- PERCENTILE_5 = percentile_5;
- MIN = min;
- MAX = max;
- }
-
- public String toStringMillis(final String testType) {
- return "Test Type: " + testType + "\n" +
- "\tAVG=" + AVG.toMillis() + "ms \n" +
- "\tPERCENTILE_5=" + PERCENTILE_5.toMillis() + "ms \n" +
- "\tPERCENTILE_10=" + PERCENTILE_10.toMillis() + "ms \n" +
- "\tMEDIAN=" + MEDIAN.toMillis() + "ms \n" +
- "\tPERCENTILE_90=" + PERCENTILE_90.toMillis() + "ms \n" +
- "\tPERCENTILE_95=" + PERCENTILE_95.toMillis() + "ms \n" +
- "\tMIN=" + MIN.toMillis() + "ms \n" +
- "\tMAX=" + MAX.toMillis() + "ms \n";
- }
-
- public String toThroughput(final String testType, int queryCount) {
- return "Test Type: " + testType + "\n" +
- "\tAVG=" + ((1000L * queryCount) / AVG.toMillis()) + " query/s \n" +
- "\tPERCENTILE_5=" + ((1000L * queryCount) / PERCENTILE_95.toMillis()) + " query/s \n" +
- "\tPERCENTILE_10=" + ((1000L * queryCount) / PERCENTILE_90.toMillis()) + " query/s \n" +
- "\tMEDIAN=" + ((1000L * queryCount) / MEDIAN.toMillis()) + " query/s \n" +
- "\tPERCENTILE_90=" + ((1000L * queryCount) / PERCENTILE_10.toMillis()) + " query/s \n" +
- "\tPERCENTILE_95=" + ((1000L * queryCount) / PERCENTILE_5.toMillis()) + " query/s \n" +
- "\tMIN=" + ((1000L * queryCount) / MAX.toMillis()) + " query/s \n" +
- "\tMAX=" + ((1000L * queryCount) / MIN.toMillis()) + " query/s \n";
- }
-}
diff --git a/gremlin-go/README.md b/gremlin-go/README.md
index 3a081b5..43d34bb 100644
--- a/gremlin-go/README.md
+++ b/gremlin-go/README.md
@@ -49,7 +49,7 @@
func main() {
// Creating the connection to the server with default settings.
- driverRemoteConnection, err := gremlingo.NewDriverRemoteConnection("ws://localhost:8182/gremlin")
+ driverRemoteConnection, err := gremlingo.NewDriverRemoteConnection("http://localhost:8182/gremlin")
// Handle error
if err != nil {
fmt.Println(err)
diff --git a/gremlin-go/design.md b/gremlin-go/design.md
index 92db9b4..7e12d16 100644
--- a/gremlin-go/design.md
+++ b/gremlin-go/design.md
@@ -35,24 +35,19 @@
A `Client` represents the entry point to interaction with a Gremlin-supported server. A URL parameter is required for construction, with additional configuration options such as HTTP headers and TLS configuration available.
-The `Client` has two main responsibilities:
-
-* Handles initialization and configuration.
-* Handles creation and allocation (i.e. pooling) of `connection` types.
-
##### Cardinalities
-* One `connectionPool
+* One `gremlinClient`
##### Lifecycle and States
* The `Client` does not track or have any real state.
-* However, `Close()` can be invoked on a `Client` in order to close any instances of `connection` that in its current `connectionPool`.
+* However, `Close()` can be invoked on a `Client` in order to close any instances client resources.
```mermaid
classDiagram
class Client
- Client: pool connectionPool
+ Client: gremlinClient gremlinClient
Client: NewClient(host, configurations) Client
Client: Close()
Client: Submit(traversal) ResultSet
@@ -69,67 +64,15 @@
```
-#### connectionPool
+#### gremlinClient
-A `connectionPool` is a collection of `connection`. The implementation used is a `loadBalancingPool`. It attempts to evenly load balance traversals by delegating it to the least-busy connection in the pool. The `loadBalancingPool` has a maximum connection count, and a `newConnectionTheshold`, where if the currently least-used connection has reached, will trigger the creation of a new `connection` for use. If there are multiple `connection` that sit unused, all but one will be `closed` and removed from the pool.
-
-##### Cardinalities
-
-* Many `connection`
-
-##### Lifecycle and States
-
-* No states, but when `close()` in invoked, all `connection` have their respective `close()` method invoked asynchronously and are removed from the pool.
-
-#### connection
-
-A `connection` represents an individual communication component with a Gremlin Server. A `connection` has the sole responsibility of being the representation of a communication channel to a Gremlin Server, providing the interface for sending requests to said server, as well as holding response `ResultSet` instances to consume responses asynchronously until they are consumed.
-
-##### Cardinalities
-
-* One `protocol`
-* Multiple temporary instances of `ResultSet`
-
-##### Lifecycle and States
-
-* States
- * `initialized`
- * `established`
- * `closed`
- * `closedDueToError`
-* When `close()` is invoked, set the state to `closed` and also invoke `close()` on the `protocol`.
-
-```mermaid
-classDiagram
- class connection
- connection: protocol *protocol
- connection: results "map[string]ResultSet"
- connection: state connectionState
- connection: close()
- connection: createConnection(host)
- connection: write(request) ResultSet
-```
-
-```mermaid
-sequenceDiagram
- Client->>connection(Pool): write()
- connection->>protocol: write(ResultSet)
- protocol-->>connection(Pool): ResultSet
- loop Readloop
- protocol->>protocol: Async population of ResultSet
- end
- connection-->>Client: ResultSet
-
-```
-
-#### protocol
-
-The `protocol` entity handles invoking serialization and deserialization of data, as well as handling the lifecycle of raw data passed to and received from the `transporter` layer. Upon creation, an instance of `protocol` starts a `goroutine` to asynchronously read and populate data into a `ResultSet` that is owned by the parent `connection`.
+The `gremlinClient` entity handles invoking serialization and deserialization of data, as well as handling the lifecycle of raw data passed to and received from the `httpTransporter` layer. Upon sending a request, an instance of `gremlinClient` starts a `goroutine` to asynchronously read and populate data into a `ResultSet`.
##### Cardinalities
* One `transporter`
* One `serializer`
+* One `http.Client`
##### Lifecycle and States
@@ -139,24 +82,26 @@
```mermaid
classDiagram
- class protocol
- protocol: transporter *transporter
- protocol: serializer *serializer
- protocol: close()
- protocol: write(request)
- protocol: readLoop(map[string]ResultSet)
+ class gremlinClient
+ gremlinClient: httpClient *http.Client
+ gremlinClient: serializer *serializer
+ gremlinClient: connSettings *connectionSettings
+ gremlinClient: close()
+ gremlinClient: send(request)
+ gremlinClient: receive(rs ResultSet, msg []byte)
```
```mermaid
sequenceDiagram
- connection->>protocol: write(request)
- protocol->>serializer: serializeMessage(request)
- serializer-->>protocol: bytes
- protocol->>transporter: Write(bytes)
- transporter-->>protocol: response
- protocol->>serializer: deserializeMessage(response)
- serializer-->>protocol: population of ResultSet
- protocol-->>connection: population of ResultSet
+ client->>gremlinClient: send(request)
+ gremlinClient-->>client: ResultSet
+ gremlinClient->>serializer: serializeMessage(request)
+ serializer-->>gremlinClient: bytes
+ gremlinClient->>httpTransporter: Write(bytes)
+ gremlinClient->>httpTransporter: Read()
+ httpTransporter-->>gremlinClient: bytes
+ gremlinClient->>serializer: deserializeMessage(response)
+ gremlinClient-->>gremlinClient: population of ResultSet
```
@@ -180,27 +125,9 @@
serializer: deserializeMessage([]byte) response
```
-#### transporter
+#### httpTransporter
-The `transporter` is an interface that describes the lowest-level methods that are required for sending and receiving requests, which implementing types are ones that are implementations of network protocols. The default implementation used for Gremlin-Go is [Gorilla WebSocket](https://github.com/gorilla/websocket), a Go implementation of the WebSocket protocol.
-
-##### Cardinalities (Gorilla)
-
-* None
-
-##### Lifecycle and States
-
-* The `transporter` interface requires method `close()`, which closes the network protocol depending on its implementation.
-
-```mermaid
-classDiagram
- class transporter
- transporter: Connect()
- transporter: Write([]byte)
- transporter: Read([]byte)
- transporter: Close()
- transporter: IsClosed() bool
-```
+The `httpTransporter` is responsible for sending and receiving bytes to/from the server. It is intended for one `httpTransporter` to be instantiated per http request and response.
#### Result
diff --git a/gremlin-go/docker-compose.yml b/gremlin-go/docker-compose.yml
index 36fafcb..a548c44 100644
--- a/gremlin-go/docker-compose.yml
+++ b/gremlin-go/docker-compose.yml
@@ -35,13 +35,11 @@
- ${HOME}/.m2:/root/.m2
- ${ABS_PROJECT_HOME}/gremlin-test/target:/opt/gremlin-test
healthcheck:
- test: [ "CMD-SHELL", "apk add curl && curl -f http://localhost:45940?gremlin=100-1" ]
+ test: [ "CMD-SHELL", "apk add curl && curl -X POST -d '{\"gremlin\":\"g.inject(1)\"}' http://localhost:45940" ]
interval: 30s
timeout: 10s
retries: 30
start_period: 30s
- depends_on:
- - gremlin-socket-server
gremlin-go-integration-tests:
container_name: gremlin-go-integration-tests
@@ -50,16 +48,13 @@
- .:/go_app
- ../gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features:/gremlin-test
- ../docker/gremlin-test-server:/go_app/gremlin-test-server
- - ../gremlin-tools/gremlin-socket-server/conf:/go_app/gremlin-socket-server/conf/
environment:
- CUCUMBER_FEATURE_FOLDER=/gremlin-test
- - GREMLIN_SERVER_URL=ws://gremlin-server-test:45940/gremlin
- - GREMLIN_SERVER_BASIC_AUTH_URL=wss://gremlin-server-test:45941/gremlin
+ - GREMLIN_SERVER_URL=http://gremlin-server-test:45940/gremlin
+ - GREMLIN_SERVER_BASIC_AUTH_URL=https://gremlin-server-test:45941/gremlin
- RUN_INTEGRATION_TESTS=true
- RUN_INTEGRATION_WITH_ALIAS_TESTS=true
- RUN_BASIC_AUTH_INTEGRATION_TESTS=true
- - GREMLIN_SOCKET_SERVER_URL=ws://gremlin-socket-server-go
- - GREMLIN_SOCKET_SERVER_CONFIG_PATH=/go_app/gremlin-socket-server/conf/test-ws-gremlin.yaml
working_dir: /go_app
command: >
bash -c "go install github.com/gotesttools/gotestfmt/v2/cmd/gotestfmt@latest
@@ -67,9 +62,3 @@
depends_on:
gremlin-server-test:
condition: service_healthy
-
- gremlin-socket-server:
- container_name: gremlin-socket-server-go
- image: tinkerpop/gremlin-socket-server:${GREMLIN_SERVER}
- ports:
- - "45943:45943"
diff --git a/gremlin-go/driver/anonymousTraversal.go b/gremlin-go/driver/anonymousTraversal.go
index 944a8a9..089f33a 100644
--- a/gremlin-go/driver/anonymousTraversal.go
+++ b/gremlin-go/driver/anonymousTraversal.go
@@ -207,7 +207,7 @@
MergeV(args ...interface{}) *GraphTraversal
// Min adds the min step to the GraphTraversal.
Min(args ...interface{}) *GraphTraversal
- // None adds the not step to the GraphTraversal.
+ // None adds the none step to the GraphTraversal.
None(args ...interface{}) *GraphTraversal
// Not adds the not step to the GraphTraversal.
Not(args ...interface{}) *GraphTraversal
diff --git a/gremlin-go/driver/client.go b/gremlin-go/driver/client.go
index c484914..ff625f6 100644
--- a/gremlin-go/driver/client.go
+++ b/gremlin-go/driver/client.go
@@ -27,10 +27,19 @@
"golang.org/x/text/language"
)
+const keepAliveIntervalDefault = 5 * time.Second
+const writeDeadlineDefault = 3 * time.Second
+const connectionTimeoutDefault = 5 * time.Second
+
+// ReadBufferSize and WriteBufferSize specify I/O buffer sizes in bytes. The default is 1MB.
+// If a buffer size is set zero, then the transporter default size is used. The I/O buffer
+// sizes do not limit the size of the messages that can be sent or received.
+const readBufferSizeDefault = 1048576
+const writeBufferSizeDefault = 1048576
+
// ClientSettings is used to modify a Client's settings on initialization.
type ClientSettings struct {
TraversalSource string
- TransporterType TransporterType
LogVerbosity LogVerbosity
Logger Logger
Language language.Tag
@@ -42,34 +51,26 @@
EnableCompression bool
ReadBufferSize int
WriteBufferSize int
- Session string
- // Minimum amount of concurrent active traversals on a connection to trigger creation of a new connection
- NewConnectionThreshold int
// Maximum number of concurrent connections. Default: number of runtime processors
MaximumConcurrentConnections int
- // Initial amount of instantiated connections. Default: 1
- InitialConcurrentConnections int
EnableUserAgentOnConnect bool
}
// Client is used to connect and interact with a Gremlin-supported server.
type Client struct {
- url string
- traversalSource string
- logHandler *logHandler
- transporterType TransporterType
- connections connectionPool
- session string
+ url string
+ traversalSource string
+ logHandler *logHandler
+ connectionSettings *connectionSettings
+ gremlinClient *gremlinClient
}
-// NewClient creates a Client and configures it with the given parameters. During creation of the Client, a connection
-// is created, which establishes a websocket.
+// NewClient creates a Client and configures it with the given parameters.
// Important note: to avoid leaking a connection, always close the Client.
func NewClient(url string, configurations ...func(settings *ClientSettings)) (*Client, error) {
settings := &ClientSettings{
TraversalSource: "g",
- TransporterType: Gorilla,
LogVerbosity: Info,
Logger: &defaultLogger{},
Language: language.English,
@@ -83,9 +84,7 @@
ReadBufferSize: readBufferSizeDefault,
WriteBufferSize: writeBufferSizeDefault,
- NewConnectionThreshold: defaultNewConnectionThreshold,
MaximumConcurrentConnections: runtime.NumCPU(),
- InitialConcurrentConnections: defaultInitialConcurrentConnections,
}
for _, configuration := range configurations {
configuration(settings)
@@ -105,27 +104,14 @@
logHandler := newLogHandler(settings.Logger, settings.LogVerbosity, settings.Language)
- if settings.InitialConcurrentConnections > settings.MaximumConcurrentConnections {
- logHandler.logf(Warning, poolInitialExceedsMaximum, settings.InitialConcurrentConnections,
- settings.MaximumConcurrentConnections, settings.MaximumConcurrentConnections)
- settings.InitialConcurrentConnections = settings.MaximumConcurrentConnections
- }
- pool, err := newLoadBalancingPool(url, logHandler, connSettings, settings.NewConnectionThreshold,
- settings.MaximumConcurrentConnections, settings.InitialConcurrentConnections)
- if err != nil {
- if err != nil {
- logHandler.logf(Error, logErrorGeneric, "NewClient", err.Error())
- }
- return nil, err
- }
+ gc := newGremlinClient(logHandler, url, connSettings)
client := &Client{
- url: url,
- traversalSource: settings.TraversalSource,
- logHandler: logHandler,
- transporterType: settings.TransporterType,
- connections: pool,
- session: settings.Session,
+ url: url,
+ traversalSource: settings.TraversalSource,
+ logHandler: logHandler,
+ connectionSettings: connSettings,
+ gremlinClient: gc,
}
return client, nil
@@ -134,27 +120,19 @@
// Close closes the client via connection.
// This is idempotent due to the underlying close() methods being idempotent as well.
func (client *Client) Close() {
- // If it is a session, call closeSession
- if client.session != "" {
- err := client.closeSession()
- if err != nil {
- client.logHandler.logf(Warning, closeSessionRequestError, client.url, client.session, err.Error())
- }
- client.session = ""
- }
client.logHandler.logf(Info, closeClient, client.url)
- client.connections.close()
+ client.gremlinClient.close()
}
// SubmitWithOptions submits a Gremlin script to the server with specified RequestOptions and returns a ResultSet.
func (client *Client) SubmitWithOptions(traversalString string, requestOptions RequestOptions) (ResultSet, error) {
client.logHandler.logf(Debug, submitStartedString, traversalString)
- request := makeStringRequest(traversalString, client.traversalSource, client.session, requestOptions)
- result, err := client.connections.write(&request)
- if err != nil {
- client.logHandler.logf(Error, logErrorGeneric, "Client.Submit()", err.Error())
- }
- return result, err
+ request := makeStringRequest(traversalString, client.traversalSource, requestOptions)
+
+ // TODO interceptors (ie. auth)
+
+ rs, err := client.gremlinClient.send(&request)
+ return rs, err
}
// Submit submits a Gremlin script to the server and returns a ResultSet. Submit can optionally accept a map of bindings
@@ -171,16 +149,6 @@
// submitBytecode submits Bytecode to the server to execute and returns a ResultSet.
func (client *Client) submitBytecode(bytecode *Bytecode) (ResultSet, error) {
client.logHandler.logf(Debug, submitStartedBytecode, *bytecode)
- request := makeBytecodeRequest(bytecode, client.traversalSource, client.session)
- return client.connections.write(&request)
-}
-
-func (client *Client) closeSession() error {
- message := makeCloseSessionRequest(client.session)
- result, err := client.connections.write(&message)
- if err != nil {
- return err
- }
- _, err = result.All()
- return err
+ request := makeBytecodeRequest(bytecode, client.traversalSource)
+ return client.gremlinClient.send(&request)
}
diff --git a/gremlin-go/driver/client_test.go b/gremlin-go/driver/client_test.go
index 0b2d602..6068f89 100644
--- a/gremlin-go/driver/client_test.go
+++ b/gremlin-go/driver/client_test.go
@@ -21,14 +21,9 @@
import (
"crypto/tls"
- "fmt"
- "log"
- "os"
"testing"
- "github.com/google/uuid"
"github.com/stretchr/testify/assert"
- "gopkg.in/yaml.v3"
)
func TestClient(t *testing.T) {
@@ -72,10 +67,6 @@
assert.NotNil(t, resultSet)
client.Close()
- pool := client.connections.(*loadBalancingPool)
- assert.Equal(t, 1, len(pool.connections))
- assert.True(t, pool.isClosed)
- assert.Equal(t, closed, pool.connections[0].state)
})
t.Run("Test client.Submit()", func(t *testing.T) {
@@ -196,38 +187,6 @@
AssertVertexPropertiesWithProperties(t, result)
})
-
- t.Run("Test sessioned client", func(t *testing.T) {
- skipTestsIfNotEnabled(t, integrationTestSuiteName, testNoAuthEnable)
- client, err := NewClient(testNoAuthUrl,
- func(settings *ClientSettings) {
- settings.TlsConfig = testNoAuthTlsConfig
- settings.AuthInfo = testNoAuthAuthInfo
- settings.TraversalSource = testServerModernGraphAlias
- settings.Session = "sessionID"
- })
- assert.NoError(t, err)
- assert.NotNil(t, client)
- defer client.Close()
-
- resultSet, err := client.Submit("x = 1+1")
- assert.NoError(t, err)
- assert.NotNil(t, resultSet)
-
- result, ok, err := resultSet.One()
- assert.NoError(t, err)
- assert.True(t, ok)
- assert.EqualValues(t, 2, result.Data)
-
- resultSet, err = client.Submit("x+1")
- assert.NoError(t, err)
- assert.NotNil(t, resultSet)
-
- result, ok, err = resultSet.One()
- assert.NoError(t, err)
- assert.True(t, ok)
- assert.EqualValues(t, 3, result.Data)
- })
}
func AssertVertexPropertiesWithProperties(t *testing.T, result *Result) {
@@ -288,202 +247,3 @@
assert.True(t, ok)
assert.Equal(t, 0, len(properties))
}
-
-// Client is used to connect and interact with a Gremlin-supported server.
-type SocketServerSettings struct {
- PORT int `yaml:"PORT"`
- /**
- * Configures which serializer will be used. Ex: "GraphBinaryV1" or "GraphSONV2"
- */
- SERIALIZER string `yaml:"SERIALIZER"`
- /**
- * If a request with this ID comes to the server, the server responds back with a single vertex picked from Modern
- * graph.
- */
- SINGLE_VERTEX_REQUEST_ID uuid.UUID `yaml:"SINGLE_VERTEX_REQUEST_ID"`
- /**
- * If a request with this ID comes to the server, the server responds back with a single vertex picked from Modern
- * graph. After a 2 second delay, server sends a Close WebSocket frame on the same connection.
- */
- SINGLE_VERTEX_DELAYED_CLOSE_CONNECTION_REQUEST_ID uuid.UUID `yaml:"SINGLE_VERTEX_DELAYED_CLOSE_CONNECTION_REQUEST_ID"`
- /**
- * Server waits for 1 second, then responds with a 500 error status code
- */
- FAILED_AFTER_DELAY_REQUEST_ID uuid.UUID `yaml:"FAILED_AFTER_DELAY_REQUEST_ID"`
- /**
- * Server waits for 1 second then responds with a close web socket frame
- */
- CLOSE_CONNECTION_REQUEST_ID uuid.UUID `yaml:"CLOSE_CONNECTION_REQUEST_ID"`
- /**
- * Same as CLOSE_CONNECTION_REQUEST_ID
- */
- CLOSE_CONNECTION_REQUEST_ID_2 uuid.UUID `yaml:"CLOSE_CONNECTION_REQUEST_ID_2"`
- /**
- * If a request with this ID comes to the server, the server responds with the user agent (if any) that was captured
- * during the web socket handshake.
- */
- USER_AGENT_REQUEST_ID uuid.UUID `yaml:"USER_AGENT_REQUEST_ID"`
- /**
- * If a request with this ID comes to the server, the server responds with a string containing all overridden
- * per request settings from the request message. String will be of the form
- * "requestId=19436d9e-f8fc-4b67-8a76-deec60918424 evaluationTimeout=1234, batchSize=12, userAgent=testUserAgent"
- */
- PER_REQUEST_SETTINGS_REQUEST_ID uuid.UUID `yaml:"PER_REQUEST_SETTINGS_REQUEST_ID"`
-}
-
-func FromYaml(path string) *SocketServerSettings {
- socketServerSettings := new(SocketServerSettings)
- f, err := os.ReadFile(path)
- if err != nil {
- log.Fatal(err)
- }
- if err := yaml.Unmarshal(f, socketServerSettings); err != nil {
- log.Fatal(err)
- }
- return socketServerSettings
-}
-
-func TestClientAgainstSocketServer(t *testing.T) {
- // Integration test variables.
- testNoAuthEnable := getEnvOrDefaultBool("RUN_INTEGRATION_TESTS", true)
- settings := FromYaml(getEnvOrDefaultString("GREMLIN_SOCKET_SERVER_CONFIG_PATH", "../../gremlin-tools/gremlin-socket-server/conf/test-ws-gremlin.yaml"))
- testSocketServerUrl := getEnvOrDefaultString("GREMLIN_SOCKET_SERVER_URL", "ws://localhost")
- testSocketServerUrl = fmt.Sprintf("%s:%v/gremlin", testSocketServerUrl, settings.PORT)
-
- /**
- * Note: This test does not demonstrate anything useful other than the ability to connect to and
- * use gremlin-socket-server. Currently, implementing more useful tests are blocked by TINKERPOP-2845.
- * This test can be safely removed once more interesting tests have been added which utilize
- * gremlin-socket-server.
- */
- t.Run("Should get single vertex response from gremlin socket server", func(t *testing.T) {
- skipTestsIfNotEnabled(t, integrationTestSuiteName, testNoAuthEnable)
- client, err := NewClient(testSocketServerUrl)
- assert.Nil(t, err)
- assert.NotNil(t, client)
- defer client.Close()
- resultSet, err := client.SubmitWithOptions("1", new(RequestOptionsBuilder).
- SetRequestId(settings.SINGLE_VERTEX_REQUEST_ID).Create())
- assert.Nil(t, err)
- assert.NotNil(t, resultSet)
- result, ok, err := resultSet.One()
- assert.Nil(t, err)
- assert.True(t, ok)
- assert.NotNil(t, result)
- })
-
- /**
- * Tests that client is correctly sending user agent during web socket handshake by having the server return
- * the captured user agent.
- */
- t.Run("Should include user agent in handshake request", func(t *testing.T) {
- skipTestsIfNotEnabled(t, integrationTestSuiteName, testNoAuthEnable)
- client, err := NewClient(testSocketServerUrl)
- assert.Nil(t, err)
- assert.NotNil(t, client)
- defer client.Close()
-
- resultSet, err := client.SubmitWithOptions("1", new(RequestOptionsBuilder).
- SetRequestId(settings.USER_AGENT_REQUEST_ID).Create())
- assert.Nil(t, err)
- assert.NotNil(t, resultSet)
-
- result, ok, err := resultSet.One()
- assert.Nil(t, err)
- assert.True(t, ok)
- assert.NotNil(t, result)
-
- userAgentResponse := result.GetString()
- assert.Equal(t, userAgent, userAgentResponse)
- })
-
- /**
- * Tests that no user agent (other than the default one provided by gorilla) is sent to server when
- * that behaviour is disabled.
- */
- t.Run("Should not include user agent in handshake request if disabled", func(t *testing.T) {
- skipTestsIfNotEnabled(t, integrationTestSuiteName, testNoAuthEnable)
- client, err := NewClient(testSocketServerUrl,
- func(settings *ClientSettings) {
- settings.EnableUserAgentOnConnect = false
- })
- assert.Nil(t, err)
- assert.NotNil(t, client)
- defer client.Close()
-
- resultSet, err := client.SubmitWithOptions("1", new(RequestOptionsBuilder).
- SetRequestId(settings.USER_AGENT_REQUEST_ID).Create())
- assert.Nil(t, err)
- assert.NotNil(t, resultSet)
-
- result, ok, err := resultSet.One()
- assert.Nil(t, err)
- assert.True(t, ok)
- assert.NotNil(t, result)
-
- userAgentResponse := result.GetString()
- //If the gremlin user agent is disabled, the underlying web socket library reverts to sending its default user agent
- //during connection requests.
- assert.Contains(t, userAgentResponse, "Go-http-client/")
- })
-
- /**
- * Tests that client is correctly sending all overridable per request settings (requestId, batchSize,
- * evaluationTimeout, and userAgent) to the server.
- */
- t.Run("Should Send Per Request Settings To Server", func(t *testing.T) {
- skipTestsIfNotEnabled(t, integrationTestSuiteName, testNoAuthEnable)
- client, err := NewClient(testSocketServerUrl)
- assert.Nil(t, err)
- assert.NotNil(t, client)
- defer client.Close()
-
- resultSet, err := client.SubmitWithOptions("1", new(RequestOptionsBuilder).
- SetRequestId(settings.PER_REQUEST_SETTINGS_REQUEST_ID).
- SetEvaluationTimeout(1234).
- SetBatchSize(12).
- SetUserAgent("helloWorld").
- SetMaterializeProperties("tokens").
- Create())
- assert.Nil(t, err)
- assert.NotNil(t, resultSet)
- result, ok, err := resultSet.One()
- assert.Nil(t, err)
- assert.True(t, ok)
- expectedResult := fmt.Sprintf("requestId=%v evaluationTimeout=%v, batchSize=%v, userAgent=%v, materializeProperties=%v",
- settings.PER_REQUEST_SETTINGS_REQUEST_ID, 1234, 12, "helloWorld", "tokens")
- assert.Equal(t, expectedResult, result.Data)
- })
-
- /**
- * Note: This test currently fails due to race condition check in go test and is only included for demonstration
- * purposes. See https://issues.apache.org/jira/browse/TINKERPOP-2845.
- * This test should be uncommented with the resolution of TINKERPOP-2845
- */
- /*
- t.Run("Should try create new connection if closed by server", func(t *testing.T) {
- skipTestsIfNotEnabled(t, integrationTestSuiteName, testNoAuthEnable)
- client, err := NewClient(testSocketServerUrl)
- defer client.Close()
- assert.Nil(t, err)
- assert.NotNil(t, client)
- resultSet, err := client.SubmitWithOptions("1", new(RequestOptionsBuilder).
- SetRequestId(settings.CLOSE_CONNECTION_REQUEST_ID).Create())
- assert.Nil(t, err)
- assert.NotNil(t, resultSet)
-
- result, ok, err := resultSet.One()
-
- assert.EqualError(t, err, "websocket: close 1005 (no status)")
-
- resultSet, err = client.SubmitWithOptions("1", new(RequestOptionsBuilder).
- SetRequestId(settings.SINGLE_VERTEX_REQUEST_ID).Create())
- assert.Nil(t, err)
- assert.NotNil(t, resultSet)
- result, ok, err = resultSet.One()
- assert.Nil(t, err)
- assert.True(t, ok)
- assert.NotNil(t, result)
- })
- */
-}
diff --git a/gremlin-go/driver/connection.go b/gremlin-go/driver/connection.go
index a721044..9dbb1ec 100644
--- a/gremlin-go/driver/connection.go
+++ b/gremlin-go/driver/connection.go
@@ -21,26 +21,9 @@
import (
"crypto/tls"
- "sync"
"time"
)
-type connectionState int
-
-const (
- initialized connectionState = iota + 1
- established
- closed
- closedDueToError
-)
-
-type connection struct {
- logHandler *logHandler
- protocol protocol
- results *synchronizedMap
- state connectionState
-}
-
type connectionSettings struct {
authInfo AuthInfoProvider
tlsConfig *tls.Config
@@ -52,107 +35,3 @@
writeBufferSize int
enableUserAgentOnConnect bool
}
-
-func (connection *connection) errorCallback() {
- connection.logHandler.log(Error, errorCallback)
- connection.state = closedDueToError
-
- // This callback is called from within protocol.readLoop. Therefore,
- // it cannot wait for it to finish to avoid a deadlock.
- if err := connection.protocol.close(false); err != nil {
- connection.logHandler.logf(Error, failedToCloseInErrorCallback, err.Error())
- }
-}
-
-func (connection *connection) close() error {
- if connection.state != established {
- return newError(err0101ConnectionCloseError)
- }
- connection.logHandler.log(Info, closeConnection)
- var err error
- if connection.protocol != nil {
- err = connection.protocol.close(true)
- }
- connection.state = closed
- return err
-}
-
-func (connection *connection) write(request *request) (ResultSet, error) {
- if connection.state != established {
- return nil, newError(err0102WriteConnectionClosedError)
- }
- connection.logHandler.log(Debug, writeRequest)
- requestID := request.requestID.String()
- connection.logHandler.logf(Debug, creatingRequest, requestID)
- resultSet := newChannelResultSet(requestID, connection.results)
- connection.results.store(requestID, resultSet)
- return resultSet, connection.protocol.write(request)
-}
-
-func (connection *connection) activeResults() int {
- return connection.results.size()
-}
-
-// createConnection establishes a connection with the given parameters. A connection should always be closed to avoid
-// leaking connections. The connection has the following states:
-//
-// initialized: connection struct is created but has not established communication with server
-// established: connection has established communication established with the server
-// closed: connection was closed by the user.
-// closedDueToError: connection was closed internally due to an error.
-func createConnection(url string, logHandler *logHandler, connSettings *connectionSettings) (*connection, error) {
- conn := &connection{
- logHandler,
- nil,
- &synchronizedMap{map[string]ResultSet{}, sync.Mutex{}},
- initialized,
- }
- logHandler.log(Info, connectConnection)
- protocol, err := newGremlinServerWSProtocol(logHandler, Gorilla, url, connSettings, conn.results, conn.errorCallback)
- if err != nil {
- logHandler.logf(Warning, failedConnection)
- conn.state = closedDueToError
- return nil, err
- }
- conn.protocol = protocol
- conn.state = established
- return conn, err
-}
-
-type synchronizedMap struct {
- internalMap map[string]ResultSet
- syncLock sync.Mutex
-}
-
-func (s *synchronizedMap) store(key string, value ResultSet) {
- s.syncLock.Lock()
- defer s.syncLock.Unlock()
- s.internalMap[key] = value
-}
-
-func (s *synchronizedMap) load(key string) ResultSet {
- s.syncLock.Lock()
- defer s.syncLock.Unlock()
- return s.internalMap[key]
-}
-
-func (s *synchronizedMap) delete(key string) {
- s.syncLock.Lock()
- defer s.syncLock.Unlock()
- delete(s.internalMap, key)
-}
-
-func (s *synchronizedMap) size() int {
- s.syncLock.Lock()
- defer s.syncLock.Unlock()
- return len(s.internalMap)
-}
-
-func (s *synchronizedMap) closeAll(err error) {
- s.syncLock.Lock()
- defer s.syncLock.Unlock()
- for _, resultSet := range s.internalMap {
- resultSet.setError(err)
- resultSet.unlockedClose()
- }
-}
diff --git a/gremlin-go/driver/connectionPool.go b/gremlin-go/driver/connectionPool.go
deleted file mode 100644
index 7f800ef..0000000
--- a/gremlin-go/driver/connectionPool.go
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-package gremlingo
-
-import (
- "sync"
-)
-
-type connectionPool interface {
- write(*request) (ResultSet, error)
- close()
-}
-
-const defaultNewConnectionThreshold = 4
-const defaultInitialConcurrentConnections = 1
-
-// loadBalancingPool has two configurations: maximumConcurrentConnections/cap(connections) and newConnectionThreshold.
-// maximumConcurrentConnections denotes the maximum amount of active connections at any given time.
-// newConnectionThreshold specifies the minimum amount of concurrent active traversals on the least used connection
-// which will trigger creation of a new connection if maximumConcurrentConnections has not been reached.
-// loadBalancingPool will use the least-used connection, and as a part of the process, getLeastUsedConnection(), will
-// remove any errored connections from the pool and ensure that the returned connection is usable.
-type loadBalancingPool struct {
- url string
- logHandler *logHandler
- connSettings *connectionSettings
-
- newConnectionThreshold int
- connections []*connection
- loadBalanceLock sync.Mutex
- isClosed bool
-}
-
-func (pool *loadBalancingPool) close() {
- pool.loadBalanceLock.Lock()
- defer pool.loadBalanceLock.Unlock()
-
- if !pool.isClosed {
- for _, connection := range pool.connections {
- err := connection.close()
- if err != nil {
- pool.logHandler.logf(Warning, errorClosingConnection, err.Error())
- }
- }
- pool.isClosed = true
- }
-}
-
-func (pool *loadBalancingPool) write(request *request) (ResultSet, error) {
- pool.loadBalanceLock.Lock()
- defer pool.loadBalanceLock.Unlock()
-
- if pool.isClosed {
- return nil, newError(err0103ConnectionPoolClosedError)
- }
-
- conn, err := pool.getLeastUsedConnection()
- if err != nil {
- return nil, err
- }
- return conn.write(request)
-}
-
-// Not thread-safe. Should only be called by write which ensures no concurrency.
-func (pool *loadBalancingPool) getLeastUsedConnection() (*connection, error) {
- // newConnection should only be called within getLeastUsedConnection and therefore is a lambda.
- newConnection := func() (*connection, error) {
- connection, err := createConnection(pool.url, pool.logHandler, pool.connSettings)
- if err != nil {
- return nil, err
- }
- pool.connections = append(pool.connections, connection)
- return connection, nil
- }
-
- // If our pool is empty, return a new connection.
- if len(pool.connections) == 0 {
- return newConnection()
- }
-
- // Remove connections which are dead and find least used.
- var leastUsed *connection = nil
- validConnections := make([]*connection, 0, cap(pool.connections))
- for _, connection := range pool.connections {
- if connection.state == established || connection.state == initialized {
- validConnections = append(validConnections, connection)
- }
- if connection.state == established {
- // Set the least used connection.
- if leastUsed == nil || connection.activeResults() < leastUsed.activeResults() {
- leastUsed = connection
- }
- }
- }
- pool.connections = validConnections
-
- if leastUsed == nil {
- // If no valid connection is found.
- if len(pool.connections) >= cap(pool.connections) {
- // Return error if pool is full and no valid connection was found (should not ever happen).
- return nil, newError(err0105ConnectionPoolFullButNoneValid)
- } else {
- // Return new connection if no valid connection was found and pool has capacity.
- return newConnection()
- }
- } else if leastUsed.activeResults() >= pool.newConnectionThreshold && len(pool.connections) < cap(pool.connections) {
- // If the number of active results in our least used connection has reached the threshold
- // AND our pool size has not reached the capacity, attempt to return a new connection.
- newConnection, err := newConnection()
- if err != nil {
- // New connection creation failed; use existing grabbed least-used connection.
- pool.logHandler.logf(Warning, poolNewConnectionError, err.Error())
- return leastUsed, nil
- }
- return newConnection, nil
- } else {
- // If our pool is at capacity OR our least busy connection is less than the threshold, return the least used connection.
- return leastUsed, nil
- }
-}
-
-func newLoadBalancingPool(url string, logHandler *logHandler, connSettings *connectionSettings,
- newConnectionThreshold int, maximumConcurrentConnections int, initialConcurrentConnections int) (connectionPool, error) {
- var wg sync.WaitGroup
- wg.Add(initialConcurrentConnections)
- var appendLock sync.Mutex
-
- pool := make([]*connection, 0, maximumConcurrentConnections)
- errorList := make([]error, 0, maximumConcurrentConnections)
- for i := 0; i < initialConcurrentConnections; i++ {
- go func() {
- defer wg.Done()
- connection, err := createConnection(url, logHandler, connSettings)
-
- appendLock.Lock()
- defer appendLock.Unlock()
- if err != nil {
- logHandler.logf(Warning, createConnectionError, err.Error())
- errorList = append(errorList, err)
- } else {
- pool = append(pool, connection)
- }
- }()
- }
-
- wg.Wait()
- if len(pool) == 0 && len(errorList) != 0 {
- // If all instantiation fails return the first error's details.
- return nil, newError(err0104ConnectionPoolInstantiateFail, errorList[0].Error())
- }
- return &loadBalancingPool{
- url: url,
- logHandler: logHandler,
- connSettings: connSettings,
- newConnectionThreshold: newConnectionThreshold,
- connections: pool,
- }, nil
-}
diff --git a/gremlin-go/driver/connectionPool_test.go b/gremlin-go/driver/connectionPool_test.go
deleted file mode 100644
index 238833e..0000000
--- a/gremlin-go/driver/connectionPool_test.go
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-package gremlingo
-
-import (
- "github.com/stretchr/testify/assert"
- "golang.org/x/text/language"
- "strconv"
- "sync"
- "testing"
-)
-
-// Arbitrarily high value to use to not trigger creation of new connections
-const newConnectionThreshold = 100
-
-var logger = newLogHandler(&defaultLogger{}, Info, language.English)
-
-func getPoolForTesting() *loadBalancingPool {
- return &loadBalancingPool{
- url: "",
- connSettings: newDefaultConnectionSettings(),
- logHandler: newLogHandler(&defaultLogger{}, Info, language.English),
- newConnectionThreshold: newConnectionThreshold,
- connections: nil,
- loadBalanceLock: sync.Mutex{},
- }
-}
-
-func getMockConnection() *connection {
- return &connection{
- logHandler: logger,
- protocol: nil,
- results: &synchronizedMap{
- internalMap: make(map[string]ResultSet),
- syncLock: sync.Mutex{},
- },
- state: established,
- }
-}
-
-func TestConnectionPool(t *testing.T) {
- t.Run("loadBalancingPool", func(t *testing.T) {
- smallMap := make(map[string]ResultSet)
- bigMap := make(map[string]ResultSet)
- for i := 1; i < 4; i++ {
- bigMap[strconv.Itoa(i)] = nil
- if i < 3 {
- smallMap[strconv.Itoa(i)] = nil
- }
- }
-
- t.Run("getLeastUsedConnection", func(t *testing.T) {
- t.Run("getting the least used connection", func(t *testing.T) {
- pool := getPoolForTesting()
- defer pool.close()
- mockConnection1 := getMockConnection()
- mockConnection2 := getMockConnection()
- mockConnection3 := getMockConnection()
- mockConnection1.results.internalMap = bigMap
- mockConnection2.results.internalMap = smallMap
- mockConnection3.results.internalMap = bigMap
- connections := []*connection{mockConnection1, mockConnection2, mockConnection3}
- pool.connections = connections
-
- connection, err := pool.getLeastUsedConnection()
- assert.Nil(t, err)
- assert.Equal(t, mockConnection2, connection)
- })
-
- t.Run("purge non-established connections", func(t *testing.T) {
- pool := getPoolForTesting()
- defer pool.close()
- mockConnection := getMockConnection()
- mockConnection.results.internalMap = smallMap
- nonEstablished := &connection{
- logHandler: logger,
- protocol: nil,
- results: nil,
- state: closed,
- }
- connections := []*connection{nonEstablished, mockConnection}
- pool.connections = connections
-
- connection, err := pool.getLeastUsedConnection()
- assert.Nil(t, err)
- assert.Equal(t, mockConnection, connection)
- assert.Len(t, pool.connections, 1)
- })
- })
-
- t.Run("close", func(t *testing.T) {
- pool := getPoolForTesting()
- empty := &synchronizedMap{
- internalMap: make(map[string]ResultSet),
- syncLock: sync.Mutex{},
- }
- openConn1 := &connection{
- logHandler: logger,
- protocol: nil,
- results: empty,
- state: established,
- }
- openConn2 := &connection{
- logHandler: logger,
- protocol: nil,
- results: empty,
- state: established,
- }
- connections := []*connection{openConn1, openConn2}
- pool.connections = connections
-
- pool.close()
- assert.Equal(t, closed, openConn1.state)
- assert.Equal(t, closed, openConn2.state)
- })
- })
-}
diff --git a/gremlin-go/driver/connection_test.go b/gremlin-go/driver/connection_test.go
index 153084d..c0b80fd 100644
--- a/gremlin-go/driver/connection_test.go
+++ b/gremlin-go/driver/connection_test.go
@@ -21,19 +21,15 @@
import (
"crypto/tls"
+ "fmt"
+ "github.com/stretchr/testify/assert"
"math/big"
"os"
"reflect"
- "runtime"
"sort"
"strconv"
"sync"
"testing"
- "time"
-
- "github.com/google/uuid"
- "github.com/stretchr/testify/assert"
- "golang.org/x/text/language"
)
const personLabel = "Person"
@@ -41,16 +37,16 @@
const nameKey = "name"
const integrationTestSuiteName = "integration"
const basicAuthIntegrationTestSuite = "basic authentication integration"
-const validHostInvalidPortValidPath = "ws://localhost:12341253/gremlin"
-const invalidHostValidPortValidPath = "ws://invalidhost:8182/gremlin"
+const validHostInvalidPortValidPath = "http://localhost:12341253/gremlin"
+const invalidHostValidPortValidPath = "http://invalidhost:8182/gremlin"
const testServerModernGraphAlias = "gmodern"
const testServerGraphAlias = "gimmutable"
const testServerCrewGraphAlias = "gcrew"
const manualTestSuiteName = "manual"
-const nonRoutableIPForConnectionTimeout = "ws://10.255.255.1/"
+const nonRoutableIPForConnectionTimeout = "http://10.255.255.1/"
// transaction is enabled on the same port as no auth url
-const noAuthUrl = "ws://localhost:45940/gremlin"
+const noAuthUrl = "http://localhost:45940/gremlin"
const basicAuthWithSsl = "wss://localhost:45941/gremlin"
var testNames = []string{"Lyndon", "Yang", "Simon", "Rithin", "Alexey", "Valentyn"}
@@ -257,10 +253,6 @@
}
}
-func deferredCleanup(t *testing.T, connection *connection) {
- assert.Nil(t, connection.close())
-}
-
func TestConnection(t *testing.T) {
// Integration test variables.
testNoAuthUrl := getEnvOrDefaultString("GREMLIN_SERVER_URL", noAuthUrl)
@@ -275,368 +267,41 @@
testNoAuthWithAliasTlsConfig := &tls.Config{}
// Basic authentication integration test variables.
- // TODO using "wss:" to connect to an auth server without ssl enabled ("ws:") will give an "EOF" error in NewDriverRemoteConnection, bug?
testBasicAuthUrl := getEnvOrDefaultString("GREMLIN_SERVER_BASIC_AUTH_URL", basicAuthWithSsl)
testBasicAuthEnable := getEnvOrDefaultBool("RUN_BASIC_AUTH_INTEGRATION_TESTS", false)
testBasicAuthAuthInfo := getBasicAuthInfo()
testBasicAuthTlsConfig := &tls.Config{InsecureSkipVerify: true}
- testManual := getEnvOrDefaultBool("RUN_MANUAL_TEST", false)
-
- t.Run("Test createConnection without valid server", func(t *testing.T) {
- connection, err := createConnection(invalidHostValidPortValidPath, newLogHandler(&defaultLogger{}, Info,
- language.English), newDefaultConnectionSettings())
- assert.NotNil(t, err)
- assert.Nil(t, connection)
- })
-
- t.Run("Test createConnection without valid port", func(t *testing.T) {
- connection, err := createConnection(validHostInvalidPortValidPath, newLogHandler(&defaultLogger{}, Info,
- language.English), newDefaultConnectionSettings())
- assert.NotNil(t, err)
- assert.Nil(t, connection)
- })
-
- t.Run("Test createConnection without valid path", func(t *testing.T) {
- connSettings := newDefaultConnectionSettings()
- t.Run("Test 1 second timeout", func(t *testing.T) {
- connSettings.connectionTimeout = 1 * time.Second
- t1 := time.Now()
- connection, err := createConnection(nonRoutableIPForConnectionTimeout, newLogHandler(&defaultLogger{}, Info,
- language.English), connSettings)
- t2 := time.Since(t1)
- assert.True(t, t2.Seconds() < 1.5 && t2.Seconds() > 0.5)
- assert.NotNil(t, err)
- assert.Nil(t, connection)
- })
-
- t.Run("Test 2 second timeout", func(t *testing.T) {
- connSettings.connectionTimeout = 2 * time.Second
- t1 := time.Now()
- connection, err := createConnection(nonRoutableIPForConnectionTimeout, newLogHandler(&defaultLogger{}, Info,
- language.English), connSettings)
- t2 := time.Since(t1)
- assert.True(t, t2.Seconds() < 2.5 && t2.Seconds() > 1.5)
- assert.NotNil(t, err)
- assert.Nil(t, connection)
- })
-
- t.Run("Test 3 second timeout", func(t *testing.T) {
- connSettings.connectionTimeout = 3 * time.Second
- t1 := time.Now()
- connection, err := createConnection(nonRoutableIPForConnectionTimeout, newLogHandler(&defaultLogger{}, Info,
- language.English), connSettings)
- t2 := time.Since(t1)
- assert.True(t, t2.Seconds() < 3.5 && t2.Seconds() > 2.5)
- assert.NotNil(t, err)
- assert.Nil(t, connection)
- })
- })
-
- t.Run("Test DriverRemoteConnection GraphTraversal", func(t *testing.T) {
+ t.Run("Test client.submit() with concurrency", func(t *testing.T) {
skipTestsIfNotEnabled(t, integrationTestSuiteName, testNoAuthEnable)
- // Initialize graph
- g := initializeGraph(t, testNoAuthUrl, testNoAuthAuthInfo, testNoAuthTlsConfig)
- defer g.remoteConnection.Close()
+ client, err := NewClient(testNoAuthUrl,
+ func(settings *ClientSettings) {
+ settings.TlsConfig = testNoAuthTlsConfig
+ settings.AuthInfo = testNoAuthAuthInfo
+ settings.WriteBufferSize = 1024
+ settings.EnableCompression = true
+ settings.TraversalSource = testServerModernGraphAlias
+ })
+ assert.Nil(t, err)
+ assert.NotNil(t, client)
+ defer client.Close()
- // Read test data out of the graph and check that it is correct.
- readTestDataVertexProperties(t, g)
- readTestDataValues(t, g)
-
- // Reset Graph
- resetGraph(t, g)
- })
-
- t.Run("Test createConnection", func(t *testing.T) {
- skipTestsIfNotEnabled(t, integrationTestSuiteName, testNoAuthEnable)
- connection, err := createConnection(testNoAuthUrl, newLogHandler(&defaultLogger{}, Info, language.English),
- newDefaultConnectionSettings())
- assert.Nil(t, err)
- assert.NotNil(t, connection)
- assert.Equal(t, established, connection.state)
- defer deferredCleanup(t, connection)
- })
-
- t.Run("Test createConnection with compression", func(t *testing.T) {
- skipTestsIfNotEnabled(t, integrationTestSuiteName, testNoAuthEnable)
- setting := newDefaultConnectionSettings()
- setting.enableCompression = true
- connection, err := createConnection(testNoAuthUrl, newLogHandler(&defaultLogger{}, Info, language.English),
- setting)
- assert.Nil(t, err)
- assert.NotNil(t, connection)
- assert.Equal(t, established, connection.state)
- defer deferredCleanup(t, connection)
- })
-
- t.Run("Test connection.write() with small buffer size", func(t *testing.T) {
- skipTestsIfNotEnabled(t, integrationTestSuiteName, testNoAuthEnable)
- setting := newDefaultConnectionSettings()
- setting.readBufferSize = 100
- setting.writeBufferSize = 150
- setting.connectionTimeout = 1 * time.Second
- connection, err := createConnection(testNoAuthUrl, newLogHandler(&defaultLogger{}, Info, language.English),
- setting)
- assert.Nil(t, err)
- assert.NotNil(t, connection)
- assert.Equal(t, established, connection.state)
- defer deferredCleanup(t, connection)
- request := makeStringRequest("g.V().count()", "g", "", *new(RequestOptions))
- resultSet, err := connection.write(&request)
- assert.Nil(t, err)
- assert.NotNil(t, resultSet)
- result, ok, err := resultSet.One()
- assert.Nil(t, err)
- assert.True(t, ok)
- assert.NotNil(t, result)
- })
-
- t.Run("Test connection.write()", func(t *testing.T) {
- skipTestsIfNotEnabled(t, integrationTestSuiteName, testNoAuthEnable)
- connection, err := createConnection(testNoAuthUrl, newLogHandler(&defaultLogger{}, Info, language.English),
- newDefaultConnectionSettings())
- assert.Nil(t, err)
- assert.NotNil(t, connection)
- assert.Equal(t, established, connection.state)
- defer deferredCleanup(t, connection)
- request := makeStringRequest("g.V().count()", "g", "", *new(RequestOptions))
- resultSet, err := connection.write(&request)
- assert.Nil(t, err)
- assert.NotNil(t, resultSet)
- result, ok, err := resultSet.One()
- assert.Nil(t, err)
- assert.True(t, ok)
- assert.NotNil(t, result)
- })
-
- t.Run("Test connection.close() failure", func(t *testing.T) {
- skipTestsIfNotEnabled(t, integrationTestSuiteName, testNoAuthEnable)
- connection, err := createConnection(testNoAuthUrl, newLogHandler(&defaultLogger{}, Info, language.English),
- newDefaultConnectionSettings())
- assert.Equal(t, established, connection.state)
- assert.Nil(t, err)
- err = connection.close()
- assert.Nil(t, err)
- assert.Equal(t, closed, connection.state)
- err = connection.close()
- assert.Equal(t, newError(err0101ConnectionCloseError), err)
- assert.Equal(t, closed, connection.state)
- err = connection.close()
- assert.Equal(t, newError(err0101ConnectionCloseError), err)
- assert.Equal(t, closed, connection.state)
- })
-
- t.Run("Test connection.write() after close() failure", func(t *testing.T) {
- skipTestsIfNotEnabled(t, integrationTestSuiteName, testNoAuthEnable)
- connection, err := createConnection(testNoAuthUrl, newLogHandler(&defaultLogger{}, Info, language.English),
- newDefaultConnectionSettings())
- assert.Equal(t, established, connection.state)
- assert.Nil(t, err)
- err = connection.close()
- assert.Nil(t, err)
- assert.Equal(t, closed, connection.state)
- request := makeStringRequest("g.V().count()", "g", "", *new(RequestOptions))
- resultSet, err := connection.write(&request)
- assert.Nil(t, resultSet)
- assert.Equal(t, newError(err0102WriteConnectionClosedError), err)
- assert.Equal(t, closed, connection.state)
- })
-
- t.Run("Test server closes websocket", func(t *testing.T) {
- skipTestsIfNotEnabled(t, manualTestSuiteName, testManual)
- connSettings := newDefaultConnectionSettings()
- connSettings.keepAliveInterval = 500 * keepAliveIntervalDefault
- connection, err := createConnection(testNoAuthUrl, newLogHandler(&defaultLogger{}, Info, language.English),
- connSettings)
- assert.Equal(t, established, connection.state)
- assert.Nil(t, err)
- time.Sleep(120 * time.Second)
- request := makeStringRequest("g.V().count()", "g", "", *new(RequestOptions))
- resultSet, err := connection.write(&request)
- assert.Nil(t, resultSet)
- assert.NotNil(t, err)
- })
-
- t.Run("Test newLoadBalancingPool", func(t *testing.T) {
- skipTestsIfNotEnabled(t, integrationTestSuiteName, testNoAuthEnable)
- newPoolSize := 2
- pool, err := newLoadBalancingPool(testNoAuthUrl, newLogHandler(&defaultLogger{}, Info, language.English),
- newDefaultConnectionSettings(), 4, 4, newPoolSize)
- assert.Nil(t, err)
- defer pool.close()
- assert.Len(t, pool.(*loadBalancingPool).connections, newPoolSize)
- })
-
- t.Run("Test loadBalancingPool.newConnection", func(t *testing.T) {
- newPoolSize := 0
- skipTestsIfNotEnabled(t, integrationTestSuiteName, testNoAuthEnable)
- pool, err := newLoadBalancingPool(testNoAuthUrl, newLogHandler(&defaultLogger{}, Info, language.English),
- newDefaultConnectionSettings(), 4, 4, newPoolSize)
- assert.Nil(t, err)
- defer pool.close()
- lhp := pool.(*loadBalancingPool)
- // Pool instantiated with no connections so this will invoke newConnection
- newConn, err := lhp.getLeastUsedConnection()
- assert.Nil(t, err)
- assert.Len(t, lhp.connections, newPoolSize+1)
- // Workaround for false positive in race condition check
- found := false
- for _, conn := range lhp.connections {
- if conn == newConn {
- found = true
- }
+ // synchronous
+ for i := 0; i < 5; i++ {
+ submitCount(i, client, t)
}
- assert.True(t, found)
- })
- t.Run("Test loadBalancingPool.getLeastUsedConnection", func(t *testing.T) {
- newConnectionThreshold := 2
- maximumConcurrentConnections := 2
- logHandler := newLogHandler(&defaultLogger{}, Info, language.English)
- skipTestsIfNotEnabled(t, integrationTestSuiteName, testNoAuthEnable)
-
- t.Run("pool is empty", func(t *testing.T) {
- pool, err := newLoadBalancingPool(testNoAuthUrl, newLogHandler(&defaultLogger{}, Info, language.English),
- newDefaultConnectionSettings(),
- newConnectionThreshold, maximumConcurrentConnections, 0)
- assert.Nil(t, err)
- lbp := pool.(*loadBalancingPool)
- defer lbp.close()
- conn, err := lbp.getLeastUsedConnection()
- assert.Nil(t, err)
- assert.NotNil(t, conn)
- assert.Len(t, lbp.connections, 1)
- })
-
- t.Run("newConcurrentThreshold reached with capacity remaining", func(t *testing.T) {
- pool, err := newLoadBalancingPool(testNoAuthUrl, newLogHandler(&defaultLogger{}, Info, language.English),
- newDefaultConnectionSettings(),
- newConnectionThreshold, maximumConcurrentConnections, 0)
- assert.Nil(t, err)
- lbp := pool.(*loadBalancingPool)
- defer lbp.close()
- thresholdReachedResults := &synchronizedMap{
- internalMap: map[string]ResultSet{},
- syncLock: sync.Mutex{},
- }
- thresholdReachedResults.store("1", nil)
- thresholdReachedResults.store("2", nil)
- fullConnection := &connection{
- logHandler: logHandler,
- protocol: nil,
- results: thresholdReachedResults,
- state: established,
- }
- capacityAvailablePool := make([]*connection, 0, maximumConcurrentConnections)
- capacityAvailablePool = append(capacityAvailablePool, fullConnection)
- lbp.connections = capacityAvailablePool
- conn, err := lbp.getLeastUsedConnection()
- assert.Nil(t, err)
- assert.NotNil(t, conn)
- assert.NotEqual(t, fullConnection, conn)
- assert.Len(t, lbp.connections, 2)
- })
-
- t.Run("newConcurrentThreshold reached with no capacity remaining", func(t *testing.T) {
- capacityFullConnectionPool, err := newLoadBalancingPool(testNoAuthUrl, newLogHandler(&defaultLogger{}, Info,
- language.English), newDefaultConnectionSettings(),
- 1, 1, 1)
- assert.Nil(t, err)
- assert.NotNil(t, capacityFullConnectionPool)
- capacityFullLbp := capacityFullConnectionPool.(*loadBalancingPool)
- defer capacityFullLbp.close()
- capacityFullLbp.connections[0].results.store("mockFillCapacity",
- newChannelResultSet("mockFillCapacity", capacityFullLbp.connections[0].results))
- conn, err := capacityFullLbp.getLeastUsedConnection()
- assert.Nil(t, err)
- assert.NotNil(t, conn)
- assert.Len(t, capacityFullLbp.connections, 1)
- })
-
- t.Run("all connections in pool invalid", func(t *testing.T) {
- pool, err := newLoadBalancingPool(testNoAuthUrl, newLogHandler(&defaultLogger{}, Info, language.English),
- newDefaultConnectionSettings(),
- newConnectionThreshold, maximumConcurrentConnections, 0)
- assert.Nil(t, err)
- lbp := pool.(*loadBalancingPool)
- defer lbp.close()
- invalidConnection1 := &connection{
- logHandler: logHandler,
- protocol: nil,
- results: nil,
- state: closed,
- }
- invalidConnection2 := &connection{
- logHandler: logHandler,
- protocol: nil,
- results: nil,
- state: closedDueToError,
- }
- invalidPool := []*connection{invalidConnection1, invalidConnection2}
- lbp.connections = invalidPool
- conn, err := lbp.getLeastUsedConnection()
- assert.Nil(t, err)
- assert.NotNil(t, conn)
- assert.NotEqual(t, invalidConnection1, conn)
- assert.NotEqual(t, invalidConnection2, conn)
- assert.Len(t, lbp.connections, 1)
- assert.NotContains(t, lbp.connections, invalidConnection1)
- assert.NotContains(t, lbp.connections, invalidConnection2)
- })
- })
-
- t.Run("Test client.submit()", func(t *testing.T) {
- skipTestsIfNotEnabled(t, integrationTestSuiteName, testNoAuthEnable)
-
- client, err := NewClient(testNoAuthUrl,
- func(settings *ClientSettings) {
- settings.TlsConfig = testNoAuthTlsConfig
- settings.AuthInfo = testNoAuthAuthInfo
- })
- assert.Nil(t, err)
- assert.NotNil(t, client)
- defer client.Close()
-
- resultSet, err := client.Submit("g.V().count()")
- assert.Nil(t, err)
- assert.NotNil(t, resultSet)
- result, ok, err := resultSet.One()
- assert.Nil(t, err)
- assert.True(t, ok)
- assert.NotNil(t, result)
-
- g := cloneGraphTraversalSource(&Graph{}, NewBytecode(nil), nil)
- b := g.V().Count().Bytecode
- resultSet, err = client.submitBytecode(b)
- assert.Nil(t, err)
- assert.NotNil(t, resultSet)
- result, ok, err = resultSet.One()
- assert.Nil(t, err)
- assert.True(t, ok)
- assert.NotNil(t, result)
- })
-
- t.Run("Test client.submit() on session", func(t *testing.T) {
- skipTestsIfNotEnabled(t, integrationTestSuiteName, testNoAuthEnable)
-
- client, err := NewClient(testNoAuthUrl,
- func(settings *ClientSettings) {
- settings.TlsConfig = testNoAuthTlsConfig
- settings.AuthInfo = testNoAuthAuthInfo
- })
- client.session = "abc123"
- assert.Nil(t, err)
- assert.NotNil(t, client)
- defer client.Close()
-
- resultSet, err := client.Submit("g.V().count()")
- assert.Nil(t, err)
- assert.NotNil(t, resultSet)
- result, ok, err := resultSet.One()
- assert.Nil(t, err)
- assert.True(t, ok)
- assert.NotNil(t, result)
+ // async
+ var wg sync.WaitGroup
+ for i := 0; i < 5; i++ {
+ wg.Add(1)
+ go func(i int) {
+ defer wg.Done()
+ submitCount(i, client, t)
+ }(i)
+ }
+ wg.Wait()
})
t.Run("Test DriverRemoteConnection GraphTraversal", func(t *testing.T) {
@@ -945,95 +610,6 @@
}
})
- t.Run("Test Sessions", func(t *testing.T) {
- t.Run("Test CreateSessions", func(t *testing.T) {
- skipTestsIfNotEnabled(t, integrationTestSuiteName, testNoAuthEnable)
- remote, err := NewDriverRemoteConnection(testNoAuthWithAliasUrl,
- func(settings *DriverRemoteConnectionSettings) {
- settings.TlsConfig = testNoAuthTlsConfig
- settings.AuthInfo = testNoAuthAuthInfo
- })
- assert.Nil(t, err)
- assert.NotNil(t, remote)
- defer remote.Close()
-
- remoteSession1, err := remote.CreateSession()
- assert.Nil(t, err)
- assert.NotNil(t, remoteSession1)
- defer remoteSession1.Close()
- assert.Equal(t, remote.client.session, "")
- assert.NotEqual(t, remoteSession1.client.session, "")
- assert.Equal(t, 1, len(remote.spawnedSessions))
- fixedUUID := uuid.New().String()
-
- remoteSession2, err := remote.CreateSession(fixedUUID)
- assert.Nil(t, err)
- assert.NotNil(t, remoteSession2)
- defer remoteSession2.Close()
- assert.Equal(t, remoteSession2.client.session, fixedUUID)
- assert.Equal(t, 2, len(remote.spawnedSessions))
- })
-
- t.Run("Test session close", func(t *testing.T) {
- skipTestsIfNotEnabled(t, integrationTestSuiteName, testNoAuthEnable)
- remote, err := NewDriverRemoteConnection(testNoAuthWithAliasUrl,
- func(settings *DriverRemoteConnectionSettings) {
- settings.TlsConfig = testNoAuthTlsConfig
- settings.AuthInfo = testNoAuthAuthInfo
- })
- assert.Nil(t, err)
- assert.NotNil(t, remote)
-
- session1, _ := remote.CreateSession()
- assert.NotNil(t, session1.client.session)
- session1.Close()
- assert.Equal(t, 1, len(remote.spawnedSessions))
- sId := session1.GetSessionId()
- session2, _ := remote.CreateSession(sId)
- assert.NotNil(t, session2.client.session)
- session3, _ := remote.CreateSession()
- assert.NotNil(t, session3.client.session)
- assert.Equal(t, 3, len(remote.spawnedSessions))
-
- remote.Close()
- assert.Equal(t, 0, len(remote.spawnedSessions))
- })
-
- t.Run("Test session failures", func(t *testing.T) {
- skipTestsIfNotEnabled(t, integrationTestSuiteName, testNoAuthEnable)
- remote, err := NewDriverRemoteConnection(testNoAuthWithAliasUrl,
- func(settings *DriverRemoteConnectionSettings) {
- settings.TlsConfig = testNoAuthTlsConfig
- settings.AuthInfo = testNoAuthAuthInfo
- })
- assert.Nil(t, err)
- assert.NotNil(t, remote)
- defer remote.Close()
- s1, err := remote.CreateSession()
- assert.Nil(t, err)
- assert.NotNil(t, s1)
- defer s1.Close()
- s2, err := s1.CreateSession()
- assert.Nil(t, s2)
- assert.Equal(t, newError(err0202CreateSessionFromSessionError), err)
- })
-
- t.Run("Test CreateSession with multiple UUIDs failure", func(t *testing.T) {
- skipTestsIfNotEnabled(t, integrationTestSuiteName, testNoAuthEnable)
- remote, err := NewDriverRemoteConnection(testNoAuthWithAliasUrl,
- func(settings *DriverRemoteConnectionSettings) {
- settings.TlsConfig = testNoAuthTlsConfig
- settings.AuthInfo = testNoAuthAuthInfo
- })
- assert.Nil(t, err)
- assert.NotNil(t, remote)
- defer remote.Close()
- s1, err := remote.CreateSession(uuid.New().String(), uuid.New().String())
- assert.Nil(t, s1)
- assert.Equal(t, newError(err0201CreateSessionMultipleIdsError), err)
- })
- })
-
t.Run("Test Client.Submit() Simple String Query with Bindings", func(t *testing.T) {
skipTestsIfNotEnabled(t, integrationTestSuiteName, testNoAuthEnable)
@@ -1046,7 +622,7 @@
assert.NotNil(t, client)
defer client.Close()
- resultSet, err := client.Submit("x + x", map[string]interface{}{"x": 2})
+ resultSet, err := client.Submit("g.inject(x).math('_+_')", map[string]interface{}{"x": 2})
assert.Nil(t, err)
assert.NotNil(t, resultSet)
result, ok, err := resultSet.One()
@@ -1095,7 +671,7 @@
// Add vertices and edges to graph.
rs, err := g.AddV("person").Property("id", T__.Unfold().Property().AddV()).ToList()
assert.Nil(t, rs)
- assert.True(t, isSameErrorCode(newError(err0502ResponseHandlerReadLoopError), err))
+ assert.True(t, isSameErrorCode(newError(err0502ResponseHandlerError), err))
rs, err = g.V().Count().ToList()
assert.NotNil(t, rs)
@@ -1105,28 +681,6 @@
dropGraph(t, g)
})
- // This test needs to be run as a standalone since other tests running can cause goroutine count to fluctuate.
- // If this test is not run manually and isolated it will have floating failures.
- t.Run("Test connection goroutine cleanup", func(t *testing.T) {
- skipTestsIfNotEnabled(t, manualTestSuiteName, testManual)
-
- startCount := runtime.NumGoroutine()
-
- connection, err := createConnection(testNoAuthUrl, newLogHandler(&defaultLogger{}, Info, language.English),
- newDefaultConnectionSettings())
- assert.Nil(t, err)
- assert.NotNil(t, connection)
- assert.Equal(t, established, connection.state)
-
- // Read loop, write loop, this routine.
- assert.Equal(t, startCount+2, runtime.NumGoroutine())
-
- assert.Nil(t, connection.close())
-
- // This routine.
- assert.Equal(t, startCount, runtime.NumGoroutine())
- })
-
t.Run("Test per-request arguments", func(t *testing.T) {
skipTestsIfNotEnabled(t, integrationTestSuiteName, testNoAuthEnable)
@@ -1322,3 +876,16 @@
}
})
}
+
+func submitCount(i int, client *Client, t *testing.T) {
+ resultSet, err := client.Submit("g.V().count().as('c').math('c + " + strconv.Itoa(i) + "')")
+ assert.Nil(t, err)
+ assert.NotNil(t, resultSet)
+ result, ok, err := resultSet.One()
+ assert.Nil(t, err)
+ assert.True(t, ok)
+ assert.NotNil(t, result)
+ c, err := result.GetInt()
+ assert.Equal(t, 6+i, c)
+ _, _ = fmt.Fprintf(os.Stdout, "Received result : %s\n", result)
+}
diff --git a/gremlin-go/driver/cucumber/cucumberSteps_test.go b/gremlin-go/driver/cucumber/cucumberSteps_test.go
index 01e8271..0942ae1 100644
--- a/gremlin-go/driver/cucumber/cucumberSteps_test.go
+++ b/gremlin-go/driver/cucumber/cucumberSteps_test.go
@@ -885,19 +885,19 @@
}
switch comparison {
case "containing":
- if strings.Contains(tg.error[true], expectedMessage) {
+ if strings.Contains(strings.ToUpper(tg.error[true]), strings.ToUpper(expectedMessage)) {
return nil
} else {
return fmt.Errorf("traversal error message must contain %s", expectedMessage)
}
case "starting":
- if strings.Contains(tg.error[true], expectedMessage) {
+ if strings.Contains(strings.ToUpper(tg.error[true]), strings.ToUpper(expectedMessage)) {
return nil
} else {
return fmt.Errorf("traversal error message must contain %s", expectedMessage)
}
case "ending":
- if strings.Contains(tg.error[true], expectedMessage) {
+ if strings.Contains(strings.ToUpper(tg.error[true]), strings.ToUpper(expectedMessage)) {
return nil
} else {
return fmt.Errorf("traversal error message must contain %s", expectedMessage)
@@ -951,8 +951,11 @@
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)
+<<<<<<< HEAD
+=======
ctx.Step(`^using the parameter (.+) of P\.(.+)\("(.+)"\)$`, tg.usingTheParameterOfP)
ctx.Step(`^using the side effect (.+) defined as"(.+)"$`, tg.usingTheSideEffectDefined)
+>>>>>>> 3.8-dev
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/cucumberWorld.go b/gremlin-go/driver/cucumber/cucumberWorld.go
index 541cf34..6e6d008 100644
--- a/gremlin-go/driver/cucumber/cucumberWorld.go
+++ b/gremlin-go/driver/cucumber/cucumberWorld.go
@@ -69,7 +69,7 @@
}
func scenarioUrl() string {
- return getEnvOrDefaultString("GREMLIN_SERVER_URL", "ws://localhost:45940/gremlin")
+ return getEnvOrDefaultString("GREMLIN_SERVER_URL", "http://localhost:45940/gremlin")
}
func NewCucumberWorld() *CucumberWorld {
diff --git a/gremlin-go/driver/cucumber/gremlin.go b/gremlin-go/driver/cucumber/gremlin.go
index 73c0e36..10906e6 100644
--- a/gremlin-go/driver/cucumber/gremlin.go
+++ b/gremlin-go/driver/cucumber/gremlin.go
@@ -291,6 +291,7 @@
"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)}},
"g_V_hasIdXmarkovar_vadasvarX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().HasId(p["vid1"], p["vid2"])}},
+ "g_V_hasIdXmarkovar_vadasvar_petervarX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().HasId(p["vid1"], p["vid2"])}},
"g_V_hasIdX2AsString_nullX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().HasId(p["vid2"], nil)}},
"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"])}},
@@ -797,7 +798,7 @@
"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_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([]interface{}{"marko"}).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")}},
@@ -897,6 +898,7 @@
"g_VX1X_outEXknows_createdX_inV": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V(p["vid1"]).OutE("knows", "created").InV()}},
"g_VX1X_outEXknowsX_bothV": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V(p["vid1"]).OutE("knows").BothV()}},
"g_VX1X_outEXknowsX_bothV_name": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V(p["vid1"]).OutE("knows").BothV().Values("name")}},
+ "g_V_toEXout_knowsvarX_valuesXweightX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().ToE(gremlingo.Direction.Out, p["xx1"]).Values("weight")}},
"g_VX1X_properties_element": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V(p["vid2"]).Properties().Element().Limit(1)}},
"g_V_properties_element": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Properties().Element()}},
"g_V_propertiesXageX_element": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Properties("age").Element()}},
@@ -1372,7 +1374,7 @@
"g_withStrategiesXProductiveByStrategyX_V_asXaX_selectXaX_byXageX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.WithStrategies(gremlingo.ProductiveByStrategy()).V().As("a").Select("a").By("age")}},
"g_withSideEffectXk_nullX_injectXxX_selectXkX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.WithSideEffect("k", nil).Inject("x").Select("k")}},
"g_V_out_in_selectXall_a_a_aX_byXunfold_name_foldX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("A").Property("name", "a1").As("a1").AddV("B").Property("name", "b1").As("b1").AddE("ab").From("a1").To("b1")}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().As("a").Out().As("a").In().As("a").Select(gremlingo.Pop.All, "a", "a", "a").By(gremlingo.T__.Unfold().Values("name").Fold())}},
- "g_V_asXlabelX_aggregateXlocal_xX_selectXxX_selectXlabelX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().As("label").Aggregate(gremlingo.Scope.Local, "x").Barrier().Select("x").Select("label")}},
+ "g_withoutStrategiesXLazyBarrierStrategyX_V_asXlabelX_aggregateXlocal_xX_selectXxX_selectXlabelX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.WithoutStrategies(gremlingo.LazyBarrierStrategy()).V().As("label").Aggregate(gremlingo.Scope.Local, "x").Select("x").Select("label")}},
"g_V_name_asXaX_selectXfirst_aX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("name").As("a").Select(gremlingo.Pop.First, "a")}},
"g_V_name_asXaX_selectXlast_aX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("name").As("a").Select(gremlingo.Pop.Last, "a")}},
"g_V_name_asXaX_selectXmixed_aX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("name").As("a").Select(gremlingo.Pop.Mixed, "a")}},
diff --git a/gremlin-go/driver/driverRemoteConnection.go b/gremlin-go/driver/driverRemoteConnection.go
index a0f155f..86de977 100644
--- a/gremlin-go/driver/driverRemoteConnection.go
+++ b/gremlin-go/driver/driverRemoteConnection.go
@@ -24,16 +24,12 @@
"runtime"
"time"
- "github.com/google/uuid"
"golang.org/x/text/language"
)
// DriverRemoteConnectionSettings are used to configure the DriverRemoteConnection.
type DriverRemoteConnectionSettings struct {
- session string
-
TraversalSource string
- TransporterType TransporterType
LogVerbosity LogVerbosity
Logger Logger
Language language.Tag
@@ -57,24 +53,20 @@
// DriverRemoteConnection is a remote connection.
type DriverRemoteConnection struct {
- client *Client
- spawnedSessions []*DriverRemoteConnection
- isClosed bool
- settings *DriverRemoteConnectionSettings
+ client *Client
+ isClosed bool
+ settings *DriverRemoteConnectionSettings
}
// NewDriverRemoteConnection creates a new DriverRemoteConnection.
// If no custom connection settings are passed in, a connection will be created with "g" as the default TraversalSource,
-// Gorilla as the default Transporter, Info as the default LogVerbosity, a default logger struct, and English and as the
+// Info as the default LogVerbosity, a default logger struct, and English and as the
// default language
func NewDriverRemoteConnection(
url string,
configurations ...func(settings *DriverRemoteConnectionSettings)) (*DriverRemoteConnection, error) {
settings := &DriverRemoteConnectionSettings{
- session: "",
-
TraversalSource: "g",
- TransporterType: Gorilla,
LogVerbosity: Info,
Logger: &defaultLogger{},
Language: language.English,
@@ -88,9 +80,7 @@
ReadBufferSize: readBufferSizeDefault,
WriteBufferSize: writeBufferSizeDefault,
- NewConnectionThreshold: defaultNewConnectionThreshold,
MaximumConcurrentConnections: runtime.NumCPU(),
- InitialConcurrentConnections: defaultInitialConcurrentConnections,
}
for _, configuration := range configurations {
configuration(settings)
@@ -109,32 +99,15 @@
}
logHandler := newLogHandler(settings.Logger, settings.LogVerbosity, settings.Language)
- if settings.session != "" {
- logHandler.log(Debug, sessionDetected)
- settings.MaximumConcurrentConnections = 1
- }
- if settings.InitialConcurrentConnections > settings.MaximumConcurrentConnections {
- logHandler.logf(Warning, poolInitialExceedsMaximum, settings.InitialConcurrentConnections,
- settings.MaximumConcurrentConnections, settings.MaximumConcurrentConnections)
- settings.InitialConcurrentConnections = settings.MaximumConcurrentConnections
- }
- pool, err := newLoadBalancingPool(url, logHandler, connSettings, settings.NewConnectionThreshold,
- settings.MaximumConcurrentConnections, settings.InitialConcurrentConnections)
- if err != nil {
- if err != nil {
- logHandler.logf(Error, logErrorGeneric, "NewDriverRemoteConnection", err.Error())
- }
- return nil, err
- }
+ httpProt := newGremlinClient(logHandler, url, connSettings)
client := &Client{
- url: url,
- traversalSource: settings.TraversalSource,
- logHandler: logHandler,
- transporterType: settings.TransporterType,
- connections: pool,
- session: settings.session,
+ url: url,
+ traversalSource: settings.TraversalSource,
+ logHandler: logHandler,
+ connectionSettings: connSettings,
+ gremlinClient: httpProt,
}
return &DriverRemoteConnection{client: client, isClosed: false, settings: settings}, nil
@@ -143,20 +116,7 @@
// Close closes the DriverRemoteConnection.
// Errors if any will be logged
func (driver *DriverRemoteConnection) Close() {
- // If DriverRemoteConnection has spawnedSessions then they must be closed as well.
- if len(driver.spawnedSessions) > 0 {
- driver.client.logHandler.logf(Debug, closingSpawnedSessions, driver.client.url)
- for _, session := range driver.spawnedSessions {
- session.Close()
- }
- driver.spawnedSessions = driver.spawnedSessions[:0]
- }
-
- if driver.isSession() {
- driver.client.logHandler.logf(Info, closeSession, driver.client.url, driver.client.session)
- } else {
- driver.client.logHandler.logf(Info, closeDriverRemoteConnection, driver.client.url)
- }
+ driver.client.logHandler.logf(Info, closeDriverRemoteConnection, driver.client.url)
driver.client.Close()
driver.isClosed = true
}
@@ -183,53 +143,6 @@
return driver.client.submitBytecode(bytecode)
}
-func (driver *DriverRemoteConnection) isSession() bool {
- return driver.client.session != ""
-}
-
-// CreateSession generates a new session. sessionId stores the optional UUID param. It can be used to create a session with a specific UUID.
-func (driver *DriverRemoteConnection) CreateSession(sessionId ...string) (*DriverRemoteConnection, error) {
- if len(sessionId) > 1 {
- return nil, newError(err0201CreateSessionMultipleIdsError)
- } else if driver.isSession() {
- return nil, newError(err0202CreateSessionFromSessionError)
- }
-
- driver.client.logHandler.log(Info, creatingSessionConnection)
- drc, err := NewDriverRemoteConnection(driver.client.url, func(settings *DriverRemoteConnectionSettings) {
- if len(sessionId) == 1 {
- settings.session = sessionId[0]
- } else {
- settings.session = uuid.New().String()
- }
- // copy other settings from parent
- settings.TraversalSource = driver.settings.TraversalSource
- settings.TransporterType = driver.settings.TransporterType
- settings.Logger = driver.settings.Logger
- settings.LogVerbosity = driver.settings.LogVerbosity
- settings.Language = driver.settings.Language
- settings.AuthInfo = driver.settings.AuthInfo
- settings.TlsConfig = driver.settings.TlsConfig
- settings.KeepAliveInterval = driver.settings.KeepAliveInterval
- settings.WriteDeadline = driver.settings.WriteDeadline
- settings.ConnectionTimeout = driver.settings.ConnectionTimeout
- settings.NewConnectionThreshold = driver.settings.NewConnectionThreshold
- settings.EnableCompression = driver.settings.EnableCompression
- settings.ReadBufferSize = driver.settings.ReadBufferSize
- settings.WriteBufferSize = driver.settings.WriteBufferSize
- settings.MaximumConcurrentConnections = driver.settings.MaximumConcurrentConnections
- })
- if err != nil {
- return nil, err
- }
- driver.spawnedSessions = append(driver.spawnedSessions, drc)
- return drc, nil
-}
-
-func (driver *DriverRemoteConnection) GetSessionId() string {
- return driver.client.session
-}
-
func (driver *DriverRemoteConnection) commit() (ResultSet, error) {
bc := &Bytecode{}
bc.AddSource("tx", "commit")
diff --git a/gremlin-go/driver/error_codes.go b/gremlin-go/driver/error_codes.go
index 7e1a62a..61b335e 100644
--- a/gremlin-go/driver/error_codes.go
+++ b/gremlin-go/driver/error_codes.go
@@ -32,18 +32,7 @@
type errorCode string
const (
- // connection.go errors
- err0101ConnectionCloseError errorCode = "E0101_CONNECTION_CLOSE_ERROR"
- err0102WriteConnectionClosedError errorCode = "E0102_CONNECTION_WRITE_CLOSED_ERROR"
-
- // connectionPool.go errors
- err0103ConnectionPoolClosedError errorCode = "E0103_CONNECTIONPOOL_CLOSED_ERROR"
- err0104ConnectionPoolInstantiateFail errorCode = "E0104_CONNECTIONPOOL_INSTANTIATE_FAIL"
- err0105ConnectionPoolFullButNoneValid errorCode = "E0105_CONNECTIONPOOL_FULL_NONE_VALID"
-
// driverRemoteConnection.go errors
- err0201CreateSessionMultipleIdsError errorCode = "E0201_DRIVER_REMOTE_CONNECTION_CREATESESSION_MULTIPLE_UUIDS_ERROR"
- err0202CreateSessionFromSessionError errorCode = "E0202_DRIVER_REMOTE_CONNECTION_CREATESESSION_SESSION_FROM_SESSION_ERROR"
err0203SubmitBytecodeToClosedConnectionError errorCode = "E0203_DRIVER_REMOTE_CONNECTION_SUBMITBYTECODE_TO_CLOSED_CONNECTION_ERROR"
// graph.go errors
@@ -62,9 +51,9 @@
err0408GetSerializerToReadUnknownTypeError errorCode = "E0408_GRAPH_BINARY_GETSERIALIZERTOREAD_UNKNOWN_TYPE_ERROR"
err0409GetSerializerToReadUnknownCustomTypeError errorCode = "E0409_GRAPH_BINARY_GETSERIALIZERTOREAD_UNKNOWN_CUSTOM_TYPE_ERROR"
- // protocol.go errors
+ // response handling errors
err0501ResponseHandlerResultSetNotCreatedError errorCode = "E0501_PROTOCOL_RESPONSEHANDLER_NO_RESULTSET_ON_DATA_RECEIVE"
- err0502ResponseHandlerReadLoopError errorCode = "E0502_PROTOCOL_RESPONSEHANDLER_READ_LOOP_ERROR"
+ err0502ResponseHandlerError errorCode = "E0502_PROTOCOL_RESPONSEHANDLER_ERROR"
err0503ResponseHandlerAuthError errorCode = "E0503_PROTOCOL_RESPONSEHANDLER_AUTH_ERROR"
// result.go errors
@@ -82,9 +71,6 @@
err0703ReadMapNonStringKeyError errorCode = "E0703_SERIALIZER_READMAP_NON_STRING_KEY_ERROR"
err0704ConvertArgsNoSerializerError errorCode = "E0704_SERIALIZER_CONVERTARGS_NO_SERIALIZER_ERROR"
- // transporterFactory.go errors
- err0801GetTransportLayerNoTypeError errorCode = "E0801_TRANSPORTERFACTORY_GETTRANSPORTLAYER_NO_TYPE_ERROR"
-
// traversal.go errors
err0901ToListAnonTraversalError errorCode = "E0901_TRAVERSAL_TOLIST_ANON_TRAVERSAL_ERROR"
err0902IterateAnonTraversalError errorCode = "E0902_TRAVERSAL_ITERATE_ANON_TRAVERSAL_ERROR"
@@ -98,9 +84,6 @@
err1102TransactionRollbackNotOpenedError errorCode = "E1102_TRANSACTION_ROLLBACK_NOT_OPENED_ERROR"
err1103TransactionCommitNotOpenedError errorCode = "E1103_TRANSACTION_COMMIT_NOT_OPENED_ERROR"
err1104TransactionRepeatedCloseError errorCode = "E1104_TRANSACTION_REPEATED_CLOSE_ERROR"
-
- // gorillaTransporter.go errors
- err1201RequestSizeExceedsWriteBufferError errorCode = "E1201_REQUEST_SIZE_EXCEEDS_WRITE_BUFFER_ERROR"
)
var localizer *i18n.Localizer
diff --git a/gremlin-go/driver/gorillaTransporter.go b/gremlin-go/driver/gorillaTransporter.go
deleted file mode 100644
index 85ac032..0000000
--- a/gremlin-go/driver/gorillaTransporter.go
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-package gremlingo
-
-import (
- "net/http"
- "net/url"
- "sync"
- "time"
-
- "github.com/gorilla/websocket"
-)
-
-const keepAliveIntervalDefault = 5 * time.Second
-const writeDeadlineDefault = 3 * time.Second
-const writeChannelSizeDefault = 100
-const connectionTimeoutDefault = 5 * time.Second
-
-// ReadBufferSize and WriteBufferSize specify I/O buffer sizes in bytes. The default is 1048576.
-// If a buffer size is set zero, then the Gorilla websocket 4096 default size is used. The I/O buffer
-// sizes do not limit the size of the messages that can be sent or received.
-const readBufferSizeDefault = 1048576
-const writeBufferSizeDefault = 1048576
-
-// Transport layer that uses gorilla/websocket: https://github.com/gorilla/websocket
-// Gorilla WebSocket is a widely used and stable Go implementation of the WebSocket protocol.
-type gorillaTransporter struct {
- url string
- connection websocketConn
- isClosed bool
- logHandler *logHandler
- connSettings *connectionSettings
- writeChannel chan []byte
- wg *sync.WaitGroup
-}
-
-// Connect used to establish a connection.
-func (transporter *gorillaTransporter) Connect() (err error) {
- if transporter.connection != nil {
- return
- }
-
- var u *url.URL
- u, err = url.Parse(transporter.url)
- if err != nil {
- return
- }
-
- dialer := &websocket.Dialer{
- Proxy: http.ProxyFromEnvironment,
- HandshakeTimeout: transporter.connSettings.connectionTimeout,
- TLSClientConfig: transporter.connSettings.tlsConfig,
- EnableCompression: transporter.connSettings.enableCompression,
- ReadBufferSize: transporter.connSettings.readBufferSize,
- WriteBufferSize: transporter.connSettings.writeBufferSize,
- }
-
- header := transporter.getAuthInfo().GetHeader()
- if transporter.connSettings.enableUserAgentOnConnect {
- if header == nil {
- header = make(http.Header)
- }
- header.Set(userAgentHeader, userAgent)
- }
-
- // Nil is accepted as a valid header, so it can always be passed directly through.
- conn, _, err := dialer.Dial(u.String(), header)
- if err != nil {
- return err
- }
- transporter.connection = conn
- transporter.connection.SetPongHandler(func(string) error {
- err := transporter.connection.SetReadDeadline(time.Now().Add(2 * transporter.connSettings.keepAliveInterval))
- if err != nil {
- return err
- }
- return nil
- })
- transporter.wg.Add(1)
- go transporter.writeLoop()
- return
-}
-
-// Write used to write data to the transporter. Opens connection if closed.
-func (transporter *gorillaTransporter) Write(data []byte) error {
- if transporter.connection == nil {
- err := transporter.Connect()
- if err != nil {
- return err
- }
- }
- if len(data) > transporter.connSettings.writeBufferSize {
- return newError(err1201RequestSizeExceedsWriteBufferError)
- }
- transporter.writeChannel <- data
- return nil
-}
-
-func (transporter *gorillaTransporter) getAuthInfo() AuthInfoProvider {
- if transporter.connSettings.authInfo == nil {
- return NoopAuthInfo
- }
- return transporter.connSettings.authInfo
-}
-
-// Read used to read data from the transporter. Opens connection if closed.
-func (transporter *gorillaTransporter) Read() ([]byte, error) {
- if transporter.connection == nil {
- err := transporter.Connect()
- if err != nil {
- return nil, err
- }
- }
-
- err := transporter.connection.SetReadDeadline(time.Now().Add(transporter.connSettings.keepAliveInterval * 2))
- if err != nil {
- return nil, err
- }
- _, bytes, err := transporter.connection.ReadMessage()
- return bytes, err
-
-}
-
-// Close used to close a connection if it is opened.
-func (transporter *gorillaTransporter) Close() (err error) {
- if !transporter.isClosed {
- if transporter.writeChannel != nil {
- close(transporter.writeChannel)
- }
- if transporter.wg != nil {
- transporter.wg.Wait()
- }
- err = transporter.connection.Close()
- transporter.isClosed = true
- if err != nil {
- return err
- }
- }
- return
-}
-
-// IsClosed returns true when the transporter is closed.
-func (transporter *gorillaTransporter) IsClosed() bool {
- return transporter.isClosed
-}
-
-func (transporter *gorillaTransporter) writeLoop() {
- defer transporter.wg.Done()
-
- ticker := time.NewTicker(transporter.connSettings.keepAliveInterval)
- defer ticker.Stop()
-
- for {
- select {
- case message, ok := <-transporter.writeChannel:
- if !ok {
- // Channel was closed, we can disconnect and exit.
- return
- }
-
- // Set write deadline.
- err := transporter.connection.SetWriteDeadline(time.Now().Add(transporter.connSettings.writeDeadline))
- if err != nil {
- transporter.logHandler.logf(Error, failedToSetWriteDeadline, err.Error())
- return
- }
-
- // Write binary message that was submitted to channel.
- err = transporter.connection.WriteMessage(websocket.BinaryMessage, message)
- if err != nil {
- transporter.logHandler.logf(Error, failedToWriteMessage, "BinaryMessage", err.Error())
- return
- }
- case <-ticker.C:
- // Set write deadline.
- err := transporter.connection.SetWriteDeadline(time.Now().Add(transporter.connSettings.keepAliveInterval))
- if err != nil {
- transporter.logHandler.logf(Error, failedToSetWriteDeadline, err.Error())
- return
- }
-
- // Write pong message.
- err = transporter.connection.WriteMessage(websocket.PingMessage, nil)
- if err != nil {
- transporter.logHandler.logf(Error, failedToWriteMessage, "PingMessage", err.Error())
- return
- }
- }
- }
-}
diff --git a/gremlin-go/driver/gorillaTransporter_test.go b/gremlin-go/driver/gorillaTransporter_test.go
deleted file mode 100644
index e8d2e41..0000000
--- a/gremlin-go/driver/gorillaTransporter_test.go
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-package gremlingo
-
-import (
- "errors"
- "sync"
- "testing"
- "time"
-
- "github.com/stretchr/testify/assert"
- "github.com/stretchr/testify/mock"
- "golang.org/x/text/language"
-)
-
-const mockMessage string = "MockMessage"
-const mockReadErrMessage string = "MockReadMessageErrMessage"
-
-type mockWebsocketConn struct {
- mock.Mock
-}
-
-func (conn *mockWebsocketConn) WriteMessage(messageType int, data []byte) error {
- args := conn.Called(messageType, data)
- return args.Error(0)
-}
-
-func (conn *mockWebsocketConn) ReadMessage() (int, []byte, error) {
- args := conn.Called()
- return args.Get(0).(int), args.Get(1).([]byte), args.Error(2)
-}
-
-func (conn *mockWebsocketConn) Close() error {
- args := conn.Called()
- return args.Error(0)
-}
-
-func (conn *mockWebsocketConn) SetReadDeadline(time time.Time) error {
- args := conn.Called(time)
- return args.Error(0)
-}
-
-func (conn *mockWebsocketConn) SetWriteDeadline(time time.Time) error {
- args := conn.Called(time)
- return args.Error(0)
-}
-
-func (conn *mockWebsocketConn) SetPongHandler(h func(appData string) error) {
- conn.Called(h)
-}
-
-func getNewGorillaTransporter() (gorillaTransporter, *mockWebsocketConn) {
- return getNewGorillaTransporterWithSettings(newDefaultConnectionSettings())
-}
-
-func getNewGorillaTransporterWithSettings(connectionSettings *connectionSettings) (gorillaTransporter, *mockWebsocketConn) {
- mockConn := new(mockWebsocketConn)
- return gorillaTransporter{
- url: "ws://mockHost:8182/gremlin",
- logHandler: newLogHandler(&defaultLogger{}, Info, language.English),
- connection: mockConn,
- isClosed: false,
- connSettings: connectionSettings,
- writeChannel: make(chan []byte, 100),
- wg: &sync.WaitGroup{},
- }, mockConn
-}
-
-func TestGorillaTransporter(t *testing.T) {
- t.Run("Success", func(t *testing.T) {
- transporter, mockConn := getNewGorillaTransporter()
- t.Run("WriteMessage", func(t *testing.T) {
- mockConn.On("WriteMessage", 2, make([]byte, 10)).Return(nil)
- err := transporter.Write(make([]byte, 10))
- assert.Nil(t, err)
- })
-
- t.Run("Read", func(t *testing.T) {
- mockConn.On("ReadMessage").Return(0, []byte(mockMessage), nil)
- mockConn.On("SetPongHandler", mock.AnythingOfType("func(string) error")).Return(nil)
- mockConn.On("SetReadDeadline", mock.Anything).Return(nil)
- mockConn.On("SetWriteDeadline", mock.Anything).Return(nil)
- message, err := transporter.Read()
- assert.Nil(t, err)
- assert.Equal(t, mockMessage, string(message[:]))
- })
-
- t.Run("Close and IsClosed", func(t *testing.T) {
- mockConn.On("Close").Return(nil)
- isClosed := transporter.IsClosed()
- assert.False(t, isClosed)
- err := transporter.Close()
- assert.Nil(t, err)
- isClosed = transporter.IsClosed()
- assert.True(t, isClosed)
- })
- })
-
- t.Run("Error", func(t *testing.T) {
- transporter, mockConn := getNewGorillaTransporter()
- t.Run("Read", func(t *testing.T) {
- mockConn.On("ReadMessage").Return(0, []byte{}, errors.New(mockReadErrMessage))
- mockConn.On("SetPongHandler", mock.AnythingOfType("func(string) error")).Return(nil)
- mockConn.On("SetReadDeadline", mock.Anything).Return(nil)
- mockConn.On("SetWriteDeadline", mock.Anything).Return(nil)
- mockConn.On("WriteMessage", mock.Anything, mock.Anything).Return(nil)
- _, err := transporter.Read()
- assert.NotNil(t, err)
- assert.Equal(t, mockReadErrMessage, err.Error())
- })
-
- t.Run("Close and IsClosed", func(t *testing.T) {
- mockConn.On("Close").Return(nil)
- isClosed := transporter.IsClosed()
- assert.False(t, isClosed)
- err := transporter.Close()
- assert.Nil(t, err)
- isClosed = transporter.IsClosed()
- assert.True(t, isClosed)
- })
- })
-
- t.Run("Should error if request size exceeds WriteBufferSize", func(t *testing.T) {
- connSettings := newDefaultConnectionSettings()
- connSettings.writeBufferSize = 30
- transporter, mockConn := getNewGorillaTransporterWithSettings(connSettings)
-
- t.Run("Small message should succeed", func(t *testing.T) {
- mockConn.On("WriteMessage", 2, make([]byte, 10)).Return(nil)
- err := transporter.Write(make([]byte, 10))
- assert.Nil(t, err)
- })
-
- t.Run("Large message should error", func(t *testing.T) {
- mockConn.On("WriteMessage", 2, make([]byte, 10)).Return(nil)
- err := transporter.Write(make([]byte, 31))
- assert.Equal(t, newError(err1201RequestSizeExceedsWriteBufferError), err)
- })
-
- t.Run("Exact size should succeed", func(t *testing.T) {
- mockConn.On("WriteMessage", 2, make([]byte, 10)).Return(nil)
- err := transporter.Write(make([]byte, 30))
- assert.Nil(t, err)
- })
- })
-}
diff --git a/gremlin-go/driver/graphTraversal.go b/gremlin-go/driver/graphTraversal.go
index f16a9c2..6cd5e94 100644
--- a/gremlin-go/driver/graphTraversal.go
+++ b/gremlin-go/driver/graphTraversal.go
@@ -54,6 +54,11 @@
// V adds the v step to the GraphTraversal.
func (g *GraphTraversal) V(args ...interface{}) *GraphTraversal {
+ for i := 0; i < len(args); i++ {
+ if v, ok := args[i].(*Vertex); ok {
+ args[i] = v.Id
+ }
+ }
g.Bytecode.AddStep("V", args...)
return g
}
@@ -332,6 +337,11 @@
// From adds the from step to the GraphTraversal.
func (g *GraphTraversal) From(args ...interface{}) *GraphTraversal {
+ for i := 0; i < len(args); i++ {
+ if v, ok := args[i].(*Vertex); ok {
+ args[i] = v.Id
+ }
+ }
g.Bytecode.AddStep("from", args...)
return g
}
@@ -520,6 +530,16 @@
// MergeE adds the mergeE step to the GraphTraversal.
func (g *GraphTraversal) MergeE(args ...interface{}) *GraphTraversal {
+ if len(args) != 0 {
+ if m, ok := args[0].(map[interface{}]interface{}); ok {
+ if v, ok := m[Direction.Out].(*Vertex); ok {
+ m[Direction.Out] = v.Id
+ }
+ if v, ok := m[Direction.In].(*Vertex); ok {
+ m[Direction.In] = v.Id
+ }
+ }
+ }
g.Bytecode.AddStep("mergeE", args...)
return g
}
@@ -786,6 +806,11 @@
// To adds the to step to the GraphTraversal.
func (g *GraphTraversal) To(args ...interface{}) *GraphTraversal {
+ for i := 0; i < len(args); i++ {
+ if v, ok := args[i].(*Vertex); ok {
+ args[i] = v.Id
+ }
+ }
g.Bytecode.AddStep("to", args...)
return g
}
@@ -910,11 +935,10 @@
}
type Transaction struct {
- g *GraphTraversalSource
- sessionBasedConnection *DriverRemoteConnection
- remoteConnection *DriverRemoteConnection
- isOpen bool
- mutex sync.Mutex
+ g *GraphTraversalSource
+ remoteConnection *DriverRemoteConnection
+ isOpen bool
+ mutex sync.Mutex
}
func (t *Transaction) Begin() (*GraphTraversalSource, error) {
@@ -925,17 +949,9 @@
return nil, err
}
- sc, err := t.remoteConnection.CreateSession()
- if err != nil {
- return nil, err
- }
- t.sessionBasedConnection = sc
- t.isOpen = true
-
gts := &GraphTraversalSource{
- graph: t.g.graph,
- bytecode: t.g.bytecode,
- remoteConnection: t.sessionBasedConnection}
+ graph: t.g.graph,
+ bytecode: t.g.bytecode}
return gts, nil
}
@@ -947,7 +963,8 @@
return err
}
- return t.closeSession(t.sessionBasedConnection.rollback())
+ t.close()
+ return nil
}
func (t *Transaction) Commit() error {
@@ -958,7 +975,8 @@
return err
}
- return t.closeSession(t.sessionBasedConnection.commit())
+ t.close()
+ return nil
}
func (t *Transaction) Close() error {
@@ -969,13 +987,11 @@
return err
}
- return t.closeSession(nil, nil)
+ t.close()
+ return nil
}
func (t *Transaction) IsOpen() bool {
- if t.sessionBasedConnection != nil && t.sessionBasedConnection.isClosed {
- t.isOpen = false
- }
return t.isOpen
}
@@ -986,31 +1002,6 @@
return nil
}
-func (t *Transaction) closeSession(rs ResultSet, err error) error {
- defer t.closeConnection()
- if err != nil {
- return err
- }
- if rs == nil {
- return nil
- }
- _, e := rs.All()
- return e
-}
-
-func (t *Transaction) closeConnection() {
- t.sessionBasedConnection.Close()
-
- // remove session based connection from spawnedSessions
- connectionCount := len(t.remoteConnection.spawnedSessions)
- if connectionCount > 0 {
- for i, x := range t.remoteConnection.spawnedSessions {
- if x == t.sessionBasedConnection {
- t.remoteConnection.spawnedSessions[i] = t.remoteConnection.spawnedSessions[connectionCount-1]
- t.remoteConnection.spawnedSessions = t.remoteConnection.spawnedSessions[:connectionCount-1]
- break
- }
- }
- }
+func (t *Transaction) close() {
t.isOpen = false
}
diff --git a/gremlin-go/driver/graphTraversalSource.go b/gremlin-go/driver/graphTraversalSource.go
index 31ee2d4..d908250 100644
--- a/gremlin-go/driver/graphTraversalSource.go
+++ b/gremlin-go/driver/graphTraversalSource.go
@@ -160,6 +160,11 @@
// V reads vertices from the graph to start the traversal.
func (gts *GraphTraversalSource) V(args ...interface{}) *GraphTraversal {
+ for i := 0; i < len(args); i++ {
+ if v, ok := args[i].(*Vertex); ok {
+ args[i] = v.Id
+ }
+ }
traversal := gts.GetGraphTraversal()
traversal.Bytecode.AddStep("V", args...)
return traversal
@@ -203,6 +208,16 @@
// MergeE uses an upsert-like operation to add an Edge to start the traversal.
func (gts *GraphTraversalSource) MergeE(args ...interface{}) *GraphTraversal {
+ if len(args) != 0 {
+ if m, ok := args[0].(map[interface{}]interface{}); ok {
+ if v, ok := m[Direction.Out].(*Vertex); ok {
+ m[Direction.Out] = v.Id
+ }
+ if v, ok := m[Direction.In].(*Vertex); ok {
+ m[Direction.In] = v.Id
+ }
+ }
+ }
traversal := gts.GetGraphTraversal()
traversal.Bytecode.AddStep("mergeE", args...)
return traversal
diff --git a/gremlin-go/driver/gremlinClient.go b/gremlin-go/driver/gremlinClient.go
new file mode 100644
index 0000000..5a1369c
--- /dev/null
+++ b/gremlin-go/driver/gremlinClient.go
@@ -0,0 +1,148 @@
+/*
+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 gremlingo
+
+import (
+ "net/http"
+)
+
+// responsible for serializing and sending requests and then receiving and deserializing responses
+type gremlinClient struct {
+ serializer serializer
+ logHandler *logHandler
+ url string
+ connSettings *connectionSettings
+ httpClient *http.Client
+}
+
+func newGremlinClient(handler *logHandler, url string, connSettings *connectionSettings) *gremlinClient {
+ transport := &http.Transport{
+ TLSClientConfig: connSettings.tlsConfig,
+ MaxConnsPerHost: 0, // TODO
+ IdleConnTimeout: 0, // TODO
+ DisableCompression: !connSettings.enableCompression,
+ }
+
+ httpClient := http.Client{
+ Transport: transport,
+ Timeout: connSettings.connectionTimeout,
+ }
+
+ httpProt := &gremlinClient{
+ serializer: newGraphBinarySerializer(handler),
+ logHandler: handler,
+ url: url,
+ connSettings: connSettings,
+ httpClient: &httpClient,
+ }
+ return httpProt
+}
+
+// sends a query request and returns a ResultSet that can be used to obtain query results
+func (client *gremlinClient) send(request *request) (ResultSet, error) {
+ rs := newChannelResultSet()
+ bytes, err := client.serializer.serializeMessage(request)
+ if err != nil {
+ rs.setError(err)
+ rs.Close()
+ return rs, err
+ }
+
+ // one transport per request
+ transport := newHttpTransporter(client.url, client.connSettings, client.httpClient, client.logHandler)
+
+ // async send request
+ transport.wg.Add(1)
+ go func() {
+ defer transport.wg.Done()
+ err := transport.write(bytes)
+ if err != nil {
+ rs.setError(err)
+ rs.Close()
+ }
+ }()
+
+ // async receive response
+ transport.wg.Add(1)
+ go func() {
+ defer transport.wg.Done()
+ msg, err := transport.read()
+ if err != nil {
+ rs.setError(err)
+ rs.Close()
+ } else {
+ err = client.receive(rs, msg)
+ }
+ transport.close()
+ }()
+
+ return rs, err
+}
+
+// receives a binary response message, deserializes, and adds results to the ResultSet
+func (client *gremlinClient) receive(rs ResultSet, msg []byte) error {
+ resp, err := client.serializer.deserializeMessage(msg)
+ if err != nil {
+ client.logHandler.logf(Error, logErrorGeneric, "deserializeMessage()", err.Error())
+ rs.Close()
+ return err
+ }
+
+ err = client.handleResponse(rs, resp)
+ if err != nil {
+ client.logHandler.logf(Error, logErrorGeneric, "handleResponse()", err.Error())
+ rs.Close()
+ return err
+ }
+ return nil
+}
+
+// processes a deserialized response and attempts to add results to the ResultSet
+func (client *gremlinClient) handleResponse(rs ResultSet, response response) error {
+ statusCode, data := response.responseStatus.code, response.responseResult.data
+ if rs == nil {
+ return newError(err0501ResponseHandlerResultSetNotCreatedError)
+ }
+
+ if statusCode == http.StatusNoContent {
+ rs.addResult(&Result{make([]interface{}, 0)})
+ rs.Close()
+ client.logHandler.logf(Debug, readComplete)
+ } else if statusCode == http.StatusOK {
+ rs.addResult(&Result{data})
+ rs.Close()
+ client.logHandler.logf(Debug, readComplete)
+ } else if statusCode == http.StatusUnauthorized || statusCode == http.StatusForbidden {
+ rs.Close()
+ err := newError(err0503ResponseHandlerAuthError, response.responseStatus, response.responseResult)
+ rs.setError(err)
+ return err
+ } else {
+ rs.Close()
+ err := newError(err0502ResponseHandlerError, response.responseStatus, statusCode)
+ rs.setError(err)
+ return err
+ }
+ return nil
+}
+
+func (client *gremlinClient) close() {
+ client.httpClient.CloseIdleConnections()
+}
diff --git a/gremlin-go/driver/httpTransporter.go b/gremlin-go/driver/httpTransporter.go
new file mode 100644
index 0000000..ed8ca7f
--- /dev/null
+++ b/gremlin-go/driver/httpTransporter.go
@@ -0,0 +1,171 @@
+/*
+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 gremlingo
+
+import (
+ "bytes"
+ "compress/zlib"
+ "encoding/json"
+ "errors"
+ "io"
+ "net/http"
+ "sync"
+)
+
+// TODO decide channel size when chunked response handling is implemented - for now just set to 1
+const responseChannelSizeDefault = 1
+const contentTypeHeader = "content-type"
+
+// httpTransporter responsible for sending and receiving bytes to/from the server
+type httpTransporter struct {
+ url string
+ isClosed bool
+ connSettings *connectionSettings
+ responseChannel chan []byte // receives response bytes from the server
+ httpClient *http.Client
+ wg *sync.WaitGroup
+ logHandler *logHandler
+}
+
+func newHttpTransporter(url string, connSettings *connectionSettings, httpClient *http.Client, logHandler *logHandler) *httpTransporter {
+ wg := &sync.WaitGroup{}
+
+ return &httpTransporter{
+ url: url,
+ connSettings: connSettings,
+ responseChannel: make(chan []byte, responseChannelSizeDefault),
+ httpClient: httpClient,
+ wg: wg,
+ logHandler: logHandler,
+ }
+}
+
+// write sends bytes to the server as a POST request and sends received response bytes to the responseChannel
+func (transporter *httpTransporter) write(data []byte) error {
+ resp, err := transporter.sendRequest(data)
+ if err != nil {
+ return err
+ }
+
+ respBytes, err := transporter.readResponse(resp)
+ if err != nil {
+ return err
+ }
+
+ // possible to receive graph-binary or json error response bodies
+ if resp.StatusCode != 200 && resp.Header.Get(contentTypeHeader) != graphBinaryMimeType {
+ return transporter.createResponseError(respBytes, resp)
+ }
+
+ transporter.responseChannel <- respBytes
+ return nil
+}
+
+// read reads bytes from the responseChannel
+func (transporter *httpTransporter) read() ([]byte, error) {
+ msg, ok := <-transporter.responseChannel
+ if !ok {
+ return []byte{}, errors.New("failed to read from response channel")
+ }
+ return msg, nil
+}
+
+// close closes the transporter and its corresponding responseChannel
+func (transporter *httpTransporter) close() {
+ if !transporter.isClosed {
+ if transporter.responseChannel != nil {
+ close(transporter.responseChannel)
+ }
+ transporter.isClosed = true
+ }
+}
+
+func (transporter *httpTransporter) createResponseError(respBytes []byte, resp *http.Response) error {
+ contentType := resp.Header.Get(contentTypeHeader)
+ if contentType == "application/json" {
+ var jsonMap map[string]interface{}
+ err := json.Unmarshal(respBytes, &jsonMap)
+ if err != nil {
+ return err
+ }
+ message, exists := jsonMap["message"]
+ if exists {
+ return newError(err0502ResponseHandlerError, message, resp.StatusCode)
+ }
+ return newError(err0502ResponseHandlerError, "Response was not successful", resp.StatusCode)
+ }
+ // unexpected error content type
+ return newError(err0502ResponseHandlerError, "Response was not successful and of unexpected content-type: "+contentType, resp.StatusCode)
+}
+
+// reads bytes from the given response
+func (transporter *httpTransporter) readResponse(resp *http.Response) ([]byte, error) {
+ var reader io.ReadCloser
+ var err error
+
+ if resp.Header.Get("content-encoding") == "deflate" {
+ reader, err = zlib.NewReader(resp.Body)
+ if err != nil {
+ transporter.logHandler.logf(Error, failedToReceiveResponse, err.Error())
+ return nil, err
+ }
+ } else {
+ reader = resp.Body
+ }
+
+ // TODO handle chunked encoding and send chunks to responseChannel
+ all, err := io.ReadAll(reader)
+ if err != nil {
+ transporter.logHandler.logf(Error, failedToReceiveResponse, err.Error())
+ return nil, err
+ }
+ err = reader.Close()
+ if err != nil {
+ return nil, err
+ }
+ transporter.logHandler.log(Debug, receivedResponse)
+ return all, nil
+}
+
+// sends a POST request for the given byte content
+func (transporter *httpTransporter) sendRequest(data []byte) (*http.Response, error) {
+ transporter.logHandler.logf(Debug, creatingRequest)
+ req, err := http.NewRequest("POST", transporter.url, bytes.NewBuffer(data))
+ if err != nil {
+ transporter.logHandler.logf(Error, failedToSendRequest, err.Error())
+ return nil, err
+ }
+ req.Header.Set(contentTypeHeader, graphBinaryMimeType)
+ req.Header.Set("accept", graphBinaryMimeType)
+ if transporter.connSettings.enableUserAgentOnConnect {
+ req.Header.Set(userAgentHeader, userAgent)
+ }
+ if transporter.connSettings.enableCompression {
+ req.Header.Set("accept-encoding", "deflate")
+ }
+
+ transporter.logHandler.logf(Debug, writeRequest)
+ resp, err := transporter.httpClient.Do(req)
+ if err != nil {
+ transporter.logHandler.logf(Error, failedToSendRequest, err.Error())
+ return nil, err
+ }
+ return resp, nil
+}
diff --git a/gremlin-go/driver/logger.go b/gremlin-go/driver/logger.go
index 3cc623c..6297afe 100644
--- a/gremlin-go/driver/logger.go
+++ b/gremlin-go/driver/logger.go
@@ -102,29 +102,15 @@
deserializeDataTypeError errorKey = "UNKNOWN_DESER_DATATYPE"
nullInput errorKey = "NULL_INPUT"
unexpectedNull errorKey = "UNEXPECTED_NULL_VALUE"
- closeConnection errorKey = "CLOSING_CONNECTION"
- connectConnection errorKey = "OPENING_CONNECTION"
- failedConnection errorKey = "FAILED_CONNECTION"
writeRequest errorKey = "WRITE_REQUEST"
- readLoopError errorKey = "READ_LOOP_ERROR"
- errorCallback errorKey = "ERROR_CALLBACK"
creatingRequest errorKey = "CREATING_REQUEST"
readComplete errorKey = "READ_COMPLETE"
submitStartedString errorKey = "SUBMIT_STARTED_STRING"
submitStartedBytecode errorKey = "SUBMIT_STARTED_BYTECODE"
- failedToCloseInErrorCallback errorKey = "FAILED_TO_CLOSE_IN_ERROR_CALLBACK"
- failedToWriteMessage errorKey = "FAILED_TO_WRITE_MESSAGE"
- failedToSetWriteDeadline errorKey = "FAILED_TO_SET_WRITE_DEADLINE"
+ failedToReceiveResponse errorKey = "FAILED_TO_RECEIVE_RESPONSE"
+ failedToSendRequest errorKey = "FAILED_TO_SEND_REQUEST"
+ receivedResponse errorKey = "RECEIVED_RESPONSE"
logErrorGeneric errorKey = "LOG_ERROR_GENERIC"
- creatingSessionConnection errorKey = "CREATING_SESSION_CONNECTION"
- closeSession errorKey = "CLOSE_SESSION"
- closeSessionRequestError errorKey = "CLOSE_SESSION_REQUEST_ERROR"
closeDriverRemoteConnection errorKey = "CLOSE_DRIVER_REMOTE_CONNECTION"
- closingSpawnedSessions errorKey = "CLOSING_SPAWNED_SESSIONS"
closeClient errorKey = "CLOSE_CLIENT"
- errorClosingConnection errorKey = "ERROR_CLOSING_CONNECTION"
- createConnectionError errorKey = "CREATE_CONNECTION_ERROR"
- poolNewConnectionError errorKey = "POOL_NEW_CONNECTION_ERROR"
- sessionDetected errorKey = "SESSION_DETECTED"
- poolInitialExceedsMaximum errorKey = "POOL_INITIAL_EXCEEDS_MAXIMUM"
)
diff --git a/gremlin-go/driver/performance/performanceSuite.go b/gremlin-go/driver/performance/performanceSuite.go
index 3adb3b3..ba2b493 100644
--- a/gremlin-go/driver/performance/performanceSuite.go
+++ b/gremlin-go/driver/performance/performanceSuite.go
@@ -364,16 +364,14 @@
const bufferSize = 314572800
const poolingBufferSize = 26214400
-//
// createConnection: Creates a connection to a remote endpoint and returns a
// GraphTraversalSource that can be used to submit Gremlin queries.
-//
func createConnection(host string, port, poolSize, buffersSize int) (*GraphTraversalSource, *DriverRemoteConnection, error) {
var g *GraphTraversalSource
var drc *DriverRemoteConnection
var err error
- endpoint := fmt.Sprintf("ws://%s:%d/gremlin", host, port)
+ endpoint := fmt.Sprintf("http://%s:%d/gremlin", host, port)
log.Println("Attempting to connect to : " + endpoint)
// Establish a new connection and catch any errors that may occur
@@ -416,9 +414,7 @@
`
)
-//
// main: Program entry point. Create the connection, run performance tests, shutdown.
-//
func main() {
hostPtr := flag.String("host", Host, "Server host, the default is localhost.")
portPtr := flag.Int("port", Port, "Server port, the default is 45940.")
diff --git a/gremlin-go/driver/protocol.go b/gremlin-go/driver/protocol.go
deleted file mode 100644
index da44bb7..0000000
--- a/gremlin-go/driver/protocol.go
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-package gremlingo
-
-import (
- "encoding/base64"
- "net/http"
- "sync"
-)
-
-// protocol handles invoking serialization and deserialization, as well as handling the lifecycle of raw data passed to
-// and received from the transport layer.
-type protocol interface {
- readLoop(resultSets *synchronizedMap, errorCallback func())
- write(request *request) error
- close(wait bool) error
-}
-
-const authenticationFailed = uint16(151)
-
-type protocolBase struct {
- protocol
-
- transporter transporter
-}
-
-type gremlinServerWSProtocol struct {
- *protocolBase
-
- serializer serializer
- logHandler *logHandler
- closed bool
- mutex sync.Mutex
- wg *sync.WaitGroup
-}
-
-func (protocol *gremlinServerWSProtocol) readLoop(resultSets *synchronizedMap, errorCallback func()) {
- defer protocol.wg.Done()
-
- for {
- // Read from transport layer. If the channel is closed, this will error out and exit.
- msg, err := protocol.transporter.Read()
- protocol.mutex.Lock()
- if protocol.closed {
- protocol.mutex.Unlock()
- return
- }
- protocol.mutex.Unlock()
- if err != nil {
- // Ignore error here, we already got an error on read, cannot do anything with this.
- _ = protocol.transporter.Close()
- protocol.logHandler.logf(Error, readLoopError, err.Error())
- readErrorHandler(resultSets, errorCallback, err, protocol.logHandler)
- return
- }
-
- // Deserialize message and unpack.
- resp, err := protocol.serializer.deserializeMessage(msg)
- if err != nil {
- protocol.logHandler.logf(Error, logErrorGeneric, "gremlinServerWSProtocol.readLoop()", err.Error())
- readErrorHandler(resultSets, errorCallback, err, protocol.logHandler)
- return
- }
-
- err = protocol.responseHandler(resultSets, resp)
- if err != nil {
- readErrorHandler(resultSets, errorCallback, err, protocol.logHandler)
- return
- }
- }
-}
-
-// If there is an error, we need to close the ResultSets and then pass the error back.
-func readErrorHandler(resultSets *synchronizedMap, errorCallback func(), err error, log *logHandler) {
- log.logf(Error, readLoopError, err.Error())
- resultSets.closeAll(err)
- errorCallback()
-}
-
-func (protocol *gremlinServerWSProtocol) responseHandler(resultSets *synchronizedMap, response response) error {
- responseID, statusCode, metadata, data := response.responseID, response.responseStatus.code,
- response.responseResult.meta, response.responseResult.data
- responseIDString := responseID.String()
- if resultSets.load(responseIDString) == nil {
- return newError(err0501ResponseHandlerResultSetNotCreatedError)
- }
- if aggregateTo, ok := metadata["aggregateTo"]; ok {
- resultSets.load(responseIDString).setAggregateTo(aggregateTo.(string))
- }
-
- // Handle status codes appropriately. If status code is http.StatusPartialContent, we need to re-read data.
- if statusCode == http.StatusNoContent {
- resultSets.load(responseIDString).addResult(&Result{make([]interface{}, 0)})
- resultSets.load(responseIDString).Close()
- protocol.logHandler.logf(Debug, readComplete, responseIDString)
- } else if statusCode == http.StatusOK {
- // Add data and status attributes to the ResultSet.
- resultSets.load(responseIDString).addResult(&Result{data})
- resultSets.load(responseIDString).setStatusAttributes(response.responseStatus.attributes)
- resultSets.load(responseIDString).Close()
- protocol.logHandler.logf(Debug, readComplete, responseIDString)
- } else if statusCode == http.StatusPartialContent {
- // Add data to the ResultSet.
- resultSets.load(responseIDString).addResult(&Result{data})
- } else if statusCode == http.StatusProxyAuthRequired || statusCode == authenticationFailed {
- // http status code 151 is not defined here, but corresponds with 403, i.e. authentication has failed.
- // Server has requested basic auth.
- authInfo := protocol.transporter.getAuthInfo()
- if ok, username, password := authInfo.GetBasicAuth(); ok {
- authBytes := make([]byte, 0)
- authBytes = append(authBytes, 0)
- authBytes = append(authBytes, []byte(username)...)
- authBytes = append(authBytes, 0)
- authBytes = append(authBytes, []byte(password)...)
- encoded := base64.StdEncoding.EncodeToString(authBytes)
- request := makeBasicAuthRequest(encoded)
- err := protocol.write(&request)
- if err != nil {
- return err
- }
- } else {
- resultSets.load(responseIDString).Close()
- return newError(err0503ResponseHandlerAuthError, response.responseStatus, response.responseResult)
- }
- } else {
- newError := newError(err0502ResponseHandlerReadLoopError, response.responseStatus, statusCode)
- resultSets.load(responseIDString).setError(newError)
- resultSets.load(responseIDString).Close()
- protocol.logHandler.logf(Error, logErrorGeneric, "gremlinServerWSProtocol.responseHandler()", newError.Error())
- }
- return nil
-}
-
-func (protocol *gremlinServerWSProtocol) write(request *request) error {
- bytes, err := protocol.serializer.serializeMessage(request)
- if err != nil {
- return err
- }
- return protocol.transporter.Write(bytes)
-}
-
-func (protocol *gremlinServerWSProtocol) close(wait bool) error {
- var err error
-
- protocol.mutex.Lock()
- if !protocol.closed {
- err = protocol.transporter.Close()
- protocol.closed = true
- }
- protocol.mutex.Unlock()
-
- if wait {
- protocol.wg.Wait()
- }
-
- return err
-}
-
-func newGremlinServerWSProtocol(handler *logHandler, transporterType TransporterType, url string, connSettings *connectionSettings, results *synchronizedMap,
- errorCallback func()) (protocol, error) {
- wg := &sync.WaitGroup{}
- transport, err := getTransportLayer(transporterType, url, connSettings, handler)
- if err != nil {
- return nil, err
- }
-
- gremlinProtocol := &gremlinServerWSProtocol{
- protocolBase: &protocolBase{transporter: transport},
- serializer: newGraphBinarySerializer(handler),
- logHandler: handler,
- closed: false,
- mutex: sync.Mutex{},
- wg: wg,
- }
- err = gremlinProtocol.transporter.Connect()
- if err != nil {
- return nil, err
- }
- wg.Add(1)
- go gremlinProtocol.readLoop(results, errorCallback)
- return gremlinProtocol, nil
-}
diff --git a/gremlin-go/driver/protocol_test.go b/gremlin-go/driver/protocol_test.go
deleted file mode 100644
index 08bcbf8..0000000
--- a/gremlin-go/driver/protocol_test.go
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-package gremlingo
-
-import (
- "sync"
- "testing"
- "time"
-
- "github.com/stretchr/testify/assert"
- "golang.org/x/text/language"
-)
-
-func TestProtocol(t *testing.T) {
- t.Run("Test protocol connect error.", func(t *testing.T) {
- connSettings := newDefaultConnectionSettings()
- connSettings.authInfo, connSettings.tlsConfig = nil, nil
- connSettings.keepAliveInterval, connSettings.writeDeadline, connSettings.writeDeadline = keepAliveIntervalDefault, writeDeadlineDefault, connectionTimeoutDefault
-
- protocol, err := newGremlinServerWSProtocol(newLogHandler(&defaultLogger{}, Info, language.English), Gorilla,
- "ws://localhost:9000/gremlin", connSettings,
- nil, nil)
- assert.NotNil(t, err)
- assert.Nil(t, protocol)
- })
-
- t.Run("Test protocol close wait", func(t *testing.T) {
- wg := &sync.WaitGroup{}
- protocol := &gremlinServerWSProtocol{
- closed: true,
- mutex: sync.Mutex{},
- wg: wg,
- }
- wg.Add(1)
-
- done := make(chan bool)
-
- go func() {
- protocol.close(true)
- done <- true
- }()
-
- select {
- case <-time.After(1 * time.Second):
- // Ok. Close must wait.
- case <-done:
- t.Fatal("protocol.close is not waiting")
- }
- })
-
- t.Run("Test protocol close no wait", func(t *testing.T) {
- wg := &sync.WaitGroup{}
- protocol := &gremlinServerWSProtocol{
- closed: true,
- mutex: sync.Mutex{},
- wg: wg,
- }
- wg.Add(1)
-
- done := make(chan bool)
-
- go func() {
- protocol.close(false)
- done <- true
- }()
-
- select {
- case <-time.After(1 * time.Second):
- t.Fatal("protocol.close is waiting")
- case <-done:
- // Ok. Close must not wait.
- }
- })
-}
diff --git a/gremlin-go/driver/request.go b/gremlin-go/driver/request.go
index 31a57ef..79581b9 100644
--- a/gremlin-go/driver/request.go
+++ b/gremlin-go/driver/request.go
@@ -19,97 +19,58 @@
package gremlingo
-import (
- "github.com/google/uuid"
-)
-
// request represents a request to the server.
type request struct {
- requestID uuid.UUID
- op string
- processor string
- args map[string]interface{}
+ gremlin string
+ fields map[string]interface{}
}
-const sessionProcessor = "session"
-
-const stringOp = "eval"
-const stringProcessor = ""
-
-func makeStringRequest(stringGremlin string, traversalSource string, sessionId string, requestOptions RequestOptions) (req request) {
- newProcessor := stringProcessor
- newArgs := map[string]interface{}{
- "gremlin": stringGremlin,
- "aliases": map[string]interface{}{
- "g": traversalSource,
- },
- }
- if sessionId != "" {
- newProcessor = sessionProcessor
- newArgs["session"] = sessionId
- }
- var requestId uuid.UUID
- if requestOptions.requestID == uuid.Nil {
- requestId = uuid.New()
- } else {
- requestId = requestOptions.requestID
+func makeStringRequest(stringGremlin string, traversalSource string, requestOptions RequestOptions) (req request) {
+ newFields := map[string]interface{}{
+ "language": "gremlin-lang",
+ "g": traversalSource,
}
if requestOptions.bindings != nil {
- newArgs["bindings"] = requestOptions.bindings
+ newFields["bindings"] = requestOptions.bindings
}
if requestOptions.evaluationTimeout != 0 {
- newArgs["evaluationTimeout"] = requestOptions.evaluationTimeout
+ newFields["evaluationTimeout"] = requestOptions.evaluationTimeout
}
if requestOptions.batchSize != 0 {
- newArgs["batchSize"] = requestOptions.batchSize
+ newFields["batchSize"] = requestOptions.batchSize
}
if requestOptions.userAgent != "" {
- newArgs["userAgent"] = requestOptions.userAgent
+ newFields["userAgent"] = requestOptions.userAgent
}
if requestOptions.materializeProperties != "" {
- newArgs["materializeProperties"] = requestOptions.materializeProperties
+ newFields["materializeProperties"] = requestOptions.materializeProperties
}
return request{
- requestID: requestId,
- op: stringOp,
- processor: newProcessor,
- args: newArgs,
+ gremlin: stringGremlin,
+ fields: newFields,
}
}
-const bytecodeOp = "bytecode"
-const bytecodeProcessor = "traversal"
-const authOp = "authentication"
-const authProcessor = "traversal"
-
-func makeBytecodeRequest(bytecodeGremlin *Bytecode, traversalSource string, sessionId string) (req request) {
- newProcessor := bytecodeProcessor
- newArgs := map[string]interface{}{
+func makeBytecodeRequest(bytecodeGremlin *Bytecode, traversalSource string) (req request) {
+ newFields := map[string]interface{}{
"gremlin": *bytecodeGremlin,
"aliases": map[string]interface{}{
"g": traversalSource,
},
}
- if sessionId != "" {
- newProcessor = sessionProcessor
- newArgs["session"] = sessionId
- }
for k, v := range extractReqArgs(bytecodeGremlin) {
- newArgs[k] = v
+ newFields[k] = v
}
return request{
- requestID: uuid.New(),
- op: bytecodeOp,
- processor: newProcessor,
- args: newArgs,
+ fields: newFields,
}
}
@@ -191,25 +152,3 @@
return key, insn.arguments[1]
}
-
-func makeBasicAuthRequest(auth string) (req request) {
- return request{
- requestID: uuid.New(),
- op: authOp,
- processor: authProcessor,
- args: map[string]interface{}{
- "sasl": auth,
- },
- }
-}
-
-func makeCloseSessionRequest(sessionId string) request {
- return request{
- requestID: uuid.New(),
- op: "close",
- processor: "session",
- args: map[string]interface{}{
- "session": sessionId,
- },
- }
-}
diff --git a/gremlin-go/driver/request_test.go b/gremlin-go/driver/request_test.go
index c388a12..d6d4b03 100644
--- a/gremlin-go/driver/request_test.go
+++ b/gremlin-go/driver/request_test.go
@@ -20,47 +20,35 @@
package gremlingo
import (
- "github.com/google/uuid"
"testing"
"github.com/stretchr/testify/assert"
)
func TestRequest(t *testing.T) {
- t.Run("Test makeStringRequest() with custom requestID", func(t *testing.T) {
- requestId := uuid.New()
- r := makeStringRequest("g.V()", "g", "",
- new(RequestOptionsBuilder).SetRequestId(requestId).Create())
- assert.Equal(t, requestId, r.requestID)
- })
-
t.Run("Test makeStringRequest() with no bindings", func(t *testing.T) {
- r := makeStringRequest("g.V()", "g", "", *new(RequestOptions))
- assert.NotNil(t, r.requestID)
- assert.NotEqual(t, uuid.Nil, r.requestID)
+ r := makeStringRequest("g.V()", "g", *new(RequestOptions))
+ assert.Equal(t, "g.V()", r.gremlin)
+ assert.Equal(t, "g", r.fields["g"])
+ assert.Equal(t, "gremlin-lang", r.fields["language"])
+ assert.Nil(t, r.fields["bindings"])
})
t.Run("Test makeStringRequest() with custom evaluationTimeout", func(t *testing.T) {
- r := makeStringRequest("g.V()", "g", "",
+ r := makeStringRequest("g.V()", "g",
new(RequestOptionsBuilder).SetEvaluationTimeout(1234).Create())
- assert.NotNil(t, r.requestID)
- assert.NotEqual(t, uuid.Nil, r.requestID)
- assert.Equal(t, 1234, r.args["evaluationTimeout"])
+ assert.Equal(t, 1234, r.fields["evaluationTimeout"])
})
t.Run("Test makeStringRequest() with custom batchSize", func(t *testing.T) {
- r := makeStringRequest("g.V()", "g", "",
+ r := makeStringRequest("g.V()", "g",
new(RequestOptionsBuilder).SetBatchSize(123).Create())
- assert.NotNil(t, r.requestID)
- assert.NotEqual(t, uuid.Nil, r.requestID)
- assert.Equal(t, 123, r.args["batchSize"])
+ assert.Equal(t, 123, r.fields["batchSize"])
})
t.Run("Test makeStringRequest() with custom userAgent", func(t *testing.T) {
- r := makeStringRequest("g.V()", "g", "",
+ r := makeStringRequest("g.V()", "g",
new(RequestOptionsBuilder).SetUserAgent("TestUserAgent").Create())
- assert.NotNil(t, r.requestID)
- assert.NotEqual(t, uuid.Nil, r.requestID)
- assert.Equal(t, "TestUserAgent", r.args["userAgent"])
+ assert.Equal(t, "TestUserAgent", r.fields["userAgent"])
})
}
diff --git a/gremlin-go/driver/resources/error-messages/en.json b/gremlin-go/driver/resources/error-messages/en.json
index fddab56..cfd070a 100644
--- a/gremlin-go/driver/resources/error-messages/en.json
+++ b/gremlin-go/driver/resources/error-messages/en.json
@@ -5,8 +5,6 @@
"E0104_CONNECTIONPOOL_INSTANTIATE_FAIL": "E0104: no successful connections could be made: %s",
"E0105_CONNECTIONPOOL_FULL_NONE_VALID": "E0105: no valid connections found and maximum concurrent connection count reached",
- "E0201_DRIVER_REMOTE_CONNECTION_CREATESESSION_MULTIPLE_UUIDS_ERROR": "E0201: more than one Session ID specified. Cannot create Session with multiple UUIDs",
- "E0202_DRIVER_REMOTE_CONNECTION_CREATESESSION_SESSION_FROM_SESSION_ERROR": "E0202: connection is already bound to a Session - child sessions are not allowed",
"E0203_DRIVER_REMOTE_CONNECTION_SUBMITBYTECODE_TO_CLOSED_CONNECTION_ERROR": "E0203: cannot submit bytecode to closed connection",
"E0301_GRAPH_GETPATHOBJECT_UNEQUAL_LABELS_OBJECTS_LENGTH_ERROR": "E0301: path is invalid because it does not contain an equal number of Labels and Objects",
@@ -24,7 +22,7 @@
"E0409_GRAPH_BINARY_GETSERIALIZERTOREAD_UNKNOWN_CUSTOM_TYPE_ERROR": "E0409: unknown custom data type to deserialize %s",
"E0501_PROTOCOL_RESPONSEHANDLER_NO_RESULTSET_ON_DATA_RECEIVE":"E0501: resultSet was not created before data was received",
- "E0502_PROTOCOL_RESPONSEHANDLER_READ_LOOP_ERROR": "E0502: error in read loop, error message '%+v'. statusCode: %d",
+ "E0502_PROTOCOL_RESPONSEHANDLER_ERROR": "E0502: error handling response, error message '%+v'. statusCode: %d",
"E0503_PROTOCOL_RESPONSEHANDLER_AUTH_ERROR":"E0503: failed to authenticate %v : %v",
"E0601_RESULT_NOT_VERTEX_ERROR":"E0601: result is not a Vertex",
diff --git a/gremlin-go/driver/resources/logger-messages/en.json b/gremlin-go/driver/resources/logger-messages/en.json
index 63287db..d024444 100644
--- a/gremlin-go/driver/resources/logger-messages/en.json
+++ b/gremlin-go/driver/resources/logger-messages/en.json
@@ -8,24 +8,14 @@
"OPENING_CONNECTION": "Connecting.",
"WRITE_REQUEST": "Writing request.",
"READ_LOOP_ERROR": "Read loop error '%s', closing read loop.",
- "ERROR_CALLBACK": "Connection error callback invoked, closing protocol.",
- "CREATING_REQUEST": "Created request with id '%s'",
- "READ_COMPLETE": "Read complete for response with id '%s'",
+ "CREATING_REQUEST": "Creating request",
+ "READ_COMPLETE": "Read complete for response",
"SUBMIT_STARTED_STRING": "Client invoked Submit with string argument: %s",
"SUBMIT_STARTED_BYTECODE": "Client invoked Submit with bytecode argument: %+v\n",
- "FAILED_TO_CLOSE_IN_ERROR_CALLBACK": "Failed to close protocol in error callback '%s'",
- "FAILED_TO_WRITE_MESSAGE": "Failed to write message type: '%s', error: '%s'",
- "FAILED_TO_SET_WRITE_DEADLINE": "Failed to set write deadline, error: '%s'",
"LOG_ERROR_GENERIC": "Error occurred during operation %s: '%s'",
- "CREATING_SESSION_CONNECTION": "Creating Session based connection",
- "CLOSING_SPAWNED_SESSIONS": "Closing spawned sessions from DriverRemoteConnection with url '%s'",
- "CLOSE_SESSION": "Closing DriverRemoteConnection with url '%s' with session '%s'",
- "CLOSE_SESSION_REQUEST_ERROR": "Error while closing DriverRemoteConnection with url '%s' and with session '%s': %s",
"CLOSE_DRIVER_REMOTE_CONNECTION": "Closing DriverRemoteConnection with url '%s'",
"CLOSE_CLIENT": "Closing Client with url '%s'",
- "ERROR_CLOSING_CONNECTION": "Ignoring error closing connection: %s",
- "CREATE_CONNECTION_ERROR": "Error creating new connection for connection pool: %s",
- "POOL_NEW_CONNECTION_ERROR": "Falling back to least-used connection. Creating new connection due to least-used connection exceeding concurrent usage threshold failed: %s",
- "SESSION_DETECTED": "Session detected. Setting connection pool size maximum to 1.",
- "POOL_INITIAL_EXCEEDS_MAXIMUM": "InitialConcurrentConnections setting %d exceeded MaximumConcurrentConnections setting %d - limiting InitialConcurrentConnections to %d."
+ "FAILED_TO_RECEIVE_RESPONSE": "Failed to receive response: %s",
+ "FAILED_TO_SEND_REQUEST": "Failed to send request: %s",
+ "RECEIVED_RESPONSE": "Received response data"
}
diff --git a/gremlin-go/driver/response.go b/gremlin-go/driver/response.go
index 6743011..dfe89ac 100644
--- a/gremlin-go/driver/response.go
+++ b/gremlin-go/driver/response.go
@@ -23,14 +23,13 @@
// responseStatus contains the status info of the response.
type responseStatus struct {
- code uint16
- message string
- attributes map[string]interface{}
+ code uint32
+ message string
+ exception string
}
// responseResult contains the result info of the response.
type responseResult struct {
- meta map[string]interface{}
data interface{}
}
diff --git a/gremlin-go/driver/resultSet.go b/gremlin-go/driver/resultSet.go
index 73269de..8079744 100644
--- a/gremlin-go/driver/resultSet.go
+++ b/gremlin-go/driver/resultSet.go
@@ -30,12 +30,8 @@
type ResultSet interface {
setAggregateTo(val string)
GetAggregateTo() string
- setStatusAttributes(statusAttributes map[string]interface{})
- GetStatusAttributes() map[string]interface{}
- GetRequestID() string
IsEmpty() bool
Close()
- unlockedClose()
Channel() chan *Result
addResult(result *Result)
One() (*Result, bool, error)
@@ -46,16 +42,13 @@
// channelResultSet Channel based implementation of ResultSet.
type channelResultSet struct {
- channel chan *Result
- requestID string
- container *synchronizedMap
- aggregateTo string
- statusAttributes map[string]interface{}
- closed bool
- err error
- waitSignal chan bool
- channelMutex sync.Mutex
- waitSignalMutex sync.Mutex
+ channel chan *Result
+ aggregateTo string
+ closed bool
+ err error
+ waitSignal chan bool
+ channelMutex sync.Mutex
+ waitSignalMutex sync.Mutex
}
func (channelResultSet *channelResultSet) sendSignal() {
@@ -114,20 +107,6 @@
if !channelResultSet.closed {
channelResultSet.channelMutex.Lock()
channelResultSet.closed = true
- channelResultSet.container.delete(channelResultSet.requestID)
- close(channelResultSet.channel)
- channelResultSet.channelMutex.Unlock()
- channelResultSet.sendSignal()
- }
-}
-
-// Close and remove from the channelResultSet from the container without locking container. Meant for use when calling
-// function already locks the container.
-func (channelResultSet *channelResultSet) unlockedClose() {
- if !channelResultSet.closed {
- channelResultSet.channelMutex.Lock()
- channelResultSet.closed = true
- delete(channelResultSet.container.internalMap, channelResultSet.requestID)
close(channelResultSet.channel)
channelResultSet.channelMutex.Unlock()
channelResultSet.sendSignal()
@@ -143,20 +122,6 @@
return channelResultSet.aggregateTo
}
-func (channelResultSet *channelResultSet) setStatusAttributes(val map[string]interface{}) {
- channelResultSet.statusAttributes = val
-}
-
-// GetStatusAttributes returns statusAttributes for the channelResultSet.
-func (channelResultSet *channelResultSet) GetStatusAttributes() map[string]interface{} {
- return channelResultSet.statusAttributes
-}
-
-// GetRequestID returns requestID for the channelResultSet.
-func (channelResultSet *channelResultSet) GetRequestID() string {
- return channelResultSet.requestID
-}
-
// Channel returns channel for the channelResultSet.
func (channelResultSet *channelResultSet) Channel() chan *Result {
return channelResultSet.channel
@@ -204,10 +169,10 @@
channelResultSet.sendSignal()
}
-func newChannelResultSetCapacity(requestID string, container *synchronizedMap, channelSize int) ResultSet {
- return &channelResultSet{make(chan *Result, channelSize), requestID, container, "", nil, false, nil, nil, sync.Mutex{}, sync.Mutex{}}
+func newChannelResultSetCapacity(channelSize int) ResultSet {
+ return &channelResultSet{make(chan *Result, channelSize), "", false, nil, nil, sync.Mutex{}, sync.Mutex{}}
}
-func newChannelResultSet(requestID string, container *synchronizedMap) ResultSet {
- return newChannelResultSetCapacity(requestID, container, defaultCapacity)
+func newChannelResultSet() ResultSet {
+ return newChannelResultSetCapacity(defaultCapacity)
}
diff --git a/gremlin-go/driver/resultSet_test.go b/gremlin-go/driver/resultSet_test.go
index df9752c..3843b9d 100644
--- a/gremlin-go/driver/resultSet_test.go
+++ b/gremlin-go/driver/resultSet_test.go
@@ -21,43 +21,29 @@
import (
"fmt"
- "sync"
"testing"
"time"
"github.com/stretchr/testify/assert"
)
-func getSyncMap() *synchronizedMap {
- return &synchronizedMap{
- make(map[string]ResultSet),
- sync.Mutex{},
- }
-}
-
func TestChannelResultSet(t *testing.T) {
const mockID = "mockID"
t.Run("Test ResultSet test getter/setters.", func(t *testing.T) {
- r := newChannelResultSet(mockID, getSyncMap())
- testStatusAttribute := map[string]interface{}{
- "1": 1234,
- "2": "foo",
- }
+ r := newChannelResultSet()
testAggregateTo := "test2"
- r.setStatusAttributes(testStatusAttribute)
- assert.Equal(t, r.GetStatusAttributes(), testStatusAttribute)
r.setAggregateTo(testAggregateTo)
assert.Equal(t, r.GetAggregateTo(), testAggregateTo)
})
t.Run("Test ResultSet close.", func(t *testing.T) {
- channelResultSet := newChannelResultSet(mockID, getSyncMap())
+ channelResultSet := newChannelResultSet()
assert.NotPanics(t, func() { channelResultSet.Close() })
})
t.Run("Test ResultSet one.", func(t *testing.T) {
- channelResultSet := newChannelResultSet(mockID, getSyncMap())
+ channelResultSet := newChannelResultSet()
AddResults(channelResultSet, 10)
idx := 0
for i := 0; i < 10; i++ {
@@ -75,7 +61,7 @@
})
t.Run("Test ResultSet one Paused.", func(t *testing.T) {
- channelResultSet := newChannelResultSet(mockID, getSyncMap())
+ channelResultSet := newChannelResultSet()
go AddResultsPause(channelResultSet, 10, 500)
idx := 0
for i := 0; i < 10; i++ {
@@ -93,12 +79,12 @@
})
t.Run("Test ResultSet one close.", func(t *testing.T) {
- channelResultSet := newChannelResultSet(mockID, getSyncMap())
+ channelResultSet := newChannelResultSet()
channelResultSet.Close()
})
t.Run("Test ResultSet All.", func(t *testing.T) {
- channelResultSet := newChannelResultSet(mockID, getSyncMap())
+ channelResultSet := newChannelResultSet()
AddResults(channelResultSet, 10)
go closeAfterTime(500, channelResultSet)
results, err := channelResultSet.All()
@@ -109,7 +95,7 @@
})
t.Run("Test ResultSet All close before.", func(t *testing.T) {
- channelResultSet := newChannelResultSet(mockID, getSyncMap())
+ channelResultSet := newChannelResultSet()
AddResults(channelResultSet, 10)
channelResultSet.Close()
results, err := channelResultSet.All()
@@ -121,21 +107,21 @@
})
t.Run("Test ResultSet IsEmpty before signal.", func(t *testing.T) {
- channelResultSet := newChannelResultSet(mockID, getSyncMap())
+ channelResultSet := newChannelResultSet()
go closeAfterTime(500, channelResultSet)
empty := channelResultSet.IsEmpty()
assert.True(t, empty)
})
t.Run("Test ResultSet IsEmpty after signal.", func(t *testing.T) {
- channelResultSet := newChannelResultSet(mockID, getSyncMap())
+ channelResultSet := newChannelResultSet()
channelResultSet.Close()
empty := channelResultSet.IsEmpty()
assert.True(t, empty)
})
t.Run("Test ResultSet IsEmpty after close.", func(t *testing.T) {
- channelResultSet := newChannelResultSet(mockID, getSyncMap())
+ channelResultSet := newChannelResultSet()
go addAfterTime(500, channelResultSet)
empty := channelResultSet.IsEmpty()
assert.False(t, empty)
@@ -144,16 +130,6 @@
empty = channelResultSet.IsEmpty()
assert.True(t, empty)
})
-
- t.Run("Test ResultSet removes self from container.", func(t *testing.T) {
- container := getSyncMap()
- assert.Equal(t, 0, container.size())
- channelResultSet := newChannelResultSet(mockID, container)
- container.store(mockID, channelResultSet)
- assert.Equal(t, 1, container.size())
- channelResultSet.Close()
- assert.Equal(t, 0, container.size())
- })
}
func AddResultsPause(resultSet ResultSet, count int, ticks time.Duration) {
diff --git a/gremlin-go/driver/serializer.go b/gremlin-go/driver/serializer.go
index 314d276..cf05087 100644
--- a/gremlin-go/driver/serializer.go
+++ b/gremlin-go/driver/serializer.go
@@ -22,15 +22,10 @@
import (
"bytes"
"encoding/binary"
- "math/big"
- "reflect"
- "strings"
"sync"
-
- "github.com/google/uuid"
)
-const graphBinaryMimeType = "application/vnd.graphbinary-v1.0"
+const graphBinaryMimeType = "application/vnd.graphbinary-v4.0"
// serializer interface for serializers.
type serializer interface {
@@ -68,122 +63,33 @@
const versionByte byte = 0x81
-func convertArgs(request *request, gs graphBinarySerializer) (map[string]interface{}, error) {
- if request.op != bytecodeProcessor {
- return request.args, nil
- }
-
- // Convert to format:
- // args["gremlin"]: <serialized args["gremlin"]>
- gremlin := request.args["gremlin"]
- switch gremlin.(type) {
- case Bytecode:
- buffer := bytes.Buffer{}
- gremlinBuffer, err := gs.ser.write(gremlin, &buffer)
- if err != nil {
- return nil, err
- }
- request.args["gremlin"] = gremlinBuffer
- return request.args, nil
- default:
- var typeName string
- if gremlin != nil {
- typeName = reflect.TypeOf(gremlin).Name()
- }
-
- return nil, newError(err0704ConvertArgsNoSerializerError, typeName)
- }
-}
-
// serializeMessage serializes a request message into GraphBinary.
func (gs graphBinarySerializer) serializeMessage(request *request) ([]byte, error) {
- args, err := convertArgs(request, gs)
- if err != nil {
- return nil, err
- }
- finalMessage, err := gs.buildMessage(request.requestID, byte(len(graphBinaryMimeType)), request.op, request.processor, args)
+ finalMessage, err := gs.buildMessage(request.gremlin, request.fields)
if err != nil {
return nil, err
}
return finalMessage, nil
}
-func (gs *graphBinarySerializer) buildMessage(id uuid.UUID, mimeLen byte, op string, processor string, args map[string]interface{}) ([]byte, error) {
+func (gs *graphBinarySerializer) buildMessage(gremlin string, args map[string]interface{}) ([]byte, error) {
buffer := bytes.Buffer{}
- // mime header
- buffer.WriteByte(mimeLen)
- buffer.WriteString(graphBinaryMimeType)
-
// Version
buffer.WriteByte(versionByte)
- // Request uuid
- bigIntUUID := uuidToBigInt(id)
- lower := bigIntUUID.Uint64()
- upperBigInt := bigIntUUID.Rsh(&bigIntUUID, 64)
- upper := upperBigInt.Uint64()
- err := binary.Write(&buffer, binary.BigEndian, upper)
+ _, err := gs.ser.writeValue(args, &buffer, false)
if err != nil {
return nil, err
}
- err = binary.Write(&buffer, binary.BigEndian, lower)
+ _, err = gs.ser.writeValue(gremlin, &buffer, false)
if err != nil {
return nil, err
}
- // op
- err = binary.Write(&buffer, binary.BigEndian, uint32(len(op)))
- if err != nil {
- return nil, err
- }
-
- _, err = buffer.WriteString(op)
- if err != nil {
- return nil, err
- }
-
- // processor
- err = binary.Write(&buffer, binary.BigEndian, uint32(len(processor)))
- if err != nil {
- return nil, err
- }
-
- _, err = buffer.WriteString(processor)
- if err != nil {
- return nil, err
- }
-
- // args
- err = binary.Write(&buffer, binary.BigEndian, uint32(len(args)))
- if err != nil {
- return nil, err
- }
- for k, v := range args {
- _, err = gs.ser.write(k, &buffer)
- if err != nil {
- return nil, err
- }
-
- switch t := v.(type) {
- case []byte:
- _, err = buffer.Write(t)
- default:
- _, err = gs.ser.write(t, &buffer)
- }
- if err != nil {
- return nil, err
- }
- }
return buffer.Bytes(), nil
}
-func uuidToBigInt(requestID uuid.UUID) big.Int {
- var bigInt big.Int
- bigInt.SetString(strings.Replace(requestID.String(), "-", "", 4), 16)
- return bigInt
-}
-
// deserializeMessage deserializes a response message.
func (gs graphBinarySerializer) deserializeMessage(message []byte) (response, error) {
var msg response
@@ -192,36 +98,39 @@
gs.ser.logHandler.log(Error, nullInput)
return msg, newError(err0405ReadValueInvalidNullInputError)
}
+ results := make([]interface{}, 0)
- // Skip version and nullable byte.
+ //Skip version and nullable byte.
i := 2
- id, err := readUuid(&message, &i)
- if err != nil {
- return msg, err
- }
- msg.responseID = id.(uuid.UUID)
- msg.responseStatus.code = uint16(readUint32Safe(&message, &i) & 0xFF)
- isMessageValid := readByteSafe(&message, &i)
- if isMessageValid == 0 {
- message, err := readString(&message, &i)
+ // TODO temp serialization before fully streaming set-up
+ for len(message) > 0 {
+ n, err := readFullyQualifiedNullable(&message, &i, true)
if err != nil {
return msg, err
}
- msg.responseStatus.message = message.(string)
+ results = append(results, n)
}
- attr, err := readMapUnqualified(&message, &i)
+ if len(results) == 1 {
+ // unwrap single results
+ msg.responseResult.data = results[0]
+ } else {
+ msg.responseResult.data = results
+ }
+ code := readUint32Safe(&message, &i)
+ msg.responseStatus.code = code
+ statusMsg, err := readUnqualified(&message, &i, stringType, true)
if err != nil {
return msg, err
}
- msg.responseStatus.attributes = attr.(map[string]interface{})
- meta, err := readMapUnqualified(&message, &i)
+ if statusMsg != nil {
+ msg.responseStatus.message = statusMsg.(string)
+ }
+ exception, err := readUnqualified(&message, &i, stringType, true)
if err != nil {
return msg, err
}
- msg.responseResult.meta = meta.(map[string]interface{})
- msg.responseResult.data, err = readFullyQualifiedNullable(&message, &i, true)
- if err != nil {
- return msg, err
+ if exception != nil {
+ msg.responseStatus.exception = exception.(string)
}
return msg, nil
}
diff --git a/gremlin-go/driver/serializer_test.go b/gremlin-go/driver/serializer_test.go
index c2e1d2d..8bd1603 100644
--- a/gremlin-go/driver/serializer_test.go
+++ b/gremlin-go/driver/serializer_test.go
@@ -24,7 +24,6 @@
"fmt"
"testing"
- "github.com/google/uuid"
"github.com/stretchr/testify/assert"
"golang.org/x/text/language"
)
@@ -34,12 +33,9 @@
func TestSerializer(t *testing.T) {
t.Run("test serialized request message", func(t *testing.T) {
- var u, _ = uuid.Parse("41d2e28a-20a4-4ab0-b379-d810dede3786")
testRequest := request{
- requestID: u,
- op: "eval",
- processor: "",
- args: map[string]interface{}{"gremlin": "g.V().count()", "aliases": map[string]interface{}{"g": "g"}},
+ gremlin: "g.V().count()",
+ fields: map[string]interface{}{"aliases": map[string]interface{}{"g": "g"}},
}
serializer := newGraphBinarySerializer(newLogHandler(&defaultLogger{}, Error, language.English))
serialized, _ := serializer.serializeMessage(&testRequest)
@@ -57,8 +53,6 @@
assert.Equal(t, "fb252a4a-75dd-47bf-b74e-5635000c8464", response.responseID.String())
assert.Equal(t, uint16(200), response.responseStatus.code)
assert.Equal(t, "", response.responseStatus.message)
- assert.Equal(t, map[string]interface{}{"host": "/127.0.0.1:62035"}, response.responseStatus.attributes)
- assert.Equal(t, map[string]interface{}{}, response.responseResult.meta)
assert.Equal(t, []interface{}{int64(0)}, response.responseResult.data)
})
@@ -74,21 +68,15 @@
assert.Equal(t, "45de2837-5f3e-4bf9-8685-9b852b97dd44", response.responseID.String())
assert.Equal(t, uint16(200), response.responseStatus.code)
assert.Equal(t, "", response.responseStatus.message)
- assert.Equal(t, map[string]interface{}{"host": "/10.244.0.33:51470"}, response.responseStatus.attributes)
- assert.Equal(t, map[string]interface{}{}, response.responseResult.meta)
assert.NotNil(t, response.responseResult.data)
})
}
func TestSerializerFailures(t *testing.T) {
t.Run("test convertArgs failure", func(t *testing.T) {
- var u, _ = uuid.Parse("41d2e28a-20a4-4ab0-b379-d810dede3786")
testRequest := request{
- requestID: u,
- op: "traversal",
- processor: "",
- // Invalid Input in args, so should fail
- args: map[string]interface{}{"invalidInput": "invalidInput", "aliases": map[string]interface{}{"g": "g"}},
+ // Invalid Input in fields, so should fail
+ fields: map[string]interface{}{"invalidInput": "invalidInput", "aliases": map[string]interface{}{"g": "g"}},
}
serializer := newGraphBinarySerializer(newLogHandler(&defaultLogger{}, Error, language.English))
resp, err := serializer.serializeMessage(&testRequest)
diff --git a/gremlin-go/driver/transporterFactory.go b/gremlin-go/driver/transporterFactory.go
deleted file mode 100644
index 6177120..0000000
--- a/gremlin-go/driver/transporterFactory.go
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-package gremlingo
-
-import (
- "sync"
-)
-
-// TransporterType is an alias for valid transport protocols.
-type TransporterType int
-
-const (
- // Gorilla transport layer: github.com/gorilla/websocket
- Gorilla TransporterType = iota + 1
-)
-
-func getTransportLayer(transporterType TransporterType, url string, connSettings *connectionSettings, logHandler *logHandler) (transporter, error) {
- var transporter transporter
- switch transporterType {
- case Gorilla:
- transporter = &gorillaTransporter{
- url: url,
- logHandler: logHandler,
- connSettings: connSettings,
- writeChannel: make(chan []byte, writeChannelSizeDefault),
- wg: &sync.WaitGroup{},
- }
- default:
- return nil, newError(err0801GetTransportLayerNoTypeError)
- }
- err := transporter.Connect()
- if err != nil {
- return nil, err
- }
- return transporter, nil
-}
diff --git a/gremlin-go/driver/traversal.go b/gremlin-go/driver/traversal.go
index 45908b2..4a7f706 100644
--- a/gremlin-go/driver/traversal.go
+++ b/gremlin-go/driver/traversal.go
@@ -694,7 +694,7 @@
Map: 1,
}
-type io struct {
+type ioconfig struct {
Graphson string
Gryo string
Graphml string
@@ -703,14 +703,14 @@
Registry string
}
-// IO holds configuration options to be passed to the GraphTraversal.io.
-var IO = io{
+// IO holds configuration options to be passed to the GraphTraversal.ioconfig.
+var IO = ioconfig{
Graphson: "graphson",
Gryo: "gryo",
Graphml: "graphml",
- Reader: "~tinkerpop.io.reader",
- Writer: "~tinkerpop.io.writer",
- Registry: "~tinkerpop.io.registry",
+ Reader: "~tinkerpop.ioconfig.reader",
+ Writer: "~tinkerpop.ioconfig.writer",
+ Registry: "~tinkerpop.ioconfig.registry",
}
// Metrics holds metrics data; typically for .profile()-step analysis. Metrics may be nested. Nesting enables
diff --git a/gremlin-go/driver/traversal_test.go b/gremlin-go/driver/traversal_test.go
index 1629366..c8d130d 100644
--- a/gremlin-go/driver/traversal_test.go
+++ b/gremlin-go/driver/traversal_test.go
@@ -173,9 +173,6 @@
err = tx.Rollback()
assert.Nil(t, err)
assert.False(t, tx.IsOpen())
-
- // sessions should be removed when transaction closed
- assert.Equal(t, 0, len(remote.spawnedSessions))
})
t.Run("Test multi commit Transaction", func(t *testing.T) {
@@ -525,6 +522,71 @@
assert.True(t, results[0].GetType().Kind() == reflect.Map)
})
+
+ t.Run("Test should extract ID from Vertex", func(t *testing.T) {
+ g := cloneGraphTraversalSource(&Graph{}, NewBytecode(nil), nil)
+
+ // Test basic V() step with mixed ID types
+ vStart := g.V(1, &Vertex{Element: Element{Id: 2}})
+ vStartBytecode := vStart.Bytecode
+ assert.Equal(t, 1, len(vStartBytecode.stepInstructions))
+ assert.Equal(t, "V", vStartBytecode.stepInstructions[0].operator)
+ assert.Equal(t, 1, vStartBytecode.stepInstructions[0].arguments[0])
+ assert.Equal(t, 2, vStartBytecode.stepInstructions[0].arguments[1]) // ID should be extracted from Vertex
+
+ // Test V() step in the middle of a traversal
+ vMid := g.Inject("foo").V(1, &Vertex{Element: Element{Id: 2}})
+ vMidBytecode := vMid.Bytecode
+ assert.Equal(t, 2, len(vMidBytecode.stepInstructions))
+ assert.Equal(t, "inject", vMidBytecode.stepInstructions[0].operator)
+ assert.Equal(t, "foo", vMidBytecode.stepInstructions[0].arguments[0])
+ assert.Equal(t, "V", vMidBytecode.stepInstructions[1].operator)
+ assert.Equal(t, 1, vMidBytecode.stepInstructions[1].arguments[0])
+ assert.Equal(t, 2, vMidBytecode.stepInstructions[1].arguments[1]) // ID should be extracted from Vertex
+
+ // Test edge creation with from/to vertices
+ fromTo := g.AddE("Edge").From(&Vertex{Element: Element{Id: 1}}).To(&Vertex{Element: Element{Id: 2}})
+ fromToBytecode := fromTo.Bytecode
+ assert.Equal(t, 3, len(fromToBytecode.stepInstructions))
+ assert.Equal(t, "addE", fromToBytecode.stepInstructions[0].operator)
+ assert.Equal(t, "Edge", fromToBytecode.stepInstructions[0].arguments[0])
+ assert.Equal(t, "from", fromToBytecode.stepInstructions[1].operator)
+ assert.Equal(t, 1, fromToBytecode.stepInstructions[1].arguments[0]) // ID should be extracted from Vertex
+ assert.Equal(t, "to", fromToBytecode.stepInstructions[2].operator)
+ assert.Equal(t, 2, fromToBytecode.stepInstructions[2].arguments[0]) // ID should be extracted from Vertex
+
+ // Test mergeE() with Vertex in map
+ mergeMap := map[interface{}]interface{}{
+ T.Label: "knows",
+ Direction.Out: &Vertex{Element: Element{Id: 1}},
+ Direction.In: &Vertex{Element: Element{Id: 2}},
+ }
+
+ mergeEStart := g.MergeE(mergeMap)
+ mergeEStartBytecode := mergeEStart.Bytecode
+ assert.Equal(t, 1, len(mergeEStartBytecode.stepInstructions))
+ assert.Equal(t, "mergeE", mergeEStartBytecode.stepInstructions[0].operator)
+
+ // Check that the map contains extracted IDs
+ mergeMapArg := mergeEStartBytecode.stepInstructions[0].arguments[0].(map[interface{}]interface{})
+ assert.Equal(t, "knows", mergeMapArg[T.Label])
+ assert.Equal(t, 1, mergeMapArg[Direction.Out]) // ID should be extracted from Vertex
+ assert.Equal(t, 2, mergeMapArg[Direction.In]) // ID should be extracted from Vertex
+
+ // Test mergeE() in the middle of a traversal
+ mergeEMid := g.Inject("foo").MergeE(mergeMap)
+ mergeEMidBytecode := mergeEMid.Bytecode
+ assert.Equal(t, 2, len(mergeEMidBytecode.stepInstructions))
+ assert.Equal(t, "inject", mergeEMidBytecode.stepInstructions[0].operator)
+ assert.Equal(t, "foo", mergeEMidBytecode.stepInstructions[0].arguments[0])
+ assert.Equal(t, "mergeE", mergeEMidBytecode.stepInstructions[1].operator)
+
+ // Check that the map contains extracted IDs
+ mergeMapArg2 := mergeEMidBytecode.stepInstructions[1].arguments[0].(map[interface{}]interface{})
+ assert.Equal(t, "knows", mergeMapArg2[T.Label])
+ assert.Equal(t, 1, mergeMapArg2[Direction.Out]) // ID should be extracted from Vertex
+ assert.Equal(t, 2, mergeMapArg2[Direction.In]) // ID should be extracted from Vertex
+ })
}
func newWithOptionsConnection(t *testing.T) *GraphTraversalSource {
diff --git a/gremlin-go/driver/user_agent.go b/gremlin-go/driver/user_agent.go
index f40fc2d..afdf50b 100644
--- a/gremlin-go/driver/user_agent.go
+++ b/gremlin-go/driver/user_agent.go
@@ -27,7 +27,7 @@
)
/**
- * User Agent body to be sent in web socket handshake
+ * User Agent header to be sent in the http request
* Has the form of:
* [Application Name] [GLV Name]/[Version] [Language Runtime Version] [OS]/[Version] [CPU Architecture]
* Note: Go does not have any builtin functionality to detect the OS version, therefore OS version will always be
@@ -37,7 +37,7 @@
const userAgentHeader = "User-Agent"
-const gremlinVersion = "3.8.0-SNAPSHOT" // DO NOT MODIFY - Configured automatically by Maven Replacer Plugin
+const gremlinVersion = "4.0.0-SNAPSHOT" // DO NOT MODIFY - Configured automatically by Maven Replacer Plugin
func init() {
applicationName := "NotAvailable"
diff --git a/gremlin-go/examples/basic_gremlin.go b/gremlin-go/examples/basic_gremlin.go
index 0ab2b11..9586130 100644
--- a/gremlin-go/examples/basic_gremlin.go
+++ b/gremlin-go/examples/basic_gremlin.go
@@ -26,7 +26,7 @@
)
func main() {
- driverRemoteConnection, err := gremlingo.NewDriverRemoteConnection("ws://localhost:8182/gremlin")
+ driverRemoteConnection, err := gremlingo.NewDriverRemoteConnection("http://localhost:8182/gremlin")
if err != nil {
fmt.Println(err)
return
@@ -66,4 +66,4 @@
for _, person := range peopleMarkoKnows {
fmt.Println("marko knows", person.GetString())
}
-}
\ No newline at end of file
+}
diff --git a/gremlin-go/examples/connections.go b/gremlin-go/examples/connections.go
index 75c64c7..c263644 100644
--- a/gremlin-go/examples/connections.go
+++ b/gremlin-go/examples/connections.go
@@ -21,8 +21,6 @@
import (
"fmt"
-
- "github.com/apache/tinkerpop/gremlin-go/v3/driver"
)
func main() {
@@ -31,8 +29,8 @@
}
func withRemote() {
- // Creating the connection to the server
- driverRemoteConnection, err := gremlingo.NewDriverRemoteConnection("ws://localhost:8182/gremlin")
+ // Creating the connection to the server
+ driverRemoteConnection, err := gremlingo.NewDriverRemoteConnection("http://localhost:8182/gremlin")
// Error handling
if err != nil {
@@ -46,19 +44,19 @@
// Creating graph traversal
g := gremlingo.Traversal_().With(driverRemoteConnection)
- // Drop existing vertices
- prom := g.V().Drop().Iterate()
- <-prom
+ // Drop existing vertices
+ prom := g.V().Drop().Iterate()
+ <-prom
- // Simple query to verify connection
- g.AddV().Iterate()
- count, _ := g.V().Count().Next()
- fmt.Println("Vertex count:", *count)
+ // Simple query to verify connection
+ g.AddV().Iterate()
+ count, _ := g.V().Count().Next()
+ fmt.Println("Vertex count:", *count)
}
func withConfigs() {
// Connecting to the server with customized configurations
- driverRemoteConnection, err := gremlingo.NewDriverRemoteConnection("ws://localhost:8182/gremlin",
+ driverRemoteConnection, err := gremlingo.NewDriverRemoteConnection("http://localhost:8182/gremlin",
func(settings *gremlingo.DriverRemoteConnectionSettings) {
settings.TraversalSource = "g"
settings.NewConnectionThreshold = 4
@@ -75,7 +73,7 @@
defer driverRemoteConnection.Close()
g := gremlingo.Traversal_().WithRemote(driverRemoteConnection)
- g.AddV().Iterate()
- count, _ := g.V().Count().Next()
- fmt.Println("Vertex count:", *count)
-}
\ No newline at end of file
+ g.AddV().Iterate()
+ count, _ := g.V().Count().Next()
+ fmt.Println("Vertex count:", *count)
+}
diff --git a/gremlin-go/examples/modern_traversals.go b/gremlin-go/examples/modern_traversals.go
index a1c9ad8..514196b 100644
--- a/gremlin-go/examples/modern_traversals.go
+++ b/gremlin-go/examples/modern_traversals.go
@@ -30,7 +30,7 @@
var P = gremlingo.P
func main() {
- driverRemoteConnection, err := gremlingo.NewDriverRemoteConnection("ws://localhost:8182/gremlin")
+ driverRemoteConnection, err := gremlingo.NewDriverRemoteConnection("http://localhost:8182/gremlin")
if err != nil {
fmt.Println(err)
return
diff --git a/gremlin-go/go.mod b/gremlin-go/go.mod
index 531516c..a7d64a5 100644
--- a/gremlin-go/go.mod
+++ b/gremlin-go/go.mod
@@ -22,11 +22,9 @@
require (
github.com/cucumber/godog v0.15.0
github.com/google/uuid v1.6.0
- github.com/gorilla/websocket v1.5.3
github.com/nicksnyder/go-i18n/v2 v2.5.0
github.com/stretchr/testify v1.9.0
golang.org/x/text v0.21.0
- gopkg.in/yaml.v3 v3.0.1
)
require (
@@ -39,5 +37,5 @@
github.com/hashicorp/golang-lru v0.5.4 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
- github.com/stretchr/objx v0.5.2 // indirect
+ gopkg.in/yaml.v3 v3.0.1 // indirect
)
diff --git a/gremlin-go/go.sum b/gremlin-go/go.sum
index 6586cbb..87eb5ea 100644
--- a/gremlin-go/go.sum
+++ b/gremlin-go/go.sum
@@ -16,8 +16,6 @@
github.com/gofrs/uuid v4.3.1+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
-github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
github.com/hashicorp/go-immutable-radix v1.3.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc=
github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
@@ -46,8 +44,6 @@
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
-github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
diff --git a/gremlin-go/pom.xml b/gremlin-go/pom.xml
index 475ee64..bbd9532 100644
--- a/gremlin-go/pom.xml
+++ b/gremlin-go/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>gremlin-go</artifactId>
<name>Apache TinkerPop :: Gremlin Go</name>
@@ -86,9 +86,10 @@
<id>glv-go</id>
<activation>
<activeByDefault>false</activeByDefault>
- <file>
- <exists>.glv</exists>
- </file>
+ <!-- TODO re-enable after gremlin-go is implemented -->
+<!-- <file>-->
+<!-- <exists>.glv</exists>-->
+<!-- </file>-->
</activation>
<build>
<directory>${basedir}/target</directory>
diff --git a/gremlin-groovy/pom.xml b/gremlin-groovy/pom.xml
index 449718a..5b7af40 100644
--- a/gremlin-groovy/pom.xml
+++ b/gremlin-groovy/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>gremlin-groovy</artifactId>
<name>Apache TinkerPop :: Gremlin Groovy</name>
@@ -60,11 +60,6 @@
</dependency>
<dependency>
<groupId>org.apache.groovy</groupId>
- <artifactId>groovy-json</artifactId>
- <version>${groovy.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.groovy</groupId>
<artifactId>groovy-jsr223</artifactId>
<version>${groovy.version}</version>
</dependency>
diff --git a/gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/jsr223/ast/RepeatASTTransformationCustomizer.groovy b/gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/jsr223/ast/RepeatASTTransformationCustomizer.groovy
index e7d3107..fe5f43b 100644
--- a/gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/jsr223/ast/RepeatASTTransformationCustomizer.groovy
+++ b/gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/jsr223/ast/RepeatASTTransformationCustomizer.groovy
@@ -31,7 +31,7 @@
* Overrides the single application of the specified global AST Transformation (which is how the base
* {@code ASTTransformationCustomizer} works. That approach is not so helpful in the ScriptEngine where we want
* each script to be treated as an independent source unit. This is a bit of a hack but the use case here is fairly
- * narrow (i.e. {@code VarAsBindingASTTransformation})
+ * narrow
*/
class RepeatASTTransformationCustomizer extends ASTTransformationCustomizer {
RepeatASTTransformationCustomizer(final ASTTransformation transformation) {
diff --git a/gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/jsr223/ast/VarAsBindingASTTransformation.groovy b/gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/jsr223/ast/VarAsBindingASTTransformation.groovy
deleted file mode 100644
index 3f76143..0000000
--- a/gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/jsr223/ast/VarAsBindingASTTransformation.groovy
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tinkerpop.gremlin.groovy.jsr223.ast
-
-import org.apache.tinkerpop.gremlin.process.traversal.Order
-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.Translator
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode
-import org.apache.tinkerpop.gremlin.process.traversal.Bindings
-import org.apache.tinkerpop.gremlin.util.CollectionUtil
-import org.codehaus.groovy.ast.ASTNode
-import org.codehaus.groovy.ast.ClassNode
-import org.codehaus.groovy.ast.CodeVisitorSupport
-import org.codehaus.groovy.ast.expr.ArgumentListExpression
-import org.codehaus.groovy.ast.expr.ClassExpression
-import org.codehaus.groovy.ast.expr.ConstantExpression
-import org.codehaus.groovy.ast.expr.DeclarationExpression
-import org.codehaus.groovy.ast.expr.Expression
-import org.codehaus.groovy.ast.expr.MethodCallExpression
-import org.codehaus.groovy.ast.expr.PropertyExpression
-import org.codehaus.groovy.ast.expr.StaticMethodCallExpression
-import org.codehaus.groovy.ast.expr.TupleExpression
-import org.codehaus.groovy.ast.expr.VariableExpression
-import org.codehaus.groovy.ast.stmt.ExpressionStatement
-import org.codehaus.groovy.control.CompilePhase
-import org.codehaus.groovy.control.SourceUnit
-import org.codehaus.groovy.syntax.Token
-import org.codehaus.groovy.syntax.Types
-import org.codehaus.groovy.transform.ASTTransformation
-import org.codehaus.groovy.transform.GroovyASTTransformation
-
-/**
- * Converts variables used in Gremlin to {@link Bindings} declarations. By doing this, the generated traversal ends up
- * having those {@link Bindings} in the Gremlin {@link Bytecode} which means that when passed through a
- * {@link Translator} to generate a script form, the variables are preserved.
- * <p/>
- * This AST Transformation is meant to work with a single lines of Gremlin and only Gremlin. Inclusion of Groovy code
- * might produce odd behavior as all variables found are basically treated as bindings which is not desirable for
- * scripts in general.
- * <p/>
- * This class is meant for internal use only at this time as it has incomplete coverage over from the gherkin tests.
- */
-@GroovyASTTransformation(phase = CompilePhase.SEMANTIC_ANALYSIS)
-class VarAsBindingASTTransformation implements ASTTransformation {
-
- private def bindingVariableName = 'bInDiNg' + UUID.randomUUID().toString().replace('-', '')
-
- @Override
- void visit(ASTNode[] nodes, SourceUnit source) {
- // inject a binding declaration here using a unique variable name that should not interfere with variables
- // in the Gremlin itself - basically generates the following line right before the Gremlin statement:
- // bInDiNg<uuid> = Bindings.instance()
- source.AST.statementBlock.statements.add(0, new ExpressionStatement(
- new DeclarationExpression(
- new VariableExpression(bindingVariableName, new ClassNode(Bindings)),
- Token.newSymbol(Types.EQUAL, 0, 0),
- new StaticMethodCallExpression(new ClassNode(Bindings), "instance", new TupleExpression())
- )
- ))
-
- // analyze the Gremlin and detect variables replacing them with:
- // bInDiNg<uuid>.of(<var>,<some-default>)
- source.AST.statementBlock.statements[1].visit(new CodeVisitorSupport() {
-
- def currentMethod
-
- @Override
- void visitMethodCallExpression(MethodCallExpression call) {
- currentMethod = call.methodAsString
- call.getArguments().visit(this)
- call.getObjectExpression().visit(this)
- }
-
- @Override
- void visitArgumentlistExpression(ArgumentListExpression expression) {
- if (!expression.empty) {
- expression.eachWithIndex{ Expression entry, int i ->
- if (entry instanceof VariableExpression) {
- if (entry.getName() == "Infinity")
- return
-
- // need a default binding value - any nonsense that satisfies the step argument should
- // work typically. the string default works for a great many cases, but sometimes we
- // need to get more specific. as it sits this list is incomplete and certain bindings
- // in certain position may generate errors still, but the entire set of gherkin files
- // passes with what is specified here currently. more tests will come as we build out
- // wider Gremlin coverage after the test suite is unified. as this body of code is
- // meant for testing only and it is documented as such it seems ok to leave this as-is
- // until we build out more Gherkin tests to expose any shortcomings.
- def bindingValue = new ConstantExpression(UUID.randomUUID().toString())
- switch (currentMethod) {
- case GraphTraversal.Symbols.map:
- case GraphTraversal.Symbols.filter:
- case GraphTraversal.Symbols.flatMap:
- case GraphTraversal.Symbols.sideEffect:
- case GraphTraversal.Symbols.choose:
- case GraphTraversal.Symbols.until:
- case GraphTraversal.Symbols.branch:
- bindingValue = new StaticMethodCallExpression(new ClassNode(__), "identity", new TupleExpression())
- break
- case GraphTraversal.Symbols.by:
- if (i == 1) bindingValue = new PropertyExpression(new ClassExpression(new ClassNode(Order)), "desc")
- break
- case GraphTraversal.Symbols.mergeE:
- case GraphTraversal.Symbols.mergeV:
- bindingValue = new MethodCallExpression(
- new ClassExpression(new ClassNode(CollectionUtil)), "asMap",
- new TupleExpression(new ConstantExpression(UUID.randomUUID().toString()),
- new ConstantExpression(UUID.randomUUID().toString())))
- break
- case GraphTraversal.Symbols.call:
- case GraphTraversal.Symbols.option:
- if (i == 1)
- bindingValue = new MethodCallExpression(
- new ClassExpression(new ClassNode(CollectionUtil)), "asMap",
- new TupleExpression(new ConstantExpression(UUID.randomUUID().toString()),
- new ConstantExpression(UUID.randomUUID().toString())))
- break
- }
- def bindingExpression = createBindingFromVar(entry.text, bindingVariableName, bindingValue)
- bindingExpression.sourcePosition = entry
- bindingExpression.copyNodeMetaData(entry)
- expression.expressions[i] = bindingExpression
- }
- }
- }
- super.visitArgumentlistExpression(expression)
- }
- })
- }
-
- private static def createBindingFromVar(String nameOfVar, String bindingVariableName, Expression bindingValue) {
- return new MethodCallExpression(
- new VariableExpression(bindingVariableName),
- new ConstantExpression("of"),
- new ArgumentListExpression(
- new ConstantExpression(nameOfVar),
- bindingValue
- )
- )
- }
-}
diff --git a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutor.java b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutor.java
index 9010578..38b21c1 100644
--- a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutor.java
+++ b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutor.java
@@ -19,19 +19,15 @@
package org.apache.tinkerpop.gremlin.groovy.engine;
import org.apache.commons.lang3.ClassUtils;
-import org.apache.commons.lang3.exception.ExceptionUtils;
import org.apache.commons.lang3.concurrent.BasicThreadFactory;
-import org.apache.tinkerpop.gremlin.jsr223.GremlinScriptChecker;
+import org.apache.commons.lang3.exception.ExceptionUtils;
import org.apache.tinkerpop.gremlin.jsr223.CachedGremlinScriptEngineManager;
import org.apache.tinkerpop.gremlin.jsr223.ConcurrentBindings;
import org.apache.tinkerpop.gremlin.jsr223.GremlinPlugin;
+import org.apache.tinkerpop.gremlin.jsr223.GremlinScriptChecker;
import org.apache.tinkerpop.gremlin.jsr223.GremlinScriptEngine;
import org.apache.tinkerpop.gremlin.jsr223.GremlinScriptEngineManager;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.util.BytecodeHelper;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalInterruptedException;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -40,7 +36,6 @@
import javax.script.CompiledScript;
import javax.script.ScriptException;
import javax.script.SimpleBindings;
-
import java.io.InterruptedIOException;
import java.lang.ref.WeakReference;
import java.lang.reflect.Method;
@@ -192,12 +187,12 @@
* result after script evaluates but before transaction commit and before the returned {@link CompletableFuture}
* is completed.
*
- * @param gremlin the script or bytecode to evaluate
+ * @param gremlin the script to evaluate
* @param language the language to evaluate it in
* @param boundVars the bindings to evaluate in the context of the script
* @param transformResult a {@link Function} that transforms the result - can be {@code null}
*/
- public CompletableFuture<Object> eval(final Object gremlin, final String language, final Map<String, Object> boundVars,
+ public CompletableFuture<Object> eval(final String gremlin, final String language, final Map<String, Object> boundVars,
final Function<Object, Object> transformResult) {
return eval(gremlin, language, new SimpleBindings(boundVars), transformResult, null);
}
@@ -207,13 +202,13 @@
* result after script evaluates but before transaction commit and before the returned {@link CompletableFuture}
* is completed.
*
- * @param gremlin the script or bytecode to evaluate
+ * @param gremlin the script to evaluate
* @param language the language to evaluate it in
* @param boundVars the bindings to evaluate in the context of the script
* @param timeOut optional override for evaluation timeout
* @param transformResult a {@link Function} that transforms the result - can be {@code null}
*/
- public CompletableFuture<Object> eval(final Object gremlin, final String language, final Map<String, Object> boundVars,
+ public CompletableFuture<Object> eval(final String gremlin, final String language, final Map<String, Object> boundVars,
final Long timeOut, final Function<Object, Object> transformResult) {
return eval(gremlin, language, new SimpleBindings(boundVars), timeOut, transformResult, null);
}
@@ -240,13 +235,13 @@
* processing after the script evaluates and after the {@link CompletableFuture} is completed, but before the
* transaction is committed.
*
- * @param gremlin the script or bytecode to evaluate
+ * @param gremlin the script to evaluate
* @param language the language to evaluate it in
* @param boundVars the bindings to evaluate in the context of the script
* @param transformResult a {@link Function} that transforms the result - can be {@code null}
* @param withResult a {@link Consumer} that accepts the result - can be {@code null}
*/
- public CompletableFuture<Object> eval(final Object gremlin, final String language, final Bindings boundVars,
+ public CompletableFuture<Object> eval(final String gremlin, final String language, final Bindings boundVars,
final Function<Object, Object> transformResult, final Consumer<Object> withResult) {
return eval(gremlin, language, boundVars, null, transformResult, withResult);
}
@@ -258,14 +253,14 @@
* processing after the script evaluates and after the {@link CompletableFuture} is completed, but before the
* transaction is committed.
*
- * @param gremlin the script or bytecode to evaluate
+ * @param gremlin the script to evaluate
* @param language the language to evaluate it in
* @param boundVars the bindings to evaluate in the context of the script
* @param timeOut optional override for evaluation timeout
* @param transformResult a {@link Function} that transforms the result - can be {@code null}
* @param withResult a {@link Consumer} that accepts the result - can be {@code null}
*/
- public CompletableFuture<Object> eval(final Object gremlin, final String language, final Bindings boundVars, final Long timeOut,
+ public CompletableFuture<Object> eval(final String gremlin, final String language, final Bindings boundVars, final Long timeOut,
final Function<Object, Object> transformResult, final Consumer<Object> withResult) {
final LifeCycle lifeCycle = LifeCycle.build()
.evaluationTimeoutOverride(timeOut)
@@ -278,12 +273,12 @@
/**
* Evaluate a script and allow for the submission of alteration to the entire evaluation execution lifecycle.
*
- * @param gremlin the script or bytecode to evaluate
+ * @param gremlin the script to evaluate
* @param language the language to evaluate it in
* @param boundVars the bindings to evaluate in the context of the script
* @param lifeCycle a set of functions that can be applied at various stages of the evaluation process
*/
- public CompletableFuture<Object> eval(final Object gremlin, final String language, final Bindings boundVars, final LifeCycle lifeCycle) {
+ public CompletableFuture<Object> eval(final String gremlin, final String language, final Bindings boundVars, final LifeCycle lifeCycle) {
final String lang = Optional.ofNullable(language).orElse("gremlin-groovy");
if (logger.isDebugEnabled()) {
@@ -296,9 +291,7 @@
// override the timeout if the lifecycle has a value assigned. if the script contains with(timeout)
// options then allow that value to override what's provided on the lifecycle
- final Optional<Long> timeoutDefinedInScript = gremlin instanceof String
- ? GremlinScriptChecker.parse((String) gremlin).getTimeout()
- : Optional.empty();
+ final Optional<Long> timeoutDefinedInScript = GremlinScriptChecker.parse(gremlin).getTimeout();
final long scriptEvalTimeOut = timeoutDefinedInScript.orElse(
lifeCycle.getEvaluationTimeoutOverride().orElse(evaluationTimeout));
@@ -309,21 +302,7 @@
logger.debug("Evaluating script - {} - in thread [{}]", gremlin, Thread.currentThread().getName());
- Object o;
- if (gremlin instanceof String) {
- o = gremlinScriptEngineManager.getEngineByName(lang).eval((String) gremlin, bindings);
- }
- else if (gremlin instanceof Bytecode) {
- final Bytecode bytecode = (Bytecode) gremlin;
- final Traversal.Admin<?, ?> traversal = eval(
- bytecode, bindings, BytecodeHelper.getLambdaLanguage(bytecode).orElse("gremlin-groovy"), "g");
-
- o = IteratorUtils.asList(traversal);
- }
- else {
- throw new IllegalArgumentException("Invalid gremlin type.");
- }
-
+ final Object o =gremlinScriptEngineManager.getEngineByName(lang).eval(gremlin, bindings);
// apply a transformation before sending back the result - useful when trying to force serialization
// in the same thread that the eval took place given ThreadLocal nature of graphs as well as some
@@ -392,19 +371,6 @@
return evaluationFuture;
}
- /**
- * Evaluates bytecode with bindings for a specific language into a {@link Traversal}.
- */
- public Traversal.Admin eval(final Bytecode bytecode, final Bindings boundVars, final String language, final String traversalSource) throws ScriptException {
- final String lang = Optional.ofNullable(language).orElse("gremlin-groovy");
-
- final Bindings bindings = new SimpleBindings();
- bindings.putAll(globalBindings);
- bindings.putAll(boundVars);
-
- return gremlinScriptEngineManager.getEngineByName(lang).eval(bytecode, bindings, traversalSource);
- }
-
public GremlinScriptEngineManager getScriptEngineManager() {
return this.gremlinScriptEngineManager;
}
diff --git a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngine.java b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngine.java
index 0c5aa49..aa3e24a 100644
--- a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngine.java
+++ b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngine.java
@@ -37,12 +37,6 @@
import org.apache.tinkerpop.gremlin.jsr223.GremlinScriptEngine;
import org.apache.tinkerpop.gremlin.jsr223.GremlinScriptEngineFactory;
import org.apache.tinkerpop.gremlin.jsr223.ImportCustomizer;
-import org.apache.tinkerpop.gremlin.jsr223.TranslatorCustomizer;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
-import org.apache.tinkerpop.gremlin.process.traversal.Translator;
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
-import org.apache.tinkerpop.gremlin.process.traversal.translator.GroovyTranslator;
import org.codehaus.groovy.ast.ClassHelper;
import org.codehaus.groovy.ast.ClassNode;
import org.codehaus.groovy.control.CompilationFailedException;
@@ -79,7 +73,6 @@
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import java.util.concurrent.atomic.AtomicLong;
-import java.util.regex.Pattern;
import java.util.stream.Collectors;
/**
@@ -140,7 +133,6 @@
*/
public static final String COLLECTED_BOUND_VARS_MAP_VARNAME = "gremlin_script_engine_collected_boundvars";
- private static final Pattern patternImportStatic = Pattern.compile("\\Aimport\\sstatic.*");
public static final ThreadLocal<Map<String, Object>> COMPILE_OPTIONS = new ThreadLocal<Map<String, Object>>() {
@Override
@@ -186,7 +178,6 @@
private volatile GremlinGroovyScriptEngineFactory factory;
- private static final String STATIC = "static";
private static final String SCRIPT = "Script";
private static final String DOT_GROOVY = ".groovy";
private static final String GROOVY_LANG_SCRIPT = "groovy.lang.Script";
@@ -198,7 +189,6 @@
private final boolean interpreterModeEnabled;
private final long expectedCompilationTime;
- private final Optional<Translator.ScriptTranslator.TypeTranslator> typeTranslator;
/**
* There is no need to require type checking infrastructure if type checking is not enabled.
@@ -257,11 +247,6 @@
interpreterModeEnabled = groovyCustomizers.stream()
.anyMatch(p -> p.getClass().equals(InterpreterModeGroovyCustomizer.class));
- final Optional<TranslatorCustomizer> translatorCustomizer = listOfCustomizers.stream().
- filter(p -> p instanceof TranslatorCustomizer).
- map(p -> (TranslatorCustomizer) p).findFirst();
- typeTranslator = translatorCustomizer.map(TranslatorCustomizer::createTypeTranslator);
-
createClassLoader();
}
@@ -272,35 +257,6 @@
return loadedPlugins;
}
- @Override
- public Traversal.Admin eval(final Bytecode bytecode, final Bindings bindings, final String traversalSource) throws ScriptException {
- // these validations occur before merging in bytecode bindings which will override existing ones. need to
- // extract the named traversalsource prior to that happening so that bytecode bindings can share the same
- // namespace as global bindings (e.g. traversalsources and graphs).
- if (traversalSource.equals(HIDDEN_G))
- throw new IllegalArgumentException("The traversalSource cannot have the name " + HIDDEN_G + " - it is reserved");
-
- if (bindings.containsKey(HIDDEN_G))
- throw new IllegalArgumentException("Bindings cannot include " + HIDDEN_G + " - it is reserved");
-
- if (!bindings.containsKey(traversalSource))
- throw new IllegalArgumentException("The bindings available to the ScriptEngine do not contain a traversalSource named: " + traversalSource);
-
- final Object b = bindings.get(traversalSource);
- if (!(b instanceof TraversalSource))
- throw new IllegalArgumentException(traversalSource + " is of type " + b.getClass().getSimpleName() + " and is not an instance of TraversalSource");
-
- final Bindings inner = new SimpleBindings();
- inner.putAll(bindings);
- inner.putAll(bytecode.getBindings());
- inner.put(HIDDEN_G, b);
- // DefaultTypeTranslator isn't thread-safe so a new one needs to be instantiated to keep this ScriptEngine thread-safe.
- final Translator.ScriptTranslator.TypeTranslator translator = typeTranslator.isPresent() ? typeTranslator.get() : new GroovyTranslator.DefaultTypeTranslator(false);
- org.apache.tinkerpop.gremlin.process.traversal.Script script = GroovyTranslator.of(HIDDEN_G, translator).translate(bytecode);
- script.getParameters().ifPresent(inner::putAll);
- return (Traversal.Admin) this.eval(script.getScript(), inner);
- }
-
/**
* Resets the entire {@code GremlinGroovyScriptEngine} by clearing script caches, recreating the classloader,
* clearing bindings.
diff --git a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTest.java b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTest.java
index e7facf8..9c8f9ac 100644
--- a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTest.java
+++ b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTest.java
@@ -21,24 +21,22 @@
import groovy.lang.Closure;
import groovy.lang.MissingMethodException;
import groovy.lang.MissingPropertyException;
-import org.apache.commons.lang3.exception.ExceptionUtils;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.MapConfiguration;
import org.apache.commons.lang3.concurrent.BasicThreadFactory;
+import org.apache.commons.lang3.exception.ExceptionUtils;
import org.apache.tinkerpop.gremlin.groovy.jsr223.ast.AmbiguousMethodASTTransformation;
import org.apache.tinkerpop.gremlin.groovy.jsr223.ast.RepeatASTTransformationCustomizer;
-import org.apache.tinkerpop.gremlin.groovy.jsr223.ast.VarAsBindingASTTransformation;
import org.apache.tinkerpop.gremlin.jsr223.DefaultImportCustomizer;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
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.GraphTraversal;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.HasStep;
+import org.apache.tinkerpop.gremlin.process.traversal.strategy.AbstractTraversalStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SubgraphStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ReadOnlyStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.translator.DotNetTranslator;
-import org.apache.tinkerpop.gremlin.process.traversal.translator.JavascriptTranslator;
-import org.apache.tinkerpop.gremlin.process.traversal.translator.PythonTranslator;
import org.apache.tinkerpop.gremlin.structure.Column;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
import org.apache.tinkerpop.gremlin.util.function.Lambda;
import org.javatuples.Pair;
@@ -53,9 +51,11 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Optional;
+import java.util.Set;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
@@ -80,8 +80,7 @@
private static final Object[] EMPTY_ARGS = new Object[0];
private static final GremlinGroovyScriptEngine ambiguousNullEngine = new GremlinGroovyScriptEngine(
- (GroovyCustomizer) () -> new RepeatASTTransformationCustomizer(new AmbiguousMethodASTTransformation()),
- (GroovyCustomizer) () -> new RepeatASTTransformationCustomizer(new VarAsBindingASTTransformation()));
+ (GroovyCustomizer) () -> new RepeatASTTransformationCustomizer(new AmbiguousMethodASTTransformation()));
@Test
public void shouldNotCacheGlobalFunctions() throws Exception {
@@ -475,122 +474,6 @@
}
@Test
- public void shouldProduceBindingsForVars() throws Exception {
- final GremlinGroovyScriptEngine engine = new GremlinGroovyScriptEngine(
- (GroovyCustomizer) () -> new RepeatASTTransformationCustomizer(new AmbiguousMethodASTTransformation()),
- (GroovyCustomizer) () -> new RepeatASTTransformationCustomizer(new VarAsBindingASTTransformation()));
-
- final GraphTraversalSource g = traversal().withEmbedded(EmptyGraph.instance());
- final Bindings bindings = new SimpleBindings();
- bindings.put("g", g);
- engine.eval("g.V(b).out()", bindings);
- final Traversal.Admin<Vertex, Vertex> t = (Traversal.Admin<Vertex, Vertex>)
- engine.eval("g.V(v1Id).has(\"person\",\"age\",29).has('person','active',x).in(\"knows\")." +
- System.lineSeparator() +
- "mergeE(m1).mergeV(m2).option(Merge.onCreate,m3).mergeV(__.identity())." +
- System.lineSeparator() +
- "choose(__.out().count()).option(two, __.values(\"name\")).option(three, __.values(\"age\"))." +
- System.lineSeparator() +
- "filter(outE().count().is(y))." +
- System.lineSeparator() +
- "map(l)." +
- System.lineSeparator() +
- "order().by('name',o)", bindings);
- final Bytecode bytecode = t.getBytecode();
- engine.eval("g.V(b).out()", bindings);
-
- final PythonTranslator translator = PythonTranslator.of("g");
- final String gremlinAsPython = translator.translate(bytecode).getScript();
-
- final Map<String,Object> bytecodeBindings = bytecode.getBindings();
- assertEquals(10, bytecodeBindings.size());
- assertThat(bytecodeBindings.containsKey("x"), is(true));
- assertThat(bytecodeBindings.containsKey("y"), is(true));
- assertThat(bytecodeBindings.containsKey("v1Id"), is(true));
- assertThat(bytecodeBindings.containsKey("l"), is(true));
- assertThat(bytecodeBindings.containsKey("o"), is(true));
- assertThat(bytecodeBindings.containsKey("m1"), is(true));
- assertThat(bytecodeBindings.containsKey("m2"), is(true));
- assertThat(bytecodeBindings.containsKey("m3"), is(true));
- assertThat(bytecodeBindings.containsKey("two"), is(true));
- assertThat(bytecodeBindings.containsKey("three"), is(true));
-
- assertEquals("g.V(v1Id).has('person','age',29).has('person','active',x).in_('knows').merge_e(m1).merge_v(m2).option(Merge.on_create,m3).merge_v(__.identity()).choose(__.out().count()).option(two,__.name).option(three,__.age).filter_(__.out_e().count().is_(y)).map(l).order().by('name',o)", gremlinAsPython);
- }
-
- @Test
- public void shouldHandleNaNInf() throws Exception {
- final GremlinGroovyScriptEngine engine = new GremlinGroovyScriptEngine((GroovyCustomizer)
- () -> new RepeatASTTransformationCustomizer(new VarAsBindingASTTransformation()));
-
- final GraphTraversalSource g = traversal().withEmbedded(EmptyGraph.instance());
- final Bindings bindings = new SimpleBindings();
- bindings.put("g", g);
-
- final Traversal.Admin t = (Traversal.Admin)
- engine.eval("g.inject(-Infinity,NaN,xx1).is(P.eq(Infinity).or(P.eq(NaN)).or(P.eq(+Infinity)))", bindings);
- final Bytecode bytecode = t.getBytecode();
-
- final Map<String,Object> bytecodeBindings = bytecode.getBindings();
- assertEquals(1, bytecodeBindings.size());
- assertThat(bytecodeBindings.containsKey("xx1"), is(true));
-
- final JavascriptTranslator jsTranslator = JavascriptTranslator.of("g");
- final String gremlinAsJs = jsTranslator.translate(bytecode).getScript();
- assertEquals("g.inject(Number.NEGATIVE_INFINITY,Number.NaN,xx1).is(P.eq(Number.POSITIVE_INFINITY).or(P.eq(Number.NaN)).or(P.eq(Number.POSITIVE_INFINITY)))", gremlinAsJs);
-
- final PythonTranslator pyTranslator = PythonTranslator.of("g");
- final String gremlinAsPy = pyTranslator.translate(bytecode).getScript();
- assertEquals("g.inject(float('-inf'),float('nan'),xx1).is_(P.eq(float('inf')).or_(P.eq(float('nan'))).or_(P.eq(float('inf'))))", gremlinAsPy);
-
- final DotNetTranslator dnTranslator = DotNetTranslator.of("g");
- final String gremlinAsDn = dnTranslator.translate(bytecode).getScript();
- assertEquals("g.Inject(Double.NegativeInfinity,Double.NaN,xx1).Is(P.Eq(Double.PositiveInfinity).Or(P.Eq(Double.NaN)).Or(P.Eq(Double.PositiveInfinity)))", gremlinAsDn);
- }
-
- @Test
- public void shouldHandleCall() throws Exception {
- final GremlinGroovyScriptEngine engine = new GremlinGroovyScriptEngine(
- (GroovyCustomizer) () -> new RepeatASTTransformationCustomizer(new AmbiguousMethodASTTransformation()),
- (GroovyCustomizer) () -> new RepeatASTTransformationCustomizer(new VarAsBindingASTTransformation())
- );
-
- final GraphTraversalSource g = traversal().withEmbedded(EmptyGraph.instance());
- final Bindings bindings = new SimpleBindings();
- bindings.put("g", g);
-
- final Traversal.Admin t = (Traversal.Admin)
- engine.eval("g.V().as(\"v\").call(\"tinker.degree.centrality\", xx1, __.project(\"direction\").by(__.constant(OUT))).project(\"vertex\", \"degree\").by(select(\"v\")).by()", bindings);
- final Bytecode bytecode = t.getBytecode();
-
- final Map<String,Object> bytecodeBindings = bytecode.getBindings();
- assertEquals(1, bytecodeBindings.size());
- assertThat(bytecodeBindings.containsKey("xx1"), is(true));
-
- final JavascriptTranslator jsTranslator = JavascriptTranslator.of("g");
- final String gremlinAsJs = jsTranslator.translate(bytecode).getScript();
- assertEquals("g.V().as(\"v\").call(\"tinker.degree.centrality\",xx1,__.project(\"direction\").by(__.constant(Direction.OUT))).project(\"vertex\",\"degree\").by(__.select(\"v\")).by()", gremlinAsJs);
-
- final PythonTranslator pyTranslator = PythonTranslator.of("g");
- final String gremlinAsPy = pyTranslator.translate(bytecode).getScript();
- assertEquals("g.V().as_('v').call('tinker.degree.centrality',xx1,__.project('direction').by(__.constant(Direction.OUT))).project('vertex','degree').by(__.select('v')).by()", gremlinAsPy);
-
- final DotNetTranslator dnTranslator = DotNetTranslator.of("g");
- final String gremlinAsDn = dnTranslator.translate(bytecode).getScript();
- assertEquals("g.V().As(\"v\").Call<object>(\"tinker.degree.centrality\",(IDictionary<object,object>) xx1,(ITraversal) __.Project<object>(\"direction\").By(__.Constant<object>(Direction.Out))).Project<object>(\"vertex\",\"degree\").By(__.Select<object>(\"v\")).By()", gremlinAsDn);
-
- // verify no Bindings bleedover
- final Traversal.Admin t2 = (Traversal.Admin)
- engine.eval("g.inject([:])", bindings);
- final Bytecode bytecode2 = t2.getBytecode();
-
- final Map<String,Object> bytecodeBindings2 = bytecode2.getBindings();
- assertEquals(0, bytecodeBindings2.size());
- assertThat(bytecodeBindings2.containsKey("xx1"), is(false));
- }
-
-
- @Test
public void shouldHandleMergeVAmbiguousNull() throws Exception {
final GraphTraversalSource g = traversal().withEmbedded(EmptyGraph.instance());
final Bindings bindings = new SimpleBindings();
@@ -643,4 +526,60 @@
final Object values = engine.eval("values");
assertEquals(Column.values, values);
}
+
+ public static class TestStrategy<S extends TraversalStrategy> extends AbstractTraversalStrategy<S> {
+ private final Configuration configuration;
+
+ public TestStrategy(final Map configuration) {
+ this(new MapConfiguration(configuration));
+ }
+
+ private TestStrategy(final Configuration configuration) {
+ this.configuration = configuration;
+ }
+ @Override
+ public void apply(Traversal.Admin traversal) {
+ // Do nothing
+ }
+
+ @Override
+ public Configuration getConfiguration() {
+ return configuration;
+ }
+
+ public static TestStrategy create(Configuration configuration) {
+ return new TestStrategy(configuration);
+ }
+ }
+
+ @Test
+ public void shouldReconstructCustomRegisteredStrategy() throws ScriptException {
+ GremlinGroovyScriptEngine scriptEngine = new GremlinGroovyScriptEngine(DefaultImportCustomizer.build().addClassImports(TestStrategy.class).create());
+ final GraphTraversalSource g = traversal().withEmbedded(EmptyGraph.instance());
+ final Bindings bindings = new SimpleBindings();
+ bindings.put("g", g);
+
+ GraphTraversal traversal = (GraphTraversal) scriptEngine.eval("g.withStrategies(new TestStrategy(stringKey:\"stringValue\",intKey:1,booleanKey:true)).V()", bindings);
+
+ TestStrategy reconstructedStrategy = traversal.asAdmin().getStrategies().getStrategy(TestStrategy.class).get();
+
+ assertNotNull(reconstructedStrategy);
+
+ MapConfiguration expectedConfig = new MapConfiguration(new HashMap<String, Object>() {{
+ put("stringKey", "stringValue");
+ put("intKey", 1);
+ put("booleanKey", true);
+ }});
+
+ Set<String> expectedKeys = new HashSet<>();
+ Set<String> actualKeys = new HashSet<>();
+ expectedConfig.getKeys().forEachRemaining((key) -> expectedKeys.add(key));
+ reconstructedStrategy.getConfiguration().getKeys().forEachRemaining((key) -> actualKeys.add(key));
+
+ assertEquals(expectedKeys, actualKeys);
+
+ expectedKeys.forEach((key) -> {
+ assertEquals(expectedConfig.get(Object.class, key), reconstructedStrategy.getConfiguration().get(Object.class, key));
+ });
+ }
}
\ No newline at end of file
diff --git a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GroovyTranslatorComputerProvider.java b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GroovyTranslatorComputerProvider.java
deleted file mode 100644
index e71ac31..0000000
--- a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GroovyTranslatorComputerProvider.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.groovy.jsr223;
-
-import org.apache.tinkerpop.gremlin.GraphProvider;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.tinkergraph.process.computer.TinkerGraphComputer;
-
-/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- */
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.computer.GraphComputerTest",
- method = "shouldSucceedWithProperTraverserRequirements",
- reason = "Reason requires investigation")
-@GraphProvider.Descriptor(computer = TinkerGraphComputer.class)
-public class GroovyTranslatorComputerProvider extends GroovyTranslatorProvider {
-
- @Override
- public GraphTraversalSource traversal(final Graph graph) {
- return super.traversal(graph).withComputer();
- }
-}
\ No newline at end of file
diff --git a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GroovyTranslatorProcessComputerTest.java b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GroovyTranslatorProcessComputerTest.java
deleted file mode 100644
index 7d09237..0000000
--- a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GroovyTranslatorProcessComputerTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.groovy.jsr223;
-
-import org.apache.tinkerpop.gremlin.GraphProviderClass;
-import org.apache.tinkerpop.gremlin.process.ProcessComputerSuite;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
-import org.junit.runner.RunWith;
-
-/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- */
-@RunWith(ProcessComputerSuite.class)
-@GraphProviderClass(provider = GroovyTranslatorComputerProvider.class, graph = TinkerGraph.class)
-public class GroovyTranslatorProcessComputerTest {
-}
\ No newline at end of file
diff --git a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GroovyTranslatorProcessStandardTest.java b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GroovyTranslatorProcessStandardTest.java
deleted file mode 100644
index 8794fa0..0000000
--- a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GroovyTranslatorProcessStandardTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.groovy.jsr223;
-
-import org.apache.tinkerpop.gremlin.GraphProviderClass;
-import org.apache.tinkerpop.gremlin.process.ProcessStandardSuite;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
-import org.junit.runner.RunWith;
-
-/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- */
-@RunWith(ProcessStandardSuite.class)
-@GraphProviderClass(provider = GroovyTranslatorProvider.class, graph = TinkerGraph.class)
-public class GroovyTranslatorProcessStandardTest {
-}
\ No newline at end of file
diff --git a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GroovyTranslatorProvider.java b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GroovyTranslatorProvider.java
deleted file mode 100644
index c060216..0000000
--- a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GroovyTranslatorProvider.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.groovy.jsr223;
-
-import org.apache.tinkerpop.gremlin.process.traversal.translator.GroovyTranslator;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.TranslationStrategy;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.util.TinkerGraphProvider;
-
-/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- */
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.ProfileTest",
- method = "*",
- reason = "Tests for profile() are not supported for remotes")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.LambdaStepTest",
- method = "*",
- reason = "Tests that include lambdas are not supported by the test suite for remotes")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.filter.DedupTest",
- method = "g_V_both_name_order_byXa_bX_dedup_value",
- reason = "Tests that include lambdas are not supported by the test suite for remotes")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.OrderTest",
- method = "g_V_name_order_byXa1_b1X_byXb2_a2X",
- reason = "Tests that include lambdas are not supported by the test suite for remotes")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.OrderTest",
- method = "g_V_order_byXname_a1_b1X_byXname_b2_a2X_name",
- reason = "Tests that include lambdas are not supported by the test suite for remotes")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.SackTest",
- method = "g_withSackXmap__map_cloneX_V_out_out_sackXmap_a_nameX_sack",
- reason = "Tests that include lambdas are not supported by the test suite for remotes")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.SubgraphTest",
- method = "g_V_withSideEffectXsgX_outEXknowsX_subgraphXsgX_name_capXsgX",
- reason = "Tests that include lambdas are not supported by the test suite for remotes")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.SubgraphTest",
- method = "g_V_withSideEffectXsgX_repeatXbothEXcreatedX_subgraphXsgX_outVX_timesX5X_name_dedup",
- reason = "Tests that include lambdas are not supported by the test suite for remotes")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.SubgraphTest",
- method = "g_withSideEffectXsgX_V_hasXname_danielXout_capXsgX",
- reason = "Tests that include lambdas are not supported by the test suite for remotes")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.ProgramTest",
- method = "*",
- reason = "Reason requires investigation")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.TraversalInterruptionTest",
- method = "*",
- reason = "Reason requires investigation")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.TraversalInterruptionComputerTest",
- method = "*",
- reason = "Reason requires investigation")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.EventStrategyProcessTest",
- method = "*",
- reason = "Strategy not properly supported by Bytecode based traversals")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.ElementIdStrategyProcessTest",
- method = "*",
- reason = "Strategy not properly supported by Bytecode based traversals")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.CoreTraversalTest",
- method = "shouldNeverPropagateANoBulkTraverser",
- reason = "Reason requires investigation")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.ReadTest",
- method = "*",
- reason = "read and write tests don't translate locally well because of calling iterate() inside read()/write() add a none()")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.WriteTest",
- method = "*",
- reason = "read and write tests don't translate locally well because of calling iterate() inside read()/write() add a none()")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.OrderabilityTest",
- method = "g_inject_order_with_unknown_type",
- reason = "GroovyTranslator only supports known Gremlin types")
-public class GroovyTranslatorProvider extends TinkerGraphProvider {
- @Override
- public GraphTraversalSource traversal(final Graph graph) {
- final GraphTraversalSource g = graph.traversal();
- return g.withStrategies(new TranslationStrategy(g, GroovyTranslator.of("g"), true));
- }
-}
\ No newline at end of file
diff --git a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/ParameterizedGroovyTranslatorProvider.java b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/ParameterizedGroovyTranslatorProvider.java
index 516dfba..edeae35 100644
--- a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/ParameterizedGroovyTranslatorProvider.java
+++ b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/ParameterizedGroovyTranslatorProvider.java
@@ -18,9 +18,7 @@
*/
package org.apache.tinkerpop.gremlin.groovy.jsr223;
-import org.apache.tinkerpop.gremlin.process.traversal.translator.GroovyTranslator;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.TranslationStrategy;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.util.TinkerGraphProvider;
@@ -76,14 +74,6 @@
method = "*",
reason = "Reason requires investigation")
@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.EventStrategyProcessTest",
- method = "*",
- reason = "Strategy not properly supported by Bytecode based traversals")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.ElementIdStrategyProcessTest",
- method = "*",
- reason = "Strategy not properly supported by Bytecode based traversals")
-@Graph.OptOut(
test = "org.apache.tinkerpop.gremlin.process.traversal.CoreTraversalTest",
method = "shouldNeverPropagateANoBulkTraverser",
reason = "Reason requires investigation")
@@ -102,7 +92,6 @@
public class ParameterizedGroovyTranslatorProvider extends TinkerGraphProvider {
@Override
public GraphTraversalSource traversal(final Graph graph) {
- final GraphTraversalSource g = graph.traversal();
- return g.withStrategies(new TranslationStrategy(g, GroovyTranslator.of("g", true), true));
+ return graph.traversal();
}
}
\ No newline at end of file
diff --git a/gremlin-javascript/build/generate.groovy b/gremlin-javascript/build/generate.groovy
index 7cf85b5..79e3151 100644
--- a/gremlin-javascript/build/generate.groovy
+++ b/gremlin-javascript/build/generate.groovy
@@ -54,10 +54,10 @@
writer.writeLine("//********************************************************************************\n\n")
writer.writeLine(
- 'const uuid = require(\'uuid\');\n' +
- 'const graphTraversalModule = require(\'../../lib/process/graph-traversal\');\n' +
- 'const traversalModule = require(\'../../lib/process/traversal\');\n' +
- 'const { TraversalStrategies, VertexProgramStrategy, OptionsStrategy, PartitionStrategy, \n' +
+ 'import * as graphTraversalModule from \'../../lib/process/graph-traversal.js\';\n' +
+ 'import * as traversalModule from \'../../lib/process/traversal.js\';\n' +
+ 'import * as uuid from \'uuid\';\n' +
+ 'import { TraversalStrategies, VertexProgramStrategy, OptionsStrategy, PartitionStrategy, \n' +
' ReadOnlyStrategy, GraphFilterStrategy, SeedStrategy, SubgraphStrategy, ProductiveByStrategy, \n' +
' LambdaRestrictionStrategy, StandardVerificationStrategy, VertexProgramRestrictionStrategy, \n' +
' ComputerVerificationStrategy, MessagePassingReductionStrategy, ProfileStrategy, InlineFilterStrategy, \n' +
@@ -66,7 +66,7 @@
' AdjacentToIncidentStrategy, ReservedKeysVerificationStrategy, RepeatUnrollStrategy, \n' +
' PathRetractionStrategy, PathProcessorStrategy, OrderLimitStrategy, MatchPredicateStrategy, \n' +
' LazyBarrierStrategy, EarlyLimitStrategy, IncidentToAdjacentStrategy, IdentityRemovalStrategy, \n' +
- ' HaltedTraverserStrategy, FilterRankingStrategy } = require(\'../../lib/process/traversal-strategy\');\n' +
+ ' HaltedTraverserStrategy, FilterRankingStrategy } from \'../../lib/process/traversal-strategy.js\';\n' +
'const __ = graphTraversalModule.statics;\n' +
'const Barrier = traversalModule.barrier\n' +
'const Cardinality = traversalModule.cardinality\n' +
@@ -126,7 +126,7 @@
}
writer.writeLine('}\n')
- writer.writeLine('exports.gremlin = gremlins')
+ writer.writeLine('export const gremlin = gremlins')
}
diff --git a/gremlin-javascript/examples/browser/index.html b/gremlin-javascript/examples/browser/index.html
index fa9ca83..8f05553 100644
--- a/gremlin-javascript/examples/browser/index.html
+++ b/gremlin-javascript/examples/browser/index.html
@@ -27,6 +27,6 @@
</head>
<body>
<main id="graph"></main>
- <script type="module" src="index.js"></script>
+ <script type="module" src="index.ts"></script>
</body>
</html>
diff --git a/gremlin-javascript/examples/browser/index.js b/gremlin-javascript/examples/browser/index.js
deleted file mode 100644
index 7af7084..0000000
--- a/gremlin-javascript/examples/browser/index.js
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import Color from "colorjs.io";
-import cytoscape from "cytoscape";
-import gremlin from "gremlin";
-import { createRandomColorGenerator } from "./utils";
-
-const randomColor = createRandomColorGenerator();
-
-const g = gremlin.process.AnonymousTraversalSource.traversal().withRemote(
- new gremlin.driver.DriverRemoteConnection("ws://localhost:8182/gremlin")
-);
-
-const [vertices, edges] = await Promise.all([
- await g.V().toList(),
- await g.E().toList(),
-]);
-
-cytoscape({
- container: globalThis.document.getElementById("graph"),
- elements: [
- ...vertices.map((vertex) => ({
- data: {
- id: vertex.id,
- },
- style: {
- label: `${vertex.label}\n${vertex.id}`,
- "background-color": randomColor(vertex.label),
- "border-color": new Color(randomColor(vertex.label)).darken().toString({
- format: "hex",
- }),
- },
- })),
- ...edges.map((edge) => ({
- data: {
- id: edge.id,
- label: edge.label,
- source: edge.inV.id,
- target: edge.outV.id,
- },
- })),
- ],
- style: [
- {
- selector: "node",
- style: {
- color: "white",
- "text-valign": "center",
- "text-halign": "center",
- "border-width": 4,
- width: "80px",
- height: "80px",
- "text-max-width": "80px",
- "text-wrap": "wrap",
- },
- },
-
- {
- selector: "edge",
- style: {
- label: "data(label)",
- color: "white",
- "text-outline-color": "black",
- "text-outline-width": "2px",
- "text-margin-y": "-6px",
- "text-rotation": "autorotate",
- "target-arrow-shape": "triangle",
- "curve-style": "bezier",
- },
- },
- ],
- layout: {
- name: "cose",
- },
-});
diff --git a/gremlin-javascript/examples/browser/index.ts b/gremlin-javascript/examples/browser/index.ts
new file mode 100644
index 0000000..720ea79
--- /dev/null
+++ b/gremlin-javascript/examples/browser/index.ts
@@ -0,0 +1,96 @@
+/*
+ * 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.
+ */
+
+import Color from "colorjs.io";
+import cytoscape from "cytoscape";
+import * as gremlin from "gremlin";
+import type { Edge, Vertex } from "gremlin/build/esm/structure/graph";
+import { createRandomColorGenerator } from "./utils";
+
+const randomColor = createRandomColorGenerator();
+
+const g = gremlin.process.AnonymousTraversalSource.traversal().with_(
+ new gremlin.driver.DriverRemoteConnection("ws://localhost:8182/gremlin")
+);
+
+const [vertices, edges] = await Promise.all([
+ await g.V().toList<Vertex>(),
+ await g.E().toList<Edge>(),
+]);
+
+cytoscape({
+ container: globalThis.document.getElementById("graph"),
+ elements: [
+ ...vertices.map((vertex) => ({
+ data: {
+ id: vertex.id,
+ },
+ style: {
+ label: `${vertex.label}\n${vertex.id}`,
+ "background-color": randomColor(vertex.label),
+ "border-color": new Color(randomColor(vertex.label)).darken().toString(
+ // @ts-expect-error
+ {
+ format: "hex",
+ }
+ ),
+ },
+ })),
+ ...edges.map((edge) => ({
+ data: {
+ id: edge.id,
+ label: edge.label,
+ source: edge.inV.id,
+ target: edge.outV.id,
+ },
+ })),
+ ],
+ style: [
+ {
+ selector: "node",
+ style: {
+ color: "white",
+ "text-valign": "center",
+ "text-halign": "center",
+ "border-width": 4,
+ width: "80px",
+ height: "80px",
+ "text-max-width": "80px",
+ "text-wrap": "wrap",
+ },
+ },
+
+ {
+ selector: "edge",
+ style: {
+ label: "data(label)",
+ color: "white",
+ "text-outline-color": "black",
+ "text-outline-width": "2px",
+ "text-margin-y": "-6px",
+ "text-rotation": "autorotate",
+ "target-arrow-shape": "triangle",
+ "curve-style": "bezier",
+ },
+ },
+ ],
+ layout: {
+ name: "cose",
+ },
+});
diff --git a/gremlin-javascript/examples/browser/utils.js b/gremlin-javascript/examples/browser/utils.ts
similarity index 100%
rename from gremlin-javascript/examples/browser/utils.js
rename to gremlin-javascript/examples/browser/utils.ts
diff --git a/gremlin-javascript/examples/browser/yarn.lock b/gremlin-javascript/examples/browser/yarn.lock
index 256cf44..b0e4440 100644
--- a/gremlin-javascript/examples/browser/yarn.lock
+++ b/gremlin-javascript/examples/browser/yarn.lock
@@ -728,15 +728,15 @@
linkType: hard
"gremlin@file:../../src/main/javascript/gremlin-javascript::locator=browser%40workspace%3A.":
- version: 3.7.2-alpha1
- resolution: "gremlin@file:../../src/main/javascript/gremlin-javascript#../../src/main/javascript/gremlin-javascript::hash=4bd845&locator=browser%40workspace%3A."
+ version: 4.0.0-alpha1
+ resolution: "gremlin@file:../../src/main/javascript/gremlin-javascript#../../src/main/javascript/gremlin-javascript::hash=7358f9&locator=browser%40workspace%3A."
dependencies:
buffer: "npm:^6.0.3"
eventemitter3: "npm:^5.0.1"
readable-stream: "npm:^4.5.2"
uuid: "npm:^9.0.1"
ws: "npm:^8.16.0"
- checksum: 10c0/1a8172b44851cb71eb11f5aee438034912762351d941684fae942a142d9d757e3be72bd136a5cc43dd81dd00594a17c36009d46ef06e0ba4120f7644aefa675e
+ checksum: 10c0/ddbbb7365d67f62a2b6a5d1dcb14fef998ea06281c8a119eede7b9f8b7b276e114e139456016746382819b612eb6e26edf4d632a2f36f7b399bd3eaa0ed97c19
languageName: node
linkType: hard
diff --git a/gremlin-javascript/pom.xml b/gremlin-javascript/pom.xml
index 868b1d9..7268c20 100644
--- a/gremlin-javascript/pom.xml
+++ b/gremlin-javascript/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>gremlin-javascript</artifactId>
<name>Apache TinkerPop :: Gremlin Javascript</name>
@@ -223,7 +223,7 @@
<groupId>com.google.code.maven-replacer-plugin</groupId>
<artifactId>replacer</artifactId>
<configuration>
- <file>src/main/javascript/gremlin-javascript/lib/utils.js</file>
+ <file>src/main/javascript/gremlin-javascript/lib/utils.ts</file>
<replacements>
<replacement>
<token>gremlinVersion = '.*'</token>
@@ -238,8 +238,9 @@
<!-- Test gremlin-javascript in Docker -->
<profile>
<id>glv-js</id>
+ <!-- TODO re-enable after gremlin-js is implemented -->
<activation>
- <activeByDefault>true</activeByDefault>
+ <activeByDefault>false</activeByDefault>
</activation>
<build>
<finalName>${project.artifactId}-${project.version}</finalName>
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/.eslintrc.cjs b/gremlin-javascript/src/main/javascript/gremlin-javascript/.eslintrc.cjs
new file mode 100644
index 0000000..0c099e5
--- /dev/null
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/.eslintrc.cjs
@@ -0,0 +1,153 @@
+/*
+ * 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.
+ */
+
+module.exports = {
+ env: {
+ commonjs: true,
+ es2022: true,
+ node: true,
+ },
+ parserOptions: {
+ ecmaVersion: 2022,
+ sourceType: 'module',
+ },
+ ignorePatterns: ['test/**/*.js', 'doc/**/*.js', 'build'],
+ extends: ['eslint:recommended', 'prettier'],
+ plugins: ['prettier'],
+ rules: {
+ 'prettier/prettier': ['error', { endOfLine: 'auto' }],
+ 'linebreak-style': 0,
+ quotes: ['error', 'single'],
+ semi: ['error', 'always'],
+ 'no-constant-condition': ['error', { checkLoops: false }],
+ strict: ['error', 'global'],
+ 'array-callback-return': 'error',
+ curly: 'error',
+ 'no-unused-vars': ['error', { args: 'none' }],
+ 'global-require': 'error',
+ eqeqeq: ['error', 'allow-null'],
+
+ // make sure for-in loops have an if statement
+ 'guard-for-in': 'error',
+ 'no-alert': 'error',
+ 'no-caller': 'error',
+ 'no-case-declarations': 'error',
+ 'no-else-return': 'error',
+ 'no-empty-pattern': 'error',
+ 'no-eval': 'error',
+ 'no-extend-native': 'error',
+ 'no-extra-bind': 'error',
+ 'no-extra-label': 'error',
+ 'no-floating-decimal': 'error',
+ 'no-global-assign': ['error', { exceptions: [] }],
+ 'no-implicit-coercion': [
+ 'off',
+ {
+ boolean: false,
+ number: true,
+ string: true,
+ allow: [],
+ },
+ ],
+ 'no-implied-eval': 'error',
+ 'no-labels': ['error', { allowLoop: false, allowSwitch: false }],
+ 'no-lone-blocks': 'error',
+ 'no-loop-func': 'error',
+ //
+ // disallow use of multiple spaces
+ 'no-multi-spaces': 'error',
+ 'no-new': 'error',
+ 'no-new-func': 'error',
+ 'no-new-wrappers': 'error',
+ 'no-octal-escape': 'error',
+ 'no-proto': 'error',
+ 'no-prototype-builtins': 0,
+ 'no-redeclare': 'error',
+ 'no-restricted-properties': [
+ 'error',
+ {
+ object: 'arguments',
+ property: 'callee',
+ message: 'arguments.callee is deprecated',
+ },
+ {
+ property: '__defineGetter__',
+ message: 'Please use Object.defineProperty instead.',
+ },
+ {
+ property: '__defineSetter__',
+ message: 'Please use Object.defineProperty instead.',
+ },
+ ],
+ 'no-self-assign': 'error',
+ 'no-self-compare': 'error',
+ 'no-sequences': 'error',
+ 'no-throw-literal': 'error',
+ 'no-unmodified-loop-condition': 'off',
+ 'no-unused-expressions': [
+ 'error',
+ {
+ allowShortCircuit: false,
+ allowTernary: false,
+ },
+ ],
+ 'no-useless-call': 'off',
+ 'no-useless-concat': 'error',
+ 'no-useless-escape': 'error',
+ 'no-useless-return': 'error',
+ 'no-void': 'error',
+ 'no-with': 'error',
+ 'no-buffer-constructor': 'error',
+ radix: 'error',
+ 'no-var': 'error',
+ 'prefer-const': 'error',
+ 'arrow-body-style': ['error', 'as-needed'],
+ 'arrow-spacing': 'error',
+ 'no-confusing-arrow': ['error', { allowParens: true }],
+ yoda: 'error',
+ 'constructor-super': 'error',
+ 'require-await': 'error',
+ 'require-atomic-updates': 'off',
+ },
+ globals: {
+ Buffer: 'off',
+ Promise: true,
+ Symbol: false,
+ Uint16Array: false,
+ Int32Array: false,
+ Int8Array: false,
+ BigInt: false,
+ process: false,
+ setInterval: false,
+ setTimeout: false,
+ setImmediate: false,
+ clearInterval: false,
+ clearTimeout: false,
+ describe: false,
+ xdescribe: false,
+ it: false,
+ xit: false,
+ context: false,
+ after: false,
+ afterEach: false,
+ before: false,
+ beforeEach: false,
+ __filename: false,
+ },
+};
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/.eslintrc.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/.eslintrc.js
deleted file mode 100644
index 97675b5..0000000
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/.eslintrc.js
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-'use strict';
-
-module.exports = {
- env: {
- commonjs: true,
- es2022: true,
- node: true,
- },
- parserOptions: {
- ecmaVersion: 2022,
- },
- ignorePatterns: ['test/**/*.js', 'doc/**/*.js'],
- extends: ['eslint:recommended', 'prettier'],
- plugins: ['prettier'],
- rules: {
- 'prettier/prettier': ['error', { endOfLine: 'auto' }],
- 'linebreak-style': 0,
- quotes: ['error', 'single'],
- semi: ['error', 'always'],
- 'no-constant-condition': ['error', { checkLoops: false }],
- strict: ['error', 'global'],
- 'array-callback-return': 'error',
- curly: 'error',
- 'no-unused-vars': ['error', { args: 'none' }],
- 'global-require': 'error',
- eqeqeq: ['error', 'allow-null'],
-
- // make sure for-in loops have an if statement
- 'guard-for-in': 'error',
- 'no-alert': 'error',
- 'no-caller': 'error',
- 'no-case-declarations': 'error',
- 'no-else-return': 'error',
- 'no-empty-pattern': 'error',
- 'no-eval': 'error',
- 'no-extend-native': 'error',
- 'no-extra-bind': 'error',
- 'no-extra-label': 'error',
- 'no-floating-decimal': 'error',
- 'no-global-assign': ['error', { exceptions: [] }],
- 'no-implicit-coercion': [
- 'off',
- {
- boolean: false,
- number: true,
- string: true,
- allow: [],
- },
- ],
- 'no-implied-eval': 'error',
- 'no-labels': ['error', { allowLoop: false, allowSwitch: false }],
- 'no-lone-blocks': 'error',
- 'no-loop-func': 'error',
- //
- // disallow use of multiple spaces
- 'no-multi-spaces': 'error',
- 'no-new': 'error',
- 'no-new-func': 'error',
- 'no-new-wrappers': 'error',
- 'no-octal-escape': 'error',
- 'no-proto': 'error',
- 'no-prototype-builtins': 0,
- 'no-redeclare': 'error',
- 'no-restricted-properties': [
- 'error',
- {
- object: 'arguments',
- property: 'callee',
- message: 'arguments.callee is deprecated',
- },
- {
- property: '__defineGetter__',
- message: 'Please use Object.defineProperty instead.',
- },
- {
- property: '__defineSetter__',
- message: 'Please use Object.defineProperty instead.',
- },
- ],
- 'no-self-assign': 'error',
- 'no-self-compare': 'error',
- 'no-sequences': 'error',
- 'no-throw-literal': 'error',
- 'no-unmodified-loop-condition': 'off',
- 'no-unused-expressions': [
- 'error',
- {
- allowShortCircuit: false,
- allowTernary: false,
- },
- ],
- 'no-useless-call': 'off',
- 'no-useless-concat': 'error',
- 'no-useless-escape': 'error',
- 'no-useless-return': 'error',
- 'no-void': 'error',
- 'no-with': 'error',
- 'no-buffer-constructor': 'error',
- radix: 'error',
- 'no-var': 'error',
- 'prefer-const': 'error',
- 'arrow-body-style': ['error', 'as-needed'],
- 'arrow-spacing': 'error',
- 'no-confusing-arrow': ['error', { allowParens: true }],
- yoda: 'error',
- 'constructor-super': 'error',
- 'require-await': 'error',
- 'require-atomic-updates': 'off',
- },
- globals: {
- Buffer: 'off',
- Promise: true,
- Symbol: false,
- Uint16Array: false,
- Int32Array: false,
- Int8Array: false,
- BigInt: false,
- process: false,
- setInterval: false,
- setTimeout: false,
- setImmediate: false,
- clearInterval: false,
- clearTimeout: false,
- describe: false,
- xdescribe: false,
- it: false,
- xit: false,
- context: false,
- after: false,
- afterEach: false,
- before: false,
- beforeEach: false,
- __filename: false,
- },
-};
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/.mocharc.json b/gremlin-javascript/src/main/javascript/gremlin-javascript/.mocharc.json
new file mode 100644
index 0000000..935e50b
--- /dev/null
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/.mocharc.json
@@ -0,0 +1,5 @@
+{
+ "extension": ["js", "ts"],
+ "require": "ts-node/register",
+ "loader": "ts-node/esm"
+}
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/.prettierrc.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/.prettierrc.cjs
similarity index 100%
rename from gremlin-javascript/src/main/javascript/gremlin-javascript/.prettierrc.js
rename to gremlin-javascript/src/main/javascript/gremlin-javascript/.prettierrc.cjs
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/Gruntfile.cjs b/gremlin-javascript/src/main/javascript/gremlin-javascript/Gruntfile.cjs
new file mode 100644
index 0000000..1468c2f
--- /dev/null
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/Gruntfile.cjs
@@ -0,0 +1,34 @@
+/*
+ * 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.
+ */
+
+module.exports = function (grunt) {
+ grunt.loadNpmTasks('grunt-jsdoc');
+ grunt.initConfig({
+ jsdoc: {
+ dist: {
+ src: ['lib'],
+ options: {
+ destination: 'doc',
+ recurse: true,
+ readme: 'README.md',
+ },
+ },
+ },
+ });
+};
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/Gruntfile.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/Gruntfile.js
deleted file mode 100644
index 8aaade3..0000000
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/Gruntfile.js
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-'use strict';
-
-module.exports = function (grunt) {
- grunt.loadNpmTasks('grunt-jsdoc');
- grunt.initConfig({
- jsdoc: {
- dist: {
- src: ['lib'],
- options: {
- destination: 'doc',
- recurse: true,
- readme: 'README.md',
- },
- },
- },
- });
-};
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/index.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/index.js
deleted file mode 100644
index 3b8a80b..0000000
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/index.js
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * @author Jorge Bay Gondra
- */
-'use strict';
-
-const t = require('./lib/process/traversal');
-const gt = require('./lib/process/graph-traversal');
-const strategiesModule = require('./lib/process/traversal-strategy');
-const graph = require('./lib/structure/graph');
-const gs = require('./lib/structure/io/graph-serializer');
-const rc = require('./lib/driver/remote-connection');
-const Bytecode = require('./lib/process/bytecode');
-const Translator = require('./lib/process/translator');
-const utils = require('./lib/utils');
-const DriverRemoteConnection = require('./lib/driver/driver-remote-connection');
-const ResponseError = require('./lib/driver/response-error');
-const Client = require('./lib/driver/client');
-const ResultSet = require('./lib/driver/result-set');
-const Authenticator = require('./lib/driver/auth/authenticator');
-const PlainTextSaslAuthenticator = require('./lib/driver/auth/plain-text-sasl-authenticator');
-const AnonymousTraversalSource = require('./lib/process/anonymous-traversal');
-
-module.exports = {
- driver: {
- RemoteConnection: rc.RemoteConnection,
- RemoteStrategy: rc.RemoteStrategy,
- RemoteTraversal: rc.RemoteTraversal,
- ResponseError,
- DriverRemoteConnection,
- Client,
- ResultSet,
- auth: {
- Authenticator,
- PlainTextSaslAuthenticator,
- },
- },
- process: {
- Bytecode,
- EnumValue: t.EnumValue,
- P: t.P,
- TextP: t.TextP,
- Traversal: t.Traversal,
- TraversalSideEffects: t.TraversalSideEffects,
- TraversalStrategies: strategiesModule.TraversalStrategies,
- TraversalStrategy: strategiesModule.TraversalStrategy,
- Traverser: t.Traverser,
- barrier: t.barrier,
- cardinality: t.cardinality,
- column: t.column,
- direction: t.direction,
- dt: t.dt,
- merge: t.merge,
- operator: t.operator,
- order: t.order,
- pick: t.pick,
- pop: t.pop,
- scope: t.scope,
- t: t.t,
- GraphTraversal: gt.GraphTraversal,
- GraphTraversalSource: gt.GraphTraversalSource,
- statics: gt.statics,
- Translator,
- traversal: AnonymousTraversalSource.traversal,
- AnonymousTraversalSource,
- withOptions: t.withOptions,
- },
- structure: {
- io: gs,
- Edge: graph.Edge,
- Graph: graph.Graph,
- Path: graph.Path,
- Property: graph.Property,
- Vertex: graph.Vertex,
- VertexProperty: graph.VertexProperty,
- toLong: utils.toLong,
- },
-};
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/auth/authenticator.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/auth/authenticator.js
deleted file mode 100644
index 1f7c3a1..0000000
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/auth/authenticator.js
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-'use strict';
-
-/** @abstract */
-class Authenticator {
- constructor(options) {
- this._options = options;
- }
-
- /**
- * @abstract
- * Evaluates the challenge from the server and returns appropriate response.
- * @param {String} challenge Challenge string presented by the server.
- */
- evaluateChallenge(challenge) {
- throw new Error('evaluateChallenge should be implemented');
- }
-}
-
-module.exports = Authenticator;
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/auth/authenticator.ts b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/auth/authenticator.ts
new file mode 100644
index 0000000..16b0643
--- /dev/null
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/auth/authenticator.ts
@@ -0,0 +1,34 @@
+/*
+ * 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.
+ */
+
+export type AuthenticatorOptions = {
+ username?: string;
+ password?: string;
+ mechanism?: any;
+};
+
+export default abstract class Authenticator {
+ constructor(protected readonly options: AuthenticatorOptions) {}
+
+ /**
+ * Evaluates the challenge from the server and returns appropriate response.
+ * @param {String} challenge Challenge string presented by the server.
+ */
+ abstract evaluateChallenge(challenge: string): any;
+}
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/auth/mechanisms/sasl-mechanism-base.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/auth/mechanisms/sasl-mechanism-base.js
deleted file mode 100644
index 250c3b9..0000000
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/auth/mechanisms/sasl-mechanism-base.js
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-'use strict';
-
-/** @abstract */
-class SaslMechanismBase {
- constructor(options) {
- this.setopts(options);
- }
-
- /**
- * Returns the name of the mechanism
- */
- get name() {
- return null;
- }
-
- /**
- * Set the options for the mechanism
- * @param {object} options Options specific to the mechanism
- */
- setopts(options) {
- this._options = options;
- }
-
- /**
- * @abstract
- * Evaluates the challenge from the server and returns appropriate response
- * @param {String} challenge Challenge string presented by the server
- */
- evaluateChallenge(challenge) {
- throw new Error('evaluateChallenge should be implemented');
- }
-}
-
-module.exports = SaslMechanismBase;
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/auth/mechanisms/sasl-mechanism-base.ts b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/auth/mechanisms/sasl-mechanism-base.ts
new file mode 100644
index 0000000..e23642e
--- /dev/null
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/auth/mechanisms/sasl-mechanism-base.ts
@@ -0,0 +1,49 @@
+/*
+ * 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.
+ */
+
+import { AuthenticatorOptions } from '../authenticator.js';
+
+export type SaslMechanismBaseOptions = AuthenticatorOptions & { authzid?: string };
+
+export default abstract class SaslMechanismBase {
+ constructor(protected options: SaslMechanismBaseOptions) {
+ this.setopts(options);
+ }
+
+ /**
+ * Returns the name of the mechanism
+ */
+ get name(): string | null {
+ return null;
+ }
+
+ /**
+ * Set the options for the mechanism
+ * @param {object} options Options specific to the mechanism
+ */
+ setopts(options: SaslMechanismBaseOptions) {
+ this.options = options;
+ }
+
+ /**
+ * Evaluates the challenge from the server and returns appropriate response
+ * @param {String} challenge Challenge string presented by the server
+ */
+ abstract evaluateChallenge(challenge: String): any;
+}
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/auth/mechanisms/sasl-mechanism-plain.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/auth/mechanisms/sasl-mechanism-plain.js
deleted file mode 100644
index e13945a..0000000
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/auth/mechanisms/sasl-mechanism-plain.js
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-'use strict';
-
-const { Buffer } = require('buffer');
-const SaslMechanismBase = require('./sasl-mechanism-base');
-
-class SaslMechanismPlain extends SaslMechanismBase {
- /**
- * Creates a new instance of SaslMechanismPlain.
- * @param {Object} [options] The mechanism options.
- * @param {String} [options.authzid] The identity of the client.
- * @param {String} [options.username] The identity of user with access to server.
- * @param {String} [options.password] The password of user with access to server.
- * @constructor
- */
- constructor(options) {
- super(options);
-
- if (
- this._options.username === undefined ||
- this._options.username === null ||
- this._options.username.length === 0 ||
- this._options.password === undefined ||
- this._options.password === null ||
- this._options.password.length === 0
- ) {
- throw new Error('Missing credentials for SASL PLAIN mechanism');
- }
- }
-
- /**
- * Returns the name of the mechanism
- */
- get name() {
- return 'PLAIN';
- }
-
- /**
- * Evaluates the challenge from the server and returns appropriate response.
- * @param {String} challenge Challenge string presented by the server.
- * @return {Object} A Promise that resolves to a valid sasl response object.
- */
- evaluateChallenge(challenge) {
- if (this._hasInitialResponse(challenge)) {
- return Promise.resolve({
- saslMechanism: this.name,
- sasl: this._saslArgument(this._options.authzid, this._options.username, this._options.password),
- });
- }
-
- return Promise.resolve({
- sasl: this._saslArgument(this._options.authzid, this._options.username, this._options.password),
- });
- }
-
- /**
- * Generates a base64 encoded sasl argument based on the given parameters.
- * @param {String} authzid Identitiy of the client.
- * @param {String} username The identity of user with access to server.
- * @param {String} password The password of user with access to server.
- */
- _saslArgument(authzid, username, password) {
- if (authzid === undefined || authzid === null) {
- authzid = '';
- }
- if (username === undefined || username === null) {
- username = '';
- }
- if (password === undefined || password.length === null) {
- password = '';
- }
-
- return Buffer.from(`${authzid}\0${username}\0${password}`).toString('base64');
- }
-
- /**
- * Checks challenge to see if we have the initial sasl response from the server.
- * @param {String} challenge The challenge string from the server.
- * @return {Boolean}
- */
- _hasInitialResponse(challenge) {
- if (challenge === undefined || challenge === null) {
- return false;
- }
- return true;
- }
-}
-
-module.exports = SaslMechanismPlain;
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/auth/mechanisms/sasl-mechanism-plain.ts b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/auth/mechanisms/sasl-mechanism-plain.ts
new file mode 100644
index 0000000..f80cf4d
--- /dev/null
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/auth/mechanisms/sasl-mechanism-plain.ts
@@ -0,0 +1,105 @@
+/*
+ * 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.
+ */
+
+import { Buffer } from 'buffer';
+import SaslMechanismBase, { SaslMechanismBaseOptions } from './sasl-mechanism-base.js';
+
+export type SaslMechanismPlainOptions = SaslMechanismBaseOptions & {};
+
+export default class SaslMechanismPlain extends SaslMechanismBase {
+ /**
+ * Creates a new instance of SaslMechanismPlain.
+ * @param {Object} [options] The mechanism options.
+ * @param {String} [options.authzid] The identity of the client.
+ * @param {String} [options.username] The identity of user with access to server.
+ * @param {String} [options.password] The password of user with access to server.
+ * @constructor
+ */
+ constructor(options: SaslMechanismPlainOptions) {
+ super(options);
+
+ if (
+ this.options?.username === undefined ||
+ this.options.username === null ||
+ this.options.username.length === 0 ||
+ this.options.password === undefined ||
+ this.options.password === null ||
+ this.options.password.length === 0
+ ) {
+ throw new Error('Missing credentials for SASL PLAIN mechanism');
+ }
+ }
+
+ /**
+ * Returns the name of the mechanism
+ */
+ get name() {
+ return 'PLAIN';
+ }
+
+ /**
+ * Evaluates the challenge from the server and returns appropriate response.
+ * @param {String} challenge Challenge string presented by the server.
+ * @return {Object} A Promise that resolves to a valid sasl response object.
+ */
+ evaluateChallenge(challenge: string) {
+ if (this._hasInitialResponse(challenge)) {
+ return Promise.resolve({
+ saslMechanism: this.name,
+ sasl: this._saslArgument(this.options!.authzid!, this.options!.username!, this.options!.password!),
+ });
+ }
+
+ return Promise.resolve({
+ sasl: this._saslArgument(this.options!.authzid!, this.options!.username!, this.options!.password!),
+ });
+ }
+
+ /**
+ * Generates a base64 encoded sasl argument based on the given parameters.
+ * @param {String} authzid Identitiy of the client.
+ * @param {String} username The identity of user with access to server.
+ * @param {String} password The password of user with access to server.
+ */
+ _saslArgument(authzid: string, username: String, password: string) {
+ if (authzid === undefined || authzid === null) {
+ authzid = '';
+ }
+ if (username === undefined || username === null) {
+ username = '';
+ }
+ if (password === undefined || password.length === null) {
+ password = '';
+ }
+
+ return Buffer.from(`${authzid}\0${username}\0${password}`).toString('base64');
+ }
+
+ /**
+ * Checks challenge to see if we have the initial sasl response from the server.
+ * @param {String} challenge The challenge string from the server.
+ * @return {Boolean}
+ */
+ _hasInitialResponse(challenge: string) {
+ if (challenge === undefined || challenge === null) {
+ return false;
+ }
+ return true;
+ }
+}
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/auth/plain-text-sasl-authenticator.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/auth/plain-text-sasl-authenticator.js
deleted file mode 100644
index 2f6845a..0000000
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/auth/plain-text-sasl-authenticator.js
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-'use strict';
-
-const Authenticator = require('./authenticator');
-const SaslMechanismPlain = require('./mechanisms/sasl-mechanism-plain');
-
-class PlainTextSaslAuthenticator extends Authenticator {
- /**
- * Creates a new instance of PlainTextSaslAuthenticator.
- * @param {string} username Username to log into the server.
- * @param {string} password Password for the user.
- * @param {string} [authzid] Optional id
- * @constructor
- */
- constructor(username, password, authzid) {
- const options = {
- mechanism: new SaslMechanismPlain({
- username: username,
- password: password,
- authzid: authzid,
- }),
- };
-
- super(options);
- }
-
- /**
- * Evaluates the challenge from the server and returns appropriate response.
- * @param {String} challenge Challenge string presented by the server.
- * @return {Object} A Promise that resolves to a valid sasl response object.
- */
- evaluateChallenge(challenge) {
- return this._options.mechanism.evaluateChallenge(challenge);
- }
-}
-
-module.exports = PlainTextSaslAuthenticator;
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/auth/plain-text-sasl-authenticator.ts b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/auth/plain-text-sasl-authenticator.ts
new file mode 100644
index 0000000..9a45f21
--- /dev/null
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/auth/plain-text-sasl-authenticator.ts
@@ -0,0 +1,51 @@
+/*
+ * 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.
+ */
+
+import Authenticator from './authenticator.js';
+import SaslMechanismPlain from './mechanisms/sasl-mechanism-plain.js';
+
+export default class PlainTextSaslAuthenticator extends Authenticator {
+ /**
+ * Creates a new instance of PlainTextSaslAuthenticator.
+ * @param {string} username Username to log into the server.
+ * @param {string} password Password for the user.
+ * @param {string} [authzid] Optional id
+ * @constructor
+ */
+ constructor(username: string, password: string, authzid?: string) {
+ const options = {
+ mechanism: new SaslMechanismPlain({
+ username: username,
+ password: password,
+ authzid: authzid,
+ }),
+ };
+
+ super(options);
+ }
+
+ /**
+ * Evaluates the challenge from the server and returns appropriate response.
+ * @param {String} challenge Challenge string presented by the server.
+ * @return {Object} A Promise that resolves to a valid sasl response object.
+ */
+ evaluateChallenge(challenge: string): any {
+ return this.options.mechanism.evaluateChallenge(challenge);
+ }
+}
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/auth/sasl-authenticator.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/auth/sasl-authenticator.js
deleted file mode 100644
index 4ad32c4..0000000
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/auth/sasl-authenticator.js
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-'use strict';
-
-const Authenticator = require('./authenticator');
-
-class SaslAuthenticator extends Authenticator {
- /**
- * Creates a new instance of SaslAuthenticator.
- * @param {Object} [options] The authentication options.
- * @param {Object} [options.mechanism] The mechanism to be used for authentication.
- * @constructor
- */
- constructor(options) {
- super(options);
-
- if (options.mechanism === null || options.mechanism === undefined) {
- throw new Error('No Sasl Mechanism Specified');
- }
- }
-
- /**
- * Evaluates the challenge from the server and returns appropriate response.
- * @param {String} challenge Challenge string presented by the server.
- * @return {Object} A Promise that resolves to a valid sasl response object.
- */
- evaluateChallenge(challenge) {
- return this._options.mechanism.evaluateChallenge(challenge);
- }
-}
-
-module.exports = SaslAuthenticator;
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/auth/sasl-authenticator.ts b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/auth/sasl-authenticator.ts
new file mode 100644
index 0000000..af5877f
--- /dev/null
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/auth/sasl-authenticator.ts
@@ -0,0 +1,50 @@
+/*
+ * 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.
+ */
+
+
+import Authenticator, { AuthenticatorOptions } from './authenticator.js';
+
+export type SaslAuthenticatorOptions = AuthenticatorOptions & {
+ mechanism?: any;
+};
+
+export default class SaslAuthenticator extends Authenticator {
+ /**
+ * Creates a new instance of SaslAuthenticator.
+ * @param {Object} [options] The authentication options.
+ * @param {Object} [options.mechanism] The mechanism to be used for authentication.
+ * @constructor
+ */
+ constructor(options: SaslAuthenticatorOptions) {
+ super(options);
+
+ if (options.mechanism === null || options.mechanism === undefined) {
+ throw new Error('No Sasl Mechanism Specified');
+ }
+ }
+
+ /**
+ * Evaluates the challenge from the server and returns appropriate response.
+ * @param {String} challenge Challenge string presented by the server.
+ * @return {Object} A Promise that resolves to a valid sasl response object.
+ */
+ evaluateChallenge(challenge: string) {
+ return this.options.mechanism.evaluateChallenge(challenge);
+ }
+}
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/client.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/client.js
deleted file mode 100644
index fc71a1b..0000000
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/client.js
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * 'License'); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-'use strict';
-
-const utils = require('../utils');
-const Connection = require('./connection');
-const Bytecode = require('../process/bytecode');
-
-/**
- * A {@link Client} contains methods to send messages to a Gremlin Server.
- */
-class Client {
- /**
- * Creates a new instance of {@link Client}.
- * @param {String} url The resource uri.
- * @param {Object} [options] The connection options.
- * @param {Array} [options.ca] Trusted certificates.
- * @param {String|Array|Buffer} [options.cert] The certificate key.
- * @param {String} [options.mimeType] The mime type to use.
- * @param {String|Buffer} [options.pfx] The private key, certificate, and CA certs.
- * @param {GraphSONReader} [options.reader] The reader to use.
- * @param {Boolean} [options.rejectUnauthorized] Determines whether to verify or not the server certificate.
- * @param {String} [options.traversalSource] The traversal source. Defaults to: 'g'.
- * @param {GraphSONWriter} [options.writer] The writer to use.
- * @param {Authenticator} [options.authenticator] The authentication handler to use.
- * @param {Object} [options.headers] An associative array containing the additional header key/values for the initial request.
- * @param {Boolean} [options.enableUserAgentOnConnect] Determines if a user agent will be sent during connection handshake. Defaults to: true
- * @param {String} [options.processor] The name of the opProcessor to use, leave it undefined or set 'session' when session mode.
- * @param {String} [options.session] The sessionId of Client in session mode. Defaults to null means session-less Client.
- * @param {http.Agent} [options.agent] The http.Agent implementation to use.
- * @param {Boolean} [options.enableCompression] Enable per-message deflate compression. Defaults to: false.
- * @constructor
- */
- constructor(url, options = {}) {
- this._options = options;
- if (this._options.processor === 'session') {
- // compatibility with old 'session' processor setting
- this._options.session = options.session || utils.getUuid();
- }
- if (this._options.session) {
- // re-assign processor to 'session' when in session mode
- this._options.processor = options.processor || 'session';
- }
- this._connection = new Connection(url, options);
- }
-
- /**
- * Opens the underlying connection to the Gremlin Server, if it's not already opened.
- * @returns {Promise}
- */
- open() {
- return this._connection.open();
- }
-
- /**
- * Returns true if the underlying connection is open
- * @returns {Boolean}
- */
- get isOpen() {
- return this._connection.isOpen;
- }
-
- /**
- * Configuration specific to the current request.
- * @typedef {Object} RequestOptions
- * @property {String} requestId - User specified request identifier which must be a UUID.
- * @property {Number} batchSize - Indicates whether the Power component is present.
- * @property {String} userAgent - The size in which the result of a request is to be 'batched' back to the client
- * @property {Number} evaluationTimeout - The timeout for the evaluation of the request.
- * @property {String} materializeProperties - Indicates whether element properties should be returned or not.
- */
-
- /**
- * Send a request to the Gremlin Server, can send a script or bytecode steps.
- * @param {Bytecode|string} message The bytecode or script to send
- * @param {Object} [bindings] The script bindings, if any.
- * @param {RequestOptions} [requestOptions] Configuration specific to the current request.
- * @returns {Promise}
- */
- submit(message, bindings, requestOptions) {
- const requestIdOverride = requestOptions && requestOptions.requestId;
- if (requestIdOverride) {
- delete requestOptions['requestId'];
- }
-
- const args = Object.assign(
- {
- gremlin: message,
- aliases: { g: this._options.traversalSource || 'g' },
- },
- requestOptions,
- );
-
- if (this._options.session && this._options.processor === 'session') {
- args['session'] = this._options.session;
- }
-
- if (message instanceof Bytecode) {
- if (this._options.session && this._options.processor === 'session') {
- return this._connection.submit('session', 'bytecode', args, requestIdOverride);
- }
- return this._connection.submit('traversal', 'bytecode', args, requestIdOverride);
- } else if (typeof message === 'string') {
- args['bindings'] = bindings;
- args['language'] = 'gremlin-groovy';
- args['accept'] = this._connection.mimeType;
- return this._connection.submit(this._options.processor || '', 'eval', args, requestIdOverride);
- }
- throw new TypeError('message must be of type Bytecode or string');
- }
-
- /**
- * Send a request to the Gremlin Server and receive a stream for the results, can send a script or bytecode steps.
- * @param {Bytecode|string} message The bytecode or script to send
- * @param {Object} [bindings] The script bindings, if any.
- * @param {RequestOptions} [requestOptions] Configuration specific to the current request.
- * @returns {ReadableStream}
- */
- stream(message, bindings, requestOptions) {
- const requestIdOverride = requestOptions && requestOptions.requestId;
- if (requestIdOverride) {
- delete requestOptions['requestId'];
- }
-
- const args = Object.assign(
- {
- gremlin: message,
- aliases: { g: this._options.traversalSource || 'g' },
- },
- requestOptions,
- );
-
- if (this._options.session && this._options.processor === 'session') {
- args['session'] = this._options.session;
- }
-
- if (message instanceof Bytecode) {
- if (this._options.session && this._options.processor === 'session') {
- return this._connection.stream('session', 'bytecode', args, requestIdOverride);
- }
- return this._connection.stream('traversal', 'bytecode', args, requestIdOverride);
- } else if (typeof message === 'string') {
- args['bindings'] = bindings;
- args['language'] = 'gremlin-groovy';
- args['accept'] = this._connection.mimeType;
- return this._connection.stream(this._options.processor || '', 'eval', args, requestIdOverride);
- }
- throw new TypeError('message must be of type Bytecode or string');
- }
-
- /**
- * Closes the underlying connection
- * send session close request before connection close if session mode
- * @returns {Promise}
- */
- close() {
- if (this._options.session && this._options.processor === 'session') {
- const args = { session: this._options.session };
- return this._connection.submit(this._options.processor, 'close', args, null).then(() => this._connection.close());
- }
- return this._connection.close();
- }
-
- /**
- * Adds an event listener to the connection
- * @param {String} event The event name that you want to listen to.
- * @param {Function} handler The callback to be called when the event occurs.
- */
- addListener(event, handler) {
- this._connection.on(event, handler);
- }
-
- /**
- * Removes a previowsly added event listener to the connection
- * @param {String} event The event name that you want to listen to.
- * @param {Function} handler The event handler to be removed.
- */
- removeListener(event, handler) {
- this._connection.removeListener(event, handler);
- }
-}
-
-module.exports = Client;
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/client.ts b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/client.ts
new file mode 100644
index 0000000..609626f
--- /dev/null
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/client.ts
@@ -0,0 +1,210 @@
+/*
+ * 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.
+ */
+
+import * as utils from '../utils.js';
+import Connection, { ConnectionOptions } from './connection.js';
+import Bytecode from '../process/bytecode.js';
+import { Readable } from 'stream';
+
+export type RequestOptions = {
+ requestId?: string;
+ session?: string;
+ bindings?: any;
+ language?: string;
+ accept?: string;
+};
+
+type ClientOptions = ConnectionOptions & RequestOptions & { processor?: string };
+
+/**
+ * A {@link Client} contains methods to send messages to a Gremlin Server.
+ */
+export default class Client {
+ private readonly _connection: Connection;
+
+ /**
+ * Creates a new instance of {@link Client}.
+ * @param {String} url The resource uri.
+ * @param {Object} [options] The connection options.
+ * @param {Array} [options.ca] Trusted certificates.
+ * @param {String|Array|Buffer} [options.cert] The certificate key.
+ * @param {String} [options.mimeType] The mime type to use.
+ * @param {String|Buffer} [options.pfx] The private key, certificate, and CA certs.
+ * @param {GraphSONReader} [options.reader] The reader to use.
+ * @param {Boolean} [options.rejectUnauthorized] Determines whether to verify or not the server certificate.
+ * @param {String} [options.traversalSource] The traversal source. Defaults to: 'g'.
+ * @param {GraphSONWriter} [options.writer] The writer to use.
+ * @param {Authenticator} [options.authenticator] The authentication handler to use.
+ * @param {Object} [options.headers] An associative array containing the additional header key/values for the initial request.
+ * @param {Boolean} [options.enableUserAgentOnConnect] Determines if a user agent will be sent during connection handshake. Defaults to: true
+ * @param {String} [options.processor] The name of the opProcessor to use, leave it undefined or set 'session' when session mode.
+ * @param {String} [options.session] The sessionId of Client in session mode. Defaults to null means session-less Client.
+ * @param {http.Agent} [options.agent] The http.Agent implementation to use.
+ * @constructor
+ */
+ constructor(
+ url: string,
+ private readonly options: ClientOptions = {},
+ ) {
+ if (this.options.processor === 'session') {
+ // compatibility with old 'session' processor setting
+ this.options.session = options.session || utils.getUuid();
+ }
+ if (this.options.session) {
+ // re-assign processor to 'session' when in session mode
+ this.options.processor = options.processor || 'session';
+ }
+ this._connection = new Connection(url, options);
+ }
+
+ /**
+ * Opens the underlying connection to the Gremlin Server, if it's not already opened.
+ * @returns {Promise}
+ */
+ open(): Promise<void> {
+ return this._connection.open();
+ }
+
+ /**
+ * Returns true if the underlying connection is open
+ * @returns {Boolean}
+ */
+ get isOpen(): boolean {
+ return this._connection.isOpen;
+ }
+
+ /**
+ * Configuration specific to the current request.
+ * @typedef {Object} RequestOptions
+ * @property {String} requestId - User specified request identifier which must be a UUID.
+ * @property {Number} batchSize - Indicates whether the Power component is present.
+ * @property {String} userAgent - The size in which the result of a request is to be 'batched' back to the client
+ * @property {Number} evaluationTimeout - The timeout for the evaluation of the request.
+ * @property {String} materializeProperties - Indicates whether element properties should be returned or not.
+ */
+
+ /**
+ * Send a request to the Gremlin Server, can send a script or bytecode steps.
+ * @param {Bytecode|string} message The bytecode or script to send
+ * @param {Object|null} [bindings] The script bindings, if any.
+ * @param {RequestOptions} [requestOptions] Configuration specific to the current request.
+ * @returns {Promise}
+ */
+ submit(message: Bytecode | string, bindings: any | null, requestOptions?: RequestOptions): Promise<any> {
+ const requestIdOverride = requestOptions && requestOptions.requestId;
+ if (requestIdOverride) {
+ delete requestOptions['requestId'];
+ }
+
+ const args = Object.assign(
+ {
+ gremlin: message,
+ aliases: { g: this.options.traversalSource || 'g' },
+ },
+ requestOptions,
+ );
+
+ if (this.options.session && this.options.processor === 'session') {
+ args['session'] = this.options.session;
+ }
+
+ if (message instanceof Bytecode) {
+ if (this.options.session && this.options.processor === 'session') {
+ return this._connection.submit('session', 'bytecode', args, requestIdOverride);
+ }
+ return this._connection.submit('traversal', 'bytecode', args, requestIdOverride);
+ } else if (typeof message === 'string') {
+ args['bindings'] = bindings;
+ args['language'] = 'gremlin-groovy';
+ args['accept'] = this._connection.mimeType;
+ return this._connection.submit(this.options.processor || '', 'eval', args, requestIdOverride);
+ }
+ throw new TypeError('message must be of type Bytecode or string');
+ }
+
+ /**
+ * Send a request to the Gremlin Server and receive a stream for the results, can send a script or bytecode steps.
+ * @param {Bytecode|string} message The bytecode or script to send
+ * @param {Object} [bindings] The script bindings, if any.
+ * @param {RequestOptions} [requestOptions] Configuration specific to the current request.
+ * @returns {ReadableStream}
+ */
+ stream(message: Bytecode | string, bindings: any, requestOptions?: RequestOptions): Readable {
+ const requestIdOverride = requestOptions && requestOptions.requestId;
+ if (requestIdOverride) {
+ delete requestOptions['requestId'];
+ }
+
+ const args = Object.assign(
+ {
+ gremlin: message,
+ aliases: { g: this.options.traversalSource || 'g' },
+ },
+ requestOptions,
+ );
+
+ if (this.options.session && this.options.processor === 'session') {
+ args['session'] = this.options.session;
+ }
+
+ if (message instanceof Bytecode) {
+ if (this.options.session && this.options.processor === 'session') {
+ return this._connection.stream('session', 'bytecode', args, requestIdOverride);
+ }
+ return this._connection.stream('traversal', 'bytecode', args, requestIdOverride);
+ } else if (typeof message === 'string') {
+ args['bindings'] = bindings;
+ args['language'] = 'gremlin-groovy';
+ args['accept'] = this._connection.mimeType;
+ return this._connection.stream(this.options.processor || '', 'eval', args, requestIdOverride);
+ }
+ throw new TypeError('message must be of type Bytecode or string');
+ }
+
+ /**
+ * Closes the underlying connection
+ * send session close request before connection close if session mode
+ * @returns {Promise}
+ */
+ close(): Promise<void> {
+ if (this.options.session && this.options.processor === 'session') {
+ const args = { session: this.options.session };
+ return this._connection.submit(this.options.processor, 'close', args, null).then(() => this._connection.close());
+ }
+ return this._connection.close();
+ }
+
+ /**
+ * Adds an event listener to the connection
+ * @param {String} event The event name that you want to listen to.
+ * @param {Function} handler The callback to be called when the event occurs.
+ */
+ addListener(event: string, handler: (...args: any[]) => unknown) {
+ this._connection.on(event, handler);
+ }
+
+ /**
+ * Removes a previowsly added event listener to the connection
+ * @param {String} event The event name that you want to listen to.
+ * @param {Function} handler The event handler to be removed.
+ */
+ removeListener(event: string, handler: (...args: any[]) => unknown) {
+ this._connection.removeListener(event, handler);
+ }
+}
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/connection.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/connection.js
deleted file mode 100644
index ebb7e96..0000000
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/connection.js
+++ /dev/null
@@ -1,453 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * @author Jorge Bay Gondra
- */
-'use strict';
-
-const { Buffer } = require('buffer');
-const EventEmitter = require('eventemitter3');
-const Stream = require('readable-stream');
-const utils = require('../utils');
-const { DeferredPromise } = utils;
-const serializer = require('../structure/io/graph-serializer');
-const { graphBinaryReader, graphBinaryWriter } = require('../structure/io/binary/GraphBinary');
-const ResultSet = require('./result-set');
-const ResponseError = require('./response-error');
-
-const responseStatusCode = {
- success: 200,
- noContent: 204,
- partialContent: 206,
- authenticationChallenge: 407,
-};
-
-const defaultMimeType = 'application/vnd.graphbinary-v1.0';
-const graphSON2MimeType = 'application/vnd.gremlin-v2.0+json';
-const graphBinaryMimeType = 'application/vnd.graphbinary-v1.0';
-
-const uuidPattern = '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}';
-
-/**
- * Represents a single connection to a Gremlin Server.
- */
-class Connection extends EventEmitter {
- /**
- * Creates a new instance of {@link Connection}.
- * @param {String} url The resource uri.
- * @param {Object} [options] The connection options.
- * @param {Array} [options.ca] Trusted certificates.
- * @param {String|Array|Buffer} [options.cert] The certificate key.
- * @param {String} [options.mimeType] The mime type to use.
- * @param {String|Buffer} [options.pfx] The private key, certificate, and CA certs.
- * @param {GraphSONReader} [options.reader] The reader to use.
- * @param {Boolean} [options.rejectUnauthorized] Determines whether to verify or not the server certificate.
- * @param {String} [options.traversalSource] The traversal source. Defaults to: 'g'.
- * @param {GraphSONWriter} [options.writer] The writer to use.
- * @param {Authenticator} [options.authenticator] The authentication handler to use.
- * @param {Object} [options.headers] An associative array containing the additional header key/values for the initial request.
- * @param {Boolean} [options.enableUserAgentOnConnect] Determines if a user agent will be sent during connection handshake. Defaults to: true
- * @param {http.Agent} [options.agent] The http.Agent implementation to use.
- * @param {Boolean} [options.enableCompression] Enable per-message deflate compression. Defaults to: false.
- * @constructor
- */
- constructor(url, options) {
- super();
-
- this.url = url;
- this.options = options = options || {};
-
- /**
- * Gets the MIME type.
- * @type {String}
- */
- this.mimeType = options.mimeType || defaultMimeType;
-
- // A map containing the request id and the handler. The id should be in lower case to prevent string comparison issues.
- this._responseHandlers = {};
- this._reader = options.reader || this.#getDefaultReader(this.mimeType);
- this._writer = options.writer || this.#getDefaultWriter(this.mimeType);
- this._openPromise = null;
- this._openCallback = null;
- this._closePromise = null;
- this._closeCallback = null;
-
- this._header = String.fromCharCode(this.mimeType.length) + this.mimeType; // TODO: what if mimeType.length > 255
- this._header_buf = Buffer.from(this._header);
- this.isOpen = false;
- this.traversalSource = options.traversalSource || 'g';
- this._authenticator = options.authenticator;
- this._enableUserAgentOnConnect = options.enableUserAgentOnConnect !== false;
- this._enableCompression = this.options.enableCompression || false;
- }
-
- /**
- * Opens the connection, if its not already opened.
- * @returns {Promise}
- */
- async open() {
- if (this.isOpen) {
- return;
- }
- if (this._openPromise) {
- return this._openPromise;
- }
-
- this._openPromise = DeferredPromise();
-
- this.emit('log', 'ws open');
- let headers = this.options.headers;
- if (this._enableUserAgentOnConnect) {
- if (!headers) {
- headers = [];
- }
-
- const userAgent = await utils.getUserAgent();
- if (userAgent !== undefined) {
- headers[utils.getUserAgentHeader()] = await utils.getUserAgent();
- }
- }
- // All these options are available to the `ws` package's constructor, but not the global WebSocket class
- const wsSpecificOptions = new Set([
- 'headers',
- 'ca',
- 'cert',
- 'pfx',
- 'rejectUnauthorized',
- 'agent',
- 'perMessageDeflate',
- ]);
- // Check if any `ws` specific options are provided and are non-null / non-undefined
- const hasWsSpecificOptions = Object.entries(this.options).some(
- ([key, value]) => wsSpecificOptions.has(key) && ![null, undefined].includes(value),
- );
- // Only use the global websocket if we don't have any unsupported options
- const useGlobalWebSocket = !hasWsSpecificOptions && globalThis.WebSocket;
- const WebSocket = useGlobalWebSocket || (await import('ws')).default;
-
- this._ws = new WebSocket(
- this.url,
- !useGlobalWebSocket
- ? {
- headers: headers,
- ca: this.options.ca,
- cert: this.options.cert,
- pfx: this.options.pfx,
- rejectUnauthorized: this.options.rejectUnauthorized,
- agent: this.options.agent,
- perMessageDeflate: this._enableCompression,
- }
- : undefined,
- );
-
- if ('binaryType' in this._ws) {
- this._ws.binaryType = 'arraybuffer';
- }
-
- this._ws.addEventListener('open', this.#handleOpen);
- this._ws.addEventListener('error', this.#handleError);
- this._ws.on('unexpected-response', this.#handleUnexpectedResponse);
- this._ws.addEventListener('message', this.#handleMessage);
- this._ws.addEventListener('close', this.#handleClose);
-
- return await this._openPromise;
- }
-
- /** @override */
- submit(processor, op, args, requestId) {
- // TINKERPOP-2847: Use lower case to prevent string comparison issues.
- const rid = (requestId || utils.getUuid()).toLowerCase();
- if (!rid.match(uuidPattern)) {
- throw new Error('Provided requestId "' + rid + '" is not a valid UUID.');
- }
-
- return this.open().then(
- () =>
- new Promise((resolve, reject) => {
- if (op !== 'authentication') {
- this._responseHandlers[rid] = {
- callback: (err, result) => (err ? reject(err) : resolve(result)),
- result: null,
- };
- }
-
- const request = {
- requestId: rid,
- op: op || 'bytecode',
- // if using op eval need to ensure processor stays unset if caller didn't set it.
- processor: !processor && op !== 'eval' ? 'traversal' : processor,
- args: args || {},
- };
-
- const request_buf = this._writer.writeRequest(request);
- const message = utils.toArrayBuffer(Buffer.concat([this._header_buf, request_buf]));
- this._ws.send(message);
- }),
- );
- }
-
- /** @override */
- stream(processor, op, args, requestId) {
- // TINKERPOP-2847: Use lower case to prevent string comparison issues.
- const rid = (requestId || utils.getUuid()).toLowerCase();
- if (!rid.match(uuidPattern)) {
- throw new Error('Provided requestId "' + rid + '" is not a valid UUID.');
- }
-
- const readableStream = new Stream.Readable({
- objectMode: true,
- read() {},
- });
-
- this._responseHandlers[rid] = {
- callback: (err) => (err ? readableStream.destroy(err) : readableStream.push(null)),
- result: readableStream,
- };
-
- this.open()
- .then(() => {
- const request = {
- requestId: rid,
- op: op || 'bytecode',
- // if using op eval need to ensure processor stays unset if caller didn't set it.
- processor: !processor && op !== 'eval' ? 'traversal' : processor,
- args: args || {},
- };
-
- const request_buf = this._writer.writeRequest(request);
- const message = utils.toArrayBuffer(Buffer.concat([this._header_buf, request_buf]));
- this._ws.send(message);
- })
- .catch((err) => readableStream.destroy(err));
-
- return readableStream;
- }
-
- #getDefaultReader(mimeType) {
- if (mimeType === graphBinaryMimeType) {
- return graphBinaryReader;
- }
-
- return mimeType === graphSON2MimeType ? new serializer.GraphSON2Reader() : new serializer.GraphSONReader();
- }
-
- #getDefaultWriter(mimeType) {
- if (mimeType === graphBinaryMimeType) {
- return graphBinaryWriter;
- }
-
- return mimeType === graphSON2MimeType ? new serializer.GraphSON2Writer() : new serializer.GraphSONWriter();
- }
-
- #handleOpen = () => {
- this._openPromise.resolve();
- this.isOpen = true;
- };
-
- /**
- * @param {ClientRequest} _req
- * @param {IncomingMessage} res
- */
- #handleUnexpectedResponse = async (_req, res) => {
- const body = await new Promise((resolve, reject) => {
- const chunks = [];
- res.on('data', (data) => {
- chunks.push(data instanceof Buffer ? data : Buffer.from(data));
- });
- res.on('end', () => {
- resolve(chunks.length ? Buffer.concat(chunks) : null);
- });
- res.on('error', reject);
- });
- const statusCodeErrorMessage = `Unexpected server response code ${res.statusCode}`;
- const errorMessage = body ? `${statusCodeErrorMessage} with body:\n${body.toString()}` : statusCodeErrorMessage;
- const error = new Error(errorMessage);
- this.#handleError({
- error,
- message: errorMessage,
- type: 'unexpected-response',
- target: this._ws,
- });
- };
-
- /**
- * @param {Event} event
- */
- #handleError = ({ error }) => {
- this._openPromise.reject(error);
- this.emit('log', `ws error ${error}`);
- this.#cleanupWebsocket(error);
- this.emit('socketError', error);
- };
-
- /**
- * @param {CloseEvent} event
- */
- #handleClose = ({ code, message }) => {
- this.emit('log', `ws close code=${code} message=${message}`);
- this.#cleanupWebsocket();
- if (this._closeCallback) {
- this._closeCallback();
- }
- this.emit('close', code, message);
- };
-
- /**
- * @param {MessageEvent<any>} event
- */
- #handleMessage = ({ data: _data }) => {
- const data = _data instanceof ArrayBuffer ? Buffer.from(_data) : _data;
-
- const response = this._reader.readResponse(data);
- if (response.requestId === null || response.requestId === undefined) {
- // There was a serialization issue on the server that prevented the parsing of the request id
- // We invoke any of the pending handlers with an error
- Object.keys(this._responseHandlers).forEach((requestId) => {
- const handler = this._responseHandlers[requestId];
- this.#clearHandler(requestId);
- if (response.status !== undefined && response.status.message) {
- return handler.callback(
- // TINKERPOP-2285: keep the old server error message in case folks are parsing that - fix in a future breaking version
- new ResponseError(
- `Server error (no request information): ${response.status.message} (${response.status.code})`,
- response.status,
- ),
- );
- }
- // TINKERPOP-2285: keep the old server error message in case folks are parsing that - fix in a future breaking version
- return handler.callback(
- new ResponseError(`Server error (no request information): ${JSON.stringify(response)}`, response.status),
- );
- });
- return;
- }
-
- // TINKERPOP-2847: Use lower case to prevent string comparison issues.
- response.requestId = response.requestId.toLowerCase();
- const handler = this._responseHandlers[response.requestId];
-
- if (!handler) {
- // The handler for a given request id was not found
- // It was probably invoked earlier due to a serialization issue.
- return;
- }
-
- if (response.status.code === responseStatusCode.authenticationChallenge && this._authenticator) {
- this._authenticator
- .evaluateChallenge(response.result.data)
- .then((res) => this.submit(undefined, 'authentication', res, response.requestId))
- .catch(handler.callback);
-
- return;
- } else if (response.status.code >= 400) {
- this.#clearHandler(response.requestId);
- // callback in error
- return handler.callback(
- // TINKERPOP-2285: keep the old server error message in case folks are parsing that - fix in a future breaking version
- new ResponseError(`Server error: ${response.status.message} (${response.status.code})`, response.status),
- );
- }
-
- const isStreamingResponse = handler.result instanceof Stream.Readable;
-
- switch (response.status.code) {
- case responseStatusCode.noContent:
- this.#clearHandler(response.requestId);
- if (isStreamingResponse) {
- handler.result.push(new ResultSet(utils.emptyArray, response.status.attributes));
- return handler.callback(null);
- }
- return handler.callback(null, new ResultSet(utils.emptyArray, response.status.attributes));
- case responseStatusCode.partialContent:
- if (isStreamingResponse) {
- handler.result.push(new ResultSet(response.result.data, response.status.attributes));
- break;
- }
- handler.result = handler.result || [];
- handler.result.push.apply(handler.result, response.result.data);
- break;
- default:
- if (isStreamingResponse) {
- handler.result.push(new ResultSet(response.result.data, response.status.attributes));
- return handler.callback(null);
- }
- if (handler.result) {
- handler.result.push.apply(handler.result, response.result.data);
- } else {
- handler.result = response.result.data;
- }
- this.#clearHandler(response.requestId);
- return handler.callback(null, new ResultSet(handler.result, response.status.attributes));
- }
- };
-
- /**
- * clean websocket context
- */
- #cleanupWebsocket(err) {
- // Invoke waiting callbacks to complete Promises when closing the websocket
- Object.keys(this._responseHandlers).forEach((requestId) => {
- const handler = this._responseHandlers[requestId];
- const isStreamingResponse = handler.result instanceof Stream.Readable;
- if (isStreamingResponse) {
- handler.callback(null);
- } else {
- const cause = err ? err : new Error('Connection has been closed.');
- handler.callback(cause);
- }
- });
- this._ws.removeEventListener('open', this.#handleOpen);
- this._ws.removeEventListener('error', this.#handleError);
- this._ws.off('unexpected-response', this.#handleUnexpectedResponse);
- this._ws.removeEventListener('message', this.#handleMessage);
- this._ws.removeEventListener('close', this.#handleClose);
- this._openPromise = null;
- this._closePromise = null;
- this.isOpen = false;
- }
-
- /**
- * Clears the internal state containing the callback and result buffer of a given request.
- * @param requestId
- * @private
- */
- #clearHandler(requestId) {
- delete this._responseHandlers[requestId];
- }
-
- /**
- * Closes the Connection.
- * @return {Promise}
- */
- close() {
- if (this.isOpen === false) {
- return Promise.resolve();
- }
- if (!this._closePromise) {
- this._closePromise = new Promise((resolve) => {
- this._closeCallback = resolve;
- this._ws.close();
- });
- }
- return this._closePromise;
- }
-}
-
-module.exports = Connection;
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/connection.ts b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/connection.ts
new file mode 100644
index 0000000..171797e
--- /dev/null
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/connection.ts
@@ -0,0 +1,506 @@
+/*
+ * 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.
+ */
+
+/**
+ * @author Jorge Bay Gondra
+ */
+
+import { Buffer } from 'buffer';
+import { EventEmitter } from 'eventemitter3';
+import type { Agent } from 'node:http';
+import Stream from 'readable-stream';
+import type {
+ CloseEvent as NodeWebSocketCloseEvent,
+ ErrorEvent as NodeWebSocketErrorEvent,
+ MessageEvent as NodeWebSocketMessageEvent,
+ WebSocket as NodeWebSocket,
+ Event as NodeWebSocketEvent,
+} from 'ws';
+import {
+ ClientRequest,
+ IncomingMessage,
+} from "http";
+import ioc from '../structure/io/binary/GraphBinary.js';
+import * as serializer from '../structure/io/graph-serializer.js';
+import * as utils from '../utils.js';
+import Authenticator from './auth/authenticator.js';
+import ResponseError from './response-error.js';
+import ResultSet from './result-set.js';
+
+const { DeferredPromise } = utils;
+const { graphBinaryReader, graphBinaryWriter } = ioc;
+
+const responseStatusCode = {
+ success: 200,
+ noContent: 204,
+ partialContent: 206,
+ authenticationChallenge: 407,
+};
+
+const defaultMimeType = 'application/vnd.graphbinary-v1.0';
+const graphSON2MimeType = 'application/vnd.gremlin-v2.0+json';
+const graphBinaryMimeType = 'application/vnd.graphbinary-v1.0';
+
+type MimeType = typeof defaultMimeType | typeof graphSON2MimeType | typeof graphBinaryMimeType;
+
+const uuidPattern = '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}';
+
+export type ConnectionOptions = {
+ ca?: string[];
+ cert?: string | string[] | Buffer;
+ mimeType?: MimeType;
+ pfx?: string | Buffer;
+ reader?: any;
+ rejectUnauthorized?: boolean;
+ traversalSource?: string;
+ writer?: any;
+ authenticator?: Authenticator;
+ headers?: Record<string, string | string[]>;
+ enableUserAgentOnConnect?: boolean;
+ agent?: Agent;
+};
+
+/**
+ * Represents a single connection to a Gremlin Server.
+ */
+export default class Connection extends EventEmitter {
+ private _ws: WebSocket | NodeWebSocket | undefined;
+
+ readonly mimeType: MimeType;
+
+ private readonly _responseHandlers: Record<string, { callback: (...args: any[]) => unknown; result: any }> = {};
+ private readonly _reader: any;
+ private readonly _writer: any;
+ private _openPromise: ReturnType<typeof DeferredPromise<void>> | null;
+ private _openCallback: (() => unknown) | null;
+ private _closePromise: Promise<void> | null;
+ private _closeCallback: (() => unknown) | null;
+
+ private readonly _header: string;
+ private readonly _header_buf: Buffer;
+
+ isOpen = false;
+ traversalSource: string;
+
+ private readonly _authenticator: any;
+ private readonly _enableUserAgentOnConnect: boolean;
+
+ /**
+ * Creates a new instance of {@link Connection}.
+ * @param {String} url The resource uri.
+ * @param {Object} [options] The connection options.
+ * @param {Array} [options.ca] Trusted certificates.
+ * @param {String|Array|Buffer} [options.cert] The certificate key.
+ * @param {String} [options.mimeType] The mime type to use.
+ * @param {String|Buffer} [options.pfx] The private key, certificate, and CA certs.
+ * @param {GraphSONReader} [options.reader] The reader to use.
+ * @param {Boolean} [options.rejectUnauthorized] Determines whether to verify or not the server certificate.
+ * @param {String} [options.traversalSource] The traversal source. Defaults to: 'g'.
+ * @param {GraphSONWriter} [options.writer] The writer to use.
+ * @param {Authenticator} [options.authenticator] The authentication handler to use.
+ * @param {Object} [options.headers] An associative array containing the additional header key/values for the initial request.
+ * @param {Boolean} [options.enableUserAgentOnConnect] Determines if a user agent will be sent during connection handshake. Defaults to: true
+ * @param {http.Agent} [options.agent] The http.Agent implementation to use.
+ * @constructor
+ */
+ constructor(
+ readonly url: string,
+ readonly options: ConnectionOptions = {},
+ ) {
+ super();
+
+ /**
+ * Gets the MIME type.
+ * @type {String}
+ */
+ this.mimeType = options.mimeType || defaultMimeType;
+
+ // A map containing the request id and the handler. The id should be in lower case to prevent string comparison issues.
+ this._responseHandlers = {};
+ this._reader = options.reader || this.#getDefaultReader(this.mimeType);
+ this._writer = options.writer || this.#getDefaultWriter(this.mimeType);
+ this._openPromise = null;
+ this._openCallback = null;
+ this._closePromise = null;
+ this._closeCallback = null;
+
+ this._header = String.fromCharCode(this.mimeType.length) + this.mimeType; // TODO: what if mimeType.length > 255
+ this._header_buf = Buffer.from(this._header);
+ this.traversalSource = options.traversalSource || 'g';
+ this._authenticator = options.authenticator;
+ this._enableUserAgentOnConnect = options.enableUserAgentOnConnect !== false;
+ }
+
+ /**
+ * Opens the connection, if its not already opened.
+ * @returns {Promise}
+ */
+ async open() {
+ if (this.isOpen) {
+ return;
+ }
+ if (this._openPromise) {
+ return this._openPromise;
+ }
+
+ this._openPromise = DeferredPromise();
+
+ this.emit('log', 'ws open');
+ let headers = this.options.headers;
+ if (this._enableUserAgentOnConnect) {
+ if (!headers) {
+ headers = {};
+ }
+
+ const userAgent = await utils.getUserAgent();
+ if (userAgent !== undefined) {
+ headers[utils.getUserAgentHeader()] = userAgent;
+ }
+ }
+ // All these options are available to the `ws` package's constructor, but not the global WebSocket class
+ const wsSpecificOptions: Set<string> = new Set([
+ 'headers',
+ 'ca',
+ 'cert',
+ 'pfx',
+ 'rejectUnauthorized',
+ 'agent',
+ 'perMessageDeflate',
+ ]);
+ // Check if any `ws` specific options are provided and are non-null / non-undefined
+ const hasWsSpecificOptions: boolean = Object.entries(this.options).some(
+ ([key, value]) => wsSpecificOptions.has(key) && ![null, undefined].includes(value),
+ );
+ // Only use the global websocket if we don't have any unsupported options
+ const useGlobalWebSocket = !hasWsSpecificOptions && globalThis.WebSocket;
+ const WebSocket = useGlobalWebSocket || (await import('ws')).default;
+
+ this._ws = new WebSocket(
+ this.url,
+ !useGlobalWebSocket
+ ? {
+ // @ts-expect-error
+ headers: headers,
+ ca: this.options.ca,
+ cert: this.options.cert,
+ pfx: this.options.pfx,
+ rejectUnauthorized: this.options.rejectUnauthorized,
+ agent: this.options.agent,
+ }
+ : undefined,
+ );
+
+ if ('binaryType' in this._ws!) {
+ this._ws.binaryType = 'arraybuffer';
+ }
+
+ // @ts-expect-error
+ this._ws!.addEventListener('open', this.#handleOpen);
+ // @ts-expect-error
+ this._ws!.addEventListener('error', this.#handleError);
+ // The following listener needs to use `.on` and `.off` because the `ws` package's addEventListener only accepts certain event types
+ // Ref: https://github.com/websockets/ws/blob/8.16.0/lib/event-target.js#L202-L241
+ // @ts-expect-error
+ this._ws!.on('unexpected-response', this.#handleUnexpectedResponse);
+ // @ts-expect-error
+ this._ws!.addEventListener('message', this.#handleMessage);
+ // @ts-expect-error
+ this._ws!.addEventListener('close', this.#handleClose);
+
+ return await this._openPromise;
+ }
+
+ /** @override */
+ submit(processor: string | undefined, op: string, args: any, requestId?: string | null) {
+ // TINKERPOP-2847: Use lower case to prevent string comparison issues.
+ const rid = (requestId || utils.getUuid()).toLowerCase();
+ if (!rid.match(uuidPattern)) {
+ throw new Error('Provided requestId "' + rid + '" is not a valid UUID.');
+ }
+
+ return this.open().then(
+ () =>
+ new Promise((resolve, reject) => {
+ if (op !== 'authentication') {
+ this._responseHandlers[rid] = {
+ callback: (err: Error, result: any) => (err ? reject(err) : resolve(result)),
+ result: null,
+ };
+ }
+
+ const request = {
+ requestId: rid,
+ op: op || 'bytecode',
+ // if using op eval need to ensure processor stays unset if caller didn't set it.
+ processor: !processor && op !== 'eval' ? 'traversal' : processor,
+ args: args || {},
+ };
+
+ const request_buf = this._writer.writeRequest(request);
+ const message = utils.toArrayBuffer(Buffer.concat([this._header_buf, request_buf]));
+ this._ws!.send(message);
+ }),
+ );
+ }
+
+ /** @override */
+ stream(processor: string, op: string, args: any, requestId?: string) {
+ // TINKERPOP-2847: Use lower case to prevent string comparison issues.
+ const rid = (requestId || utils.getUuid()).toLowerCase();
+ if (!rid.match(uuidPattern)) {
+ throw new Error('Provided requestId "' + rid + '" is not a valid UUID.');
+ }
+
+ const readableStream = new Stream.Readable({
+ objectMode: true,
+ read() {},
+ });
+
+ this._responseHandlers[rid] = {
+ callback: (err: Error) => (err ? readableStream.destroy(err) : readableStream.push(null)),
+ result: readableStream,
+ };
+
+ this.open()
+ .then(() => {
+ const request = {
+ requestId: rid,
+ op: op || 'bytecode',
+ // if using op eval need to ensure processor stays unset if caller didn't set it.
+ processor: !processor && op !== 'eval' ? 'traversal' : processor,
+ args: args || {},
+ };
+
+ const request_buf = this._writer.writeRequest(request);
+ const message = utils.toArrayBuffer(Buffer.concat([this._header_buf, request_buf]));
+ this._ws!.send(message);
+ })
+ .catch((err) => readableStream.destroy(err));
+
+ return readableStream;
+ }
+
+ #getDefaultReader(mimeType: MimeType) {
+ if (mimeType === graphBinaryMimeType) {
+ return graphBinaryReader;
+ }
+
+ return mimeType === graphSON2MimeType ? new serializer.GraphSON2Reader() : new serializer.GraphSONReader();
+ }
+
+ #getDefaultWriter(mimeType: MimeType) {
+ if (mimeType === graphBinaryMimeType) {
+ return graphBinaryWriter;
+ }
+
+ return mimeType === graphSON2MimeType ? new serializer.GraphSON2Writer() : new serializer.GraphSONWriter();
+ }
+
+ #handleOpen = (_: Event | NodeWebSocketEvent) => {
+ this._openPromise?.resolve();
+ this.isOpen = true;
+ };
+
+ #handleError = (event: Event | NodeWebSocketErrorEvent) => {
+ const error = 'error' in event ? event.error : event;
+ this._openPromise?.reject(error);
+ this.emit('log', `ws error ${error}`);
+ this.#cleanupWebsocket(error);
+ this.emit('socketError', error);
+ };
+
+ #handleUnexpectedResponse = async (_: ClientRequest, res: IncomingMessage) => {
+ const body = await new Promise((resolve, reject) => {
+ const chunks: any[] = [];
+ res.on('data', data => {
+ chunks.push(data instanceof Buffer ? data : Buffer.from(data));
+ });
+ res.on('end', () => {
+ resolve(chunks.length ? Buffer.concat(chunks) : null);
+ });
+ res.on('error', reject);
+ });
+ // @ts-ignore
+ const statusCodeErrorMessage = `Unexpected server response code ${res.statusCode}`;
+ // @ts-ignore
+ const errorMessage = body ? `${statusCodeErrorMessage} with body:\n${body.toString()}` : statusCodeErrorMessage;
+ const error = new Error(errorMessage);
+ this.#handleError({
+ error,
+ message: errorMessage,
+ type: 'unexpected-response',
+ target: this._ws
+ } as NodeWebSocketErrorEvent);
+ };
+
+
+
+ #handleClose = ({ code, reason }: CloseEvent | NodeWebSocketCloseEvent) => {
+ this.emit('log', `ws close code=${code} message=${reason}`);
+ this.#cleanupWebsocket();
+ if (this._closeCallback) {
+ this._closeCallback();
+ }
+ this.emit('close', code, reason);
+ };
+
+ #handleMessage = ({ data: _data }: MessageEvent | NodeWebSocketMessageEvent) => {
+ const data = _data instanceof ArrayBuffer ? Buffer.from(_data) : _data;
+
+ const response = this._reader.readResponse(data);
+ if (response.requestId === null || response.requestId === undefined) {
+ // There was a serialization issue on the server that prevented the parsing of the request id
+ // We invoke any of the pending handlers with an error
+ Object.keys(this._responseHandlers).forEach((requestId) => {
+ const handler = this._responseHandlers[requestId];
+ this.#clearHandler(requestId);
+ if (response.status !== undefined && response.status.message) {
+ return handler.callback(
+ // TINKERPOP-2285: keep the old server error message in case folks are parsing that - fix in a future breaking version
+ new ResponseError(
+ `Server error (no request information): ${response.status.message} (${response.status.code})`,
+ response.status,
+ ),
+ );
+ }
+ // TINKERPOP-2285: keep the old server error message in case folks are parsing that - fix in a future breaking version
+ return handler.callback(
+ new ResponseError(`Server error (no request information): ${JSON.stringify(response)}`, response.status),
+ );
+ });
+ return;
+ }
+
+ // TINKERPOP-2847: Use lower case to prevent string comparison issues.
+ response.requestId = response.requestId.toLowerCase();
+ const handler = this._responseHandlers[response.requestId];
+
+ if (!handler) {
+ // The handler for a given request id was not found
+ // It was probably invoked earlier due to a serialization issue.
+ return;
+ }
+
+ if (response.status.code === responseStatusCode.authenticationChallenge && this._authenticator) {
+ this._authenticator
+ .evaluateChallenge(response.result.data)
+ .then((res: any) => this.submit(undefined, 'authentication', res, response.requestId))
+ .catch(handler.callback);
+
+ return;
+ } else if (response.status.code >= 400) {
+ this.#clearHandler(response.requestId);
+ // callback in error
+ return handler.callback(
+ // TINKERPOP-2285: keep the old server error message in case folks are parsing that - fix in a future breaking version
+ new ResponseError(`Server error: ${response.status.message} (${response.status.code})`, response.status),
+ );
+ }
+
+ const isStreamingResponse = handler.result instanceof Stream.Readable;
+
+ switch (response.status.code) {
+ case responseStatusCode.noContent:
+ this.#clearHandler(response.requestId);
+ if (isStreamingResponse) {
+ handler.result.push(new ResultSet(utils.emptyArray, response.status.attributes));
+ return handler.callback(null);
+ }
+ return handler.callback(null, new ResultSet(utils.emptyArray, response.status.attributes));
+ case responseStatusCode.partialContent:
+ if (isStreamingResponse) {
+ handler.result.push(new ResultSet(response.result.data, response.status.attributes));
+ break;
+ }
+ handler.result = handler.result || [];
+ handler.result.push.apply(handler.result, response.result.data);
+ break;
+ default:
+ if (isStreamingResponse) {
+ handler.result.push(new ResultSet(response.result.data, response.status.attributes));
+ return handler.callback(null);
+ }
+ if (handler.result) {
+ handler.result.push.apply(handler.result, response.result.data);
+ } else {
+ handler.result = response.result.data;
+ }
+ this.#clearHandler(response.requestId);
+ return handler.callback(null, new ResultSet(handler.result, response.status.attributes));
+ }
+ };
+
+ /**
+ * clean websocket context
+ */
+ #cleanupWebsocket(err?: Error) {
+ // Invoke waiting callbacks to complete Promises when closing the websocket
+ Object.keys(this._responseHandlers).forEach((requestId) => {
+ const handler = this._responseHandlers[requestId];
+ const isStreamingResponse = handler.result instanceof Stream.Readable;
+ if (isStreamingResponse) {
+ handler.callback(null);
+ } else {
+ const cause = err ? err : new Error('Connection has been closed.');
+ handler.callback(cause);
+ }
+ });
+ // @ts-expect-error
+ this._ws?.removeEventListener('open', this.#handleOpen);
+ // @ts-expect-error
+ this._ws?.removeEventListener('error', this.#handleError);
+ // The following listener needs to use `.on` and `.off` because the `ws` package's addEventListener only accepts certain event types
+ // Ref: https://github.com/websockets/ws/blob/8.16.0/lib/event-target.js#L202-L241
+ // @ts-expect-error
+ this._ws?.off('unexpected-response', this.#handleUnexpectedResponse);
+ // @ts-expect-error
+ this._ws?.removeEventListener('message', this.#handleMessage);
+ // @ts-expect-error
+ this._ws?.removeEventListener('close', this.#handleClose);
+ this._openPromise = null;
+ this._closePromise = null;
+ this.isOpen = false;
+ }
+
+ /**
+ * Clears the internal state containing the callback and result buffer of a given request.
+ * @param requestId
+ * @private
+ */
+ #clearHandler(requestId: string) {
+ delete this._responseHandlers[requestId];
+ }
+
+ /**
+ * Closes the Connection.
+ * @return {Promise}
+ */
+ close() {
+ if (this.isOpen === false) {
+ return Promise.resolve();
+ }
+ if (!this._closePromise) {
+ this._closePromise = new Promise((resolve) => {
+ this._closeCallback = resolve;
+ this._ws?.close();
+ });
+ }
+ return this._closePromise;
+ }
+}
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/driver-remote-connection.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/driver-remote-connection.js
deleted file mode 100644
index f31e8db..0000000
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/driver-remote-connection.js
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * @author Jorge Bay Gondra
- */
-'use strict';
-
-const rcModule = require('./remote-connection');
-const RemoteConnection = rcModule.RemoteConnection;
-const RemoteTraversal = rcModule.RemoteTraversal;
-const utils = require('../utils');
-const Client = require('./client');
-const Bytecode = require('../process/bytecode');
-const OptionsStrategy = require('../process/traversal-strategy').OptionsStrategy;
-
-/**
- * Represents the default {@link RemoteConnection} implementation.
- */
-class DriverRemoteConnection extends RemoteConnection {
- /**
- * Creates a new instance of {@link DriverRemoteConnection}.
- * @param {String} url The resource uri.
- * @param {Object} [options] The connection options.
- * @param {Array} [options.ca] Trusted certificates.
- * @param {String|Array|Buffer} [options.cert] The certificate key.
- * @param {String} [options.mimeType] The mime type to use.
- * @param {String|Buffer} [options.pfx] The private key, certificate, and CA certs.
- * @param {GraphSONReader} [options.reader] The reader to use.
- * @param {Boolean} [options.rejectUnauthorized] Determines whether to verify or not the server certificate.
- * @param {String} [options.traversalSource] The traversal source. Defaults to: 'g'.
- * @param {GraphSONWriter} [options.writer] The writer to use.
- * @param {Authenticator} [options.authenticator] The authentication handler to use.
- * @param {Object} [options.headers] An associative array containing the additional header key/values for the initial request.
- * @param {Boolean} [options.enableUserAgentOnConnect] Determines if a user agent will be sent during connection handshake. Defaults to: true
- * @param {http.Agent} [options.agent] The http.Agent implementation to use.
- * @param {Boolean} [options.enableCompression] Enable per-message deflate compression. Defaults to: false.
- * @constructor
- */
- constructor(url, options = {}) {
- super(url, options);
- this._client = new Client(url, options);
- }
-
- /** @override */
- open() {
- return this._client.open();
- }
-
- /** @override */
- get isOpen() {
- return this._client.isOpen;
- }
-
- /** @override */
- submit(bytecode) {
- const optionsStrategy = bytecode.sourceInstructions.find(
- (i) => i[0] === 'withStrategies' && i[1] instanceof OptionsStrategy,
- );
- const allowedKeys = [
- 'evaluationTimeout',
- 'scriptEvaluationTimeout',
- 'batchSize',
- 'requestId',
- 'userAgent',
- 'materializeProperties',
- ];
-
- let requestOptions = undefined;
- if (optionsStrategy !== undefined) {
- requestOptions = {};
- const conf = optionsStrategy[1].configuration;
- for (const key in conf) {
- if (conf.hasOwnProperty(key) && allowedKeys.indexOf(key) > -1) {
- requestOptions[key] = conf[key];
- }
- }
- }
-
- return this._client.submit(bytecode, null, requestOptions).then((result) => new RemoteTraversal(result.toArray()));
- }
-
- /** @override */
- createSession() {
- if (this.isSessionBound) {
- throw new Error('Connection is already bound to a session - child sessions are not allowed');
- }
-
- // make sure a fresh session is used when starting a new transaction
- const copiedOptions = Object.assign({}, this.options);
- copiedOptions.session = utils.getUuid();
- return new DriverRemoteConnection(this.url, copiedOptions);
- }
-
- /** @override */
- get isSessionBound() {
- return this.options.session;
- }
-
- /** @override */
- commit() {
- return this._client.submit(Bytecode.GraphOp.commit, null);
- }
-
- /** @override */
- rollback() {
- return this._client.submit(Bytecode.GraphOp.rollback, null);
- }
-
- /** @override */
- close() {
- return this._client.close();
- }
-
- /** @override */
- addListener(...args) {
- return this._client.addListener(...args);
- }
-
- /** @override */
- removeListener(...args) {
- return this._client.removeListener(...args);
- }
-}
-
-module.exports = DriverRemoteConnection;
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/driver-remote-connection.ts b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/driver-remote-connection.ts
new file mode 100644
index 0000000..f3d93de
--- /dev/null
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/driver-remote-connection.ts
@@ -0,0 +1,136 @@
+/*
+ * 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.
+ */
+
+/**
+ * @author Jorge Bay Gondra
+ */
+
+import * as rcModule from './remote-connection.js';
+const RemoteConnection = rcModule.RemoteConnection;
+const RemoteTraversal = rcModule.RemoteTraversal;
+import * as utils from '../utils.js';
+import Client, { RequestOptions } from './client.js';
+import Bytecode from '../process/bytecode.js';
+import { ConnectionOptions } from './connection.js';
+import { OptionsStrategy } from '../process/traversal-strategy.js';
+
+/**
+ * Represents the default {@link RemoteConnection} implementation.
+ */
+export default class DriverRemoteConnection extends RemoteConnection {
+ private readonly _client: Client;
+
+ /**
+ * Creates a new instance of {@link DriverRemoteConnection}.
+ * @param {String} url The resource uri.
+ * @param {ConnectionOptions} [options] The connection options.
+ * @param {Array} [options.ca] Trusted certificates.
+ * @param {String|Array|Buffer} [options.cert] The certificate key.
+ * @param {String} [options.mimeType] The mime type to use.
+ * @param {String|Buffer} [options.pfx] The private key, certificate, and CA certs.
+ * @param {GraphSONReader} [options.reader] The reader to use.
+ * @param {Boolean} [options.rejectUnauthorized] Determines whether to verify or not the server certificate.
+ * @param {String} [options.traversalSource] The traversal source. Defaults to: 'g'.
+ * @param {GraphSONWriter} [options.writer] The writer to use.
+ * @param {Authenticator} [options.authenticator] The authentication handler to use.
+ * @param {Object} [options.headers] An associative array containing the additional header key/values for the initial request.
+ * @param {Boolean} [options.enableUserAgentOnConnect] Determines if a user agent will be sent during connection handshake. Defaults to: true
+ * @param {http.Agent} [options.agent] The http.Agent implementation to use.
+ * @constructor
+ */
+ constructor(url: string, options: ConnectionOptions = {}) {
+ super(url, options);
+ this._client = new Client(url, options);
+ }
+
+ /** @override */
+ open() {
+ return this._client.open();
+ }
+
+ /** @override */
+ get isOpen() {
+ return this._client.isOpen;
+ }
+
+ /** @override */
+ submit(bytecode: Bytecode) {
+ const optionsStrategy = bytecode.sourceInstructions.find(
+ (i) => i[0] === 'withStrategies' && i[1] instanceof OptionsStrategy,
+ );
+ const allowedKeys = [
+ 'evaluationTimeout',
+ 'scriptEvaluationTimeout',
+ 'batchSize',
+ 'requestId',
+ 'userAgent',
+ 'materializeProperties',
+ ];
+
+ let requestOptions: RequestOptions | undefined = undefined;
+ if (optionsStrategy !== undefined) {
+ requestOptions = {};
+ const conf = optionsStrategy[1].configuration;
+ for (const key in conf) {
+ if (conf.hasOwnProperty(key) && allowedKeys.indexOf(key) > -1) {
+ requestOptions[key as keyof RequestOptions] = conf[key];
+ }
+ }
+ }
+
+ return this._client.submit(bytecode, null, requestOptions).then((result) => new RemoteTraversal(result.toArray()));
+ }
+
+ override createSession() {
+ if (this.isSessionBound) {
+ throw new Error('Connection is already bound to a session - child sessions are not allowed');
+ }
+
+ // make sure a fresh session is used when starting a new transaction
+ const copiedOptions = Object.assign({}, this.options);
+ copiedOptions.session = utils.getUuid();
+ return new DriverRemoteConnection(this.url, copiedOptions);
+ }
+
+ override get isSessionBound() {
+ return Boolean(this.options.session);
+ }
+
+ override commit() {
+ return this._client.submit(Bytecode.GraphOp.commit, null);
+ }
+
+ override rollback() {
+ return this._client.submit(Bytecode.GraphOp.rollback, null);
+ }
+
+ override close() {
+ return this._client.close();
+ }
+
+ /** @override */
+ addListener(event: string, handler: (...args: any[]) => unknown) {
+ return this._client.addListener(event, handler);
+ }
+
+ /** @override */
+ removeListener(event: string, handler: (...args: any[]) => unknown) {
+ return this._client.removeListener(event, handler);
+ }
+}
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/remote-connection.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/remote-connection.js
deleted file mode 100644
index 053d519..0000000
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/remote-connection.js
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * @author Jorge Bay Gondra
- */
-'use strict';
-
-const t = require('../process/traversal');
-const TraversalStrategy = require('../process/traversal-strategy').TraversalStrategy;
-
-/**
- * Represents an abstraction of a "connection" to a "server" that is capable of processing a traversal and
- * returning results.
- */
-class RemoteConnection {
- /**
- * @param {String} url The resource uri.
- * @param {Object} [options] The connection options.
- */
- constructor(url, options = {}) {
- this.url = url;
- this.options = options;
- }
-
- /**
- * Opens the connection, if its not already opened.
- * @returns {Promise}
- */
- open() {
- throw new Error('open() must be implemented');
- }
-
- /**
- * Returns true if connection is open
- * @returns {Boolean}
- */
- get isOpen() {
- throw new Error('isOpen() must be implemented');
- }
-
- /**
- * Determines if the connection is already bound to a session. If so, this indicates that the
- * <code>#createSession()</code> cannot be called so as to produce child sessions.
- * @returns {boolean}
- */
- get isSessionBound() {
- return false;
- }
-
- /**
- * Submits the <code>Bytecode</code> provided and returns a <code>RemoteTraversal</code>.
- * @abstract
- * @param {Bytecode} bytecode
- * @returns {Promise} Returns a <code>Promise</code> that resolves to a <code>RemoteTraversal</code>.
- */
- submit(bytecode) {
- throw new Error('submit() must be implemented');
- }
-
- /**
- * Create a new <code>RemoteConnection</code> that is bound to a session using the configuration from this one.
- * If the connection is already session bound then this function should throw an exception.
- * @returns {RemoteConnection}
- */
- createSession() {
- throw new Error('createSession() must be implemented');
- }
-
- /**
- * Submits a <code>Bytecode.GraphOp.commit</code> to the server and closes the connection.
- * @returns {Promise}
- */
- commit() {
- throw new Error('commit() must be implemented');
- }
- /**
- * Submits a <code>Bytecode.GraphOp.rollback</code> to the server and closes the connection.
- * @returns {Promise}
- */
- rollback() {
- throw new Error('rollback() must be implemented');
- }
-
- /**
- * Closes the connection where open transactions will close according to the features of the graph provider.
- * @returns {Promise}
- */
- close() {
- throw new Error('close() must be implemented');
- }
-}
-
-/**
- * Represents a traversal as a result of a {@link RemoteConnection} submission.
- */
-class RemoteTraversal extends t.Traversal {
- constructor(traversers, sideEffects) {
- super(null, null, null);
- this.traversers = traversers;
- this.sideEffects = sideEffects;
- }
-}
-
-class RemoteStrategy extends TraversalStrategy {
- /**
- * Creates a new instance of RemoteStrategy.
- * @param {RemoteConnection} connection
- */
- constructor(connection) {
- // gave this a fqcn that has a local "js:" prefix since this strategy isn't sent as bytecode to the server.
- // this is a sort of local-only strategy that actually executes client side. not sure if this prefix is the
- // right way to name this or not, but it should have a name to identify it.
- super('js:RemoteStrategy');
- this.connection = connection;
- }
-
- /** @override */
- apply(traversal) {
- if (traversal.traversers) {
- return Promise.resolve();
- }
-
- return this.connection.submit(traversal.getBytecode()).then(function (remoteTraversal) {
- traversal.sideEffects = remoteTraversal.sideEffects;
- traversal.traversers = remoteTraversal.traversers;
- });
- }
-}
-
-module.exports = { RemoteConnection, RemoteStrategy, RemoteTraversal };
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/remote-connection.ts b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/remote-connection.ts
new file mode 100644
index 0000000..d653c4d
--- /dev/null
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/remote-connection.ts
@@ -0,0 +1,134 @@
+/*
+ * 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.
+ */
+
+/**
+ * @author Jorge Bay Gondra
+ */
+
+import Bytecode from '../process/bytecode.js';
+import { TraversalStrategy } from '../process/traversal-strategy.js';
+import { Traversal, Traverser } from '../process/traversal.js';
+import type { ConnectionOptions } from './connection.js';
+
+export type RemoteConnectionOptions = ConnectionOptions & { session?: string };
+
+/**
+ * Represents an abstraction of a "connection" to a "server" that is capable of processing a traversal and
+ * returning results.
+ */
+export abstract class RemoteConnection {
+ /**
+ * @param {String} url The resource uri.
+ * @param {RemoteConnectionOptions} [options] The connection options.
+ */
+ constructor(
+ public url: string,
+ protected readonly options: RemoteConnectionOptions = {},
+ ) {}
+
+ /**
+ * Opens the connection, if its not already opened.
+ * @returns {Promise}
+ */
+ abstract open(): Promise<void>;
+
+ /**
+ * Returns true if connection is open
+ * @returns {Boolean}
+ */
+ abstract get isOpen(): boolean;
+
+ /**
+ * Determines if the connection is already bound to a session. If so, this indicates that the
+ * <code>#createSession()</code> cannot be called so as to produce child sessions.
+ * @returns {boolean}
+ */
+ get isSessionBound(): boolean {
+ return false;
+ }
+
+ /**
+ * Submits the <code>Bytecode</code> provided and returns a <code>RemoteTraversal</code>.
+ * @param {Bytecode} bytecode
+ * @returns {Promise} Returns a <code>Promise</code> that resolves to a <code>RemoteTraversal</code>.
+ */
+ abstract submit(bytecode: Bytecode | null): Promise<RemoteTraversal>;
+
+ /**
+ * Create a new <code>RemoteConnection</code> that is bound to a session using the configuration from this one.
+ * If the connection is already session bound then this function should throw an exception.
+ * @returns {RemoteConnection}
+ */
+ abstract createSession(): RemoteConnection;
+
+ /**
+ * Submits a <code>Bytecode.GraphOp.commit</code> to the server and closes the connection.
+ * @returns {Promise}
+ */
+ abstract commit(): Promise<void>;
+
+ /**
+ * Submits a <code>Bytecode.GraphOp.rollback</code> to the server and closes the connection.
+ * @returns {Promise}
+ */
+ abstract rollback(): Promise<void>;
+
+ /**
+ * Closes the connection where open transactions will close according to the features of the graph provider.
+ * @returns {Promise}
+ */
+ abstract close(): Promise<void>;
+}
+
+/**
+ * Represents a traversal as a result of a {@link RemoteConnection} submission.
+ */
+export class RemoteTraversal extends Traversal {
+ constructor(
+ public traversers: Traverser<any>[],
+ public sideEffects?: any[],
+ ) {
+ super(null, null, new Bytecode());
+ }
+}
+
+export class RemoteStrategy extends TraversalStrategy {
+ /**
+ * Creates a new instance of RemoteStrategy.
+ * @param {RemoteConnection} connection
+ */
+ constructor(public connection: RemoteConnection) {
+ // gave this a fqcn that has a local "js:" prefix since this strategy isn't sent as bytecode to the server.
+ // this is a sort of local-only strategy that actually executes client side. not sure if this prefix is the
+ // right way to name this or not, but it should have a name to identify it.
+ super('js:RemoteStrategy');
+ }
+
+ /** @override */
+ apply(traversal: Traversal) {
+ if (traversal.traversers) {
+ return Promise.resolve();
+ }
+
+ return this.connection.submit(traversal.getBytecode()).then(function (remoteTraversal: RemoteTraversal) {
+ traversal.sideEffects = remoteTraversal.sideEffects;
+ traversal.traversers = remoteTraversal.traversers;
+ });
+ }
+}
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/response-error.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/response-error.js
deleted file mode 100644
index 6004f77..0000000
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/response-error.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-'use strict';
-
-/**
- * Represents an error obtained from the server.
- */
-class ResponseError extends Error {
- constructor(message, responseStatus) {
- super(message);
- this.name = 'ResponseError';
-
- /**
- * Gets the server status code.
- */
- this.statusCode = responseStatus.code;
-
- /**
- * Gets the server status message.
- */
- this.statusMessage = responseStatus.message;
-
- /**
- * Gets the server status attributes as a Map (may contain provider specific status information).
- */
- this.statusAttributes = responseStatus.attributes || {};
- }
-}
-
-module.exports = ResponseError;
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/response-error.ts b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/response-error.ts
new file mode 100644
index 0000000..faa072c
--- /dev/null
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/response-error.ts
@@ -0,0 +1,55 @@
+/*
+ * 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.
+ */
+
+
+/**
+ * Represents an error obtained from the server.
+ */
+export default class ResponseError extends Error {
+ statusCode: number;
+ statusMessage: string;
+ statusAttributes: Map<string, string>;
+
+ constructor(
+ message: string,
+ responseStatus: {
+ code: ResponseError['statusCode'];
+ message: ResponseError['statusMessage'];
+ attributes: ResponseError['statusAttributes'];
+ },
+ ) {
+ super(message);
+ this.name = 'ResponseError';
+
+ /**
+ * Gets the server status code.
+ */
+ this.statusCode = responseStatus.code;
+
+ /**
+ * Gets the server status message.
+ */
+ this.statusMessage = responseStatus.message;
+
+ /**
+ * Gets the server status attributes as a Map (may contain provider specific status information).
+ */
+ this.statusAttributes = responseStatus.attributes || {};
+ }
+}
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/result-set.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/result-set.js
deleted file mode 100644
index 8a7e401..0000000
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/result-set.js
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * @author Jorge Bay Gondra
- */
-'use strict';
-
-const utils = require('../utils');
-const emptyMap = Object.freeze(new utils.ImmutableMap());
-
-/**
- * Represents the response returned from the execution of a Gremlin traversal or script.
- */
-class ResultSet {
- /**
- * Creates a new instance of {@link ResultSet}.
- * @param {Array} items
- * @param {Map} [attributes]
- */
- constructor(items, attributes) {
- if (!Array.isArray(items)) {
- throw new TypeError('items must be an Array instance');
- }
-
- this._items = items;
-
- /**
- * Gets a Map representing the attributes of the response.
- * @type {Map}
- */
- this.attributes = attributes || emptyMap;
-
- /**
- * Gets the amount of items in the result.
- * @type {Number}
- */
- this.length = items.length;
- }
-
- /**
- * Gets the iterator associated with this instance.
- * @returns {Iterator}
- */
- [Symbol.iterator]() {
- return this._items[Symbol.iterator]();
- }
-
- /**
- * Gets an array of result items.
- * @returns {Array}
- */
- toArray() {
- return this._items;
- }
-
- /**
- * Returns the first item.
- * @returns {Object|null}
- */
- first() {
- const item = this._items[0];
- return item !== undefined ? item : null;
- }
-}
-
-module.exports = ResultSet;
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/result-set.ts b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/result-set.ts
new file mode 100644
index 0000000..29301e3
--- /dev/null
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/result-set.ts
@@ -0,0 +1,86 @@
+/*
+ * 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.
+ */
+
+/**
+ * @author Jorge Bay Gondra
+ */
+
+import * as utils from '../utils.js';
+const emptyMap = Object.freeze(new utils.ImmutableMap());
+
+/**
+ * Represents the response returned from the execution of a Gremlin traversal or script.
+ */
+export default class ResultSet {
+ private readonly attributes: Map<string, string>;
+ readonly length: number;
+
+ /**
+ * Creates a new instance of {@link ResultSet}.
+ * @param {Array} items
+ * @param {Map} [attributes]
+ */
+ constructor(
+ private readonly items: any[],
+ attributes: Map<string, any>,
+ ) {
+ if (!Array.isArray(items)) {
+ throw new TypeError('items must be an Array instance');
+ }
+
+ this.items = items;
+
+ /**
+ * Gets a Map representing the attributes of the response.
+ * @type {Map}
+ */
+ this.attributes = attributes || emptyMap;
+
+ /**
+ * Gets the amount of items in the result.
+ * @type {Number}
+ */
+ this.length = items.length;
+ }
+
+ /**
+ * Gets the iterator associated with this instance.
+ * @returns {Iterator}
+ */
+ [Symbol.iterator]() {
+ return this.items[Symbol.iterator]();
+ }
+
+ /**
+ * Gets an array of result items.
+ * @returns {Array}
+ */
+ toArray(): Array<any> {
+ return this.items;
+ }
+
+ /**
+ * Returns the first item.
+ * @returns {Object|null}
+ */
+ first(): any | null {
+ const item = this.items[0];
+ return item !== undefined ? item : null;
+ }
+}
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/index.ts b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/index.ts
new file mode 100644
index 0000000..acc5a1b
--- /dev/null
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/index.ts
@@ -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.
+ */
+
+/**
+ * @author Jorge Bay Gondra
+ */
+
+import * as t from './process/traversal.js';
+import * as gt from './process/graph-traversal.js';
+import * as strategiesModule from './process/traversal-strategy.js';
+import * as graph from './structure/graph.js';
+import * as gs from './structure/io/graph-serializer.js';
+import * as rc from './driver/remote-connection.js';
+import Bytecode from './process/bytecode.js';
+import Translator from './process/translator.js';
+import * as utils from './utils.js';
+import DriverRemoteConnection from './driver/driver-remote-connection.js';
+import ResponseError from './driver/response-error.js';
+import Client from './driver/client.js';
+import ResultSet from './driver/result-set.js';
+import Authenticator from './driver/auth/authenticator.js';
+import PlainTextSaslAuthenticator from './driver/auth/plain-text-sasl-authenticator.js';
+import AnonymousTraversalSource from './process/anonymous-traversal.js';
+
+export const driver = {
+ RemoteConnection: rc.RemoteConnection,
+ RemoteStrategy: rc.RemoteStrategy,
+ RemoteTraversal: rc.RemoteTraversal,
+ ResponseError,
+ DriverRemoteConnection,
+ Client,
+ ResultSet,
+ auth: {
+ Authenticator,
+ PlainTextSaslAuthenticator,
+ },
+};
+
+export const process = {
+ Bytecode,
+ EnumValue: t.EnumValue,
+ P: t.P,
+ TextP: t.TextP,
+ Traversal: t.Traversal,
+ TraversalSideEffects: t.TraversalSideEffects,
+ TraversalStrategies: strategiesModule.TraversalStrategies,
+ TraversalStrategy: strategiesModule.TraversalStrategy,
+ Traverser: t.Traverser,
+ barrier: t.barrier,
+ cardinality: t.cardinality,
+ column: t.column,
+ direction: t.direction,
+ dt: t.dt,
+ merge: t.merge,
+ operator: t.operator,
+ order: t.order,
+ pick: t.pick,
+ pop: t.pop,
+ scope: t.scope,
+ t: t.t,
+ GraphTraversal: gt.GraphTraversal,
+ GraphTraversalSource: gt.GraphTraversalSource,
+ statics: gt.statics,
+ Translator,
+ traversal: AnonymousTraversalSource.traversal,
+ AnonymousTraversalSource,
+ withOptions: t.withOptions,
+};
+
+export const structure = {
+ io: gs,
+ Edge: graph.Edge,
+ Graph: graph.Graph,
+ Path: graph.Path,
+ Property: graph.Property,
+ Vertex: graph.Vertex,
+ VertexProperty: graph.VertexProperty,
+ toLong: utils.toLong,
+};
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/anonymous-traversal.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/anonymous-traversal.js
deleted file mode 100644
index 2f77107..0000000
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/anonymous-traversal.js
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-'use strict';
-
-const graphTraversalModule = require('./graph-traversal');
-const remote = require('../driver/remote-connection');
-const TraversalStrategies = require('./traversal-strategy').TraversalStrategies;
-const GraphTraversalSource = graphTraversalModule.GraphTraversalSource;
-const GraphTraversal = graphTraversalModule.GraphTraversal;
-const Bytecode = require('./bytecode');
-const Graph = require('../structure/graph').Graph;
-
-/**
- * Provides a unified way to construct a <code>TraversalSource</code> from the perspective of the traversal. In this
- * syntax the user is creating the source and binding it to a reference which is either an existing <code>Graph</code>
- * instance or a <code>RemoteConnection</code>.
- */
-class AnonymousTraversalSource {
- /**
- * Creates a new instance of {@code AnonymousTraversalSource}.
- * @param {Function} [traversalSourceClass] Optional {@code GraphTraversalSource} constructor.
- * @param {Function} [traversalClass] Optional {@code GraphTraversal} constructor.
- */
- constructor(traversalSourceClass, traversalClass) {
- this.traversalSourceClass = traversalSourceClass;
- this.traversalClass = traversalClass;
- }
-
- /**
- * Constructs an {@code AnonymousTraversalSource} which will then be configured to spawn a
- * {@link GraphTraversalSource}.
- * @param {Function} [traversalSourceClass] Optional {@code GraphTraversalSource} constructor.
- * @param {Function} [traversalClass] Optional {@code GraphTraversalSource} constructor.
- * @returns {AnonymousTraversalSource}.
- */
- static traversal(traversalSourceClass, traversalClass) {
- return new AnonymousTraversalSource(traversalSourceClass || GraphTraversalSource, traversalClass || GraphTraversal);
- }
-
- /**
- * Creates a {@link GraphTraversalSource} binding a {@link RemoteConnection} to a remote {@link Graph} instances as its
- * reference so that traversals spawned from it will execute over that reference.
- * @param {RemoteConnection} connection
- * @return {GraphTraversalSource}
- */
- with_(connection) {
- const traversalStrategies = new TraversalStrategies();
- traversalStrategies.addStrategy(new remote.RemoteStrategy(connection));
- return new this.traversalSourceClass(
- new Graph(),
- traversalStrategies,
- new Bytecode(),
- this.traversalSourceClass,
- this.traversalClass,
- );
- }
-
- /**
- * Creates a {@link GraphTraversalSource} binding a {@link RemoteConnection} to a remote {@link Graph} instances as its
- * reference so that traversals spawned from it will execute over that reference.
- * @param {RemoteConnection} remoteConnection
- * @return {GraphTraversalSource}
- * @deprecated As of release 3.8.0, prefer {@link with_}.
- */
- withRemote(remoteConnection) {
- return this.with_(remoteConnection);
- }
-}
-
-module.exports = AnonymousTraversalSource;
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/anonymous-traversal.ts b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/anonymous-traversal.ts
new file mode 100644
index 0000000..e4d8972
--- /dev/null
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/anonymous-traversal.ts
@@ -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.
+ */
+
+import { RemoteConnection, RemoteStrategy } from '../driver/remote-connection.js';
+import { Graph } from '../structure/graph.js';
+import Bytecode from './bytecode.js';
+import { GraphTraversalSource, GraphTraversal } from './graph-traversal.js';
+import { TraversalStrategies } from './traversal-strategy.js';
+
+/**
+ * Provides a unified way to construct a <code>TraversalSource</code> from the perspective of the traversal. In this
+ * syntax the user is creating the source and binding it to a reference which is either an existing <code>Graph</code>
+ * instance or a <code>RemoteConnection</code>.
+ */
+export default class AnonymousTraversalSource {
+ /**
+ * Creates a new instance of {@code AnonymousTraversalSource}.
+ * @param {Function} [traversalSourceClass] Optional {@code GraphTraversalSource} constructor.
+ * @param {Function} [traversalClass] Optional {@code GraphTraversal} constructor.
+ */
+ constructor(
+ readonly traversalSourceClass?: typeof GraphTraversalSource,
+ readonly traversalClass?: typeof GraphTraversal,
+ ) {}
+
+ /**
+ * Constructs an {@code AnonymousTraversalSource} which will then be configured to spawn a
+ * {@link GraphTraversalSource}.
+ * @param {Function} [traversalSourceClass] Optional {@code GraphTraversalSource} constructor.
+ * @param {Function} [traversalClass] Optional {@code GraphTraversalSource} constructor.
+ * @returns {AnonymousTraversalSource}.
+ */
+ static traversal(traversalSourceClass?: typeof GraphTraversalSource, traversalClass?: typeof GraphTraversal) {
+ return new AnonymousTraversalSource(traversalSourceClass || GraphTraversalSource, traversalClass || GraphTraversal);
+ }
+
+ /**
+ * Creates a {@link GraphTraversalSource} binding a {@link RemoteConnection} to a remote {@link Graph} instances as its
+ * reference so that traversals spawned from it will execute over that reference.
+ * @param {RemoteConnection} connection
+ * @return {GraphTraversalSource}
+ */
+ with_(connection: RemoteConnection) {
+ const traversalStrategies = new TraversalStrategies();
+ traversalStrategies.addStrategy(new RemoteStrategy(connection));
+ return new this.traversalSourceClass!(
+ new Graph(),
+ traversalStrategies,
+ new Bytecode(),
+ this.traversalSourceClass,
+ this.traversalClass,
+ );
+ }
+
+ /**
+ * Creates a {@link GraphTraversalSource} binding a {@link RemoteConnection} to a remote {@link Graph} instances as its
+ * reference so that traversals spawned from it will execute over that reference.
+ * @param {RemoteConnection} remoteConnection
+ * @return {GraphTraversalSource}
+ * @deprecated As of release 3.8.0, prefer {@link with_}.
+ */
+ withRemote(remoteConnection: RemoteConnection) {
+ return this.with_(remoteConnection);
+ }
+}
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/bytecode.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/bytecode.js
deleted file mode 100644
index 1f355f0..0000000
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/bytecode.js
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * @author Jorge Bay Gondra
- */
-'use strict';
-
-const { Traversal } = require('./traversal');
-
-class Bytecode {
- /**
- * Creates a new instance of Bytecode
- * @param {Bytecode} [toClone]
- */
- constructor(toClone) {
- if (!toClone) {
- this.sourceInstructions = [];
- this.stepInstructions = [];
- } else {
- this.sourceInstructions = [...toClone.sourceInstructions];
- this.stepInstructions = [...toClone.stepInstructions];
- }
- }
-
- /**
- * Adds a new source instructions
- * @param {String} name
- * @param {Array} values
- * @returns {Bytecode}
- */
- addSource(name, values) {
- if (name === undefined) {
- throw new Error('Name is not defined');
- }
- const instruction = new Array(values.length + 1);
- instruction[0] = name;
- for (let i = 0; i < values.length; ++i) {
- instruction[i + 1] = values[i];
- }
- this.sourceInstructions.push(Bytecode._generateInstruction(name, values));
- return this;
- }
-
- /**
- * Adds a new step instructions
- * @param {String} name
- * @param {Array} values
- * @returns {Bytecode}
- */
- addStep(name, values) {
- if (name === undefined) {
- throw new Error('Name is not defined');
- }
- this.stepInstructions.push(Bytecode._generateInstruction(name, values));
- return this;
- }
-
- static _generateInstruction(name, values) {
- const length = (values ? values.length : 0) + 1;
- const instruction = new Array(length);
- instruction[0] = name;
- for (let i = 1; i < length; i++) {
- const val = values[i - 1];
- if (val instanceof Traversal && val.graph != null) {
- throw new Error(
- `The child traversal of ${val} was not spawned anonymously - use ` +
- 'the __ class rather than a TraversalSource to construct the child traversal',
- );
- }
- instruction[i] = val;
- }
- return instruction;
- }
-
- /**
- * Returns the JSON representation of the source and step instructions
- * @returns {String}
- */
- toString() {
- return JSON.stringify([this.sourceInstructions, this.stepInstructions]);
- }
-
- /**
- * Adds a new source instructions
- * @param {String} name
- * @param {Array} values
- * @returns {Bytecode}
- */
- static _createGraphOp(name, values) {
- const bc = new Bytecode();
- bc.addSource(name, values);
- return bc;
- }
-
- /**
- * Gets the <code>Bytecode</code> that is meant to be sent as "graph operations" to the server.
- * @returns {{rollback: Bytecode, commit: Bytecode}}
- */
- static get GraphOp() {
- return {
- commit: Bytecode._createGraphOp('tx', ['commit']),
- rollback: Bytecode._createGraphOp('tx', ['rollback']),
- };
- }
-}
-
-module.exports = Bytecode;
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/bytecode.ts b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/bytecode.ts
new file mode 100644
index 0000000..0df6802
--- /dev/null
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/bytecode.ts
@@ -0,0 +1,124 @@
+/*
+ * 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.
+ */
+
+/**
+ * @author Jorge Bay Gondra
+ */
+
+import { Traversal } from './traversal.js';
+
+export default class Bytecode {
+ sourceInstructions: any[] = [];
+ stepInstructions: any[] = [];
+
+ /**
+ * Creates a new instance of Bytecode
+ * @param {Bytecode} [toClone]
+ */
+ constructor(toClone?: Bytecode) {
+ if (!toClone) {
+ this.sourceInstructions = [];
+ this.stepInstructions = [];
+ } else {
+ this.sourceInstructions = [...toClone.sourceInstructions];
+ this.stepInstructions = [...toClone.stepInstructions];
+ }
+ }
+
+ /**
+ * Adds a new source instructions
+ * @param {String} name
+ * @param {Array} values
+ * @returns {Bytecode}
+ */
+ addSource(name: string, values: any[]): Bytecode {
+ if (name === undefined) {
+ throw new Error('Name is not defined');
+ }
+ const instruction = new Array(values.length + 1);
+ instruction[0] = name;
+ for (let i = 0; i < values.length; ++i) {
+ instruction[i + 1] = values[i];
+ }
+ this.sourceInstructions.push(Bytecode._generateInstruction(name, values));
+ return this;
+ }
+
+ /**
+ * Adds a new step instructions
+ * @param {String} name
+ * @param {Array} values
+ * @returns {Bytecode}
+ */
+ addStep(name: string, values?: any[]): Bytecode {
+ if (name === undefined) {
+ throw new Error('Name is not defined');
+ }
+ this.stepInstructions.push(Bytecode._generateInstruction(name, values));
+ return this;
+ }
+
+ private static _generateInstruction(name: string, values?: any[]) {
+ const length = (values ? values.length : 0) + 1;
+ const instruction = new Array(length);
+ instruction[0] = name;
+ for (let i = 1; i < length; i++) {
+ const val = values?.[i - 1];
+ if (val instanceof Traversal && val.graph != null) {
+ throw new Error(
+ `The child traversal of ${val} was not spawned anonymously - use ` +
+ 'the __ class rather than a TraversalSource to construct the child traversal',
+ );
+ }
+ instruction[i] = val;
+ }
+ return instruction;
+ }
+
+ /**
+ * Returns the JSON representation of the source and step instructions
+ * @returns {String}
+ */
+ toString(): string {
+ return JSON.stringify([this.sourceInstructions, this.stepInstructions]);
+ }
+
+ /**
+ * Adds a new source instructions
+ * @param {String} name
+ * @param {Array} values
+ * @returns {Bytecode}
+ */
+ static _createGraphOp(name: string, values: any[]): Bytecode {
+ const bc = new Bytecode();
+ bc.addSource(name, values);
+ return bc;
+ }
+
+ /**
+ * Gets the <code>Bytecode</code> that is meant to be sent as "graph operations" to the server.
+ * @returns {{rollback: Bytecode, commit: Bytecode}}
+ */
+ static get GraphOp(): { rollback: Bytecode; commit: Bytecode } {
+ return {
+ commit: Bytecode._createGraphOp('tx', ['commit']),
+ rollback: Bytecode._createGraphOp('tx', ['rollback']),
+ };
+ }
+}
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/graph-traversal.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/graph-traversal.js
deleted file mode 100644
index 7edcfe1..0000000
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/graph-traversal.js
+++ /dev/null
@@ -1,1889 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * @author Jorge Bay Gondra
- */
-'use strict';
-
-const { Traversal, cardinality } = require('./traversal');
-const { Transaction } = require('./transaction');
-const Bytecode = require('./bytecode');
-const { TraversalStrategies, VertexProgramStrategy, OptionsStrategy } = require('./traversal-strategy');
-
-/**
- * Represents the primary DSL of the Gremlin traversal machine.
- */
-class GraphTraversalSource {
- /**
- * Creates a new instance of {@link GraphTraversalSource}.
- * @param {Graph} graph
- * @param {TraversalStrategies} traversalStrategies
- * @param {Bytecode} [bytecode]
- * @param {Function} [graphTraversalSourceClass] Optional {@link GraphTraversalSource} constructor.
- * @param {Function} [graphTraversalClass] Optional {@link GraphTraversal} constructor.
- */
- constructor(graph, traversalStrategies, bytecode, graphTraversalSourceClass, graphTraversalClass) {
- this.graph = graph;
- this.traversalStrategies = traversalStrategies;
- this.bytecode = bytecode || new Bytecode();
- this.graphTraversalSourceClass = graphTraversalSourceClass || GraphTraversalSource;
- this.graphTraversalClass = graphTraversalClass || GraphTraversal;
- const strat = traversalStrategies.strategies.find((ts) => ts.fqcn === 'js:RemoteStrategy');
- this.remoteConnection = strat !== undefined ? strat.connection : undefined;
- }
-
- /**
- * Spawn a new <code>Transaction</code> object that can then start and stop a transaction.
- * @returns {Transaction}
- */
- tx() {
- // you can't do g.tx().begin().tx() - no child transactions
- if (this.remoteConnection && this.remoteConnection.isSessionBound) {
- throw new Error('This TraversalSource is already bound to a transaction - child transactions are not supported');
- }
-
- return new Transaction(this);
- }
-
- /**
- * @param graphComputer
- * @param workers
- * @param result
- * @param persist
- * @param vertices
- * @param edges
- * @param configuration
- * @returns {GraphTraversalSource}
- */
- withComputer(graphComputer, workers, result, persist, vertices, edges, configuration) {
- const m = {};
- if (graphComputer !== undefined) {
- m.graphComputer = graphComputer;
- }
- if (workers !== undefined) {
- m.workers = workers;
- }
- if (result !== undefined) {
- m.result = result;
- }
- if (persist !== undefined) {
- m.graphComputer = persist;
- }
- if (vertices !== undefined) {
- m.vertices = vertices;
- }
- if (edges !== undefined) {
- m.edges = edges;
- }
- if (configuration !== undefined) {
- m.configuration = configuration;
- }
- return this.withStrategies(new VertexProgramStrategy(m));
- }
-
- /**
- * Graph Traversal Source with method.
- * @param {String} key
- * @param {Object} value if not specified, the value with default to {@code true}
- * @returns {GraphTraversalSource}
- */
- with_(key, value = undefined) {
- const val = value === undefined ? true : value;
- let optionsStrategy = this.bytecode.sourceInstructions.find(
- (i) => i[0] === 'withStrategies' && i[1] instanceof OptionsStrategy,
- );
- if (optionsStrategy === undefined) {
- optionsStrategy = new OptionsStrategy({ [key]: val });
- return this.withStrategies(optionsStrategy);
- }
- optionsStrategy[1].configuration[key] = val;
- return new this.graphTraversalSourceClass(
- this.graph,
- new TraversalStrategies(this.traversalStrategies),
- this.bytecode,
- this.graphTraversalSourceClass,
- this.graphTraversalClass,
- );
- }
-
- /**
- * Returns the string representation of the GraphTraversalSource.
- * @returns {string}
- */
- toString() {
- return 'graphtraversalsource[' + this.graph.toString() + ']';
- }
-
- /**
- * Graph Traversal Source withBulk method.
- * @param {...Object} args
- * @returns {GraphTraversalSource}
- */
- withBulk(...args) {
- const b = new Bytecode(this.bytecode).addSource('withBulk', args);
- return new this.graphTraversalSourceClass(
- this.graph,
- new TraversalStrategies(this.traversalStrategies),
- b,
- this.graphTraversalSourceClass,
- this.graphTraversalClass,
- );
- }
-
- /**
- * Graph Traversal Source withPath method.
- * @param {...Object} args
- * @returns {GraphTraversalSource}
- */
- withPath(...args) {
- const b = new Bytecode(this.bytecode).addSource('withPath', args);
- return new this.graphTraversalSourceClass(
- this.graph,
- new TraversalStrategies(this.traversalStrategies),
- b,
- this.graphTraversalSourceClass,
- this.graphTraversalClass,
- );
- }
-
- /**
- * Graph Traversal Source withSack method.
- * @param {...Object} args
- * @returns {GraphTraversalSource}
- */
- withSack(...args) {
- const b = new Bytecode(this.bytecode).addSource('withSack', args);
- return new this.graphTraversalSourceClass(
- this.graph,
- new TraversalStrategies(this.traversalStrategies),
- b,
- this.graphTraversalSourceClass,
- this.graphTraversalClass,
- );
- }
-
- /**
- * Graph Traversal Source withSideEffect method.
- * @param {...Object} args
- * @returns {GraphTraversalSource}
- */
- withSideEffect(...args) {
- const b = new Bytecode(this.bytecode).addSource('withSideEffect', args);
- return new this.graphTraversalSourceClass(
- this.graph,
- new TraversalStrategies(this.traversalStrategies),
- b,
- this.graphTraversalSourceClass,
- this.graphTraversalClass,
- );
- }
-
- /**
- * Graph Traversal Source withStrategies method.
- * @param {...Object} args
- * @returns {GraphTraversalSource}
- */
- withStrategies(...args) {
- const b = new Bytecode(this.bytecode).addSource('withStrategies', args);
- return new this.graphTraversalSourceClass(
- this.graph,
- new TraversalStrategies(this.traversalStrategies),
- b,
- this.graphTraversalSourceClass,
- this.graphTraversalClass,
- );
- }
-
- /**
- * Graph Traversal Source withoutStrategies method.
- * @param {...Object} args
- * @returns {GraphTraversalSource}
- */
- withoutStrategies(...args) {
- const b = new Bytecode(this.bytecode).addSource('withoutStrategies', args);
- return new this.graphTraversalSourceClass(
- this.graph,
- new TraversalStrategies(this.traversalStrategies),
- b,
- this.graphTraversalSourceClass,
- this.graphTraversalClass,
- );
- }
-
- /**
- * E GraphTraversalSource step method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- E(...args) {
- const b = new Bytecode(this.bytecode).addStep('E', args);
- return new this.graphTraversalClass(this.graph, new TraversalStrategies(this.traversalStrategies), b);
- }
-
- /**
- * V GraphTraversalSource step method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- V(...args) {
- const b = new Bytecode(this.bytecode).addStep('V', args);
- return new this.graphTraversalClass(this.graph, new TraversalStrategies(this.traversalStrategies), b);
- }
-
- /**
- * addE GraphTraversalSource step method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- addE(...args) {
- const b = new Bytecode(this.bytecode).addStep('addE', args);
- return new this.graphTraversalClass(this.graph, new TraversalStrategies(this.traversalStrategies), b);
- }
-
- /**
- * mergeV GraphTraversalSource step method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- mergeE(...args) {
- const b = new Bytecode(this.bytecode).addStep('mergeE', args);
- return new this.graphTraversalClass(this.graph, new TraversalStrategies(this.traversalStrategies), b);
- }
-
- /**
- * addV GraphTraversalSource step method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- addV(...args) {
- const b = new Bytecode(this.bytecode).addStep('addV', args);
- return new this.graphTraversalClass(this.graph, new TraversalStrategies(this.traversalStrategies), b);
- }
-
- /**
- * mergeV GraphTraversalSource step method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- mergeV(...args) {
- const b = new Bytecode(this.bytecode).addStep('mergeV', args);
- return new this.graphTraversalClass(this.graph, new TraversalStrategies(this.traversalStrategies), b);
- }
-
- /**
- * inject GraphTraversalSource step method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- inject(...args) {
- const b = new Bytecode(this.bytecode).addStep('inject', args);
- return new this.graphTraversalClass(this.graph, new TraversalStrategies(this.traversalStrategies), b);
- }
-
- /**
- * io GraphTraversalSource step method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- io(...args) {
- const b = new Bytecode(this.bytecode).addStep('io', args);
- return new this.graphTraversalClass(this.graph, new TraversalStrategies(this.traversalStrategies), b);
- }
-
- /**
- * call GraphTraversalSource step method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- call(...args) {
- const b = new Bytecode(this.bytecode).addStep('call', args);
- return new this.graphTraversalClass(this.graph, new TraversalStrategies(this.traversalStrategies), b);
- }
-
- /**
- * union GraphTraversalSource method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- union(...args) {
- const b = new Bytecode(this.bytecode).addStep('union', args);
- return new this.graphTraversalClass(this.graph, new TraversalStrategies(this.traversalStrategies), b);
- }
-}
-
-/**
- * Represents a graph traversal.
- */
-class GraphTraversal extends Traversal {
- constructor(graph, traversalStrategies, bytecode) {
- super(graph, traversalStrategies, bytecode);
- }
-
- /**
- * Copy a traversal so as to reset and re-use it.
- */
- clone() {
- return new GraphTraversal(this.graph, this.traversalStrategies, this.getBytecode());
- }
-
- /**
- * Graph traversal V method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- V(...args) {
- this.bytecode.addStep('V', args);
- return this;
- }
-
- /**
- * Graph traversal E method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- E(...args) {
- this.bytecode.addStep('E', args);
- return this;
- }
-
- /**
- * Graph traversal addE method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- addE(...args) {
- this.bytecode.addStep('addE', args);
- return this;
- }
-
- /**
- * Graph traversal addV method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- addV(...args) {
- this.bytecode.addStep('addV', args);
- return this;
- }
-
- /**
- * Graph traversal aggregate method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- aggregate(...args) {
- this.bytecode.addStep('aggregate', args);
- return this;
- }
-
- /**
- * Graph traversal all method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- all(...args) {
- this.bytecode.addStep('all', args);
- return this;
- }
-
- /**
- * Graph traversal and method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- and(...args) {
- this.bytecode.addStep('and', args);
- return this;
- }
-
- /**
- * Graph traversal any method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- any(...args) {
- this.bytecode.addStep('any', args);
- return this;
- }
-
- /**
- * Graph traversal as method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- as(...args) {
- this.bytecode.addStep('as', args);
- return this;
- }
-
- /**
- * Graph traversal asBool method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- asBool(...args) {
- this.bytecode.addStep('asBool', args);
- return this;
- }
-
- /**
- * Graph traversal asDate method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- asDate(...args) {
- this.bytecode.addStep('asDate', args);
- return this;
- }
-
- /**
- * Graph traversal asNumber method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- asNumber(...args) {
- this.bytecode.addStep('asNumber', args);
- return this;
- }
-
- /**
- * Graph traversal asString method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- asString(...args) {
- this.bytecode.addStep('asString', args);
- return this;
- }
-
- /**
- * Graph traversal barrier method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- barrier(...args) {
- this.bytecode.addStep('barrier', args);
- return this;
- }
-
- /**
- * Graph traversal both method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- both(...args) {
- this.bytecode.addStep('both', args);
- return this;
- }
-
- /**
- * Graph traversal bothE method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- bothE(...args) {
- this.bytecode.addStep('bothE', args);
- return this;
- }
-
- /**
- * Graph traversal bothV method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- bothV(...args) {
- this.bytecode.addStep('bothV', args);
- return this;
- }
-
- /**
- * Graph traversal branch method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- branch(...args) {
- this.bytecode.addStep('branch', args);
- return this;
- }
-
- /**
- * Graph traversal by method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- by(...args) {
- this.bytecode.addStep('by', args);
- return this;
- }
-
- /**
- * Graph traversal call method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- call(...args) {
- this.bytecode.addStep('call', args);
- return this;
- }
- /**
- * Graph traversal cap method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- cap(...args) {
- this.bytecode.addStep('cap', args);
- return this;
- }
-
- /**
- * Graph traversal choose method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- choose(...args) {
- this.bytecode.addStep('choose', args);
- return this;
- }
-
- /**
- * Graph traversal coalesce method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- coalesce(...args) {
- this.bytecode.addStep('coalesce', args);
- return this;
- }
-
- /**
- * Graph traversal coin method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- coin(...args) {
- this.bytecode.addStep('coin', args);
- return this;
- }
-
- /**
- * Graph traversal combine method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- combine(...args) {
- this.bytecode.addStep('combine', args);
- return this;
- }
-
- /**
- * Graph traversal concat method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- concat(...args) {
- this.bytecode.addStep('concat', args);
- return this;
- }
-
- /**
- * Graph traversal conjoin method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- conjoin(...args) {
- this.bytecode.addStep('conjoin', args);
- return this;
- }
-
- /**
- * Graph traversal connectedComponent method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- connectedComponent(...args) {
- this.bytecode.addStep('connectedComponent', args);
- return this;
- }
-
- /**
- * Graph traversal constant method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- constant(...args) {
- this.bytecode.addStep('constant', args);
- return this;
- }
-
- /**
- * Graph traversal count method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- count(...args) {
- this.bytecode.addStep('count', args);
- return this;
- }
-
- /**
- * Graph traversal cyclicPath method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- cyclicPath(...args) {
- this.bytecode.addStep('cyclicPath', args);
- return this;
- }
-
- /**
- * Graph traversal dateAdd method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- dateAdd(...args) {
- this.bytecode.addStep('dateAdd', args);
- return this;
- }
-
- /**
- * Graph traversal dateDiff method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- dateDiff(...args) {
- this.bytecode.addStep('dateDiff', args);
- return this;
- }
-
- /**
- * Graph traversal dedup method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- dedup(...args) {
- this.bytecode.addStep('dedup', args);
- return this;
- }
-
- /**
- * Graph traversal difference method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- difference(...args) {
- this.bytecode.addStep('difference', args);
- return this;
- }
-
- /**
- * Graph traversal discard method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- discard(...args) {
- this.bytecode.addStep('discard', args);
- return this;
- }
-
- /**
- * Graph traversal disjunct method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- disjunct(...args) {
- this.bytecode.addStep('disjunct', args);
- return this;
- }
-
- /**
- * Graph traversal drop method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- drop(...args) {
- this.bytecode.addStep('drop', args);
- return this;
- }
-
- /**
- * Graph traversal element method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- element(...args) {
- this.bytecode.addStep('element', args);
- return this;
- }
- /**
- * Graph traversal elementMap method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- elementMap(...args) {
- this.bytecode.addStep('elementMap', args);
- return this;
- }
-
- /**
- * Graph traversal emit method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- emit(...args) {
- this.bytecode.addStep('emit', args);
- return this;
- }
-
- /**
- * Graph traversal fa method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- fail(...args) {
- this.bytecode.addStep('fail', args);
- return this;
- }
-
- /**
- * Graph traversal filter method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- filter(...args) {
- this.bytecode.addStep('filter', args);
- return this;
- }
-
- /**
- * Graph traversal flatMap method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- flatMap(...args) {
- this.bytecode.addStep('flatMap', args);
- return this;
- }
-
- /**
- * Graph traversal fold method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- fold(...args) {
- this.bytecode.addStep('fold', args);
- return this;
- }
-
- /**
- * Graph traversal format method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- format(...args) {
- this.bytecode.addStep('format', args);
- return this;
- }
-
- /**
- * Graph traversal from method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- from_(...args) {
- this.bytecode.addStep('from', args);
- return this;
- }
-
- /**
- * Graph traversal group method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- group(...args) {
- this.bytecode.addStep('group', args);
- return this;
- }
-
- /**
- * Graph traversal groupCount method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- groupCount(...args) {
- this.bytecode.addStep('groupCount', args);
- return this;
- }
-
- /**
- * Graph traversal has method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- has(...args) {
- this.bytecode.addStep('has', args);
- return this;
- }
-
- /**
- * Graph traversal hasId method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- hasId(...args) {
- this.bytecode.addStep('hasId', args);
- return this;
- }
-
- /**
- * Graph traversal hasKey method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- hasKey(...args) {
- this.bytecode.addStep('hasKey', args);
- return this;
- }
-
- /**
- * Graph traversal hasLabel method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- hasLabel(...args) {
- this.bytecode.addStep('hasLabel', args);
- return this;
- }
-
- /**
- * Graph traversal hasNot method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- hasNot(...args) {
- this.bytecode.addStep('hasNot', args);
- return this;
- }
-
- /**
- * Graph traversal hasValue method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- hasValue(...args) {
- this.bytecode.addStep('hasValue', args);
- return this;
- }
-
- /**
- * Graph traversal id method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- id(...args) {
- this.bytecode.addStep('id', args);
- return this;
- }
-
- /**
- * Graph traversal identity method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- identity(...args) {
- this.bytecode.addStep('identity', args);
- return this;
- }
-
- /**
- * Graph traversal in method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- in_(...args) {
- this.bytecode.addStep('in', args);
- return this;
- }
-
- /**
- * Graph traversal inE method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- inE(...args) {
- this.bytecode.addStep('inE', args);
- return this;
- }
-
- /**
- * Graph traversal inV method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- inV(...args) {
- this.bytecode.addStep('inV', args);
- return this;
- }
-
- /**
- * Graph traversal index method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- index(...args) {
- this.bytecode.addStep('index', args);
- return this;
- }
-
- /**
- * Graph traversal inject method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- inject(...args) {
- this.bytecode.addStep('inject', args);
- return this;
- }
-
- /**
- * Graph traversal intersect method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- intersect(...args) {
- this.bytecode.addStep('intersect', args);
- return this;
- }
-
- /**
- * Graph traversal is method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- is(...args) {
- this.bytecode.addStep('is', args);
- return this;
- }
-
- /**
- * Graph traversal key method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- key(...args) {
- this.bytecode.addStep('key', args);
- return this;
- }
-
- /**
- * Graph traversal label method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- label(...args) {
- this.bytecode.addStep('label', args);
- return this;
- }
-
- /**
- * Graph traversal length method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- length(...args) {
- this.bytecode.addStep('length', args);
- return this;
- }
-
- /**
- * Graph traversal limit method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- limit(...args) {
- this.bytecode.addStep('limit', args);
- return this;
- }
-
- /**
- * Graph traversal local method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- local(...args) {
- this.bytecode.addStep('local', args);
- return this;
- }
-
- /**
- * Graph traversal loops method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- loops(...args) {
- this.bytecode.addStep('loops', args);
- return this;
- }
-
- /**
- * Graph traversal lTrim method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- lTrim(...args) {
- this.bytecode.addStep('lTrim', args);
- return this;
- }
-
- /**
- * Graph traversal map method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- map(...args) {
- this.bytecode.addStep('map', args);
- return this;
- }
-
- /**
- * Graph traversal match method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- match(...args) {
- this.bytecode.addStep('match', args);
- return this;
- }
-
- /**
- * Graph traversal math method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- math(...args) {
- this.bytecode.addStep('math', args);
- return this;
- }
-
- /**
- * Graph traversal max method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- max(...args) {
- this.bytecode.addStep('max', args);
- return this;
- }
-
- /**
- * Graph traversal mean method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- mean(...args) {
- this.bytecode.addStep('mean', args);
- return this;
- }
-
- /**
- * Graph traversal merge method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- merge(...args) {
- this.bytecode.addStep('merge', args);
- return this;
- }
-
- /**
- * Graph traversal mergeE method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- mergeE(...args) {
- this.bytecode.addStep('mergeE', args);
- return this;
- }
-
- /**
- * Graph traversal mergeV method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- mergeV(...args) {
- this.bytecode.addStep('mergeV', args);
- return this;
- }
-
- /**
- * Graph traversal min method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- min(...args) {
- this.bytecode.addStep('min', args);
- return this;
- }
-
- /**
- * Graph traversal none method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- none(...args) {
- this.bytecode.addStep('none', args);
- return this;
- }
-
- /**
- * Graph traversal not method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- not(...args) {
- this.bytecode.addStep('not', args);
- return this;
- }
-
- /**
- * Graph traversal option method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- option(...args) {
- this.bytecode.addStep('option', args);
- return this;
- }
-
- /**
- * Graph traversal optional method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- optional(...args) {
- this.bytecode.addStep('optional', args);
- return this;
- }
-
- /**
- * Graph traversal or method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- or(...args) {
- this.bytecode.addStep('or', args);
- return this;
- }
-
- /**
- * Graph traversal order method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- order(...args) {
- this.bytecode.addStep('order', args);
- return this;
- }
-
- /**
- * Graph traversal otherV method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- otherV(...args) {
- this.bytecode.addStep('otherV', args);
- return this;
- }
-
- /**
- * Graph traversal out method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- out(...args) {
- this.bytecode.addStep('out', args);
- return this;
- }
-
- /**
- * Graph traversal outE method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- outE(...args) {
- this.bytecode.addStep('outE', args);
- return this;
- }
-
- /**
- * Graph traversal outV method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- outV(...args) {
- this.bytecode.addStep('outV', args);
- return this;
- }
-
- /**
- * Graph traversal pageRank method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- pageRank(...args) {
- this.bytecode.addStep('pageRank', args);
- return this;
- }
-
- /**
- * Graph traversal path method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- path(...args) {
- this.bytecode.addStep('path', args);
- return this;
- }
-
- /**
- * Graph traversal peerPressure method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- peerPressure(...args) {
- this.bytecode.addStep('peerPressure', args);
- return this;
- }
-
- /**
- * Graph traversal product method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- product(...args) {
- this.bytecode.addStep('product', args);
- return this;
- }
-
- /**
- * Graph traversal profile method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- profile(...args) {
- this.bytecode.addStep('profile', args);
- return this;
- }
-
- /**
- * Graph traversal program method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- program(...args) {
- this.bytecode.addStep('program', args);
- return this;
- }
-
- /**
- * Graph traversal project method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- project(...args) {
- this.bytecode.addStep('project', args);
- return this;
- }
-
- /**
- * Graph traversal properties method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- properties(...args) {
- this.bytecode.addStep('properties', args);
- return this;
- }
-
- /**
- * Graph traversal property method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- property(...args) {
- this.bytecode.addStep('property', args);
- return this;
- }
-
- /**
- * Graph traversal propertyMap method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- propertyMap(...args) {
- this.bytecode.addStep('propertyMap', args);
- return this;
- }
-
- /**
- * Graph traversal range method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- range(...args) {
- this.bytecode.addStep('range', args);
- return this;
- }
-
- /**
- * Graph traversal read method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- read(...args) {
- this.bytecode.addStep('read', args);
- return this;
- }
-
- /**
- * Graph traversal repeat method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- repeat(...args) {
- this.bytecode.addStep('repeat', args);
- return this;
- }
-
- /**
- * Graph traversal replace method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- replace(...args) {
- this.bytecode.addStep('replace', args);
- return this;
- }
-
- /**
- * Graph traversal reverse method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- reverse(...args) {
- this.bytecode.addStep('reverse', args);
- return this;
- }
-
- /**
- * Graph traversal rTrim method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- rTrim(...args) {
- this.bytecode.addStep('rTrim', args);
- return this;
- }
-
- /**
- * Graph traversal sack method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- sack(...args) {
- this.bytecode.addStep('sack', args);
- return this;
- }
-
- /**
- * Graph traversal sample method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- sample(...args) {
- this.bytecode.addStep('sample', args);
- return this;
- }
-
- /**
- * Graph traversal select method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- select(...args) {
- this.bytecode.addStep('select', args);
- return this;
- }
-
- /**
- * Graph traversal shortestPath method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- shortestPath(...args) {
- this.bytecode.addStep('shortestPath', args);
- return this;
- }
-
- /**
- * Graph traversal sideEffect method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- sideEffect(...args) {
- this.bytecode.addStep('sideEffect', args);
- return this;
- }
-
- /**
- * Graph traversal simplePath method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- simplePath(...args) {
- this.bytecode.addStep('simplePath', args);
- return this;
- }
-
- /**
- * Graph traversal skip method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- skip(...args) {
- this.bytecode.addStep('skip', args);
- return this;
- }
-
- /**
- * Graph traversal split method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- split(...args) {
- this.bytecode.addStep('split', args);
- return this;
- }
-
- /**
- * Graph traversal store method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- store(...args) {
- this.bytecode.addStep('store', args);
- return this;
- }
-
- /**
- * Graph traversal subgraph method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- subgraph(...args) {
- this.bytecode.addStep('subgraph', args);
- return this;
- }
-
- /**
- * Graph traversal subgraph method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- substring(...args) {
- this.bytecode.addStep('substring', args);
- return this;
- }
-
- /**
- * Graph traversal sum method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- sum(...args) {
- this.bytecode.addStep('sum', args);
- return this;
- }
-
- /**
- * Graph traversal tail method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- tail(...args) {
- this.bytecode.addStep('tail', args);
- return this;
- }
-
- /**
- * Graph traversal timeLimit method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- timeLimit(...args) {
- this.bytecode.addStep('timeLimit', args);
- return this;
- }
-
- /**
- * Graph traversal times method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- times(...args) {
- this.bytecode.addStep('times', args);
- return this;
- }
-
- /**
- * Graph traversal to method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- to(...args) {
- this.bytecode.addStep('to', args);
- return this;
- }
-
- /**
- * Graph traversal toE method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- toE(...args) {
- this.bytecode.addStep('toE', args);
- return this;
- }
-
- /**
- * Graph traversal toLower method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- toLower(...args) {
- this.bytecode.addStep('toLower', args);
- return this;
- }
-
- /**
- * Graph traversal toUpper method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- toUpper(...args) {
- this.bytecode.addStep('toUpper', args);
- return this;
- }
-
- /**
- * Graph traversal toV method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- toV(...args) {
- this.bytecode.addStep('toV', args);
- return this;
- }
-
- /**
- * Graph traversal tree method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- tree(...args) {
- this.bytecode.addStep('tree', args);
- return this;
- }
-
- /**
- * Graph traversal trim method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- trim(...args) {
- this.bytecode.addStep('trim', args);
- return this;
- }
-
- /**
- * Graph traversal unfold method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- unfold(...args) {
- this.bytecode.addStep('unfold', args);
- return this;
- }
-
- /**
- * Graph traversal union method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- union(...args) {
- this.bytecode.addStep('union', args);
- return this;
- }
-
- /**
- * Graph traversal until method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- until(...args) {
- this.bytecode.addStep('until', args);
- return this;
- }
-
- /**
- * Graph traversal value method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- value(...args) {
- this.bytecode.addStep('value', args);
- return this;
- }
-
- /**
- * Graph traversal valueMap method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- valueMap(...args) {
- this.bytecode.addStep('valueMap', args);
- return this;
- }
-
- /**
- * Graph traversal values method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- values(...args) {
- this.bytecode.addStep('values', args);
- return this;
- }
-
- /**
- * Graph traversal where method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- where(...args) {
- this.bytecode.addStep('where', args);
- return this;
- }
-
- /**
- * Graph traversal with method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- with_(...args) {
- this.bytecode.addStep('with', args);
- return this;
- }
-
- /**
- * Graph traversal write method.
- * @param {...Object} args
- * @returns {GraphTraversal}
- */
- write(...args) {
- this.bytecode.addStep('write', args);
- return this;
- }
-}
-
-class CardinalityValue extends Bytecode {
- /**
- * Creates a new instance of {@link CardinalityValue}.
- * @param {String} card
- * @param {Object} value
- */
- constructor(card, value) {
- super();
- this.addSource('CardinalityValueTraversal', [card, value]);
- }
-
- /**
- * Create a value with single cardinality.
- * @param {Array} value
- * @returns {CardinalityValue}
- */
- static single(value) {
- return new CardinalityValue(cardinality.single, value);
- }
-
- /**
- * Create a value with list cardinality.
- * @param {Array} value
- * @returns {CardinalityValue}
- */
- static list(value) {
- return new CardinalityValue(cardinality.list, value);
- }
-
- /**
- * Create a value with set cardinality.
- * @param {Array} value
- * @returns {CardinalityValue}
- */
- static set(value) {
- return new CardinalityValue(cardinality.set, value);
- }
-}
-
-function callOnEmptyTraversal(fnName, args) {
- const g = new GraphTraversal(null, null, new Bytecode());
- return g[fnName].apply(g, args);
-}
-
-/**
- * Contains the static method definitions
- * @type {Object}
- */
-const statics = {
- E: (...args) => callOnEmptyTraversal('E', args),
- V: (...args) => callOnEmptyTraversal('V', args),
- addE: (...args) => callOnEmptyTraversal('addE', args),
- addV: (...args) => callOnEmptyTraversal('addV', args),
- aggregate: (...args) => callOnEmptyTraversal('aggregate', args),
- all: (...args) => callOnEmptyTraversal('all', args),
- and: (...args) => callOnEmptyTraversal('and', args),
- any: (...args) => callOnEmptyTraversal('any', args),
- as: (...args) => callOnEmptyTraversal('as', args),
- asBool: (...args) => callOnEmptyTraversal('asBool', args),
- asDate: (...args) => callOnEmptyTraversal('asDate', args),
- asString: (...args) => callOnEmptyTraversal('asString', args),
- barrier: (...args) => callOnEmptyTraversal('barrier', args),
- both: (...args) => callOnEmptyTraversal('both', args),
- bothE: (...args) => callOnEmptyTraversal('bothE', args),
- bothV: (...args) => callOnEmptyTraversal('bothV', args),
- branch: (...args) => callOnEmptyTraversal('branch', args),
- call: (...args) => callOnEmptyTraversal('call', args),
- cap: (...args) => callOnEmptyTraversal('cap', args),
- choose: (...args) => callOnEmptyTraversal('choose', args),
- coalesce: (...args) => callOnEmptyTraversal('coalesce', args),
- coin: (...args) => callOnEmptyTraversal('coin', args),
- concat: (...args) => callOnEmptyTraversal('concat', args),
- constant: (...args) => callOnEmptyTraversal('constant', args),
- count: (...args) => callOnEmptyTraversal('count', args),
- cyclicPath: (...args) => callOnEmptyTraversal('cyclicPath', args),
- dateAdd: (...args) => callOnEmptyTraversal('dateAdd', args),
- dateDiff: (...args) => callOnEmptyTraversal('dateDiff', args),
- dedup: (...args) => callOnEmptyTraversal('dedup', args),
- discard: (...args) => callOnEmptyTraversal('discard', args),
- disjunct: (...args) => callOnEmptyTraversal('disjunct', args),
- drop: (...args) => callOnEmptyTraversal('drop', args),
- element: (...args) => callOnEmptyTraversal('element', args),
- elementMap: (...args) => callOnEmptyTraversal('elementMap', args),
- emit: (...args) => callOnEmptyTraversal('emit', args),
- fail: (...args) => callOnEmptyTraversal('fail', args),
- filter: (...args) => callOnEmptyTraversal('filter', args),
- flatMap: (...args) => callOnEmptyTraversal('flatMap', args),
- fold: (...args) => callOnEmptyTraversal('fold', args),
- format: (...args) => callOnEmptyTraversal('format', args),
- group: (...args) => callOnEmptyTraversal('group', args),
- groupCount: (...args) => callOnEmptyTraversal('groupCount', args),
- has: (...args) => callOnEmptyTraversal('has', args),
- hasId: (...args) => callOnEmptyTraversal('hasId', args),
- hasKey: (...args) => callOnEmptyTraversal('hasKey', args),
- hasLabel: (...args) => callOnEmptyTraversal('hasLabel', args),
- hasNot: (...args) => callOnEmptyTraversal('hasNot', args),
- hasValue: (...args) => callOnEmptyTraversal('hasValue', args),
- id: (...args) => callOnEmptyTraversal('id', args),
- identity: (...args) => callOnEmptyTraversal('identity', args),
- in_: (...args) => callOnEmptyTraversal('in_', args),
- inE: (...args) => callOnEmptyTraversal('inE', args),
- inV: (...args) => callOnEmptyTraversal('inV', args),
- index: (...args) => callOnEmptyTraversal('index', args),
- inject: (...args) => callOnEmptyTraversal('inject', args),
- is: (...args) => callOnEmptyTraversal('is', args),
- key: (...args) => callOnEmptyTraversal('key', args),
- label: (...args) => callOnEmptyTraversal('label', args),
- length: (...args) => callOnEmptyTraversal('length', args),
- limit: (...args) => callOnEmptyTraversal('limit', args),
- local: (...args) => callOnEmptyTraversal('local', args),
- loops: (...args) => callOnEmptyTraversal('loops', args),
- lTrim: (...args) => callOnEmptyTraversal('lTrim', args),
- map: (...args) => callOnEmptyTraversal('map', args),
- match: (...args) => callOnEmptyTraversal('match', args),
- math: (...args) => callOnEmptyTraversal('math', args),
- max: (...args) => callOnEmptyTraversal('max', args),
- mean: (...args) => callOnEmptyTraversal('mean', args),
- mergeE: (...args) => callOnEmptyTraversal('mergeE', args),
- mergeV: (...args) => callOnEmptyTraversal('mergeV', args),
- min: (...args) => callOnEmptyTraversal('min', args),
- none: (...args) => callOnEmptyTraversal('none', args),
- not: (...args) => callOnEmptyTraversal('not', args),
- optional: (...args) => callOnEmptyTraversal('optional', args),
- or: (...args) => callOnEmptyTraversal('or', args),
- order: (...args) => callOnEmptyTraversal('order', args),
- otherV: (...args) => callOnEmptyTraversal('otherV', args),
- out: (...args) => callOnEmptyTraversal('out', args),
- outE: (...args) => callOnEmptyTraversal('outE', args),
- outV: (...args) => callOnEmptyTraversal('outV', args),
- path: (...args) => callOnEmptyTraversal('path', args),
- project: (...args) => callOnEmptyTraversal('project', args),
- properties: (...args) => callOnEmptyTraversal('properties', args),
- property: (...args) => callOnEmptyTraversal('property', args),
- propertyMap: (...args) => callOnEmptyTraversal('propertyMap', args),
- range: (...args) => callOnEmptyTraversal('range', args),
- repeat: (...args) => callOnEmptyTraversal('repeat', args),
- replace: (...args) => callOnEmptyTraversal('replace', args),
- reverse: (...args) => callOnEmptyTraversal('reverse', args),
- rTrim: (...args) => callOnEmptyTraversal('rTrim', args),
- sack: (...args) => callOnEmptyTraversal('sack', args),
- sample: (...args) => callOnEmptyTraversal('sample', args),
- select: (...args) => callOnEmptyTraversal('select', args),
- sideEffect: (...args) => callOnEmptyTraversal('sideEffect', args),
- simplePath: (...args) => callOnEmptyTraversal('simplePath', args),
- skip: (...args) => callOnEmptyTraversal('skip', args),
- split: (...args) => callOnEmptyTraversal('split', args),
- store: (...args) => callOnEmptyTraversal('store', args),
- subgraph: (...args) => callOnEmptyTraversal('subgraph', args),
- substring: (...args) => callOnEmptyTraversal('substring', args),
- sum: (...args) => callOnEmptyTraversal('sum', args),
- tail: (...args) => callOnEmptyTraversal('tail', args),
- timeLimit: (...args) => callOnEmptyTraversal('timeLimit', args),
- times: (...args) => callOnEmptyTraversal('times', args),
- to: (...args) => callOnEmptyTraversal('to', args),
- toE: (...args) => callOnEmptyTraversal('toE', args),
- toLower: (...args) => callOnEmptyTraversal('toLower', args),
- toUpper: (...args) => callOnEmptyTraversal('toUpper', args),
- toV: (...args) => callOnEmptyTraversal('toV', args),
- tree: (...args) => callOnEmptyTraversal('tree', args),
- trim: (...args) => callOnEmptyTraversal('trim', args),
- unfold: (...args) => callOnEmptyTraversal('unfold', args),
- union: (...args) => callOnEmptyTraversal('union', args),
- until: (...args) => callOnEmptyTraversal('until', args),
- value: (...args) => callOnEmptyTraversal('value', args),
- valueMap: (...args) => callOnEmptyTraversal('valueMap', args),
- values: (...args) => callOnEmptyTraversal('values', args),
- where: (...args) => callOnEmptyTraversal('where', args),
-};
-
-module.exports = {
- GraphTraversal,
- GraphTraversalSource,
- CardinalityValue,
- statics,
-};
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/graph-traversal.ts b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/graph-traversal.ts
new file mode 100644
index 0000000..1847b22
--- /dev/null
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/graph-traversal.ts
@@ -0,0 +1,1919 @@
+/*
+ * 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.
+ */
+
+/**
+ * @author Jorge Bay Gondra
+ */
+
+import { EnumValue, Traversal, cardinality, direction } from './traversal.js';
+import { Transaction } from './transaction.js';
+import Bytecode from './bytecode.js';
+import { TraversalStrategies, VertexProgramStrategy, OptionsStrategy } from './traversal-strategy.js';
+import {Graph, Vertex} from '../structure/graph.js';
+import { RemoteConnection, RemoteStrategy } from '../driver/remote-connection.js';
+
+/**
+ * Represents the primary DSL of the Gremlin traversal machine.
+ */
+export class GraphTraversalSource {
+ remoteConnection?: RemoteConnection;
+
+ /**
+ * Creates a new instance of {@link GraphTraversalSource}.
+ * @param {Graph} graph
+ * @param {TraversalStrategies} traversalStrategies
+ * @param {Bytecode} [bytecode]
+ * @param {Function} [graphTraversalSourceClass] Optional {@link GraphTraversalSource} constructor.
+ * @param {Function} [graphTraversalClass] Optional {@link GraphTraversal} constructor.
+ */
+ constructor(
+ public graph: Graph,
+ public traversalStrategies: TraversalStrategies,
+ public bytecode: Bytecode = new Bytecode(),
+ public graphTraversalSourceClass: typeof GraphTraversalSource = GraphTraversalSource,
+ public graphTraversalClass: typeof GraphTraversal = GraphTraversal,
+ ) {
+ const strat = traversalStrategies.strategies.find((ts) => ts.fqcn === 'js:RemoteStrategy');
+ this.remoteConnection = strat !== undefined ? strat.connection : undefined;
+ }
+
+ /**
+ * Spawn a new <code>Transaction</code> object that can then start and stop a transaction.
+ * @returns {Transaction}
+ */
+ tx(): Transaction {
+ // you can't do g.tx().begin().tx() - no child transactions
+ if (this.remoteConnection && this.remoteConnection.isSessionBound) {
+ throw new Error('This TraversalSource is already bound to a transaction - child transactions are not supported');
+ }
+
+ return new Transaction(this);
+ }
+
+ /**
+ * @param graphComputer
+ * @param workers
+ * @param result
+ * @param persist
+ * @param vertices
+ * @param edges
+ * @param configuration
+ * @returns {GraphTraversalSource}
+ */
+ withComputer(
+ graphComputer: any,
+ workers: any,
+ result: any,
+ persist: any,
+ vertices: any[],
+ edges: any[],
+ configuration: any,
+ ): GraphTraversalSource {
+ const m: any = {};
+ if (graphComputer !== undefined) {
+ m.graphComputer = graphComputer;
+ }
+ if (workers !== undefined) {
+ m.workers = workers;
+ }
+ if (result !== undefined) {
+ m.result = result;
+ }
+ if (persist !== undefined) {
+ m.graphComputer = persist;
+ }
+ if (vertices !== undefined) {
+ m.vertices = vertices;
+ }
+ if (edges !== undefined) {
+ m.edges = edges;
+ }
+ if (configuration !== undefined) {
+ m.configuration = configuration;
+ }
+ return this.withStrategies(new VertexProgramStrategy(m));
+ }
+
+ /**
+ * Graph Traversal Source with method.
+ * @param {String} key
+ * @param {Object} value if not specified, the value with default to {@code true}
+ * @returns {GraphTraversalSource}
+ */
+ with_(key: string, value: object | undefined = undefined): GraphTraversalSource {
+ const val = value === undefined ? true : value;
+ let optionsStrategy = this.bytecode.sourceInstructions.find(
+ (i) => i[0] === 'withStrategies' && i[1] instanceof OptionsStrategy,
+ );
+ if (optionsStrategy === undefined) {
+ optionsStrategy = new OptionsStrategy({ [key]: val });
+ return this.withStrategies(optionsStrategy);
+ }
+ optionsStrategy[1].configuration[key] = val;
+ return new this.graphTraversalSourceClass(
+ this.graph,
+ new TraversalStrategies(this.traversalStrategies),
+ this.bytecode,
+ this.graphTraversalSourceClass,
+ this.graphTraversalClass,
+ );
+ }
+
+ /**
+ * Returns the string representation of the GraphTraversalSource.
+ * @returns {string}
+ */
+ toString(): string {
+ return 'graphtraversalsource[' + this.graph.toString() + ']';
+ }
+
+ /**
+ * Graph Traversal Source withBulk method.
+ * @param {...Object} args
+ * @returns {GraphTraversalSource}
+ */
+ withBulk(...args: any[]): GraphTraversalSource {
+ const b = new Bytecode(this.bytecode).addSource('withBulk', args);
+ return new this.graphTraversalSourceClass(
+ this.graph,
+ new TraversalStrategies(this.traversalStrategies),
+ b,
+ this.graphTraversalSourceClass,
+ this.graphTraversalClass,
+ );
+ }
+
+ /**
+ * Graph Traversal Source withPath method.
+ * @param {...Object} args
+ * @returns {GraphTraversalSource}
+ */
+ withPath(...args: any[]): GraphTraversalSource {
+ const b = new Bytecode(this.bytecode).addSource('withPath', args);
+ return new this.graphTraversalSourceClass(
+ this.graph,
+ new TraversalStrategies(this.traversalStrategies),
+ b,
+ this.graphTraversalSourceClass,
+ this.graphTraversalClass,
+ );
+ }
+
+ /**
+ * Graph Traversal Source withSack method.
+ * @param {...Object} args
+ * @returns {GraphTraversalSource}
+ */
+ withSack(...args: any[]): GraphTraversalSource {
+ const b = new Bytecode(this.bytecode).addSource('withSack', args);
+ return new this.graphTraversalSourceClass(
+ this.graph,
+ new TraversalStrategies(this.traversalStrategies),
+ b,
+ this.graphTraversalSourceClass,
+ this.graphTraversalClass,
+ );
+ }
+
+ /**
+ * Graph Traversal Source withSideEffect method.
+ * @param {...Object} args
+ * @returns {GraphTraversalSource}
+ */
+ withSideEffect(...args: any[]): GraphTraversalSource {
+ const b = new Bytecode(this.bytecode).addSource('withSideEffect', args);
+ return new this.graphTraversalSourceClass(
+ this.graph,
+ new TraversalStrategies(this.traversalStrategies),
+ b,
+ this.graphTraversalSourceClass,
+ this.graphTraversalClass,
+ );
+ }
+
+ /**
+ * Graph Traversal Source withStrategies method.
+ * @param {...Object} args
+ * @returns {GraphTraversalSource}
+ */
+ withStrategies(...args: any[]): GraphTraversalSource {
+ const b = new Bytecode(this.bytecode).addSource('withStrategies', args);
+ return new this.graphTraversalSourceClass(
+ this.graph,
+ new TraversalStrategies(this.traversalStrategies),
+ b,
+ this.graphTraversalSourceClass,
+ this.graphTraversalClass,
+ );
+ }
+
+ /**
+ * Graph Traversal Source withoutStrategies method.
+ * @param {...Object} args
+ * @returns {GraphTraversalSource}
+ */
+ withoutStrategies(...args: any[]): GraphTraversalSource {
+ const b = new Bytecode(this.bytecode).addSource('withoutStrategies', args);
+ return new this.graphTraversalSourceClass(
+ this.graph,
+ new TraversalStrategies(this.traversalStrategies),
+ b,
+ this.graphTraversalSourceClass,
+ this.graphTraversalClass,
+ );
+ }
+
+ /**
+ * E GraphTraversalSource step method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ E(...args: any[]): GraphTraversal {
+ const b = new Bytecode(this.bytecode).addStep('E', args);
+ return new this.graphTraversalClass(this.graph, new TraversalStrategies(this.traversalStrategies), b);
+ }
+
+ /**
+ * V GraphTraversalSource step method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ V(...args: any[]): GraphTraversal {
+ for (let i = 0; i < args.length; i++) {
+ if (args[i] instanceof Vertex) {
+ args[i] = args[i].id
+ }
+ }
+ const b = new Bytecode(this.bytecode).addStep('V', args);
+ return new this.graphTraversalClass(this.graph, new TraversalStrategies(this.traversalStrategies), b);
+ }
+
+ /**
+ * addE GraphTraversalSource step method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ addE(...args: any[]): GraphTraversal {
+ const b = new Bytecode(this.bytecode).addStep('addE', args);
+ return new this.graphTraversalClass(this.graph, new TraversalStrategies(this.traversalStrategies), b);
+ }
+
+ /**
+ * mergeV GraphTraversalSource step method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ mergeE(...args: any[]): GraphTraversal {
+ if (args && args[0]) {
+ if (args[0].get(direction.out) instanceof Vertex) {
+ args[0].set(direction.out, args[0].get(direction.out).id);
+ }
+ if (args[0].get(direction.in) instanceof Vertex) {
+ args[0].set(direction.in, args[0].get(direction.in).id);
+ }
+ }
+ const b = new Bytecode(this.bytecode).addStep('mergeE', args);
+ return new this.graphTraversalClass(this.graph, new TraversalStrategies(this.traversalStrategies), b);
+ }
+
+ /**
+ * addV GraphTraversalSource step method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ addV(...args: any[]): GraphTraversal {
+ const b = new Bytecode(this.bytecode).addStep('addV', args);
+ return new this.graphTraversalClass(this.graph, new TraversalStrategies(this.traversalStrategies), b);
+ }
+
+ /**
+ * mergeV GraphTraversalSource step method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ mergeV(...args: any[]): GraphTraversal {
+ const b = new Bytecode(this.bytecode).addStep('mergeV', args);
+ return new this.graphTraversalClass(this.graph, new TraversalStrategies(this.traversalStrategies), b);
+ }
+
+ /**
+ * inject GraphTraversalSource step method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ inject(...args: any[]): GraphTraversal {
+ const b = new Bytecode(this.bytecode).addStep('inject', args);
+ return new this.graphTraversalClass(this.graph, new TraversalStrategies(this.traversalStrategies), b);
+ }
+
+ /**
+ * io GraphTraversalSource step method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ io(...args: any[]): GraphTraversal {
+ const b = new Bytecode(this.bytecode).addStep('io', args);
+ return new this.graphTraversalClass(this.graph, new TraversalStrategies(this.traversalStrategies), b);
+ }
+
+ /**
+ * call GraphTraversalSource step method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ call(...args: any[]): GraphTraversal {
+ const b = new Bytecode(this.bytecode).addStep('call', args);
+ return new this.graphTraversalClass(this.graph, new TraversalStrategies(this.traversalStrategies), b);
+ }
+
+ /**
+ * union GraphTraversalSource method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ union(...args: any[]): GraphTraversal {
+ const b = new Bytecode(this.bytecode).addStep('union', args);
+ return new this.graphTraversalClass(this.graph, new TraversalStrategies(this.traversalStrategies), b);
+ }
+}
+
+/**
+ * Represents a graph traversal.
+ */
+export class GraphTraversal extends Traversal {
+ constructor(graph: Graph | null, traversalStrategies: TraversalStrategies | null, bytecode: Bytecode) {
+ super(graph, traversalStrategies, bytecode);
+ }
+
+ /**
+ * Copy a traversal so as to reset and re-use it.
+ */
+ clone() {
+ return new GraphTraversal(this.graph, this.traversalStrategies, this.getBytecode());
+ }
+
+ /**
+ * Graph traversal V method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ V(...args: any[]): this {
+ for (let i = 0; i < args.length; i++) {
+ if (args[i] instanceof Vertex) {
+ args[i] = args[i].id
+ }
+ }
+ this.bytecode.addStep('V', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal E method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ E(...args: any[]): this {
+ this.bytecode.addStep('E', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal addE method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ addE(...args: any[]): this {
+ this.bytecode.addStep('addE', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal addV method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ addV(...args: any[]): this {
+ this.bytecode.addStep('addV', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal aggregate method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ aggregate(...args: any[]): this {
+ this.bytecode.addStep('aggregate', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal all method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ all(...args: any[]): this {
+ this.bytecode.addStep('all', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal and method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ and(...args: any[]): this {
+ this.bytecode.addStep('and', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal any method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ any(...args: any[]): this {
+ this.bytecode.addStep('any', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal as method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ as(...args: any[]): this {
+ this.bytecode.addStep('as', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal asDate method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ asDate(...args: any[]): this {
+ this.bytecode.addStep('asDate', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal asNumber method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ asNumber(...args: any[]) {
+ this.bytecode.addStep('asNumber', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal asString method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ asString(...args: any[]): this {
+ this.bytecode.addStep('asString', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal barrier method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ barrier(...args: any[]): this {
+ this.bytecode.addStep('barrier', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal both method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ both(...args: any[]): this {
+ this.bytecode.addStep('both', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal bothE method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ bothE(...args: any[]): this {
+ this.bytecode.addStep('bothE', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal bothV method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ bothV(...args: any[]): this {
+ this.bytecode.addStep('bothV', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal branch method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ branch(...args: any[]): this {
+ this.bytecode.addStep('branch', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal by method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ by(...args: any[]): this {
+ this.bytecode.addStep('by', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal call method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ call(...args: any[]): this {
+ this.bytecode.addStep('call', args);
+ return this;
+ }
+ /**
+ * Graph traversal cap method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ cap(...args: any[]): this {
+ this.bytecode.addStep('cap', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal choose method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ choose(...args: any[]): this {
+ this.bytecode.addStep('choose', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal coalesce method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ coalesce(...args: any[]): this {
+ this.bytecode.addStep('coalesce', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal coin method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ coin(...args: any[]): this {
+ this.bytecode.addStep('coin', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal combine method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ combine(...args: any[]): this {
+ this.bytecode.addStep('combine', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal concat method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ concat(...args: any[]): this {
+ this.bytecode.addStep('concat', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal conjoin method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ conjoin(...args: any[]): this {
+ this.bytecode.addStep('conjoin', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal connectedComponent method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ connectedComponent(...args: any[]): this {
+ this.bytecode.addStep('connectedComponent', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal constant method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ constant(...args: any[]): this {
+ this.bytecode.addStep('constant', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal count method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ count(...args: any[]): this {
+ this.bytecode.addStep('count', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal cyclicPath method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ cyclicPath(...args: any[]): this {
+ this.bytecode.addStep('cyclicPath', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal dateAdd method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ dateAdd(...args: any[]): this {
+ this.bytecode.addStep('dateAdd', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal dateDiff method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ dateDiff(...args: any[]): this {
+ this.bytecode.addStep('dateDiff', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal dedup method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ dedup(...args: any[]): this {
+ this.bytecode.addStep('dedup', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal difference method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ difference(...args: any[]): this {
+ this.bytecode.addStep('difference', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal discard method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ discard(...args: any[]): this {
+ this.bytecode.addStep('discard', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal disjunct method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ disjunct(...args: any[]): this {
+ this.bytecode.addStep('disjunct', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal drop method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ drop(...args: any[]): this {
+ this.bytecode.addStep('drop', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal element method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ element(...args: any[]): this {
+ this.bytecode.addStep('element', args);
+ return this;
+ }
+ /**
+ * Graph traversal elementMap method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ elementMap(...args: any[]): this {
+ this.bytecode.addStep('elementMap', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal emit method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ emit(...args: any[]): this {
+ this.bytecode.addStep('emit', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal fa method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ fail(...args: any[]): this {
+ this.bytecode.addStep('fail', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal filter method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ filter(...args: any[]): this {
+ this.bytecode.addStep('filter', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal flatMap method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ flatMap(...args: any[]): this {
+ this.bytecode.addStep('flatMap', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal fold method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ fold(...args: any[]): this {
+ this.bytecode.addStep('fold', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal format method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ format(...args: any[]): this {
+ this.bytecode.addStep('format', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal from method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ from_(...args: any[]): this {
+ for (let i = 0; i < args.length; i++) {
+ if (args[i] instanceof Vertex) {
+ args[i] = args[i].id
+ }
+ }
+ this.bytecode.addStep('from', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal group method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ group(...args: any[]): this {
+ this.bytecode.addStep('group', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal groupCount method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ groupCount(...args: any[]): this {
+ this.bytecode.addStep('groupCount', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal has method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ has(...args: any[]): this {
+ this.bytecode.addStep('has', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal hasId method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ hasId(...args: any[]): this {
+ this.bytecode.addStep('hasId', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal hasKey method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ hasKey(...args: any[]): this {
+ this.bytecode.addStep('hasKey', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal hasLabel method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ hasLabel(...args: any[]): this {
+ this.bytecode.addStep('hasLabel', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal hasNot method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ hasNot(...args: any[]): this {
+ this.bytecode.addStep('hasNot', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal hasValue method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ hasValue(...args: any[]): this {
+ this.bytecode.addStep('hasValue', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal id method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ id(...args: any[]): this {
+ this.bytecode.addStep('id', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal identity method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ identity(...args: any[]): this {
+ this.bytecode.addStep('identity', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal in method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ in_(...args: any[]): this {
+ this.bytecode.addStep('in', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal inE method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ inE(...args: any[]): this {
+ this.bytecode.addStep('inE', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal inV method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ inV(...args: any[]): this {
+ this.bytecode.addStep('inV', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal index method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ index(...args: any[]): this {
+ this.bytecode.addStep('index', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal inject method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ inject(...args: any[]): this {
+ this.bytecode.addStep('inject', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal intersect method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ intersect(...args: any[]): this {
+ this.bytecode.addStep('intersect', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal is method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ is(...args: any[]): this {
+ this.bytecode.addStep('is', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal key method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ key(...args: any[]): this {
+ this.bytecode.addStep('key', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal label method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ label(...args: any[]): this {
+ this.bytecode.addStep('label', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal length method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ length(...args: any[]): this {
+ this.bytecode.addStep('length', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal limit method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ limit(...args: any[]): this {
+ this.bytecode.addStep('limit', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal local method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ local(...args: any[]): this {
+ this.bytecode.addStep('local', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal loops method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ loops(...args: any[]): this {
+ this.bytecode.addStep('loops', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal lTrim method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ lTrim(...args: any[]): this {
+ this.bytecode.addStep('lTrim', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal map method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ map(...args: any[]): this {
+ this.bytecode.addStep('map', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal match method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ match(...args: any[]): this {
+ this.bytecode.addStep('match', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal math method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ math(...args: any[]): this {
+ this.bytecode.addStep('math', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal max method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ max(...args: any[]): this {
+ this.bytecode.addStep('max', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal mean method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ mean(...args: any[]): this {
+ this.bytecode.addStep('mean', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal merge method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ merge(...args: any[]): this {
+ this.bytecode.addStep('merge', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal mergeE method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ mergeE(...args: any[]): this {
+ if (args && args[0]) {
+ if (args[0].get(direction.OUT) instanceof Vertex) {
+ args[0].set(direction.OUT, args[0].get(direction.OUT).id);
+ }
+ if (args[0].get(direction.IN) instanceof Vertex) {
+ args[0].set(direction.IN, args[0].get(direction.IN).id);
+ }
+ }
+ this.bytecode.addStep('mergeE', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal mergeV method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ mergeV(...args: any[]): this {
+ this.bytecode.addStep('mergeV', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal min method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ min(...args: any[]): this {
+ this.bytecode.addStep('min', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal none method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ none(...args: any[]): this {
+ this.bytecode.addStep('none', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal not method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ not(...args: any[]): this {
+ this.bytecode.addStep('not', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal option method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ option(...args: any[]): this {
+ this.bytecode.addStep('option', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal optional method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ optional(...args: any[]): this {
+ this.bytecode.addStep('optional', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal or method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ or(...args: any[]): this {
+ this.bytecode.addStep('or', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal order method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ order(...args: any[]): this {
+ this.bytecode.addStep('order', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal otherV method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ otherV(...args: any[]): this {
+ this.bytecode.addStep('otherV', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal out method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ out(...args: any[]): this {
+ this.bytecode.addStep('out', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal outE method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ outE(...args: any[]): this {
+ this.bytecode.addStep('outE', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal outV method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ outV(...args: any[]): this {
+ this.bytecode.addStep('outV', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal pageRank method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ pageRank(...args: any[]): this {
+ this.bytecode.addStep('pageRank', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal path method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ path(...args: any[]): this {
+ this.bytecode.addStep('path', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal peerPressure method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ peerPressure(...args: any[]): this {
+ this.bytecode.addStep('peerPressure', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal product method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ product(...args: any[]): this {
+ this.bytecode.addStep('product', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal profile method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ profile(...args: any[]): this {
+ this.bytecode.addStep('profile', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal program method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ program(...args: any[]): this {
+ this.bytecode.addStep('program', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal project method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ project(...args: any[]): this {
+ this.bytecode.addStep('project', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal properties method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ properties(...args: any[]): this {
+ this.bytecode.addStep('properties', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal property method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ property(...args: any[]): this {
+ this.bytecode.addStep('property', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal propertyMap method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ propertyMap(...args: any[]): this {
+ this.bytecode.addStep('propertyMap', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal range method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ range(...args: any[]): this {
+ this.bytecode.addStep('range', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal read method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ read(...args: any[]): this {
+ this.bytecode.addStep('read', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal repeat method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ repeat(...args: any[]): this {
+ this.bytecode.addStep('repeat', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal replace method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ replace(...args: any[]): this {
+ this.bytecode.addStep('replace', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal reverse method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ reverse(...args: any[]): this {
+ this.bytecode.addStep('reverse', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal rTrim method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ rTrim(...args: any[]): this {
+ this.bytecode.addStep('rTrim', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal sack method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ sack(...args: any[]): this {
+ this.bytecode.addStep('sack', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal sample method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ sample(...args: any[]): this {
+ this.bytecode.addStep('sample', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal select method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ select(...args: any[]): this {
+ this.bytecode.addStep('select', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal shortestPath method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ shortestPath(...args: any[]): this {
+ this.bytecode.addStep('shortestPath', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal sideEffect method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ sideEffect(...args: any[]): this {
+ this.bytecode.addStep('sideEffect', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal simplePath method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ simplePath(...args: any[]): this {
+ this.bytecode.addStep('simplePath', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal skip method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ skip(...args: any[]): this {
+ this.bytecode.addStep('skip', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal split method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ split(...args: any[]): this {
+ this.bytecode.addStep('split', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal store method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ store(...args: any[]): this {
+ this.bytecode.addStep('store', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal subgraph method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ subgraph(...args: any[]): this {
+ this.bytecode.addStep('subgraph', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal subgraph method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ substring(...args: any[]): this {
+ this.bytecode.addStep('substring', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal sum method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ sum(...args: any[]): this {
+ this.bytecode.addStep('sum', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal tail method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ tail(...args: any[]): this {
+ this.bytecode.addStep('tail', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal timeLimit method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ timeLimit(...args: any[]): this {
+ this.bytecode.addStep('timeLimit', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal times method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ times(...args: any[]): this {
+ this.bytecode.addStep('times', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal to method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ to(...args: any[]): this {
+ for (let i = 0; i < args.length; i++) {
+ if (args[i] instanceof Vertex) {
+ args[i] = args[i].id
+ }
+ }
+ this.bytecode.addStep('to', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal toE method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ toE(...args: any[]): this {
+ this.bytecode.addStep('toE', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal toLower method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ toLower(...args: any[]): this {
+ this.bytecode.addStep('toLower', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal toUpper method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ toUpper(...args: any[]): this {
+ this.bytecode.addStep('toUpper', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal toV method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ toV(...args: any[]): this {
+ this.bytecode.addStep('toV', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal tree method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ tree(...args: any[]): this {
+ this.bytecode.addStep('tree', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal trim method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ trim(...args: any[]): this {
+ this.bytecode.addStep('trim', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal unfold method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ unfold(...args: any[]): this {
+ this.bytecode.addStep('unfold', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal union method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ union(...args: any[]): this {
+ this.bytecode.addStep('union', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal until method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ until(...args: any[]): this {
+ this.bytecode.addStep('until', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal value method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ value(...args: any[]): this {
+ this.bytecode.addStep('value', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal valueMap method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ valueMap(...args: any[]): this {
+ this.bytecode.addStep('valueMap', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal values method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ values(...args: any[]): this {
+ this.bytecode.addStep('values', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal where method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ where(...args: any[]): this {
+ this.bytecode.addStep('where', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal with method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ with_(...args: any[]): this {
+ this.bytecode.addStep('with', args);
+ return this;
+ }
+
+ /**
+ * Graph traversal write method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+ write(...args: any[]): this {
+ this.bytecode.addStep('write', args);
+ return this;
+ }
+}
+
+export class CardinalityValue extends Bytecode {
+ /**
+ * Creates a new instance of {@link CardinalityValue}.
+ * @param {String} card
+ * @param {Object} value
+ */
+ constructor(card: string | EnumValue, value: any) {
+ super();
+ this.addSource('CardinalityValueTraversal', [card, value]);
+ }
+
+ /**
+ * Create a value with single cardinality.
+ * @param {Array} value
+ * @returns {CardinalityValue}
+ */
+ static single(value: any[]): CardinalityValue {
+ return new CardinalityValue(cardinality.single, value);
+ }
+
+ /**
+ * Create a value with list cardinality.
+ * @param {Array} value
+ * @returns {CardinalityValue}
+ */
+ static list(value: any[]): CardinalityValue {
+ return new CardinalityValue(cardinality.list, value);
+ }
+
+ /**
+ * Create a value with set cardinality.
+ * @param {Array} value
+ * @returns {CardinalityValue}
+ */
+ static set(value: any[]): CardinalityValue {
+ return new CardinalityValue(cardinality.set, value);
+ }
+}
+
+function callOnEmptyTraversal(fnName: string, args: any[]) {
+ const g = new GraphTraversal(null, null, new Bytecode());
+ return g[fnName as keyof typeof g].apply(g, args);
+}
+
+/**
+ * Contains the static method definitions
+ */
+export const statics = {
+ E: (...args: any[]) => callOnEmptyTraversal('E', args),
+ V: (...args: any[]) => callOnEmptyTraversal('V', args),
+ addE: (...args: any[]) => callOnEmptyTraversal('addE', args),
+ addV: (...args: any[]) => callOnEmptyTraversal('addV', args),
+ aggregate: (...args: any[]) => callOnEmptyTraversal('aggregate', args),
+ all: (...args: any[]) => callOnEmptyTraversal('all', args),
+ and: (...args: any[]) => callOnEmptyTraversal('and', args),
+ any: (...args: any[]) => callOnEmptyTraversal('any', args),
+ as: (...args: any[]) => callOnEmptyTraversal('as', args),
+ asDate: (...args: any[]) => callOnEmptyTraversal('asDate', args),
+ asBool: (...args: any[]) => callOnEmptyTraversal('asBool', args),
+ asString: (...args: any[]) => callOnEmptyTraversal('asString', args),
+ barrier: (...args: any[]) => callOnEmptyTraversal('barrier', args),
+ both: (...args: any[]) => callOnEmptyTraversal('both', args),
+ bothE: (...args: any[]) => callOnEmptyTraversal('bothE', args),
+ bothV: (...args: any[]) => callOnEmptyTraversal('bothV', args),
+ branch: (...args: any[]) => callOnEmptyTraversal('branch', args),
+ call: (...args: any[]) => callOnEmptyTraversal('call', args),
+ cap: (...args: any[]) => callOnEmptyTraversal('cap', args),
+ choose: (...args: any[]) => callOnEmptyTraversal('choose', args),
+ coalesce: (...args: any[]) => callOnEmptyTraversal('coalesce', args),
+ coin: (...args: any[]) => callOnEmptyTraversal('coin', args),
+ concat: (...args: any[]) => callOnEmptyTraversal('concat', args),
+ constant: (...args: any[]) => callOnEmptyTraversal('constant', args),
+ count: (...args: any[]) => callOnEmptyTraversal('count', args),
+ cyclicPath: (...args: any[]) => callOnEmptyTraversal('cyclicPath', args),
+ dateAdd: (...args: any[]) => callOnEmptyTraversal('dateAdd', args),
+ dateDiff: (...args: any[]) => callOnEmptyTraversal('dateDiff', args),
+ dedup: (...args: any[]) => callOnEmptyTraversal('dedup', args),
+ discard: (...args: any[]) => callOnEmptyTraversal('discard', args),
+ disjunct: (...args: any[]) => callOnEmptyTraversal('disjunct', args),
+ drop: (...args: any[]) => callOnEmptyTraversal('drop', args),
+ element: (...args: any[]) => callOnEmptyTraversal('element', args),
+ elementMap: (...args: any[]) => callOnEmptyTraversal('elementMap', args),
+ emit: (...args: any[]) => callOnEmptyTraversal('emit', args),
+ fail: (...args: any[]) => callOnEmptyTraversal('fail', args),
+ filter: (...args: any[]) => callOnEmptyTraversal('filter', args),
+ flatMap: (...args: any[]) => callOnEmptyTraversal('flatMap', args),
+ fold: (...args: any[]) => callOnEmptyTraversal('fold', args),
+ format: (...args: any[]) => callOnEmptyTraversal('format', args),
+ group: (...args: any[]) => callOnEmptyTraversal('group', args),
+ groupCount: (...args: any[]) => callOnEmptyTraversal('groupCount', args),
+ has: (...args: any[]) => callOnEmptyTraversal('has', args),
+ hasId: (...args: any[]) => callOnEmptyTraversal('hasId', args),
+ hasKey: (...args: any[]) => callOnEmptyTraversal('hasKey', args),
+ hasLabel: (...args: any[]) => callOnEmptyTraversal('hasLabel', args),
+ hasNot: (...args: any[]) => callOnEmptyTraversal('hasNot', args),
+ hasValue: (...args: any[]) => callOnEmptyTraversal('hasValue', args),
+ id: (...args: any[]) => callOnEmptyTraversal('id', args),
+ identity: (...args: any[]) => callOnEmptyTraversal('identity', args),
+ in_: (...args: any[]) => callOnEmptyTraversal('in_', args),
+ inE: (...args: any[]) => callOnEmptyTraversal('inE', args),
+ inV: (...args: any[]) => callOnEmptyTraversal('inV', args),
+ index: (...args: any[]) => callOnEmptyTraversal('index', args),
+ inject: (...args: any[]) => callOnEmptyTraversal('inject', args),
+ is: (...args: any[]) => callOnEmptyTraversal('is', args),
+ key: (...args: any[]) => callOnEmptyTraversal('key', args),
+ label: (...args: any[]) => callOnEmptyTraversal('label', args),
+ length: (...args: any[]) => callOnEmptyTraversal('length', args),
+ limit: (...args: any[]) => callOnEmptyTraversal('limit', args),
+ local: (...args: any[]) => callOnEmptyTraversal('local', args),
+ loops: (...args: any[]) => callOnEmptyTraversal('loops', args),
+ lTrim: (...args: any[]) => callOnEmptyTraversal('lTrim', args),
+ map: (...args: any[]) => callOnEmptyTraversal('map', args),
+ match: (...args: any[]) => callOnEmptyTraversal('match', args),
+ math: (...args: any[]) => callOnEmptyTraversal('math', args),
+ max: (...args: any[]) => callOnEmptyTraversal('max', args),
+ mean: (...args: any[]) => callOnEmptyTraversal('mean', args),
+ mergeE: (...args: any[]) => callOnEmptyTraversal('mergeE', args),
+ mergeV: (...args: any[]) => callOnEmptyTraversal('mergeV', args),
+ min: (...args: any[]) => callOnEmptyTraversal('min', args),
+ none: (...args: any[]) => callOnEmptyTraversal('none', args),
+ not: (...args: any[]) => callOnEmptyTraversal('not', args),
+ optional: (...args: any[]) => callOnEmptyTraversal('optional', args),
+ or: (...args: any[]) => callOnEmptyTraversal('or', args),
+ order: (...args: any[]) => callOnEmptyTraversal('order', args),
+ otherV: (...args: any[]) => callOnEmptyTraversal('otherV', args),
+ out: (...args: any[]) => callOnEmptyTraversal('out', args),
+ outE: (...args: any[]) => callOnEmptyTraversal('outE', args),
+ outV: (...args: any[]) => callOnEmptyTraversal('outV', args),
+ path: (...args: any[]) => callOnEmptyTraversal('path', args),
+ project: (...args: any[]) => callOnEmptyTraversal('project', args),
+ properties: (...args: any[]) => callOnEmptyTraversal('properties', args),
+ property: (...args: any[]) => callOnEmptyTraversal('property', args),
+ propertyMap: (...args: any[]) => callOnEmptyTraversal('propertyMap', args),
+ range: (...args: any[]) => callOnEmptyTraversal('range', args),
+ repeat: (...args: any[]) => callOnEmptyTraversal('repeat', args),
+ replace: (...args: any[]) => callOnEmptyTraversal('replace', args),
+ reverse: (...args: any[]) => callOnEmptyTraversal('reverse', args),
+ rTrim: (...args: any[]) => callOnEmptyTraversal('rTrim', args),
+ sack: (...args: any[]) => callOnEmptyTraversal('sack', args),
+ sample: (...args: any[]) => callOnEmptyTraversal('sample', args),
+ select: (...args: any[]) => callOnEmptyTraversal('select', args),
+ sideEffect: (...args: any[]) => callOnEmptyTraversal('sideEffect', args),
+ simplePath: (...args: any[]) => callOnEmptyTraversal('simplePath', args),
+ skip: (...args: any[]) => callOnEmptyTraversal('skip', args),
+ split: (...args: any[]) => callOnEmptyTraversal('split', args),
+ store: (...args: any[]) => callOnEmptyTraversal('store', args),
+ subgraph: (...args: any[]) => callOnEmptyTraversal('subgraph', args),
+ substring: (...args: any[]) => callOnEmptyTraversal('substring', args),
+ sum: (...args: any[]) => callOnEmptyTraversal('sum', args),
+ tail: (...args: any[]) => callOnEmptyTraversal('tail', args),
+ timeLimit: (...args: any[]) => callOnEmptyTraversal('timeLimit', args),
+ times: (...args: any[]) => callOnEmptyTraversal('times', args),
+ to: (...args: any[]) => callOnEmptyTraversal('to', args),
+ toE: (...args: any[]) => callOnEmptyTraversal('toE', args),
+ toLower: (...args: any[]) => callOnEmptyTraversal('toLower', args),
+ toUpper: (...args: any[]) => callOnEmptyTraversal('toUpper', args),
+ toV: (...args: any[]) => callOnEmptyTraversal('toV', args),
+ tree: (...args: any[]) => callOnEmptyTraversal('tree', args),
+ trim: (...args: any[]) => callOnEmptyTraversal('trim', args),
+ unfold: (...args: any[]) => callOnEmptyTraversal('unfold', args),
+ union: (...args: any[]) => callOnEmptyTraversal('union', args),
+ until: (...args: any[]) => callOnEmptyTraversal('until', args),
+ value: (...args: any[]) => callOnEmptyTraversal('value', args),
+ valueMap: (...args: any[]) => callOnEmptyTraversal('valueMap', args),
+ values: (...args: any[]) => callOnEmptyTraversal('values', args),
+ where: (...args: any[]) => callOnEmptyTraversal('where', args),
+};
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/transaction.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/transaction.js
deleted file mode 100644
index a60e38f..0000000
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/transaction.js
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-'use strict';
-
-const remote = require('../driver/remote-connection');
-const Bytecode = require('./bytecode');
-const { TraversalStrategies } = require('./traversal-strategy');
-
-/**
- * A controller for a remote transaction that is constructed from <code>g.tx()</code>. Calling <code>begin()</code>
- * on this object will produce a new <code>GraphTraversalSource</code> that is bound to a remote transaction over which
- * multiple traversals may be executed in that context. Calling <code>commit()</code> or <code>rollback()</code> will
- * then close the transaction and thus, the session. This feature only works with transaction enabled graphs.
- */
-class Transaction {
- constructor(g) {
- this._g = g;
- this._sessionBasedConnection = undefined;
- }
-
- /**
- * Spawns a <code>GraphTraversalSource</code> that is bound to a remote session which enables a transaction.
- * @returns {*}
- */
- begin() {
- if (this._sessionBasedConnection) {
- throw new Error('Transaction already started on this object');
- }
-
- this._sessionBasedConnection = this._g.remoteConnection.createSession();
- const traversalStrategy = new TraversalStrategies();
- traversalStrategy.addStrategy(new remote.RemoteStrategy(this._sessionBasedConnection));
- return new this._g.graphTraversalSourceClass(
- this._g.graph,
- traversalStrategy,
- new Bytecode(this._g.bytecode),
- this._g.graphTraversalSourceClass,
- this._g.graphTraversalClass,
- );
- }
-
- /**
- * @returns {Promise}
- */
- commit() {
- if (!this._sessionBasedConnection) {
- throw new Error('Cannot commit a transaction that is not started');
- }
-
- return this._sessionBasedConnection.commit().finally(() => this.close());
- }
-
- /**
- * @returns {Promise}
- */
- rollback() {
- if (!this._sessionBasedConnection) {
- throw new Error('Cannot rollback a transaction that is not started');
- }
-
- return this._sessionBasedConnection.rollback().finally(() => this.close());
- }
-
- /**
- * Returns true if transaction is open.
- * @returns {Boolean}
- */
- get isOpen() {
- return this._sessionBasedConnection.isOpen;
- }
-
- /**
- * @returns {Promise}
- */
- close() {
- if (this._sessionBasedConnection) {
- this._sessionBasedConnection.close();
- }
- }
-}
-
-module.exports = {
- Transaction,
-};
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/transaction.ts b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/transaction.ts
new file mode 100644
index 0000000..55b6310
--- /dev/null
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/transaction.ts
@@ -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.
+ */
+
+import { RemoteConnection, RemoteStrategy } from '../driver/remote-connection.js';
+import Bytecode from './bytecode.js';
+import { GraphTraversalSource } from './graph-traversal.js';
+import { TraversalStrategies } from './traversal-strategy.js';
+
+/**
+ * A controller for a remote transaction that is constructed from <code>g.tx()</code>. Calling <code>begin()</code>
+ * on this object will produce a new <code>GraphTraversalSource</code> that is bound to a remote transaction over which
+ * multiple traversals may be executed in that context. Calling <code>commit()</code> or <code>rollback()</code> will
+ * then close the transaction and thus, the session. This feature only works with transaction enabled graphs.
+ */
+export class Transaction {
+ private _sessionBasedConnection?: RemoteConnection = undefined;
+
+ constructor(private readonly g: GraphTraversalSource) {}
+
+ /**
+ * Spawns a <code>GraphTraversalSource</code> that is bound to a remote session which enables a transaction.
+ * @returns {GraphTraversalSource}
+ */
+ begin(): GraphTraversalSource {
+ if (this._sessionBasedConnection) {
+ throw new Error('Transaction already started on this object');
+ }
+
+ this._sessionBasedConnection = this.g.remoteConnection!.createSession();
+ const traversalStrategy = new TraversalStrategies();
+ traversalStrategy.addStrategy(new RemoteStrategy(this._sessionBasedConnection));
+ return new this.g.graphTraversalSourceClass(
+ this.g.graph,
+ traversalStrategy,
+ new Bytecode(this.g.bytecode),
+ this.g.graphTraversalSourceClass,
+ this.g.graphTraversalClass,
+ );
+ }
+
+ /**
+ * @returns {Promise}
+ */
+ commit(): Promise<void> {
+ if (!this._sessionBasedConnection) {
+ throw new Error('Cannot commit a transaction that is not started');
+ }
+
+ return this._sessionBasedConnection.commit().finally(() => this.close());
+ }
+
+ /**
+ * @returns {Promise}
+ */
+ rollback(): Promise<void> {
+ if (!this._sessionBasedConnection) {
+ throw new Error('Cannot rollback a transaction that is not started');
+ }
+
+ return this._sessionBasedConnection.rollback().finally(() => this.close());
+ }
+
+ /**
+ * Returns true if transaction is open.
+ * @returns {Boolean}
+ */
+ get isOpen(): boolean {
+ return this._sessionBasedConnection?.isOpen ?? false;
+ }
+
+ /**
+ * @returns {Promise}
+ */
+ async close(): Promise<void> {
+ if (this._sessionBasedConnection) {
+ this._sessionBasedConnection.close();
+ }
+ }
+}
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/translator.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/translator.js
deleted file mode 100644
index fb58907..0000000
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/translator.js
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-'use strict';
-
-const Traversal = require('./traversal').Traversal;
-const Bytecode = require('./bytecode');
-
-/**
- * Class to translate glv bytecode steps into executable Gremlin-Groovy script
- */
-class Translator {
- constructor(traversalSource) {
- this._traversalSource = traversalSource;
- }
-
- getTraversalSource() {
- return this._traversalSource;
- }
-
- getTargetLanguage() {
- return 'gremlin-groovy';
- }
-
- of(traversalSource) {
- this._traversalSource = traversalSource;
- }
-
- /**
- * Returns a script representation of the given bytecode instructions.
- * @param {Object} bytecodeOrTraversal The traversal or bytecode of a traversal containing step instructions.
- * @param {boolean} child Determines if a traversal object should be treated as an anonymous child or if it is a spawn from "g"
- * @returns {string} Gremlin-Groovy script
- */
- translate(bytecodeOrTraversal, child = false) {
- let script = child ? '__' : this._traversalSource;
- const bc = bytecodeOrTraversal instanceof Bytecode ? bytecodeOrTraversal : bytecodeOrTraversal.getBytecode();
-
- const instructions = bc.stepInstructions;
-
- // build the script from the glv instructions.
- for (let i = 0; i < instructions.length; i++) {
- const params = instructions[i].slice(1);
- script += '.' + instructions[i][0] + '(';
-
- if (params.length) {
- for (let k = 0; k < params.length; k++) {
- if (k > 0) {
- script += ', ';
- }
-
- script += this.convert(params[k]);
- }
- }
-
- script += ')';
- }
-
- return script;
- }
-
- /**
- * Converts an object to a Gremlin script representation.
- * @param {Object} anyObject The object to convert to a script representation
- * @returns {string} The Gremlin script representation
- */
- convert(anyObject) {
- let script = '';
- if (Object(anyObject) === anyObject) {
- if (anyObject instanceof Traversal) {
- script += this.translate(anyObject.getBytecode(), true);
- } else if (anyObject.toString() === '[object Object]') {
- Object.keys(anyObject).forEach(function (key, index) {
- if (index > 0) {
- script += ', ';
- }
- script += `('${key}', `;
- if (anyObject[key] instanceof String || typeof anyObject[key] === 'string') {
- script += `'${`${anyObject[key]}`.replaceAll("'", "\\'")}'`; // eslint-disable-line quotes
- } else {
- script += anyObject[key];
- }
- script += ')';
- });
- } else if (Array.isArray(anyObject)) {
- const parts = [];
- for (const item of anyObject) {
- parts.push(this.convert(item));
- }
- script += '[' + parts.join(', ') + ']';
- } else {
- script += anyObject.toString();
- }
- } else if (anyObject === undefined || anyObject === null) {
- script += 'null';
- } else if (typeof anyObject === 'number' || typeof anyObject === 'boolean') {
- script += anyObject;
- } else {
- script += `'${`${anyObject}`.replaceAll("'", "\\'")}'`; // eslint-disable-line quotes
- }
-
- return script;
- }
-}
-
-module.exports = Translator;
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/translator.ts b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/translator.ts
new file mode 100644
index 0000000..fe97870
--- /dev/null
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/translator.ts
@@ -0,0 +1,116 @@
+/*
+ * 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.
+ */
+
+import { Traversal } from './traversal.js';
+import Bytecode from './bytecode.js';
+
+/**
+ * Class to translate glv bytecode steps into executable Gremlin-Groovy script
+ */
+export default class Translator {
+ constructor(private traversalSource: string) {}
+
+ getTraversalSource() {
+ return this.traversalSource;
+ }
+
+ getTargetLanguage() {
+ return 'gremlin-groovy';
+ }
+
+ of(traversalSource: string) {
+ this.traversalSource = traversalSource;
+ }
+
+ /**
+ * Returns a script representation of the given bytecode instructions.
+ * @param {Object} bytecodeOrTraversal The traversal or bytecode of a traversal containing step instructions.
+ * @param {boolean} child Determines if a traversal object should be treated as an anonymous child or if it is a spawn from "g"
+ * @returns {string} Gremlin-Groovy script
+ */
+ translate(bytecodeOrTraversal: Traversal | Bytecode, child: boolean = false): string {
+ let script = child ? '__' : this.traversalSource;
+ const bc = bytecodeOrTraversal instanceof Bytecode ? bytecodeOrTraversal : bytecodeOrTraversal.getBytecode();
+
+ const instructions = bc.stepInstructions;
+
+ // build the script from the glv instructions.
+ for (let i = 0; i < instructions.length; i++) {
+ const params = instructions[i].slice(1);
+ script += '.' + instructions[i][0] + '(';
+
+ if (params.length) {
+ for (let k = 0; k < params.length; k++) {
+ if (k > 0) {
+ script += ', ';
+ }
+
+ script += this.convert(params[k]);
+ }
+ }
+
+ script += ')';
+ }
+
+ return script;
+ }
+
+ /**
+ * Converts an object to a Gremlin script representation.
+ * @param {Object} anyObject The object to convert to a script representation
+ * @returns {string} The Gremlin script representation
+ */
+ convert(anyObject: any): string {
+ let script = '';
+ if (Object(anyObject) === anyObject) {
+ if (anyObject instanceof Traversal) {
+ script += this.translate(anyObject.getBytecode(), true);
+ } else if (anyObject.toString() === '[object Object]') {
+ Object.keys(anyObject).forEach(function (key, index) {
+ if (index > 0) {
+ script += ', ';
+ }
+ script += `('${key}', `;
+ if (anyObject[key] instanceof String || typeof anyObject[key] === 'string') {
+ script += `'${`${anyObject[key]}`.replaceAll("'", "\\'")}'`; // eslint-disable-line quotes
+ } else {
+ script += anyObject[key];
+ }
+ script += ')';
+ });
+ } else if (Array.isArray(anyObject)) {
+ const parts = [];
+ for (const item of anyObject) {
+ parts.push(this.convert(item));
+ }
+ script += '[' + parts.join(', ') + ']';
+ } else {
+ script += anyObject.toString();
+ }
+ } else if (anyObject === undefined || anyObject === null) {
+ script += 'null';
+ } else if (typeof anyObject === 'number' || typeof anyObject === 'boolean') {
+ script += anyObject;
+ } else {
+ script += `'${`${anyObject}`.replaceAll("'", "\\'")}'`; // eslint-disable-line quotes
+ }
+
+ return script;
+ }
+}
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/traversal-strategy.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/traversal-strategy.js
deleted file mode 100644
index 51e9927..0000000
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/traversal-strategy.js
+++ /dev/null
@@ -1,415 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * @author Jorge Bay Gondra
- */
-'use strict';
-
-const Traversal = require('./traversal').Traversal;
-
-class TraversalStrategies {
- /**
- * Creates a new instance of TraversalStrategies.
- * @param {TraversalStrategies} [parent] The parent strategies from where to clone the values from.
- * @constructor
- */
- constructor(parent) {
- if (parent) {
- // Clone the strategies
- this.strategies = [...parent.strategies];
- } else {
- this.strategies = [];
- }
- }
-
- /** @param {TraversalStrategy} strategy */
- addStrategy(strategy) {
- this.strategies.push(strategy);
- }
-
- /** @param {TraversalStrategy} strategy */
- removeStrategy(strategy) {
- const idx = this.strategies.findIndex((s) => s.fqcn === strategy.fqcn);
- if (idx !== -1) {
- return this.strategies.splice(idx, 1)[0];
- }
-
- return undefined;
- }
-
- /**
- * @param {Traversal} traversal
- * @returns {Promise}
- */
- applyStrategies(traversal) {
- // Apply all strategies serially
- return this.strategies.reduce(
- (promise, strategy) => promise.then(() => strategy.apply(traversal)),
- Promise.resolve(),
- );
- }
-}
-
-/** @abstract */
-class TraversalStrategy {
- /**
- * @param {String} fqcn fully qualified class name in Java of the strategy
- * @param {Object} configuration for the strategy
- */
- constructor(fqcn, configuration = {}) {
- this.fqcn = fqcn;
- this.configuration = configuration;
- }
-
- /**
- * @abstract
- * @param {Traversal} traversal
- * @returns {Promise}
- */
- apply(traversal) {}
-}
-
-class ConnectiveStrategy extends TraversalStrategy {
- constructor() {
- super('org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.ConnectiveStrategy');
- }
-}
-
-class ElementIdStrategy extends TraversalStrategy {
- constructor() {
- super('org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.ElementIdStrategy');
- }
-}
-
-class HaltedTraverserStrategy extends TraversalStrategy {
- /**
- * @param {String} haltedTraverserFactory full qualified class name in Java of a {@code HaltedTraverserFactory} implementation
- */
- constructor({ haltedTraverserFactory } = {}) {
- super('org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.HaltedTraverserStrategy');
- if (haltedTraverserFactory !== undefined) {
- this.configuration['haltedTraverserFactory'] = haltedTraverserFactory;
- }
- }
-}
-
-class MessagePassingReductionStrategy extends TraversalStrategy {
- constructor() {
- super(
- 'org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.optimization.MessagePassingReductionStrategy',
- );
- }
-}
-
-class OptionsStrategy extends TraversalStrategy {
- constructor(options) {
- super('org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.OptionsStrategy');
- if (options !== undefined) {
- this.configuration = options;
- }
- }
-}
-
-class PartitionStrategy extends TraversalStrategy {
- /**
- * @param {Object} [options]
- * @param {String} [options.partitionKey] name of the property key to partition by
- * @param {String} [options.writePartition] the value of the currently write partition
- * @param {Array<String>} [options.readPartitions] list of strings representing the partitions to include for reads
- * @param {boolean} [options.includeMetaProperties] determines if meta-properties should be included in partitioning defaulting to false
- */
- constructor(options) {
- super('org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy', options);
- }
-}
-
-class ProfileStrategy extends TraversalStrategy {
- constructor() {
- super('org.apache.tinkerpop.gremlin.process.traversal.strategy.finalization.ProfileStrategy');
- }
-}
-
-class SeedStrategy extends TraversalStrategy {
- /**
- * @param {Object} [options]
- * @param {number} [options.seed] the seed to provide to the random number generator for the traversal
- */
- constructor(options) {
- super('org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SeedStrategy', {
- seed: options?.seed,
- });
- }
-}
-
-class SubgraphStrategy extends TraversalStrategy {
- /**
- * @param {Object} [options]
- * @param {GraphTraversal} [options.vertices] name of the property key to partition by
- * @param {GraphTraversal} [options.edges] the value of the currently write partition
- * @param {GraphTraversal} [options.vertexProperties] list of strings representing the partitions to include for reads
- * @param {boolean} [options.checkAdjacentVertices] enables the strategy to apply the {@code vertices} filter to the adjacent vertices of an edge.
- */
- constructor(options) {
- super('org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SubgraphStrategy', options);
- if (this.configuration.vertices instanceof Traversal) {
- this.configuration.vertices = this.configuration.vertices.bytecode;
- }
- if (this.configuration.edges instanceof Traversal) {
- this.configuration.edges = this.configuration.edges.bytecode;
- }
- if (this.configuration.vertexProperties instanceof Traversal) {
- this.configuration.vertexProperties = this.configuration.vertexProperties.bytecode;
- }
- }
-}
-
-class ReferenceElementStrategy extends TraversalStrategy {
- constructor() {
- super('org.apache.tinkerpop.gremlin.process.traversal.strategy.finalization.ReferenceElementStrategy');
- }
-}
-
-class VertexProgramStrategy extends TraversalStrategy {
- constructor(options) {
- super('org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.decoration.VertexProgramStrategy', options);
- }
-}
-
-class MatchAlgorithmStrategy extends TraversalStrategy {
- /**
- * @param matchAlgorithm
- */
- constructor({ matchAlgorithm } = {}) {
- super('org.apache.tinkerpop.gremlin.process.traversal.strategy.finalization.MatchAlgorithmStrategy');
- if (matchAlgorithm !== undefined) {
- this.configuration['matchAlgorithm'] = matchAlgorithm;
- }
- }
-}
-
-class ComputerFinalizationStrategy extends TraversalStrategy {
- constructor() {
- super('org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.finalization.ComputerFinalizationStrategy');
- }
-}
-
-class AdjacentToIncidentStrategy extends TraversalStrategy {
- constructor() {
- super('org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.AdjacentToIncidentStrategy');
- }
-}
-
-class ByModulatorOptimizationStrategy extends TraversalStrategy {
- constructor() {
- super('org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.ByModulatorOptimizationStrategy');
- }
-}
-
-class FilterRankingStrategy extends TraversalStrategy {
- constructor() {
- super('org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.FilterRankingStrategy');
- }
-}
-
-class IdentityRemovalStrategy extends TraversalStrategy {
- constructor() {
- super('org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.IdentityRemovalStrategy');
- }
-}
-
-class IncidentToAdjacentStrategy extends TraversalStrategy {
- constructor() {
- super('org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.IncidentToAdjacentStrategy');
- }
-}
-
-class InlineFilterStrategy extends TraversalStrategy {
- constructor() {
- super('org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.InlineFilterStrategy');
- }
-}
-
-class LazyBarrierStrategy extends TraversalStrategy {
- constructor() {
- super('org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.LazyBarrierStrategy');
- }
-}
-
-class MatchPredicateStrategy extends TraversalStrategy {
- constructor() {
- super('org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.MatchPredicateStrategy');
- }
-}
-
-class OrderLimitStrategy extends TraversalStrategy {
- constructor() {
- super('org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.OrderLimitStrategy');
- }
-}
-
-class PathProcessorStrategy extends TraversalStrategy {
- constructor() {
- super('org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.PathProcessorStrategy');
- }
-}
-
-class PathRetractionStrategy extends TraversalStrategy {
- constructor() {
- super('org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.PathRetractionStrategy');
- }
-}
-
-class ProductiveByStrategy extends TraversalStrategy {
- /**
- * @param {Object} [options]
- * @param {Array<String>} productiveKeys set of keys that will always be productive
- */
- constructor({ productiveKeys = [] } = {}) {
- super('org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.ProductiveByStrategy');
- this.configuration['productiveKeys'] = productiveKeys;
- }
-}
-
-class CountStrategy extends TraversalStrategy {
- constructor() {
- super('org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.CountStrategy');
- }
-}
-
-class RepeatUnrollStrategy extends TraversalStrategy {
- constructor() {
- super('org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.RepeatUnrollStrategy');
- }
-}
-
-class GraphFilterStrategy extends TraversalStrategy {
- constructor() {
- super('org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.optimization.GraphFilterStrategy');
- }
-}
-
-class EarlyLimitStrategy extends TraversalStrategy {
- constructor() {
- super('org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.EarlyLimitStrategy');
- }
-}
-
-class ComputerVerificationStrategy extends TraversalStrategy {
- constructor() {
- super('org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ComputerVerificationStrategy');
- }
-}
-
-class LambdaRestrictionStrategy extends TraversalStrategy {
- constructor() {
- super('org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.LambdaRestrictionStrategy');
- }
-}
-
-class ReadOnlyStrategy extends TraversalStrategy {
- constructor() {
- super('org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ReadOnlyStrategy');
- }
-}
-
-class EdgeLabelVerificationStrategy extends TraversalStrategy {
- /**
- * @param {boolean} logWarnings determines if warnings should be written to the logger when verification fails
- * @param {boolean} throwException determines if exceptions should be thrown when verifications fails
- */
- constructor({ logWarnings = false, throwException = false } = {}) {
- super('org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.EdgeLabelVerificationStrategy');
- this.configuration['logWarnings'] = logWarnings;
- this.configuration['throwException'] = throwException;
- }
-}
-
-class ReservedKeysVerificationStrategy extends TraversalStrategy {
- /**
- * @param {boolean} logWarnings determines if warnings should be written to the logger when verification fails
- * @param {boolean} throwException determines if exceptions should be thrown when verifications fails
- * @param {Array<String>} keys the list of reserved keys to verify
- */
- constructor({ logWarnings = false, throwException = false, keys = ['id', 'label'] } = {}) {
- super('org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ReservedKeysVerificationStrategy');
- this.configuration['logWarnings'] = logWarnings;
- this.configuration['throwException'] = throwException;
- this.configuration['keys'] = keys;
- }
-}
-
-class VertexProgramRestrictionStrategy extends TraversalStrategy {
- constructor() {
- super(
- 'org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.verification.VertexProgramRestrictionStrategy',
- );
- }
-}
-
-class StandardVerificationStrategy extends TraversalStrategy {
- constructor() {
- super('org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.StandardVerificationStrategy');
- }
-}
-
-module.exports = {
- TraversalStrategies: TraversalStrategies,
- TraversalStrategy: TraversalStrategy,
- // decoration
- ComputerFinalizationStrategy: ComputerFinalizationStrategy,
- ConnectiveStrategy: ConnectiveStrategy,
- ElementIdStrategy: ElementIdStrategy,
- HaltedTraverserStrategy: HaltedTraverserStrategy,
- MessagePassingReductionStrategy: MessagePassingReductionStrategy,
- OptionsStrategy: OptionsStrategy,
- PartitionStrategy: PartitionStrategy,
- ProfileStrategy: ProfileStrategy,
- ReferenceElementStrategy: ReferenceElementStrategy,
- SeedStrategy: SeedStrategy,
- SubgraphStrategy: SubgraphStrategy,
- VertexProgramStrategy: VertexProgramStrategy,
- // finalization
- MatchAlgorithmStrategy: MatchAlgorithmStrategy,
- // optimization
- AdjacentToIncidentStrategy: AdjacentToIncidentStrategy,
- ByModulatorOptimizationStrategy: ByModulatorOptimizationStrategy,
- FilterRankingStrategy: FilterRankingStrategy,
- IdentityRemovalStrategy: IdentityRemovalStrategy,
- IncidentToAdjacentStrategy: IncidentToAdjacentStrategy,
- InlineFilterStrategy: InlineFilterStrategy,
- LazyBarrierStrategy: LazyBarrierStrategy,
- MatchPredicateStrategy: MatchPredicateStrategy,
- OrderLimitStrategy: OrderLimitStrategy,
- PathProcessorStrategy: PathProcessorStrategy,
- PathRetractionStrategy: PathRetractionStrategy,
- ProductiveByStrategy: ProductiveByStrategy,
- CountStrategy: CountStrategy,
- RepeatUnrollStrategy: RepeatUnrollStrategy,
- GraphFilterStrategy: GraphFilterStrategy,
- EarlyLimitStrategy: EarlyLimitStrategy,
- // verification
- ComputerVerificationStrategy: ComputerVerificationStrategy,
- EdgeLabelVerificationStrategy: EdgeLabelVerificationStrategy,
- LambdaRestrictionStrategy: LambdaRestrictionStrategy,
- ReadOnlyStrategy: ReadOnlyStrategy,
- ReservedKeysVerificationStrategy: ReservedKeysVerificationStrategy,
- StandardVerificationStrategy: StandardVerificationStrategy,
- VertexProgramRestrictionStrategy: VertexProgramRestrictionStrategy,
-};
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/traversal-strategy.ts b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/traversal-strategy.ts
new file mode 100644
index 0000000..1d03803
--- /dev/null
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/traversal-strategy.ts
@@ -0,0 +1,373 @@
+/*
+ * 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.
+ */
+
+/**
+ * @author Jorge Bay Gondra
+ */
+
+import { RemoteConnection } from '../driver/remote-connection.js';
+import { Traversal } from './traversal.js';
+
+export class TraversalStrategies {
+ readonly strategies: TraversalStrategy[];
+
+ /**
+ * Creates a new instance of TraversalStrategies.
+ * @param {TraversalStrategies} [parent] The parent strategies from where to clone the values from.
+ * @constructor
+ */
+ constructor(parent?: TraversalStrategies) {
+ if (parent) {
+ // Clone the strategies
+ this.strategies = [...parent.strategies];
+ } else {
+ this.strategies = [];
+ }
+ }
+
+ /** @param {TraversalStrategy} strategy */
+ addStrategy(strategy: TraversalStrategy) {
+ this.strategies.push(strategy);
+ }
+
+ /** @param {TraversalStrategy} strategy */
+ removeStrategy(strategy: TraversalStrategy) {
+ const idx = this.strategies.findIndex((s) => s.fqcn === strategy.fqcn);
+ if (idx !== -1) {
+ return this.strategies.splice(idx, 1)[0];
+ }
+
+ return undefined;
+ }
+
+ /**
+ * @param {Traversal} traversal
+ * @returns {Promise}
+ */
+ applyStrategies(traversal: Traversal) {
+ // Apply all strategies serially
+ return this.strategies.reduce(
+ (promise, strategy) => promise.then(() => strategy.apply(traversal)),
+ Promise.resolve(),
+ );
+ }
+}
+
+export type TraversalStrategyConfiguration = any;
+
+export abstract class TraversalStrategy {
+ connection?: RemoteConnection;
+
+ /**
+ * @param {String} fqcn fully qualified class name in Java of the strategy
+ * @param {TraversalStrategyConfiguration} configuration for the strategy
+ */
+ constructor(
+ public fqcn: string,
+ public configuration: TraversalStrategyConfiguration = {},
+ ) {}
+
+ /**
+ * @abstract
+ * @param {Traversal} traversal
+ * @returns {Promise}
+ */
+ async apply(traversal: Traversal): Promise<void> {}
+}
+
+export class ConnectiveStrategy extends TraversalStrategy {
+ constructor() {
+ super('org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.ConnectiveStrategy');
+ }
+}
+
+export class ElementIdStrategy extends TraversalStrategy {
+ constructor() {
+ super('org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.ElementIdStrategy');
+ }
+}
+
+export class HaltedTraverserStrategy extends TraversalStrategy {
+ /**
+ * @param {String} haltedTraverserFactory full qualified class name in Java of a {@code HaltedTraverserFactory} implementation
+ */
+ constructor(haltedTraverserFactory: string) {
+ super('org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.HaltedTraverserStrategy');
+ if (haltedTraverserFactory !== undefined) {
+ this.configuration['haltedTraverserFactory'] = haltedTraverserFactory;
+ }
+ }
+}
+
+export class MessagePassingReductionStrategy extends TraversalStrategy {
+ constructor() {
+ super('org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.optimization.MessagePassingReductionStrategy');
+ }
+}
+
+export class OptionsStrategy extends TraversalStrategy {
+ constructor(options: TraversalStrategyConfiguration) {
+ super('org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.OptionsStrategy', options);
+ }
+}
+
+export class PartitionStrategy extends TraversalStrategy {
+ /**
+ * @param {Object} [options]
+ * @param {String} [options.partitionKey] name of the property key to partition by
+ * @param {String} [options.writePartition] the value of the currently write partition
+ * @param {Array<String>} [options.readPartitions] list of strings representing the partitions to include for reads
+ * @param {boolean} [options.includeMetaProperties] determines if meta-properties should be included in partitioning defaulting to false
+ */
+ constructor(options: TraversalStrategyConfiguration) {
+ super('org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy', options);
+ }
+}
+
+export class ProfileStrategy extends TraversalStrategy {
+ constructor() {
+ super('org.apache.tinkerpop.gremlin.process.traversal.strategy.finalization.ProfileStrategy');
+ }
+}
+
+export class SubgraphStrategy extends TraversalStrategy {
+ /**
+ * @param {Object} [options]
+ * @param {GraphTraversal} [options.vertices] name of the property key to partition by
+ * @param {GraphTraversal} [options.edges] the value of the currently write partition
+ * @param {GraphTraversal} [options.vertexProperties] list of strings representing the partitions to include for reads
+ * @param {boolean} [options.checkAdjacentVertices] enables the strategy to apply the {@code vertices} filter to the adjacent vertices of an edge.
+ */
+ constructor(options: TraversalStrategyConfiguration) {
+ super('org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SubgraphStrategy', options);
+ if (this.configuration.vertices instanceof Traversal) {
+ this.configuration.vertices = this.configuration.vertices.bytecode;
+ }
+ if (this.configuration.edges instanceof Traversal) {
+ this.configuration.edges = this.configuration.edges.bytecode;
+ }
+ if (this.configuration.vertexProperties instanceof Traversal) {
+ this.configuration.vertexProperties = this.configuration.vertexProperties.bytecode;
+ }
+ }
+}
+
+export class ProductiveByStrategy extends TraversalStrategy {
+ /**
+ * @param {Object} [options]
+ * @param {Array<String>} [options.productiveKeys] set of keys that will always be productive
+ */
+ constructor(options: TraversalStrategyConfiguration) {
+ super('org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.ProductiveByStrategy', options);
+ }
+}
+
+export class ReferenceElementStrategy extends TraversalStrategy {
+ constructor() {
+ super('org.apache.tinkerpop.gremlin.process.traversal.strategy.finalization.ReferenceElementStrategy');
+ }
+}
+
+export class VertexProgramStrategy extends TraversalStrategy {
+ constructor(options: TraversalStrategyConfiguration) {
+ super('org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.decoration.VertexProgramStrategy', options);
+ }
+}
+
+export class MatchAlgorithmStrategy extends TraversalStrategy {
+ /**
+ * @param matchAlgorithm
+ */
+ constructor(matchAlgorithm: string) {
+ super('org.apache.tinkerpop.gremlin.process.traversal.strategy.finalization.MatchAlgorithmStrategy');
+ if (matchAlgorithm !== undefined) {
+ this.configuration['matchAlgorithm'] = matchAlgorithm;
+ }
+ }
+}
+
+export class ComputerFinalizationStrategy extends TraversalStrategy {
+ constructor() {
+ super('org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.finalization.ComputerFinalizationStrategy');
+ }
+}
+
+export class AdjacentToIncidentStrategy extends TraversalStrategy {
+ constructor() {
+ super('org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.AdjacentToIncidentStrategy');
+ }
+}
+
+export class FilterRankingStrategy extends TraversalStrategy {
+ constructor() {
+ super('org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.FilterRankingStrategy');
+ }
+}
+
+export class ByModulatorOptimizationStrategy extends TraversalStrategy {
+ constructor() {
+ super('org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.ByModulatorOptimizationStrategy');
+ }
+}
+
+export class IdentityRemovalStrategy extends TraversalStrategy {
+ constructor() {
+ super('org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.IdentityRemovalStrategy');
+ }
+}
+
+export class IncidentToAdjacentStrategy extends TraversalStrategy {
+ constructor() {
+ super('org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.IncidentToAdjacentStrategy');
+ }
+}
+
+export class InlineFilterStrategy extends TraversalStrategy {
+ constructor() {
+ super('org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.InlineFilterStrategy');
+ }
+}
+
+export class LazyBarrierStrategy extends TraversalStrategy {
+ constructor() {
+ super('org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.LazyBarrierStrategy');
+ }
+}
+
+export class MatchPredicateStrategy extends TraversalStrategy {
+ constructor() {
+ super('org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.MatchPredicateStrategy');
+ }
+}
+
+export class OrderLimitStrategy extends TraversalStrategy {
+ constructor() {
+ super('org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.OrderLimitStrategy');
+ }
+}
+
+export class PathProcessorStrategy extends TraversalStrategy {
+ constructor() {
+ super('org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.PathProcessorStrategy');
+ }
+}
+
+export class PathRetractionStrategy extends TraversalStrategy {
+ constructor() {
+ super('org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.PathRetractionStrategy');
+ }
+}
+
+export class CountStrategy extends TraversalStrategy {
+ constructor() {
+ super('org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.CountStrategy');
+ }
+}
+
+export class RepeatUnrollStrategy extends TraversalStrategy {
+ constructor() {
+ super('org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.RepeatUnrollStrategy');
+ }
+}
+
+export class GraphFilterStrategy extends TraversalStrategy {
+ constructor() {
+ super('org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.optimization.GraphFilterStrategy');
+ }
+}
+
+export class EarlyLimitStrategy extends TraversalStrategy {
+ constructor() {
+ super('org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.EarlyLimitStrategy');
+ }
+}
+
+export class ComputerVerificationStrategy extends TraversalStrategy {
+ constructor() {
+ super('org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ComputerVerificationStrategy');
+ }
+}
+
+export class LambdaRestrictionStrategy extends TraversalStrategy {
+ constructor() {
+ super('org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.LambdaRestrictionStrategy');
+ }
+}
+
+export class ReadOnlyStrategy extends TraversalStrategy {
+ constructor() {
+ super('org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ReadOnlyStrategy');
+ }
+}
+
+export class EdgeLabelVerificationStrategy extends TraversalStrategy {
+ /**
+ * @param {boolean} logWarnings determines if warnings should be written to the logger when verification fails
+ * @param {boolean} throwException determines if exceptions should be thrown when verifications fails
+ */
+ constructor(logWarnings = false, throwException = false) {
+ super('org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.EdgeLabelVerificationStrategy', {
+ logWarnings: logWarnings,
+ throwException: throwException,
+ });
+ }
+}
+
+export class ReservedKeysVerificationStrategy extends TraversalStrategy {
+ /**
+ * @param {boolean} logWarnings determines if warnings should be written to the logger when verification fails
+ * @param {boolean} throwException determines if exceptions should be thrown when verifications fails
+ * @param {Array<String>} keys the list of reserved keys to verify
+ */
+ constructor(logWarnings = false, throwException = false, keys = ['id', 'label']) {
+ super('org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ReservedKeysVerificationStrategy', {
+ logWarnings: logWarnings,
+ throwException: throwException,
+ keys: keys,
+ });
+ }
+}
+
+export class VertexProgramRestrictionStrategy extends TraversalStrategy {
+ constructor() {
+ super(
+ 'org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.verification.VertexProgramRestrictionStrategy',
+ );
+ }
+}
+
+export class StandardVerificationStrategy extends TraversalStrategy {
+ constructor() {
+ super('org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.StandardVerificationStrategy');
+ }
+}
+
+export type SeedStrategyOptions = { seed: number };
+
+export class SeedStrategy extends TraversalStrategy {
+ /**
+ * @param {SeedStrategyOptions} [options]
+ * @param {number} [options.seed] the seed to provide to the random number generator for the traversal
+ */
+ constructor(options: SeedStrategyOptions) {
+ super('org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SeedStrategy', {
+ seed: options.seed,
+ });
+ }
+}
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/traversal.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/traversal.js
deleted file mode 100644
index 44f1f34..0000000
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/traversal.js
+++ /dev/null
@@ -1,533 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * @author Jorge Bay Gondra
- */
-
-'use strict';
-
-const itemDone = Object.freeze({ value: null, done: true });
-const asyncIteratorSymbol = Symbol.asyncIterator || Symbol('@@asyncIterator');
-
-class Traversal {
- constructor(graph, traversalStrategies, bytecode) {
- this.graph = graph;
- this.traversalStrategies = traversalStrategies;
- this.bytecode = bytecode;
- /** @type {Array<Traverser>} */
- this.traversers = null;
- this.sideEffects = null;
- this._traversalStrategiesPromise = null;
- this._traversersIteratorIndex = 0;
- }
-
- /**
- * Async iterable method implementation.
- */
- [asyncIteratorSymbol]() {
- return this;
- }
-
- /** @returns {Bytecode} */
- getBytecode() {
- return this.bytecode;
- }
-
- /**
- * Returns an Array containing the traverser objects.
- * @returns {Promise.<Array>}
- */
- toList() {
- return this._applyStrategies().then(() => {
- const result = [];
- let it;
- while ((it = this._getNext()) && !it.done) {
- result.push(it.value);
- }
- return result;
- });
- }
-
- /**
- * Determines if there are any more items to iterate from the traversal.
- * @returns {Promise.<boolean>}
- */
- hasNext() {
- return this._applyStrategies().then(
- () =>
- this.traversers &&
- this.traversers.length > 0 &&
- this._traversersIteratorIndex < this.traversers.length &&
- this.traversers[this._traversersIteratorIndex].bulk > 0,
- );
- }
-
- /**
- * Iterates all Traverser instances in the traversal.
- * @returns {Promise}
- */
- iterate() {
- this.bytecode.addStep('discard');
- return this._applyStrategies().then(() => {
- let it;
- while ((it = this._getNext()) && !it.done) {
- //
- }
- });
- }
-
- /**
- * Async iterator method implementation.
- * Returns a promise containing an iterator item.
- * @returns {Promise.<{value, done}>}
- */
- next() {
- return this._applyStrategies().then(() => this._getNext());
- }
-
- /**
- * Synchronous iterator of traversers including
- * @private
- */
- _getNext() {
- while (this.traversers && this._traversersIteratorIndex < this.traversers.length) {
- const traverser = this.traversers[this._traversersIteratorIndex];
- if (traverser.bulk > 0) {
- traverser.bulk--;
- return { value: traverser.object, done: false };
- }
- this._traversersIteratorIndex++;
- }
- return itemDone;
- }
-
- _applyStrategies() {
- if (this._traversalStrategiesPromise) {
- // Apply strategies only once
- return this._traversalStrategiesPromise;
- }
- return (this._traversalStrategiesPromise = this.traversalStrategies.applyStrategies(this));
- }
-
- /**
- * Returns step instructions during JSON serialization
- * @returns {Array}
- */
- toJSON() {
- return this.bytecode.stepInstructions;
- }
-
- /**
- * Returns the Bytecode JSON representation of the traversal
- * @returns {String}
- */
- toString() {
- return this.bytecode.toString();
- }
-}
-
-class IO {
- static get graphml() {
- return 'graphml';
- }
-
- static get graphson() {
- return 'graphson';
- }
-
- static get gryo() {
- return 'gryo';
- }
-
- static get reader() {
- return '~tinkerpop.io.reader';
- }
-
- static get registry() {
- return '~tinkerpop.io.registry';
- }
-
- static get writer() {
- return '~tinkerpop.io.writer';
- }
-}
-
-// eslint-disable-next-line no-unused-vars
-class ConnectedComponent {
- static get component() {
- return 'gremlin.connectedComponentVertexProgram.component';
- }
-
- static get edges() {
- return '~tinkerpop.connectedComponent.edges';
- }
-
- static get propertyName() {
- return '~tinkerpop.connectedComponent.propertyName';
- }
-}
-
-// eslint-disable-next-line no-unused-vars
-class ShortestPath {
- static get distance() {
- return '~tinkerpop.shortestPath.distance';
- }
-
- static get edges() {
- return '~tinkerpop.shortestPath.edges';
- }
-
- static get includeEdges() {
- return '~tinkerpop.shortestPath.includeEdges';
- }
-
- static get maxDistance() {
- return '~tinkerpop.shortestPath.maxDistance';
- }
-
- static get target() {
- return '~tinkerpop.shortestPath.target';
- }
-}
-
-// eslint-disable-next-line no-unused-vars
-class PageRank {
- static get edges() {
- return '~tinkerpop.pageRank.edges';
- }
-
- static get propertyName() {
- return '~tinkerpop.pageRank.propertyName';
- }
-
- static get times() {
- return '~tinkerpop.pageRank.times';
- }
-}
-
-// eslint-disable-next-line no-unused-vars
-class PeerPressure {
- static get edges() {
- return '~tinkerpop.peerPressure.edges';
- }
-
- static get propertyName() {
- return '~tinkerpop.peerPressure.propertyName';
- }
-
- static get times() {
- return '~tinkerpop.peerPressure.times';
- }
-}
-
-class P {
- /**
- * Represents an operation.
- * @constructor
- */
- constructor(operator, value, other) {
- this.operator = operator;
- this.value = value;
- this.other = other;
- }
-
- /**
- * Returns the string representation of the instance.
- * @returns {string}
- */
- toString() {
- function formatValue(value) {
- if (Array.isArray(value)) {
- const acc = [];
- for (const item of value) {
- acc.push(formatValue(item));
- }
- return acc;
- }
- if (value && typeof value === 'string') {
- return `'${value}'`;
- }
- return value;
- }
-
- if (this.other === undefined || this.other === null) {
- return this.operator + '(' + formatValue(this.value) + ')';
- }
- return this.operator + '(' + formatValue(this.value) + ', ' + formatValue(this.other) + ')';
- }
-
- and(arg) {
- return new P('and', this, arg);
- }
-
- or(arg) {
- return new P('or', this, arg);
- }
-
- static within(...args) {
- if (args.length === 1 && Array.isArray(args[0])) {
- return new P('within', args[0], null);
- }
- return new P('within', args, null);
- }
-
- static without(...args) {
- if (args.length === 1 && Array.isArray(args[0])) {
- return new P('without', args[0], null);
- }
- return new P('without', args, null);
- }
-
- /** @param {...Object} args */
- static between(...args) {
- return createP('between', args);
- }
-
- /** @param {...Object} args */
- static eq(...args) {
- return createP('eq', args);
- }
-
- /** @param {...Object} args */
- static gt(...args) {
- return createP('gt', args);
- }
-
- /** @param {...Object} args */
- static gte(...args) {
- return createP('gte', args);
- }
-
- /** @param {...Object} args */
- static inside(...args) {
- return createP('inside', args);
- }
-
- /** @param {...Object} args */
- static lt(...args) {
- return createP('lt', args);
- }
-
- /** @param {...Object} args */
- static lte(...args) {
- return createP('lte', args);
- }
-
- /** @param {...Object} args */
- static neq(...args) {
- return createP('neq', args);
- }
-
- /** @param {...Object} args */
- static not(...args) {
- return createP('not', args);
- }
-
- /** @param {...Object} args */
- static outside(...args) {
- return createP('outside', args);
- }
-
- /** @param {...Object} args */
- static test(...args) {
- return createP('test', args);
- }
-}
-
-function createP(operator, args) {
- args.unshift(null, operator);
- return new (Function.prototype.bind.apply(P, args))();
-}
-
-class TextP {
- /**
- * Represents an operation.
- * @constructor
- */
- constructor(operator, value, other) {
- this.operator = operator;
- this.value = value;
- this.other = other;
- }
-
- /**
- * Returns the string representation of the instance.
- * @returns {string}
- */
- toString() {
- function formatValue(value) {
- if (value && typeof value === 'string') {
- return `'${value}'`;
- }
- return value;
- }
-
- if (this.other === undefined) {
- return this.operator + '(' + formatValue(this.value) + ')';
- }
- return this.operator + '(' + formatValue(this.value) + ', ' + formatValue(this.other) + ')';
- }
-
- and(arg) {
- return new P('and', this, arg);
- }
-
- or(arg) {
- return new P('or', this, arg);
- }
-
- /** @param {...Object} args */
- static containing(...args) {
- return createTextP('containing', args);
- }
-
- /** @param {...Object} args */
- static endingWith(...args) {
- return createTextP('endingWith', args);
- }
-
- /** @param {...Object} args */
- static notContaining(...args) {
- return createTextP('notContaining', args);
- }
-
- /** @param {...Object} args */
- static notEndingWith(...args) {
- return createTextP('notEndingWith', args);
- }
-
- /** @param {...Object} args */
- static notStartingWith(...args) {
- return createTextP('notStartingWith', args);
- }
-
- /** @param {...Object} args */
- static startingWith(...args) {
- return createTextP('startingWith', args);
- }
-
- /** @param {...Object} args */
- static regex(...args) {
- return createTextP('regex', args);
- }
-
- /** @param {...Object} args */
- static notRegex(...args) {
- return createTextP('notRegex', args);
- }
-}
-
-function createTextP(operator, args) {
- args.unshift(null, operator);
- return new (Function.prototype.bind.apply(TextP, args))();
-}
-
-class Traverser {
- constructor(object, bulk) {
- this.object = object;
- this.bulk = bulk || 1;
- }
-}
-
-class TraversalSideEffects {}
-
-const withOptions = {
- tokens: '~tinkerpop.valueMap.tokens',
- none: 0,
- ids: 1,
- labels: 2,
- keys: 4,
- values: 8,
- all: 15,
- indexer: '~tinkerpop.index.indexer',
- list: 0,
- map: 1,
-};
-
-function toEnum(typeName, keys) {
- const result = {};
- keys.split(' ').forEach((k) => {
- let jsKey = k;
- if (jsKey === jsKey.toUpperCase()) {
- jsKey = jsKey.toLowerCase();
- }
- result[jsKey] = new EnumValue(typeName, k);
- });
- return result;
-}
-
-const directionAlias = {
- from_: 'out',
- to: 'in',
-};
-
-// for direction enums, maps the same EnumValue object to the enum aliases after creating them
-function toDirectionEnum(typeName, keys) {
- const result = toEnum(typeName, keys);
- Object.keys(directionAlias).forEach((k) => {
- result[k] = result[directionAlias[k]];
- });
- return result;
-}
-
-function toNEnum(typeName, keys) {
- const result = {};
- keys.split(' ').forEach((k) => {
- result[k] = new EnumValue(typeName, k.replace('_', ''));
- });
- return result;
-}
-
-class EnumValue {
- constructor(typeName, elementName) {
- this.typeName = typeName;
- this.elementName = elementName;
- }
-
- toString() {
- return this.elementName;
- }
-}
-
-module.exports = {
- EnumValue,
- P,
- TextP,
- withOptions,
- IO,
- Traversal,
- TraversalSideEffects,
- Traverser,
- barrier: toEnum('Barrier', 'normSack'),
- cardinality: toEnum('Cardinality', 'list set single'),
- column: toEnum('Column', 'keys values'),
- direction: toDirectionEnum('Direction', 'BOTH IN OUT from_ to'),
- dt: toEnum('DT', 'second minute hour day'),
- n: toNEnum('N', 'byte_ short_ int_ long_ float_ double_ bigInt bigDecimal'),
- graphSONVersion: toEnum('GraphSONVersion', 'V1_0 V2_0 V3_0'),
- gryoVersion: toEnum('GryoVersion', 'V1_0 V3_0'),
- merge: toEnum('Merge', 'onCreate onMatch outV inV'),
- operator: toEnum('Operator', 'addAll and assign div max min minus mult or sum sumLong'),
- order: toEnum('Order', 'asc desc shuffle'),
- pick: toEnum('Pick', 'any none unproductive'),
- pop: toEnum('Pop', 'all first last mixed'),
- scope: toEnum('Scope', 'global local'),
- t: toEnum('T', 'id key label value'),
-};
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/traversal.ts b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/traversal.ts
new file mode 100644
index 0000000..299c930
--- /dev/null
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/traversal.ts
@@ -0,0 +1,519 @@
+/*
+ * 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.
+ */
+
+/**
+ * @author Jorge Bay Gondra
+ */
+
+import { Graph } from '../structure/graph.js';
+import Bytecode from './bytecode.js';
+import { TraversalStrategies } from './traversal-strategy.js';
+
+const itemDone = Object.freeze({ value: null, done: true });
+const asyncIteratorSymbol = Symbol.asyncIterator || Symbol('@@asyncIterator');
+
+export class Traversal {
+ traversers: Traverser<any>[] | null = null;
+ sideEffects?: any = null;
+ private _traversalStrategiesPromise: Promise<void> | null = null;
+ private _traversersIteratorIndex = 0;
+
+ constructor(
+ public graph: Graph | null,
+ public traversalStrategies: TraversalStrategies | null,
+ public bytecode: Bytecode,
+ ) {}
+
+ /**
+ * Async iterable method implementation.
+ */
+ [asyncIteratorSymbol]() {
+ return this;
+ }
+
+ /** @returns {Bytecode} */
+ getBytecode() {
+ return this.bytecode;
+ }
+
+ /**
+ * Returns an Array containing the traverser objects.
+ * @returns {Promise.<Array>}
+ */
+ toList<T>(): Promise<T[]> {
+ return this._applyStrategies().then(() => {
+ const result: T[] = [];
+ let it;
+ while ((it = this._getNext()) && !it.done) {
+ result.push(it.value as T);
+ }
+ return result;
+ });
+ }
+
+ /**
+ * Determines if there are any more items to iterate from the traversal.
+ * @returns {Promise.<boolean>}
+ */
+ hasNext() {
+ return this._applyStrategies().then(
+ () =>
+ this.traversers &&
+ this.traversers.length > 0 &&
+ this._traversersIteratorIndex < this.traversers.length &&
+ this.traversers[this._traversersIteratorIndex].bulk > 0,
+ );
+ }
+
+ /**
+ * Iterates all Traverser instances in the traversal.
+ * @returns {Promise}
+ */
+ iterate() {
+ this.bytecode.addStep('discard');
+ return this._applyStrategies().then(() => {
+ let it;
+ while ((it = this._getNext()) && !it.done) {
+ //
+ }
+ });
+ }
+
+ /**
+ * Async iterator method implementation.
+ * Returns a promise containing an iterator item.
+ * @returns {Promise.<{value, done}>}
+ */
+ next<T>(): Promise<IteratorResult<T, null>> {
+ return this._applyStrategies().then(() => this._getNext<T>());
+ }
+
+ /**
+ * Synchronous iterator of traversers including
+ * @private
+ */
+ _getNext<T>(): IteratorResult<T, null> {
+ while (this.traversers && this._traversersIteratorIndex < this.traversers.length) {
+ const traverser = this.traversers[this._traversersIteratorIndex];
+ if (traverser.bulk > 0) {
+ traverser.bulk--;
+ return { value: traverser.object, done: false };
+ }
+ this._traversersIteratorIndex++;
+ }
+ return itemDone;
+ }
+
+ _applyStrategies() {
+ if (this._traversalStrategiesPromise) {
+ // Apply strategies only once
+ return this._traversalStrategiesPromise;
+ }
+ return (this._traversalStrategiesPromise = this.traversalStrategies?.applyStrategies(this) ?? Promise.resolve());
+ }
+
+ /**
+ * Returns step instructions during JSON serialization
+ * @returns {Array}
+ */
+ toJSON() {
+ return this.bytecode.stepInstructions;
+ }
+
+ /**
+ * Returns the Bytecode JSON representation of the traversal
+ * @returns {String}
+ */
+ toString() {
+ return this.bytecode.toString();
+ }
+}
+
+export class IO {
+ static get graphml() {
+ return 'graphml';
+ }
+
+ static get graphson() {
+ return 'graphson';
+ }
+
+ static get gryo() {
+ return 'gryo';
+ }
+
+ static get reader() {
+ return '~tinkerpop.io.reader';
+ }
+
+ static get registry() {
+ return '~tinkerpop.io.registry';
+ }
+
+ static get writer() {
+ return '~tinkerpop.io.writer';
+ }
+}
+
+// eslint-disable-next-line no-unused-vars
+class ConnectedComponent {
+ static get component() {
+ return 'gremlin.connectedComponentVertexProgram.component';
+ }
+
+ static get edges() {
+ return '~tinkerpop.connectedComponent.edges';
+ }
+
+ static get propertyName() {
+ return '~tinkerpop.connectedComponent.propertyName';
+ }
+}
+
+// eslint-disable-next-line no-unused-vars
+class ShortestPath {
+ static get distance() {
+ return '~tinkerpop.shortestPath.distance';
+ }
+
+ static get edges() {
+ return '~tinkerpop.shortestPath.edges';
+ }
+
+ static get includeEdges() {
+ return '~tinkerpop.shortestPath.includeEdges';
+ }
+
+ static get maxDistance() {
+ return '~tinkerpop.shortestPath.maxDistance';
+ }
+
+ static get target() {
+ return '~tinkerpop.shortestPath.target';
+ }
+}
+
+// eslint-disable-next-line no-unused-vars
+class PageRank {
+ static get edges() {
+ return '~tinkerpop.pageRank.edges';
+ }
+
+ static get propertyName() {
+ return '~tinkerpop.pageRank.propertyName';
+ }
+
+ static get times() {
+ return '~tinkerpop.pageRank.times';
+ }
+}
+
+// eslint-disable-next-line no-unused-vars
+class PeerPressure {
+ static get edges() {
+ return '~tinkerpop.peerPressure.edges';
+ }
+
+ static get propertyName() {
+ return '~tinkerpop.peerPressure.propertyName';
+ }
+
+ static get times() {
+ return '~tinkerpop.peerPressure.times';
+ }
+}
+
+export class P<T1 = any, T2 = any> {
+ /**
+ * Represents an operation.
+ * @constructor
+ */
+ constructor(
+ public operator: string,
+ public value: T1,
+ public other: T2,
+ ) {}
+
+ /**
+ * Returns the string representation of the instance.
+ * @returns {string}
+ */
+ toString() {
+ function formatValue(value: T1 | T2): any {
+ if (Array.isArray(value)) {
+ const acc = [];
+ for (const item of value) {
+ acc.push(formatValue(item));
+ }
+ return acc;
+ }
+ if (value && typeof value === 'string') {
+ return `'${value}'`;
+ }
+ return value;
+ }
+
+ if (this.other === undefined || this.other === null) {
+ return this.operator + '(' + formatValue(this.value) + ')';
+ }
+ return this.operator + '(' + formatValue(this.value) + ', ' + formatValue(this.other) + ')';
+ }
+
+ and(arg?: any) {
+ return new P('and', this, arg);
+ }
+
+ or(arg?: any) {
+ return new P('or', this, arg);
+ }
+
+ static within(...args: any[]) {
+ if (args.length === 1 && Array.isArray(args[0])) {
+ return new P('within', args[0], null);
+ }
+ return new P('within', args, null);
+ }
+
+ static without(...args: any[]) {
+ if (args.length === 1 && Array.isArray(args[0])) {
+ return new P('without', args[0], null);
+ }
+ return new P('without', args, null);
+ }
+
+ /** @param {...Object} args */
+ static between(...args: any[]) {
+ return createP('between', args);
+ }
+
+ /** @param {...Object} args */
+ static eq(...args: any[]) {
+ return createP('eq', args);
+ }
+
+ /** @param {...Object} args */
+ static gt(...args: any[]) {
+ return createP('gt', args);
+ }
+
+ /** @param {...Object} args */
+ static gte(...args: any[]) {
+ return createP('gte', args);
+ }
+
+ /** @param {...Object} args */
+ static inside(...args: any[]) {
+ return createP('inside', args);
+ }
+
+ /** @param {...Object} args */
+ static lt(...args: any[]) {
+ return createP('lt', args);
+ }
+
+ /** @param {...Object} args */
+ static lte(...args: any[]) {
+ return createP('lte', args);
+ }
+
+ /** @param {...Object} args */
+ static neq(...args: any[]) {
+ return createP('neq', args);
+ }
+
+ /** @param {...Object} args */
+ static not(...args: any[]) {
+ return createP('not', args);
+ }
+
+ /** @param {...Object} args */
+ static outside(...args: any[]) {
+ return createP('outside', args);
+ }
+
+ /** @param {...Object} args */
+ static test(...args: any[]) {
+ return createP('test', args);
+ }
+}
+
+function createP(operator: string, args: any) {
+ args.unshift(null, operator);
+ return new (Function.prototype.bind.apply(P, args))();
+}
+
+export class TextP<T1 = any, T2 = any> {
+ /**
+ * Represents an operation.
+ * @constructor
+ */
+ constructor(
+ public operator: string,
+ public value: T1,
+ public other: T2,
+ ) {}
+
+ /**
+ * Returns the string representation of the instance.
+ * @returns {string}
+ */
+ toString() {
+ function formatValue(value: any) {
+ if (value && typeof value === 'string') {
+ return `'${value}'`;
+ }
+ return value;
+ }
+
+ if (this.other === undefined) {
+ return this.operator + '(' + formatValue(this.value) + ')';
+ }
+ return this.operator + '(' + formatValue(this.value) + ', ' + formatValue(this.other) + ')';
+ }
+
+ and(arg: any) {
+ return new P('and', this, arg);
+ }
+
+ or(arg: any) {
+ return new P('or', this, arg);
+ }
+
+ /** @param {...Object} args */
+ static containing(...args: any[]) {
+ return createTextP('containing', args);
+ }
+
+ /** @param {...Object} args */
+ static endingWith(...args: any[]) {
+ return createTextP('endingWith', args);
+ }
+
+ /** @param {...Object} args */
+ static notContaining(...args: any[]) {
+ return createTextP('notContaining', args);
+ }
+
+ /** @param {...Object} args */
+ static notEndingWith(...args: any[]) {
+ return createTextP('notEndingWith', args);
+ }
+
+ /** @param {...Object} args */
+ static notStartingWith(...args: any[]) {
+ return createTextP('notStartingWith', args);
+ }
+
+ /** @param {...Object} args */
+ static startingWith(...args: any[]) {
+ return createTextP('startingWith', args);
+ }
+
+ /** @param {...Object} args */
+ static regex(...args: any[]) {
+ return createTextP('regex', args);
+ }
+
+ /** @param {...Object} args */
+ static notRegex(...args: any[]) {
+ return createTextP('notRegex', args);
+ }
+}
+
+function createTextP(operator: string, args: any) {
+ args.unshift(null, operator);
+ return new (Function.prototype.bind.apply(TextP, args))();
+}
+
+export class Traverser<T = any> {
+ constructor(
+ public object: T,
+ public bulk: number,
+ ) {
+ this.bulk = bulk || 1;
+ }
+}
+
+export class TraversalSideEffects {}
+
+export const withOptions = {
+ tokens: '~tinkerpop.valueMap.tokens',
+ none: 0,
+ ids: 1,
+ labels: 2,
+ keys: 4,
+ values: 8,
+ all: 15,
+ indexer: '~tinkerpop.index.indexer',
+ list: 0,
+ map: 1,
+};
+
+function toEnum(typeName: string, keys: string) {
+ const result: Record<string, EnumValue> = {};
+ keys.split(' ').forEach((k) => {
+ let jsKey = k;
+ if (jsKey === jsKey.toUpperCase()) {
+ jsKey = jsKey.toLowerCase();
+ }
+ result[jsKey] = new EnumValue(typeName, k);
+ });
+ return result;
+}
+
+const directionAlias = {
+ from_: 'out',
+ to: 'in',
+} as const;
+
+// for direction enums, maps the same EnumValue object to the enum aliases after creating them
+function toDirectionEnum(typeName: string, keys: string) {
+ const result = toEnum(typeName, keys);
+ Object.keys(directionAlias).forEach((k) => {
+ result[k] = result[directionAlias[k as keyof typeof directionAlias]];
+ });
+ return result;
+}
+
+export class EnumValue {
+ constructor(
+ public typeName: string,
+ public elementName: string,
+ ) {}
+
+ toString() {
+ return this.elementName;
+ }
+}
+
+export const barrier = toEnum('Barrier', 'normSack');
+export const cardinality = toEnum('Cardinality', 'list set single');
+export const column = toEnum('Column', 'keys values');
+export const direction = toDirectionEnum('Direction', 'BOTH IN OUT from_ to');
+export const dt = toEnum('DT', 'second minute hour day');
+export const graphSONVersion = toEnum('GraphSONVersion', 'V1_0 V2_0 V3_0');
+export const gryoVersion = toEnum('GryoVersion', 'V1_0 V3_0');
+export const merge = toEnum('Merge', 'onCreate onMatch outV inV');
+export const operator = toEnum('Operator', 'addAll and assign div max min minus mult or sum sumLong');
+export const order = toEnum('Order', 'asc desc shuffle');
+export const pick = toEnum('Pick', 'any none unproductive');
+export const pop = toEnum('Pop', 'all first last mixed');
+export const scope = toEnum('Scope', 'global local');
+export const t = toEnum('T', 'id key label value');
+export const n = toEnum('N', 'byte_ short_ int_ long_ float_ double_ bigInt bigDecimal');
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/graph.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/graph.js
deleted file mode 100644
index 02459bc..0000000
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/graph.js
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * @author Jorge Bay Gondra
- */
-'use strict';
-
-const gt = require('../process/graph-traversal');
-const { TraversalStrategies } = require('../process/traversal-strategy');
-
-/**
- * An "empty" graph object to server only as a reference.
- */
-class Graph {
- /**
- * Returns the graph traversal source.
- * @param {Function} [traversalSourceClass] The constructor to use for the {@code GraphTraversalSource} instance.
- * @returns {GraphTraversalSource}
- * @deprecated As of release 3.3.5, replaced by the traversal() anonymous function.
- */
- traversal(traversalSourceClass) {
- const traversalSourceConstructor = traversalSourceClass || gt.GraphTraversalSource;
- return new traversalSourceConstructor(this, new TraversalStrategies());
- }
-
- toString() {
- return 'graph[]';
- }
-}
-
-class Element {
- constructor(id, label) {
- this.id = id;
- this.label = label;
- }
-
- /**
- * Compares this instance to another and determines if they can be considered as equal.
- * @param {Element} other
- * @returns {boolean}
- */
- equals(other) {
- return other instanceof Element && this.id === other.id;
- }
-}
-
-class Vertex extends Element {
- constructor(id, label, properties) {
- super(id, label);
- this.properties = properties;
- }
-
- toString() {
- return `v[${this.id}]`;
- }
-}
-
-class Edge extends Element {
- constructor(id, outV, label, inV, properties) {
- super(id, label);
- this.outV = outV;
- this.inV = inV;
- this.properties = {};
- if (properties) {
- if (Array.isArray(properties)) {
- // Handle array of Property objects
- properties.forEach((prop) => (this.properties[prop.key] = prop.value));
- } else {
- // Handle object format as before
- Object.keys(properties).forEach((k) => (this.properties[k] = properties[k].value));
- }
- }
- }
-
- toString() {
- const outVId = this.outV ? this.outV.id : '?';
- const inVId = this.inV ? this.inV.id : '?';
-
- return `e[${this.id}][${outVId}-${this.label}->${inVId}]`;
- }
-}
-
-class VertexProperty extends Element {
- constructor(id, label, value, properties) {
- super(id, label);
- this.value = value;
- this.key = this.label;
- this.properties = properties;
- }
-
- toString() {
- return `vp[${this.label}->${summarize(this.value)}]`;
- }
-}
-
-class Property {
- constructor(key, value) {
- this.key = key;
- this.value = value;
- }
-
- toString() {
- return `p[${this.key}->${summarize(this.value)}]`;
- }
-
- equals(other) {
- return other instanceof Property && this.key === other.key && this.value === other.value;
- }
-}
-
-class Path {
- /**
- * Represents a walk through a graph as defined by a traversal.
- * @param {Array} labels
- * @param {Array} objects
- * @constructor
- */
- constructor(labels, objects) {
- this.labels = labels;
- this.objects = objects;
- }
-
- toString() {
- return `path[${(this.objects || []).join(', ')}]`;
- }
-
- equals(other) {
- if (!(other instanceof Path)) {
- return false;
- }
- if (other === this) {
- return true;
- }
- return areEqual(this.objects, other.objects) && areEqual(this.labels, other.labels);
- }
-}
-
-function areEqual(obj1, obj2) {
- if (obj1 === obj2) {
- return true;
- }
- if (typeof obj1.equals === 'function') {
- return obj1.equals(obj2);
- }
- if (Array.isArray(obj1) && Array.isArray(obj2)) {
- if (obj1.length !== obj2.length) {
- return false;
- }
- for (let i = 0; i < obj1.length; i++) {
- if (!areEqual(obj1[i], obj2[i])) {
- return false;
- }
- }
- return true;
- }
- return false;
-}
-
-function summarize(value) {
- if (value === null || value === undefined) {
- return value;
- }
-
- const strValue = value.toString();
- return strValue.length > 20 ? strValue.substr(0, 20) : strValue;
-}
-
-module.exports = {
- Edge,
- Graph,
- Path,
- Property,
- Vertex,
- VertexProperty,
-};
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/graph.ts b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/graph.ts
new file mode 100644
index 0000000..f4e1c14
--- /dev/null
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/graph.ts
@@ -0,0 +1,218 @@
+/*
+ * 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.
+ */
+
+/**
+ * @author Jorge Bay Gondra
+ */
+
+import { GraphTraversalSource } from '../process/graph-traversal.js';
+import { TraversalStrategies } from '../process/traversal-strategy.js';
+
+/**
+ * An "empty" graph object to server only as a reference.
+ */
+export class Graph {
+ /**
+ * Returns the graph traversal source.
+ * @param TraversalSourceClass The constructor to use for the {@code GraphTraversalSource} instance.
+ * @deprecated As of release 3.3.5, replaced by the traversal() anonymous function.
+ */
+ traversal(TraversalSourceClass: typeof GraphTraversalSource = GraphTraversalSource): GraphTraversalSource {
+ return new TraversalSourceClass(this, new TraversalStrategies());
+ }
+
+ toString() {
+ return 'graph[]';
+ }
+}
+
+class Element<TLabel extends string = string, TId = any> {
+ constructor(
+ readonly id: TId,
+ readonly label: TLabel,
+ ) {}
+
+ /**
+ * Compares this instance to another and determines if they can be considered as equal.
+ */
+ equals(other: any): boolean {
+ return other instanceof Element && this.id === other.id;
+ }
+}
+
+export class Vertex<
+ TLabel extends string = string,
+ TProperties extends Record<string, any> = Record<string, any>,
+ TId = number,
+ TVertexProperties = {
+ [P in keyof TProperties]: P extends string ? VertexProperties<P, TProperties[P]> : never;
+ },
+> extends Element<TLabel, TId> {
+ constructor(
+ id: TId,
+ label: TLabel,
+ readonly properties?: TVertexProperties,
+ ) {
+ super(id, label);
+ }
+
+ toString() {
+ return `v[${this.id}]`;
+ }
+}
+
+export class Edge<
+ TOutVertex extends Vertex = Vertex,
+ TLabel extends string = string,
+ TInVertex extends Vertex = Vertex,
+ TProperties extends Record<string, any> = Record<string, any>,
+ TId = number,
+> extends Element<TLabel, TId> {
+ constructor(
+ id: TId,
+ readonly outV: TOutVertex,
+ readonly label: TLabel,
+ readonly inV: TInVertex,
+ readonly properties: TProperties = {} as TProperties,
+ ) {
+ super(id, label);
+ if (properties) {
+ if (Array.isArray(properties)) {
+ // Handle array of Property objects
+ properties.forEach((prop) => {
+ // Use type assertion to inform TypeScript that prop.key is a valid key for TProperties
+ (this.properties as any)[prop.key] = prop.value;
+ });
+ } else {
+ // Handle object format as before
+ Object.keys(properties).forEach((k) => {
+ (this.properties as any)[k] = properties[k].value;
+ });
+ }
+ }
+ }
+
+ toString() {
+ const outVId = this.outV ? this.outV.id : '?';
+ const inVId = this.inV ? this.inV.id : '?';
+
+ return `e[${this.id}][${outVId}-${this.label}->${inVId}]`;
+ }
+}
+
+export class VertexProperty<
+ TLabel extends string = string,
+ TValue = any,
+ TProperties extends Record<string, any> | null | undefined = Record<string, any>,
+ TId = any,
+> extends Element<TLabel, TId> {
+ readonly key: string;
+
+ constructor(
+ id: TId,
+ label: TLabel,
+ readonly value: TValue,
+ readonly properties?: TProperties,
+ ) {
+ super(id, label);
+ this.value = value;
+ this.key = this.label;
+ this.properties = properties;
+ }
+
+ toString() {
+ return `vp[${this.label}->${summarize(this.value)}]`;
+ }
+}
+
+export type VertexProperties<
+ TLabel extends string = string,
+ TValue = any,
+ TProperties extends Record<string, any> = Record<string, any>,
+ TId = any,
+> = [VertexProperty<TLabel, TValue, TProperties, TId>, ...Array<VertexProperty<TLabel, TValue, TProperties, TId>>];
+
+export class Property<T = any> {
+ constructor(
+ readonly key: string,
+ readonly value: T,
+ ) {}
+
+ toString() {
+ return `p[${this.key}->${summarize(this.value)}]`;
+ }
+
+ equals(other: any) {
+ return other instanceof Property && this.key === other.key && this.value === other.value;
+ }
+}
+
+/**
+ * Represents a walk through a graph as defined by a traversal.
+ */
+export class Path {
+ constructor(
+ readonly labels: string[],
+ readonly objects: any[],
+ ) {}
+
+ toString() {
+ return `path[${(this.objects || []).join(', ')}]`;
+ }
+
+ equals(other: any) {
+ if (!(other instanceof Path)) {
+ return false;
+ }
+ if (other === this) {
+ return true;
+ }
+ return areEqual(this.objects, other.objects) && areEqual(this.labels, other.labels);
+ }
+}
+
+function areEqual(obj1: any, obj2: any) {
+ if (obj1 === obj2) {
+ return true;
+ }
+ if (typeof obj1.equals === 'function') {
+ return obj1.equals(obj2);
+ }
+ if (Array.isArray(obj1) && Array.isArray(obj2)) {
+ if (obj1.length !== obj2.length) {
+ return false;
+ }
+ for (let i = 0; i < obj1.length; i++) {
+ if (!areEqual(obj1[i], obj2[i])) {
+ return false;
+ }
+ }
+ return true;
+ }
+ return false;
+}
+
+function summarize(value: any) {
+ if (value === null || value === undefined) {
+ return value;
+ }
+
+ const strValue = value.toString();
+ return strValue.length > 20 ? strValue.substr(0, 20) : strValue;
+}
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/GraphBinary.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/GraphBinary.js
index ed397b2..d0813e4 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/GraphBinary.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/GraphBinary.js
@@ -58,53 +58,133 @@
* @author Igor Ostapenko
*/
/*eslint-disable*/
-'use strict';
+
+import DataType from './internals/DataType.js';
+import * as utils from './internals/utils.js';
+import IntSerializer from './internals/IntSerializer.js';
+import LongSerializer from './internals/LongSerializer.js';
+import LongSerializerNg from './internals/LongSerializerNg.js';
+import StringSerializer from './internals/StringSerializer.js';
+import DateSerializer from './internals/DateSerializer.js';
+import OffsetDateTimeSerializer from './internals/OffsetDateTimeSerializer.js';
+import DoubleSerializer from './internals/DoubleSerializer.js';
+import FloatSerializer from './internals/FloatSerializer.js';
+import ArraySerializer from './internals/ArraySerializer.js';
+import MapSerializer from './internals/MapSerializer.js';
+import SetSerializer from './internals/SetSerializer.js';
+import UuidSerializer from './internals/UuidSerializer.js';
+import EdgeSerializer from './internals/EdgeSerializer.js';
+import PathSerializer from './internals/PathSerializer.js';
+import PropertySerializer from './internals/PropertySerializer.js';
+import VertexSerializer from './internals/VertexSerializer.js';
+import VertexPropertySerializer from './internals/VertexPropertySerializer.js';
+import BytecodeSerializer from './internals/BytecodeSerializer.js';
+import PSerializer from './internals/PSerializer.js';
+import TraverserSerializer from './internals/TraverserSerializer.js';
+import EnumSerializer from './internals/EnumSerializer.js';
+import LambdaSerializer from './internals/LambdaSerializer.js';
+import BigIntegerSerializer from './internals/BigIntegerSerializer.js';
+import ByteSerializer from './internals/ByteSerializer.js';
+import ByteBufferSerializer from './internals/ByteBufferSerializer.js';
+import ShortSerializer from './internals/ShortSerializer.js';
+import BooleanSerializer from './internals/BooleanSerializer.js';
+import TextPSerializer from './internals/TextPSerializer.js';
+import TraversalStrategySerializer from './internals/TraversalStrategySerializer.js';
+import BulkSetSerializer from './internals/BulkSetSerializer.js';
+import UnspecifiedNullSerializer from './internals/UnspecifiedNullSerializer.js';
+import NumberSerializationStrategy from './internals/NumberSerializationStrategy.js';
+import AnySerializer from './internals/AnySerializer.js';
+import GraphBinaryReader from './internals/GraphBinaryReader.js';
+import GraphBinaryWriter from './internals/GraphBinaryWriter.js';
const ioc = {};
-ioc.DataType = require('./internals/DataType');
-ioc.utils = require('./internals/utils');
+ioc.DataType = DataType;
+ioc.utils = utils;
ioc.serializers = {};
-ioc.intSerializer = new (require('./internals/IntSerializer'))(ioc);
-ioc.longSerializer = new (require('./internals/LongSerializer'))(ioc);
-ioc.longSerializerNg = new (require('./internals/LongSerializerNg'))(ioc);
-ioc.stringSerializer = new (require('./internals/StringSerializer'))(ioc, ioc.DataType.STRING);
-ioc.offsetDateTimeSerializer = new (require('./internals/OffsetDateTimeSerializer'))(ioc, ioc.DataType.OFFSETDATETIME);
-ioc.dateSerializer = new (require('./internals/DateSerializer'))(ioc, ioc.DataType.DATE);
-ioc.timestampSerializer = new (require('./internals/DateSerializer'))(ioc, ioc.DataType.TIMESTAMP);
-ioc.classSerializer = new (require('./internals/ClassSerializer'))(ioc);
-ioc.doubleSerializer = new (require('./internals/DoubleSerializer'))(ioc);
-ioc.floatSerializer = new (require('./internals/FloatSerializer'))(ioc);
-ioc.listSerializer = new (require('./internals/ArraySerializer'))(ioc, ioc.DataType.LIST);
-ioc.mapSerializer = new (require('./internals/MapSerializer'))(ioc);
-ioc.setSerializer = new (require('./internals/SetSerializer'))(ioc, ioc.DataType.SET);
-ioc.uuidSerializer = new (require('./internals/UuidSerializer'))(ioc);
-ioc.edgeSerializer = new (require('./internals/EdgeSerializer'))(ioc);
-ioc.pathSerializer = new (require('./internals/PathSerializer'))(ioc);
-ioc.propertySerializer = new (require('./internals/PropertySerializer'))(ioc);
-ioc.vertexSerializer = new (require('./internals/VertexSerializer'))(ioc);
-ioc.vertexPropertySerializer = new (require('./internals/VertexPropertySerializer'))(ioc);
-ioc.bytecodeSerializer = new (require('./internals/BytecodeSerializer'))(ioc);
-ioc.pSerializer = new (require('./internals/PSerializer'))(ioc);
-ioc.traverserSerializer = new (require('./internals/TraverserSerializer'))(ioc);
-ioc.enumSerializer = new (require('./internals/EnumSerializer'))(ioc);
-ioc.lambdaSerializer = new (require('./internals/LambdaSerializer'))(ioc);
-ioc.bigIntegerSerializer = new (require('./internals/BigIntegerSerializer'))(ioc);
-ioc.byteSerializer = new (require('./internals/ByteSerializer'))(ioc);
-ioc.byteBufferSerializer = new (require('./internals/ByteBufferSerializer'))(ioc);
-ioc.shortSerializer = new (require('./internals/ShortSerializer'))(ioc);
-ioc.booleanSerializer = new (require('./internals/BooleanSerializer'))(ioc);
-ioc.textPSerializer = new (require('./internals/TextPSerializer'))(ioc);
-ioc.traversalStrategySerializer = new (require('./internals/TraversalStrategySerializer'))(ioc);
-ioc.bulkSetSerializer = new (require('./internals/BulkSetSerializer'))(ioc);
-ioc.unspecifiedNullSerializer = new (require('./internals/UnspecifiedNullSerializer'))(ioc);
+ioc.intSerializer = new IntSerializer(ioc);
+ioc.longSerializer = new LongSerializer(ioc);
+ioc.longSerializerNg = new LongSerializerNg(ioc);
+ioc.stringSerializer = new StringSerializer(ioc, ioc.DataType.STRING);
+ioc.dateSerializer = new DateSerializer(ioc, ioc.DataType.DATE);
+ioc.offsetDateTimeSerializer = new OffsetDateTimeSerializer(ioc, ioc.DataType.OFFSETDATETIME);
+ioc.timestampSerializer = new DateSerializer(ioc, ioc.DataType.TIMESTAMP);
+ioc.classSerializer = new ClassSerializer(ioc, ioc.DataType.CLASS);
+ioc.doubleSerializer = new DoubleSerializer(ioc);
+ioc.floatSerializer = new FloatSerializer(ioc);
+ioc.listSerializer = new ArraySerializer(ioc, ioc.DataType.LIST);
+ioc.mapSerializer = new MapSerializer(ioc);
+ioc.setSerializer = new SetSerializer(ioc, ioc.DataType.SET);
+ioc.uuidSerializer = new UuidSerializer(ioc);
+ioc.edgeSerializer = new EdgeSerializer(ioc);
+ioc.pathSerializer = new PathSerializer(ioc);
+ioc.propertySerializer = new PropertySerializer(ioc);
+ioc.vertexSerializer = new VertexSerializer(ioc);
+ioc.vertexPropertySerializer = new VertexPropertySerializer(ioc);
+ioc.bytecodeSerializer = new BytecodeSerializer(ioc);
+ioc.pSerializer = new PSerializer(ioc);
+ioc.traverserSerializer = new TraverserSerializer(ioc);
+ioc.enumSerializer = new EnumSerializer(ioc);
+ioc.lambdaSerializer = new LambdaSerializer(ioc);
+ioc.bigIntegerSerializer = new BigIntegerSerializer(ioc);
+ioc.byteSerializer = new ByteSerializer(ioc);
+ioc.byteBufferSerializer = new ByteBufferSerializer(ioc);
+ioc.shortSerializer = new ShortSerializer(ioc);
+ioc.booleanSerializer = new BooleanSerializer(ioc);
+ioc.textPSerializer = new TextPSerializer(ioc);
+ioc.traversalStrategySerializer = new TraversalStrategySerializer(ioc);
+ioc.bulkSetSerializer = new BulkSetSerializer(ioc);
+ioc.unspecifiedNullSerializer = new UnspecifiedNullSerializer(ioc);
-ioc.numberSerializationStrategy = new (require('./internals/NumberSerializationStrategy'))(ioc);
-ioc.anySerializer = new (require('./internals/AnySerializer'))(ioc);
+ioc.numberSerializationStrategy = new NumberSerializationStrategy(ioc);
+ioc.anySerializer = new AnySerializer(ioc);
-ioc.graphBinaryReader = new (require('./internals/GraphBinaryReader.js'))(ioc);
-ioc.graphBinaryWriter = new (require('./internals/GraphBinaryWriter'))(ioc);
+ioc.graphBinaryReader = new GraphBinaryReader(ioc);
+ioc.graphBinaryWriter = new GraphBinaryWriter(ioc);
-module.exports = ioc;
+export { default as DataType } from './internals/DataType.js';
+
+export const {
+ serializers,
+ intSerializer,
+ longSerializer,
+ longSerializerNg,
+ stringSerializer,
+ dateSerializer,
+ offsetDateTimeSerializer,
+ timestampSerializer,
+ classSerializer,
+ doubleSerializer,
+ floatSerializer,
+ listSerializer,
+ mapSerializer,
+ setSerializer,
+ uuidSerializer,
+ edgeSerializer,
+ pathSerializer,
+ propertySerializer,
+ vertexSerializer,
+ vertexPropertySerializer,
+ bytecodeSerializer,
+ pSerializer,
+ traverserSerializer,
+ enumSerializer,
+ lambdaSerializer,
+ bigIntegerSerializer,
+ byteSerializer,
+ byteBufferSerializer,
+ shortSerializer,
+ booleanSerializer,
+ textPSerializer,
+ traversalStrategySerializer,
+ bulkSetSerializer,
+ unspecifiedNullSerializer,
+ numberSerializationStrategy,
+ anySerializer,
+ graphBinaryReader,
+ graphBinaryWriter,
+} = ioc;
+
+export default ioc;
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/AnySerializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/AnySerializer.js
index 5d5268c..1e4c836 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/AnySerializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/AnySerializer.js
@@ -20,11 +20,10 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const { Buffer } = require('buffer');
+import { Buffer } from 'buffer';
-module.exports = class AnySerializer {
+export default class AnySerializer {
constructor(ioc) {
this.ioc = ioc;
@@ -97,4 +96,4 @@
throw this.ioc.utils.des_error({ serializer: this, args: arguments, err });
}
}
-};
+}
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/ArraySerializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/ArraySerializer.js
index 77aabd4..abfe28f 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/ArraySerializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/ArraySerializer.js
@@ -20,11 +20,10 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const { Buffer } = require('buffer');
+import { Buffer } from 'buffer';
-module.exports = class ArraySerializer {
+export default class ArraySerializer {
constructor(ioc, ID) {
this.ioc = ioc;
this.ID = ID;
@@ -134,4 +133,4 @@
throw this.ioc.utils.des_error({ serializer: this, args: arguments, cursor, err });
}
}
-};
+}
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/BigIntegerSerializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/BigIntegerSerializer.js
index 48e6e8c..436f02a 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/BigIntegerSerializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/BigIntegerSerializer.js
@@ -20,12 +20,11 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const { Buffer } = require('buffer');
+import { Buffer } from 'buffer';
// TODO: it has room for performance improvements
-module.exports = class BigIntegerSerializer {
+export default class BigIntegerSerializer {
constructor(ioc) {
this.ioc = ioc;
this.ioc.serializers[ioc.DataType.BIGINTEGER] = this;
@@ -150,4 +149,4 @@
throw this.ioc.utils.des_error({ serializer: this, args: arguments, cursor, err });
}
}
-};
+}
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/BooleanSerializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/BooleanSerializer.js
index bbdf9fc..5dc38f3 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/BooleanSerializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/BooleanSerializer.js
@@ -20,11 +20,10 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const { Buffer } = require('buffer');
+import { Buffer } from 'buffer';
-module.exports = class BooleanSerializer {
+export default class BooleanSerializer {
constructor(ioc) {
this.ioc = ioc;
this.ioc.serializers[ioc.DataType.BOOLEAN] = this;
@@ -102,4 +101,4 @@
throw this.ioc.utils.des_error({ serializer: this, args: arguments, cursor, err });
}
}
-};
+}
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/BulkSetSerializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/BulkSetSerializer.js
index 518caa2..8920939 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/BulkSetSerializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/BulkSetSerializer.js
@@ -20,11 +20,10 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const { Buffer } = require('buffer');
+import { Buffer } from 'buffer';
-module.exports = class BulkSetSerializer {
+export default class BulkSetSerializer {
constructor(ioc) {
this.ioc = ioc;
this.ioc.serializers[ioc.DataType.BULKSET] = this;
@@ -123,4 +122,4 @@
throw this.ioc.utils.des_error({ serializer: this, args: arguments, cursor, err });
}
}
-};
+}
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/ByteBufferSerializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/ByteBufferSerializer.js
index 080edef..358aa07 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/ByteBufferSerializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/ByteBufferSerializer.js
@@ -20,11 +20,10 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const { Buffer } = require('buffer');
+import { Buffer } from 'buffer';
-module.exports = class ByteBufferSerializer {
+export default class ByteBufferSerializer {
constructor(ioc) {
this.ioc = ioc;
this.ioc.serializers[ioc.DataType.BYTEBUFFER] = this;
@@ -123,4 +122,4 @@
throw this.ioc.utils.des_error({ serializer: this, args: arguments, cursor, err });
}
}
-};
+}
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/ByteSerializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/ByteSerializer.js
index ed5e622..f704c09 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/ByteSerializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/ByteSerializer.js
@@ -20,11 +20,10 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const { Buffer } = require('buffer');
+import { Buffer } from 'buffer';
-module.exports = class ByteSerializer {
+export default class ByteSerializer {
constructor(ioc) {
this.ioc = ioc;
this.ioc.serializers[ioc.DataType.BYTE] = this;
@@ -94,4 +93,4 @@
throw this.ioc.utils.des_error({ serializer: this, args: arguments, cursor, err });
}
}
-};
+}
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/BytecodeSerializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/BytecodeSerializer.js
index e458f55..a2c0d74 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/BytecodeSerializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/BytecodeSerializer.js
@@ -20,20 +20,19 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const { Buffer } = require('buffer');
-const Bytecode = require('../../../../process/bytecode');
-const t = require('../../../../process/traversal');
+import { Buffer } from 'buffer';
+import Bytecode from '../../../../process/bytecode.js';
+import { Traversal } from '../../../../process/traversal.js';
-module.exports = class BytecodeSerializer {
+export default class BytecodeSerializer {
constructor(ioc) {
this.ioc = ioc;
this.ioc.serializers[ioc.DataType.BYTECODE] = this;
}
canBeUsedFor(value) {
- return value instanceof Bytecode || value instanceof t.Traversal;
+ return value instanceof Bytecode || value instanceof Traversal;
}
serialize(item, fullyQualifiedFormat = true) {
@@ -46,7 +45,7 @@
return Buffer.from([...steps_length, ...sources_length]);
}
- if (item instanceof t.Traversal) {
+ if (item instanceof Traversal) {
item = item.getBytecode();
}
@@ -247,4 +246,4 @@
throw this.ioc.utils.des_error({ serializer: this, args: arguments, cursor, err });
}
}
-};
+}
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/ClassSerializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/ClassSerializer.js
deleted file mode 100644
index 9dc15c7..0000000
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/ClassSerializer.js
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-'use strict';
-
-const { TraversalStrategy } = require('../../../../process/traversal-strategy');
-const { Buffer } = require('buffer');
-
-module.exports = class ClassSerializer {
- constructor(ioc) {
- this.ioc = ioc;
- this.ioc.serializers[ioc.DataType.CLASS] = this;
- }
-
- canBeUsedFor(value) {
- return (
- typeof value === 'function' &&
- !!value.prototype &&
- !!value.prototype.constructor.name &&
- new value() instanceof TraversalStrategy
- );
- }
-
- serialize(item, fullyQualifiedFormat = true) {
- if (item === undefined || item === null) {
- if (fullyQualifiedFormat) {
- return Buffer.from([this.ioc.DataType.CLASS, 0x01]);
- }
- return this.ioc.intSerializer.serialize(0, false);
- }
-
- const bufs = [];
- if (fullyQualifiedFormat) {
- bufs.push(Buffer.from([this.ioc.DataType.CLASS, 0x00]));
- }
-
- const fqcn = new item().fqcn;
- const v = Buffer.from(fqcn, 'utf8');
- bufs.push(this.ioc.intSerializer.serialize(fqcn.length, false));
- bufs.push(v);
-
- return Buffer.concat(bufs);
- }
-};
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/DataType.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/DataType.js
index ee12739..63388e9 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/DataType.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/DataType.js
@@ -20,7 +20,6 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
/**
* Represents a GraphBinary data type.
@@ -97,4 +96,4 @@
UNSPECIFIED_NULL: 0xfe,
};
-module.exports = DataType;
+export default DataType;
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/DateSerializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/DateSerializer.js
index a7f3dc8..076e2d5 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/DateSerializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/DateSerializer.js
@@ -20,11 +20,10 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const { Buffer } = require('buffer');
+import { Buffer } from 'buffer';
-module.exports = class DateSerializer {
+export default class DateSerializer {
constructor(ioc, ID) {
this.ioc = ioc;
this.ID = ID;
@@ -102,4 +101,4 @@
throw this.ioc.utils.des_error({ serializer: this, args: arguments, cursor, err });
}
}
-};
+}
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/DoubleSerializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/DoubleSerializer.js
index bd0c65c..4e7019e 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/DoubleSerializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/DoubleSerializer.js
@@ -20,11 +20,10 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const { Buffer } = require('buffer');
+import { Buffer } from 'buffer';
-module.exports = class DoubleSerializer {
+export default class DoubleSerializer {
constructor(ioc) {
this.ioc = ioc;
this.ioc.serializers[ioc.DataType.DOUBLE] = this;
@@ -98,4 +97,4 @@
throw this.ioc.utils.des_error({ serializer: this, args: arguments, cursor, err });
}
}
-};
+}
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/EdgeSerializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/EdgeSerializer.js
index f755f1d..d32b4a0 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/EdgeSerializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/EdgeSerializer.js
@@ -20,19 +20,18 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const { Buffer } = require('buffer');
-const g = require('../../../graph');
+import { Buffer } from 'buffer';
+import { Edge, Vertex } from '../../../graph.js';
-module.exports = class EdgeSerializer {
+export default class EdgeSerializer {
constructor(ioc) {
this.ioc = ioc;
this.ioc.serializers[ioc.DataType.EDGE] = this;
}
canBeUsedFor(value) {
- return value instanceof g.Edge;
+ return value instanceof Edge;
}
serialize(item, fullyQualifiedFormat = true) {
@@ -201,16 +200,13 @@
}
cursor = cursor.slice(properties_len);
- const v = new g.Edge(
- id,
- new g.Vertex(outVId, outVLabel, null),
- label,
- new g.Vertex(inVId, inVLabel, null),
- properties,
- );
+ // null properties are deserialized into empty lists
+ const edge_props = properties ? properties : [];
+
+ const v = new Edge(id, new Vertex(outVId, outVLabel, null), label, new Vertex(inVId, inVLabel, null), edge_props);
return { v, len };
} catch (err) {
throw this.ioc.utils.des_error({ serializer: this, args: arguments, cursor, err });
}
}
-};
+}
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/EnumSerializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/EnumSerializer.js
index bb11c65..43b4b50 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/EnumSerializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/EnumSerializer.js
@@ -20,12 +20,26 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const { Buffer } = require('buffer');
-const t = require('../../../../process/traversal');
+import { Buffer } from 'buffer';
+import {
+ barrier,
+ cardinality,
+ column,
+ direction,
+ dt,
+ merge,
+ operator,
+ order,
+ pick,
+ pop,
+ scope,
+ t as _t,
+ n as _n,
+ EnumValue,
+} from '../../../../process/traversal.js';
-module.exports = class EnumSerializer {
+export default class EnumSerializer {
constructor(ioc) {
this.ioc = ioc;
@@ -38,19 +52,19 @@
};
const DT = ioc.DataType;
this.types = [
- { name: 'Barrier', code: DT.BARRIER, enum: to_orig_enum(t.barrier) },
- { name: 'Cardinality', code: DT.CARDINALITY, enum: to_orig_enum(t.cardinality) },
- { name: 'Column', code: DT.COLUMN, enum: to_orig_enum(t.column) },
- { name: 'Direction', code: DT.DIRECTION, enum: to_orig_enum(t.direction) },
- { name: 'DT', code: DT.DT, enum: to_orig_enum(t.dt) },
- { name: 'Merge', code: DT.MERGE, enum: to_orig_enum(t.merge) },
- { name: 'N', code: DT.N, enum: to_orig_enum(t.n) },
- { name: 'Operator', code: DT.OPERATOR, enum: to_orig_enum(t.operator) },
- { name: 'Order', code: DT.ORDER, enum: to_orig_enum(t.order) },
- { name: 'Pick', code: DT.PICK, enum: to_orig_enum(t.pick) },
- { name: 'Pop', code: DT.POP, enum: to_orig_enum(t.pop) },
- { name: 'Scope', code: DT.SCOPE, enum: to_orig_enum(t.scope) },
- { name: 'T', code: DT.T, enum: to_orig_enum(t.t) },
+ { name: 'Barrier', code: DT.BARRIER, enum: to_orig_enum(barrier) },
+ { name: 'Cardinality', code: DT.CARDINALITY, enum: to_orig_enum(cardinality) },
+ { name: 'Column', code: DT.COLUMN, enum: to_orig_enum(column) },
+ { name: 'Direction', code: DT.DIRECTION, enum: to_orig_enum(direction) },
+ { name: 'DT', code: DT.DT, enum: to_orig_enum(dt) },
+ { name: 'Merge', code: DT.MERGE, enum: to_orig_enum(merge) },
+ { name: 'Operator', code: DT.OPERATOR, enum: to_orig_enum(operator) },
+ { name: 'Order', code: DT.ORDER, enum: to_orig_enum(order) },
+ { name: 'Pick', code: DT.PICK, enum: to_orig_enum(pick) },
+ { name: 'Pop', code: DT.POP, enum: to_orig_enum(pop) },
+ { name: 'Scope', code: DT.SCOPE, enum: to_orig_enum(scope) },
+ { name: 'T', code: DT.T, enum: to_orig_enum(_t) },
+ { name: 'N', code: DT.N, enum: to_orig_enum(_n) },
];
this.byname = {};
this.bycode = {};
@@ -62,7 +76,7 @@
}
canBeUsedFor(value) {
- if (!(value instanceof t.EnumValue)) {
+ if (!(value instanceof EnumValue)) {
return false;
}
if (!this.byname[value.typeName]) {
@@ -139,7 +153,7 @@
let v;
if (!type) {
- v = new t.EnumValue(undefined, elementName);
+ v = new EnumValue(undefined, elementName);
} else {
v = type.enum[elementName]; // users are expected to work with maps like Map.get(T.id), i.e. it must be exactly the same object
}
@@ -149,4 +163,4 @@
throw this.ioc.utils.des_error({ serializer: this, args: arguments, cursor, err });
}
}
-};
+}
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/FloatSerializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/FloatSerializer.js
index c0febcb..62ba0cd 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/FloatSerializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/FloatSerializer.js
@@ -20,11 +20,10 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const { Buffer } = require('buffer');
+import { Buffer } from 'buffer';
-module.exports = class FloatSerializer {
+export default class FloatSerializer {
constructor(ioc) {
this.ioc = ioc;
this.ioc.serializers[ioc.DataType.FLOAT] = this;
@@ -98,4 +97,4 @@
throw this.ioc.utils.des_error({ serializer: this, args: arguments, cursor, err });
}
}
-};
+}
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/GraphBinaryReader.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/GraphBinaryReader.js
index 21d9f2b..deca362 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/GraphBinaryReader.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/GraphBinaryReader.js
@@ -20,14 +20,13 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const { Buffer } = require('buffer');
+import { Buffer } from 'buffer';
/**
* GraphBinary reader.
*/
-module.exports = class GraphBinaryReader {
+export default class GraphBinaryReader {
constructor(ioc) {
this.ioc = ioc;
}
@@ -79,4 +78,4 @@
return response;
}
-};
+}
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/GraphBinaryWriter.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/GraphBinaryWriter.js
index 7440ba0..d69640b 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/GraphBinaryWriter.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/GraphBinaryWriter.js
@@ -20,14 +20,13 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const { Buffer } = require('buffer');
+import { Buffer } from 'buffer';
/**
* GraphBinary writer.
*/
-module.exports = class GraphBinaryWriter {
+export default class GraphBinaryWriter {
constructor(ioc) {
this.ioc = ioc;
}
@@ -82,4 +81,4 @@
0x00,0x00,0x00,0x00,
*/
}
-};
+}
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/IntSerializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/IntSerializer.js
index ddd32f4..49a0aed 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/IntSerializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/IntSerializer.js
@@ -20,11 +20,10 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const { Buffer } = require('buffer');
+import { Buffer } from 'buffer';
-module.exports = class IntSerializer {
+export default class IntSerializer {
get INT32_MIN() {
return -2147483648;
}
@@ -111,4 +110,4 @@
throw this.ioc.utils.des_error({ serializer: this, args: arguments, cursor, err });
}
}
-};
+}
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/LambdaSerializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/LambdaSerializer.js
index 292b7ef..1e87a9c 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/LambdaSerializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/LambdaSerializer.js
@@ -20,12 +20,11 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const { Buffer } = require('buffer');
-const { valueKey, LambdaSerializer: GraphsonLambdaSerializer } = require('../../type-serializers');
+import { Buffer } from 'buffer';
+import { valueKey, LambdaSerializer as GraphsonLambdaSerializer } from '../../type-serializers.js';
-module.exports = class LambdaSerializer {
+export default class LambdaSerializer {
constructor(ioc) {
this.ioc = ioc;
// this.ioc.serializers[ioc.DataType.LAMBDA] = this; // it's not expected to be deserialized
@@ -68,4 +67,4 @@
return Buffer.concat(bufs);
}
-};
+}
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/LongSerializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/LongSerializer.js
index c5f45fe..823a312 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/LongSerializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/LongSerializer.js
@@ -20,11 +20,10 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const { Buffer } = require('buffer');
+import { Buffer } from 'buffer';
-module.exports = class LongSerializer {
+export default class LongSerializer {
constructor(ioc) {
this.ioc = ioc;
this.ioc.serializers[ioc.DataType.LONG] = this;
@@ -106,4 +105,4 @@
throw this.ioc.utils.des_error({ serializer: this, args: arguments, cursor, err });
}
}
-};
+}
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/LongSerializerNg.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/LongSerializerNg.js
index e23fe5b..fbbde85 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/LongSerializerNg.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/LongSerializerNg.js
@@ -20,14 +20,13 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const { Buffer } = require('buffer');
+import { Buffer } from 'buffer';
// TODO: it's based on BigInt native JavaScript type to completely support
// 64 bits integers, but for backward compatibility with current GraphSON
// implementation we do not use this for now. Consider its removal.
-module.exports = class LongSerializerNg {
+export default class LongSerializerNg {
constructor(ioc) {
this.ioc = ioc;
// this.ioc.serializers[ioc.DataType.LONG] = this; // disabled, see AnySerializer.deserialize()
@@ -101,4 +100,4 @@
throw this.ioc.utils.des_error({ serializer: this, args: arguments, cursor, err });
}
}
-};
+}
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/MapSerializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/MapSerializer.js
index 62e952c..9bed8d4 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/MapSerializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/MapSerializer.js
@@ -20,11 +20,10 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const { Buffer } = require('buffer');
+import { Buffer } from 'buffer';
-module.exports = class MapSerializer {
+export default class MapSerializer {
constructor(ioc) {
this.ioc = ioc;
this.ioc.serializers[ioc.DataType.MAP] = this;
@@ -152,4 +151,4 @@
throw this.ioc.utils.des_error({ serializer: this, args: arguments, cursor, err });
}
}
-};
+}
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/NumberSerializationStrategy.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/NumberSerializationStrategy.js
index e7fe9d2..eda9062 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/NumberSerializationStrategy.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/NumberSerializationStrategy.js
@@ -20,11 +20,10 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
// Based on GraphSON NumberSerializer.serialize().
// It's tested by AnySerializer.serialize() tests.
-module.exports = class NumberSerializationStrategy {
+export default class NumberSerializationStrategy {
constructor(ioc) {
this.ioc = ioc;
}
@@ -70,4 +69,4 @@
return this.ioc.bigIntegerSerializer.serialize(item, fullyQualifiedFormat);
}
}
-};
+}
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/OffsetDateTimeSerializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/OffsetDateTimeSerializer.js
index 30045ff..3ca8c7c 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/OffsetDateTimeSerializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/OffsetDateTimeSerializer.js
@@ -17,8 +17,6 @@
* under the License.
*/
-'use strict';
-
const { Buffer } = require('buffer');
module.exports = class OffsetDateTimeSerializer {
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/PSerializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/PSerializer.js
index 046f034..5826032 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/PSerializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/PSerializer.js
@@ -20,19 +20,18 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const { Buffer } = require('buffer');
-const t = require('../../../../process/traversal');
+import { Buffer } from 'buffer';
+import { P } from '../../../../process/traversal.js';
-module.exports = class PSerializer {
+export default class PSerializer {
constructor(ioc) {
this.ioc = ioc;
this.ioc.serializers[ioc.DataType.P] = this;
}
canBeUsedFor(value) {
- return value instanceof t.P;
+ return value instanceof P;
}
serialize(item, fullyQualifiedFormat = true) {
@@ -133,15 +132,15 @@
cursor = cursor.slice(values_len);
if (values.length < 1) {
- return { v: new t.P(''), len };
+ return { v: new P(''), len };
}
let v;
- const P_static = t.P[name];
+ const P_static = P[name];
if (typeof P_static === 'function') {
v = P_static(...values); // it's better to follow existing logic which may depend on an operator name
} else {
- v = new t.P(name, ...values);
+ v = new P(name, ...values);
}
return { v, len };
@@ -149,4 +148,4 @@
throw this.ioc.utils.des_error({ serializer: this, args: arguments, cursor, err });
}
}
-};
+}
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/PathSerializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/PathSerializer.js
index 8b3aeff..11530d6 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/PathSerializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/PathSerializer.js
@@ -20,19 +20,18 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const { Buffer } = require('buffer');
-const g = require('../../../graph');
+import { Buffer } from 'buffer';
+import { Path } from '../../../graph.js';
-module.exports = class PathSerializer {
+export default class PathSerializer {
constructor(ioc) {
this.ioc = ioc;
this.ioc.serializers[ioc.DataType.PATH] = this;
}
canBeUsedFor(value) {
- return value instanceof g.Path;
+ return value instanceof Path;
}
serialize(item, fullyQualifiedFormat = true) {
@@ -115,10 +114,10 @@
}
cursor = cursor.slice(objects_len);
- const v = new g.Path(labels, objects);
+ const v = new Path(labels, objects);
return { v, len };
} catch (err) {
throw this.ioc.utils.des_error({ serializer: this, args: arguments, cursor, err });
}
}
-};
+}
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/PropertySerializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/PropertySerializer.js
index 9738d85..dd63941 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/PropertySerializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/PropertySerializer.js
@@ -20,19 +20,18 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const { Buffer } = require('buffer');
-const g = require('../../../graph');
+import { Buffer } from 'buffer';
+import { Property } from '../../../graph.js';
-module.exports = class PropertySerializer {
+export default class PropertySerializer {
constructor(ioc) {
this.ioc = ioc;
this.ioc.serializers[ioc.DataType.PROPERTY] = this;
}
canBeUsedFor(value) {
- return value instanceof g.Property;
+ return value instanceof Property;
}
serialize(item, fullyQualifiedFormat = true) {
@@ -133,10 +132,10 @@
// TODO: should we verify that parent is null?
cursor = cursor.slice(parent_len);
- const v = new g.Property(key, value);
+ const v = new Property(key, value);
return { v, len };
} catch (err) {
throw this.ioc.utils.des_error({ serializer: this, args: arguments, cursor, err });
}
}
-};
+}
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/SetSerializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/SetSerializer.js
index 3ae518a..fa5ddec 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/SetSerializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/SetSerializer.js
@@ -20,10 +20,9 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const { Buffer } = require('buffer');
-module.exports = class SetSerializer {
+import { Buffer } from 'buffer';
+export default class SetSerializer {
constructor(ioc, ID) {
this.ioc = ioc;
this.ID = ID;
@@ -131,4 +130,4 @@
throw this.ioc.utils.des_error({ serializer: this, args: arguments, cursor, err });
}
}
-};
+}
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/ShortSerializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/ShortSerializer.js
index f5dda2f..497378f 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/ShortSerializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/ShortSerializer.js
@@ -20,11 +20,10 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const { Buffer } = require('buffer');
+import { Buffer } from 'buffer';
-module.exports = class ShortSerializer {
+export default class ShortSerializer {
constructor(ioc) {
this.ioc = ioc;
this.ioc.serializers[ioc.DataType.SHORT] = this;
@@ -98,4 +97,4 @@
throw this.ioc.utils.des_error({ serializer: this, args: arguments, cursor, err });
}
}
-};
+}
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/StringSerializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/StringSerializer.js
index 17ea06d..49349c2 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/StringSerializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/StringSerializer.js
@@ -20,11 +20,10 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const { Buffer } = require('buffer');
+import { Buffer } from 'buffer';
-module.exports = class StringSerializer {
+export default class StringSerializer {
constructor(ioc, ID) {
this.ioc = ioc;
this.ID = ID;
@@ -113,4 +112,4 @@
throw this.ioc.utils.des_error({ serializer: this, args: arguments, cursor, err });
}
}
-};
+}
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/TextPSerializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/TextPSerializer.js
index a78c1ab..61acd10 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/TextPSerializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/TextPSerializer.js
@@ -20,19 +20,18 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const { Buffer } = require('buffer');
-const t = require('../../../../process/traversal');
+import { Buffer } from 'buffer';
+import { TextP } from '../../../../process/traversal.js';
-module.exports = class TextPSerializer {
+export default class TextPSerializer {
constructor(ioc) {
this.ioc = ioc;
this.ioc.serializers[ioc.DataType.TEXTP] = this;
}
canBeUsedFor(value) {
- return value instanceof t.TextP;
+ return value instanceof TextP;
}
serialize(item, fullyQualifiedFormat = true) {
@@ -127,15 +126,15 @@
cursor = cursor.slice(values_len);
if (values.length < 1) {
- return { v: new t.TextP(''), len };
+ return { v: new TextP(''), len };
}
let v;
- const TextP_static = t.TextP[name];
+ const TextP_static = TextP[name];
if (typeof TextP_static === 'function') {
v = TextP_static(...values); // it's better to follow existing logic which may depend on an operator name
} else {
- v = new t.TextP(name, ...values);
+ v = new TextP(name, ...values);
}
return { v, len };
@@ -143,4 +142,4 @@
throw this.ioc.utils.des_error({ serializer: this, args: arguments, cursor, err });
}
}
-};
+}
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/TraversalStrategySerializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/TraversalStrategySerializer.js
index bda79c5..af82ca0 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/TraversalStrategySerializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/TraversalStrategySerializer.js
@@ -20,13 +20,12 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const { Buffer } = require('buffer');
+import { Buffer } from 'buffer';
-const { TraversalStrategySerializer: GraphsonTraversalStrategySerializer } = require('../../type-serializers');
+import { TraversalStrategySerializer as GraphsonTraversalStrategySerializer } from '../../type-serializers.js';
-module.exports = class TraversalStrategySerializer {
+export default class TraversalStrategySerializer {
constructor(ioc) {
this.ioc = ioc;
this.graphsonTraversalStrategySerializer = new GraphsonTraversalStrategySerializer();
@@ -66,4 +65,4 @@
return Buffer.concat(bufs);
}
-};
+}
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/TraverserSerializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/TraverserSerializer.js
index 3d15553..1758d94 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/TraverserSerializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/TraverserSerializer.js
@@ -20,19 +20,18 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const { Buffer } = require('buffer');
-const t = require('../../../../process/traversal');
+import { Buffer } from 'buffer';
+import { Traverser } from '../../../../process/traversal.js';
-module.exports = class TraverserSerializer {
+export default class TraverserSerializer {
constructor(ioc) {
this.ioc = ioc;
this.ioc.serializers[ioc.DataType.TRAVERSER] = this;
}
canBeUsedFor(value) {
- return value instanceof t.Traverser;
+ return value instanceof Traverser;
}
serialize(item, fullyQualifiedFormat = true) {
@@ -115,10 +114,10 @@
}
cursor = cursor.slice(value_len);
- const v = new t.Traverser(value, bulk);
+ const v = new Traverser(value, bulk);
return { v, len };
} catch (err) {
throw this.ioc.utils.des_error({ serializer: this, args: arguments, cursor, err });
}
}
-};
+}
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/UnspecifiedNullSerializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/UnspecifiedNullSerializer.js
index 5fa1fc7..8fd1601 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/UnspecifiedNullSerializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/UnspecifiedNullSerializer.js
@@ -20,11 +20,10 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const { Buffer } = require('buffer');
+import { Buffer } from 'buffer';
-module.exports = class UnspecifiedNullSerializer {
+export default class UnspecifiedNullSerializer {
constructor(ioc) {
this.ioc = ioc;
this.ioc.serializers[ioc.DataType.UNSPECIFIED_NULL] = this;
@@ -74,4 +73,4 @@
throw this.ioc.utils.des_error({ serializer: this, args: arguments, cursor, err });
}
}
-};
+}
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/UuidSerializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/UuidSerializer.js
index cb050de..9bc346c 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/UuidSerializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/UuidSerializer.js
@@ -20,11 +20,10 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const { Buffer } = require('buffer');
+import { Buffer } from 'buffer';
-module.exports = class UuidSerializer {
+export default class UuidSerializer {
constructor(ioc) {
this.ioc = ioc;
this.ioc.serializers[ioc.DataType.UUID] = this;
@@ -118,4 +117,4 @@
throw this.ioc.utils.des_error({ serializer: this, args: arguments, cursor, err });
}
}
-};
+}
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/VertexPropertySerializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/VertexPropertySerializer.js
index 597c0ab..5c529d7 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/VertexPropertySerializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/VertexPropertySerializer.js
@@ -20,19 +20,18 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const { Buffer } = require('buffer');
-const g = require('../../../graph');
+import { Buffer } from 'buffer';
+import { VertexProperty } from '../../../graph.js';
-module.exports = class VertexPropertySerializer {
+export default class VertexPropertySerializer {
constructor(ioc) {
this.ioc = ioc;
this.ioc.serializers[ioc.DataType.VERTEXPROPERTY] = this;
}
canBeUsedFor(value) {
- return value instanceof g.VertexProperty;
+ return value instanceof VertexProperty;
}
serialize(item, fullyQualifiedFormat = true) {
@@ -166,11 +165,10 @@
// null properties are deserialized into empty lists
const vp_props = properties ? properties : [];
-
- const v = new g.VertexProperty(id, label, value, vp_props);
+ const v = new VertexProperty(id, label, value, vp_props);
return { v, len };
} catch (err) {
throw this.ioc.utils.des_error({ serializer: this, args: arguments, cursor, err });
}
}
-};
+}
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/VertexSerializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/VertexSerializer.js
index 65ec4e4..4171b63 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/VertexSerializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/VertexSerializer.js
@@ -20,19 +20,18 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const { Buffer } = require('buffer');
-const g = require('../../../graph');
+import { Buffer } from 'buffer';
+import { Vertex } from '../../../graph.js';
-module.exports = class VertexSerializer {
+export default class VertexSerializer {
constructor(ioc) {
this.ioc = ioc;
this.ioc.serializers[ioc.DataType.VERTEX] = this;
}
canBeUsedFor(value) {
- return value instanceof g.Vertex;
+ return value instanceof Vertex;
}
serialize(item, fullyQualifiedFormat = true) {
@@ -130,10 +129,10 @@
// null properties are deserialized into empty lists
const vertex_props = properties ? properties : [];
- const v = new g.Vertex(id, label, vertex_props);
+ const v = new Vertex(id, label, vertex_props);
return { v, len };
} catch (err) {
throw this.ioc.utils.des_error({ serializer: this, args: arguments, cursor, err });
}
}
-};
+}
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/utils.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/utils.js
index bab8fdc..4753a1f 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/utils.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/utils.js
@@ -20,14 +20,13 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const { Buffer } = require('buffer');
+import { Buffer } from 'buffer';
/*
* Deserialization error general constructor.
*/
-const des_error = ({ serializer, args, cursor, err }) => {
+export const des_error = ({ serializer, args, cursor, err }) => {
if (cursor === undefined) {
cursor = args[0]; // buffer
}
@@ -55,7 +54,3 @@
return err;
};
-
-module.exports = {
- des_error,
-};
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/graph-serializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/graph-serializer.js
deleted file mode 100644
index 188cd554..0000000
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/graph-serializer.js
+++ /dev/null
@@ -1,303 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * @author Jorge Bay Gondra
- */
-'use strict';
-
-const { Buffer } = require('buffer');
-const typeSerializers = require('./type-serializers');
-const Bytecode = require('../../process/bytecode');
-
-/**
- * GraphSON2 writer.
- */
-class GraphSON2Writer {
- /**
- * @param {Object} [options]
- * @param {Object} [options.serializers] An object used as an associative array with GraphSON 2 type name as keys and
- * serializer instances as values, ie: { 'g:Int64': longSerializer }.
- * @constructor
- */
- constructor(options) {
- this._options = options || {};
- // Create instance of the default serializers
- this._serializers = this.getDefaultSerializers().map((serializerConstructor) => {
- const s = new serializerConstructor();
- s.writer = this;
- return s;
- });
-
- const customSerializers = this._options.serializers || {};
-
- Object.keys(customSerializers).forEach((key) => {
- const s = customSerializers[key];
- if (!s.serialize) {
- return;
- }
- s.writer = this;
- // Insert custom serializers first
- this._serializers.unshift(s);
- });
- }
-
- /**
- * Gets the default serializers to be used.
- * @returns {Array}
- */
- getDefaultSerializers() {
- return graphSON2Serializers;
- }
-
- adaptObject(value) {
- let s;
-
- for (let i = 0; i < this._serializers.length; i++) {
- const currentSerializer = this._serializers[i];
- if (currentSerializer.canBeUsedFor && currentSerializer.canBeUsedFor(value)) {
- s = currentSerializer;
- break;
- }
- }
-
- if (s) {
- return s.serialize(value);
- }
-
- if (Array.isArray(value)) {
- // We need to handle arrays when there is no serializer
- // for older versions of GraphSON
- return value.map((item) => this.adaptObject(item));
- }
-
- // Default (strings / objects / ...)
- return value;
- }
-
- /**
- * Returns the GraphSON representation of the provided object instance.
- * @param {Object} obj
- * @returns {String}
- */
- write(obj) {
- return JSON.stringify(this.adaptObject(obj));
- }
-
- writeRequest({ requestId, op, processor, args }) {
- const req = {
- requestId: { '@type': 'g:UUID', '@value': requestId },
- op,
- processor,
- args: this._adaptArgs(args, true),
- };
-
- if (req.args['gremlin'] instanceof Bytecode) {
- req.args['gremlin'] = this.adaptObject(req.args['gremlin']);
- }
-
- return Buffer.from(JSON.stringify(req));
- }
-
- /**
- * Takes the given args map and ensures all arguments are passed through to adaptObject
- * @param {Object} args Map of arguments to process.
- * @param {Boolean} protocolLevel Determines whether it's a protocol level binding.
- * @returns {Object}
- * @private
- */
- _adaptArgs(args, protocolLevel) {
- if (args instanceof Object) {
- const newObj = {};
- Object.keys(args).forEach((key) => {
- // bindings key (at the protocol-level needs special handling. without this, it wraps the generated Map
- // in another map for types like EnumValue. Could be a nicer way to do this but for now it's solving the
- // problem with script submission of non JSON native types
- if (protocolLevel && key === 'bindings') {
- newObj[key] = this._adaptArgs(args[key], false);
- } else {
- newObj[key] = this.adaptObject(args[key]);
- }
- });
-
- return newObj;
- }
-
- return args;
- }
-}
-
-/**
- * GraphSON3 writer.
- */
-class GraphSON3Writer extends GraphSON2Writer {
- getDefaultSerializers() {
- return graphSON3Serializers;
- }
-}
-
-/**
- * GraphSON2 reader.
- */
-class GraphSON2Reader {
- /**
- * GraphSON Reader
- * @param {Object} [options]
- * @param {Object} [options.serializers] An object used as an associative array with GraphSON 2 type name as keys and
- * deserializer instances as values, ie: { 'g:Int64': longSerializer }.
- * @constructor
- */
- constructor(options) {
- this._options = options || {};
- this._deserializers = {};
-
- const defaultDeserializers = this.getDefaultDeserializers();
- Object.keys(defaultDeserializers).forEach((typeName) => {
- const serializerConstructor = defaultDeserializers[typeName];
- const s = new serializerConstructor();
- s.reader = this;
- this._deserializers[typeName] = s;
- });
-
- if (this._options.serializers) {
- const customSerializers = this._options.serializers || {};
- Object.keys(customSerializers).forEach((key) => {
- const s = customSerializers[key];
- if (!s.deserialize) {
- return;
- }
- s.reader = this;
- this._deserializers[key] = s;
- });
- }
- }
-
- /**
- * Gets the default deserializers as an associative array.
- * @returns {Object}
- */
- getDefaultDeserializers() {
- return graphSON2Deserializers;
- }
-
- read(obj) {
- if (obj === undefined) {
- return undefined;
- }
- if (obj === null) {
- return null;
- }
- if (Array.isArray(obj)) {
- return obj.map((item) => this.read(item));
- }
- const type = obj[typeSerializers.typeKey];
- if (type) {
- const d = this._deserializers[type];
- if (d) {
- // Use type serializer
- return d.deserialize(obj);
- }
- return obj[typeSerializers.valueKey];
- }
- if (obj && typeof obj === 'object' && obj.constructor === Object) {
- return this._deserializeObject(obj);
- }
- // Default (for boolean, number and other scalars)
- return obj;
- }
-
- readResponse(buffer) {
- return this.read(JSON.parse(buffer.toString()));
- }
-
- _deserializeObject(obj) {
- const keys = Object.keys(obj);
- const result = {};
- for (let i = 0; i < keys.length; i++) {
- result[keys[i]] = this.read(obj[keys[i]]);
- }
- return result;
- }
-}
-
-/**
- * GraphSON3 reader.
- */
-class GraphSON3Reader extends GraphSON2Reader {
- getDefaultDeserializers() {
- return graphSON3Deserializers;
- }
-}
-
-const graphSON2Deserializers = {
- 'g:Traverser': typeSerializers.TraverserSerializer,
- 'g:TraversalStrategy': typeSerializers.TraversalStrategySerializer,
- 'g:Int32': typeSerializers.NumberSerializer,
- 'g:Int64': typeSerializers.NumberSerializer,
- 'g:Float': typeSerializers.NumberSerializer,
- 'g:Double': typeSerializers.NumberSerializer,
- 'g:Date': typeSerializers.DateSerializer,
- 'gx:OffsetDateTime': typeSerializers.OffsetDateTimeSerializer,
- 'g:Direction': typeSerializers.DirectionSerializer,
- 'g:Vertex': typeSerializers.VertexSerializer,
- 'g:Edge': typeSerializers.EdgeSerializer,
- 'g:VertexProperty': typeSerializers.VertexPropertySerializer,
- 'g:Property': typeSerializers.PropertySerializer,
- 'g:Path': typeSerializers.Path3Serializer,
- 'g:TextP': typeSerializers.TextPSerializer,
- 'g:T': typeSerializers.TSerializer,
- 'g:BulkSet': typeSerializers.BulkSetSerializer,
-};
-
-const graphSON3Deserializers = Object.assign({}, graphSON2Deserializers, {
- 'g:List': typeSerializers.ListSerializer,
- 'g:Set': typeSerializers.SetSerializer,
- 'g:Map': typeSerializers.MapSerializer,
-});
-
-const graphSON2Serializers = [
- typeSerializers.NumberSerializer,
- typeSerializers.OffsetDateTimeSerializer,
- typeSerializers.BytecodeSerializer,
- typeSerializers.TraverserSerializer,
- typeSerializers.TraversalStrategySerializer,
- typeSerializers.PSerializer,
- typeSerializers.TextPSerializer,
- typeSerializers.ClassSerializer,
- typeSerializers.LambdaSerializer,
- typeSerializers.EnumSerializer,
- typeSerializers.VertexSerializer,
- typeSerializers.EdgeSerializer,
- typeSerializers.LongSerializer,
-];
-
-const graphSON3Serializers = graphSON2Serializers.concat([
- typeSerializers.ListSerializer,
- typeSerializers.SetSerializer,
- typeSerializers.MapSerializer,
-]);
-
-module.exports = {
- GraphSON3Writer,
- GraphSON3Reader,
- GraphSON2Writer,
- GraphSON2Reader,
- GraphSONWriter: GraphSON3Writer,
- GraphSONReader: GraphSON3Reader,
-};
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/graph-serializer.ts b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/graph-serializer.ts
new file mode 100644
index 0000000..b780cb6
--- /dev/null
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/graph-serializer.ts
@@ -0,0 +1,340 @@
+/*
+ * 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.
+ */
+
+/**
+ * @author Jorge Bay Gondra
+ */
+
+import { Buffer } from 'buffer';
+import Bytecode from '../../process/bytecode.js';
+import {
+ BulkSetSerializer,
+ BytecodeSerializer,
+ DateSerializer,
+ OffsetDateTimeSerializer,
+ DirectionSerializer,
+ EdgeSerializer,
+ EnumSerializer,
+ LambdaSerializer,
+ ListSerializer,
+ LongSerializer,
+ MapSerializer,
+ NumberSerializer,
+ PSerializer,
+ Path3Serializer,
+ PropertySerializer,
+ SetSerializer,
+ TSerializer,
+ TextPSerializer,
+ TraversalStrategySerializer,
+ TraverserSerializer,
+ TypeSerializer,
+ VertexPropertySerializer,
+ VertexSerializer,
+ typeKey,
+ valueKey,
+} from './type-serializers.js';
+
+export type GraphWriterOptions = {
+ serializers?: Record<string, TypeSerializer<any>>;
+};
+
+/**
+ * GraphSON2 writer.
+ */
+export class GraphSON2Writer {
+ private readonly _serializers: TypeSerializer<any>[];
+
+ /**
+ * @param {GraphWriterOptions} [options]
+ * @param {TypeSerializer} [options.serializers] An object used as an associative array with GraphSON 2 type name as keys and
+ * serializer instances as values, ie: { 'g:Int64': longSerializer }.
+ * @constructor
+ */
+ constructor(private readonly options: GraphWriterOptions = {}) {
+ // Create instance of the default serializers
+ this._serializers = this.getDefaultSerializers().map((serializerConstructor) => {
+ const s = new serializerConstructor();
+ s.writer = this;
+ return s;
+ });
+
+ const customSerializers = this.options.serializers || {};
+
+ Object.keys(customSerializers).forEach((key) => {
+ const s = customSerializers[key];
+ if (!s.serialize) {
+ return;
+ }
+ s.writer = this;
+ // Insert custom serializers first
+ this._serializers.unshift(s);
+ });
+ }
+
+ /**
+ * Gets the default serializers to be used.
+ * @returns {Array}
+ */
+ getDefaultSerializers(): any[] {
+ return graphSON2Serializers;
+ }
+
+ adaptObject<T>(value: T): any {
+ let s;
+
+ for (let i = 0; i < this._serializers.length; i++) {
+ const currentSerializer = this._serializers[i];
+ if (currentSerializer.canBeUsedFor?.(value)) {
+ s = currentSerializer;
+ break;
+ }
+ }
+
+ if (s) {
+ return s.serialize(value);
+ }
+
+ if (Array.isArray(value)) {
+ // We need to handle arrays when there is no serializer
+ // for older versions of GraphSON
+ return value.map((item) => this.adaptObject(item));
+ }
+
+ // Default (strings / objects / ...)
+ return value;
+ }
+
+ /**
+ * Returns the GraphSON representation of the provided object instance.
+ * @param {Object} obj
+ * @returns {String}
+ */
+ write<T>(obj: T): string {
+ return JSON.stringify(this.adaptObject(obj));
+ }
+
+ writeRequest({
+ requestId,
+ op,
+ processor,
+ args,
+ }: {
+ processor: string | undefined;
+ op: string;
+ args: any;
+ requestId?: string | null;
+ }) {
+ const req = {
+ requestId: { '@type': 'g:UUID', '@value': requestId },
+ op,
+ processor,
+ args: this._adaptArgs(args, true),
+ };
+
+ if (req.args['gremlin'] instanceof Bytecode) {
+ req.args['gremlin'] = this.adaptObject(req.args['gremlin']);
+ }
+
+ return Buffer.from(JSON.stringify(req));
+ }
+
+ /**
+ * Takes the given args map and ensures all arguments are passed through to adaptObject
+ * @param {Object} args Map of arguments to process.
+ * @param {Boolean} protocolLevel Determines whether it's a protocol level binding.
+ * @returns {Object}
+ * @private
+ */
+ _adaptArgs<T extends Record<string, any>>(args: T, protocolLevel: boolean): T {
+ if (args instanceof Object) {
+ const newObj: Record<string, any> = {};
+ Object.keys(args).forEach((key) => {
+ // bindings key (at the protocol-level needs special handling. without this, it wraps the generated Map
+ // in another map for types like EnumValue. Could be a nicer way to do this but for now it's solving the
+ // problem with script submission of non JSON native types
+ if (protocolLevel && key === 'bindings') {
+ newObj[key] = this._adaptArgs(args[key], false);
+ } else {
+ newObj[key] = this.adaptObject(args[key]);
+ }
+ });
+
+ return newObj as T;
+ }
+
+ return args;
+ }
+}
+
+/**
+ * GraphSON3 writer.
+ */
+export class GraphSON3Writer extends GraphSON2Writer {
+ getDefaultSerializers() {
+ return graphSON3Serializers;
+ }
+}
+
+export type GraphReaderOptions = {
+ serializers?: Record<string, TypeSerializer<any>>;
+};
+
+/**
+ * GraphSON2 reader.
+ */
+export class GraphSON2Reader {
+ private readonly _deserializers: Record<string, TypeSerializer<any>>;
+
+ /**
+ * GraphSON Reader
+ * @param {GraphReaderOptions} [options]
+ * @param {TypeSerializer} [options.serializers] An object used as an associative array with GraphSON 2 type name as keys and
+ * deserializer instances as values, ie: { 'g:Int64': longSerializer }.
+ * @constructor
+ */
+ constructor(private readonly options: GraphReaderOptions = {}) {
+ this._deserializers = {};
+
+ const defaultDeserializers = this.getDefaultDeserializers();
+ Object.keys(defaultDeserializers).forEach((typeName) => {
+ const serializerConstructor = defaultDeserializers[typeName as keyof typeof defaultDeserializers];
+ const s = new serializerConstructor();
+ s.reader = this;
+ this._deserializers[typeName] = s;
+ });
+
+ if (this.options.serializers) {
+ const customSerializers = this.options.serializers || {};
+ Object.keys(customSerializers).forEach((key) => {
+ const s = customSerializers[key];
+ if (!s.deserialize) {
+ return;
+ }
+ s.reader = this;
+ this._deserializers[key] = s;
+ });
+ }
+ }
+
+ /**
+ * Gets the default deserializers as an associative array.
+ */
+ getDefaultDeserializers() {
+ return graphSON2Deserializers;
+ }
+
+ read(obj: any): any {
+ if (obj === undefined) {
+ return undefined;
+ }
+ if (obj === null) {
+ return null;
+ }
+ if (Array.isArray(obj)) {
+ return obj.map((item: any) => this.read(item));
+ }
+ const type = obj[typeKey];
+ if (type) {
+ const d = this._deserializers[type];
+ if (d) {
+ // Use type serializer
+ return d.deserialize(obj);
+ }
+ return obj[valueKey];
+ }
+ if (obj && typeof obj === 'object' && obj.constructor === Object) {
+ return this._deserializeObject(obj);
+ }
+ // Default (for boolean, number and other scalars)
+ return obj;
+ }
+
+ readResponse(buffer: Buffer) {
+ return this.read(JSON.parse(buffer.toString()));
+ }
+
+ _deserializeObject<T extends Record<any, any>>(obj: T) {
+ const keys = Object.keys(obj);
+ const result = {};
+ for (let i = 0; i < keys.length; i++) {
+ // @ts-ignore
+ result[keys[i]] = this.read(obj[keys[i]]);
+ }
+ return result;
+ }
+}
+
+/**
+ * GraphSON3 reader.
+ */
+export class GraphSON3Reader extends GraphSON2Reader {
+ getDefaultDeserializers() {
+ return graphSON3Deserializers;
+ }
+}
+
+const graphSON2Deserializers = {
+ 'g:Traverser': TraverserSerializer,
+ 'g:TraversalStrategy': TraversalStrategySerializer,
+ 'g:Int32': NumberSerializer,
+ 'g:Int64': NumberSerializer,
+ 'g:Float': NumberSerializer,
+ 'g:Double': NumberSerializer,
+ 'g:Date': DateSerializer,
+ 'gx:OffsetDateTime': OffsetDateTimeSerializer,
+ 'g:Direction': DirectionSerializer,
+ 'g:Vertex': VertexSerializer,
+ 'g:Edge': EdgeSerializer,
+ 'g:VertexProperty': VertexPropertySerializer,
+ 'g:Property': PropertySerializer,
+ 'g:Path': Path3Serializer,
+ 'g:TextP': TextPSerializer,
+ 'g:T': TSerializer,
+ 'g:BulkSet': BulkSetSerializer,
+};
+
+const graphSON3Deserializers = Object.assign({}, graphSON2Deserializers, {
+ 'g:List': ListSerializer,
+ 'g:Set': SetSerializer,
+ 'g:Map': MapSerializer,
+});
+
+const graphSON2Serializers = [
+ NumberSerializer,
+ DateSerializer,
+ OffsetDateTimeSerializer,
+ BytecodeSerializer,
+ TraverserSerializer,
+ TraversalStrategySerializer,
+ PSerializer,
+ TextPSerializer,
+ LambdaSerializer,
+ EnumSerializer,
+ VertexSerializer,
+ EdgeSerializer,
+ LongSerializer,
+];
+
+// @ts-expect-error
+const graphSON3Serializers = graphSON2Serializers.concat([ListSerializer, SetSerializer, MapSerializer]);
+
+export const GraphSONWriter = GraphSON3Writer;
+
+export const GraphSONReader = GraphSON3Reader;
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/type-serializers.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/type-serializers.js
deleted file mode 100644
index 22166a6..0000000
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/type-serializers.js
+++ /dev/null
@@ -1,547 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * @author Jorge Bay Gondra
- */
-'use strict';
-
-const t = require('../../process/traversal');
-const ts = require('../../process/traversal-strategy');
-const Bytecode = require('../../process/bytecode');
-const g = require('../graph');
-const utils = require('../../utils');
-
-const valueKey = '@value';
-const typeKey = '@type';
-
-/**
- * @abstract
- */
-class TypeSerializer {
- serialize() {
- throw new Error('serialize() method not implemented for ' + this.constructor.name);
- }
-
- deserialize() {
- throw new Error('deserialize() method not implemented for ' + this.constructor.name);
- }
-
- canBeUsedFor() {
- throw new Error('canBeUsedFor() method not implemented for ' + this.constructor.name);
- }
-}
-
-class NumberSerializer extends TypeSerializer {
- serialize(item) {
- if (isNaN(item)) {
- return {
- [typeKey]: 'g:Double',
- [valueKey]: 'NaN',
- };
- } else if (item === Number.POSITIVE_INFINITY) {
- return {
- [typeKey]: 'g:Double',
- [valueKey]: 'Infinity',
- };
- } else if (item === Number.NEGATIVE_INFINITY) {
- return {
- [typeKey]: 'g:Double',
- [valueKey]: '-Infinity',
- };
- }
- return item;
- }
-
- deserialize(obj) {
- const val = obj[valueKey];
- if (val === 'NaN') {
- return NaN;
- } else if (val === 'Infinity') {
- return Number.POSITIVE_INFINITY;
- } else if (val === '-Infinity') {
- return Number.NEGATIVE_INFINITY;
- }
- return parseFloat(val);
- }
-
- canBeUsedFor(value) {
- return typeof value === 'number';
- }
-}
-
-class DateSerializer extends TypeSerializer {
- // only deserialize g:Date objects
- deserialize(obj) {
- return new Date(obj[valueKey]);
- }
-}
-
-class OffsetDateTimeSerializer extends TypeSerializer {
- // Date objects are serialized as OffsetDateTime by default
- serialize(item) {
- return {
- [typeKey]: 'gx:OffsetDateTime',
- [valueKey]: item.toISOString(),
- };
- }
-
- deserialize(obj) {
- return new Date(obj[valueKey]);
- }
-
- canBeUsedFor(value) {
- return value instanceof Date;
- }
-}
-
-class ClassSerializer extends TypeSerializer {
- serialize(item) {
- return {
- [typeKey]: 'g:Class',
- [valueKey]: new item().fqcn,
- };
- }
-
- canBeUsedFor(value) {
- return (
- typeof value === 'function' &&
- !!value.prototype &&
- !!value.prototype.constructor.name &&
- new value() instanceof ts.TraversalStrategy
- );
- }
-}
-
-class LongSerializer extends TypeSerializer {
- serialize(item) {
- return {
- [typeKey]: 'g:Int64',
- [valueKey]: item.value,
- };
- }
-
- canBeUsedFor(value) {
- return value instanceof utils.Long;
- }
-}
-
-class BytecodeSerializer extends TypeSerializer {
- serialize(item) {
- let bytecode = item;
- if (item instanceof t.Traversal) {
- bytecode = item.getBytecode();
- }
- const result = {};
- result[typeKey] = 'g:Bytecode';
- const resultValue = (result[valueKey] = {});
- const sources = this._serializeInstructions(bytecode.sourceInstructions);
- if (sources) {
- resultValue['source'] = sources;
- }
- const steps = this._serializeInstructions(bytecode.stepInstructions);
- if (steps) {
- resultValue['step'] = steps;
- }
- return result;
- }
-
- _serializeInstructions(instructions) {
- if (instructions.length === 0) {
- return null;
- }
- const result = new Array(instructions.length);
- result[0] = instructions[0];
- for (let i = 0; i < instructions.length; i++) {
- result[i] = instructions[i].map((item) => this.writer.adaptObject(item));
- }
- return result;
- }
-
- canBeUsedFor(value) {
- return value instanceof Bytecode || value instanceof t.Traversal;
- }
-}
-
-class PSerializer extends TypeSerializer {
- /** @param {P} item */
- serialize(item) {
- const result = {};
- result[typeKey] = 'g:P';
- const resultValue = (result[valueKey] = {
- predicate: item.operator,
- });
- if (item.other === undefined || item.other === null) {
- resultValue['value'] = this.writer.adaptObject(item.value);
- } else {
- resultValue['value'] = [this.writer.adaptObject(item.value), this.writer.adaptObject(item.other)];
- }
- return result;
- }
-
- canBeUsedFor(value) {
- return value instanceof t.P;
- }
-}
-
-class TextPSerializer extends TypeSerializer {
- /** @param {TextP} item */
- serialize(item) {
- const result = {};
- result[typeKey] = 'g:TextP';
- const resultValue = (result[valueKey] = {
- predicate: item.operator,
- });
- if (item.other === undefined || item.other === null) {
- resultValue['value'] = this.writer.adaptObject(item.value);
- } else {
- resultValue['value'] = [this.writer.adaptObject(item.value), this.writer.adaptObject(item.other)];
- }
- return result;
- }
-
- canBeUsedFor(value) {
- return value instanceof t.TextP;
- }
-}
-
-class LambdaSerializer extends TypeSerializer {
- /** @param {Function} item */
- serialize(item) {
- const lambdaDef = item();
-
- // check if the language is specified otherwise assume gremlin-groovy.
- const returnIsString = typeof lambdaDef === 'string';
- const script = returnIsString ? lambdaDef : lambdaDef[0];
- const lang = returnIsString ? 'gremlin-groovy' : lambdaDef[1];
-
- // detect argument count
- const argCount =
- lang === 'gremlin-groovy' && script.includes('->')
- ? script.substring(0, script.indexOf('->')).includes(',')
- ? 2
- : 1
- : -1;
-
- return {
- [typeKey]: 'g:Lambda',
- [valueKey]: {
- arguments: argCount,
- language: lang,
- script: script,
- },
- };
- }
-
- canBeUsedFor(value) {
- return typeof value === 'function';
- }
-}
-
-class EnumSerializer extends TypeSerializer {
- /** @param {EnumValue} item */
- serialize(item) {
- return {
- [typeKey]: 'g:' + item.typeName,
- [valueKey]: item.elementName,
- };
- }
-
- canBeUsedFor(value) {
- return value && value.typeName && value instanceof t.EnumValue;
- }
-}
-
-class TraverserSerializer extends TypeSerializer {
- /** @param {Traverser} item */
- serialize(item) {
- return {
- [typeKey]: 'g:Traverser',
- [valueKey]: {
- value: this.writer.adaptObject(item.object),
- bulk: this.writer.adaptObject(item.bulk),
- },
- };
- }
-
- deserialize(obj) {
- const value = obj[valueKey];
- return new t.Traverser(this.reader.read(value['value']), this.reader.read(value['bulk']));
- }
-
- canBeUsedFor(value) {
- return value instanceof t.Traverser;
- }
-}
-
-class TraversalStrategySerializer extends TypeSerializer {
- /** @param {TraversalStrategy} item */
- serialize(item) {
- const conf = {};
- for (const k in item.configuration) {
- if (item.configuration.hasOwnProperty(k)) {
- conf[k] = this.writer.adaptObject(item.configuration[k]);
- }
- }
-
- return {
- [typeKey]: 'g:' + item.constructor.name,
- [valueKey]: { ['fqcn']: item.fqcn, ['conf']: conf },
- };
- }
-
- canBeUsedFor(value) {
- return value instanceof ts.TraversalStrategy;
- }
-}
-
-class VertexSerializer extends TypeSerializer {
- deserialize(obj) {
- const value = obj[valueKey];
- return new g.Vertex(this.reader.read(value['id']), value['label'], this.reader.read(value['properties']));
- }
-
- /** @param {Vertex} item */
- serialize(item) {
- return {
- [typeKey]: 'g:Vertex',
- [valueKey]: {
- id: this.writer.adaptObject(item.id),
- label: item.label,
- },
- };
- }
-
- canBeUsedFor(value) {
- return value instanceof g.Vertex;
- }
-}
-
-class VertexPropertySerializer extends TypeSerializer {
- deserialize(obj) {
- const value = obj[valueKey];
- return new g.VertexProperty(
- this.reader.read(value['id']),
- value['label'],
- this.reader.read(value['value']),
- this.reader.read(value['properties']),
- );
- }
-}
-
-class PropertySerializer extends TypeSerializer {
- deserialize(obj) {
- const value = obj[valueKey];
- return new g.Property(value['key'], this.reader.read(value['value']));
- }
-}
-
-class EdgeSerializer extends TypeSerializer {
- deserialize(obj) {
- const value = obj[valueKey];
- return new g.Edge(
- this.reader.read(value['id']),
- new g.Vertex(this.reader.read(value['outV']), this.reader.read(value['outVLabel'])),
- value['label'],
- new g.Vertex(this.reader.read(value['inV']), this.reader.read(value['inVLabel'])),
- this.reader.read(value['properties']),
- );
- }
-
- /** @param {Edge} item */
- serialize(item) {
- return {
- [typeKey]: 'g:Edge',
- [valueKey]: {
- id: this.writer.adaptObject(item.id),
- label: item.label,
- outV: this.writer.adaptObject(item.outV.id),
- outVLabel: item.outV.label,
- inV: this.writer.adaptObject(item.inV.id),
- inVLabel: item.inV.label,
- },
- };
- }
-
- canBeUsedFor(value) {
- return value instanceof g.Edge;
- }
-}
-
-class PathSerializer extends TypeSerializer {
- deserialize(obj) {
- const value = obj[valueKey];
- const objects = value['objects'].map((o) => this.reader.read(o));
- return new g.Path(this.reader.read(value['labels']), objects);
- }
-}
-
-class Path3Serializer extends TypeSerializer {
- deserialize(obj) {
- const value = obj[valueKey];
- return new g.Path(this.reader.read(value['labels']), this.reader.read(value['objects']));
- }
-}
-
-class TSerializer extends TypeSerializer {
- deserialize(obj) {
- return t.t[obj[valueKey]];
- }
-}
-
-class DirectionSerializer extends TypeSerializer {
- deserialize(obj) {
- return t.direction[obj[valueKey].toLowerCase()];
- }
-}
-
-class ArraySerializer extends TypeSerializer {
- constructor(typeKey) {
- super();
- this.typeKey = typeKey;
- }
-
- deserialize(obj) {
- const value = obj[valueKey];
- if (!Array.isArray(value)) {
- throw new Error('Expected Array, obtained: ' + value);
- }
- return value.map((x) => this.reader.read(x));
- }
-
- /** @param {Array} item */
- serialize(item) {
- return {
- [typeKey]: this.typeKey,
- [valueKey]: item.map((x) => this.writer.adaptObject(x)),
- };
- }
-
- canBeUsedFor(value) {
- return Array.isArray(value);
- }
-}
-
-class BulkSetSerializer extends TypeSerializer {
- deserialize(obj) {
- const value = obj[valueKey];
- if (!Array.isArray(value)) {
- throw new Error('Expected Array, obtained: ' + value);
- }
-
- // coerce the BulkSet to List. if the bulk exceeds the int space then we can't coerce to List anyway,
- // so this query will be trouble. we'd need a legit BulkSet implementation here in js. this current
- // implementation is here to replicate the previous functionality that existed on the server side in
- // previous versions.
- let result = [];
- for (let ix = 0, iy = value.length; ix < iy; ix += 2) {
- const pair = value.slice(ix, ix + 2);
- result = result.concat(Array(this.reader.read(pair[1])).fill(this.reader.read(pair[0])));
- }
-
- return result;
- }
-}
-
-class MapSerializer extends TypeSerializer {
- deserialize(obj) {
- const value = obj[valueKey];
- if (!Array.isArray(value)) {
- throw new Error('Expected Array, obtained: ' + value);
- }
- const result = new Map();
- for (let i = 0; i < value.length; i += 2) {
- result.set(this.reader.read(value[i]), this.reader.read(value[i + 1]));
- }
- return result;
- }
-
- /** @param {Map} map */
- serialize(map) {
- const arr = [];
- map.forEach((v, k) => {
- arr.push(this.writer.adaptObject(k));
- arr.push(this.writer.adaptObject(v));
- });
- return {
- [typeKey]: 'g:Map',
- [valueKey]: arr,
- };
- }
-
- canBeUsedFor(value) {
- return value instanceof Map;
- }
-}
-
-class ListSerializer extends ArraySerializer {
- constructor() {
- super('g:List');
- }
-}
-
-class SetSerializer extends ArraySerializer {
- constructor() {
- super('g:Set');
- }
-
- deserialize(obj) {
- return new Set(super.deserialize(obj));
- }
-
- serialize(item) {
- return {
- [typeKey]: this.typeKey,
- [valueKey]: [...item].map((x) => this.writer.adaptObject(x)),
- };
- }
-
- canBeUsedFor(value) {
- return value instanceof Set;
- }
-}
-
-module.exports = {
- BulkSetSerializer,
- BytecodeSerializer,
- ClassSerializer,
- DateSerializer,
- OffsetDateTimeSerializer,
- DirectionSerializer,
- EdgeSerializer,
- EnumSerializer,
- LambdaSerializer,
- ListSerializer,
- LongSerializer,
- MapSerializer,
- NumberSerializer,
- Path3Serializer,
- PathSerializer,
- PropertySerializer,
- PSerializer,
- TextPSerializer,
- SetSerializer,
- TSerializer,
- TraverserSerializer,
- TraversalStrategySerializer,
- typeKey,
- valueKey,
- VertexPropertySerializer,
- VertexSerializer,
-};
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/type-serializers.ts b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/type-serializers.ts
new file mode 100644
index 0000000..0c08332
--- /dev/null
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/type-serializers.ts
@@ -0,0 +1,512 @@
+/*
+ * 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.
+ */
+
+/**
+ * @author Jorge Bay Gondra
+ */
+
+import * as t from '../../process/traversal.js';
+import * as ts from '../../process/traversal-strategy.js';
+import Bytecode from '../../process/bytecode.js';
+import * as g from '../graph.js';
+import * as utils from '../../utils.js';
+
+export const valueKey = '@value';
+export const typeKey = '@type';
+
+export type SerializedValue = { [typeKey]: string; [valueKey]: any };
+
+/**
+ * @abstract
+ */
+export class TypeSerializer<T = any> {
+ reader: any;
+ writer: any;
+
+ serialize(value: T): T | SerializedValue {
+ throw new Error('serialize() method not implemented for ' + this.constructor.name);
+ }
+
+ deserialize<TObject extends SerializedValue>(value: TObject): T {
+ throw new Error('deserialize() method not implemented for ' + this.constructor.name);
+ }
+
+ canBeUsedFor?(value: unknown): boolean {
+ throw new Error('canBeUsedFor() method not implemented for ' + this.constructor.name);
+ }
+}
+
+export class NumberSerializer extends TypeSerializer<number> {
+ serialize(item: number) {
+ if (isNaN(item)) {
+ return {
+ [typeKey]: 'g:Double',
+ [valueKey]: 'NaN',
+ };
+ } else if (item === Number.POSITIVE_INFINITY) {
+ return {
+ [typeKey]: 'g:Double',
+ [valueKey]: 'Infinity',
+ };
+ } else if (item === Number.NEGATIVE_INFINITY) {
+ return {
+ [typeKey]: 'g:Double',
+ [valueKey]: '-Infinity',
+ };
+ }
+ return item;
+ }
+
+ deserialize(obj: SerializedValue) {
+ const val = obj[valueKey];
+ if (val === 'NaN') {
+ return NaN;
+ } else if (val === 'Infinity') {
+ return Number.POSITIVE_INFINITY;
+ } else if (val === '-Infinity') {
+ return Number.NEGATIVE_INFINITY;
+ }
+ return parseFloat(val);
+ }
+
+ canBeUsedFor(value: unknown) {
+ return typeof value === 'number';
+ }
+}
+// consolidate into DateTime when implementing HTTP for js
+export class DateSerializer extends TypeSerializer<Date> {
+ serialize(item: Date) {
+ return {
+ [typeKey]: 'g:Date',
+ [valueKey]: item.getTime(),
+ };
+ }
+
+ deserialize(obj: SerializedValue) {
+ return new Date(obj[valueKey]);
+ }
+
+ canBeUsedFor(value: unknown) {
+ return value instanceof Date;
+ }
+}
+
+export class OffsetDateTimeSerializer extends TypeSerializer<Date> {
+ serialize(item: Date) {
+ return {
+ [typeKey]: 'gx:OffsetDateTime',
+ [valueKey]: item.getTime(),
+ };
+ }
+
+ deserialize(obj: SerializedValue) {
+ return new Date(obj[valueKey]);
+ }
+
+ canBeUsedFor(value: unknown) {
+ return value instanceof Date;
+ }
+}
+
+export class LongSerializer extends TypeSerializer<utils.Long> {
+ serialize(item: utils.Long) {
+ return {
+ [typeKey]: 'g:Int64',
+ [valueKey]: item.value,
+ };
+ }
+
+ canBeUsedFor(value: unknown) {
+ return value instanceof utils.Long;
+ }
+}
+
+export class BytecodeSerializer extends TypeSerializer<Bytecode> {
+ serialize(item: Bytecode) {
+ let bytecode = item;
+ if (item instanceof t.Traversal) {
+ bytecode = item.getBytecode();
+ }
+ const result: Partial<SerializedValue> = {};
+ result[typeKey] = 'g:Bytecode';
+ const resultValue: any = (result[valueKey] = {});
+ const sources = this._serializeInstructions(bytecode.sourceInstructions);
+ if (sources) {
+ resultValue['source'] = sources;
+ }
+ const steps = this._serializeInstructions(bytecode.stepInstructions);
+ if (steps) {
+ resultValue['step'] = steps;
+ }
+ return result as SerializedValue;
+ }
+
+ _serializeInstructions(instructions: any[]) {
+ if (instructions.length === 0) {
+ return null;
+ }
+ const result = new Array(instructions.length);
+ result[0] = instructions[0];
+ for (let i = 0; i < instructions.length; i++) {
+ result[i] = instructions[i].map((item: unknown) => this.writer.adaptObject(item));
+ }
+ return result;
+ }
+
+ canBeUsedFor(value: unknown) {
+ return value instanceof Bytecode || value instanceof t.Traversal;
+ }
+}
+
+export class PSerializer extends TypeSerializer<t.P> {
+ /** @param {P} item */
+ serialize(item: t.P) {
+ const result: Partial<SerializedValue> = {};
+ result[typeKey] = 'g:P';
+ const resultValue: any = (result[valueKey] = {
+ predicate: item.operator,
+ });
+ if (item.other === undefined || item.other === null) {
+ resultValue['value'] = this.writer.adaptObject(item.value);
+ } else {
+ resultValue['value'] = [this.writer.adaptObject(item.value), this.writer.adaptObject(item.other)];
+ }
+ return result as SerializedValue;
+ }
+
+ canBeUsedFor(value: unknown) {
+ return value instanceof t.P;
+ }
+}
+
+export class TextPSerializer extends TypeSerializer<t.TextP> {
+ /** @param {TextP} item */
+ serialize(item: t.TextP) {
+ const result: Partial<SerializedValue> = {};
+ result[typeKey] = 'g:TextP';
+ const resultValue: any = (result[valueKey] = {
+ predicate: item.operator,
+ });
+ if (item.other === undefined || item.other === null) {
+ resultValue['value'] = this.writer.adaptObject(item.value);
+ } else {
+ resultValue['value'] = [this.writer.adaptObject(item.value), this.writer.adaptObject(item.other)];
+ }
+ return result as SerializedValue;
+ }
+
+ canBeUsedFor(value: unknown) {
+ return value instanceof t.TextP;
+ }
+}
+
+export class LambdaSerializer extends TypeSerializer<() => unknown[]> {
+ /** @param {Function} item */
+ serialize(item: () => any[]) {
+ const lambdaDef = item();
+
+ // check if the language is specified otherwise assume gremlin-groovy.
+ const returnIsString = typeof lambdaDef === 'string';
+ const script = returnIsString ? lambdaDef : lambdaDef[0];
+ const lang = returnIsString ? 'gremlin-groovy' : lambdaDef[1];
+
+ // detect argument count
+ const argCount =
+ lang === 'gremlin-groovy' && script.includes('->')
+ ? script.substring(0, script.indexOf('->')).includes(',')
+ ? 2
+ : 1
+ : -1;
+
+ return {
+ [typeKey]: 'g:Lambda',
+ [valueKey]: {
+ arguments: argCount,
+ language: lang,
+ script: script,
+ },
+ };
+ }
+
+ canBeUsedFor(value: unknown) {
+ return typeof value === 'function';
+ }
+}
+
+export class EnumSerializer extends TypeSerializer<t.EnumValue> {
+ /** @param {EnumValue} item */
+ serialize(item: t.EnumValue) {
+ return {
+ [typeKey]: 'g:' + item.typeName,
+ [valueKey]: item.elementName,
+ };
+ }
+
+ canBeUsedFor(value: unknown) {
+ return value && (value as any).typeName && value instanceof t.EnumValue;
+ }
+}
+
+export class TraverserSerializer extends TypeSerializer<t.Traverser> {
+ /** @param {Traverser} item */
+ serialize(item: t.Traverser) {
+ return {
+ [typeKey]: 'g:Traverser',
+ [valueKey]: {
+ value: this.writer.adaptObject(item.object),
+ bulk: this.writer.adaptObject(item.bulk),
+ },
+ };
+ }
+
+ deserialize(obj: SerializedValue) {
+ const value = obj[valueKey];
+ return new t.Traverser(this.reader.read(value['value']), this.reader.read(value['bulk']));
+ }
+
+ canBeUsedFor(value: unknown) {
+ return value instanceof t.Traverser;
+ }
+}
+
+export class TraversalStrategySerializer extends TypeSerializer<ts.TraversalStrategy> {
+ /** @param {TraversalStrategy} item */
+ serialize(item: ts.TraversalStrategy) {
+ const conf: ts.TraversalStrategyConfiguration = {};
+ for (const k in item.configuration) {
+ if (item.configuration.hasOwnProperty(k)) {
+ conf[k] = this.writer.adaptObject(item.configuration[k]);
+ }
+ }
+
+ return {
+ [typeKey]: 'g:' + item.constructor.name,
+ [valueKey]: { ['fqcn']: item.fqcn, ['conf']: conf },
+ };
+ }
+
+ canBeUsedFor(value: unknown) {
+ return value instanceof ts.TraversalStrategy;
+ }
+}
+
+export class VertexSerializer extends TypeSerializer<g.Vertex> {
+ deserialize(obj: SerializedValue) {
+ const value = obj[valueKey];
+ return new g.Vertex(this.reader.read(value['id']), value['label'], this.reader.read(value['properties']));
+ }
+
+ /** @param {Vertex} item */
+ serialize(item: g.Vertex) {
+ return {
+ [typeKey]: 'g:Vertex',
+ [valueKey]: {
+ id: this.writer.adaptObject(item.id),
+ label: item.label,
+ },
+ };
+ }
+
+ canBeUsedFor(value: unknown) {
+ return value instanceof g.Vertex;
+ }
+}
+
+export class VertexPropertySerializer extends TypeSerializer<g.VertexProperty> {
+ deserialize(obj: SerializedValue) {
+ const value = obj[valueKey];
+ return new g.VertexProperty(
+ this.reader.read(value['id']),
+ value['label'],
+ this.reader.read(value['value']),
+ this.reader.read(value['properties']),
+ );
+ }
+}
+
+export class PropertySerializer extends TypeSerializer<g.Property> {
+ deserialize(obj: SerializedValue) {
+ const value = obj[valueKey];
+ return new g.Property(value['key'], this.reader.read(value['value']));
+ }
+}
+
+export class EdgeSerializer extends TypeSerializer<g.Edge> {
+ deserialize(obj: SerializedValue) {
+ const value = obj[valueKey];
+ return new g.Edge(
+ this.reader.read(value['id']),
+ new g.Vertex(this.reader.read(value['outV']), this.reader.read(value['outVLabel'])),
+ value['label'],
+ new g.Vertex(this.reader.read(value['inV']), this.reader.read(value['inVLabel'])),
+ this.reader.read(value['properties']),
+ );
+ }
+
+ /** @param {Edge} item */
+ serialize(item: g.Edge) {
+ return {
+ [typeKey]: 'g:Edge',
+ [valueKey]: {
+ id: this.writer.adaptObject(item.id),
+ label: item.label,
+ outV: this.writer.adaptObject(item.outV.id),
+ outVLabel: item.outV.label,
+ inV: this.writer.adaptObject(item.inV.id),
+ inVLabel: item.inV.label,
+ },
+ };
+ }
+
+ canBeUsedFor(value: unknown) {
+ return value instanceof g.Edge;
+ }
+}
+
+export class PathSerializer extends TypeSerializer<g.Path> {
+ deserialize(obj: SerializedValue) {
+ const value = obj[valueKey];
+ const objects = value['objects'].map((o: unknown) => this.reader.read(o));
+ return new g.Path(this.reader.read(value['labels']), objects);
+ }
+}
+
+export class Path3Serializer extends TypeSerializer<g.Path> {
+ deserialize(obj: SerializedValue) {
+ const value = obj[valueKey];
+ return new g.Path(this.reader.read(value['labels']), this.reader.read(value['objects']));
+ }
+}
+
+export class TSerializer extends TypeSerializer<t.EnumValue> {
+ deserialize(obj: SerializedValue) {
+ return t.t[obj[valueKey]];
+ }
+}
+
+export class DirectionSerializer extends TypeSerializer<t.EnumValue> {
+ deserialize(obj: SerializedValue) {
+ return t.direction[obj[valueKey].toLowerCase()];
+ }
+}
+
+class ArraySerializer extends TypeSerializer<unknown[]> {
+ constructor(readonly typeKey: string) {
+ super();
+ }
+
+ deserialize(obj: SerializedValue) {
+ const value = obj[valueKey];
+ if (!Array.isArray(value)) {
+ throw new Error('Expected Array, obtained: ' + value);
+ }
+ return value.map((x) => this.reader.read(x));
+ }
+
+ /** @param {Array} item */
+ serialize(item: unknown[]) {
+ return {
+ [typeKey]: this.typeKey,
+ [valueKey]: item.map((x) => this.writer.adaptObject(x)),
+ };
+ }
+
+ canBeUsedFor(value: unknown) {
+ return Array.isArray(value);
+ }
+}
+
+export class BulkSetSerializer extends TypeSerializer<unknown> {
+ deserialize(obj: SerializedValue) {
+ const value = obj[valueKey];
+ if (!Array.isArray(value)) {
+ throw new Error('Expected Array, obtained: ' + value);
+ }
+
+ // coerce the BulkSet to List. if the bulk exceeds the int space then we can't coerce to List anyway,
+ // so this query will be trouble. we'd need a legit BulkSet implementation here in js. this current
+ // implementation is here to replicate the previous functionality that existed on the server side in
+ // previous versions.
+ let result: unknown[] = [];
+ for (let ix = 0, iy = value.length; ix < iy; ix += 2) {
+ const pair = value.slice(ix, ix + 2);
+ result = result.concat(Array(this.reader.read(pair[1])).fill(this.reader.read(pair[0])));
+ }
+
+ return result;
+ }
+}
+
+export class MapSerializer extends TypeSerializer<Map<unknown, unknown>> {
+ deserialize(obj: SerializedValue) {
+ const value = obj[valueKey];
+ if (!Array.isArray(value)) {
+ throw new Error('Expected Array, obtained: ' + value);
+ }
+ const result = new Map();
+ for (let i = 0; i < value.length; i += 2) {
+ result.set(this.reader.read(value[i]), this.reader.read(value[i + 1]));
+ }
+ return result;
+ }
+
+ /** @param {Map} map */
+ serialize(map: Map<unknown, unknown>) {
+ const arr: unknown[] = [];
+ map.forEach((v, k) => {
+ arr.push(this.writer.adaptObject(k));
+ arr.push(this.writer.adaptObject(v));
+ });
+ return {
+ [typeKey]: 'g:Map',
+ [valueKey]: arr,
+ };
+ }
+
+ canBeUsedFor(value: unknown) {
+ return value instanceof Map;
+ }
+}
+
+export class ListSerializer extends ArraySerializer {
+ constructor() {
+ super('g:List');
+ }
+}
+
+export class SetSerializer extends ArraySerializer {
+ constructor() {
+ super('g:Set');
+ }
+
+ deserialize(obj: SerializedValue): any {
+ return new Set(super.deserialize(obj));
+ }
+
+ serialize(item: unknown[]) {
+ return {
+ [typeKey]: this.typeKey,
+ [valueKey]: [...item].map((x) => this.writer.adaptObject(x)),
+ };
+ }
+
+ canBeUsedFor(value: unknown) {
+ return value instanceof Set;
+ }
+}
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/utils.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/utils.js
deleted file mode 100644
index 1d41e01..0000000
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/utils.js
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * A module containing any utility functions.
- * @author Jorge Bay Gondra
- */
-'use strict';
-
-const uuid = require('uuid');
-
-const gremlinVersion = '3.8.0-SNAPSHOT'; // DO NOT MODIFY - Configured automatically by Maven Replacer Plugin
-
-exports.toLong = function toLong(value) {
- return new Long(value);
-};
-
-const Long = (exports.Long = function Long(value) {
- if (typeof value !== 'string' && typeof value !== 'number') {
- throw new TypeError('The value must be a string or a number');
- }
- this.value = value.toString();
-});
-
-exports.getUuid = function getUuid() {
- // TODO: replace with `globalThis.crypto.randomUUID` once supported Node version is bump to >=19
- return uuid.v4();
-};
-
-exports.emptyArray = Object.freeze([]);
-
-class ImmutableMap extends Map {
- constructor(iterable) {
- super(iterable);
- }
-
- set() {
- return this;
- }
-
- ['delete']() {
- return false;
- }
-
- clear() {}
-}
-
-exports.ImmutableMap = ImmutableMap;
-
-async function generateNodeUserAgent() {
- const os = await import('node:os');
-
- const applicationName = (process?.env.npm_package_name ?? 'NotAvailable').replace('_', ' ');
- let runtimeVersion;
- let osName;
- let osVersion;
- let cpuArch;
- runtimeVersion = osName = osVersion = cpuArch = 'NotAvailable';
- if (process != null) {
- if (process.version) {
- runtimeVersion = process.version.replace(' ', '_');
- }
- if (process.arch) {
- cpuArch = process.arch.replace(' ', '_');
- }
- }
-
- if (os != null) {
- osName = os.platform().replace(' ', '_');
- osVersion = os.release().replace(' ', '_');
- }
-
- const userAgent = `${applicationName} Gremlin-Javascript.${gremlinVersion} ${runtimeVersion} ${osName}.${osVersion} ${cpuArch}`;
-
- return userAgent;
-}
-
-exports.getUserAgentHeader = function getUserAgentHeader() {
- return 'User-Agent';
-};
-
-exports.getUserAgent = async () => {
- if ('navigator' in globalThis) {
- return globalThis.navigator.userAgent;
- }
-
- if (process?.versions?.node !== undefined) {
- return await generateNodeUserAgent();
- }
-
- return undefined;
-};
-
-/**
- * @param {Buffer} buffer
- * @returns {ArrayBuffer}
- */
-const toArrayBuffer = (buffer) => buffer.buffer.slice(buffer.byteOffset, buffer.byteOffset + buffer.byteLength);
-
-exports.toArrayBuffer = toArrayBuffer;
-
-const DeferredPromise = () => {
- let resolve = (value) => {};
- let reject = (reason) => {};
-
- const promise = new Promise((_resolve, _reject) => {
- resolve = _resolve;
- reject = _reject;
- });
-
- return Object.assign(promise, { resolve, reject });
-};
-
-module.exports.DeferredPromise = DeferredPromise;
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/utils.ts b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/utils.ts
new file mode 100644
index 0000000..f49b4d1
--- /dev/null
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/utils.ts
@@ -0,0 +1,121 @@
+/*
+ * 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.
+ */
+
+/**
+ * A module containing any utility functions.
+ * @author Jorge Bay Gondra
+ */
+
+import * as uuid from 'uuid';
+
+const gremlinVersion = '4.0.0-SNAPSHOT'; // DO NOT MODIFY - Configured automatically by Maven Replacer Plugin
+
+export function toLong(value: number | string) {
+ return new Long(value);
+}
+
+export class Long {
+ constructor(public value: number | string) {
+ if (typeof value !== 'string' && typeof value !== 'number') {
+ throw new TypeError('The value must be a string or a number');
+ }
+ }
+}
+
+export function getUuid() {
+ // TODO: replace with `globalThis.crypto.randomUUID` once supported Node version is bump to >=19
+ return uuid.v4();
+}
+
+export const emptyArray = Object.freeze([]) as any as any[];
+
+export class ImmutableMap<K, V> extends Map<K, V> implements ReadonlyMap<K, V> {
+ constructor(iterable?: Iterable<[K, V]>) {
+ super(iterable);
+ }
+
+ set() {
+ return this;
+ }
+
+ ['delete']() {
+ return false;
+ }
+
+ clear() {}
+}
+
+async function generateNodeUserAgent() {
+ const os = await import('node:os');
+
+ const applicationName = (process?.env.npm_package_name ?? 'NotAvailable').replace('_', ' ');
+ let runtimeVersion;
+ let osName;
+ let osVersion;
+ let cpuArch;
+ runtimeVersion = osName = osVersion = cpuArch = 'NotAvailable';
+ if (process != null) {
+ if (process.version) {
+ runtimeVersion = process.version.replace(' ', '_');
+ }
+ if (process.arch) {
+ cpuArch = process.arch.replace(' ', '_');
+ }
+ }
+
+ if (os != null) {
+ osName = os.platform().replace(' ', '_');
+ osVersion = os.release().replace(' ', '_');
+ }
+
+ const userAgent = `${applicationName} Gremlin-Javascript.${gremlinVersion} ${runtimeVersion} ${osName}.${osVersion} ${cpuArch}`;
+
+ return userAgent;
+}
+
+export function getUserAgentHeader() {
+ return 'User-Agent';
+}
+
+export const getUserAgent = async () => {
+ if ('navigator' in globalThis) {
+ return globalThis.navigator.userAgent;
+ }
+
+ if (process?.versions?.node !== undefined) {
+ return await generateNodeUserAgent();
+ }
+
+ return undefined;
+};
+
+export const toArrayBuffer = (buffer: Buffer) =>
+ buffer.buffer.slice(buffer.byteOffset, buffer.byteOffset + buffer.byteLength);
+
+export const DeferredPromise = <T>() => {
+ let resolve = (value: T) => {};
+ let reject = (reason: unknown) => {};
+
+ const promise = new Promise<T>((_resolve, _reject) => {
+ resolve = _resolve;
+ reject = _reject;
+ });
+
+ return Object.assign(promise, { resolve, reject });
+};
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/package-lock.json b/gremlin-javascript/src/main/javascript/gremlin-javascript/package-lock.json
index 2737512..2ccd932 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/package-lock.json
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "gremlin",
- "version": "3.8.0-alpha1",
+ "version": "4.0.0-alpha1",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "gremlin",
- "version": "3.8.0-alpha1",
+ "version": "4.0.0-alpha1",
"license": "Apache-2.0",
"dependencies": {
"buffer": "^6.0.3",
@@ -16,11 +16,16 @@
"ws": "^8.16.0"
},
"devDependencies": {
+ "@cucumber/cucumber": "^10.3.1",
+ "@knighted/duel": "^1.0.7",
+ "@tsconfig/node18": "^18.2.2",
+ "@types/readable-stream": "^4.0.10",
+ "@types/uuid": "^9.0.8",
+ "@types/ws": "^8.5.10",
"chai": "~4.5.0",
"chai-string": "~1.5.0",
"colors": "1.4.0",
"cross-env": "^7.0.3",
- "cucumber": "~6.0.7",
"eslint": "^8.42.0",
"eslint-config-prettier": "^10.0.1",
"eslint-plugin-prettier": "^5.0.0",
@@ -28,7 +33,9 @@
"grunt-cli": "~1.5.0",
"grunt-jsdoc": "~2.4.1",
"mocha": "^10.2.0",
- "prettier": "^3.0.0"
+ "prettier": "^3.0.0",
+ "ts-node": "^10.9.2",
+ "typescript": "^5.4.2"
},
"engines": {
"node": ">=20"
@@ -43,10 +50,258 @@
"node": ">=0.10.0"
}
},
+ "node_modules/@babel/code-frame": {
+ "version": "7.23.5",
+ "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.5.tgz",
+ "integrity": "sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==",
+ "dev": true,
+ "dependencies": {
+ "@babel/highlight": "^7.23.4",
+ "chalk": "^2.4.2"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ }
+ },
+ "node_modules/@babel/code-frame/node_modules/ansi-styles": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+ "dev": true,
+ "dependencies": {
+ "color-convert": "^1.9.0"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/@babel/code-frame/node_modules/chalk": {
+ "version": "2.4.2",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+ "dev": true,
+ "dependencies": {
+ "ansi-styles": "^3.2.1",
+ "escape-string-regexp": "^1.0.5",
+ "supports-color": "^5.3.0"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/@babel/code-frame/node_modules/color-convert": {
+ "version": "1.9.3",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+ "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+ "dev": true,
+ "dependencies": {
+ "color-name": "1.1.3"
+ }
+ },
+ "node_modules/@babel/code-frame/node_modules/color-name": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+ "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+ "dev": true
+ },
+ "node_modules/@babel/code-frame/node_modules/escape-string-regexp": {
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+ "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.8.0"
+ }
+ },
+ "node_modules/@babel/code-frame/node_modules/has-flag": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+ "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+ "dev": true,
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/@babel/code-frame/node_modules/supports-color": {
+ "version": "5.5.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+ "dev": true,
+ "dependencies": {
+ "has-flag": "^3.0.0"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/@babel/generator": {
+ "version": "7.23.6",
+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.6.tgz",
+ "integrity": "sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==",
+ "dev": true,
+ "dependencies": {
+ "@babel/types": "^7.23.6",
+ "@jridgewell/gen-mapping": "^0.3.2",
+ "@jridgewell/trace-mapping": "^0.3.17",
+ "jsesc": "^2.5.1"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ }
+ },
+ "node_modules/@babel/helper-environment-visitor": {
+ "version": "7.22.20",
+ "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
+ "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
+ "dev": true,
+ "engines": {
+ "node": ">=6.9.0"
+ }
+ },
+ "node_modules/@babel/helper-function-name": {
+ "version": "7.23.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
+ "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
+ "dev": true,
+ "dependencies": {
+ "@babel/template": "^7.22.15",
+ "@babel/types": "^7.23.0"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ }
+ },
+ "node_modules/@babel/helper-hoist-variables": {
+ "version": "7.22.5",
+ "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
+ "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
+ "dev": true,
+ "dependencies": {
+ "@babel/types": "^7.22.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ }
+ },
+ "node_modules/@babel/helper-split-export-declaration": {
+ "version": "7.22.6",
+ "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
+ "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
+ "dev": true,
+ "dependencies": {
+ "@babel/types": "^7.22.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ }
+ },
+ "node_modules/@babel/helper-string-parser": {
+ "version": "7.23.4",
+ "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz",
+ "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=6.9.0"
+ }
+ },
+ "node_modules/@babel/helper-validator-identifier": {
+ "version": "7.22.20",
+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
+ "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
+ "dev": true,
+ "engines": {
+ "node": ">=6.9.0"
+ }
+ },
+ "node_modules/@babel/highlight": {
+ "version": "7.23.4",
+ "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz",
+ "integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==",
+ "dev": true,
+ "dependencies": {
+ "@babel/helper-validator-identifier": "^7.22.20",
+ "chalk": "^2.4.2",
+ "js-tokens": "^4.0.0"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ }
+ },
+ "node_modules/@babel/highlight/node_modules/ansi-styles": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+ "dev": true,
+ "dependencies": {
+ "color-convert": "^1.9.0"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/@babel/highlight/node_modules/chalk": {
+ "version": "2.4.2",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+ "dev": true,
+ "dependencies": {
+ "ansi-styles": "^3.2.1",
+ "escape-string-regexp": "^1.0.5",
+ "supports-color": "^5.3.0"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/@babel/highlight/node_modules/color-convert": {
+ "version": "1.9.3",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+ "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+ "dev": true,
+ "dependencies": {
+ "color-name": "1.1.3"
+ }
+ },
+ "node_modules/@babel/highlight/node_modules/color-name": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+ "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+ "dev": true
+ },
+ "node_modules/@babel/highlight/node_modules/escape-string-regexp": {
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+ "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.8.0"
+ }
+ },
+ "node_modules/@babel/highlight/node_modules/has-flag": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+ "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+ "dev": true,
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/@babel/highlight/node_modules/supports-color": {
+ "version": "5.5.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+ "dev": true,
+ "dependencies": {
+ "has-flag": "^3.0.0"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
"node_modules/@babel/parser": {
- "version": "7.14.4",
- "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.4.tgz",
- "integrity": "sha512-ArliyUsWDUqEGfWcmzpGUzNfLxTdTp6WU4IuP6QFSp9gGfWS6boxFCkJSJ/L4+RG8z/FnIU3WxCk6hPL9SSWeA==",
+ "version": "7.24.0",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.0.tgz",
+ "integrity": "sha512-QuP/FxEAzMSjXygs8v4N9dvdXzEHN4W1oF3PxuWAtPo08UdM17u89RDMgjLn/mlc56iM0HlLmVkO/wgR+rDgHg==",
"dev": true,
"bin": {
"parser": "bin/babel-parser.js"
@@ -55,19 +310,456 @@
"node": ">=6.0.0"
}
},
- "node_modules/@babel/runtime-corejs3": {
- "version": "7.18.9",
- "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.18.9.tgz",
- "integrity": "sha512-qZEWeccZCrHA2Au4/X05QW5CMdm4VjUDCrGq5gf1ZDcM4hRqreKrtwAn7yci9zfgAS9apvnsFXiGBHBAxZdK9A==",
+ "node_modules/@babel/template": {
+ "version": "7.24.0",
+ "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.0.tgz",
+ "integrity": "sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==",
"dev": true,
"dependencies": {
- "core-js-pure": "^3.20.2",
- "regenerator-runtime": "^0.13.4"
+ "@babel/code-frame": "^7.23.5",
+ "@babel/parser": "^7.24.0",
+ "@babel/types": "^7.24.0"
},
"engines": {
"node": ">=6.9.0"
}
},
+ "node_modules/@babel/traverse": {
+ "version": "7.24.0",
+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.0.tgz",
+ "integrity": "sha512-HfuJlI8qq3dEDmNU5ChzzpZRWq+oxCZQyMzIMEqLho+AQnhMnKQUzH6ydo3RBl/YjPCuk68Y6s0Gx0AeyULiWw==",
+ "dev": true,
+ "dependencies": {
+ "@babel/code-frame": "^7.23.5",
+ "@babel/generator": "^7.23.6",
+ "@babel/helper-environment-visitor": "^7.22.20",
+ "@babel/helper-function-name": "^7.23.0",
+ "@babel/helper-hoist-variables": "^7.22.5",
+ "@babel/helper-split-export-declaration": "^7.22.6",
+ "@babel/parser": "^7.24.0",
+ "@babel/types": "^7.24.0",
+ "debug": "^4.3.1",
+ "globals": "^11.1.0"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ }
+ },
+ "node_modules/@babel/traverse/node_modules/globals": {
+ "version": "11.12.0",
+ "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+ "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+ "dev": true,
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/@babel/types": {
+ "version": "7.24.0",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.0.tgz",
+ "integrity": "sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==",
+ "dev": true,
+ "dependencies": {
+ "@babel/helper-string-parser": "^7.23.4",
+ "@babel/helper-validator-identifier": "^7.22.20",
+ "to-fast-properties": "^2.0.0"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ }
+ },
+ "node_modules/@colors/colors": {
+ "version": "1.5.0",
+ "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz",
+ "integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==",
+ "dev": true,
+ "optional": true,
+ "engines": {
+ "node": ">=0.1.90"
+ }
+ },
+ "node_modules/@cspotcode/source-map-support": {
+ "version": "0.8.1",
+ "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz",
+ "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==",
+ "dev": true,
+ "dependencies": {
+ "@jridgewell/trace-mapping": "0.3.9"
+ },
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/@cspotcode/source-map-support/node_modules/@jridgewell/trace-mapping": {
+ "version": "0.3.9",
+ "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz",
+ "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==",
+ "dev": true,
+ "dependencies": {
+ "@jridgewell/resolve-uri": "^3.0.3",
+ "@jridgewell/sourcemap-codec": "^1.4.10"
+ }
+ },
+ "node_modules/@cucumber/ci-environment": {
+ "version": "10.0.0",
+ "resolved": "https://registry.npmjs.org/@cucumber/ci-environment/-/ci-environment-10.0.0.tgz",
+ "integrity": "sha512-lRkiehckosIOdc7p1L44nZsttO5dVHFjpwKKWZ07x8SeoAdV/sPuGe1PISe0AmAowFGza62nMOgG4KaroGzwFQ==",
+ "dev": true
+ },
+ "node_modules/@cucumber/cucumber": {
+ "version": "10.3.1",
+ "resolved": "https://registry.npmjs.org/@cucumber/cucumber/-/cucumber-10.3.1.tgz",
+ "integrity": "sha512-0H0NkOXcYTCG1qCh3o0p1HPSMODGJmlHi1rm5yfoiMx5tJbBjxVNI2VVD2xtPWA+D6ehHQD9asewuzjMXrbPIw==",
+ "dev": true,
+ "dependencies": {
+ "@cucumber/ci-environment": "10.0.0",
+ "@cucumber/cucumber-expressions": "17.0.1",
+ "@cucumber/gherkin": "27.0.0",
+ "@cucumber/gherkin-streams": "5.0.1",
+ "@cucumber/gherkin-utils": "8.0.5",
+ "@cucumber/html-formatter": "21.2.0",
+ "@cucumber/message-streams": "4.0.1",
+ "@cucumber/messages": "24.0.1",
+ "@cucumber/tag-expressions": "6.1.0",
+ "assertion-error-formatter": "^3.0.0",
+ "capital-case": "^1.0.4",
+ "chalk": "^4.1.2",
+ "cli-table3": "0.6.3",
+ "commander": "^10.0.0",
+ "debug": "^4.3.4",
+ "error-stack-parser": "^2.1.4",
+ "figures": "^3.2.0",
+ "glob": "^10.3.10",
+ "has-ansi": "^4.0.1",
+ "indent-string": "^4.0.0",
+ "is-installed-globally": "^0.4.0",
+ "is-stream": "^2.0.0",
+ "knuth-shuffle-seeded": "^1.0.6",
+ "lodash.merge": "^4.6.2",
+ "lodash.mergewith": "^4.6.2",
+ "luxon": "3.2.1",
+ "mkdirp": "^2.1.5",
+ "mz": "^2.7.0",
+ "progress": "^2.0.3",
+ "read-pkg-up": "^7.0.1",
+ "resolve-pkg": "^2.0.0",
+ "semver": "7.5.3",
+ "string-argv": "0.3.1",
+ "strip-ansi": "6.0.1",
+ "supports-color": "^8.1.1",
+ "tmp": "^0.2.1",
+ "type-fest": "^4.8.3",
+ "util-arity": "^1.1.0",
+ "xmlbuilder": "^15.1.1",
+ "yaml": "^2.2.2",
+ "yup": "1.2.0"
+ },
+ "bin": {
+ "cucumber-js": "bin/cucumber.js"
+ },
+ "engines": {
+ "node": "18 || >=20"
+ }
+ },
+ "node_modules/@cucumber/cucumber-expressions": {
+ "version": "17.0.1",
+ "resolved": "https://registry.npmjs.org/@cucumber/cucumber-expressions/-/cucumber-expressions-17.0.1.tgz",
+ "integrity": "sha512-reR7/sNRmDWgdz8BtFuHEwpksPnAkHty7gxUC2n0iaUPmckv9G5I5i+Vonc6xwUHDb/hmHPz/DyUL+Iv4Ao96w==",
+ "dev": true,
+ "dependencies": {
+ "regexp-match-indices": "1.0.2"
+ }
+ },
+ "node_modules/@cucumber/cucumber/node_modules/brace-expansion": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+ "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+ "dev": true,
+ "dependencies": {
+ "balanced-match": "^1.0.0"
+ }
+ },
+ "node_modules/@cucumber/cucumber/node_modules/cli-table3": {
+ "version": "0.6.3",
+ "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.3.tgz",
+ "integrity": "sha512-w5Jac5SykAeZJKntOxJCrm63Eg5/4dhMWIcuTbo9rpE+brgaSZo0RuNJZeOyMgsUdhDeojvgyQLmjI+K50ZGyg==",
+ "dev": true,
+ "dependencies": {
+ "string-width": "^4.2.0"
+ },
+ "engines": {
+ "node": "10.* || >= 12.*"
+ },
+ "optionalDependencies": {
+ "@colors/colors": "1.5.0"
+ }
+ },
+ "node_modules/@cucumber/cucumber/node_modules/commander": {
+ "version": "10.0.1",
+ "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz",
+ "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==",
+ "dev": true,
+ "engines": {
+ "node": ">=14"
+ }
+ },
+ "node_modules/@cucumber/cucumber/node_modules/glob": {
+ "version": "10.3.10",
+ "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz",
+ "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==",
+ "dev": true,
+ "dependencies": {
+ "foreground-child": "^3.1.0",
+ "jackspeak": "^2.3.5",
+ "minimatch": "^9.0.1",
+ "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0",
+ "path-scurry": "^1.10.1"
+ },
+ "bin": {
+ "glob": "dist/esm/bin.mjs"
+ },
+ "engines": {
+ "node": ">=16 || 14 >=14.17"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/isaacs"
+ }
+ },
+ "node_modules/@cucumber/cucumber/node_modules/minimatch": {
+ "version": "9.0.3",
+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
+ "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+ "dev": true,
+ "dependencies": {
+ "brace-expansion": "^2.0.1"
+ },
+ "engines": {
+ "node": ">=16 || 14 >=14.17"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/isaacs"
+ }
+ },
+ "node_modules/@cucumber/cucumber/node_modules/mkdirp": {
+ "version": "2.1.6",
+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-2.1.6.tgz",
+ "integrity": "sha512-+hEnITedc8LAtIP9u3HJDFIdcLV2vXP33sqLLIzkv1Db1zO/1OxbvYf0Y1OC/S/Qo5dxHXepofhmxL02PsKe+A==",
+ "dev": true,
+ "bin": {
+ "mkdirp": "dist/cjs/src/bin.js"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/isaacs"
+ }
+ },
+ "node_modules/@cucumber/cucumber/node_modules/supports-color": {
+ "version": "8.1.1",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+ "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+ "dev": true,
+ "dependencies": {
+ "has-flag": "^4.0.0"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/chalk/supports-color?sponsor=1"
+ }
+ },
+ "node_modules/@cucumber/cucumber/node_modules/type-fest": {
+ "version": "4.12.0",
+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.12.0.tgz",
+ "integrity": "sha512-5Y2/pp2wtJk8o08G0CMkuFPCO354FGwk/vbidxrdhRGZfd0tFnb4Qb8anp9XxXriwBgVPjdWbKpGl4J9lJY2jQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=16"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/@cucumber/gherkin": {
+ "version": "27.0.0",
+ "resolved": "https://registry.npmjs.org/@cucumber/gherkin/-/gherkin-27.0.0.tgz",
+ "integrity": "sha512-j5rCsjqzRiC3iVTier3sa0kzyNbkcAmF7xr7jKnyO7qDeK3Z8Ye1P3KSVpeQRMY+KCDJ3WbTDdyxH0FwfA/fIw==",
+ "dev": true,
+ "dependencies": {
+ "@cucumber/messages": ">=19.1.4 <=22"
+ }
+ },
+ "node_modules/@cucumber/gherkin-streams": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/@cucumber/gherkin-streams/-/gherkin-streams-5.0.1.tgz",
+ "integrity": "sha512-/7VkIE/ASxIP/jd4Crlp4JHXqdNFxPGQokqWqsaCCiqBiu5qHoKMxcWNlp9njVL/n9yN4S08OmY3ZR8uC5x74Q==",
+ "dev": true,
+ "dependencies": {
+ "commander": "9.1.0",
+ "source-map-support": "0.5.21"
+ },
+ "bin": {
+ "gherkin-javascript": "bin/gherkin"
+ },
+ "peerDependencies": {
+ "@cucumber/gherkin": ">=22.0.0",
+ "@cucumber/message-streams": ">=4.0.0",
+ "@cucumber/messages": ">=17.1.1"
+ }
+ },
+ "node_modules/@cucumber/gherkin-streams/node_modules/commander": {
+ "version": "9.1.0",
+ "resolved": "https://registry.npmjs.org/commander/-/commander-9.1.0.tgz",
+ "integrity": "sha512-i0/MaqBtdbnJ4XQs4Pmyb+oFQl+q0lsAmokVUH92SlSw4fkeAcG3bVon+Qt7hmtF+u3Het6o4VgrcY3qAoEB6w==",
+ "dev": true,
+ "engines": {
+ "node": "^12.20.0 || >=14"
+ }
+ },
+ "node_modules/@cucumber/gherkin-utils": {
+ "version": "8.0.5",
+ "resolved": "https://registry.npmjs.org/@cucumber/gherkin-utils/-/gherkin-utils-8.0.5.tgz",
+ "integrity": "sha512-kxM1OCDjYddF26VKc892PF0GokW4wUIl1PUz3TIXsPZgS39ExM1pF8oww8mlGFD2B0+4op/cSE3SSIME5H3aNw==",
+ "dev": true,
+ "dependencies": {
+ "@cucumber/gherkin": "^26.0.0",
+ "@cucumber/messages": "^22.0.0",
+ "@teppeis/multimaps": "3.0.0",
+ "commander": "10.0.1",
+ "source-map-support": "^0.5.21"
+ },
+ "bin": {
+ "gherkin-utils": "bin/gherkin-utils"
+ }
+ },
+ "node_modules/@cucumber/gherkin-utils/node_modules/@cucumber/gherkin": {
+ "version": "26.2.0",
+ "resolved": "https://registry.npmjs.org/@cucumber/gherkin/-/gherkin-26.2.0.tgz",
+ "integrity": "sha512-iRSiK8YAIHAmLrn/mUfpAx7OXZ7LyNlh1zT89RoziSVCbqSVDxJS6ckEzW8loxs+EEXl0dKPQOXiDmbHV+C/fA==",
+ "dev": true,
+ "dependencies": {
+ "@cucumber/messages": ">=19.1.4 <=22"
+ }
+ },
+ "node_modules/@cucumber/gherkin-utils/node_modules/@cucumber/messages": {
+ "version": "22.0.0",
+ "resolved": "https://registry.npmjs.org/@cucumber/messages/-/messages-22.0.0.tgz",
+ "integrity": "sha512-EuaUtYte9ilkxcKmfqGF9pJsHRUU0jwie5ukuZ/1NPTuHS1LxHPsGEODK17RPRbZHOFhqybNzG2rHAwThxEymg==",
+ "dev": true,
+ "dependencies": {
+ "@types/uuid": "9.0.1",
+ "class-transformer": "0.5.1",
+ "reflect-metadata": "0.1.13",
+ "uuid": "9.0.0"
+ }
+ },
+ "node_modules/@cucumber/gherkin-utils/node_modules/@types/uuid": {
+ "version": "9.0.1",
+ "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.1.tgz",
+ "integrity": "sha512-rFT3ak0/2trgvp4yYZo5iKFEPsET7vKydKF+VRCxlQ9bpheehyAJH89dAkaLEq/j/RZXJIqcgsmPJKUP1Z28HA==",
+ "dev": true
+ },
+ "node_modules/@cucumber/gherkin-utils/node_modules/commander": {
+ "version": "10.0.1",
+ "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz",
+ "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==",
+ "dev": true,
+ "engines": {
+ "node": ">=14"
+ }
+ },
+ "node_modules/@cucumber/gherkin-utils/node_modules/reflect-metadata": {
+ "version": "0.1.13",
+ "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz",
+ "integrity": "sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==",
+ "dev": true
+ },
+ "node_modules/@cucumber/gherkin-utils/node_modules/uuid": {
+ "version": "9.0.0",
+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz",
+ "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==",
+ "dev": true,
+ "bin": {
+ "uuid": "dist/bin/uuid"
+ }
+ },
+ "node_modules/@cucumber/gherkin/node_modules/@cucumber/messages": {
+ "version": "22.0.0",
+ "resolved": "https://registry.npmjs.org/@cucumber/messages/-/messages-22.0.0.tgz",
+ "integrity": "sha512-EuaUtYte9ilkxcKmfqGF9pJsHRUU0jwie5ukuZ/1NPTuHS1LxHPsGEODK17RPRbZHOFhqybNzG2rHAwThxEymg==",
+ "dev": true,
+ "dependencies": {
+ "@types/uuid": "9.0.1",
+ "class-transformer": "0.5.1",
+ "reflect-metadata": "0.1.13",
+ "uuid": "9.0.0"
+ }
+ },
+ "node_modules/@cucumber/gherkin/node_modules/@types/uuid": {
+ "version": "9.0.1",
+ "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.1.tgz",
+ "integrity": "sha512-rFT3ak0/2trgvp4yYZo5iKFEPsET7vKydKF+VRCxlQ9bpheehyAJH89dAkaLEq/j/RZXJIqcgsmPJKUP1Z28HA==",
+ "dev": true
+ },
+ "node_modules/@cucumber/gherkin/node_modules/reflect-metadata": {
+ "version": "0.1.13",
+ "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz",
+ "integrity": "sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==",
+ "dev": true
+ },
+ "node_modules/@cucumber/gherkin/node_modules/uuid": {
+ "version": "9.0.0",
+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz",
+ "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==",
+ "dev": true,
+ "bin": {
+ "uuid": "dist/bin/uuid"
+ }
+ },
+ "node_modules/@cucumber/html-formatter": {
+ "version": "21.2.0",
+ "resolved": "https://registry.npmjs.org/@cucumber/html-formatter/-/html-formatter-21.2.0.tgz",
+ "integrity": "sha512-4OcSa12Y0v5e4ySDl67+QFTxCG/Y9fxGSkFqvm98ggpTvS7b75whwzupu+lM2lMBw+h3H6P8ZURQr0xQIAwE2A==",
+ "dev": true,
+ "peerDependencies": {
+ "@cucumber/messages": ">=18"
+ }
+ },
+ "node_modules/@cucumber/message-streams": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/@cucumber/message-streams/-/message-streams-4.0.1.tgz",
+ "integrity": "sha512-Kxap9uP5jD8tHUZVjTWgzxemi/0uOsbGjd4LBOSxcJoOCRbESFwemUzilJuzNTB8pcTQUh8D5oudUyxfkJOKmA==",
+ "dev": true,
+ "peerDependencies": {
+ "@cucumber/messages": ">=17.1.1"
+ }
+ },
+ "node_modules/@cucumber/messages": {
+ "version": "24.0.1",
+ "resolved": "https://registry.npmjs.org/@cucumber/messages/-/messages-24.0.1.tgz",
+ "integrity": "sha512-dKfNkvgc6stSQIyeHk7p/221iqEZe1BP+e/Js8XKtSmc0sS8khKMvbSBwYVeonn/67/vYKiAyo6Eo0SzXd5Plw==",
+ "dev": true,
+ "dependencies": {
+ "@types/uuid": "9.0.7",
+ "class-transformer": "0.5.1",
+ "reflect-metadata": "0.2.1",
+ "uuid": "9.0.1"
+ }
+ },
+ "node_modules/@cucumber/messages/node_modules/@types/uuid": {
+ "version": "9.0.7",
+ "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.7.tgz",
+ "integrity": "sha512-WUtIVRUZ9i5dYXefDEAI7sh9/O7jGvHg7Df/5O/gtH3Yabe5odI3UWopVR1qbPXQtvOxWu3mM4XxlYeZtMWF4g==",
+ "dev": true
+ },
+ "node_modules/@cucumber/tag-expressions": {
+ "version": "6.1.0",
+ "resolved": "https://registry.npmjs.org/@cucumber/tag-expressions/-/tag-expressions-6.1.0.tgz",
+ "integrity": "sha512-+3DwRumrCJG27AtzCIL37A/X+A/gSfxOPLg8pZaruh5SLumsTmpvilwroVWBT2fPzmno/tGXypeK5a7NHU4RzA==",
+ "dev": true
+ },
"node_modules/@eslint-community/eslint-utils": {
"version": "4.4.0",
"resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
@@ -175,6 +867,314 @@
"integrity": "sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==",
"dev": true
},
+ "node_modules/@isaacs/cliui": {
+ "version": "8.0.2",
+ "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
+ "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
+ "dev": true,
+ "dependencies": {
+ "string-width": "^5.1.2",
+ "string-width-cjs": "npm:string-width@^4.2.0",
+ "strip-ansi": "^7.0.1",
+ "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
+ "wrap-ansi": "^8.1.0",
+ "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
+ },
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/@isaacs/cliui/node_modules/ansi-regex": {
+ "version": "6.0.1",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+ "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+ "dev": true,
+ "engines": {
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+ }
+ },
+ "node_modules/@isaacs/cliui/node_modules/ansi-styles": {
+ "version": "6.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+ "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+ "dev": true,
+ "engines": {
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+ }
+ },
+ "node_modules/@isaacs/cliui/node_modules/emoji-regex": {
+ "version": "9.2.2",
+ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+ "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+ "dev": true
+ },
+ "node_modules/@isaacs/cliui/node_modules/string-width": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+ "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+ "dev": true,
+ "dependencies": {
+ "eastasianwidth": "^0.2.0",
+ "emoji-regex": "^9.2.2",
+ "strip-ansi": "^7.0.1"
+ },
+ "engines": {
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/@isaacs/cliui/node_modules/strip-ansi": {
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+ "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+ "dev": true,
+ "dependencies": {
+ "ansi-regex": "^6.0.1"
+ },
+ "engines": {
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+ }
+ },
+ "node_modules/@isaacs/cliui/node_modules/wrap-ansi": {
+ "version": "8.1.0",
+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
+ "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
+ "dev": true,
+ "dependencies": {
+ "ansi-styles": "^6.1.0",
+ "string-width": "^5.0.1",
+ "strip-ansi": "^7.0.1"
+ },
+ "engines": {
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+ }
+ },
+ "node_modules/@jridgewell/gen-mapping": {
+ "version": "0.3.5",
+ "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
+ "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
+ "dev": true,
+ "dependencies": {
+ "@jridgewell/set-array": "^1.2.1",
+ "@jridgewell/sourcemap-codec": "^1.4.10",
+ "@jridgewell/trace-mapping": "^0.3.24"
+ },
+ "engines": {
+ "node": ">=6.0.0"
+ }
+ },
+ "node_modules/@jridgewell/resolve-uri": {
+ "version": "3.1.2",
+ "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+ "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
+ "dev": true,
+ "engines": {
+ "node": ">=6.0.0"
+ }
+ },
+ "node_modules/@jridgewell/set-array": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
+ "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
+ "dev": true,
+ "engines": {
+ "node": ">=6.0.0"
+ }
+ },
+ "node_modules/@jridgewell/sourcemap-codec": {
+ "version": "1.4.15",
+ "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
+ "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
+ "dev": true
+ },
+ "node_modules/@jridgewell/trace-mapping": {
+ "version": "0.3.25",
+ "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+ "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
+ "dev": true,
+ "dependencies": {
+ "@jridgewell/resolve-uri": "^3.1.0",
+ "@jridgewell/sourcemap-codec": "^1.4.14"
+ }
+ },
+ "node_modules/@knighted/duel": {
+ "version": "1.0.7",
+ "resolved": "https://registry.npmjs.org/@knighted/duel/-/duel-1.0.7.tgz",
+ "integrity": "sha512-N/Z/BqKFNwuyPZvrTtcsVtnPABOIfVgyQN58YpTOBBJIWCP/ZrNM4KaMjdWpf5byYjC1LIOzf8Va/9l/buHmig==",
+ "dev": true,
+ "dependencies": {
+ "@knighted/specifier": "^1.0.1",
+ "find-up": "^6.3.0",
+ "glob": "^10.3.3",
+ "jsonc-parser": "^3.2.0",
+ "read-package-up": "^11.0.0"
+ },
+ "bin": {
+ "duel": "dist/esm/duel.js"
+ },
+ "engines": {
+ "node": ">=16.19.0"
+ },
+ "peerDependencies": {
+ "typescript": ">=4.0.0 || >=4.9.0-dev || >=5.3.0-dev || 5.4.0-dev || 5.5.0-dev"
+ }
+ },
+ "node_modules/@knighted/duel/node_modules/brace-expansion": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+ "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+ "dev": true,
+ "dependencies": {
+ "balanced-match": "^1.0.0"
+ }
+ },
+ "node_modules/@knighted/duel/node_modules/find-up": {
+ "version": "6.3.0",
+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-6.3.0.tgz",
+ "integrity": "sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==",
+ "dev": true,
+ "dependencies": {
+ "locate-path": "^7.1.0",
+ "path-exists": "^5.0.0"
+ },
+ "engines": {
+ "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/@knighted/duel/node_modules/glob": {
+ "version": "10.3.10",
+ "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz",
+ "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==",
+ "dev": true,
+ "dependencies": {
+ "foreground-child": "^3.1.0",
+ "jackspeak": "^2.3.5",
+ "minimatch": "^9.0.1",
+ "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0",
+ "path-scurry": "^1.10.1"
+ },
+ "bin": {
+ "glob": "dist/esm/bin.mjs"
+ },
+ "engines": {
+ "node": ">=16 || 14 >=14.17"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/isaacs"
+ }
+ },
+ "node_modules/@knighted/duel/node_modules/locate-path": {
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-7.2.0.tgz",
+ "integrity": "sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==",
+ "dev": true,
+ "dependencies": {
+ "p-locate": "^6.0.0"
+ },
+ "engines": {
+ "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/@knighted/duel/node_modules/minimatch": {
+ "version": "9.0.3",
+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
+ "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+ "dev": true,
+ "dependencies": {
+ "brace-expansion": "^2.0.1"
+ },
+ "engines": {
+ "node": ">=16 || 14 >=14.17"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/isaacs"
+ }
+ },
+ "node_modules/@knighted/duel/node_modules/p-limit": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz",
+ "integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==",
+ "dev": true,
+ "dependencies": {
+ "yocto-queue": "^1.0.0"
+ },
+ "engines": {
+ "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/@knighted/duel/node_modules/p-locate": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-6.0.0.tgz",
+ "integrity": "sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==",
+ "dev": true,
+ "dependencies": {
+ "p-limit": "^4.0.0"
+ },
+ "engines": {
+ "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/@knighted/duel/node_modules/path-exists": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-5.0.0.tgz",
+ "integrity": "sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==",
+ "dev": true,
+ "engines": {
+ "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+ }
+ },
+ "node_modules/@knighted/duel/node_modules/yocto-queue": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz",
+ "integrity": "sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==",
+ "dev": true,
+ "engines": {
+ "node": ">=12.20"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/@knighted/specifier": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/@knighted/specifier/-/specifier-1.0.1.tgz",
+ "integrity": "sha512-LArFWJN7wGGLU1P3TeEHgO6wGKWEYq/o4/Yij7rnKk0ng1HbQn1wythI0E9Q7B3+7LRnposEtaeY9AZlE3Cg+Q==",
+ "dev": true,
+ "dependencies": {
+ "@babel/parser": "^7.22.7",
+ "@babel/traverse": "^7.23.2",
+ "magic-string": "^0.30.1"
+ },
+ "engines": {
+ "node": ">=14"
+ }
+ },
"node_modules/@nodelib/fs.scandir": {
"version": "2.1.5",
"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -210,6 +1210,16 @@
"node": ">= 8"
}
},
+ "node_modules/@pkgjs/parseargs": {
+ "version": "0.11.0",
+ "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
+ "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
+ "dev": true,
+ "optional": true,
+ "engines": {
+ "node": ">=14"
+ }
+ },
"node_modules/@pkgr/core": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.1.1.tgz",
@@ -222,6 +1232,45 @@
"url": "https://opencollective.com/unts"
}
},
+ "node_modules/@teppeis/multimaps": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/@teppeis/multimaps/-/multimaps-3.0.0.tgz",
+ "integrity": "sha512-ID7fosbc50TbT0MK0EG12O+gAP3W3Aa/Pz4DaTtQtEvlc9Odaqi0de+xuZ7Li2GtK4HzEX7IuRWS/JmZLksR3Q==",
+ "dev": true,
+ "engines": {
+ "node": ">=14"
+ }
+ },
+ "node_modules/@tsconfig/node10": {
+ "version": "1.0.9",
+ "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz",
+ "integrity": "sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==",
+ "dev": true
+ },
+ "node_modules/@tsconfig/node12": {
+ "version": "1.0.11",
+ "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz",
+ "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==",
+ "dev": true
+ },
+ "node_modules/@tsconfig/node14": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz",
+ "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==",
+ "dev": true
+ },
+ "node_modules/@tsconfig/node16": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz",
+ "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==",
+ "dev": true
+ },
+ "node_modules/@tsconfig/node18": {
+ "version": "18.2.2",
+ "resolved": "https://registry.npmjs.org/@tsconfig/node18/-/node18-18.2.2.tgz",
+ "integrity": "sha512-d6McJeGsuoRlwWZmVIeE8CUA27lu6jLjvv1JzqmpsytOYYbVi1tHZEnwCNVOXnj4pyLvneZlFlpXUK+X9wBWyw==",
+ "dev": true
+ },
"node_modules/@types/linkify-it": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-3.0.2.tgz",
@@ -244,6 +1293,52 @@
"integrity": "sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA==",
"dev": true
},
+ "node_modules/@types/node": {
+ "version": "20.11.26",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.26.tgz",
+ "integrity": "sha512-YwOMmyhNnAWijOBQweOJnQPl068Oqd4K3OFbTc6AHJwzweUwwWG3GIFY74OKks2PJUDkQPeddOQES9mLn1CTEQ==",
+ "dev": true,
+ "dependencies": {
+ "undici-types": "~5.26.4"
+ }
+ },
+ "node_modules/@types/normalize-package-data": {
+ "version": "2.4.4",
+ "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz",
+ "integrity": "sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==",
+ "dev": true
+ },
+ "node_modules/@types/readable-stream": {
+ "version": "4.0.10",
+ "resolved": "https://registry.npmjs.org/@types/readable-stream/-/readable-stream-4.0.10.tgz",
+ "integrity": "sha512-AbUKBjcC8SHmImNi4yK2bbjogQlkFSg7shZCcicxPQapniOlajG8GCc39lvXzCWX4lLRRs7DM3VAeSlqmEVZUA==",
+ "dev": true,
+ "dependencies": {
+ "@types/node": "*",
+ "safe-buffer": "~5.1.1"
+ }
+ },
+ "node_modules/@types/readable-stream/node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+ "dev": true
+ },
+ "node_modules/@types/uuid": {
+ "version": "9.0.8",
+ "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.8.tgz",
+ "integrity": "sha512-jg+97EGIcY9AGHJJRaaPVgetKDsrTgbRjQ5Msgjh/DQKEFl0DtyRr/VCOyD1T2R1MNeWPK/u7JoGhlDZnKBAfA==",
+ "dev": true
+ },
+ "node_modules/@types/ws": {
+ "version": "8.5.10",
+ "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.10.tgz",
+ "integrity": "sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A==",
+ "dev": true,
+ "dependencies": {
+ "@types/node": "*"
+ }
+ },
"node_modules/@ungap/structured-clone": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
@@ -288,6 +1383,15 @@
"acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
}
},
+ "node_modules/acorn-walk": {
+ "version": "8.3.2",
+ "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.2.tgz",
+ "integrity": "sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.4.0"
+ }
+ },
"node_modules/ajv": {
"version": "6.12.6",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
@@ -356,6 +1460,12 @@
"node": ">= 8"
}
},
+ "node_modules/arg": {
+ "version": "4.1.3",
+ "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
+ "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
+ "dev": true
+ },
"node_modules/argparse": {
"version": "1.0.10",
"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
@@ -389,15 +1499,6 @@
"node": ">=0.10.0"
}
},
- "node_modules/assert-plus": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
- "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
- "dev": true,
- "engines": {
- "node": ">=0.8"
- }
- },
"node_modules/assertion-error": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
@@ -449,12 +1550,6 @@
}
]
},
- "node_modules/becke-ch--regex--s0-0-v1--base--pl--lib": {
- "version": "1.4.0",
- "resolved": "https://registry.npmjs.org/becke-ch--regex--s0-0-v1--base--pl--lib/-/becke-ch--regex--s0-0-v1--base--pl--lib-1.4.0.tgz",
- "integrity": "sha512-FnWonOyaw7Vivg5nIkrUll9HSS5TjFbyuURAiDssuL6VxrBe3ERzudRxOcWRhZYlP89UArMDikz7SapRPQpmZQ==",
- "dev": true
- },
"node_modules/binary-extensions": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
@@ -521,6 +1616,12 @@
"ieee754": "^1.2.1"
}
},
+ "node_modules/buffer-from": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+ "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+ "dev": true
+ },
"node_modules/callsites": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
@@ -542,6 +1643,36 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
+ "node_modules/capital-case": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/capital-case/-/capital-case-1.0.4.tgz",
+ "integrity": "sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==",
+ "dev": true,
+ "dependencies": {
+ "no-case": "^3.0.4",
+ "tslib": "^2.0.3",
+ "upper-case-first": "^2.0.2"
+ }
+ },
+ "node_modules/capital-case/node_modules/lower-case": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz",
+ "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==",
+ "dev": true,
+ "dependencies": {
+ "tslib": "^2.0.3"
+ }
+ },
+ "node_modules/capital-case/node_modules/no-case": {
+ "version": "3.0.4",
+ "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
+ "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==",
+ "dev": true,
+ "dependencies": {
+ "lower-case": "^2.0.2",
+ "tslib": "^2.0.3"
+ }
+ },
"node_modules/catharsis": {
"version": "0.9.0",
"resolved": "https://registry.npmjs.org/catharsis/-/catharsis-0.9.0.tgz",
@@ -693,64 +1824,11 @@
"node": ">=8.0"
}
},
- "node_modules/cli-table3": {
+ "node_modules/class-transformer": {
"version": "0.5.1",
- "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.5.1.tgz",
- "integrity": "sha512-7Qg2Jrep1S/+Q3EceiZtQcDPWxhAvBw+ERf1162v4sikJrvojMHFqXt8QIVha8UlH9rgU0BeWPytZ9/TzYqlUw==",
- "dev": true,
- "dependencies": {
- "object-assign": "^4.1.0",
- "string-width": "^2.1.1"
- },
- "engines": {
- "node": ">=6"
- },
- "optionalDependencies": {
- "colors": "^1.1.2"
- }
- },
- "node_modules/cli-table3/node_modules/ansi-regex": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
- "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
- "dev": true,
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/cli-table3/node_modules/is-fullwidth-code-point": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
- "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
- "dev": true,
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/cli-table3/node_modules/string-width": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
- "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
- "dev": true,
- "dependencies": {
- "is-fullwidth-code-point": "^2.0.0",
- "strip-ansi": "^4.0.0"
- },
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/cli-table3/node_modules/strip-ansi": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
- "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
- "dev": true,
- "dependencies": {
- "ansi-regex": "^3.0.0"
- },
- "engines": {
- "node": ">=4"
- }
+ "resolved": "https://registry.npmjs.org/class-transformer/-/class-transformer-0.5.1.tgz",
+ "integrity": "sha512-SQa1Ws6hUbfC98vKGxZH3KFY0Y1lm5Zm0SY8XX9zbK7FJCyVEac3ATW0RIpwzW+oOfmHE5PMPufDG9hCfoEOMw==",
+ "dev": true
},
"node_modules/cliui": {
"version": "7.0.4",
@@ -790,33 +1868,16 @@
"node": ">=0.1.90"
}
},
- "node_modules/commander": {
- "version": "3.0.2",
- "resolved": "https://registry.npmjs.org/commander/-/commander-3.0.2.tgz",
- "integrity": "sha512-Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow==",
- "dev": true
- },
"node_modules/concat-map": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
"dev": true
},
- "node_modules/core-js-pure": {
- "version": "3.24.1",
- "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.24.1.tgz",
- "integrity": "sha512-r1nJk41QLLPyozHUUPmILCEMtMw24NG4oWK6RbsDdjzQgg9ZvrUsPBj1MnG0wXXp1DCDU6j+wUvEmBSrtRbLXg==",
- "dev": true,
- "hasInstallScript": true,
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/core-js"
- }
- },
- "node_modules/core-util-is": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
- "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
+ "node_modules/create-require": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
+ "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
"dev": true
},
"node_modules/cross-env": {
@@ -866,75 +1927,6 @@
"node": ">= 8"
}
},
- "node_modules/cucumber": {
- "version": "6.0.7",
- "resolved": "https://registry.npmjs.org/cucumber/-/cucumber-6.0.7.tgz",
- "integrity": "sha512-pN3AgWxHx8rOi+wOlqjASNETOjf3TgeyqhMNLQam7nSTXgQzju1oAmXkleRQRcXvpVvejcDHiZBLFSfBkqbYpA==",
- "deprecated": "Cucumber is publishing new releases under @cucumber/cucumber",
- "dev": true,
- "dependencies": {
- "assertion-error-formatter": "^3.0.0",
- "bluebird": "^3.4.1",
- "cli-table3": "^0.5.1",
- "colors": "^1.1.2",
- "commander": "^3.0.1",
- "cucumber-expressions": "^8.1.0",
- "cucumber-tag-expressions": "^2.0.2",
- "duration": "^0.2.1",
- "escape-string-regexp": "^2.0.0",
- "figures": "^3.0.0",
- "gherkin": "5.0.0",
- "glob": "^7.1.3",
- "indent-string": "^4.0.0",
- "is-generator": "^1.0.2",
- "is-stream": "^2.0.0",
- "knuth-shuffle-seeded": "^1.0.6",
- "lodash": "^4.17.14",
- "mz": "^2.4.0",
- "progress": "^2.0.0",
- "resolve": "^1.3.3",
- "serialize-error": "^4.1.0",
- "stack-chain": "^2.0.0",
- "stacktrace-js": "^2.0.0",
- "string-argv": "^0.3.0",
- "title-case": "^2.1.1",
- "util-arity": "^1.0.2",
- "verror": "^1.9.0"
- },
- "bin": {
- "cucumber-js": "bin/cucumber-js"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/cucumber-expressions": {
- "version": "8.3.0",
- "resolved": "https://registry.npmjs.org/cucumber-expressions/-/cucumber-expressions-8.3.0.tgz",
- "integrity": "sha512-cP2ya0EiorwXBC7Ll7Cj7NELYbasNv9Ty42L4u7sso9KruWemWG1ZiTq4PMqir3SNDSrbykoqI5wZgMbLEDjLQ==",
- "deprecated": "This package is now published under @cucumber/cucumber-expressions",
- "dev": true,
- "dependencies": {
- "becke-ch--regex--s0-0-v1--base--pl--lib": "^1.4.0",
- "xregexp": "^4.2.4"
- }
- },
- "node_modules/cucumber-tag-expressions": {
- "version": "2.0.3",
- "resolved": "https://registry.npmjs.org/cucumber-tag-expressions/-/cucumber-tag-expressions-2.0.3.tgz",
- "integrity": "sha512-+x5j1IfZrBtbvYHuoUX0rl4nUGxaey6Do9sM0CABmZfDCcWXuuRm1fQeCaklIYQgOFHQ6xOHvDSdkMHHpni6tQ==",
- "dev": true
- },
- "node_modules/d": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
- "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
- "dev": true,
- "dependencies": {
- "es5-ext": "^0.10.50",
- "type": "^1.0.1"
- }
- },
"node_modules/dateformat": {
"version": "4.6.3",
"resolved": "https://registry.npmjs.org/dateformat/-/dateformat-4.6.3.tgz",
@@ -1021,15 +2013,11 @@
"node": ">=6.0.0"
}
},
- "node_modules/duration": {
- "version": "0.2.2",
- "resolved": "https://registry.npmjs.org/duration/-/duration-0.2.2.tgz",
- "integrity": "sha512-06kgtea+bGreF5eKYgI/36A6pLXggY7oR4p1pq4SmdFBn1ReOL5D8RhG64VrqfTTKNucqqtBAwEj8aB88mcqrg==",
- "dev": true,
- "dependencies": {
- "d": "1",
- "es5-ext": "~0.10.46"
- }
+ "node_modules/eastasianwidth": {
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+ "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
+ "dev": true
},
"node_modules/emoji-regex": {
"version": "8.0.0",
@@ -1037,6 +2025,15 @@
"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
"dev": true
},
+ "node_modules/error-ex": {
+ "version": "1.3.2",
+ "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+ "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+ "dev": true,
+ "dependencies": {
+ "is-arrayish": "^0.2.1"
+ }
+ },
"node_modules/error-stack-parser": {
"version": "2.1.4",
"resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.1.4.tgz",
@@ -1046,42 +2043,6 @@
"stackframe": "^1.3.4"
}
},
- "node_modules/es5-ext": {
- "version": "0.10.62",
- "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.62.tgz",
- "integrity": "sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==",
- "dev": true,
- "hasInstallScript": true,
- "dependencies": {
- "es6-iterator": "^2.0.3",
- "es6-symbol": "^3.1.3",
- "next-tick": "^1.1.0"
- },
- "engines": {
- "node": ">=0.10"
- }
- },
- "node_modules/es6-iterator": {
- "version": "2.0.3",
- "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
- "integrity": "sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==",
- "dev": true,
- "dependencies": {
- "d": "1",
- "es5-ext": "^0.10.35",
- "es6-symbol": "^3.1.1"
- }
- },
- "node_modules/es6-symbol": {
- "version": "3.1.3",
- "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
- "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==",
- "dev": true,
- "dependencies": {
- "d": "^1.0.1",
- "ext": "^1.1.2"
- }
- },
"node_modules/escalade": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
@@ -1091,15 +2052,6 @@
"node": ">=6"
}
},
- "node_modules/escape-string-regexp": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
- "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
- "dev": true,
- "engines": {
- "node": ">=8"
- }
- },
"node_modules/eslint": {
"version": "8.57.0",
"resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz",
@@ -1387,36 +2339,12 @@
"node": ">=0.10.0"
}
},
- "node_modules/ext": {
- "version": "1.6.0",
- "resolved": "https://registry.npmjs.org/ext/-/ext-1.6.0.tgz",
- "integrity": "sha512-sdBImtzkq2HpkdRLtlLWDa6w4DX22ijZLKx8BMPUuKe1c5lbN6xwQDQCxSfxBQnHZ13ls/FH0MQZx/q/gr6FQg==",
- "dev": true,
- "dependencies": {
- "type": "^2.5.0"
- }
- },
- "node_modules/ext/node_modules/type": {
- "version": "2.7.2",
- "resolved": "https://registry.npmjs.org/type/-/type-2.7.2.tgz",
- "integrity": "sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==",
- "dev": true
- },
"node_modules/extend": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
"integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
"dev": true
},
- "node_modules/extsprintf": {
- "version": "1.4.1",
- "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.1.tgz",
- "integrity": "sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA==",
- "dev": true,
- "engines": [
- "node >=0.6.0"
- ]
- },
"node_modules/fast-deep-equal": {
"version": "3.1.3",
"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -1514,6 +2442,18 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
+ "node_modules/find-up-simple": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/find-up-simple/-/find-up-simple-1.0.0.tgz",
+ "integrity": "sha512-q7Us7kcjj2VMePAa02hDAF6d+MzsdsAWEwYyOpwUtlerRBkOEPBCRZrAV4XfcSN8fHAgaD0hP7miwoay6DCprw==",
+ "dev": true,
+ "engines": {
+ "node": ">=18"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
"node_modules/findup-sync": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-5.0.0.tgz",
@@ -1603,6 +2543,22 @@
"node": ">=0.10.0"
}
},
+ "node_modules/foreground-child": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz",
+ "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==",
+ "dev": true,
+ "dependencies": {
+ "cross-spawn": "^7.0.0",
+ "signal-exit": "^4.0.1"
+ },
+ "engines": {
+ "node": ">=14"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/isaacs"
+ }
+ },
"node_modules/fs.realpath": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
@@ -1624,10 +2580,13 @@
}
},
"node_modules/function-bind": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
- "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
- "dev": true
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+ "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+ "dev": true,
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
},
"node_modules/get-caller-file": {
"version": "2.0.5",
@@ -1656,16 +2615,6 @@
"node": ">=10"
}
},
- "node_modules/gherkin": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/gherkin/-/gherkin-5.0.0.tgz",
- "integrity": "sha512-Y+93z2Nh+TNIKuKEf+6M0FQrX/z0Yv9C2LFfc5NlcGJWRrrTeI/jOg2374y1FOw6ZYQ3RgJBezRkli7CLDubDA==",
- "deprecated": "This package is now published under @cucumber/gherkin",
- "dev": true,
- "bin": {
- "gherkin-javascript": "bin/gherkin"
- }
- },
"node_modules/glob": {
"version": "7.2.3",
"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
@@ -1710,6 +2659,30 @@
"node": ">=0.10.0"
}
},
+ "node_modules/global-dirs": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.1.tgz",
+ "integrity": "sha512-NBcGGFbBA9s1VzD41QXDG+3++t9Mn5t1FpLdhESY6oKY4gYTFpX4wO3sqGUa0Srjtbfj3szX0RnemmrVRUdULA==",
+ "dev": true,
+ "dependencies": {
+ "ini": "2.0.0"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/global-dirs/node_modules/ini": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz",
+ "integrity": "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==",
+ "dev": true,
+ "engines": {
+ "node": ">=10"
+ }
+ },
"node_modules/global-modules": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
@@ -2005,16 +2978,25 @@
"node": ">= 0.10"
}
},
- "node_modules/has": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
- "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+ "node_modules/has-ansi": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-4.0.1.tgz",
+ "integrity": "sha512-Qr4RtTm30xvEdqUXbSBVWDu+PrTokJOwe/FU+VdfJPk+MXAPoeOzKpRyrDTnZIJwAkQ4oBLTU53nu0HrkF/Z2A==",
"dev": true,
"dependencies": {
- "function-bind": "^1.1.1"
+ "ansi-regex": "^4.1.0"
},
"engines": {
- "node": ">= 0.4.0"
+ "node": ">=8"
+ }
+ },
+ "node_modules/has-ansi/node_modules/ansi-regex": {
+ "version": "4.1.1",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+ "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
+ "dev": true,
+ "engines": {
+ "node": ">=6"
}
},
"node_modules/has-flag": {
@@ -2026,6 +3008,18 @@
"node": ">=8"
}
},
+ "node_modules/hasown": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+ "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+ "dev": true,
+ "dependencies": {
+ "function-bind": "^1.1.2"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
"node_modules/he": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
@@ -2056,6 +3050,18 @@
"node": "*"
}
},
+ "node_modules/hosted-git-info": {
+ "version": "7.0.1",
+ "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-7.0.1.tgz",
+ "integrity": "sha512-+K84LB1DYwMHoHSgaOY/Jfhw3ucPmSET5v98Ke/HdNSw4a0UktWzyW1mjhjpuxxTqOOsfWT/7iVshHmVZ4IpOA==",
+ "dev": true,
+ "dependencies": {
+ "lru-cache": "^10.0.1"
+ },
+ "engines": {
+ "node": "^16.14.0 || >=18.0.0"
+ }
+ },
"node_modules/iconv-lite": {
"version": "0.6.3",
"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
@@ -2130,6 +3136,18 @@
"node": ">=8"
}
},
+ "node_modules/index-to-position": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/index-to-position/-/index-to-position-0.1.2.tgz",
+ "integrity": "sha512-MWDKS3AS1bGCHLBA2VLImJz42f7bJh8wQsTGCzI3j519/CASStoDONUBVz2I/VID0MpiX3SGSnbOD2xUalbE5g==",
+ "dev": true,
+ "engines": {
+ "node": ">=18"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
"node_modules/inflight": {
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -2171,6 +3189,12 @@
"node": ">=0.10.0"
}
},
+ "node_modules/is-arrayish": {
+ "version": "0.2.1",
+ "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+ "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
+ "dev": true
+ },
"node_modules/is-binary-path": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
@@ -2184,12 +3208,12 @@
}
},
"node_modules/is-core-module": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz",
- "integrity": "sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==",
+ "version": "2.13.1",
+ "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz",
+ "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==",
"dev": true,
"dependencies": {
- "has": "^1.0.3"
+ "hasown": "^2.0.0"
},
"funding": {
"url": "https://github.com/sponsors/ljharb"
@@ -2213,12 +3237,6 @@
"node": ">=8"
}
},
- "node_modules/is-generator": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/is-generator/-/is-generator-1.0.3.tgz",
- "integrity": "sha512-G56jBpbJeg7ds83HW1LuShNs8J73Fv3CPz/bmROHOHlnKkN8sWb9ujiagjmxxMUywftgq48HlBZELKKqFLk0oA==",
- "dev": true
- },
"node_modules/is-glob": {
"version": "4.0.3",
"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
@@ -2231,6 +3249,22 @@
"node": ">=0.10.0"
}
},
+ "node_modules/is-installed-globally": {
+ "version": "0.4.0",
+ "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz",
+ "integrity": "sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==",
+ "dev": true,
+ "dependencies": {
+ "global-dirs": "^3.0.0",
+ "is-path-inside": "^3.0.2"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
"node_modules/is-number": {
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
@@ -2342,6 +3376,30 @@
"node": ">=0.10.0"
}
},
+ "node_modules/jackspeak": {
+ "version": "2.3.6",
+ "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz",
+ "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==",
+ "dev": true,
+ "dependencies": {
+ "@isaacs/cliui": "^8.0.2"
+ },
+ "engines": {
+ "node": ">=14"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/isaacs"
+ },
+ "optionalDependencies": {
+ "@pkgjs/parseargs": "^0.11.0"
+ }
+ },
+ "node_modules/js-tokens": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+ "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+ "dev": true
+ },
"node_modules/js-yaml": {
"version": "3.14.1",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
@@ -2485,6 +3543,24 @@
"integrity": "sha512-nquOebG4sngPmGPICTS5EnxqhKbCmz5Ox5hsszI2T6U5qdrJizBc+0ilYSEjTSzU0yZcmvppztXe/5Al5fUwdg==",
"dev": true
},
+ "node_modules/jsesc": {
+ "version": "2.5.2",
+ "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+ "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+ "dev": true,
+ "bin": {
+ "jsesc": "bin/jsesc"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/json-parse-even-better-errors": {
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+ "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+ "dev": true
+ },
"node_modules/json-schema-traverse": {
"version": "0.4.1",
"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
@@ -2497,6 +3573,12 @@
"integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
"dev": true
},
+ "node_modules/jsonc-parser": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.1.tgz",
+ "integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==",
+ "dev": true
+ },
"node_modules/kind-of": {
"version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
@@ -2644,6 +3726,12 @@
"node": ">=8.0"
}
},
+ "node_modules/lines-and-columns": {
+ "version": "1.2.4",
+ "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+ "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
+ "dev": true
+ },
"node_modules/locate-path": {
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
@@ -2671,6 +3759,12 @@
"integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
"dev": true
},
+ "node_modules/lodash.mergewith": {
+ "version": "4.6.2",
+ "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz",
+ "integrity": "sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==",
+ "dev": true
+ },
"node_modules/log-symbols": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
@@ -2766,10 +3860,40 @@
"get-func-name": "^2.0.0"
}
},
- "node_modules/lower-case": {
- "version": "1.1.4",
- "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz",
- "integrity": "sha512-2Fgx1Ycm599x+WGpIYwJOvsjmXFzTSc34IwDWALRA/8AopUKAVPwfJ+h5+f85BCp0PWmmJcWzEpxOpoXycMpdA==",
+ "node_modules/lru-cache": {
+ "version": "10.2.0",
+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.0.tgz",
+ "integrity": "sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q==",
+ "dev": true,
+ "engines": {
+ "node": "14 || >=16.14"
+ }
+ },
+ "node_modules/luxon": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.2.1.tgz",
+ "integrity": "sha512-QrwPArQCNLAKGO/C+ZIilgIuDnEnKx5QYODdDtbFaxzsbZcc/a7WFq7MhsVYgRlwawLtvOUESTlfJ+hc/USqPg==",
+ "dev": true,
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/magic-string": {
+ "version": "0.30.8",
+ "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.8.tgz",
+ "integrity": "sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==",
+ "dev": true,
+ "dependencies": {
+ "@jridgewell/sourcemap-codec": "^1.4.15"
+ },
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/make-error": {
+ "version": "1.3.6",
+ "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
+ "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
"dev": true
},
"node_modules/make-iterator": {
@@ -2824,6 +3948,15 @@
"node": "*"
}
},
+ "node_modules/minipass": {
+ "version": "7.0.4",
+ "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz",
+ "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=16 || 14 >=14.17"
+ }
+ },
"node_modules/mkdirp": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
@@ -2994,21 +4127,6 @@
"integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
"dev": true
},
- "node_modules/next-tick": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz",
- "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==",
- "dev": true
- },
- "node_modules/no-case": {
- "version": "2.3.2",
- "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
- "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==",
- "dev": true,
- "dependencies": {
- "lower-case": "^1.1.1"
- }
- },
"node_modules/nopt": {
"version": "3.0.6",
"resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
@@ -3021,6 +4139,21 @@
"nopt": "bin/nopt.js"
}
},
+ "node_modules/normalize-package-data": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-6.0.0.tgz",
+ "integrity": "sha512-UL7ELRVxYBHBgYEtZCXjxuD5vPxnmvMGq0jp/dGPKKrN7tfsBh2IY7TlJ15WWwdjRWD3RJbnsygUurTK3xkPkg==",
+ "dev": true,
+ "dependencies": {
+ "hosted-git-info": "^7.0.0",
+ "is-core-module": "^2.8.1",
+ "semver": "^7.3.5",
+ "validate-npm-package-license": "^3.0.4"
+ },
+ "engines": {
+ "node": "^16.14.0 || >=18.0.0"
+ }
+ },
"node_modules/normalize-path": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
@@ -3164,6 +4297,15 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
+ "node_modules/p-try": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+ "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=6"
+ }
+ },
"node_modules/pad-right": {
"version": "0.2.2",
"resolved": "https://registry.npmjs.org/pad-right/-/pad-right-0.2.2.tgz",
@@ -3202,6 +4344,35 @@
"node": ">=0.8"
}
},
+ "node_modules/parse-json": {
+ "version": "8.1.0",
+ "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-8.1.0.tgz",
+ "integrity": "sha512-rum1bPifK5SSar35Z6EKZuYPJx85pkNaFrxBK3mwdfSJ1/WKbYrjoW/zTPSjRRamfmVX1ACBIdFAO0VRErW/EA==",
+ "dev": true,
+ "dependencies": {
+ "@babel/code-frame": "^7.22.13",
+ "index-to-position": "^0.1.2",
+ "type-fest": "^4.7.1"
+ },
+ "engines": {
+ "node": ">=18"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/parse-json/node_modules/type-fest": {
+ "version": "4.12.0",
+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.12.0.tgz",
+ "integrity": "sha512-5Y2/pp2wtJk8o08G0CMkuFPCO354FGwk/vbidxrdhRGZfd0tFnb4Qb8anp9XxXriwBgVPjdWbKpGl4J9lJY2jQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=16"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
"node_modules/parse-passwd": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
@@ -3265,6 +4436,22 @@
"node": ">=0.10.0"
}
},
+ "node_modules/path-scurry": {
+ "version": "1.10.1",
+ "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.1.tgz",
+ "integrity": "sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==",
+ "dev": true,
+ "dependencies": {
+ "lru-cache": "^9.1.1 || ^10.0.0",
+ "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
+ },
+ "engines": {
+ "node": ">=16 || 14 >=14.17"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/isaacs"
+ }
+ },
"node_modules/pathval": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz",
@@ -3339,6 +4526,12 @@
"node": ">=0.4.0"
}
},
+ "node_modules/property-expr": {
+ "version": "2.0.6",
+ "resolved": "https://registry.npmjs.org/property-expr/-/property-expr-2.0.6.tgz",
+ "integrity": "sha512-SVtmxhRE/CGkn3eZY1T6pC8Nln6Fr/lu1mKSgRud0eC73whjGfoAogbn78LkD8aFL0zz3bAFerKSnOl7NlErBA==",
+ "dev": true
+ },
"node_modules/punycode": {
"version": "2.3.1",
"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
@@ -3377,6 +4570,213 @@
"safe-buffer": "^5.1.0"
}
},
+ "node_modules/read-package-up": {
+ "version": "11.0.0",
+ "resolved": "https://registry.npmjs.org/read-package-up/-/read-package-up-11.0.0.tgz",
+ "integrity": "sha512-MbgfoNPANMdb4oRBNg5eqLbB2t2r+o5Ua1pNt8BqGp4I0FJZhuVSOj3PaBPni4azWuSzEdNn2evevzVmEk1ohQ==",
+ "dev": true,
+ "dependencies": {
+ "find-up-simple": "^1.0.0",
+ "read-pkg": "^9.0.0",
+ "type-fest": "^4.6.0"
+ },
+ "engines": {
+ "node": ">=18"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/read-package-up/node_modules/type-fest": {
+ "version": "4.12.0",
+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.12.0.tgz",
+ "integrity": "sha512-5Y2/pp2wtJk8o08G0CMkuFPCO354FGwk/vbidxrdhRGZfd0tFnb4Qb8anp9XxXriwBgVPjdWbKpGl4J9lJY2jQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=16"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/read-pkg": {
+ "version": "9.0.1",
+ "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-9.0.1.tgz",
+ "integrity": "sha512-9viLL4/n1BJUCT1NXVTdS1jtm80yDEgR5T4yCelII49Mbj0v1rZdKqj7zCiYdbB0CuCgdrvHcNogAKTFPBocFA==",
+ "dev": true,
+ "dependencies": {
+ "@types/normalize-package-data": "^2.4.3",
+ "normalize-package-data": "^6.0.0",
+ "parse-json": "^8.0.0",
+ "type-fest": "^4.6.0",
+ "unicorn-magic": "^0.1.0"
+ },
+ "engines": {
+ "node": ">=18"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/read-pkg-up": {
+ "version": "7.0.1",
+ "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
+ "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
+ "dev": true,
+ "dependencies": {
+ "find-up": "^4.1.0",
+ "read-pkg": "^5.2.0",
+ "type-fest": "^0.8.1"
+ },
+ "engines": {
+ "node": ">=8"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/read-pkg-up/node_modules/find-up": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+ "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+ "dev": true,
+ "dependencies": {
+ "locate-path": "^5.0.0",
+ "path-exists": "^4.0.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/read-pkg-up/node_modules/hosted-git-info": {
+ "version": "2.8.9",
+ "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+ "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
+ "dev": true
+ },
+ "node_modules/read-pkg-up/node_modules/locate-path": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+ "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+ "dev": true,
+ "dependencies": {
+ "p-locate": "^4.1.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/read-pkg-up/node_modules/normalize-package-data": {
+ "version": "2.5.0",
+ "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+ "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+ "dev": true,
+ "dependencies": {
+ "hosted-git-info": "^2.1.4",
+ "resolve": "^1.10.0",
+ "semver": "2 || 3 || 4 || 5",
+ "validate-npm-package-license": "^3.0.1"
+ }
+ },
+ "node_modules/read-pkg-up/node_modules/p-limit": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+ "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+ "dev": true,
+ "dependencies": {
+ "p-try": "^2.0.0"
+ },
+ "engines": {
+ "node": ">=6"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/read-pkg-up/node_modules/p-locate": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+ "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+ "dev": true,
+ "dependencies": {
+ "p-limit": "^2.2.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/read-pkg-up/node_modules/parse-json": {
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+ "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+ "dev": true,
+ "dependencies": {
+ "@babel/code-frame": "^7.0.0",
+ "error-ex": "^1.3.1",
+ "json-parse-even-better-errors": "^2.3.0",
+ "lines-and-columns": "^1.1.6"
+ },
+ "engines": {
+ "node": ">=8"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/read-pkg-up/node_modules/read-pkg": {
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
+ "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
+ "dev": true,
+ "dependencies": {
+ "@types/normalize-package-data": "^2.4.0",
+ "normalize-package-data": "^2.5.0",
+ "parse-json": "^5.0.0",
+ "type-fest": "^0.6.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/read-pkg-up/node_modules/read-pkg/node_modules/type-fest": {
+ "version": "0.6.0",
+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
+ "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/read-pkg-up/node_modules/semver": {
+ "version": "5.7.2",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+ "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+ "dev": true,
+ "bin": {
+ "semver": "bin/semver"
+ }
+ },
+ "node_modules/read-pkg-up/node_modules/type-fest": {
+ "version": "0.8.1",
+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+ "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/read-pkg/node_modules/type-fest": {
+ "version": "4.12.0",
+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.12.0.tgz",
+ "integrity": "sha512-5Y2/pp2wtJk8o08G0CMkuFPCO354FGwk/vbidxrdhRGZfd0tFnb4Qb8anp9XxXriwBgVPjdWbKpGl4J9lJY2jQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=16"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
"node_modules/readable-stream": {
"version": "4.7.0",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.7.0.tgz",
@@ -3404,12 +4804,30 @@
"node": ">=8.10.0"
}
},
- "node_modules/regenerator-runtime": {
- "version": "0.13.9",
- "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
- "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==",
+ "node_modules/reflect-metadata": {
+ "version": "0.2.1",
+ "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.2.1.tgz",
+ "integrity": "sha512-i5lLI6iw9AU3Uu4szRNPPEkomnkjRTaVt9hy/bn5g/oSzekBSMeLZblcjP74AW0vBabqERLLIrz+gR8QYR54Tw==",
"dev": true
},
+ "node_modules/regexp-match-indices": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/regexp-match-indices/-/regexp-match-indices-1.0.2.tgz",
+ "integrity": "sha512-DwZuAkt8NF5mKwGGER1EGh2PRqyvhRhhLviH+R8y8dIuaQROlUfXjt4s9ZTXstIsSkptf06BSvwcEmmfheJJWQ==",
+ "dev": true,
+ "dependencies": {
+ "regexp-tree": "^0.1.11"
+ }
+ },
+ "node_modules/regexp-tree": {
+ "version": "0.1.27",
+ "resolved": "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.27.tgz",
+ "integrity": "sha512-iETxpjK6YoRWJG5o6hXLwvjYAoW+FEZn9os0PD/b6AP6xQwsa/Y7lCVgIixBbUPMfhu+i2LtdeAqVTgGlQarfA==",
+ "dev": true,
+ "bin": {
+ "regexp-tree": "bin/regexp-tree"
+ }
+ },
"node_modules/repeat-string": {
"version": "1.6.1",
"resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
@@ -3472,6 +4890,27 @@
"node": ">=4"
}
},
+ "node_modules/resolve-pkg": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/resolve-pkg/-/resolve-pkg-2.0.0.tgz",
+ "integrity": "sha512-+1lzwXehGCXSeryaISr6WujZzowloigEofRB+dj75y9RRa/obVcYgbHJd53tdYw8pvZj8GojXaaENws8Ktw/hQ==",
+ "dev": true,
+ "dependencies": {
+ "resolve-from": "^5.0.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/resolve-pkg/node_modules/resolve-from": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+ "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
+ }
+ },
"node_modules/reusify": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
@@ -3551,16 +4990,31 @@
"integrity": "sha512-34EQV6AAHQGhoc0tn/96a9Fsi6v2xdqe/dMUwljGRaFOzR3EgRmECvD0O8vi8X+/uQ50LGHfkNu/Eue5TPKZkQ==",
"dev": true
},
- "node_modules/serialize-error": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-4.1.0.tgz",
- "integrity": "sha512-5j9GgyGsP9vV9Uj1S0lDCvlsd+gc2LEPVK7HHHte7IyPwOD4lVQFeaX143gx3U5AnoCi+wbcb3mvaxVysjpxEw==",
+ "node_modules/semver": {
+ "version": "7.5.3",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz",
+ "integrity": "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==",
"dev": true,
"dependencies": {
- "type-fest": "^0.3.0"
+ "lru-cache": "^6.0.0"
+ },
+ "bin": {
+ "semver": "bin/semver.js"
},
"engines": {
- "node": ">=8"
+ "node": ">=10"
+ }
+ },
+ "node_modules/semver/node_modules/lru-cache": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+ "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+ "dev": true,
+ "dependencies": {
+ "yallist": "^4.0.0"
+ },
+ "engines": {
+ "node": ">=10"
}
},
"node_modules/serialize-javascript": {
@@ -3593,63 +5047,81 @@
"node": ">=8"
}
},
- "node_modules/source-map": {
- "version": "0.5.6",
- "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
- "integrity": "sha512-MjZkVp0NHr5+TPihLcadqnlVoGIoWo4IBHptutGh9wI3ttUYvCG26HkSuDi+K6lsZ25syXJXcctwgyVCt//xqA==",
+ "node_modules/signal-exit": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+ "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+ "dev": true,
+ "engines": {
+ "node": ">=14"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/isaacs"
+ }
+ },
+ "node_modules/source-map-support": {
+ "version": "0.5.21",
+ "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+ "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+ "dev": true,
+ "dependencies": {
+ "buffer-from": "^1.0.0",
+ "source-map": "^0.6.0"
+ }
+ },
+ "node_modules/source-map-support/node_modules/source-map": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
"dev": true,
"engines": {
"node": ">=0.10.0"
}
},
+ "node_modules/spdx-correct": {
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz",
+ "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==",
+ "dev": true,
+ "dependencies": {
+ "spdx-expression-parse": "^3.0.0",
+ "spdx-license-ids": "^3.0.0"
+ }
+ },
+ "node_modules/spdx-exceptions": {
+ "version": "2.5.0",
+ "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz",
+ "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==",
+ "dev": true
+ },
+ "node_modules/spdx-expression-parse": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+ "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+ "dev": true,
+ "dependencies": {
+ "spdx-exceptions": "^2.1.0",
+ "spdx-license-ids": "^3.0.0"
+ }
+ },
+ "node_modules/spdx-license-ids": {
+ "version": "3.0.17",
+ "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.17.tgz",
+ "integrity": "sha512-sh8PWc/ftMqAAdFiBu6Fy6JUOYjqDJBJvIhpfDMyHrr0Rbp5liZqd4TjtQ/RgfLjKFZb+LMx5hpml5qOWy0qvg==",
+ "dev": true
+ },
"node_modules/sprintf-js": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz",
"integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==",
"dev": true
},
- "node_modules/stack-chain": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/stack-chain/-/stack-chain-2.0.0.tgz",
- "integrity": "sha512-GGrHXePi305aW7XQweYZZwiRwR7Js3MWoK/EHzzB9ROdc75nCnjSJVi21rdAGxFl+yCx2L2qdfl5y7NO4lTyqg==",
- "dev": true
- },
- "node_modules/stack-generator": {
- "version": "2.0.10",
- "resolved": "https://registry.npmjs.org/stack-generator/-/stack-generator-2.0.10.tgz",
- "integrity": "sha512-mwnua/hkqM6pF4k8SnmZ2zfETsRUpWXREfA/goT8SLCV4iOFa4bzOX2nDipWAZFPTjLvQB82f5yaodMVhK0yJQ==",
- "dev": true,
- "dependencies": {
- "stackframe": "^1.3.4"
- }
- },
"node_modules/stackframe": {
"version": "1.3.4",
"resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.3.4.tgz",
"integrity": "sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==",
"dev": true
},
- "node_modules/stacktrace-gps": {
- "version": "3.1.2",
- "resolved": "https://registry.npmjs.org/stacktrace-gps/-/stacktrace-gps-3.1.2.tgz",
- "integrity": "sha512-GcUgbO4Jsqqg6RxfyTHFiPxdPqF+3LFmQhm7MgCuYQOYuWyqxo5pwRPz5d/u6/WYJdEnWfK4r+jGbyD8TSggXQ==",
- "dev": true,
- "dependencies": {
- "source-map": "0.5.6",
- "stackframe": "^1.3.4"
- }
- },
- "node_modules/stacktrace-js": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/stacktrace-js/-/stacktrace-js-2.0.2.tgz",
- "integrity": "sha512-Je5vBeY4S1r/RnLydLl0TBTi3F2qdfWmYsGvtfZgEI+SCprPppaIhQf5nGcal4gI4cGpCV/duLcAzT1np6sQqg==",
- "dev": true,
- "dependencies": {
- "error-stack-parser": "^2.0.6",
- "stack-generator": "^2.0.5",
- "stacktrace-gps": "^3.0.4"
- }
- },
"node_modules/string_decoder": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
@@ -3681,6 +5153,21 @@
"node": ">=8"
}
},
+ "node_modules/string-width-cjs": {
+ "name": "string-width",
+ "version": "4.2.3",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+ "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+ "dev": true,
+ "dependencies": {
+ "emoji-regex": "^8.0.0",
+ "is-fullwidth-code-point": "^3.0.0",
+ "strip-ansi": "^6.0.1"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
"node_modules/strip-ansi": {
"version": "6.0.1",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
@@ -3693,6 +5180,19 @@
"node": ">=8"
}
},
+ "node_modules/strip-ansi-cjs": {
+ "name": "strip-ansi",
+ "version": "6.0.1",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+ "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+ "dev": true,
+ "dependencies": {
+ "ansi-regex": "^5.0.1"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
"node_modules/strip-json-comments": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
@@ -3766,14 +5266,28 @@
"node": ">=0.8"
}
},
- "node_modules/title-case": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/title-case/-/title-case-2.1.1.tgz",
- "integrity": "sha512-EkJoZ2O3zdCz3zJsYCsxyq2OC5hrxR9mfdd5I+w8h/tmFfeOxJ+vvkxsKxdmN0WtS9zLdHEgfgVOiMVgv+Po4Q==",
+ "node_modules/tiny-case": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/tiny-case/-/tiny-case-1.0.3.tgz",
+ "integrity": "sha512-Eet/eeMhkO6TX8mnUteS9zgPbUMQa4I6Kkp5ORiBD5476/m+PIRiumP5tmh5ioJpH7k51Kehawy2UDfsnxxY8Q==",
+ "dev": true
+ },
+ "node_modules/tmp": {
+ "version": "0.2.3",
+ "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz",
+ "integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==",
"dev": true,
- "dependencies": {
- "no-case": "^2.2.0",
- "upper-case": "^1.0.3"
+ "engines": {
+ "node": ">=14.14"
+ }
+ },
+ "node_modules/to-fast-properties": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+ "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
+ "dev": true,
+ "engines": {
+ "node": ">=4"
}
},
"node_modules/to-regex-range": {
@@ -3788,18 +5302,61 @@
"node": ">=8.0"
}
},
+ "node_modules/toposort": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/toposort/-/toposort-2.0.2.tgz",
+ "integrity": "sha512-0a5EOkAUp8D4moMi2W8ZF8jcga7BgZd91O/yabJCFY8az+XSzeGyTKs0Aoo897iV1Nj6guFq8orWDS96z91oGg==",
+ "dev": true
+ },
+ "node_modules/ts-node": {
+ "version": "10.9.2",
+ "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz",
+ "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==",
+ "dev": true,
+ "dependencies": {
+ "@cspotcode/source-map-support": "^0.8.0",
+ "@tsconfig/node10": "^1.0.7",
+ "@tsconfig/node12": "^1.0.7",
+ "@tsconfig/node14": "^1.0.0",
+ "@tsconfig/node16": "^1.0.2",
+ "acorn": "^8.4.1",
+ "acorn-walk": "^8.1.1",
+ "arg": "^4.1.0",
+ "create-require": "^1.1.0",
+ "diff": "^4.0.1",
+ "make-error": "^1.1.1",
+ "v8-compile-cache-lib": "^3.0.1",
+ "yn": "3.1.1"
+ },
+ "bin": {
+ "ts-node": "dist/bin.js",
+ "ts-node-cwd": "dist/bin-cwd.js",
+ "ts-node-esm": "dist/bin-esm.js",
+ "ts-node-script": "dist/bin-script.js",
+ "ts-node-transpile-only": "dist/bin-transpile.js",
+ "ts-script": "dist/bin-script-deprecated.js"
+ },
+ "peerDependencies": {
+ "@swc/core": ">=1.2.50",
+ "@swc/wasm": ">=1.2.50",
+ "@types/node": "*",
+ "typescript": ">=2.7"
+ },
+ "peerDependenciesMeta": {
+ "@swc/core": {
+ "optional": true
+ },
+ "@swc/wasm": {
+ "optional": true
+ }
+ }
+ },
"node_modules/tslib": {
"version": "2.7.0",
"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
"integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
"dev": true
},
- "node_modules/type": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
- "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==",
- "dev": true
- },
"node_modules/type-check": {
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
@@ -3821,13 +5378,17 @@
"node": ">=4"
}
},
- "node_modules/type-fest": {
- "version": "0.3.1",
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz",
- "integrity": "sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==",
+ "node_modules/typescript": {
+ "version": "5.4.2",
+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.2.tgz",
+ "integrity": "sha512-+2/g0Fds1ERlP6JsakQQDXjZdZMM+rqpamFZJEKh4kwTIn3iDkgKtby0CeNd5ATNZ4Ry1ax15TMx0W2V+miizQ==",
"dev": true,
+ "bin": {
+ "tsc": "bin/tsc",
+ "tsserver": "bin/tsserver"
+ },
"engines": {
- "node": ">=6"
+ "node": ">=14.17"
}
},
"node_modules/uc.micro": {
@@ -3858,12 +5419,33 @@
"node": "*"
}
},
- "node_modules/upper-case": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz",
- "integrity": "sha512-WRbjgmYzgXkCV7zNVpy5YgrHgbBv126rMALQQMrmzOVC4GM2waQ9x7xtm8VU+1yF2kWyPzI9zbZ48n4vSxwfSA==",
+ "node_modules/undici-types": {
+ "version": "5.26.5",
+ "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+ "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
"dev": true
},
+ "node_modules/unicorn-magic": {
+ "version": "0.1.0",
+ "resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.1.0.tgz",
+ "integrity": "sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=18"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/upper-case-first": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/upper-case-first/-/upper-case-first-2.0.2.tgz",
+ "integrity": "sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==",
+ "dev": true,
+ "dependencies": {
+ "tslib": "^2.0.3"
+ }
+ },
"node_modules/uri-js": {
"version": "4.4.1",
"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
@@ -3897,6 +5479,12 @@
"uuid": "dist/bin/uuid"
}
},
+ "node_modules/v8-compile-cache-lib": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz",
+ "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==",
+ "dev": true
+ },
"node_modules/v8flags": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/v8flags/-/v8flags-4.0.1.tgz",
@@ -3906,18 +5494,14 @@
"node": ">= 10.13.0"
}
},
- "node_modules/verror": {
- "version": "1.10.1",
- "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.1.tgz",
- "integrity": "sha512-veufcmxri4e3XSrT0xwfUR7kguIkaxBeosDg00yDWhk49wdwkSUrvvsm7nc75e1PUyvIeZj6nS8VQRYz2/S4Xg==",
+ "node_modules/validate-npm-package-license": {
+ "version": "3.0.4",
+ "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+ "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
"dev": true,
"dependencies": {
- "assert-plus": "^1.0.0",
- "core-util-is": "1.0.2",
- "extsprintf": "^1.2.0"
- },
- "engines": {
- "node": ">=0.6.0"
+ "spdx-correct": "^3.0.0",
+ "spdx-expression-parse": "^3.0.0"
}
},
"node_modules/which": {
@@ -3955,6 +5539,24 @@
"url": "https://github.com/chalk/wrap-ansi?sponsor=1"
}
},
+ "node_modules/wrap-ansi-cjs": {
+ "name": "wrap-ansi",
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+ "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+ "dev": true,
+ "dependencies": {
+ "ansi-styles": "^4.0.0",
+ "string-width": "^4.1.0",
+ "strip-ansi": "^6.0.0"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+ }
+ },
"node_modules/wrap-ansi/node_modules/ansi-styles": {
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -4014,13 +5616,13 @@
}
}
},
- "node_modules/xregexp": {
- "version": "4.4.1",
- "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-4.4.1.tgz",
- "integrity": "sha512-2u9HwfadaJaY9zHtRRnH6BY6CQVNQKkYm3oLtC9gJXXzfsbACg5X5e4EZZGVAH+YIfa+QA9lsFQTTe3HURF3ag==",
+ "node_modules/xmlbuilder": {
+ "version": "15.1.1",
+ "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-15.1.1.tgz",
+ "integrity": "sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg==",
"dev": true,
- "dependencies": {
- "@babel/runtime-corejs3": "^7.12.1"
+ "engines": {
+ "node": ">=8.0"
}
},
"node_modules/y18n": {
@@ -4032,6 +5634,24 @@
"node": ">=10"
}
},
+ "node_modules/yallist": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+ "dev": true
+ },
+ "node_modules/yaml": {
+ "version": "2.4.1",
+ "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.4.1.tgz",
+ "integrity": "sha512-pIXzoImaqmfOrL7teGUBt/T7ZDnyeGBWyXQBvOVhLkWLN37GXv8NMLK406UY6dS51JfcQHsmcW5cJ441bHg6Lg==",
+ "dev": true,
+ "bin": {
+ "yaml": "bin.mjs"
+ },
+ "engines": {
+ "node": ">= 14"
+ }
+ },
"node_modules/yargs": {
"version": "16.2.0",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
@@ -4074,6 +5694,15 @@
"node": ">=10"
}
},
+ "node_modules/yn": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
+ "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
+ "dev": true,
+ "engines": {
+ "node": ">=6"
+ }
+ },
"node_modules/yocto-queue": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
@@ -4085,6 +5714,30 @@
"funding": {
"url": "https://github.com/sponsors/sindresorhus"
}
+ },
+ "node_modules/yup": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/yup/-/yup-1.2.0.tgz",
+ "integrity": "sha512-PPqYKSAXjpRCgLgLKVGPA33v5c/WgEx3wi6NFjIiegz90zSwyMpvTFp/uGcVnnbx6to28pgnzp/q8ih3QRjLMQ==",
+ "dev": true,
+ "dependencies": {
+ "property-expr": "^2.0.5",
+ "tiny-case": "^1.0.3",
+ "toposort": "^2.0.2",
+ "type-fest": "^2.19.0"
+ }
+ },
+ "node_modules/yup/node_modules/type-fest": {
+ "version": "2.19.0",
+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
+ "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
+ "dev": true,
+ "engines": {
+ "node": ">=12.20"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
}
},
"dependencies": {
@@ -4094,22 +5747,576 @@
"integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==",
"dev": true
},
- "@babel/parser": {
- "version": "7.14.4",
- "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.4.tgz",
- "integrity": "sha512-ArliyUsWDUqEGfWcmzpGUzNfLxTdTp6WU4IuP6QFSp9gGfWS6boxFCkJSJ/L4+RG8z/FnIU3WxCk6hPL9SSWeA==",
- "dev": true
- },
- "@babel/runtime-corejs3": {
- "version": "7.18.9",
- "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.18.9.tgz",
- "integrity": "sha512-qZEWeccZCrHA2Au4/X05QW5CMdm4VjUDCrGq5gf1ZDcM4hRqreKrtwAn7yci9zfgAS9apvnsFXiGBHBAxZdK9A==",
+ "@babel/code-frame": {
+ "version": "7.23.5",
+ "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.5.tgz",
+ "integrity": "sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==",
"dev": true,
"requires": {
- "core-js-pure": "^3.20.2",
- "regenerator-runtime": "^0.13.4"
+ "@babel/highlight": "^7.23.4",
+ "chalk": "^2.4.2"
+ },
+ "dependencies": {
+ "ansi-styles": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+ "dev": true,
+ "requires": {
+ "color-convert": "^1.9.0"
+ }
+ },
+ "chalk": {
+ "version": "2.4.2",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "^3.2.1",
+ "escape-string-regexp": "^1.0.5",
+ "supports-color": "^5.3.0"
+ }
+ },
+ "color-convert": {
+ "version": "1.9.3",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+ "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+ "dev": true,
+ "requires": {
+ "color-name": "1.1.3"
+ }
+ },
+ "color-name": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+ "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+ "dev": true
+ },
+ "escape-string-regexp": {
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+ "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+ "dev": true
+ },
+ "has-flag": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+ "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+ "dev": true
+ },
+ "supports-color": {
+ "version": "5.5.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+ "dev": true,
+ "requires": {
+ "has-flag": "^3.0.0"
+ }
+ }
}
},
+ "@babel/generator": {
+ "version": "7.23.6",
+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.6.tgz",
+ "integrity": "sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==",
+ "dev": true,
+ "requires": {
+ "@babel/types": "^7.23.6",
+ "@jridgewell/gen-mapping": "^0.3.2",
+ "@jridgewell/trace-mapping": "^0.3.17",
+ "jsesc": "^2.5.1"
+ }
+ },
+ "@babel/helper-environment-visitor": {
+ "version": "7.22.20",
+ "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
+ "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
+ "dev": true
+ },
+ "@babel/helper-function-name": {
+ "version": "7.23.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
+ "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
+ "dev": true,
+ "requires": {
+ "@babel/template": "^7.22.15",
+ "@babel/types": "^7.23.0"
+ }
+ },
+ "@babel/helper-hoist-variables": {
+ "version": "7.22.5",
+ "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
+ "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
+ "dev": true,
+ "requires": {
+ "@babel/types": "^7.22.5"
+ }
+ },
+ "@babel/helper-split-export-declaration": {
+ "version": "7.22.6",
+ "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
+ "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
+ "dev": true,
+ "requires": {
+ "@babel/types": "^7.22.5"
+ }
+ },
+ "@babel/helper-string-parser": {
+ "version": "7.23.4",
+ "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz",
+ "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==",
+ "dev": true
+ },
+ "@babel/helper-validator-identifier": {
+ "version": "7.22.20",
+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
+ "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
+ "dev": true
+ },
+ "@babel/highlight": {
+ "version": "7.23.4",
+ "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz",
+ "integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-validator-identifier": "^7.22.20",
+ "chalk": "^2.4.2",
+ "js-tokens": "^4.0.0"
+ },
+ "dependencies": {
+ "ansi-styles": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+ "dev": true,
+ "requires": {
+ "color-convert": "^1.9.0"
+ }
+ },
+ "chalk": {
+ "version": "2.4.2",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "^3.2.1",
+ "escape-string-regexp": "^1.0.5",
+ "supports-color": "^5.3.0"
+ }
+ },
+ "color-convert": {
+ "version": "1.9.3",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+ "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+ "dev": true,
+ "requires": {
+ "color-name": "1.1.3"
+ }
+ },
+ "color-name": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+ "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+ "dev": true
+ },
+ "escape-string-regexp": {
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+ "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+ "dev": true
+ },
+ "has-flag": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+ "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+ "dev": true
+ },
+ "supports-color": {
+ "version": "5.5.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+ "dev": true,
+ "requires": {
+ "has-flag": "^3.0.0"
+ }
+ }
+ }
+ },
+ "@babel/parser": {
+ "version": "7.24.0",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.0.tgz",
+ "integrity": "sha512-QuP/FxEAzMSjXygs8v4N9dvdXzEHN4W1oF3PxuWAtPo08UdM17u89RDMgjLn/mlc56iM0HlLmVkO/wgR+rDgHg==",
+ "dev": true
+ },
+ "@babel/template": {
+ "version": "7.24.0",
+ "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.0.tgz",
+ "integrity": "sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==",
+ "dev": true,
+ "requires": {
+ "@babel/code-frame": "^7.23.5",
+ "@babel/parser": "^7.24.0",
+ "@babel/types": "^7.24.0"
+ }
+ },
+ "@babel/traverse": {
+ "version": "7.24.0",
+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.0.tgz",
+ "integrity": "sha512-HfuJlI8qq3dEDmNU5ChzzpZRWq+oxCZQyMzIMEqLho+AQnhMnKQUzH6ydo3RBl/YjPCuk68Y6s0Gx0AeyULiWw==",
+ "dev": true,
+ "requires": {
+ "@babel/code-frame": "^7.23.5",
+ "@babel/generator": "^7.23.6",
+ "@babel/helper-environment-visitor": "^7.22.20",
+ "@babel/helper-function-name": "^7.23.0",
+ "@babel/helper-hoist-variables": "^7.22.5",
+ "@babel/helper-split-export-declaration": "^7.22.6",
+ "@babel/parser": "^7.24.0",
+ "@babel/types": "^7.24.0",
+ "debug": "^4.3.1",
+ "globals": "^11.1.0"
+ },
+ "dependencies": {
+ "globals": {
+ "version": "11.12.0",
+ "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+ "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+ "dev": true
+ }
+ }
+ },
+ "@babel/types": {
+ "version": "7.24.0",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.0.tgz",
+ "integrity": "sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-string-parser": "^7.23.4",
+ "@babel/helper-validator-identifier": "^7.22.20",
+ "to-fast-properties": "^2.0.0"
+ }
+ },
+ "@colors/colors": {
+ "version": "1.5.0",
+ "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz",
+ "integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==",
+ "dev": true,
+ "optional": true
+ },
+ "@cspotcode/source-map-support": {
+ "version": "0.8.1",
+ "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz",
+ "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==",
+ "dev": true,
+ "requires": {
+ "@jridgewell/trace-mapping": "0.3.9"
+ },
+ "dependencies": {
+ "@jridgewell/trace-mapping": {
+ "version": "0.3.9",
+ "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz",
+ "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==",
+ "dev": true,
+ "requires": {
+ "@jridgewell/resolve-uri": "^3.0.3",
+ "@jridgewell/sourcemap-codec": "^1.4.10"
+ }
+ }
+ }
+ },
+ "@cucumber/ci-environment": {
+ "version": "10.0.0",
+ "resolved": "https://registry.npmjs.org/@cucumber/ci-environment/-/ci-environment-10.0.0.tgz",
+ "integrity": "sha512-lRkiehckosIOdc7p1L44nZsttO5dVHFjpwKKWZ07x8SeoAdV/sPuGe1PISe0AmAowFGza62nMOgG4KaroGzwFQ==",
+ "dev": true
+ },
+ "@cucumber/cucumber": {
+ "version": "10.3.1",
+ "resolved": "https://registry.npmjs.org/@cucumber/cucumber/-/cucumber-10.3.1.tgz",
+ "integrity": "sha512-0H0NkOXcYTCG1qCh3o0p1HPSMODGJmlHi1rm5yfoiMx5tJbBjxVNI2VVD2xtPWA+D6ehHQD9asewuzjMXrbPIw==",
+ "dev": true,
+ "requires": {
+ "@cucumber/ci-environment": "10.0.0",
+ "@cucumber/cucumber-expressions": "17.0.1",
+ "@cucumber/gherkin": "27.0.0",
+ "@cucumber/gherkin-streams": "5.0.1",
+ "@cucumber/gherkin-utils": "8.0.5",
+ "@cucumber/html-formatter": "21.2.0",
+ "@cucumber/message-streams": "4.0.1",
+ "@cucumber/messages": "24.0.1",
+ "@cucumber/tag-expressions": "6.1.0",
+ "assertion-error-formatter": "^3.0.0",
+ "capital-case": "^1.0.4",
+ "chalk": "^4.1.2",
+ "cli-table3": "0.6.3",
+ "commander": "^10.0.0",
+ "debug": "^4.3.4",
+ "error-stack-parser": "^2.1.4",
+ "figures": "^3.2.0",
+ "glob": "^10.3.10",
+ "has-ansi": "^4.0.1",
+ "indent-string": "^4.0.0",
+ "is-installed-globally": "^0.4.0",
+ "is-stream": "^2.0.0",
+ "knuth-shuffle-seeded": "^1.0.6",
+ "lodash.merge": "^4.6.2",
+ "lodash.mergewith": "^4.6.2",
+ "luxon": "3.2.1",
+ "mkdirp": "^2.1.5",
+ "mz": "^2.7.0",
+ "progress": "^2.0.3",
+ "read-pkg-up": "^7.0.1",
+ "resolve-pkg": "^2.0.0",
+ "semver": "7.5.3",
+ "string-argv": "0.3.1",
+ "strip-ansi": "6.0.1",
+ "supports-color": "^8.1.1",
+ "tmp": "^0.2.1",
+ "type-fest": "^4.8.3",
+ "util-arity": "^1.1.0",
+ "xmlbuilder": "^15.1.1",
+ "yaml": "^2.2.2",
+ "yup": "1.2.0"
+ },
+ "dependencies": {
+ "brace-expansion": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+ "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+ "dev": true,
+ "requires": {
+ "balanced-match": "^1.0.0"
+ }
+ },
+ "cli-table3": {
+ "version": "0.6.3",
+ "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.3.tgz",
+ "integrity": "sha512-w5Jac5SykAeZJKntOxJCrm63Eg5/4dhMWIcuTbo9rpE+brgaSZo0RuNJZeOyMgsUdhDeojvgyQLmjI+K50ZGyg==",
+ "dev": true,
+ "requires": {
+ "@colors/colors": "1.5.0",
+ "string-width": "^4.2.0"
+ }
+ },
+ "commander": {
+ "version": "10.0.1",
+ "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz",
+ "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==",
+ "dev": true
+ },
+ "glob": {
+ "version": "10.3.10",
+ "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz",
+ "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==",
+ "dev": true,
+ "requires": {
+ "foreground-child": "^3.1.0",
+ "jackspeak": "^2.3.5",
+ "minimatch": "^9.0.1",
+ "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0",
+ "path-scurry": "^1.10.1"
+ }
+ },
+ "minimatch": {
+ "version": "9.0.3",
+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
+ "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+ "dev": true,
+ "requires": {
+ "brace-expansion": "^2.0.1"
+ }
+ },
+ "mkdirp": {
+ "version": "2.1.6",
+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-2.1.6.tgz",
+ "integrity": "sha512-+hEnITedc8LAtIP9u3HJDFIdcLV2vXP33sqLLIzkv1Db1zO/1OxbvYf0Y1OC/S/Qo5dxHXepofhmxL02PsKe+A==",
+ "dev": true
+ },
+ "supports-color": {
+ "version": "8.1.1",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+ "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+ "dev": true,
+ "requires": {
+ "has-flag": "^4.0.0"
+ }
+ },
+ "type-fest": {
+ "version": "4.12.0",
+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.12.0.tgz",
+ "integrity": "sha512-5Y2/pp2wtJk8o08G0CMkuFPCO354FGwk/vbidxrdhRGZfd0tFnb4Qb8anp9XxXriwBgVPjdWbKpGl4J9lJY2jQ==",
+ "dev": true
+ }
+ }
+ },
+ "@cucumber/cucumber-expressions": {
+ "version": "17.0.1",
+ "resolved": "https://registry.npmjs.org/@cucumber/cucumber-expressions/-/cucumber-expressions-17.0.1.tgz",
+ "integrity": "sha512-reR7/sNRmDWgdz8BtFuHEwpksPnAkHty7gxUC2n0iaUPmckv9G5I5i+Vonc6xwUHDb/hmHPz/DyUL+Iv4Ao96w==",
+ "dev": true,
+ "requires": {
+ "regexp-match-indices": "1.0.2"
+ }
+ },
+ "@cucumber/gherkin": {
+ "version": "27.0.0",
+ "resolved": "https://registry.npmjs.org/@cucumber/gherkin/-/gherkin-27.0.0.tgz",
+ "integrity": "sha512-j5rCsjqzRiC3iVTier3sa0kzyNbkcAmF7xr7jKnyO7qDeK3Z8Ye1P3KSVpeQRMY+KCDJ3WbTDdyxH0FwfA/fIw==",
+ "dev": true,
+ "requires": {
+ "@cucumber/messages": ">=19.1.4 <=22"
+ },
+ "dependencies": {
+ "@cucumber/messages": {
+ "version": "22.0.0",
+ "resolved": "https://registry.npmjs.org/@cucumber/messages/-/messages-22.0.0.tgz",
+ "integrity": "sha512-EuaUtYte9ilkxcKmfqGF9pJsHRUU0jwie5ukuZ/1NPTuHS1LxHPsGEODK17RPRbZHOFhqybNzG2rHAwThxEymg==",
+ "dev": true,
+ "requires": {
+ "@types/uuid": "9.0.1",
+ "class-transformer": "0.5.1",
+ "reflect-metadata": "0.1.13",
+ "uuid": "9.0.0"
+ }
+ },
+ "@types/uuid": {
+ "version": "9.0.1",
+ "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.1.tgz",
+ "integrity": "sha512-rFT3ak0/2trgvp4yYZo5iKFEPsET7vKydKF+VRCxlQ9bpheehyAJH89dAkaLEq/j/RZXJIqcgsmPJKUP1Z28HA==",
+ "dev": true
+ },
+ "reflect-metadata": {
+ "version": "0.1.13",
+ "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz",
+ "integrity": "sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==",
+ "dev": true
+ },
+ "uuid": {
+ "version": "9.0.0",
+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz",
+ "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==",
+ "dev": true
+ }
+ }
+ },
+ "@cucumber/gherkin-streams": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/@cucumber/gherkin-streams/-/gherkin-streams-5.0.1.tgz",
+ "integrity": "sha512-/7VkIE/ASxIP/jd4Crlp4JHXqdNFxPGQokqWqsaCCiqBiu5qHoKMxcWNlp9njVL/n9yN4S08OmY3ZR8uC5x74Q==",
+ "dev": true,
+ "requires": {
+ "commander": "9.1.0",
+ "source-map-support": "0.5.21"
+ },
+ "dependencies": {
+ "commander": {
+ "version": "9.1.0",
+ "resolved": "https://registry.npmjs.org/commander/-/commander-9.1.0.tgz",
+ "integrity": "sha512-i0/MaqBtdbnJ4XQs4Pmyb+oFQl+q0lsAmokVUH92SlSw4fkeAcG3bVon+Qt7hmtF+u3Het6o4VgrcY3qAoEB6w==",
+ "dev": true
+ }
+ }
+ },
+ "@cucumber/gherkin-utils": {
+ "version": "8.0.5",
+ "resolved": "https://registry.npmjs.org/@cucumber/gherkin-utils/-/gherkin-utils-8.0.5.tgz",
+ "integrity": "sha512-kxM1OCDjYddF26VKc892PF0GokW4wUIl1PUz3TIXsPZgS39ExM1pF8oww8mlGFD2B0+4op/cSE3SSIME5H3aNw==",
+ "dev": true,
+ "requires": {
+ "@cucumber/gherkin": "^26.0.0",
+ "@cucumber/messages": "^22.0.0",
+ "@teppeis/multimaps": "3.0.0",
+ "commander": "10.0.1",
+ "source-map-support": "^0.5.21"
+ },
+ "dependencies": {
+ "@cucumber/gherkin": {
+ "version": "26.2.0",
+ "resolved": "https://registry.npmjs.org/@cucumber/gherkin/-/gherkin-26.2.0.tgz",
+ "integrity": "sha512-iRSiK8YAIHAmLrn/mUfpAx7OXZ7LyNlh1zT89RoziSVCbqSVDxJS6ckEzW8loxs+EEXl0dKPQOXiDmbHV+C/fA==",
+ "dev": true,
+ "requires": {
+ "@cucumber/messages": ">=19.1.4 <=22"
+ }
+ },
+ "@cucumber/messages": {
+ "version": "22.0.0",
+ "resolved": "https://registry.npmjs.org/@cucumber/messages/-/messages-22.0.0.tgz",
+ "integrity": "sha512-EuaUtYte9ilkxcKmfqGF9pJsHRUU0jwie5ukuZ/1NPTuHS1LxHPsGEODK17RPRbZHOFhqybNzG2rHAwThxEymg==",
+ "dev": true,
+ "requires": {
+ "@types/uuid": "9.0.1",
+ "class-transformer": "0.5.1",
+ "reflect-metadata": "0.1.13",
+ "uuid": "9.0.0"
+ }
+ },
+ "@types/uuid": {
+ "version": "9.0.1",
+ "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.1.tgz",
+ "integrity": "sha512-rFT3ak0/2trgvp4yYZo5iKFEPsET7vKydKF+VRCxlQ9bpheehyAJH89dAkaLEq/j/RZXJIqcgsmPJKUP1Z28HA==",
+ "dev": true
+ },
+ "commander": {
+ "version": "10.0.1",
+ "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz",
+ "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==",
+ "dev": true
+ },
+ "reflect-metadata": {
+ "version": "0.1.13",
+ "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz",
+ "integrity": "sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==",
+ "dev": true
+ },
+ "uuid": {
+ "version": "9.0.0",
+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz",
+ "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==",
+ "dev": true
+ }
+ }
+ },
+ "@cucumber/html-formatter": {
+ "version": "21.2.0",
+ "resolved": "https://registry.npmjs.org/@cucumber/html-formatter/-/html-formatter-21.2.0.tgz",
+ "integrity": "sha512-4OcSa12Y0v5e4ySDl67+QFTxCG/Y9fxGSkFqvm98ggpTvS7b75whwzupu+lM2lMBw+h3H6P8ZURQr0xQIAwE2A==",
+ "dev": true,
+ "requires": {}
+ },
+ "@cucumber/message-streams": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/@cucumber/message-streams/-/message-streams-4.0.1.tgz",
+ "integrity": "sha512-Kxap9uP5jD8tHUZVjTWgzxemi/0uOsbGjd4LBOSxcJoOCRbESFwemUzilJuzNTB8pcTQUh8D5oudUyxfkJOKmA==",
+ "dev": true,
+ "requires": {}
+ },
+ "@cucumber/messages": {
+ "version": "24.0.1",
+ "resolved": "https://registry.npmjs.org/@cucumber/messages/-/messages-24.0.1.tgz",
+ "integrity": "sha512-dKfNkvgc6stSQIyeHk7p/221iqEZe1BP+e/Js8XKtSmc0sS8khKMvbSBwYVeonn/67/vYKiAyo6Eo0SzXd5Plw==",
+ "dev": true,
+ "requires": {
+ "@types/uuid": "9.0.7",
+ "class-transformer": "0.5.1",
+ "reflect-metadata": "0.2.1",
+ "uuid": "9.0.1"
+ },
+ "dependencies": {
+ "@types/uuid": {
+ "version": "9.0.7",
+ "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.7.tgz",
+ "integrity": "sha512-WUtIVRUZ9i5dYXefDEAI7sh9/O7jGvHg7Df/5O/gtH3Yabe5odI3UWopVR1qbPXQtvOxWu3mM4XxlYeZtMWF4g==",
+ "dev": true
+ }
+ }
+ },
+ "@cucumber/tag-expressions": {
+ "version": "6.1.0",
+ "resolved": "https://registry.npmjs.org/@cucumber/tag-expressions/-/tag-expressions-6.1.0.tgz",
+ "integrity": "sha512-+3DwRumrCJG27AtzCIL37A/X+A/gSfxOPLg8pZaruh5SLumsTmpvilwroVWBT2fPzmno/tGXypeK5a7NHU4RzA==",
+ "dev": true
+ },
"@eslint-community/eslint-utils": {
"version": "4.4.0",
"resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
@@ -4188,6 +6395,216 @@
"integrity": "sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==",
"dev": true
},
+ "@isaacs/cliui": {
+ "version": "8.0.2",
+ "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
+ "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
+ "dev": true,
+ "requires": {
+ "string-width": "^5.1.2",
+ "string-width-cjs": "npm:string-width@^4.2.0",
+ "strip-ansi": "^7.0.1",
+ "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
+ "wrap-ansi": "^8.1.0",
+ "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
+ },
+ "dependencies": {
+ "ansi-regex": {
+ "version": "6.0.1",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+ "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+ "dev": true
+ },
+ "ansi-styles": {
+ "version": "6.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+ "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+ "dev": true
+ },
+ "emoji-regex": {
+ "version": "9.2.2",
+ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+ "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+ "dev": true
+ },
+ "string-width": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+ "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+ "dev": true,
+ "requires": {
+ "eastasianwidth": "^0.2.0",
+ "emoji-regex": "^9.2.2",
+ "strip-ansi": "^7.0.1"
+ }
+ },
+ "strip-ansi": {
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+ "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+ "dev": true,
+ "requires": {
+ "ansi-regex": "^6.0.1"
+ }
+ },
+ "wrap-ansi": {
+ "version": "8.1.0",
+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
+ "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "^6.1.0",
+ "string-width": "^5.0.1",
+ "strip-ansi": "^7.0.1"
+ }
+ }
+ }
+ },
+ "@jridgewell/gen-mapping": {
+ "version": "0.3.5",
+ "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
+ "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
+ "dev": true,
+ "requires": {
+ "@jridgewell/set-array": "^1.2.1",
+ "@jridgewell/sourcemap-codec": "^1.4.10",
+ "@jridgewell/trace-mapping": "^0.3.24"
+ }
+ },
+ "@jridgewell/resolve-uri": {
+ "version": "3.1.2",
+ "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+ "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
+ "dev": true
+ },
+ "@jridgewell/set-array": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
+ "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
+ "dev": true
+ },
+ "@jridgewell/sourcemap-codec": {
+ "version": "1.4.15",
+ "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
+ "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
+ "dev": true
+ },
+ "@jridgewell/trace-mapping": {
+ "version": "0.3.25",
+ "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+ "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
+ "dev": true,
+ "requires": {
+ "@jridgewell/resolve-uri": "^3.1.0",
+ "@jridgewell/sourcemap-codec": "^1.4.14"
+ }
+ },
+ "@knighted/duel": {
+ "version": "1.0.7",
+ "resolved": "https://registry.npmjs.org/@knighted/duel/-/duel-1.0.7.tgz",
+ "integrity": "sha512-N/Z/BqKFNwuyPZvrTtcsVtnPABOIfVgyQN58YpTOBBJIWCP/ZrNM4KaMjdWpf5byYjC1LIOzf8Va/9l/buHmig==",
+ "dev": true,
+ "requires": {
+ "@knighted/specifier": "^1.0.1",
+ "find-up": "^6.3.0",
+ "glob": "^10.3.3",
+ "jsonc-parser": "^3.2.0",
+ "read-package-up": "^11.0.0"
+ },
+ "dependencies": {
+ "brace-expansion": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+ "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+ "dev": true,
+ "requires": {
+ "balanced-match": "^1.0.0"
+ }
+ },
+ "find-up": {
+ "version": "6.3.0",
+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-6.3.0.tgz",
+ "integrity": "sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==",
+ "dev": true,
+ "requires": {
+ "locate-path": "^7.1.0",
+ "path-exists": "^5.0.0"
+ }
+ },
+ "glob": {
+ "version": "10.3.10",
+ "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz",
+ "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==",
+ "dev": true,
+ "requires": {
+ "foreground-child": "^3.1.0",
+ "jackspeak": "^2.3.5",
+ "minimatch": "^9.0.1",
+ "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0",
+ "path-scurry": "^1.10.1"
+ }
+ },
+ "locate-path": {
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-7.2.0.tgz",
+ "integrity": "sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==",
+ "dev": true,
+ "requires": {
+ "p-locate": "^6.0.0"
+ }
+ },
+ "minimatch": {
+ "version": "9.0.3",
+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
+ "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+ "dev": true,
+ "requires": {
+ "brace-expansion": "^2.0.1"
+ }
+ },
+ "p-limit": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz",
+ "integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==",
+ "dev": true,
+ "requires": {
+ "yocto-queue": "^1.0.0"
+ }
+ },
+ "p-locate": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-6.0.0.tgz",
+ "integrity": "sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==",
+ "dev": true,
+ "requires": {
+ "p-limit": "^4.0.0"
+ }
+ },
+ "path-exists": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-5.0.0.tgz",
+ "integrity": "sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==",
+ "dev": true
+ },
+ "yocto-queue": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz",
+ "integrity": "sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==",
+ "dev": true
+ }
+ }
+ },
+ "@knighted/specifier": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/@knighted/specifier/-/specifier-1.0.1.tgz",
+ "integrity": "sha512-LArFWJN7wGGLU1P3TeEHgO6wGKWEYq/o4/Yij7rnKk0ng1HbQn1wythI0E9Q7B3+7LRnposEtaeY9AZlE3Cg+Q==",
+ "dev": true,
+ "requires": {
+ "@babel/parser": "^7.22.7",
+ "@babel/traverse": "^7.23.2",
+ "magic-string": "^0.30.1"
+ }
+ },
"@nodelib/fs.scandir": {
"version": "2.1.5",
"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -4214,12 +6631,55 @@
"fastq": "^1.6.0"
}
},
+ "@pkgjs/parseargs": {
+ "version": "0.11.0",
+ "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
+ "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
+ "dev": true,
+ "optional": true
+ },
"@pkgr/core": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.1.1.tgz",
"integrity": "sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA==",
"dev": true
},
+ "@teppeis/multimaps": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/@teppeis/multimaps/-/multimaps-3.0.0.tgz",
+ "integrity": "sha512-ID7fosbc50TbT0MK0EG12O+gAP3W3Aa/Pz4DaTtQtEvlc9Odaqi0de+xuZ7Li2GtK4HzEX7IuRWS/JmZLksR3Q==",
+ "dev": true
+ },
+ "@tsconfig/node10": {
+ "version": "1.0.9",
+ "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz",
+ "integrity": "sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==",
+ "dev": true
+ },
+ "@tsconfig/node12": {
+ "version": "1.0.11",
+ "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz",
+ "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==",
+ "dev": true
+ },
+ "@tsconfig/node14": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz",
+ "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==",
+ "dev": true
+ },
+ "@tsconfig/node16": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz",
+ "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==",
+ "dev": true
+ },
+ "@tsconfig/node18": {
+ "version": "18.2.2",
+ "resolved": "https://registry.npmjs.org/@tsconfig/node18/-/node18-18.2.2.tgz",
+ "integrity": "sha512-d6McJeGsuoRlwWZmVIeE8CUA27lu6jLjvv1JzqmpsytOYYbVi1tHZEnwCNVOXnj4pyLvneZlFlpXUK+X9wBWyw==",
+ "dev": true
+ },
"@types/linkify-it": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-3.0.2.tgz",
@@ -4242,6 +6702,54 @@
"integrity": "sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA==",
"dev": true
},
+ "@types/node": {
+ "version": "20.11.26",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.26.tgz",
+ "integrity": "sha512-YwOMmyhNnAWijOBQweOJnQPl068Oqd4K3OFbTc6AHJwzweUwwWG3GIFY74OKks2PJUDkQPeddOQES9mLn1CTEQ==",
+ "dev": true,
+ "requires": {
+ "undici-types": "~5.26.4"
+ }
+ },
+ "@types/normalize-package-data": {
+ "version": "2.4.4",
+ "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz",
+ "integrity": "sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==",
+ "dev": true
+ },
+ "@types/readable-stream": {
+ "version": "4.0.10",
+ "resolved": "https://registry.npmjs.org/@types/readable-stream/-/readable-stream-4.0.10.tgz",
+ "integrity": "sha512-AbUKBjcC8SHmImNi4yK2bbjogQlkFSg7shZCcicxPQapniOlajG8GCc39lvXzCWX4lLRRs7DM3VAeSlqmEVZUA==",
+ "dev": true,
+ "requires": {
+ "@types/node": "*",
+ "safe-buffer": "~5.1.1"
+ },
+ "dependencies": {
+ "safe-buffer": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+ "dev": true
+ }
+ }
+ },
+ "@types/uuid": {
+ "version": "9.0.8",
+ "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.8.tgz",
+ "integrity": "sha512-jg+97EGIcY9AGHJJRaaPVgetKDsrTgbRjQ5Msgjh/DQKEFl0DtyRr/VCOyD1T2R1MNeWPK/u7JoGhlDZnKBAfA==",
+ "dev": true
+ },
+ "@types/ws": {
+ "version": "8.5.10",
+ "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.10.tgz",
+ "integrity": "sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A==",
+ "dev": true,
+ "requires": {
+ "@types/node": "*"
+ }
+ },
"@ungap/structured-clone": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
@@ -4275,6 +6783,12 @@
"dev": true,
"requires": {}
},
+ "acorn-walk": {
+ "version": "8.3.2",
+ "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.2.tgz",
+ "integrity": "sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==",
+ "dev": true
+ },
"ajv": {
"version": "6.12.6",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
@@ -4324,6 +6838,12 @@
"picomatch": "^2.0.4"
}
},
+ "arg": {
+ "version": "4.1.3",
+ "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
+ "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
+ "dev": true
+ },
"argparse": {
"version": "1.0.10",
"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
@@ -4353,12 +6873,6 @@
"integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==",
"dev": true
},
- "assert-plus": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
- "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
- "dev": true
- },
"assertion-error": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
@@ -4393,12 +6907,6 @@
"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
"integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
},
- "becke-ch--regex--s0-0-v1--base--pl--lib": {
- "version": "1.4.0",
- "resolved": "https://registry.npmjs.org/becke-ch--regex--s0-0-v1--base--pl--lib/-/becke-ch--regex--s0-0-v1--base--pl--lib-1.4.0.tgz",
- "integrity": "sha512-FnWonOyaw7Vivg5nIkrUll9HSS5TjFbyuURAiDssuL6VxrBe3ERzudRxOcWRhZYlP89UArMDikz7SapRPQpmZQ==",
- "dev": true
- },
"binary-extensions": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
@@ -4445,6 +6953,12 @@
"ieee754": "^1.2.1"
}
},
+ "buffer-from": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+ "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+ "dev": true
+ },
"callsites": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
@@ -4457,6 +6971,38 @@
"integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
"dev": true
},
+ "capital-case": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/capital-case/-/capital-case-1.0.4.tgz",
+ "integrity": "sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==",
+ "dev": true,
+ "requires": {
+ "no-case": "^3.0.4",
+ "tslib": "^2.0.3",
+ "upper-case-first": "^2.0.2"
+ },
+ "dependencies": {
+ "lower-case": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz",
+ "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==",
+ "dev": true,
+ "requires": {
+ "tslib": "^2.0.3"
+ }
+ },
+ "no-case": {
+ "version": "3.0.4",
+ "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
+ "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==",
+ "dev": true,
+ "requires": {
+ "lower-case": "^2.0.2",
+ "tslib": "^2.0.3"
+ }
+ }
+ }
+ },
"catharsis": {
"version": "0.9.0",
"resolved": "https://registry.npmjs.org/catharsis/-/catharsis-0.9.0.tgz",
@@ -4567,49 +7113,11 @@
}
}
},
- "cli-table3": {
+ "class-transformer": {
"version": "0.5.1",
- "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.5.1.tgz",
- "integrity": "sha512-7Qg2Jrep1S/+Q3EceiZtQcDPWxhAvBw+ERf1162v4sikJrvojMHFqXt8QIVha8UlH9rgU0BeWPytZ9/TzYqlUw==",
- "dev": true,
- "requires": {
- "colors": "^1.1.2",
- "object-assign": "^4.1.0",
- "string-width": "^2.1.1"
- },
- "dependencies": {
- "ansi-regex": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
- "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
- "dev": true
- },
- "is-fullwidth-code-point": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
- "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
- "dev": true
- },
- "string-width": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
- "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
- "dev": true,
- "requires": {
- "is-fullwidth-code-point": "^2.0.0",
- "strip-ansi": "^4.0.0"
- }
- },
- "strip-ansi": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
- "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
- "dev": true,
- "requires": {
- "ansi-regex": "^3.0.0"
- }
- }
- }
+ "resolved": "https://registry.npmjs.org/class-transformer/-/class-transformer-0.5.1.tgz",
+ "integrity": "sha512-SQa1Ws6hUbfC98vKGxZH3KFY0Y1lm5Zm0SY8XX9zbK7FJCyVEac3ATW0RIpwzW+oOfmHE5PMPufDG9hCfoEOMw==",
+ "dev": true
},
"cliui": {
"version": "7.0.4",
@@ -4643,28 +7151,16 @@
"integrity": "sha1-xQSRR51MG9rtLJztMs98fcI2D3g=",
"dev": true
},
- "commander": {
- "version": "3.0.2",
- "resolved": "https://registry.npmjs.org/commander/-/commander-3.0.2.tgz",
- "integrity": "sha512-Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow==",
- "dev": true
- },
"concat-map": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
"dev": true
},
- "core-js-pure": {
- "version": "3.24.1",
- "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.24.1.tgz",
- "integrity": "sha512-r1nJk41QLLPyozHUUPmILCEMtMw24NG4oWK6RbsDdjzQgg9ZvrUsPBj1MnG0wXXp1DCDU6j+wUvEmBSrtRbLXg==",
- "dev": true
- },
- "core-util-is": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
- "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
+ "create-require": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
+ "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
"dev": true
},
"cross-env": {
@@ -4698,67 +7194,6 @@
}
}
},
- "cucumber": {
- "version": "6.0.7",
- "resolved": "https://registry.npmjs.org/cucumber/-/cucumber-6.0.7.tgz",
- "integrity": "sha512-pN3AgWxHx8rOi+wOlqjASNETOjf3TgeyqhMNLQam7nSTXgQzju1oAmXkleRQRcXvpVvejcDHiZBLFSfBkqbYpA==",
- "dev": true,
- "requires": {
- "assertion-error-formatter": "^3.0.0",
- "bluebird": "^3.4.1",
- "cli-table3": "^0.5.1",
- "colors": "^1.1.2",
- "commander": "^3.0.1",
- "cucumber-expressions": "^8.1.0",
- "cucumber-tag-expressions": "^2.0.2",
- "duration": "^0.2.1",
- "escape-string-regexp": "^2.0.0",
- "figures": "^3.0.0",
- "gherkin": "5.0.0",
- "glob": "^7.1.3",
- "indent-string": "^4.0.0",
- "is-generator": "^1.0.2",
- "is-stream": "^2.0.0",
- "knuth-shuffle-seeded": "^1.0.6",
- "lodash": "^4.17.14",
- "mz": "^2.4.0",
- "progress": "^2.0.0",
- "resolve": "^1.3.3",
- "serialize-error": "^4.1.0",
- "stack-chain": "^2.0.0",
- "stacktrace-js": "^2.0.0",
- "string-argv": "^0.3.0",
- "title-case": "^2.1.1",
- "util-arity": "^1.0.2",
- "verror": "^1.9.0"
- }
- },
- "cucumber-expressions": {
- "version": "8.3.0",
- "resolved": "https://registry.npmjs.org/cucumber-expressions/-/cucumber-expressions-8.3.0.tgz",
- "integrity": "sha512-cP2ya0EiorwXBC7Ll7Cj7NELYbasNv9Ty42L4u7sso9KruWemWG1ZiTq4PMqir3SNDSrbykoqI5wZgMbLEDjLQ==",
- "dev": true,
- "requires": {
- "becke-ch--regex--s0-0-v1--base--pl--lib": "^1.4.0",
- "xregexp": "^4.2.4"
- }
- },
- "cucumber-tag-expressions": {
- "version": "2.0.3",
- "resolved": "https://registry.npmjs.org/cucumber-tag-expressions/-/cucumber-tag-expressions-2.0.3.tgz",
- "integrity": "sha512-+x5j1IfZrBtbvYHuoUX0rl4nUGxaey6Do9sM0CABmZfDCcWXuuRm1fQeCaklIYQgOFHQ6xOHvDSdkMHHpni6tQ==",
- "dev": true
- },
- "d": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
- "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
- "dev": true,
- "requires": {
- "es5-ext": "^0.10.50",
- "type": "^1.0.1"
- }
- },
"dateformat": {
"version": "4.6.3",
"resolved": "https://registry.npmjs.org/dateformat/-/dateformat-4.6.3.tgz",
@@ -4816,15 +7251,11 @@
"esutils": "^2.0.2"
}
},
- "duration": {
- "version": "0.2.2",
- "resolved": "https://registry.npmjs.org/duration/-/duration-0.2.2.tgz",
- "integrity": "sha512-06kgtea+bGreF5eKYgI/36A6pLXggY7oR4p1pq4SmdFBn1ReOL5D8RhG64VrqfTTKNucqqtBAwEj8aB88mcqrg==",
- "dev": true,
- "requires": {
- "d": "1",
- "es5-ext": "~0.10.46"
- }
+ "eastasianwidth": {
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+ "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
+ "dev": true
},
"emoji-regex": {
"version": "8.0.0",
@@ -4832,6 +7263,15 @@
"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
"dev": true
},
+ "error-ex": {
+ "version": "1.3.2",
+ "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+ "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+ "dev": true,
+ "requires": {
+ "is-arrayish": "^0.2.1"
+ }
+ },
"error-stack-parser": {
"version": "2.1.4",
"resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.1.4.tgz",
@@ -4841,50 +7281,12 @@
"stackframe": "^1.3.4"
}
},
- "es5-ext": {
- "version": "0.10.62",
- "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.62.tgz",
- "integrity": "sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==",
- "dev": true,
- "requires": {
- "es6-iterator": "^2.0.3",
- "es6-symbol": "^3.1.3",
- "next-tick": "^1.1.0"
- }
- },
- "es6-iterator": {
- "version": "2.0.3",
- "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
- "integrity": "sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==",
- "dev": true,
- "requires": {
- "d": "1",
- "es5-ext": "^0.10.35",
- "es6-symbol": "^3.1.1"
- }
- },
- "es6-symbol": {
- "version": "3.1.3",
- "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
- "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==",
- "dev": true,
- "requires": {
- "d": "^1.0.1",
- "ext": "^1.1.2"
- }
- },
"escalade": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
"integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
"dev": true
},
- "escape-string-regexp": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
- "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
- "dev": true
- },
"eslint": {
"version": "8.57.0",
"resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz",
@@ -5079,35 +7481,12 @@
"homedir-polyfill": "^1.0.1"
}
},
- "ext": {
- "version": "1.6.0",
- "resolved": "https://registry.npmjs.org/ext/-/ext-1.6.0.tgz",
- "integrity": "sha512-sdBImtzkq2HpkdRLtlLWDa6w4DX22ijZLKx8BMPUuKe1c5lbN6xwQDQCxSfxBQnHZ13ls/FH0MQZx/q/gr6FQg==",
- "dev": true,
- "requires": {
- "type": "^2.5.0"
- },
- "dependencies": {
- "type": {
- "version": "2.7.2",
- "resolved": "https://registry.npmjs.org/type/-/type-2.7.2.tgz",
- "integrity": "sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==",
- "dev": true
- }
- }
- },
"extend": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
"integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
"dev": true
},
- "extsprintf": {
- "version": "1.4.1",
- "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.1.tgz",
- "integrity": "sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA==",
- "dev": true
- },
"fast-deep-equal": {
"version": "3.1.3",
"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -5186,6 +7565,12 @@
"path-exists": "^4.0.0"
}
},
+ "find-up-simple": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/find-up-simple/-/find-up-simple-1.0.0.tgz",
+ "integrity": "sha512-q7Us7kcjj2VMePAa02hDAF6d+MzsdsAWEwYyOpwUtlerRBkOEPBCRZrAV4XfcSN8fHAgaD0hP7miwoay6DCprw==",
+ "dev": true
+ },
"findup-sync": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-5.0.0.tgz",
@@ -5254,6 +7639,16 @@
"for-in": "^1.0.1"
}
},
+ "foreground-child": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz",
+ "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==",
+ "dev": true,
+ "requires": {
+ "cross-spawn": "^7.0.0",
+ "signal-exit": "^4.0.1"
+ }
+ },
"fs.realpath": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
@@ -5268,9 +7663,9 @@
"optional": true
},
"function-bind": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
- "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+ "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
"dev": true
},
"get-caller-file": {
@@ -5291,12 +7686,6 @@
"integrity": "sha512-2zblDBaFcb3rB4rF77XVnuINOE2h2k/OnqXAiy0IrTxUfV1iFp3la33oAQVY9pCpWU268WFYVt2t71hlMuLsOg==",
"dev": true
},
- "gherkin": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/gherkin/-/gherkin-5.0.0.tgz",
- "integrity": "sha512-Y+93z2Nh+TNIKuKEf+6M0FQrX/z0Yv9C2LFfc5NlcGJWRrrTeI/jOg2374y1FOw6ZYQ3RgJBezRkli7CLDubDA==",
- "dev": true
- },
"glob": {
"version": "7.2.3",
"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
@@ -5331,6 +7720,23 @@
}
}
},
+ "global-dirs": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.1.tgz",
+ "integrity": "sha512-NBcGGFbBA9s1VzD41QXDG+3++t9Mn5t1FpLdhESY6oKY4gYTFpX4wO3sqGUa0Srjtbfj3szX0RnemmrVRUdULA==",
+ "dev": true,
+ "requires": {
+ "ini": "2.0.0"
+ },
+ "dependencies": {
+ "ini": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz",
+ "integrity": "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==",
+ "dev": true
+ }
+ }
+ },
"global-modules": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
@@ -5554,13 +7960,21 @@
}
}
},
- "has": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
- "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+ "has-ansi": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-4.0.1.tgz",
+ "integrity": "sha512-Qr4RtTm30xvEdqUXbSBVWDu+PrTokJOwe/FU+VdfJPk+MXAPoeOzKpRyrDTnZIJwAkQ4oBLTU53nu0HrkF/Z2A==",
"dev": true,
"requires": {
- "function-bind": "^1.1.1"
+ "ansi-regex": "^4.1.0"
+ },
+ "dependencies": {
+ "ansi-regex": {
+ "version": "4.1.1",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+ "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
+ "dev": true
+ }
}
},
"has-flag": {
@@ -5569,6 +7983,15 @@
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
"dev": true
},
+ "hasown": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+ "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+ "dev": true,
+ "requires": {
+ "function-bind": "^1.1.2"
+ }
+ },
"he": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
@@ -5590,6 +8013,15 @@
"integrity": "sha512-t+UerCsQviSymAInD01Pw+Dn/usmz1sRO+3Zk1+lx8eg+WKpD2ulcwWqHHL0+aseRBr+3+vIhiG1K1JTwaIcTA==",
"dev": true
},
+ "hosted-git-info": {
+ "version": "7.0.1",
+ "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-7.0.1.tgz",
+ "integrity": "sha512-+K84LB1DYwMHoHSgaOY/Jfhw3ucPmSET5v98Ke/HdNSw4a0UktWzyW1mjhjpuxxTqOOsfWT/7iVshHmVZ4IpOA==",
+ "dev": true,
+ "requires": {
+ "lru-cache": "^10.0.1"
+ }
+ },
"iconv-lite": {
"version": "0.6.3",
"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
@@ -5632,6 +8064,12 @@
"integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
"dev": true
},
+ "index-to-position": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/index-to-position/-/index-to-position-0.1.2.tgz",
+ "integrity": "sha512-MWDKS3AS1bGCHLBA2VLImJz42f7bJh8wQsTGCzI3j519/CASStoDONUBVz2I/VID0MpiX3SGSnbOD2xUalbE5g==",
+ "dev": true
+ },
"inflight": {
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -5670,6 +8108,12 @@
"is-windows": "^1.0.1"
}
},
+ "is-arrayish": {
+ "version": "0.2.1",
+ "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+ "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
+ "dev": true
+ },
"is-binary-path": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
@@ -5680,12 +8124,12 @@
}
},
"is-core-module": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz",
- "integrity": "sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==",
+ "version": "2.13.1",
+ "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz",
+ "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==",
"dev": true,
"requires": {
- "has": "^1.0.3"
+ "hasown": "^2.0.0"
}
},
"is-extglob": {
@@ -5700,12 +8144,6 @@
"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
"dev": true
},
- "is-generator": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/is-generator/-/is-generator-1.0.3.tgz",
- "integrity": "sha512-G56jBpbJeg7ds83HW1LuShNs8J73Fv3CPz/bmROHOHlnKkN8sWb9ujiagjmxxMUywftgq48HlBZELKKqFLk0oA==",
- "dev": true
- },
"is-glob": {
"version": "4.0.3",
"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
@@ -5715,6 +8153,16 @@
"is-extglob": "^2.1.1"
}
},
+ "is-installed-globally": {
+ "version": "0.4.0",
+ "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz",
+ "integrity": "sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==",
+ "dev": true,
+ "requires": {
+ "global-dirs": "^3.0.0",
+ "is-path-inside": "^3.0.2"
+ }
+ },
"is-number": {
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
@@ -5790,6 +8238,22 @@
"integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
"dev": true
},
+ "jackspeak": {
+ "version": "2.3.6",
+ "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz",
+ "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==",
+ "dev": true,
+ "requires": {
+ "@isaacs/cliui": "^8.0.2",
+ "@pkgjs/parseargs": "^0.11.0"
+ }
+ },
+ "js-tokens": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+ "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+ "dev": true
+ },
"js-yaml": {
"version": "3.14.1",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
@@ -5905,6 +8369,18 @@
}
}
},
+ "jsesc": {
+ "version": "2.5.2",
+ "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+ "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+ "dev": true
+ },
+ "json-parse-even-better-errors": {
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+ "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+ "dev": true
+ },
"json-schema-traverse": {
"version": "0.4.1",
"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
@@ -5917,6 +8393,12 @@
"integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
"dev": true
},
+ "jsonc-parser": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.1.tgz",
+ "integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==",
+ "dev": true
+ },
"kind-of": {
"version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
@@ -6033,6 +8515,12 @@
}
}
},
+ "lines-and-columns": {
+ "version": "1.2.4",
+ "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+ "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
+ "dev": true
+ },
"locate-path": {
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
@@ -6054,6 +8542,12 @@
"integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
"dev": true
},
+ "lodash.mergewith": {
+ "version": "4.6.2",
+ "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz",
+ "integrity": "sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==",
+ "dev": true
+ },
"log-symbols": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
@@ -6124,10 +8618,31 @@
"get-func-name": "^2.0.0"
}
},
- "lower-case": {
- "version": "1.1.4",
- "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz",
- "integrity": "sha512-2Fgx1Ycm599x+WGpIYwJOvsjmXFzTSc34IwDWALRA/8AopUKAVPwfJ+h5+f85BCp0PWmmJcWzEpxOpoXycMpdA==",
+ "lru-cache": {
+ "version": "10.2.0",
+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.0.tgz",
+ "integrity": "sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q==",
+ "dev": true
+ },
+ "luxon": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.2.1.tgz",
+ "integrity": "sha512-QrwPArQCNLAKGO/C+ZIilgIuDnEnKx5QYODdDtbFaxzsbZcc/a7WFq7MhsVYgRlwawLtvOUESTlfJ+hc/USqPg==",
+ "dev": true
+ },
+ "magic-string": {
+ "version": "0.30.8",
+ "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.8.tgz",
+ "integrity": "sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==",
+ "dev": true,
+ "requires": {
+ "@jridgewell/sourcemap-codec": "^1.4.15"
+ }
+ },
+ "make-error": {
+ "version": "1.3.6",
+ "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
+ "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
"dev": true
},
"make-iterator": {
@@ -6170,6 +8685,12 @@
"brace-expansion": "^1.1.7"
}
},
+ "minipass": {
+ "version": "7.0.4",
+ "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz",
+ "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==",
+ "dev": true
+ },
"mkdirp": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
@@ -6304,21 +8825,6 @@
"integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
"dev": true
},
- "next-tick": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz",
- "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==",
- "dev": true
- },
- "no-case": {
- "version": "2.3.2",
- "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
- "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==",
- "dev": true,
- "requires": {
- "lower-case": "^1.1.1"
- }
- },
"nopt": {
"version": "3.0.6",
"resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
@@ -6328,6 +8834,18 @@
"abbrev": "1"
}
},
+ "normalize-package-data": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-6.0.0.tgz",
+ "integrity": "sha512-UL7ELRVxYBHBgYEtZCXjxuD5vPxnmvMGq0jp/dGPKKrN7tfsBh2IY7TlJ15WWwdjRWD3RJbnsygUurTK3xkPkg==",
+ "dev": true,
+ "requires": {
+ "hosted-git-info": "^7.0.0",
+ "is-core-module": "^2.8.1",
+ "semver": "^7.3.5",
+ "validate-npm-package-license": "^3.0.4"
+ }
+ },
"normalize-path": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
@@ -6434,6 +8952,12 @@
"p-limit": "^3.0.2"
}
},
+ "p-try": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+ "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+ "dev": true
+ },
"pad-right": {
"version": "0.2.2",
"resolved": "https://registry.npmjs.org/pad-right/-/pad-right-0.2.2.tgz",
@@ -6463,6 +8987,25 @@
"path-root": "^0.1.1"
}
},
+ "parse-json": {
+ "version": "8.1.0",
+ "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-8.1.0.tgz",
+ "integrity": "sha512-rum1bPifK5SSar35Z6EKZuYPJx85pkNaFrxBK3mwdfSJ1/WKbYrjoW/zTPSjRRamfmVX1ACBIdFAO0VRErW/EA==",
+ "dev": true,
+ "requires": {
+ "@babel/code-frame": "^7.22.13",
+ "index-to-position": "^0.1.2",
+ "type-fest": "^4.7.1"
+ },
+ "dependencies": {
+ "type-fest": {
+ "version": "4.12.0",
+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.12.0.tgz",
+ "integrity": "sha512-5Y2/pp2wtJk8o08G0CMkuFPCO354FGwk/vbidxrdhRGZfd0tFnb4Qb8anp9XxXriwBgVPjdWbKpGl4J9lJY2jQ==",
+ "dev": true
+ }
+ }
+ },
"parse-passwd": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
@@ -6508,6 +9051,16 @@
"integrity": "sha512-4GlJ6rZDhQZFE0DPVKh0e9jmZ5egZfxTkp7bcRDuPlJXbAwhxcl2dINPUAsjLdejqaLsCeg8axcLjIbvBjN4pQ==",
"dev": true
},
+ "path-scurry": {
+ "version": "1.10.1",
+ "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.1.tgz",
+ "integrity": "sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==",
+ "dev": true,
+ "requires": {
+ "lru-cache": "^9.1.1 || ^10.0.0",
+ "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
+ }
+ },
"pathval": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz",
@@ -6552,6 +9105,12 @@
"integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
"dev": true
},
+ "property-expr": {
+ "version": "2.0.6",
+ "resolved": "https://registry.npmjs.org/property-expr/-/property-expr-2.0.6.tgz",
+ "integrity": "sha512-SVtmxhRE/CGkn3eZY1T6pC8Nln6Fr/lu1mKSgRud0eC73whjGfoAogbn78LkD8aFL0zz3bAFerKSnOl7NlErBA==",
+ "dev": true
+ },
"punycode": {
"version": "2.3.1",
"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
@@ -6573,6 +9132,158 @@
"safe-buffer": "^5.1.0"
}
},
+ "read-package-up": {
+ "version": "11.0.0",
+ "resolved": "https://registry.npmjs.org/read-package-up/-/read-package-up-11.0.0.tgz",
+ "integrity": "sha512-MbgfoNPANMdb4oRBNg5eqLbB2t2r+o5Ua1pNt8BqGp4I0FJZhuVSOj3PaBPni4azWuSzEdNn2evevzVmEk1ohQ==",
+ "dev": true,
+ "requires": {
+ "find-up-simple": "^1.0.0",
+ "read-pkg": "^9.0.0",
+ "type-fest": "^4.6.0"
+ },
+ "dependencies": {
+ "type-fest": {
+ "version": "4.12.0",
+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.12.0.tgz",
+ "integrity": "sha512-5Y2/pp2wtJk8o08G0CMkuFPCO354FGwk/vbidxrdhRGZfd0tFnb4Qb8anp9XxXriwBgVPjdWbKpGl4J9lJY2jQ==",
+ "dev": true
+ }
+ }
+ },
+ "read-pkg": {
+ "version": "9.0.1",
+ "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-9.0.1.tgz",
+ "integrity": "sha512-9viLL4/n1BJUCT1NXVTdS1jtm80yDEgR5T4yCelII49Mbj0v1rZdKqj7zCiYdbB0CuCgdrvHcNogAKTFPBocFA==",
+ "dev": true,
+ "requires": {
+ "@types/normalize-package-data": "^2.4.3",
+ "normalize-package-data": "^6.0.0",
+ "parse-json": "^8.0.0",
+ "type-fest": "^4.6.0",
+ "unicorn-magic": "^0.1.0"
+ },
+ "dependencies": {
+ "type-fest": {
+ "version": "4.12.0",
+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.12.0.tgz",
+ "integrity": "sha512-5Y2/pp2wtJk8o08G0CMkuFPCO354FGwk/vbidxrdhRGZfd0tFnb4Qb8anp9XxXriwBgVPjdWbKpGl4J9lJY2jQ==",
+ "dev": true
+ }
+ }
+ },
+ "read-pkg-up": {
+ "version": "7.0.1",
+ "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
+ "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
+ "dev": true,
+ "requires": {
+ "find-up": "^4.1.0",
+ "read-pkg": "^5.2.0",
+ "type-fest": "^0.8.1"
+ },
+ "dependencies": {
+ "find-up": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+ "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+ "dev": true,
+ "requires": {
+ "locate-path": "^5.0.0",
+ "path-exists": "^4.0.0"
+ }
+ },
+ "hosted-git-info": {
+ "version": "2.8.9",
+ "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+ "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
+ "dev": true
+ },
+ "locate-path": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+ "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+ "dev": true,
+ "requires": {
+ "p-locate": "^4.1.0"
+ }
+ },
+ "normalize-package-data": {
+ "version": "2.5.0",
+ "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+ "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+ "dev": true,
+ "requires": {
+ "hosted-git-info": "^2.1.4",
+ "resolve": "^1.10.0",
+ "semver": "2 || 3 || 4 || 5",
+ "validate-npm-package-license": "^3.0.1"
+ }
+ },
+ "p-limit": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+ "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+ "dev": true,
+ "requires": {
+ "p-try": "^2.0.0"
+ }
+ },
+ "p-locate": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+ "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+ "dev": true,
+ "requires": {
+ "p-limit": "^2.2.0"
+ }
+ },
+ "parse-json": {
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+ "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+ "dev": true,
+ "requires": {
+ "@babel/code-frame": "^7.0.0",
+ "error-ex": "^1.3.1",
+ "json-parse-even-better-errors": "^2.3.0",
+ "lines-and-columns": "^1.1.6"
+ }
+ },
+ "read-pkg": {
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
+ "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
+ "dev": true,
+ "requires": {
+ "@types/normalize-package-data": "^2.4.0",
+ "normalize-package-data": "^2.5.0",
+ "parse-json": "^5.0.0",
+ "type-fest": "^0.6.0"
+ },
+ "dependencies": {
+ "type-fest": {
+ "version": "0.6.0",
+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
+ "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
+ "dev": true
+ }
+ }
+ },
+ "semver": {
+ "version": "5.7.2",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+ "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+ "dev": true
+ },
+ "type-fest": {
+ "version": "0.8.1",
+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+ "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+ "dev": true
+ }
+ }
+ },
"readable-stream": {
"version": "4.7.0",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.7.0.tgz",
@@ -6594,10 +9305,25 @@
"picomatch": "^2.2.1"
}
},
- "regenerator-runtime": {
- "version": "0.13.9",
- "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
- "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==",
+ "reflect-metadata": {
+ "version": "0.2.1",
+ "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.2.1.tgz",
+ "integrity": "sha512-i5lLI6iw9AU3Uu4szRNPPEkomnkjRTaVt9hy/bn5g/oSzekBSMeLZblcjP74AW0vBabqERLLIrz+gR8QYR54Tw==",
+ "dev": true
+ },
+ "regexp-match-indices": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/regexp-match-indices/-/regexp-match-indices-1.0.2.tgz",
+ "integrity": "sha512-DwZuAkt8NF5mKwGGER1EGh2PRqyvhRhhLviH+R8y8dIuaQROlUfXjt4s9ZTXstIsSkptf06BSvwcEmmfheJJWQ==",
+ "dev": true,
+ "requires": {
+ "regexp-tree": "^0.1.11"
+ }
+ },
+ "regexp-tree": {
+ "version": "0.1.27",
+ "resolved": "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.27.tgz",
+ "integrity": "sha512-iETxpjK6YoRWJG5o6hXLwvjYAoW+FEZn9os0PD/b6AP6xQwsa/Y7lCVgIixBbUPMfhu+i2LtdeAqVTgGlQarfA==",
"dev": true
},
"repeat-string": {
@@ -6647,6 +9373,23 @@
"integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
"dev": true
},
+ "resolve-pkg": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/resolve-pkg/-/resolve-pkg-2.0.0.tgz",
+ "integrity": "sha512-+1lzwXehGCXSeryaISr6WujZzowloigEofRB+dj75y9RRa/obVcYgbHJd53tdYw8pvZj8GojXaaENws8Ktw/hQ==",
+ "dev": true,
+ "requires": {
+ "resolve-from": "^5.0.0"
+ },
+ "dependencies": {
+ "resolve-from": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+ "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+ "dev": true
+ }
+ }
+ },
"reusify": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
@@ -6688,13 +9431,24 @@
"integrity": "sha512-34EQV6AAHQGhoc0tn/96a9Fsi6v2xdqe/dMUwljGRaFOzR3EgRmECvD0O8vi8X+/uQ50LGHfkNu/Eue5TPKZkQ==",
"dev": true
},
- "serialize-error": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-4.1.0.tgz",
- "integrity": "sha512-5j9GgyGsP9vV9Uj1S0lDCvlsd+gc2LEPVK7HHHte7IyPwOD4lVQFeaX143gx3U5AnoCi+wbcb3mvaxVysjpxEw==",
+ "semver": {
+ "version": "7.5.3",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz",
+ "integrity": "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==",
"dev": true,
"requires": {
- "type-fest": "^0.3.0"
+ "lru-cache": "^6.0.0"
+ },
+ "dependencies": {
+ "lru-cache": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+ "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+ "dev": true,
+ "requires": {
+ "yallist": "^4.0.0"
+ }
+ }
}
},
"serialize-javascript": {
@@ -6721,10 +9475,60 @@
"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
"dev": true
},
- "source-map": {
- "version": "0.5.6",
- "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
- "integrity": "sha512-MjZkVp0NHr5+TPihLcadqnlVoGIoWo4IBHptutGh9wI3ttUYvCG26HkSuDi+K6lsZ25syXJXcctwgyVCt//xqA==",
+ "signal-exit": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+ "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+ "dev": true
+ },
+ "source-map-support": {
+ "version": "0.5.21",
+ "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+ "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+ "dev": true,
+ "requires": {
+ "buffer-from": "^1.0.0",
+ "source-map": "^0.6.0"
+ },
+ "dependencies": {
+ "source-map": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+ "dev": true
+ }
+ }
+ },
+ "spdx-correct": {
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz",
+ "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==",
+ "dev": true,
+ "requires": {
+ "spdx-expression-parse": "^3.0.0",
+ "spdx-license-ids": "^3.0.0"
+ }
+ },
+ "spdx-exceptions": {
+ "version": "2.5.0",
+ "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz",
+ "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==",
+ "dev": true
+ },
+ "spdx-expression-parse": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+ "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+ "dev": true,
+ "requires": {
+ "spdx-exceptions": "^2.1.0",
+ "spdx-license-ids": "^3.0.0"
+ }
+ },
+ "spdx-license-ids": {
+ "version": "3.0.17",
+ "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.17.tgz",
+ "integrity": "sha512-sh8PWc/ftMqAAdFiBu6Fy6JUOYjqDJBJvIhpfDMyHrr0Rbp5liZqd4TjtQ/RgfLjKFZb+LMx5hpml5qOWy0qvg==",
"dev": true
},
"sprintf-js": {
@@ -6733,48 +9537,12 @@
"integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==",
"dev": true
},
- "stack-chain": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/stack-chain/-/stack-chain-2.0.0.tgz",
- "integrity": "sha512-GGrHXePi305aW7XQweYZZwiRwR7Js3MWoK/EHzzB9ROdc75nCnjSJVi21rdAGxFl+yCx2L2qdfl5y7NO4lTyqg==",
- "dev": true
- },
- "stack-generator": {
- "version": "2.0.10",
- "resolved": "https://registry.npmjs.org/stack-generator/-/stack-generator-2.0.10.tgz",
- "integrity": "sha512-mwnua/hkqM6pF4k8SnmZ2zfETsRUpWXREfA/goT8SLCV4iOFa4bzOX2nDipWAZFPTjLvQB82f5yaodMVhK0yJQ==",
- "dev": true,
- "requires": {
- "stackframe": "^1.3.4"
- }
- },
"stackframe": {
"version": "1.3.4",
"resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.3.4.tgz",
"integrity": "sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==",
"dev": true
},
- "stacktrace-gps": {
- "version": "3.1.2",
- "resolved": "https://registry.npmjs.org/stacktrace-gps/-/stacktrace-gps-3.1.2.tgz",
- "integrity": "sha512-GcUgbO4Jsqqg6RxfyTHFiPxdPqF+3LFmQhm7MgCuYQOYuWyqxo5pwRPz5d/u6/WYJdEnWfK4r+jGbyD8TSggXQ==",
- "dev": true,
- "requires": {
- "source-map": "0.5.6",
- "stackframe": "^1.3.4"
- }
- },
- "stacktrace-js": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/stacktrace-js/-/stacktrace-js-2.0.2.tgz",
- "integrity": "sha512-Je5vBeY4S1r/RnLydLl0TBTi3F2qdfWmYsGvtfZgEI+SCprPppaIhQf5nGcal4gI4cGpCV/duLcAzT1np6sQqg==",
- "dev": true,
- "requires": {
- "error-stack-parser": "^2.0.6",
- "stack-generator": "^2.0.5",
- "stacktrace-gps": "^3.0.4"
- }
- },
"string_decoder": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
@@ -6800,6 +9568,17 @@
"strip-ansi": "^6.0.1"
}
},
+ "string-width-cjs": {
+ "version": "npm:string-width@4.2.3",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+ "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+ "dev": true,
+ "requires": {
+ "emoji-regex": "^8.0.0",
+ "is-fullwidth-code-point": "^3.0.0",
+ "strip-ansi": "^6.0.1"
+ }
+ },
"strip-ansi": {
"version": "6.0.1",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
@@ -6809,6 +9588,15 @@
"ansi-regex": "^5.0.1"
}
},
+ "strip-ansi-cjs": {
+ "version": "npm:strip-ansi@6.0.1",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+ "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+ "dev": true,
+ "requires": {
+ "ansi-regex": "^5.0.1"
+ }
+ },
"strip-json-comments": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
@@ -6864,15 +9652,23 @@
"thenify": ">= 3.1.0 < 4"
}
},
- "title-case": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/title-case/-/title-case-2.1.1.tgz",
- "integrity": "sha512-EkJoZ2O3zdCz3zJsYCsxyq2OC5hrxR9mfdd5I+w8h/tmFfeOxJ+vvkxsKxdmN0WtS9zLdHEgfgVOiMVgv+Po4Q==",
- "dev": true,
- "requires": {
- "no-case": "^2.2.0",
- "upper-case": "^1.0.3"
- }
+ "tiny-case": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/tiny-case/-/tiny-case-1.0.3.tgz",
+ "integrity": "sha512-Eet/eeMhkO6TX8mnUteS9zgPbUMQa4I6Kkp5ORiBD5476/m+PIRiumP5tmh5ioJpH7k51Kehawy2UDfsnxxY8Q==",
+ "dev": true
+ },
+ "tmp": {
+ "version": "0.2.3",
+ "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz",
+ "integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==",
+ "dev": true
+ },
+ "to-fast-properties": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+ "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
+ "dev": true
},
"to-regex-range": {
"version": "5.0.1",
@@ -6883,18 +9679,39 @@
"is-number": "^7.0.0"
}
},
+ "toposort": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/toposort/-/toposort-2.0.2.tgz",
+ "integrity": "sha512-0a5EOkAUp8D4moMi2W8ZF8jcga7BgZd91O/yabJCFY8az+XSzeGyTKs0Aoo897iV1Nj6guFq8orWDS96z91oGg==",
+ "dev": true
+ },
+ "ts-node": {
+ "version": "10.9.2",
+ "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz",
+ "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==",
+ "dev": true,
+ "requires": {
+ "@cspotcode/source-map-support": "^0.8.0",
+ "@tsconfig/node10": "^1.0.7",
+ "@tsconfig/node12": "^1.0.7",
+ "@tsconfig/node14": "^1.0.0",
+ "@tsconfig/node16": "^1.0.2",
+ "acorn": "^8.4.1",
+ "acorn-walk": "^8.1.1",
+ "arg": "^4.1.0",
+ "create-require": "^1.1.0",
+ "diff": "^4.0.1",
+ "make-error": "^1.1.1",
+ "v8-compile-cache-lib": "^3.0.1",
+ "yn": "3.1.1"
+ }
+ },
"tslib": {
"version": "2.7.0",
"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
"integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
"dev": true
},
- "type": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
- "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==",
- "dev": true
- },
"type-check": {
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
@@ -6910,10 +9727,10 @@
"integrity": "sha512-Acylog8/luQ8L7il+geoSxhEkazvkslg7PSNKOX59mbB9cOveP5aq9h74Y7YU8yDpJwetzQQrfIwtf4Wp4LKcw==",
"dev": true
},
- "type-fest": {
- "version": "0.3.1",
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz",
- "integrity": "sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==",
+ "typescript": {
+ "version": "5.4.2",
+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.2.tgz",
+ "integrity": "sha512-+2/g0Fds1ERlP6JsakQQDXjZdZMM+rqpamFZJEKh4kwTIn3iDkgKtby0CeNd5ATNZ4Ry1ax15TMx0W2V+miizQ==",
"dev": true
},
"uc.micro": {
@@ -6938,12 +9755,27 @@
"util-deprecate": "^1.0.2"
}
},
- "upper-case": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz",
- "integrity": "sha512-WRbjgmYzgXkCV7zNVpy5YgrHgbBv126rMALQQMrmzOVC4GM2waQ9x7xtm8VU+1yF2kWyPzI9zbZ48n4vSxwfSA==",
+ "undici-types": {
+ "version": "5.26.5",
+ "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+ "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
"dev": true
},
+ "unicorn-magic": {
+ "version": "0.1.0",
+ "resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.1.0.tgz",
+ "integrity": "sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==",
+ "dev": true
+ },
+ "upper-case-first": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/upper-case-first/-/upper-case-first-2.0.2.tgz",
+ "integrity": "sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==",
+ "dev": true,
+ "requires": {
+ "tslib": "^2.0.3"
+ }
+ },
"uri-js": {
"version": "4.4.1",
"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
@@ -6970,21 +9802,26 @@
"resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
"integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA=="
},
+ "v8-compile-cache-lib": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz",
+ "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==",
+ "dev": true
+ },
"v8flags": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/v8flags/-/v8flags-4.0.1.tgz",
"integrity": "sha512-fcRLaS4H/hrZk9hYwbdRM35D0U8IYMfEClhXxCivOojl+yTRAZH3Zy2sSy6qVCiGbV9YAtPssP6jaChqC9vPCg==",
"dev": true
},
- "verror": {
- "version": "1.10.1",
- "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.1.tgz",
- "integrity": "sha512-veufcmxri4e3XSrT0xwfUR7kguIkaxBeosDg00yDWhk49wdwkSUrvvsm7nc75e1PUyvIeZj6nS8VQRYz2/S4Xg==",
+ "validate-npm-package-license": {
+ "version": "3.0.4",
+ "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+ "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
"dev": true,
"requires": {
- "assert-plus": "^1.0.0",
- "core-util-is": "1.0.2",
- "extsprintf": "^1.2.0"
+ "spdx-correct": "^3.0.0",
+ "spdx-expression-parse": "^3.0.0"
}
},
"which": {
@@ -7039,6 +9876,17 @@
}
}
},
+ "wrap-ansi-cjs": {
+ "version": "npm:wrap-ansi@7.0.0",
+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+ "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "^4.0.0",
+ "string-width": "^4.1.0",
+ "strip-ansi": "^6.0.0"
+ }
+ },
"wrappy": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
@@ -7051,14 +9899,11 @@
"integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
"requires": {}
},
- "xregexp": {
- "version": "4.4.1",
- "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-4.4.1.tgz",
- "integrity": "sha512-2u9HwfadaJaY9zHtRRnH6BY6CQVNQKkYm3oLtC9gJXXzfsbACg5X5e4EZZGVAH+YIfa+QA9lsFQTTe3HURF3ag==",
- "dev": true,
- "requires": {
- "@babel/runtime-corejs3": "^7.12.1"
- }
+ "xmlbuilder": {
+ "version": "15.1.1",
+ "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-15.1.1.tgz",
+ "integrity": "sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg==",
+ "dev": true
},
"y18n": {
"version": "5.0.8",
@@ -7066,6 +9911,18 @@
"integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
"dev": true
},
+ "yallist": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+ "dev": true
+ },
+ "yaml": {
+ "version": "2.4.1",
+ "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.4.1.tgz",
+ "integrity": "sha512-pIXzoImaqmfOrL7teGUBt/T7ZDnyeGBWyXQBvOVhLkWLN37GXv8NMLK406UY6dS51JfcQHsmcW5cJ441bHg6Lg==",
+ "dev": true
+ },
"yargs": {
"version": "16.2.0",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
@@ -7099,11 +9956,37 @@
"is-plain-obj": "^2.1.0"
}
},
+ "yn": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
+ "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
+ "dev": true
+ },
"yocto-queue": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
"integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
"dev": true
+ },
+ "yup": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/yup/-/yup-1.2.0.tgz",
+ "integrity": "sha512-PPqYKSAXjpRCgLgLKVGPA33v5c/WgEx3wi6NFjIiegz90zSwyMpvTFp/uGcVnnbx6to28pgnzp/q8ih3QRjLMQ==",
+ "dev": true,
+ "requires": {
+ "property-expr": "^2.0.5",
+ "tiny-case": "^1.0.3",
+ "toposort": "^2.0.2",
+ "type-fest": "^2.19.0"
+ },
+ "dependencies": {
+ "type-fest": {
+ "version": "2.19.0",
+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
+ "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
+ "dev": true
+ }
+ }
}
}
}
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json b/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
index 611a246..b28ac17 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
@@ -1,6 +1,6 @@
{
"name": "gremlin",
- "version": "3.8.0-alpha1",
+ "version": "4.0.0-alpha1",
"description": "JavaScript Gremlin Language Variant",
"author": "Apache TinkerPop team",
"keywords": [
@@ -13,6 +13,15 @@
"graphdb"
],
"license": "Apache-2.0",
+ "type": "module",
+ "main": "./build/cjs/index.cjs",
+ "exports": {
+ "import": "./build/esm/index.js",
+ "require": "./build/cjs/index.cjs"
+ },
+ "files": [
+ "build"
+ ],
"dependencies": {
"buffer": "^6.0.3",
"eventemitter3": "^5.0.1",
@@ -21,11 +30,16 @@
"ws": "^8.16.0"
},
"devDependencies": {
+ "@cucumber/cucumber": "^10.3.1",
+ "@knighted/duel": "^1.0.7",
+ "@tsconfig/node18": "^18.2.2",
+ "@types/readable-stream": "^4.0.10",
+ "@types/uuid": "^9.0.8",
+ "@types/ws": "^8.5.10",
"chai": "~4.5.0",
"chai-string": "~1.5.0",
"colors": "1.4.0",
"cross-env": "^7.0.3",
- "cucumber": "~6.0.7",
"eslint": "^8.42.0",
"eslint-config-prettier": "^10.0.1",
"eslint-plugin-prettier": "^5.0.0",
@@ -33,7 +47,9 @@
"grunt-cli": "~1.5.0",
"grunt-jsdoc": "~2.4.1",
"mocha": "^10.2.0",
- "prettier": "^3.0.0"
+ "prettier": "^3.0.0",
+ "ts-node": "^10.9.2",
+ "typescript": "^5.4.2"
},
"repository": {
"type": "git",
@@ -44,18 +60,20 @@
"url": "https://issues.apache.org/jira/browse/TINKERPOP"
},
"scripts": {
+ "build": "rm -rf build && duel --dirs",
+ "prepare": "npm run build",
"test": "npm run unit-test && npm run integration-test",
- "unit-test": "mocha test/unit/*",
+ "unit-test": "cross-env TS_NODE_PROJECT='tsconfig.test.json' mocha test/unit/*",
"integration-test": "npm run integration-test-graphson30 && npm run integration-test-graphbinary",
- "integration-test-graphson30": "cross-env CLIENT_MIMETYPE='application/vnd.gremlin-v3.0+json' ./node_modules/mocha/bin/mocha.js test/integration -t 5000",
- "integration-test-graphbinary": "cross-env CLIENT_MIMETYPE='application/vnd.graphbinary-v1.0' ./node_modules/mocha/bin/mocha.js test/integration -t 5000",
+ "integration-test-graphson30": "cross-env TS_NODE_PROJECT='tsconfig.test.json' CLIENT_MIMETYPE='application/vnd.gremlin-v3.0+json' ./node_modules/mocha/bin/mocha.js test/integration -t 5000",
+ "integration-test-graphbinary": "cross-env TS_NODE_PROJECT='tsconfig.test.json' CLIENT_MIMETYPE='application/vnd.graphbinary-v1.0' ./node_modules/mocha/bin/mocha.js test/integration -t 5000",
"TODO": "# test other mime types like graphbinary stringd",
"features": "npm run features-graphson30 && npm run features-graphbinary",
- "features-graphson30": "cross-env CLIENT_MIMETYPE='application/vnd.gremlin-v3.0+json' cucumber-js --require test/cucumber ../../../../../gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/",
- "features-graphbinary": "cross-env CLIENT_MIMETYPE='application/vnd.graphbinary-v1.0' cucumber-js --require test/cucumber ../../../../../gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/",
+ "features-graphson30": "cross-env NODE_OPTIONS='--loader ts-node/esm' TS_NODE_PROJECT='tsconfig.test.json' CLIENT_MIMETYPE='application/vnd.gremlin-v3.0+json' cucumber-js --import test/cucumber ../../../../../gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/",
+ "features-graphbinary": "cross-env NODE_OPTIONS='--loader ts-node/esm' TS_NODE_PROJECT='tsconfig.test.json' CLIENT_MIMETYPE='application/vnd.graphbinary-v1.0' cucumber-js --import test/cucumber ../../../../../gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/",
"features-docker": "npm run features-graphson30-docker && npm run features-graphbinary-docker",
- "features-graphson30-docker": "cross-env CLIENT_MIMETYPE='application/vnd.gremlin-v3.0+json' cucumber-js --require test/cucumber ../gremlin-test/",
- "features-graphbinary-docker": "cross-env CLIENT_MIMETYPE='application/vnd.graphbinary-v1.0' cucumber-js --require test/cucumber ../gremlin-test/",
+ "features-graphson30-docker": "cross-env NODE_OPTIONS='--loader ts-node/esm' TS_NODE_PROJECT='tsconfig.test.json' CLIENT_MIMETYPE='application/vnd.gremlin-v3.0+json' cucumber-js --import test/cucumber ../gremlin-test/",
+ "features-graphbinary-docker": "cross-env NODE_OPTIONS='--loader ts-node/esm' TS_NODE_PROJECT='tsconfig.test.json' CLIENT_MIMETYPE='application/vnd.graphbinary-v1.0' cucumber-js --import test/cucumber ../gremlin-test/",
"lint": "eslint --ext .js ."
},
"engines": {
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/element-comparison.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/element-comparison.js
index 7f60f47..73fee51 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/element-comparison.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/element-comparison.js
@@ -25,15 +25,15 @@
* See licenses/chai for full license.
*/
-const chai = require('chai');
-const deepEqual = require('deep-eql');
-const { Edge, Vertex, VertexProperty } = require('../../lib/structure/graph');
+import { Assertion } from 'chai';
+import deepEqual from 'deep-eql';
+import { Edge, Vertex, VertexProperty } from '../../lib/structure/graph.js';
function isElement(obj) {
return obj instanceof Edge || obj instanceof Vertex || obj instanceof VertexProperty;
}
-const opt = {comparator: compareElements};
+export const opt = {comparator: compareElements};
function isSubsetOf(subset, superset, cmp, contains, ordered) {
if (!contains) {
@@ -72,14 +72,14 @@
}
};
-function deepMembersById (subset, msg) {
+export function deepMembersById (subset, msg) {
if (msg) flag(this, 'message', msg);
var obj = flag(this, 'object')
, flagMsg = flag(this, 'message')
, ssfi = flag(this, 'ssfi');
- new chai.Assertion(obj, flagMsg, ssfi, true).to.be.an('array');
- new chai.Assertion(subset, flagMsg, ssfi, true).to.be.an('array');
+ new Assertion(obj, flagMsg, ssfi, true).to.be.an('array');
+ new Assertion(subset, flagMsg, ssfi, true).to.be.an('array');
var contains = flag(this, 'contains');
var ordered = flag(this, 'ordered');
@@ -108,16 +108,10 @@
);
}
-function compareElements(a, b) {
+export function compareElements(a, b) {
if (!isElement(a) || !isElement(b)) {
return null;
} else {
return a.constructor === b.constructor && a.id === b.id;
}
}
-
-module.exports = {
- deepMembersById,
- compareElements,
- opt
-}
\ No newline at end of file
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 10eea4d..06dab68 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
@@ -20,28 +20,22 @@
/**
* @author Jorge Bay Gondra
*/
-'use strict';
-const {Given, Then, When, setDefaultTimeout} = require('cucumber');
+import chaiString from 'chai-string';
+import { Given, Then, When, setDefaultTimeout } from '@cucumber/cucumber';
// Setting Cucumber timeout to 10s for Floating Errors on Windows on GitHub Actions
setDefaultTimeout(10 * 1000);
-const chai = require('chai')
-chai.use(require('chai-string'));
-const expect = chai.expect;
-const util = require('util');
-const gremlin = require('./gremlin').gremlin;
-const graphModule = require('../../lib/structure/graph');
-const graphTraversalModule = require('../../lib/process/graph-traversal');
-const traversalModule = require('../../lib/process/traversal');
-const utils = require('../../lib/utils');
-const traversal = require('../../lib/process/anonymous-traversal').traversal;
-const Path = graphModule.Path;
-const __ = graphTraversalModule.statics;
-const t = traversalModule.t;
-const P = traversalModule.P;
-const direction = traversalModule.direction;
-const merge = traversalModule.merge;
-const deepMembersById = require('./element-comparison').deepMembersById;
+import { use, expect } from 'chai';
+use(chaiString);
+import { inspect, format, inherits } from 'util';
+import { gremlin } from './gremlin.js';
+import { Path, Vertex, Edge } from '../../lib/structure/graph.js';
+import { statics } from '../../lib/process/graph-traversal.js';
+import { t, P, direction, merge, barrier, cardinality, column, order, TextP, IO, pick, pop, scope, operator, withOptions } from '../../lib/process/traversal.js';
+import { toLong } from '../../lib/utils.js';
+import anon from '../../lib/process/anonymous-traversal.js';
+const __ = statics;
+import { deepMembersById } from './element-comparison.js';
const parsers = [
[ 'str\\[(.*)\\]', (stringValue) => stringValue ], //returns the string value as is
[ 'vp\\[(.+)\\]', toVertexProperty ],
@@ -64,7 +58,7 @@
[ 'M\\[(.+)\\]', toMerge ]
].map(x => [ new RegExp('^' + x[0] + '$'), x[1] ]);
-chai.use(function (chai, chaiUtils) {
+use(function (chai, chaiUtils) {
chai.Assertion.overwriteMethod('members', function (_super) {
return deepMembersById;
});
@@ -111,7 +105,7 @@
}
this.graphName = graphName;
const data = this.getData();
- this.g = traversal().with_(data.connection);
+ this.g = anon.traversal().with_(data.connection);
if (this.isGraphComputer) {
this.g = this.g.withComputer();
@@ -176,14 +170,14 @@
var removeProperties = function(p) {
if (p === undefined) {
- } else if (p instanceof graphModule.Vertex || p instanceof graphModule.Edge) {
+ } else if (p instanceof Vertex || p instanceof Edge) {
p.properties = undefined;
} else if (p instanceof Array) {
p.forEach(removeProperties)
} else if (p instanceof Map) {
removeProperties(Array.from(p.keys()))
removeProperties(Array.from(p.values()))
- } else if (p instanceof graphModule.Path) {
+ } else if (p instanceof Path) {
removeProperties(p.objects)
}
@@ -208,11 +202,11 @@
Then(/^the traversal will raise an error with message (\w+) text of "(.+)"$/, function(comparison, expectedMessage) {
expect(this.result).to.be.a.instanceof(Error);
if (comparison === "containing") {
- expect(this.result.message).to.contain(expectedMessage)
+ expect(this.result.message.toUpperCase()).to.contain(expectedMessage.toUpperCase())
} else if (comparison === "starting") {
- expect(this.result.message).to.startWith(expectedMessage)
+ expect(this.result.message.toUpperCase()).to.startWith(expectedMessage.toUpperCase())
} else if (comparison === "ending") {
- expect(this.result.message).to.endWith(expectedMessage)
+ expect(this.result.message.toUpperCase()).to.endWith(expectedMessage.toUpperCase())
} else {
throw new Error('unknown comparison \'' + comparison + '\'- must be: containing, ending or starting');
}
@@ -278,7 +272,7 @@
count = Object.keys(this.result).length;
}
else {
- throw new Error('result not supported: ' + util.inspect(this.result));
+ throw new Error('result not supported: ' + inspect(this.result));
}
expect(count).to.be.equal(expected);
return;
@@ -292,27 +286,27 @@
const sandbox = {
g: g,
__: __,
- Barrier: traversalModule.barrier,
- Cardinality: traversalModule.cardinality,
- Column: traversalModule.column,
+ Barrier: barrier,
+ Cardinality: cardinality,
+ Column: column,
Direction: {
- BOTH: traversalModule.direction.both,
- IN: traversalModule.direction.in,
- OUT: traversalModule.direction.out,
- from_: traversalModule.direction.in,
- to: traversalModule.direction.out,
+ BOTH: direction.both,
+ IN: direction.in,
+ OUT: direction.out,
+ from_: direction.in,
+ to: direction.out,
},
- Order: traversalModule.order,
- P: traversalModule.P,
- TextP: traversalModule.TextP,
- IO: traversalModule.IO,
- Pick: traversalModule.pick,
- Pop: traversalModule.pop,
- Scope: traversalModule.scope,
- Operator: traversalModule.operator,
- T: traversalModule.t,
- toLong: utils.toLong,
- WithOptions: traversalModule.withOptions
+ Order: order,
+ P: P,
+ TextP: TextP,
+ IO: IO,
+ Pick: pick,
+ Pop: pop,
+ Scope: scope,
+ Operator: operator,
+ T: t,
+ toLong: toLong,
+ WithOptions: withOptions
};
// Pass the parameter to the sandbox
Object.keys(parameters).forEach(paramName => sandbox[paramName] = parameters[paramName]);
@@ -368,7 +362,7 @@
if (vertices.has(name))
return this.getData().vertices.get(name);
else
- return new graphModule.Vertex(name, "vertex")
+ return new Vertex(name, "vertex")
}
function toVertexId(name) {
@@ -382,7 +376,7 @@
function toEdge(name) {
const e = this.getData().edges[name];
if (!e) {
- throw new Error(util.format('Edge with key "%s" not found', name));
+ throw new Error(format('Edge with key "%s" not found', name));
}
return e;
}
@@ -398,7 +392,7 @@
function toVertexProperty(name) {
const vp = this.getData().vertexProperties[name];
if (!vp) {
- throw new Error(util.format('VertexProperty with key "%s" not found', name));
+ throw new Error(format('VertexProperty with key "%s" not found', name));
}
return vp;
}
@@ -439,20 +433,17 @@
return stringList.split(',').map(x => parseValue.call(this, x));
}
-function toSet(stringList) {
- if (stringList === '') {
- return new Set();
- }
-
- const s = new Set();
- stringList.split(',').forEach(x => s.add(parseValue.call(this, x)));
- return s;
-}
-
function toMap(stringMap) {
return parseMapValue.call(this, JSON.parse(stringMap));
}
+function toSet(stringSet) {
+ if (stringSet === '') {
+ return new Set();
+ }
+ return new Set(stringSet.split(',').map(x => parseValue.call(this, x)));
+}
+
function parseMapValue(value) {
if (value === null)
return null;
@@ -498,4 +489,4 @@
Error.captureStackTrace(this, IgnoreError);
}
-util.inherits(IgnoreError, Error);
+inherits(IgnoreError, Error);
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 954b709..ecac831 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
@@ -24,10 +24,10 @@
//********************************************************************************
-const uuid = require('uuid');
-const graphTraversalModule = require('../../lib/process/graph-traversal');
-const traversalModule = require('../../lib/process/traversal');
-const { TraversalStrategies, VertexProgramStrategy, OptionsStrategy, PartitionStrategy,
+import * as graphTraversalModule from '../../lib/process/graph-traversal.js';
+import * as traversalModule from '../../lib/process/traversal.js';
+import * as uuid from 'uuid';
+import { TraversalStrategies, VertexProgramStrategy, OptionsStrategy, PartitionStrategy,
ReadOnlyStrategy, GraphFilterStrategy, SeedStrategy, SubgraphStrategy, ProductiveByStrategy,
LambdaRestrictionStrategy, StandardVerificationStrategy, VertexProgramRestrictionStrategy,
ComputerVerificationStrategy, MessagePassingReductionStrategy, ProfileStrategy, InlineFilterStrategy,
@@ -36,7 +36,7 @@
AdjacentToIncidentStrategy, ReservedKeysVerificationStrategy, RepeatUnrollStrategy,
PathRetractionStrategy, PathProcessorStrategy, OrderLimitStrategy, MatchPredicateStrategy,
LazyBarrierStrategy, EarlyLimitStrategy, IncidentToAdjacentStrategy, IdentityRemovalStrategy,
- HaltedTraverserStrategy, FilterRankingStrategy } = require('../../lib/process/traversal-strategy');
+ HaltedTraverserStrategy, FilterRankingStrategy } from '../../lib/process/traversal-strategy.js';
const __ = graphTraversalModule.statics;
const Barrier = traversalModule.barrier
const Cardinality = traversalModule.cardinality
@@ -322,6 +322,7 @@
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) }],
g_V_hasIdXmarkovar_vadasvarX: [function({g, vid2, vid1}) { return g.V().hasId(vid1, vid2) }],
+ g_V_hasIdXmarkovar_vadasvar_petervarX: [function({g, vid2, vid1}) { return g.V().hasId(vid1, vid2) }],
g_V_hasIdX2AsString_nullX: [function({g, vid2}) { return g.V().hasId(vid2, null) }],
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) }],
@@ -828,7 +829,7 @@
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_out_path_byXvaluesXnameX_toUpperX_conjoinXMARKOX: [function({g}) { return g.V().out().path().by(__.values("name").toUpper()).conjoin("MARKO") }],
g_injectXmarkoX_conjoinX_X: [function({g}) { return g.inject(["marko"]).conjoin("-") }],
g_V_valueMapXlocationX_selectXvaluesX_unfold_orderXlocalX_conjoinX1X: [function({g}) { return g.V().valueMap("location").select(Column.values).unfold().order(Scope.local).conjoin("1") }],
@@ -928,6 +929,7 @@
g_VX1X_outEXknows_createdX_inV: [function({g, vid1}) { return g.V(vid1).outE("knows", "created").inV() }],
g_VX1X_outEXknowsX_bothV: [function({g, vid1}) { return g.V(vid1).outE("knows").bothV() }],
g_VX1X_outEXknowsX_bothV_name: [function({g, vid1}) { return g.V(vid1).outE("knows").bothV().values("name") }],
+ g_V_toEXout_knowsvarX_valuesXweightX: [function({g, xx1}) { return g.V().toE(Direction.OUT, xx1).values("weight") }],
g_VX1X_properties_element: [function({g, vid2}) { return g.V(vid2).properties().element().limit(1) }],
g_V_properties_element: [function({g}) { return g.V().properties().element() }],
g_V_propertiesXageX_element: [function({g}) { return g.V().properties("age").element() }],
@@ -1403,7 +1405,7 @@
g_withStrategiesXProductiveByStrategyX_V_asXaX_selectXaX_byXageX: [function({g}) { return g.withStrategies(new ProductiveByStrategy()).V().as("a").select("a").by("age") }],
g_withSideEffectXk_nullX_injectXxX_selectXkX: [function({g}) { return g.withSideEffect("k", null).inject("x").select("k") }],
g_V_out_in_selectXall_a_a_aX_byXunfold_name_foldX: [function({g}) { return g.addV("A").property("name", "a1").as("a1").addV("B").property("name", "b1").as("b1").addE("ab").from_("a1").to("b1") }, function({g}) { return g.V().as("a").out().as("a").in_().as("a").select(Pop.all, "a", "a", "a").by(__.unfold().values("name").fold()) }],
- g_V_asXlabelX_aggregateXlocal_xX_selectXxX_selectXlabelX: [function({g}) { return g.V().as("label").aggregate(Scope.local, "x").barrier().select("x").select("label") }],
+ g_withoutStrategiesXLazyBarrierStrategyX_V_asXlabelX_aggregateXlocal_xX_selectXxX_selectXlabelX: [function({g}) { return g.withoutStrategies(LazyBarrierStrategy).V().as("label").aggregate(Scope.local, "x").select("x").select("label") }],
g_V_name_asXaX_selectXfirst_aX: [function({g}) { return g.V().values("name").as("a").select(Pop.first, "a") }],
g_V_name_asXaX_selectXlast_aX: [function({g}) { return g.V().values("name").as("a").select(Pop.last, "a") }],
g_V_name_asXaX_selectXmixed_aX: [function({g}) { return g.V().values("name").as("a").select(Pop.mixed, "a") }],
@@ -1849,4 +1851,4 @@
g_injectXUUIDXXX: [function({g}) { return g.inject(uuid.v4()) }],
}
-exports.gremlin = gremlins
+export const gremlin = gremlins
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/world.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/world.js
index dfd75a8..bbc3f99 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/world.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/world.js
@@ -20,13 +20,12 @@
/**
* @author Jorge Bay Gondra
*/
-'use strict';
-const {setWorldConstructor, Before, BeforeAll, AfterAll} = require('cucumber');
-const helper = require('../helper');
-const traversal = require('../../lib/process/anonymous-traversal').traversal;
-const graphTraversalModule = require('../../lib/process/graph-traversal');
-const __ = graphTraversalModule.statics;
+import { setWorldConstructor, Before, BeforeAll, AfterAll } from '@cucumber/cucumber';
+import { getConnection } from '../helper.js';
+import anon from '../../lib/process/anonymous-traversal.js';
+import { statics } from '../../lib/process/graph-traversal.js';
+const __ = statics;
const cache = {};
@@ -51,7 +50,7 @@
TinkerPopWorld.prototype.cleanEmptyGraph = function () {
const connection = this.cache['empty'].connection;
- const g = traversal().withRemote(connection);
+ const g = anon.traversal().withRemote(connection);
return g.V().drop().toList();
};
@@ -72,10 +71,10 @@
const promises = ['modern', 'classic', 'crew', 'grateful', 'sink', 'empty'].map(graphName => {
let connection = null;
if (graphName === 'empty') {
- connection = helper.getConnection('ggraph');
+ connection = getConnection('ggraph');
return connection.open().then(() => cache['empty'] = { connection: connection });
}
- connection = helper.getConnection('g' + graphName);
+ connection = getConnection('g' + graphName);
return connection.open()
.then(() => Promise.all([getVertices(connection), getEdges(connection), getVertexProperties(connection)]))
.then(values => {
@@ -108,7 +107,7 @@
})
function getVertices(connection) {
- const g = traversal().withRemote(connection);
+ const g = anon.traversal().withRemote(connection);
return g.V().group().by('name').by(__.tail()).next().then(it => {
// properties excluded from verification
if (it.value instanceof Map) {
@@ -121,7 +120,7 @@
}
function getEdges(connection) {
- const g = traversal().withRemote(connection);
+ const g = anon.traversal().withRemote(connection);
return g.E().group()
.by(__.project("o", "l", "i").by(__.outV().values("name")).by(__.label()).by(__.inV().values("name")))
.by(__.tail())
@@ -138,7 +137,7 @@
}
function getVertexProperties(connection) {
- const g = traversal().withRemote(connection);
+ const g = anon.traversal().withRemote(connection);
return g.V().properties()
.group()
.by(__.project("n", "k", "v").by(__.element().values("name")).by(__.key()).by(__.value()))
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/helper.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/helper.js
index 8466631..33c1bb5 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/helper.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/helper.js
@@ -20,15 +20,14 @@
/**
* @author Jorge Bay Gondra
*/
-'use strict';
-const utils = require('../lib/utils');
-const DriverRemoteConnection = require('../lib/driver/driver-remote-connection');
-const Client = require('../lib/driver/client');
-const PlainTextSaslAuthenticator = require('../lib/driver/auth/plain-text-sasl-authenticator');
+import * as utilsJs from '../lib/utils.js';
+import DriverRemoteConnection from '../lib/driver/driver-remote-connection.js';
+import Client from '../lib/driver/client.js';
+import PlainTextSaslAuthenticator from '../lib/driver/auth/plain-text-sasl-authenticator.js';
-const yaml = require('js-yaml');
-const fs = require('fs');
+import jsYaml from 'js-yaml';
+import fs from 'fs';
let serverUrl;
let serverAuthUrl;
@@ -47,11 +46,11 @@
}
/** @returns {DriverRemoteConnection} */
-exports.getConnection = function getConnection(traversalSource) {
+export function getConnection(traversalSource) {
return new DriverRemoteConnection(serverUrl, { traversalSource, mimeType: process.env.CLIENT_MIMETYPE });
-};
+}
-exports.getSecureConnectionWithPlainTextSaslAuthenticator = (traversalSource, username, password) => {
+export function getSecureConnectionWithPlainTextSaslAuthenticator(traversalSource, username, password) {
const authenticator = new PlainTextSaslAuthenticator(username, password);
return new DriverRemoteConnection(serverAuthUrl, {
traversalSource,
@@ -59,28 +58,24 @@
rejectUnauthorized: false,
mimeType: process.env.CLIENT_MIMETYPE,
});
-};
+}
-exports.getDriverRemoteConnection = (url, options) => {
+export function getDriverRemoteConnection(url, options) {
return new DriverRemoteConnection(url, { ...options, mimeType: process.env.CLIENT_MIMETYPE });
}
-exports.getDriverRemoteConnectionGraphSON = (traversalSource) => {
- return new DriverRemoteConnection(serverUrl, { traversalSource, mimeType: 'application/vnd.gremlin-v3.0+json' });
-};
-
-exports.getClient = function getClient(traversalSource) {
+export function getClient(traversalSource) {
return new Client(serverUrl, { traversalSource, mimeType: process.env.CLIENT_MIMETYPE });
-};
+}
-exports.getSessionClient = function getSessionClient(traversalSource) {
- const sessionId = utils.getUuid();
+export function getSessionClient(traversalSource) {
+ const sessionId = utilsJs.getUuid();
return new Client(serverUrl, {
'traversalSource': traversalSource,
'session': sessionId.toString(),
mimeType: process.env.CLIENT_MIMETYPE,
});
-};
+}
function getMimeTypeFromSocketServerSettings(socketServerSettings) {
let mimeType;
@@ -99,28 +94,21 @@
return mimeType;
}
-exports.getGremlinSocketServerClient = function getGremlinSocketServerClient(traversalSource) {
- const settings = exports.getGremlinSocketServerSettings();
+export function getGremlinSocketServerClient(traversalSource) {
+ const settings = getGremlinSocketServerSettings();
const url = socketServerUrl + settings.PORT + '/gremlin';
let mimeType = getMimeTypeFromSocketServerSettings(settings)
return new Client(url, { traversalSource, mimeType });
-};
+}
-exports.getGremlinSocketServerClientWithOptions = function getGremlinSocketServerClient(traversalSource, options) {
- const settings = exports.getGremlinSocketServerSettings();
- const url = socketServerUrl + settings.PORT + '/gremlin';
- const mimeType = getMimeTypeFromSocketServerSettings(settings)
- return new Client(url, { traversalSource, mimeType, ...options});
-};
-
-exports.getGremlinSocketServerClientNoUserAgent = function getGremlinSocketServerClient(traversalSource) {
- const settings = exports.getGremlinSocketServerSettings();
+export const getGremlinSocketServerClientNoUserAgent = function getGremlinSocketServerClient(traversalSource) {
+ const settings = getGremlinSocketServerSettings();
const url = socketServerUrl + settings.PORT + '/gremlin';
let mimeType = getMimeTypeFromSocketServerSettings(settings)
return new Client(url, { traversalSource, mimeType, enableUserAgentOnConnect:false });
};
-exports.getGremlinSocketServerSettings = function getGremlinSocketServerSettings() {
- const settings = yaml.load(fs.readFileSync(sockerServerConfigPath, 'utf8'));
+export function getGremlinSocketServerSettings() {
+ const settings = jsYaml.load(fs.readFileSync(sockerServerConfigPath, 'utf8'));
return settings;
-};
+}
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/integration/client-behavior-tests.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/integration/client-behavior-tests.js
index b98ae3e..af0c078 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/integration/client-behavior-tests.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/integration/client-behavior-tests.js
@@ -17,19 +17,17 @@
* under the License.
*/
-'use strict';
-
-const assert = require('assert');
-const helper = require('../helper');
-const {getUserAgent} = require("../../lib/utils");
+import assert from 'assert';
+import { getGremlinSocketServerClient, getGremlinSocketServerSettings, getGremlinSocketServerClientNoUserAgent } from '../helper.js';
+import { getUserAgent } from "../../lib/utils.js";
let client;
let settings;
describe('Client', function () {
before(function () {
- client = helper.getGremlinSocketServerClient('gmodern');
- settings = helper.getGremlinSocketServerSettings();
+ client = getGremlinSocketServerClient('gmodern');
+ settings = getGremlinSocketServerSettings();
return client.open();
});
after(function () {
@@ -55,7 +53,7 @@
assert.strictEqual(result.first(), await getUserAgent());
});
it('should not include user agent in handshake request if disabled', async function () {
- let noUserAgentClient = helper.getGremlinSocketServerClientNoUserAgent('gmodern');
+ let noUserAgentClient = getGremlinSocketServerClientNoUserAgent('gmodern');
let result = await noUserAgentClient.submit('1', null,
{requestId: settings.USER_AGENT_REQUEST_ID});
@@ -63,33 +61,6 @@
await noUserAgentClient.close();
});
- it('should not request permessage deflate compression by default', async function () {
- const result = await client.submit('1', null, {requestId: settings.SEC_WEBSOCKET_EXTENSIONS});
- const returnedExtensions = result.first()
- assert.ok(returnedExtensions == undefined || !returnedExtensions.includes("permessage-deflate;"))
- });
- it('should not request permessage deflate compression when disabled', async function () {
- const noCompressionClient = helper.getGremlinSocketServerClientWithOptions('gmodern',
- {enableCompression: false});
- const result = await noCompressionClient.submit('1', null,
- {requestId: settings.SEC_WEBSOCKET_EXTENSIONS});
-
- const returnedExtensions = result.first()
- assert.ok(returnedExtensions == undefined || !returnedExtensions.includes("permessage-deflate;"))
-
- await noCompressionClient.close();
- });
- it('should request permessage deflate compression when enabled', async function () {
- const compressionClient = helper.getGremlinSocketServerClientWithOptions('gmodern',
- {enableCompression: true});
- const result = await compressionClient.submit('1', null,
- {requestId: settings.SEC_WEBSOCKET_EXTENSIONS});
-
- const returnedExtensions = result.first()
- assert.ok(returnedExtensions.includes("permessage-deflate;"))
-
- await compressionClient.close();
- });
it('should send per request settings to server', async function () {
const resultSet = await client.submit('1', null, {
requestId: settings.PER_REQUEST_SETTINGS_REQUEST_ID,
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/integration/client-tests.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/integration/client-tests.js
index a61701d..b50b645 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/integration/client-tests.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/integration/client-tests.js
@@ -17,19 +17,17 @@
* under the License.
*/
-'use strict';
-
-const assert = require('assert');
-const Bytecode = require('../../lib/process/bytecode');
-const graphModule = require('../../lib/structure/graph');
-const helper = require('../helper');
-const t = require('../../lib/process/traversal');
+import assert from 'assert';
+import Bytecode from '../../lib/process/bytecode.js';
+import { Vertex } from '../../lib/structure/graph.js';
+import { getClient } from '../helper.js';
+import { cardinality } from '../../lib/process/traversal.js';
let client, clientCrew;
describe('Client', function () {
before(function () {
- client = helper.getClient('gmodern');
+ client = getClient('gmodern');
clientCrew = helper.getClient('gcrew')
return client.open();
});
@@ -43,7 +41,7 @@
.then(function (result) {
assert.ok(result);
assert.strictEqual(result.length, 1);
- assert.ok(result.first().object instanceof graphModule.Vertex);
+ assert.ok(result.first().object instanceof Vertex);
});
});
it('should send and parse a script', function () {
@@ -51,7 +49,7 @@
.then(function (result) {
assert.ok(result);
assert.strictEqual(result.length, 1);
- assert.ok(result.first() instanceof graphModule.Vertex);
+ assert.ok(result.first() instanceof Vertex);
});
});
it('should send and parse a script with bindings', function () {
@@ -62,7 +60,7 @@
});
});
it('should send and parse a script with non-native javascript bindings', function () {
- return client.submit('card.class.simpleName + ":" + card', { card: t.cardinality.set } )
+ return client.submit('card.class.simpleName + ":" + card', { card: cardinality.set } )
.then(function (result) {
assert.ok(result);
assert.strictEqual(result.first(), 'Cardinality:set');
@@ -83,7 +81,7 @@
assert.ok(result);
assert.strictEqual(result.length, 1);
const vertex = result.first().object;
- assert.ok(vertex instanceof graphModule.Vertex);
+ assert.ok(vertex instanceof Vertex);
let age, name
if (vertex.properties instanceof Array) {
const ageProps = vertex.properties.filter(p => p.key === 'age');
@@ -107,7 +105,7 @@
assert.ok(result);
assert.strictEqual(result.length, 1);
const vertex = result.first().object;
- assert.ok(vertex instanceof graphModule.Vertex);
+ assert.ok(vertex instanceof Vertex);
assert.ok(vertex.properties === undefined || vertex.properties.length === 0);
});
});
@@ -118,7 +116,7 @@
assert.ok(result);
assert.strictEqual(result.length, 1);
const vertex = result.first();
- assert.ok(vertex instanceof graphModule.Vertex);
+ assert.ok(vertex instanceof Vertex);
// if/then until TINKERPOP-3186
let age, name
if (vertex.properties instanceof Array) {
@@ -182,13 +180,13 @@
assert.ok(result);
assert.strictEqual(result.length, 1);
const vertex = result.first();
- assert.ok(vertex instanceof graphModule.Vertex);
+ assert.ok(vertex instanceof Vertex);
assert.ok(vertex.properties === undefined || vertex.properties.length === 0);
});
});
it('should handle VertexProperties properties for gremlin request', async function () {
- const crewClient = helper.getClient('gcrew');
+ const crewClient = getClient('gcrew');
await crewClient.open();
const result = await crewClient.submit('g.V(7)');
@@ -203,7 +201,7 @@
});
it('should handle VertexProperties properties for bytecode request', async function () {
- const crewClient = helper.getClient('gcrew');
+ const crewClient = getClient('gcrew');
await crewClient.open();
const result = await crewClient.submit(new Bytecode().addStep('V', [7]));
@@ -230,7 +228,7 @@
readable.on('end', () => {
assert.strictEqual(calls, 2); // limit of 3 with batchSize of 2 should be two function calls
assert.strictEqual(output.length, 3);
- assert.ok(output[0] instanceof graphModule.Vertex);
+ assert.ok(output[0] instanceof Vertex);
done();
})
});
@@ -247,7 +245,7 @@
assert.strictEqual(calls, 2); // limit of 3 with batchSize of 2 should be two function calls
assert.strictEqual(output.length, 3);
- assert.ok(output[0] instanceof graphModule.Vertex);
+ assert.ok(output[0] instanceof Vertex);
});
it("should get error for malformed requestId for script stream", async () => {
@@ -299,7 +297,7 @@
});
it("should reject pending traversal promises if connection closes", async () => {
- const closingClient = helper.getClient('gmodern');
+ const closingClient = getClient('gmodern');
await closingClient.open();
const timeout = 10000;
const startTime = Date.now();
@@ -323,7 +321,7 @@
});
it("should end streams on traversals if connection closes", async () => {
- const closingClient = helper.getClient('gmodern');
+ const closingClient = getClient('gmodern');
await closingClient.open();
let isRejected = false;
@@ -344,7 +342,7 @@
});
function assertVertexProperties(vertex) {
- assert.ok(vertex instanceof graphModule.Vertex);
+ assert.ok(vertex instanceof Vertex);
let locations;
if (vertex.properties instanceof Array) {
locations = vertex.properties.filter(p => p.key == 'location');
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/integration/remote-connection-tests.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/integration/remote-connection-tests.js
index f86e252..5d4da82 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/integration/remote-connection-tests.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/integration/remote-connection-tests.js
@@ -20,18 +20,17 @@
/**
* @author Jorge Bay Gondra
*/
-'use strict';
-const assert = require('assert');
-const Bytecode = require('../../lib/process/bytecode');
-const graphModule = require('../../lib/structure/graph');
-const helper = require('../helper');
+import assert from 'assert';
+import Bytecode from '../../lib/process/bytecode.js';
+import { Vertex } from '../../lib/structure/graph.js';
+import { getConnection } from '../helper.js';
let connection;
describe('DriverRemoteConnection', function () {
before(function () {
- connection = helper.getConnection('gmodern');
+ connection = getConnection('gmodern');
return connection.open();
});
after(function () {
@@ -45,7 +44,7 @@
assert.ok(response);
assert.ok(response.traversers);
assert.strictEqual(response.traversers.length, 1);
- assert.ok(response.traversers[0].object instanceof graphModule.Vertex);
+ assert.ok(response.traversers[0].object instanceof Vertex);
});
});
it('should send the request with syntax error and parse the response error', function () {
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/integration/sasl-authentication-tests.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/integration/sasl-authentication-tests.js
index ee6a4e2..eb4b204 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/integration/sasl-authentication-tests.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/integration/sasl-authentication-tests.js
@@ -17,15 +17,12 @@
* under the License.
*/
-'use strict';
-
-const assert = require('assert');
-const AssertionError = require('assert');
-const { traversal } = require('../../lib/process/anonymous-traversal');
-const Bytecode = require('../../lib/process/bytecode');
-const helper = require('../helper');
-const DriverRemoteConnection = require('../../lib/driver/driver-remote-connection');
-const PlainTextSaslAuthenticator = require('../../lib/driver/auth/plain-text-sasl-authenticator');
+import assert from 'assert';
+import { AssertionError } from 'assert';
+import anon from '../../lib/process/anonymous-traversal.js';
+import Bytecode from '../../lib/process/bytecode.js';
+import { getSecureConnectionWithPlainTextSaslAuthenticator, getDriverRemoteConnection } from '../helper.js';
+import PlainTextSaslAuthenticator from '../../lib/driver/auth/plain-text-sasl-authenticator.js';
let connection;
let badServerAuthUrl;
@@ -45,7 +42,7 @@
describe('#submit()', function () {
it('should send the request with valid credentials and parse the response', function () {
- connection = helper.getSecureConnectionWithPlainTextSaslAuthenticator(null, 'stephen', 'password');
+ connection = getSecureConnectionWithPlainTextSaslAuthenticator(null, 'stephen', 'password');
return connection.submit(new Bytecode().addStep('V', []).addStep('tail', []))
.then(function (response) {
@@ -54,21 +51,8 @@
});
});
- it('should be able to send multiple requests concurrently with valid credentials and parse the response', async function () {
- connection = helper.getSecureConnectionWithPlainTextSaslAuthenticator(null, 'stephen', 'password');
-
- const submissions = await Promise.all(
- Array.from({ length: 10 }).map(() => connection.submit(new Bytecode().addStep('V', []).addStep('tail', []))),
- );
-
- submissions.forEach((response) => {
- assert.ok(response);
- assert.ok(response.traversers);
- });
- });
-
it('should send the request with invalid credentials and parse the response error', function () {
- connection = helper.getSecureConnectionWithPlainTextSaslAuthenticator(null, 'Bob', 'password');
+ connection = getSecureConnectionWithPlainTextSaslAuthenticator(null, 'Bob', 'password');
return connection.submit(new Bytecode().addStep('V', []).addStep('tail', []))
.then(function() {
@@ -82,7 +66,7 @@
it('should return error when using ws:// for a TLS configured server', function () {
const authenticator = new PlainTextSaslAuthenticator('stephen', 'password');
- connection = helper.getDriverRemoteConnection(badServerAuthUrl, {
+ connection = getDriverRemoteConnection(badServerAuthUrl, {
authenticator: authenticator,
rejectUnauthorized: false
});
@@ -100,12 +84,12 @@
it('should return error when using ws:// for a TLS configured server', function () {
const authenticator = new PlainTextSaslAuthenticator('stephen', 'password');
- connection = helper.getDriverRemoteConnection(badServerAuthUrl, {
+ connection = getDriverRemoteConnection(badServerAuthUrl, {
authenticator: authenticator,
rejectUnauthorized: false
});
- const g = traversal().with_(connection);
+ const g = anon.traversal().with_(connection);
return g.V().toList().then(function() {
assert.fail("server is running TLS and trying to connect with ws:// so this should result in error thrown");
}).catch(function(err) {
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/integration/session-client-tests.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/integration/session-client-tests.js
index 59cd1c6..b2ce2f7 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/integration/session-client-tests.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/integration/session-client-tests.js
@@ -21,18 +21,15 @@
* @author : Liu Jianping
*/
-'use strict';
-
-const assert = require('assert');
-const Bytecode = require('../../lib/process/bytecode');
-const graphModule = require('../../lib/structure/graph');
-const helper = require('../helper');
+import assert from 'assert';
+import Bytecode from '../../lib/process/bytecode.js';
+import { getSessionClient } from '../helper.js';
let client;
describe('Client', function () {
before(function () {
- client = helper.getSessionClient('g');
+ client = getSessionClient('g');
return client.open();
});
after(function () {
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/integration/traversal-test.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/integration/traversal-test.js
index 89b4c85..f8b464d 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/integration/traversal-test.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/integration/traversal-test.js
@@ -20,19 +20,16 @@
/**
* @author Jorge Bay Gondra
*/
-'use strict';
-const Mocha = require('mocha');
-const assert = require('assert');
-const { AssertionError } = require('assert');
-const DriverRemoteConnection = require('../../lib/driver/driver-remote-connection');
-const { Vertex, Edge, VertexProperty} = require('../../lib/structure/graph');
-const { traversal } = require('../../lib/process/anonymous-traversal');
-const { GraphTraversalSource, GraphTraversal, statics } = require('../../lib/process/graph-traversal');
-const { SubgraphStrategy, ReadOnlyStrategy, SeedStrategy, HaltedTraverserStrategy, FilterRankingStrategy,
- OptionsStrategy, ReservedKeysVerificationStrategy, EdgeLabelVerificationStrategy } = require('../../lib/process/traversal-strategy');
-const Bytecode = require('../../lib/process/bytecode');
-const helper = require('../helper');
+import assert from 'assert';
+import { AssertionError } from 'assert';
+import {Edge, Vertex, VertexProperty} from '../../lib/structure/graph.js';
+import anon from '../../lib/process/anonymous-traversal.js';
+import { GraphTraversalSource, GraphTraversal, statics } from '../../lib/process/graph-traversal.js';
+import { SubgraphStrategy, ReadOnlyStrategy, SeedStrategy,HaltedTraverserStrategy, FilterRankingStrategy,
+ OptionsStrategy, ReservedKeysVerificationStrategy, EdgeLabelVerificationStrategy } from '../../lib/process/traversal-strategy.js';
+import Bytecode from '../../lib/process/bytecode.js';
+import { getConnection, getDriverRemoteConnection } from '../helper.js';
const {getDriverRemoteConnectionGraphSON} = require("../helper");
const __ = statics;
@@ -69,7 +66,7 @@
describe('Traversal', function () {
before(function () {
- connection = helper.getConnection('gmodern');
+ connection = getConnection('gmodern');
return connection.open();
});
after(function () {
@@ -77,7 +74,7 @@
});
describe("#construct", function () {
it('should not hang if server not present', function() {
- const g = traversal().with_(helper.getDriverRemoteConnection('ws://localhost:9998/gremlin', {traversalSource: 'g'}));
+ const g = anon.traversal().with_(getDriverRemoteConnection('ws://localhost:9998/gremlin', {traversalSource: 'g'}));
return g.V().toList().then(function() {
assert.fail("there is no server so an error should have occurred");
}).catch(function(err) {
@@ -88,7 +85,7 @@
});
describe('#toList()', function () {
it('should submit the traversal and return a list', function () {
- var g = traversal().with_(connection);
+ var g = anon.traversal().with_(connection);
return g.V().toList().then(function (list) {
assert.ok(list);
assert.strictEqual(list.length, 6);
@@ -98,7 +95,7 @@
});
describe('#clone()', function () {
it('should reset a traversal when cloned', function () {
- var g = traversal().with_(connection);
+ var g = anon.traversal().with_(connection);
var t = g.V().count();
return t.next().then(function (item1) {
assert.ok(item1);
@@ -112,7 +109,7 @@
});
describe('#next()', function () {
it('should submit the traversal and return an iterator', function () {
- var g = traversal().with_(connection);
+ var g = anon.traversal().with_(connection);
var t = g.V().count();
return t.hasNext()
.then(function (more) {
@@ -132,7 +129,7 @@
});
describe('#materializeProperties()', function () {
it('should skip vertex properties when tokens is set', function () {
- var g = traversal().withRemote(connection);
+ var g = anon.traversal().with_(connection);
return g.with_("materializeProperties", "tokens").V().toList().then(function (list) {
assert.ok(list);
assert.strictEqual(list.length, 6);
@@ -141,17 +138,17 @@
});
});
it('should skip edge properties when tokens is set', function () {
- var g = traversal().withRemote(connection);
+ var g = anon.traversal().with_(connection);
return g.with_("materializeProperties", "tokens").E().toList().then(function (list) {
assert.ok(list);
assert.strictEqual(list.length, 6);
list.forEach(e => assert.ok(e instanceof Edge));
- // due to the way edge is constructed, edge properties will be {} regardless if it's null or []
+ // due to the way edge is constructed, edge properties will be {} or []
list.forEach(e => assert.strictEqual(Object.keys(e.properties).length, 0));
});
});
it('should skip vertex property properties when tokens is set', function () {
- var g = traversal().withRemote(connection);
+ var g = anon.traversal().with_(connection);
return g.with_("materializeProperties", "tokens").V().properties().toList().then(function (list) {
assert.ok(list);
assert.strictEqual(list.length, 12);
@@ -235,7 +232,7 @@
});
describe('lambdas', function() {
it('should handle 1-arg lambdas', function() {
- const g = traversal().with_(connection);
+ const g = anon.traversal().with_(connection);
return g.V().has('person','name','marko').values('name').map(() => "it.get()[1]").toList().then(function (s) {
assert.ok(s);
assert.strictEqual(s[0], 'a');
@@ -244,7 +241,7 @@
});
describe('dsl', function() {
it('should expose DSL methods', function() {
- const g = traversal(SocialTraversalSource).with_(connection);
+ const g = anon.traversal(SocialTraversalSource).with_(connection);
return g.person('marko').aged(29).values('name').toList().then(function (list) {
assert.ok(list);
assert.strictEqual(list.length, 1);
@@ -253,7 +250,7 @@
});
it('should expose anonymous DSL methods', function() {
- const g = traversal(SocialTraversalSource).with_(connection);
+ const g = anon.traversal(SocialTraversalSource).with_(connection);
return g.person('marko').filter(aged(29)).values('name').toList().then(function (list) {
assert.ok(list);
assert.strictEqual(list.length, 1);
@@ -263,7 +260,7 @@
});
describe("more complex traversals", function() {
it('should return paths of value maps', function() {
- const g = traversal().with_(connection);
+ const g = anon.traversal().with_(connection);
return g.V(1).out().order().in_().order().limit(1).path().by(__.valueMap('name')).toList().then(function (list) {
assert.ok(list);
assert.strictEqual(list.length, 1);
@@ -275,7 +272,7 @@
});
describe("should allow TraversalStrategy definition", function() {
it('should allow SubgraphStrategy', function() {
- const g = traversal().with_(connection).withStrategies(
+ const g = anon.traversal().with_(connection).withStrategies(
new SubgraphStrategy({vertices:__.hasLabel("person"), edges:__.hasLabel("created")}));
g.V().count().next().then(function (item1) {
assert.ok(item1);
@@ -295,7 +292,7 @@
}, (err) => assert.fail("tanked: " + err));
});
it('should allow ReadOnlyStrategy', function() {
- const g = traversal().with_(connection).withStrategies(new ReadOnlyStrategy());
+ const g = anon.traversal().with_(connection).withStrategies(new ReadOnlyStrategy());
return g.addV().iterate().then(() => assert.fail("should have tanked"), (err) => assert.ok(err));
});
it('should allow OptionsStrategy', function() {
@@ -306,11 +303,11 @@
});
});
it('should allow ReservedKeysVerificationStrategy', function() {
- const g = traversal().with_(connection).withStrategies(new ReservedKeysVerificationStrategy({logWarnings: false, throwException: true}));
+ const g = anon.traversal().with_(connection).withStrategies(new ReservedKeysVerificationStrategy({logWarnings: false, throwException: true}));
return g.addV().property("id", "please-don't-use-id").iterate().then(() => assert.fail("should have tanked"), (err) => assert.ok(err));
});
it('should allow EdgeLabelVerificationStrategy', function() {
- const g = traversal().with_(connection).withStrategies(new EdgeLabelVerificationStrategy({logWarnings: false, throwException: true}));
+ const g = anon.traversal().with_(connection).withStrategies(new EdgeLabelVerificationStrategy({logWarnings: false, throwException: true}));
g.V().outE("created", "knows").count().next().then(function (item1) {
assert.ok(item1);
assert.strictEqual(item1.value, 6);
@@ -318,11 +315,11 @@
return g.V().out().iterate().then(() => assert.fail("should have tanked"), (err) => assert.strictEqual(err.statusCode, 500));
});
it('should allow with_(evaluationTimeout,10)', function() {
- const g = traversal().with_(connection).with_('x').with_('evaluationTimeout', 10);
+ const g = anon.traversal().with_(connection).with_('x').with_('evaluationTimeout', 10);
return g.V().repeat(__.both()).iterate().then(() => assert.fail("should have tanked"), (err) => assert.strictEqual(err.statusCode, 598));
});
it('should allow SeedStrategy', function () {
- const g = traversal().with_(connection).withStrategies(new SeedStrategy({seed: 999999}));
+ const g = anon.traversal().with_(connection).withStrategies(new SeedStrategy({seed: 999999}));
return g.V().coin(0.4).count().next().then(function (item1) {
assert.ok(item1);
assert.strictEqual(item1.value, 1);
@@ -349,7 +346,7 @@
});
describe("should handle tx errors if graph not support tx", function() {
it('should throw exception on commit if graph not support tx', async function() {
- const g = traversal().withRemote(connection);
+ const g = anon.traversal().withRemote(connection);
const tx = g.tx();
const gtx = tx.begin();
const result = await g.V().count().next();
@@ -362,7 +359,7 @@
}
});
it('should throw exception on rollback if graph not support tx', async function() {
- const g = traversal().withRemote(connection);
+ const g = anon.traversal().withRemote(connection);
const tx = g.tx();
tx.begin();
try {
@@ -375,17 +372,17 @@
});
describe('support remote transactions - commit', function() {
before(function () {
- txConnection = helper.getConnection('gtx');
+ txConnection = getConnection('gtx');
return txConnection.open();
});
after(function () {
- const g = traversal().with_(txConnection);
+ const g = anon.traversal().with_(txConnection);
return g.V().drop().iterate().then(() => {
return txConnection.close()
});
});
it('should commit a simple transaction', async function () {
- const g = traversal().with_(txConnection);
+ const g = anon.traversal().with_(txConnection);
const tx = g.tx();
const gtx = tx.begin();
await Promise.all([
@@ -414,17 +411,17 @@
describe('support remote transactions - rollback', function() {
before(function () {
- txConnection = helper.getConnection('gtx');
+ txConnection = getConnection('gtx');
return txConnection.open();
});
after(function () {
- const g = traversal().with_(txConnection);
+ const g = anon.traversal().with_(txConnection);
return g.V().drop().iterate().then(() => {
return txConnection.close()
});
});
it('should rollback a simple transaction', async function() {
- const g = traversal().with_(txConnection);
+ const g = anon.traversal().with_(txConnection);
const tx = g.tx();
const gtx = tx.begin();
await Promise.all([
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/bytecode-test.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/bytecode-test.js
index c625a3e..3e7eaae 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/bytecode-test.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/bytecode-test.js
@@ -20,37 +20,36 @@
/**
* @author Serhiy Salo
*/
-'use strict';
-const assert = require('assert');
-const graph = require('../../lib/structure/graph');
-const graphTraversalModule = require('../../lib/process/graph-traversal');
-const __ = graphTraversalModule.statics;
-const { ReadOnlyStrategy } = require('../../lib/process/traversal-strategy');
+import assert from 'assert';
+import { Graph } from '../../lib/structure/graph.js';
+import { statics } from '../../lib/process/graph-traversal.js';
+const __ = statics;
+import { ReadOnlyStrategy } from '../../lib/process/traversal-strategy.js';
describe('Bytecode', () => {
describe('#toString()', () => {
it('should produce valid string representation of bytecode', () => {
- const g = new graph.Graph().traversal();
+ const g = new Graph().traversal();
const bytecode = g.V().hasLabel("person").has("name", "peter");
assert.ok(bytecode);
assert.strictEqual(bytecode.toString(), '[[],[["V"],["hasLabel","person"],["has","name","peter"]]]');
});
it('should produce valid string representation of bytecode with reference to inner steps', () => {
- const g = new graph.Graph().traversal();
+ const g = new Graph().traversal();
const bytecode = g.V().hasLabel("airport").where(__.outE("route").hasId(7753));
assert.ok(bytecode);
assert.strictEqual(bytecode.toString(), '[[],[["V"],["hasLabel","airport"],["where",[["outE","route"],["hasId",7753]]]]]');
});
it('should produce valid string representation of bytecode with multiple parameters', () => {
- const g = new graph.Graph().traversal();
+ const g = new Graph().traversal();
const bytecode = g.V().has('person', 'name', 'marko');
assert.ok(bytecode);
assert.strictEqual(bytecode.toString(), '[[],[["V"],["has","person","name","marko"]]]');
});
it('should produce valid string representation of bytecode with strategies', () => {
- const g = new graph.Graph().traversal();
+ const g = new Graph().traversal();
const bytecode = g.with_('enabled').withStrategies(new ReadOnlyStrategy()).V();
assert.ok(bytecode);
assert.strictEqual(bytecode.toString(), '[[["withStrategies",{"fqcn":"org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.OptionsStrategy","configuration":{"enabled":true}}],["withStrategies",{"fqcn":"org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ReadOnlyStrategy","configuration":{}}]],[["V"]]]');
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/client-test.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/client-test.js
index f9dbde0..e150208 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/client-test.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/client-test.js
@@ -17,10 +17,8 @@
* under the License.
*/
-'use strict';
-
-const assert = require('assert');
-const Client = require('../../lib/driver/client');
+import assert from 'assert';
+import Client from '../../lib/driver/client.js';
describe('Client', function () {
const customOpProcessor = 'customOpProcessor';
@@ -82,17 +80,4 @@
const customClient = new Client('ws://localhost:9321', {traversalSource: 'g', connectOnStartup: false, mimeType: 'application/vnd.gremlin-v2.0+json'});
assert.strictEqual(customClient._connection.mimeType, 'application/vnd.gremlin-v2.0+json')
});
-
- it('should disable compression by default', function () {
- const client = new Client('ws://localhost:9321');
- assert.strictEqual(client._connection._enableCompression, false);
- });
-
- it('should passthrough compression setting', function () {
- const uncompressedClient = new Client('ws://localhost:9321', {enableCompression: false});
- const compressedClient = new Client('ws://localhost:9321', {enableCompression: true});
-
- assert.strictEqual(uncompressedClient._connection._enableCompression, false);
- assert.strictEqual(compressedClient._connection._enableCompression, true);
- });
});
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/element-comparison-test.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/element-comparison-test.js
index fc459e5..99d3779 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/element-comparison-test.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/element-comparison-test.js
@@ -17,11 +17,11 @@
* under the License.
*/
-const chai = require('chai')
-const { expect } = require('chai');
-const { VertexProperty, Property, Vertex, Edge, Path } = require('../../lib/structure/graph');
-const { deepMembersById, compareElements, opt } = require('../cucumber/element-comparison');
-const deepEqual = require('deep-eql');
+import chai from 'chai';
+import { expect } from 'chai';
+import { VertexProperty, Property, Vertex, Edge, Path } from '../../lib/structure/graph.js';
+import { deepMembersById, opt } from '../cucumber/element-comparison.js';
+import deepEqual from 'deep-eql';
chai.use(function (chai, chaiUtils) {
chai.Assertion.overwriteMethod('members', function (_super) {
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/exports-test.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/exports-test.js
index 4273604..65ab268 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/exports-test.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/exports-test.js
@@ -20,10 +20,9 @@
/**
* @author Jorge Bay Gondra
*/
-'use strict';
-const assert = require('assert');
-const glvModule = require('../../');
+import assert from 'assert';
+import * as glvModule from '../../lib/index.js';
describe('API', function () {
it('should export fields under process', function () {
@@ -86,4 +85,4 @@
function validateConstructor(parent, name) {
assert.strictEqual(typeof parent[name], 'function');
assert.strictEqual(parent[name].name, name);
-}
\ No newline at end of file
+}
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/AnySerializer-test.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/AnySerializer-test.js
index d723c85..4cac41b 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/AnySerializer-test.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/AnySerializer-test.js
@@ -20,17 +20,16 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const utils = require('./utils');
-const assert = require('assert');
-const { DataType, anySerializer } = require('../../../lib/structure/io/binary/GraphBinary');
+import { ser_title, des_title } from './utils.js';
+import assert from 'assert';
+import { DataType, anySerializer } from '../../../lib/structure/io/binary/GraphBinary.js';
-const { Vertex, VertexProperty, Edge, Path, Property } = require('../../../lib/structure/graph');
-const t = require('../../../lib/process/traversal');
-const ts = require('../../../lib/process/traversal-strategy');
-const Bytecode = require('../../../lib/process/bytecode');
-const { GraphTraversal } = require('../../../lib/process/graph-traversal');
+import { Vertex, VertexProperty, Edge, Path, Property } from '../../../lib/structure/graph.js';
+import { Traverser, P, TextP, EnumValue } from '../../../lib/process/traversal.js';
+import { OptionsStrategy } from '../../../lib/process/traversal-strategy.js';
+import Bytecode from '../../../lib/process/bytecode.js';
+import { GraphTraversal } from '../../../lib/process/graph-traversal.js';
const g = () => new GraphTraversal(undefined, undefined, new Bytecode());
const { from, concat } = Buffer;
@@ -104,7 +103,7 @@
},
// TraverserSerializer
- { v: new t.Traverser("A1", 16),
+ { v: new Traverser("A1", 16),
b: [
DataType.TRAVERSER,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,
@@ -113,7 +112,7 @@
},
// TraversalStrategySerializer
- { v: new ts.OptionsStrategy({ 'B': 1, 'A': 2 }),
+ { v: new OptionsStrategy({ 'B': 1, 'A': 2 }),
b: [
DataType.TRAVERSALSTRATEGY,0x00,
0x00,0x00,0x00,0x52, ...from('org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.OptionsStrategy'),
@@ -128,7 +127,7 @@
},
// PSerializer
- { v: t.P.eq('marko'),
+ { v: P.eq('marko'),
b: [
DataType.P,0x00,
0x00,0x00,0x00,0x02, ...from('eq'),
@@ -138,7 +137,7 @@
},
// TextPSerializer
- { v: t.TextP.containing('ValuE'),
+ { v: TextP.containing('ValuE'),
b: [
DataType.TEXTP,0x00,
0x00,0x00,0x00,0x0A, ...from('containing'),
@@ -158,22 +157,22 @@
},
// EnumSerializer (actually represents different enum like types)
- { v: new t.EnumValue('Barrier', 'normSack'),
+ { v: new EnumValue('Barrier', 'normSack'),
b: [ DataType.BARRIER,0x00, DataType.STRING,0x00, 0x00,0x00,0x00,0x08, ...from('normSack') ]
},
- { v: new t.EnumValue('Cardinality', 'single'),
+ { v: new EnumValue('Cardinality', 'single'),
b: [ DataType.CARDINALITY,0x00, DataType.STRING,0x00, 0x00,0x00,0x00,0x06, ...from('single') ]
},
- { v: new t.EnumValue('Column', 'keys'),
+ { v: new EnumValue('Column', 'keys'),
b: [ DataType.COLUMN,0x00, DataType.STRING,0x00, 0x00,0x00,0x00,0x04, ...from('keys') ]
},
- { v: new t.EnumValue('Direction', 'OUT'),
+ { v: new EnumValue('Direction', 'OUT'),
b: [ DataType.DIRECTION,0x00, DataType.STRING,0x00, 0x00,0x00,0x00,0x03, ...from('OUT') ]
},
- { v: new t.EnumValue('DT', 'minute'),
+ { v: new EnumValue('DT', 'minute'),
b: [ DataType.DT,0x00, DataType.STRING,0x00, 0x00,0x00,0x00,0x06, ...from('minute') ]
},
- { v: new t.EnumValue('Merge', 'onMatch'),
+ { v: new EnumValue('Merge', 'onMatch'),
b: [ DataType.MERGE,0x00, DataType.STRING,0x00, 0x00,0x00,0x00,0x07, ...from('onMatch') ]
},
{ v: new t.EnumValue('N', 'byte'),
@@ -182,19 +181,19 @@
{ v: new t.EnumValue('Operator', 'addAll'),
b: [ DataType.OPERATOR,0x00, DataType.STRING,0x00, 0x00,0x00,0x00,0x06, ...from('addAll') ]
},
- { v: new t.EnumValue('Order', 'desc'),
+ { v: new EnumValue('Order', 'desc'),
b: [ DataType.ORDER,0x00, DataType.STRING,0x00, 0x00,0x00,0x00,0x04, ...from('desc') ]
},
- { v: new t.EnumValue('Pick', 'any'),
+ { v: new EnumValue('Pick', 'any'),
b: [ DataType.PICK,0x00, DataType.STRING,0x00, 0x00,0x00,0x00,0x03, ...from('any') ]
},
- { v: new t.EnumValue('Pop', 'first'),
+ { v: new EnumValue('Pop', 'first'),
b: [ DataType.POP,0x00, DataType.STRING,0x00, 0x00,0x00,0x00,0x05, ...from('first') ]
},
- { v: new t.EnumValue('Scope', 'local'),
+ { v: new EnumValue('Scope', 'local'),
b: [ DataType.SCOPE,0x00, DataType.STRING,0x00, 0x00,0x00,0x00,0x05, ...from('local') ]
},
- { v: new t.EnumValue('T', 'id'),
+ { v: new EnumValue('T', 'id'),
b: [ DataType.T,0x00, DataType.STRING,0x00, 0x00,0x00,0x00,0x02, ...from('id') ]
},
@@ -209,7 +208,7 @@
},
// EdgeSerializer
- { v:new Edge('A', new Vertex('B','Person',null), 'has', new Vertex('C','Pet',null), null),
+ { v:new Edge('A', new Vertex('B','Person',null), 'has', new Vertex('C','Pet',null), []),
b:[
DataType.EDGE,0x00,
DataType.STRING,0x00, 0x00,0x00,0x00,0x01, 0x41, // id
@@ -328,7 +327,7 @@
{ v:null, fq:1, b:[0xFE,0x01] },
{ v:undefined, fq:1, b:[0xFE,0x01] },
- ].forEach(({ v, fq, b }, i) => it(utils.ser_title({i,v}), () => {
+ ].forEach(({ v, fq, b }, i) => it(ser_title({i,v}), () => {
b = from(b);
// when fq is under control
@@ -412,7 +411,7 @@
// SET
// TODO: Is it still okay to follow GraphSON where Set and List are usual JS ArrayS?
{ v:null, b:[0x0B,0x01] },
- { v:new Set(), b:[0x0B,0x00, 0x00,0x00,0x00,0x00] },
+ { v:new Set(), b:[0x0B,0x00, 0x00,0x00,0x00,0x00] },
// UUID
{ v:null, b:[0x0C,0x01] },
@@ -420,7 +419,7 @@
// EDGE
{ v:null, b:[0x0D,0x01] },
- { v:new Edge(1, new Vertex(2,'Person',null), 'has', new Vertex(3,'Pet',null), null),
+ { v:new Edge(1, new Vertex(2,'Person',null), 'has', new Vertex(3,'Pet',null), []),
b:[
0x0D,0x00,
0x01,0x00, 0x00,0x00,0x00,0x01, // id
@@ -491,7 +490,7 @@
// BARRIER
{ v:null, b:[0x13,0x01] },
- { v:new t.EnumValue('Barrier','normSack'), b:[0x13,0x00, 0x03,0x00, 0x00,0x00,0x00,0x08, ...from('normSack')] },
+ { v:new EnumValue('Barrier','normSack'), b:[0x13,0x00, 0x03,0x00, 0x00,0x00,0x00,0x08, ...from('normSack')] },
// BINDING
// TODO: it's ignored for now
@@ -502,23 +501,23 @@
// CARDINALITY
{ v:null, b:[0x16,0x01] },
- { v:new t.EnumValue('Cardinality', 'set'), b:[0x16,0x00, 0x03,0x00, 0x00,0x00,0x00,0x03, ...from('set')] },
+ { v:new EnumValue('Cardinality', 'set'), b:[0x16,0x00, 0x03,0x00, 0x00,0x00,0x00,0x03, ...from('set')] },
// COLUMN
{ v:null, b:[0x17,0x01] },
- { v:new t.EnumValue('Column','keys'), b:[0x17,0x00, 0x03,0x00, 0x00,0x00,0x00,0x04, ...from('keys')] },
+ { v:new EnumValue('Column','keys'), b:[0x17,0x00, 0x03,0x00, 0x00,0x00,0x00,0x04, ...from('keys')] },
// DIRECTION
{ v:null, b:[0x18,0x01] },
- { v:new t.EnumValue('Direction','OUT'), b:[0x18,0x00, 0x03,0x00, 0x00,0x00,0x00,0x03, ...from('OUT')] },
+ { v:new EnumValue('Direction','OUT'), b:[0x18,0x00, 0x03,0x00, 0x00,0x00,0x00,0x03, ...from('OUT')] },
// DT
{ v:null, b:[0x2f,0x01] },
- { v:new t.EnumValue('DT','minute'), b:[0x2f,0x00, 0x03,0x00, 0x00,0x00,0x00,0x06, ...from('minute')] },
+ { v:new EnumValue('DT','minute'), b:[0x2f,0x00, 0x03,0x00, 0x00,0x00,0x00,0x06, ...from('minute')] },
// MERGE
{ v:null, b:[0x2e,0x01] },
- { v:new t.EnumValue('Merge','onCreate'), b:[0x2e,0x00, 0x03,0x00, 0x00,0x00,0x00,0x08, ...from('onCreate')] },
+ { v:new EnumValue('Merge','onCreate'), b:[0x2e,0x00, 0x03,0x00, 0x00,0x00,0x00,0x08, ...from('onCreate')] },
// N
{ v:null, b:[0x30,0x01] },
@@ -526,37 +525,37 @@
// OPERATOR
{ v:null, b:[0x19,0x01] },
- { v:new t.EnumValue('Operator','addAll'), b:[0x19,0x00, 0x03,0x00, 0x00,0x00,0x00,0x06, ...from('addAll')] },
+ { v:new EnumValue('Operator','addAll'), b:[0x19,0x00, 0x03,0x00, 0x00,0x00,0x00,0x06, ...from('addAll')] },
// ORDER
{ v:null, b:[0x1A,0x01] },
- { v:new t.EnumValue('Order','desc'), b:[0x1A,0x00, 0x03,0x00, 0x00,0x00,0x00,0x04, ...from('desc')] },
+ { v:new EnumValue('Order','desc'), b:[0x1A,0x00, 0x03,0x00, 0x00,0x00,0x00,0x04, ...from('desc')] },
// PICK
{ v:null, b:[0x1B,0x01] },
- { v:new t.EnumValue('Pick','any'), b:[0x1B,0x00, 0x03,0x00, 0x00,0x00,0x00,0x03, ...from('any')] },
+ { v:new EnumValue('Pick','any'), b:[0x1B,0x00, 0x03,0x00, 0x00,0x00,0x00,0x03, ...from('any')] },
// POP
{ v:null, b:[0x1C,0x01] },
- { v:new t.EnumValue('Pop','first'), b:[0x1C,0x00, 0x03,0x00, 0x00,0x00,0x00,0x05, ...from('first')] },
+ { v:new EnumValue('Pop','first'), b:[0x1C,0x00, 0x03,0x00, 0x00,0x00,0x00,0x05, ...from('first')] },
// LAMBDA
// TODO: it's not expected to be deserialized, is it correct assumption?
// P
- { v:t.P.eq(7), b:[0x1E,0x00, 0x00,0x00,0x00,0x02, ...from('eq'), 0x00,0x00,0x00,0x01, 0x01,0x00,0x00,0x00,0x00,0x07] },
+ { v:P.eq(7), b:[0x1E,0x00, 0x00,0x00,0x00,0x02, ...from('eq'), 0x00,0x00,0x00,0x01, 0x01,0x00,0x00,0x00,0x00,0x07] },
// SCOPE
{ v:null, b:[0x1F,0x01] },
- { v:new t.EnumValue('Scope','local'), b:[0x1F,0x00, 0x03,0x00, 0x00,0x00,0x00,0x05, ...from('local')] },
+ { v:new EnumValue('Scope','local'), b:[0x1F,0x00, 0x03,0x00, 0x00,0x00,0x00,0x05, ...from('local')] },
// T
{ v:null, b:[0x20,0x01] },
- { v:new t.EnumValue('T','id'), b:[0x20,0x00, 0x03,0x00, 0x00,0x00,0x00,0x02, ...from('id')] },
+ { v:new EnumValue('T','id'), b:[0x20,0x00, 0x03,0x00, 0x00,0x00,0x00,0x02, ...from('id')] },
// TRAVERSER
{ v:null, b:[0x21,0x01] },
- { v:new t.Traverser('A', 2), b:[0x21,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02, 0x03,0x00,0x00,0x00,0x00,0x01,0x41] },
+ { v:new Traverser('A', 2), b:[0x21,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02, 0x03,0x00,0x00,0x00,0x00,0x01,0x41] },
// BIGINTEGER
{ v:null, b:[0x23,0x01] },
@@ -580,7 +579,7 @@
// TEXTP
{ v:null, b:[0x28,0x01] },
- { v:t.TextP.containing('ValuE'),
+ { v:TextP.containing('ValuE'),
b:[
0x28,0x00,
0x00,0x00,0x00,0x0A, ...from('containing'),
@@ -608,7 +607,7 @@
// TODO: "register" other types
]
- .forEach(({ v, b, err }, i) => it(utils.des_title({i,b}), () => {
+ .forEach(({ v, b, err }, i) => it(des_title({i,b}), () => {
if (Array.isArray(b))
b = from(b);
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/ArraySerializerTestTemplate.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/ArraySerializerTestTemplate.js
index b19e357..a300412 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/ArraySerializerTestTemplate.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/ArraySerializerTestTemplate.js
@@ -20,24 +20,22 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const utils = require('./utils');
-const assert = require('assert');
-const ioc = require('../../../lib/structure/io/binary/GraphBinary');
-const intSerializer = ioc.intSerializer;
-const t = require('../../../lib/process/traversal');
+import { ser_title, des_title, cbuf_title } from './utils.js';
+import assert from 'assert';
+import { intSerializer, serializers } from '../../../lib/structure/io/binary/GraphBinary.js';
+import { Traverser } from '../../../lib/process/traversal.js';
const { from, concat } = Buffer;
-module.exports = ({ ID, name }) => {
+export default ({ ID, name }) => {
describe(`GraphBinary.${name}Serializer`, () => {
const type_code = from([ID]);
const value_flag = from([0x00]);
- const serializer = ioc.serializers[ID];
+ const serializer = serializers[ID];
const cases = [
{ v:undefined, fq:1, b:[ID,0x01], av:null },
@@ -77,7 +75,7 @@
describe('#serialize', () => {
cases
.filter(({des}) => !des)
- .forEach(({ v, fq, b }, i) => it(utils.ser_title({i,v}), () => {
+ .forEach(({ v, fq, b }, i) => it(ser_title({i,v}), () => {
b = from(b);
// when fq is under control
@@ -100,7 +98,7 @@
});
describe('#deserialize', () =>
- cases.forEach(({ v, fq, b, av, err }, i) => it(utils.des_title({i,b}), () => {
+ cases.forEach(({ v, fq, b, av, err }, i) => it(des_title({i,b}), () => {
if (Array.isArray(b))
b = from(b);
@@ -137,11 +135,11 @@
{ v: null, e: false },
{ v: undefined, e: false },
{ v: {}, e: false },
- { v: new t.Traverser(), e: false },
+ { v: new Traverser(), e: false },
{ v: [], e: true },
{ v: [0], e: true },
{ v: [undefined], e: true },
- ].forEach(({ v, e }, i) => it(utils.cbuf_title({i,v}), () =>
+ ].forEach(({ v, e }, i) => it(cbuf_title({i,v}), () =>
assert.strictEqual( serializer.canBeUsedFor(v), e )
))
);
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/BigIntegerSerializer-test.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/BigIntegerSerializer-test.js
index 8216e72..8480dbe 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/BigIntegerSerializer-test.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/BigIntegerSerializer-test.js
@@ -20,11 +20,10 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const utils = require('./utils');
-const assert = require('assert');
-const { bigIntegerSerializer } = require('../../../lib/structure/io/binary/GraphBinary');
+import { ser_title, des_title, cbuf_title } from './utils.js';
+import assert from 'assert';
+import { bigIntegerSerializer } from '../../../lib/structure/io/binary/GraphBinary.js';
const { from, concat } = Buffer;
@@ -123,7 +122,7 @@
describe('#serialize', () =>
cases
.filter(({des}) => !des)
- .forEach(({ v, fq, b }, i) => it(utils.ser_title({i,v}), () => {
+ .forEach(({ v, fq, b }, i) => it(ser_title({i,v}), () => {
b = from(b);
// when fq is under control
@@ -139,7 +138,7 @@
);
describe('#deserialize', () =>
- cases.forEach(({ v, fq, b, av, err }, i) => it(utils.des_title({i,b}), () => {
+ cases.forEach(({ v, fq, b, av, err }, i) => it(des_title({i,b}), () => {
if (Array.isArray(b))
b = from(b);
@@ -192,7 +191,7 @@
{ v: Infinity, e: false },
{ v: -Infinity, e: false },
{ v: NaN, e: false },
- ].forEach(({ v, e }, i) => it(utils.cbuf_title({i,v}), () =>
+ ].forEach(({ v, e }, i) => it(cbuf_title({i,v}), () =>
assert.strictEqual( bigIntegerSerializer.canBeUsedFor(v), e )
))
);
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/BooleanSerializer-test.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/BooleanSerializer-test.js
index 0dd9147..96b45d5 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/BooleanSerializer-test.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/BooleanSerializer-test.js
@@ -20,11 +20,10 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const utils = require('./utils');
-const assert = require('assert');
-const { booleanSerializer } = require('../../../lib/structure/io/binary/GraphBinary');
+import { ser_title, des_title, cbuf_title } from './utils.js';
+import assert from 'assert';
+import { booleanSerializer } from '../../../lib/structure/io/binary/GraphBinary.js';
const { from, concat } = Buffer;
@@ -73,7 +72,7 @@
describe('#serialize', () =>
cases
.filter(({des}) => !des)
- .forEach(({ v, fq, b }, i) => it(utils.ser_title({i,v}), () => {
+ .forEach(({ v, fq, b }, i) => it(ser_title({i,v}), () => {
b = from(b);
// when fq is under control
@@ -89,7 +88,7 @@
);
describe('#deserialize', () =>
- cases.forEach(({ v, fq, b, av, err }, i) => it(utils.des_title({i,b}), () => {
+ cases.forEach(({ v, fq, b, av, err }, i) => it(des_title({i,b}), () => {
if (Array.isArray(b))
b = from(b);
@@ -134,7 +133,7 @@
{ v: -1, e: false },
{ v: true, e: true },
{ v: false, e: true },
- ].forEach(({ v, e }, i) => it(utils.cbuf_title({i,v}), () =>
+ ].forEach(({ v, e }, i) => it(cbuf_title({i,v}), () =>
assert.strictEqual( booleanSerializer.canBeUsedFor(v), e )
))
);
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/BulkSetSerializer-test.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/BulkSetSerializer-test.js
index cce9dce..c1288a6 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/BulkSetSerializer-test.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/BulkSetSerializer-test.js
@@ -20,11 +20,10 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const utils = require('./utils');
-const assert = require('assert');
-const { bulkSetSerializer } = require('../../../lib/structure/io/binary/GraphBinary');
+import { des_title } from './utils.js';
+import assert from 'assert';
+import { bulkSetSerializer } from '../../../lib/structure/io/binary/GraphBinary.js';
const { from, concat } = Buffer;
@@ -124,7 +123,7 @@
];
describe('#deserialize', () =>
- cases.forEach(({ v, fq, b, av, err }, i) => it(utils.des_title({i,b}), () => {
+ cases.forEach(({ v, fq, b, av, err }, i) => it(des_title({i,b}), () => {
if (Array.isArray(b))
b = from(b);
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/ByteBufferSerializer-test.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/ByteBufferSerializer-test.js
index e94cb79..affaa69 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/ByteBufferSerializer-test.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/ByteBufferSerializer-test.js
@@ -20,15 +20,14 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const utils = require('./utils');
-const assert = require('assert');
-const { byteBufferSerializer, intSerializer } = require('../../../lib/structure/io/binary/GraphBinary');
-const t = require('../../../lib/process/traversal');
+import { ser_title, des_title, cbuf_title } from './utils.js';
+import assert from 'assert';
+import { byteBufferSerializer, intSerializer } from '../../../lib/structure/io/binary/GraphBinary.js';
+import { Traverser } from '../../../lib/process/traversal.js';
const { from, concat } = Buffer;
-const buffer = require('buffer');
+import { constants } from 'buffer';
describe(`GraphBinary.ByteBufferSerializer`, () => {
@@ -74,7 +73,7 @@
describe('#serialize', () => {
cases
.filter(({des}) => !des)
- .forEach(({ v, fq, b }, i) => it(utils.ser_title({i,v}), () => {
+ .forEach(({ v, fq, b }, i) => it(ser_title({i,v}), () => {
b = from(b);
if (v)
v = from(v);
@@ -93,8 +92,8 @@
it.skip('should not error if buffer length is INT32_MAX');
// Buffer.size limit depends on Node version and runtime, see https://nodejs.org/docs/latest/api/buffer.html#bufferconstantsmax_length
- if (buffer.constants.MAX_LENGTH < intSerializer.INT32_MAX+1)
- it.skip(`should error if buffer length is greater than INT32_MAX - cannot be tested due to buffer.constants.MAX_LENGTH=${buffer.constants.MAX_LENGTH} < INT32_MAX+1=${intSerializer.INT32_MAX+1}`);
+ if (constants.MAX_LENGTH < intSerializer.INT32_MAX+1)
+ it.skip(`should error if buffer length is greater than INT32_MAX - cannot be tested due to buffer.constants.MAX_LENGTH=${constants.MAX_LENGTH} < INT32_MAX+1=${intSerializer.INT32_MAX+1}`);
else
it('should error if buffer length is greater than INT32_MAX', () => assert.throws(
() => byteBufferSerializer.serialize(Buffer.alloc(intSerializer.INT32_MAX+1)),
@@ -103,7 +102,7 @@
});
describe('#deserialize', () =>
- cases.forEach(({ v, fq, b, av, err }, i) => it(utils.des_title({i,b}), () => {
+ cases.forEach(({ v, fq, b, av, err }, i) => it(des_title({i,b}), () => {
if (Array.isArray(b))
b = from(b);
@@ -142,12 +141,12 @@
{ v: null, e: false },
{ v: undefined, e: false },
{ v: {}, e: false },
- { v: new t.Traverser(), e: false },
+ { v: new Traverser(), e: false },
{ v: [], e: false },
{ v: [0], e: false },
{ v: [new Buffer([])], e: false },
{ v: new Buffer([]), e: true },
- ].forEach(({ v, e }, i) => it(utils.cbuf_title({i,v}), () =>
+ ].forEach(({ v, e }, i) => it(cbuf_title({i,v}), () =>
assert.strictEqual( byteBufferSerializer.canBeUsedFor(v), e )
))
);
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/ByteSerializer-test.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/ByteSerializer-test.js
index 31661a5..bb6eaeb 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/ByteSerializer-test.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/ByteSerializer-test.js
@@ -20,11 +20,10 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const utils = require('./utils');
-const assert = require('assert');
-const { byteSerializer } = require('../../../lib/structure/io/binary/GraphBinary');
+import { ser_title, des_title } from './utils.js';
+import assert from 'assert';
+import { byteSerializer } from '../../../lib/structure/io/binary/GraphBinary.js';
const { from, concat } = Buffer;
@@ -68,7 +67,7 @@
describe('#serialize', () =>
cases
.filter(({des}) => !des)
- .forEach(({ v, fq, b }, i) => it(utils.ser_title({i,v}), () => {
+ .forEach(({ v, fq, b }, i) => it(ser_title({i,v}), () => {
b = from(b);
// when fq is under control
@@ -84,7 +83,7 @@
);
describe('#deserialize', () =>
- cases.forEach(({ v, fq, b, av, err }, i) => it(utils.des_title({i,b}), () => {
+ cases.forEach(({ v, fq, b, av, err }, i) => it(des_title({i,b}), () => {
if (Array.isArray(b))
b = from(b);
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/BytecodeSerializer-test.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/BytecodeSerializer-test.js
index 9331514..9ed97b5 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/BytecodeSerializer-test.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/BytecodeSerializer-test.js
@@ -20,16 +20,15 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const utils = require('./utils');
-const assert = require('assert');
-const { bytecodeSerializer } = require('../../../lib/structure/io/binary/GraphBinary');
+import { ser_title, des_title, cbuf_title } from './utils.js';
+import assert from 'assert';
+import { bytecodeSerializer } from '../../../lib/structure/io/binary/GraphBinary.js';
-const t = require('../../../lib/process/traversal');
-const Bytecode = require('../../../lib/process/bytecode');
-const { GraphTraversal } = require('../../../lib/process/graph-traversal');
-const { ReservedKeysVerificationStrategy } = require('../../../lib/process/traversal-strategy');
+import { Traverser, Traversal } from '../../../lib/process/traversal.js';
+import Bytecode from '../../../lib/process/bytecode.js';
+import { GraphTraversal } from '../../../lib/process/graph-traversal.js';
+import { ReservedKeysVerificationStrategy } from '../../../lib/process/traversal-strategy.js';
const g = (strategy) => {
const bc = new Bytecode();
@@ -138,7 +137,7 @@
describe('#serialize', () =>
cases
.filter(({des}) => !des)
- .forEach(({ v, fq, b }, i) => it(utils.ser_title({i,v}), () => {
+ .forEach(({ v, fq, b }, i) => it(ser_title({i,v}), () => {
b = from(b);
// when fq is under control
@@ -157,7 +156,7 @@
describe('#deserialize', () =>
cases
.filter(({ser}) => !ser)
- .forEach(({ v, fq, b, av, err }, i) => it(utils.des_title({i,b}), () => {
+ .forEach(({ v, fq, b, av, err }, i) => it(des_title({i,b}), () => {
if (Array.isArray(b))
b = from(b);
@@ -196,15 +195,15 @@
{ v: null, e: false },
{ v: undefined, e: false },
{ v: {}, e: false },
- { v: new t.Traverser(), e: false },
+ { v: new Traverser(), e: false },
{ v: [], e: false },
{ v: [0], e: false },
{ v: [undefined], e: false },
{ v: [new Bytecode()], e: false },
{ v: new Bytecode(), e: true },
- { v: [new t.Traversal], e: false },
- { v: new t.Traversal, e: true },
- ].forEach(({ v, e }, i) => it(utils.cbuf_title({i,v}), () =>
+ { v: [new Traversal], e: false },
+ { v: new Traversal, e: true },
+ ].forEach(({ v, e }, i) => it(cbuf_title({i,v}), () =>
assert.strictEqual( bytecodeSerializer.canBeUsedFor(v), e )
))
);
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/ClassSerializer-test.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/ClassSerializer-test.js
index 299a332..991faea 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/ClassSerializer-test.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/ClassSerializer-test.js
@@ -17,8 +17,6 @@
* under the License.
*/
-'use strict';
-
const utils = require('./utils');
const assert = require('assert');
const { classSerializer } = require('../../../lib/structure/io/binary/GraphBinary');
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/DateSerializer-test.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/DateSerializer-test.js
index 3393e35..6ef008b 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/DateSerializer-test.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/DateSerializer-test.js
@@ -20,6 +20,7 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-require('./DateSerializerTestTemplate')({ ID: 0x04, name: 'Date' });
+import DateSerializerTestTemplate from './DateSerializerTestTemplate.js';
+
+DateSerializerTestTemplate({ ID: 0x04, name: 'Date' });
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/DateSerializerTestTemplate.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/DateSerializerTestTemplate.js
index 5493960..243ec56 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/DateSerializerTestTemplate.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/DateSerializerTestTemplate.js
@@ -20,23 +20,22 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const utils = require('./utils');
-const assert = require('assert');
-const ioc = require('../../../lib/structure/io/binary/GraphBinary');
-const t = require('../../../lib/process/traversal');
+import { ser_title, des_title, cbuf_title } from './utils.js';
+import assert from 'assert';
+import { serializers } from '../../../lib/structure/io/binary/GraphBinary.js';
+import { Traverser, P } from '../../../lib/process/traversal.js';
const { from, concat } = Buffer;
-module.exports = ({ ID, name }) => {
+export default ({ ID, name }) => {
describe(`GraphBinary.${name}Serializer`, () => {
const type_code = from([ID]);
const value_flag = from([0x00]);
- const serializer = ioc.serializers[ID];
+ const serializer = serializers[ID];
const cases = [
{ v:undefined, fq:1, b:[ID,0x01], av:null },
@@ -79,7 +78,7 @@
describe('#serialize', () =>
cases
.filter(({des}) => !des)
- .forEach(({ v, fq, b }, i) => it(utils.ser_title({i,v}), () => {
+ .forEach(({ v, fq, b }, i) => it(ser_title({i,v}), () => {
b = from(b);
// when fq is under control
@@ -95,7 +94,7 @@
);
describe('#deserialize', () =>
- cases.forEach(({ v, fq, b, av, err }, i) => it(utils.des_title({i,b}), () => {
+ cases.forEach(({ v, fq, b, av, err }, i) => it(des_title({i,b}), () => {
if (Array.isArray(b))
b = from(b);
@@ -132,14 +131,14 @@
{ v: null, e: false },
{ v: undefined, e: false },
{ v: {}, e: false },
- { v: new t.Traverser(), e: false },
- { v: new t.P(), e: false },
+ { v: new Traverser(), e: false },
+ { v: new P(), e: false },
{ v: [], e: false },
{ v: [0], e: false },
- { v: [new t.P()], e: false },
+ { v: [new P()], e: false },
{ v: [new Date()], e: false },
{ v: new Date(), e: true },
- ].forEach(({ v, e }, i) => it(utils.cbuf_title({i,v}), () =>
+ ].forEach(({ v, e }, i) => it(cbuf_title({i,v}), () =>
assert.strictEqual( serializer.canBeUsedFor(v), e )
))
);
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/DoubleSerializer-test.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/DoubleSerializer-test.js
index f03edac..a383d5a 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/DoubleSerializer-test.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/DoubleSerializer-test.js
@@ -20,11 +20,10 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const utils = require('./utils');
-const assert = require('assert');
-const { doubleSerializer } = require('../../../lib/structure/io/binary/GraphBinary');
+import { ser_title, des_title, cbuf_title } from './utils.js';
+import assert from 'assert';
+import { doubleSerializer } from '../../../lib/structure/io/binary/GraphBinary.js';
const { from, concat } = Buffer;
@@ -75,7 +74,7 @@
describe('#serialize', () =>
cases
.filter(({des}) => !des)
- .forEach(({ v, fq, b }, i) => it(utils.ser_title({i,v}), () => {
+ .forEach(({ v, fq, b }, i) => it(ser_title({i,v}), () => {
b = from(b);
// when fq is under control
@@ -91,7 +90,7 @@
);
describe('#deserialize', () =>
- cases.forEach(({ v, fq, b, av, err }, i) => it(utils.des_title({i,b}), () => {
+ cases.forEach(({ v, fq, b, av, err }, i) => it(des_title({i,b}), () => {
if (Array.isArray(b))
b = from(b);
@@ -144,7 +143,7 @@
{ v: Infinity, e: true },
{ v: -Infinity, e: true },
{ v: NaN, e: true },
- ].forEach(({ v, e }, i) => it(utils.cbuf_title({i,v}), () =>
+ ].forEach(({ v, e }, i) => it(cbuf_title({i,v}), () =>
assert.strictEqual( doubleSerializer.canBeUsedFor(v), e )
))
);
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/EdgeSerializer-test.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/EdgeSerializer-test.js
index a8d58bc..b4426ce 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/EdgeSerializer-test.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/EdgeSerializer-test.js
@@ -20,13 +20,12 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const utils = require('./utils');
-const assert = require('assert');
-const { edgeSerializer } = require('../../../lib/structure/io/binary/GraphBinary');
-const t = require('../../../lib/process/traversal');
-const g = require('../../../lib/structure/graph');
+import { ser_title, des_title, cbuf_title } from './utils.js';
+import assert from 'assert';
+import { edgeSerializer } from '../../../lib/structure/io/binary/GraphBinary.js';
+import { Traverser, P } from '../../../lib/process/traversal.js';
+import { Edge, Vertex } from '../../../lib/structure/graph.js';
const { from, concat } = Buffer;
@@ -48,7 +47,7 @@
0xFE,0x01, // parent
0xFE,0x01, // properties
],
- av:new g.Edge('', new g.Vertex('','',null), '', new g.Vertex('','',null), null),
+ av:new Edge('', new Vertex('','',null), '', new Vertex('','',null), []),
},
{ v:null, fq:1, b:[0x0D,0x01] },
{ v:null, fq:0,
@@ -62,10 +61,10 @@
0xFE,0x01, // parent
0xFE,0x01, // properties
],
- av:new g.Edge('', new g.Vertex('','',null), '', new g.Vertex('','',null), null),
+ av:new Edge('', new Vertex('','',null), '', new Vertex('','',null), []),
},
- { v:new g.Edge('A', new g.Vertex('B','Person',null), 'has', new g.Vertex('C','Pet',null), null),
+ { v:new Edge('A', new Vertex('B','Person',null), 'has', new Vertex('C','Pet',null), []),
b:[
0x03,0x00, 0x00,0x00,0x00,0x01, 0x41, // id
0x00,0x00,0x00,0x03, ...from('has'), // label
@@ -101,7 +100,7 @@
describe('#serialize', () =>
cases
.filter(({des}) => !des)
- .forEach(({ v, fq, b }, i) => it(utils.ser_title({i,v}), () => {
+ .forEach(({ v, fq, b }, i) => it(ser_title({i,v}), () => {
b = from(b);
// when fq is under control
@@ -117,7 +116,7 @@
);
describe('#deserialize', () =>
- cases.forEach(({ v, fq, b, av, err }, i) => it(utils.des_title({i,b}), () => {
+ cases.forEach(({ v, fq, b, av, err }, i) => it(des_title({i,b}), () => {
if (Array.isArray(b))
b = from(b);
@@ -154,15 +153,15 @@
{ v: null, e: false },
{ v: undefined, e: false },
{ v: {}, e: false },
- { v: new t.Traverser(), e: false },
- { v: new t.P(), e: false },
+ { v: new Traverser(), e: false },
+ { v: new P(), e: false },
{ v: [], e: false },
{ v: [0], e: false },
- { v: [new g.Vertex()], e: false },
- { v: new g.Vertex(), e: false },
- { v: [new g.Edge()], e: false },
- { v: new g.Edge(), e: true },
- ].forEach(({ v, e }, i) => it(utils.cbuf_title({i,v}), () =>
+ { v: [new Vertex()], e: false },
+ { v: new Vertex(), e: false },
+ { v: [new Edge()], e: false },
+ { v: new Edge(), e: true },
+ ].forEach(({ v, e }, i) => it(cbuf_title({i,v}), () =>
assert.strictEqual( edgeSerializer.canBeUsedFor(v), e )
))
);
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/EnumSerializer-test.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/EnumSerializer-test.js
index 4dc0abd..76f61d4 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/EnumSerializer-test.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/EnumSerializer-test.js
@@ -20,29 +20,28 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const utils = require('./utils');
-const assert = require('assert');
-const { enumSerializer } = require('../../../lib/structure/io/binary/GraphBinary');
-const t = require('../../../lib/process/traversal');
+import { ser_title, des_title, cbuf_title } from './utils.js';
+import assert from 'assert';
+import { enumSerializer } from '../../../lib/structure/io/binary/GraphBinary.js';
+import { barrier, cardinality, column, direction, operator, order, pick, pop, scope, t, n, EnumValue } from '../../../lib/process/traversal.js';
const { from, concat } = Buffer;
describe('GraphBinary.EnumSerializer', () => {
const types = [
- { name: 'Barrier', code: from([0x13]), enum: t.barrier },
- { name: 'Cardinality', code: from([0x16]), enum: t.cardinality },
- { name: 'Column', code: from([0x17]), enum: t.column },
- { name: 'Direction', code: from([0x18]), enum: t.direction },
- { name: 'N', code: from([0x30]), enum: t.n },
- { name: 'Operator', code: from([0x19]), enum: t.operator },
- { name: 'Order', code: from([0x1A]), enum: t.order },
- { name: 'Pick', code: from([0x1B]), enum: t.pick },
- { name: 'Pop', code: from([0x1C]), enum: t.pop },
- { name: 'Scope', code: from([0x1F]), enum: t.scope },
- { name: 'T', code: from([0x20]), enum: t.t },
+ { name: 'Barrier', code: from([0x13]), enum: barrier },
+ { name: 'Cardinality', code: from([0x16]), enum: cardinality },
+ { name: 'Column', code: from([0x17]), enum: column },
+ { name: 'Direction', code: from([0x18]), enum: direction },
+ { name: 'Operator', code: from([0x19]), enum: operator },
+ { name: 'Order', code: from([0x1A]), enum: order },
+ { name: 'Pick', code: from([0x1B]), enum: pick },
+ { name: 'Pop', code: from([0x1C]), enum: pop },
+ { name: 'Scope', code: from([0x1F]), enum: scope },
+ { name: 'T', code: from([0x20]), enum: t },
+ { name: 'N', code: from([0x30]), enum: n },
];
const value_flag = from([0x00]);
@@ -82,9 +81,9 @@
types.forEach((type) => describe(`${type.name}`, () =>
cases
.filter(({des}) => !des)
- .forEach(({ v, fq, b }, i) => it(utils.ser_title({i,v}), () => {
+ .forEach(({ v, fq, b }, i) => it(ser_title({i,v}), () => {
b = from(b);
- v = new t.EnumValue(type.name, v);
+ v = new EnumValue(type.name, v);
// when fq is under control
if (fq !== undefined) {
@@ -103,7 +102,7 @@
describe('#deserialize', () => {
types.forEach((type) => describe(`${type.name}`, () =>
- cases.forEach(({ v, fq, b, B, av, err }, i) => it(utils.des_title({i,b}), () => {
+ cases.forEach(({ v, fq, b, B, av, err }, i) => it(des_title({i,b}), () => {
if (B)
b = B;
if (Array.isArray(b)) {
@@ -126,7 +125,7 @@
if (av !== undefined)
v = av;
if (v !== undefined && v !== null)
- v = new t.EnumValue(type.name, v);
+ v = new EnumValue(type.name, v);
const len = b.length;
// when fq is under control
@@ -155,7 +154,7 @@
describe('#canBeUsedFor', () => {
it('should error if type name is not supported', () => assert.throws(
- () => enumSerializer.canBeUsedFor(new t.EnumValue('UnknownType', 'asc')),
+ () => enumSerializer.canBeUsedFor(new EnumValue('UnknownType', 'asc')),
{ message: /typeName=UnknownType is not supported/ }
));
@@ -164,8 +163,8 @@
{ v: null, e: false },
{ v: undefined, e: false },
{ v: {}, e: false },
- { v: new t.EnumValue('Barrier'), e: true },
- ].forEach(({ v, e }, i) => it(utils.cbuf_title({i,v}), () =>
+ { v: new EnumValue('Barrier'), e: true },
+ ].forEach(({ v, e }, i) => it(cbuf_title({i,v}), () =>
assert.strictEqual( enumSerializer.canBeUsedFor(v), e )
));
});
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/FloatSerializer-test.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/FloatSerializer-test.js
index 409c06b..8bfd7ee 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/FloatSerializer-test.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/FloatSerializer-test.js
@@ -20,11 +20,10 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const utils = require('./utils');
-const assert = require('assert');
-const { floatSerializer } = require('../../../lib/structure/io/binary/GraphBinary');
+import { ser_title, des_title } from './utils.js';
+import assert from 'assert';
+import { floatSerializer } from '../../../lib/structure/io/binary/GraphBinary.js';
const { from, concat } = Buffer;
@@ -73,7 +72,7 @@
describe('#serialize', () =>
cases
.filter(({des}) => !des)
- .forEach(({ v, fq, b }, i) => it(utils.ser_title({i,v}), () => {
+ .forEach(({ v, fq, b }, i) => it(ser_title({i,v}), () => {
b = from(b);
// when fq is under control
@@ -89,7 +88,7 @@
);
describe('#deserialize', () =>
- cases.forEach(({ v, fq, b, av, err }, i) => it(utils.des_title({i,b}), () => {
+ cases.forEach(({ v, fq, b, av, err }, i) => it(des_title({i,b}), () => {
if (Array.isArray(b))
b = from(b);
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/GraphBinaryReader-test.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/GraphBinaryReader-test.js
index e9028d2..1f49b0b 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/GraphBinaryReader-test.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/GraphBinaryReader-test.js
@@ -20,14 +20,13 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const assert = require('assert');
-const { graphBinaryReader } = require('../../../lib/structure/io/binary/GraphBinary');
+import assert from 'assert';
+import { graphBinaryReader } from '../../../lib/structure/io/binary/GraphBinary.js';
-const { Traverser } = require('../../../lib/process/traversal');
-const Bytecode = require('../../../lib/process/bytecode');
-const { GraphTraversal } = require('../../../lib/process/graph-traversal');
+import { Traverser } from '../../../lib/process/traversal.js';
+import Bytecode from '../../../lib/process/bytecode.js';
+import { GraphTraversal } from '../../../lib/process/graph-traversal.js';
const g = () => new GraphTraversal(undefined, undefined, new Bytecode());
const { from } = Buffer;
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/GraphBinaryWriter-test.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/GraphBinaryWriter-test.js
index b447e14..277f83c 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/GraphBinaryWriter-test.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/GraphBinaryWriter-test.js
@@ -20,13 +20,12 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const assert = require('assert');
-const { graphBinaryWriter } = require('../../../lib/structure/io/binary/GraphBinary');
+import assert from 'assert';
+import { graphBinaryWriter } from '../../../lib/structure/io/binary/GraphBinary.js';
-const Bytecode = require('../../../lib/process/bytecode');
-const { GraphTraversal } = require('../../../lib/process/graph-traversal');
+import Bytecode from '../../../lib/process/bytecode.js';
+import { GraphTraversal } from '../../../lib/process/graph-traversal.js';
const g = () => new GraphTraversal(undefined, undefined, new Bytecode());
const { from, concat } = Buffer;
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/IntSerializer-test.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/IntSerializer-test.js
index cd605f4..b7b2895 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/IntSerializer-test.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/IntSerializer-test.js
@@ -20,11 +20,10 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const utils = require('./utils');
-const assert = require('assert');
-const { intSerializer } = require('../../../lib/structure/io/binary/GraphBinary');
+import { ser_title, des_title, cbuf_title } from './utils.js';
+import assert from 'assert';
+import { intSerializer } from '../../../lib/structure/io/binary/GraphBinary.js';
const { from, concat } = Buffer;
@@ -75,7 +74,7 @@
describe('#serialize', () =>
cases
.filter(({des}) => !des)
- .forEach(({ v, fq, b }, i) => it(utils.ser_title({i,v}), () => {
+ .forEach(({ v, fq, b }, i) => it(ser_title({i,v}), () => {
b = from(b);
// when fq is under control
@@ -91,7 +90,7 @@
);
describe('#deserialize', () =>
- cases.forEach(({ v, fq, b, av, err }, i) => it(utils.des_title({i,b}), () => {
+ cases.forEach(({ v, fq, b, av, err }, i) => it(des_title({i,b}), () => {
if (Array.isArray(b))
b = from(b);
@@ -140,7 +139,7 @@
{ v: 2147483648, e: false },
{ v: -2147483648, e: true },
{ v: -2147483649, e: false },
- ].forEach(({ v, e }, i) => it(utils.cbuf_title({i,v}), () =>
+ ].forEach(({ v, e }, i) => it(cbuf_title({i,v}), () =>
assert.strictEqual( intSerializer.canBeUsedFor(v), e )
))
);
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/LambdaSerializer-test.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/LambdaSerializer-test.js
index 7b6dd35..302ec98 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/LambdaSerializer-test.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/LambdaSerializer-test.js
@@ -20,13 +20,11 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const utils = require('./utils');
-const assert = require('assert');
-const { lambdaSerializer } = require('../../../lib/structure/io/binary/GraphBinary');
-const t = require('../../../lib/process/traversal');
-const g = require('../../../lib/structure/graph');
+import { ser_title, cbuf_title } from './utils.js';
+import assert from 'assert';
+import { lambdaSerializer } from '../../../lib/structure/io/binary/GraphBinary.js';
+import { Traverser, P } from '../../../lib/process/traversal.js';
const { from, concat } = Buffer;
@@ -60,7 +58,7 @@
describe('#serialize', () =>
cases
- .forEach(({ v, fq, b }, i) => it(utils.ser_title({i,v}), () => {
+ .forEach(({ v, fq, b }, i) => it(ser_title({i,v}), () => {
b = from(b);
// when fq is under control
@@ -81,13 +79,13 @@
{ v: null, e: false },
{ v: undefined, e: false },
{ v: {}, e: false },
- { v: new t.Traverser(), e: false },
- { v: new t.P(), e: false },
+ { v: new Traverser(), e: false },
+ { v: new P(), e: false },
{ v: [], e: false },
{ v: [0], e: false },
{ v: [function(){}], e: false },
{ v: function(){}, e: true },
- ].forEach(({ v, e }, i) => it(utils.cbuf_title({i,v}), () =>
+ ].forEach(({ v, e }, i) => it(cbuf_title({i,v}), () =>
assert.strictEqual( lambdaSerializer.canBeUsedFor(v), e )
))
);
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/ListSerializer-test.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/ListSerializer-test.js
index 881dc1f..1df3559 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/ListSerializer-test.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/ListSerializer-test.js
@@ -20,6 +20,7 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-require('./ArraySerializerTestTemplate')({ ID: 0x09, name: 'List' });
+import ArraySerializerTestTemplate from './ArraySerializerTestTemplate.js';
+
+ArraySerializerTestTemplate({ ID: 0x09, name: 'List' });
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/LongSerializer-test.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/LongSerializer-test.js
index 1038ec8..159f08d35 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/LongSerializer-test.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/LongSerializer-test.js
@@ -20,11 +20,10 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const utils = require('./utils');
-const assert = require('assert');
-const { longSerializer } = require('../../../lib/structure/io/binary/GraphBinary');
+import { ser_title, des_title } from './utils.js';
+import assert from 'assert';
+import { longSerializer } from '../../../lib/structure/io/binary/GraphBinary.js';
const { from, concat } = Buffer;
@@ -91,7 +90,7 @@
describe('#serialize', () =>
cases
.filter(({des}) => !des)
- .forEach(({ v, fq, b }, i) => it(utils.ser_title({i,v}), () => {
+ .forEach(({ v, fq, b }, i) => it(ser_title({i,v}), () => {
b = from(b);
// when fq is under control
@@ -107,7 +106,7 @@
);
describe('#deserialize', () =>
- cases.forEach(({ v, fq, b, av, err }, i) => it(utils.des_title({i,b}), () => {
+ cases.forEach(({ v, fq, b, av, err }, i) => it(des_title({i,b}), () => {
if (Array.isArray(b))
b = from(b);
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/LongSerializerNg-test.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/LongSerializerNg-test.js
index 3f98248..1249c3d 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/LongSerializerNg-test.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/LongSerializerNg-test.js
@@ -20,11 +20,10 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const utils = require('./utils');
-const assert = require('assert');
-const { longSerializerNg: longSerializer } = require('../../../lib/structure/io/binary/GraphBinary');
+import { ser_title, des_title } from './utils.js';
+import assert from 'assert';
+import { longSerializerNg as longSerializer } from '../../../lib/structure/io/binary/GraphBinary.js';
const { from, concat } = Buffer;
@@ -79,7 +78,7 @@
describe('#serialize', () =>
cases
.filter(({des}) => !des)
- .forEach(({ v, fq, b }, i) => it(utils.ser_title({i,v}), () => {
+ .forEach(({ v, fq, b }, i) => it(ser_title({i,v}), () => {
b = from(b);
// when fq is under control
@@ -95,7 +94,7 @@
);
describe('#deserialize', () =>
- cases.forEach(({ v, fq, b, av, err }, i) => it(utils.des_title({i,b}), () => {
+ cases.forEach(({ v, fq, b, av, err }, i) => it(des_title({i,b}), () => {
if (Array.isArray(b))
b = from(b);
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/MapSerializer-test.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/MapSerializer-test.js
index 6d3952c..0043b05 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/MapSerializer-test.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/MapSerializer-test.js
@@ -20,15 +20,14 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const utils = require('./utils');
-const assert = require('assert');
-const { mapSerializer } = require('../../../lib/structure/io/binary/GraphBinary');
-const t = require('../../../lib/process/traversal');
+import { ser_title, des_title, cbuf_title } from './utils.js';
+import assert from 'assert';
+import { mapSerializer } from '../../../lib/structure/io/binary/GraphBinary.js';
+import { Traverser } from '../../../lib/process/traversal.js';
-const Bytecode = require('../../../lib/process/bytecode');
-const { GraphTraversal } = require('../../../lib/process/graph-traversal');
+import Bytecode from '../../../lib/process/bytecode.js';
+import { GraphTraversal } from '../../../lib/process/graph-traversal.js';
const g = () => new GraphTraversal(undefined, undefined, new Bytecode());
const { from, concat } = Buffer;
@@ -138,7 +137,7 @@
describe('#serialize', () => {
cases
.filter(({des}) => !des)
- .forEach(({ v, fq, b }, i) => it(utils.ser_title({i,v}), () => {
+ .forEach(({ v, fq, b }, i) => it(ser_title({i,v}), () => {
let map;
if (v)
map = new Map( Object.entries(v) );
@@ -163,7 +162,7 @@
});
describe('#deserialize', () =>
- cases.forEach(({ v, fq, b, av, err }, i) => it(utils.des_title({i,b}), () => {
+ cases.forEach(({ v, fq, b, av, err }, i) => it(des_title({i,b}), () => {
if (Array.isArray(b))
b = from(b);
@@ -202,12 +201,12 @@
{ v: null, e: false },
{ v: undefined, e: false },
{ v: {}, e: true },
- { v: new t.Traverser(), e: true },
+ { v: new Traverser(), e: true },
{ v: [], e: false },
{ v: [{}], e: false },
{ v: [new Map()], e: false },
{ v: new Map(), e: true },
- ].forEach(({ v, e }, i) => it(utils.cbuf_title({i,v}), () =>
+ ].forEach(({ v, e }, i) => it(cbuf_title({i,v}), () =>
assert.strictEqual( mapSerializer.canBeUsedFor(v), e )
))
);
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/PSerializer-test.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/PSerializer-test.js
index 86f176b..5868e9d 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/PSerializer-test.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/PSerializer-test.js
@@ -20,12 +20,11 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const utils = require('./utils');
-const assert = require('assert');
-const { pSerializer } = require('../../../lib/structure/io/binary/GraphBinary');
-const t = require('../../../lib/process/traversal');
+import { ser_title, des_title, cbuf_title } from './utils.js';
+import assert from 'assert';
+import { pSerializer } from '../../../lib/structure/io/binary/GraphBinary.js';
+import { P, Traverser } from '../../../lib/process/traversal.js';
const { from, concat } = Buffer;
@@ -36,16 +35,16 @@
const cases = [
{ v:undefined, fq:1, b:[0x1E, 0x01], av:null },
- { v:undefined, fq:0, b:[0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00], av:new t.P('') },
+ { v:undefined, fq:0, b:[0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00], av:new P('') },
{ v:null, fq:1, b:[0x1E, 0x01] },
- { v:null, fq:0, b:[0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00], av:new t.P('') },
+ { v:null, fq:0, b:[0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00], av:new P('') },
// TODO: and
// TODO: or
// within(...[])
- { v: t.P.within('A', 'b', '3'),
+ { v: P.within('A', 'b', '3'),
b: [
0x00,0x00,0x00,0x06, ...from('within'),
0x00,0x00,0x00,0x03, // {values_length}
@@ -55,7 +54,7 @@
]
},
// within([...])
- { v: t.P.within([ 'B', 'a', '0' ]),
+ { v: P.within([ 'B', 'a', '0' ]),
b: [
0x00,0x00,0x00,0x06, ...from('within'),
0x00,0x00,0x00,0x03, // {values_length}
@@ -66,7 +65,7 @@
},
// without(...[])
- { v: t.P.without('A', 'b', '3'),
+ { v: P.without('A', 'b', '3'),
b: [
0x00,0x00,0x00,0x07, ...from('without'),
0x00,0x00,0x00,0x03, // {values_length}
@@ -76,7 +75,7 @@
]
},
// without([...])
- { v: t.P.without([ 'B', 'a', '0' ]),
+ { v: P.without([ 'B', 'a', '0' ]),
b: [
0x00,0x00,0x00,0x07, ...from('without'),
0x00,0x00,0x00,0x03, // {values_length}
@@ -87,7 +86,7 @@
},
...(['between','eq','gt','gte','inside','lt','lte','neq','not','outside'].map(operator => ({
- v: t.P[operator]('ValuE', 'OtheR'),
+ v: P[operator]('ValuE', 'OtheR'),
b: [
0x00,0x00,0x00,operator.length, ...from(operator),
0x00,0x00,0x00,0x02, // {values_length}
@@ -97,7 +96,7 @@
}))),
// test
- { v: t.P.test(1, 2, 3),
+ { v: P.test(1, 2, 3),
b: [
0x00,0x00,0x00,0x04, ...from('test'),
0x00,0x00,0x00,0x02, // {values_length}
@@ -131,7 +130,7 @@
describe('#serialize', () =>
cases
.filter(({des}) => !des)
- .forEach(({ v, fq, b }, i) => it(utils.ser_title({i,v}), () => {
+ .forEach(({ v, fq, b }, i) => it(ser_title({i,v}), () => {
b = from(b);
// when fq is under control
@@ -147,7 +146,7 @@
);
describe('#deserialize', () =>
- cases.forEach(({ v, fq, b, av, err }, i) => it(utils.des_title({i,b}), () => {
+ cases.forEach(({ v, fq, b, av, err }, i) => it(des_title({i,b}), () => {
if (Array.isArray(b))
b = from(b);
@@ -184,12 +183,12 @@
{ v: null, e: false },
{ v: undefined, e: false },
{ v: {}, e: false },
- { v: new t.Traverser(), e: false },
- { v: new t.P(), e: true },
+ { v: new Traverser(), e: false },
+ { v: new P(), e: true },
{ v: [], e: false },
{ v: [0], e: false },
- { v: [new t.P()], e: false },
- ].forEach(({ v, e }, i) => it(utils.cbuf_title({i,v}), () =>
+ { v: [new P()], e: false },
+ ].forEach(({ v, e }, i) => it(cbuf_title({i,v}), () =>
assert.strictEqual( pSerializer.canBeUsedFor(v), e )
))
);
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/PathSerializer-test.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/PathSerializer-test.js
index 95198c4..c341880 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/PathSerializer-test.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/PathSerializer-test.js
@@ -20,13 +20,12 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const utils = require('./utils');
-const assert = require('assert');
-const { pathSerializer } = require('../../../lib/structure/io/binary/GraphBinary');
-const t = require('../../../lib/process/traversal');
-const g = require('../../../lib/structure/graph');
+import { ser_title, des_title, cbuf_title } from './utils.js';
+import assert from 'assert';
+import { pathSerializer } from '../../../lib/structure/io/binary/GraphBinary.js';
+import { Traverser, P } from '../../../lib/process/traversal.js';
+import { Path } from '../../../lib/structure/graph.js';
const { from, concat } = Buffer;
@@ -37,11 +36,11 @@
const cases = [
{ v:undefined, fq:1, b:[0x0E,0x01], av:null },
- { v:undefined, fq:0, b:[0x09,0x00,0x00,0x00,0x00,0x00, 0x09,0x00,0x00,0x00,0x00,0x00], av:new g.Path([],[]) },
+ { v:undefined, fq:0, b:[0x09,0x00,0x00,0x00,0x00,0x00, 0x09,0x00,0x00,0x00,0x00,0x00], av:new Path([],[]) },
{ v:null, fq:1, b:[0x0E,0x01] },
- { v:null, fq:0, b:[0x09,0x00,0x00,0x00,0x00,0x00, 0x09,0x00,0x00,0x00,0x00,0x00], av:new g.Path([],[]) },
+ { v:null, fq:0, b:[0x09,0x00,0x00,0x00,0x00,0x00, 0x09,0x00,0x00,0x00,0x00,0x00], av:new Path([],[]) },
- { v:new g.Path([ ['A','B'], ['C','D'] ], [ 1,-1 ]),
+ { v:new Path([ ['A','B'], ['C','D'] ], [ 1,-1 ]),
b:[
// {labels}
0x09,0x00,0x00,0x00,0x00,0x02, // List.{length}
@@ -85,7 +84,7 @@
describe('#serialize', () =>
cases
.filter(({des}) => !des)
- .forEach(({ v, fq, b }, i) => it(utils.ser_title({i,v}), () => {
+ .forEach(({ v, fq, b }, i) => it(ser_title({i,v}), () => {
b = from(b);
// when fq is under control
@@ -101,7 +100,7 @@
);
describe('#deserialize', () =>
- cases.forEach(({ v, fq, b, av, err }, i) => it(utils.des_title({i,b}), () => {
+ cases.forEach(({ v, fq, b, av, err }, i) => it(des_title({i,b}), () => {
if (Array.isArray(b))
b = from(b);
@@ -138,13 +137,13 @@
{ v: null, e: false },
{ v: undefined, e: false },
{ v: {}, e: false },
- { v: new t.Traverser(), e: false },
- { v: new t.P(), e: false },
+ { v: new Traverser(), e: false },
+ { v: new P(), e: false },
{ v: [], e: false },
{ v: [0], e: false },
- { v: [new g.Path()], e: false },
- { v: new g.Path(), e: true },
- ].forEach(({ v, e }, i) => it(utils.cbuf_title({i,v}), () =>
+ { v: [new Path()], e: false },
+ { v: new Path(), e: true },
+ ].forEach(({ v, e }, i) => it(cbuf_title({i,v}), () =>
assert.strictEqual( pathSerializer.canBeUsedFor(v), e )
))
);
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/PropertySerializer-test.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/PropertySerializer-test.js
index fb2d8a3..689da64 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/PropertySerializer-test.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/PropertySerializer-test.js
@@ -20,13 +20,12 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const utils = require('./utils');
-const assert = require('assert');
-const { propertySerializer } = require('../../../lib/structure/io/binary/GraphBinary');
-const t = require('../../../lib/process/traversal');
-const g = require('../../../lib/structure/graph');
+import { ser_title, des_title, cbuf_title } from './utils.js';
+import assert from 'assert';
+import { propertySerializer } from '../../../lib/structure/io/binary/GraphBinary.js';
+import { Traverser, P } from '../../../lib/process/traversal.js';
+import { Property } from '../../../lib/structure/graph.js';
const { from, concat } = Buffer;
@@ -37,11 +36,11 @@
const cases = [
{ v:undefined, fq:1, b:[0x0F,0x01], av:null },
- { v:undefined, fq:0, b:[0x00,0x00,0x00,0x00, 0xFE,0x01, 0xFE,0x01], av:new g.Property('',null) },
+ { v:undefined, fq:0, b:[0x00,0x00,0x00,0x00, 0xFE,0x01, 0xFE,0x01], av:new Property('',null) },
{ v:null, fq:1, b:[0x0F,0x01] },
- { v:null, fq:0, b:[0x00,0x00,0x00,0x00, 0xFE,0x01, 0xFE,0x01], av:new g.Property('',null) },
+ { v:null, fq:0, b:[0x00,0x00,0x00,0x00, 0xFE,0x01, 0xFE,0x01], av:new Property('',null) },
- { v:new g.Property('key', 42),
+ { v:new Property('key', 42),
b:[
0x00,0x00,0x00,0x03, ...from('key'),
0x01,0x00, 0x00,0x00,0x00,0x2A,
@@ -74,7 +73,7 @@
describe('#serialize', () =>
cases
.filter(({des}) => !des)
- .forEach(({ v, fq, b }, i) => it(utils.ser_title({i,v}), () => {
+ .forEach(({ v, fq, b }, i) => it(ser_title({i,v}), () => {
b = from(b);
// when fq is under control
@@ -90,7 +89,7 @@
);
describe('#deserialize', () =>
- cases.forEach(({ v, fq, b, av, err }, i) => it(utils.des_title({i,b}), () => {
+ cases.forEach(({ v, fq, b, av, err }, i) => it(des_title({i,b}), () => {
if (Array.isArray(b))
b = from(b);
@@ -127,13 +126,13 @@
{ v: null, e: false },
{ v: undefined, e: false },
{ v: {}, e: false },
- { v: new t.Traverser(), e: false },
- { v: new t.P(), e: false },
+ { v: new Traverser(), e: false },
+ { v: new P(), e: false },
{ v: [], e: false },
{ v: [0], e: false },
- { v: [new g.Property()], e: false },
- { v: new g.Property(), e: true },
- ].forEach(({ v, e }, i) => it(utils.cbuf_title({i,v}), () =>
+ { v: [new Property()], e: false },
+ { v: new Property(), e: true },
+ ].forEach(({ v, e }, i) => it(cbuf_title({i,v}), () =>
assert.strictEqual( propertySerializer.canBeUsedFor(v), e )
))
);
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/SetSerializer-test.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/SetSerializer-test.js
index 502aa00..cfac40b 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/SetSerializer-test.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/SetSerializer-test.js
@@ -20,6 +20,7 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-require('./SetSerializerTestTemplate')({ ID: 0x0B, name: 'Set' });
+import SetSerializerTestTemplate from './SetSerializerTestTemplate.js';
+
+SetSerializerTestTemplate({ ID: 0x0b, name: 'Set' });
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/SetSerializerTestTemplate.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/SetSerializerTestTemplate.js
index 1ff7611..f151ae9 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/SetSerializerTestTemplate.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/SetSerializerTestTemplate.js
@@ -21,22 +21,21 @@
* @author Igor Ostapenko
*/
-const utils = require('./utils');
-const assert = require('assert');
-const ioc = require('../../../lib/structure/io/binary/GraphBinary');
-const intSerializer = ioc.intSerializer;
-const t = require('../../../lib/process/traversal');
+import {des_title, cbuf_title, ser_title} from './utils.js';
+import assert from 'assert';
+import {intSerializer, serializers} from '../../../lib/structure/io/binary/GraphBinary.js';
+import { Traverser } from '../../../lib/process/traversal.js';
const { from, concat } = Buffer;
-module.exports = ({ ID, name }) => {
+export default ({ ID, name }) => {
-describe(`GraphBinary.SetSerializer`, () => {
+describe(`GraphBinary.${name}Serializer`, () => {
const type_code = from([ID]);
const value_flag = from([0x00]);
- const serializer = ioc.serializers[ID];
+ const serializer = serializers[ID];
const cases = [
{ v:undefined, fq:1, b:[ID,0x01], av:null },
@@ -76,7 +75,7 @@
describe('#serialize', () => {
cases
.filter(({des}) => !des)
- .forEach(({ v, fq, b }, i) => it(utils.ser_title({i,v}), () => {
+ .forEach(({ v, fq, b }, i) => it(ser_title({i,v}), () => {
b = from(b);
// when fq is under control
@@ -95,7 +94,7 @@
});
describe('#deserialize', () =>
- cases.forEach(({ v, fq, b, av, err }, i) => it(utils.des_title({i,b}), () => {
+ cases.forEach(({ v, fq, b, av, err }, i) => it(des_title({i,b}), () => {
if (Array.isArray(b))
b = from(b);
@@ -132,14 +131,14 @@
{ v: null, e: false },
{ v: undefined, e: false },
{ v: {}, e: false },
- { v: new t.Traverser(), e: false },
+ { v: new Traverser(), e: false },
{ v: [], e: false },
{ v: [0], e: false },
{ v: [undefined], e: false },
{ v: new Set(), e: true },
{ v: new Set([0]), e: true },
{ v: new Set([undefined]), e: true },
- ].forEach(({ v, e }, i) => it(utils.cbuf_title({i,v}), () =>
+ ].forEach(({ v, e }, i) => it(cbuf_title({i,v}), () =>
assert.strictEqual( serializer.canBeUsedFor(v), e )
))
);
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/ShortSerializer-test.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/ShortSerializer-test.js
index 2e0124f..52b2f3e 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/ShortSerializer-test.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/ShortSerializer-test.js
@@ -20,11 +20,10 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const utils = require('./utils');
-const assert = require('assert');
-const { shortSerializer } = require('../../../lib/structure/io/binary/GraphBinary');
+import { ser_title, des_title } from './utils.js';
+import assert from 'assert';
+import { shortSerializer } from '../../../lib/structure/io/binary/GraphBinary.js';
const { from, concat } = Buffer;
@@ -72,7 +71,7 @@
describe('#serialize', () =>
cases
.filter(({des}) => !des)
- .forEach(({ v, fq, b }, i) => it(utils.ser_title({i,v}), () => {
+ .forEach(({ v, fq, b }, i) => it(ser_title({i,v}), () => {
b = from(b);
// when fq is under control
@@ -88,7 +87,7 @@
);
describe('#deserialize', () =>
- cases.forEach(({ v, fq, b, av, err }, i) => it(utils.des_title({i,b}), () => {
+ cases.forEach(({ v, fq, b, av, err }, i) => it(des_title({i,b}), () => {
if (Array.isArray(b))
b = from(b);
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/StringSerializer-test.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/StringSerializer-test.js
index d904e53..e46c6ae 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/StringSerializer-test.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/StringSerializer-test.js
@@ -20,6 +20,7 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-require('./StringSerializerTestTemplate')({ ID: 0x03, name: 'String' });
+import StringSerializerTestTemplate from './StringSerializerTestTemplate.js';
+
+StringSerializerTestTemplate({ ID: 0x03, name: 'String' });
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/StringSerializerTestTemplate.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/StringSerializerTestTemplate.js
index f829b4b..48a3c39 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/StringSerializerTestTemplate.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/StringSerializerTestTemplate.js
@@ -20,22 +20,21 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const utils = require('./utils');
-const assert = require('assert');
-const ioc = require('../../../lib/structure/io/binary/GraphBinary');
+import { ser_title, des_title, cbuf_title } from './utils.js';
+import assert from 'assert';
+import { serializers } from '../../../lib/structure/io/binary/GraphBinary.js';
const { from, concat } = Buffer;
-module.exports = ({ ID, name }) => {
+export default ({ ID, name }) => {
describe(`GraphBinary.${name}Serializer`, () => {
const type_code = from([ID]);
const value_flag = from([0x00]);
- const serializer = ioc.serializers[ID];
+ const serializer = serializers[ID];
const cases = [
{ v:undefined, fq:1, b:[ID,0x01], av:null },
@@ -90,7 +89,7 @@
describe('#serialize', () =>
cases
.filter(({des}) => !des)
- .forEach(({ v, fq, b }, i) => it(utils.ser_title({i,v}), () => {
+ .forEach(({ v, fq, b }, i) => it(ser_title({i,v}), () => {
b = from(b);
// when fq is under control
@@ -106,7 +105,7 @@
);
describe('#deserialize', () =>
- cases.forEach(({ v, fq, na, b, av, err }, i) => it(utils.des_title({i,b}), () => {
+ cases.forEach(({ v, fq, na, b, av, err }, i) => it(des_title({i,b}), () => {
if (Array.isArray(b))
b = from(b);
@@ -158,7 +157,7 @@
{ v: +Infinity, e: false },
{ v: -Infinity, e: false },
//{ v: Symbol(''), e: false },
- ].forEach(({ v, e }, i) => it(utils.cbuf_title({i,v}), () => assert.strictEqual(
+ ].forEach(({ v, e }, i) => it(cbuf_title({i,v}), () => assert.strictEqual(
serializer.canBeUsedFor(v),
e,
)))
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/TextPSerializer-test.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/TextPSerializer-test.js
index 498f43f..64b26b3 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/TextPSerializer-test.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/TextPSerializer-test.js
@@ -20,12 +20,11 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const utils = require('./utils');
-const assert = require('assert');
-const { textPSerializer } = require('../../../lib/structure/io/binary/GraphBinary');
-const t = require('../../../lib/process/traversal');
+import { ser_title, des_title, cbuf_title } from './utils.js';
+import assert from 'assert';
+import { textPSerializer } from '../../../lib/structure/io/binary/GraphBinary.js';
+import { TextP, Traverser } from '../../../lib/process/traversal.js';
const { from, concat } = Buffer;
@@ -36,15 +35,15 @@
const cases = [
{ v:undefined, fq:1, b:[0x28,0x01], av:null },
- { v:undefined, fq:0, b:[0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00], av:new t.TextP('') },
+ { v:undefined, fq:0, b:[0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00], av:new TextP('') },
{ v:null, fq:1, b:[0x28,0x01] },
- { v:null, fq:0, b:[0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00], av:new t.TextP('') },
+ { v:null, fq:0, b:[0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00], av:new TextP('') },
// TODO: and
// TODO: or
...(['containing','endingWith','notContaining','notEndingWith','notStartingWith','startingWith'].map(operator => ({
- v: t.TextP[operator]('ValuE', 'OtheR'),
+ v: TextP[operator]('ValuE', 'OtheR'),
b: [
0x00,0x00,0x00,operator.length, ...from(operator),
0x00,0x00,0x00,0x02, // {values_length}
@@ -77,7 +76,7 @@
describe('#serialize', () =>
cases
.filter(({des}) => !des)
- .forEach(({ v, fq, b }, i) => it(utils.ser_title({i,v}), () => {
+ .forEach(({ v, fq, b }, i) => it(ser_title({i,v}), () => {
b = from(b);
// when fq is under control
@@ -93,7 +92,7 @@
);
describe('#deserialize', () =>
- cases.forEach(({ v, fq, b, av, err }, i) => it(utils.des_title({i,b}), () => {
+ cases.forEach(({ v, fq, b, av, err }, i) => it(des_title({i,b}), () => {
if (Array.isArray(b))
b = from(b);
@@ -130,12 +129,12 @@
{ v: null, e: false },
{ v: undefined, e: false },
{ v: {}, e: false },
- { v: new t.Traverser(), e: false },
+ { v: new Traverser(), e: false },
{ v: [], e: false },
{ v: [0], e: false },
- { v: [new t.TextP()], e: false },
- { v: new t.TextP(), e: true },
- ].forEach(({ v, e }, i) => it(utils.cbuf_title({i,v}), () =>
+ { v: [new TextP()], e: false },
+ { v: new TextP(), e: true },
+ ].forEach(({ v, e }, i) => it(cbuf_title({i,v}), () =>
assert.strictEqual( textPSerializer.canBeUsedFor(v), e )
))
);
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/TimestampSerializer-test.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/TimestampSerializer-test.js
index 1bfad0c..2502745 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/TimestampSerializer-test.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/TimestampSerializer-test.js
@@ -20,6 +20,7 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-require('./DateSerializerTestTemplate')({ ID: 0x05, name: 'Timestamp' });
+import DateSerializerTestTemplate from './DateSerializerTestTemplate.js';
+
+DateSerializerTestTemplate({ ID: 0x05, name: 'Timestamp' });
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/TraversalStrategySerializer-test.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/TraversalStrategySerializer-test.js
index 164b3d1..5f28eff 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/TraversalStrategySerializer-test.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/TraversalStrategySerializer-test.js
@@ -20,13 +20,12 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const utils = require('./utils');
-const assert = require('assert');
-const { traversalStrategySerializer } = require('../../../lib/structure/io/binary/GraphBinary');
-const t = require('../../../lib/process/traversal');
-const ts = require('../../../lib/process/traversal-strategy');
+import { ser_title, cbuf_title } from './utils.js';
+import assert from 'assert';
+import { traversalStrategySerializer } from '../../../lib/structure/io/binary/GraphBinary.js';
+import { Traverser, P } from '../../../lib/process/traversal.js';
+import { ElementIdStrategy, OptionsStrategy, TraversalStrategy } from '../../../lib/process/traversal-strategy.js';
const { from, concat } = Buffer;
@@ -41,14 +40,14 @@
{ v:null, fq:1, b:[0x29,0x01] },
{ v:null, fq:0, b:[0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00] },
- { v:new ts.ElementIdStrategy(),
+ { v:new ElementIdStrategy(),
b:[
0x00,0x00,0x00,0x54, ...from('org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.ElementIdStrategy'),
0x00,0x00,0x00,0x00,
]
},
- { v:new ts.OptionsStrategy({ 'A': 1, 'B': 2 }),
+ { v:new OptionsStrategy({ 'A': 1, 'B': 2 }),
b:[
0x00,0x00,0x00,0x52, ...from('org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.OptionsStrategy'),
0x00,0x00,0x00,0x02,
@@ -64,7 +63,7 @@
describe('#serialize', () =>
cases
- .forEach(({ v, fq, b }, i) => it(utils.ser_title({i,v}), () => {
+ .forEach(({ v, fq, b }, i) => it(ser_title({i,v}), () => {
b = from(b);
// when fq is under control
@@ -85,14 +84,14 @@
{ v: null, e: false },
{ v: undefined, e: false },
{ v: {}, e: false },
- { v: new t.Traverser(), e: false },
- { v: new t.P(), e: false },
+ { v: new Traverser(), e: false },
+ { v: new P(), e: false },
{ v: [], e: false },
{ v: [0], e: false },
{ v: [function(){}], e: false },
{ v: function(){}, e: false },
- { v: new ts.TraversalStrategy(), e: true },
- ].forEach(({ v, e }, i) => it(utils.cbuf_title({i,v}), () =>
+ { v: new TraversalStrategy(), e: true },
+ ].forEach(({ v, e }, i) => it(cbuf_title({i,v}), () =>
assert.strictEqual( traversalStrategySerializer.canBeUsedFor(v), e )
))
);
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/TraverserSerializer-test.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/TraverserSerializer-test.js
index de485a6..b3599ac 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/TraverserSerializer-test.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/TraverserSerializer-test.js
@@ -20,12 +20,11 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const utils = require('./utils');
-const assert = require('assert');
-const { traverserSerializer } = require('../../../lib/structure/io/binary/GraphBinary');
-const t = require('../../../lib/process/traversal');
+import { ser_title, des_title, cbuf_title } from './utils.js';
+import assert from 'assert';
+import { traverserSerializer } from '../../../lib/structure/io/binary/GraphBinary.js';
+import { Traverser } from '../../../lib/process/traversal.js';
const { from, concat } = Buffer;
@@ -36,12 +35,12 @@
const cases = [
{ v:undefined, fq:1, b:[0x21, 0x01], av:null },
- { v:undefined, fq:0, b:[0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01, 0xFE,0x01], av:new t.Traverser(null, 1) },
+ { v:undefined, fq:0, b:[0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01, 0xFE,0x01], av:new Traverser(null, 1) },
{ v:null, fq:1, b:[0x21, 0x01] },
- { v:null, fq:0, b:[0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01, 0xFE,0x01], av:new t.Traverser(null, 1) },
+ { v:null, fq:0, b:[0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01, 0xFE,0x01], av:new Traverser(null, 1) },
- { v:new t.Traverser(-1, 0), b:[0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01, 0x01,0x00,0xFF,0xFF,0xFF,0xFF], av:new t.Traverser(-1, 1) }, // check Traverser.constructor() when bulk=0 becomes bulk=1
- { v:new t.Traverser('abC', 2), b:[0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02, 0x03,0x00, 0x00,0x00,0x00,0x03, 0x61,0x62,0x43] },
+ { v:new Traverser(-1, 0), b:[0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01, 0x01,0x00,0xFF,0xFF,0xFF,0xFF], av:new Traverser(-1, 1) }, // check Traverser.constructor() when bulk=0 becomes bulk=1
+ { v:new Traverser('abC', 2), b:[0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02, 0x03,0x00, 0x00,0x00,0x00,0x03, 0x61,0x62,0x43] },
{ des:1, err:/buffer is missing/, fq:1, b:undefined },
{ des:1, err:/buffer is missing/, fq:0, b:undefined },
@@ -70,7 +69,7 @@
describe('#serialize', () =>
cases
.filter(({des}) => !des)
- .forEach(({ v, fq, b }, i) => it(utils.ser_title({i,v}), () => {
+ .forEach(({ v, fq, b }, i) => it(ser_title({i,v}), () => {
b = from(b);
// when fq is under control
@@ -86,7 +85,7 @@
);
describe('#deserialize', () =>
- cases.forEach(({ v, fq, b, av, err }, i) => it(utils.des_title({i,b}), () => {
+ cases.forEach(({ v, fq, b, av, err }, i) => it(des_title({i,b}), () => {
if (Array.isArray(b))
b = from(b);
@@ -123,8 +122,8 @@
{ v: null, e: false },
{ v: undefined, e: false },
{ v: {}, e: false },
- { v: new t.Traverser(), e: true },
- ].forEach(({ v, e }, i) => it(utils.cbuf_title({i,v}), () =>
+ { v: new Traverser(), e: true },
+ ].forEach(({ v, e }, i) => it(cbuf_title({i,v}), () =>
assert.strictEqual( traverserSerializer.canBeUsedFor(v), e )
))
);
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/UnspecifiedNullSerializer-test.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/UnspecifiedNullSerializer-test.js
index 6bf3e73..6a4ae5b 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/UnspecifiedNullSerializer-test.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/UnspecifiedNullSerializer-test.js
@@ -20,12 +20,11 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const utils = require('./utils');
-const assert = require('assert');
-const { unspecifiedNullSerializer } = require('../../../lib/structure/io/binary/GraphBinary');
-const t = require('../../../lib/process/traversal');
+import { ser_title, des_title, cbuf_title } from './utils.js';
+import assert from 'assert';
+import { unspecifiedNullSerializer } from '../../../lib/structure/io/binary/GraphBinary.js';
+import { Traverser } from '../../../lib/process/traversal.js';
const { from, concat } = Buffer;
@@ -57,14 +56,14 @@
describe('#serialize', () =>
cases
.filter(({des}) => !des)
- .forEach(({ v, b }, i) => it(utils.ser_title({i,v}), () => {
+ .forEach(({ v, b }, i) => it(ser_title({i,v}), () => {
b = from(b);
assert.deepEqual( unspecifiedNullSerializer.serialize(v), b );
}))
);
describe('#deserialize', () =>
- cases.forEach(({ v, b, av, err }, i) => it(utils.des_title({i,b}), () => {
+ cases.forEach(({ v, b, av, err }, i) => it(des_title({i,b}), () => {
if (Array.isArray(b))
b = from(b);
@@ -89,12 +88,12 @@
{ v: null, e: true },
{ v: undefined, e: true },
{ v: {}, e: false },
- { v: new t.Traverser(), e: false },
+ { v: new Traverser(), e: false },
{ v: [], e: false },
{ v: [{}], e: false },
{ v: [new Map()], e: false },
{ v: new Map(), e: false },
- ].forEach(({ v, e }, i) => it(utils.cbuf_title({i,v}), () =>
+ ].forEach(({ v, e }, i) => it(cbuf_title({i,v}), () =>
assert.strictEqual( unspecifiedNullSerializer.canBeUsedFor(v), e )
))
);
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/UuidSerializer-test.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/UuidSerializer-test.js
index 9e77837..e3883bc 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/UuidSerializer-test.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/UuidSerializer-test.js
@@ -20,11 +20,10 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const utils = require('./utils');
-const assert = require('assert');
-const { uuidSerializer } = require('../../../lib/structure/io/binary/GraphBinary');
+import { ser_title, des_title } from './utils.js';
+import assert from 'assert';
+import { uuidSerializer } from '../../../lib/structure/io/binary/GraphBinary.js';
const { from, concat } = Buffer;
@@ -89,7 +88,7 @@
describe('#serialize', () =>
cases
.filter(({des}) => !des)
- .forEach(({ v, fq, b }, i) => it(utils.ser_title({i,v}), () => {
+ .forEach(({ v, fq, b }, i) => it(ser_title({i,v}), () => {
b = from(b);
// when fq is under control
@@ -105,7 +104,7 @@
);
describe('#deserialize', () =>
- cases.forEach(({ v, fq, na, b, av, err }, i) => it(utils.des_title({i,b}), () => {
+ cases.forEach(({ v, fq, na, b, av, err }, i) => it(des_title({i,b}), () => {
if (Array.isArray(b))
b = from(b);
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/VertexPropertySerializer-test.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/VertexPropertySerializer-test.js
index 16444ae..41da527 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/VertexPropertySerializer-test.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/VertexPropertySerializer-test.js
@@ -20,13 +20,12 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const utils = require('./utils');
-const assert = require('assert');
-const { vertexPropertySerializer } = require('../../../lib/structure/io/binary/GraphBinary');
-const t = require('../../../lib/process/traversal');
-const g = require('../../../lib/structure/graph');
+import { ser_title, des_title, cbuf_title } from './utils.js';
+import assert from 'assert';
+import { vertexPropertySerializer } from '../../../lib/structure/io/binary/GraphBinary.js';
+import { Traverser, P } from '../../../lib/process/traversal.js';
+import { VertexProperty } from '../../../lib/structure/graph.js';
const { from, concat } = Buffer;
@@ -37,11 +36,11 @@
const cases = [
{ v:undefined, fq:1, b:[0x12,0x01], av:null },
- { v:undefined, fq:0, b:[0xFE,0x01, 0x00,0x00,0x00,0x00, 0xFE,0x01, 0xFE,0x01, 0xFE,0x01], av:new g.VertexProperty(null,'',null,[]) },
+ { v:undefined, fq:0, b:[0xFE,0x01, 0x00,0x00,0x00,0x00, 0xFE,0x01, 0xFE,0x01, 0xFE,0x01], av:new VertexProperty(null,'',null,[]) },
{ v:null, fq:1, b:[0x12,0x01] },
- { v:null, fq:0, b:[0xFE,0x01, 0x00,0x00,0x00,0x00, 0xFE,0x01, 0xFE,0x01, 0xFE,0x01], av:new g.VertexProperty(null,'',null,[]) },
+ { v:null, fq:0, b:[0xFE,0x01, 0x00,0x00,0x00,0x00, 0xFE,0x01, 0xFE,0x01, 0xFE,0x01], av:new VertexProperty(null,'',null,[]) },
- { v:new g.VertexProperty('Id', 'Label', 'Value', []),
+ { v:new VertexProperty('Id', 'Label', 'Value', []),
b:[
0x03,0x00, 0x00,0x00,0x00,0x02, ...from('Id'),
0x00,0x00,0x00,0x05, ...from('Label'),
@@ -76,7 +75,7 @@
describe('#serialize', () =>
cases
.filter(({des}) => !des)
- .forEach(({ v, fq, b }, i) => it(utils.ser_title({i,v}), () => {
+ .forEach(({ v, fq, b }, i) => it(ser_title({i,v}), () => {
b = from(b);
// when fq is under control
@@ -92,7 +91,7 @@
);
describe('#deserialize', () =>
- cases.forEach(({ v, fq, b, av, err }, i) => it(utils.des_title({i,b}), () => {
+ cases.forEach(({ v, fq, b, av, err }, i) => it(des_title({i,b}), () => {
if (Array.isArray(b))
b = from(b);
@@ -129,13 +128,13 @@
{ v: null, e: false },
{ v: undefined, e: false },
{ v: {}, e: false },
- { v: new t.Traverser(), e: false },
- { v: new t.P(), e: false },
+ { v: new Traverser(), e: false },
+ { v: new P(), e: false },
{ v: [], e: false },
{ v: [0], e: false },
- { v: [new g.VertexProperty()], e: false },
- { v: new g.VertexProperty(), e: true },
- ].forEach(({ v, e }, i) => it(utils.cbuf_title({i,v}), () =>
+ { v: [new VertexProperty()], e: false },
+ { v: new VertexProperty(), e: true },
+ ].forEach(({ v, e }, i) => it(cbuf_title({i,v}), () =>
assert.strictEqual( vertexPropertySerializer.canBeUsedFor(v), e )
))
);
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/VertexSerializer-test.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/VertexSerializer-test.js
index 774037b..624056b 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/VertexSerializer-test.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/VertexSerializer-test.js
@@ -20,13 +20,12 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const utils = require('./utils');
-const assert = require('assert');
-const { vertexSerializer } = require('../../../lib/structure/io/binary/GraphBinary');
-const t = require('../../../lib/process/traversal');
-const g = require('../../../lib/structure/graph');
+import { ser_title, des_title, cbuf_title } from './utils.js';
+import assert from 'assert';
+import { vertexSerializer } from '../../../lib/structure/io/binary/GraphBinary.js';
+import { Traverser, P } from '../../../lib/process/traversal.js';
+import { Vertex } from '../../../lib/structure/graph.js';
const { from, concat } = Buffer;
@@ -37,11 +36,11 @@
const cases = [
{ v:undefined, fq:1, b:[0x11,0x01], av:null },
- { v:undefined, fq:0, b:[0x03,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00, 0xFE,0x01], av:new g.Vertex('','',[]) },
+ { v:undefined, fq:0, b:[0x03,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00, 0xFE,0x01], av:new Vertex('','',[]) },
{ v:null, fq:1, b:[0x11,0x01] },
- { v:null, fq:0, b:[0x03,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00, 0xFE,0x01], av:new g.Vertex('','',[]) },
+ { v:null, fq:0, b:[0x03,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00, 0xFE,0x01], av:new Vertex('','',[]) },
- { v:new g.Vertex(42, 'A', -1),
+ { v:new Vertex(42, 'A', -1),
b:[
0x01,0x00, 0x00,0x00,0x00,0x2A, // id
0x00,0x00,0x00,0x01, 0x41, // label
@@ -51,7 +50,7 @@
// real case with id of UUID type, but JS does not have UUID type, it's presented as a string instead
{ des:1,
- v:new g.Vertex('28f38e3d-7739-4c99-8284-eb43db2a80f1', 'Person', []),
+ v:new Vertex('28f38e3d-7739-4c99-8284-eb43db2a80f1', 'Person', []),
b:[
0x0C,0x00, 0x28,0xF3,0x8E,0x3D, 0x77,0x39, 0x4C,0x99, 0x82,0x84, 0xEB,0x43,0xDB,0x2A,0x80,0xF1, // id
0x00,0x00,0x00,0x06, ...from('Person'), // label
@@ -82,7 +81,7 @@
describe('#serialize', () =>
cases
.filter(({des}) => !des)
- .forEach(({ v, fq, b }, i) => it(utils.ser_title({i,v}), () => {
+ .forEach(({ v, fq, b }, i) => it(ser_title({i,v}), () => {
b = from(b);
// when fq is under control
@@ -98,7 +97,7 @@
);
describe('#deserialize', () =>
- cases.forEach(({ v, fq, b, av, err }, i) => it(utils.des_title({i,b}), () => {
+ cases.forEach(({ v, fq, b, av, err }, i) => it(des_title({i,b}), () => {
if (Array.isArray(b))
b = from(b);
@@ -135,13 +134,13 @@
{ v: null, e: false },
{ v: undefined, e: false },
{ v: {}, e: false },
- { v: new t.Traverser(), e: false },
- { v: new t.P(), e: false },
+ { v: new Traverser(), e: false },
+ { v: new P(), e: false },
{ v: [], e: false },
{ v: [0], e: false },
- { v: [new g.Vertex()], e: false },
- { v: new g.Vertex(), e: true },
- ].forEach(({ v, e }, i) => it(utils.cbuf_title({i,v}), () =>
+ { v: [new Vertex()], e: false },
+ { v: new Vertex(), e: true },
+ ].forEach(({ v, e }, i) => it(cbuf_title({i,v}), () =>
assert.strictEqual( vertexSerializer.canBeUsedFor(v), e )
))
);
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/utils.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/utils.js
index a433c4a..50fc82b 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/utils.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/utils.js
@@ -20,21 +20,13 @@
/**
* @author Igor Ostapenko
*/
-'use strict';
-const util = require('util');
+import { inspect } from 'util';
-const ser_title = ({ i, v }) =>
- `should be able to handle case #${i}: ${util.inspect(v, { depth: 1, breakLength: Infinity })}`;
+export const ser_title = ({ i, v }) =>
+ `should be able to handle case #${i}: ${inspect(v, { depth: 1, breakLength: Infinity })}`;
-const des_title = ({ i, b }) =>
- `should be able to handle case #${i}: ${b ? Buffer.from(b).toString('hex') : b}`;
+export const des_title = ({ i, b }) => `should be able to handle case #${i}: ${b ? Buffer.from(b).toString('hex') : b}`;
-const cbuf_title = ({ i, v }) =>
- `should be able to handle case #${i}: ${util.inspect(v, { depth: 1, breakLength: Infinity })}`;
-
-module.exports = {
- ser_title,
- des_title,
- cbuf_title,
-};
+export const cbuf_title = ({ i, v }) =>
+ `should be able to handle case #${i}: ${inspect(v, { depth: 1, breakLength: Infinity })}`;
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphson-test.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphson-test.js
index 913102b..804c565 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphson-test.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphson-test.js
@@ -20,17 +20,11 @@
/**
* @author Jorge Bay Gondra
*/
-'use strict';
-const assert = require('assert');
-const graph = require('../../lib/structure/graph');
-const t = require('../../lib/process/traversal.js');
-const gs = require('../../lib/structure/io/graph-serializer.js');
-const utils = require('../../lib/utils');
-const { ConnectiveStrategy, SeedStrategy } = require("../../lib/process/traversal-strategy");
-const GraphSONReader = gs.GraphSONReader;
-const GraphSONWriter = gs.GraphSONWriter;
-const P = t.P;
+import assert from 'assert';
+import { Vertex } from '../../lib/structure/graph.js';
+import { P, cardinality } from '../../lib/process/traversal.js';
+import { GraphSONReader, GraphSONWriter } from '../../lib/structure/io/graph-serializer.js';
describe('GraphSONReader', function () {
it('should parse GraphSON null', function () {
@@ -97,7 +91,7 @@
"age":[{"id":{"@type":"g:Int64","@value":1},"value":{"@type":"g:Int32","@value":29}}]}}};
const reader = new GraphSONReader(obj);
const result = reader.read(obj);
- assert.ok(result instanceof graph.Vertex);
+ assert.ok(result instanceof Vertex);
assert.strictEqual(result.label, 'person');
assert.strictEqual(typeof result.id, 'number');
assert.ok(result.properties);
@@ -131,8 +125,8 @@
assert.strictEqual(result.objects[2], 'lop');
const a = result.objects[0];
const bc = result.objects[1];
- assert.ok(a instanceof graph.Vertex);
- assert.ok(bc instanceof graph.Vertex);
+ assert.ok(a instanceof Vertex);
+ assert.ok(bc instanceof Vertex);
assert.strictEqual(a.label, 'person');
assert.strictEqual(bc.label, 'software');
assert.ok(a.properties);
@@ -199,8 +193,8 @@
assert.strictEqual(result.objects[2], 'lop');
const a = result.objects[0];
const bc = result.objects[1];
- assert.ok(a instanceof graph.Vertex);
- assert.ok(bc instanceof graph.Vertex);
+ assert.ok(a instanceof Vertex);
+ assert.ok(bc instanceof Vertex);
assert.strictEqual(a.label, 'person');
assert.strictEqual(bc.label, 'software');
assert.ok(a.properties === undefined);
@@ -244,7 +238,7 @@
});
it('should write enum values', function () {
const writer = new GraphSONWriter();
- assert.strictEqual(writer.write(t.cardinality.set), '{"@type":"g:Cardinality","@value":"set"}');
+ assert.strictEqual(writer.write(cardinality.set), '{"@type":"g:Cardinality","@value":"set"}');
});
it('should write P', function () {
const writer = new GraphSONWriter();
@@ -278,14 +272,4 @@
assert.strictEqual(writer.write(() => '(x,y) -> x.get() + y'),
'{"@type":"g:Lambda","@value":{"arguments":2,"language":"gremlin-groovy","script":"(x,y) -> x.get() + y"}}');
});
- it('should write Class values', function () {
- const writer = new GraphSONWriter();
- const expected = JSON.stringify({"@type": "g:Class", "@value": "org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.ConnectiveStrategy"});
- assert.strictEqual(writer.write(ConnectiveStrategy), expected);
- });
- it('should write TraversalStrategy values', function () {
- const writer = new GraphSONWriter();
- const expected = JSON.stringify({"@type": "g:SeedStrategy", "@value": {"fqcn": "org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SeedStrategy", "conf": {"seed":100}}});
- assert.strictEqual(writer.write(new SeedStrategy({seed: 100})), expected);
- });
});
\ No newline at end of file
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/result-set-test.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/result-set-test.js
index 9bd97f4..ca74a69 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/result-set-test.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/result-set-test.js
@@ -20,10 +20,9 @@
/**
* @author Jorge Bay Gondra
*/
-'use strict';
-const assert = require('assert');
-const ResultSet = require('../../lib/driver/result-set');
+import assert from 'assert';
+import ResultSet from '../../lib/driver/result-set.js';
describe('ResultSet', function () {
describe('#toArray()', () => {
@@ -70,7 +69,7 @@
describe('#[util.inspect.custom]()', () => {
it('should return the Array representation', () => {
- assert.deepStrictEqual(new ResultSet([1, 2, 3])._items, [1, 2, 3]);
+ assert.deepStrictEqual(new ResultSet([1, 2, 3]).items, [1, 2, 3]);
});
});
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/structure-types-test.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/structure-types-test.js
index 29bebfa..3b55c78 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/structure-types-test.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/structure-types-test.js
@@ -20,10 +20,9 @@
/**
* @author Jorge Bay Gondra
*/
-'use strict';
-const { assert } = require('chai');
-const { VertexProperty, Property, Vertex, Edge, Path } = require('../../lib/structure/graph');
+import { assert } from 'chai';
+import { VertexProperty, Property, Vertex, Edge, Path } from '../../lib/structure/graph.js';
describe('Edge', () => {
describe('#toString()', () => {
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/translator-test.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/translator-test.js
index a91742f..1488328 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/translator-test.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/translator-test.js
@@ -17,125 +17,123 @@
* under the License.
*/
-'use strict';
-
-const assert = require('assert');
-const graph = require('../../lib/structure/graph');
-const t = require('../../lib/process/traversal');
-const Translator = require('../../lib/process/translator');
-const graphTraversalModule = require('../../lib/process/graph-traversal');
-const __ = graphTraversalModule.statics;
+import assert from 'assert';
+import { Graph } from '../../lib/structure/graph.js';
+import { order, P, TextP } from '../../lib/process/traversal.js';
+import Translator from '../../lib/process/translator.js';
+import { statics } from '../../lib/process/graph-traversal.js';
+const __ = statics;
describe('Translator', function () {
describe('#translate()', function () {
it('should produce valid script representation from bytecode glv steps', function () {
- const g = new graph.Graph().traversal();
+ const g = new Graph().traversal();
const script = new Translator('g').translate(g.V().out('created').getBytecode());
assert.ok(script);
assert.strictEqual(script, 'g.V().out(\'created\')');
});
it('should produce valid script representation from bytecode glv steps translating number and text correctly', function () {
- const g = new graph.Graph().traversal();
+ const g = new Graph().traversal();
const script = new Translator('g').translate(g.V(1).out('created').getBytecode());
assert.ok(script);
assert.strictEqual(script, 'g.V(1).out(\'created\')');
});
it('should produce valid script representation from bytecode glv steps containing parameter bindings', function () {
- const g = new graph.Graph().traversal();
+ const g = new Graph().traversal();
const script = new Translator('g').translate(g.addV({'name': 'Lilac'}).getBytecode());
assert.ok(script);
assert.strictEqual(script, 'g.addV((\'name\', \'Lilac\'))');
});
it('should produce valid script representation from bytecode glv steps containing enum', function () {
- const g = new graph.Graph().traversal();
- const script = new Translator('g').translate(g.V().order().by('age', t.order.shuffle).getBytecode());
+ const g = new Graph().traversal();
+ const script = new Translator('g').translate(g.V().order().by('age', order.shuffle).getBytecode());
assert.ok(script);
assert.strictEqual(script, 'g.V().order().by(\'age\', shuffle)');
});
it('should produce valid script representation from bytecode glv steps containing a predicate', function () {
- const g = new graph.Graph().traversal();
- const script = new Translator('g').translate(g.V().hasLabel('person').has('age', t.P.gt(30)).getBytecode());
+ const g = new Graph().traversal();
+ const script = new Translator('g').translate(g.V().hasLabel('person').has('age', P.gt(30)).getBytecode());
assert.ok(script);
assert.strictEqual(script, 'g.V().hasLabel(\'person\').has(\'age\', gt(30))');
});
it('should produce valid script representation from bytecode glv steps containing a string predicate', function () {
- const g = new graph.Graph().traversal();
- const script = new Translator('g').translate(g.V().hasLabel('person').has('name', t.TextP.containing("foo")).getBytecode());
+ const g = new Graph().traversal();
+ const script = new Translator('g').translate(g.V().hasLabel('person').has('name', TextP.containing("foo")).getBytecode());
assert.ok(script);
assert.strictEqual(script, 'g.V().hasLabel(\'person\').has(\'name\', containing(\'foo\'))');
});
it('should produce valid script representation from bytecode glv steps with child', function () {
- const g = new graph.Graph().traversal();
+ const g = new Graph().traversal();
const script = new Translator('g').translate(g.V().filter(__.outE('created')).getBytecode());
assert.ok(script);
assert.strictEqual(script, 'g.V().filter(__.outE(\'created\'))');
});
it('should produce valid script representation from bytecode glv steps with embedded child', function () {
- const g = new graph.Graph().traversal();
+ const g = new Graph().traversal();
const script = new Translator('g').translate(g.V().filter(__.outE('created').filter(__.has('weight'))).getBytecode());
assert.ok(script);
assert.strictEqual(script, 'g.V().filter(__.outE(\'created\').filter(__.has(\'weight\')))');
});
it('should produce valid script representation from bytecode glv steps with embedded children', function () {
- const g = new graph.Graph().traversal();
+ const g = new Graph().traversal();
const script = new Translator('g').translate(g.V().or(__.has('name', 'a'), __.has('name', 'b')).getBytecode());
assert.ok(script);
assert.strictEqual(script, 'g.V().or(__.has(\'name\', \'a\'), __.has(\'name\', \'b\'))');
});
it('should produce valid script representation from bytecode glv for boolean values', function () {
- const g = new graph.Graph().traversal();
+ const g = new Graph().traversal();
const script = new Translator('g').translate(g.V().has('male', true).getBytecode());
assert.ok(script);
assert.strictEqual(script, 'g.V().has(\'male\', true)');
});
it('should produce valid script representation from a traversal object', function () {
- const g = new graph.Graph().traversal();
+ const g = new Graph().traversal();
const script = new Translator('g').translate(g.V().has('male', true));
assert.ok(script);
assert.strictEqual(script, 'g.V().has(\'male\', true)');
});
it('should produce valid script representation of array as step arg', function () {
- const g = new graph.Graph().traversal();
+ const g = new Graph().traversal();
const script = new Translator('g').translate(g.V([1, 2, 3]));
assert.ok(script);
assert.strictEqual(script, 'g.V([1, 2, 3])');
});
it('should translate null', function () {
- const g = new graph.Graph().traversal();
+ const g = new Graph().traversal();
const script = new Translator('g').translate(g.addV('test').property('empty', null));
assert.ok(script);
assert.strictEqual(script, 'g.addV(\'test\').property(\'empty\', null)');
});
it('should translate undefined to null', function () {
- const g = new graph.Graph().traversal();
+ const g = new Graph().traversal();
const script = new Translator('g').translate(g.addV('test').property('empty', undefined));
assert.ok(script);
assert.strictEqual(script, 'g.addV(\'test\').property(\'empty\', null)');
});
it('should properly escape quotes in string literals', function () {
- const g = new graph.Graph().traversal();
+ const g = new Graph().traversal();
const script = new Translator('g').translate(g.addV('test').property('quotes', "some \"quotes' in the middle."));
assert.ok(script);
assert.strictEqual(script, 'g.addV(\'test\').property(\'quotes\', \'some "quotes\\\' in the middle.\')');
});
it('should properly escape quotes in Object values', function () {
- const g = new graph.Graph().traversal();
+ const g = new Graph().traversal();
const o = {key: "some \"quotes' in the middle."}
const script = new Translator('g').translate(g.inject(o));
assert.ok(script);
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/traversal-strategy-test.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/traversal-strategy-test.js
index fbfbcf1..9e78af86 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/traversal-strategy-test.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/traversal-strategy-test.js
@@ -17,10 +17,8 @@
* under the License.
*/
-'use strict';
-
-const assert = require('assert');
-const { TraversalStrategies, OptionsStrategy, ConnectiveStrategy } = require('../../lib/process/traversal-strategy');
+import assert from 'assert';
+import { TraversalStrategies, OptionsStrategy, ConnectiveStrategy } from '../../lib/process/traversal-strategy.js';
describe('TraversalStrategies', function () {
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/traversal-test.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/traversal-test.js
index b051f5b..f1b96d6 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/traversal-test.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/traversal-test.js
@@ -20,25 +20,23 @@
/**
* @author Jorge Bay Gondra
*/
-'use strict';
-const assert = require('assert');
-const expect = require('chai').expect;
-const graph = require('../../lib/structure/graph');
-const anon = require('../../lib/process/anonymous-traversal');
-const t = require('../../lib/process/traversal');
-const gt = require('../../lib/process/graph-traversal');
-const V = gt.statics.V;
-const P = t.P;
-const Bytecode = require('../../lib/process/bytecode');
-const TraversalStrategies = require('../../lib/process/traversal-strategy').TraversalStrategies;
-const RemoteConnection = require('../../lib/driver/remote-connection').RemoteConnection;
+import assert from 'assert';
+import { expect } from 'chai';
+import { Graph, Vertex } from '../../lib/structure/graph.js';
+import anon from '../../lib/process/anonymous-traversal.js';
+import { P, order, direction, Traverser, Traversal } from '../../lib/process/traversal.js';
+import { statics } from '../../lib/process/graph-traversal.js';
+const V = statics.V;
+import Bytecode from '../../lib/process/bytecode.js';
+import { TraversalStrategies } from '../../lib/process/traversal-strategy.js';
+import { RemoteConnection } from '../../lib/driver/remote-connection.js';
describe('Traversal', function () {
describe('#getByteCode()', function () {
it('should add steps for with a string parameter', function () {
- const g = anon.traversal().with_(new graph.Graph());
+ const g = anon.traversal().with_(new Graph());
const bytecode = g.V().out('created').getBytecode();
assert.ok(bytecode);
assert.strictEqual(bytecode.sourceInstructions.length, 0);
@@ -49,8 +47,8 @@
});
it('should add steps with an enum value', function () {
- const g = anon.traversal().with_(new graph.Graph());
- const bytecode = g.V().order().by('age', t.order.desc).getBytecode();
+ const g = anon.traversal().with_(new Graph());
+ const bytecode = g.V().order().by('age', order.desc).getBytecode();
assert.ok(bytecode);
assert.strictEqual(bytecode.sourceInstructions.length, 0);
assert.strictEqual(bytecode.stepInstructions.length, 3);
@@ -64,8 +62,8 @@
});
it('should add steps with Direction aliases from_ and to properly mapped to OUT and IN', function () {
- const g = anon.traversal().with_(new graph.Graph());
- const bytecode = g.V().to(t.direction.from_, 'knows').to(t.direction.in, 'created').getBytecode();
+ const g = anon.traversal().with_(new Graph());
+ const bytecode = g.V().to(direction.from_, 'knows').to(direction.in, 'created').getBytecode();
assert.ok(bytecode);
assert.strictEqual(bytecode.sourceInstructions.length, 0);
assert.strictEqual(bytecode.stepInstructions.length, 3);
@@ -81,7 +79,7 @@
});
it('should configure OptionStrategy for with_()', function () {
- const g = new graph.Graph().traversal();
+ const g = new Graph().traversal();
const bytecode = g.with_('x','test').with_('y').V().getBytecode();
assert.ok(bytecode);
assert.strictEqual(bytecode.sourceInstructions.length, 1);
@@ -98,13 +96,13 @@
it('should apply the strategies and return a Promise with the iterator item', function () {
const strategyMock = {
apply: function (traversal) {
- traversal.traversers = [ new t.Traverser(1, 1), new t.Traverser(2, 1) ];
+ traversal.traversers = [ new Traverser(1, 1), new Traverser(2, 1) ];
return Promise.resolve();
}
};
const strategies = new TraversalStrategies();
strategies.addStrategy(strategyMock);
- const traversal = new t.Traversal(null, strategies, null);
+ const traversal = new Traversal(null, strategies, null);
return traversal.next()
.then(function (item) {
assert.strictEqual(item.value, 1);
@@ -126,13 +124,13 @@
it('should support bulk', function () {
const strategyMock = {
apply: function (traversal) {
- traversal.traversers = [ new t.Traverser(1, 2), new t.Traverser(2, 1) ];
+ traversal.traversers = [ new Traverser(1, 2), new Traverser(2, 1) ];
return Promise.resolve();
}
};
const strategies = new TraversalStrategies();
strategies.addStrategy(strategyMock);
- const traversal = new t.Traversal(null, strategies, null);
+ const traversal = new Traversal(null, strategies, null);
return traversal.next()
.then(function (item) {
assert.strictEqual(item.value, 1);
@@ -160,7 +158,7 @@
if (Symbol.asyncIterator) {
describe('@@asyncIterator', function () {
it('should expose the async iterator', function () {
- const traversal = new t.Traversal(null, null, null);
+ const traversal = new Traversal(null, null, null);
assert.strictEqual(typeof traversal[Symbol.asyncIterator], 'function');
});
});
@@ -171,13 +169,13 @@
it('should apply the strategies and return a Promise with an array', function () {
const strategyMock = {
apply: function (traversal) {
- traversal.traversers = [ new t.Traverser('a', 1), new t.Traverser('b', 1) ];
+ traversal.traversers = [ new Traverser('a', 1), new Traverser('b', 1) ];
return Promise.resolve();
}
};
const strategies = new TraversalStrategies();
strategies.addStrategy(strategyMock);
- const traversal = new t.Traversal(null, strategies, null);
+ const traversal = new Traversal(null, strategies, null);
return traversal.toList().then(function (list) {
assert.ok(list);
assert.deepEqual(list, [ 'a', 'b' ]);
@@ -193,7 +191,7 @@
};
const strategies = new TraversalStrategies();
strategies.addStrategy(strategyMock);
- const traversal = new t.Traversal(null, strategies, null);
+ const traversal = new Traversal(null, strategies, null);
return traversal.toList().then(function (list) {
assert.ok(Array.isArray(list));
assert.strictEqual(list.length, 0);
@@ -203,14 +201,14 @@
it('should support bulk', function () {
const strategyMock = {
apply: function (traversal) {
- traversal.traversers = [ new t.Traverser(1, 1), new t.Traverser(2, 3), new t.Traverser(3, 2),
- new t.Traverser(4, 1) ];
+ traversal.traversers = [ new Traverser(1, 1), new Traverser(2, 3), new Traverser(3, 2),
+ new Traverser(4, 1) ];
return Promise.resolve();
}
};
const strategies = new TraversalStrategies();
strategies.addStrategy(strategyMock);
- const traversal = new t.Traversal(null, strategies, null);
+ const traversal = new Traversal(null, strategies, null);
return traversal.toList()
.then(list => {
expect(list).to.have.members([1, 2, 2, 2, 3, 3, 4]);
@@ -224,13 +222,13 @@
const strategyMock = {
apply: function (traversal) {
applied = true;
- traversal.traversers = [ new t.Traverser('a', 1), new t.Traverser('b', 1) ];
+ traversal.traversers = [ new Traverser('a', 1), new Traverser('b', 1) ];
return Promise.resolve();
}
};
const strategies = new TraversalStrategies();
strategies.addStrategy(strategyMock);
- const traversal = new t.Traversal(null, strategies, new Bytecode());
+ const traversal = new Traversal(null, strategies, new Bytecode());
return traversal.iterate().then(() => {
assert.strictEqual(applied, true);
});
@@ -253,7 +251,7 @@
describe("build", function() {
it('should only allow anonymous child traversals', function() {
- const g = anon.traversal().with_(new graph.Graph());
+ const g = anon.traversal().with_(new Graph());
assert.doesNotThrow(function() {
g.V(0).addE("self").to(V(1))
});
@@ -307,6 +305,68 @@
});
});
});
+
+ describe('#shouldExtractIdFromVertex()', function () {
+ const g = anon.traversal().with_(new Graph());
+ it('should extract ID from Vertex objects for V()', function () {
+ // Test basic V() step with mixed ID types
+ const vStart = g.V(1, new Vertex(2, 'person'));
+ const vStartBytecode = vStart.getBytecode();
+ assert.strictEqual(vStartBytecode.stepInstructions[0][0], 'V');
+ assert.strictEqual(vStartBytecode.stepInstructions[0][1], 1);
+ assert.strictEqual(vStartBytecode.stepInstructions[0][2], 2); // ID should be extracted from Vertex
+
+ // Test V() step in the middle of a traversal
+ const vMid = g.inject('foo').V(1, new Vertex(2, 'person'));
+ const vMidBytecode = vMid.getBytecode();
+ assert.strictEqual(vMidBytecode.stepInstructions[0][0], 'inject');
+ assert.strictEqual(vMidBytecode.stepInstructions[0][1], 'foo');
+ assert.strictEqual(vMidBytecode.stepInstructions[1][0], 'V');
+ assert.strictEqual(vMidBytecode.stepInstructions[1][1], 1);
+ assert.strictEqual(vMidBytecode.stepInstructions[1][2], 2); // ID should be extracted from Vertex
+ });
+ it('should extract ID from Vertex objects for from()/to()', function () {
+ // Test edge creation with from/to vertices
+ const fromTo = g.addE('Edge').from_(new Vertex(1, 'person')).to(new Vertex(2, 'person'));
+ const fromToBytecode = fromTo.getBytecode();
+ assert.strictEqual(fromToBytecode.stepInstructions[0][0], 'addE');
+ assert.strictEqual(fromToBytecode.stepInstructions[0][1], 'Edge');
+ assert.strictEqual(fromToBytecode.stepInstructions[1][0], 'from');
+ assert.strictEqual(fromToBytecode.stepInstructions[1][1], 1); // ID should be extracted from Vertex
+ assert.strictEqual(fromToBytecode.stepInstructions[2][0], 'to');
+ assert.strictEqual(fromToBytecode.stepInstructions[2][1], 2); // ID should be extracted from Vertex
+ });
+ it('should extract ID from Vertex objects for mergeE()', function () {
+ // Test mergeE() with Vertex in map
+ const mergeMap = new Map();
+ mergeMap.set('label', 'knows');
+ mergeMap.set(direction.out, new Vertex(1, 'person'));
+ mergeMap.set(direction.in, new Vertex(2, 'person'));
+
+ const mergeEStart = g.mergeE(mergeMap);
+ const mergeEStartBytecode = mergeEStart.getBytecode();
+ assert.strictEqual(mergeEStartBytecode.stepInstructions[0][0], 'mergeE');
+
+ // Check that the map contains extracted IDs
+ const mergeMapArg = mergeEStartBytecode.stepInstructions[0][1];
+ assert.strictEqual(mergeMapArg.get('label'), 'knows');
+ assert.strictEqual(mergeMapArg.get(direction.out), 1); // ID should be extracted from Vertex
+ assert.strictEqual(mergeMapArg.get(direction.in), 2); // ID should be extracted from Vertex
+
+ // Test mergeE() in the middle of a traversal
+ const mergeEMid = g.inject('foo').mergeE(mergeMap);
+ const mergeEMidBytecode = mergeEMid.getBytecode();
+ assert.strictEqual(mergeEMidBytecode.stepInstructions[0][0], 'inject');
+ assert.strictEqual(mergeEMidBytecode.stepInstructions[0][1], 'foo');
+ assert.strictEqual(mergeEMidBytecode.stepInstructions[1][0], 'mergeE');
+
+ // Check that the map contains extracted IDs
+ const mergeMapArg2 = mergeEMidBytecode.stepInstructions[1][1];
+ assert.strictEqual(mergeMapArg2.get('label'), 'knows');
+ assert.strictEqual(mergeMapArg2.get(direction.out), 1); // ID should be extracted from Vertex
+ assert.strictEqual(mergeMapArg2.get(direction.in), 2); // ID should be extracted from Vertex
+ });
+ });
});
class MockRemoteConnection extends RemoteConnection {
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/tsconfig.json b/gremlin-javascript/src/main/javascript/gremlin-javascript/tsconfig.json
new file mode 100644
index 0000000..f337448
--- /dev/null
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/tsconfig.json
@@ -0,0 +1,10 @@
+{
+ "extends": "@tsconfig/node18/tsconfig.json",
+ "compilerOptions": {
+ "lib": ["DOM", "es2022"],
+ "allowJs": true,
+ "declaration": true,
+ "outDir": "build",
+ },
+ "include": ["lib"],
+}
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/tsconfig.test.json b/gremlin-javascript/src/main/javascript/gremlin-javascript/tsconfig.test.json
new file mode 100644
index 0000000..26bfa5d
--- /dev/null
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/tsconfig.test.json
@@ -0,0 +1,7 @@
+{
+ "extends": "./tsconfig.json",
+ "compilerOptions": {
+ "noEmit": true
+ },
+ "include": ["lib", "test"]
+}
diff --git a/gremlin-language/pom.xml b/gremlin-language/pom.xml
index 42a8506..0d0a1de 100644
--- a/gremlin-language/pom.xml
+++ b/gremlin-language/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>gremlin-language</artifactId>
diff --git a/gremlin-language/src/main/antlr4/Gremlin.g4 b/gremlin-language/src/main/antlr4/Gremlin.g4
index fbe2f37..64cc34c 100644
--- a/gremlin-language/src/main/antlr4/Gremlin.g4
+++ b/gremlin-language/src/main/antlr4/Gremlin.g4
@@ -1517,6 +1517,11 @@
| variable
;
+nullableGenericLiteralMap
+ : genericMapLiteral
+ | nullLiteral
+ ;
+
traversalStrategyVarargs
: traversalStrategyExpr?
;
@@ -2014,7 +2019,7 @@
K_DEDUP: 'dedup';
K_DESC: 'desc';
K_DIFFERENCE: 'difference';
-K_DISCARD: 'discard';
+K_DISCARD : 'discard';
K_DIRECTION: 'Direction';
K_DISJUNCT: 'disjunct';
K_DISTANCE: 'distance';
diff --git a/gremlin-python/docker-compose.yml b/gremlin-python/docker-compose.yml
index 9b5172e..85cec1d 100644
--- a/gremlin-python/docker-compose.yml
+++ b/gremlin-python/docker-compose.yml
@@ -29,20 +29,17 @@
ports:
- "45940:45940"
- "45941:45941"
- - "45942:45942"
- "4588:4588"
volumes:
- ${HOME}/.groovy:/root/.groovy
- ${HOME}/.m2:/root/.m2
- ${ABS_PROJECT_HOME}/gremlin-test/target:/opt/gremlin-test
healthcheck:
- test: [ "CMD-SHELL", "apk add curl && curl -f http://localhost:45940?gremlin=100-1" ]
+ test: [ "CMD-SHELL", "apk add curl && curl -X POST -d {\"gremlin\":\"100-1\"} http://localhost:45940" ]
interval: 30s
timeout: 10s
retries: 30
start_period: 30s
- depends_on:
- - gremlin-socket-server
gremlin-python-integration-tests:
container_name: gremlin-python-integration-tests
@@ -50,32 +47,27 @@
volumes:
- ${BUILD_DIR:-./src/main/python}:/python_app
- ../gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features:/python_app/gremlin-test/features
+ - ../gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary:/python_app/gremlin-test/graphbinary
+ - ../gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson:/python_app/gremlin-test/graphson
- ../docker/gremlin-test-server:/python_app/gremlin-test-server
- - ../gremlin-tools/gremlin-socket-server/conf:/python_app/gremlin-socket-server/conf/
-
environment:
- DEBIAN_FRONTEND=noninteractive
- - KRB5_CONFIG=./gremlin-test-server/krb5.conf
- - KRB5CCNAME=./test-tkt.cc
- - GREMLIN_SERVER_URL=ws://gremlin-server-test-python:{}/gremlin
- - GREMLIN_SERVER_BASIC_AUTH_URL=wss://gremlin-server-test-python:{}/gremlin
- - GREMLIN_SERVER_URL_HTTP=http://gremlin-server-test-python:{}/
- - GREMLIN_SERVER_BASIC_AUTH_URL_HTTP=https://gremlin-server-test-python:{}/
- - KRB_HOSTNAME=${KRB_HOSTNAME:-gremlin-server-test}
+ - GREMLIN_SERVER_URL=http://gremlin-server-test-python:{}/gremlin
+ - GREMLIN_SERVER_BASIC_AUTH_URL=https://gremlin-server-test-python:{}/gremlin
+ - IO_TEST_DIRECTORY=/python_app/gremlin-test/graphbinary/
+ - IO_TEST_DIRECTORY_GRAPHSON=/python_app/gremlin-test/graphson/
- VERSION=${VERSION}
- - GREMLIN_SOCKET_SERVER_URL=ws://gremlin-socket-server-python:{}/gremlin
- - GREMLIN_SOCKET_SERVER_CONFIG_PATH=/python_app/gremlin-socket-server/conf/test-ws-gremlin.yaml
working_dir: /python_app
command: >
- bash -c "apt-get update && apt-get -y install libkrb5-dev krb5-user
- && echo 'password' | kinit stephen
- && klist
- && pip install wheel radish-bdd PyHamcrest aenum isodate kerberos
+ bash -c "pip install wheel radish-bdd PyHamcrest aenum isodate
&& python3 ./setup.py build
&& python3 ./setup.py test
&& python3 ./setup.py install
- && radish -f dots -e -t -b ./radish ./gremlin-test --user-data='serializer=application/vnd.gremlin-v3.0+json'
- && radish -f dots -e -t -b ./radish ./gremlin-test --user-data='serializer=application/vnd.graphbinary-v1.0';
+ && radish -f dots -e -t -b ./radish ./gremlin-test --user-data='serializer=application/vnd.graphbinary-v4.0' --user-data='bulked=true'
+ && radish -f dots -e -t -b ./radish ./gremlin-test --user-data='serializer=application/vnd.graphbinary-v4.0' --user-data='parameterize=true'
+ && radish -f dots -e -t -b ./radish ./gremlin-test --user-data='serializer=application/vnd.graphbinary-v4.0'
+ && radish -f dots -e -t -b ./radish ./gremlin-test --user-data='serializer=application/vnd.gremlin-v4.0+json' --user-data='parameterize=true'
+ && radish -f dots -e -t -b ./radish ./gremlin-test --user-data='serializer=application/vnd.gremlin-v4.0+json';
EXIT_CODE=$$?; chown -R `stat -c "%u:%g" .` .; exit $$EXIT_CODE"
depends_on:
gremlin-server-test-python:
@@ -92,9 +84,3 @@
command: >
bash -c "python3 setup.py sdist bdist_wheel;
EXIT_CODE=$$?; chown -R `stat -c "%u:%g" .` .; exit $$EXIT_CODE"
-
- gremlin-socket-server:
- container_name: gremlin-socket-server-python
- image: tinkerpop/gremlin-socket-server:${GREMLIN_SERVER}
- ports:
- - "45943:45943"
diff --git a/gremlin-python/pom.xml b/gremlin-python/pom.xml
index 4942ac8..1f759a2 100644
--- a/gremlin-python/pom.xml
+++ b/gremlin-python/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>gremlin-python</artifactId>
<name>Apache TinkerPop :: Gremlin Python</name>
diff --git a/gremlin-python/src/main/python/gremlin_python/driver/aiohttp/transport.py b/gremlin-python/src/main/python/gremlin_python/driver/aiohttp/transport.py
index 5b3b2a3..459eeeb 100644
--- a/gremlin-python/src/main/python/gremlin_python/driver/aiohttp/transport.py
+++ b/gremlin-python/src/main/python/gremlin_python/driver/aiohttp/transport.py
@@ -16,141 +16,28 @@
# specific language governing permissions and limitations
# under the License.
#
+import json
+
import aiohttp
import asyncio
-import async_timeout
-from aiohttp import ClientResponseError
+import sys
+if sys.version_info >= (3, 11):
+ import asyncio as async_timeout
+else:
+ import async_timeout
+from aiohttp import ClientPayloadError
+from gremlin_python.driver.protocol import GremlinServerError
from gremlin_python.driver.transport import AbstractBaseTransport
__author__ = 'Lyndon Bauto (lyndonb@bitquilltech.com)'
-class AiohttpTransport(AbstractBaseTransport):
- nest_asyncio_applied = False
-
- def __init__(self, call_from_event_loop=None, read_timeout=None, write_timeout=None, enable_compression=False,
- **kwargs):
- if call_from_event_loop is not None and call_from_event_loop and not AiohttpTransport.nest_asyncio_applied:
- """
- The AiohttpTransport implementation uses the asyncio event loop. Because of this, it cannot be called
- within an event loop without nest_asyncio. If the code is ever refactored so that it can be called
- within an event loop this import and call can be removed. Without this, applications which use the
- event loop to call gremlin-python (such as Jupyter) will not work.
- """
- import nest_asyncio
- nest_asyncio.apply()
- AiohttpTransport.nest_asyncio_applied = True
-
- # Start event loop and initialize websocket and client to None
- self._loop = asyncio.new_event_loop()
- self._websocket = None
- self._client_session = None
-
- # Set all inner variables to parameters passed in.
- self._aiohttp_kwargs = kwargs
- self._write_timeout = write_timeout
- self._read_timeout = read_timeout
- self._enable_compression = enable_compression
- if "max_content_length" in self._aiohttp_kwargs:
- self._aiohttp_kwargs["max_msg_size"] = self._aiohttp_kwargs.pop("max_content_length")
- if "max_msg_size" not in self._aiohttp_kwargs:
- self._aiohttp_kwargs["max_msg_size"] = 10 * 1024 * 1024
- if "ssl_options" in self._aiohttp_kwargs:
- self._aiohttp_kwargs["ssl"] = self._aiohttp_kwargs.pop("ssl_options")
- if self._enable_compression and "compress" not in self._aiohttp_kwargs:
- self._aiohttp_kwargs["compress"] = 15 # enable per-message deflate compression with 32k sliding window size
-
- def __del__(self):
- # Close will only actually close if things are left open, so this is safe to call.
- # Clean up any connection resources and close the event loop.
- self.close()
-
- def connect(self, url, headers=None):
- # Inner function to perform async connect.
- async def async_connect():
- # Start client session and use it to create a websocket with all the connection options provided.
- self._client_session = aiohttp.ClientSession(loop=self._loop)
- try:
- self._websocket = await self._client_session.ws_connect(url, **self._aiohttp_kwargs, headers=headers)
- except ClientResponseError as err:
- # If 403, just send forbidden because in some cases this prints out a huge verbose message
- # that includes credentials.
- if err.status == 403:
- raise Exception('Failed to connect to server: HTTP Error code 403 - Forbidden.')
- else:
- raise
-
- # Execute the async connect synchronously.
- self._loop.run_until_complete(async_connect())
-
- def write(self, message):
- # Inner function to perform async write.
- async def async_write():
- async with async_timeout.timeout(self._write_timeout):
- await self._websocket.send_bytes(message)
-
- # Execute the async write synchronously.
- self._loop.run_until_complete(async_write())
-
- def read(self):
- # Inner function to perform async read.
- async def async_read():
- async with async_timeout.timeout(self._read_timeout):
- return await self._websocket.receive()
-
- # Execute the async read synchronously.
- msg = self._loop.run_until_complete(async_read())
-
- # Need to handle multiple potential message types.
- if msg.type == aiohttp.WSMsgType.close:
- # Server is closing connection, shutdown and throw exception.
- self.close()
- raise RuntimeError("Connection was closed by server.")
- elif msg.type == aiohttp.WSMsgType.closed:
- # Should not be possible since our loop and socket would be closed.
- raise RuntimeError("Connection was already closed.")
- elif msg.type == aiohttp.WSMsgType.error:
- # Error on connection, try to convert message to a string in error.
- raise RuntimeError("Received error on read: '" + str(msg.data) + "'")
- elif msg.type == aiohttp.WSMsgType.text:
- # Convert message to bytes.
- data = msg.data.strip().encode('utf-8')
- else:
- # General handle, return byte data.
- data = msg.data
- return data
-
- def close(self):
- # Inner function to perform async close.
- async def async_close():
- if self._websocket is not None and not self._websocket.closed:
- await self._websocket.close()
- self._websocket = None
-
- if self._client_session is not None and not self._client_session.closed:
- await self._client_session.close()
- self._client_session = None
-
- # If the loop is not closed (connection hasn't already been closed)
- if not self._loop.is_closed():
- # Execute the async close synchronously.
- self._loop.run_until_complete(async_close())
-
- # Close the event loop.
- self._loop.close()
-
- @property
- def closed(self):
- # Connection is closed if either the websocket or the client session is closed.
- return self._websocket.closed or self._client_session.closed
-
-
class AiohttpHTTPTransport(AbstractBaseTransport):
nest_asyncio_applied = False
def __init__(self, call_from_event_loop=None, read_timeout=None, write_timeout=None, **kwargs):
- if call_from_event_loop is not None and call_from_event_loop and not AiohttpTransport.nest_asyncio_applied:
+ if call_from_event_loop is not None and call_from_event_loop and not AiohttpHTTPTransport.nest_asyncio_applied:
"""
The AiohttpTransport implementation uses the asyncio event loop. Because of this, it cannot be called
within an event loop without nest_asyncio. If the code is ever refactored so that it can be called
@@ -159,18 +46,23 @@
"""
import nest_asyncio
nest_asyncio.apply()
- AiohttpTransport.nest_asyncio_applied = True
+ AiohttpHTTPTransport.nest_asyncio_applied = True
# Start event loop and initialize client session and response to None
self._loop = asyncio.new_event_loop()
self._client_session = None
self._http_req_resp = None
self._enable_ssl = False
+ self._url = None
# Set all inner variables to parameters passed in.
self._aiohttp_kwargs = kwargs
self._write_timeout = write_timeout
self._read_timeout = read_timeout
+ if "max_content_length" in self._aiohttp_kwargs:
+ self._max_content_len = self._aiohttp_kwargs.pop("max_content_length")
+ else:
+ self._max_content_len = 10 * 1024 * 1024
if "ssl_options" in self._aiohttp_kwargs:
self._ssl_context = self._aiohttp_kwargs.pop("ssl_options")
self._enable_ssl = True
@@ -181,17 +73,17 @@
self.close()
def connect(self, url, headers=None):
+ self._url = url
# Inner function to perform async connect.
async def async_connect():
- # Start client session and use it to send all HTTP requests. Base url is the endpoint, headers are set here
- # Base url can only parse basic url with no path, see https://github.com/aio-libs/aiohttp/issues/6647
+ # Start client session and use it to send all HTTP requests. Headers can be set here.
if self._enable_ssl:
# ssl context is established through tcp connector
tcp_conn = aiohttp.TCPConnector(ssl_context=self._ssl_context)
self._client_session = aiohttp.ClientSession(connector=tcp_conn,
- base_url=url, headers=headers, loop=self._loop)
+ headers=headers, loop=self._loop)
else:
- self._client_session = aiohttp.ClientSession(base_url=url, headers=headers, loop=self._loop)
+ self._client_session = aiohttp.ClientSession(headers=headers, loop=self._loop)
# Execute the async connect synchronously.
self._loop.run_until_complete(async_connect())
@@ -199,13 +91,13 @@
def write(self, message):
# Inner function to perform async write.
async def async_write():
- basic_auth = None
- # basic password authentication for https connections
+ # To pass url into message for request authentication processing
+ message.update({'url': self._url})
if message['auth']:
- basic_auth = aiohttp.BasicAuth(message['auth']['username'], message['auth']['password'])
+ message['auth'](message)
+
async with async_timeout.timeout(self._write_timeout):
- self._http_req_resp = await self._client_session.post(url="/gremlin",
- auth=basic_auth,
+ self._http_req_resp = await self._client_session.post(url=self._url,
data=message['payload'],
headers=message['headers'],
**self._aiohttp_kwargs)
@@ -213,13 +105,59 @@
# Execute the async write synchronously.
self._loop.run_until_complete(async_write())
- def read(self):
+ def read(self, stream_chunk=None):
+ if not stream_chunk:
+ '''
+ GraphSON does not support streaming deserialization, we are aggregating data and bypassing streamed
+ deserialization while GraphSON is enabled for testing. Remove after GraphSON is removed.
+ '''
+ async def async_read():
+ async with async_timeout.timeout(self._read_timeout):
+ data_buffer = b""
+ async for data, end_of_http_chunk in self._http_req_resp.content.iter_chunks():
+ try:
+ data_buffer += data
+ except ClientPayloadError:
+ # server disconnect during streaming will cause ClientPayLoadError from aiohttp
+ raise GremlinServerError({'code': 500,
+ 'message': 'Server disconnected - please try to reconnect',
+ 'exception': ClientPayloadError})
+ if self._max_content_len and len(
+ data_buffer) > self._max_content_len:
+ raise Exception(f'Response size {len(data_buffer)} exceeds limit {self._max_content_len} bytes')
+ if self._http_req_resp.headers.get('content-type') == 'application/json':
+ message = json.loads(data_buffer.decode('utf-8'))
+ err = message.get('message')
+ raise Exception(f'Server disconnected with error message: "{err}" - please try to reconnect')
+ return data_buffer
+ return self._loop.run_until_complete(async_read())
+ # raise Exception('missing handling of streamed responses to protocol')
+
# Inner function to perform async read.
async def async_read():
+ # TODO: potentially refactor to just use streaming and remove transport/protocol
async with async_timeout.timeout(self._read_timeout):
- return {"content": await self._http_req_resp.read(),
- "ok": self._http_req_resp.ok,
- "status": self._http_req_resp.status}
+ read_completed = False
+ # aiohttp streaming may not iterate through one whole chunk if it's too large, need to buffer it
+ data_buffer = b""
+ async for data, end_of_http_chunk in self._http_req_resp.content.iter_chunks():
+ try:
+ data_buffer += data
+ if end_of_http_chunk:
+ if self._max_content_len and len(
+ data_buffer) > self._max_content_len:
+ raise Exception( # TODO: do we need proper exception class for this?
+ f'Response size {len(data_buffer)} exceeds limit {self._max_content_len} bytes')
+ stream_chunk(data_buffer, read_completed, self._http_req_resp.ok)
+ data_buffer = b""
+ except ClientPayloadError:
+ # server disconnect during streaming will cause ClientPayLoadError from aiohttp
+ # TODO: double check during refactoring
+ raise GremlinServerError({'code': 500,
+ 'message': 'Server disconnected - please try to reconnect',
+ 'exception': ClientPayloadError})
+ read_completed = True
+ stream_chunk(data_buffer, read_completed, self._http_req_resp.ok)
return self._loop.run_until_complete(async_read())
diff --git a/gremlin-python/src/main/python/gremlin_python/driver/auth.py b/gremlin-python/src/main/python/gremlin_python/driver/auth.py
new file mode 100644
index 0000000..dd7a161
--- /dev/null
+++ b/gremlin-python/src/main/python/gremlin_python/driver/auth.py
@@ -0,0 +1,55 @@
+#
+# 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.
+#
+
+
+def basic(username, password):
+ from aiohttp import BasicAuth as aiohttpBasicAuth
+
+ def apply(request):
+ return request['headers'].update({'authorization': aiohttpBasicAuth(username, password).encode()})
+
+ return apply
+
+
+def sigv4(region, service):
+ import os
+ from boto3 import Session
+ from botocore.auth import SigV4Auth
+ from botocore.awsrequest import AWSRequest
+
+ def apply(request):
+ access_key = os.environ.get('AWS_ACCESS_KEY_ID', '')
+ secret_key = os.environ.get('AWS_SECRET_ACCESS_KEY', '')
+ session_token = os.environ.get('AWS_SESSION_TOKEN', '')
+
+ session = Session(
+ aws_access_key_id=access_key,
+ aws_secret_access_key=secret_key,
+ aws_session_token=session_token,
+ region_name=region
+ )
+
+ sigv4_request = AWSRequest(method="POST", url=request['url'], data=request['payload'])
+ SigV4Auth(session.get_credentials(), service, region).add_auth(sigv4_request)
+ request['headers'].update(sigv4_request.headers)
+ request['payload'] = sigv4_request.data
+ return request
+
+ return apply
+
diff --git a/gremlin-python/src/main/python/gremlin_python/driver/client.py b/gremlin-python/src/main/python/gremlin_python/driver/client.py
index 955ade8..68a4aa0 100644
--- a/gremlin-python/src/main/python/gremlin_python/driver/client.py
+++ b/gremlin-python/src/main/python/gremlin_python/driver/client.py
@@ -19,11 +19,9 @@
import logging
import warnings
import queue
-import re
from concurrent.futures import ThreadPoolExecutor
from gremlin_python.driver import connection, protocol, request, serializer
-from gremlin_python.process import traversal
log = logging.getLogger("gremlinpython")
@@ -38,69 +36,51 @@
__author__ = 'David M. Brown (davebshow@gmail.com), Lyndon Bauto (lyndonb@bitquilltech.com)'
+# TODO: remove session, update connection pooling, etc.
class Client:
def __init__(self, url, traversal_source, protocol_factory=None,
transport_factory=None, pool_size=None, max_workers=None,
- message_serializer=None, username="", password="",
- kerberized_service="", headers=None, session=None,
- enable_user_agent_on_connect=True, enable_compression=False,
- **transport_kwargs):
+ request_serializer=serializer.GraphBinarySerializersV4(),
+ response_serializer=None, interceptors=None, auth=None,
+ headers=None, enable_user_agent_on_connect=True,
+ bulk_results=False, **transport_kwargs):
log.info("Creating Client with url '%s'", url)
- # check via url that we are using http protocol
- self._use_http = re.search('^http', url)
-
self._closed = False
self._url = url
self._headers = headers
self._enable_user_agent_on_connect = enable_user_agent_on_connect
+ self._bulk_results = bulk_results
self._traversal_source = traversal_source
- self._enable_compression = enable_compression
- if not self._use_http and "max_content_length" not in transport_kwargs:
+ if "max_content_length" not in transport_kwargs:
transport_kwargs["max_content_length"] = 10 * 1024 * 1024
- if message_serializer is None:
- message_serializer = serializer.GraphBinarySerializersV1()
+ if response_serializer is None:
+ response_serializer = serializer.GraphBinarySerializersV4()
- self._message_serializer = message_serializer
- self._username = username
- self._password = password
- self._session = session
- self._session_enabled = (session is not None and session != "")
+ self._auth = auth
+ self._response_serializer = response_serializer
+
if transport_factory is None:
try:
- from gremlin_python.driver.aiohttp.transport import (
- AiohttpTransport, AiohttpHTTPTransport)
+ from gremlin_python.driver.aiohttp.transport import AiohttpHTTPTransport
except ImportError:
raise Exception("Please install AIOHTTP or pass "
"custom transport factory")
else:
def transport_factory():
- if self._use_http:
- return AiohttpHTTPTransport(**transport_kwargs)
- else:
- return AiohttpTransport(enable_compression=enable_compression, **transport_kwargs)
+ if self._protocol_factory is None:
+ self._protocol_factory = protocol_factory
+ return AiohttpHTTPTransport(**transport_kwargs)
self._transport_factory = transport_factory
+
if protocol_factory is None:
def protocol_factory():
- if self._use_http:
- return protocol.GremlinServerHTTPProtocol(
- self._message_serializer,
- username=self._username,
- password=self._password)
- else:
- return protocol.GremlinServerWSProtocol(
- self._message_serializer,
- username=self._username,
- password=self._password,
- kerberized_service=kerberized_service,
- max_content_length=transport_kwargs["max_content_length"])
+ return protocol.GremlinServerHTTPProtocol(
+ request_serializer, response_serializer, auth=self._auth,
+ interceptors=interceptors)
self._protocol_factory = protocol_factory
- if self._session_enabled:
- if pool_size is None:
- pool_size = 1
- elif pool_size != 1:
- raise Exception("PoolSize must be 1 on session mode!")
+
if pool_size is None:
pool_size = 8
self._pool_size = pool_size
@@ -117,6 +97,9 @@
@property
def available_pool_size(self):
return self._pool.qsize()
+
+ def response_serializer(self):
+ return self._response_serializer
@property
def executor(self):
@@ -140,8 +123,6 @@
if self._closed:
return
- if self._session_enabled:
- self._close_session()
log.info("Closing Client with url '%s'", self._url)
while not self._pool.empty():
conn = self._pool.get(True)
@@ -149,17 +130,6 @@
self._executor.shutdown()
self._closed = True
- def _close_session(self):
- message = request.RequestMessage(
- processor='session', op='close',
- args={'session': str(self._session)})
- conn = self._pool.get(True)
- try:
- write_result_set = conn.write(message).result()
- return write_result_set.all().result() # wait for _receive() to finish
- except protocol.GremlinServerError:
- pass
-
def _get_connection(self):
protocol = self._protocol_factory()
return connection.Connection(
@@ -182,25 +152,30 @@
raise Exception("Client is closed")
log.debug("message '%s'", str(message))
- args = {'gremlin': message, 'aliases': {'g': self._traversal_source}}
- processor = ''
- op = 'eval'
- if isinstance(message, traversal.Bytecode):
- op = 'bytecode'
- processor = 'traversal'
+ fields = {'g': self._traversal_source}
+ # TODO: bindings is now part of request_options, evaluate the need to keep it separate in python.
+ # Note this bindings parameter only applies to string script submissions
if isinstance(message, str) and bindings:
- args['bindings'] = bindings
+ fields['bindings'] = bindings
- if self._session_enabled:
- args['session'] = str(self._session)
- processor = 'session'
-
- if isinstance(message, traversal.Bytecode) or isinstance(message, str):
- log.debug("processor='%s', op='%s', args='%s'", str(processor), str(op), str(args))
- message = request.RequestMessage(processor=processor, op=op, args=args)
+ if isinstance(message, str):
+ log.debug("fields='%s', gremlin='%s'", str(fields), str(message))
+ message = request.RequestMessage(fields=fields, gremlin=message)
conn = self._pool.get(True)
if request_options:
- message.args.update(request_options)
+ message.fields.update({token: request_options[token] for token in request.Tokens
+ if token in request_options and token != 'bindings'})
+ if 'bindings' in request_options:
+ if 'bindings' in message.fields:
+ message.fields['bindings'].update(request_options['bindings'])
+ else:
+ message.fields['bindings'] = request_options['bindings']
+ if 'params' in request_options:
+ if 'bindings' in message.fields:
+ message.fields['bindings'].update(request_options['params'])
+ else:
+ message.fields['bindings'] = request_options['params']
+
return conn.write(message)
diff --git a/gremlin-python/src/main/python/gremlin_python/driver/connection.py b/gremlin-python/src/main/python/gremlin_python/driver/connection.py
index 9df9dbc..7c64ee8 100644
--- a/gremlin-python/src/main/python/gremlin_python/driver/connection.py
+++ b/gremlin-python/src/main/python/gremlin_python/driver/connection.py
@@ -14,7 +14,6 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-import uuid
import queue
from concurrent.futures import Future
@@ -26,7 +25,8 @@
class Connection:
def __init__(self, url, traversal_source, protocol, transport_factory,
- executor, pool, headers=None, enable_user_agent_on_connect=True):
+ executor, pool, headers=None, enable_user_agent_on_connect=True,
+ bulk_results=False):
self._url = url
self._headers = headers
self._traversal_source = traversal_source
@@ -35,11 +35,14 @@
self._executor = executor
self._transport = None
self._pool = pool
- self._results = {}
+ self._result_set = None
self._inited = False
self._enable_user_agent_on_connect = enable_user_agent_on_connect
if self._enable_user_agent_on_connect:
self.__add_header(useragent.userAgentHeader, useragent.userAgent)
+ self._bulk_results = bulk_results
+ if self._bulk_results:
+ self.__add_header("bulkResults", "true")
def connect(self):
if self._transport:
@@ -56,17 +59,11 @@
def write(self, request_message):
if not self._inited:
self.connect()
- if request_message.args.get("requestId"):
- request_id = str(request_message.args.get("requestId"))
- uuid.UUID(request_id) # Checks for proper UUID or else server will return an error.
- else:
- request_id = str(uuid.uuid4())
- result_set = resultset.ResultSet(queue.Queue(), request_id)
- self._results[request_id] = result_set
+ self._result_set = resultset.ResultSet(queue.Queue())
# Create write task
future = Future()
future_write = self._executor.submit(
- self._protocol.write, request_id, request_message)
+ self._protocol.write, request_message)
def cb(f):
try:
@@ -77,22 +74,27 @@
else:
# Start receive task
done = self._executor.submit(self._receive)
- result_set.done = done
- future.set_result(result_set)
+ self._result_set.done = done
+ future.set_result(self._result_set)
future_write.add_done_callback(cb)
return future
def _receive(self):
try:
- while True:
- data = self._transport.read()
- status_code = self._protocol.data_received(data, self._results)
- if status_code != 206:
- break
+ '''
+ GraphSON does not support streaming deserialization, we are aggregating data and bypassing streamed
+ deserialization while GraphSON is enabled for testing. Remove after GraphSON is removed.
+ '''
+ self._protocol.data_received_aggregate(self._transport.read(), self._result_set)
+ # re-enable streaming after graphSON removal
+ # self._transport.read(self.stream_chunk)
finally:
self._pool.put_nowait(self)
+ def stream_chunk(self, chunk_data, read_completed=None, http_req_resp=None):
+ self._protocol.data_received(chunk_data, self._result_set, read_completed, http_req_resp)
+
def __add_header(self, key, value):
if self._headers is None:
self._headers = dict()
diff --git a/gremlin-python/src/main/python/gremlin_python/driver/driver_remote_connection.py b/gremlin-python/src/main/python/gremlin_python/driver/driver_remote_connection.py
index 58080f6..58dd12d 100644
--- a/gremlin-python/src/main/python/gremlin_python/driver/driver_remote_connection.py
+++ b/gremlin-python/src/main/python/gremlin_python/driver/driver_remote_connection.py
@@ -21,11 +21,8 @@
import warnings
from gremlin_python.driver import client, serializer
-from gremlin_python.driver.remote_connection import (
- RemoteConnection, RemoteTraversal)
-from gremlin_python.process.strategies import OptionsStrategy
-from gremlin_python.process.traversal import Bytecode
-import uuid
+from gremlin_python.driver.remote_connection import RemoteConnection, RemoteTraversal
+from gremlin_python.driver.request import Tokens
log = logging.getLogger("gremlinpython")
@@ -36,10 +33,10 @@
def __init__(self, url, traversal_source="g", protocol_factory=None,
transport_factory=None, pool_size=None, max_workers=None,
- username="", password="", kerberized_service='',
- message_serializer=None, graphson_reader=None,
- graphson_writer=None, headers=None, session=None,
- enable_user_agent_on_connect=True, enable_compression=False, **transport_kwargs):
+ request_serializer=serializer.GraphBinarySerializersV4(),
+ response_serializer=None, interceptors=None, auth=None,
+ headers=None, enable_user_agent_on_connect=True,
+ bulk_results=False, **transport_kwargs):
log.info("Creating DriverRemoteConnection with url '%s'", str(url))
self.__url = url
self.__traversal_source = traversal_source
@@ -47,63 +44,39 @@
self.__transport_factory = transport_factory
self.__pool_size = pool_size
self.__max_workers = max_workers
- self.__username = username
- self.__password = password
- self.__kerberized_service = kerberized_service
- self.__message_serializer = message_serializer
- self.__graphson_reader = graphson_reader
- self.__graphson_writer = graphson_writer
+ self.__auth = auth
self.__headers = headers
- self.__session = session
self.__enable_user_agent_on_connect = enable_user_agent_on_connect
- self.__enable_compression = enable_compression
+ self.__bulk_results = bulk_results
self.__transport_kwargs = transport_kwargs
- # keeps a list of sessions that have been spawned from this DriverRemoteConnection
- # so that they can be closed if this parent session is closed.
- self.__spawned_sessions = []
-
- if message_serializer is None and graphson_reader is not None and graphson_writer is not None:
- message_serializer = serializer.GraphSONMessageSerializer(
- reader=graphson_reader,
- writer=graphson_writer)
+ if response_serializer is None:
+ response_serializer = serializer.GraphBinarySerializersV4()
self._client = client.Client(url, traversal_source,
protocol_factory=protocol_factory,
transport_factory=transport_factory,
pool_size=pool_size,
max_workers=max_workers,
- message_serializer=message_serializer,
- username=username,
- password=password,
- kerberized_service=kerberized_service,
+ request_serializer=request_serializer,
+ response_serializer=response_serializer,
+ interceptors=interceptors, auth=auth,
headers=headers,
- session=session,
enable_user_agent_on_connect=enable_user_agent_on_connect,
- enable_compression=enable_compression,
+ bulk_results=bulk_results,
**transport_kwargs)
self._url = self._client._url
self._traversal_source = self._client._traversal_source
def close(self):
- # close this client and any DriverRemoteConnection instances spawned from this one
- # for a session
- if len(self.__spawned_sessions) > 0:
- log.info("closing spawned sessions from DriverRemoteConnection with url '%s'", str(self._url))
- for spawned_session in self.__spawned_sessions:
- spawned_session.close()
- self.__spawned_sessions.clear()
-
- if self.__session:
- log.info("closing DriverRemoteConnection with url '%s' with session '%s'",
- str(self._url), str(self.__session))
- else:
- log.info("closing DriverRemoteConnection with url '%s'", str(self._url))
+ log.info("closing DriverRemoteConnection with url '%s'", str(self._url))
self._client.close()
- def submit(self, bytecode):
- log.debug("submit with bytecode '%s'", str(bytecode))
- result_set = self._client.submit(bytecode, request_options=self._extract_request_options(bytecode))
+ def submit(self, gremlin_lang):
+ log.debug("submit with gremlin lang script '%s'", gremlin_lang.get_gremlin())
+ gremlin_lang.add_g(self._traversal_source)
+ result_set = self._client.submit(gremlin_lang.get_gremlin(),
+ request_options=self.extract_request_options(gremlin_lang))
results = result_set.all().result()
return RemoteTraversal(iter(results))
@@ -114,10 +87,12 @@
DeprecationWarning)
self.submit_async(message, bindings, request_options)
- def submit_async(self, bytecode):
- log.debug("submit_async with bytecode '%s'", str(bytecode))
+ def submit_async(self, gremlin_lang):
+ log.debug("submit_async with gremlin lang script '%s'", gremlin_lang.get_gremlin())
future = Future()
- future_result_set = self._client.submit_async(bytecode, request_options=self._extract_request_options(bytecode))
+ gremlin_lang.add_g(self._traversal_source)
+ future_result_set = self._client.submit_async(gremlin_lang.get_gremlin(),
+ request_options=self.extract_request_options(gremlin_lang))
def cb(f):
try:
@@ -133,51 +108,25 @@
def is_closed(self):
return self._client.is_closed()
- def is_session_bound(self):
- return self.__session is not None
-
- def create_session(self):
- log.info("Creating session based connection")
- if self.is_session_bound():
- raise Exception('Connection is already bound to a session - child sessions are not allowed')
- conn = DriverRemoteConnection(self.__url,
- traversal_source=self.__traversal_source,
- protocol_factory=self.__protocol_factory,
- transport_factory=self.__transport_factory,
- pool_size=self.__pool_size,
- max_workers=self.__max_workers,
- username=self.__username,
- password=self.__password,
- kerberized_service=self.__kerberized_service,
- message_serializer=self.__message_serializer,
- graphson_reader=self.__graphson_reader,
- graphson_writer=self.__graphson_writer,
- headers=self.__headers,
- session=uuid.uuid4(),
- enable_user_agent_on_connect=self.__enable_user_agent_on_connect,
- **self.__transport_kwargs)
- self.__spawned_sessions.append(conn)
- return conn
-
- def remove_session(self, session_based_connection):
- session_based_connection.close()
- self.__spawned_sessions.remove(session_based_connection)
-
- def commit(self):
- log.info("Submitting commit graph operation.")
- return self._client.submit(Bytecode.GraphOp.commit())
-
- def rollback(self):
- log.info("Submitting rollback graph operation.")
- return self._client.submit(Bytecode.GraphOp.rollback())
+ # TODO remove or update once HTTP transaction is implemented
+ # def commit(self):
+ # log.info("Submitting commit graph operation.")
+ # return self._client.submit(Bytecode.GraphOp.commit())
+ #
+ # def rollback(self):
+ # log.info("Submitting rollback graph operation.")
+ # return self._client.submit(Bytecode.GraphOp.rollback())
@staticmethod
- def _extract_request_options(bytecode):
- options_strategy = next((x for x in bytecode.source_instructions
- if x[0] == "withStrategies" and type(x[1]) is OptionsStrategy), None)
- request_options = None
- if options_strategy:
- allowed_keys = ['evaluationTimeout', 'scriptEvaluationTimeout', 'batchSize', 'requestId', 'userAgent', 'materializeProperties']
- request_options = {allowed: options_strategy[1].configuration[allowed] for allowed in allowed_keys
- if allowed in options_strategy[1].configuration}
+ def extract_request_options(gremlin_lang):
+ request_options = {}
+ for os in gremlin_lang.options_strategies:
+ request_options.update({token: os.configuration[token] for token in Tokens
+ if token in os.configuration})
+ # request the server to bulk results by default when using drc through request options
+ if 'bulkResults' not in request_options:
+ request_options['bulkResults'] = True
+ if gremlin_lang.parameters is not None and len(gremlin_lang.parameters) > 0:
+ request_options["params"] = gremlin_lang.parameters
+
return request_options
diff --git a/gremlin-python/src/main/python/gremlin_python/driver/protocol.py b/gremlin-python/src/main/python/gremlin_python/driver/protocol.py
index 6afd7c2..48c709d 100644
--- a/gremlin-python/src/main/python/gremlin_python/driver/protocol.py
+++ b/gremlin-python/src/main/python/gremlin_python/driver/protocol.py
@@ -16,18 +16,8 @@
# specific language governing permissions and limitations
# under the License.
#
-import json
import logging
import abc
-import base64
-import struct
-
-# import kerberos Optional dependency imported in relevant codeblock
-
-from gremlin_python.driver import request
-from gremlin_python.driver.resultset import ResultSet
-from gremlin_python.process.translator import Translator
-from gremlin_python.process.traversal import Bytecode
log = logging.getLogger("gremlinpython")
@@ -37,13 +27,9 @@
class GremlinServerError(Exception):
def __init__(self, status):
super(GremlinServerError, self).__init__('{0}: {1}'.format(status['code'], status['message']))
- self._status_attributes = status['attributes']
self.status_code = status['code']
self.status_message = status['message']
-
- @property
- def status_attributes(self):
- return self._status_attributes
+ self.status_exception = status['exception']
class ConfigurationError(Exception):
@@ -57,203 +43,133 @@
self._transport = transport
@abc.abstractmethod
- def data_received(self, message, results_dict):
+ def data_received(self, message, result_set):
pass
@abc.abstractmethod
- def write(self, request_id, request_message):
+ def write(self, request_message):
pass
-class GremlinServerWSProtocol(AbstractBaseProtocol):
- QOP_AUTH_BIT = 1
- _kerberos_context = None
- _max_content_length = 10 * 1024 * 1024
-
- def __init__(self,
- message_serializer,
- username='', password='',
- kerberized_service='',
- max_content_length=10 * 1024 * 1024):
- self._message_serializer = message_serializer
- self._username = username
- self._password = password
- self._kerberized_service = kerberized_service
- self._max_content_length = max_content_length
-
- def connection_made(self, transport):
- super(GremlinServerWSProtocol, self).connection_made(transport)
-
- def write(self, request_id, request_message):
- message = self._message_serializer.serialize_message(request_id, request_message)
- self._transport.write(message)
-
- def data_received(self, message, results_dict):
- # if Gremlin Server cuts off then we get a None for the message
- if message is None:
- log.error("Received empty message from server.")
- raise GremlinServerError({'code': 500,
- 'message': 'Server disconnected - please try to reconnect', 'attributes': {}})
-
- message = self._message_serializer.deserialize_message(message)
- request_id = message['requestId']
- result_set = results_dict[request_id] if request_id in results_dict else ResultSet(None, None)
- status_code = message['status']['code']
- aggregate_to = message['result']['meta'].get('aggregateTo', 'list')
- data = message['result']['data']
- result_set.aggregate_to = aggregate_to
- if status_code == 407:
- if self._username and self._password:
- auth_bytes = b''.join([b'\x00', self._username.encode('utf-8'),
- b'\x00', self._password.encode('utf-8')])
- auth = base64.b64encode(auth_bytes)
- request_message = request.RequestMessage(
- 'traversal', 'authentication', {'sasl': auth.decode()})
- elif self._kerberized_service:
- request_message = self._kerberos_received(message)
- else:
- error_message = 'Gremlin server requires authentication credentials in DriverRemoteConnection. ' \
- 'For basic authentication provide username and password. ' \
- 'For kerberos authentication provide the kerberized_service parameter.'
- log.error(error_message)
- raise ConfigurationError(error_message)
- self.write(request_id, request_message)
- data = self._transport.read()
- # Allow for auth handshake with multiple steps
- return self.data_received(data, results_dict)
- elif status_code == 204:
- result_set.stream.put_nowait([])
- del results_dict[request_id]
- return status_code
- elif status_code in [200, 206]:
- result_set.stream.put_nowait(data)
- if status_code == 200:
- result_set.status_attributes = message['status']['attributes']
- del results_dict[request_id]
- return status_code
- else:
- # This message is going to be huge and kind of hard to read, but in the event of an error,
- # it can provide invaluable info, so space it out appropriately.
- log.error("\r\nReceived error message '%s'\r\n\r\nWith results dictionary '%s'",
- str(message), str(results_dict))
- del results_dict[request_id]
- raise GremlinServerError(message['status'])
-
- def _kerberos_received(self, message):
- # Inspired by: https://github.com/thobbs/pure-sasl/blob/0.6.2/puresasl/mechanisms.py
- # https://github.com/thobbs/pure-sasl/blob/0.6.2/LICENSE
- try:
- import kerberos
- except ImportError:
- raise ImportError('Please install gremlinpython[kerberos].')
-
- # First pass: get service granting ticket and return it to gremlin-server
- if not self._kerberos_context:
- try:
- _, kerberos_context = kerberos.authGSSClientInit(
- self._kerberized_service, gssflags=kerberos.GSS_C_MUTUAL_FLAG)
- kerberos.authGSSClientStep(kerberos_context, '')
- auth = kerberos.authGSSClientResponse(kerberos_context)
- self._kerberos_context = kerberos_context
- except kerberos.KrbError as e:
- raise ConfigurationError(
- 'Kerberos authentication requires a valid service name in DriverRemoteConnection, '
- 'as well as a valid tgt (export KRB5CCNAME) or keytab (export KRB5_KTNAME): ' + str(e))
- return request.RequestMessage('', 'authentication', {'sasl': auth})
-
- # Second pass: completion of authentication
- sasl_response = message['status']['attributes']['sasl']
- if not self._username:
- result_code = kerberos.authGSSClientStep(self._kerberos_context, sasl_response)
- if result_code == kerberos.AUTH_GSS_COMPLETE:
- self._username = kerberos.authGSSClientUserName(self._kerberos_context)
- return request.RequestMessage('', 'authentication', {'sasl': ''})
-
- # Third pass: sasl quality of protection (qop) handshake
-
- # Gremlin-server Krb5Authenticator only supports qop=QOP_AUTH; use ssl for confidentiality.
- # Handshake content format:
- # byte 0: the selected qop. 1==auth, 2==auth-int, 4==auth-conf
- # byte 1-3: the max length for any buffer sent back and forth on this connection. (big endian)
- # the rest of the buffer: the authorization user name in UTF-8 - not null terminated.
- kerberos.authGSSClientUnwrap(self._kerberos_context, sasl_response)
- data = kerberos.authGSSClientResponse(self._kerberos_context)
- plaintext_data = base64.b64decode(data)
- assert len(plaintext_data) == 4, "Unexpected response from gremlin server sasl handshake"
- word, = struct.unpack('!I', plaintext_data)
- qop_bits = word >> 24
- assert self.QOP_AUTH_BIT & qop_bits, "Unexpected sasl qop level received from gremlin server"
-
- name_length = len(self._username)
- fmt = '!I' + str(name_length) + 's'
- word = self.QOP_AUTH_BIT << 24 | self._max_content_length
- out = struct.pack(fmt, word, self._username.encode("utf-8"), )
- encoded = base64.b64encode(out).decode('ascii')
- kerberos.authGSSClientWrap(self._kerberos_context, encoded)
- auth = kerberos.authGSSClientResponse(self._kerberos_context)
- return request.RequestMessage('', 'authentication', {'sasl': auth})
-
-
class GremlinServerHTTPProtocol(AbstractBaseProtocol):
- def __init__(self,
- message_serializer,
- username='', password=''):
- self._message_serializer = message_serializer
- self._username = username
- self._password = password
+ def __init__(self, request_serializer, response_serializer,
+ interceptors=None, auth=None):
+ if callable(interceptors):
+ interceptors = [interceptors]
+ elif not (isinstance(interceptors, tuple)
+ or isinstance(interceptors, list)
+ or interceptors is None):
+ raise TypeError("interceptors must be a callable, tuple, list or None")
+
+ self._auth = auth
+ self._interceptors = interceptors
+ self._request_serializer = request_serializer
+ self._response_serializer = response_serializer
+ self._response_msg = {'status': {'code': 0,
+ 'message': '',
+ 'exception': ''},
+ 'result': {'meta': {},
+ 'data': []}}
+ self._is_first_chunk = True
def connection_made(self, transport):
super(GremlinServerHTTPProtocol, self).connection_made(transport)
- def write(self, request_id, request_message):
-
- basic_auth = {}
- if self._username and self._password:
- basic_auth['username'] = self._username
- basic_auth['password'] = self._password
-
- content_type = str(self._message_serializer.version, encoding='utf-8')
+ def write(self, request_message):
+ accept = str(self._response_serializer.version, encoding='utf-8')
message = {
- 'headers': {'CONTENT-TYPE': content_type,
- 'ACCEPT': content_type},
- 'payload': self._message_serializer.serialize_message(request_id, request_message),
- 'auth': basic_auth
+ 'headers': {'accept': accept},
+ 'payload': self._request_serializer.serialize_message(request_message)
+ if self._request_serializer is not None else request_message,
+ 'auth': self._auth
}
+ # The user may not want the payload to be serialized if they are using an interceptor.
+ if self._request_serializer is not None:
+ content_type = str(self._request_serializer.version, encoding='utf-8')
+ message['headers']['content-type'] = content_type
+
+ for interceptor in self._interceptors or []:
+ message = interceptor(message)
+
self._transport.write(message)
- def data_received(self, response, results_dict):
- # if Gremlin Server cuts off then we get a None for the message
- if response is None:
- log.error("Received empty message from server.")
- raise GremlinServerError({'code': 500,
- 'message': 'Server disconnected - please try to reconnect', 'attributes': {}})
+ '''
+ GraphSON does not support streaming deserialization, we are aggregating data and bypassing streamed
+ deserialization while GraphSON is enabled for testing. Remove after GraphSON is removed.
+ '''
+ def data_received_aggregate(self, response, result_set):
+ response_msg = {'status': {'code': 0,
+ 'message': '',
+ 'exception': ''},
+ 'result': {'meta': {},
+ 'data': []}}
- if response['ok']:
- message = self._message_serializer.deserialize_message(response['content'])
- request_id = message['requestId']
- result_set = results_dict[request_id] if request_id in results_dict else ResultSet(None, None)
- status_code = message['status']['code']
- aggregate_to = message['result']['meta'].get('aggregateTo', 'list')
- data = message['result']['data']
+ response_msg = self._decode_chunk(response_msg, response, self._is_first_chunk)
+
+ self._is_first_chunk = False
+ status_code = response_msg['status']['code']
+ aggregate_to = response_msg['result']['meta'].get('aggregateTo', 'list')
+ data = response_msg['result']['data']
+ result_set.aggregate_to = aggregate_to
+ self._is_first_chunk = True
+
+ if status_code == 204 and len(data) == 0:
+ result_set.stream.put_nowait([])
+ elif status_code in [200, 204, 206]:
+ result_set.stream.put_nowait(data)
+ else:
+ log.error("\r\nReceived error message '%s'\r\n\r\nWith result set '%s'",
+ str(self._response_msg), str(result_set))
+ raise GremlinServerError({'code': status_code,
+ 'message': self._response_msg['status']['message'],
+ 'exception': self._response_msg['status']['exception']})
+
+ # data is received in chunks
+ def data_received(self, response_chunk, result_set, read_completed=None, http_req_resp=None):
+ # we shouldn't need to use the http_req_resp code as status is sent in response message, but leaving it for now
+ if read_completed:
+ status_code = self._response_msg['status']['code']
+ aggregate_to = self._response_msg['result']['meta'].get('aggregateTo', 'list')
+ data = self._response_msg['result']['data']
result_set.aggregate_to = aggregate_to
- if status_code == 204:
+ # reset response message
+ self._response_msg = {'status': {'code': 0,
+ 'message': '',
+ 'exception': ''},
+ 'result': {'meta': {},
+ 'data': []}}
+ self._is_first_chunk = True
+
+ if status_code == 204 and len(data) == 0:
result_set.stream.put_nowait([])
- del results_dict[request_id]
- return status_code
- elif status_code in [200, 206]:
+ elif status_code in [200, 204, 206]:
result_set.stream.put_nowait(data)
- if status_code == 200:
- result_set.status_attributes = message['status']['attributes']
- del results_dict[request_id]
- return status_code
+ else:
+ log.error("\r\nReceived error message '%s'\r\n\r\nWith result set '%s'",
+ str(self._response_msg), str(result_set))
+ raise GremlinServerError({'code': status_code,
+ 'message': self._response_msg['status']['message'],
+ 'exception': self._response_msg['status']['exception']})
else:
- # This message is going to be huge and kind of hard to read, but in the event of an error,
- # it can provide invaluable info, so space it out appropriately.
- log.error("\r\nReceived error message '%s'\r\n\r\nWith results dictionary '%s'",
- str(response['content']), str(results_dict))
- body = json.loads(response['content'])
- del results_dict[body['requestId']]
- raise GremlinServerError({'code': response['status'], 'message': body['message'], 'attributes': {}})
+ self._response_msg = self._decode_chunk(self._response_msg, response_chunk, self._is_first_chunk)
+ self._is_first_chunk = False
+
+ def _decode_chunk(self, message, data_buffer, is_first_chunk):
+ chunk_msg = self._response_serializer.deserialize_message(data_buffer, is_first_chunk)
+
+ if 'result' in chunk_msg:
+ msg_data = message['result']['data']
+ chunk_data = chunk_msg['result']['data']
+ message['result']['data'] = [*msg_data, *chunk_data]
+ if 'status' in chunk_msg:
+ status_code = chunk_msg['status']['code']
+ if status_code in [200, 204, 206]:
+ message.update({'status': chunk_msg['status']})
+ else:
+ raise GremlinServerError({'code': status_code,
+ 'message': chunk_msg['status']['message'],
+ 'exception': chunk_msg['status']['exception']})
+ return message
diff --git a/gremlin-python/src/main/python/gremlin_python/driver/remote_connection.py b/gremlin-python/src/main/python/gremlin_python/driver/remote_connection.py
index 11d4fa9..5575610 100644
--- a/gremlin-python/src/main/python/gremlin_python/driver/remote_connection.py
+++ b/gremlin-python/src/main/python/gremlin_python/driver/remote_connection.py
@@ -37,18 +37,12 @@
return self._traversal_source
@abc.abstractmethod
- def submit(self, bytecode):
+ def submit(self, gremlin_lang):
pass
def is_closed(self):
raise Exception('is_closed() must be implemented')
- def is_session_bound(self):
- return False
-
- def create_session(self):
- raise Exception('createSession() must be implemented');
-
def commit(self):
raise Exception('commit() must be implemented')
@@ -75,10 +69,10 @@
def apply(self, traversal):
if traversal.traversers is None:
- remote_traversal = self.remote_connection.submit(traversal.bytecode)
+ remote_traversal = self.remote_connection.submit(traversal.gremlin_lang)
traversal.remote_results = remote_traversal
traversal.traversers = remote_traversal.traversers
def apply_async(self, traversal):
if traversal.traversers is None:
- traversal.remote_results = self.remote_connection.submit_async(traversal.bytecode)
+ traversal.remote_results = self.remote_connection.submit_async(traversal.gremlin_lang)
diff --git a/gremlin-python/src/main/python/gremlin_python/driver/request.py b/gremlin-python/src/main/python/gremlin_python/driver/request.py
index 73ee727..37b0415 100644
--- a/gremlin-python/src/main/python/gremlin_python/driver/request.py
+++ b/gremlin-python/src/main/python/gremlin_python/driver/request.py
@@ -20,6 +20,8 @@
__author__ = 'David M. Brown (davebshow@gmail.com)'
-
RequestMessage = collections.namedtuple(
- 'RequestMessage', ['processor', 'op', 'args'])
+ 'RequestMessage', ['fields', 'gremlin'])
+
+Tokens = ['batchSize', 'bindings', 'g', 'gremlin', 'language',
+ 'evaluationTimeout', 'materializeProperties', 'timeoutMs', 'userAgent', 'bulkResults']
diff --git a/gremlin-python/src/main/python/gremlin_python/driver/resultset.py b/gremlin-python/src/main/python/gremlin_python/driver/resultset.py
index 66566fe..6e71c2a 100644
--- a/gremlin-python/src/main/python/gremlin_python/driver/resultset.py
+++ b/gremlin-python/src/main/python/gremlin_python/driver/resultset.py
@@ -23,12 +23,10 @@
class ResultSet:
- def __init__(self, stream, request_id):
+ def __init__(self, stream):
self._stream = stream
- self._request_id = request_id
self._done = None
self._aggregate_to = None
- self._status_attributes = {}
@property
def aggregate_to(self):
@@ -39,18 +37,6 @@
self._aggregate_to = val
@property
- def status_attributes(self):
- return self._status_attributes
-
- @status_attributes.setter
- def status_attributes(self, val):
- self._status_attributes = val
-
- @property
- def request_id(self):
- return self._request_id
-
- @property
def stream(self):
return self._stream
diff --git a/gremlin-python/src/main/python/gremlin_python/driver/serializer.py b/gremlin-python/src/main/python/gremlin_python/driver/serializer.py
index 6b522e5..aa4c70a 100644
--- a/gremlin-python/src/main/python/gremlin_python/driver/serializer.py
+++ b/gremlin-python/src/main/python/gremlin_python/driver/serializer.py
@@ -20,8 +20,10 @@
import base64
import logging
import struct
-import uuid
import io
+
+from gremlin_python.process.traversal import Traverser
+
try:
import ujson as json
if int(json.__version__[0]) < 2:
@@ -29,72 +31,16 @@
except ImportError:
import json
-from gremlin_python.structure.io import graphbinaryV1
-from gremlin_python.structure.io import graphsonV2d0
-from gremlin_python.structure.io import graphsonV3d0
+from gremlin_python.structure.io import graphbinaryV4, graphsonV4
+from gremlin_python.structure.io.util import Marker
__author__ = 'David M. Brown (davebshow@gmail.com), Lyndon Bauto (lyndonb@bitquilltech.com)'
+"""
+GraphSONV4
+"""
-class Processor:
- """Base class for OpProcessor serialization system."""
-
- def __init__(self, writer):
- self._writer = writer
-
- def get_op_args(self, op, args):
- op_method = getattr(self, op, None)
- if not op_method:
- raise Exception("Processor does not support op: {}".format(op))
- return op_method(args)
-
-
-class Standard(Processor):
-
- def authentication(self, args):
- return args
-
- def eval(self, args):
- return args
-
-
-class Session(Processor):
-
- def authentication(self, args):
- return args
-
- def eval(self, args):
- return args
-
- def close(self, args):
- return args
-
- def bytecode(self, args):
- gremlin = args['gremlin']
- args['gremlin'] = self._writer.to_dict(gremlin)
- aliases = args.get('aliases', '')
- if not aliases:
- aliases = {'g': 'g'}
- args['aliases'] = aliases
- return args
-
-
-class Traversal(Processor):
-
- def authentication(self, args):
- return args
-
- def bytecode(self, args):
- gremlin = args['gremlin']
- args['gremlin'] = self._writer.to_dict(gremlin)
- aliases = args.get('aliases', '')
- if not aliases:
- aliases = {'g': 'g'}
- args['aliases'] = aliases
- return args
-
-
-class GraphSONMessageSerializer(object):
+class GraphSONSerializersV4(object):
"""
Message serializer for GraphSON. Allow users to pass custom reader,
writer, and version kwargs for custom serialization. Otherwise,
@@ -102,9 +48,9 @@
"""
# KEEP TRACK OF CURRENT DEFAULTS
- DEFAULT_READER_CLASS = graphsonV3d0.GraphSONReader
- DEFAULT_WRITER_CLASS = graphsonV3d0.GraphSONWriter
- DEFAULT_VERSION = b"application/vnd.gremlin-v3.0+json"
+ DEFAULT_READER_CLASS = graphsonV4.GraphSONReader
+ DEFAULT_WRITER_CLASS = graphsonV4.GraphSONWriter
+ DEFAULT_VERSION = b"application/vnd.gremlin-v4.0+json"
def __init__(self, reader=None, writer=None, version=None):
if not version:
@@ -115,80 +61,49 @@
self._graphson_reader = reader
if not writer:
writer = self.DEFAULT_WRITER_CLASS()
- self.standard = Standard(writer)
- self.traversal = Traversal(writer)
- self.session = Session(writer)
+ self._graphson_writer = writer
@property
def version(self):
"""Read only property"""
return self._version
- def get_processor(self, processor):
- processor = getattr(self, processor, None)
- if not processor:
- raise Exception("Unknown processor")
- return processor
-
- def serialize_message(self, request_id, request_message):
- processor = request_message.processor
- op = request_message.op
- args = request_message.args
- if not processor:
- processor_obj = self.get_processor('standard')
- else:
- processor_obj = self.get_processor(processor)
- args = processor_obj.get_op_args(op, args)
- message = self.build_message(request_id, processor, op, args)
+ def serialize_message(self, request_message):
+ message = self.build_message(request_message.fields, request_message.gremlin)
return message
- def build_message(self, request_id, processor, op, args):
+ def build_message(self, fields, gremlin):
message = {
- 'requestId': {'@type': 'g:UUID', '@value': request_id},
- 'processor': processor,
- 'op': op,
- 'args': args
+ 'gremlin': gremlin # gremlin wil always be a gremlin lang string script
}
- return self.finalize_message(message, b"\x21", self.version)
+ for k, v in fields.items():
+ message[k] = self._graphson_writer.to_dict(v)
+ return self.finalize_message(message)
- def finalize_message(self, message, mime_len, mime_type):
+ def finalize_message(self, message):
message = json.dumps(message)
- message = b''.join([mime_len, mime_type, message.encode('utf-8')])
return message
- def deserialize_message(self, message):
- # for parsing string message via HTTP connections
- msg = json.loads(message if isinstance(message, str) else message.decode('utf-8'))
- return self._graphson_reader.to_object(msg)
+ def deserialize_message(self, message, is_first_chunk=False):
+ if is_first_chunk:
+ msg = json.loads(message if isinstance(message, str) else message.decode('utf-8'))
+ return self._graphson_reader.to_object(msg)
+ else:
+ # graphSON does not stream, all results are aggregated inside the first chunk
+ return ""
-
-class GraphSONSerializersV2d0(GraphSONMessageSerializer):
- """Message serializer for GraphSON 2.0"""
- def __init__(self):
- reader = graphsonV2d0.GraphSONReader()
- writer = graphsonV2d0.GraphSONWriter()
- version = b"application/vnd.gremlin-v2.0+json"
- super(GraphSONSerializersV2d0, self).__init__(reader, writer, version)
-
-
-class GraphSONSerializersV3d0(GraphSONMessageSerializer):
- """Message serializer for GraphSON 3.0"""
- def __init__(self):
- reader = graphsonV3d0.GraphSONReader()
- writer = graphsonV3d0.GraphSONWriter()
- version = b"application/vnd.gremlin-v3.0+json"
- super(GraphSONSerializersV3d0, self).__init__(reader, writer, version)
-
-
-class GraphBinarySerializersV1(object):
- DEFAULT_READER_CLASS = graphbinaryV1.GraphBinaryReader
- DEFAULT_WRITER_CLASS = graphbinaryV1.GraphBinaryWriter
- DEFAULT_VERSION = b"application/vnd.graphbinary-v1.0"
+"""
+GraphBinaryV4
+"""
+class GraphBinarySerializersV4(object):
+ DEFAULT_READER_CLASS = graphbinaryV4.GraphBinaryReader
+ DEFAULT_WRITER_CLASS = graphbinaryV4.GraphBinaryWriter
+ DEFAULT_VERSION = b"application/vnd.graphbinary-v4.0"
max_int64 = 0xFFFFFFFFFFFFFFFF
header_struct = struct.Struct('>b32sBQQ')
header_pack = header_struct.pack
- int_pack = graphbinaryV1.int32_pack
+ int_pack = graphbinaryV4.int32_pack
int32_unpack = struct.Struct(">i").unpack
def __init__(self, reader=None, writer=None, version=None):
@@ -201,94 +116,95 @@
if not writer:
writer = self.DEFAULT_WRITER_CLASS()
self._graphbinary_writer = writer
- self.standard = Standard(writer)
- self.traversal = Traversal(writer)
- self.session = Session(writer)
+ self._bulked = False
@property
def version(self):
"""Read only property"""
return self._version
- def get_processor(self, processor):
- processor = getattr(self, processor, None)
- if not processor:
- raise Exception("Unknown processor")
- return processor
-
- def serialize_message(self, request_id, request_message):
- processor = request_message.processor
- op = request_message.op
- args = request_message.args
- if not processor:
- processor_obj = self.get_processor('standard')
- else:
- processor_obj = self.get_processor(processor)
- args = processor_obj.get_op_args(op, args)
- message = self.build_message(request_id, processor, op, args)
+ def serialize_message(self, request_message):
+ message = self.build_message(request_message.fields, request_message.gremlin)
return message
- def build_message(self, request_id, processor, op, args):
+ def build_message(self, fields, gremlin):
message = {
- 'requestId': request_id,
- 'processor': processor,
- 'op': op,
- 'args': args
+ 'fields': fields,
+ 'gremlin': gremlin
}
- return self.finalize_message(message, 0x20, self.version)
+ return self.finalize_message(message)
- def finalize_message(self, message, mime_len, mime_type):
+ def finalize_message(self, message):
ba = bytearray()
- request_id = uuid.UUID(str(message['requestId']))
- ba.extend(self.header_pack(mime_len, mime_type, 0x81,
- (request_id.int >> 64) & self.max_int64, request_id.int & self.max_int64))
-
- op_bytes = message['op'].encode("utf-8")
- ba.extend(self.int_pack(len(op_bytes)))
- ba.extend(op_bytes)
-
- processor_bytes = message['processor'].encode("utf-8")
- ba.extend(self.int_pack(len(processor_bytes)))
- ba.extend(processor_bytes)
-
- args = message["args"]
- ba.extend(self.int_pack(len(args)))
- for k, v in args.items():
+ ba.extend(graphbinaryV4.uint8_pack(0x81))
+ fields = message["fields"]
+ ba.extend(self.int_pack(len(fields)))
+ for k, v in fields.items():
self._graphbinary_writer.to_dict(k, ba)
+ self._graphbinary_writer.to_dict(v, ba)
- # processor_obj.get_op_args in serialize_message() seems to already handle bytecode. in python 3
- # because bytearray isn't bound to a type in graphbinary it falls through the writeObject() and
- # just works but python 2 bytearray is bound to ByteBufferType so it writes DataType.bytebuffer
- # rather than DataType.bytecode and the server gets confused. special casing this for now until
- # it can be refactored
- if k == "gremlin" and isinstance(v, bytearray):
- ba.extend(v)
- else:
- self._graphbinary_writer.to_dict(v, ba)
+ gremlin = message['gremlin']
+ # TODO: hack to remove type code from gremlin value for V4 message format, writer doesn't seem to have a way to
+ # write value directly by passing serializer types, check back when removing bytecode
+ gremlin_ba = bytearray()
+ self._graphbinary_writer.to_dict(gremlin, gremlin_ba)
+ ba.extend(gremlin_ba[2:])
return bytes(ba)
- def deserialize_message(self, message):
+ def deserialize_message(self, message, is_first_chunk=False):
+ if len(message) == 0:
+ return {'status': {'code': 204},
+ 'result': {'meta': {},
+ 'data': []}}
+
# for parsing string message via HTTP connections
b = io.BytesIO(base64.b64decode(message) if isinstance(message, str) else message)
- b.read(1) # version
+ if is_first_chunk:
+ b.read(1) # version
+ self._bulked = b.read(1)[0] == 0x01
- request_id = str(self._graphbinary_reader.to_object(b, graphbinaryV1.DataType.uuid))
- status_code = self.int32_unpack(b.read(4))[0]
- status_msg = self._graphbinary_reader.to_object(b, graphbinaryV1.DataType.string)
- status_attrs = self._graphbinary_reader.to_object(b, graphbinaryV1.DataType.map, nullable=False)
- meta_attrs = self._graphbinary_reader.to_object(b, graphbinaryV1.DataType.map, nullable=False)
- result = self._graphbinary_reader.to_object(b)
+ result, readable = self.read_payload(b)
+ if not readable:
+ return {
+ 'result': {'meta': {},
+ 'data': result}
+ }
+ status_code = self.int32_unpack(b.read(4))[0] # status code
+ status_msg = self._graphbinary_reader.to_object(b, graphbinaryV4.DataType.string, nullable=True)
+ status_ex = self._graphbinary_reader.to_object(b, graphbinaryV4.DataType.string, nullable=True)
+ # meta_attrs = self._graphbinary_reader.to_object(b, graphbinaryV4.DataType.map, nullable=False)
b.close()
- msg = {'requestId': request_id,
- 'status': {'code': status_code,
+ msg = {'status': {'code': status_code,
'message': status_msg,
- 'attributes': status_attrs},
- 'result': {'meta': meta_attrs,
+ 'exception': status_ex},
+ 'result': {'meta': {},
'data': result}}
return msg
+
+ def read_payload(self, buffer):
+ results = []
+ readable = True
+ while buffer.readable(): # find method or way to access readable bytes without using buffer.getvalue()
+ if buffer.tell() == len(buffer.getvalue()):
+ readable = False
+ break
+ if self._bulked:
+ item = self._graphbinary_reader.to_object(buffer)
+ if item == Marker.end_of_stream():
+ self._bulked = False # no more data expected, reset bulked flag
+ break
+ bulk = self._graphbinary_reader.to_object(buffer)
+ results.append(Traverser(item, bulk))
+ else:
+ data = self._graphbinary_reader.to_object(buffer)
+ if data == Marker.end_of_stream():
+ break
+ results.append(data)
+
+ return results, readable
diff --git a/gremlin-python/src/main/python/gremlin_python/driver/useragent.py b/gremlin-python/src/main/python/gremlin_python/driver/useragent.py
index d6b0a15..fb08c5c 100644
--- a/gremlin-python/src/main/python/gremlin_python/driver/useragent.py
+++ b/gremlin-python/src/main/python/gremlin_python/driver/useragent.py
@@ -18,7 +18,7 @@
#
import platform
-gremlin_version = "3.8.0-SNAPSHOT" # DO NOT MODIFY - Configured automatically by Maven Replacer Plugin
+gremlin_version = "4.0.0-SNAPSHOT" # DO NOT MODIFY - Configured automatically by Maven Replacer Plugin
def _generate_user_agent():
application_name = "NotAvailable"
diff --git a/gremlin-python/src/main/python/gremlin_python/process/graph_traversal.py b/gremlin-python/src/main/python/gremlin_python/process/graph_traversal.py
index 887a919..1285919 100644
--- a/gremlin-python/src/main/python/gremlin_python/process/graph_traversal.py
+++ b/gremlin-python/src/main/python/gremlin_python/process/graph_traversal.py
@@ -24,7 +24,7 @@
from .traversal import Traversal
from .traversal import TraversalStrategies
from .strategies import VertexProgramStrategy, OptionsStrategy
-from .traversal import Bytecode
+from .traversal import GremlinLang
from ..driver.remote_connection import RemoteStrategy
from .. import statics
from ..statics import long
@@ -35,13 +35,13 @@
class GraphTraversalSource(object):
- def __init__(self, graph, traversal_strategies, bytecode=None, remote_connection=None):
+ def __init__(self, graph, traversal_strategies, gremlin_lang=None, remote_connection=None):
log.info("Creating GraphTraversalSource.")
self.graph = graph
self.traversal_strategies = traversal_strategies
- if bytecode is None:
- bytecode = Bytecode()
- self.bytecode = bytecode
+ if gremlin_lang is None:
+ gremlin_lang = GremlinLang()
+ self.gremlin_lang = gremlin_lang
self.graph_traversal = GraphTraversal
if remote_connection:
self.traversal_strategies.add_strategies([RemoteStrategy(remote_connection)])
@@ -51,10 +51,10 @@
return "graphtraversalsource[" + str(self.graph) + "]"
def get_graph_traversal_source(self):
- return self.__class__(self.graph, TraversalStrategies(self.traversal_strategies), Bytecode(self.bytecode))
+ return self.__class__(self.graph, TraversalStrategies(self.traversal_strategies), GremlinLang(self.gremlin_lang))
def get_graph_traversal(self):
- return self.graph_traversal(self.graph, self.traversal_strategies, Bytecode(self.bytecode))
+ return self.graph_traversal(self.graph, self.traversal_strategies, GremlinLang(self.gremlin_lang))
def withBulk(self, *args):
warnings.warn(
@@ -65,7 +65,7 @@
def with_bulk(self, *args):
source = self.get_graph_traversal_source()
- source.bytecode.add_source("withBulk", *args)
+ source.gremlin_lang.add_source("withBulk", *args)
return source
def withPath(self, *args):
@@ -77,7 +77,7 @@
def with_path(self, *args):
source = self.get_graph_traversal_source()
- source.bytecode.add_source("withPath", *args)
+ source.gremlin_lang.add_source("withPath", *args)
return source
def withSack(self, *args):
@@ -89,7 +89,7 @@
def with_sack(self, *args):
source = self.get_graph_traversal_source()
- source.bytecode.add_source("withSack", *args)
+ source.gremlin_lang.add_source("withSack", *args)
return source
def withSideEffect(self, *args):
@@ -101,7 +101,7 @@
def with_side_effect(self, *args):
source = self.get_graph_traversal_source()
- source.bytecode.add_source("withSideEffect", *args)
+ source.gremlin_lang.add_source("withSideEffect", *args)
return source
def withStrategies(self, *args):
@@ -113,7 +113,7 @@
def with_strategies(self, *args):
source = self.get_graph_traversal_source()
- source.bytecode.add_source("withStrategies", *args)
+ source.gremlin_lang.add_source("withStrategies", *args)
return source
def withoutStrategies(self, *args):
@@ -125,12 +125,12 @@
def without_strategies(self, *args):
source = self.get_graph_traversal_source()
- source.bytecode.add_source("withoutStrategies", *args)
+ source.gremlin_lang.add_source("withoutStrategies", *args)
return source
def with_(self, k, v=None):
source = self.get_graph_traversal_source()
- options_strategy = next((x for x in source.bytecode.source_instructions
+ options_strategy = next((x for x in source.gremlin_lang.gremlin
if x[0] == "withStrategies" and type(x[1]) is OptionsStrategy), None)
val = True if v is None else v
@@ -142,23 +142,24 @@
return source
- def tx(self):
- # In order to keep the constructor unchanged within 3.5.x we can try to pop the RemoteConnection out of the
- # TraversalStrategies. keeping this unchanged will allow user DSLs to not take a break.
- # This is the same strategy as gremlin-javascript.
- # TODO https://issues.apache.org/jira/browse/TINKERPOP-2664: refactor this to be nicer in 3.6.0 when
- # we can take a breaking change
- remote_connection = next((x.remote_connection for x in self.traversal_strategies.traversal_strategies if
- x.fqcn == "py:RemoteStrategy"), None)
-
- if remote_connection is None:
- raise Exception("Error, remote connection is required for transaction.")
-
- # You can't do g.tx().begin().tx() i.e child transactions are not supported.
- if remote_connection and remote_connection.is_session_bound():
- raise Exception("This TraversalSource is already bound to a transaction - child transactions are not "
- "supported")
- return Transaction(self, remote_connection)
+ # TODO remove or update once HTTP transaction is implemented
+ # def tx(self):
+ # # In order to keep the constructor unchanged within 3.5.x we can try to pop the RemoteConnection out of the
+ # # TraversalStrategies. keeping this unchanged will allow user DSLs to not take a break.
+ # # This is the same strategy as gremlin-javascript.
+ # # TODO https://issues.apache.org/jira/browse/TINKERPOP-2664: refactor this to be nicer in 3.6.0 when
+ # # we can take a breaking change
+ # remote_connection = next((x.remote_connection for x in self.traversal_strategies.traversal_strategies if
+ # x.fqcn == "py:RemoteStrategy"), None)
+ #
+ # if remote_connection is None:
+ # raise Exception("Error, remote connection is required for transaction.")
+ #
+ # # You can't do g.tx().begin().tx() i.e child transactions are not supported.
+ # if remote_connection and remote_connection.is_session_bound():
+ # raise Exception("This TraversalSource is already bound to a transaction - child transactions are not "
+ # "supported")
+ # return Transaction(self, remote_connection)
def withComputer(self, graph_computer=None, workers=None, result=None, persist=None, vertices=None,
edges=None, configuration=None):
@@ -175,12 +176,12 @@
def E(self, *args):
traversal = self.get_graph_traversal()
- traversal.bytecode.add_step("E", *args)
+ traversal.gremlin_lang.add_step("E", *args)
return traversal
def V(self, *args):
traversal = self.get_graph_traversal()
- traversal.bytecode.add_step("V", *args)
+ traversal.gremlin_lang.add_step("V", *args)
return traversal
def addE(self, *args):
@@ -192,7 +193,7 @@
def add_e(self, *args):
traversal = self.get_graph_traversal()
- traversal.bytecode.add_step("addE", *args)
+ traversal.gremlin_lang.add_step("addE", *args)
return traversal
def addV(self, *args):
@@ -204,43 +205,43 @@
def add_v(self, *args):
traversal = self.get_graph_traversal()
- traversal.bytecode.add_step("addV", *args)
+ traversal.gremlin_lang.add_step("addV", *args)
return traversal
def merge_v(self, *args):
traversal = self.get_graph_traversal()
- traversal.bytecode.add_step("mergeV", *args)
+ traversal.gremlin_lang.add_step("mergeV", *args)
return traversal
def merge_e(self, *args):
traversal = self.get_graph_traversal()
- traversal.bytecode.add_step("mergeE", *args)
+ traversal.gremlin_lang.add_step("mergeE", *args)
return traversal
def inject(self, *args):
traversal = self.get_graph_traversal()
- traversal.bytecode.add_step("inject", *args)
+ traversal.gremlin_lang.add_step("inject", *args)
return traversal
def io(self, *args):
traversal = self.get_graph_traversal()
- traversal.bytecode.add_step("io", *args)
+ traversal.gremlin_lang.add_step("io", *args)
return traversal
def call(self, *args):
traversal = self.get_graph_traversal()
- traversal.bytecode.add_step("call", *args)
+ traversal.gremlin_lang.add_step("call", *args)
return traversal
def union(self, *args):
traversal = self.get_graph_traversal()
- traversal.bytecode.add_step("union", *args)
+ traversal.gremlin_lang.add_step("union", *args)
return traversal
class GraphTraversal(Traversal):
- def __init__(self, graph, traversal_strategies, bytecode):
- super(GraphTraversal, self).__init__(graph, traversal_strategies, bytecode)
+ def __init__(self, graph, traversal_strategies, gremlin_lang):
+ super(GraphTraversal, self).__init__(graph, traversal_strategies, gremlin_lang)
def __getitem__(self, index):
if isinstance(index, int):
@@ -262,14 +263,14 @@
return self.values(key)
def clone(self):
- return GraphTraversal(self.graph, self.traversal_strategies, copy.deepcopy(self.bytecode))
+ return GraphTraversal(self.graph, self.traversal_strategies, copy.deepcopy(self.gremlin_lang))
def V(self, *args):
- self.bytecode.add_step("V", *args)
+ self.gremlin_lang.add_step("V", *args)
return self
def E(self, *args):
- self.bytecode.add_step("E", *args)
+ self.gremlin_lang.add_step("E", *args)
return self
def addE(self, *args):
@@ -280,7 +281,7 @@
return self.add_e(*args)
def add_e(self, *args):
- self.bytecode.add_step("addE", *args)
+ self.gremlin_lang.add_step("addE", *args)
return self
def addV(self, *args):
@@ -291,51 +292,51 @@
return self.add_v(*args)
def add_v(self, *args):
- self.bytecode.add_step("addV", *args)
+ self.gremlin_lang.add_step("addV", *args)
return self
def aggregate(self, *args):
- self.bytecode.add_step("aggregate", *args)
+ self.gremlin_lang.add_step("aggregate", *args)
return self
def all_(self, *args):
- self.bytecode.add_step("all", *args)
+ self.gremlin_lang.add_step("all", *args)
return self
def and_(self, *args):
- self.bytecode.add_step("and", *args)
+ self.gremlin_lang.add_step("and", *args)
return self
def any_(self, *args):
- self.bytecode.add_step("any", *args)
+ self.gremlin_lang.add_step("any", *args)
return self
def as_(self, *args):
- self.bytecode.add_step("as", *args)
+ self.gremlin_lang.add_step("as", *args)
return self
def as_bool(self, *args):
- self.bytecode.add_step("asBool", *args)
+ self.gremlin_lang.add_step("asBool", *args)
return self
def as_date(self, *args):
- self.bytecode.add_step("asDate", *args)
+ self.gremlin_lang.add_step("asDate", *args)
return self
def as_number(self, *args):
- self.bytecode.add_step("asNumber", *args)
+ self.gremlin_lang.add_step("asNumber", *args)
return self
def as_string(self, *args):
- self.bytecode.add_step("asString", *args)
+ self.gremlin_lang.add_step("asString", *args)
return self
def barrier(self, *args):
- self.bytecode.add_step("barrier", *args)
+ self.gremlin_lang.add_step("barrier", *args)
return self
def both(self, *args):
- self.bytecode.add_step("both", *args)
+ self.gremlin_lang.add_step("both", *args)
return self
def bothE(self, *args):
@@ -346,7 +347,7 @@
return self.both_e(*args)
def both_e(self, *args):
- self.bytecode.add_step("bothE", *args)
+ self.gremlin_lang.add_step("bothE", *args)
return self
def bothV(self, *args):
@@ -357,47 +358,47 @@
return self.both_v(*args)
def both_v(self, *args):
- self.bytecode.add_step("bothV", *args)
+ self.gremlin_lang.add_step("bothV", *args)
return self
def branch(self, *args):
- self.bytecode.add_step("branch", *args)
+ self.gremlin_lang.add_step("branch", *args)
return self
def by(self, *args):
- self.bytecode.add_step("by", *args)
+ self.gremlin_lang.add_step("by", *args)
return self
def call(self, *args):
- self.bytecode.add_step("call", *args)
+ self.gremlin_lang.add_step("call", *args)
return self
def cap(self, *args):
- self.bytecode.add_step("cap", *args)
+ self.gremlin_lang.add_step("cap", *args)
return self
def choose(self, *args):
- self.bytecode.add_step("choose", *args)
+ self.gremlin_lang.add_step("choose", *args)
return self
def coalesce(self, *args):
- self.bytecode.add_step("coalesce", *args)
+ self.gremlin_lang.add_step("coalesce", *args)
return self
def coin(self, *args):
- self.bytecode.add_step("coin", *args)
+ self.gremlin_lang.add_step("coin", *args)
return self
def combine(self, *args):
- self.bytecode.add_step("combine", *args)
+ self.gremlin_lang.add_step("combine", *args)
return self
def concat(self, *args):
- self.bytecode.add_step("concat", *args)
+ self.gremlin_lang.add_step("concat", *args)
return self
def conjoin(self, *args):
- self.bytecode.add_step("conjoin", *args)
+ self.gremlin_lang.add_step("conjoin", *args)
return self
def connectedComponent(self, *args):
@@ -408,15 +409,15 @@
return self.connected_component(*args)
def connected_component(self, *args):
- self.bytecode.add_step("connectedComponent", *args)
+ self.gremlin_lang.add_step("connectedComponent", *args)
return self
def constant(self, *args):
- self.bytecode.add_step("constant", *args)
+ self.gremlin_lang.add_step("constant", *args)
return self
def count(self, *args):
- self.bytecode.add_step("count", *args)
+ self.gremlin_lang.add_step("count", *args)
return self
def cyclicPath(self, *args):
@@ -427,39 +428,39 @@
return self.cyclic_path(*args)
def cyclic_path(self, *args):
- self.bytecode.add_step("cyclicPath", *args)
+ self.gremlin_lang.add_step("cyclicPath", *args)
return self
def date_add(self, *args):
- self.bytecode.add_step("dateAdd", *args)
+ self.gremlin_lang.add_step("dateAdd", *args)
return self
def date_diff(self, *args):
- self.bytecode.add_step("dateDiff", *args)
+ self.gremlin_lang.add_step("dateDiff", *args)
return self
def dedup(self, *args):
- self.bytecode.add_step("dedup", *args)
+ self.gremlin_lang.add_step("dedup", *args)
return self
def difference(self, *args):
- self.bytecode.add_step("difference", *args)
+ self.gremlin_lang.add_step("difference", *args)
return self
def discard(self, *args):
- self.bytecode.add_step("discard", *args)
+ self.gremlin_lang.add_step("discard", *args)
return self
def disjunct(self, *args):
- self.bytecode.add_step("disjunct", *args)
+ self.gremlin_lang.add_step("disjunct", *args)
return self
def drop(self, *args):
- self.bytecode.add_step("drop", *args)
+ self.gremlin_lang.add_step("drop", *args)
return self
def element(self, *args):
- self.bytecode.add_step("element", *args)
+ self.gremlin_lang.add_step("element", *args)
return self
def elementMap(self, *args):
@@ -470,19 +471,19 @@
return self.element_map(*args)
def element_map(self, *args):
- self.bytecode.add_step("elementMap", *args)
+ self.gremlin_lang.add_step("elementMap", *args)
return self
def emit(self, *args):
- self.bytecode.add_step("emit", *args)
+ self.gremlin_lang.add_step("emit", *args)
return self
def fail(self, *args):
- self.bytecode.add_step("fail", *args)
+ self.gremlin_lang.add_step("fail", *args)
return self
def filter_(self, *args):
- self.bytecode.add_step("filter", *args)
+ self.gremlin_lang.add_step("filter", *args)
return self
def flatMap(self, *args):
@@ -493,23 +494,23 @@
return self.flat_map(*args)
def flat_map(self, *args):
- self.bytecode.add_step("flatMap", *args)
+ self.gremlin_lang.add_step("flatMap", *args)
return self
def fold(self, *args):
- self.bytecode.add_step("fold", *args)
+ self.gremlin_lang.add_step("fold", *args)
return self
def format_(self, *args):
- self.bytecode.add_step("format", *args)
+ self.gremlin_lang.add_step("format", *args)
return self
def from_(self, *args):
- self.bytecode.add_step("from", *args)
+ self.gremlin_lang.add_step("from", *args)
return self
def group(self, *args):
- self.bytecode.add_step("group", *args)
+ self.gremlin_lang.add_step("group", *args)
return self
def groupCount(self, *args):
@@ -520,11 +521,11 @@
return self.group_count(*args)
def group_count(self, *args):
- self.bytecode.add_step("groupCount", *args)
+ self.gremlin_lang.add_step("groupCount", *args)
return self
def has(self, *args):
- self.bytecode.add_step("has", *args)
+ self.gremlin_lang.add_step("has", *args)
return self
def hasId(self, *args):
@@ -535,7 +536,7 @@
return self.has_id(*args)
def has_id(self, *args):
- self.bytecode.add_step("hasId", *args)
+ self.gremlin_lang.add_step("hasId", *args)
return self
def hasKey(self, *args):
@@ -551,13 +552,9 @@
"gremlin_python.process.GraphTraversalSource.has_key.",
DeprecationWarning)
return self.has_key(*args)
-
- def has_key(self, *args):
- self.bytecode.add_step("hasKey", *args)
- return self
def has_key(self, *args):
- self.bytecode.add_step("hasKey", *args)
+ self.gremlin_lang.add_step("hasKey", *args)
return self
def hasLabel(self, *args):
@@ -568,7 +565,7 @@
return self.has_label(*args)
def has_label(self, *args):
- self.bytecode.add_step("hasLabel", *args)
+ self.gremlin_lang.add_step("hasLabel", *args)
return self
def hasNot(self, *args):
@@ -579,7 +576,7 @@
return self.has_not(*args)
def has_not(self, *args):
- self.bytecode.add_step("hasNot", *args)
+ self.gremlin_lang.add_step("hasNot", *args)
return self
def hasValue(self, *args):
@@ -590,15 +587,15 @@
return self.has_value(*args)
def has_value(self, *args):
- self.bytecode.add_step("hasValue", *args)
+ self.gremlin_lang.add_step("hasValue", *args)
return self
def id_(self, *args):
- self.bytecode.add_step("id", *args)
+ self.gremlin_lang.add_step("id", *args)
return self
def identity(self, *args):
- self.bytecode.add_step("identity", *args)
+ self.gremlin_lang.add_step("identity", *args)
return self
def inE(self, *args):
@@ -609,7 +606,7 @@
return self.in_e(*args)
def in_e(self, *args):
- self.bytecode.add_step("inE", *args)
+ self.gremlin_lang.add_step("inE", *args)
return self
def inV(self, *args):
@@ -620,119 +617,119 @@
return self.in_v(*args)
def in_v(self, *args):
- self.bytecode.add_step("inV", *args)
+ self.gremlin_lang.add_step("inV", *args)
return self
def in_(self, *args):
- self.bytecode.add_step("in", *args)
+ self.gremlin_lang.add_step("in", *args)
return self
def index(self, *args):
- self.bytecode.add_step("index", *args)
+ self.gremlin_lang.add_step("index", *args)
return self
def inject(self, *args):
- self.bytecode.add_step("inject", *args)
+ self.gremlin_lang.add_step("inject", *args)
return self
def intersect(self, *args):
- self.bytecode.add_step("intersect", *args)
+ self.gremlin_lang.add_step("intersect", *args)
return self
def is_(self, *args):
- self.bytecode.add_step("is", *args)
+ self.gremlin_lang.add_step("is", *args)
return self
def key(self, *args):
- self.bytecode.add_step("key", *args)
+ self.gremlin_lang.add_step("key", *args)
return self
def label(self, *args):
- self.bytecode.add_step("label", *args)
+ self.gremlin_lang.add_step("label", *args)
return self
def length(self, *args):
- self.bytecode.add_step("length", *args)
+ self.gremlin_lang.add_step("length", *args)
return self
def limit(self, *args):
- self.bytecode.add_step("limit", *args)
+ self.gremlin_lang.add_step("limit", *args)
return self
def local(self, *args):
- self.bytecode.add_step("local", *args)
+ self.gremlin_lang.add_step("local", *args)
return self
def loops(self, *args):
- self.bytecode.add_step("loops", *args)
+ self.gremlin_lang.add_step("loops", *args)
return self
def lTrim(self, *args):
- self.bytecode.add_step("lTrim", *args)
+ self.gremlin_lang.add_step("lTrim", *args)
return self
def l_trim(self, *args):
- self.bytecode.add_step("lTrim", *args)
+ self.gremlin_lang.add_step("lTrim", *args)
return self
def map(self, *args):
- self.bytecode.add_step("map", *args)
+ self.gremlin_lang.add_step("map", *args)
return self
def match(self, *args):
- self.bytecode.add_step("match", *args)
+ self.gremlin_lang.add_step("match", *args)
return self
def math(self, *args):
- self.bytecode.add_step("math", *args)
+ self.gremlin_lang.add_step("math", *args)
return self
def max_(self, *args):
- self.bytecode.add_step("max", *args)
+ self.gremlin_lang.add_step("max", *args)
return self
def mean(self, *args):
- self.bytecode.add_step("mean", *args)
+ self.gremlin_lang.add_step("mean", *args)
return self
def merge(self, *args):
- self.bytecode.add_step("merge", *args)
+ self.gremlin_lang.add_step("merge", *args)
return self
def merge_e(self, *args):
- self.bytecode.add_step("mergeE", *args)
+ self.gremlin_lang.add_step("mergeE", *args)
return self
def merge_v(self, *args):
- self.bytecode.add_step("mergeV", *args)
+ self.gremlin_lang.add_step("mergeV", *args)
return self
def min_(self, *args):
- self.bytecode.add_step("min", *args)
+ self.gremlin_lang.add_step("min", *args)
return self
def none(self, *args):
- self.bytecode.add_step("none", *args)
+ self.gremlin_lang.add_step("none", *args)
return self
def not_(self, *args):
- self.bytecode.add_step("not", *args)
+ self.gremlin_lang.add_step("not", *args)
return self
def option(self, *args):
- self.bytecode.add_step("option", *args)
+ self.gremlin_lang.add_step("option", *args)
return self
def optional(self, *args):
- self.bytecode.add_step("optional", *args)
+ self.gremlin_lang.add_step("optional", *args)
return self
def or_(self, *args):
- self.bytecode.add_step("or", *args)
+ self.gremlin_lang.add_step("or", *args)
return self
def order(self, *args):
- self.bytecode.add_step("order", *args)
+ self.gremlin_lang.add_step("order", *args)
return self
def otherV(self, *args):
@@ -743,11 +740,11 @@
return self.other_v(*args)
def other_v(self, *args):
- self.bytecode.add_step("otherV", *args)
+ self.gremlin_lang.add_step("otherV", *args)
return self
def out(self, *args):
- self.bytecode.add_step("out", *args)
+ self.gremlin_lang.add_step("out", *args)
return self
def outE(self, *args):
@@ -758,7 +755,7 @@
return self.out_e(*args)
def out_e(self, *args):
- self.bytecode.add_step("outE", *args)
+ self.gremlin_lang.add_step("outE", *args)
return self
def outV(self, *args):
@@ -769,7 +766,7 @@
return self.out_v(*args)
def out_v(self, *args):
- self.bytecode.add_step("outV", *args)
+ self.gremlin_lang.add_step("outV", *args)
return self
def pageRank(self, *args):
@@ -780,11 +777,11 @@
return self.page_rank(*args)
def page_rank(self, *args):
- self.bytecode.add_step("pageRank", *args)
+ self.gremlin_lang.add_step("pageRank", *args)
return self
def path(self, *args):
- self.bytecode.add_step("path", *args)
+ self.gremlin_lang.add_step("path", *args)
return self
def peerPressure(self, *args):
@@ -795,31 +792,31 @@
return self.peer_pressure(*args)
def peer_pressure(self, *args):
- self.bytecode.add_step("peerPressure", *args)
+ self.gremlin_lang.add_step("peerPressure", *args)
return self
def product(self, *args):
- self.bytecode.add_step("product", *args)
+ self.gremlin_lang.add_step("product", *args)
return self
def profile(self, *args):
- self.bytecode.add_step("profile", *args)
+ self.gremlin_lang.add_step("profile", *args)
return self
def program(self, *args):
- self.bytecode.add_step("program", *args)
+ self.gremlin_lang.add_step("program", *args)
return self
def project(self, *args):
- self.bytecode.add_step("project", *args)
+ self.gremlin_lang.add_step("project", *args)
return self
def properties(self, *args):
- self.bytecode.add_step("properties", *args)
+ self.gremlin_lang.add_step("properties", *args)
return self
def property(self, *args):
- self.bytecode.add_step("property", *args)
+ self.gremlin_lang.add_step("property", *args)
return self
def propertyMap(self, *args):
@@ -830,47 +827,47 @@
return self.property_map(*args)
def property_map(self, *args):
- self.bytecode.add_step("propertyMap", *args)
+ self.gremlin_lang.add_step("propertyMap", *args)
return self
def range_(self, *args):
- self.bytecode.add_step("range", *args)
+ self.gremlin_lang.add_step("range", *args)
return self
def read(self, *args):
- self.bytecode.add_step("read", *args)
+ self.gremlin_lang.add_step("read", *args)
return self
def repeat(self, *args):
- self.bytecode.add_step("repeat", *args)
+ self.gremlin_lang.add_step("repeat", *args)
return self
def replace(self, *args):
- self.bytecode.add_step("replace", *args)
+ self.gremlin_lang.add_step("replace", *args)
return self
def reverse(self, *args):
- self.bytecode.add_step("reverse", *args)
+ self.gremlin_lang.add_step("reverse", *args)
return self
def rTrim(self, *args):
- self.bytecode.add_step("rTrim", *args)
+ self.gremlin_lang.add_step("rTrim", *args)
return self
def r_trim(self, *args):
- self.bytecode.add_step("rTrim", *args)
+ self.gremlin_lang.add_step("rTrim", *args)
return self
def sack(self, *args):
- self.bytecode.add_step("sack", *args)
+ self.gremlin_lang.add_step("sack", *args)
return self
def sample(self, *args):
- self.bytecode.add_step("sample", *args)
+ self.gremlin_lang.add_step("sample", *args)
return self
def select(self, *args):
- self.bytecode.add_step("select", *args)
+ self.gremlin_lang.add_step("select", *args)
return self
def shortestPath(self, *args):
@@ -881,7 +878,7 @@
return self.shortest_path(*args)
def shortest_path(self, *args):
- self.bytecode.add_step("shortestPath", *args)
+ self.gremlin_lang.add_step("shortestPath", *args)
return self
def sideEffect(self, *args):
@@ -892,7 +889,7 @@
return self.side_effect(*args)
def side_effect(self, *args):
- self.bytecode.add_step("sideEffect", *args)
+ self.gremlin_lang.add_step("sideEffect", *args)
return self
def simplePath(self, *args):
@@ -903,35 +900,35 @@
return self.simple_path(*args)
def simple_path(self, *args):
- self.bytecode.add_step("simplePath", *args)
+ self.gremlin_lang.add_step("simplePath", *args)
return self
def skip(self, *args):
- self.bytecode.add_step("skip", *args)
+ self.gremlin_lang.add_step("skip", *args)
return self
def split(self, *args):
- self.bytecode.add_step("split", *args)
+ self.gremlin_lang.add_step("split", *args)
return self
def store(self, *args):
- self.bytecode.add_step("store", *args)
+ self.gremlin_lang.add_step("store", *args)
return self
def subgraph(self, *args):
- self.bytecode.add_step("subgraph", *args)
+ self.gremlin_lang.add_step("subgraph", *args)
return self
def substring(self, *args):
- self.bytecode.add_step("substring", *args)
+ self.gremlin_lang.add_step("substring", *args)
return self
def sum_(self, *args):
- self.bytecode.add_step("sum", *args)
+ self.gremlin_lang.add_step("sum", *args)
return self
def tail(self, *args):
- self.bytecode.add_step("tail", *args)
+ self.gremlin_lang.add_step("tail", *args)
return self
def timeLimit(self, *args):
@@ -942,15 +939,15 @@
return self.time_limit(*args)
def time_limit(self, *args):
- self.bytecode.add_step("timeLimit", *args)
+ self.gremlin_lang.add_step("timeLimit", *args)
return self
def times(self, *args):
- self.bytecode.add_step("times", *args)
+ self.gremlin_lang.add_step("times", *args)
return self
def to(self, *args):
- self.bytecode.add_step("to", *args)
+ self.gremlin_lang.add_step("to", *args)
return self
def toE(self, *args):
@@ -961,15 +958,15 @@
return self.to_e(*args)
def to_e(self, *args):
- self.bytecode.add_step("toE", *args)
+ self.gremlin_lang.add_step("toE", *args)
return self
def to_lower(self, *args):
- self.bytecode.add_step("toLower", *args)
+ self.gremlin_lang.add_step("toLower", *args)
return self
def to_upper(self, *args):
- self.bytecode.add_step("toUpper", *args)
+ self.gremlin_lang.add_step("toUpper", *args)
return self
def toV(self, *args):
@@ -980,31 +977,31 @@
return self.to_v(*args)
def to_v(self, *args):
- self.bytecode.add_step("toV", *args)
+ self.gremlin_lang.add_step("toV", *args)
return self
def tree(self, *args):
- self.bytecode.add_step("tree", *args)
+ self.gremlin_lang.add_step("tree", *args)
return self
def trim(self, *args):
- self.bytecode.add_step("trim", *args)
+ self.gremlin_lang.add_step("trim", *args)
return self
def unfold(self, *args):
- self.bytecode.add_step("unfold", *args)
+ self.gremlin_lang.add_step("unfold", *args)
return self
def union(self, *args):
- self.bytecode.add_step("union", *args)
+ self.gremlin_lang.add_step("union", *args)
return self
def until(self, *args):
- self.bytecode.add_step("until", *args)
+ self.gremlin_lang.add_step("until", *args)
return self
def value(self, *args):
- self.bytecode.add_step("value", *args)
+ self.gremlin_lang.add_step("value", *args)
return self
def valueMap(self, *args):
@@ -1015,23 +1012,23 @@
return self.value_map(*args)
def value_map(self, *args):
- self.bytecode.add_step("valueMap", *args)
+ self.gremlin_lang.add_step("valueMap", *args)
return self
def values(self, *args):
- self.bytecode.add_step("values", *args)
+ self.gremlin_lang.add_step("values", *args)
return self
def where(self, *args):
- self.bytecode.add_step("where", *args)
+ self.gremlin_lang.add_step("where", *args)
return self
def with_(self, *args):
- self.bytecode.add_step("with", *args)
+ self.gremlin_lang.add_step("with", *args)
return self
def write(self, *args):
- self.bytecode.add_step("write", *args)
+ self.gremlin_lang.add_step("write", *args)
return self
@@ -1049,7 +1046,7 @@
@classmethod
def start(cls):
- return GraphTraversal(None, None, Bytecode())
+ return GraphTraversal(None, None, GremlinLang())
@classmethod
def __(cls, *args):
@@ -1057,11 +1054,11 @@
@classmethod
def E(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).E(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).E(*args)
@classmethod
def V(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).V(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).V(*args)
@classmethod
def addE(cls, *args):
@@ -1073,7 +1070,7 @@
@classmethod
def add_e(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).add_e(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).add_e(*args)
@classmethod
def addV(cls, *args):
@@ -1085,51 +1082,51 @@
@classmethod
def add_v(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).add_v(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).add_v(*args)
@classmethod
def aggregate(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).aggregate(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).aggregate(*args)
@classmethod
def all_(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).all_(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).all_(*args)
@classmethod
def and_(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).and_(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).and_(*args)
@classmethod
def any_(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).any_(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).any_(*args)
@classmethod
def as_(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).as_(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).as_(*args)
@classmethod
def as_bool(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).as_bool(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).as_bool(*args)
@classmethod
def as_date(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).as_date(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).as_date(*args)
@classmethod
def as_number(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).as_number(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).as_number(*args)
@classmethod
def as_string(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).as_string(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).as_string(*args)
@classmethod
def barrier(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).barrier(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).barrier(*args)
@classmethod
def both(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).both(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).both(*args)
@classmethod
def bothE(cls, *args):
@@ -1141,7 +1138,7 @@
@classmethod
def both_e(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).both_e(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).both_e(*args)
@classmethod
def bothV(cls, *args):
@@ -1153,51 +1150,51 @@
@classmethod
def both_v(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).both_v(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).both_v(*args)
@classmethod
def branch(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).branch(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).branch(*args)
@classmethod
def call(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).call(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).call(*args)
@classmethod
def cap(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).cap(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).cap(*args)
@classmethod
def choose(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).choose(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).choose(*args)
@classmethod
def coalesce(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).coalesce(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).coalesce(*args)
@classmethod
def coin(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).coin(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).coin(*args)
@classmethod
def combine(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).combine(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).combine(*args)
@classmethod
def concat(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).concat(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).concat(*args)
@classmethod
def conjoin(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).conjoin(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).conjoin(*args)
@classmethod
def constant(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).constant(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).constant(*args)
@classmethod
def count(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).count(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).count(*args)
@classmethod
def cyclicPath(cls, *args):
@@ -1209,39 +1206,39 @@
@classmethod
def cyclic_path(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).cyclic_path(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).cyclic_path(*args)
@classmethod
def date_add(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).date_add(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).date_add(*args)
@classmethod
def date_diff(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).date_diff(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).date_diff(*args)
@classmethod
def dedup(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).dedup(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).dedup(*args)
@classmethod
def difference(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).difference(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).difference(*args)
@classmethod
def discard(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).discard(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).discard(*args)
@classmethod
def disjunct(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).disjunct(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).disjunct(*args)
@classmethod
def drop(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).drop(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).drop(*args)
@classmethod
def element(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).element(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).element(*args)
@classmethod
def elementMap(cls, *args):
@@ -1253,19 +1250,19 @@
@classmethod
def element_map(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).element_map(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).element_map(*args)
@classmethod
def emit(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).emit(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).emit(*args)
@classmethod
def fail(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).fail(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).fail(*args)
@classmethod
def filter_(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).filter_(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).filter_(*args)
@classmethod
def flatMap(cls, *args):
@@ -1277,19 +1274,19 @@
@classmethod
def flat_map(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).flat_map(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).flat_map(*args)
@classmethod
def fold(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).fold(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).fold(*args)
@classmethod
def format_(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).format_(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).format_(*args)
@classmethod
def group(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).group(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).group(*args)
@classmethod
def groupCount(cls, *args):
@@ -1301,11 +1298,11 @@
@classmethod
def group_count(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).group_count(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).group_count(*args)
@classmethod
def has(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).has(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).has(*args)
@classmethod
def hasId(cls, *args):
@@ -1317,7 +1314,7 @@
@classmethod
def has_id(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).has_id(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).has_id(*args)
@classmethod
def hasKey(cls, *args):
@@ -1337,7 +1334,7 @@
@classmethod
def has_key (cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).has_key(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).has_key_(*args)
@classmethod
def hasLabel(cls, *args):
@@ -1349,7 +1346,7 @@
@classmethod
def has_label(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).has_label(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).has_label(*args)
@classmethod
def hasNot(cls, *args):
@@ -1361,7 +1358,7 @@
@classmethod
def has_not(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).has_not(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).has_not(*args)
@classmethod
def hasValue(cls, *args):
@@ -1373,15 +1370,15 @@
@classmethod
def has_value(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).has_value(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).has_value(*args)
@classmethod
def id_(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).id_(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).id_(*args)
@classmethod
def identity(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).identity(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).identity(*args)
@classmethod
def inE(cls, *args):
@@ -1393,7 +1390,7 @@
@classmethod
def in_e(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).in_e(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).in_e(*args)
@classmethod
def inV(cls, *args):
@@ -1405,51 +1402,51 @@
@classmethod
def in_v(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).in_v(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).in_v(*args)
@classmethod
def in_(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).in_(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).in_(*args)
@classmethod
def index(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).index(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).index(*args)
@classmethod
def inject(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).inject(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).inject(*args)
@classmethod
def intersect(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).intersect(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).intersect(*args)
@classmethod
def is_(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).is_(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).is_(*args)
@classmethod
def key(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).key(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).key(*args)
@classmethod
def label(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).label(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).label(*args)
@classmethod
def length(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).length(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).length(*args)
@classmethod
def limit(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).limit(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).limit(*args)
@classmethod
def local(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).local(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).local(*args)
@classmethod
def loops(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).loops(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).loops(*args)
@classmethod
def ltrim(cls, *args):
@@ -1461,63 +1458,63 @@
@classmethod
def l_trim(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).l_trim(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).l_trim(*args)
@classmethod
def map(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).map(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).map(*args)
@classmethod
def match(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).match(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).match(*args)
@classmethod
def math(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).math(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).math(*args)
@classmethod
def max_(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).max_(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).max_(*args)
@classmethod
def mean(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).mean(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).mean(*args)
@classmethod
def merge(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).merge(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).merge(*args)
@classmethod
def merge_e(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).merge_e(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).merge_e(*args)
@classmethod
def merge_v(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).merge_v(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).merge_v(*args)
@classmethod
def min_(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).min_(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).min_(*args)
@classmethod
def none(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).none(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).none(*args)
@classmethod
def not_(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).not_(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).not_(*args)
@classmethod
def optional(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).optional(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).optional(*args)
@classmethod
def or_(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).or_(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).or_(*args)
@classmethod
def order(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).order(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).order(*args)
@classmethod
def otherV(cls, *args):
@@ -1529,11 +1526,11 @@
@classmethod
def other_v(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).other_v(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).other_v(*args)
@classmethod
def out(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).out(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).out(*args)
@classmethod
def outE(cls, *args):
@@ -1545,7 +1542,7 @@
@classmethod
def out_e(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).out_e(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).out_e(*args)
@classmethod
def outV(cls, *args):
@@ -1557,27 +1554,27 @@
@classmethod
def out_v(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).out_v(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).out_v(*args)
@classmethod
def path(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).path(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).path(*args)
@classmethod
def product(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).product(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).product(*args)
@classmethod
def project(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).project(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).project(*args)
@classmethod
def properties(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).properties(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).properties(*args)
@classmethod
def property(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).property(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).property(*args)
@classmethod
def propertyMap(cls, *args):
@@ -1589,23 +1586,23 @@
@classmethod
def property_map(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).property_map(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).property_map(*args)
@classmethod
def range_(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).range_(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).range_(*args)
@classmethod
def repeat(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).repeat(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).repeat(*args)
@classmethod
def replace(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).replace(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).replace(*args)
@classmethod
def reverse(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).reverse(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).reverse(*args)
@classmethod
def rTrim(cls, *args):
@@ -1617,19 +1614,19 @@
@classmethod
def r_trim(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).r_trim(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).r_trim(*args)
@classmethod
def sack(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).sack(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).sack(*args)
@classmethod
def sample(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).sample(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).sample(*args)
@classmethod
def select(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).select(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).select(*args)
@classmethod
def sideEffect(cls, *args):
@@ -1641,7 +1638,7 @@
@classmethod
def side_effect(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).side_effect(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).side_effect(*args)
@classmethod
def simplePath(cls, *args):
@@ -1653,35 +1650,35 @@
@classmethod
def simple_path(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).simple_path(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).simple_path(*args)
@classmethod
def skip(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).skip(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).skip(*args)
@classmethod
def split(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).split(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).split(*args)
@classmethod
def store(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).store(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).store(*args)
@classmethod
def subgraph(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).subgraph(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).subgraph(*args)
@classmethod
def substring(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).substring(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).substring(*args)
@classmethod
def sum_(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).sum_(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).sum_(*args)
@classmethod
def tail(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).tail(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).tail(*args)
@classmethod
def timeLimit(cls, *args):
@@ -1693,15 +1690,15 @@
@classmethod
def time_limit(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).time_limit(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).time_limit(*args)
@classmethod
def times(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).times(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).times(*args)
@classmethod
def to(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).to(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).to(*args)
@classmethod
def toE(cls, *args):
@@ -1713,15 +1710,15 @@
@classmethod
def to_e(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).to_e(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).to_e(*args)
@classmethod
def to_lower(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).to_lower(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).to_lower(*args)
@classmethod
def to_upper(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).to_upper(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).to_upper(*args)
@classmethod
def toV(cls, *args):
@@ -1733,31 +1730,31 @@
@classmethod
def to_v(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).to_v(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).to_v(*args)
@classmethod
def tree(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).tree(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).tree(*args)
@classmethod
def trim(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).trim(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).trim(*args)
@classmethod
def unfold(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).unfold(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).unfold(*args)
@classmethod
def union(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).union(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).union(*args)
@classmethod
def until(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).until(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).until(*args)
@classmethod
def value(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).value(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).value(*args)
@classmethod
def valueMap(cls, *args):
@@ -1769,90 +1766,90 @@
@classmethod
def value_map(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).value_map(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).value_map(*args)
@classmethod
def values(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).values(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).values(*args)
@classmethod
def where(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).where(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).where(*args)
# Class to handle transactions.
-class Transaction:
-
- def __init__(self, g, remote_connection):
- self._g = g
- self._session_based_connection = None
- self._remote_connection = remote_connection
- self.__is_open = False
- self.__mutex = Lock()
-
- # Begins transaction.
- def begin(self):
- with self.__mutex:
- # Verify transaction is not open.
- self.__verify_transaction_state(False, "Transaction already started on this object")
-
- # Create new session using the remote connection.
- self._session_based_connection = self._remote_connection.create_session()
- self.__is_open = True
-
- # Set the session as a remote strategy within the traversal strategy.
- traversal_strategy = TraversalStrategies()
- traversal_strategy.add_strategies([RemoteStrategy(self._session_based_connection)])
-
- # Return new GraphTraversalSource.
- return GraphTraversalSource(self._g.graph, traversal_strategy, self._g.bytecode)
-
- # Rolls transaction back.
- def rollback(self):
- with self.__mutex:
- # Verify transaction is open, close session and return result of transaction's rollback.
- self.__verify_transaction_state(True, "Cannot rollback a transaction that is not started.")
- return self.__close_session(self._session_based_connection.rollback())
-
- # Commits the current transaction.
- def commit(self):
- with self.__mutex:
- # Verify transaction is open, close session and return result of transaction's commit.
- self.__verify_transaction_state(True, "Cannot commit a transaction that is not started.")
- return self.__close_session(self._session_based_connection.commit())
-
- # Closes session.
- def close(self):
- with self.__mutex:
- # Verify transaction is open.
- self.__verify_transaction_state(True, "Cannot close a transaction that has previously been closed.")
- self.__close_session(None)
-
- # Return whether or not transaction is open.
- # Allow camelcase function here to keep api consistent with other languages.
- def isOpen(self):
- warnings.warn(
- "gremlin_python.process.Transaction.isOpen will be replaced by "
- "gremlin_python.process.Transaction.is_open.",
- DeprecationWarning)
- return self.is_open()
-
- def is_open(self):
- # if the underlying DriverRemoteConnection is closed then the Transaction can't be open
- if (self._session_based_connection and self._session_based_connection.is_closed()) or \
- self._remote_connection.is_closed():
- self.__is_open = False
-
- return self.__is_open
-
- def __verify_transaction_state(self, state, error_message):
- if self.__is_open != state:
- raise Exception(error_message)
-
- def __close_session(self, session):
- self.__is_open = False
- self._remote_connection.remove_session(self._session_based_connection)
- return session
+# class Transaction:
+#
+# def __init__(self, g, remote_connection):
+# self._g = g
+# self._session_based_connection = None
+# self._remote_connection = remote_connection
+# self.__is_open = False
+# self.__mutex = Lock()
+#
+# # Begins transaction.
+# def begin(self):
+# with self.__mutex:
+# # Verify transaction is not open.
+# self.__verify_transaction_state(False, "Transaction already started on this object")
+#
+# # Create new session using the remote connection.
+# self._session_based_connection = self._remote_connection.create_session()
+# self.__is_open = True
+#
+# # Set the session as a remote strategy within the traversal strategy.
+# traversal_strategy.py = TraversalStrategies()
+# traversal_strategy.py.add_strategies([RemoteStrategy(self._session_based_connection)])
+#
+# # Return new GraphTraversalSource.
+# return GraphTraversalSource(self._g.graph, traversal_strategy.py, self._g.bytecode)
+#
+# # Rolls transaction back.
+# def rollback(self):
+# with self.__mutex:
+# # Verify transaction is open, close session and return result of transaction's rollback.
+# self.__verify_transaction_state(True, "Cannot rollback a transaction that is not started.")
+# return self.__close_session(self._session_based_connection.rollback())
+#
+# # Commits the current transaction.
+# def commit(self):
+# with self.__mutex:
+# # Verify transaction is open, close session and return result of transaction's commit.
+# self.__verify_transaction_state(True, "Cannot commit a transaction that is not started.")
+# return self.__close_session(self._session_based_connection.commit())
+#
+# # Closes session.
+# def close(self):
+# with self.__mutex:
+# # Verify transaction is open.
+# self.__verify_transaction_state(True, "Cannot close a transaction that has previously been closed.")
+# self.__close_session(None)
+#
+# # Return whether or not transaction is open.
+# # Allow camelcase function here to keep api consistent with other languages.
+# def isOpen(self):
+# warnings.warn(
+# "gremlin_python.process.Transaction.isOpen will be replaced by "
+# "gremlin_python.process.Transaction.is_open.",
+# DeprecationWarning)
+# return self.is_open()
+#
+# def is_open(self):
+# # if the underlying DriverRemoteConnection is closed then the Transaction can't be open
+# if (self._session_based_connection and self._session_based_connection.is_closed()) or \
+# self._remote_connection.is_closed():
+# self.__is_open = False
+#
+# return self.__is_open
+#
+# def __verify_transaction_state(self, state, error_message):
+# if self.__is_open != state:
+# raise Exception(error_message)
+#
+# def __close_session(self, session):
+# self.__is_open = False
+# self._remote_connection.remove_session(self._session_based_connection)
+# return session
def E(*args):
@@ -2495,12 +2492,12 @@
statics.add_static('date_diff', date_diff)
-statics.add_static('dedup', dedup)
-
statics.add_static('discard', discard)
statics.add_static('disjunct', disjunct)
+statics.add_static('dedup', dedup)
+
statics.add_static('drop', drop)
statics.add_static('element', element)
diff --git a/gremlin-python/src/main/python/gremlin_python/process/translator.py b/gremlin-python/src/main/python/gremlin_python/process/translator.py
deleted file mode 100755
index 7fd3e88..0000000
--- a/gremlin-python/src/main/python/gremlin_python/process/translator.py
+++ /dev/null
@@ -1,297 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-"""
-Class that can turn traversals back into Gremlin Groovy format text queries.
-Those queries can then be run in the Gremlin console or using the GLV submit(<String>) API or
-sent to any TinkerPop compliant HTTP endpoint.
-"""
-__author__ = 'Kelvin R. Lawrence (gfxman)'
-
-import math
-import numbers
-import re
-
-from gremlin_python.process.traversal import *
-from gremlin_python.process.strategies import *
-from gremlin_python.structure.graph import Vertex, Edge, VertexProperty
-from datetime import datetime
-
-
-class Translator:
- """
- Turn a bytecode object back into a textual query (Gremlin Groovy script).
- """
-
- # Dictionary used to reverse-map token IDs to strings
- options = {
- WithOptions.tokens: 'tokens',
- WithOptions.none: 'none',
- WithOptions.ids: 'ids',
- WithOptions.labels: 'labels',
- WithOptions.keys: 'keys',
- WithOptions.values: 'values',
- WithOptions.all: 'all',
- WithOptions.indexer: 'indexer',
- WithOptions.list: 'list',
- WithOptions.map: 'map'
- }
-
- conn_p = ['and', 'or']
-
- def __init__(self, traversal_source=None):
- self.traversal_source = traversal_source
-
- def get_traversal_source(self):
- return self.traversal_source
-
- def get_target_language(self):
- return "gremlin-groovy"
-
- def of(self, traversal_source):
- self.traversal_source = traversal_source
- return self
-
- # Do any needed special processing for the representation
- # of strings and dates and boolean.
- def fixup(self, v):
- if isinstance(v, str):
- return f'{v!r}' # use repr() format for canonical string rep
- elif type(v) == datetime:
- return self.process_date(v)
- elif type(v) == bool:
- return 'true' if v else 'false'
- elif isinstance(v, numbers.Number):
- return self.process_number(v)
- elif isinstance(v, set):
- return f'[{str(v)[1:-1]}]'
- elif isinstance(v, P):
- return self.process_predicate(v)
- elif type(v) == Vertex:
- return self.process_vertex(v)
- elif type(v) == Edge:
- return self.process_edge(v)
- elif type(v) in [Merge]: # on_create on_match out_v in_v
- tmp = str(v)
- return f'{tmp.split("_")[0]}{tmp.split("_")[1].capitalize()}' if tmp.find('_') else tmp
- elif v is None:
- return 'null'
- else:
- return str(v)
-
- # Turn a Python datetime into the equivalent new Date(...)
- def process_date(self, date):
- y = date.year - 1900
- mo = date.month
- d = date.day
- h = date.hour
- mi = date.minute
- s = date.second
- return f'new Date({y},{mo},{d},{h},{mi},{s})'
-
- # Do special processing needed to format predicates that come in
- # such as "gt(a)" correctly.
- def process_predicate(self, p):
- res = ''
- if p.operator in self.conn_p:
- res += f'{self.process_predicate(p.value)}.{p.operator}({self.process_predicate(p.other)})'
- else:
- res += f'{self.process_p_value(p)}'
- return res
-
- # process the value of the predicates
- def process_p_value(self, p):
- res = str(p).split('(')[0] + '('
- if type(p.value) == list:
- res += '['
- for v in p.value:
- res += self.fixup(v) + ','
- res = (res[0:-1] + ']') if len(p.value) > 0 else (res + ']')
- else:
- res += self.fixup(p.value)
- if p.other is not None:
- res += f',{self.fixup(p.other)}'
- res += ')'
- return res
-
- # Special processing to handle strategies
- def process_strategy(self, s):
- c = 0
- res = ''
- # if parameter is empty, only pass class name (referenced GroovyTranslator.java)
- if not s.configuration:
- res += s.strategy_name
- else:
- res = f'new {str(s)}('
- for key in s.configuration:
- res += ',' if c > 0 else ''
- res += key + ':'
- val = s.configuration[key]
- if isinstance(val, Traversal):
- res += self.translate(val.bytecode, child=True)
- else:
- res += self.fixup(val)
- c += 1
- res += ')'
- return res
- pass
-
- # Special processing to handle vertices
- def process_vertex(self, vertex):
- return f'new ReferenceVertex({self.fixup(vertex.id)},\'{vertex.label}\')'
-
- # Special processing to handle edges
- def process_edge(self, edge):
- return f'new ReferenceEdge({str(edge.id)},\'{edge.label}\',' \
- f'new ReferenceVertex({str(edge.inV.id)},\'{edge.inV.label}\'),' \
- f'new ReferenceVertex({str(edge.outV.id)},\'{edge.outV.label}\'))'
-
- # Special processing to handle vertex property
- def process_vertex_property(self, vp):
- return f'new ReferenceVertexProperty({str(vp.id)},\'{vp.label}\',{self.fixup(vp.value)})'
-
- # Special processing to handle lambda
- def process_lambda(self, lam):
- lambda_result = lam()
- script = lambda_result if isinstance(lambda_result, str) else lambda_result[0]
- return f'{script}' if re.match(r"^\{.*\}$", script, flags=re.DOTALL) else f'{{{script}}}'
-
- def process_dict(self, d):
- c = 0
- res = '['
- if len(d) == 0:
- res += ':'
- else:
- for k, v in d.items():
- wrap = not isinstance(k, str)
- res += ',' if c > 0 else ''
- res += '(' if wrap else ''
- res += self.fixup(k)
- res += ')' if wrap else ''
- res += f':{self.fixup(v)}'
- c += 1
- res += ']'
- return res
-
- def process_number(self, n):
- if isinstance(n, float):
- # converting floats into doubles for script since python doesn't distinguish and java defaults to double
- if math.isnan(n):
- return "Double.NaN"
- elif math.isinf(n) and n > 0:
- return "Double.POSITIVE_INFINITY"
- elif math.isinf(n) and n < 0:
- return "Double.NEGATIVE_INFINITY"
- else:
- return f'{n}d'
- return f'{n}'
-
- def process_list(self, l):
- c = 0
- res = '['
- for i in l:
- res += ',' if c > 0 else ''
- res += self.fixup(i)
- c += 1
- res += ']'
- return res
-
- # Special processing to handle bindings inside of traversals
- def process_binding(self, binding):
- return f'Bindings.instance().of(\'{binding.key}\', {str(binding.value)})'
-
- # Main driver of the translation. Different parts of
- # a Traversal are handled appropriately.
- def do_translation(self, step):
- script = ''
- params = step[1:]
- script += '.' + step[0] + '('
- if len(params) > 0:
- c = 0
- with_opts = False
- is_merge_op = (step[0] == 'mergeV') or (step[0] == 'mergeE')
- for p in params:
- script += ',' if c > 0 else ''
- if with_opts:
- script += f'WithOptions.{self.options[p]}'
- elif type(p) == Bytecode:
- script += self.translate(p, True)
- elif isinstance(p, P):
- script += self.process_predicate(p)
- elif type(p) == Vertex:
- script += self.process_vertex(p)
- elif type(p) == Edge:
- script += self.process_edge(p)
- elif type(p) == VertexProperty:
- script += self.process_vertex_property(p)
- elif type(p) in [Cardinality, Pop, Operator, Scope, T]:
- tmp = str(p)
- script += tmp[0:-1] if tmp.endswith('_') else tmp
- elif type(p) in [Merge]: # on_create on_match out_v in_v
- is_merge_op = True
- tmp = str(p)
- script += f'{tmp.split("_")[0]}{tmp.split("_")[1].capitalize()}' if tmp.find('_') else tmp
- elif isinstance(p, TraversalStrategy): # this will capture all strategies
- script += self.process_strategy(p)
- elif type(p) == datetime:
- script += self.process_date(p)
- elif p == WithOptions.tokens:
- script += 'WithOptions.tokens'
- with_opts = True
- elif isinstance(p, str):
- script += f'{p!r}' # use repr() format for canonical string rep
- elif type(p) == bool:
- script += 'true' if p else 'false'
- elif isinstance(p, type(lambda: None)) and p.__name__ == (lambda: None).__name__:
- script += self.process_lambda(p)
- elif type(p) == Binding:
- script += self.process_binding(p)
- elif p is None:
- script += '(Traversal) null' if is_merge_op else 'null'
- elif isinstance(p, type):
- script += p.__name__
- elif isinstance(p, dict):
- script += self.process_dict(p)
- elif isinstance(p, numbers.Number):
- script += self.process_number(p)
- elif isinstance(p, set):
- script += f'[{str(p)[1:-1]}] as Set' if len(p) > 0 else '[] as Set'
- elif isinstance(p, list):
- script += self.process_list(p)
- else:
- script += str(p)
- c += 1
- script += ')'
- return script
-
- # Translation starts here. There are two main parts to a
- # traversal. Source instructions such as "withSideEffect"
- # and "withStrategies", and step instructions such as
- # "addV" and "repeat". If child is True we will generate
- # anonymous traversal style syntax.
- def translate(self, bytecode, child=False):
- script = '__' if child else self.traversal_source
-
- for step in bytecode.source_instructions:
- script += self.do_translation(step)
-
- for step in bytecode.step_instructions:
- script += self.do_translation(step)
-
- return script
diff --git a/gremlin-python/src/main/python/gremlin_python/process/traversal.py b/gremlin-python/src/main/python/gremlin_python/process/traversal.py
index 817987d..46ac241 100644
--- a/gremlin-python/src/main/python/gremlin_python/process/traversal.py
+++ b/gremlin-python/src/main/python/gremlin_python/process/traversal.py
@@ -18,25 +18,33 @@
#
import copy
+import math
+import threading
+import uuid
import warnings
+
from aenum import Enum
+from gremlin_python.structure.graph import Vertex, Edge, Path, Property
+
from .. import statics
-from ..statics import long
+from ..statics import long, SingleByte, short, bigint, BigDecimal
+from datetime import datetime
+
class Traversal(object):
- def __init__(self, graph, traversal_strategies, bytecode):
+ def __init__(self, graph, traversal_strategies, gremlin_lang):
self.graph = graph
self.traversal_strategies = traversal_strategies
- self.bytecode = bytecode
+ self.gremlin_lang = gremlin_lang
self.traversers = None
self.last_traverser = None
def __repr__(self):
- return str(self.bytecode)
+ return self.gremlin_lang.get_gremlin()
def __eq__(self, other):
if isinstance(other, self.__class__):
- return self.bytecode == other.bytecode
+ return self.gremlin_lang.get_gremlin() == other.gremlin_lang.get_gremlin()
else:
return False
@@ -48,11 +56,16 @@
self.traversal_strategies.apply_strategies(self)
if self.last_traverser is None:
self.last_traverser = next(self.traversers)
- object = self.last_traverser.object
- self.last_traverser.bulk = self.last_traverser.bulk - 1
- if self.last_traverser.bulk <= 0:
+ res = self.last_traverser
+ if isinstance(res, Traverser):
+ obj = res.object
+ self.last_traverser.bulk = self.last_traverser.bulk - 1
+ if self.last_traverser.bulk <= 0:
+ self.last_traverser = None
+ return obj
+ else:
self.last_traverser = None
- return object
+ return res
def toList(self):
warnings.warn(
@@ -75,10 +88,12 @@
return set(iter(self))
def iterate(self):
- self.bytecode.add_step("discard")
+ self.gremlin_lang.add_step("discard")
while True:
- try: self.next_traverser()
- except StopIteration: return self
+ try:
+ self.next_traverser()
+ except StopIteration:
+ return self
def nextTraverser(self):
warnings.warn(
@@ -108,9 +123,11 @@
if self.traversers is None:
self.traversal_strategies.apply_strategies(self)
if self.last_traverser is None:
- try: self.last_traverser = next(self.traversers)
- except StopIteration: return False
- return not(self.last_traverser is None) and self.last_traverser.bulk > 0
+ try:
+ self.last_traverser = next(self.traversers)
+ except StopIteration:
+ return False
+ return not (self.last_traverser is None) and self.last_traverser.bulk > 0 if isinstance(self.last_traverser, Traverser) else True
def next(self, amount=None):
if amount is None:
@@ -120,8 +137,10 @@
tempList = []
while count < amount:
count = count + 1
- try: temp = self.__next__()
- except StopIteration: return tempList
+ try:
+ temp = self.__next__()
+ except StopIteration:
+ return tempList
tempList.append(temp)
return tempList
@@ -129,6 +148,7 @@
self.traversal_strategies.apply_async_strategies(self)
future_traversal = self.remote_results
future = type(future_traversal)()
+
def process(f):
try:
traversal = f.result()
@@ -145,6 +165,7 @@
future.set_result(result)
else:
future.set_result(self)
+
future_traversal.add_done_callback(process)
return future
@@ -183,17 +204,6 @@
statics.add_static('from_', Direction.OUT)
statics.add_static('to', Direction.IN)
-GraphSONVersion = Enum('GraphSONVersion', ' V1_0 V2_0 V3_0')
-
-statics.add_static('V1_0', GraphSONVersion.V1_0)
-statics.add_static('V2_0', GraphSONVersion.V2_0)
-statics.add_static('V3_0', GraphSONVersion.V3_0)
-
-GryoVersion = Enum('GryoVersion', ' V1_0 V3_0')
-
-statics.add_static('V1_0', GryoVersion.V1_0)
-statics.add_static('V3_0', GryoVersion.V3_0)
-
DT = Enum('DT', ' second minute hour day')
statics.add_static('second', DT.second)
@@ -243,7 +253,6 @@
statics.add_static('global_', Scope.global_)
statics.add_static('local', Scope.local)
-
T = Enum('T', ' id id_ key label value')
statics.add_static('id', T.id)
@@ -252,7 +261,6 @@
statics.add_static('key', T.key)
statics.add_static('value', T.value)
-
Operator = Enum('Operator', ' addAll add_all and_ assign div max max_ min min_ minus mult or_ sum_ sumLong sum_long')
statics.add_static('sum_', Operator.sum_)
@@ -328,7 +336,7 @@
return P("within", list(args[0]))
else:
return P("within", list(args))
-
+
@staticmethod
def without(*args):
if len(args) == 1 and type(args[0]) == list:
@@ -582,16 +590,12 @@
statics.add_static('not_regex', not_regex)
-
-
-
'''
IO
'''
class IO(object):
-
graphml = "graphml"
graphson = "graphson"
@@ -611,7 +615,6 @@
class ConnectedComponent(object):
-
component = "gremlin.connectedComponentVertexProgram.component"
edges = "~tinkerpop.connectedComponent.edges"
@@ -627,7 +630,6 @@
class ShortestPath(object):
-
distance = "~tinkerpop.shortestPath.distance"
edges = "~tinkerpop.shortestPath.edges"
@@ -649,7 +651,6 @@
class PageRank(object):
-
edges = "~tinkerpop.pageRank.edges"
propertyName = "~tinkerpop.pageRank.propertyName"
@@ -665,7 +666,6 @@
class PeerPressure(object):
-
edges = "~tinkerpop.peerPressure.edges"
propertyName = "~tinkerpop.peerPressure.propertyName"
@@ -720,10 +720,11 @@
class TraversalStrategy(object):
- def __init__(self, strategy_name=None, configuration=None, fqcn=None):
+ def __init__(self, strategy_name=None, configuration=None, fqcn=None, **kwargs):
self.fqcn = fqcn
self.strategy_name = type(self).__name__ if strategy_name is None else strategy_name
self.configuration = {} if configuration is None else configuration
+ self.configuration = {**kwargs, **self.configuration} # merge additional kwargs into strategy configuration
def apply(self, traversal):
return
@@ -742,153 +743,11 @@
'''
-BYTECODE
-'''
-
-
-class Bytecode(object):
- def __init__(self, bytecode=None):
- self.source_instructions = []
- self.step_instructions = []
- self.bindings = {}
- if bytecode is not None:
- self.source_instructions = list(bytecode.source_instructions)
- self.step_instructions = list(bytecode.step_instructions)
-
- def add_source(self, source_name, *args):
- instruction = [source_name]
- for arg in args:
- instruction.append(self.__convertArgument(arg))
- self.source_instructions.append(instruction)
-
- def add_step(self, step_name, *args):
- instruction = [step_name]
- for arg in args:
- instruction.append(self.__convertArgument(arg))
- self.step_instructions.append(instruction)
-
- def __eq__(self, other):
- if isinstance(other, self.__class__):
- return self.source_instructions == other.source_instructions and self.step_instructions == other.step_instructions
- else:
- return False
-
- def __copy__(self):
- bb = Bytecode()
- bb.source_instructions = self.source_instructions
- bb.step_instructions = self.step_instructions
- bb.bindings = self.bindings
- return bb
-
- def __deepcopy__(self, memo={}):
- bb = Bytecode()
- bb.source_instructions = copy.deepcopy(self.source_instructions, memo)
- bb.step_instructions = copy.deepcopy(self.step_instructions, memo)
- bb.bindings = copy.deepcopy(self.bindings, memo)
- return bb
-
- def __convertArgument(self, arg):
- if isinstance(arg, Traversal):
- if arg.graph is not None:
- raise TypeError("The child traversal of " + str(arg) + " was not spawned anonymously - use the __ class rather than a TraversalSource to construct the child traversal")
- self.bindings.update(arg.bytecode.bindings)
- return arg.bytecode
- elif isinstance(arg, dict):
- newDict = {}
- for key in arg:
- newDict[self.__convertArgument(key)] = self.__convertArgument(arg[key])
- return newDict
- elif isinstance(arg, list):
- newList = []
- for item in arg:
- newList.append(self.__convertArgument(item))
- return newList
- elif isinstance(arg, set):
- newSet = set()
- for item in arg:
- newSet.add(self.__convertArgument(item))
- return newSet
- elif isinstance(arg, Binding):
- self.bindings[arg.key] = arg.value
- return Binding(arg.key, self.__convertArgument(arg.value))
- else:
- return arg
-
- def __repr__(self):
- return (str(self.source_instructions) if len(self.source_instructions) > 0 else "") + \
- (str(self.step_instructions) if len(self.step_instructions) > 0 else "")
-
- @staticmethod
- def _create_graph_op(name, *values):
- bc = Bytecode()
- bc.add_source(name, *values)
- return bc
-
- @staticmethod
- class GraphOp:
- @staticmethod
- def commit():
- return Bytecode._create_graph_op("tx", "commit")
-
- @staticmethod
- def rollback():
- return Bytecode._create_graph_op("tx", "rollback")
-
-
-class CardinalityValue(Bytecode):
- def __init__(self, cardinality, val):
- super().__init__()
- self.add_source("CardinalityValueTraversal", cardinality, val)
-
- @classmethod
- def single(cls, val):
- return CardinalityValue(Cardinality.single, val)
-
- @classmethod
- def list_(cls, val):
- return CardinalityValue(Cardinality.list_, val)
-
- @classmethod
- def set_(cls, val):
- return CardinalityValue(Cardinality.set_, val)
-
-
-'''
-BINDINGS
-'''
-
-
-class Bindings(object):
-
- @staticmethod
- def of(key, value):
- if not isinstance(key, str):
- raise TypeError("Key must be str")
- return Binding(key, value)
-
-
-class Binding(object):
- def __init__(self, key, value):
- self.key = key
- self.value = value
-
- def __eq__(self, other):
- return isinstance(other, self.__class__) and self.key == other.key and self.value == other.value
-
- def __hash__(self):
- return hash(self.key) + hash(self.value)
-
- def __repr__(self):
- return "binding[" + self.key + "=" + str(self.value) + "]"
-
-
-'''
WITH OPTIONS
'''
class WithOptions(object):
-
tokens = "~tinkerpop.valueMap.tokens"
none = 0
@@ -909,3 +768,391 @@
map = 1
+
+'''
+GREMLIN LANGUAGE
+'''
+
+
+class GremlinLang(object):
+ conn_p = ['and', 'or']
+
+ def __init__(self, gremlin_lang=None):
+ self.empty_array = []
+
+ self.gremlin = []
+ self.parameters = {}
+ self.options_strategies = []
+ self.param_count = AtomicInteger()
+
+ if gremlin_lang is not None:
+ self.gremlin = list(gremlin_lang.gremlin)
+ self.parameters = dict(gremlin_lang.parameters)
+ self.options_strategies = list(gremlin_lang.options_strategies)
+ self.param_count = gremlin_lang.param_count
+
+ def _add_to_gremlin(self, string_name, *args):
+
+ if string_name == 'CardinalityValueTraversal':
+ self.gremlin.append(
+ f'{self._arg_as_string(args[0][0])}({self._arg_as_string(args[0][1])})')
+ return
+
+ self.gremlin.extend(['.', string_name, '('])
+
+ c = 0
+ while len(args[0]) > c:
+ if c != 0:
+ self.gremlin.append(',')
+ self.gremlin.append(self._arg_as_string(self._convert_argument(args[0][c])))
+ c += 1
+
+ self.gremlin.append(')')
+
+ def _arg_as_string(self, arg):
+
+ if arg is None:
+ return 'null'
+
+ if isinstance(arg, str):
+ return f'{arg!r}' # use repr() format for canonical string rep
+ # return f'"{arg}"'
+ if isinstance(arg, bool):
+ return 'true' if arg else 'false'
+
+ if isinstance(arg, SingleByte):
+ return f'{arg}B'
+ if isinstance(arg, short):
+ return f'{arg}S'
+ if isinstance(arg, long):
+ return f'{arg}L'
+ if isinstance(arg, bigint):
+ return f'{arg}N'
+ if isinstance(arg, int):
+ return f'{arg}'
+ if isinstance(arg, float):
+ # converting floats into doubles for script since python doesn't distinguish and java defaults to double
+ if math.isnan(arg):
+ return "NaN"
+ elif math.isinf(arg) and arg > 0:
+ return "+Infinity"
+ elif math.isinf(arg) and arg < 0:
+ return "-Infinity"
+ else:
+ return f'{arg}D'
+ if isinstance(arg, BigDecimal):
+ return f'{arg.value}M'
+
+ if isinstance(arg, datetime):
+ return f'datetime("{arg.isoformat()}")'
+
+ if isinstance(arg, uuid.UUID):
+ return f'UUID("{arg}")'
+
+ if isinstance(arg, Enum):
+ tmp = str(arg)
+ if tmp.endswith('_'):
+ return tmp[0:-1]
+ elif '_' in tmp:
+ return f'{tmp.split("_")[0]}{tmp.split("_")[1].capitalize()}'
+ else:
+ return tmp
+
+ if isinstance(arg, Vertex):
+ return f'{self._arg_as_string(arg.id)}'
+
+ if isinstance(arg, P):
+ return self._process_predicate(arg)
+
+ if isinstance(arg, GremlinLang) or isinstance(arg, Traversal):
+ gremlin_lang = arg if isinstance(arg, GremlinLang) else arg.gremlin_lang
+ self.parameters.update(gremlin_lang.parameters)
+ return gremlin_lang.get_gremlin('__')
+
+ if isinstance(arg, GValue):
+ key = arg.get_name()
+
+ if not key.isidentifier():
+ raise Exception(f'invalid parameter name {key}.')
+
+ if key in self.parameters:
+ if self.parameters[key] != arg.value:
+ raise Exception(f'parameter with name {key} already exists.')
+ else:
+ self.parameters[key] = arg.value
+ return key
+
+ if isinstance(arg, dict):
+ return self._process_dict(arg)
+
+ if isinstance(arg, set):
+ return self._process_set(arg)
+
+ if isinstance(arg, list):
+ return self._process_list(arg)
+
+ if hasattr(arg, '__class__'):
+ try:
+ return arg.__name__
+ except AttributeError:
+ pass
+
+ return self._as_parameter(arg)
+
+ def _as_parameter(self, arg):
+ param_name = f'_{self.param_count.get_and_increment()}'
+ self.parameters[param_name] = arg
+ return param_name
+
+ # Do special processing needed to format predicates that come in
+ # such as "gt(a)" correctly.
+ def _process_predicate(self, p):
+ res = []
+ if p.operator in self.conn_p:
+ res.append(f'{self._process_predicate(p.value)}.{p.operator}({self._process_predicate(p.other)})')
+ else:
+ res.append(f'{self._process_p_value(p)}')
+ return ''.join(res)
+
+ # process the value of the predicates
+ def _process_p_value(self, p):
+ c = 0
+ res = [str(p).split('(')[0] + '(']
+ if isinstance(p.value, list):
+ res.append('[')
+ for v in p.value:
+ if c > 0:
+ res.append(',')
+ res.append(self._arg_as_string(v))
+ c += 1
+ res.append(']')
+ else:
+ res.append(self._arg_as_string(p.value))
+ if p.other is not None:
+ res.append(f',{self._arg_as_string(p.other)}')
+ res.append(')')
+ return ''.join(res)
+
+ def _process_dict(self, d):
+ c = 0
+ res = ['[']
+ if len(d) == 0:
+ res.append(':')
+ else:
+ for k, v in d.items():
+ wrap = not isinstance(k, str)
+ if c > 0:
+ res.append(',')
+ res.append(f'({self._arg_as_string(k)})') if wrap else res.append(self._arg_as_string(k))
+ res.append(f':{self._arg_as_string(v)}')
+ c += 1
+ res.append(']')
+ return ''.join(res)
+
+ def _process_set(self, s):
+ c = 0
+ res = ['{']
+ for i in s:
+ if c > 0:
+ res.append(',')
+ res.append(self._arg_as_string(i))
+ c += 1
+ res.append('}')
+ return ''.join(res)
+
+ def _process_list(self, lst):
+ c = 0
+ res = ['[']
+ for i in lst:
+ if c > 0:
+ res.append(',')
+ res.append(self._arg_as_string(i))
+ c += 1
+ res.append(']')
+ return ''.join(res)
+
+ def get_gremlin(self, g='g'):
+ # special handling for CardinalityValueTraversal
+ if len(self.gremlin) != 0 and self.gremlin[0] != '.':
+ return ''.join(self.gremlin)
+
+ return g + ''.join(self.gremlin)
+
+ def get_parameters(self):
+ return self.parameters
+
+ def add_g(self, g):
+ self.parameters['g'] = g
+
+ def reset(self):
+ self.param_count.set(0)
+
+ def add_source(self, source_name, *args):
+
+ if source_name == 'withStrategies' and len(args) != 0:
+ args = self.build_strategy_args(args)
+ if len(args) != 0:
+ self.gremlin.append('.')
+ self.gremlin.append(f'withStrategies({args})')
+ return
+ self._add_to_gremlin(source_name, args)
+
+ def build_strategy_args(self, args):
+ res = []
+ c = 0
+ for arg in args:
+ if c > 0:
+ res.append(',')
+ # special handling for OptionsStrategy
+ from gremlin_python.process.strategies import OptionsStrategy
+ if isinstance(arg, OptionsStrategy):
+ self.options_strategies.append(arg)
+ break
+ if not arg.configuration:
+ res.append(arg.strategy_name)
+ else:
+ res.append(f'new {str(arg)}(')
+ ct = 0
+ for key in arg.configuration:
+ if ct > 0:
+ res.append(',')
+ res.append(f'{key}:')
+ val = arg.configuration[key]
+ if isinstance(val, Traversal):
+ res.append(self._arg_as_string(val.gremlin_lang))
+ else:
+ res.append(self._arg_as_string(val))
+ ct += 1
+ res.append(')')
+ c += 1
+ return ''.join(res)
+
+ def add_step(self, step_name, *args):
+ self._add_to_gremlin(step_name, args)
+
+ def __eq__(self, other):
+ if isinstance(other, self.__class__):
+ return ''.join(self.gremlin) == ''.join(self.gremlin) and self.parameters == other.parameters
+ else:
+ return False
+
+ def __copy__(self):
+ gl = GremlinLang()
+ gl.parameters = self.parameters
+ gl.gremlin = self.gremlin
+ return gl
+
+ def __deepcopy__(self, memo=None):
+ if memo is None:
+ memo = {}
+ gl = GremlinLang()
+ gl.parameters = copy.deepcopy(self.parameters, memo)
+ gl.gremlin = copy.deepcopy(self.gremlin, memo)
+ return gl
+
+ def _convert_argument(self, arg):
+ # if arg is None or len(arg) == 0:
+ # return arg
+ if isinstance(arg, Traversal):
+ if arg.graph is not None:
+ raise TypeError("The child traversal of " + str(
+ arg) + "was not spawned anonymously - use the __ class rather than a TraversalSource to construct "
+ "the child traversal.")
+ return arg.gremlin_lang
+ elif isinstance(arg, dict):
+ newDict = {}
+ for key in arg:
+ newDict[self._convert_argument(key)] = self._convert_argument(arg[key])
+ return newDict
+ elif isinstance(arg, list):
+ newList = []
+ for item in arg:
+ newList.append(self._convert_argument(item))
+ return newList
+ elif isinstance(arg, set):
+ newSet = set()
+ for item in arg:
+ newSet.add(self._convert_argument(item))
+ return newSet
+ else:
+ return arg
+
+ def __repr__(self):
+ return (''.join(self.gremlin) if len(self.gremlin) > 0 else "") + \
+ (str(self.parameters) if len(self.parameters) > 0 else "")
+
+ # TODO to be removed or updated once HTTP transaction is implemented
+ # @staticmethod
+ # def _create_graph_op(name, *values):
+ # bc = Bytecode()
+ # bc.add_source(name, *values)
+ # return bc
+ #
+ # @staticmethod
+ # class GraphOp:
+ # @staticmethod
+ # def commit():
+ # return Bytecode._create_graph_op("tx", "commit")
+ #
+ # @staticmethod
+ # def rollback():
+ # return Bytecode._create_graph_op("tx", "rollback")
+
+
+class GValue:
+ def __init__(self, name, value):
+ if name is None:
+ raise Exception("The parameter name cannot be None.")
+ if name.startswith('_'):
+ raise Exception(f'invalid GValue name {name}. Should not start with _.')
+ self.name = name
+ self.value = value
+
+ def get_name(self):
+ return self.name
+
+ def is_null(self):
+ return self.value is None
+
+ def get(self):
+ return self.value
+
+
+class CardinalityValue(GremlinLang):
+ def __init__(self, cardinality, val):
+ super().__init__()
+ self.add_source("CardinalityValueTraversal", cardinality, val)
+
+ @classmethod
+ def single(cls, val):
+ return CardinalityValue(Cardinality.single, val)
+
+ @classmethod
+ def list_(cls, val):
+ return CardinalityValue(Cardinality.list_, val)
+
+ @classmethod
+ def set_(cls, val):
+ return CardinalityValue(Cardinality.set_, val)
+
+
+class AtomicInteger:
+ def __init__(self):
+ self._value = 0
+ self._lock = threading.Lock()
+
+ def get_and_increment(self):
+ with self._lock:
+ value = self._value
+ self._value += 1
+ return value
+
+ def set(self, value):
+ with self._lock:
+ self._value = value
+ return self._value
+
+ @property
+ def value(self):
+ with self._lock:
+ return self._value
diff --git a/gremlin-python/src/main/python/gremlin_python/statics.py b/gremlin-python/src/main/python/gremlin_python/statics.py
index 598b15d..b5a83fb 100644
--- a/gremlin-python/src/main/python/gremlin_python/statics.py
+++ b/gremlin-python/src/main/python/gremlin_python/statics.py
@@ -16,7 +16,7 @@
# specific language governing permissions and limitations
# under the License.
#
-
+import decimal
from types import FunctionType
from aenum import Enum
@@ -42,15 +42,6 @@
ListType = list
DictType = dict
SetType = set
-ByteBufferType = bytes
-
-
-class timestamp(float):
- """
- In Python a timestamp is simply a float. This dummy class (similar to long), allows users to wrap a float
- in a GLV script to make sure the value is serialized as a Gremlin timestamp.
- """
- pass
class SingleByte(int):
@@ -84,10 +75,34 @@
class BigDecimal(object):
+ """
+ Provides a way to represent a BigDecimal for Gremlin.
+ """
def __init__(self, scale, unscaled_value):
self.scale = scale
self.unscaled_value = unscaled_value
+ @property
+ def value(self):
+ self._as_decimal = decimal.Decimal(self.unscaled_value)
+ precision = len(self._as_decimal.as_tuple().digits)
+ with decimal.localcontext(decimal.Context(prec=precision)):
+ return self._as_decimal.scaleb(-self.scale)
+
+"""
+Create a BigDecimal from a number that can be converted to a Decimal. Note precision may be lost during the conversion.
+"""
+def to_bigdecimal(value):
+ try:
+ decimal_value = value if isinstance(value, decimal.Decimal) else decimal.Decimal(str(value))
+ scale = -decimal_value.as_tuple().exponent
+ unscaled_value = int("".join(map(str, decimal_value.as_tuple().digits)))
+ except TypeError:
+ raise ValueError("BigDecimal does not support NaN, Infinity or -Infinity")
+ except Exception as err:
+ raise ValueError(f'Encountered error: {err}. Value must be able to convert to a Decimal.')
+ return BigDecimal(scale, unscaled_value if decimal_value >= 0 else -unscaled_value)
+
staticMethods = {}
staticEnums = {}
diff --git a/gremlin-python/src/main/python/gremlin_python/structure/graph.py b/gremlin-python/src/main/python/gremlin_python/structure/graph.py
index ab83a53..1825855 100644
--- a/gremlin-python/src/main/python/gremlin_python/structure/graph.py
+++ b/gremlin-python/src/main/python/gremlin_python/structure/graph.py
@@ -19,10 +19,6 @@
__author__ = 'Marko A. Rodriguez (http://markorodriguez.com)'
-from gremlin_python.process.graph_traversal import GraphTraversalSource
-from gremlin_python.process.traversal import TraversalStrategies
-import warnings
-
class Graph(object):
diff --git a/gremlin-python/src/main/python/gremlin_python/structure/io/graphbinaryV1.py b/gremlin-python/src/main/python/gremlin_python/structure/io/graphbinaryV1.py
deleted file mode 100644
index fa1e693..0000000
--- a/gremlin-python/src/main/python/gremlin_python/structure/io/graphbinaryV1.py
+++ /dev/null
@@ -1,1213 +0,0 @@
-"""
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
-"""
-
-import datetime
-import calendar
-import uuid
-import math
-import io
-import struct
-from collections import OrderedDict
-import logging
-
-from struct import pack, unpack
-from aenum import Enum
-from datetime import timedelta
-from gremlin_python import statics
-from gremlin_python.statics import FloatType, BigDecimal, FunctionType, ShortType, IntType, LongType, BigIntType, \
- TypeType, DictType, ListType, SetType, SingleByte, ByteBufferType, GremlinType, \
- SingleChar
-from gremlin_python.process.traversal import Barrier, Binding, Bytecode, Cardinality, Column, Direction, DT, Merge, N, \
- Operator, Order, Pick, Pop, P, Scope, TextP, Traversal, Traverser, \
- TraversalStrategy, T
-from gremlin_python.process.graph_traversal import GraphTraversal
-from gremlin_python.structure.graph import Graph, Edge, Property, Vertex, VertexProperty, Path
-from gremlin_python.structure.io.util import HashableDict, SymbolUtil
-
-log = logging.getLogger(__name__)
-
-# When we fall back to a superclass's serializer, we iterate over this map.
-# We want that iteration order to be consistent, so we use an OrderedDict,
-# not a dict.
-_serializers = OrderedDict()
-_deserializers = {}
-
-
-class DataType(Enum):
- null = 0xfe
- int = 0x01
- long = 0x02
- string = 0x03
- date = 0x04
- timestamp = 0x05
- clazz = 0x06
- double = 0x07
- float = 0x08
- list = 0x09
- map = 0x0a
- set = 0x0b
- uuid = 0x0c
- edge = 0x0d
- path = 0x0e
- property = 0x0f
- graph = 0x10 # not supported - no graph object in python yet
- vertex = 0x11
- vertexproperty = 0x12
- barrier = 0x13
- binding = 0x14
- bytecode = 0x15
- cardinality = 0x16
- column = 0x17
- direction = 0x18
- operator = 0x19
- order = 0x1a
- pick = 0x1b
- pop = 0x1c
- lambda_ = 0x1d
- p = 0x1e
- scope = 0x1f
- t = 0x20
- traverser = 0x21
- bigdecimal = 0x22
- biginteger = 0x23
- byte = 0x24
- bytebuffer = 0x25
- short = 0x26
- boolean = 0x27
- textp = 0x28
- traversalstrategy = 0x29
- bulkset = 0x2a
- tree = 0x2b # not supported - no tree object in Python yet
- metrics = 0x2c
- traversalmetrics = 0x2d
- merge = 0x2e
- dt = 0x2f
- n = 0x30
- char = 0x80
- duration = 0x81
- inetaddress = 0x82 # todo
- instant = 0x83 # todo
- localdate = 0x84 # todo
- localdatetime = 0x85 # todo
- localtime = 0x86 # todo
- monthday = 0x87 # todo
- offsetdatetime = 0x88
- offsettime = 0x89 # todo
- period = 0x8a # todo
- year = 0x8b # todo
- yearmonth = 0x8c # todo
- zonedatetime = 0x8d # todo
- zoneoffset = 0x8e # todo
- custom = 0x00 # todo
-
-
-NULL_BYTES = [DataType.null.value, 0x01]
-
-
-def _make_packer(format_string):
- packer = struct.Struct(format_string)
- pack = packer.pack
- unpack = lambda s: packer.unpack(s)[0]
- return pack, unpack
-
-
-int64_pack, int64_unpack = _make_packer('>q')
-int32_pack, int32_unpack = _make_packer('>i')
-int16_pack, int16_unpack = _make_packer('>h')
-int8_pack, int8_unpack = _make_packer('>b')
-uint64_pack, uint64_unpack = _make_packer('>Q')
-uint8_pack, uint8_unpack = _make_packer('>B')
-float_pack, float_unpack = _make_packer('>f')
-double_pack, double_unpack = _make_packer('>d')
-
-
-class GraphBinaryTypeType(type):
- def __new__(mcs, name, bases, dct):
- cls = super(GraphBinaryTypeType, mcs).__new__(mcs, name, bases, dct)
- if not name.startswith('_'):
- if cls.python_type:
- _serializers[cls.python_type] = cls
- if cls.graphbinary_type:
- _deserializers[cls.graphbinary_type] = cls
- return cls
-
-
-class GraphBinaryWriter(object):
- def __init__(self, serializer_map=None):
- self.serializers = _serializers.copy()
- if serializer_map:
- self.serializers.update(serializer_map)
-
- def write_object(self, object_data):
- return self.to_dict(object_data)
-
- def to_dict(self, obj, to_extend=None):
- if to_extend is None:
- to_extend = bytearray()
-
- if obj is None:
- to_extend.extend(NULL_BYTES)
- return
-
- try:
- t = type(obj)
- return self.serializers[t].dictify(obj, self, to_extend)
- except KeyError:
- for key, serializer in self.serializers.items():
- if isinstance(obj, key):
- return serializer.dictify(obj, self, to_extend)
-
- if isinstance(obj, dict):
- return dict((self.to_dict(k, to_extend), self.to_dict(v, to_extend)) for k, v in obj.items())
- elif isinstance(obj, set):
- return set([self.to_dict(o, to_extend) for o in obj])
- elif isinstance(obj, list):
- return [self.to_dict(o, to_extend) for o in obj]
- else:
- return obj
-
-
-class GraphBinaryReader(object):
- def __init__(self, deserializer_map=None):
- self.deserializers = _deserializers.copy()
- if deserializer_map:
- self.deserializers.update(deserializer_map)
-
- def read_object(self, b):
- if isinstance(b, bytearray):
- return self.to_object(io.BytesIO(b))
- elif isinstance(b, io.BufferedIOBase):
- return self.to_object(b)
-
- def to_object(self, buff, data_type=None, nullable=True):
- if data_type is None:
- bt = uint8_unpack(buff.read(1))
- if bt == DataType.null.value:
- if nullable:
- buff.read(1)
- return None
- return self.deserializers[DataType(bt)].objectify(buff, self, nullable)
- else:
- return self.deserializers[data_type].objectify(buff, self, nullable)
-
-
-class _GraphBinaryTypeIO(object, metaclass=GraphBinaryTypeType):
- python_type = None
- graphbinary_type = None
-
- @classmethod
- def prefix_bytes(cls, graphbin_type, as_value=False, nullable=True, to_extend=None):
- if to_extend is None:
- to_extend = bytearray()
-
- if not as_value:
- to_extend += uint8_pack(graphbin_type.value)
-
- if nullable:
- to_extend += int8_pack(0)
-
- return to_extend
-
- @classmethod
- def read_int(cls, buff):
- return int32_unpack(buff.read(4))
-
- @classmethod
- def is_null(cls, buff, reader, else_opt, nullable=True):
- return None if nullable and buff.read(1)[0] == 0x01 else else_opt(buff, reader)
-
- def dictify(self, obj, writer, to_extend, as_value=False, nullable=True):
- raise NotImplementedError()
-
- def objectify(self, d, reader, nullable=True):
- raise NotImplementedError()
-
-
-class LongIO(_GraphBinaryTypeIO):
-
- python_type = LongType
- graphbinary_type = DataType.long
- byte_format_pack = int64_pack
- byte_format_unpack = int64_unpack
-
- @classmethod
- def dictify(cls, obj, writer, to_extend, as_value=False, nullable=True):
- if obj < -9223372036854775808 or obj > 9223372036854775807:
- raise Exception("Value too big, please use bigint Gremlin type")
- else:
- cls.prefix_bytes(cls.graphbinary_type, as_value, nullable, to_extend)
- to_extend.extend(cls.byte_format_pack(obj))
- return to_extend
-
- @classmethod
- def objectify(cls, buff, reader, nullable=True):
- return cls.is_null(buff, reader, lambda b, r: int64_unpack(buff.read(8)), nullable)
-
-
-class IntIO(LongIO):
-
- python_type = IntType
- graphbinary_type = DataType.int
- byte_format_pack = int32_pack
- byte_format_unpack = int32_unpack
-
- @classmethod
- def objectify(cls, buff, reader, nullable=True):
- return cls.is_null(buff, reader, lambda b, r: cls.read_int(b), nullable)
-
-
-class ShortIO(LongIO):
-
- python_type = ShortType
- graphbinary_type = DataType.short
- byte_format_pack = int16_pack
- byte_format_unpack = int16_unpack
-
- @classmethod
- def objectify(cls, buff, reader, nullable=True):
- return cls.is_null(buff, reader, lambda b, r: int16_unpack(buff.read(2)), nullable)
-
-
-class BigIntIO(_GraphBinaryTypeIO):
-
- python_type = BigIntType
- graphbinary_type = DataType.biginteger
-
- @classmethod
- def write_bigint(cls, obj, to_extend):
- length = (obj.bit_length() + 7) // 8
- if obj > 0:
- b = obj.to_bytes(length, byteorder='big')
- to_extend.extend(int32_pack(length + 1))
- to_extend.extend(int8_pack(0))
- to_extend.extend(b)
- else:
- # handle negative
- b = obj.to_bytes(length, byteorder='big', signed=True)
- to_extend.extend(int32_pack(length))
- to_extend.extend(b)
- return to_extend
-
- @classmethod
- def dictify(cls, obj, writer, to_extend, as_value=False, nullable=True):
- cls.prefix_bytes(cls.graphbinary_type, as_value, nullable, to_extend)
- return cls.write_bigint(obj, to_extend)
-
- @classmethod
- def read_bigint(cls, buff):
- size = cls.read_int(buff)
- return int.from_bytes(buff.read(size), byteorder='big', signed=True)
-
- @classmethod
- def objectify(cls, buff, reader, nullable=False):
- return cls.is_null(buff, reader, lambda b, r: cls.read_bigint(b), nullable)
-
-
-class DateIO(_GraphBinaryTypeIO):
-
- python_type = datetime.datetime
- graphbinary_type = DataType.date
-
- @classmethod
- def dictify(cls, obj, writer, to_extend, as_value=False, nullable=True):
- try:
- timestamp_seconds = calendar.timegm(obj.utctimetuple())
- pts = timestamp_seconds * 1e3 + getattr(obj, 'microsecond', 0) / 1e3
- except AttributeError:
- pts = calendar.timegm(obj.timetuple()) * 1e3
-
- ts = int(round(pts))
- cls.prefix_bytes(cls.graphbinary_type, as_value, nullable, to_extend)
- to_extend.extend(int64_pack(ts))
- return to_extend
-
- @classmethod
- def objectify(cls, buff, reader, nullable=True):
- return cls.is_null(buff, reader,
- lambda b, r: datetime.datetime.utcfromtimestamp(int64_unpack(b.read(8)) / 1000.0),
- nullable)
-
-
-class OffsetDateTimeIO(_GraphBinaryTypeIO):
-
- python_type = datetime.datetime
- graphbinary_type = DataType.offsetdatetime
-
- @classmethod
- def dictify(cls, obj, writer, to_extend, as_value=False, nullable=True):
- if obj.tzinfo is None:
- return DateIO.dictify(obj, writer, to_extend, as_value, nullable)
- cls.prefix_bytes(cls.graphbinary_type, as_value, nullable, to_extend)
- IntIO.dictify(obj.year, writer, to_extend, True, False)
- ByteIO.dictify(obj.month, writer, to_extend, True, False)
- ByteIO.dictify(obj.day, writer, to_extend, True, False)
- # construct time of day in nanoseconds
- h = obj.time().hour
- m = obj.time().minute
- s = obj.time().second
- ms = obj.time().microsecond
- ns = round((h*60*60*1e9) + (m*60*1e9) + (s*1e9) + (ms*1e3))
- LongIO.dictify(ns, writer, to_extend, True, False)
- os = round(obj.utcoffset().total_seconds())
- IntIO.dictify(os, writer, to_extend, True, False)
- return to_extend
-
- @classmethod
- def objectify(cls, buff, reader, nullable=True):
- return cls.is_null(buff, reader, cls._read_dt, nullable)
-
- @classmethod
- def _read_dt(cls, b, r):
- year = r.to_object(b, DataType.int, False)
- month = r.to_object(b, DataType.byte, False)
- day = r.to_object(b, DataType.byte, False)
- ns = r.to_object(b, DataType.long, False)
- offset = r.to_object(b, DataType.int, False)
- tz = datetime.timezone(timedelta(seconds=offset))
- return datetime.datetime(year, month, day, tzinfo=tz) + timedelta(microseconds=ns/1000)
-
-# Based on current implementation, this class must always be declared before FloatIO.
-# Seems pretty fragile for future maintainers. Maybe look into this.
-class TimestampIO(_GraphBinaryTypeIO):
- python_type = statics.timestamp
- graphbinary_type = DataType.timestamp
-
- @classmethod
- def dictify(cls, obj, writer, to_extend, as_value=False, nullable=True):
- # Java timestamp expects milliseconds integer - Have to use int because of legacy Python
- ts = int(round(obj * 1000))
- cls.prefix_bytes(cls.graphbinary_type, as_value, nullable, to_extend)
- to_extend.extend(int64_pack(ts))
- return to_extend
-
- @classmethod
- def objectify(cls, buff, reader, nullable=True):
- # Python timestamp expects seconds
- return cls.is_null(buff, reader, lambda b, r: statics.timestamp(int64_unpack(b.read(8)) / 1000.0),
- nullable)
-
-
-def _long_bits_to_double(bits):
- return unpack('d', pack('Q', bits))[0]
-
-
-NAN = _long_bits_to_double(0x7ff8000000000000)
-POSITIVE_INFINITY = _long_bits_to_double(0x7ff0000000000000)
-NEGATIVE_INFINITY = _long_bits_to_double(0xFff0000000000000)
-
-
-class FloatIO(LongIO):
-
- python_type = FloatType
- graphbinary_type = DataType.float
- graphbinary_base_type = DataType.float
- byte_format_pack = float_pack
- byte_format_unpack = float_unpack
-
- @classmethod
- def dictify(cls, obj, writer, to_extend, as_value=False, nullable=True):
- if math.isnan(obj):
- cls.prefix_bytes(cls.graphbinary_type, as_value, nullable, to_extend)
- to_extend.extend(cls.byte_format_pack(NAN))
- elif math.isinf(obj) and obj > 0:
- cls.prefix_bytes(cls.graphbinary_type, as_value, nullable, to_extend)
- to_extend.extend(cls.byte_format_pack(POSITIVE_INFINITY))
- elif math.isinf(obj) and obj < 0:
- cls.prefix_bytes(cls.graphbinary_type, as_value, nullable, to_extend)
- to_extend.extend(cls.byte_format_pack(NEGATIVE_INFINITY))
- else:
- cls.prefix_bytes(cls.graphbinary_type, as_value, nullable, to_extend)
- to_extend.extend(cls.byte_format_pack(obj))
-
- return to_extend
-
- @classmethod
- def objectify(cls, buff, reader, nullable=True):
- return cls.is_null(buff, reader, lambda b, r: float_unpack(b.read(4)), nullable)
-
-
-class DoubleIO(FloatIO):
- """
- Floats basically just fall through to double serialization.
- """
-
- graphbinary_type = DataType.double
- graphbinary_base_type = DataType.double
- byte_format_pack = double_pack
- byte_format_unpack = double_unpack
-
- @classmethod
- def objectify(cls, buff, reader, nullable=True):
- return cls.is_null(buff, reader, lambda b, r: double_unpack(b.read(8)), nullable)
-
-
-class BigDecimalIO(_GraphBinaryTypeIO):
-
- python_type = BigDecimal
- graphbinary_type = DataType.bigdecimal
-
- @classmethod
- def dictify(cls, obj, writer, to_extend, as_value=False, nullable=True):
- cls.prefix_bytes(cls.graphbinary_type, as_value, nullable, to_extend)
- to_extend.extend(int32_pack(obj.scale))
- return BigIntIO.write_bigint(obj.unscaled_value, to_extend)
-
- @classmethod
- def _read(cls, buff):
- scale = int32_unpack(buff.read(4))
- unscaled_value = BigIntIO.read_bigint(buff)
- return BigDecimal(scale, unscaled_value)
-
- @classmethod
- def objectify(cls, buff, reader, nullable=False):
- return cls.is_null(buff, reader, lambda b, r: cls._read(b), nullable)
-
-
-class CharIO(_GraphBinaryTypeIO):
- python_type = SingleChar
- graphbinary_type = DataType.char
-
- @classmethod
- def dictify(cls, obj, writer, to_extend, as_value=False, nullable=True):
- cls.prefix_bytes(cls.graphbinary_type, as_value, nullable, to_extend)
- to_extend.extend(obj.encode("utf-8"))
- return to_extend
-
- @classmethod
- def objectify(cls, buff, reader, nullable=True):
- return cls.is_null(buff, reader, cls._read_char, nullable)
-
- @classmethod
- def _read_char(cls, b, r):
- max_bytes = 4
- x = b.read(1)
- while max_bytes > 0:
- max_bytes = max_bytes - 1
- try:
- return x.decode("utf-8")
- except UnicodeDecodeError:
- x += b.read(1)
-
-
-class StringIO(_GraphBinaryTypeIO):
-
- python_type = str
- graphbinary_type = DataType.string
-
- @classmethod
- def dictify(cls, obj, writer, to_extend, as_value=False, nullable=True):
- cls.prefix_bytes(cls.graphbinary_type, as_value, nullable, to_extend)
- str_bytes = obj.encode("utf-8")
- to_extend += int32_pack(len(str_bytes))
- to_extend += str_bytes
- return to_extend
-
- @classmethod
- def objectify(cls, buff, reader, nullable=True):
- return cls.is_null(buff, reader, lambda b, r: b.read(cls.read_int(b)).decode("utf-8"), nullable)
-
-
-class ListIO(_GraphBinaryTypeIO):
-
- python_type = list
- graphbinary_type = DataType.list
-
- @classmethod
- def dictify(cls, obj, writer, to_extend, as_value=False, nullable=True):
- cls.prefix_bytes(cls.graphbinary_type, as_value, nullable, to_extend)
- to_extend.extend(int32_pack(len(obj)))
- for item in obj:
- writer.to_dict(item, to_extend)
-
- return to_extend
-
- @classmethod
- def objectify(cls, buff, reader, nullable=True):
- return cls.is_null(buff, reader, cls._read_list, nullable)
-
- @classmethod
- def _read_list(cls, b, r):
- size = cls.read_int(b)
- the_list = []
- while size > 0:
- the_list.append(r.read_object(b))
- size = size - 1
-
- return the_list
-
-
-class SetDeserializer(ListIO):
-
- python_type = SetType
- graphbinary_type = DataType.set
-
- @classmethod
- def objectify(cls, buff, reader, nullable=True):
- return set(ListIO.objectify(buff, reader, nullable))
-
-
-class MapIO(_GraphBinaryTypeIO):
-
- python_type = DictType
- graphbinary_type = DataType.map
-
- @classmethod
- def dictify(cls, obj, writer, to_extend, as_value=False, nullable=True):
- cls.prefix_bytes(cls.graphbinary_type, as_value, nullable, to_extend)
-
- to_extend.extend(int32_pack(len(obj)))
- for k, v in obj.items():
- writer.to_dict(k, to_extend)
- writer.to_dict(v, to_extend)
-
- return to_extend
-
- @classmethod
- def objectify(cls, buff, reader, nullable=True):
- return cls.is_null(buff, reader, cls._read_map, nullable)
-
- @classmethod
- def _read_map(cls, b, r):
- size = cls.read_int(b)
- the_dict = {}
- while size > 0:
- k = HashableDict.of(r.read_object(b))
- v = r.read_object(b)
- the_dict[k] = v
- size = size - 1
-
- return the_dict
-
-
-class UuidIO(_GraphBinaryTypeIO):
-
- python_type = uuid.UUID
- graphbinary_type = DataType.uuid
-
- @classmethod
- def dictify(cls, obj, writer, to_extend, as_value=False, nullable=True):
- cls.prefix_bytes(cls.graphbinary_type, as_value, nullable, to_extend)
- to_extend.extend(obj.bytes)
- return to_extend
-
- @classmethod
- def objectify(cls, buff, reader, nullable=True):
- return cls.is_null(buff, reader, lambda b, r: uuid.UUID(bytes=b.read(16)), nullable)
-
-
-class EdgeIO(_GraphBinaryTypeIO):
-
- python_type = Edge
- graphbinary_type = DataType.edge
-
- @classmethod
- def dictify(cls, obj, writer, to_extend, as_value=False, nullable=True):
- cls.prefix_bytes(cls.graphbinary_type, as_value, nullable, to_extend)
-
- writer.to_dict(obj.id, to_extend)
- StringIO.dictify(obj.label, writer, to_extend, True, False)
- writer.to_dict(obj.inV.id, to_extend)
- StringIO.dictify(obj.inV.label, writer, to_extend, True, False)
- writer.to_dict(obj.outV.id, to_extend)
- StringIO.dictify(obj.outV.label, writer, to_extend, True, False)
- to_extend.extend(NULL_BYTES)
- to_extend.extend(NULL_BYTES)
-
- return to_extend
-
- @classmethod
- def objectify(cls, buff, reader, nullable=True):
- return cls.is_null(buff, reader, cls._read_edge, nullable)
-
- @classmethod
- def _read_edge(cls, b, r):
- edgeid = r.read_object(b)
- edgelbl = r.to_object(b, DataType.string, False)
- inv = Vertex(r.read_object(b), r.to_object(b, DataType.string, False))
- outv = Vertex(r.read_object(b), r.to_object(b, DataType.string, False))
- b.read(2)
- props = r.read_object(b)
- # null properties are returned as empty lists
- properties = [] if props is None else props
- edge = Edge(edgeid, outv, edgelbl, inv, properties)
- return edge
-
-
-class PathIO(_GraphBinaryTypeIO):
-
- python_type = Path
- graphbinary_type = DataType.path
-
- @classmethod
- def dictify(cls, obj, writer, to_extend, as_value=False, nullable=True):
- cls.prefix_bytes(cls.graphbinary_type, as_value, nullable, to_extend)
- writer.to_dict(obj.labels, to_extend)
- writer.to_dict(obj.objects, to_extend)
- return to_extend
-
- @classmethod
- def objectify(cls, buff, reader, nullable=True):
- return cls.is_null(buff, reader, lambda b, r: Path(r.read_object(b), r.read_object(b)), nullable)
-
-
-class PropertyIO(_GraphBinaryTypeIO):
-
- python_type = Property
- graphbinary_type = DataType.property
-
- @classmethod
- def dictify(cls, obj, writer, to_extend, as_value=False, nullable=True):
- cls.prefix_bytes(cls.graphbinary_type, as_value, nullable, to_extend)
- StringIO.dictify(obj.key, writer, to_extend, True, False)
- writer.to_dict(obj.value, to_extend)
- to_extend.extend(NULL_BYTES)
- return to_extend
-
- @classmethod
- def objectify(cls, buff, reader, nullable=True):
- return cls.is_null(buff, reader, cls._read_property, nullable)
-
- @classmethod
- def _read_property(cls, b, r):
- p = Property(r.to_object(b, DataType.string, False), r.read_object(b), None)
- b.read(2)
- return p
-
-
-class TinkerGraphIO(_GraphBinaryTypeIO):
-
- python_type = Graph
- graphbinary_type = DataType.graph
-
- @classmethod
- def dictify(cls, obj, writer, to_extend, as_value=False, nullable=True):
- raise AttributeError("TinkerGraph serialization is not currently supported by gremlin-python")
-
- @classmethod
- def objectify(cls, b, reader, as_value=False):
- raise AttributeError("TinkerGraph deserialization is not currently supported by gremlin-python")
-
-
-class VertexIO(_GraphBinaryTypeIO):
-
- python_type = Vertex
- graphbinary_type = DataType.vertex
-
- @classmethod
- def dictify(cls, obj, writer, to_extend, as_value=False, nullable=True):
- cls.prefix_bytes(cls.graphbinary_type, as_value, nullable, to_extend)
- writer.to_dict(obj.id, to_extend)
- StringIO.dictify(obj.label, writer, to_extend, True, False)
- to_extend.extend(NULL_BYTES)
- return to_extend
-
- @classmethod
- def objectify(cls, buff, reader, nullable=True):
- return cls.is_null(buff, reader, cls._read_vertex, nullable)
-
- @classmethod
- def _read_vertex(cls, b, r):
- vertex_id = r.read_object(b)
- vertex_label = r.to_object(b, DataType.string, False)
- props = r.read_object(b)
- # null properties are returned as empty lists
- properties = [] if props is None else props
- vertex = Vertex(vertex_id, vertex_label, properties)
- return vertex
-
-
-class VertexPropertyIO(_GraphBinaryTypeIO):
-
- python_type = VertexProperty
- graphbinary_type = DataType.vertexproperty
-
- @classmethod
- def dictify(cls, obj, writer, to_extend, as_value=False, nullable=True):
- cls.prefix_bytes(cls.graphbinary_type, as_value, nullable, to_extend)
- writer.to_dict(obj.id, to_extend)
- StringIO.dictify(obj.label, writer, to_extend, True, False)
- writer.to_dict(obj.value, to_extend)
- to_extend.extend(NULL_BYTES)
- to_extend.extend(NULL_BYTES)
- return to_extend
-
- @classmethod
- def objectify(cls, buff, reader, nullable=True):
- return cls.is_null(buff, reader, cls._read_vertexproperty, nullable)
-
- @classmethod
- def _read_vertexproperty(cls, b, r):
- vp = VertexProperty(r.read_object(b), r.to_object(b, DataType.string, False), r.read_object(b), None)
- b.read(2)
- properties = r.read_object(b)
- # null properties are returned as empty lists
- vp.properties = [] if properties is None else properties
- return vp
-
-
-class _EnumIO(_GraphBinaryTypeIO):
-
- @classmethod
- def dictify(cls, obj, writer, to_extend, as_value=False, nullable=True):
- cls.prefix_bytes(cls.graphbinary_type, as_value, nullable, to_extend)
- StringIO.dictify(SymbolUtil.to_camel_case(str(obj.name)), writer, to_extend)
- return to_extend
-
- @classmethod
- def objectify(cls, buff, reader, nullable=True):
- return cls.is_null(buff, reader, cls._read_enumval, nullable)
-
- @classmethod
- def _read_enumval(cls, b, r):
- enum_name = r.to_object(b)
- return cls.python_type[SymbolUtil.to_snake_case(enum_name)]
-
-
-class BarrierIO(_EnumIO):
- graphbinary_type = DataType.barrier
- python_type = Barrier
-
-
-class CardinalityIO(_EnumIO):
- graphbinary_type = DataType.cardinality
- python_type = Cardinality
-
-
-class ColumnIO(_EnumIO):
- graphbinary_type = DataType.column
- python_type = Column
-
-
-class DirectionIO(_EnumIO):
- graphbinary_type = DataType.direction
- python_type = Direction
-
- @classmethod
- def _read_enumval(cls, b, r):
- # Direction needs to retain all CAPS. note that to_/from_ are really just aliases of IN/OUT
- # so they don't need to be accounted for in serialization
- enum_name = r.to_object(b)
- return cls.python_type[enum_name]
-
-
-class OperatorIO(_EnumIO):
- graphbinary_type = DataType.operator
- python_type = Operator
-
-
-class OrderIO(_EnumIO):
- graphbinary_type = DataType.order
- python_type = Order
-
-
-class PickIO(_EnumIO):
- graphbinary_type = DataType.pick
- python_type = Pick
-
-
-class PopIO(_EnumIO):
- graphbinary_type = DataType.pop
- python_type = Pop
-
-
-class BindingIO(_GraphBinaryTypeIO):
-
- python_type = Binding
- graphbinary_type = DataType.binding
-
- @classmethod
- def dictify(cls, obj, writer, to_extend, as_value=False, nullable=True):
- cls.prefix_bytes(cls.graphbinary_type, as_value, nullable, to_extend)
- StringIO.dictify(obj.key, writer, to_extend, True, False)
- writer.to_dict(obj.value, to_extend)
- return to_extend
-
- @classmethod
- def objectify(cls, buff, reader, nullable=True):
- return cls.is_null(buff, reader, lambda b, r: Binding(r.to_object(b, DataType.string, False),
- reader.read_object(b)), nullable)
-
-
-class BytecodeIO(_GraphBinaryTypeIO):
- python_type = Bytecode
- graphbinary_type = DataType.bytecode
-
- @classmethod
- def dictify(cls, obj, writer, to_extend, as_value=False, nullable=True):
- cls.prefix_bytes(cls.graphbinary_type, as_value, nullable, to_extend)
- bc = obj.bytecode if isinstance(obj, Traversal) else obj
- to_extend.extend(int32_pack(len(bc.step_instructions)))
- for inst in bc.step_instructions:
- inst_name, inst_args = inst[0], inst[1:] if len(inst) > 1 else []
- StringIO.dictify(inst_name, writer, to_extend, True, False)
- to_extend.extend(int32_pack(len(inst_args)))
- for arg in inst_args:
- writer.to_dict(arg, to_extend)
-
- to_extend.extend(int32_pack(len(bc.source_instructions)))
- for inst in bc.source_instructions:
- inst_name, inst_args = inst[0], inst[1:] if len(inst) > 1 else []
- StringIO.dictify(inst_name, writer, to_extend, True, False)
- to_extend.extend(int32_pack(len(inst_args)))
- for arg in inst_args:
- if isinstance(arg, TypeType):
- writer.to_dict(GremlinType(arg().fqcn), to_extend)
- else:
- writer.to_dict(arg, to_extend)
- return to_extend
-
- @classmethod
- def objectify(cls, buff, reader, nullable=True):
- return cls.is_null(buff, reader, cls._read_bytecode, nullable)
-
- @classmethod
- def _read_bytecode(cls, b, r):
- bytecode = Bytecode()
-
- step_count = cls.read_int(b)
- ix = 0
- while ix < step_count:
- inst = [r.to_object(b, DataType.string, False)]
- inst_ct = cls.read_int(b)
- iy = 0
- while iy < inst_ct:
- inst.append(r.read_object(b))
- iy += 1
- bytecode.step_instructions.append(inst)
- ix += 1
-
- source_count = cls.read_int(b)
- ix = 0
- while ix < source_count:
- inst = [r.to_object(b, DataType.string, False)]
- inst_ct = cls.read_int(b)
- iy = 0
- while iy < inst_ct:
- inst.append(r.read_object(b))
- iy += 1
- bytecode.source_instructions.append(inst)
- ix += 1
-
- return bytecode
-
-
-class TraversalIO(BytecodeIO):
- python_type = GraphTraversal
-
-
-class LambdaSerializer(_GraphBinaryTypeIO):
-
- python_type = FunctionType
- graphbinary_type = DataType.lambda_
-
- @classmethod
- def dictify(cls, obj, writer, to_extend, as_value=False, nullable=True):
- cls.prefix_bytes(cls.graphbinary_type, as_value, nullable, to_extend)
-
- lambda_result = obj()
- script = lambda_result if isinstance(lambda_result, str) else lambda_result[0]
- language = statics.default_lambda_language if isinstance(lambda_result, str) else lambda_result[1]
-
- StringIO.dictify(language, writer, to_extend, True, False)
-
- script_cleaned = script
- script_args = -1
-
- if language == "gremlin-groovy" and "->" in script:
- # if the user has explicitly added parameters to the groovy closure then we can easily detect one or two
- # arg lambdas - if we can't detect 1 or 2 then we just go with "unknown"
- args = script[0:script.find("->")]
- script_args = 2 if "," in args else 1
-
- StringIO.dictify(script_cleaned, writer, to_extend, True, False)
- to_extend.extend(int32_pack(script_args))
-
- return to_extend
-
-
-class PSerializer(_GraphBinaryTypeIO):
- graphbinary_type = DataType.p
- python_type = P
-
- @classmethod
- def dictify(cls, obj, writer, to_extend, as_value=False, nullable=True):
- cls.prefix_bytes(cls.graphbinary_type, as_value, nullable, to_extend)
-
- StringIO.dictify(obj.operator, writer, to_extend, True, False)
-
- args = []
- if obj.other is None:
- if isinstance(obj.value, ListType):
- args = obj.value
- else:
- args.append(obj.value)
- else:
- args.append(obj.value)
- args.append(obj.other)
-
- to_extend.extend(int32_pack(len(args)))
- for a in args:
- writer.to_dict(a, to_extend)
-
- return to_extend
-
-
-class DTIO(_EnumIO):
- graphbinary_type = DataType.dt
- python_type = DT
-
-
-class MergeIO(_EnumIO):
- graphbinary_type = DataType.merge
- python_type = Merge
-
-
-class NIO(_EnumIO):
- graphbinary_type = DataType.n
- python_type = N
-
-
-class ScopeIO(_EnumIO):
- graphbinary_type = DataType.scope
- python_type = Scope
-
-
-class TIO(_EnumIO):
- graphbinary_type = DataType.t
- python_type = T
-
-
-class TraverserIO(_GraphBinaryTypeIO):
- graphbinary_type = DataType.traverser
- python_type = Traverser
-
- @classmethod
- def dictify(cls, obj, writer, to_extend, as_value=False, nullable=True):
- cls.prefix_bytes(cls.graphbinary_type, as_value, nullable, to_extend)
- to_extend.extend(int64_pack(obj.bulk))
- writer.to_dict(obj.object, to_extend)
- return to_extend
-
- @classmethod
- def objectify(cls, buff, reader, nullable=True):
- return cls.is_null(buff, reader, cls._read_traverser, nullable)
-
- @classmethod
- def _read_traverser(cls, b, r):
- bulk = int64_unpack(b.read(8))
- obj = r.read_object(b)
- return Traverser(obj, bulk=bulk)
-
-
-class ByteIO(_GraphBinaryTypeIO):
- python_type = SingleByte
- graphbinary_type = DataType.byte
-
- @classmethod
- def dictify(cls, obj, writer, to_extend, as_value=False, nullable=True):
- cls.prefix_bytes(cls.graphbinary_type, as_value, nullable, to_extend)
- to_extend.extend(int8_pack(obj))
- return to_extend
-
- @classmethod
- def objectify(cls, buff, reader, nullable=True):
- return cls.is_null(buff, reader,
- lambda b, r: int.__new__(SingleByte, int8_unpack(b.read(1))),
- nullable)
-
-
-class ByteBufferIO(_GraphBinaryTypeIO):
- python_type = ByteBufferType
- graphbinary_type = DataType.bytebuffer
-
- @classmethod
- def dictify(cls, obj, writer, to_extend, as_value=False, nullable=True):
- cls.prefix_bytes(cls.graphbinary_type, as_value, nullable, to_extend)
- to_extend.extend(int32_pack(len(obj)))
- to_extend.extend(obj)
- return to_extend
-
- @classmethod
- def objectify(cls, buff, reader, nullable=True):
- return cls.is_null(buff, reader, cls._read_bytebuffer, nullable)
-
- @classmethod
- def _read_bytebuffer(cls, b, r):
- size = cls.read_int(b)
- return ByteBufferType(b.read(size))
-
-
-class BooleanIO(_GraphBinaryTypeIO):
- python_type = bool
- graphbinary_type = DataType.boolean
-
- @classmethod
- def dictify(cls, obj, writer, to_extend, as_value=False, nullable=True):
- cls.prefix_bytes(cls.graphbinary_type, as_value, nullable, to_extend)
- to_extend.extend(int8_pack(0x01 if obj else 0x00))
- return to_extend
-
- @classmethod
- def objectify(cls, buff, reader, nullable=True):
- return cls.is_null(buff, reader,
- lambda b, r: True if int8_unpack(b.read(1)) == 0x01 else False,
- nullable)
-
-
-class TextPSerializer(_GraphBinaryTypeIO):
- graphbinary_type = DataType.textp
- python_type = TextP
-
- @classmethod
- def dictify(cls, obj, writer, to_extend, as_value=False, nullable=True):
- cls.prefix_bytes(cls.graphbinary_type, as_value, nullable, to_extend)
-
- StringIO.dictify(obj.operator, writer, to_extend, True, False)
-
- args = []
- if obj.other is None:
- if isinstance(obj.value, ListType):
- args = obj.value
- else:
- args.append(obj.value)
- else:
- args.append(obj.value)
- args.append(obj.other)
-
- to_extend.extend(int32_pack(len(args)))
- for a in args:
- writer.to_dict(a, to_extend)
-
- return to_extend
-
-
-class BulkSetDeserializer(_GraphBinaryTypeIO):
-
- graphbinary_type = DataType.bulkset
-
- @classmethod
- def objectify(cls, buff, reader, nullable=True):
- return cls.is_null(buff, reader, cls._read_bulkset, nullable)
-
- @classmethod
- def _read_bulkset(cls, b, r):
- size = cls.read_int(b)
- the_list = []
- while size > 0:
- itm = r.read_object(b)
- bulk = int64_unpack(b.read(8))
- for y in range(bulk):
- the_list.append(itm)
- size = size - 1
-
- return the_list
-
-
-class MetricsDeserializer(_GraphBinaryTypeIO):
-
- graphbinary_type = DataType.metrics
-
- @classmethod
- def objectify(cls, buff, reader, nullable=True):
- return cls.is_null(buff, reader, cls._read_metrics, nullable)
-
- @classmethod
- def _read_metrics(cls, b, r):
- metricid = r.to_object(b, DataType.string, False)
- name = r.to_object(b, DataType.string, False)
- duration = r.to_object(b, DataType.long, nullable=False)
- counts = r.to_object(b, DataType.map, nullable=False)
- annotations = r.to_object(b, DataType.map, nullable=False)
- metrics = r.to_object(b, DataType.list, nullable=False)
-
- return {"id": metricid,
- "name": name,
- "dur": duration,
- "counts": counts,
- "annotations": annotations,
- "metrics": metrics}
-
-
-class TraversalMetricsDeserializer(_GraphBinaryTypeIO):
-
- graphbinary_type = DataType.traversalmetrics
-
- @classmethod
- def objectify(cls, buff, reader, nullable=True):
- return cls.is_null(buff, reader, cls._read_traversalmetrics, nullable)
-
- @classmethod
- def _read_traversalmetrics(cls, b, r):
- duration = r.to_object(b, DataType.long, nullable=False)
- metrics = r.to_object(b, DataType.list, nullable=False)
-
- return {"dur": duration,
- "metrics": metrics}
-
-
-class ClassSerializer(_GraphBinaryTypeIO):
- graphbinary_type = DataType.clazz
- python_type = GremlinType
-
- @classmethod
- def dictify(cls, obj, writer, to_extend, as_value=False, nullable=True):
- cls.prefix_bytes(cls.graphbinary_type, as_value, nullable, to_extend)
- StringIO.dictify(obj.gremlin_type, writer, to_extend, True, False)
- return to_extend
-
-
-class TraversalStrategySerializer(_GraphBinaryTypeIO):
- graphbinary_type = DataType.traversalstrategy
- python_type = TraversalStrategy
-
- @classmethod
- def dictify(cls, obj, writer, to_extend, as_value=False, nullable=True):
- cls.prefix_bytes(cls.graphbinary_type, as_value, nullable, to_extend)
-
- ClassSerializer.dictify(GremlinType(obj.fqcn), writer, to_extend, True, False)
- conf = {k: cls._convert(v) for k, v in obj.configuration.items()}
- MapIO.dictify(conf, writer, to_extend, True, False)
-
- return to_extend
-
- @classmethod
- def _convert(cls, v):
- return v.bytecode if isinstance(v, Traversal) else v
-
-
-class DurationIO(_GraphBinaryTypeIO):
- python_type = timedelta
- graphbinary_type = DataType.duration
-
- @classmethod
- def dictify(cls, obj, writer, to_extend, as_value=False, nullable=True):
- cls.prefix_bytes(cls.graphbinary_type, as_value, nullable, to_extend)
- LongIO.dictify(obj.seconds, writer, to_extend, True, False)
- IntIO.dictify(obj.microseconds * 1000, writer, to_extend, True, False)
- return to_extend
-
- @classmethod
- def objectify(cls, buff, reader, nullable=True):
- return cls.is_null(buff, reader, cls._read_duration, nullable)
-
- @classmethod
- def _read_duration(cls, b, r):
- seconds = r.to_object(b, DataType.long, False)
- nanos = r.to_object(b, DataType.int, False)
- return timedelta(seconds=seconds, microseconds=nanos / 1000)
diff --git a/gremlin-python/src/main/python/gremlin_python/structure/io/graphbinaryV4.py b/gremlin-python/src/main/python/gremlin_python/structure/io/graphbinaryV4.py
new file mode 100644
index 0000000..dda7c08
--- /dev/null
+++ b/gremlin-python/src/main/python/gremlin_python/structure/io/graphbinaryV4.py
@@ -0,0 +1,846 @@
+"""
+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.
+"""
+import calendar
+import io
+import logging
+import math
+import struct
+import uuid
+from collections import OrderedDict
+from datetime import datetime, timedelta, timezone
+from struct import pack, unpack
+
+from aenum import Enum
+from gremlin_python.process.traversal import Direction, T, Merge, N
+from gremlin_python.statics import FloatType, BigDecimal, ShortType, IntType, LongType, BigIntType, \
+ DictType, SetType, SingleByte, SingleChar
+from gremlin_python.structure.graph import Graph, Edge, Property, Vertex, VertexProperty, Path
+from gremlin_python.structure.io.util import HashableDict, SymbolUtil, Marker
+
+log = logging.getLogger(__name__)
+
+# When we fall back to a superclass's serializer, we iterate over this map.
+# We want that iteration order to be consistent, so we use an OrderedDict,
+# not a dict.
+_serializers = OrderedDict()
+_deserializers = {}
+
+
+class DataType(Enum):
+ null = 0xfe
+ int = 0x01
+ long = 0x02
+ string = 0x03
+ datetime = 0x04
+ double = 0x07
+ float = 0x08
+ list = 0x09
+ map = 0x0a
+ set = 0x0b
+ uuid = 0x0c
+ edge = 0x0d
+ path = 0x0e
+ property = 0x0f
+ graph = 0x10 # not supported - no graph object in python yet
+ vertex = 0x11
+ vertexproperty = 0x12
+ direction = 0x18
+ t = 0x20
+ merge = 0x2e
+ bigdecimal = 0x22
+ biginteger = 0x23
+ byte = 0x24
+ binary = 0x25
+ short = 0x26
+ boolean = 0x27
+ tree = 0x2b # not supported - no tree object in Python yet
+ n = 0x30
+ char = 0x80
+ duration = 0x81
+ marker = 0xfd
+ custom = 0x00 # todo
+
+
+NULL_BYTES = [DataType.null.value, 0x01]
+
+
+def _make_packer(format_string):
+ packer = struct.Struct(format_string)
+ pack = packer.pack
+ unpack = lambda s: packer.unpack(s)[0]
+ return pack, unpack
+
+
+int64_pack, int64_unpack = _make_packer('>q')
+int32_pack, int32_unpack = _make_packer('>i')
+int16_pack, int16_unpack = _make_packer('>h')
+int8_pack, int8_unpack = _make_packer('>b')
+uint64_pack, uint64_unpack = _make_packer('>Q')
+uint8_pack, uint8_unpack = _make_packer('>B')
+float_pack, float_unpack = _make_packer('>f')
+double_pack, double_unpack = _make_packer('>d')
+
+
+class GraphBinaryTypeType(type):
+ def __new__(mcs, name, bases, dct):
+ cls = super(GraphBinaryTypeType, mcs).__new__(mcs, name, bases, dct)
+ if not name.startswith('_'):
+ if cls.python_type:
+ _serializers[cls.python_type] = cls
+ if cls.graphbinary_type:
+ _deserializers[cls.graphbinary_type] = cls
+ return cls
+
+
+class GraphBinaryWriter(object):
+ def __init__(self, serializer_map=None):
+ self.serializers = _serializers.copy()
+ if serializer_map:
+ self.serializers.update(serializer_map)
+
+ def write_object(self, object_data):
+ return self.to_dict(object_data)
+
+ def to_dict(self, obj, to_extend=None):
+ if to_extend is None:
+ to_extend = bytearray()
+
+ if obj is None:
+ to_extend.extend(NULL_BYTES)
+ return
+
+ try:
+ t = type(obj)
+ return self.serializers[t].dictify(obj, self, to_extend)
+ except KeyError:
+ for key, serializer in self.serializers.items():
+ if isinstance(obj, key):
+ return serializer.dictify(obj, self, to_extend)
+
+ if isinstance(obj, dict):
+ return dict((self.to_dict(k, to_extend), self.to_dict(v, to_extend)) for k, v in obj.items())
+ elif isinstance(obj, set):
+ return set([self.to_dict(o, to_extend) for o in obj])
+ elif isinstance(obj, list):
+ return [self.to_dict(o, to_extend) for o in obj]
+ else:
+ return obj
+
+
+class GraphBinaryReader(object):
+ def __init__(self, deserializer_map=None):
+ self.deserializers = _deserializers.copy()
+ if deserializer_map:
+ self.deserializers.update(deserializer_map)
+
+ def read_object(self, b):
+ if isinstance(b, bytearray):
+ return self.to_object(io.BytesIO(b))
+ elif isinstance(b, io.BufferedIOBase):
+ return self.to_object(b)
+
+ def to_object(self, buff, data_type=None, nullable=True):
+ if data_type is None:
+ bt = uint8_unpack(buff.read(1))
+ if bt == DataType.null.value:
+ if nullable:
+ buff.read(1)
+ return None
+ return self.deserializers[DataType(bt)].objectify(buff, self, nullable)
+ else:
+ return self.deserializers[data_type].objectify(buff, self, nullable)
+
+
+class _GraphBinaryTypeIO(object, metaclass=GraphBinaryTypeType):
+ python_type = None
+ graphbinary_type = None
+
+ @classmethod
+ def prefix_bytes(cls, graphbin_type, as_value=False, nullable=True, to_extend=None, ordered=False):
+ if to_extend is None:
+ to_extend = bytearray()
+
+ if not as_value:
+ to_extend += uint8_pack(graphbin_type.value)
+
+ if nullable:
+ if ordered:
+ to_extend += int8_pack(2)
+ else:
+ to_extend += int8_pack(0)
+
+ return to_extend
+
+ @classmethod
+ def read_int(cls, buff):
+ return int32_unpack(buff.read(4))
+
+ @classmethod
+ def is_null(cls, buff, reader, else_opt, nullable=True):
+ return None if nullable and buff.read(1)[0] == 0x01 else else_opt(buff, reader)
+
+ def dictify(self, obj, writer, to_extend, as_value=False, nullable=True):
+ raise NotImplementedError()
+
+ def objectify(self, d, reader, nullable=True):
+ raise NotImplementedError()
+
+
+class LongIO(_GraphBinaryTypeIO):
+
+ python_type = LongType
+ graphbinary_type = DataType.long
+ byte_format_pack = int64_pack
+ byte_format_unpack = int64_unpack
+
+ @classmethod
+ def dictify(cls, obj, writer, to_extend, as_value=False, nullable=True):
+ if obj < -9223372036854775808 or obj > 9223372036854775807:
+ raise Exception("Value too big, please use bigint Gremlin type")
+ else:
+ cls.prefix_bytes(cls.graphbinary_type, as_value, nullable, to_extend)
+ to_extend.extend(cls.byte_format_pack(obj))
+ return to_extend
+
+ @classmethod
+ def objectify(cls, buff, reader, nullable=True):
+ return cls.is_null(buff, reader, lambda b, r: int64_unpack(buff.read(8)), nullable)
+
+
+class IntIO(LongIO):
+
+ python_type = IntType
+ graphbinary_type = DataType.int
+ byte_format_pack = int32_pack
+ byte_format_unpack = int32_unpack
+
+ @classmethod
+ def objectify(cls, buff, reader, nullable=True):
+ return cls.is_null(buff, reader, lambda b, r: cls.read_int(b), nullable)
+
+
+class ShortIO(LongIO):
+
+ python_type = ShortType
+ graphbinary_type = DataType.short
+ byte_format_pack = int16_pack
+ byte_format_unpack = int16_unpack
+
+ @classmethod
+ def objectify(cls, buff, reader, nullable=True):
+ return cls.is_null(buff, reader, lambda b, r: int16_unpack(buff.read(2)), nullable)
+
+
+class BigIntIO(_GraphBinaryTypeIO):
+
+ python_type = BigIntType
+ graphbinary_type = DataType.biginteger
+
+ @classmethod
+ def write_bigint(cls, obj, to_extend):
+ length = (obj.bit_length() + 7) // 8
+ if obj > 0:
+ b = obj.to_bytes(length, byteorder='big')
+ to_extend.extend(int32_pack(length + 1))
+ to_extend.extend(int8_pack(0))
+ to_extend.extend(b)
+ else:
+ # handle negative
+ b = obj.to_bytes(length, byteorder='big', signed=True)
+ to_extend.extend(int32_pack(length))
+ to_extend.extend(b)
+ return to_extend
+
+ @classmethod
+ def dictify(cls, obj, writer, to_extend, as_value=False, nullable=True):
+ cls.prefix_bytes(cls.graphbinary_type, as_value, nullable, to_extend)
+ return cls.write_bigint(obj, to_extend)
+
+ @classmethod
+ def read_bigint(cls, buff):
+ size = cls.read_int(buff)
+ return int.from_bytes(buff.read(size), byteorder='big', signed=True)
+
+ @classmethod
+ def objectify(cls, buff, reader, nullable=False):
+ return cls.is_null(buff, reader, lambda b, r: cls.read_bigint(b), nullable)
+
+
+def _long_bits_to_double(bits):
+ return unpack('d', pack('Q', bits))[0]
+
+
+NAN = _long_bits_to_double(0x7ff8000000000000)
+POSITIVE_INFINITY = _long_bits_to_double(0x7ff0000000000000)
+NEGATIVE_INFINITY = _long_bits_to_double(0xFff0000000000000)
+
+
+class FloatIO(LongIO):
+
+ python_type = FloatType
+ graphbinary_type = DataType.float
+ graphbinary_base_type = DataType.float
+ byte_format_pack = float_pack
+ byte_format_unpack = float_unpack
+
+ @classmethod
+ def dictify(cls, obj, writer, to_extend, as_value=False, nullable=True):
+ if math.isnan(obj):
+ cls.prefix_bytes(cls.graphbinary_type, as_value, nullable, to_extend)
+ to_extend.extend(cls.byte_format_pack(NAN))
+ elif math.isinf(obj) and obj > 0:
+ cls.prefix_bytes(cls.graphbinary_type, as_value, nullable, to_extend)
+ to_extend.extend(cls.byte_format_pack(POSITIVE_INFINITY))
+ elif math.isinf(obj) and obj < 0:
+ cls.prefix_bytes(cls.graphbinary_type, as_value, nullable, to_extend)
+ to_extend.extend(cls.byte_format_pack(NEGATIVE_INFINITY))
+ else:
+ cls.prefix_bytes(cls.graphbinary_type, as_value, nullable, to_extend)
+ to_extend.extend(cls.byte_format_pack(obj))
+
+ return to_extend
+
+ @classmethod
+ def objectify(cls, buff, reader, nullable=True):
+ return cls.is_null(buff, reader, lambda b, r: float_unpack(b.read(4)), nullable)
+
+
+class DoubleIO(FloatIO):
+ """
+ Floats basically just fall through to double serialization.
+ """
+
+ graphbinary_type = DataType.double
+ graphbinary_base_type = DataType.double
+ byte_format_pack = double_pack
+ byte_format_unpack = double_unpack
+
+ @classmethod
+ def objectify(cls, buff, reader, nullable=True):
+ return cls.is_null(buff, reader, lambda b, r: double_unpack(b.read(8)), nullable)
+
+
+class BigDecimalIO(_GraphBinaryTypeIO):
+
+ python_type = BigDecimal
+ graphbinary_type = DataType.bigdecimal
+
+ @classmethod
+ def dictify(cls, obj, writer, to_extend, as_value=False, nullable=True):
+ cls.prefix_bytes(cls.graphbinary_type, as_value, nullable, to_extend)
+ to_extend.extend(int32_pack(obj.scale))
+ return BigIntIO.write_bigint(obj.unscaled_value, to_extend)
+
+ @classmethod
+ def _read(cls, buff):
+ scale = int32_unpack(buff.read(4))
+ unscaled_value = BigIntIO.read_bigint(buff)
+ return BigDecimal(scale, unscaled_value)
+
+ @classmethod
+ def objectify(cls, buff, reader, nullable=False):
+ return cls.is_null(buff, reader, lambda b, r: cls._read(b), nullable)
+
+
+class DateTimeIO(_GraphBinaryTypeIO):
+
+ python_type = datetime
+ graphbinary_type = DataType.datetime
+
+ @classmethod
+ def dictify(cls, obj, writer, to_extend, as_value=False, nullable=True):
+ if obj.tzinfo is None:
+ raise AttributeError("Timezone information is required when constructing datetime")
+ cls.prefix_bytes(cls.graphbinary_type, as_value, nullable, to_extend)
+ IntIO.dictify(obj.year, writer, to_extend, True, False)
+ ByteIO.dictify(obj.month, writer, to_extend, True, False)
+ ByteIO.dictify(obj.day, writer, to_extend, True, False)
+ # construct time of day in nanoseconds
+ h = obj.time().hour
+ m = obj.time().minute
+ s = obj.time().second
+ ms = obj.time().microsecond
+ ns = round((h*60*60*1e9) + (m*60*1e9) + (s*1e9) + (ms*1e3))
+ LongIO.dictify(ns, writer, to_extend, True, False)
+ os = round(obj.utcoffset().total_seconds())
+ IntIO.dictify(os, writer, to_extend, True, False)
+ return to_extend
+
+ @classmethod
+ def objectify(cls, buff, reader, nullable=True):
+ return cls.is_null(buff, reader, cls._read_dt, nullable)
+
+ @classmethod
+ def _read_dt(cls, b, r):
+ year = r.to_object(b, DataType.int, False)
+ month = r.to_object(b, DataType.byte, False)
+ day = r.to_object(b, DataType.byte, False)
+ ns = r.to_object(b, DataType.long, False)
+ offset = r.to_object(b, DataType.int, False)
+ tz = timezone(timedelta(seconds=offset))
+ return datetime(year, month, day, tzinfo=tz) + timedelta(microseconds=ns/1000)
+
+
+class CharIO(_GraphBinaryTypeIO):
+ python_type = SingleChar
+ graphbinary_type = DataType.char
+
+ @classmethod
+ def dictify(cls, obj, writer, to_extend, as_value=False, nullable=True):
+ cls.prefix_bytes(cls.graphbinary_type, as_value, nullable, to_extend)
+ to_extend.extend(obj.encode("utf-8"))
+ return to_extend
+
+ @classmethod
+ def objectify(cls, buff, reader, nullable=True):
+ return cls.is_null(buff, reader, cls._read_char, nullable)
+
+ @classmethod
+ def _read_char(cls, b, r):
+ max_bytes = 4
+ x = b.read(1)
+ while max_bytes > 0:
+ max_bytes = max_bytes - 1
+ try:
+ return x.decode("utf-8")
+ except UnicodeDecodeError:
+ x += b.read(1)
+
+
+class StringIO(_GraphBinaryTypeIO):
+
+ python_type = str
+ graphbinary_type = DataType.string
+
+ @classmethod
+ def dictify(cls, obj, writer, to_extend, as_value=False, nullable=True):
+ cls.prefix_bytes(cls.graphbinary_type, as_value, nullable, to_extend)
+ str_bytes = obj.encode("utf-8")
+ to_extend += int32_pack(len(str_bytes))
+ to_extend += str_bytes
+ return to_extend
+
+ @classmethod
+ def objectify(cls, buff, reader, nullable=True):
+ return cls.is_null(buff, reader, lambda b, r: b.read(cls.read_int(b)).decode("utf-8"), nullable)
+
+
+class ListIO(_GraphBinaryTypeIO):
+
+ python_type = list
+ graphbinary_type = DataType.list
+
+ @classmethod
+ def dictify(cls, obj, writer, to_extend, as_value=False, nullable=True):
+ cls.prefix_bytes(cls.graphbinary_type, as_value, nullable, to_extend)
+ to_extend.extend(int32_pack(len(obj)))
+ for item in obj:
+ writer.to_dict(item, to_extend)
+
+ return to_extend
+
+ @classmethod
+ def objectify(cls, buff, reader, nullable=True):
+ flag = 0x00
+ if nullable:
+ flag = buff.read(1)[0]
+ if flag == 0x01:
+ return None
+ else:
+ return cls._read_list(buff, reader, flag)
+ return cls._read_list(buff, reader, flag)
+
+ @classmethod
+ def _read_list(cls, b, r, flag):
+ size = cls.read_int(b)
+ the_list = []
+ if flag == 0x02:
+ while size > 0:
+ itm = r.read_object(b)
+ bulk = int64_unpack(b.read(8))
+ for y in range(bulk):
+ the_list.append(itm)
+ size = size - 1
+ else:
+ while size > 0:
+ the_list.append(r.read_object(b))
+ size = size - 1
+
+ return the_list
+
+
+class SetDeserializer(ListIO):
+
+ python_type = SetType
+ graphbinary_type = DataType.set
+
+ @classmethod
+ def objectify(cls, buff, reader, nullable=True):
+ return set(ListIO.objectify(buff, reader, nullable))
+
+
+class MapIO(_GraphBinaryTypeIO):
+
+ python_type = DictType
+ graphbinary_type = DataType.map
+
+ @classmethod
+ def dictify(cls, obj, writer, to_extend, as_value=False, nullable=True):
+ cls.prefix_bytes(cls.graphbinary_type, as_value, nullable, to_extend, ordered=isinstance(obj, OrderedDict))
+
+ to_extend.extend(int32_pack(len(obj)))
+ for k, v in obj.items():
+ writer.to_dict(k, to_extend)
+ writer.to_dict(v, to_extend)
+
+ return to_extend
+
+ @classmethod
+ def objectify(cls, buff, reader, nullable=True):
+ flag = 0x00
+ if nullable:
+ flag = buff.read(1)[0]
+ if flag == 0x01:
+ return None
+ else:
+ return cls._read_map(buff, reader, flag)
+ return cls._read_map(buff, reader, flag)
+
+ @classmethod
+ def _read_map(cls, b, r, flag):
+ size = cls.read_int(b)
+ the_dict = OrderedDict() if flag == 0x02 else {}
+ while size > 0:
+ k = HashableDict.of(r.read_object(b))
+ v = r.read_object(b)
+ the_dict[k] = v
+ size = size - 1
+
+ return the_dict
+
+
+class UuidIO(_GraphBinaryTypeIO):
+
+ python_type = uuid.UUID
+ graphbinary_type = DataType.uuid
+
+ @classmethod
+ def dictify(cls, obj, writer, to_extend, as_value=False, nullable=True):
+ cls.prefix_bytes(cls.graphbinary_type, as_value, nullable, to_extend)
+ to_extend.extend(obj.bytes)
+ return to_extend
+
+ @classmethod
+ def objectify(cls, buff, reader, nullable=True):
+ return cls.is_null(buff, reader, lambda b, r: uuid.UUID(bytes=b.read(16)), nullable)
+
+
+class EdgeIO(_GraphBinaryTypeIO):
+
+ python_type = Edge
+ graphbinary_type = DataType.edge
+
+ @classmethod
+ def dictify(cls, obj, writer, to_extend, as_value=False, nullable=True):
+ cls.prefix_bytes(cls.graphbinary_type, as_value, nullable, to_extend)
+
+ writer.to_dict(obj.id, to_extend)
+ # serializing label as list here for now according to GraphBinaryV4
+ ListIO.dictify([obj.label], writer, to_extend, True, False)
+ writer.to_dict(obj.inV.id, to_extend)
+ ListIO.dictify([obj.inV.label], writer, to_extend, True, False)
+ writer.to_dict(obj.outV.id, to_extend)
+ ListIO.dictify([obj.outV.label], writer, to_extend, True, False)
+ to_extend.extend(NULL_BYTES)
+ to_extend.extend(NULL_BYTES)
+
+ return to_extend
+
+ @classmethod
+ def objectify(cls, buff, reader, nullable=True):
+ return cls.is_null(buff, reader, cls._read_edge, nullable)
+
+ @classmethod
+ def _read_edge(cls, b, r):
+ edgeid = r.read_object(b)
+ # reading single string value for now according to GraphBinaryV4
+ edgelbl = r.to_object(b, DataType.list, False)[0]
+ inv = Vertex(r.read_object(b), r.to_object(b, DataType.list, False)[0])
+ outv = Vertex(r.read_object(b), r.to_object(b, DataType.list, False)[0])
+ b.read(2)
+ props = r.read_object(b)
+ # null properties are returned as empty lists
+ properties = [] if props is None else props
+ edge = Edge(edgeid, outv, edgelbl, inv, properties)
+ return edge
+
+
+class PathIO(_GraphBinaryTypeIO):
+
+ python_type = Path
+ graphbinary_type = DataType.path
+
+ @classmethod
+ def dictify(cls, obj, writer, to_extend, as_value=False, nullable=True):
+ cls.prefix_bytes(cls.graphbinary_type, as_value, nullable, to_extend)
+ writer.to_dict(obj.labels, to_extend)
+ writer.to_dict(obj.objects, to_extend)
+ return to_extend
+
+ @classmethod
+ def objectify(cls, buff, reader, nullable=True):
+ return cls.is_null(buff, reader, lambda b, r: Path(r.read_object(b), r.read_object(b)), nullable)
+
+
+class PropertyIO(_GraphBinaryTypeIO):
+
+ python_type = Property
+ graphbinary_type = DataType.property
+
+ @classmethod
+ def dictify(cls, obj, writer, to_extend, as_value=False, nullable=True):
+ cls.prefix_bytes(cls.graphbinary_type, as_value, nullable, to_extend)
+ StringIO.dictify(obj.key, writer, to_extend, True, False)
+ writer.to_dict(obj.value, to_extend)
+ to_extend.extend(NULL_BYTES)
+ return to_extend
+
+ @classmethod
+ def objectify(cls, buff, reader, nullable=True):
+ return cls.is_null(buff, reader, cls._read_property, nullable)
+
+ @classmethod
+ def _read_property(cls, b, r):
+ p = Property(r.to_object(b, DataType.string, False), r.read_object(b), None)
+ b.read(2)
+ return p
+
+
+class TinkerGraphIO(_GraphBinaryTypeIO):
+
+ python_type = Graph
+ graphbinary_type = DataType.graph
+
+ @classmethod
+ def dictify(cls, obj, writer, to_extend, as_value=False, nullable=True):
+ raise AttributeError("TinkerGraph serialization is not currently supported by gremlin-python")
+
+ @classmethod
+ def objectify(cls, b, reader, as_value=False):
+ raise AttributeError("TinkerGraph deserialization is not currently supported by gremlin-python")
+
+
+class VertexIO(_GraphBinaryTypeIO):
+
+ python_type = Vertex
+ graphbinary_type = DataType.vertex
+
+ @classmethod
+ def dictify(cls, obj, writer, to_extend, as_value=False, nullable=True):
+ cls.prefix_bytes(cls.graphbinary_type, as_value, nullable, to_extend)
+ writer.to_dict(obj.id, to_extend)
+ # serializing label as list here for now according to GraphBinaryV4
+ ListIO.dictify([obj.label], writer, to_extend, True, False)
+ to_extend.extend(NULL_BYTES)
+ return to_extend
+
+ @classmethod
+ def objectify(cls, buff, reader, nullable=True):
+ return cls.is_null(buff, reader, cls._read_vertex, nullable)
+
+ @classmethod
+ def _read_vertex(cls, b, r):
+ vertex_id = r.read_object(b)
+ # reading single string value for now according to GraphBinaryV4
+ vertex_label = r.to_object(b, DataType.list, False)[0]
+ props = r.read_object(b)
+ # null properties are returned as empty lists
+ properties = [] if props is None else props
+ vertex = Vertex(vertex_id, vertex_label, properties)
+ return vertex
+
+
+class VertexPropertyIO(_GraphBinaryTypeIO):
+
+ python_type = VertexProperty
+ graphbinary_type = DataType.vertexproperty
+
+ @classmethod
+ def dictify(cls, obj, writer, to_extend, as_value=False, nullable=True):
+ cls.prefix_bytes(cls.graphbinary_type, as_value, nullable, to_extend)
+ writer.to_dict(obj.id, to_extend)
+ # serializing label as list here for now according to GraphBinaryV4
+ ListIO.dictify([obj.label], writer, to_extend, True, False)
+ writer.to_dict(obj.value, to_extend)
+ to_extend.extend(NULL_BYTES)
+ to_extend.extend(NULL_BYTES)
+ return to_extend
+
+ @classmethod
+ def objectify(cls, buff, reader, nullable=True):
+ return cls.is_null(buff, reader, cls._read_vertexproperty, nullable)
+
+ @classmethod
+ def _read_vertexproperty(cls, b, r):
+ # reading single string value for now according to GraphBinaryV4
+ vp = VertexProperty(r.read_object(b), r.to_object(b, DataType.list, False)[0], r.read_object(b), None)
+ b.read(2)
+ properties = r.read_object(b)
+ # null properties are returned as empty lists
+ vp.properties = [] if properties is None else properties
+ return vp
+
+
+class _EnumIO(_GraphBinaryTypeIO):
+
+ @classmethod
+ def dictify(cls, obj, writer, to_extend, as_value=False, nullable=True):
+ cls.prefix_bytes(cls.graphbinary_type, as_value, nullable, to_extend)
+ StringIO.dictify(SymbolUtil.to_camel_case(str(obj.name)), writer, to_extend)
+ return to_extend
+
+ @classmethod
+ def objectify(cls, buff, reader, nullable=True):
+ return cls.is_null(buff, reader, cls._read_enumval, nullable)
+
+ @classmethod
+ def _read_enumval(cls, b, r):
+ enum_name = r.to_object(b)
+ return cls.python_type[SymbolUtil.to_snake_case(enum_name)]
+
+
+class DirectionIO(_EnumIO):
+ graphbinary_type = DataType.direction
+ python_type = Direction
+
+ @classmethod
+ def _read_enumval(cls, b, r):
+ # Direction needs to retain all CAPS. note that to_/from_ are really just aliases of IN/OUT
+ # so they don't need to be accounted for in serialization
+ enum_name = r.to_object(b)
+ return cls.python_type[enum_name]
+
+
+class TIO(_EnumIO):
+ graphbinary_type = DataType.t
+ python_type = T
+
+
+class MergeIO(_EnumIO):
+ graphbinary_type = DataType.merge
+ python_type = Merge
+
+
+class NIO(_EnumIO):
+ graphbinary_type = DataType.n
+ python_type = N
+
+
+class ByteIO(_GraphBinaryTypeIO):
+ python_type = SingleByte
+ graphbinary_type = DataType.byte
+
+ @classmethod
+ def dictify(cls, obj, writer, to_extend, as_value=False, nullable=True):
+ cls.prefix_bytes(cls.graphbinary_type, as_value, nullable, to_extend)
+ to_extend.extend(int8_pack(obj))
+ return to_extend
+
+ @classmethod
+ def objectify(cls, buff, reader, nullable=True):
+ return cls.is_null(buff, reader,
+ lambda b, r: int.__new__(SingleByte, int8_unpack(b.read(1))),
+ nullable)
+
+
+class BinaryIO(_GraphBinaryTypeIO):
+ python_type = bytes
+ graphbinary_type = DataType.binary
+
+ @classmethod
+ def dictify(cls, obj, writer, to_extend, as_value=False, nullable=True):
+ cls.prefix_bytes(cls.graphbinary_type, as_value, nullable, to_extend)
+ to_extend.extend(int32_pack(len(obj)))
+ to_extend.extend(obj)
+ return to_extend
+
+ @classmethod
+ def objectify(cls, buff, reader, nullable=True):
+ return cls.is_null(buff, reader, cls._read_bytebuffer, nullable)
+
+ @classmethod
+ def _read_bytebuffer(cls, b, r):
+ size = cls.read_int(b)
+ return bytes(b.read(size))
+
+
+class BooleanIO(_GraphBinaryTypeIO):
+ python_type = bool
+ graphbinary_type = DataType.boolean
+
+ @classmethod
+ def dictify(cls, obj, writer, to_extend, as_value=False, nullable=True):
+ cls.prefix_bytes(cls.graphbinary_type, as_value, nullable, to_extend)
+ to_extend.extend(int8_pack(0x01 if obj else 0x00))
+ return to_extend
+
+ @classmethod
+ def objectify(cls, buff, reader, nullable=True):
+ return cls.is_null(buff, reader,
+ lambda b, r: True if int8_unpack(b.read(1)) == 0x01 else False,
+ nullable)
+
+
+class DurationIO(_GraphBinaryTypeIO):
+ python_type = timedelta
+ graphbinary_type = DataType.duration
+
+ @classmethod
+ def dictify(cls, obj, writer, to_extend, as_value=False, nullable=True):
+ cls.prefix_bytes(cls.graphbinary_type, as_value, nullable, to_extend)
+ LongIO.dictify(obj.seconds, writer, to_extend, True, False)
+ IntIO.dictify(obj.microseconds * 1000, writer, to_extend, True, False)
+ return to_extend
+
+ @classmethod
+ def objectify(cls, buff, reader, nullable=True):
+ return cls.is_null(buff, reader, cls._read_duration, nullable)
+
+ @classmethod
+ def _read_duration(cls, b, r):
+ seconds = r.to_object(b, DataType.long, False)
+ nanos = r.to_object(b, DataType.int, False)
+ return timedelta(seconds=seconds, microseconds=nanos / 1000)
+
+
+class MarkerIO(_GraphBinaryTypeIO):
+ python_type = Marker
+ graphbinary_type = DataType.marker
+
+ @classmethod
+ def dictify(cls, obj, writer, to_extend, as_value=False, nullable=True):
+ cls.prefix_bytes(cls.graphbinary_type, as_value, nullable, to_extend)
+ to_extend.extend(int8_pack(obj.get_value()))
+ return to_extend
+
+ @classmethod
+ def objectify(cls, buff, reader, nullable=True):
+ return cls.is_null(buff, reader,
+ lambda b, r: Marker.of(int8_unpack(b.read(1))),
+ nullable)
\ No newline at end of file
diff --git a/gremlin-python/src/main/python/gremlin_python/structure/io/graphsonV2d0.py b/gremlin-python/src/main/python/gremlin_python/structure/io/graphsonV2d0.py
deleted file mode 100644
index 08c82c5..0000000
--- a/gremlin-python/src/main/python/gremlin_python/structure/io/graphsonV2d0.py
+++ /dev/null
@@ -1,685 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-import calendar
-import datetime
-import json
-import uuid
-import math
-from collections import OrderedDict
-from decimal import *
-from datetime import timedelta
-
-from aenum import Enum
-from isodate import parse_duration, duration_isoformat
-
-from gremlin_python import statics
-from gremlin_python.statics import FloatType, FunctionType, ShortType, IntType, LongType, TypeType, SingleByte, ByteBufferType, SingleChar
-from gremlin_python.process.traversal import Binding, Bytecode, P, TextP, Traversal, Traverser, TraversalStrategy
-from gremlin_python.structure.graph import Edge, Property, Vertex, VertexProperty, Path
-from gremlin_python.structure.io.util import SymbolUtil
-
-# When we fall back to a superclass's serializer, we iterate over this map.
-# We want that iteration order to be consistent, so we use an OrderedDict,
-# not a dict.
-_serializers = OrderedDict()
-_deserializers = {}
-
-
-class GraphSONTypeType(type):
- def __new__(mcs, name, bases, dct):
- cls = super(GraphSONTypeType, mcs).__new__(mcs, name, bases, dct)
- if not name.startswith('_'):
- if cls.python_type:
- _serializers[cls.python_type] = cls
- if cls.graphson_type:
- _deserializers[cls.graphson_type] = cls
- return cls
-
-
-class GraphSONUtil(object):
- TYPE_KEY = "@type"
- VALUE_KEY = "@value"
-
- @classmethod
- def typed_value(cls, type_name, value, prefix="g"):
- out = {cls.TYPE_KEY: cls.format_type(prefix, type_name)}
- if value is not None:
- out[cls.VALUE_KEY] = value
- return out
-
- @classmethod
- def format_type(cls, prefix, type_name):
- return "%s:%s" % (prefix, type_name)
-
-
-# Read/Write classes split to follow precedence of the Java API
-class GraphSONWriter(object):
- def __init__(self, serializer_map=None):
- """
- :param serializer_map: map from Python type to serializer instance implementing `dictify`
- """
- self.serializers = _serializers.copy()
- if serializer_map:
- self.serializers.update(serializer_map)
-
- def write_object(self, objectData):
- # to JSON
- return json.dumps(self.to_dict(objectData), separators=(',', ':'))
-
- def to_dict(self, obj):
- """
- Encodes python objects in GraphSON type-tagged dict values
- """
- try:
- return self.serializers[type(obj)].dictify(obj, self)
- except KeyError:
- for key, serializer in self.serializers.items():
- if isinstance(obj, key):
- return serializer.dictify(obj, self)
-
- # list and map are treated as normal json objs (could be isolated serializers)
- if isinstance(obj, (list, set)):
- return [self.to_dict(o) for o in obj]
- elif isinstance(obj, dict):
- return dict((self.to_dict(k), self.to_dict(v)) for k, v in obj.items())
- else:
- return obj
-
-
-class GraphSONReader(object):
- def __init__(self, deserializer_map=None):
- """
- :param deserializer_map: map from GraphSON type tag to deserializer instance implementing `objectify`
- """
- self.deserializers = _deserializers.copy()
- if deserializer_map:
- self.deserializers.update(deserializer_map)
-
- def read_object(self, json_data):
- # from JSON
- return self.to_object(json.loads(json_data))
-
- def to_object(self, obj):
- """
- Unpacks GraphSON type-tagged dict values into objects mapped in self.deserializers
- """
- if isinstance(obj, dict):
- try:
- return self.deserializers[obj[GraphSONUtil.TYPE_KEY]].objectify(obj[GraphSONUtil.VALUE_KEY], self)
- except KeyError:
- pass
- # list and map are treated as normal json objs (could be isolated deserializers)
- return dict((self.to_object(k), self.to_object(v)) for k, v in obj.items())
- elif isinstance(obj, list):
- return [self.to_object(o) for o in obj]
- else:
- return obj
-
-
-class _GraphSONTypeIO(object, metaclass=GraphSONTypeType):
- python_type = None
- graphson_type = None
-
- def dictify(self, obj, writer):
- raise NotImplementedError()
-
- def objectify(self, d, reader):
- raise NotImplementedError()
-
-
-class _BytecodeSerializer(_GraphSONTypeIO):
- @classmethod
- def _dictify_instructions(cls, instructions, writer):
- out = []
- for instruction in instructions:
- inst = [instruction[0]]
- inst.extend(writer.to_dict(arg) for arg in instruction[1:])
- out.append(inst)
- return out
-
- @classmethod
- def dictify(cls, bytecode, writer):
- if isinstance(bytecode, Traversal):
- bytecode = bytecode.bytecode
- out = {}
- if bytecode.source_instructions:
- out["source"] = cls._dictify_instructions(bytecode.source_instructions, writer)
- if bytecode.step_instructions:
- out["step"] = cls._dictify_instructions(bytecode.step_instructions, writer)
- return GraphSONUtil.typed_value("Bytecode", out)
-
-class TraversalSerializer(_BytecodeSerializer):
- python_type = Traversal
-
-
-class BytecodeSerializer(_BytecodeSerializer):
- python_type = Bytecode
-
-
-class VertexSerializer(_GraphSONTypeIO):
- python_type = Vertex
- graphson_type = "g:Vertex"
-
- @classmethod
- def dictify(cls, vertex, writer):
- return GraphSONUtil.typed_value("Vertex", {"id": writer.to_dict(vertex.id),
- "label": writer.to_dict(vertex.label)})
-
-
-class EdgeSerializer(_GraphSONTypeIO):
- python_type = Edge
- graphson_type = "g:Edge"
-
- @classmethod
- def dictify(cls, edge, writer):
- return GraphSONUtil.typed_value("Edge", {"id": writer.to_dict(edge.id),
- "outV": writer.to_dict(edge.outV.id),
- "outVLabel": writer.to_dict(edge.outV.label),
- "label": writer.to_dict(edge.label),
- "inV": writer.to_dict(edge.inV.id),
- "inVLabel": writer.to_dict(edge.inV.label)})
-
-
-class VertexPropertySerializer(_GraphSONTypeIO):
- python_type = VertexProperty
- graphson_type = "g:VertexProperty"
-
- @classmethod
- def dictify(cls, vertex_property, writer):
- return GraphSONUtil.typed_value("VertexProperty", {"id": writer.to_dict(vertex_property.id),
- "label": writer.to_dict(vertex_property.label),
- "value": writer.to_dict(vertex_property.value),
- "vertex": writer.to_dict(vertex_property.vertex.id)})
-
-
-class PropertySerializer(_GraphSONTypeIO):
- python_type = Property
- graphson_type = "g:Property"
-
- @classmethod
- def dictify(cls, property, writer):
- element_dict = writer.to_dict(property.element)
- if element_dict is not None:
- value_dict = element_dict["@value"]
- if "outVLabel" in value_dict:
- del value_dict["outVLabel"]
- if "inVLabel" in value_dict:
- del value_dict["inVLabel"]
- if "properties" in value_dict:
- del value_dict["properties"]
- if "value" in value_dict:
- del value_dict["value"]
- return GraphSONUtil.typed_value("Property", {"key": writer.to_dict(property.key),
- "value": writer.to_dict(property.value),
- "element": element_dict})
-
-
-class TraversalStrategySerializer(_GraphSONTypeIO):
- python_type = TraversalStrategy
-
- @classmethod
- def dictify(cls, strategy, writer):
- strat_dict = {}
- strat_dict["fqcn"] = strategy.fqcn
- strat_dict["conf"] = {}
- for key in strategy.configuration:
- strat_dict["conf"][key] = writer.to_dict(strategy.configuration[key])
- return GraphSONUtil.typed_value(strategy.strategy_name, strat_dict)
-
-
-class TraverserIO(_GraphSONTypeIO):
- python_type = Traverser
- graphson_type = "g:Traverser"
-
- @classmethod
- def dictify(cls, traverser, writer):
- return GraphSONUtil.typed_value("Traverser", {"value": writer.to_dict(traverser.object),
- "bulk": writer.to_dict(traverser.bulk)})
-
- @classmethod
- def objectify(cls, d, reader):
- return Traverser(reader.to_object(d["value"]),
- reader.to_object(d["bulk"]))
-
-
-class EnumSerializer(_GraphSONTypeIO):
- python_type = Enum
-
- @classmethod
- def dictify(cls, enum, _):
- return GraphSONUtil.typed_value(SymbolUtil.to_camel_case(type(enum).__name__),
- SymbolUtil.to_camel_case(str(enum.name)))
-
-
-class PSerializer(_GraphSONTypeIO):
- python_type = P
-
- @classmethod
- def dictify(cls, p, writer):
- out = {"predicate": p.operator,
- "value": [writer.to_dict(p.value), writer.to_dict(p.other)] if p.other is not None else
- writer.to_dict(p.value)}
- return GraphSONUtil.typed_value("P", out)
-
-
-class TextPSerializer(_GraphSONTypeIO):
- python_type = TextP
-
- @classmethod
- def dictify(cls, p, writer):
- out = {"predicate": p.operator,
- "value": [writer.to_dict(p.value), writer.to_dict(p.other)] if p.other is not None else
- writer.to_dict(p.value)}
- return GraphSONUtil.typed_value("TextP", out)
-
-
-class BindingSerializer(_GraphSONTypeIO):
- python_type = Binding
-
- @classmethod
- def dictify(cls, binding, writer):
- out = {"key": binding.key,
- "value": writer.to_dict(binding.value)}
- return GraphSONUtil.typed_value("Binding", out)
-
-
-class LambdaSerializer(_GraphSONTypeIO):
- python_type = FunctionType
-
- @classmethod
- def dictify(cls, lambda_object, writer):
- lambda_result = lambda_object()
- script = lambda_result if isinstance(lambda_result, str) else lambda_result[0]
- language = statics.default_lambda_language if isinstance(lambda_result, str) else lambda_result[1]
- out = {"script": script,
- "language": language}
- if language == "gremlin-groovy" and "->" in script:
- # if the user has explicitly added parameters to the groovy closure then we can easily detect one or two
- # arg lambdas - if we can't detect 1 or 2 then we just go with "unknown"
- args = script[0:script.find("->")]
- out["arguments"] = 2 if "," in args else 1
- else:
- out["arguments"] = -1
-
- return GraphSONUtil.typed_value("Lambda", out)
-
-
-class TypeSerializer(_GraphSONTypeIO):
- python_type = TypeType
-
- @classmethod
- def dictify(cls, typ, writer):
- return writer.to_dict(typ())
-
-
-class UUIDIO(_GraphSONTypeIO):
- python_type = uuid.UUID
- graphson_type = "g:UUID"
- graphson_base_type = "UUID"
-
- @classmethod
- def dictify(cls, obj, writer):
- return GraphSONUtil.typed_value(cls.graphson_base_type, str(obj))
-
- @classmethod
- def objectify(cls, d, reader):
- return cls.python_type(d)
-
-
-class DateIO(_GraphSONTypeIO):
- graphson_type = "g:Date"
- graphson_base_type = "Date"
-
- @classmethod
- def dictify(cls, obj, writer):
- try:
- timestamp_seconds = calendar.timegm(obj.utctimetuple())
- pts = timestamp_seconds * 1e3 + getattr(obj, 'microsecond', 0) / 1e3
- except AttributeError:
- pts = calendar.timegm(obj.timetuple()) * 1e3
-
- ts = int(round(pts))
- return GraphSONUtil.typed_value(cls.graphson_base_type, ts)
-
- @classmethod
- def objectify(cls, ts, reader):
- # Python timestamp expects seconds
- return datetime.datetime.utcfromtimestamp(ts / 1000.0)
-
-
- class OffsetDateTimeIO(_GraphSONTypeIO):
- python_type = datetime.datetime
- graphson_type = "gx:OffsetDateTime"
- graphson_base_type = "OffsetDateTime"
-
- @classmethod
- def dictify(cls, obj, writer):
- if obj.tzinfo is None:
- return DateIO.dictify(obj, writer)
- return GraphSONUtil.typed_value(cls.graphson_base_type, obj.isoformat(), "gx")
-
- @classmethod
- def objectify(cls, dt, reader):
- # specially handling as python isoformat does not support zulu until 3.11
- dt_iso = dt[:-1] + '+00:00' if dt.endswith('Z') else dt
- return datetime.datetime.fromisoformat(dt_iso)
-
-
-# Based on current implementation, this class must always be declared before FloatIO.
-# Seems pretty fragile for future maintainers. Maybe look into this.
-class TimestampIO(_GraphSONTypeIO):
- """A timestamp in Python is type float"""
- python_type = statics.timestamp
- graphson_type = "g:Timestamp"
- graphson_base_type = "Timestamp"
-
- @classmethod
- def dictify(cls, obj, writer):
- # Java timestamp expects milliseconds integer
- # Have to use int because of legacy Python
- ts = int(round(obj * 1000))
- return GraphSONUtil.typed_value(cls.graphson_base_type, ts)
-
- @classmethod
- def objectify(cls, ts, reader):
- # Python timestamp expects seconds
- return cls.python_type(ts / 1000.0)
-
-
-class _NumberIO(_GraphSONTypeIO):
- @classmethod
- def dictify(cls, n, writer):
- if isinstance(n, bool): # because isinstance(False, int) and isinstance(True, int)
- return n
- return GraphSONUtil.typed_value(cls.graphson_base_type, n)
-
- @classmethod
- def objectify(cls, v, _):
- return cls.python_type(v)
-
-
-class FloatIO(_NumberIO):
- python_type = FloatType
- graphson_type = "g:Float"
- graphson_base_type = "Float"
-
- @classmethod
- def dictify(cls, n, writer):
- if isinstance(n, bool): # because isinstance(False, int) and isinstance(True, int)
- return n
- elif math.isnan(n):
- return GraphSONUtil.typed_value(cls.graphson_base_type, "NaN")
- elif math.isinf(n) and n > 0:
- return GraphSONUtil.typed_value(cls.graphson_base_type, "Infinity")
- elif math.isinf(n) and n < 0:
- return GraphSONUtil.typed_value(cls.graphson_base_type, "-Infinity")
- else:
- return GraphSONUtil.typed_value(cls.graphson_base_type, n)
-
- @classmethod
- def objectify(cls, v, _):
- if isinstance(v, str):
- if v == 'NaN':
- return float('nan')
- elif v == "Infinity":
- return float('inf')
- elif v == "-Infinity":
- return float('-inf')
-
- return cls.python_type(v)
-
-
-class BigDecimalIO(_NumberIO):
- python_type = Decimal
- graphson_type = "gx:BigDecimal"
- graphson_base_type = "BigDecimal"
-
- @classmethod
- def dictify(cls, n, writer):
- if isinstance(n, bool): # because isinstance(False, int) and isinstance(True, int)
- return n
- elif math.isnan(n):
- return GraphSONUtil.typed_value(cls.graphson_base_type, "NaN", "gx")
- elif math.isinf(n) and n > 0:
- return GraphSONUtil.typed_value(cls.graphson_base_type, "Infinity", "gx")
- elif math.isinf(n) and n < 0:
- return GraphSONUtil.typed_value(cls.graphson_base_type, "-Infinity", "gx")
- else:
- return GraphSONUtil.typed_value(cls.graphson_base_type, str(n), "gx")
-
- @classmethod
- def objectify(cls, v, _):
- if isinstance(v, str):
- if v == 'NaN':
- return Decimal('nan')
- elif v == "Infinity":
- return Decimal('inf')
- elif v == "-Infinity":
- return Decimal('-inf')
-
- return Decimal(v)
-
-
-class DoubleIO(FloatIO):
- graphson_type = "g:Double"
- graphson_base_type = "Double"
-
-
-class Int64IO(_NumberIO):
- python_type = LongType
- graphson_type = "g:Int64"
- graphson_base_type = "Int64"
-
- @classmethod
- def dictify(cls, n, writer):
- # if we exceed Java long range then we need a BigInteger
- if isinstance(n, bool):
- return n
- elif n < -9223372036854775808 or n > 9223372036854775807:
- return GraphSONUtil.typed_value("BigInteger", str(n), "gx")
- else:
- return GraphSONUtil.typed_value(cls.graphson_base_type, n)
-
-
-class BigIntegerIO(Int64IO):
- graphson_type = "gx:BigInteger"
-
-
-class Int32IO(Int64IO):
- python_type = IntType
- graphson_type = "g:Int32"
- graphson_base_type = "Int32"
-
- @classmethod
- def dictify(cls, n, writer):
- # if we exceed Java int range then we need a long
- if isinstance(n, bool):
- return n
- elif n < -9223372036854775808 or n > 9223372036854775807:
- return GraphSONUtil.typed_value("BigInteger", str(n), "gx")
- elif n < -2147483648 or n > 2147483647:
- return GraphSONUtil.typed_value("Int64", n)
- else:
- return GraphSONUtil.typed_value(cls.graphson_base_type, n)
-
-
-class Int16IO(Int64IO):
- python_type = ShortType
- graphson_type = "gx:Int16"
- graphson_base_type = "Int16"
-
- @classmethod
- def dictify(cls, n, writer):
- # if we exceed Java int range then we need a long
- if isinstance(n, bool):
- return n
- elif n < -9223372036854775808 or n > 9223372036854775807:
- return GraphSONUtil.typed_value("BigInteger", str(n), "gx")
- elif n < -2147483648 or n > 2147483647:
- return GraphSONUtil.typed_value("Int64", n)
- elif n < -32768 or n > 32767:
- return GraphSONUtil.typed_value("Int32", n)
- else:
- return GraphSONUtil.typed_value(cls.graphson_base_type, n, "gx")
-
- @classmethod
- def objectify(cls, v, _):
- return int.__new__(ShortType, v)
-
-
-class ByteIO(_NumberIO):
- python_type = SingleByte
- graphson_type = "gx:Byte"
- graphson_base_type = "Byte"
-
- @classmethod
- def dictify(cls, n, writer):
- if isinstance(n, bool): # because isinstance(False, int) and isinstance(True, int)
- return n
- return GraphSONUtil.typed_value(cls.graphson_base_type, n, "gx")
-
- @classmethod
- def objectify(cls, v, _):
- return int.__new__(SingleByte, v)
-
-
-class ByteBufferIO(_GraphSONTypeIO):
- python_type = ByteBufferType
- graphson_type = "gx:ByteBuffer"
- graphson_base_type = "ByteBuffer"
-
- @classmethod
- def dictify(cls, n, writer):
- return GraphSONUtil.typed_value(cls.graphson_base_type, "".join(chr(x) for x in n), "gx")
-
- @classmethod
- def objectify(cls, v, _):
- return cls.python_type(v, "utf8")
-
-
-class CharIO(_GraphSONTypeIO):
- python_type = SingleChar
- graphson_type = "gx:Char"
- graphson_base_type = "Char"
-
- @classmethod
- def dictify(cls, n, writer):
- return GraphSONUtil.typed_value(cls.graphson_base_type, n, "gx")
-
- @classmethod
- def objectify(cls, v, _):
- return str.__new__(SingleChar, v)
-
-
-class DurationIO(_GraphSONTypeIO):
- python_type = timedelta
- graphson_type = "gx:Duration"
- graphson_base_type = "Duration"
-
- @classmethod
- def dictify(cls, n, writer):
- return GraphSONUtil.typed_value(cls.graphson_base_type, duration_isoformat(n), "gx")
-
- @classmethod
- def objectify(cls, v, _):
- return parse_duration(v)
-
-
-class VertexDeserializer(_GraphSONTypeIO):
- graphson_type = "g:Vertex"
-
- @classmethod
- def objectify(cls, d, reader):
- properties = None
- if "properties" in d:
- properties = reader.to_object(d["properties"])
- if properties is not None:
- properties = [item for sublist in properties.values() for item in sublist]
- return Vertex(reader.to_object(d["id"]), d.get("label", "vertex"), properties)
-
-
-class EdgeDeserializer(_GraphSONTypeIO):
- graphson_type = "g:Edge"
-
- @classmethod
- def objectify(cls, d, reader):
- properties = None
- if "properties" in d:
- properties = reader.to_object(d["properties"])
- if properties is not None:
- properties = list(properties.values())
- return Edge(reader.to_object(d["id"]),
- Vertex(reader.to_object(d["outV"]), d.get("outVLabel", "vertex")),
- d.get("label", "edge"),
- Vertex(reader.to_object(d["inV"]), d.get("inVLabel", "vertex")),
- properties)
-
-
-class VertexPropertyDeserializer(_GraphSONTypeIO):
- graphson_type = "g:VertexProperty"
-
- @classmethod
- def objectify(cls, d, reader):
- properties = None
- if "properties" in d:
- properties = reader.to_object(d["properties"])
- if properties is not None:
- properties = list(map(lambda x: Property(x[0], x[1], None), properties.items()))
- vertex = Vertex(reader.to_object(d.get("vertex"))) if "vertex" in d else None
- return VertexProperty(reader.to_object(d["id"]),
- d["label"],
- reader.to_object(d["value"]),
- vertex,
- properties)
-
-
-class PropertyDeserializer(_GraphSONTypeIO):
- graphson_type = "g:Property"
-
- @classmethod
- def objectify(cls, d, reader):
- element = reader.to_object(d["element"]) if "element" in d else None
- return Property(d["key"], reader.to_object(d["value"]), element)
-
-
-class PathDeserializer(_GraphSONTypeIO):
- graphson_type = "g:Path"
-
- @classmethod
- def objectify(cls, d, reader):
- labels = [set(label) for label in d["labels"]]
- objects = [reader.to_object(o) for o in d["objects"]]
- return Path(labels, objects)
-
-
-class TraversalMetricsDeserializer(_GraphSONTypeIO):
- graphson_type = "g:TraversalMetrics"
-
- @classmethod
- def objectify(cls, d, reader):
- return reader.to_object(d)
-
-
-class MetricsDeserializer(_GraphSONTypeIO):
- graphson_type = "g:Metrics"
-
- @classmethod
- def objectify(cls, d, reader):
- return reader.to_object(d)
diff --git a/gremlin-python/src/main/python/gremlin_python/structure/io/graphsonV3d0.py b/gremlin-python/src/main/python/gremlin_python/structure/io/graphsonV3d0.py
deleted file mode 100644
index 75bc642..0000000
--- a/gremlin-python/src/main/python/gremlin_python/structure/io/graphsonV3d0.py
+++ /dev/null
@@ -1,802 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-import calendar
-import datetime
-import json
-import uuid
-import math
-from collections import OrderedDict
-from decimal import *
-import logging
-from datetime import timedelta
-
-from aenum import Enum
-from isodate import parse_duration, duration_isoformat
-
-from gremlin_python import statics
-from gremlin_python.statics import FloatType, FunctionType, ShortType, IntType, LongType, TypeType, DictType, ListType, SetType, SingleByte, ByteBufferType, SingleChar
-from gremlin_python.process.traversal import Binding, Bytecode, Direction, P, TextP, Traversal, Traverser, TraversalStrategy, T
-from gremlin_python.structure.graph import Edge, Property, Vertex, VertexProperty, Path
-from gremlin_python.structure.io.util import HashableDict, SymbolUtil
-
-log = logging.getLogger(__name__)
-
-# When we fall back to a superclass's serializer, we iterate over this map.
-# We want that iteration order to be consistent, so we use an OrderedDict,
-# not a dict.
-_serializers = OrderedDict()
-_deserializers = {}
-
-
-class GraphSONTypeType(type):
- def __new__(mcs, name, bases, dct):
- cls = super(GraphSONTypeType, mcs).__new__(mcs, name, bases, dct)
- if not name.startswith('_'):
- if cls.python_type:
- _serializers[cls.python_type] = cls
- if cls.graphson_type:
- _deserializers[cls.graphson_type] = cls
- return cls
-
-
-class GraphSONUtil(object):
- TYPE_KEY = "@type"
- VALUE_KEY = "@value"
-
- @classmethod
- def typed_value(cls, type_name, value, prefix="g"):
- out = {cls.TYPE_KEY: cls.format_type(prefix, type_name)}
- if value is not None:
- out[cls.VALUE_KEY] = value
- return out
-
- @classmethod
- def format_type(cls, prefix, type_name):
- return "%s:%s" % (prefix, type_name)
-
-
-# Read/Write classes split to follow precedence of the Java API
-class GraphSONWriter(object):
- def __init__(self, serializer_map=None):
- """
- :param serializer_map: map from Python type to serializer instance implementing `dictify`
- """
- self.serializers = _serializers.copy()
- if serializer_map:
- self.serializers.update(serializer_map)
-
- def write_object(self, objectData):
- # to JSON
- return json.dumps(self.to_dict(objectData), separators=(',', ':'))
-
- def to_dict(self, obj):
- """
- Encodes python objects in GraphSON type-tagged dict values
- """
- try:
- return self.serializers[type(obj)].dictify(obj, self)
- except KeyError:
- for key, serializer in self.serializers.items():
- if isinstance(obj, key):
- return serializer.dictify(obj, self)
-
- if isinstance(obj, dict):
- return dict((self.to_dict(k), self.to_dict(v)) for k, v in obj.items())
- elif isinstance(obj, set):
- return set([self.to_dict(o) for o in obj])
- elif isinstance(obj, list):
- return [self.to_dict(o) for o in obj]
- else:
- return obj
-
-
-class GraphSONReader(object):
- def __init__(self, deserializer_map=None):
- """
- :param deserializer_map: map from GraphSON type tag to deserializer instance implementing `objectify`
- """
- self.deserializers = _deserializers.copy()
- if deserializer_map:
- self.deserializers.update(deserializer_map)
-
- def read_object(self, json_data):
- # from JSON
- return self.to_object(json.loads(json_data))
-
- def to_object(self, obj):
- """
- Unpacks GraphSON type-tagged dict values into objects mapped in self.deserializers
- """
- if isinstance(obj, dict):
- try:
- return self.deserializers[obj[GraphSONUtil.TYPE_KEY]].objectify(obj[GraphSONUtil.VALUE_KEY], self)
- except KeyError:
- pass
- return dict((self.to_object(k), self.to_object(v)) for k, v in obj.items())
- elif isinstance(obj, set):
- return set([self.to_object(o) for o in obj])
- elif isinstance(obj, list):
- return [self.to_object(o) for o in obj]
- else:
- return obj
-
-
-class _GraphSONTypeIO(object, metaclass=GraphSONTypeType):
- python_type = None
- graphson_type = None
-
- def dictify(self, obj, writer):
- raise NotImplementedError()
-
- def objectify(self, d, reader):
- raise NotImplementedError()
-
-
-class _BytecodeSerializer(_GraphSONTypeIO):
- @classmethod
- def _dictify_instructions(cls, instructions, writer):
- out = []
- for instruction in instructions:
- inst = [instruction[0]]
- inst.extend(writer.to_dict(arg) for arg in instruction[1:])
- out.append(inst)
- return out
-
- @classmethod
- def dictify(cls, bytecode, writer):
- if isinstance(bytecode, Traversal):
- bytecode = bytecode.bytecode
- out = {}
- if bytecode.source_instructions:
- out["source"] = cls._dictify_instructions(bytecode.source_instructions, writer)
- if bytecode.step_instructions:
- out["step"] = cls._dictify_instructions(bytecode.step_instructions, writer)
- return GraphSONUtil.typed_value("Bytecode", out)
-
-
-class TraversalSerializer(_BytecodeSerializer):
- python_type = Traversal
-
-
-class BytecodeSerializer(_BytecodeSerializer):
- python_type = Bytecode
-
-
-class VertexSerializer(_GraphSONTypeIO):
- python_type = Vertex
- graphson_type = "g:Vertex"
-
- @classmethod
- def dictify(cls, vertex, writer):
- return GraphSONUtil.typed_value("Vertex", {"id": writer.to_dict(vertex.id),
- "label": writer.to_dict(vertex.label)})
-
-
-class EdgeSerializer(_GraphSONTypeIO):
- python_type = Edge
- graphson_type = "g:Edge"
-
- @classmethod
- def dictify(cls, edge, writer):
- return GraphSONUtil.typed_value("Edge", {"id": writer.to_dict(edge.id),
- "outV": writer.to_dict(edge.outV.id),
- "outVLabel": writer.to_dict(edge.outV.label),
- "label": writer.to_dict(edge.label),
- "inV": writer.to_dict(edge.inV.id),
- "inVLabel": writer.to_dict(edge.inV.label)})
-
-
-class VertexPropertySerializer(_GraphSONTypeIO):
- python_type = VertexProperty
- graphson_type = "g:VertexProperty"
-
- @classmethod
- def dictify(cls, vertex_property, writer):
- return GraphSONUtil.typed_value("VertexProperty", {"id": writer.to_dict(vertex_property.id),
- "label": writer.to_dict(vertex_property.label),
- "value": writer.to_dict(vertex_property.value),
- "vertex": writer.to_dict(vertex_property.vertex.id)})
-
-
-class PropertySerializer(_GraphSONTypeIO):
- python_type = Property
- graphson_type = "g:Property"
-
- @classmethod
- def dictify(cls, property, writer):
- elementDict = writer.to_dict(property.element)
- if elementDict is not None:
- valueDict = elementDict["@value"]
- if "outVLabel" in valueDict:
- del valueDict["outVLabel"]
- if "inVLabel" in valueDict:
- del valueDict["inVLabel"]
- if "properties" in valueDict:
- del valueDict["properties"]
- if "value" in valueDict:
- del valueDict["value"]
- return GraphSONUtil.typed_value("Property", {"key": writer.to_dict(property.key),
- "value": writer.to_dict(property.value),
- "element": elementDict})
-
-
-class TraversalStrategySerializer(_GraphSONTypeIO):
- python_type = TraversalStrategy
-
- @classmethod
- def dictify(cls, strategy, writer):
- strat_dict = {}
- strat_dict["fqcn"] = strategy.fqcn
- strat_dict["conf"] = {}
- for key in strategy.configuration:
- strat_dict["conf"][key] = writer.to_dict(strategy.configuration[key])
- return GraphSONUtil.typed_value(strategy.strategy_name, strat_dict)
-
-
-class TraverserIO(_GraphSONTypeIO):
- python_type = Traverser
- graphson_type = "g:Traverser"
-
- @classmethod
- def dictify(cls, traverser, writer):
- return GraphSONUtil.typed_value("Traverser", {"value": writer.to_dict(traverser.object),
- "bulk": writer.to_dict(traverser.bulk)})
-
- @classmethod
- def objectify(cls, d, reader):
- return Traverser(reader.to_object(d["value"]),
- reader.to_object(d["bulk"]))
-
-
-class EnumSerializer(_GraphSONTypeIO):
- python_type = Enum
-
- @classmethod
- def dictify(cls, enum, _):
- return GraphSONUtil.typed_value(SymbolUtil.to_camel_case(type(enum).__name__),
- SymbolUtil.to_camel_case(str(enum.name)))
-
-
-class PSerializer(_GraphSONTypeIO):
- python_type = P
-
- @classmethod
- def dictify(cls, p, writer):
- out = {"predicate": p.operator,
- "value": [writer.to_dict(p.value), writer.to_dict(p.other)] if p.other is not None else
- writer.to_dict(p.value)}
- return GraphSONUtil.typed_value("P", out)
-
-
-class TextPSerializer(_GraphSONTypeIO):
- python_type = TextP
-
- @classmethod
- def dictify(cls, p, writer):
- out = {"predicate": p.operator,
- "value": [writer.to_dict(p.value), writer.to_dict(p.other)] if p.other is not None else
- writer.to_dict(p.value)}
- return GraphSONUtil.typed_value("TextP", out)
-
-
-class BindingSerializer(_GraphSONTypeIO):
- python_type = Binding
-
- @classmethod
- def dictify(cls, binding, writer):
- out = {"key": binding.key,
- "value": writer.to_dict(binding.value)}
- return GraphSONUtil.typed_value("Binding", out)
-
-
-class LambdaSerializer(_GraphSONTypeIO):
- python_type = FunctionType
-
- @classmethod
- def dictify(cls, lambda_object, writer):
- lambda_result = lambda_object()
- script = lambda_result if isinstance(lambda_result, str) else lambda_result[0]
- language = statics.default_lambda_language if isinstance(lambda_result, str) else lambda_result[1]
- out = {"script": script,
- "language": language}
- if language == "gremlin-groovy" and "->" in script:
- # if the user has explicitly added parameters to the groovy closure then we can easily detect one or two
- # arg lambdas - if we can't detect 1 or 2 then we just go with "unknown"
- args = script[0:script.find("->")]
- out["arguments"] = 2 if "," in args else 1
- else:
- out["arguments"] = -1
-
- return GraphSONUtil.typed_value("Lambda", out)
-
-
-class TypeSerializer(_GraphSONTypeIO):
- python_type = TypeType
-
- @classmethod
- def dictify(cls, typ, writer):
- return writer.to_dict(typ())
-
-
-class UUIDIO(_GraphSONTypeIO):
- python_type = uuid.UUID
- graphson_type = "g:UUID"
- graphson_base_type = "UUID"
-
- @classmethod
- def dictify(cls, obj, writer):
- return GraphSONUtil.typed_value(cls.graphson_base_type, str(obj))
-
- @classmethod
- def objectify(cls, d, reader):
- return cls.python_type(d)
-
-
-class DateIO(_GraphSONTypeIO):
- graphson_type = "g:Date"
- graphson_base_type = "Date"
-
- @classmethod
- def dictify(cls, obj, writer):
- try:
- timestamp_seconds = calendar.timegm(obj.utctimetuple())
- pts = timestamp_seconds * 1e3 + getattr(obj, 'microsecond', 0) / 1e3
- except AttributeError:
- pts = calendar.timegm(obj.timetuple()) * 1e3
-
- ts = int(round(pts))
- return GraphSONUtil.typed_value(cls.graphson_base_type, ts)
-
- @classmethod
- def objectify(cls, ts, reader):
- # Python timestamp expects seconds
- return datetime.datetime.utcfromtimestamp(ts / 1000.0)
-
-
-class OffsetDateTimeIO(_GraphSONTypeIO):
- python_type = datetime.datetime
- graphson_type = "gx:OffsetDateTime"
- graphson_base_type = "OffsetDateTime"
-
- @classmethod
- def dictify(cls, obj, writer):
- if obj.tzinfo is None:
- return DateIO.dictify(obj, writer)
- return GraphSONUtil.typed_value(cls.graphson_base_type, obj.isoformat(), "gx")
-
- @classmethod
- def objectify(cls, dt, reader):
- # specially handling as python isoformat does not support zulu until 3.11
- dt_iso = dt[:-1] + '+00:00' if dt.endswith('Z') else dt
- return datetime.datetime.fromisoformat(dt_iso)
-
-
-# Based on current implementation, this class must always be declared before FloatIO.
-# Seems pretty fragile for future maintainers. Maybe look into this.
-class TimestampIO(_GraphSONTypeIO):
- """A timestamp in Python is type float"""
- python_type = statics.timestamp
- graphson_type = "g:Timestamp"
- graphson_base_type = "Timestamp"
-
- @classmethod
- def dictify(cls, obj, writer):
- # Java timestamp expects milliseconds integer
- # Have to use int because of legacy Python
- ts = int(round(obj * 1000))
- return GraphSONUtil.typed_value(cls.graphson_base_type, ts)
-
- @classmethod
- def objectify(cls, ts, reader):
- # Python timestamp expects seconds
- return cls.python_type(ts / 1000.0)
-
-
-class _NumberIO(_GraphSONTypeIO):
- @classmethod
- def dictify(cls, n, writer):
- if isinstance(n, bool): # because isinstance(False, int) and isinstance(True, int)
- return n
- return GraphSONUtil.typed_value(cls.graphson_base_type, n)
-
- @classmethod
- def objectify(cls, v, _):
- return cls.python_type(v)
-
-
-class ListIO(_GraphSONTypeIO):
- python_type = ListType
- graphson_type = "g:List"
-
- @classmethod
- def dictify(cls, l, writer):
- new_list = []
- for obj in l:
- new_list.append(writer.to_dict(obj))
- return GraphSONUtil.typed_value("List", new_list)
-
- @classmethod
- def objectify(cls, l, reader):
- new_list = []
- for obj in l:
- new_list.append(reader.to_object(obj))
- return new_list
-
-
-class SetIO(_GraphSONTypeIO):
- python_type = SetType
- graphson_type = "g:Set"
-
- @classmethod
- def dictify(cls, s, writer):
- new_list = []
- for obj in s:
- new_list.append(writer.to_dict(obj))
- return GraphSONUtil.typed_value("Set", new_list)
-
- @classmethod
- def objectify(cls, s, reader):
- """
- By default, returns a python set
-
- In case Java returns numeric values of different types which
- python don't recognize, coerce and return a list.
- See comments of TINKERPOP-1844 for more details
- """
- new_list = [reader.to_object(obj) for obj in s]
- new_set = set(new_list)
- if len(new_list) != len(new_set):
- log.warning("Coercing g:Set to list due to java numeric values. "
- "See TINKERPOP-1844 for more details.")
- return new_list
-
- return new_set
-
-
-class MapType(_GraphSONTypeIO):
- python_type = DictType
- graphson_type = "g:Map"
-
- @classmethod
- def dictify(cls, d, writer):
- l = []
- for key in d:
- l.append(writer.to_dict(key))
- l.append(writer.to_dict(d[key]))
- return GraphSONUtil.typed_value("Map", l)
-
- @classmethod
- def objectify(cls, l, reader):
- new_dict = {}
- if len(l) > 0:
- x = 0
- while x < len(l):
- new_dict[HashableDict.of(reader.to_object(l[x]))] = reader.to_object(l[x + 1])
- x = x + 2
- return new_dict
-
-
-class BulkSetIO(_GraphSONTypeIO):
- graphson_type = "g:BulkSet"
-
- @classmethod
- def objectify(cls, l, reader):
- new_list = []
-
- # this approach basically mimics what currently existed in 3.3.4 and prior versions where BulkSet is
- # basically just coerced to list. the limitation here is that if the value of a bulk exceeds the size of
- # a list (into the long space) then stuff won't work nice.
- if len(l) > 0:
- x = 0
- while x < len(l):
- obj = reader.to_object(l[x])
- bulk = reader.to_object(l[x + 1])
- for y in range(bulk):
- new_list.append(obj)
- x = x + 2
- return new_list
-
-
-class FloatIO(_NumberIO):
- python_type = FloatType
- graphson_type = "g:Float"
- graphson_base_type = "Float"
-
- @classmethod
- def dictify(cls, n, writer):
- if isinstance(n, bool): # because isinstance(False, int) and isinstance(True, int)
- return n
- elif math.isnan(n):
- return GraphSONUtil.typed_value(cls.graphson_base_type, "NaN")
- elif math.isinf(n) and n > 0:
- return GraphSONUtil.typed_value(cls.graphson_base_type, "Infinity")
- elif math.isinf(n) and n < 0:
- return GraphSONUtil.typed_value(cls.graphson_base_type, "-Infinity")
- else:
- return GraphSONUtil.typed_value(cls.graphson_base_type, n)
-
- @classmethod
- def objectify(cls, v, _):
- if isinstance(v, str):
- if v == 'NaN':
- return float('nan')
- elif v == "Infinity":
- return float('inf')
- elif v == "-Infinity":
- return float('-inf')
-
- return cls.python_type(v)
-
-
-class BigDecimalIO(_NumberIO):
- python_type = Decimal
- graphson_type = "gx:BigDecimal"
- graphson_base_type = "BigDecimal"
-
- @classmethod
- def dictify(cls, n, writer):
- if isinstance(n, bool): # because isinstance(False, int) and isinstance(True, int)
- return n
- elif math.isnan(n):
- return GraphSONUtil.typed_value(cls.graphson_base_type, "NaN", "gx")
- elif math.isinf(n) and n > 0:
- return GraphSONUtil.typed_value(cls.graphson_base_type, "Infinity", "gx")
- elif math.isinf(n) and n < 0:
- return GraphSONUtil.typed_value(cls.graphson_base_type, "-Infinity", "gx")
- else:
- return GraphSONUtil.typed_value(cls.graphson_base_type, str(n), "gx")
-
- @classmethod
- def objectify(cls, v, _):
- if isinstance(v, str):
- if v == 'NaN':
- return Decimal('nan')
- elif v == "Infinity":
- return Decimal('inf')
- elif v == "-Infinity":
- return Decimal('-inf')
-
- return Decimal(v)
-
-
-class DoubleIO(FloatIO):
- graphson_type = "g:Double"
- graphson_base_type = "Double"
-
-
-class Int64IO(_NumberIO):
- python_type = LongType
- graphson_type = "g:Int64"
- graphson_base_type = "Int64"
-
- @classmethod
- def dictify(cls, n, writer):
- # if we exceed Java long range then we need a BigInteger
- if isinstance(n, bool):
- return n
- elif n < -9223372036854775808 or n > 9223372036854775807:
- return GraphSONUtil.typed_value("BigInteger", str(n), "gx")
- else:
- return GraphSONUtil.typed_value(cls.graphson_base_type, n)
-
-
-class BigIntegerIO(Int64IO):
- graphson_type = "gx:BigInteger"
-
-
-class Int32IO(Int64IO):
- python_type = IntType
- graphson_type = "g:Int32"
- graphson_base_type = "Int32"
-
- @classmethod
- def dictify(cls, n, writer):
- # if we exceed Java int range then we need a long
- if isinstance(n, bool):
- return n
- elif n < -9223372036854775808 or n > 9223372036854775807:
- return GraphSONUtil.typed_value("BigInteger", str(n), "gx")
- elif n < -2147483648 or n > 2147483647:
- return GraphSONUtil.typed_value("Int64", n)
- else:
- return GraphSONUtil.typed_value(cls.graphson_base_type, n)
-
-
-class Int16IO(Int64IO):
- python_type = ShortType
- graphson_type = "gx:Int16"
- graphson_base_type = "Int16"
-
- @classmethod
- def dictify(cls, n, writer):
- # if we exceed Java int range then we need a long
- if isinstance(n, bool):
- return n
- elif n < -9223372036854775808 or n > 9223372036854775807:
- return GraphSONUtil.typed_value("BigInteger", str(n), "gx")
- elif n < -2147483648 or n > 2147483647:
- return GraphSONUtil.typed_value("Int64", n)
- elif n < -32768 or n > 32767:
- return GraphSONUtil.typed_value("Int32", n)
- else:
- return GraphSONUtil.typed_value(cls.graphson_base_type, n, "gx")
-
- @classmethod
- def objectify(cls, v, _):
- return int.__new__(ShortType, v)
-
-
-class ByteIO(_NumberIO):
- python_type = SingleByte
- graphson_type = "gx:Byte"
- graphson_base_type = "Byte"
-
- @classmethod
- def dictify(cls, n, writer):
- if isinstance(n, bool): # because isinstance(False, int) and isinstance(True, int)
- return n
- return GraphSONUtil.typed_value(cls.graphson_base_type, n, "gx")
-
- @classmethod
- def objectify(cls, v, _):
- return int.__new__(SingleByte, v)
-
-
-class ByteBufferIO(_GraphSONTypeIO):
- python_type = ByteBufferType
- graphson_type = "gx:ByteBuffer"
- graphson_base_type = "ByteBuffer"
-
- @classmethod
- def dictify(cls, n, writer):
- return GraphSONUtil.typed_value(cls.graphson_base_type, "".join(chr(x) for x in n), "gx")
-
- @classmethod
- def objectify(cls, v, _):
- return cls.python_type(v, "utf8")
-
-
-class CharIO(_GraphSONTypeIO):
- python_type = SingleChar
- graphson_type = "gx:Char"
- graphson_base_type = "Char"
-
- @classmethod
- def dictify(cls, n, writer):
- return GraphSONUtil.typed_value(cls.graphson_base_type, n, "gx")
-
- @classmethod
- def objectify(cls, v, _):
- return str.__new__(SingleChar, v)
-
-
-class DurationIO(_GraphSONTypeIO):
- python_type = timedelta
- graphson_type = "gx:Duration"
- graphson_base_type = "Duration"
-
- @classmethod
- def dictify(cls, n, writer):
- return GraphSONUtil.typed_value(cls.graphson_base_type, duration_isoformat(n), "gx")
-
- @classmethod
- def objectify(cls, v, _):
- return parse_duration(v)
-
-
-class VertexDeserializer(_GraphSONTypeIO):
- graphson_type = "g:Vertex"
-
- @classmethod
- def objectify(cls, d, reader):
- properties = None
- if "properties" in d:
- properties = reader.to_object(d["properties"])
- if properties is not None:
- properties = [item for sublist in properties.values() for item in sublist]
- return Vertex(reader.to_object(d["id"]), d.get("label", "vertex"), properties)
-
-
-class EdgeDeserializer(_GraphSONTypeIO):
- graphson_type = "g:Edge"
-
- @classmethod
- def objectify(cls, d, reader):
- properties = None
- if "properties" in d:
- properties = reader.to_object(d["properties"])
- if properties is not None:
- properties = list(properties.values())
- return Edge(reader.to_object(d["id"]),
- Vertex(reader.to_object(d["outV"]), d.get("outVLabel", "vertex")),
- d.get("label", "edge"),
- Vertex(reader.to_object(d["inV"]), d.get("inVLabel", "vertex")),
- properties)
-
-
-class VertexPropertyDeserializer(_GraphSONTypeIO):
- graphson_type = "g:VertexProperty"
-
- @classmethod
- def objectify(cls, d, reader):
- properties = None
- if "properties" in d:
- properties = reader.to_object(d["properties"])
- if properties is not None:
- properties = list(map(lambda x: Property(x[0], x[1], None), properties.items()))
- vertex = Vertex(reader.to_object(d.get("vertex"))) if "vertex" in d else None
- return VertexProperty(reader.to_object(d["id"]),
- d["label"],
- reader.to_object(d["value"]),
- vertex,
- properties)
-
-
-class PropertyDeserializer(_GraphSONTypeIO):
- graphson_type = "g:Property"
-
- @classmethod
- def objectify(cls, d, reader):
- element = reader.to_object(d["element"]) if "element" in d else None
- return Property(d["key"], reader.to_object(d["value"]), element)
-
-
-class PathDeserializer(_GraphSONTypeIO):
- graphson_type = "g:Path"
-
- @classmethod
- def objectify(cls, d, reader):
- return Path(reader.to_object(d["labels"]), reader.to_object(d["objects"]))
-
-
-class TDeserializer(_GraphSONTypeIO):
- graphson_type = "g:T"
-
- @classmethod
- def objectify(cls, d, reader):
- return T[d]
-
-
-class DirectionIO(_GraphSONTypeIO):
- graphson_type = "g:Direction"
- graphson_base_type = "Direction"
- python_type = Direction
-
- @classmethod
- def dictify(cls, d, writer):
- return GraphSONUtil.typed_value(cls.graphson_base_type, d.name, "g")
-
- @classmethod
- def objectify(cls, d, reader):
- return Direction[d]
-
-
-class TraversalMetricsDeserializer(_GraphSONTypeIO):
- graphson_type = "g:TraversalMetrics"
-
- @classmethod
- def objectify(cls, d, reader):
- return reader.to_object(d)
-
-
-class MetricsDeserializer(_GraphSONTypeIO):
- graphson_type = "g:Metrics"
-
- @classmethod
- def objectify(cls, d, reader):
- return reader.to_object(d)
diff --git a/gremlin-python/src/main/python/gremlin_python/structure/io/graphsonV4.py b/gremlin-python/src/main/python/gremlin_python/structure/io/graphsonV4.py
new file mode 100644
index 0000000..438c5d4
--- /dev/null
+++ b/gremlin-python/src/main/python/gremlin_python/structure/io/graphsonV4.py
@@ -0,0 +1,588 @@
+# 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.
+import base64
+import calendar
+import datetime
+import json
+import uuid
+import math
+from collections import OrderedDict
+from decimal import *
+import logging
+from datetime import timedelta
+
+from aenum import Enum
+from isodate import parse_duration, duration_isoformat
+
+from gremlin_python import statics
+from gremlin_python.statics import FloatType, BigDecimal, ShortType, IntType, LongType, TypeType, DictType, ListType, SetType, SingleByte, SingleChar, to_bigdecimal
+from gremlin_python.process.traversal import Direction, P, TextP, Traversal, Traverser, TraversalStrategy, T
+from gremlin_python.structure.graph import Edge, Property, Vertex, VertexProperty, Path
+from gremlin_python.structure.io.util import HashableDict, SymbolUtil
+
+log = logging.getLogger(__name__)
+
+# When we fall back to a superclass's serializer, we iterate over this map.
+# We want that iteration order to be consistent, so we use an OrderedDict,
+# not a dict.
+_serializers = OrderedDict()
+_deserializers = {}
+
+
+class GraphSONTypeType(type):
+ def __new__(mcs, name, bases, dct):
+ cls = super(GraphSONTypeType, mcs).__new__(mcs, name, bases, dct)
+ if not name.startswith('_'):
+ if cls.python_type:
+ _serializers[cls.python_type] = cls
+ if cls.graphson_type:
+ _deserializers[cls.graphson_type] = cls
+ return cls
+
+
+class GraphSONUtil(object):
+ TYPE_KEY = "@type"
+ VALUE_KEY = "@value"
+
+ @classmethod
+ def typed_value(cls, type_name, value, prefix="g"):
+ out = {cls.TYPE_KEY: cls.format_type(prefix, type_name)}
+ if value is not None:
+ out[cls.VALUE_KEY] = value
+ return out
+
+ @classmethod
+ def format_type(cls, prefix, type_name):
+ return "%s:%s" % (prefix, type_name)
+
+
+# Read/Write classes split to follow precedence of the Java API
+class GraphSONWriter(object):
+ def __init__(self, serializer_map=None):
+ """
+ :param serializer_map: map from Python type to serializer instance implementing `dictify`
+ """
+ self.serializers = _serializers.copy()
+ if serializer_map:
+ self.serializers.update(serializer_map)
+
+ def write_object(self, objectData):
+ # to JSON
+ return json.dumps(self.to_dict(objectData), separators=(',', ':'))
+
+ def to_dict(self, obj):
+ """
+ Encodes python objects in GraphSON type-tagged dict values
+ """
+ try:
+ return self.serializers[type(obj)].dictify(obj, self)
+ except KeyError:
+ for key, serializer in self.serializers.items():
+ if isinstance(obj, key):
+ return serializer.dictify(obj, self)
+
+ if isinstance(obj, dict):
+ return dict((self.to_dict(k), self.to_dict(v)) for k, v in obj.items())
+ elif isinstance(obj, set):
+ return set([self.to_dict(o) for o in obj])
+ elif isinstance(obj, list):
+ return [self.to_dict(o) for o in obj]
+ else:
+ return obj
+
+
+class GraphSONReader(object):
+ def __init__(self, deserializer_map=None):
+ """
+ :param deserializer_map: map from GraphSON type tag to deserializer instance implementing `objectify`
+ """
+ self.deserializers = _deserializers.copy()
+ if deserializer_map:
+ self.deserializers.update(deserializer_map)
+
+ def read_object(self, json_data):
+ # from JSON
+ return self.to_object(json.loads(json_data))
+
+ def to_object(self, obj):
+ """
+ Unpacks GraphSON type-tagged dict values into objects mapped in self.deserializers
+ """
+ if isinstance(obj, dict):
+ try:
+ return self.deserializers[obj[GraphSONUtil.TYPE_KEY]].objectify(obj[GraphSONUtil.VALUE_KEY], self)
+ except KeyError:
+ pass
+ return dict((self.to_object(k), self.to_object(v)) for k, v in obj.items())
+ elif isinstance(obj, set):
+ return set([self.to_object(o) for o in obj])
+ elif isinstance(obj, list):
+ return [self.to_object(o) for o in obj]
+ else:
+ return obj
+
+
+class _GraphSONTypeIO(object, metaclass=GraphSONTypeType):
+ python_type = None
+ graphson_type = None
+
+ def dictify(self, obj, writer):
+ raise NotImplementedError()
+
+ def objectify(self, d, reader):
+ raise NotImplementedError()
+
+
+class VertexSerializer(_GraphSONTypeIO):
+ python_type = Vertex
+ graphson_type = "g:Vertex"
+
+ @classmethod
+ def dictify(cls, vertex, writer):
+ return GraphSONUtil.typed_value("Vertex", {"id": writer.to_dict(vertex.id),
+ "label": [writer.to_dict(vertex.label)]})
+
+
+class EdgeSerializer(_GraphSONTypeIO):
+ python_type = Edge
+ graphson_type = "g:Edge"
+
+ @classmethod
+ def dictify(cls, edge, writer):
+ return GraphSONUtil.typed_value("Edge", {"id": writer.to_dict(edge.id),
+ "label": [writer.to_dict(edge.label)],
+ "inV": {
+ "id": writer.to_dict(edge.inV.id),
+ "label": [writer.to_dict(edge.inV.label)]
+ },
+ "outV": {
+ "id": writer.to_dict(edge.outV.id),
+ "label": [writer.to_dict(edge.outV.label)]
+ }})
+
+
+class VertexPropertySerializer(_GraphSONTypeIO):
+ python_type = VertexProperty
+ graphson_type = "g:VertexProperty"
+
+ @classmethod
+ def dictify(cls, vertex_property, writer):
+ return GraphSONUtil.typed_value("VertexProperty", {"id": writer.to_dict(vertex_property.id),
+ "label": [writer.to_dict(vertex_property.label)],
+ "value": writer.to_dict(vertex_property.value)})
+
+
+class PropertySerializer(_GraphSONTypeIO):
+ python_type = Property
+ graphson_type = "g:Property"
+
+ @classmethod
+ def dictify(cls, property, writer):
+ return GraphSONUtil.typed_value("Property", {"key": writer.to_dict(property.key),
+ "value": writer.to_dict(property.value)})
+
+
+class UUIDIO(_GraphSONTypeIO):
+ python_type = uuid.UUID
+ graphson_type = "g:UUID"
+ graphson_base_type = "UUID"
+
+ @classmethod
+ def dictify(cls, obj, writer):
+ return GraphSONUtil.typed_value(cls.graphson_base_type, str(obj))
+
+ @classmethod
+ def objectify(cls, d, reader):
+ return cls.python_type(d)
+
+
+class DateTimeIO(_GraphSONTypeIO):
+ python_type = datetime.datetime
+ graphson_type = "g:DateTime"
+ graphson_base_type = "DateTime"
+
+ @classmethod
+ def dictify(cls, obj, writer):
+ if obj.tzinfo is None:
+ raise AttributeError("Timezone information is required when constructing datetime")
+ return GraphSONUtil.typed_value(cls.graphson_base_type, obj.isoformat())
+
+ @classmethod
+ def objectify(cls, dt, reader):
+ # specially handling as python isoformat does not support zulu until 3.11
+ dt_iso = dt[:-1] + '+00:00' if dt.endswith('Z') else dt
+ return datetime.datetime.fromisoformat(dt_iso)
+
+
+class _NumberIO(_GraphSONTypeIO):
+ @classmethod
+ def dictify(cls, n, writer):
+ if isinstance(n, bool): # because isinstance(False, int) and isinstance(True, int)
+ return n
+ return GraphSONUtil.typed_value(cls.graphson_base_type, n)
+
+ @classmethod
+ def objectify(cls, v, _):
+ return cls.python_type(v)
+
+
+class ListIO(_GraphSONTypeIO):
+ python_type = ListType
+ graphson_type = "g:List"
+
+ @classmethod
+ def dictify(cls, l, writer):
+ new_list = []
+ for obj in l:
+ new_list.append(writer.to_dict(obj))
+ return GraphSONUtil.typed_value("List", new_list)
+
+ @classmethod
+ def objectify(cls, l, reader):
+ new_list = []
+ for obj in l:
+ new_list.append(reader.to_object(obj))
+ return new_list
+
+
+class SetIO(_GraphSONTypeIO):
+ python_type = SetType
+ graphson_type = "g:Set"
+
+ @classmethod
+ def dictify(cls, s, writer):
+ new_list = []
+ for obj in s:
+ new_list.append(writer.to_dict(obj))
+ return GraphSONUtil.typed_value("Set", new_list)
+
+ @classmethod
+ def objectify(cls, s, reader):
+ """
+ By default, returns a python set
+
+ In case Java returns numeric values of different types which
+ python don't recognize, coerce and return a list.
+ See comments of TINKERPOP-1844 for more details
+ """
+ new_list = [reader.to_object(obj) for obj in s]
+ new_set = set(new_list)
+ if len(new_list) != len(new_set):
+ log.warning("Coercing g:Set to list due to java numeric values. "
+ "See TINKERPOP-1844 for more details.")
+ return new_list
+
+ return new_set
+
+
+class MapType(_GraphSONTypeIO):
+ python_type = DictType
+ graphson_type = "g:Map"
+
+ @classmethod
+ def dictify(cls, d, writer):
+ l = []
+ for key in d:
+ l.append(writer.to_dict(key))
+ l.append(writer.to_dict(d[key]))
+ return GraphSONUtil.typed_value("Map", l)
+
+ @classmethod
+ def objectify(cls, l, reader):
+ new_dict = {}
+ if len(l) > 0:
+ x = 0
+ while x < len(l):
+ new_dict[HashableDict.of(reader.to_object(l[x]))] = reader.to_object(l[x + 1])
+ x = x + 2
+ return new_dict
+
+
+class FloatIO(_NumberIO):
+ python_type = FloatType
+ graphson_type = "g:Float"
+ graphson_base_type = "Float"
+
+ @classmethod
+ def dictify(cls, n, writer):
+ if isinstance(n, bool): # because isinstance(False, int) and isinstance(True, int)
+ return n
+ elif math.isnan(n):
+ return GraphSONUtil.typed_value(cls.graphson_base_type, "NaN")
+ elif math.isinf(n) and n > 0:
+ return GraphSONUtil.typed_value(cls.graphson_base_type, "Infinity")
+ elif math.isinf(n) and n < 0:
+ return GraphSONUtil.typed_value(cls.graphson_base_type, "-Infinity")
+ else:
+ return GraphSONUtil.typed_value(cls.graphson_base_type, n)
+
+ @classmethod
+ def objectify(cls, v, _):
+ if isinstance(v, str):
+ if v == 'NaN':
+ return float('nan')
+ elif v == "Infinity":
+ return float('inf')
+ elif v == "-Infinity":
+ return float('-inf')
+
+ return cls.python_type(v)
+
+
+class BigDecimalIO(_GraphSONTypeIO):
+ python_type = BigDecimal
+ graphson_type = "g:BigDecimal"
+ graphson_base_type = "BigDecimal"
+
+ @classmethod
+ def dictify(cls, n, writer):
+ return GraphSONUtil.typed_value(cls.graphson_base_type, str(n.value), "g")
+
+ @classmethod
+ def objectify(cls, v, _):
+ return to_bigdecimal(v)
+
+
+class DoubleIO(FloatIO):
+ graphson_type = "g:Double"
+ graphson_base_type = "Double"
+
+
+class Int64IO(_NumberIO):
+ python_type = LongType
+ graphson_type = "g:Int64"
+ graphson_base_type = "Int64"
+
+ @classmethod
+ def dictify(cls, n, writer):
+ # if we exceed Java long range then we need a BigInteger
+ if isinstance(n, bool):
+ return n
+ elif n < -9223372036854775808 or n > 9223372036854775807:
+ return GraphSONUtil.typed_value("BigInteger", str(n), "g")
+ else:
+ return GraphSONUtil.typed_value(cls.graphson_base_type, n)
+
+
+class BigIntegerIO(Int64IO):
+ graphson_type = "g:BigInteger"
+
+
+class Int32IO(Int64IO):
+ python_type = IntType
+ graphson_type = "g:Int32"
+ graphson_base_type = "Int32"
+
+ @classmethod
+ def dictify(cls, n, writer):
+ # if we exceed Java int range then we need a long
+ if isinstance(n, bool):
+ return n
+ elif n < -9223372036854775808 or n > 9223372036854775807:
+ return GraphSONUtil.typed_value("BigInteger", str(n), "g")
+ elif n < -2147483648 or n > 2147483647:
+ return GraphSONUtil.typed_value("Int64", n)
+ else:
+ return GraphSONUtil.typed_value(cls.graphson_base_type, n)
+
+
+class Int16IO(Int64IO):
+ python_type = ShortType
+ graphson_type = "g:Int16"
+ graphson_base_type = "Int16"
+
+ @classmethod
+ def dictify(cls, n, writer):
+ # if we exceed Java int range then we need a long
+ if isinstance(n, bool):
+ return n
+ elif n < -9223372036854775808 or n > 9223372036854775807:
+ return GraphSONUtil.typed_value("BigInteger", str(n), "g")
+ elif n < -2147483648 or n > 2147483647:
+ return GraphSONUtil.typed_value("Int64", n)
+ elif n < -32768 or n > 32767:
+ return GraphSONUtil.typed_value("Int32", n)
+ else:
+ return GraphSONUtil.typed_value(cls.graphson_base_type, n, "g")
+
+ @classmethod
+ def objectify(cls, v, _):
+ return int.__new__(ShortType, v)
+
+
+class ByteIO(_NumberIO):
+ python_type = SingleByte
+ graphson_type = "g:Byte"
+ graphson_base_type = "Byte"
+
+ @classmethod
+ def dictify(cls, n, writer):
+ if isinstance(n, bool): # because isinstance(False, int) and isinstance(True, int)
+ return n
+ return GraphSONUtil.typed_value(cls.graphson_base_type, n, "g")
+
+ @classmethod
+ def objectify(cls, v, _):
+ return int.__new__(SingleByte, v)
+
+
+class BinaryIO(_GraphSONTypeIO):
+ python_type = bytes
+ graphson_type = "g:Binary"
+ graphson_base_type = "Binary"
+
+ @classmethod
+ def dictify(cls, n, writer):
+ # writes a JSON String containing base64-encoded bytes
+ n_encoded = "".join(chr(x) for x in base64.b64encode(n))
+ return GraphSONUtil.typed_value(cls.graphson_base_type, n_encoded, "g")
+
+ @classmethod
+ def objectify(cls, v, _):
+ return base64.b64decode(v)
+
+
+class CharIO(_GraphSONTypeIO):
+ python_type = SingleChar
+ graphson_type = "g:Char"
+ graphson_base_type = "Char"
+
+ @classmethod
+ def dictify(cls, n, writer):
+ return GraphSONUtil.typed_value(cls.graphson_base_type, n, "g")
+
+ @classmethod
+ def objectify(cls, v, _):
+ return str.__new__(SingleChar, v)
+
+
+class DurationIO(_GraphSONTypeIO):
+ python_type = timedelta
+ graphson_type = "g:Duration"
+ graphson_base_type = "Duration"
+
+ @classmethod
+ def dictify(cls, n, writer):
+ n_iso = duration_isoformat(n)
+ return GraphSONUtil.typed_value(cls.graphson_base_type, n_iso[:-2] + 'T0S' if n_iso.endswith('0D') else n_iso, "g")
+
+ @classmethod
+ def objectify(cls, v, _):
+ return parse_duration(v)
+
+
+class VertexDeserializer(_GraphSONTypeIO):
+ graphson_type = "g:Vertex"
+
+ @classmethod
+ def objectify(cls, d, reader):
+ properties = None
+ if "properties" in d:
+ properties = reader.to_object(d["properties"])
+ if properties is not None:
+ properties = [item for sublist in properties.values() for item in sublist]
+ label = d.get("label", "vertex")
+ return Vertex(reader.to_object(d["id"]), label if isinstance(label, str) else label[0], properties)
+
+
+class EdgeDeserializer(_GraphSONTypeIO):
+ graphson_type = "g:Edge"
+
+ @classmethod
+ def objectify(cls, d, reader):
+ properties = None
+ if "properties" in d:
+ properties = reader.to_object(d["properties"])
+ if properties is not None:
+ properties = [item for sublist in properties.values() for item in sublist]
+
+ return Edge(reader.to_object(d["id"]),
+ Vertex(reader.to_object(d["outV"]).get("id"), reader.to_object(d["outV"]).get("label")[0]),
+ d.get("label", "edge")[0],
+ Vertex(reader.to_object(d["inV"]).get("id"), reader.to_object(d["outV"]).get("label")[0]),
+ properties)
+
+
+class VertexPropertyDeserializer(_GraphSONTypeIO):
+ graphson_type = "g:VertexProperty"
+
+ @classmethod
+ def objectify(cls, d, reader):
+ properties = None
+ if "properties" in d:
+ properties = reader.to_object(d["properties"])
+ if properties is not None:
+ properties = list(map(lambda x: Property(x[0], x[1], None), properties.items()))
+ vertex = Vertex(reader.to_object(d.get("vertex"))) if "vertex" in d else None
+ return VertexProperty(reader.to_object(d["id"]),
+ d["label"][0],
+ reader.to_object(d["value"]),
+ vertex,
+ properties)
+
+
+class PropertyDeserializer(_GraphSONTypeIO):
+ graphson_type = "g:Property"
+
+ @classmethod
+ def objectify(cls, d, reader):
+ element = reader.to_object(d["element"]) if "element" in d else None
+ return Property(d["key"], reader.to_object(d["value"]), element)
+
+
+class PathDeserializer(_GraphSONTypeIO):
+ graphson_type = "g:Path"
+
+ @classmethod
+ def objectify(cls, d, reader):
+ return Path(reader.to_object(d["labels"]), reader.to_object(d["objects"]))
+
+
+class TIO(_GraphSONTypeIO):
+ graphson_type = "g:T"
+ graphson_base_type = "T"
+ python_type = T
+
+ @classmethod
+ def dictify(cls, t, writer):
+ return GraphSONUtil.typed_value(cls.graphson_base_type, t.name, "g")
+ @classmethod
+ def objectify(cls, d, reader):
+ return T[d]
+
+
+class DirectionIO(_GraphSONTypeIO):
+ graphson_type = "g:Direction"
+ graphson_base_type = "Direction"
+ python_type = Direction
+
+ @classmethod
+ def dictify(cls, d, writer):
+ return GraphSONUtil.typed_value(cls.graphson_base_type, d.name, "g")
+
+ @classmethod
+ def objectify(cls, d, reader):
+ return Direction[d]
+
+
+class EnumSerializer(_GraphSONTypeIO):
+ python_type = Enum
+
+ @classmethod
+ def dictify(cls, enum, _):
+ return GraphSONUtil.typed_value(SymbolUtil.to_camel_case(type(enum).__name__),
+ SymbolUtil.to_camel_case(str(enum.name)))
diff --git a/gremlin-python/src/main/python/gremlin_python/structure/io/util.py b/gremlin-python/src/main/python/gremlin_python/structure/io/util.py
index 2660e9a..d0af103 100644
--- a/gremlin-python/src/main/python/gremlin_python/structure/io/util.py
+++ b/gremlin-python/src/main/python/gremlin_python/structure/io/util.py
@@ -16,6 +16,9 @@
# under the License.
import re
+from threading import Lock
+
+from gremlin_python.statics import SingleByte
class SymbolUtil:
@@ -58,3 +61,38 @@
new_o[k] = cls.of(v)
return new_o
+
+# referenced python singleton from https://refactoring.guru/design-patterns/singleton/python/example#example-1--main-py,
+# might need some refactoring
+class SingletonMeta(type):
+
+ _instances = {}
+ _lock: Lock = Lock()
+
+ def __call__(cls, *args, **kwargs):
+ with cls._lock:
+ if cls not in cls._instances:
+ instance = super().__call__(*args, **kwargs)
+ cls._instances[cls] = instance
+ return cls._instances[cls]
+
+
+class Marker(metaclass=SingletonMeta):
+ _value: SingleByte
+
+ def __init__(self, value: SingleByte) -> None:
+ self._value = value
+
+ @staticmethod
+ def end_of_stream():
+ return Marker(SingleByte(0))
+
+ def get_value(self):
+ return self._value
+
+ @classmethod
+ def of(cls, val):
+ if val != 0:
+ raise ValueError
+ return cls.end_of_stream()
+
diff --git a/gremlin-python/src/main/python/radish/feature_steps.py b/gremlin-python/src/main/python/radish/feature_steps.py
index 26c3aca..5567d47 100644
--- a/gremlin-python/src/main/python/radish/feature_steps.py
+++ b/gremlin-python/src/main/python/radish/feature_steps.py
@@ -26,20 +26,50 @@
from gremlin_python.process.anonymous_traversal import traversal
from gremlin_python.process.graph_traversal import __
from gremlin_python.process.traversal import Barrier, Cardinality, P, TextP, Pop, Scope, Column, Order, Direction, T, \
- Pick, Operator, IO, WithOptions, Merge
+ Pick, Operator, IO, WithOptions, Merge, GValue, GremlinLang
from radish import given, when, then, world
from hamcrest import *
-outV = __.outV
+outV = __.out_v
label = __.label
-inV = __.inV
+inV = __.in_v
project = __.project
tail = __.tail
ignores = [
"g.V().choose(has(T.label, \"person\"),values(\"age\").groupCount(\"a\"), values(\"name\").groupCount(\"b\")).cap(\"a\", \"b\").unfold()", # uses embedded Map in assertion
"g.withSideEffect(\"x\",{}).V().both().both().sideEffect(__.store(\"x\").by(\"name\")).cap(\"x\").unfold()", # Objects must be both of Map or Collection: a=LinkedHashMap b=BulkSet???
- "g.withSack(10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000n, Operator.assign).V().local(__.out(\"knows\").barrier(Barrier.normSack)).in(\"knows\").barrier().sack()" # issues with BigInteger/BigDecimal - why do we carry BigDecimal? just use python Decimal module?
+ 'g.withSack(10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000n, Operator.assign).V().local(__.out("knows").barrier(Barrier.normSack)).in("knows").barrier().sack()', # issues with BigInteger/BigDecimal - why do we carry BigDecimal? just use python Decimal module?
+ "g.withSack(2).V().sack(Operator.div).by(__.constant(xx1)).sack()", # issues with BigInteger/BigDecimal - why do we carry BigDecimal? just use python Decimal module?
+ ## The following section has queries that aren't supported by gremlin-lang parameters
+ 'g.V().branch(l1).option("a", __.values("age")).option("b", __.values("lang")).option("b", __.values("name"))',
+ 'g.V().choose(pred1, __.out("knows"), __.in("created")).values("name")',
+ 'g.V().repeat(__.both()).until(pred1).groupCount().by("name")',
+ 'g.V().both().properties("name").order().by(c1).dedup().value()',
+ 'g.V().filter(pred1)',
+ 'g.V(vid1).filter(pred1)',
+ 'g.V(vid2).filter(pred1)',
+ 'g.V(vid1).out().filter(pred1)',
+ 'g.E().filter(pred1)',
+ 'g.V().out("created").has("name", __.map(l1).is(P.gt(3))).values("name")',
+ 'g.V(vid1).map(l1)',
+ 'g.V(vid1).outE().label().map(l1)',
+ 'g.V(vid1).out().map(l1).map(l2)',
+ 'g.withPath().V().as("a").out().map(l1)',
+ 'g.withPath().V().as("a").out().out().map(l1)',
+ 'g.V().values("name").order().by(c1).by(c2)',
+ 'g.V().order().by("name", c1).by("name", c2).values("name")',
+ 'g.V().hasLabel("person").order().by(l1, Order.desc).values("name")',
+ 'g.V(v1).hasLabel("person").map(l1).order(Scope.local).by(Column.values, Order.desc).by(Column.keys, Order.asc)',
+ 'g.V().valueMap().unfold().map(l1)',
+ 'g.E(e11)',
+ 'g.E(e7,e11)',
+ 'g.E(xx1)',
+ 'g.withSideEffect("a", xx1).V().both().values("name").aggregate(Scope.local,"a").cap("a")',
+ 'g.V().group().by(l1).by(__.constant(1))',
+ 'g.V(vid1).out().values("name").inject("daniel").as("a").map(l1).path()',
+ 'g.V().group("a").by(l1).by(__.constant(1)).cap("a")',
+ 'g.withSideEffect("a", xx1).V().both().values("name").store("a").cap("a")',
]
@@ -54,11 +84,15 @@
if not step.context.ignore:
step.context.ignore = "StepTree" in tagset
+ # TINKERPOP-3055
+ if not step.context.ignore:
+ step.context.ignore = "WithReservedKeysVerificationStrategy" in tagset
+
if (step.context.ignore):
return
step.context.graph_name = graph_name
- step.context.g = traversal().with_(step.context.remote_conn[graph_name])
+ step.context.g = traversal().with_(step.context.remote_conn[graph_name]).with_('language', 'gremlin-lang')
@given("the graph initializer of")
@@ -71,7 +105,7 @@
# just be sure that the traversal returns something to prove that it worked to some degree. probably
# is overkill to try to assert the complete success of this init operation. presumably the test
# suite would fail elsewhere if this didn't work which would help identify a problem.
- result = t.toList()
+ result = t.to_list()
assert len(result) > 0
@@ -107,29 +141,30 @@
def translate_traversal(step):
if step.context.ignore == False:
step.context.ignore = step.text in ignores
-
- # after backport of strategy construction improvements from master, there are now test failures (not currently
- # running GLV tests on master) - TINKERPOP-3055
- if step.context.ignore == False:
- step.context.ignore = "withoutStrategies" in step.text
- if step.context.ignore == False:
- step.context.ignore = "withStrategies" in step.text
-
if step.context.ignore:
return
- p = step.context.traversal_params if hasattr(step.context, "traversal_params") else {}
- localg = step.context.g
+ p = {}
+ if hasattr(step.context, "traversal_params"):
+ # user flag "parameterize", when set to 'true' will use GValue to parameterize parameters instead of flattening them out into string
+ if world.config.user_data.get("parameterize"):
+ for k, v in step.context.traversal_params.items():
+ p[k] = GValue(k, v)
+ else:
+ p = step.context.traversal_params
+ localg = step.context.g.with_('language', 'gremlin-lang')
tagset = [tag.name for tag in step.all_tags]
if "GraphComputerOnly" in tagset:
- localg = step.context.g.withComputer()
+ localg = step.context.g.with_('language', 'gremlin-lang').with_computer()
p['g'] = localg
step.context.traversal = step.context.traversals.pop(0)(**p)
if hasattr(step.context, "traversal_side_effects"):
+ gremlin_lang = GremlinLang()
for key in step.context.traversal_side_effects:
- step.context.traversal.bytecode.add_source("withSideEffect", key, step.context.traversal_side_effects[key])
+ gremlin_lang.add_source("withSideEffect", key, step.context.traversal_side_effects[key])
+ step.context.traversal.gremlin_lang.gremlin = gremlin_lang.gremlin + step.context.traversal.gremlin_lang.gremlin # prepend the side effects to the query
@when("iterated to list")
@@ -138,7 +173,7 @@
return
try:
- step.context.result = list(map(lambda x: _convert_results(x), step.context.traversal.toList()))
+ step.context.result = list(map(lambda x: _convert_results(x), step.context.traversal.to_list()))
step.context.failed = False
step.context.failed_message = ''
except Exception as e:
@@ -162,7 +197,7 @@
@then("the traversal will raise an error")
def raise_an_error(step):
- if step.context.ignore:
+ if (step.context.ignore):
return
assert_that(step.context.failed, equal_to(True))
@@ -170,17 +205,17 @@
@then("the traversal will raise an error with message {comparison:w} text of {expected_message:QuotedString}")
def raise_an_error_with_message(step, comparison, expected_message):
- if step.context.ignore:
+ if (step.context.ignore):
return
assert_that(step.context.failed, equal_to(True))
if comparison == "containing":
- assert_that(step.context.failed_message, contains_string(expected_message))
+ assert_that(step.context.failed_message.upper(), contains_string(expected_message.upper()))
elif comparison == "ending":
- assert_that(step.context.failed_message, ends_with(expected_message))
+ assert_that(step.context.failed_message.upper(), ends_with(expected_message.upper()))
elif comparison == "starting":
- assert_that(step.context.failed_message, starts_with(expected_message))
+ assert_that(step.context.failed_message.upper(), starts_with(expected_message.upper()))
else:
raise ValueError("unknown comparison '" + comparison + "'- must be: containing, ending or starting")
diff --git a/gremlin-python/src/main/python/radish/gremlin.py b/gremlin-python/src/main/python/radish/gremlin.py
index 4ce9a1a..1704925 100644
--- a/gremlin-python/src/main/python/radish/gremlin.py
+++ b/gremlin-python/src/main/python/radish/gremlin.py
@@ -294,6 +294,7 @@
'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))],
'g_V_hasIdXmarkovar_vadasvarX': [(lambda g, vid2=None,vid1=None:g.V().has_id(vid1, vid2))],
+ 'g_V_hasIdXmarkovar_vadasvar_petervarX': [(lambda g, vid2=None,vid1=None:g.V().has_id(vid1, vid2))],
'g_V_hasIdX2AsString_nullX': [(lambda g, vid2=None:g.V().has_id(vid2, None))],
'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))],
@@ -457,57 +458,57 @@
'g_V_asXnX_whereXorXselectXnX_hasLabelXsoftwareX_selectXnX_hasLabelXpersonXXX_selectXnX_byXnameX': [(lambda g:g.V().as_('n').where(__.or_(__.select('n').has_label('software'), __.select('n').has_label('person'))).select('n').by('name'))],
'g_V_hasLabelXpersonX_asXxX_whereXinEXknowsX_count_isXgteX1XXX_selectXxX': [(lambda g:g.V().has_label('person').as_('x').where(__.in_e('knows').count().is_(P.gte(1))).select('x'))],
'g_withStrategiesXAdjacentToIncidentStrategyX_V': [(lambda g:g.with_strategies(AdjacentToIncidentStrategy()).V())],
- 'g_withoutStrategiesXAdjacentToIncidentStrategyX_V': [(lambda g:g.without_strategies(*[GremlinType('org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.AdjacentToIncidentStrategy')]).V())],
+ 'g_withoutStrategiesXAdjacentToIncidentStrategyX_V': [(lambda g:g.without_strategies(AdjacentToIncidentStrategy).V())],
'g_withStrategiesXAdjacentToIncidentStrategyX_V_out_count': [(lambda g:g.with_strategies(AdjacentToIncidentStrategy()).V().out().count())],
'g_withStrategiesXAdjacentToIncidentStrategyX_V_whereXoutX': [(lambda g:g.with_strategies(AdjacentToIncidentStrategy()).V().where(__.out()))],
'g_withStrategiesXByModulatorOptimizationStrategyX_V_order_byXvaluesXnameXX': [(lambda g:g.with_strategies(ByModulatorOptimizationStrategy()).V().order().by(__.values('name')))],
- 'g_withoutStrategiesXByModulatorOptimizationStrategyX_V_order_byXvaluesXnameXX': [(lambda g:g.without_strategies(*[GremlinType('org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.ByModulatorOptimizationStrategy')]).V().order().by(__.values('name')))],
+ 'g_withoutStrategiesXByModulatorOptimizationStrategyX_V_order_byXvaluesXnameXX': [(lambda g:g.without_strategies(ByModulatorOptimizationStrategy).V().order().by(__.values('name')))],
'g_withStrategiesXComputerFinalizationStrategyX_V': [(lambda g:g.with_strategies(ComputerFinalizationStrategy()).V())],
- 'g_withoutStrategiesXByModulatorOptimizationStrategyX_V': [(lambda g:g.without_strategies(*[GremlinType('org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.finalization.ComputerFinalizationStrategy')]).V())],
+ 'g_withoutStrategiesXByModulatorOptimizationStrategyX_V': [(lambda g:g.without_strategies(ComputerFinalizationStrategy).V())],
'g_withStrategiesXComputerVerificationStrategyX_V': [(lambda g:g.with_strategies(ComputerVerificationStrategy()).V())],
- 'g_withoutStrategiesXComputerVerificationStrategyX_V': [(lambda g:g.without_strategies(*[GremlinType('org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ComputerVerificationStrategy')]).V())],
+ 'g_withoutStrategiesXComputerVerificationStrategyX_V': [(lambda g:g.without_strategies(ComputerVerificationStrategy).V())],
'g_withStrategiesXConnectiveStrategyStrategyX_V_hasXname_markoX_or_whereXinXknowsX_hasXname_markoXX': [(lambda g:g.with_strategies(ConnectiveStrategy()).V().has('name', 'marko').or_().where(__.in_('knows').has('name', 'marko')))],
- 'g_withoutStrategiesXConnectiveStrategyX_V_hasXname_markoX_or_whereXinXknowsX_hasXname_markoXX': [(lambda g:g.without_strategies(*[GremlinType('org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.ConnectiveStrategy')]).V().has('name', 'marko').or_().where(__.in_('knows').has('name', 'marko')))],
+ 'g_withoutStrategiesXConnectiveStrategyX_V_hasXname_markoX_or_whereXinXknowsX_hasXname_markoXX': [(lambda g:g.without_strategies(ConnectiveStrategy).V().has('name', 'marko').or_().where(__.in_('knows').has('name', 'marko')))],
'g_withStrategiesXCountStrategyX_V_whereXoutE_count_isX0XX': [(lambda g:g.with_strategies(CountStrategy()).V().where(__.out_e().count().is_(0)))],
- 'g_withoutStrategiesXCountStrategyX_V_whereXoutE_count_isX0XX': [(lambda g:g.without_strategies(*[GremlinType('org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.CountStrategy')]).V().where(__.out_e().count().is_(0)))],
+ 'g_withoutStrategiesXCountStrategyX_V_whereXoutE_count_isX0XX': [(lambda g:g.without_strategies(CountStrategy).V().where(__.out_e().count().is_(0)))],
'g_withStrategiesXEarlyLimitStrategyX_V_out_order_valueMap_limitX3X_selectXnameX': [(lambda g:g.with_strategies(EarlyLimitStrategy()).V().out().order().value_map().limit(3).select('name'))],
- 'g_withoutStrategiesXEarlyLimitStrategyX_V_out_order_valueMap_limitX3X_selectXnameX': [(lambda g:g.without_strategies(*[GremlinType('org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.EarlyLimitStrategy')]).V().out().order().value_map().limit(3).select('name'))],
+ 'g_withoutStrategiesXEarlyLimitStrategyX_V_out_order_valueMap_limitX3X_selectXnameX': [(lambda g:g.without_strategies(EarlyLimitStrategy).V().out().order().value_map().limit(3).select('name'))],
'g_withStrategiesXEdgeLabelVerificationStrategyXthrowException_true_logWarning_falseXX_V': [(lambda g:g.with_strategies(EdgeLabelVerificationStrategy(throw_exception=True, log_warning=False)).V().out())],
'g_withStrategiesXEdgeLabelVerificationStrategyXthrowException_false_logWarning_falseXX_V': [(lambda g:g.with_strategies(EdgeLabelVerificationStrategy(throw_exception=False, log_warning=False)).V().out())],
- 'g_withoutStrategiesXEdgeLabelVerificationStrategyX_V': [(lambda g:g.without_strategies(*[GremlinType('org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.EdgeLabelVerificationStrategy')]).V().out())],
+ 'g_withoutStrategiesXEdgeLabelVerificationStrategyX_V': [(lambda g:g.without_strategies(EdgeLabelVerificationStrategy).V().out())],
'g_withStrategiesXElementIdStrategyX_V': [(lambda g:g.with_strategies(ElementIdStrategy()).V())],
- 'g_withoutStrategiesXElementIdStrategyX_V': [(lambda g:g.without_strategies(*[GremlinType('org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.ElementIdStrategy')]).V())],
+ 'g_withoutStrategiesXElementIdStrategyX_V': [(lambda g:g.without_strategies(ElementIdStrategy).V())],
'g_withStrategiesXFilterRankingStrategyX_V_out_order_dedup': [(lambda g:g.with_strategies(FilterRankingStrategy()).V().out().order().dedup())],
- 'g_withoutStrategiesXFilterRankingStrategyX_V_out_order_dedup': [(lambda g:g.without_strategies(*[GremlinType('org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.FilterRankingStrategy')]).V().out().order().dedup())],
+ 'g_withoutStrategiesXFilterRankingStrategyX_V_out_order_dedup': [(lambda g:g.without_strategies(FilterRankingStrategy).V().out().order().dedup())],
'g_withStrategiesXGraphFilterStrategyX_V': [(lambda g:g.with_strategies(GraphFilterStrategy()).V())],
- 'g_withoutStrategiesXGraphFilterStrategyX_V': [(lambda g:g.without_strategies(*[GremlinType('org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.optimization.GraphFilterStrategy')]).V())],
+ 'g_withoutStrategiesXGraphFilterStrategyX_V': [(lambda g:g.without_strategies(GraphFilterStrategy).V())],
'g_withStrategiesXHaltedTraverserStrategyXDetachedFactoryXX_V': [(lambda g:g.with_strategies(HaltedTraverserStrategy(halted_traverser_factory='org.apache.tinkerpop.gremlin.structure.util.detached.DetachedFactory')).V())],
'g_withStrategiesXHaltedTraverserStrategyXReferenceFactoryXX_V': [(lambda g:g.with_strategies(HaltedTraverserStrategy(halted_traverser_factory='org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceFactory')).V())],
- 'g_withoutStrategiesXHaltedTraverserStrategyX_V': [(lambda g:g.without_strategies(*[GremlinType('org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.HaltedTraverserStrategy')]).V())],
+ 'g_withoutStrategiesXHaltedTraverserStrategyX_V': [(lambda g:g.without_strategies(HaltedTraverserStrategy).V())],
'g_withStrategiesXIdentityRemovalStrategyX_V_identity_out': [(lambda g:g.with_strategies(IdentityRemovalStrategy()).V().identity().out())],
- 'g_withoutStrategiesXIdentityRemovalStrategyX_V_identity_out': [(lambda g:g.without_strategies(*[GremlinType('org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.IdentityRemovalStrategy')]).V().identity().out())],
+ 'g_withoutStrategiesXIdentityRemovalStrategyX_V_identity_out': [(lambda g:g.without_strategies(IdentityRemovalStrategy).V().identity().out())],
'g_withStrategiesXIncidentToAdjacentStrategyX_V_outE_inV': [(lambda g:g.with_strategies(IncidentToAdjacentStrategy()).V().out_e().in_v())],
- 'g_withoutStrategiesXIncidentToAdjacentStrategyX_V_outE_inV': [(lambda g:g.without_strategies(*[GremlinType('org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.IncidentToAdjacentStrategy')]).V().out_e().in_v())],
+ 'g_withoutStrategiesXIncidentToAdjacentStrategyX_V_outE_inV': [(lambda g:g.without_strategies(IncidentToAdjacentStrategy).V().out_e().in_v())],
'g_withStrategiesXInlineFilterStrategyX_V_filterXhasXname_markoXX': [(lambda g:g.with_strategies(InlineFilterStrategy()).V().filter_(__.has('name', 'marko')))],
- 'g_withoutStrategiesXInlineFilterStrategyX_V_filterXhasXname_markoXX': [(lambda g:g.without_strategies(*[GremlinType('org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.InlineFilterStrategy')]).V().filter_(__.has('name', 'marko')))],
+ 'g_withoutStrategiesXInlineFilterStrategyX_V_filterXhasXname_markoXX': [(lambda g:g.without_strategies(InlineFilterStrategy).V().filter_(__.has('name', 'marko')))],
'g_withStrategiesXLambdaRestrictionStrategyX_V': [(lambda g:g.with_strategies(LambdaRestrictionStrategy()).V())],
- 'g_withoutStrategiesXLambdaRestrictionStrategyX_V': [(lambda g:g.without_strategies(*[GremlinType('org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.LambdaRestrictionStrategy')]).V())],
+ 'g_withoutStrategiesXLambdaRestrictionStrategyX_V': [(lambda g:g.without_strategies(LambdaRestrictionStrategy).V())],
'g_withStrategiesXLazyBarrierStrategyX_V_out_bothE_count': [(lambda g:g.with_strategies(LazyBarrierStrategy()).V().out().both_e().count())],
- 'g_withoutStrategiesXLazyBarrierStrategyX_V_out_bothE_count': [(lambda g:g.without_strategies(*[GremlinType('org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.LazyBarrierStrategy')]).V().out().both_e().count())],
+ 'g_withoutStrategiesXLazyBarrierStrategyX_V_out_bothE_count': [(lambda g:g.without_strategies(LazyBarrierStrategy).V().out().both_e().count())],
'g_withStrategiesXMatchAlgorithmStrategyXmatchAlgorithm_CountMatchAlgorithmXX_V_matchXa_knows_b__a_created_cX': [(lambda g:g.with_strategies(MatchAlgorithmStrategy(match_algorithm='org.apache.tinkerpop.gremlin.process.traversal.step.map.MatchStep$CountMatchAlgorithm')).V().match(__.as_('a').out('knows').as_('b'), __.as_('a').out('created').as_('c')))],
'g_withStrategiesXMatchAlgorithmStrategyXmatchAlgorithm_GreedyMatchAlgorithmXX_V_matchXa_knows_b__a_created_cX': [(lambda g:g.with_strategies(MatchAlgorithmStrategy(match_algorithm='org.apache.tinkerpop.gremlin.process.traversal.step.map.MatchStep$GreedyMatchAlgorithm')).V().match(__.as_('a').out('knows').as_('b'), __.as_('a').out('created').as_('c')))],
- 'g_withoutStrategiesXMatchAlgorithmStrategyX_V_matchXa_knows_b__a_created_cX': [(lambda g:g.without_strategies(*[GremlinType('org.apache.tinkerpop.gremlin.process.traversal.strategy.finalization.MatchAlgorithmStrategy')]).V().match(__.as_('a').out('knows').as_('b'), __.as_('a').out('created').as_('c')))],
+ 'g_withoutStrategiesXMatchAlgorithmStrategyX_V_matchXa_knows_b__a_created_cX': [(lambda g:g.without_strategies(MatchAlgorithmStrategy).V().match(__.as_('a').out('knows').as_('b'), __.as_('a').out('created').as_('c')))],
'g_withStrategiesXMatchPredicateStrategyX_V_matchXa_created_lop_b__b_0created_29_cX_whereXc_repeatXoutX_timesX2XX_selectXa_b_cX': [(lambda g:g.with_strategies(MatchPredicateStrategy()).V().match(__.as_('a').out('created').has('name', 'lop').as_('b'), __.as_('b').in_('created').has('age', 29).as_('c')).where(__.as_('c').repeat(__.out()).times(2)).select('a', 'b', 'c'))],
- 'g_withoutStrategiesXMatchPredicateStrategyX_V_matchXa_created_lop_b__b_0created_29_cX_whereXc_repeatXoutX_timesX2XX_selectXa_b_cX': [(lambda g:g.without_strategies(*[GremlinType('org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.MatchPredicateStrategy')]).V().match(__.as_('a').out('created').has('name', 'lop').as_('b'), __.as_('b').in_('created').has('age', 29).as_('c')).where(__.as_('c').repeat(__.out()).times(2)).select('a', 'b', 'c'))],
+ 'g_withoutStrategiesXMatchPredicateStrategyX_V_matchXa_created_lop_b__b_0created_29_cX_whereXc_repeatXoutX_timesX2XX_selectXa_b_cX': [(lambda g:g.without_strategies(MatchPredicateStrategy).V().match(__.as_('a').out('created').has('name', 'lop').as_('b'), __.as_('b').in_('created').has('age', 29).as_('c')).where(__.as_('c').repeat(__.out()).times(2)).select('a', 'b', 'c'))],
'g_withStrategiesXMessagePassingReductionStrategyX_V': [(lambda g:g.with_strategies(MessagePassingReductionStrategy()).V())],
- 'g_withoutStrategiesXMessagePassingReductionStrategyX_V': [(lambda g:g.without_strategies(*[GremlinType('org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.optimization.MessagePassingReductionStrategy')]).V())],
+ 'g_withoutStrategiesXMessagePassingReductionStrategyX_V': [(lambda g:g.without_strategies(MessagePassingReductionStrategy).V())],
'g_V_coworker': [(lambda g:g.V().has_label('person').filter_(__.out_e('created')).aggregate('p').as_('p1').values('name').as_('p1n').select('p').unfold().where(P.neq('p1')).as_('p2').values('name').as_('p2n').select('p2').out('created').choose(__.in_('created').where(P.eq('p1')), __.values('name'), __.constant([])).group().by(__.select('p1n')).by(__.group().by(__.select('p2n')).by(__.unfold().fold().project('numCoCreated', 'coCreated').by(__.count(Scope.local)).by())).unfold())],
'g_V_coworker_with_midV': [(lambda g:g.V().has_label('person').filter_(__.out_e('created')).as_('p1').V().has_label('person').where(P.neq('p1')).filter_(__.out_e('created')).as_('p2').map(__.out('created').where(__.in_('created').as_('p1')).values('name').fold()).group().by(__.select('p1').by('name')).by(__.group().by(__.select('p2').by('name')).by(__.project('numCoCreated', 'coCreated').by(__.count(Scope.local)).by())).unfold())],
'g_withStrategiesXOptionsStrategyX_V': [(lambda g:g.with_strategies(OptionsStrategy()).V())],
'g_withStrategiesXOptionsStrategyXmyVar_myValueXX_V': [(lambda g:g.with_strategies(OptionsStrategy(my_var='myValue')).V())],
- 'g_withoutStrategiesXOptionsStrategyX_V': [(lambda g:g.without_strategies(*[GremlinType('org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.OptionsStrategy')]).V())],
+ 'g_withoutStrategiesXOptionsStrategyX_V': [(lambda g:g.without_strategies(OptionsStrategy).V())],
'g_withStrategiesXOrderLimitStrategyX_V': [(lambda g:g.with_strategies(OrderLimitStrategy()).V())],
- 'g_withoutStrategiesXOrderLimitStrategyX_V': [(lambda g:g.without_strategies(*[GremlinType('org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.OrderLimitStrategy')]).V())],
+ 'g_withoutStrategiesXOrderLimitStrategyX_V': [(lambda g:g.without_strategies(OrderLimitStrategy).V())],
'g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_V_name': [(lambda g:g.add_v('person').property('_partition', 'a').property('name', 'alice').add_v('person').property('_partition', 'b').property('name', 'bob')), (lambda g:g.with_strategies(PartitionStrategy(partition_key='_partition', write_partition='a', read_partitions=['a'])).V().values('name'))],
'g_withStrategiesXPartitionStrategyXwrite_a_read_a_bXX_V_name': [(lambda g:g.add_v('person').property('_partition', 'a').property('name', 'alice').add_v('person').property('_partition', 'b').property('name', 'bob')), (lambda g:g.with_strategies(PartitionStrategy(partition_key='_partition', write_partition='a', read_partitions=['a', 'b'])).V().values('name'))],
'g_withStrategiesXPartitionStrategyXwrite_a_read_cXX_V_name': [(lambda g:g.add_v('person').property('_partition', 'a').property('name', 'alice').add_v('person').property('_partition', 'b').property('name', 'bob')), (lambda g:g.with_strategies(PartitionStrategy(partition_key='_partition', write_partition='a', read_partitions=['c'])).V().values('name'))],
@@ -533,15 +534,15 @@
'g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_mergeV_optionXonCreateX': [(lambda g, xx1=None,xx2=None:g.add_v('person').property('_partition', 'b').property('name', 'alice')), (lambda g, xx1=None,xx2=None:g.with_strategies(PartitionStrategy(partition_key='_partition', write_partition='a', read_partitions=['a'])).merge_v(xx1).option(Merge.on_create, xx2)), (lambda g, xx1=None,xx2=None:g.V().has('name', 'alice').has('age', 35).has('_partition', 'a')), (lambda g, xx1=None,xx2=None:g.V())],
'g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_injectX0X__mergeV_optionXonCreateX': [(lambda g, xx1=None,xx2=None:g.add_v('person').property('_partition', 'b').property('name', 'alice')), (lambda g, xx1=None,xx2=None:g.with_strategies(PartitionStrategy(partition_key='_partition', write_partition='a', read_partitions=['a'])).inject(0).merge_v(xx1).option(Merge.on_create, xx2)), (lambda g, xx1=None,xx2=None:g.V().has('name', 'alice').has('age', 35).has('_partition', 'a')), (lambda g, xx1=None,xx2=None:g.V())],
'g_withStrategiesXPathProcessorStrategyX_V_asXaX_selectXaX_byXvaluesXnameXX': [(lambda g:g.with_strategies(PathProcessorStrategy()).V().as_('a').select('a').by(__.values('name')))],
- 'g_withoutStrategiesXPathProcessorStrategyX_V_asXaX_selectXaX_byXvaluesXnameXX': [(lambda g:g.without_strategies(*[GremlinType('org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.PathProcessorStrategy')]).V().as_('a').select('a').by(__.values('name')))],
+ 'g_withoutStrategiesXPathProcessorStrategyX_V_asXaX_selectXaX_byXvaluesXnameXX': [(lambda g:g.without_strategies(PathProcessorStrategy).V().as_('a').select('a').by(__.values('name')))],
'g_withStrategiesXPathRetractionStrategyX_V': [(lambda g:g.with_strategies(PathRetractionStrategy()).V())],
- 'g_withoutStrategiesXPathRetractionStrategyX_V': [(lambda g:g.without_strategies(*[GremlinType('org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.PathRetractionStrategy')]).V())],
+ 'g_withoutStrategiesXPathRetractionStrategyX_V': [(lambda g:g.without_strategies(PathRetractionStrategy).V())],
'g_V_shortestpath': [(lambda g:g.V().as_('v').both().as_('v').project('src', 'tgt', 'p').by(__.select(Pop.first, 'v')).by(__.select(Pop.last, 'v')).by(__.select(Pop.all_, 'v')).as_('triple').group('x').by(__.select('src', 'tgt')).by(__.select('p').fold()).select('tgt').barrier().repeat(__.both().as_('v').project('src', 'tgt', 'p').by(__.select(Pop.first, 'v')).by(__.select(Pop.last, 'v')).by(__.select(Pop.all_, 'v')).as_('t').filter_(__.select(Pop.all_, 'p').count(Scope.local).as_('l').select(Pop.last, 't').select(Pop.all_, 'p').dedup(Scope.local).count(Scope.local).where(P.eq('l'))).select(Pop.last, 't').not_(__.select(Pop.all_, 'p').as_('p').count(Scope.local).as_('l').select(Pop.all_, 'x').unfold().filter_(__.select(Column.keys).where(P.eq('t')).by(__.select('src', 'tgt'))).filter_(__.select(Column.values).unfold().or_(__.count(Scope.local).where(P.lt('l')), __.where(P.eq('p'))))).barrier().group('x').by(__.select('src', 'tgt')).by(__.select(Pop.all_, 'p').fold()).select('tgt').barrier()).cap('x').select(Column.values).unfold().unfold().map(__.unfold().values('name').fold()))],
'g_V_playlist_paths': [(lambda g:g.with_strategies(SeedStrategy(seed=99999)).V().has('name', 'Bob_Dylan').in_('sungBy').as_('a').repeat(__.out().order().by(Order.shuffle).simple_path().from_('a')).until(__.out('writtenBy').has('name', 'Johnny_Cash')).limit(1).as_('b').repeat(__.out().order().by(Order.shuffle).as_('c').simple_path().from_('b').to('c')).until(__.out('sungBy').has('name', 'Grateful_Dead')).limit(1).path().from_('a').unfold().project('song', 'artists').by('name').by(__.coalesce(__.out('sungBy', 'writtenBy').dedup().values('name'), __.constant('Unknown')).fold()))],
'g_withStrategiesXProductiveByStrategyX_V_group_byXageX_byXnameX': [(lambda g:g.with_strategies(ProductiveByStrategy()).V().group().by('age').by('name'))],
- 'g_withoutStrategiesXProductiveByStrategyX_V_group_byXageX_byXnameX': [(lambda g:g.without_strategies(*[GremlinType('org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.ProductiveByStrategy')]).V().group().by('age').by('name'))],
+ 'g_withoutStrategiesXProductiveByStrategyX_V_group_byXageX_byXnameX': [(lambda g:g.without_strategies(ProductiveByStrategy).V().group().by('age').by('name'))],
'g_withStrategiesXProfileStrategyX_V': [(lambda g:g.with_strategies(ProfileStrategy()).V())],
- 'g_withoutStrategiesXProfileStrategyX_V': [(lambda g:g.without_strategies(*[GremlinType('org.apache.tinkerpop.gremlin.process.traversal.strategy.finalization.ProfileStrategy')]).V())],
+ 'g_withoutStrategiesXProfileStrategyX_V': [(lambda g:g.without_strategies(ProfileStrategy).V())],
'g_withStrategiesXReadOnlyStrategyX_V': [(lambda g:g.with_strategies(ReadOnlyStrategy()).V())],
'g_withStrategiesXReadOnlyStrategyX_V_outXknowsX_name': [(lambda g:g.with_strategies(ReadOnlyStrategy()).V().out('knows').values('name'))],
'g_withStrategiesXReadOnlyStrategyX_addVXpersonX': [(lambda g:g.with_strategies(ReadOnlyStrategy()).add_v('person'))],
@@ -552,15 +553,15 @@
'g_V_classic_recommendation': [(lambda g:g.V().has('name', 'DARK STAR').as_('a').out('followedBy').aggregate('stash').in_('followedBy').where(P.neq('a').and_(P.not_(P.within('stash')))).group_count().unfold().project('x', 'y', 'z').by(__.select(Column.keys).values('name')).by(__.select(Column.keys).values('performances')).by(__.select(Column.values)).order().by(__.select('z'), Order.desc).by(__.select('y'), Order.asc).limit(5).aggregate(Scope.local, 'm').select('x'))],
'g_V_classic_recommendation_ranked': [(lambda g:g.V().has('name', 'DARK STAR').as_('a').out('followedBy').aggregate('stash').in_('followedBy').where(P.neq('a').and_(P.not_(P.within('stash')))).group_count().unfold().project('x', 'y', 'z').by(__.select(Column.keys).values('name')).by(__.select(Column.keys).values('performances')).by(__.select(Column.values)).order().by(__.select('z'), Order.desc).by(__.select('y'), Order.asc).limit(5).aggregate(Scope.local, 'm'))],
'g_withStrategiesXReferenceElementStrategyX_V': [(lambda g:g.with_strategies(ReferenceElementStrategy()).V())],
- 'g_withoutStrategiesXReferenceElementStrategyX_V': [(lambda g:g.without_strategies(*[GremlinType('org.apache.tinkerpop.gremlin.process.traversal.strategy.finalization.ReferenceElementStrategy')]).V())],
+ 'g_withoutStrategiesXReferenceElementStrategyX_V': [(lambda g:g.without_strategies(ReferenceElementStrategy).V())],
'g_withStrategiesXRepeatUnrollStrategyX_V_repeatXoutX_timesX2X': [(lambda g:g.with_strategies(RepeatUnrollStrategy()).V().repeat(__.out()).times(2))],
- 'g_withoutStrategiesXRepeatUnrollStrategyX_V_repeatXoutX_timesX2X': [(lambda g:g.without_strategies(*[GremlinType('org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.RepeatUnrollStrategy')]).V().repeat(__.out()).times(2))],
+ 'g_withoutStrategiesXRepeatUnrollStrategyX_V_repeatXoutX_timesX2X': [(lambda g:g.without_strategies(RepeatUnrollStrategy).V().repeat(__.out()).times(2))],
'g_withStrategiesXReservedKeysVerificationStrategyXthrowException_trueXX_addVXpersonX_propertyXid_123X_propertyXname_markoX': [(lambda g:g.with_strategies(ReservedKeysVerificationStrategy(throw_exception=True)).add_v('person').property('id', 123).property('name', 'marko'))],
'g_withStrategiesXReservedKeysVerificationStrategyXthrowException_trueXX_addVXpersonX_propertyXage_29X_propertyXname_markoX': [(lambda g:g.with_strategies(ReservedKeysVerificationStrategy(throw_exception=True, keys={'age'})).add_v('person').property('age', 29).property('name', 'marko'))],
- 'g_withoutStrategiesXReservedKeysVerificationStrategyX_addVXpersonX_propertyXid_123X_propertyXname_markoX': [(lambda g:g.without_strategies(*[GremlinType('org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ReservedKeysVerificationStrategy')]).add_v('person').property('id', 123).property('name', 'marko').values())],
- 'g_withoutStrategiesXSeedStrategyX_V': [(lambda g:g.without_strategies(*[GremlinType('org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SeedStrategy')]).V())],
+ 'g_withoutStrategiesXReservedKeysVerificationStrategyX_addVXpersonX_propertyXid_123X_propertyXname_markoX': [(lambda g:g.without_strategies(ReservedKeysVerificationStrategy).add_v('person').property('id', 123).property('name', 'marko').values())],
+ 'g_withoutStrategiesXSeedStrategyX_V': [(lambda g:g.without_strategies(SeedStrategy).V())],
'g_withStrategiesXStandardVerificationStrategyX_V': [(lambda g:g.with_strategies(StandardVerificationStrategy()).V())],
- 'g_withoutStrategiesXStandardVerificationStrategyX_V': [(lambda g:g.without_strategies(*[GremlinType('org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.StandardVerificationStrategy')]).V())],
+ 'g_withoutStrategiesXStandardVerificationStrategyX_V': [(lambda g:g.without_strategies(StandardVerificationStrategy).V())],
'g_withStrategiesXSubgraphStrategyXsubgraphAXX_V': [(lambda g:g.with_strategies(SubgraphStrategy(vertices=__.has('name', P.within('josh', 'lop', 'ripple')))).V())],
'g_withStrategiesXSubgraphStrategyXsubgraphAXX_E': [(lambda g:g.with_strategies(SubgraphStrategy(vertices=__.has('name', P.within('josh', 'lop', 'ripple')))).E())],
'g_withStrategiesXSubgraphStrategyXsubgraphAXX_VX4X_outE': [(lambda g, vid4=None:g.with_strategies(SubgraphStrategy(vertices=__.has('name', P.within('josh', 'lop', 'ripple')))).V(vid4).out_e())],
@@ -622,11 +623,11 @@
'g_withStrategiesXSubgraphStrategyXsubgraphDXX_EX12X_bothV': [(lambda g, eid12=None:g.with_strategies(SubgraphStrategy(check_adjacent_vertices=False, vertices=__.has('name', P.within('josh', 'lop', 'ripple')), edges=__.or_(__.has('weight', 0.4).has_label('created'), __.has('weight', 1.0).has_label('created')))).E(eid12).both_v())],
'g_withStrategiesXSubgraphStrategyXsubgraphDXX_EX9X_bothV': [(lambda g, eid9=None:g.with_strategies(SubgraphStrategy(check_adjacent_vertices=False, vertices=__.has('name', P.within('josh', 'lop', 'ripple')), edges=__.or_(__.has('weight', 0.4).has_label('created'), __.has('weight', 1.0).has_label('created')))).E(eid9).both_v())],
'g_withStrategiesXSubgraphStrategyXcheckAdjacentVertices_subgraphDXX_EX9X_bothV': [(lambda g, eid9=None:g.with_strategies(SubgraphStrategy(check_adjacent_vertices=True, vertices=__.has('name', P.within('josh', 'lop', 'ripple')), edges=__.or_(__.has('weight', 0.4).has_label('created'), __.has('weight', 1.0).has_label('created')))).E(eid9).both_v())],
- 'g_withStrategiesXVertexProgramRestrictionStrategyX_withoutStrategiesXVertexProgramStrategyX_V': [(lambda g:g.with_strategies(VertexProgramRestrictionStrategy()).without_strategies(*[GremlinType('org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.decoration.VertexProgramStrategy')]).V())],
+ 'g_withStrategiesXVertexProgramRestrictionStrategyX_withoutStrategiesXVertexProgramStrategyX_V': [(lambda g:g.with_strategies(VertexProgramRestrictionStrategy()).without_strategies(VertexProgramStrategy).V())],
'g_withStrategiesXVertexProgramRestrictionStrategy_VertexProgramStrategyX_V': [(lambda g:g.with_strategies(VertexProgramRestrictionStrategy(), VertexProgramStrategy()).V())],
- 'g_withoutStrategiesXVertexProgramRestrictionStrategyX_V': [(lambda g:g.without_strategies(*[GremlinType('org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.verification.VertexProgramRestrictionStrategy')]).with_strategies(VertexProgramStrategy()).V())],
+ 'g_withoutStrategiesXVertexProgramRestrictionStrategyX_V': [(lambda g:g.without_strategies(VertexProgramRestrictionStrategy).with_strategies(VertexProgramStrategy()).V())],
'g_withStrategiesXVertexProgramStrategyX_V': [(lambda g:g.with_strategies(VertexProgramStrategy()).V())],
- 'g_withoutStrategiesXVertexProgramStrategyX_V': [(lambda g:g.without_strategies(*[GremlinType('org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.decoration.VertexProgramStrategy')]).V())],
+ 'g_withoutStrategiesXVertexProgramStrategyX_V': [(lambda g:g.without_strategies(VertexProgramStrategy).V())],
'g_VX1X_asXaX_outXcreatedX_addEXcreatedByX_toXaX': [(lambda g, vid1=None:g.add_v('person').property('name', 'marko').property('age', 29).as_('marko').add_v('person').property('name', 'vadas').property('age', 27).as_('vadas').add_v('software').property('name', 'lop').property('lang', 'java').as_('lop').add_v('person').property('name', 'josh').property('age', 32).as_('josh').add_v('software').property('name', 'ripple').property('lang', 'java').as_('ripple').add_v('person').property('name', 'peter').property('age', 35).as_('peter').add_e('knows').from_('marko').to('vadas').property('weight', 0.5).add_e('knows').from_('marko').to('josh').property('weight', 1.0).add_e('created').from_('marko').to('lop').property('weight', 0.4).add_e('created').from_('josh').to('ripple').property('weight', 1.0).add_e('created').from_('josh').to('lop').property('weight', 0.4).add_e('created').from_('peter').to('lop').property('weight', 0.2)), (lambda g, vid1=None:g.V(vid1).as_('a').out('created').add_e('createdBy').to('a')), (lambda g, vid1=None:g.E()), (lambda g, vid1=None:g.V(vid1).in_e())],
'g_VX1X_asXaX_outXcreatedX_addEXcreatedByX_toXaX_propertyXweight_2X': [(lambda g, vid1=None:g.add_v('person').property('name', 'marko').property('age', 29).as_('marko').add_v('person').property('name', 'vadas').property('age', 27).as_('vadas').add_v('software').property('name', 'lop').property('lang', 'java').as_('lop').add_v('person').property('name', 'josh').property('age', 32).as_('josh').add_v('software').property('name', 'ripple').property('lang', 'java').as_('ripple').add_v('person').property('name', 'peter').property('age', 35).as_('peter').add_e('knows').from_('marko').to('vadas').property('weight', 0.5).add_e('knows').from_('marko').to('josh').property('weight', 1.0).add_e('created').from_('marko').to('lop').property('weight', 0.4).add_e('created').from_('josh').to('ripple').property('weight', 1.0).add_e('created').from_('josh').to('lop').property('weight', 0.4).add_e('created').from_('peter').to('lop').property('weight', 0.2)), (lambda g, vid1=None:g.V(vid1).as_('a').out('created').add_e('createdBy').to('a').property('weight', 2.0)), (lambda g, vid1=None:g.E()), (lambda g, vid1=None:g.V(vid1).both_e()), (lambda g, vid1=None:g.V(vid1).in_e().has('weight', 2.0))],
'g_V_outE_propertyXweight_nullX': [(lambda g:g.add_v('person').property('name', 'marko').property('age', 29).as_('marko').add_v('person').property('name', 'vadas').property('age', 27).as_('vadas').add_v('software').property('name', 'lop').property('lang', 'java').as_('lop').add_v('person').property('name', 'josh').property('age', 32).as_('josh').add_v('software').property('name', 'ripple').property('lang', 'java').as_('ripple').add_v('person').property('name', 'peter').property('age', 35).as_('peter').add_e('knows').from_('marko').to('vadas').property('weight', 0.5).add_e('knows').from_('marko').to('josh').property('weight', 1.0).add_e('created').from_('marko').to('lop').property('weight', 0.4).add_e('created').from_('josh').to('ripple').property('weight', 1.0).add_e('created').from_('josh').to('lop').property('weight', 0.4).add_e('created').from_('peter').to('lop').property('weight', 0.2)), (lambda g:g.V().out_e().property('weight', None)), (lambda g:g.E().properties('weight'))],
@@ -800,7 +801,7 @@
'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_out_path_byXvaluesXnameX_toUpperX_conjoinXMARKOX': [(lambda g:g.V().out().path().by(__.values('name').to_upper()).conjoin('MARKO'))],
'g_injectXmarkoX_conjoinX_X': [(lambda g:g.inject(['marko']).conjoin('-'))],
'g_V_valueMapXlocationX_selectXvaluesX_unfold_orderXlocalX_conjoinX1X': [(lambda g:g.V().value_map('location').select(Column.values).unfold().order(Scope.local).conjoin('1'))],
@@ -900,6 +901,7 @@
'g_VX1X_outEXknows_createdX_inV': [(lambda g, vid1=None:g.V(vid1).out_e('knows', 'created').in_v())],
'g_VX1X_outEXknowsX_bothV': [(lambda g, vid1=None:g.V(vid1).out_e('knows').both_v())],
'g_VX1X_outEXknowsX_bothV_name': [(lambda g, vid1=None:g.V(vid1).out_e('knows').both_v().values('name'))],
+ 'g_V_toEXout_knowsvarX_valuesXweightX': [(lambda g, xx1=None:g.V().to_e(Direction.OUT, xx1).values('weight'))],
'g_VX1X_properties_element': [(lambda g, vid2=None:g.V(vid2).properties().element().limit(1))],
'g_V_properties_element': [(lambda g:g.V().properties().element())],
'g_V_propertiesXageX_element': [(lambda g:g.V().properties('age').element())],
@@ -1375,7 +1377,7 @@
'g_withStrategiesXProductiveByStrategyX_V_asXaX_selectXaX_byXageX': [(lambda g:g.with_strategies(ProductiveByStrategy()).V().as_('a').select('a').by('age'))],
'g_withSideEffectXk_nullX_injectXxX_selectXkX': [(lambda g:g.with_side_effect('k', None).inject('x').select('k'))],
'g_V_out_in_selectXall_a_a_aX_byXunfold_name_foldX': [(lambda g:g.add_v('A').property('name', 'a1').as_('a1').add_v('B').property('name', 'b1').as_('b1').add_e('ab').from_('a1').to('b1')), (lambda g:g.V().as_('a').out().as_('a').in_().as_('a').select(Pop.all_, 'a', 'a', 'a').by(__.unfold().values('name').fold()))],
- 'g_V_asXlabelX_aggregateXlocal_xX_selectXxX_selectXlabelX': [(lambda g:g.V().as_('label').aggregate(Scope.local, 'x').barrier().select('x').select('label'))],
+ 'g_withoutStrategiesXLazyBarrierStrategyX_V_asXlabelX_aggregateXlocal_xX_selectXxX_selectXlabelX': [(lambda g:g.without_strategies(LazyBarrierStrategy).V().as_('label').aggregate(Scope.local, 'x').select('x').select('label'))],
'g_V_name_asXaX_selectXfirst_aX': [(lambda g:g.V().values('name').as_('a').select(Pop.first, 'a'))],
'g_V_name_asXaX_selectXlast_aX': [(lambda g:g.V().values('name').as_('a').select(Pop.last, 'a'))],
'g_V_name_asXaX_selectXmixed_aX': [(lambda g:g.V().values('name').as_('a').select(Pop.mixed, 'a'))],
diff --git a/gremlin-python/src/main/python/radish/terrain.py b/gremlin-python/src/main/python/radish/terrain.py
index 27a804a..d7d58e6 100644
--- a/gremlin-python/src/main/python/radish/terrain.py
+++ b/gremlin-python/src/main/python/radish/terrain.py
@@ -29,7 +29,7 @@
inV = __.in_v
project = __.project
tail = __.tail
-gremlin_server_url = os.environ.get('GREMLIN_SERVER_URL', 'ws://localhost:{}/gremlin')
+gremlin_server_url = os.environ.get('GREMLIN_SERVER_URL', 'http://localhost:{}/gremlin')
test_no_auth_url = gremlin_server_url.format(45940)
@before.all
@@ -94,11 +94,15 @@
if not("serializer" in world.config.user_data):
raise ValueError('test configuration requires setting of --user-data="serializer={mime-type}"')
- if world.config.user_data["serializer"] == "application/vnd.gremlin-v3.0+json":
- s = serializer.GraphSONSerializersV3d0()
- elif world.config.user_data["serializer"] == "application/vnd.graphbinary-v1.0":
- s = serializer.GraphBinarySerializersV1()
+ if world.config.user_data["serializer"] == "application/vnd.graphbinary-v4.0":
+ s = serializer.GraphBinarySerializersV4()
+ elif world.config.user_data["serializer"] == "application/vnd.gremlin-v4.0+json":
+ s = serializer.GraphSONSerializersV4()
else:
raise ValueError('serializer not found - ' + world.config.user_data["serializer"])
- return DriverRemoteConnection(test_no_auth_url, server_graph_name, message_serializer=s)
+ bulking = world.config.user_data["bulking"] == "true" if "bulking" in world.config.user_data else False
+
+ return DriverRemoteConnection(test_no_auth_url, server_graph_name,
+ request_serializer=s, response_serializer=s,
+ bulk_results=bulking)
diff --git a/gremlin-python/src/main/python/radish/utils.py b/gremlin-python/src/main/python/radish/utils.py
index a820a41..fdbd2c6 100644
--- a/gremlin-python/src/main/python/radish/utils.py
+++ b/gremlin-python/src/main/python/radish/utils.py
@@ -36,10 +36,23 @@
# hold a map of the "name"/edge for use in asserting results - "name" in this context is in the form of
# outgoingV-label->incomingV
- return g.E().group(). \
- by(lambda: ("it.outVertex().value('name') + '-' + it.label() + '->' + it.inVertex().value('name')", "gremlin-groovy")). \
+ edges = {}
+ edge_map = g.E().group(). \
+ by(__.project('o', 'l', 'i').by(__.out_v().values('name')).by(__.label()).by(__.in_v().values('name'))). \
by(__.tail()).next()
+ for key, value in edge_map.items():
+ edges[_get_edge_keys(key)] = value
+
+ return edges
+
+
+def _get_edge_keys(key_map):
+ outV = key_map.get('o')
+ label = key_map.get('l')
+ inV = key_map.get('i')
+ return f'{outV}-{label}->{inV}'
+
@pick
def create_lookup_vp(remote):
@@ -48,15 +61,25 @@
# hold a map of the "name"/vertexproperty for use in asserting results - "name" in this context is in the form of
# vertexName-propName->propVal where the propVal must be typed according to the gherkin spec. note that the toy
# graphs only deal in String/Int/Float/Double types so none of the other types are accounted for here.
- return g.V().properties().group(). \
- by(lambda: ("{ it -> \n" +
- " def val = it.value()\n" +
- " if (val instanceof Integer)\n" +
- " val = 'd[' + val + '].i'\n" +
- " else if (val instanceof Float)\n" +
- " val = 'd[' + val + '].f'\n" +
- " else if (val instanceof Double)\n" +
- " val = 'd[' + val + '].d'\n" +
- " return it.element().value('name') + '-' + it.key() + '->' + val\n" +
- "}", "gremlin-groovy")). \
+ vps = {}
+ props = g.V().properties().group(). \
+ by(__.project('n', 'k', 'v').by(__.element().values('name')).by(__.key()).by(__.value())). \
by(__.tail()).next()
+
+ for key, value in props.items():
+ vps[_get_v_keys(key)] = value
+
+ return vps
+
+
+# since gremlin-lang doesn't allow lambdas, we are using the same logic as javascript to construct the keys
+def _get_v_keys(key_map):
+ k = key_map.get('k')
+ val = key_map.get('v')
+ if k == 'weight':
+ val = f'd[{val}].d'
+ elif k == 'age' or k == 'since' or k == 'skill':
+ val = f'd[{val}].i'
+ name = key_map.get('n')
+
+ return f'{name}-{k}->{val}'
diff --git a/gremlin-python/src/main/python/setup.py b/gremlin-python/src/main/python/setup.py
index 9bc306c..1c875b8 100644
--- a/gremlin-python/src/main/python/setup.py
+++ b/gremlin-python/src/main/python/setup.py
@@ -48,7 +48,9 @@
'aiohttp>=3.8.0,<4.0.0',
'aenum>=1.4.5,<4.0.0',
'isodate>=0.6.0,<1.0.0',
- 'async-timeout>=4.0.3,<5.0.0'
+ 'boto3',
+ 'botocore',
+ 'async-timeout>=4.0.3,<5.0; python_version < "3.11"',
]
setup(
@@ -78,7 +80,7 @@
],
install_requires=install_requires,
extras_require={
- 'kerberos': 'kerberos>=1.3.0,<2.0.0', # Does not install in Microsoft Windows
+ 'kerberos': 'kerberos>=1.3.0,<2.0.0; sys_platform != "win32"', # Does not install in Microsoft Windows
'ujson': 'ujson>=2.0.0'
},
classifiers=[
diff --git a/gremlin-python/src/main/python/tests/conftest.py b/gremlin-python/src/main/python/tests/conftest.py
index 4739cd6..918e6aa 100644
--- a/gremlin-python/src/main/python/tests/conftest.py
+++ b/gremlin-python/src/main/python/tests/conftest.py
@@ -18,58 +18,46 @@
#
import concurrent.futures
+from json import dumps
import os
import ssl
import pytest
-import socket
import logging
import queue
-import yaml
-
+from gremlin_python.driver import serializer
from gremlin_python.driver.client import Client
from gremlin_python.driver.connection import Connection
-from gremlin_python.driver import serializer
-from gremlin_python.driver.driver_remote_connection import (
- DriverRemoteConnection)
-from gremlin_python.driver.protocol import GremlinServerWSProtocol
-from gremlin_python.driver.serializer import (
- GraphSONMessageSerializer, GraphSONSerializersV2d0, GraphSONSerializersV3d0,
- GraphBinarySerializersV1)
-from gremlin_python.driver.aiohttp.transport import AiohttpTransport, AiohttpHTTPTransport
+from gremlin_python.driver.driver_remote_connection import DriverRemoteConnection
+from gremlin_python.driver.protocol import GremlinServerHTTPProtocol
+from gremlin_python.driver.serializer import GraphBinarySerializersV4
+from gremlin_python.driver.aiohttp.transport import AiohttpHTTPTransport
+from gremlin_python.driver.auth import basic, sigv4
-gremlin_server_url = os.environ.get('GREMLIN_SERVER_URL', 'ws://localhost:{}/gremlin')
-gremlin_basic_auth_url = os.environ.get('GREMLIN_SERVER_BASIC_AUTH_URL', 'wss://localhost:{}/gremlin')
-gremlin_socket_server_url = os.environ.get('GREMLIN_SOCKET_SERVER_URL', 'ws://localhost:{}/gremlin')
-gremlin_socket_server_config_path = os.environ.get("GREMLIN_SOCKET_SERVER_CONFIG_PATH",
- "../../../../../../gremlin-tools/gremlin-socket-server/conf/"
- "test-ws-gremlin.yaml")
-kerberos_hostname = os.environ.get('KRB_HOSTNAME', socket.gethostname())
+"""HTTP server testing variables"""
+gremlin_server_url = os.environ.get('GREMLIN_SERVER_URL', 'http://localhost:{}/gremlin')
+gremlin_basic_auth_url = os.environ.get('GREMLIN_SERVER_BASIC_AUTH_URL', 'https://localhost:{}/gremlin')
anonymous_url = gremlin_server_url.format(45940)
basic_url = gremlin_basic_auth_url.format(45941)
-kerberos_url = gremlin_server_url.format(45942)
-kerberized_service = 'test-service@{}'.format(kerberos_hostname)
-gremlin_server_url_http = os.environ.get('GREMLIN_SERVER_URL_HTTP', 'http://localhost:{}/')
-gremlin_basic_auth_url_http = os.environ.get('GREMLIN_SERVER_BASIC_AUTH_URL_HTTP', 'https://localhost:{}/')
-anonymous_url_http = gremlin_server_url_http.format(45940)
-basic_url_http = gremlin_basic_auth_url_http.format(45941)
verbose_logging = False
logging.basicConfig(format='%(asctime)s [%(levelname)8s] [%(filename)15s:%(lineno)d - %(funcName)10s()] - %(message)s',
level=logging.DEBUG if verbose_logging else logging.INFO)
-
+"""
+Tests below are for the HTTP server with GraphBinaryV4
+"""
@pytest.fixture
def connection(request):
- protocol = GremlinServerWSProtocol(
- GraphSONMessageSerializer(),
- username='stephen', password='password')
+ protocol = GremlinServerHTTPProtocol(
+ GraphBinarySerializersV4(), GraphBinarySerializersV4(),
+ auth=basic('stephen', 'password'))
executor = concurrent.futures.ThreadPoolExecutor(5)
pool = queue.Queue()
try:
conn = Connection(anonymous_url, 'gmodern', protocol,
- lambda: AiohttpTransport(), executor, pool)
+ lambda: AiohttpHTTPTransport(), executor, pool)
except OSError:
executor.shutdown()
pytest.skip('Gremlin Server is not running')
@@ -96,68 +84,16 @@
return client
-@pytest.fixture
-def gremlin_socket_server_serializer(socket_server_settings):
- if socket_server_settings["SERIALIZER"] == "GraphBinaryV1":
- return serializer.GraphBinarySerializersV1()
- elif socket_server_settings["SERIALIZER"] == "GraphSONV2":
- return serializer.GraphSONSerializersV2d0()
- elif socket_server_settings["SERIALIZER"] == "GraphSONV3":
- return serializer.GraphSONSerializersV3d0()
- else:
- return serializer.GraphBinarySerializersV1()
-
-
-@pytest.fixture
-def socket_server_client(request, socket_server_settings, gremlin_socket_server_serializer):
- marker = request.node.get_closest_marker("client_kwargs")
- client_kwargs = marker.args[0] if marker is not None else dict()
- url = gremlin_socket_server_url.format(socket_server_settings["PORT"])
- try:
- client = Client(url, 'g', pool_size=1, message_serializer=gremlin_socket_server_serializer, **client_kwargs)
- except OSError:
- pytest.skip('Gremlin Socket Server is not running')
- else:
- def fin():
- client.close()
-
- request.addfinalizer(fin)
- return client
-
-
-@pytest.fixture
-def socket_server_client_no_user_agent(request, socket_server_settings, gremlin_socket_server_serializer):
- url = gremlin_socket_server_url.format(socket_server_settings["PORT"])
- try:
- client = Client(url, 'g', pool_size=1, message_serializer=gremlin_socket_server_serializer,
- enable_user_agent_on_connect=False)
- except OSError:
- pytest.skip('Gremlin Socket Server is not running')
- else:
- def fin():
- client.close()
-
- request.addfinalizer(fin)
- return client
-
-
-@pytest.fixture
-def socket_server_settings():
- with open(gremlin_socket_server_config_path, mode="rb") as file:
- settings = yaml.safe_load(file)
- return settings
-
-@pytest.fixture(params=['basic', 'kerberos'])
+@pytest.fixture(params=['basic'])
def authenticated_client(request):
try:
if request.param == 'basic':
# turn off certificate verification for testing purposes only
ssl_opts = ssl.SSLContext(ssl.PROTOCOL_TLSv1_2)
ssl_opts.verify_mode = ssl.CERT_NONE
- client = Client(basic_url, 'gmodern', username='stephen', password='password',
- transport_factory=lambda: AiohttpTransport(ssl_options=ssl_opts))
- elif request.param == 'kerberos':
- client = Client(kerberos_url, 'gmodern', kerberized_service=kerberized_service)
+ client = Client(basic_url, 'gmodern',
+ auth=basic('stephen', 'password'),
+ transport_factory=lambda: AiohttpHTTPTransport(ssl_options=ssl_opts))
else:
raise ValueError("Invalid authentication option - " + request.param)
except OSError:
@@ -170,18 +106,22 @@
return client
-@pytest.fixture(params=['graphsonv2', 'graphsonv3', 'graphbinaryv1'])
+@pytest.fixture
+def graphbinary_serializer_v4(request):
+ return GraphBinarySerializersV4()
+
+
+@pytest.fixture(params=['graphbinaryv4','graphsonv4'])
def remote_connection(request):
try:
- if request.param == 'graphbinaryv1':
+ if request.param == 'graphbinaryv4':
remote_conn = DriverRemoteConnection(anonymous_url, 'gmodern',
- message_serializer=serializer.GraphBinarySerializersV1())
- elif request.param == 'graphsonv2':
+ request_serializer=serializer.GraphBinarySerializersV4(),
+ response_serializer=serializer.GraphBinarySerializersV4())
+ elif request.param == 'graphsonv4':
remote_conn = DriverRemoteConnection(anonymous_url, 'gmodern',
- message_serializer=serializer.GraphSONSerializersV2d0())
- elif request.param == 'graphsonv3':
- remote_conn = DriverRemoteConnection(anonymous_url, 'gmodern',
- message_serializer=serializer.GraphSONSerializersV3d0())
+ request_serializer=serializer.GraphSONSerializersV4(),
+ response_serializer=serializer.GraphSONSerializersV4())
else:
raise ValueError("Invalid serializer option - " + request.param)
except OSError:
@@ -194,18 +134,15 @@
return remote_conn
-@pytest.fixture(params=['graphsonv2', 'graphsonv3', 'graphbinaryv1'])
+@pytest.fixture(params=['graphbinaryv4','graphsonv4'])
def remote_connection_crew(request):
try:
- if request.param == 'graphbinaryv1':
+ if request.param == 'graphbinaryv4':
+ remote_conn = DriverRemoteConnection(anonymous_url, 'gcrew')
+ elif request.param == 'graphsonv4':
remote_conn = DriverRemoteConnection(anonymous_url, 'gcrew',
- message_serializer=serializer.GraphBinarySerializersV1())
- elif request.param == 'graphsonv2':
- remote_conn = DriverRemoteConnection(anonymous_url, 'gcrew',
- message_serializer=serializer.GraphSONSerializersV2d0())
- elif request.param == 'graphsonv3':
- remote_conn = DriverRemoteConnection(anonymous_url, 'gcrew',
- message_serializer=serializer.GraphSONSerializersV3d0())
+ request_serializer=serializer.GraphSONSerializersV4(),
+ response_serializer=serializer.GraphSONSerializersV4())
else:
raise ValueError("Invalid serializer option - " + request.param)
except OSError:
@@ -218,31 +155,8 @@
return remote_conn
-@pytest.fixture(params=['graphsonv2', 'graphsonv3', 'graphbinaryv1'])
-def remote_transaction_connection(request):
- try:
- if request.param == 'graphbinaryv1':
- remote_conn = DriverRemoteConnection(anonymous_url, 'gtx',
- message_serializer=serializer.GraphBinarySerializersV1())
- elif request.param == 'graphsonv2':
- remote_conn = DriverRemoteConnection(anonymous_url, 'gtx',
- message_serializer=serializer.GraphSONSerializersV2d0())
- elif request.param == 'graphsonv3':
- remote_conn = DriverRemoteConnection(anonymous_url, 'gtx',
- message_serializer=serializer.GraphSONSerializersV3d0())
- else:
- raise ValueError("Invalid serializer option - " + request.param)
- except OSError:
- pytest.skip('Gremlin Server is not running')
- else:
- def fin():
- remote_conn.close()
-
- request.addfinalizer(fin)
- return remote_conn
-
-
-@pytest.fixture(params=['basic', 'kerberos'])
+# TODO: revisit once testing for multiple types of auth is enabled
+@pytest.fixture(params=['basic'])
def remote_connection_authenticated(request):
try:
if request.param == 'basic':
@@ -250,92 +164,7 @@
ssl_opts = ssl.SSLContext(ssl.PROTOCOL_TLSv1_2)
ssl_opts.verify_mode = ssl.CERT_NONE
remote_conn = DriverRemoteConnection(basic_url, 'gmodern',
- username='stephen', password='password',
- message_serializer=serializer.GraphSONSerializersV2d0(),
- transport_factory=lambda: AiohttpTransport(ssl_options=ssl_opts))
- elif request.param == 'kerberos':
- remote_conn = DriverRemoteConnection(kerberos_url, 'gmodern', kerberized_service=kerberized_service,
- message_serializer=serializer.GraphSONSerializersV2d0())
- else:
- raise ValueError("Invalid authentication option - " + request.param)
- except OSError:
- pytest.skip('Gremlin Server is not running')
- else:
- def fin():
- remote_conn.close()
-
- request.addfinalizer(fin)
- return remote_conn
-
-
-@pytest.fixture
-def remote_connection_graphsonV2(request):
- try:
- remote_conn = DriverRemoteConnection(anonymous_url,
- message_serializer=serializer.GraphSONSerializersV2d0())
- except OSError:
- pytest.skip('Gremlin Server is not running')
- else:
- def fin():
- remote_conn.close()
-
- request.addfinalizer(fin)
- return remote_conn
-
-
-@pytest.fixture
-def graphson_serializer_v2(request):
- return GraphSONSerializersV2d0()
-
-
-@pytest.fixture
-def graphson_serializer_v3(request):
- return GraphSONSerializersV3d0()
-
-
-@pytest.fixture
-def graphbinary_serializer_v1(request):
- return GraphBinarySerializersV1()
-
-
-@pytest.fixture(params=['graphsonv2', 'graphsonv3', 'graphbinaryv1'])
-def remote_connection_http(request):
- try:
- if request.param == 'graphbinaryv1':
- remote_conn = DriverRemoteConnection(anonymous_url_http, 'gmodern',
- message_serializer=serializer.GraphBinarySerializersV1())
- elif request.param == 'graphsonv2':
- remote_conn = DriverRemoteConnection(anonymous_url_http, 'gmodern',
- message_serializer=serializer.GraphSONSerializersV2d0())
- elif request.param == 'graphsonv3':
- remote_conn = DriverRemoteConnection(anonymous_url_http, 'gmodern',
- message_serializer=serializer.GraphSONSerializersV3d0())
- else:
- raise ValueError("Invalid serializer option - " + request.param)
- except OSError:
- pytest.skip('Gremlin Server is not running')
- else:
- def fin():
- remote_conn.close()
-
- request.addfinalizer(fin)
- return remote_conn
-
-
-"""
-# The WsAndHttpChannelizer somehow does not distinguish the ssl handlers so authenticated https remote connection will
-# only work with HttpChannelizer that is currently not in the testing set up, thus this is commented out for now
-
-@pytest.fixture(params=['basic'])
-def remote_connection_http_authenticated(request):
- try:
- if request.param == 'basic':
- # turn off certificate verification for testing purposes only
- ssl_opts = ssl.SSLContext(ssl.PROTOCOL_TLSv1_2)
- ssl_opts.verify_mode = ssl.CERT_NONE
- remote_conn = DriverRemoteConnection(basic_url_http, 'gmodern',
- username='stephen', password='password',
- message_serializer=serializer.GraphSONSerializersV2d0(),
+ auth=basic('stephen', 'password'),
transport_factory=lambda: AiohttpHTTPTransport(ssl_options=ssl_opts))
else:
raise ValueError("Invalid authentication option - " + request.param)
@@ -347,18 +176,13 @@
request.addfinalizer(fin)
return remote_conn
-"""
-@pytest.fixture(params=['graphsonv3', 'graphbinaryv1'])
-def invalid_alias_remote_connection_http(request):
+@pytest.fixture(params=['graphbinaryv4'])
+def invalid_alias_remote_connection(request):
try:
- if request.param == 'graphbinaryv1':
- remote_conn = DriverRemoteConnection(anonymous_url_http, 'does_not_exist',
- message_serializer=serializer.GraphBinarySerializersV1())
- elif request.param == 'graphsonv3':
- remote_conn = DriverRemoteConnection(anonymous_url_http, 'does_not_exist',
- message_serializer=serializer.GraphSONSerializersV3d0())
+ if request.param == 'graphbinaryv4':
+ remote_conn = DriverRemoteConnection(anonymous_url, 'does_not_exist')
else:
raise ValueError("Invalid serializer option - " + request.param)
except OSError:
@@ -369,3 +193,41 @@
request.addfinalizer(fin)
return remote_conn
+
+
+@pytest.fixture()
+def remote_connection_with_interceptor(request):
+ try:
+ remote_conn = DriverRemoteConnection(anonymous_url, 'gmodern',
+ request_serializer=None,
+ interceptors=json_interceptor)
+ except OSError:
+ pytest.skip('Gremlin Server is not running')
+ else:
+ def fin():
+ remote_conn.close()
+
+ request.addfinalizer(fin)
+ return remote_conn
+
+
+@pytest.fixture()
+def client_with_interceptor(request):
+ try:
+ client = Client(anonymous_url, 'gmodern', request_serializer=None,
+ response_serializer=GraphBinarySerializersV4(),
+ interceptors=json_interceptor)
+ except OSError:
+ pytest.skip('Gremlin Server is not running')
+ else:
+ def fin():
+ client.close()
+
+ request.addfinalizer(fin)
+ return client
+
+
+def json_interceptor(request):
+ request['headers']['content-type'] = "application/json"
+ request['payload'] = dumps({"gremlin": "g.inject(2)", "g": "g"})
+ return request
diff --git a/gremlin-python/src/main/python/tests/driver/test_auth.py b/gremlin-python/src/main/python/tests/driver/test_auth.py
new file mode 100644
index 0000000..584cf1e
--- /dev/null
+++ b/gremlin-python/src/main/python/tests/driver/test_auth.py
@@ -0,0 +1,66 @@
+#
+# 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.
+#
+import os
+from aiohttp import BasicAuth as aiohttpBasicAuth
+from gremlin_python.driver.auth import basic, sigv4
+
+
+def create_mock_request():
+ return {'headers':
+ {'content-type': 'application/vnd.graphbinary-v4.0',
+ 'accept': 'application/vnd.graphbinary-v4.0'},
+ 'payload': b'',
+ 'url': 'https://test_url:8182/gremlin'}
+
+
+class TestAuth(object):
+
+ def test_basic_auth_request(self):
+ mock_request = create_mock_request()
+ assert 'authorization' not in mock_request['headers']
+ basic('username', 'password')(mock_request)
+ assert 'authorization' in mock_request['headers']
+ assert aiohttpBasicAuth('username', 'password').encode() == mock_request['headers']['authorization']
+
+ def test_sigv4_auth_request(self):
+ mock_request = create_mock_request()
+ assert 'Authorization' not in mock_request['headers']
+ assert 'X-Amz-Date' not in mock_request['headers']
+ os.environ['AWS_ACCESS_KEY_ID'] = 'MOCK_ID'
+ os.environ['AWS_SECRET_ACCESS_KEY'] = 'MOCK_KEY'
+ sigv4('gremlin-east-1', 'tinkerpop-sigv4')(mock_request)
+ assert mock_request['headers']['X-Amz-Date'] is not None
+ assert mock_request['headers']['Authorization'].startswith('AWS4-HMAC-SHA256 Credential=MOCK_ID')
+ assert 'gremlin-east-1/tinkerpop-sigv4/aws4_request' in mock_request['headers']['Authorization']
+ assert 'Signature=' in mock_request['headers']['Authorization']
+
+ def test_sigv4_auth_request_session_token(self):
+ mock_request = create_mock_request()
+ assert 'Authorization' not in mock_request['headers']
+ assert 'X-Amz-Date' not in mock_request['headers']
+ assert 'X-Amz-Security-Token' not in mock_request['headers']
+ os.environ['AWS_SESSION_TOKEN'] = 'MOCK_TOKEN'
+ sigv4('gremlin-east-1', 'tinkerpop-sigv4')(mock_request)
+ assert mock_request['headers']['X-Amz-Date'] is not None
+ assert mock_request['headers']['Authorization'].startswith('AWS4-HMAC-SHA256 Credential=')
+ assert mock_request['headers']['X-Amz-Security-Token'] == 'MOCK_TOKEN'
+ assert 'gremlin-east-1/tinkerpop-sigv4/aws4_request' in mock_request['headers']['Authorization']
+ assert 'Signature=' in mock_request['headers']['Authorization']
+
+
diff --git a/gremlin-python/src/main/python/tests/driver/test_client.py b/gremlin-python/src/main/python/tests/driver/test_client.py
index aec6ff9..88dda3a 100644
--- a/gremlin-python/src/main/python/tests/driver/test_client.py
+++ b/gremlin-python/src/main/python/tests/driver/test_client.py
@@ -21,76 +21,118 @@
import threading
import uuid
-from gremlin_python.driver import serializer
+import pytest
from gremlin_python.driver.client import Client
from gremlin_python.driver.protocol import GremlinServerError
from gremlin_python.driver.request import RequestMessage
+from gremlin_python.driver.serializer import GraphBinarySerializersV4
from gremlin_python.process.graph_traversal import __, GraphTraversalSource
-from gremlin_python.process.traversal import TraversalStrategies
+from gremlin_python.process.traversal import TraversalStrategies, GValue
from gremlin_python.process.strategies import OptionsStrategy
from gremlin_python.structure.graph import Graph, Vertex
-from gremlin_python.driver.aiohttp.transport import AiohttpTransport
+from gremlin_python.driver.aiohttp.transport import AiohttpHTTPTransport
from gremlin_python.statics import *
from asyncio import TimeoutError
__author__ = 'David M. Brown (davebshow@gmail.com)'
-gremlin_server_url = os.environ.get('GREMLIN_SERVER_URL', 'ws://localhost:{}/gremlin')
+gremlin_server_url = os.environ.get('GREMLIN_SERVER_URL', 'http://localhost:{}/gremlin')
test_no_auth_url = gremlin_server_url.format(45940)
+def create_basic_request_message(traversal, source='gmodern'):
+ return RequestMessage(fields={'g': source}, gremlin=traversal.gremlin_lang.get_gremlin())
+
+
def test_connection(connection):
g = GraphTraversalSource(Graph(), TraversalStrategies())
t = g.V()
- message = RequestMessage('traversal', 'bytecode', {'gremlin': t.bytecode, 'aliases': {'g': 'gmodern'}})
+ message = create_basic_request_message(t)
results_set = connection.write(message).result()
future = results_set.all()
results = future.result()
assert len(results) == 6
assert isinstance(results, list)
assert results_set.done.done()
- assert 'host' in results_set.status_attributes
-
+# TODO: revisit after max_content_length definition/implementation is updated
def test_client_message_too_big(client):
try:
- client = Client(test_no_auth_url, 'g', max_content_length=4096)
- client.submit("\" \"*8000").all().result()
+ client = Client(test_no_auth_url, 'g', max_content_length=1024)
+ client.submit("g.inject(' ').repeat(concat(' ')).times(1234)").all().result()
assert False
except Exception as ex:
- assert ex.args[0].startswith("Received error on read: 'Message size") \
- and ex.args[0].endswith("exceeds limit 4096'")
+ assert ex.args[0].startswith('Response size') \
+ and ex.args[0].endswith('exceeds limit 1024 bytes')
# confirm the client instance is still usable and not closed
- assert ["test"] == client.submit("'test'").all().result()
+ assert ["test"] == client.submit("g.inject('test')").all().result()
finally:
client.close()
+def test_client_large_result(client):
+ result_set = client.submit("[\" \".repeat(200000), \" \".repeat(100000)]", request_options={'language': 'gremlin-groovy'}).all().result()
+ assert len(result_set[0]) == 200000
+ assert len(result_set[1]) == 100000
+
+
+def test_client_script_submission(client):
+ assert len(client.submit("g.inject(0).repeat(inject(0)).times(99)").all().result()) == 100
+
+
def test_client_simple_eval(client):
- assert client.submit('1 + 1').all().result()[0] == 2
+ assert client.submit('g.inject(2)').all().result()[0] == 2
def test_client_simple_eval_bindings(client):
- assert client.submit('x + x', {'x': 2}).all().result()[0] == 4
+ assert client.submit('g.V(x).values("age")', {'x': 1}).all().result()[0] == 29
def test_client_eval_traversal(client):
assert len(client.submit('g.V()').all().result()) == 6
+def test_client_eval_traversal_bindings(client):
+ assert client.submit('g.V(x).values("name")', bindings={'x': 1}).all().result()[0] == 'marko'
+
+
+def test_client_eval_traversal_request_options_bindings(client):
+ assert client.submit('g.V(x).values("name")', request_options={'bindings': {'x': 1}}).all().result()[0] == 'marko'
+
+
+def test_client_eval_traversal_bindings_request_options_bindings(client):
+ # Note that parameters from request_options[bindings] is applied later and will replace bindings if key is the same
+ assert client.submit('g.V(x).values("name")', bindings={'x': 1},
+ request_options={'bindings': {'x': 2}}).all().result()[0] == 'vadas'
+
+
def test_client_error(client):
try:
# should fire an exception
- client.submit('1/0').all().result()
+ client.submit('g.inject(1).math("_/0")').all().result()
assert False
except GremlinServerError as ex:
- assert 'exceptions' in ex.status_attributes
- assert 'stackTrace' in ex.status_attributes
+ assert ex.status_message.endswith('Division by zero!')
+ assert ex.status_exception
assert str(ex) == f"{ex.status_code}: {ex.status_message}"
# still can submit after failure
- assert client.submit('x + x', {'x': 2}).all().result()[0] == 4
+ assert client.submit('g.V(x).values("age")', {'x': 1}).all().result()[0] == 29
+
+
+def test_bad_serialization(client):
+ try:
+ # should timeout
+ client.submit('java.awt.Color.RED', request_options={'language': 'gremlin-groovy'}).all().result()
+ assert False
+ except GremlinServerError as ex:
+ assert ex.status_message
+ assert ex.status_exception
+ assert str(ex) == f"{ex.status_code}: {ex.status_message}"
+
+ # still can submit after failure
+ assert client.submit('g.V(x).values("age")', {'x': 1}).all().result()[0] == 29
def test_client_connection_pool_after_error(client):
@@ -99,55 +141,55 @@
try:
# should fire an exception
- client.submit('1/0').all().result()
+ client.submit('g.inject(1).math("_/0")').all().result()
assert False
except GremlinServerError as gse:
# expecting the pool size to be 1 again after query returned
- assert gse.status_code == 597
+ assert gse.status_code == 500
assert client.available_pool_size == 1
# still can submit after failure
- assert client.submit('x + x', {'x': 2}).all().result()[0] == 4
+ assert client.submit('g.V(x).values("age")', {'x': 1}).all().result()[0] == 29
def test_client_no_hang_if_submit_on_closed(client):
- assert client.submit('1 + 1').all().result()[0] == 2
+ assert client.submit('g.inject(2)').all().result()[0] == 2
client.close()
try:
# should fail since not hang if closed
- client.submit('1 + 1').all().result()
+ client.submit('g.inject(2)').all().result()
assert False
except Exception as ex:
assert True
def test_client_close_all_connection_in_pool(client):
- client = Client(test_no_auth_url, 'g', pool_size=1, session="75e9620e-da98-41e3-9378-0336db803de0")
+ client = Client(test_no_auth_url, 'g', pool_size=1)
assert client.available_pool_size == 1
- client.submit('2+2').all().result()
+ client.submit('g.inject(4)').all().result()
client.close()
assert client.available_pool_size == 0
def test_client_side_timeout_set_for_aiohttp(client):
client = Client(test_no_auth_url, 'gmodern',
- transport_factory=lambda: AiohttpTransport(read_timeout=1, write_timeout=1))
+ transport_factory=lambda: AiohttpHTTPTransport(read_timeout=1, write_timeout=1))
try:
# should fire an exception
- client.submit('Thread.sleep(2000);1').all().result()
+ client.submit('Thread.sleep(2000);1', request_options={'language': 'gremlin-groovy'}).all().result()
assert False
except TimeoutError as err:
# asyncio TimeoutError has no message.
assert str(err) == ""
# still can submit after failure
- assert client.submit('x + x', {'x': 2}).all().result()[0] == 4
+ assert client.submit('g.V(x).values("age")', {'x': 1}).all().result()[0] == 29
async def async_connect(enable):
try:
- transport = AiohttpTransport(call_from_event_loop=enable)
+ transport = AiohttpHTTPTransport(call_from_event_loop=enable)
transport.connect(test_no_auth_url)
transport.close()
return True
@@ -160,7 +202,7 @@
assert asyncio.get_event_loop().run_until_complete(async_connect(True))
-def test_client_gremlin(client):
+def test_client_submit(client):
result_set = client.submit('g.V(1)')
result = result_set.all().result()
assert 1 == len(result)
@@ -192,33 +234,52 @@
assert 0 == len(vp.properties)
-def test_client_bytecode(client):
+def test_client_gremlin_lang(client):
g = GraphTraversalSource(Graph(), TraversalStrategies())
t = g.V()
- message = RequestMessage('traversal', 'bytecode', {'gremlin': t.bytecode, 'aliases': {'g': 'gmodern'}})
+ message = create_basic_request_message(t)
result_set = client.submit(message)
assert len(result_set.all().result()) == 6
-def test_client_bytecode_options(client):
+def test_client_gremlin_lang_options(client):
# smoke test to validate serialization of OptionsStrategy. no way to really validate this from an integration
# test perspective because there's no way to access the internals of the strategy via bytecode
g = GraphTraversalSource(Graph(), TraversalStrategies())
- t = g.withStrategies(OptionsStrategy(**{"x": "test", "y": True})).V()
- message = RequestMessage('traversal', 'bytecode', {'gremlin': t.bytecode, 'aliases': {'g': 'gmodern'}})
+ t = g.with_strategies(OptionsStrategy(**{"x": "test", "y": True})).V()
+ message = create_basic_request_message(t)
result_set = client.submit(message)
assert len(result_set.all().result()) == 6
##
t = g.with_("x", "test").with_("y", True).V()
- message = RequestMessage('traversal', 'bytecode', {'gremlin': t.bytecode, 'aliases': {'g': 'gmodern'}})
+ message = create_basic_request_message(t)
result_set = client.submit(message)
assert len(result_set.all().result()) == 6
+def test_client_gremlin_lang_request_options_with_binding(client):
+ g = GraphTraversalSource(Graph(), TraversalStrategies())
+ # Note that bindings for constructed traversals is done via Parameter only
+ t = g.with_('language', 'gremlin-lang').V(GValue('x', [1, 2, 3])).count()
+ request_opts = {'language': 'gremlin-lang', 'params': {'x': [1, 2, 3]}}
+ message = create_basic_request_message(t)
+ result_set = client.submit(message, request_options=request_opts)
+ assert result_set.all().result()[0] == 3
+ # We can re-use the extracted request options in script submission
+ result_set = client.submit('g.V(x).values("name")', request_options=request_opts)
+ assert result_set.all().result()[0] == 'marko'
+ # For script submission only, we can also add bindings to request options and they will be applied
+ request_opts['bindings'] = {'y': 4}
+ result_set = client.submit('g.V(y).values("name")', request_options=request_opts)
+ assert result_set.all().result()[0] == 'josh'
+ result_set = client.submit('g.V(z).values("name")', bindings={'z': 5}, request_options=request_opts)
+ assert result_set.all().result()[0] == 'ripple'
+
+
def test_iterate_result_set(client):
g = GraphTraversalSource(Graph(), TraversalStrategies())
t = g.V()
- message = RequestMessage('traversal', 'bytecode', {'gremlin': t.bytecode, 'aliases': {'g': 'gmodern'}})
+ message = create_basic_request_message(t)
result_set = client.submit(message)
results = []
for result in result_set:
@@ -229,7 +290,7 @@
def test_client_async(client):
g = GraphTraversalSource(Graph(), TraversalStrategies())
t = g.V()
- message = RequestMessage('traversal', 'bytecode', {'gremlin': t.bytecode, 'aliases': {'g': 'gmodern'}})
+ message = create_basic_request_message(t)
future = client.submit_async(message)
result_set = future.result()
assert len(result_set.all().result()) == 6
@@ -240,8 +301,8 @@
client = Client(test_no_auth_url, 'gmodern', pool_size=1)
g = GraphTraversalSource(Graph(), TraversalStrategies())
t = g.V()
- message = RequestMessage('traversal', 'bytecode', {'gremlin': t.bytecode, 'aliases': {'g': 'gmodern'}})
- message2 = RequestMessage('traversal', 'bytecode', {'gremlin': t.bytecode, 'aliases': {'g': 'gmodern'}})
+ message = create_basic_request_message(t)
+ message2 = create_basic_request_message(t)
future = client.submit_async(message)
future2 = client.submit_async(message2)
@@ -257,8 +318,8 @@
def test_multi_conn_pool(client):
g = GraphTraversalSource(Graph(), TraversalStrategies())
t = g.V()
- message = RequestMessage('traversal', 'bytecode', {'gremlin': t.bytecode, 'aliases': {'g': 'gmodern'}})
- message2 = RequestMessage('traversal', 'bytecode', {'gremlin': t.bytecode, 'aliases': {'g': 'gmodern'}})
+ message = create_basic_request_message(t)
+ message2 = create_basic_request_message(t)
client = Client(test_no_auth_url, 'g', pool_size=1)
future = client.submit_async(message)
future2 = client.submit_async(message2)
@@ -285,7 +346,7 @@
condition = threading.Condition()
def thread_run(tr, result_list):
- message = RequestMessage('traversal', 'bytecode', {'gremlin': tr.bytecode, 'aliases': {'g': 'gmodern'}})
+ message = create_basic_request_message(tr)
with condition:
condition.wait(5)
result_set = client.submit(message)
@@ -307,76 +368,51 @@
t.join(5)
assert len(results[0][0]) == 6
- assert results[1][0][0].object == 6
+ assert results[1][0][0] == 6
assert len(results[2][0]) == 6
- assert results[3][0][0].object == 6
+ assert results[3][0][0] == 6
-def test_client_bytecode_with_short(client):
+
+def test_client_gremlin_lang_with_short(client):
g = GraphTraversalSource(Graph(), TraversalStrategies())
- t = g.V().has('age', short(16)).count()
- message = RequestMessage('traversal', 'bytecode', {'gremlin': t.bytecode, 'aliases': {'g': 'gmodern'}})
- result_set = client.submit(message)
+ t = g.with_('language', 'gremlin-lang').V().has('age', short(16)).count()
+ request_opts = {'language': 'gremlin-lang'}
+ message = create_basic_request_message(t)
+ result_set = client.submit(message, request_options=request_opts)
results = []
for result in result_set:
results += result
assert len(results) == 1
-def test_client_bytecode_with_long(client):
+
+def test_client_gremlin_lang_with_long(client):
g = GraphTraversalSource(Graph(), TraversalStrategies())
t = g.V().has('age', long(851401972585122)).count()
- message = RequestMessage('traversal', 'bytecode', {'gremlin': t.bytecode, 'aliases': {'g': 'gmodern'}})
- result_set = client.submit(message)
+ request_opts = {}
+ message = create_basic_request_message(t)
+ result_set = client.submit(message, request_options=request_opts)
results = []
for result in result_set:
results += result
assert len(results) == 1
-def test_client_bytecode_with_bigint(client):
+def test_client_gremlin_lang_with_bigint(client):
g = GraphTraversalSource(Graph(), TraversalStrategies())
- t = g.V().has('age', bigint(0x1000_0000_0000_0000_0000)).count()
- message = RequestMessage('traversal', 'bytecode', {'gremlin': t.bytecode, 'aliases': {'g': 'gmodern'}})
- result_set = client.submit(message)
+ t = g.with_('language', 'gremlin-lang').V().has('age', bigint(0x1000_0000_0000_0000_0000)).count()
+ request_opts = {'language': 'gremlin-lang'}
+ message = create_basic_request_message(t)
+ result_set = client.submit(message, request_options=request_opts)
results = []
for result in result_set:
results += result
assert len(results) == 1
-def test_multi_request_in_session(client):
- # Overwrite fixture with session client
- session_id = str(uuid.uuid4())
- client = Client(test_no_auth_url, 'g', session=session_id)
-
- assert client.submit('x = 1').all().result()[0] == 1
- assert client.submit('x + 2').all().result()[0] == 3
-
- client.close()
-
- # attempt reconnect to session and make sure "x" is no longer a thing
- client = Client(test_no_auth_url, 'g', session=session_id)
- try:
- # should fire an exception
- client.submit('x').all().result()
- assert False
- except Exception:
- assert True
-
-
-def test_client_pool_in_session(client):
- # Overwrite fixture with pool_size=2 client
- try:
- # should fire an exception
- client = Client(test_no_auth_url, 'g', session=str(uuid.uuid4()), pool_size=2)
- assert False
- except Exception:
- assert True
-
-
def test_big_result_set(client):
g = GraphTraversalSource(Graph(), TraversalStrategies())
- t = g.inject(1).repeat(__.addV('person').property('name', __.loops())).times(20000).count()
- message = RequestMessage('traversal', 'bytecode', {'gremlin': t.bytecode, 'aliases': {'g': 'g'}})
+ t = g.inject(1).repeat(__.add_v('person').property('name', __.loops())).times(20000).count()
+ message = create_basic_request_message(t, source='g')
result_set = client.submit(message)
results = []
for result in result_set:
@@ -384,7 +420,7 @@
assert len(results) == 1
t = g.V().limit(10)
- message = RequestMessage('traversal', 'bytecode', {'gremlin': t.bytecode, 'aliases': {'g': 'g'}})
+ message = create_basic_request_message(t, source='g')
result_set = client.submit(message)
results = []
for result in result_set:
@@ -392,7 +428,7 @@
assert len(results) == 10
t = g.V().limit(100)
- message = RequestMessage('traversal', 'bytecode', {'gremlin': t.bytecode, 'aliases': {'g': 'g'}})
+ message = create_basic_request_message(t, source='g')
result_set = client.submit(message)
results = []
for result in result_set:
@@ -400,7 +436,7 @@
assert len(results) == 100
t = g.V().limit(1000)
- message = RequestMessage('traversal', 'bytecode', {'gremlin': t.bytecode, 'aliases': {'g': 'g'}})
+ message = create_basic_request_message(t, source='g')
result_set = client.submit(message)
results = []
for result in result_set:
@@ -408,7 +444,7 @@
assert len(results) == 1000
t = g.V().limit(10000)
- message = RequestMessage('traversal', 'bytecode', {'gremlin': t.bytecode, 'aliases': {'g': 'g'}})
+ message = create_basic_request_message(t, source='g')
result_set = client.submit(message)
results = []
for result in result_set:
@@ -418,8 +454,8 @@
def test_big_result_set_secure(authenticated_client):
g = GraphTraversalSource(Graph(), TraversalStrategies())
- t = g.inject(1).repeat(__.addV('person').property('name', __.loops())).times(20000).count()
- message = RequestMessage('traversal', 'bytecode', {'gremlin': t.bytecode, 'aliases': {'g': 'g'}})
+ t = g.inject(1).repeat(__.add_v('person').property('name', __.loops())).times(20000).count()
+ message = create_basic_request_message(t, source='g')
result_set = authenticated_client.submit(message)
results = []
for result in result_set:
@@ -427,7 +463,7 @@
assert len(results) == 1
t = g.V().limit(10)
- message = RequestMessage('traversal', 'bytecode', {'gremlin': t.bytecode, 'aliases': {'g': 'g'}})
+ message = create_basic_request_message(t, source='g')
result_set = authenticated_client.submit(message)
results = []
for result in result_set:
@@ -435,7 +471,7 @@
assert len(results) == 10
t = g.V().limit(100)
- message = RequestMessage('traversal', 'bytecode', {'gremlin': t.bytecode, 'aliases': {'g': 'g'}})
+ message = create_basic_request_message(t, source='g')
result_set = authenticated_client.submit(message)
results = []
for result in result_set:
@@ -443,7 +479,7 @@
assert len(results) == 100
t = g.V().limit(1000)
- message = RequestMessage('traversal', 'bytecode', {'gremlin': t.bytecode, 'aliases': {'g': 'g'}})
+ message = create_basic_request_message(t, source='g')
result_set = authenticated_client.submit(message)
results = []
for result in result_set:
@@ -451,7 +487,7 @@
assert len(results) == 1000
t = g.V().limit(10000)
- message = RequestMessage('traversal', 'bytecode', {'gremlin': t.bytecode, 'aliases': {'g': 'g'}})
+ message = create_basic_request_message(t, source='g')
result_set = authenticated_client.submit(message)
results = []
for result in result_set:
@@ -470,48 +506,67 @@
assert False
+# TODO: tests pass because requestID is now generated on HTTP server and this option gets ignored, tests to be removed
+# or updated depending on if we still want to use requestID or not
+@pytest.mark.skip(reason="requestID is generated on server side only, disable for now")
def test_client_custom_invalid_request_id_graphson_script(client):
- client = Client(test_no_auth_url, 'gmodern', message_serializer=serializer.GraphSONSerializersV3d0())
+ client = Client(test_no_auth_url, 'gmodern')
try:
- client.submit('g.V()', request_options={"requestId":"malformed"}).all().result()
+ client.submit('g.V()', request_options={"requestId": "malformed"}).all().result()
except Exception as ex:
assert "badly formed hexadecimal UUID string" in str(ex)
+@pytest.mark.skip(reason="requestID is generated on server side only, disable for now")
def test_client_custom_invalid_request_id_graphbinary_script(client):
- client = Client(test_no_auth_url, 'gmodern', message_serializer=serializer.GraphBinarySerializersV1())
+ client = Client(test_no_auth_url, 'gmodern')
try:
- client.submit('g.V()', request_options={"requestId":"malformed"}).all().result()
+ client.submit('g.V()', request_options={"requestId": "malformed"}).all().result()
except Exception as ex:
assert "badly formed hexadecimal UUID string" in str(ex)
+@pytest.mark.skip(reason="requestID is generated on server side only, disable for now")
def test_client_custom_valid_request_id_script_uuid(client):
- assert len(client.submit('g.V()', request_options={"requestId":uuid.uuid4()}).all().result()) == 6
+ assert len(client.submit('g.V()', request_options={"requestId": uuid.uuid4()}).all().result()) == 6
+@pytest.mark.skip(reason="requestID is generated on server side only, disable for now")
def test_client_custom_valid_request_id_script_string(client):
- assert len(client.submit('g.V()', request_options={"requestId":str(uuid.uuid4())}).all().result()) == 6
+ assert len(client.submit('g.V()', request_options={"requestId": str(uuid.uuid4())}).all().result()) == 6
+@pytest.mark.skip(reason="requestID is generated on server side only, disable for now")
def test_client_custom_invalid_request_id_graphson_bytecode(client):
- client = Client(test_no_auth_url, 'gmodern', message_serializer=serializer.GraphSONSerializersV3d0())
+ client = Client(test_no_auth_url, 'gmodern')
query = GraphTraversalSource(Graph(), TraversalStrategies()).V().bytecode
try:
- client.submit(query, request_options={"requestId":"malformed"}).all().result()
+ client.submit(query, request_options={"requestId": "malformed"}).all().result()
except Exception as ex:
assert "badly formed hexadecimal UUID string" in str(ex)
+@pytest.mark.skip(reason="requestID is generated on server side only, disable for now")
def test_client_custom_invalid_request_id_graphbinary_bytecode(client):
- client = Client(test_no_auth_url, 'gmodern', message_serializer=serializer.GraphBinarySerializersV1())
+ client = Client(test_no_auth_url, 'gmodern')
query = GraphTraversalSource(Graph(), TraversalStrategies()).V().bytecode
try:
- client.submit(query, request_options={"requestId":"malformed"}).all().result()
+ client.submit(query, request_options={"requestId": "malformed"}).all().result()
except Exception as ex:
assert "badly formed hexadecimal UUID string" in str(ex)
+@pytest.mark.skip(reason="requestID is generated on server side only, disable for now")
def test_client_custom_valid_request_id_bytecode(client):
query = GraphTraversalSource(Graph(), TraversalStrategies()).V().bytecode
assert len(client.submit(query).all().result()) == 6
+
+def test_response_serializer_never_None():
+ client = Client('url', 'g', response_serializer=None)
+ resp_ser = client.response_serializer()
+ assert resp_ser is not None
+
+
+def test_serializer_and_interceptor_forwarded(client_with_interceptor):
+ result = client_with_interceptor.submit("g.inject(1)").next()
+ assert [2] == result # interceptor changes request to g.inject(2)
diff --git a/gremlin-python/src/main/python/tests/driver/test_driver_remote_connection.py b/gremlin-python/src/main/python/tests/driver/test_driver_remote_connection.py
index 346d5ff..f33ebfd 100644
--- a/gremlin-python/src/main/python/tests/driver/test_driver_remote_connection.py
+++ b/gremlin-python/src/main/python/tests/driver/test_driver_remote_connection.py
@@ -18,43 +18,43 @@
#
import os
+import pytest
+
from gremlin_python import statics
from gremlin_python.driver.driver_remote_connection import DriverRemoteConnection
-from gremlin_python.driver.protocol import GremlinServerError
-from gremlin_python.statics import long, bigint
-from gremlin_python.process.traversal import Traverser, Operator, Barrier
-from gremlin_python.process.traversal import TraversalStrategy
-from gremlin_python.process.traversal import Bindings
-from gremlin_python.process.traversal import P, Order, T
+from gremlin_python.statics import long
+from gremlin_python.process.traversal import TraversalStrategy, P, Order, T, DT, GValue, Cardinality
from gremlin_python.process.graph_traversal import __
from gremlin_python.process.anonymous_traversal import traversal
from gremlin_python.structure.graph import Vertex
-from gremlin_python.process.strategies import SubgraphStrategy, ReservedKeysVerificationStrategy, SeedStrategy
+from gremlin_python.process.strategies import SubgraphStrategy, SeedStrategy, ReservedKeysVerificationStrategy
from gremlin_python.structure.io.util import HashableDict
-from gremlin_python.driver.serializer import GraphSONSerializersV2d0
+from gremlin_python.driver.protocol import GremlinServerError
+from gremlin_python.driver import serializer
-__author__ = 'Marko A. Rodriguez (http://markorodriguez.com)'
-
-from tests.conftest import anonymous_url
-
-gremlin_server_url = os.environ.get('GREMLIN_SERVER_URL', 'ws://localhost:{}/gremlin')
+gremlin_server_url = os.environ.get('GREMLIN_SERVER_URL', 'http://localhost:{}/')
test_no_auth_url = gremlin_server_url.format(45940)
-class TestDriverRemoteConnection(object):
- def test_traversals(self, remote_connection):
- statics.load_statics(globals())
- g = traversal().with_(remote_connection)
- assert long(6) == g.V().count().toList()[0]
+class TestDriverRemoteConnection(object):
+
+ # this is a temporary test for basic graphSONV4 connectivity, once all types are implemented, enable graphSON testing
+ # in conftest.py and remove this
+ def test_graphSONV4_temp(self):
+ remote_conn = DriverRemoteConnection(test_no_auth_url, 'gmodern',
+ request_serializer=serializer.GraphSONSerializersV4(),
+ response_serializer=serializer.GraphSONSerializersV4())
+ g = traversal().with_(remote_conn)
+ assert long(6) == g.V().count().to_list()[0]
# #
assert Vertex(1) == g.V(1).next()
assert Vertex(1) == g.V(Vertex(1)).next()
assert 1 == g.V(1).id_().next()
- assert Traverser(Vertex(1)) == g.V(1).nextTraverser()
- assert 1 == len(g.V(1).toList())
- assert isinstance(g.V(1).toList(), list)
+ # assert Traverser(Vertex(1)) == g.V(1).nextTraverser() # TODO check back after bulking added back
+ assert 1 == len(g.V(1).to_list())
+ assert isinstance(g.V(1).to_list(), list)
results = g.V().repeat(__.out()).times(2).name
- results = results.toList()
+ results = results.to_list()
assert 2 == len(results)
assert "lop" in results
assert "ripple" in results
@@ -65,18 +65,14 @@
assert 4 == g.V()[2:].count().next()
assert 2 == g.V()[:2].count().next()
# #
- results = g.withSideEffect('a', ['josh', 'peter']).V(1).out('created').in_('created').values('name').where(P.within('a')).toList()
+ results = g.with_side_effect('a', ['josh', 'peter']).V(1).out('created').in_('created').values('name').where(
+ P.within('a')).to_list()
assert 2 == len(results)
assert 'josh' in results
assert 'peter' in results
# #
- results = g.V().out().profile().toList()
- assert 1 == len(results)
- assert 'metrics' in results[0]
- assert 'dur' in results[0]
- # #
results = g.V().has('name', 'peter').as_('a').out('created').as_('b').select('a', 'b').by(
- __.valueMap()).toList()
+ __.value_map()).to_list()
assert 1 == len(results)
assert 'peter' == results[0]['a']['name'][0]
assert 35 == results[0]['a']['age'][0]
@@ -85,33 +81,115 @@
assert 2 == len(results[0]['a'])
assert 2 == len(results[0]['b'])
# #
- results = g.V(1).inject(g.V(2).next()).values('name').toList()
+ results = g.V(1, 2).inject().values('name').to_list()
assert 2 == len(results)
assert 'marko' in results
assert 'vadas' in results
# #
- results = g.V().has('person', 'name', 'marko').map(lambda: ("it.get().value('name')", "gremlin-groovy")).toList()
- assert 1 == len(results)
- assert 'marko' in results
- # #
# this test just validates that the underscored versions of steps conflicting with Gremlin work
# properly and can be removed when the old steps are removed - TINKERPOP-2272
results = g.V().filter_(__.values('age').sum_().and_(
__.max_().is_(P.gt(0)), __.min_().is_(P.gt(0)))).range_(0, 1).id_().next()
assert 1 == results
# #
- # test binding in P
- results = g.V().has('person', 'age', Bindings.of('x', P.lt(30))).count().next()
- assert 2 == results
- # #
- # test dict keys which can only work on GraphBinary and GraphSON3 which include specific serialization
+ # test dict keys
# types for dict
- if not isinstance(remote_connection._client._message_serializer, GraphSONSerializersV2d0):
- results = g.V().has('person', 'name', 'marko').elementMap("name").groupCount().next()
- assert {HashableDict.of({T.id: 1, T.label: 'person', 'name': 'marko'}): 1} == results
- if not isinstance(remote_connection._client._message_serializer, GraphSONSerializersV2d0):
- results = g.V().has('person', 'name', 'marko').both('knows').groupCount().by(__.values('name').fold()).next()
- assert {tuple(['vadas']): 1, tuple(['josh']): 1} == results
+ results = g.V().has('person', 'name', 'marko').element_map("name").group_count().next()
+ assert {HashableDict.of({T.id: 1, T.label: 'person', 'name': 'marko'}): 1} == results
+ results = g.V().has('person', 'name', 'marko').both('knows').group_count().by(__.values('name').fold()).next()
+ assert {tuple(['vadas']): 1, tuple(['josh']): 1} == results
+
+ def test_bulk_request_option(self, remote_connection):
+ g = traversal().with_(remote_connection)
+ result = g.inject(1,2,3,2,1).to_list()
+ assert 5 == len(result)
+ bulked_results = g.with_("language", "gremlin-lang").with_("bulkResults", True).inject(1,2,3,2,1).to_list()
+ assert 5 == len(bulked_results)
+
+ def test_extract_request_options(self, remote_connection):
+ g = traversal().with_(remote_connection)
+ t = g.with_("evaluationTimeout", 1000).with_("batchSize", 100).V().count()
+ assert remote_connection.extract_request_options(t.gremlin_lang) == {'batchSize': 100,
+ 'evaluationTimeout': 1000,
+ 'bulkResults': True}
+ assert 6 == t.to_list()[0]
+
+ @pytest.mark.skip(reason="investigate why 'ids' parameter name fails to parse in gremlin-lang")
+ def test_extract_request_options_with_params(self, remote_connection):
+ g = traversal().with_(remote_connection)
+ t = g.with_("evaluationTimeout",
+ 1000).with_("batchSize", 100).with_("userAgent",
+ "test").V(GValue('ids', [1, 2, 3])).count()
+ assert remote_connection.extract_request_options(t.gremlin_lang) == {'batchSize': 100,
+ 'evaluationTimeout': 1000,
+ 'userAgent': 'test',
+ 'bulkResults': True,
+ 'params': {'ids': [1, 2, 3]}}
+ assert 3 == t.to_list()[0]
+
+ def test_traversals(self, remote_connection):
+ statics.load_statics(globals())
+ g = traversal().with_(remote_connection)
+
+ assert long(6) == g.V().count().to_list()[0]
+ # #
+ assert Vertex(1) == g.V(1).next()
+ assert Vertex(1) == g.V(Vertex(1)).next()
+ assert 1 == g.V(1).id_().next()
+ # assert Traverser(Vertex(1)) == g.V(1).nextTraverser() # TODO check back after bulking added back
+ assert 1 == len(g.V(1).to_list())
+ assert isinstance(g.V(1).to_list(), list)
+ results = g.V().repeat(__.out()).times(2).name
+ results = results.to_list()
+ assert 2 == len(results)
+ assert "lop" in results
+ assert "ripple" in results
+ # #
+ assert 10 == g.V().repeat(__.both()).times(5)[0:10].count().next()
+ assert 1 == g.V().repeat(__.both()).times(5)[0:1].count().next()
+ assert 0 == g.V().repeat(__.both()).times(5)[0:0].count().next()
+ assert 4 == g.V()[2:].count().next()
+ assert 2 == g.V()[:2].count().next()
+ # #
+ results = g.with_side_effect('a', ['josh', 'peter']).V(1).out('created').in_('created').values('name').where(
+ P.within('a')).to_list()
+ assert 2 == len(results)
+ assert 'josh' in results
+ assert 'peter' in results
+ # #
+ # # todo: enable when profile/explain serialization is implemented
+ # results = g.V().out().profile().to_list()
+ # assert 1 == len(results)
+ # assert 'metrics' in results[0]
+ # assert 'dur' in results[0]
+ # #
+ results = g.V().has('name', 'peter').as_('a').out('created').as_('b').select('a', 'b').by(
+ __.value_map()).to_list()
+ assert 1 == len(results)
+ assert 'peter' == results[0]['a']['name'][0]
+ assert 35 == results[0]['a']['age'][0]
+ assert 'lop' == results[0]['b']['name'][0]
+ assert 'java' == results[0]['b']['lang'][0]
+ assert 2 == len(results[0]['a'])
+ assert 2 == len(results[0]['b'])
+ # #
+ results = g.V(1, 2).values('name').to_list()
+ assert 2 == len(results)
+ assert 'marko' in results
+ assert 'vadas' in results
+ # #
+ # this test just validates that the underscored versions of steps conflicting with Gremlin work
+ # properly and can be removed when the old steps are removed - TINKERPOP-2272
+ results = g.V().filter_(__.values('age').sum_().and_(
+ __.max_().is_(P.gt(0)), __.min_().is_(P.gt(0)))).range_(0, 1).id_().next()
+ assert 1 == results
+ # #
+ # test dict keys
+ # types for dict
+ results = g.V().has('person', 'name', 'marko').element_map("name").group_count().next()
+ assert {HashableDict.of({T.id: 1, T.label: 'person', 'name': 'marko'}): 1} == results
+ results = g.V().has('person', 'name', 'marko').both('knows').group_count().by(__.values('name').fold()).next()
+ assert {tuple(['vadas']): 1, tuple(['josh']): 1} == results
# #
# test materializeProperties in V - GraphSON will deserialize into None and GraphBinary to []
results = g.with_("materializeProperties", "tokens").V().to_list()
@@ -129,61 +207,50 @@
assert vp.properties is None or len(vp.properties) == 0
# #
# test materializeProperties in Path - GraphSON will deserialize into None and GraphBinary to []
- p = g.with_("materializeProperties", "tokens").V().has('name', 'marko').outE().inV().has_label('software').path().next()
- assert 3 == len(p.objects)
- assert p.objects[0].properties is None or len(p.objects[0].properties) == 0
- assert p.objects[1].properties is None or len(p.objects[1].properties) == 0
- assert p.objects[2].properties is None or len(p.objects[2].properties) == 0
+ # p = g.with_("materializeProperties", "tokens").V().has('name', 'marko').outE().inV().has_label('software').path().next()
+ # assert 3 == len(p.objects)
+ # assert p.objects[0].properties is None or len(p.objects[0].properties) == 0
+ # assert p.objects[1].properties is None or len(p.objects[1].properties) == 0
+ # assert p.objects[2].properties is None or len(p.objects[2].properties) == 0
# #
# test materializeProperties in Path - 'all' should materialize properties on each element
- p = g.with_("materializeProperties", "all").V().has('name', 'marko').outE().inV().has_label('software').path().next()
- assert 3 == len(p.objects)
- assert p.objects[0].properties is not None and len(p.objects[0].properties) > 0
- # edges have dict-like properties; ensure not empty
- assert p.objects[1].properties is not None and len(p.objects[1].properties) > 0
- assert p.objects[2].properties is not None and len(p.objects[2].properties) > 0
-
- def test_lambda_traversals(self, remote_connection):
- statics.load_statics(globals())
- assert "remoteconnection[{},gmodern]".format(test_no_auth_url) == str(remote_connection)
- g = traversal().with_(remote_connection)
-
- assert 24.0 == g.withSack(1.0, lambda: ("x -> x + 1", "gremlin-groovy")).V().both().sack().sum_().next()
- assert 24.0 == g.withSack(lambda: ("{1.0d}", "gremlin-groovy"), lambda: ("x -> x + 1", "gremlin-groovy")).V().both().sack().sum_().next()
-
- assert 48.0 == g.withSack(1.0, lambda: ("x, y -> x + y + 1", "gremlin-groovy")).V().both().sack().sum_().next()
- assert 48.0 == g.withSack(lambda: ("{1.0d}", "gremlin-groovy"), lambda: ("x, y -> x + y + 1", "gremlin-groovy")).V().both().sack().sum_().next()
+ # p = g.with_("materializeProperties", "all").V().has('name', 'marko').outE().inV().has_label('software').path().next()
+ # assert 3 == len(p.objects)
+ # assert p.objects[0].properties is not None and len(p.objects[0].properties) > 0
+ # # edges have dict-like properties; ensure not empty
+ # assert p.objects[1].properties is not None and len(p.objects[1].properties) > 0
+ # assert p.objects[2].properties is not None and len(p.objects[2].properties) > 0
def test_iteration(self, remote_connection):
statics.load_statics(globals())
g = traversal().with_(remote_connection)
t = g.V().count()
- assert t.hasNext()
- assert t.hasNext()
- assert t.hasNext()
- assert t.hasNext()
- assert t.hasNext()
+ assert t.has_next()
+ assert t.has_next()
+ assert t.has_next()
+ assert t.has_next()
+ assert t.has_next()
assert 6 == t.next()
- assert not(t.hasNext())
- assert not(t.hasNext())
- assert not(t.hasNext())
- assert not(t.hasNext())
- assert not(t.hasNext())
+ assert not (t.has_next())
+ assert not (t.has_next())
+ assert not (t.has_next())
+ assert not (t.has_next())
+ assert not (t.has_next())
t = g.V().has('name', P.within('marko', 'peter')).values('name').order()
assert "marko" == t.next()
- assert t.hasNext()
- assert t.hasNext()
- assert t.hasNext()
- assert t.hasNext()
- assert t.hasNext()
+ assert t.has_next()
+ assert t.has_next()
+ assert t.has_next()
+ assert t.has_next()
+ assert t.has_next()
assert "peter" == t.next()
- assert not(t.hasNext())
- assert not(t.hasNext())
- assert not(t.hasNext())
- assert not(t.hasNext())
- assert not(t.hasNext())
+ assert not (t.has_next())
+ assert not (t.has_next())
+ assert not (t.has_next())
+ assert not (t.has_next())
+ assert not (t.has_next())
try:
t.next()
@@ -194,46 +261,45 @@
def test_strategies(self, remote_connection):
statics.load_statics(globals())
g = traversal().with_(remote_connection). \
- withStrategies(TraversalStrategy("SubgraphStrategy",
- {"vertices": __.hasLabel("person"),
- "edges": __.hasLabel("created")},
- "org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SubgraphStrategy"))
- assert 4 == g.V().count().next()
- assert 0 == g.E().count().next()
- assert 1 == g.V().label().dedup().count().next()
- assert 4 == g.V().filter_(lambda: ("x -> true", "gremlin-groovy")).count().next()
- assert "person" == g.V().label().dedup().next()
- #
- g = traversal().with_(remote_connection). \
- withStrategies(SubgraphStrategy(vertices=__.hasLabel("person"), edges=__.hasLabel("created")))
+ with_strategies(TraversalStrategy("SubgraphStrategy",
+ {"vertices": __.has_label("person"),
+ "edges": __.has_label("created")},
+ "org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SubgraphStrategy"))
assert 4 == g.V().count().next()
assert 0 == g.E().count().next()
assert 1 == g.V().label().dedup().count().next()
assert "person" == g.V().label().dedup().next()
#
g = traversal().with_(remote_connection). \
- withStrategies(SubgraphStrategy(edges=__.hasLabel("created")))
+ with_strategies(SubgraphStrategy(vertices=__.has_label("person"), edges=__.has_label("created")))
+ assert 4 == g.V().count().next()
+ assert 0 == g.E().count().next()
+ assert 1 == g.V().label().dedup().count().next()
+ assert "person" == g.V().label().dedup().next()
+ #
+ g = traversal().with_(remote_connection). \
+ with_strategies(SubgraphStrategy(edges=__.has_label("created")))
assert 6 == g.V().count().next()
assert 4 == g.E().count().next()
assert 1 == g.E().label().dedup().count().next()
assert "created" == g.E().label().dedup().next()
#
- g = g.withoutStrategies(SubgraphStrategy). \
- withComputer(vertices=__.has("name", "marko"), edges=__.limit(0))
+ g = g.without_strategies(SubgraphStrategy). \
+ with_computer(vertices=__.has("name", "marko"), edges=__.limit(0))
assert 1 == g.V().count().next()
assert 0 == g.E().count().next()
assert "person" == g.V().label().next()
assert "marko" == g.V().name.next()
#
- g = traversal().with_(remote_connection).withComputer()
+ g = traversal().with_(remote_connection).with_computer()
assert 6 == g.V().count().next()
assert 6 == g.E().count().next()
#
- g = traversal().with_(remote_connection).withStrategies(SeedStrategy(12345))
- shuffledResult = g.V().values("name").order().by(Order.shuffle).toList()
- assert shuffledResult == g.V().values("name").order().by(Order.shuffle).toList()
- assert shuffledResult == g.V().values("name").order().by(Order.shuffle).toList()
- assert shuffledResult == g.V().values("name").order().by(Order.shuffle).toList()
+ g = traversal().with_(remote_connection).with_strategies(SeedStrategy(12345))
+ shuffledResult = g.V().values("name").order().by(Order.shuffle).to_list()
+ assert shuffledResult == g.V().values("name").order().by(Order.shuffle).to_list()
+ assert shuffledResult == g.V().values("name").order().by(Order.shuffle).to_list()
+ assert shuffledResult == g.V().values("name").order().by(Order.shuffle).to_list()
#
g = traversal().with_(remote_connection). \
withStrategies(ReservedKeysVerificationStrategy(throw_exception=True))
@@ -243,83 +309,32 @@
except GremlinServerError as gse:
assert gse.status_code == 500
- g = traversal().with_(remote_connection).with_("x", True).with_('evaluationTimeout', 10)
- try:
- g.inject(1).sideEffect(lambda: ("Thread.sleep(1000)", "gremlin-groovy")).iterate()
- assert False
- except GremlinServerError as gse:
- assert gse.status_code == 598
-
- def test_close_sessions(self, remote_transaction_connection):
- g = traversal().with_(remote_transaction_connection)
- tx = g.tx()
- gtx = tx.begin()
- # session created for new transaction
- assert 1 == len(remote_transaction_connection._DriverRemoteConnection__spawned_sessions)
- gtx.addV("person").iterate()
- tx.rollback()
- # after closing transaction we should remove spawned_session
- assert 0 == len(remote_transaction_connection._DriverRemoteConnection__spawned_sessions)
-
- def test_tx_on_graph_without_tx_support(self, remote_connection):
- g = traversal().withRemote(remote_connection)
- tx = g.tx()
- try:
- # tx is just a session, so no exception here
- gtx = tx.begin()
- # read operation is ok for sessioned connection
- assert 6 == gtx.V().count().next()
- tx.commit().all().result()
- assert False
- except GremlinServerError as ex:
- assert "500: Graph does not support transactions" == str(ex)
-
- def test_tx_commit_on_graph_without_tx_support(self, remote_connection):
- g = traversal().withRemote(remote_connection)
- tx = g.tx()
- try:
- tx.commit()
- assert False
- except Exception as ex:
- assert "Cannot commit a transaction that is not started." == str(ex)
-
- def test_tx_rollback_on_graph_without_tx_support(self, remote_connection):
- g = traversal().withRemote(remote_connection)
- tx = g.tx()
- try:
- tx.rollback()
- assert False
- except Exception as ex:
- assert "Cannot rollback a transaction that is not started." == str(ex)
def test_clone(self, remote_connection):
g = traversal().with_(remote_connection)
t = g.V().both()
- assert 12 == len(t.toList())
+ assert 12 == len(t.to_list())
assert 5 == t.clone().limit(5).count().next()
assert 10 == t.clone().limit(10).count().next()
+ def test_receive_error(self, invalid_alias_remote_connection):
+ g = traversal().with_(invalid_alias_remote_connection)
+
+ try:
+ g.V().next()
+ assert False
+ except GremlinServerError as err:
+ assert err.status_code == 400
+ assert ('Could not alias [g] to [does_not_exist] as [does_not_exist] not in the Graph or TraversalSource '
+ 'global bindings') in err.status_message
+
def test_authenticated(self, remote_connection_authenticated):
statics.load_statics(globals())
g = traversal().with_(remote_connection_authenticated)
- assert long(6) == g.V().count().toList()[0]
+ assert long(6) == g.V().count().to_list()[0]
- def test_should_propagate_enable_compression(self):
- # Use Compression
- drc = DriverRemoteConnection(anonymous_url, enable_compression=True)
-
- aiohttp_kwargs = drc._client._transport_factory()._aiohttp_kwargs
- assert aiohttp_kwargs.get("compress") != 0
-
- # Disable Compression
- drc = DriverRemoteConnection(anonymous_url, enable_compression=False)
-
- aiohttp_kwargs = drc._client._transport_factory()._aiohttp_kwargs
- assert aiohttp_kwargs.get("compress") is None or aiohttp_kwargs.get("compress") == 0
-
- # Default (no compression)
- drc = DriverRemoteConnection(anonymous_url)
-
- aiohttp_kwargs = drc._client._transport_factory()._aiohttp_kwargs
- assert aiohttp_kwargs.get("compress") is None or aiohttp_kwargs.get("compress") == 0
+ def test_forwards_interceptor_serializers(self, remote_connection_with_interceptor):
+ g = traversal().with_(remote_connection_with_interceptor)
+ result = g.inject(1).next()
+ assert 2 == result # interceptor changes request to g.inject(2)
diff --git a/gremlin-python/src/main/python/tests/driver/test_driver_remote_connection_http.py b/gremlin-python/src/main/python/tests/driver/test_driver_remote_connection_http.py
deleted file mode 100644
index 8d35695..0000000
--- a/gremlin-python/src/main/python/tests/driver/test_driver_remote_connection_http.py
+++ /dev/null
@@ -1,235 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-import os
-
-from gremlin_python import statics
-from gremlin_python.statics import long
-from gremlin_python.process.traversal import Traverser
-from gremlin_python.process.traversal import TraversalStrategy
-from gremlin_python.process.traversal import Bindings
-from gremlin_python.process.traversal import P, Order, T
-from gremlin_python.process.graph_traversal import __
-from gremlin_python.process.anonymous_traversal import traversal
-from gremlin_python.structure.graph import Vertex
-from gremlin_python.process.strategies import SubgraphStrategy, SeedStrategy
-from gremlin_python.structure.io.util import HashableDict
-from gremlin_python.driver.serializer import GraphSONSerializersV2d0
-from gremlin_python.driver.protocol import GremlinServerError
-
-gremlin_server_url_http = os.environ.get('GREMLIN_SERVER_URL_HTTP', 'http://localhost:{}/')
-test_no_auth_http_url = gremlin_server_url_http.format(45940)
-
-
-class TestDriverRemoteConnectionHttp(object):
- def test_traversals(self, remote_connection_http):
- statics.load_statics(globals())
- g = traversal().with_(remote_connection_http)
-
- assert long(6) == g.V().count().toList()[0]
- # #
- assert Vertex(1) == g.V(1).next()
- assert Vertex(1) == g.V(Vertex(1)).next()
- assert 1 == g.V(1).id_().next()
- assert Traverser(Vertex(1)) == g.V(1).nextTraverser()
- assert 1 == len(g.V(1).toList())
- assert isinstance(g.V(1).toList(), list)
- results = g.V().repeat(__.out()).times(2).name
- results = results.toList()
- assert 2 == len(results)
- assert "lop" in results
- assert "ripple" in results
- # #
- assert 10 == g.V().repeat(__.both()).times(5)[0:10].count().next()
- assert 1 == g.V().repeat(__.both()).times(5)[0:1].count().next()
- assert 0 == g.V().repeat(__.both()).times(5)[0:0].count().next()
- assert 4 == g.V()[2:].count().next()
- assert 2 == g.V()[:2].count().next()
- # #
- results = g.withSideEffect('a', ['josh', 'peter']).V(1).out('created').in_('created').values('name').where(
- P.within('a')).toList()
- assert 2 == len(results)
- assert 'josh' in results
- assert 'peter' in results
- # #
- results = g.V().out().profile().toList()
- assert 1 == len(results)
- assert 'metrics' in results[0]
- assert 'dur' in results[0]
- # #
- results = g.V().has('name', 'peter').as_('a').out('created').as_('b').select('a', 'b').by(
- __.valueMap()).toList()
- assert 1 == len(results)
- assert 'peter' == results[0]['a']['name'][0]
- assert 35 == results[0]['a']['age'][0]
- assert 'lop' == results[0]['b']['name'][0]
- assert 'java' == results[0]['b']['lang'][0]
- assert 2 == len(results[0]['a'])
- assert 2 == len(results[0]['b'])
- # #
- results = g.V(1).inject(g.V(2).next()).values('name').toList()
- assert 2 == len(results)
- assert 'marko' in results
- assert 'vadas' in results
- # #
- results = g.V().has('person', 'name', 'marko').map(
- lambda: ("it.get().value('name')", "gremlin-groovy")).toList()
- assert 1 == len(results)
- assert 'marko' in results
- # #
- # this test just validates that the underscored versions of steps conflicting with Gremlin work
- # properly and can be removed when the old steps are removed - TINKERPOP-2272
- results = g.V().filter_(__.values('age').sum_().and_(
- __.max_().is_(P.gt(0)), __.min_().is_(P.gt(0)))).range_(0, 1).id_().next()
- assert 1 == results
- # #
- # test binding in P
- results = g.V().has('person', 'age', Bindings.of('x', P.lt(30))).count().next()
- assert 2 == results
- # #
- # test dict keys which can only work on GraphBinary and GraphSON3 which include specific serialization
- # types for dict
- if not isinstance(remote_connection_http._client._message_serializer, GraphSONSerializersV2d0):
- results = g.V().has('person', 'name', 'marko').elementMap("name").groupCount().next()
- assert {HashableDict.of({T.id: 1, T.label: 'person', 'name': 'marko'}): 1} == results
- if not isinstance(remote_connection_http._client._message_serializer, GraphSONSerializersV2d0):
- results = g.V().has('person', 'name', 'marko').both('knows').groupCount().by(
- __.values('name').fold()).next()
- assert {tuple(['vadas']): 1, tuple(['josh']): 1} == results
-
- def test_iteration(self, remote_connection_http):
- statics.load_statics(globals())
- g = traversal().with_(remote_connection_http)
-
- t = g.V().count()
- assert t.hasNext()
- assert t.hasNext()
- assert t.hasNext()
- assert t.hasNext()
- assert t.hasNext()
- assert 6 == t.next()
- assert not (t.hasNext())
- assert not (t.hasNext())
- assert not (t.hasNext())
- assert not (t.hasNext())
- assert not (t.hasNext())
-
- t = g.V().has('name', P.within('marko', 'peter')).values('name').order()
- assert "marko" == t.next()
- assert t.hasNext()
- assert t.hasNext()
- assert t.hasNext()
- assert t.hasNext()
- assert t.hasNext()
- assert "peter" == t.next()
- assert not (t.hasNext())
- assert not (t.hasNext())
- assert not (t.hasNext())
- assert not (t.hasNext())
- assert not (t.hasNext())
-
- try:
- t.next()
- assert False
- except StopIteration:
- assert True
-
- def test_lambda_traversals(self, remote_connection_http):
- statics.load_statics(globals())
- assert "remoteconnection[{},gmodern]".format(test_no_auth_http_url) == str(remote_connection_http)
- g = traversal().with_(remote_connection_http)
-
- assert 24.0 == g.withSack(1.0, lambda: ("x -> x + 1", "gremlin-groovy")).V().both().sack().sum_().next()
- assert 24.0 == g.withSack(lambda: ("{1.0d}", "gremlin-groovy"),
- lambda: ("x -> x + 1", "gremlin-groovy")).V().both().sack().sum_().next()
-
- assert 48.0 == g.withSack(1.0, lambda: ("x, y -> x + y + 1", "gremlin-groovy")).V().both().sack().sum_().next()
- assert 48.0 == g.withSack(lambda: ("{1.0d}", "gremlin-groovy"),
- lambda: ("x, y -> x + y + 1", "gremlin-groovy")).V().both().sack().sum_().next()
-
- def test_strategies(self, remote_connection_http):
- statics.load_statics(globals())
- g = traversal().with_(remote_connection_http). \
- withStrategies(TraversalStrategy("SubgraphStrategy",
- {"vertices": __.hasLabel("person"),
- "edges": __.hasLabel("created")},
- "org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SubgraphStrategy"))
- assert 4 == g.V().count().next()
- assert 0 == g.E().count().next()
- assert 1 == g.V().label().dedup().count().next()
- assert 4 == g.V().filter_(lambda: ("x -> true", "gremlin-groovy")).count().next()
- assert "person" == g.V().label().dedup().next()
- #
- g = traversal().with_(remote_connection_http). \
- withStrategies(SubgraphStrategy(vertices=__.hasLabel("person"), edges=__.hasLabel("created")))
- assert 4 == g.V().count().next()
- assert 0 == g.E().count().next()
- assert 1 == g.V().label().dedup().count().next()
- assert "person" == g.V().label().dedup().next()
- #
- g = traversal().with_(remote_connection_http). \
- withStrategies(SubgraphStrategy(edges=__.hasLabel("created")))
- assert 6 == g.V().count().next()
- assert 4 == g.E().count().next()
- assert 1 == g.E().label().dedup().count().next()
- assert "created" == g.E().label().dedup().next()
- #
- g = g.withoutStrategies(SubgraphStrategy). \
- withComputer(vertices=__.has("name", "marko"), edges=__.limit(0))
- assert 1 == g.V().count().next()
- assert 0 == g.E().count().next()
- assert "person" == g.V().label().next()
- assert "marko" == g.V().name.next()
- #
- g = traversal().with_(remote_connection_http).withComputer()
- assert 6 == g.V().count().next()
- assert 6 == g.E().count().next()
- #
- g = traversal().with_(remote_connection_http).withStrategies(SeedStrategy(12345))
- shuffledResult = g.V().values("name").order().by(Order.shuffle).toList()
- assert shuffledResult == g.V().values("name").order().by(Order.shuffle).toList()
- assert shuffledResult == g.V().values("name").order().by(Order.shuffle).toList()
- assert shuffledResult == g.V().values("name").order().by(Order.shuffle).toList()
-
- def test_clone(self, remote_connection_http):
- g = traversal().with_(remote_connection_http)
- t = g.V().both()
- assert 12 == len(t.toList())
- assert 5 == t.clone().limit(5).count().next()
- assert 10 == t.clone().limit(10).count().next()
-
- def test_receive_error(self, invalid_alias_remote_connection_http):
- g = traversal().withRemote(invalid_alias_remote_connection_http)
-
- try:
- g.V().next()
- assert False
- except GremlinServerError as err:
- assert err.status_code == 400
- assert 'Could not rebind' in err.status_message
-
- """
- # The WsAndHttpChannelizer somehow does not distinguish the ssl handlers so authenticated https remote connection
- # only work with HttpChannelizer that is currently not in the testing set up, thus this is commented out for now
-
- def test_authenticated(self, remote_connection_http_authenticated):
- statics.load_statics(globals())
- g = traversal().with_(remote_connection_http_authenticated)
-
- assert long(6) == g.V().count().toList()[0]
- """
diff --git a/gremlin-python/src/main/python/tests/driver/test_driver_remote_connection_threaded.py b/gremlin-python/src/main/python/tests/driver/test_driver_remote_connection_threaded.py
index 4423e04..4f9afab 100644
--- a/gremlin-python/src/main/python/tests/driver/test_driver_remote_connection_threaded.py
+++ b/gremlin-python/src/main/python/tests/driver/test_driver_remote_connection_threaded.py
@@ -28,9 +28,10 @@
__author__ = 'David M. Brown (davebshow@gmail.com)'
-gremlin_server_url = os.environ.get('GREMLIN_SERVER_URL', 'ws://localhost:{}/gremlin')
+gremlin_server_url = os.environ.get('GREMLIN_SERVER_URL', 'http://localhost:{}/gremlin')
test_no_auth_url = gremlin_server_url.format(45940)
+
def test_conns_in_threads(remote_connection):
q = queue.Queue()
child = Thread(target=_executor, args=(q, None))
@@ -67,7 +68,7 @@
g = traversal().with_(conn)
future = g.V().promise()
t = future.result()
- assert len(t.toList()) == 6
+ assert len(t.to_list()) == 6
except:
q.put(sys.exc_info()[0])
else:
@@ -79,9 +80,9 @@
def handle_request():
try:
- remote_connection = DriverRemoteConnection(test_no_auth_url, "g")
+ remote_connection = DriverRemoteConnection(test_no_auth_url, "gmodern")
g = traversal().with_(remote_connection)
- g.V().limit(1).toList()
+ g.V().limit(1).to_list()
remote_connection.close()
return True
except RuntimeError:
diff --git a/gremlin-python/src/main/python/tests/driver/test_protocol.py b/gremlin-python/src/main/python/tests/driver/test_protocol.py
new file mode 100644
index 0000000..3efd129
--- /dev/null
+++ b/gremlin-python/src/main/python/tests/driver/test_protocol.py
@@ -0,0 +1,131 @@
+#
+# 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.
+#
+from gremlin_python.driver.protocol import GremlinServerHTTPProtocol
+from gremlin_python.driver.serializer import GraphBinarySerializersV4
+from gremlin_python.driver.transport import AbstractBaseTransport
+from gremlin_python.driver.request import RequestMessage
+
+class MockHTTPTransport(AbstractBaseTransport):
+ def connect(self, url, headers=None):
+ pass
+
+ def write(self, message):
+ self._message = message
+
+ def get_write(self):
+ return self._message
+
+ def read(self):
+ pass
+
+ def close(self):
+ pass
+
+ def closed(self):
+ pass
+
+def test_none_request_serializer_valid():
+ protocol = GremlinServerHTTPProtocol(None, GraphBinarySerializersV4(), interceptors=None)
+ mock_transport = MockHTTPTransport()
+ protocol.connection_made(mock_transport)
+
+ message = RequestMessage(fields={}, gremlin="g.V()")
+ protocol.write(message)
+ written = mock_transport.get_write()
+
+ assert written["payload"] == message
+ assert 'content-type' not in written["headers"]
+
+def test_graphbinary_request_serializer_serializes_payload():
+ gb_ser = GraphBinarySerializersV4()
+ protocol = GremlinServerHTTPProtocol(gb_ser, gb_ser)
+ mock_transport = MockHTTPTransport()
+ protocol.connection_made(mock_transport)
+
+ message = RequestMessage(fields={}, gremlin="g.V()")
+ protocol.write(message)
+ written = mock_transport.get_write()
+
+ assert written["payload"] == gb_ser.serialize_message(message)
+ assert written["headers"]['content-type'] == str(gb_ser.version, encoding='utf-8')
+
+def test_interceptor_allows_tuple_and_list():
+ try:
+ tuple = GremlinServerHTTPProtocol(None, None, interceptors=(lambda req: req))
+ list = GremlinServerHTTPProtocol(None, None, interceptors=[lambda req: req])
+ assert True
+ except:
+ assert False
+
+def test_interceptor_doesnt_allow_any_type():
+ try:
+ protocol = GremlinServerHTTPProtocol(None, None, interceptors=1)
+ assert False
+ except TypeError:
+ assert True
+
+def test_single_interceptor_runs():
+ changed_req = RequestMessage(fields={}, gremlin="changed")
+ def interceptor(request):
+ request['payload'] = changed_req
+ return request
+
+ protocol = GremlinServerHTTPProtocol(None, GraphBinarySerializersV4(),
+ interceptors=interceptor)
+ mock_transport = MockHTTPTransport()
+ protocol.connection_made(mock_transport)
+
+ message = RequestMessage(fields={}, gremlin="g.V()")
+ protocol.write(message)
+ written = mock_transport.get_write()
+
+ assert written['payload'] == changed_req
+
+def test_interceptor_works_with_request_serializer():
+ gb_ser = GraphBinarySerializersV4()
+ message = RequestMessage(fields={}, gremlin="g.E()")
+
+ def assert_inteceptor(request):
+ assert request['payload'] == gb_ser.serialize_message(message)
+ request['payload'] = "changed"
+ return request
+
+ protocol = GremlinServerHTTPProtocol(gb_ser, gb_ser, interceptors=assert_inteceptor)
+ mock_transport = MockHTTPTransport()
+ protocol.connection_made(mock_transport)
+
+ protocol.write(message)
+ written = mock_transport.get_write()
+
+ assert written["payload"] == "changed"
+
+def test_interceptors_run_sequentially():
+ def three(request): request['payload'].gremlin.append(3); return request
+ def two(request): request['payload'].gremlin.append(2); return request
+ def one(request): request['payload'].gremlin.append(1); return request
+ protocol = GremlinServerHTTPProtocol(None, GraphBinarySerializersV4(),
+ interceptors=[one, two, three])
+ mock_transport = MockHTTPTransport()
+ protocol.connection_made(mock_transport)
+
+ message = RequestMessage(fields={}, gremlin=[])
+ protocol.write(message)
+ written = mock_transport.get_write()
+
+ assert written["payload"].gremlin == [1, 2, 3]
diff --git a/gremlin-python/src/main/python/tests/driver/test_serializer.py b/gremlin-python/src/main/python/tests/driver/test_serializer.py
index 843af97..16e4371 100644
--- a/gremlin-python/src/main/python/tests/driver/test_serializer.py
+++ b/gremlin-python/src/main/python/tests/driver/test_serializer.py
@@ -16,30 +16,12 @@
# specific language governing permissions and limitations
# under the License.
#
-from gremlin_python.structure.io import graphsonV2d0
-from gremlin_python.structure.io import graphsonV3d0
-from gremlin_python.structure.io import graphbinaryV1
+from gremlin_python.structure.io import graphbinaryV4
__author__ = 'David M. Brown'
-def test_graphson_serializer_v2(graphson_serializer_v2):
- assert graphson_serializer_v2.version == b"application/vnd.gremlin-v2.0+json"
- assert isinstance(graphson_serializer_v2._graphson_reader, graphsonV2d0.GraphSONReader)
- assert isinstance(graphson_serializer_v2.standard._writer, graphsonV2d0.GraphSONWriter)
- assert isinstance(graphson_serializer_v2.traversal._writer, graphsonV2d0.GraphSONWriter)
-
-
-def test_graphson_serializer_v3(graphson_serializer_v3):
- assert graphson_serializer_v3.version == b"application/vnd.gremlin-v3.0+json"
- assert isinstance(graphson_serializer_v3._graphson_reader, graphsonV3d0.GraphSONReader)
- assert isinstance(graphson_serializer_v3.standard._writer, graphsonV3d0.GraphSONWriter)
- assert isinstance(graphson_serializer_v3.traversal._writer, graphsonV3d0.GraphSONWriter)
-
-
-def test_graphbinary_serializer_v1(graphbinary_serializer_v1):
- assert graphbinary_serializer_v1.version == b"application/vnd.graphbinary-v1.0"
- assert isinstance(graphbinary_serializer_v1._graphbinary_reader, graphbinaryV1.GraphBinaryReader)
- assert isinstance(graphbinary_serializer_v1.standard._writer, graphbinaryV1.GraphBinaryWriter)
- assert isinstance(graphbinary_serializer_v1.traversal._writer, graphbinaryV1.GraphBinaryWriter)
+def test_graphbinary_serializer_v4(graphbinary_serializer_v4):
+ assert graphbinary_serializer_v4.version == b"application/vnd.graphbinary-v4.0"
+ assert isinstance(graphbinary_serializer_v4._graphbinary_reader, graphbinaryV4.GraphBinaryReader)
diff --git a/gremlin-python/src/main/python/tests/driver/test_web_socket_client_behavior.py b/gremlin-python/src/main/python/tests/driver/test_web_socket_client_behavior.py
index 8c5ff31..d237d16 100644
--- a/gremlin-python/src/main/python/tests/driver/test_web_socket_client_behavior.py
+++ b/gremlin-python/src/main/python/tests/driver/test_web_socket_client_behavior.py
@@ -25,17 +25,16 @@
from functools import reduce
import pytest
-
-from tests import conftest
-
from gremlin_python.driver import useragent
+# TODO: remove or modify after implementing equivalent support in HTTP server
# Note: This test demonstrates different behavior in response to a server sending a close frame than the other GLV's.
# Other GLV's will respond to this by trying to reconnect. This test is also demonstrating incorrect behavior of
# client.is_closed() as it appears unaware that the event loop is dead.
# These differences from other GLV's are being tracked in [TINKERPOP-2846]. If this behavior is changed to resemble
# other GLV's, this test should be updated to show a vertex is being received by the second request.
+@pytest.mark.skip(reason="not implemented in HTTP & need to check on server side")
def test_does_not_create_new_connection_if_closed_by_server(socket_server_client, socket_server_settings):
try:
socket_server_client.submit(
@@ -56,6 +55,7 @@
# Tests that client is correctly sending user agent during web socket handshake by having the server return
# the captured user agent.
+@pytest.mark.skip(reason="not implemented in HTTP & need to check on server side")
def test_should_include_user_agent_in_handshake_request(socket_server_client, socket_server_settings):
user_agent_response = socket_server_client.submit(
"1", request_options={'requestId': socket_server_settings["USER_AGENT_REQUEST_ID"]}).one()[0]
@@ -65,6 +65,7 @@
# Tests that no user agent (other than the default one provided by aiohttp) is sent to server when that
# behaviour is disabled.
+@pytest.mark.skip(reason="not implemented in HTTP & need to check on server side")
def test_should_not_include_user_agent_in_handshake_request_if_disabled(socket_server_client_no_user_agent,
socket_server_settings):
user_agent_response = socket_server_client_no_user_agent.submit(
@@ -74,35 +75,9 @@
# during connection requests.
assert re.search("^Python/(\d\.)*\d aiohttp/(\d\.)*\d", user_agent_response)
-
-# Tests that client does not request permessage deflate compression by default
-def test_should_not_request_compression_by_default(socket_server_client, socket_server_settings):
- response = socket_server_client.submit(
- "1", request_options={'requestId': socket_server_settings["SEC_WEBSOCKET_EXTENSIONS"]}).one()[0]
-
- assert 'permessage-deflate;' not in response
-
-
-# Tests that client does not request permessage deflate compression when disabled
-@pytest.mark.client_kwargs({'enable_compression': False})
-def test_should_not_request_compression_when_disabled(socket_server_client, socket_server_settings):
- response = socket_server_client.submit(
- "1", request_options={'requestId': socket_server_settings["SEC_WEBSOCKET_EXTENSIONS"]}).one()[0]
-
- assert 'permessage-deflate;' not in response
-
-
-# Tests that client requests permessage deflate compression when enabled
-@pytest.mark.client_kwargs({'enable_compression': True})
-def test_should_request_compression_when_enabled(socket_server_client, socket_server_settings,):
- response = socket_server_client.submit(
- "1", request_options={'requestId': socket_server_settings["SEC_WEBSOCKET_EXTENSIONS"]}).one()[0]
-
- assert 'permessage-deflate;' in response
-
-
# Tests that client is correctly sending all overridable per request settings (requestId, batchSize,
# evaluationTimeout, and userAgent) to the server.
+@pytest.mark.skip(reason="not implemented in HTTP & need to check on server side")
def test_should_send_per_request_settings_to_server(socket_server_client, socket_server_settings):
result = socket_server_client.submit(
diff --git a/gremlin-python/src/main/python/tests/process/test_dsl.py b/gremlin-python/src/main/python/tests/process/test_dsl.py
index c2a2810..76625f3 100644
--- a/gremlin-python/src/main/python/tests/process/test_dsl.py
+++ b/gremlin-python/src/main/python/tests/process/test_dsl.py
@@ -18,7 +18,7 @@
#
import pytest
-from gremlin_python.process.traversal import Bytecode, P
+from gremlin_python.process.traversal import GremlinLang, P
from gremlin_python.process.graph_traversal import (
GraphTraversalSource, GraphTraversal)
from gremlin_python.process.graph_traversal import __ as AnonymousTraversal
@@ -30,13 +30,13 @@
class SocialTraversal(GraphTraversal):
def knows(self, person_name):
- return self.out("knows").hasLabel("person").has("name", person_name)
+ return self.out("knows").has_label("person").has("name", person_name)
def youngestFriendsAge(self):
- return self.out("knows").hasLabel("person").values("age").min_()
+ return self.out("knows").has_label("person").values("age").min_()
def createdAtLeast(self, number):
- return self.outE("created").count().is_(P.gte(number))
+ return self.out_e("created").count().is_(P.gte(number))
class __(AnonymousTraversal):
@@ -44,15 +44,15 @@
@classmethod
def knows(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).knows(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).knows(*args)
@classmethod
def youngestFriendsAge(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).youngestFriendsAge(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).youngestFriendsAge(*args)
@classmethod
def createdAtLeast(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).createdAtLeast(*args)
+ return cls.graph_traversal(None, None, GremlinLang()).createdAtLeast(*args)
class SocialTraversalSource(GraphTraversalSource):
@@ -62,7 +62,7 @@
self.graph_traversal = SocialTraversal
def persons(self, *args):
- traversal = self.get_graph_traversal().V().hasLabel("person")
+ traversal = self.get_graph_traversal().V().has_label("person")
if len(args) > 0:
traversal = traversal.has("name", P.within(*args))
diff --git a/gremlin-python/src/main/python/tests/process/test_gremlin_lang.py b/gremlin-python/src/main/python/tests/process/test_gremlin_lang.py
new file mode 100644
index 0000000..31742d7
--- /dev/null
+++ b/gremlin-python/src/main/python/tests/process/test_gremlin_lang.py
@@ -0,0 +1,528 @@
+# 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.
+#
+
+"""
+Unit tests for the GremlinLang Class. Modified from deprecated Groovy Translator Tests.
+"""
+import uuid
+
+from gremlin_python.process.strategies import ReadOnlyStrategy, SubgraphStrategy, OptionsStrategy, PartitionStrategy
+from gremlin_python.process.traversal import within, eq, T, Order, Scope, Column, Operator, P, Pop, Cardinality, \
+ between, inside, WithOptions, ShortestPath, starting_with, ending_with, containing, gt, lte, GValue
+from gremlin_python.statics import SingleByte, short, long, bigint, BigDecimal
+from gremlin_python.structure.graph import Graph, Vertex, Edge, VertexProperty
+from gremlin_python.process.anonymous_traversal import traversal
+from gremlin_python.process.graph_traversal import __
+from datetime import datetime
+
+
+class TestGremlinLang(object):
+
+ def test_gremlin_lang(self):
+ g = traversal().with_(None)
+
+ tests = list()
+ # 0
+ tests.append([g.V(),
+ "g.V()"])
+ # 1
+ tests.append([g.V('1', '2', '3', '4'),
+ "g.V('1','2','3','4')"])
+ # 2
+ tests.append([g.V('3').value_map(True),
+ "g.V('3').valueMap(true)"])
+ # 3
+ tests.append([g.V().constant(5),
+ "g.V().constant(5)"])
+ # 4
+ tests.append([g.V().constant(1.5),
+ "g.V().constant(1.5D)"])
+ # 5
+ tests.append([g.V().constant('Hello'),
+ "g.V().constant('Hello')"])
+ # 6
+ tests.append([g.V().has_label('airport').limit(5),
+ "g.V().hasLabel('airport').limit(5)"])
+ # 7
+ tests.append([g.V().has_label(within('a', 'b', 'c')),
+ "g.V().hasLabel(within(['a','b','c']))"])
+ # 8
+ tests.append([g.V().has_label('airport', 'continent').out().limit(5),
+ "g.V().hasLabel('airport','continent').out().limit(5)"])
+ # 9
+ tests.append([g.V().has_label('airport').out().values('code').limit(5),
+ "g.V().hasLabel('airport').out().values('code').limit(5)"])
+ # 10
+ tests.append([g.V('3').as_('a').out('route').limit(10).where(eq('a')).by('region'),
+ "g.V('3').as('a').out('route').limit(10).where(eq('a')).by('region')"])
+ # 11
+ tests.append([g.V('3').repeat(__.out('route').simple_path()).times(2).path().by('code'),
+ "g.V('3').repeat(__.out('route').simplePath()).times(2).path().by('code')"])
+ # 12
+ tests.append([g.V().has_label('airport').out().has('region', 'US-TX').values('code').limit(5),
+ "g.V().hasLabel('airport').out().has('region','US-TX').values('code').limit(5)"])
+ # 13
+ tests.append([g.V().has_label('airport').union(__.values('city'), __.values('region')).limit(5),
+ "g.V().hasLabel('airport').union(__.values('city'),__.values('region')).limit(5)"])
+ # 14
+ tests.append([g.V('3').as_('a').out('route', 'routes'),
+ "g.V('3').as('a').out('route','routes')"])
+ # 15
+ tests.append([g.V().where(__.values('runways').is_(5)),
+ "g.V().where(__.values('runways').is(5))"])
+ # 16
+ tests.append([g.V('3').repeat(__.out().simple_path()).until(__.has('code', 'AGR')).path().by('code').limit(5),
+ "g.V('3').repeat(__.out().simplePath()).until(__.has('code','AGR')).path().by('code').limit(5)"])
+ # 17
+ tests.append([g.V().has_label('airport').order().by(__.id_()),
+ "g.V().hasLabel('airport').order().by(__.id())"])
+ # 18
+ tests.append([g.V().has_label('airport').order().by(T.id),
+ "g.V().hasLabel('airport').order().by(T.id)"])
+ # 19
+ tests.append([g.V().has_label('airport').order().by(__.id_(), Order.desc),
+ "g.V().hasLabel('airport').order().by(__.id(),Order.desc)"])
+ # 20
+ tests.append([g.V().has_label('airport').order().by('code', Order.desc),
+ "g.V().hasLabel('airport').order().by('code',Order.desc)"])
+ # 21
+ tests.append([g.V('1', '2', '3').local(__.out().out().dedup().fold()),
+ "g.V('1','2','3').local(__.out().out().dedup().fold())"])
+ # 22
+ tests.append([g.V('3').out().path().count(Scope.local),
+ "g.V('3').out().path().count(Scope.local)"])
+ # 23
+ tests.append([g.E().count(),
+ "g.E().count()"])
+ # 24
+ tests.append([g.V('5').out_e('route').in_v().path().limit(10),
+ "g.V('5').outE('route').inV().path().limit(10)"])
+ # 25
+ tests.append([g.V('5').property_map().select(Column.keys),
+ "g.V('5').propertyMap().select(Column.keys)"])
+ # 26
+ tests.append([g.V('5').property_map().select(Column.values),
+ "g.V('5').propertyMap().select(Column.values)"])
+ # 27
+ tests.append([g.V('3').values('runways').math('_ + 1'),
+ "g.V('3').values('runways').math('_ + 1')"])
+ # 28
+ tests.append([g.V('3').emit().repeat(__.out().simple_path()).times(3).limit(5).path(),
+ "g.V('3').emit().repeat(__.out().simplePath()).times(3).limit(5).path()"])
+ # 29
+ tests.append([g.V().match(__.as_('a').has('code', 'LHR').as_('b')).select('b').by('code'),
+ "g.V().match(__.as('a').has('code','LHR').as('b')).select('b').by('code')"])
+ # 30
+ tests.append([g.V().has('test-using-keyword-as-property', 'repeat'),
+ "g.V().has('test-using-keyword-as-property','repeat')"])
+ # 31
+ tests.append([g.V('1').add_e('test').to(__.V('4')),
+ "g.V('1').addE('test').to(__.V('4'))"])
+ # 32
+ tests.append([g.V().values('runways').max_(),
+ "g.V().values('runways').max()"])
+ # 33
+ tests.append([g.V().values('runways').min_(),
+ "g.V().values('runways').min()"])
+ # 34
+ tests.append([g.V().values('runways').sum_(),
+ "g.V().values('runways').sum()"])
+ # 35
+ tests.append([g.V().values('runways').mean(),
+ "g.V().values('runways').mean()"])
+ # 36
+ tests.append([g.with_sack(0).V('3', '5').sack(Operator.sum_).by('runways').sack(),
+ "g.withSack(0).V('3','5').sack(Operator.sum).by('runways').sack()"])
+ # 37
+ tests.append([g.V('3').values('runways').store('x').V('4').values('runways').store('x').by(__.constant(1)).V(
+ '6').store('x').by(__.constant(1)).select('x').unfold().sum_(),
+ "g.V('3').values('runways').store('x').V('4').values('runways').store('x').by(__.constant(1)).V('6').store('x').by(__.constant(1)).select('x').unfold().sum()"])
+ # 38
+ tests.append([g.inject(3, 4, 5),
+ "g.inject(3,4,5)"])
+ # 39
+ tests.append([g.inject([3, 4, 5]),
+ "g.inject([3,4,5])"])
+ # 40
+ tests.append([g.inject(3, 4, 5).count(),
+ "g.inject(3,4,5).count()"])
+ # 41
+ tests.append([g.V().has('runways', gt(5)).count(),
+ "g.V().has('runways',gt(5)).count()"])
+ # 42
+ tests.append([g.V().has('runways', lte(5.3)).count(),
+ "g.V().has('runways',lte(5.3D)).count()"])
+ # 43
+ tests.append([g.V().has('code', within(123, 124)),
+ "g.V().has('code',within([123,124]))"])
+ # 44
+ tests.append([g.V().has('code', within(123, 'abc')),
+ "g.V().has('code',within([123,'abc']))"])
+ # 45
+ tests.append([g.V().has('code', within('abc', 123)),
+ "g.V().has('code',within(['abc',123]))"])
+ # 46
+ tests.append([g.V().has('code', within('abc', 'xyz')),
+ "g.V().has('code',within(['abc','xyz']))"])
+ # 47
+ tests.append([g.V('1', '2').has('region', P.within('US-TX', 'US-GA')),
+ "g.V('1','2').has('region',within(['US-TX','US-GA']))"])
+ # 48
+ tests.append([g.V().and_(__.has('runways', P.gt(5)), __.has('region', 'US-TX')),
+ "g.V().and(__.has('runways',gt(5)),__.has('region','US-TX'))"])
+ # 49
+ tests.append([g.V().union(__.has('runways', gt(5)), __.has('region', 'US-TX')),
+ "g.V().union(__.has('runways',gt(5)),__.has('region','US-TX'))"])
+ # 50
+ tests.append([g.V('3').choose(__.values('runways').is_(3), __.constant('three'), __.constant('not three')),
+ "g.V('3').choose(__.values('runways').is(3),__.constant('three'),__.constant('not three'))"])
+ # 51
+ tests.append(
+ [g.V('3').choose(__.values('runways')).option(1, __.constant('three')).option(2, __.constant('not three')),
+ "g.V('3').choose(__.values('runways')).option(1,__.constant('three')).option(2,__.constant('not three'))"])
+ # 52
+ tests.append([g.V('3').choose(__.values('runways')).option(1.5, __.constant('one and a half')).option(2, __.constant('not three')),
+ "g.V('3').choose(__.values('runways')).option(1.5D,__.constant('one and a half')).option(2,__.constant('not three'))"])
+ # 53
+ tests.append([g.V('3').repeat(__.out().simple_path()).until(__.loops().is_(1)).count(),
+ "g.V('3').repeat(__.out().simplePath()).until(__.loops().is(1)).count()"])
+ # 54
+ tests.append(
+ [g.V().has_label('airport').limit(20).group().by('region').by('code').order(Scope.local).by(Column.keys),
+ "g.V().hasLabel('airport').limit(20).group().by('region').by('code').order(Scope.local).by(Column.keys)"])
+ # 55
+ tests.append([g.V('1').as_('a').V('2').as_('a').select(Pop.all_, 'a'),
+ "g.V('1').as('a').V('2').as('a').select(Pop.all,'a')"])
+ # 56
+ tests.append([g.add_v('test').property(Cardinality.set_, 'p1', 10),
+ "g.addV('test').property(Cardinality.set,'p1',10)"])
+ # 57
+ tests.append([g.add_v('test').property(Cardinality.list_, 'p1', 10),
+ "g.addV('test').property(Cardinality.list,'p1',10)"])
+
+ # 58
+ tests.append([g.add_v('test').property(Cardinality.single, 'p1', 10),
+ "g.addV('test').property(Cardinality.single,'p1',10)"])
+ # 59
+ tests.append([g.V().limit(5).order().by(T.label),
+ "g.V().limit(5).order().by(T.label)"])
+
+ # 60
+ tests.append([g.V().range_(1, 5),
+ "g.V().range(1,5)"])
+
+ # 61
+ tests.append([g.add_v('test').property('p1', 123),
+ "g.addV('test').property('p1',123)"])
+
+ # 62
+ tests.append([g.add_v('test').property('date', datetime(2021, 2, 1, 9, 30)),
+ "g.addV('test').property('date',datetime(\"2021-02-01T09:30:00\"))"])
+ # 63
+ tests.append([g.add_v('test').property('date', datetime(2021, 2, 1)),
+ "g.addV('test').property('date',datetime(\"2021-02-01T00:00:00\"))"])
+ # 64
+ tests.append([g.add_e('route').from_(__.V('1')).to(__.V('2')),
+ "g.addE('route').from(__.V('1')).to(__.V('2'))"])
+ # 65
+ tests.append([g.with_side_effect('a', [1, 2]).V('3').select('a'),
+ "g.withSideEffect('a',[1,2]).V('3').select('a')"])
+ # 66
+ tests.append([g.with_side_effect('a', 1).V('3').select('a'),
+ "g.withSideEffect('a',1).V('3').select('a')"])
+ # 67
+ tests.append([g.with_side_effect('a', 'abc').V('3').select('a'),
+ "g.withSideEffect('a','abc').V('3').select('a')"])
+ # 68
+ tests.append([g.V().has('airport', 'region', 'US-NM').limit(3).values('elev').fold().index(),
+ "g.V().has('airport','region','US-NM').limit(3).values('elev').fold().index()"])
+ # 69
+ tests.append([g.V('3').repeat(__.time_limit(1000).out().simple_path()).until(__.has('code', 'AGR')).path(),
+ "g.V('3').repeat(__.timeLimit(1000).out().simplePath()).until(__.has('code','AGR')).path()"])
+
+ # 70
+ tests.append([g.V().has_label('airport').where(__.values('elev').is_(gt(14000))),
+ "g.V().hasLabel('airport').where(__.values('elev').is(gt(14000)))"])
+
+ # 71
+ tests.append([g.V().has_label('airport').where(__.out().count().is_(gt(250))).values('code'),
+ "g.V().hasLabel('airport').where(__.out().count().is(gt(250))).values('code')"])
+
+ # 72
+ tests.append([g.V().has_label('airport').filter_(__.out().count().is_(gt(250))).values('code'),
+ "g.V().hasLabel('airport').filter(__.out().count().is(gt(250))).values('code')"])
+ # 73
+ tests.append([g.with_sack(0).
+ V('3').
+ repeat(__.out_e('route').sack(Operator.sum_).by('dist').in_v()).
+ until(__.has('code', 'AGR').or_().loops().is_(4)).
+ has('code', 'AGR').
+ local(__.union(__.path().by('code').by('dist'), __.sack()).fold()).
+ limit(10),
+ "g.withSack(0).V('3').repeat(__.outE('route').sack(Operator.sum).by('dist').inV()).until(__.has('code','AGR').or().loops().is(4)).has('code','AGR').local(__.union(__.path().by('code').by('dist'),__.sack()).fold()).limit(10)"])
+
+ # 74
+ tests.append([g.add_v().as_('a').add_v().as_('b').add_e('knows').from_('a').to('b'),
+ "g.addV().as('a').addV().as('b').addE('knows').from('a').to('b')"])
+
+ # 75
+ tests.append([g.add_v('Person').as_('a').add_v('Person').as_('b').add_e('knows').from_('a').to('b'),
+ "g.addV('Person').as('a').addV('Person').as('b').addE('knows').from('a').to('b')"])
+
+ # 76
+ tests.append([g.V('3').project('Out', 'In').by(__.out().count()).by(__.in_().count()),
+ "g.V('3').project('Out','In').by(__.out().count()).by(__.in().count())"])
+
+ # 77
+ tests.append([g.V('44').out().aggregate('a').out().where(within('a')).path(),
+ "g.V('44').out().aggregate('a').out().where(within(['a'])).path()"])
+
+ # 78
+ tests.append([g.V().has('date', datetime(2021, 2, 22)),
+ "g.V().has('date',datetime(\"2021-02-22T00:00:00\"))"])
+
+ # 79
+ tests.append([g.V().has('date', within(datetime(2021, 2, 22), datetime(2021, 1, 1))),
+ "g.V().has('date',within([datetime(\"2021-02-22T00:00:00\"),datetime(\"2021-01-01T00:00:00\")]))"])
+
+ # 80
+ tests.append([g.V().has('date', between(datetime(2021, 1, 1), datetime(2021, 2, 22))),
+ "g.V().has('date',between(datetime(\"2021-01-01T00:00:00\"),datetime(\"2021-02-22T00:00:00\")))"])
+
+ # 81
+ tests.append([g.V().has('date', inside(datetime(2021, 1, 1), datetime(2021, 2, 22))),
+ "g.V().has('date',inside(datetime(\"2021-01-01T00:00:00\"),datetime(\"2021-02-22T00:00:00\")))"])
+
+ # 82
+ tests.append([g.V().has('date', P.gt(datetime(2021, 1, 1, 9, 30))),
+ "g.V().has('date',gt(datetime(\"2021-01-01T09:30:00\")))"])
+
+ # 83
+ tests.append([g.V().has('runways', between(3, 5)),
+ "g.V().has('runways',between(3,5))"])
+
+ # 84
+ tests.append([g.V().has('runways', inside(3, 5)),
+ "g.V().has('runways',inside(3,5))"])
+
+ # 85
+ tests.append([g.V('44').out_e().element_map(),
+ "g.V('44').outE().elementMap()"])
+
+ # 86
+ tests.append([g.V('44').value_map().by(__.unfold()),
+ "g.V('44').valueMap().by(__.unfold())"])
+
+ # 87
+ tests.append([g.V('44').value_map().with_(WithOptions.tokens, WithOptions.labels),
+ "g.V('44').valueMap().with('~tinkerpop.valueMap.tokens',2)"])
+
+ # 88
+ tests.append([g.V('44').value_map().with_(WithOptions.tokens),
+ "g.V('44').valueMap().with('~tinkerpop.valueMap.tokens')"])
+
+ # 89
+ tests.append([g.with_strategies(ReadOnlyStrategy()).add_v('test'),
+ "g.withStrategies(ReadOnlyStrategy).addV('test')"])
+ # 90
+ strategy = SubgraphStrategy(vertices=__.has('region', 'US-TX'), edges=__.has_label('route'))
+ tests.append([g.with_strategies(strategy).V().count(),
+ "g.withStrategies(new SubgraphStrategy(vertices:__.has('region','US-TX'),edges:__.hasLabel('route'))).V().count()"])
+
+ # 91
+ strategy = SubgraphStrategy(vertex_properties=__.has_not('runways'))
+ tests.append([g.with_strategies(strategy).V().count(),
+ "g.withStrategies(new SubgraphStrategy(vertexProperties:__.hasNot('runways'))).V().count()"])
+
+ # 92
+ strategy = SubgraphStrategy(vertices=__.has('region', 'US-TX'), vertex_properties=__.has_not('runways'))
+ tests.append([g.with_strategies(strategy).V().count(),
+ "g.withStrategies(new SubgraphStrategy(vertices:__.has('region','US-TX'),vertexProperties:__.hasNot('runways'))).V().count()"])
+
+ # 93
+ strategy = SubgraphStrategy(vertices=__.has('region', 'US-TX'), edges=__.has_label('route'))
+ tests.append([g.with_strategies(ReadOnlyStrategy(), strategy).V().count(),
+ "g.withStrategies(ReadOnlyStrategy,new SubgraphStrategy(vertices:__.has('region','US-TX'),edges:__.hasLabel('route'))).V().count()"])
+
+ # 94
+ strategy = SubgraphStrategy(vertices=__.has('region', 'US-TX'))
+ tests.append([g.with_strategies(ReadOnlyStrategy(), strategy).V().count(),
+ "g.withStrategies(ReadOnlyStrategy,new SubgraphStrategy(vertices:__.has('region','US-TX'))).V().count()"])
+
+ # 95 Note with_() options are now extracted into request message and is no longer sent with the script
+ tests.append([g.with_('evaluationTimeout', 500).V().count(),
+ "g.V().count()"])
+
+ # 96 Note OptionsStrategy are now extracted into request message and is no longer sent with the script
+ tests.append([g.with_strategies(OptionsStrategy(evaluationTimeout=500)).V().count(),
+ "g.V().count()"])
+
+ # 97
+ tests.append([g.with_strategies(
+ PartitionStrategy(partition_key="partition", write_partition="a", read_partitions=["a"])).add_v('test'),
+ "g.withStrategies(new PartitionStrategy(partitionKey:'partition',writePartition:'a',readPartitions:['a'])).addV('test')"])
+
+ # 98
+ tests.append([g.with_computer().V().shortest_path().with_(ShortestPath.target, __.has('name', 'peter')),
+ "g.withStrategies(VertexProgramStrategy).V().shortestPath().with('~tinkerpop.shortestPath.target',__.has('name','peter'))"])
+
+ # 99
+ tests.append([g.V().coalesce(__.E(), __.add_e('person')),
+ "g.V().coalesce(__.E(),__.addE('person'))"])
+
+ # 100
+ tests.append([g.inject(1).E(),
+ "g.inject(1).E()"])
+
+ # 101
+ tests.append([g.V().has("p1", starting_with("foo")),
+ "g.V().has('p1',startingWith('foo'))"])
+
+ # 102
+ tests.append([g.V().has("p1", ending_with("foo")),
+ "g.V().has('p1',endingWith('foo'))"])
+
+ # 103
+ class SuperStr(str):
+ pass
+
+ tests.append([g.V(SuperStr("foo_id")),
+ "g.V('foo_id')"])
+
+ # 104
+ tests.append([g.V().has("p1", containing(SuperStr("foo"))),
+ "g.V().has('p1',containing('foo'))"])
+
+ # 105
+ tests.append([g.V().has("p1", None),
+ "g.V().has('p1',null)"])
+
+ # 106
+ vertex = Vertex(0, "person")
+ tests.append([g.V(vertex),
+ "g.V(0)"])
+
+ # 107
+ outVertex = Vertex(0, "person")
+ inVertex = Vertex(1, "person")
+ edge = Edge(2, outVertex, "knows", inVertex)
+ tests.append([g.E(edge),
+ "g.E(_0)"])
+
+ # 108
+ vp = VertexProperty(3, "time", "18:00", None)
+ tests.append([g.inject(vp),
+ "g.inject(_1)"])
+
+ # 109
+ tests.append([g.inject({'name': 'java'}, {T.id: 0}, {},
+ {'age': float(10), 'pos_inf': float("inf"), 'neg_inf': float("-inf"),
+ 'nan': float("nan")}),
+ "g.inject(['name':'java'],[(T.id):0],[:],['age':10.0D,'pos_inf':+Infinity,'neg_inf':-Infinity,'nan':NaN])"])
+
+ # 110
+ tests.append([g.inject(float(1)).is_(P.eq(1).or_(P.gt(2)).or_(P.lte(3)).or_(P.gte(4))),
+ "g.inject(1.0D).is(eq(1).or(gt(2)).or(lte(3)).or(gte(4)))"])
+
+ # 111
+ tests.append([g.V().has_label('person').has('age', P.gt(10).or_(P.gte(11).and_(P.lt(20))).and_(
+ P.lt(29).or_(P.eq(35)))).name,
+ "g.V().hasLabel('person').has('age',gt(10).or(gte(11).and(lt(20))).and(lt(29).or(eq(35)))).values('name')"])
+
+ # 112
+ tests.append([g.inject(set('a')),
+ "g.inject({'a'})"])
+
+ # 113
+ tests.append([g.merge_v(None),
+ "g.mergeV(null)"])
+
+ # 114
+ tests.append([g.merge_e(None),
+ "g.mergeE(null)"])
+
+ # 115
+ tests.append([g.add_v('\"test\"'),
+ "g.addV('\"test\"')"])
+
+ # 116
+ tests.append([g.add_v('t\'"est'),
+ "g.addV('t\\'\"est')"])
+
+ # 117
+ tests.append([g.inject(True, SingleByte(1), short(2), 3, long(4), float(5),
+ float(6), bigint(7), BigDecimal(0, 8)),
+ "g.inject(true,1B,2S,3,4L,5.0D,6.0D,7N,8M)"])
+
+ #118
+ tests.append([g.inject(uuid.UUID('9b8d8a9c-61c2-43e5-9cc8-c27b9261290e')),
+ 'g.inject(UUID("9b8d8a9c-61c2-43e5-9cc8-c27b9261290e"))'])
+
+ for t in range(len(tests)):
+ gremlin_lang = tests[t][0].gremlin_lang.get_gremlin()
+ assert gremlin_lang == tests[t][1]
+
+ def test_gvalue_name_cannot_be_null(self):
+ g = traversal().with_(None)
+ try:
+ g.V(GValue(None, [1, 2, 3]))
+ except Exception as ex:
+ assert str(ex) == 'The parameter name cannot be None.'
+
+ def test_gvalue_name_dont_need_escaping(self):
+ g = traversal().with_(None)
+ try:
+ g.V(GValue('\"', [1, 2, 3]))
+ except Exception as ex:
+ assert str(ex) == 'invalid parameter name ".'
+
+ def test_gvalue_is_not_number(self):
+ g = traversal().with_(None)
+ try:
+ g.V(GValue('1', [1, 2, 3]))
+ except Exception as ex:
+ assert str(ex) == 'invalid parameter name 1.'
+
+ def test_gvalue_is_valid_identifier(self):
+ g = traversal().with_(None)
+ try:
+ g.V(GValue('1a', [1, 2, 3]))
+ except Exception as ex:
+ assert str(ex) == 'invalid parameter name 1a.'
+
+ def test_gvalue_is_not_reserved(self):
+ g = traversal().with_(None)
+ try:
+ g.V(GValue('_1', [1, 2, 3]))
+ except Exception as ex:
+ assert str(ex) == 'invalid GValue name _1. Should not start with _.'
+
+ def test_gvalue_is_not_duplicate(self):
+ g = traversal().with_(None)
+ try:
+ g.inject(GValue('ids', [1, 2])).V(GValue('ids', [2, 3]))
+ except Exception as ex:
+ assert str(ex) == 'parameter with name ids already exists.'
+
+ def test_gvalue_allow_parameter_reuse(self):
+ g = traversal().with_(None)
+ val = [1, 2, 3]
+ p = GValue('ids', val)
+ gremlin = g.inject(p).V(p).gremlin_lang
+ assert 'g.inject(ids).V(ids)' == gremlin.get_gremlin()
+ assert val == gremlin.get_parameters().get('ids')
diff --git a/gremlin-python/src/main/python/tests/process/test_strategies.py b/gremlin-python/src/main/python/tests/process/test_strategies.py
index 91bec64..e03b4f6 100644
--- a/gremlin-python/src/main/python/tests/process/test_strategies.py
+++ b/gremlin-python/src/main/python/tests/process/test_strategies.py
@@ -27,95 +27,83 @@
class TestTraversalStrategies(object):
def test_singletons(self):
g = traversal().with_(None)
- bytecode = g.withStrategies(ReadOnlyStrategy()).bytecode
- assert 1 == len(bytecode.source_instructions)
- assert 2 == len(bytecode.source_instructions[0])
- assert "withStrategies" == bytecode.source_instructions[0][0]
- assert ReadOnlyStrategy() == bytecode.source_instructions[0][1]
- assert "ReadOnlyStrategy" == str(bytecode.source_instructions[0][1])
- assert hash(ReadOnlyStrategy()) == hash(bytecode.source_instructions[0][1])
+ gremlin_script = g.with_strategies(ReadOnlyStrategy()).gremlin_lang
+ gremlin_instr = gremlin_script.gremlin
+ assert "withStrategies" in str(gremlin_script)
+ assert "ReadOnlyStrategy" in str(gremlin_script)
+ assert "withStrategies(ReadOnlyStrategy)" == gremlin_instr[1]
assert 0 == len(g.traversal_strategies.traversal_strategies) # these strategies are proxies
##
- g = g.withStrategies(ReadOnlyStrategy(), IncidentToAdjacentStrategy())
- bytecode = g.bytecode
- assert 1 == len(bytecode.source_instructions)
- assert 3 == len(bytecode.source_instructions[0])
- assert "withStrategies" == bytecode.source_instructions[0][0]
- assert ReadOnlyStrategy() == bytecode.source_instructions[0][1]
- assert IncidentToAdjacentStrategy() == bytecode.source_instructions[0][2]
+ g = g.with_strategies(ReadOnlyStrategy(), IncidentToAdjacentStrategy())
+ gremlin_script = g.gremlin_lang
+ gremlin_instr = gremlin_script.gremlin
+ assert "withStrategies" in str(gremlin_script)
+ assert "ReadOnlyStrategy" in str(gremlin_script)
+ assert "withStrategies(ReadOnlyStrategy,IncidentToAdjacentStrategy)" == gremlin_instr[1]
##
- bytecode = g.V().bytecode
- assert 1 == len(bytecode.source_instructions)
- assert 3 == len(bytecode.source_instructions[0])
- assert "withStrategies" == bytecode.source_instructions[0][0]
- assert ReadOnlyStrategy() == bytecode.source_instructions[0][1]
- assert IncidentToAdjacentStrategy() == bytecode.source_instructions[0][2]
- assert 1 == len(bytecode.step_instructions)
- assert "V" == bytecode.step_instructions[0][0]
+ gremlin_script = g.V().gremlin_lang
+ gremlin_instr = gremlin_script.gremlin
+ assert "withStrategies" in str(gremlin_script)
+ assert "ReadOnlyStrategy" in str(gremlin_script)
+ assert "IncidentToAdjacentStrategy" in str(gremlin_script)
+ assert "V()" in str(gremlin_script)
+ assert "withStrategies(ReadOnlyStrategy,IncidentToAdjacentStrategy)" == gremlin_instr[1]
+ assert 'V' == gremlin_instr[3]
##
- bytecode = g.withoutStrategies(ReadOnlyStrategy()).V().bytecode
- assert 2 == len(bytecode.source_instructions)
- assert 3 == len(bytecode.source_instructions[0])
- assert 2 == len(bytecode.source_instructions[1])
- assert "withStrategies" == bytecode.source_instructions[0][0]
- assert ReadOnlyStrategy() == bytecode.source_instructions[0][1]
- assert IncidentToAdjacentStrategy() == bytecode.source_instructions[0][2]
- assert "withoutStrategies" == bytecode.source_instructions[1][0]
- assert ReadOnlyStrategy() == bytecode.source_instructions[1][1]
- assert 1 == len(bytecode.step_instructions)
- assert "V" == bytecode.step_instructions[0][0]
+ gremlin_script = g.without_strategies(ReadOnlyStrategy()).V().gremlin_lang
+ gremlin_instr = gremlin_script.gremlin
+ gremlin_params = gremlin_script.parameters
+ assert "withStrategies" in str(gremlin_script)
+ assert "ReadOnlyStrategy" in str(gremlin_script)
+ assert "IncidentToAdjacentStrategy" in str(gremlin_script)
+ assert "withoutStrategies" in str(gremlin_script)
+ assert "V()" in str(gremlin_script)
+ assert "withStrategies(ReadOnlyStrategy,IncidentToAdjacentStrategy)" == gremlin_instr[1]
+ assert ReadOnlyStrategy() == gremlin_params["_0"]
##
- bytecode = g.withoutStrategies(ReadOnlyStrategy(), LazyBarrierStrategy()).V().bytecode
- assert 2 == len(bytecode.source_instructions)
- assert 3 == len(bytecode.source_instructions[0])
- assert 3 == len(bytecode.source_instructions[1])
- assert "withStrategies" == bytecode.source_instructions[0][0]
- assert ReadOnlyStrategy() == bytecode.source_instructions[0][1]
- assert IncidentToAdjacentStrategy() == bytecode.source_instructions[0][2]
- assert "withoutStrategies" == bytecode.source_instructions[1][0]
- assert ReadOnlyStrategy() == bytecode.source_instructions[1][1]
- assert LazyBarrierStrategy() == bytecode.source_instructions[1][2]
- assert 1 == len(bytecode.step_instructions)
- assert "V" == bytecode.step_instructions[0][0]
+ gremlin_script = g.without_strategies(ReadOnlyStrategy(), LazyBarrierStrategy()).V().gremlin_lang
+ gremlin_params = gremlin_script.parameters
+ assert "withStrategies" in str(gremlin_script)
+ assert "ReadOnlyStrategy" in str(gremlin_script)
+ assert "IncidentToAdjacentStrategy" in str(gremlin_script)
+ assert "withoutStrategies" in str(gremlin_script)
+ assert "V()" in str(gremlin_script)
+ assert ReadOnlyStrategy() == gremlin_params["_1"]
+ assert LazyBarrierStrategy() == gremlin_params["_2"]
###
g = traversal().with_(None)
- bytecode = g.with_("x", "test").with_("y").bytecode
- assert 1 == len(bytecode.source_instructions)
- assert 2 == len(bytecode.source_instructions[0])
- assert "withStrategies" == bytecode.source_instructions[0][0]
- assert OptionsStrategy() == bytecode.source_instructions[0][1]
- strategy = bytecode.source_instructions[0][1]
- assert 2 == len(strategy.configuration)
- assert "test" == strategy.configuration["x"]
- assert strategy.configuration["y"]
+ gremlin_script = g.with_("x", "test").with_("y").gremlin_lang
+ options = gremlin_script.options_strategies
+ assert "test" == options[0].configuration["x"]
+ assert options[1].configuration["y"]
def test_configurable(self):
g = traversal().with_(None)
- bytecode = g.withStrategies(MatchAlgorithmStrategy("greedy")).bytecode
- assert 1 == len(bytecode.source_instructions)
- assert 2 == len(bytecode.source_instructions[0])
- assert "withStrategies" == bytecode.source_instructions[0][0]
- assert MatchAlgorithmStrategy() == bytecode.source_instructions[0][1]
- assert "MatchAlgorithmStrategy" == str(bytecode.source_instructions[0][1])
- assert hash(MatchAlgorithmStrategy()) == hash(
- bytecode.source_instructions[0][1]) # even though different confs, same strategy
- assert 0 == len(g.traversal_strategies.traversal_strategies) # these strategies are proxies
+ gremlin_script = g.with_strategies(MatchAlgorithmStrategy("greedy")).gremlin_lang
+ assert "withStrategies" in str(gremlin_script)
+ assert "MatchAlgorithmStrategy" in str(gremlin_script)
+ assert "greedy" in str(gremlin_script)
###
- bytecode = g.withStrategies(SubgraphStrategy(vertices=__.has("name", "marko"))).bytecode
- assert 1 == len(bytecode.source_instructions)
- assert 2 == len(bytecode.source_instructions[0])
- assert "withStrategies" == bytecode.source_instructions[0][0]
- assert SubgraphStrategy() == bytecode.source_instructions[0][1]
- strategy = bytecode.source_instructions[0][1]
- assert 1 == len(strategy.configuration)
- assert __.has("name","marko") == strategy.configuration["vertices"]
+ gremlin_script = g.with_strategies(SubgraphStrategy(vertices=__.has("name", "marko"))).gremlin_lang
+ assert "withStrategies" in str(gremlin_script)
+ assert "SubgraphStrategy" in str(gremlin_script)
+ assert "__.has('name','marko')" in str(gremlin_script)
###
- bytecode = g.withStrategies(OptionsStrategy(x="test", y=True)).bytecode
- assert 1 == len(bytecode.source_instructions)
- assert 2 == len(bytecode.source_instructions[0])
- assert "withStrategies" == bytecode.source_instructions[0][0]
- assert OptionsStrategy() == bytecode.source_instructions[0][1]
- strategy = bytecode.source_instructions[0][1]
- assert 2 == len(strategy.configuration)
- assert "test" == strategy.configuration["x"]
- assert strategy.configuration["y"]
+ gremlin_script = g.with_strategies(OptionsStrategy(x="test", y=True)).gremlin_lang
+ options = gremlin_script.options_strategies
+ assert "test" == options[0].configuration["x"]
+ assert options[0].configuration["y"]
+
+ def test_custom_strategies(self):
+ g = traversal().with_(None)
+
+ gremlin_script = g.with_strategies(TraversalStrategy(strategy_name='CustomSingletonStrategy')).gremlin_lang
+ assert "withStrategies(CustomSingletonStrategy)" in str(gremlin_script)
+
+ gremlin_script = g.with_strategies(TraversalStrategy(
+ strategy_name='CustomConfigurableStrategy',
+ stringKey='string value',
+ intKey=5,
+ booleanKey=True
+ )).gremlin_lang
+ assert "withStrategies(new CustomConfigurableStrategy(stringKey:'string value',intKey:5,booleanKey:true))" in str(gremlin_script)
diff --git a/gremlin-python/src/main/python/tests/process/test_translator.py b/gremlin-python/src/main/python/tests/process/test_translator.py
deleted file mode 100644
index 9c5a74d..0000000
--- a/gremlin-python/src/main/python/tests/process/test_translator.py
+++ /dev/null
@@ -1,458 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-"""
-Unit tests for the Translator Class.
-"""
-__author__ = 'Kelvin R. Lawrence (gfxman)'
-
-from gremlin_python.structure.graph import Graph, Vertex, Edge, VertexProperty
-from gremlin_python.process.anonymous_traversal import traversal
-from gremlin_python.process.graph_traversal import __
-from gremlin_python.process.translator import *
-from datetime import datetime
-
-
-class TestTranslator(object):
-
- def test_translations(self):
- g = traversal().with_(None)
-
- tests = list()
- # 0
- tests.append([g.V(),
- "g.V()"])
- # 1
- tests.append([g.V('1', '2', '3', '4'),
- "g.V('1','2','3','4')"])
- # 2
- tests.append([g.V('3').valueMap(True),
- "g.V('3').valueMap(true)"])
- # 3
- tests.append([g.V().constant(5),
- "g.V().constant(5)"])
- # 4
- tests.append([g.V().constant(1.5),
- "g.V().constant(1.5d)"])
- # 5
- tests.append([g.V().constant('Hello'),
- "g.V().constant('Hello')"])
- # 6
- tests.append([g.V().hasLabel('airport').limit(5),
- "g.V().hasLabel('airport').limit(5)"])
- # 7
- tests.append([g.V().hasLabel(within('a', 'b', 'c')),
- "g.V().hasLabel(within(['a','b','c']))"])
- # 8
- tests.append([g.V().hasLabel('airport', 'continent').out().limit(5),
- "g.V().hasLabel('airport','continent').out().limit(5)"])
- # 9
- tests.append([g.V().hasLabel('airport').out().values('code').limit(5),
- "g.V().hasLabel('airport').out().values('code').limit(5)"])
- # 10
- tests.append([g.V('3').as_('a').out('route').limit(10).where(eq('a')).by('region'),
- "g.V('3').as('a').out('route').limit(10).where(eq('a')).by('region')"])
- # 11
- tests.append([g.V('3').repeat(__.out('route').simplePath()).times(2).path().by('code'),
- "g.V('3').repeat(__.out('route').simplePath()).times(2).path().by('code')"])
- # 12
- tests.append([g.V().hasLabel('airport').out().has('region', 'US-TX').values('code').limit(5),
- "g.V().hasLabel('airport').out().has('region','US-TX').values('code').limit(5)"])
- # 13
- tests.append([g.V().hasLabel('airport').union(__.values('city'), __.values('region')).limit(5),
- "g.V().hasLabel('airport').union(__.values('city'),__.values('region')).limit(5)"])
- # 14
- tests.append([g.V('3').as_('a').out('route', 'routes'),
- "g.V('3').as('a').out('route','routes')"])
- # 15
- tests.append([g.V().where(__.values('runways').is_(5)),
- "g.V().where(__.values('runways').is(5))"])
- # 16
- tests.append([g.V('3').repeat(__.out().simplePath()).until(__.has('code', 'AGR')).path().by('code').limit(5),
- "g.V('3').repeat(__.out().simplePath()).until(__.has('code','AGR')).path().by('code').limit(5)"])
- # 17
- tests.append([g.V().hasLabel('airport').order().by(__.id_()),
- "g.V().hasLabel('airport').order().by(__.id())"])
- # 18
- tests.append([g.V().hasLabel('airport').order().by(T.id),
- "g.V().hasLabel('airport').order().by(T.id)"])
- # 19
- tests.append([g.V().hasLabel('airport').order().by(__.id_(), Order.desc),
- "g.V().hasLabel('airport').order().by(__.id(),Order.desc)"])
- # 20
- tests.append([g.V().hasLabel('airport').order().by('code', Order.desc),
- "g.V().hasLabel('airport').order().by('code',Order.desc)"])
- # 21
- tests.append([g.V('1', '2', '3').local(__.out().out().dedup().fold()),
- "g.V('1','2','3').local(__.out().out().dedup().fold())"])
- # 22
- tests.append([g.V('3').out().path().count(Scope.local),
- "g.V('3').out().path().count(Scope.local)"])
- # 23
- tests.append([g.E().count(),
- "g.E().count()"])
- # 24
- tests.append([g.V('5').outE('route').inV().path().limit(10),
- "g.V('5').outE('route').inV().path().limit(10)"])
- # 25
- tests.append([g.V('5').propertyMap().select(Column.keys),
- "g.V('5').propertyMap().select(Column.keys)"])
- # 26
- tests.append([g.V('5').propertyMap().select(Column.values),
- "g.V('5').propertyMap().select(Column.values)"])
- # 27
- tests.append([g.V('3').values('runways').math('_ + 1'),
- "g.V('3').values('runways').math('_ + 1')"])
- # 28
- tests.append([g.V('3').emit().repeat(__.out().simplePath()).times(3).limit(5).path(),
- "g.V('3').emit().repeat(__.out().simplePath()).times(3).limit(5).path()"])
- # 29
- tests.append([g.V().match(__.as_('a').has('code', 'LHR').as_('b')).select('b').by('code'),
- "g.V().match(__.as('a').has('code','LHR').as('b')).select('b').by('code')"])
- # 30
- tests.append([g.V().has('test-using-keyword-as-property', 'repeat'),
- "g.V().has('test-using-keyword-as-property','repeat')"])
- # 31
- tests.append([g.V('1').addE('test').to(__.V('4')),
- "g.V('1').addE('test').to(__.V('4'))"])
- # 32
- tests.append([g.V().values('runways').max_(),
- "g.V().values('runways').max()"])
- # 33
- tests.append([g.V().values('runways').min_(),
- "g.V().values('runways').min()"])
- # 34
- tests.append([g.V().values('runways').sum_(),
- "g.V().values('runways').sum()"])
- # 35
- tests.append([g.V().values('runways').mean(),
- "g.V().values('runways').mean()"])
- # 36
- tests.append([g.withSack(0).V('3', '5').sack(Operator.sum_).by('runways').sack(),
- "g.withSack(0).V('3','5').sack(Operator.sum).by('runways').sack()"])
- # 37
- tests.append([g.V('3').values('runways').store('x').V('4').values('runways').store('x').by(__.constant(1)).V(
- '6').store('x').by(__.constant(1)).select('x').unfold().sum_(),
- "g.V('3').values('runways').store('x').V('4').values('runways').store('x').by(__.constant(1)).V('6').store('x').by(__.constant(1)).select('x').unfold().sum()"])
- # 38
- tests.append([g.inject(3, 4, 5),
- "g.inject(3,4,5)"])
- # 39
- tests.append([g.inject([3, 4, 5]),
- "g.inject([3,4,5])"])
- # 40
- tests.append([g.inject(3, 4, 5).count(),
- "g.inject(3,4,5).count()"])
- # 41
- tests.append([g.V().has('runways', gt(5)).count(),
- "g.V().has('runways',gt(5)).count()"])
- # 42
- tests.append([g.V().has('runways', lte(5.3)).count(),
- "g.V().has('runways',lte(5.3d)).count()"])
- # 43
- tests.append([g.V().has('code', within(123, 124)),
- "g.V().has('code',within([123,124]))"])
- # 44
- tests.append([g.V().has('code', within(123, 'abc')),
- "g.V().has('code',within([123,'abc']))"])
- # 45
- tests.append([g.V().has('code', within('abc', 123)),
- "g.V().has('code',within(['abc',123]))"])
- # 46
- tests.append([g.V().has('code', within('abc', 'xyz')),
- "g.V().has('code',within(['abc','xyz']))"])
- # 47
- tests.append([g.V('1', '2').has('region', P.within('US-TX', 'US-GA')),
- "g.V('1','2').has('region',within(['US-TX','US-GA']))"])
- # 48
- tests.append([g.V().and_(__.has('runways', P.gt(5)), __.has('region', 'US-TX')),
- "g.V().and(__.has('runways',gt(5)),__.has('region','US-TX'))"])
- # 49
- tests.append([g.V().union(__.has('runways', gt(5)), __.has('region', 'US-TX')),
- "g.V().union(__.has('runways',gt(5)),__.has('region','US-TX'))"])
- # 50
- tests.append([g.V('3').choose(__.values('runways').is_(3), __.constant('three'), __.constant('not three')),
- "g.V('3').choose(__.values('runways').is(3),__.constant('three'),__.constant('not three'))"])
- # 51
- tests.append(
- [g.V('3').choose(__.values('runways')).option(1, __.constant('three')).option(2, __.constant('not three')),
- "g.V('3').choose(__.values('runways')).option(1,__.constant('three')).option(2,__.constant('not three'))"])
- # 52
- tests.append([g.V('3').choose(__.values('runways')).option(1.5, __.constant('one and a half')).option(2,
- __.constant(
- 'not three')),
- "g.V('3').choose(__.values('runways')).option(1.5d,__.constant('one and a half')).option(2,__.constant('not three'))"])
- # 53
- tests.append([g.V('3').repeat(__.out().simplePath()).until(__.loops().is_(1)).count(),
- "g.V('3').repeat(__.out().simplePath()).until(__.loops().is(1)).count()"])
- # 54
- tests.append(
- [g.V().hasLabel('airport').limit(20).group().by('region').by('code').order(Scope.local).by(Column.keys),
- "g.V().hasLabel('airport').limit(20).group().by('region').by('code').order(Scope.local).by(Column.keys)"])
- # 55
- tests.append([g.V('1').as_('a').V('2').as_('a').select(Pop.all_, 'a'),
- "g.V('1').as('a').V('2').as('a').select(Pop.all,'a')"])
- # 56
- tests.append([g.addV('test').property(Cardinality.set_, 'p1', 10),
- "g.addV('test').property(Cardinality.set,'p1',10)"])
- # 57
- tests.append([g.addV('test').property(Cardinality.list_, 'p1', 10),
- "g.addV('test').property(Cardinality.list,'p1',10)"])
-
- # 58
- tests.append([g.addV('test').property(Cardinality.single, 'p1', 10),
- "g.addV('test').property(Cardinality.single,'p1',10)"])
- # 59
- tests.append([g.V().limit(5).order().by(T.label),
- "g.V().limit(5).order().by(T.label)"])
-
- # 60
- tests.append([g.V().range_(1, 5),
- "g.V().range(1,5)"])
-
- # 61
- tests.append([g.addV('test').property('p1', 123),
- "g.addV('test').property('p1',123)"])
-
- # 62
- tests.append([g.addV('test').property('date', datetime(2021, 2, 1, 9, 30)),
- "g.addV('test').property('date',new Date(121,2,1,9,30,0))"])
- # 63
- tests.append([g.addV('test').property('date', datetime(2021, 2, 1)),
- "g.addV('test').property('date',new Date(121,2,1,0,0,0))"])
- # 64
- tests.append([g.addE('route').from_(__.V('1')).to(__.V('2')),
- "g.addE('route').from(__.V('1')).to(__.V('2'))"])
- # 65
- tests.append([g.withSideEffect('a', [1, 2]).V('3').select('a'),
- "g.withSideEffect('a',[1,2]).V('3').select('a')"])
- # 66
- tests.append([g.withSideEffect('a', 1).V('3').select('a'),
- "g.withSideEffect('a',1).V('3').select('a')"])
- # 67
- tests.append([g.withSideEffect('a', 'abc').V('3').select('a'),
- "g.withSideEffect('a','abc').V('3').select('a')"])
- # 68
- tests.append([g.V().has('airport', 'region', 'US-NM').limit(3).values('elev').fold().index(),
- "g.V().has('airport','region','US-NM').limit(3).values('elev').fold().index()"])
- # 69
- tests.append([g.V('3').repeat(__.timeLimit(1000).out().simplePath()).until(__.has('code', 'AGR')).path(),
- "g.V('3').repeat(__.timeLimit(1000).out().simplePath()).until(__.has('code','AGR')).path()"])
-
- # 70
- tests.append([g.V().hasLabel('airport').where(__.values('elev').is_(gt(14000))),
- "g.V().hasLabel('airport').where(__.values('elev').is(gt(14000)))"])
-
- # 71
- tests.append([g.V().hasLabel('airport').where(__.out().count().is_(gt(250))).values('code'),
- "g.V().hasLabel('airport').where(__.out().count().is(gt(250))).values('code')"])
-
- # 72
- tests.append([g.V().hasLabel('airport').filter_(__.out().count().is_(gt(250))).values('code'),
- "g.V().hasLabel('airport').filter(__.out().count().is(gt(250))).values('code')"])
- # 73
- tests.append([g.withSack(0).
- V('3').
- repeat(__.outE('route').sack(Operator.sum_).by('dist').inV()).
- until(__.has('code', 'AGR').or_().loops().is_(4)).
- has('code', 'AGR').
- local(__.union(__.path().by('code').by('dist'), __.sack()).fold()).
- limit(10),
- "g.withSack(0).V('3').repeat(__.outE('route').sack(Operator.sum).by('dist').inV()).until(__.has('code','AGR').or().loops().is(4)).has('code','AGR').local(__.union(__.path().by('code').by('dist'),__.sack()).fold()).limit(10)"])
-
- # 74
- tests.append([g.addV().as_('a').addV().as_('b').addE('knows').from_('a').to('b'),
- "g.addV().as('a').addV().as('b').addE('knows').from('a').to('b')"])
-
- # 75
- tests.append([g.addV('Person').as_('a').addV('Person').as_('b').addE('knows').from_('a').to('b'),
- "g.addV('Person').as('a').addV('Person').as('b').addE('knows').from('a').to('b')"])
- # 76
- tests.append([g.V('3').project('Out', 'In').by(__.out().count()).by(__.in_().count()),
- "g.V('3').project('Out','In').by(__.out().count()).by(__.in().count())"])
- # 77
- tests.append([g.V('44').out().aggregate('a').out().where(within('a')).path(),
- "g.V('44').out().aggregate('a').out().where(within(['a'])).path()"])
- # 78
- tests.append([g.V().has('date', datetime(2021, 2, 22)),
- "g.V().has('date',new Date(121,2,22,0,0,0))"])
- # 79
- tests.append([g.V().has('date', within(datetime(2021, 2, 22), datetime(2021, 1, 1))),
- "g.V().has('date',within([new Date(121,2,22,0,0,0),new Date(121,1,1,0,0,0)]))"])
- # 80
- tests.append([g.V().has('date', between(datetime(2021, 1, 1), datetime(2021, 2, 22))),
- "g.V().has('date',between(new Date(121,1,1,0,0,0),new Date(121,2,22,0,0,0)))"])
- # 81
- tests.append([g.V().has('date', inside(datetime(2021, 1, 1), datetime(2021, 2, 22))),
- "g.V().has('date',inside(new Date(121,1,1,0,0,0),new Date(121,2,22,0,0,0)))"])
- # 82
- tests.append([g.V().has('date', P.gt(datetime(2021, 1, 1, 9, 30))),
- "g.V().has('date',gt(new Date(121,1,1,9,30,0)))"])
- # 83
- tests.append([g.V().has('runways', between(3, 5)),
- "g.V().has('runways',between(3,5))"])
- # 84
- tests.append([g.V().has('runways', inside(3, 5)),
- "g.V().has('runways',inside(3,5))"])
- # 85
- tests.append([g.V('44').outE().elementMap(),
- "g.V('44').outE().elementMap()"])
- # 86
- tests.append([g.V('44').valueMap().by(__.unfold()),
- "g.V('44').valueMap().by(__.unfold())"])
- # 87
- tests.append([g.V('44').valueMap().with_(WithOptions.tokens, WithOptions.labels),
- "g.V('44').valueMap().with(WithOptions.tokens,WithOptions.labels)"])
- # 88
- tests.append([g.V('44').valueMap().with_(WithOptions.tokens),
- "g.V('44').valueMap().with(WithOptions.tokens)"])
- # 89
- tests.append([g.withStrategies(ReadOnlyStrategy()).addV('test'),
- "g.withStrategies(ReadOnlyStrategy).addV('test')"])
- # 90
- strategy = SubgraphStrategy(vertices=__.has('region', 'US-TX'), edges=__.hasLabel('route'))
- tests.append([g.withStrategies(strategy).V().count(),
- "g.withStrategies(new SubgraphStrategy(vertices:__.has('region','US-TX'),edges:__.hasLabel('route'))).V().count()"])
- # 91
- strategy = SubgraphStrategy(vertex_properties=__.hasNot('runways'))
- tests.append([g.withStrategies(strategy).V().count(),
- "g.withStrategies(new SubgraphStrategy(vertexProperties:__.hasNot('runways'))).V().count()"])
- # 92
- strategy = SubgraphStrategy(vertices=__.has('region', 'US-TX'), vertex_properties=__.hasNot('runways'))
- tests.append([g.withStrategies(strategy).V().count(),
- "g.withStrategies(new SubgraphStrategy(vertices:__.has('region','US-TX'),vertexProperties:__.hasNot('runways'))).V().count()"])
- # 93
- strategy = SubgraphStrategy(vertices=__.has('region', 'US-TX'), edges=__.hasLabel('route'))
- tests.append([g.withStrategies(ReadOnlyStrategy(), strategy).V().count(),
- "g.withStrategies(ReadOnlyStrategy,new SubgraphStrategy(vertices:__.has('region','US-TX'),edges:__.hasLabel('route'))).V().count()"])
- # 94
- strategy = SubgraphStrategy(vertices=__.has('region', 'US-TX'))
- tests.append([g.withStrategies(ReadOnlyStrategy(), strategy).V().count(),
- "g.withStrategies(ReadOnlyStrategy,new SubgraphStrategy(vertices:__.has('region','US-TX'))).V().count()"])
- # 95
- tests.append([g.with_('evaluationTimeout', 500).V().count(),
- "g.withStrategies(new OptionsStrategy(evaluationTimeout:500)).V().count()"])
- # 96
- tests.append([g.withStrategies(OptionsStrategy(evaluationTimeout=500)).V().count(),
- "g.withStrategies(new OptionsStrategy(evaluationTimeout:500)).V().count()"])
- # 97
- tests.append([g.withStrategies(
- PartitionStrategy(partition_key="partition", write_partition="a", read_partitions=["a"])).addV('test'),
- "g.withStrategies(new PartitionStrategy(partitionKey:'partition',writePartition:'a',readPartitions:['a'])).addV('test')"])
- # 98
- tests.append([g.withComputer().V().shortestPath().with_(ShortestPath.target, __.has('name', 'peter')),
- "g.withStrategies(VertexProgramStrategy).V().shortestPath().with('~tinkerpop.shortestPath.target',__.has('name','peter'))"])
-
- # 99
- tests.append([g.V().coalesce(__.E(),__.addE('person')),
- "g.V().coalesce(__.E(),__.addE('person'))"])
- # 100
- tests.append([g.inject(1).E(),
- "g.inject(1).E()"])
-
- # 99
- tests.append([g.V().has("p1", starting_with("foo")),
- "g.V().has('p1',startingWith('foo'))"])
-
- # 100
- tests.append([g.V().has("p1", ending_with("foo")),
- "g.V().has('p1',endingWith('foo'))"])
-
- # 101
- class SuperStr(str):
- pass
-
- tests.append([g.V(SuperStr("foo_id")),
- "g.V('foo_id')"])
-
- # 102
- tests.append([g.V().has("p1", containing(SuperStr("foo"))),
- "g.V().has('p1',containing('foo'))"])
-
- # 103
- tests.append([g.V().has("p1", None),
- "g.V().has('p1',null)"])
-
- # 104
- vertex = Vertex(0, "person")
- tests.append([g.V(vertex),
- "g.V(new ReferenceVertex(0,'person'))"])
-
- # 105
- outVertex = Vertex(0, "person")
- inVertex = Vertex(1, "person")
- edge = Edge(2, outVertex, "knows", inVertex)
- tests.append([g.inject(edge),
- "g.inject(new ReferenceEdge(2,'knows',new ReferenceVertex(1,'person'),new ReferenceVertex(0,'person')))"])
-
- # 106
- vp = VertexProperty(3, "time", "18:00", None)
- tests.append([g.inject(vp),
- "g.inject(new ReferenceVertexProperty(3,'time','18:00'))"])
-
- # 107
- tests.append([g.V().has('person', 'name', 'marko').map(lambda: ("it.get().value('name')", "gremlin-groovy")),
- "g.V().has('person','name','marko').map({it.get().value('name')})"])
-
- # 108
- tests.append([g.V().has('person', 'age', Bindings.of('x', P.lt(30))).count(),
- "g.V().has('person','age',Bindings.instance().of('x', lt(30))).count()"])
-
- # 109
- tests.append([g.inject({'name': 'java'}, {T.id: 0}, {},
- {'age': float(10), 'pos_inf': float("inf"), 'neg_inf': float("-inf"), 'nan': float("nan")}),
- "g.inject(['name':'java'],[(T.id):0],[:],['age':10.0d,'pos_inf':Double.POSITIVE_INFINITY,'neg_inf':Double.NEGATIVE_INFINITY,'nan':Double.NaN])"])
-
- # 110
- tests.append([g.inject(float(1)).is_(P.eq(1).or_(P.gt(2)).or_(P.lte(3)).or_(P.gte(4))),
- "g.inject(1.0d).is(eq(1).or(gt(2)).or(lte(3)).or(gte(4)))"])
-
- # 111
- tests.append([g.V().hasLabel('person').has('age',P.gt(10).or_(P.gte(11).and_(P.lt(20))).and_(P.lt(29).or_(P.eq(35)))).name,
- "g.V().hasLabel('person').has('age',gt(10).or(gte(11).and(lt(20))).and(lt(29).or(eq(35)))).values('name')"])
-
- # 112
- tests.append([g.inject(set(('a'))),
- "g.inject(['a'] as Set)"])
-
- # 113
- tests.append([g.merge_v(None),
- "g.mergeV((Traversal) null)"])
-
- # 114
- tests.append([g.merge_e(None),
- "g.mergeE((Traversal) null)"])
-
- tlr = Translator().of('g')
-
- for t in range(len(tests)):
- a = tlr.translate(tests[t][0].bytecode)
- assert a == tests[t][1]
-
- def test_target_language(self):
- tlr = Translator().of('g')
- assert tlr.get_target_language() == 'gremlin-groovy'
-
- def test_constructor(self):
- tlr = Translator().of('g')
- g = traversal().with_(None)
- assert tlr.translate(g.V().bytecode) == "g.V()"
-
- def test_source_name(self):
- tlr = Translator().of('g')
- assert tlr.get_traversal_source() == 'g'
diff --git a/gremlin-python/src/main/python/tests/process/test_traversal.py b/gremlin-python/src/main/python/tests/process/test_traversal.py
index 90a4026..c52cbd4 100644
--- a/gremlin-python/src/main/python/tests/process/test_traversal.py
+++ b/gremlin-python/src/main/python/tests/process/test_traversal.py
@@ -25,9 +25,9 @@
from gremlin_python.driver import serializer
from gremlin_python.driver.driver_remote_connection import DriverRemoteConnection
-from gremlin_python.structure.graph import Graph
+from gremlin_python.structure.graph import Graph, Vertex
from gremlin_python.process.anonymous_traversal import traversal
-from gremlin_python.process.traversal import P, Direction, Bindings, Binding
+from gremlin_python.process.traversal import P, Direction, T
from gremlin_python.process.graph_traversal import __
gremlin_server_url = os.environ.get('GREMLIN_SERVER_URL', 'ws://localhost:{}/gremlin')
@@ -35,59 +35,6 @@
class TestTraversal(object):
- def test_bytecode(self):
- g = traversal().with_(None)
- bytecode = g.V().out("created").bytecode
- assert 0 == len(bytecode.bindings.keys())
- assert 0 == len(bytecode.source_instructions)
- assert 2 == len(bytecode.step_instructions)
- assert "V" == bytecode.step_instructions[0][0]
- assert "out" == bytecode.step_instructions[1][0]
- assert "created" == bytecode.step_instructions[1][1]
- assert 1 == len(bytecode.step_instructions[0])
- assert 2 == len(bytecode.step_instructions[1])
- ##
- bytecode = g.withSack(1).E().groupCount().by("weight").bytecode
- assert 0 == len(bytecode.bindings.keys())
- assert 1 == len(bytecode.source_instructions)
- assert "withSack" == bytecode.source_instructions[0][0]
- assert 1 == bytecode.source_instructions[0][1]
- assert 3 == len(bytecode.step_instructions)
- assert "E" == bytecode.step_instructions[0][0]
- assert "groupCount" == bytecode.step_instructions[1][0]
- assert "by" == bytecode.step_instructions[2][0]
- assert "weight" == bytecode.step_instructions[2][1]
- assert 1 == len(bytecode.step_instructions[0])
- assert 1 == len(bytecode.step_instructions[1])
- assert 2 == len(bytecode.step_instructions[2])
- ##
- bytecode = g.V(Bindings.of('a', [1, 2, 3])) \
- .out(Bindings.of('b', 'created')) \
- .where(__.in_(Bindings.of('c', 'created'), Bindings.of('d', 'knows')) \
- .count().is_(Bindings.of('e', P.gt(2)))).bytecode
- assert 5 == len(bytecode.bindings.keys())
- assert [1, 2, 3] == bytecode.bindings['a']
- assert 'created' == bytecode.bindings['b']
- assert 'created' == bytecode.bindings['c']
- assert 'knows' == bytecode.bindings['d']
- assert P.gt(2) == bytecode.bindings['e']
- assert Binding('b', 'created') == bytecode.step_instructions[1][1]
- assert 'binding[b=created]' == str(bytecode.step_instructions[1][1])
- assert isinstance(hash(bytecode.step_instructions[1][1]), int)
- ###
- bytecode = g.V().to(Direction.from_, 'knows').to(Direction.to, 'created').bytecode
- assert 0 == len(bytecode.bindings.keys())
- assert 0 == len(bytecode.source_instructions)
- assert 3 == len(bytecode.step_instructions)
- assert "V" == bytecode.step_instructions[0][0]
- assert "to" == bytecode.step_instructions[1][0]
- assert Direction.OUT == bytecode.step_instructions[1][1]
- assert "knows" == bytecode.step_instructions[1][2]
- assert Direction.IN == bytecode.step_instructions[2][1]
- assert "created" == bytecode.step_instructions[2][2]
- assert 1 == len(bytecode.step_instructions[0])
- assert 3 == len(bytecode.step_instructions[1])
- assert 3 == len(bytecode.step_instructions[2])
def test_P(self):
# verify that the order of operations is respected
@@ -97,17 +44,12 @@
P.lt("b").or_(P.gt("c")).and_(P.neq("d").or_(P.gte("e"))))
def test_anonymous_traversal(self):
- bytecode = __.__(1).bytecode
- assert 0 == len(bytecode.bindings.keys())
- assert 0 == len(bytecode.source_instructions)
- assert 1 == len(bytecode.step_instructions)
- assert "inject" == bytecode.step_instructions[0][0]
- assert 1 == bytecode.step_instructions[0][1]
+ gremlin = __.__(1).gremlin_lang
+ assert "__.inject(1)" == gremlin.get_gremlin('__')
+
##
- bytecode = __.start().bytecode
- assert 0 == len(bytecode.bindings.keys())
- assert 0 == len(bytecode.source_instructions)
- assert 0 == len(bytecode.step_instructions)
+ gremlin = __.start().gremlin_lang
+ assert "" == gremlin.get_gremlin('')
def test_clone_traversal(self):
g = traversal().with_(None)
@@ -115,22 +57,23 @@
clone = original.clone().out("knows")
cloneClone = clone.clone().out("created")
- assert 2 == len(original.bytecode.step_instructions)
- assert 3 == len(clone.bytecode.step_instructions)
- assert 4 == len(cloneClone.bytecode.step_instructions)
+ assert "g.V().out('created')" == original.gremlin_lang.get_gremlin()
+ assert "g.V().out('created').out('knows')" == clone.gremlin_lang.get_gremlin()
+ assert "g.V().out('created').out('knows').out('created')" == cloneClone.gremlin_lang.get_gremlin()
original.has("person", "name", "marko")
clone.V().out()
- assert 3 == len(original.bytecode.step_instructions)
- assert 5 == len(clone.bytecode.step_instructions)
- assert 4 == len(cloneClone.bytecode.step_instructions)
+ assert "g.V().out('created').has('person','name','marko')" == original.gremlin_lang.get_gremlin()
+ assert "g.V().out('created').out('knows').V().out()" == clone.gremlin_lang.get_gremlin()
+ assert "g.V().out('created').out('knows').out('created')" == cloneClone.gremlin_lang.get_gremlin()
+
def test_no_sugar_for_magic_methods(self):
g = traversal().with_(None)
t = g.V().age
- assert 2 == len(t.bytecode.step_instructions)
+ assert "g.V().values('age')" == t.gremlin_lang.get_gremlin()
try:
t = g.V().__len__
@@ -141,14 +84,15 @@
def test_enforce_anonymous_child_traversal(self):
g = traversal().with_(None)
- g.V(0).addE("self").to(__.V(1))
+ g.V(0).add_e("self").to(__.V(1))
try:
- g.V(0).addE("self").to(g.V(1))
+ g.V(0).add_e("self").to(g.V(1))
assert False
except TypeError:
pass
+ @pytest.mark.skip(reason="enable after transaction is implemented in HTTP")
def test_transaction_commit(self, remote_transaction_connection):
# Start a transaction traversal.
g = traversal().with_(remote_transaction_connection)
@@ -172,6 +116,7 @@
drop_graph_check_count(g)
verify_gtx_closed(gtx)
+ @pytest.mark.skip(reason="enable after transaction is implemented in HTTP")
def test_transaction_rollback(self, remote_transaction_connection):
# Start a transaction traversal.
g = traversal().with_(remote_transaction_connection)
@@ -195,6 +140,7 @@
drop_graph_check_count(g)
verify_gtx_closed(gtx)
+ @pytest.mark.skip(reason="enable after transaction is implemented in HTTP")
def test_transaction_no_begin(self, remote_transaction_connection):
# Start a transaction traversal.
g = traversal().with_(remote_transaction_connection)
@@ -246,6 +192,7 @@
tx.rollback()
assert not tx.isOpen()
+ @pytest.mark.skip(reason="enable after transaction is implemented in HTTP")
def test_multi_commit_transaction(self, remote_transaction_connection):
# Start a transaction traversal.
g = traversal().with_(remote_transaction_connection)
@@ -276,6 +223,7 @@
verify_tx_state([tx1, tx2], False)
assert g.V().count().next() == start_count + 3
+ @pytest.mark.skip(reason="enable after transaction is implemented in HTTP")
def test_multi_rollback_transaction(self, remote_transaction_connection):
# Start a transaction traversal.
g = traversal().with_(remote_transaction_connection)
@@ -306,6 +254,7 @@
verify_tx_state([tx1, tx2], False)
assert g.V().count().next() == start_count
+ @pytest.mark.skip(reason="enable after transaction is implemented in HTTP")
def test_multi_commit_and_rollback(self, remote_transaction_connection):
# Start a transaction traversal.
g = traversal().with_(remote_transaction_connection)
@@ -336,6 +285,7 @@
verify_tx_state([tx1, tx2], False)
assert g.V().count().next() == start_count + 2
+ @pytest.mark.skip(reason="enable after transaction is implemented in HTTP")
def test_transaction_close_tx(self):
remote_conn = create_connection_to_gtx()
g = traversal().with_(remote_conn)
@@ -371,6 +321,7 @@
drop_graph_check_count(g)
+ @pytest.mark.skip(reason="enable after transaction is implemented in HTTP")
def test_transaction_close_tx_from_parent(self):
remote_conn = create_connection_to_gtx()
g = traversal().with_(remote_conn)
@@ -406,16 +357,44 @@
drop_graph_check_count(g)
+ def test_should_extract_id_from_vertex(self):
+ g = traversal().with_(None)
+
+ # Test basic V() step with mixed ID types
+ v_start = g.V(1, Vertex(2))
+ assert "g.V(1,2)" == v_start.gremlin_lang.get_gremlin()
+
+ # Test V() step in the middle of a traversal
+ v_mid = g.inject("foo").V(1, Vertex(2))
+ assert "g.inject('foo').V(1,2)" == v_mid.gremlin_lang.get_gremlin()
+
+ # Test edge creation with from/to vertices
+ from_to = g.add_e("Edge").from_(Vertex(1)).to(Vertex(2))
+ assert "g.addE('Edge').from(1).to(2)" == from_to.gremlin_lang.get_gremlin()
+
+ # Test mergeE() with Vertex in dictionary
+ merge_map = {
+ T.label: "knows",
+ Direction.OUT: Vertex(1),
+ Direction.IN: Vertex(2)
+ }
+
+ merge_e_start = g.merge_e(merge_map)
+ assert "g.mergeE([(T.label):'knows',(Direction.OUT):1,(Direction.IN):2])" == merge_e_start.gremlin_lang.get_gremlin()
+
+ # Test mergeE() in the middle of a traversal
+ merge_e_mid = g.inject("foo").merge_e(merge_map)
+ assert "g.inject('foo').mergeE([(T.label):'knows',(Direction.OUT):1,(Direction.IN):2])" == merge_e_mid.gremlin_lang.get_gremlin()
+
def create_connection_to_gtx():
- return DriverRemoteConnection(anonymous_url, 'gtx',
- message_serializer=serializer.GraphBinarySerializersV1())
+ return DriverRemoteConnection(anonymous_url, 'gtx')
def add_node_validate_transaction_state(g, g_add_to, g_start_count, g_add_to_start_count, tx_verify_list):
# Add a single node to g_add_to, but not g.
# Check that vertex count in g is g_start_count and vertex count in g_add_to is g_add_to_start_count + 1.
- g_add_to.addV("person").property("name", "lyndon").iterate()
+ g_add_to.add_v("person").property("name", "lyndon").iterate()
assert g_add_to.V().count().next() == g_add_to_start_count + 1
assert g.V().count().next() == g_start_count
verify_tx_state(tx_verify_list, True)
@@ -435,7 +414,7 @@
try:
# Attempt to add an additional vertex to the transaction. This should throw an exception since it
# has been rolled back.
- gtx().addV("failure").iterate()
+ gtx().add_v("failure").iterate()
assert False
except Exception as e:
pass
diff --git a/gremlin-python/src/main/python/tests/structure/io/model.py b/gremlin-python/src/main/python/tests/structure/io/model.py
new file mode 100644
index 0000000..45f9ec0
--- /dev/null
+++ b/gremlin-python/src/main/python/tests/structure/io/model.py
@@ -0,0 +1,155 @@
+"""
+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.
+"""
+
+import datetime
+import uuid
+from gremlin_python.statics import short, long, bigint, BigDecimal, SingleByte
+from gremlin_python.structure.graph import Vertex, Edge, Property, VertexProperty, Path
+from gremlin_python.process.traversal import Direction, Traverser, T
+
+"""
+The following models aren't supported.
+tinker-graph Graph type not implemented
+max-offsetdatetime Too large for datetime
+min-offsetdatetime Too small for datetime
+forever-duration Too large for duration
+max-float single precision float not supported in Python
+min-float single precision float not supported in Python
+neg-max-float single precision float not supported in Python
+neg-min-float single precision float not supported in Python
+nan-float single precision float not supported in Python
+pos-inf-float single precision float not supported in Python
+neg-inf-float single precision float not supported in Python
+neg-zero-float single precision float not supported in Python
+traversal-tree Tree type not implemented
+"""
+
+model = {}
+
+model["pos-bigdecimal"] = BigDecimal(33, 123456789987654321123456789987654321)
+model["neg-bigdecimal"] = BigDecimal(33, -123456789987654321123456789987654321)
+model["pos-biginteger"] = bigint(123456789987654321123456789987654321)
+model["neg-biginteger"] = bigint(-123456789987654321123456789987654321)
+model["min-byte"] = SingleByte(-128)
+model["max-byte"] = SingleByte(127)
+model["empty-binary"] = bytes("", "utf8")
+model["str-binary"] = bytes("some bytes for you", "utf8")
+model["max-double"] = 1.7976931348623157E308
+model["min-double"] = 4.9E-324
+model["neg-max-double"] = -1.7976931348623157E308
+model["neg-min-double"] = -4.9E-324
+model["nan-double"] = float('nan')
+model["pos-inf-double"] = float('inf')
+model["neg-inf-double"] = float('-inf')
+model["neg-zero-double"] = -0.0
+model["single-byte-char"] = 'a'
+model["multi-byte-char"] = '\u03A9'
+model["unspecified-null"] = None
+model["true-boolean"] = True
+model["false-boolean"] = False
+model["single-byte-string"] = "abc"
+model["mixed-string"] = "abc\u0391\u0392\u0393"
+model["var-bulklist"] = ["marko", "josh", "josh"]
+model["empty-bulklist"] = []
+model["zero-duration"] = datetime.timedelta()
+model["traversal-edge"] = Edge(
+ 13,
+ Vertex(1, 'person'),
+ "develops",
+ Vertex(10, "software"),
+ [Property("since", 2009, None)]
+)
+model["no-prop-edge"] = Edge(
+ 13,
+ Vertex(1, 'person'),
+ "develops",
+ Vertex(10, "software")
+)
+model["max-int"] = 2147483647
+model["min-int"] = -2**31
+model["max-long"] = long(2**63-1)
+model["min-long"] = long(-2**63)
+model["var-type-list"] = [1, "person", True, None]
+model["empty-list"] = []
+model["var-type-map"] = {
+ "test": 123,
+ datetime.datetime(1970, 1, 1, 0, 24, 41, 295000, tzinfo=datetime.timezone.utc): "red",
+ (1,2,3): datetime.datetime(1970, 1, 1, 0, 24, 41, 295000, tzinfo=datetime.timezone.utc),
+ None: None
+}
+model["empty-map"] = {}
+model["traversal-path"] = Path(
+ [set(), set(), set()],
+ [Vertex(1, "person"), Vertex(10, "software"), Vertex(11, "software")]
+)
+model["empty-path"] = Path([], [])
+model["prop-path"] = Path(
+ [set(), set(), set()],
+ [
+ Vertex(1, "person", VertexProperty(
+ 123,
+ "name",
+ "stephen",
+ [
+ VertexProperty(0, "name", "marko", None),
+ VertexProperty(6, "location", [], None)
+ ]
+ )),
+ Vertex(10, "software"),
+ Vertex(11, "software")
+ ]
+)
+model["edge-property"] = Property("since", 2009, None)
+model["null-property"] = Property("", None, None)
+model["var-type-set"] = {2, "person", True, None}
+model["empty-set"] = set()
+model["max-short"] = short(32767)
+model["min-short"] = short(-32768)
+model["specified-uuid"] = uuid.UUID("41d2e28a-20a4-4ab0-b379-d810dede3786")
+model["nil-uuid"] = uuid.UUID(int = 0)
+model["no-prop-vertex"] = Vertex(1, "person")
+model["traversal-vertexproperty"] = VertexProperty(0, "name", "marko", None)
+model["meta-vertexproperty"] = VertexProperty(1, "person", "stephen", None, [Property("a", "b", None)])
+model["set-cardinality-vertexproperty"] = VertexProperty(1, "person", {"stephen", "marko"}, None, [Property("a", "b", None)])
+model["id-t"] = T.id
+model["out-direction"] = Direction.OUT
+
+santa_fe = VertexProperty(
+ 9, "location", "santa fe", None,
+ [Property("startTime", 2005, None)]
+)
+brussels = VertexProperty(
+ 8, "location", "brussels", None,
+ [Property("startTime", 2005, None), Property("endTime", 2005, None)]
+)
+santa_cruz = VertexProperty(
+ 7, "location", "santa cruz", None,
+ [Property("startTime", 2001, None), Property("endTime", 2004, None)]
+)
+san_diego = VertexProperty(
+ 6, "location", "san diego", None,
+ [Property("startTime", 1997, None), Property("endTime", 2001, None)]
+)
+name = VertexProperty(0, "name", "marko", None)
+
+model["traversal-vertex"] = Vertex(1, "person", [
+ Property("name", name, None), Property("location", [
+ san_diego, santa_cruz, brussels, santa_fe
+ ], None)])
+model["vertex-traverser"] = Traverser(model["traversal-vertex"], 1)
diff --git a/gremlin-python/src/main/python/tests/structure/io/test_functionalityio.py b/gremlin-python/src/main/python/tests/structure/io/test_functionalityio.py
index d6effb4..8dfe37a 100644
--- a/gremlin-python/src/main/python/tests/structure/io/test_functionalityio.py
+++ b/gremlin-python/src/main/python/tests/structure/io/test_functionalityio.py
@@ -17,12 +17,12 @@
under the License.
'''
-import datetime
import uuid
+import pytest
-from gremlin_python.driver.serializer import GraphSONSerializersV2d0, GraphBinarySerializersV1
+from datetime import datetime, timedelta, timezone
+from gremlin_python.driver.serializer import GraphBinarySerializersV4
from gremlin_python.process.anonymous_traversal import traversal
-from gremlin_python.process.traversal import DT
from gremlin_python.statics import *
@@ -81,53 +81,28 @@
assert vertex.properties[1].properties[1].value == 2000
-def test_timestamp(remote_connection):
- g = traversal().with_(remote_connection)
- ts = timestamp(1481750076295 / 1000)
- resp = g.addV('test_vertex').property('ts', ts)
- resp = resp.toList()
- vid = resp[0].id
- try:
- ts_prop = g.V(vid).properties('ts').toList()[0]
- assert isinstance(ts_prop.value, timestamp)
- assert ts_prop.value == ts
- finally:
- g.V(vid).drop().iterate()
-
-
def test_datetime(remote_connection):
g = traversal().with_(remote_connection)
- dt = datetime.datetime.utcfromtimestamp(1481750076295 / 1000)
- resp = g.addV('test_vertex').property('dt', dt).toList()
- vid = resp[0].id
- try:
- dt_prop = g.V(vid).properties('dt').toList()[0]
- assert isinstance(dt_prop.value, datetime.datetime)
- assert dt_prop.value == dt
- finally:
- g.V(vid).drop().iterate()
-
-def test_offsetdatetime(remote_connection):
- g = traversal().with_(remote_connection)
- tz = datetime.timezone(datetime.timedelta(seconds=36000))
+ tz = timezone(timedelta(seconds=36000))
ms = 12345678912
- dt = datetime.datetime(2022, 5, 20, tzinfo=tz) + datetime.timedelta(microseconds=ms)
+ dt = datetime(2022, 5, 20, tzinfo=tz) + timedelta(microseconds=ms)
resp = g.add_v('test_vertex').property('dt', dt).to_list()
vid = resp[0].id
try:
dt_prop = g.V(vid).properties('dt').to_list()[0]
- assert isinstance(dt_prop.value, datetime.datetime)
+ assert isinstance(dt_prop.value, datetime)
assert dt_prop.value == dt
finally:
g.V(vid).drop().iterate()
+
def test_uuid(remote_connection):
g = traversal().with_(remote_connection)
uid = uuid.UUID("41d2e28a-20a4-4ab0-b379-d810dede3786")
- resp = g.addV('test_vertex').property('uuid', uid).toList()
+ resp = g.add_v('test_vertex').property('uuid', uid).to_list()
vid = resp[0].id
try:
- uid_prop = g.V(vid).properties('uuid').toList()[0]
+ uid_prop = g.V(vid).properties('uuid').to_list()[0]
assert isinstance(uid_prop.value, uuid.UUID)
assert uid_prop.value == uid
finally:
@@ -135,31 +110,31 @@
def test_short(remote_connection):
- if not isinstance(remote_connection._client._message_serializer, GraphBinarySerializersV1):
+ if not isinstance(remote_connection._client.response_serializer(), GraphBinarySerializersV4):
return
g = traversal().with_(remote_connection)
num = short(1111)
- resp = g.addV('test_vertex').property('short', num).toList()
+ resp = g.with_('language', 'gremlin-lang').add_v('test_vertex').property('short', num).to_list()
vid = resp[0].id
try:
- bigint_prop = g.V(vid).properties('short').toList()[0]
- assert isinstance(bigint_prop.value, int)
- assert bigint_prop.value == num
+ short_prop = g.with_('language', 'gremlin-lang').V(vid).properties('short').to_list()[0]
+ assert isinstance(short_prop.value, int)
+ assert short_prop.value == num
finally:
g.V(vid).drop().iterate()
def test_bigint_positive(remote_connection):
- if not isinstance(remote_connection._client._message_serializer, GraphBinarySerializersV1):
+ if not isinstance(remote_connection._client.response_serializer(), GraphBinarySerializersV4):
return
g = traversal().with_(remote_connection)
big = bigint(0x1000_0000_0000_0000_0000)
- resp = g.addV('test_vertex').property('bigint', big).toList()
+ resp = g.with_('language', 'gremlin-lang').add_v('test_vertex').property('bigint', big).to_list()
vid = resp[0].id
try:
- bigint_prop = g.V(vid).properties('bigint').toList()[0]
+ bigint_prop = g.with_('language', 'gremlin-lang').V(vid).properties('bigint').to_list()[0]
assert isinstance(bigint_prop.value, int)
assert bigint_prop.value == big
finally:
@@ -167,15 +142,15 @@
def test_bigint_negative(remote_connection):
- if not isinstance(remote_connection._client._message_serializer, GraphBinarySerializersV1):
+ if not isinstance(remote_connection._client.response_serializer(), GraphBinarySerializersV4):
return
g = traversal().with_(remote_connection)
big = bigint(-0x1000_0000_0000_0000_0000)
- resp = g.addV('test_vertex').property('bigint', big).toList()
+ resp = g.with_('language', 'gremlin-lang').add_v('test_vertex').property('bigint', big).to_list()
vid = resp[0].id
try:
- bigint_prop = g.V(vid).properties('bigint').toList()[0]
+ bigint_prop = g.with_('language', 'gremlin-lang').V(vid).properties('bigint').to_list()[0]
assert isinstance(bigint_prop.value, int)
assert bigint_prop.value == big
finally:
@@ -183,15 +158,15 @@
def test_bigdecimal(remote_connection):
- if not isinstance(remote_connection._client._message_serializer, GraphBinarySerializersV1):
+ if not isinstance(remote_connection._client.response_serializer(), GraphBinarySerializersV4):
return
g = traversal().with_(remote_connection)
- bigdecimal = BigDecimal(101, 235)
- resp = g.addV('test_vertex').property('bigdecimal', bigdecimal).toList()
+ bigdecimal = BigDecimal(10, 235)
+ resp = g.with_('language', 'gremlin-lang').add_v('test_vertex').property('bigdecimal', bigdecimal).to_list()
vid = resp[0].id
try:
- bigdecimal_prop = g.V(vid).properties('bigdecimal').toList()[0]
+ bigdecimal_prop = g.with_('language', 'gremlin-lang').V(vid).properties('bigdecimal').next()
assert isinstance(bigdecimal_prop.value, BigDecimal)
assert bigdecimal_prop.value.scale == bigdecimal.scale
assert bigdecimal_prop.value.unscaled_value == bigdecimal.unscaled_value
@@ -200,31 +175,30 @@
def test_odd_bits(remote_connection):
- if not isinstance(remote_connection._client._message_serializer, GraphSONSerializersV2d0):
- g = traversal().with_(remote_connection)
- char_lower = str.__new__(SingleChar, chr(78))
- resp = g.addV('test_vertex').property('char_lower', char_lower).toList()
- vid = resp[0].id
- try:
- v = g.V(vid).values('char_lower').toList()[0]
- assert v == char_lower
- finally:
- g.V(vid).drop().iterate()
+ g = traversal().with_(remote_connection)
+ char_lower = str.__new__(SingleChar, chr(78))
+ resp = g.add_v('test_vertex').property('char_lower', char_lower).to_list()
+ vid = resp[0].id
+ try:
+ v = g.V(vid).values('char_lower').to_list()[0]
+ assert v == char_lower
+ finally:
+ g.V(vid).drop().iterate()
- char_upper = str.__new__(SingleChar, chr(57344))
- resp = g.addV('test_vertex').property('char_upper', char_upper).toList()
- vid = resp[0].id
- try:
- v = g.V(vid).values('char_upper').toList()[0]
- assert v == char_upper
- finally:
- g.V(vid).drop().iterate()
+ char_upper = str.__new__(SingleChar, chr(57344))
+ resp = g.add_v('test_vertex').property('char_upper', char_upper).to_list()
+ vid = resp[0].id
+ try:
+ v = g.V(vid).values('char_upper').to_list()[0]
+ assert v == char_upper
+ finally:
+ g.V(vid).drop().iterate()
- dur = datetime.timedelta(seconds=1000, microseconds=1000)
- resp = g.addV('test_vertex').property('dur', dur).toList()
- vid = resp[0].id
- try:
- v = g.V(vid).values('dur').toList()[0]
- assert v == dur
- finally:
- g.V(vid).drop().iterate()
+ dur = timedelta(seconds=1000, microseconds=1000)
+ resp = g.add_v('test_vertex').property('dur', dur).to_list()
+ vid = resp[0].id
+ try:
+ v = g.V(vid).values('dur').to_list()[0]
+ assert v == dur
+ finally:
+ g.V(vid).drop().iterate()
diff --git a/gremlin-python/src/main/python/tests/structure/io/test_graphbinaryV1.py b/gremlin-python/src/main/python/tests/structure/io/test_graphbinaryV1.py
deleted file mode 100644
index 102be49..0000000
--- a/gremlin-python/src/main/python/tests/structure/io/test_graphbinaryV1.py
+++ /dev/null
@@ -1,260 +0,0 @@
-"""
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
-"""
-
-import uuid
-import math
-
-from datetime import datetime, timedelta, timezone
-from gremlin_python.statics import long, bigint, BigDecimal, SingleByte, SingleChar, ByteBufferType, timestamp
-from gremlin_python.structure.graph import Vertex, Edge, Property, VertexProperty, Path
-from gremlin_python.structure.io.graphbinaryV1 import GraphBinaryWriter, GraphBinaryReader
-from gremlin_python.process.traversal import Barrier, Binding, Bytecode, Merge, Direction
-
-
-class TestGraphBinaryReader(object):
- graphbinary_reader = GraphBinaryReader()
-
-
-class TestGraphBinaryWriter(object):
- graphbinary_writer = GraphBinaryWriter()
- graphbinary_reader = GraphBinaryReader()
-
- def test_null(self):
- c = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(None))
- assert c is None
-
- def test_int(self):
- x = 100
- output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
- assert x == output
-
- def test_long(self):
- x = long(100)
- output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
- assert x == output
-
- def test_bigint(self):
- x = bigint(0x1000_0000_0000_0000_0000)
- output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
- assert x == output
-
- def test_float(self):
- x = float(100.001)
- output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
- assert x == output
-
- x = float('nan')
- output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
- assert math.isnan(output)
-
- x = float('-inf')
- output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
- assert math.isinf(output) and output < 0
-
- x = float('inf')
- output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
- assert math.isinf(output) and output > 0
-
- def test_double(self):
- x = 100.001
- output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
- assert x == output
-
- def test_bigdecimal(self):
- x = BigDecimal(100, 234)
- output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
- assert x.scale == output.scale
- assert x.unscaled_value == output.unscaled_value
-
- def test_date(self):
- x = datetime(2016, 12, 14, 16, 14, 36, 295000)
- output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
- assert x == output
-
- def test_timestamp(self):
- x = timestamp(1481750076295 / 1000)
- output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
- assert x == output
-
- def test_offsetdatetime(self):
- tz = timezone(timedelta(seconds=36000))
- ms = 12345678912
- x = datetime(2022, 5, 20, tzinfo=tz) + timedelta(microseconds=ms)
- output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
- assert x == output
-
- def test_offsetdatetime_format(self):
- x = datetime.strptime('2022-05-20T03:25:45.678912Z', '%Y-%m-%dT%H:%M:%S.%f%z')
- output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
- assert x == output
-
- def test_offsetdatetime_local(self):
- x = datetime.now().astimezone()
- output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
- assert x == output
-
- def test_offsetdatetime_epoch(self):
- x = datetime.fromtimestamp(1690934400).astimezone(timezone.utc)
- output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
- assert x == output
-
- def test_string(self):
- x = "serialize this!"
- output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
- assert x == output
-
- def test_homogeneous_list(self):
- x = ["serialize this!", "serialize that!", "serialize that!","stop telling me what to serialize"]
- output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
- assert x == output
-
- def test_heterogeneous_list(self):
- x = ["serialize this!", 0, "serialize that!", "serialize that!", 1, "stop telling me what to serialize", 2]
- output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
- assert x == output
-
- def test_heterogeneous_list_with_none(self):
- x = ["serialize this!", 0, "serialize that!", "serialize that!", 1, "stop telling me what to serialize", 2, None]
- output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
- assert x == output
-
- def test_homogeneous_set(self):
- x = {"serialize this!", "serialize that!", "stop telling me what to serialize"}
- output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
- assert x == output
-
- def test_heterogeneous_set(self):
- x = {"serialize this!", 0, "serialize that!", 1, "stop telling me what to serialize", 2}
- output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
- assert x == output
-
- def test_dict(self):
- x = {"yo": "what?",
- "go": "no!",
- "number": 123,
- 321: "crazy with the number for a key",
- 987: ["go", "deep", {"here": "!"}]}
- output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
- assert x == output
-
- x = {"marko": [666], "noone": ["blah"]}
- output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
- assert x == output
-
- x = {"ripple": [], "peter": ["created"], "noone": ["blah"], "vadas": [],
- "josh": ["created", "created"], "lop": [], "marko": [666, "created", "knows", "knows"]}
- output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
- assert x == output
-
- def test_uuid(self):
- x = uuid.UUID("41d2e28a-20a4-4ab0-b379-d810dede3786")
- output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
- assert x == output
-
- def test_edge(self):
- x = Edge(123, Vertex(1, 'person'), "developed", Vertex(10, "software"))
- output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
- assert x == output
- assert x.inV == output.inV
- assert x.outV == output.outV
-
- def test_path(self):
- x = Path(["x", "y", "z"], [1, 2, 3])
- output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
- assert x == output
-
- def test_property(self):
- x = Property("name", "stephen", None)
- output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
- assert x == output
-
- def test_vertex(self):
- x = Vertex(123, "person")
- output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
- assert x == output
-
- def test_vertexproperty(self):
- x = VertexProperty(123, "name", "stephen", None)
- output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
- assert x == output
-
- def test_barrier(self):
- x = Barrier.norm_sack
- output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
- assert x == output
-
- def test_merge(self):
- x = Merge.on_match
- output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
- assert x == output
-
- def test_direction(self):
- x = Direction.OUT
- output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
- assert x == output
-
- x = Direction.from_
- output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
- assert x == output
-
- def test_binding(self):
- x = Binding("name", "marko")
- output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
- assert x == output
-
- def test_bytecode(self):
- x = Bytecode()
- x.source_instructions.append(["withStrategies", "SubgraphStrategy"])
- x.step_instructions.append(["V", 1, 2, 3])
- x.step_instructions.append(["out"])
- output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
- assert x == output
-
- def test_byte(self):
- x = int.__new__(SingleByte, 1)
- output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
- assert x == output
-
- def test_bytebuffer(self):
- x = ByteBufferType("c29tZSBieXRlcyBmb3IgeW91", "utf8")
- output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
- assert x == output
-
- def test_boolean(self):
- x = True
- output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
- assert x == output
-
- x = False
- output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
- assert x == output
-
- def test_char(self):
- x = str.__new__(SingleChar, chr(76))
- output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
- assert x == output
-
- x = str.__new__(SingleChar, chr(57344))
- output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
- assert x == output
-
- def test_duration(self):
- x = timedelta(seconds=1000, microseconds=1000)
- output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
- assert x == output
diff --git a/gremlin-python/src/main/python/tests/structure/io/test_graphbinaryV4.py b/gremlin-python/src/main/python/tests/structure/io/test_graphbinaryV4.py
new file mode 100644
index 0000000..f0c1935
--- /dev/null
+++ b/gremlin-python/src/main/python/tests/structure/io/test_graphbinaryV4.py
@@ -0,0 +1,237 @@
+"""
+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.
+"""
+
+import uuid
+import math
+from collections import OrderedDict
+
+from datetime import datetime, timedelta, timezone
+from gremlin_python.statics import long, bigint, BigDecimal, SingleByte, SingleChar
+from gremlin_python.structure.graph import Vertex, Edge, Property, VertexProperty, Path
+from gremlin_python.structure.io.graphbinaryV4 import GraphBinaryWriter, GraphBinaryReader
+from gremlin_python.process.traversal import Direction
+from gremlin_python.structure.io.util import Marker
+
+
+class TestGraphBinaryV4(object):
+ graphbinary_writer = GraphBinaryWriter()
+ graphbinary_reader = GraphBinaryReader()
+
+ def test_null(self):
+ c = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(None))
+ assert c is None
+
+ def test_int(self):
+ x = 100
+ output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
+ assert x == output
+
+ def test_long(self):
+ x = long(100)
+ output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
+ assert x == output
+
+ def test_bigint(self):
+ x = bigint(0x1000_0000_0000_0000_0000)
+ output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
+ assert x == output
+
+ def test_float(self):
+ x = float(100.001)
+ output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
+ assert x == output
+
+ x = float('nan')
+ output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
+ assert math.isnan(output)
+
+ x = float('-inf')
+ output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
+ assert math.isinf(output) and output < 0
+
+ x = float('inf')
+ output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
+ assert math.isinf(output) and output > 0
+
+ def test_double(self):
+ x = 100.001
+ output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
+ assert x == output
+
+ def test_bigdecimal(self):
+ x = BigDecimal(100, 234)
+ output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
+ assert x.scale == output.scale
+ assert x.unscaled_value == output.unscaled_value
+
+ def test_datetime(self):
+ tz = timezone(timedelta(seconds=36000))
+ ms = 12345678912
+ x = datetime(2022, 5, 20, tzinfo=tz) + timedelta(microseconds=ms)
+ output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
+ assert x == output
+
+ def test_datetime_format(self):
+ x = datetime.strptime('2022-05-20T03:25:45.678912Z', '%Y-%m-%dT%H:%M:%S.%f%z')
+ output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
+ assert x == output
+
+ def test_datetime_local(self):
+ x = datetime.now().astimezone()
+ output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
+ assert x == output
+
+ def test_datetime_epoch(self):
+ x = datetime.fromtimestamp(1690934400).astimezone(timezone.utc)
+ output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
+ assert x == output
+
+ def test_string(self):
+ x = "serialize this!"
+ output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
+ assert x == output
+
+ def test_homogeneous_list(self):
+ x = ["serialize this!", "serialize that!", "serialize that!","stop telling me what to serialize"]
+ output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
+ assert x == output
+
+ def test_heterogeneous_list(self):
+ x = ["serialize this!", 0, "serialize that!", "serialize that!", 1, "stop telling me what to serialize", 2]
+ output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
+ assert x == output
+
+ def test_heterogeneous_list_with_none(self):
+ x = ["serialize this!", 0, "serialize that!", "serialize that!", 1, "stop telling me what to serialize", 2, None]
+ output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
+ assert x == output
+
+ def test_homogeneous_set(self):
+ x = {"serialize this!", "serialize that!", "stop telling me what to serialize"}
+ output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
+ assert x == output
+
+ def test_heterogeneous_set(self):
+ x = {"serialize this!", 0, "serialize that!", 1, "stop telling me what to serialize", 2}
+ output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
+ assert x == output
+
+ def test_dict(self):
+ x = {"yo": "what?",
+ "go": "no!",
+ "number": 123,
+ 321: "crazy with the number for a key",
+ 987: ["go", "deep", {"here": "!"}]}
+ output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
+ assert x == output
+
+ x = {"marko": [666], "noone": ["blah"]}
+ output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
+ assert x == output
+
+ x = {"ripple": [], "peter": ["created"], "noone": ["blah"], "vadas": [],
+ "josh": ["created", "created"], "lop": [], "marko": [666, "created", "knows", "knows"]}
+ output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
+ assert x == output
+
+ def test_ordered_dict(self):
+ x = OrderedDict()
+ x['a'] = 1
+ x['b'] = 2
+ output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
+ assert x == output
+
+ def test_uuid(self):
+ x = uuid.UUID("41d2e28a-20a4-4ab0-b379-d810dede3786")
+ output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
+ assert x == output
+
+ def test_edge(self):
+ x = Edge(123, Vertex(1, 'person'), "developed", Vertex(10, "software"))
+ output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
+ assert x == output
+ assert x.inV == output.inV
+ assert x.outV == output.outV
+
+ def test_path(self):
+ x = Path(["x", "y", "z"], [1, 2, 3])
+ output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
+ assert x == output
+
+ def test_property(self):
+ x = Property("name", "stephen", None)
+ output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
+ assert x == output
+
+ def test_vertex(self):
+ x = Vertex(123, "person")
+ output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
+ assert x == output
+
+ def test_vertexproperty(self):
+ x = VertexProperty(123, "name", "stephen", None)
+ output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
+ assert x == output
+
+ def test_direction(self):
+ x = Direction.OUT
+ output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
+ assert x == output
+
+ x = Direction.from_
+ output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
+ assert x == output
+
+ def test_byte(self):
+ x = int.__new__(SingleByte, 1)
+ output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
+ assert x == output
+
+ def test_binary(self):
+ x = bytes("some bytes for you", "utf8")
+ output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
+ assert x == output
+
+ def test_boolean(self):
+ x = True
+ output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
+ assert x == output
+
+ x = False
+ output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
+ assert x == output
+
+ def test_char(self):
+ x = str.__new__(SingleChar, chr(76))
+ output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
+ assert x == output
+
+ x = str.__new__(SingleChar, chr(57344))
+ output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
+ assert x == output
+
+ def test_duration(self):
+ x = timedelta(seconds=1000, microseconds=1000)
+ output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
+ assert x == output
+
+ def test_marker(self):
+ x = Marker.end_of_stream()
+ output = self.graphbinary_reader.read_object(self.graphbinary_writer.write_object(x))
+ assert x == output
diff --git a/gremlin-python/src/main/python/tests/structure/io/test_graphbinaryv4model.py b/gremlin-python/src/main/python/tests/structure/io/test_graphbinaryv4model.py
new file mode 100644
index 0000000..63298d4
--- /dev/null
+++ b/gremlin-python/src/main/python/tests/structure/io/test_graphbinaryv4model.py
@@ -0,0 +1,304 @@
+"""
+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.
+"""
+import pytest
+
+"""
+Round trip testing of GraphBinaryV4 compared to a correct "model".
+
+Set the IO_TEST_DIRECTORY environment variable to the directory where
+the .gbin files that represent the serialized "model" are located.
+"""
+
+from gremlin_python.structure.io.graphbinaryV4 import GraphBinaryWriter, GraphBinaryReader
+import math
+import os
+
+from .model import model
+
+gremlin_test_dir = "gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/"
+directory_search_pattern = "gremlin-python" + os.sep + "src" + os.sep + "main"
+default_dir = __file__[:__file__.find(directory_search_pattern)]
+test_resource_directory = os.environ.get('IO_TEST_DIRECTORY', default_dir + gremlin_test_dir)
+writer = GraphBinaryWriter()
+reader = GraphBinaryReader()
+
+def get_entry(title):
+ return model[title]
+
+def read_file_by_name(resource_name):
+ full_name = test_resource_directory + resource_name + "-" + "v4" + ".gbin"
+ with open(full_name, 'rb') as resource_file:
+ return bytearray(resource_file.read())
+
+def test_pos_bigdecimal():
+ def decimal_cmp(x, y):
+ if x.scale == y.scale and x.unscaled_value == y.unscaled_value and x.value == y.value:
+ return True
+ else:
+ return False
+
+ run_writeread("pos-bigdecimal", decimal_cmp)
+
+def test_neg_bigdecimal():
+ def decimal_cmp(x, y):
+ if x.scale == y.scale and x.unscaled_value == y.unscaled_value and x.value == y.value:
+ return True
+ else:
+ return False
+
+ run_writeread("neg-bigdecimal", decimal_cmp)
+
+def test_pos_biginteger():
+ # gremlin-python adds an extra 0 byte to the value.
+ run_writeread("pos-biginteger")
+
+def test_neg_biginteger():
+ # gremlin-python adds an extra 0 byte to the value.
+ run_writeread("neg-biginteger")
+
+def test_min_byte():
+ run("min-byte")
+
+def test_max_byte():
+ run("max-byte")
+
+def test_empty_binary():
+ run("empty-binary")
+
+def test_str_binary():
+ run("str-binary")
+
+def test_max_double():
+ run("max-double")
+
+def test_min_double():
+ run("min-double")
+
+def test_neg_max_double():
+ run("neg-max-double")
+
+def test_neg_min_double():
+ run("neg-min-double")
+
+def test_nan_double():
+ def nan_cmp(x, y):
+ if math.isnan(x) and math.isnan(y):
+ return True
+ else:
+ return False
+ run("nan-double", nan_cmp)
+
+def test_pos_inf_double():
+ run("pos-inf-double")
+
+def test_neg_inf_double():
+ run("neg-inf-double")
+
+def test_neg_zero_double():
+ run("neg-zero-double")
+
+def test_zero_duration():
+ run("zero-duration")
+
+def test_traversal_edge():
+ # properties aren't serialized in gremlin-python
+ run_writeread("traversal-edge")
+
+def test_no_prop_edge():
+ # gremlin-python serializes/deserializes "null" for props not empty list
+ run_writeread("no-prop-edge")
+
+def test_max_int():
+ run("max-int")
+
+def test_min_int():
+ run("min-int")
+
+def test_max_long():
+ # attempts to serialize a long as an int
+ run_writeread("max-long")
+
+def test_min_long():
+ # attempts to serialize a long as an int
+ run_writeread("min-long")
+
+def test_var_type_list():
+ run("var-type-list")
+
+def test_empty_list():
+ run("empty-list")
+
+def test_var_type_map():
+ # can't write tuple
+ run_read("var-type-map")
+
+def test_empty_map():
+ run("empty-map")
+
+def test_traversal_path():
+ # gremlin-python serializes/deserializes "null" for props not empty list
+ run_writeread("traversal-path")
+
+def test_empty_path():
+ run("empty-path")
+
+def test_prop_path():
+ # gremlin-python doesn't serialize properties
+ run_writeread("prop-path")
+
+def test_edge_property():
+ run("edge-property")
+
+def test_null_property():
+ run("null-property")
+
+def test_var_type_set():
+ # ordering within set might be different
+ run_writeread("var-type-set")
+
+def test_empty_set():
+ run("empty-set")
+
+def test_max_short():
+ # short deserialized to int
+ run_writeread("max-short")
+
+def test_min_short():
+ # short deserialized to int
+ run_writeread("min-short")
+
+def test_specified_uuid():
+ run("specified-uuid")
+
+def test_nil_uuid():
+ run("nil-uuid")
+
+def test_no_prop_vertex():
+ # gremlin-python serializes/deserializes "null" for props not empty list
+ run_writeread("no-prop-vertex")
+
+def test_traversal_vertexproperty():
+ # properties aren't serialized in gremlin-python
+ run_writeread("traversal-vertexproperty")
+
+def test_meta_vertexproperty():
+ # properties aren't serialized in gremlin-python
+ run_writeread("meta-vertexproperty")
+
+def test_set_cardinality_vertexproperty():
+ # properties aren't serialized in gremlin-python
+ run_writeread("set-cardinality-vertexproperty")
+
+def test_id_t():
+ run("id-t")
+
+def test_out_direction():
+ run("out-direction")
+
+def test_var_bulklist():
+ run_read("var-bulklist")
+
+def test_var_bulklist():
+ run_read("empty-bulklist")
+
+def test_single_byte_char():
+ # char is serialized as string
+ run_writeread("single-byte-char")
+
+def test_multi_byte_char():
+ # char is serialized as string
+ run_writeread("multi-byte-char")
+
+def test_unspecified_null():
+ # no serializer for plain null
+ run_writeread("unspecified-null")
+
+def test_true_boolean():
+ run("true-boolean")
+
+def test_false_boolean():
+ run("false-boolean")
+
+def test_single_byte_string():
+ run("single-byte-string")
+
+def test_mixed_string():
+ run("mixed-string")
+
+def run(resource_name, comparator = None):
+ """
+ Runs the regular set of tests for the type which is
+ 1. model to deserialized object
+ 2. written bytes to read bytes
+ 3. round tripped (read then written) bytes to read bytes
+
+ Optionally takes in a comparator that used for comparison 1.
+ """
+ resource_bytes = read_file_by_name(resource_name)
+
+ model = get_entry(resource_name)
+ read = reader.read_object(resource_bytes)
+ if comparator is not None:
+ assert comparator(model, read)
+ else:
+ assert model == read
+
+ written = writer.write_object(model)
+ assert resource_bytes == written
+
+ round_tripped = writer.write_object(reader.read_object(resource_bytes))
+ assert resource_bytes == round_tripped
+
+def run_read(resource_name):
+ """
+ Runs the read test which compares the model to deserialized object
+
+ This should only be used in cases where there is only a deserializer
+ but no serializer for the same type.
+ """
+ resource_bytes = read_file_by_name(resource_name)
+
+ model = get_entry(resource_name)
+ read = reader.read_object(resource_bytes)
+ assert model == read
+
+def run_writeread(resource_name, comparator = None):
+ """
+ Runs a reduced set of tests for the type which is
+ 1. model to deserialized object
+ 2. model to round tripped (written then read) object
+
+ Optionally takes in a comparator that used for comparison 1.
+
+ Use this in cases where the regular run() function in too stringent.
+ E.g. when ordering doesn't matter like for sets. Ideally, a type
+ should be tested with run() instead when possible.
+ """
+ resource_bytes = read_file_by_name(resource_name)
+
+ model = get_entry(resource_name)
+ read = reader.read_object(resource_bytes)
+ round_tripped = reader.read_object(writer.write_object(model))
+
+ if comparator is not None:
+ assert comparator(model, read)
+ assert comparator(model, round_tripped)
+ else:
+ assert model == read
+ assert model == round_tripped
\ No newline at end of file
diff --git a/gremlin-python/src/main/python/tests/structure/io/test_graphsonV2d0.py b/gremlin-python/src/main/python/tests/structure/io/test_graphsonV2d0.py
deleted file mode 100644
index 8b31970..0000000
--- a/gremlin-python/src/main/python/tests/structure/io/test_graphsonV2d0.py
+++ /dev/null
@@ -1,553 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-__author__ = 'Marko A. Rodriguez (http://markorodriguez.com)'
-
-import datetime
-import calendar
-import json
-import uuid
-import math
-from decimal import *
-
-from unittest.mock import Mock
-
-from gremlin_python.statics import *
-from gremlin_python.structure.graph import Vertex, Edge, Property, VertexProperty, Graph, Path
-from gremlin_python.structure.io.graphsonV2d0 import GraphSONWriter, GraphSONReader, GraphSONUtil
-import gremlin_python.structure.io.graphsonV2d0
-from gremlin_python.process.traversal import P, Merge, Operator, Order, Barrier, Direction
-from gremlin_python.process.strategies import SubgraphStrategy
-from gremlin_python.process.graph_traversal import __
-from gremlin_python.process.anonymous_traversal import traversal
-
-
-class TestGraphSONReader:
- graphson_reader = GraphSONReader()
-
- def test_number_input(self):
- x = self.graphson_reader.read_object(json.dumps({
- "@type": "gx:Byte",
- "@value": 1
- }))
- assert isinstance(x, SingleByte)
- assert 1 == x
- x = self.graphson_reader.read_object(json.dumps({
- "@type": "gx:Int16",
- "@value": 16
- }))
- assert isinstance(x, short)
- assert 16 == x
- x = self.graphson_reader.read_object(json.dumps({
- "@type": "g:Int32",
- "@value": 31
- }))
- assert isinstance(x, int)
- assert 31 == x
- ##
- x = self.graphson_reader.read_object(json.dumps({
- "@type": "g:Int64",
- "@value": 31
- }))
- assert isinstance(x, long)
- assert long(31) == x
- ##
- x = self.graphson_reader.read_object(json.dumps({
- "@type": "g:Float",
- "@value": 31.3
- }))
- assert isinstance(x, float)
- assert 31.3 == x
- ##
- x = self.graphson_reader.read_object(json.dumps({
- "@type": "g:Double",
- "@value": 31.2
- }))
- assert isinstance(x, float)
- assert 31.2 == x
- ##
- x = self.graphson_reader.read_object(json.dumps({
- "@type": "g:Double",
- "@value": "NaN"
- }))
- assert isinstance(x, float)
- assert math.isnan(x)
- ##
- x = self.graphson_reader.read_object(json.dumps({
- "@type": "g:Double",
- "@value": "Infinity"
- }))
- assert isinstance(x, float)
- assert math.isinf(x) and x > 0
- ##
- x = self.graphson_reader.read_object(json.dumps({
- "@type": "g:Double",
- "@value": "-Infinity"
- }))
- assert isinstance(x, float)
- assert math.isinf(x) and x < 0
- ##
- x = self.graphson_reader.read_object(json.dumps({
- "@type": "gx:BigDecimal",
- "@value": 31.2
- }))
- assert isinstance(x, Decimal)
- assert Decimal(31.2) == x
- ##
- x = self.graphson_reader.read_object(json.dumps({
- "@type": "gx:BigDecimal",
- "@value": 123456789987654321123456789987654321
- }))
- assert isinstance(x, Decimal)
- assert Decimal('123456789987654321123456789987654321') == x
- ##
- x = self.graphson_reader.read_object(json.dumps({
- "@type": "gx:BigDecimal",
- "@value": "NaN"
- }))
- assert isinstance(x, Decimal)
- assert math.isnan(x)
- ##
- x = self.graphson_reader.read_object(json.dumps({
- "@type": "gx:BigDecimal",
- "@value": "Infinity"
- }))
- assert isinstance(x, Decimal)
- assert math.isinf(x) and x > 0
- ##
- x = self.graphson_reader.read_object(json.dumps({
- "@type": "gx:BigDecimal",
- "@value": "-Infinity"
- }))
- assert isinstance(x, Decimal)
- assert math.isinf(x) and x < 0
- ##
- x = self.graphson_reader.read_object(json.dumps({
- "@type": "gx:BigInteger",
- "@value": 31
- }))
- assert isinstance(x, long)
- assert 31 == x
- ##
- x = self.graphson_reader.read_object(json.dumps({
- "@type": "gx:BigInteger",
- "@value": 123456789987654321123456789987654321
- }))
- assert isinstance(x, long)
- assert 123456789987654321123456789987654321 == x
-
- def test_graph(self):
- vertex = self.graphson_reader.read_object("""
- {"@type":"g:Vertex", "@value":{"id":{"@type":"g:Int32","@value":1},"label":"person","outE":{"created":[{"id":{"@type":"g:Int32","@value":9},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Double","@value":0.4}}}],"knows":[{"id":{"@type":"g:Int32","@value":7},"inV":{"@type":"g:Int32","@value":2},"properties":{"weight":{"@type":"g:Double","@value":0.5}}},{"id":{"@type":"g:Int32","@value":8},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Double","@value":1.0}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":0},"value":"marko"}],"age":[{"id":{"@type":"g:Int64","@value":1},"value":{"@type":"g:Int32","@value":29}}]}}}""")
- assert isinstance(vertex, Vertex)
- assert "person" == vertex.label
- assert 1 == vertex.id
- assert isinstance(vertex.id, int)
- assert vertex == Vertex(1)
- assert 2 == len(vertex.properties)
- ##
- vertex = self.graphson_reader.read_object("""
- {"@type":"g:Vertex", "@value":{"id":{"@type":"g:Float","@value":45.23}}}""")
- assert isinstance(vertex, Vertex)
- assert 45.23 == vertex.id
- assert isinstance(vertex.id, FloatType)
- assert "vertex" == vertex.label
- assert vertex == Vertex(45.23)
- ##
- vertex_property = self.graphson_reader.read_object("""
- {"@type":"g:VertexProperty", "@value":{"id":"anId","label":"aKey","value":true,"vertex":{"@type":"g:Int32","@value":9}}}""")
- assert isinstance(vertex_property, VertexProperty)
- assert "anId" == vertex_property.id
- assert "aKey" == vertex_property.label
- assert vertex_property.value
- assert vertex_property.vertex == Vertex(9)
- ##
- vertex_property = self.graphson_reader.read_object("""
- {"@type":"g:VertexProperty", "@value":{"id":{"@type":"g:Int32","@value":1},"label":"name","value":"marko"}}""")
- assert isinstance(vertex_property, VertexProperty)
- assert 1 == vertex_property.id
- assert "name" == vertex_property.label
- assert "marko" == vertex_property.value
- assert vertex_property.vertex is None
- ##
- edge = self.graphson_reader.read_object("""
- {"@type":"g:Edge", "@value":{"id":{"@type":"g:Int64","@value":17},"label":"knows","inV":"x","outV":"y","inVLabel":"xLab","properties":{"aKey":"aValue","bKey":true}}}""")
- # print edge
- assert isinstance(edge, Edge)
- assert 17 == edge.id
- assert "knows" == edge.label
- assert edge.inV == Vertex("x", "xLabel")
- assert edge.outV == Vertex("y", "vertex")
- ##
- property = self.graphson_reader.read_object("""
- {"@type":"g:Property", "@value":{"key":"aKey","value":{"@type":"g:Int64","@value":17},"element":{"@type":"g:Edge","@value":{"id":{"@type":"g:Int64","@value":122},"label":"knows","inV":"x","outV":"y","inVLabel":"xLab"}}}}""")
- # print property
- assert isinstance(property, Property)
- assert "aKey" == property.key
- assert 17 == property.value
- assert Edge(122, Vertex("x"), "knows", Vertex("y")) == property.element
-
- def test_path(self):
- path = self.graphson_reader.read_object(
- """{"@type":"g:Path","@value":{"labels":[["a"],["b","c"],[]],"objects":[{"@type":"g:Vertex","@value":{"id":{"@type":"g:Int32","@value":1},"label":"person","properties":{"name":[{"@type":"g:VertexProperty","@value":{"id":{"@type":"g:Int64","@value":0},"value":"marko","label":"name"}}],"age":[{"@type":"g:VertexProperty","@value":{"id":{"@type":"g:Int64","@value":1},"value":{"@type":"g:Int32","@value":29},"label":"age"}}]}}},{"@type":"g:Vertex","@value":{"id":{"@type":"g:Int32","@value":3},"label":"software","properties":{"name":[{"@type":"g:VertexProperty","@value":{"id":{"@type":"g:Int64","@value":4},"value":"lop","label":"name"}}],"lang":[{"@type":"g:VertexProperty","@value":{"id":{"@type":"g:Int64","@value":5},"value":"java","label":"lang"}}]}}},"lop"]}}"""
- )
- assert isinstance(path, Path)
- assert "path[v[1], v[3], lop]" == str(path)
- assert Vertex(1) == path[0]
- assert Vertex(1) == path["a"]
- assert "lop" == path[2]
- assert 3 == len(path)
-
- def test_custom_mapping(self):
-
- # extended mapping
- class X:
- pass
-
- type_string = "test:Xtype"
- override_string = "g:Int64"
- serdes = Mock()
-
- reader = GraphSONReader(deserializer_map={type_string: serdes})
- assert type_string in reader.deserializers
-
- # base dicts are not modified
- assert type_string not in gremlin_python.structure.io.graphsonV2d0._deserializers
-
- x = X()
- o = reader.to_object({GraphSONUtil.TYPE_KEY: type_string, GraphSONUtil.VALUE_KEY: x})
- serdes.objectify.assert_called_once_with(x, reader)
- assert o is serdes.objectify()
-
- # overridden mapping
- type_string = "g:Int64"
- serdes = Mock()
- reader = GraphSONReader(deserializer_map={type_string: serdes, override_string: serdes})
- assert gremlin_python.structure.io.graphsonV2d0._deserializers[type_string] is not reader.deserializers[type_string]
-
- value = 3
- o = reader.to_object({GraphSONUtil.TYPE_KEY: type_string, GraphSONUtil.VALUE_KEY: value})
- serdes.objectify.assert_called_once_with(value, reader)
- assert o is serdes.objectify()
-
- def test_datetime(self):
- expected = datetime.datetime(2016, 12, 14, 16, 14, 36, 295000)
- pts = calendar.timegm(expected.utctimetuple()) + expected.microsecond / 1e6
- ts = int(round(pts * 1000))
- output = self.graphson_reader.read_object(json.dumps({"@type": "g:Date", "@value": ts}))
- assert isinstance(output, datetime.datetime)
- # TINKERPOP-1848
- assert expected == output
-
- def test_offsetdatetime(self):
- tz = datetime.timezone(datetime.timedelta(seconds=36000))
- ms = 12345678912
- expected = datetime.datetime(2022, 5, 20, tzinfo=tz) + datetime.timedelta(microseconds=ms)
- output = self.graphson_reader.read_object(json.dumps({"@type": "gx:OffsetDateTime", "@value": expected.isoformat()}))
- assert isinstance(output, datetime.datetime)
- assert expected == output
-
- def test_offsetdatetime_zulu(self):
- tz = datetime.timezone.utc
- ms = 12345678912
- expected = datetime.datetime(2022, 5, 20, tzinfo=tz) + datetime.timedelta(microseconds=ms)
- # simulate zulu format
- expected_zulu = expected.isoformat()[:-6] + 'Z'
- output = self.graphson_reader.read_object(json.dumps({"@type": "gx:OffsetDateTime", "@value": expected_zulu}))
- assert isinstance(output, datetime.datetime)
- assert expected == output
-
- def test_timestamp(self):
- dt = self.graphson_reader.read_object(json.dumps({"@type": "g:Timestamp", "@value": 1481750076295}))
- assert isinstance(dt, timestamp)
- assert float(dt) == 1481750076.295
-
- def test_duration(self):
- d = self.graphson_reader.read_object(json.dumps({"@type": "gx:Duration", "@value": "PT120H"}))
- assert isinstance(d, datetime.timedelta)
- assert d == datetime.timedelta(hours=120)
-
- def test_uuid(self):
- prop = self.graphson_reader.read_object(
- json.dumps({'@type': 'g:UUID', '@value': "41d2e28a-20a4-4ab0-b379-d810dede3786"}))
- assert isinstance(prop, uuid.UUID)
- assert str(prop) == '41d2e28a-20a4-4ab0-b379-d810dede3786'
-
- def test_metrics(self):
- prop = self.graphson_reader.read_object(
- json.dumps([{'@type': 'g:TraversalMetrics', '@value': {'dur': 1.468594, 'metrics': [
- {'@type': 'g:Metrics', '@value': {'dur': 1.380957, 'counts': {}, 'name': 'GraphStep(__.V())', 'annotations': {'percentDur': 94.03259171697556}, 'id': '4.0.0()'}},
- {'@type': 'g:Metrics', '@value': {'dur': 0.087637, 'counts': {}, 'name': 'ReferenceElementStep', 'annotations': {'percentDur': 5.967408283024444}, 'id': '3.0.0()'}}
- ]}}]))
- assert isinstance(prop, list)
- assert prop == [{'dur': 1.468594, 'metrics': [
- {'dur': 1.380957, 'counts': {}, 'name': 'GraphStep(__.V())', 'annotations': {'percentDur': 94.03259171697556}, 'id': '4.0.0()'},
- {'dur': 0.087637, 'counts': {}, 'name': 'ReferenceElementStep', 'annotations': {'percentDur': 5.967408283024444}, 'id': '3.0.0()'}
- ]}]
-
- def test_bytebuffer(self):
- bb = self.graphson_reader.read_object(
- json.dumps({"@type": "gx:ByteBuffer", "@value": "c29tZSBieXRlcyBmb3IgeW91"}))
- assert isinstance(bb, ByteBufferType)
- assert ByteBufferType("c29tZSBieXRlcyBmb3IgeW91", "utf8") == bb
-
- def test_char(self):
- c = self.graphson_reader.read_object(json.dumps({"@type": "gx:Char", "@value": "L"}))
- assert isinstance(c, SingleChar)
- assert chr(76) == c
-
- def test_null(self):
- c = self.graphson_reader.read_object(json.dumps(None))
- assert c is None
-
-
-class TestGraphSONWriter:
- graphson_writer = GraphSONWriter()
- graphson_reader = GraphSONReader()
-
- def test_numbers(self):
- assert {"@type": "gx:Byte", "@value": 1} == json.loads(self.graphson_writer.write_object(int.__new__(SingleByte, 1)))
- assert {"@type": "gx:Int16", "@value": 16} == json.loads(self.graphson_writer.write_object(short(16)))
- assert {"@type": "gx:Int16", "@value": -16} == json.loads(self.graphson_writer.write_object(short(-16)))
- assert {"@type": "g:Int64", "@value": 2} == json.loads(self.graphson_writer.write_object(long(2)))
- assert {"@type": "g:Int64", "@value": 851401972585122} == json.loads(self.graphson_writer.write_object(long(851401972585122)))
- assert {"@type": "g:Int64", "@value": -2} == json.loads(self.graphson_writer.write_object(long(-2)))
- assert {"@type": "g:Int64", "@value": -851401972585122} == json.loads(self.graphson_writer.write_object(long(-851401972585122)))
- assert {"@type": "g:Int32", "@value": 1} == json.loads(self.graphson_writer.write_object(1))
- assert {"@type": "g:Int32", "@value": -1} == json.loads(self.graphson_writer.write_object(-1))
- assert {"@type": "g:Int64", "@value": 851401972585122} == json.loads(self.graphson_writer.write_object(851401972585122))
- assert {"@type": "g:Double", "@value": 3.2} == json.loads(self.graphson_writer.write_object(3.2))
- assert {"@type": "g:Double", "@value": "NaN"} == json.loads(self.graphson_writer.write_object(float('nan')))
- assert {"@type": "g:Double", "@value": "Infinity"} == json.loads(self.graphson_writer.write_object(float('inf')))
- assert {"@type": "g:Double", "@value": "-Infinity"} == json.loads(self.graphson_writer.write_object(float('-inf')))
- assert {"@type": "gx:BigDecimal", "@value": "123456789987654321123456789987654321"} == json.loads(self.graphson_writer.write_object(Decimal('123456789987654321123456789987654321')))
- assert {"@type": "gx:BigDecimal", "@value": "NaN"} == json.loads(self.graphson_writer.write_object(Decimal('nan')))
- assert {"@type": "gx:BigDecimal", "@value": "Infinity"} == json.loads(self.graphson_writer.write_object(Decimal('inf')))
- assert {"@type": "gx:BigDecimal", "@value": "-Infinity"} == json.loads(self.graphson_writer.write_object(Decimal('-inf')))
- assert {"@type": "gx:BigInteger", "@value": "123456789987654321123456789987654321"} == json.loads(self.graphson_writer.write_object(long(123456789987654321123456789987654321)))
- assert {"@type": "gx:BigInteger", "@value": "123456789987654321123456789987654321"} == json.loads(self.graphson_writer.write_object(123456789987654321123456789987654321))
- assert """true""" == self.graphson_writer.write_object(True)
-
- def test_enum(self):
- assert {"@type": "g:Merge", "@value": "onMatch"} == json.loads(self.graphson_writer.write_object(Merge.on_match))
- assert {"@type": "g:Order", "@value": "shuffle"} == json.loads(self.graphson_writer.write_object(Order.shuffle))
- assert {"@type": "g:Barrier", "@value": "normSack"} == json.loads(self.graphson_writer.write_object(Barrier.norm_sack))
- assert {"@type": "g:Operator", "@value": "sum"} == json.loads(self.graphson_writer.write_object(Operator.sum_))
- assert {"@type": "g:Operator", "@value": "sumLong"} == json.loads(self.graphson_writer.write_object(Operator.sum_long))
- assert {"@type": "g:Direction", "@value": "OUT"} == json.loads(self.graphson_writer.write_object(Direction.OUT))
- assert {"@type": "g:Direction", "@value": "OUT"} == json.loads(self.graphson_writer.write_object(Direction.from_))
-
- def test_P(self):
- result = {'@type': 'g:P',
- '@value': {
- 'predicate': 'and',
- 'value': [{
- '@type': 'g:P',
- '@value': {
- 'predicate': 'or',
- 'value': [{
- '@type': 'g:P',
- '@value': {'predicate': 'lt', 'value': 'b'}
- },
- {'@type': 'g:P', '@value': {'predicate': 'gt', 'value': 'c'}}
- ]
- }
- },
- {'@type': 'g:P', '@value': {'predicate': 'neq', 'value': 'd'}}]}}
-
- assert result == json.loads(
- self.graphson_writer.write_object(P.lt("b").or_(P.gt("c")).and_(P.neq("d"))))
-
- result = {'@type': 'g:P', '@value': {'predicate':'within','value': [{"@type": "g:Int32", "@value": 1},{"@type": "g:Int32", "@value": 2}]}}
- assert result == json.loads(self.graphson_writer.write_object(P.within([1, 2])))
- assert result == json.loads(self.graphson_writer.write_object(P.within(1, 2)))
-
- result = {'@type': 'g:P', '@value': {'predicate':'within','value': [{"@type": "g:Int32", "@value": 1}]}}
- assert result == json.loads(self.graphson_writer.write_object(P.within([1])))
- assert result == json.loads(self.graphson_writer.write_object(P.within(1)))
-
- def test_strategies(self):
- assert {"@type": "g:SubgraphStrategy", "@value": {'conf': {}, 'fqcn': 'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SubgraphStrategy'}} == json.loads(
- self.graphson_writer.write_object(SubgraphStrategy))
- assert {"@type": "g:SubgraphStrategy", "@value": {'conf': { "vertices": {"@type": "g:Bytecode", "@value": {"step": [["has", "name", "marko"]]}}}, 'fqcn': 'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SubgraphStrategy'}} == json.loads(
- self.graphson_writer.write_object(SubgraphStrategy(vertices=__.has("name", "marko"))))
-
- def test_graph(self):
- # TODO: this assert is not compatible with python 3 and now that we test with both 2 and 3 it fails
- assert {"@type": "g:Vertex", "@value": {"id": {"@type": "g:Int64", "@value": 12}, "label": "person"}} == json.loads(self.graphson_writer.write_object(Vertex(long(12), "person")))
-
- assert {"@type": "g:Edge", "@value": {"id": {"@type": "g:Int32", "@value": 7},
- "outV": {"@type": "g:Int32", "@value": 0},
- "outVLabel": "person",
- "label": "knows",
- "inV": {"@type": "g:Int32", "@value": 1},
- "inVLabel": "dog"}} == json.loads(
- self.graphson_writer.write_object(Edge(7, Vertex(0, "person"), "knows", Vertex(1, "dog"))))
- assert {"@type": "g:VertexProperty", "@value": {"id": "blah", "label": "keyA", "value": True,
- "vertex": "stephen"}} == json.loads(
- self.graphson_writer.write_object(VertexProperty("blah", "keyA", True, Vertex("stephen"))))
-
- assert {"@type": "g:Property",
- "@value": {"key": "name", "value": "marko", "element": {"@type": "g:VertexProperty",
- "@value": {
- "vertex": "vertexId",
- "id": {"@type": "g:Int32", "@value": 1234},
- "label": "aKey"}}}} == json.loads(
- self.graphson_writer.write_object(
- Property("name", "marko", VertexProperty(1234, "aKey", 21345, Vertex("vertexId")))))
-
- vertex = self.graphson_reader.read_object(self.graphson_writer.write_object(Vertex(1, "person")))
- assert 1 == vertex.id
- assert "person" == vertex.label
-
- edge = self.graphson_reader.read_object(
- self.graphson_writer.write_object(Edge(3, Vertex(1, "person"), "knows", Vertex(2, "dog"))))
- assert "knows" == edge.label
- assert 3 == edge.id
- assert 1 == edge.outV.id
- assert 2 == edge.inV.id
-
- vertex_property = self.graphson_reader.read_object(
- self.graphson_writer.write_object(VertexProperty(1, "age", 32, Vertex(1))))
- assert 1 == vertex_property.id
- assert "age" == vertex_property.key
- assert 32 == vertex_property.value
-
- property = self.graphson_reader.read_object(self.graphson_writer.write_object(Property("age", 32.2, Edge(1, Vertex(2), "knows", Vertex(3)))))
- assert "age" == property.key
- assert 32.2 == property.value
-
- def test_custom_mapping(self):
- # extended mapping
- class X:
- pass
-
- serdes = Mock()
- writer = GraphSONWriter(serializer_map={X: serdes})
- assert X in writer.serializers
-
- # base dicts are not modified
- assert X not in gremlin_python.structure.io.graphsonV2d0._serializers
-
- obj = X()
- d = writer.to_dict(obj)
- serdes.dictify.assert_called_once_with(obj, writer)
- assert d is serdes.dictify()
-
- # overridden mapping
- serdes = Mock()
- writer = GraphSONWriter(serializer_map={int: serdes})
- assert gremlin_python.structure.io.graphsonV2d0._serializers[int] is not writer.serializers[int]
-
- value = 3
- d = writer.to_dict(value)
- serdes.dictify.assert_called_once_with(value, writer)
- assert d is serdes.dictify()
-
- def test_write_long(self):
- mapping = self.graphson_writer.to_dict(1)
- assert mapping['@type'] == 'g:Int32'
- assert mapping['@value'] == 1
-
- mapping = self.graphson_writer.to_dict(long(1))
- assert mapping['@type'] == 'g:Int64'
- assert mapping['@value'] == 1
-
- def test_datetime(self):
- expected = json.dumps({"@type": "g:Date", "@value": 1481750076295}, separators=(',', ':'))
- dt = datetime.datetime.utcfromtimestamp(1481750076295 / 1000.0)
- output = self.graphson_writer.write_object(dt)
- assert expected == output
-
- def test_timestamp(self):
- expected = json.dumps({"@type": "g:Timestamp", "@value": 1481750076295}, separators=(',', ':'))
- ts = timestamp(1481750076295 / 1000.0)
- output = self.graphson_writer.write_object(ts)
- assert expected == output
-
- def test_duration(self):
- expected = json.dumps({"@type": "gx:Duration", "@value": "P5D"}, separators=(',', ':'))
- d = datetime.timedelta(hours=120)
- output = self.graphson_writer.write_object(d)
- assert expected == output
-
- def test_uuid(self):
- expected = json.dumps({'@type': 'g:UUID', '@value': "41d2e28a-20a4-4ab0-b379-d810dede3786"}, separators=(',', ':'))
- prop = uuid.UUID("41d2e28a-20a4-4ab0-b379-d810dede3786")
- output = self.graphson_writer.write_object(prop)
- assert expected == output
-
- def test_bytebuffer(self):
- expected = json.dumps({'@type': 'gx:ByteBuffer', '@value': 'c29tZSBieXRlcyBmb3IgeW91'}, separators=(',', ':'))
- bb = ByteBufferType("c29tZSBieXRlcyBmb3IgeW91", "utf8")
- output = self.graphson_writer.write_object(bb)
- assert expected == output
-
- def test_char(self):
- expected = json.dumps({'@type': 'gx:Char', '@value': 'L'}, separators=(',', ':'))
- c = str.__new__(SingleChar, chr(76))
- output = self.graphson_writer.write_object(c)
- assert expected == output
-
-
-class TestFunctionalGraphSONIO:
- """Functional IO tests"""
-
- def test_timestamp(self, remote_connection_graphsonV2):
- g = traversal().with_(remote_connection_graphsonV2)
- ts = timestamp(1481750076295 / 1000)
- resp = g.addV('test_vertex').property('ts', ts)
- resp = resp.toList()
- vid = resp[0].id
- try:
- ts_prop = g.V(vid).properties('ts').toList()[0]
- assert isinstance(ts_prop.value, timestamp)
- assert ts_prop.value == ts
- except OSError:
- assert False, "Error making request"
- finally:
- g.V(vid).drop().iterate()
-
- def test_datetime(self, remote_connection_graphsonV2):
- g = traversal().with_(remote_connection_graphsonV2)
- dt = datetime.datetime.utcfromtimestamp(1481750076295 / 1000)
- resp = g.addV('test_vertex').property('dt', dt).toList()
- vid = resp[0].id
- try:
- dt_prop = g.V(vid).properties('dt').toList()[0]
- assert isinstance(dt_prop.value, datetime.datetime)
- assert dt_prop.value == dt
- except OSError:
- assert False, "Error making request"
- finally:
- g.V(vid).drop().iterate()
-
- def test_uuid(self, remote_connection_graphsonV2):
- g = traversal().with_(remote_connection_graphsonV2)
- uid = uuid.UUID("41d2e28a-20a4-4ab0-b379-d810dede3786")
- resp = g.addV('test_vertex').property('uuid', uid).toList()
- vid = resp[0].id
- try:
- uid_prop = g.V(vid).properties('uuid').toList()[0]
- assert isinstance(uid_prop.value, uuid.UUID)
- assert uid_prop.value == uid
- except OSError:
- assert False, "Error making request"
- finally:
- g.V(vid).drop().iterate()
diff --git a/gremlin-python/src/main/python/tests/structure/io/test_graphsonV3d0.py b/gremlin-python/src/main/python/tests/structure/io/test_graphsonV3d0.py
deleted file mode 100644
index 099c1ab..0000000
--- a/gremlin-python/src/main/python/tests/structure/io/test_graphsonV3d0.py
+++ /dev/null
@@ -1,570 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-__author__ = 'Marko A. Rodriguez (http://markorodriguez.com)'
-
-import datetime
-import calendar
-import json
-import uuid
-import math
-from decimal import *
-
-from unittest.mock import Mock
-
-from gremlin_python.statics import *
-from gremlin_python.structure.graph import Vertex, Edge, Property, VertexProperty, Path
-from gremlin_python.structure.io.graphsonV3d0 import GraphSONWriter, GraphSONReader, GraphSONUtil
-import gremlin_python.structure.io.graphsonV3d0
-from gremlin_python.process.traversal import P, Merge, Barrier, Order, Operator, Direction
-from gremlin_python.process.strategies import SubgraphStrategy
-from gremlin_python.process.graph_traversal import __
-
-
-class TestGraphSONReader:
- graphson_reader = GraphSONReader()
-
- def test_collections(self):
- x = self.graphson_reader.read_object(
- json.dumps({"@type": "g:List", "@value": [{"@type": "g:Int32", "@value": 1},
- {"@type": "g:Int32", "@value": 2},
- "3"]}))
- assert isinstance(x, list)
- assert x[0] == 1
- assert x[1] == 2
- assert x[2] == "3"
- ##
-
- x = self.graphson_reader.read_object(
- json.dumps({"@type": "g:Set", "@value": [{"@type": "g:Int32", "@value": 1},
- {"@type": "g:Int32", "@value": 2},
- "3"]}))
- # return a set as normal
- assert isinstance(x, set)
- assert x == {1, 2, "3"}
-
- x = self.graphson_reader.read_object(
- json.dumps({"@type": "g:Set", "@value": [{"@type": "g:Int32", "@value": 1},
- {"@type": "g:Int32", "@value": 2},
- {"@type": "g:Float", "@value": 2.0},
- "3"]}))
- # coerce to list here because Java might return numerics of different types which python won't recognize
- # see comments of TINKERPOP-1844 for more details
- assert isinstance(x, list)
- assert x == list([1, 2, 2.0, "3"])
- ##
- x = self.graphson_reader.read_object(
- json.dumps({"@type": "g:Map",
- "@value": ['a', {"@type": "g:Int32", "@value": 1}, 'b', "marko"]}))
- assert isinstance(x, dict)
- assert x['a'] == 1
- assert x['b'] == "marko"
- assert len(x) == 2
-
- # BulkSet gets coerced to a List - both have the same behavior
- x = self.graphson_reader.read_object(
- json.dumps({"@type": "g:BulkSet",
- "@value": ["marko", {"@type": "g:Int64", "@value": 1}, "josh", {"@type": "g:Int64", "@value": 3}]}))
- assert isinstance(x, list)
- assert len(x) == 4
- assert x.count("marko") == 1
- assert x.count("josh") == 3
-
- def test_number_input(self):
- x = self.graphson_reader.read_object(json.dumps({
- "@type": "gx:Byte",
- "@value": 1
- }))
- assert isinstance(x, SingleByte)
- assert 1 == x
- x = self.graphson_reader.read_object(json.dumps({
- "@type": "gx:Int16",
- "@value": 16
- }))
- assert isinstance(x, short)
- assert 16 == x
- x = self.graphson_reader.read_object(json.dumps({
- "@type": "g:Int32",
- "@value": 31
- }))
- assert isinstance(x, int)
- assert 31 == x
- ##
- x = self.graphson_reader.read_object(json.dumps({
- "@type": "g:Int64",
- "@value": 31
- }))
- assert isinstance(x, long)
- assert long(31) == x
- ##
- x = self.graphson_reader.read_object(json.dumps({
- "@type": "g:Float",
- "@value": 31.3
- }))
- assert isinstance(x, float)
- assert 31.3 == x
- ##
- x = self.graphson_reader.read_object(json.dumps({
- "@type": "g:Double",
- "@value": 31.2
- }))
- assert isinstance(x, float)
- assert 31.2 == x
- ##
- x = self.graphson_reader.read_object(json.dumps({
- "@type": "g:Double",
- "@value": "NaN"
- }))
- assert isinstance(x, float)
- assert math.isnan(x)
- ##
- x = self.graphson_reader.read_object(json.dumps({
- "@type": "g:Double",
- "@value": "Infinity"
- }))
- assert isinstance(x, float)
- assert math.isinf(x) and x > 0
- ##
- x = self.graphson_reader.read_object(json.dumps({
- "@type": "g:Double",
- "@value": "-Infinity"
- }))
- assert isinstance(x, float)
- assert math.isinf(x) and x < 0
- ##
- x = self.graphson_reader.read_object(json.dumps({
- "@type": "gx:BigDecimal",
- "@value": 31.2
- }))
- assert isinstance(x, Decimal)
- assert Decimal(31.2) == x
- ##
- x = self.graphson_reader.read_object(json.dumps({
- "@type": "gx:BigDecimal",
- "@value": 123456789987654321123456789987654321
- }))
- assert isinstance(x, Decimal)
- assert Decimal('123456789987654321123456789987654321') == x
- ##
- x = self.graphson_reader.read_object(json.dumps({
- "@type": "gx:BigDecimal",
- "@value": "NaN"
- }))
- assert isinstance(x, Decimal)
- assert math.isnan(x)
- ##
- x = self.graphson_reader.read_object(json.dumps({
- "@type": "gx:BigDecimal",
- "@value": "Infinity"
- }))
- assert isinstance(x, Decimal)
- assert math.isinf(x) and x > 0
- ##
- x = self.graphson_reader.read_object(json.dumps({
- "@type": "gx:BigDecimal",
- "@value": "-Infinity"
- }))
- assert isinstance(x, Decimal)
- assert math.isinf(x) and x < 0
- ##
- x = self.graphson_reader.read_object(json.dumps({
- "@type": "gx:BigInteger",
- "@value": 31
- }))
- assert isinstance(x, long)
- assert 31 == x
- ##
- x = self.graphson_reader.read_object(json.dumps({
- "@type": "gx:BigInteger",
- "@value": 123456789987654321123456789987654321
- }))
- assert isinstance(x, long)
- assert 123456789987654321123456789987654321 == x
-
- def test_graph(self):
- vertex = self.graphson_reader.read_object("""
- {"@type":"g:Vertex", "@value":{"id":{"@type":"g:Int32","@value":1},"label":"person","outE":{"created":[{"id":{"@type":"g:Int32","@value":9},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Double","@value":0.4}}}],"knows":[{"id":{"@type":"g:Int32","@value":7},"inV":{"@type":"g:Int32","@value":2},"properties":{"weight":{"@type":"g:Double","@value":0.5}}},{"id":{"@type":"g:Int32","@value":8},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Double","@value":1.0}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":0},"value":"marko"}],"age":[{"id":{"@type":"g:Int64","@value":1},"value":{"@type":"g:Int32","@value":29}}]}}}""")
- assert isinstance(vertex, Vertex)
- assert "person" == vertex.label
- assert 1 == vertex.id
- assert isinstance(vertex.id, int)
- assert vertex == Vertex(1)
- ##
- vertex = self.graphson_reader.read_object("""
- {"@type":"g:Vertex", "@value":{"id":{"@type":"g:Float","@value":45.23}}}""")
- assert isinstance(vertex, Vertex)
- assert 45.23 == vertex.id
- assert isinstance(vertex.id, FloatType)
- assert "vertex" == vertex.label
- assert vertex == Vertex(45.23)
- ##
- vertex_property = self.graphson_reader.read_object("""
- {"@type":"g:VertexProperty", "@value":{"id":"anId","label":"aKey","value":true,"vertex":{"@type":"g:Int32","@value":9}}}""")
- assert isinstance(vertex_property, VertexProperty)
- assert "anId" == vertex_property.id
- assert "aKey" == vertex_property.label
- assert vertex_property.value
- assert vertex_property.vertex == Vertex(9)
- ##
- vertex_property = self.graphson_reader.read_object("""
- {"@type":"g:VertexProperty", "@value":{"id":{"@type":"g:Int32","@value":1},"label":"name","value":"marko"}}""")
- assert isinstance(vertex_property, VertexProperty)
- assert 1 == vertex_property.id
- assert "name" == vertex_property.label
- assert "marko" == vertex_property.value
- assert vertex_property.vertex is None
- ##
- edge = self.graphson_reader.read_object("""
- {"@type":"g:Edge", "@value":{"id":{"@type":"g:Int64","@value":17},"label":"knows","inV":"x","outV":"y","inVLabel":"xLab","properties":{"aKey":"aValue","bKey":true}}}""")
- # print edge
- assert isinstance(edge, Edge)
- assert 17 == edge.id
- assert "knows" == edge.label
- assert edge.inV == Vertex("x", "xLabel")
- assert edge.outV == Vertex("y", "vertex")
- ##
- property = self.graphson_reader.read_object("""
- {"@type":"g:Property", "@value":{"key":"aKey","value":{"@type":"g:Int64","@value":17},"element":{"@type":"g:Edge","@value":{"id":{"@type":"g:Int64","@value":122},"label":"knows","inV":"x","outV":"y","inVLabel":"xLab"}}}}""")
- # print property
- assert isinstance(property, Property)
- assert "aKey" == property.key
- assert 17 == property.value
- assert Edge(122, Vertex("x"), "knows", Vertex("y")) == property.element
-
- def test_path(self):
- path = self.graphson_reader.read_object(
- """{"@type":"g:Path","@value":{"labels":{"@type":"g:List","@value":[{"@type":"g:Set","@value":["a"]},{"@type":"g:Set","@value":["b","c"]},{"@type":"g:Set","@value":[]}]},"objects":{"@type":"g:List","@value":[{"@type":"g:Vertex","@value":{"id":{"@type":"g:Int32","@value":1},"label":"person","properties":{"name":[{"@type":"g:VertexProperty","@value":{"id":{"@type":"g:Int64","@value":0},"value":"marko","label":"name"}}],"age":[{"@type":"g:VertexProperty","@value":{"id":{"@type":"g:Int64","@value":1},"value":{"@type":"g:Int32","@value":29},"label":"age"}}]}}},{"@type":"g:Vertex","@value":{"id":{"@type":"g:Int32","@value":3},"label":"software","properties":{"name":[{"@type":"g:VertexProperty","@value":{"id":{"@type":"g:Int64","@value":4},"value":"lop","label":"name"}}],"lang":[{"@type":"g:VertexProperty","@value":{"id":{"@type":"g:Int64","@value":5},"value":"java","label":"lang"}}]}}},"lop"]}}}"""
- )
- assert isinstance(path, Path)
- assert "path[v[1], v[3], lop]" == str(path)
- assert Vertex(1) == path[0]
- assert Vertex(1) == path["a"]
- assert "lop" == path[2]
- assert 3 == len(path)
-
- def test_custom_mapping(self):
-
- # extended mapping
- class X:
- pass
-
- type_string = "test:Xtype"
- override_string = "g:Int64"
- serdes = Mock()
-
- reader = GraphSONReader(deserializer_map={type_string: serdes})
- assert type_string in reader.deserializers
-
- # base dicts are not modified
- assert type_string not in gremlin_python.structure.io.graphsonV3d0._deserializers
-
- x = X()
- o = reader.to_object({GraphSONUtil.TYPE_KEY: type_string, GraphSONUtil.VALUE_KEY: x})
- serdes.objectify.assert_called_once_with(x, reader)
- assert o is serdes.objectify()
-
- # overridden mapping
- type_string = "g:Int64"
- serdes = Mock()
- reader = GraphSONReader(deserializer_map={type_string: serdes, override_string: serdes})
- assert gremlin_python.structure.io.graphsonV3d0._deserializers[type_string] is not reader.deserializers[
- type_string]
-
- value = 3
- o = reader.to_object({GraphSONUtil.TYPE_KEY: type_string, GraphSONUtil.VALUE_KEY: value})
- serdes.objectify.assert_called_once_with(value, reader)
- assert o is serdes.objectify()
-
- def test_datetime(self):
- expected = datetime.datetime(2016, 12, 14, 16, 14, 36, 295000)
- pts = calendar.timegm(expected.utctimetuple()) + expected.microsecond / 1e6
- ts = int(round(pts * 1000))
- output = self.graphson_reader.read_object(json.dumps({"@type": "g:Date", "@value": ts}))
- assert isinstance(output, datetime.datetime)
- # TINKERPOP-1848
- assert expected == output
-
- def test_offsetdatetime(self):
- tz = datetime.timezone(datetime.timedelta(seconds=36000))
- ms = 12345678912
- expected = datetime.datetime(2022, 5, 20, tzinfo=tz) + datetime.timedelta(microseconds=ms)
- output = self.graphson_reader.read_object(json.dumps({"@type": "gx:OffsetDateTime", "@value": expected.isoformat()}))
- assert isinstance(output, datetime.datetime)
- assert expected == output
-
- def test_offsetdatetime_zulu(self):
- tz = datetime.timezone.utc
- ms = 12345678912
- expected = datetime.datetime(2022, 5, 20, tzinfo=tz) + datetime.timedelta(microseconds=ms)
- # simulate zulu format
- expected_zulu = expected.isoformat()[:-6] + 'Z'
- output = self.graphson_reader.read_object(json.dumps({"@type": "gx:OffsetDateTime", "@value": expected_zulu}))
- assert isinstance(output, datetime.datetime)
- assert expected == output
-
- def test_timestamp(self):
- dt = self.graphson_reader.read_object(json.dumps({"@type": "g:Timestamp", "@value": 1481750076295}))
- assert isinstance(dt, timestamp)
- assert float(dt) == 1481750076.295
-
- def test_duration(self):
- d = self.graphson_reader.read_object(json.dumps({"@type": "gx:Duration", "@value": "PT120H"}))
- assert isinstance(d, datetime.timedelta)
- assert d == datetime.timedelta(hours=120)
-
- def test_uuid(self):
- prop = self.graphson_reader.read_object(
- json.dumps({'@type': 'g:UUID', '@value': "41d2e28a-20a4-4ab0-b379-d810dede3786"}))
- assert isinstance(prop, uuid.UUID)
- assert str(prop) == '41d2e28a-20a4-4ab0-b379-d810dede3786'
-
- def test_metrics(self):
- prop = self.graphson_reader.read_object(
- json.dumps([{'@type': 'g:TraversalMetrics', '@value': {'dur': 1.468594, 'metrics': [
- {'@type': 'g:Metrics', '@value': {'dur': 1.380957, 'counts': {}, 'name': 'GraphStep(__.V())', 'annotations': {'percentDur': 94.03259171697556}, 'id': '4.0.0()'}},
- {'@type': 'g:Metrics', '@value': {'dur': 0.087637, 'counts': {}, 'name': 'ReferenceElementStep', 'annotations': {'percentDur': 5.967408283024444}, 'id': '3.0.0()'}}
- ]}}]))
- assert isinstance(prop, list)
- assert prop == [{'dur': 1.468594, 'metrics': [
- {'dur': 1.380957, 'counts': {}, 'name': 'GraphStep(__.V())', 'annotations': {'percentDur': 94.03259171697556}, 'id': '4.0.0()'},
- {'dur': 0.087637, 'counts': {}, 'name': 'ReferenceElementStep', 'annotations': {'percentDur': 5.967408283024444}, 'id': '3.0.0()'}
- ]}]
-
- def test_bytebuffer(self):
- bb = self.graphson_reader.read_object(
- json.dumps({"@type": "gx:ByteBuffer", "@value": "c29tZSBieXRlcyBmb3IgeW91"}))
- assert isinstance(bb, ByteBufferType)
- assert ByteBufferType("c29tZSBieXRlcyBmb3IgeW91", "utf8") == bb
-
- def test_char(self):
- c = self.graphson_reader.read_object(json.dumps({"@type": "gx:Char", "@value": "L"}))
- assert isinstance(c, SingleChar)
- assert chr(76) == c
-
- def test_null(self):
- c = self.graphson_reader.read_object(json.dumps(None))
- assert c is None
-
-
-class TestGraphSONWriter:
- graphson_writer = GraphSONWriter()
- graphson_reader = GraphSONReader()
-
- def test_collections(self):
- assert {"@type": "g:List", "@value": [{"@type": "g:Int32", "@value": 1},
- {"@type": "g:Int32", "@value": 2},
- {"@type": "g:Int32", "@value": 3}]} == json.loads(
- self.graphson_writer.write_object([1, 2, 3]))
- assert {"@type": "g:Set", "@value": [{"@type": "g:Int32", "@value": 1},
- {"@type": "g:Int32", "@value": 2},
- {"@type": "g:Int32", "@value": 3}]} == json.loads(
- self.graphson_writer.write_object({1, 2, 3, 3}))
- assert {"@type": "g:Map",
- "@value": ['a', {"@type": "g:Int32", "@value": 1}]} == json.loads(
- self.graphson_writer.write_object({'a': 1}))
-
- def test_numbers(self):
- assert {"@type": "gx:Byte", "@value": 1} == json.loads(self.graphson_writer.write_object(int.__new__(SingleByte, 1)))
- assert {"@type": "gx:Int16", "@value": 16} == json.loads(self.graphson_writer.write_object(short(16)))
- assert {"@type": "gx:Int16", "@value": -16} == json.loads(self.graphson_writer.write_object(short(-16)))
- assert {"@type": "g:Int64", "@value": 2} == json.loads(self.graphson_writer.write_object(long(2)))
- assert {"@type": "g:Int64", "@value": 851401972585122} == json.loads(self.graphson_writer.write_object(long(851401972585122)))
- assert {"@type": "g:Int64", "@value": -2} == json.loads(self.graphson_writer.write_object(long(-2)))
- assert {"@type": "g:Int64", "@value": -851401972585122} == json.loads(self.graphson_writer.write_object(long(-851401972585122)))
- assert {"@type": "g:Int32", "@value": 1} == json.loads(self.graphson_writer.write_object(1))
- assert {"@type": "g:Int32", "@value": -1} == json.loads(self.graphson_writer.write_object(-1))
- assert {"@type": "g:Int64", "@value": 851401972585122} == json.loads(self.graphson_writer.write_object(851401972585122))
- assert {"@type": "g:Double", "@value": 3.2} == json.loads(self.graphson_writer.write_object(3.2))
- assert {"@type": "g:Double", "@value": "NaN"} == json.loads(self.graphson_writer.write_object(float('nan')))
- assert {"@type": "g:Double", "@value": "Infinity"} == json.loads(self.graphson_writer.write_object(float('inf')))
- assert {"@type": "g:Double", "@value": "-Infinity"} == json.loads(self.graphson_writer.write_object(float('-inf')))
- assert {"@type": "gx:BigDecimal", "@value": "123456789987654321123456789987654321"} == json.loads(self.graphson_writer.write_object(Decimal('123456789987654321123456789987654321')))
- assert {"@type": "gx:BigDecimal", "@value": "NaN"} == json.loads(self.graphson_writer.write_object(Decimal('nan')))
- assert {"@type": "gx:BigDecimal", "@value": "Infinity"} == json.loads(self.graphson_writer.write_object(Decimal('inf')))
- assert {"@type": "gx:BigDecimal", "@value": "-Infinity"} == json.loads(self.graphson_writer.write_object(Decimal('-inf')))
- assert {"@type": "gx:BigInteger", "@value": "123456789987654321123456789987654321"} == json.loads(self.graphson_writer.write_object(long(123456789987654321123456789987654321)))
- assert {"@type": "gx:BigInteger", "@value": "123456789987654321123456789987654321"} == json.loads(self.graphson_writer.write_object(123456789987654321123456789987654321))
- assert """true""" == self.graphson_writer.write_object(True)
-
- def test_enum(self):
- assert {"@type": "g:Merge", "@value": "onMatch"} == json.loads(self.graphson_writer.write_object(Merge.on_match))
- assert {"@type": "g:Order", "@value": "shuffle"} == json.loads(self.graphson_writer.write_object(Order.shuffle))
- assert {"@type": "g:Barrier", "@value": "normSack"} == json.loads(self.graphson_writer.write_object(Barrier.norm_sack))
- assert {"@type": "g:Operator", "@value": "sum"} == json.loads(self.graphson_writer.write_object(Operator.sum_))
- assert {"@type": "g:Operator", "@value": "sumLong"} == json.loads(self.graphson_writer.write_object(Operator.sum_long))
- assert {"@type": "g:Direction", "@value": "OUT"} == json.loads(self.graphson_writer.write_object(Direction.OUT))
- assert {"@type": "g:Direction", "@value": "OUT"} == json.loads(self.graphson_writer.write_object(Direction.from_))
-
- def test_P(self):
- result = {'@type': 'g:P',
- '@value': {
- 'predicate': 'and',
- 'value': [{
- '@type': 'g:P',
- '@value': {
- 'predicate': 'or',
- 'value': [{
- '@type': 'g:P',
- '@value': {'predicate': 'lt', 'value': 'b'}
- },
- {'@type': 'g:P', '@value': {'predicate': 'gt', 'value': 'c'}}
- ]
- }
- },
- {'@type': 'g:P', '@value': {'predicate': 'neq', 'value': 'd'}}]}}
-
- assert result == json.loads(
- self.graphson_writer.write_object(P.lt("b").or_(P.gt("c")).and_(P.neq("d"))))
-
- result = {'@type': 'g:P', '@value': {'predicate': 'within', 'value': {'@type': 'g:List', '@value': [
- {"@type": "g:Int32", "@value": 1}, {"@type": "g:Int32", "@value": 2}]}}}
- assert result == json.loads(self.graphson_writer.write_object(P.within([1, 2])))
- assert result == json.loads(self.graphson_writer.write_object(P.within({1, 2})))
- assert result == json.loads(self.graphson_writer.write_object(P.within(1, 2)))
-
- result = {'@type': 'g:P', '@value': {'predicate': 'within', 'value': {'@type': 'g:List', '@value': [
- {"@type": "g:Int32", "@value": 1}]}}}
- assert result == json.loads(self.graphson_writer.write_object(P.within([1])))
- assert result == json.loads(self.graphson_writer.write_object(P.within({1})))
- assert result == json.loads(self.graphson_writer.write_object(P.within(1)))
-
- def test_strategies(self):
- assert {"@type": "g:SubgraphStrategy", "@value": {'conf': {}, 'fqcn': 'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SubgraphStrategy'}} == json.loads(
- self.graphson_writer.write_object(SubgraphStrategy))
- assert {"@type": "g:SubgraphStrategy", "@value": {'conf': { "vertices": {"@type": "g:Bytecode", "@value": {"step": [["has", "name", "marko"]]}}}, 'fqcn': 'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SubgraphStrategy'}} == json.loads(
- self.graphson_writer.write_object(SubgraphStrategy(vertices=__.has("name", "marko"))))
-
- def test_graph(self):
- # TODO: this assert is not compatible with python 3 and now that we test with both 2 and 3 it fails
- assert {"@type": "g:Vertex",
- "@value": {"id": {"@type": "g:Int64", "@value": 12}, "label": "person"}} == json.loads(
- self.graphson_writer.write_object(Vertex(long(12), "person")))
-
- assert {"@type": "g:Edge", "@value": {"id": {"@type": "g:Int32", "@value": 7},
- "outV": {"@type": "g:Int32", "@value": 0},
- "outVLabel": "person",
- "label": "knows",
- "inV": {"@type": "g:Int32", "@value": 1},
- "inVLabel": "dog"}} == json.loads(
- self.graphson_writer.write_object(Edge(7, Vertex(0, "person"), "knows", Vertex(1, "dog"))))
- assert {"@type": "g:VertexProperty", "@value": {"id": "blah", "label": "keyA", "value": True,
- "vertex": "stephen"}} == json.loads(
- self.graphson_writer.write_object(VertexProperty("blah", "keyA", True, Vertex("stephen"))))
-
- assert {"@type": "g:Property",
- "@value": {"key": "name", "value": "marko", "element": {"@type": "g:VertexProperty",
- "@value": {
- "vertex": "vertexId",
- "id": {"@type": "g:Int32", "@value": 1234},
- "label": "aKey"}}}} == json.loads(
- self.graphson_writer.write_object(
- Property("name", "marko", VertexProperty(1234, "aKey", 21345, Vertex("vertexId")))))
-
- vertex = self.graphson_reader.read_object(self.graphson_writer.write_object(Vertex(1, "person")))
- assert 1 == vertex.id
- assert "person" == vertex.label
-
- edge = self.graphson_reader.read_object(
- self.graphson_writer.write_object(Edge(3, Vertex(1, "person"), "knows", Vertex(2, "dog"))))
- assert "knows" == edge.label
- assert 3 == edge.id
- assert 1 == edge.outV.id
- assert 2 == edge.inV.id
-
- vertex_property = self.graphson_reader.read_object(
- self.graphson_writer.write_object(VertexProperty(1, "age", 32, Vertex(1))))
- assert 1 == vertex_property.id
- assert "age" == vertex_property.key
- assert 32 == vertex_property.value
-
- property = self.graphson_reader.read_object(self.graphson_writer.write_object(Property("age", 32.2, Edge(1, Vertex(2), "knows", Vertex(3)))))
- assert "age" == property.key
- assert 32.2 == property.value
-
- def test_custom_mapping(self):
- # extended mapping
- class X:
- pass
-
- serdes = Mock()
- writer = GraphSONWriter(serializer_map={X: serdes})
- assert X in writer.serializers
-
- # base dicts are not modified
- assert X not in gremlin_python.structure.io.graphsonV3d0._serializers
-
- obj = X()
- d = writer.to_dict(obj)
- serdes.dictify.assert_called_once_with(obj, writer)
- assert d is serdes.dictify()
-
- # overridden mapping
- serdes = Mock()
- writer = GraphSONWriter(serializer_map={int: serdes})
- assert gremlin_python.structure.io.graphsonV3d0._serializers[int] is not writer.serializers[int]
-
- value = 3
- d = writer.to_dict(value)
- serdes.dictify.assert_called_once_with(value, writer)
- assert d is serdes.dictify()
-
- def test_write_long(self):
- mapping = self.graphson_writer.to_dict(1)
- assert mapping['@type'] == 'g:Int32'
- assert mapping['@value'] == 1
-
- mapping = self.graphson_writer.to_dict(long(1))
- assert mapping['@type'] == 'g:Int64'
- assert mapping['@value'] == 1
-
- def test_datetime(self):
- expected = json.dumps({"@type": "g:Date", "@value": 1481750076295}, separators=(',', ':'))
- dt = datetime.datetime.utcfromtimestamp(1481750076295 / 1000.0)
- output = self.graphson_writer.write_object(dt)
- assert expected == output
-
- def test_timestamp(self):
- expected = json.dumps({"@type": "g:Timestamp", "@value": 1481750076295}, separators=(',', ':'))
- ts = timestamp(1481750076295 / 1000.0)
- output = self.graphson_writer.write_object(ts)
- assert expected == output
-
- def test_duration(self):
- expected = json.dumps({"@type": "gx:Duration", "@value": "P5D"}, separators=(',', ':'))
- d = datetime.timedelta(hours=120)
- output = self.graphson_writer.write_object(d)
- assert expected == output
-
- def test_uuid(self):
- expected = json.dumps({'@type': 'g:UUID', '@value': "41d2e28a-20a4-4ab0-b379-d810dede3786"}, separators=(',', ':'))
- prop = uuid.UUID("41d2e28a-20a4-4ab0-b379-d810dede3786")
- output = self.graphson_writer.write_object(prop)
- assert expected == output
-
- def test_bytebuffer(self):
- expected = json.dumps({'@type': 'gx:ByteBuffer', '@value': 'c29tZSBieXRlcyBmb3IgeW91'}, separators=(',', ':'))
- bb = ByteBufferType("c29tZSBieXRlcyBmb3IgeW91", "utf8")
- output = self.graphson_writer.write_object(bb)
- assert expected == output
-
- def test_char(self):
- expected = json.dumps({'@type': 'gx:Char', '@value': 'L'}, separators=(',', ':'))
- c = str.__new__(SingleChar, chr(76))
- output = self.graphson_writer.write_object(c)
- assert expected == output
diff --git a/gremlin-python/src/main/python/tests/structure/io/test_graphsonV4.py b/gremlin-python/src/main/python/tests/structure/io/test_graphsonV4.py
new file mode 100644
index 0000000..7d88e73
--- /dev/null
+++ b/gremlin-python/src/main/python/tests/structure/io/test_graphsonV4.py
@@ -0,0 +1,448 @@
+#
+# 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.
+#
+
+__author__ = 'Marko A. Rodriguez (http://markorodriguez.com)'
+
+import datetime
+import calendar
+import json
+import uuid
+import math
+from decimal import *
+
+from unittest.mock import Mock
+
+from gremlin_python.statics import *
+from gremlin_python.structure.graph import Vertex, Edge, Property, VertexProperty, Path
+from gremlin_python.structure.io.graphsonV4 import GraphSONWriter, GraphSONReader, GraphSONUtil
+import gremlin_python.structure.io.graphsonV4
+from gremlin_python.process.traversal import P, Merge, Barrier, Order, Operator, Direction
+from gremlin_python.process.strategies import SubgraphStrategy
+from gremlin_python.process.graph_traversal import __
+
+
+class TestGraphSONReader:
+ graphson_reader = GraphSONReader()
+
+ def test_collections(self):
+ x = self.graphson_reader.read_object(
+ json.dumps({"@type": "g:List", "@value": [{"@type": "g:Int32", "@value": 1},
+ {"@type": "g:Int32", "@value": 2},
+ "3"]}))
+ assert isinstance(x, list)
+ assert x[0] == 1
+ assert x[1] == 2
+ assert x[2] == "3"
+ ##
+
+ x = self.graphson_reader.read_object(
+ json.dumps({"@type": "g:Set", "@value": [{"@type": "g:Int32", "@value": 1},
+ {"@type": "g:Int32", "@value": 2},
+ "3"]}))
+ # return a set as normal
+ assert isinstance(x, set)
+ assert x == {1, 2, "3"}
+
+ x = self.graphson_reader.read_object(
+ json.dumps({"@type": "g:Set", "@value": [{"@type": "g:Int32", "@value": 1},
+ {"@type": "g:Int32", "@value": 2},
+ {"@type": "g:Float", "@value": 2.0},
+ "3"]}))
+ # coerce to list here because Java might return numerics of different types which python won't recognize
+ # see comments of TINKERPOP-1844 for more details
+ assert isinstance(x, list)
+ assert x == list([1, 2, 2.0, "3"])
+ ##
+ x = self.graphson_reader.read_object(
+ json.dumps({"@type": "g:Map",
+ "@value": ['a', {"@type": "g:Int32", "@value": 1}, 'b', "marko"]}))
+ assert isinstance(x, dict)
+ assert x['a'] == 1
+ assert x['b'] == "marko"
+ assert len(x) == 2
+
+ def test_number_input(self):
+ x = self.graphson_reader.read_object(json.dumps({
+ "@type": "g:Byte",
+ "@value": 1
+ }))
+ assert isinstance(x, SingleByte)
+ assert 1 == x
+ x = self.graphson_reader.read_object(json.dumps({
+ "@type": "g:Int16",
+ "@value": 16
+ }))
+ assert isinstance(x, short)
+ assert 16 == x
+ x = self.graphson_reader.read_object(json.dumps({
+ "@type": "g:Int32",
+ "@value": 31
+ }))
+ assert isinstance(x, int)
+ assert 31 == x
+ ##
+ x = self.graphson_reader.read_object(json.dumps({
+ "@type": "g:Int64",
+ "@value": 31
+ }))
+ assert isinstance(x, long)
+ assert long(31) == x
+ ##
+ x = self.graphson_reader.read_object(json.dumps({
+ "@type": "g:Float",
+ "@value": 31.3
+ }))
+ assert isinstance(x, float)
+ assert 31.3 == x
+ ##
+ x = self.graphson_reader.read_object(json.dumps({
+ "@type": "g:Double",
+ "@value": 31.2
+ }))
+ assert isinstance(x, float)
+ assert 31.2 == x
+ ##
+ x = self.graphson_reader.read_object(json.dumps({
+ "@type": "g:Double",
+ "@value": "NaN"
+ }))
+ assert isinstance(x, float)
+ assert math.isnan(x)
+ ##
+ x = self.graphson_reader.read_object(json.dumps({
+ "@type": "g:Double",
+ "@value": "Infinity"
+ }))
+ assert isinstance(x, float)
+ assert math.isinf(x) and x > 0
+ ##
+ x = self.graphson_reader.read_object(json.dumps({
+ "@type": "g:Double",
+ "@value": "-Infinity"
+ }))
+ assert isinstance(x, float)
+ assert math.isinf(x) and x < 0
+ ##
+ x = self.graphson_reader.read_object(json.dumps({
+ "@type": "g:BigDecimal",
+ "@value": 31.2
+ }))
+ assert isinstance(x, BigDecimal)
+ assert Decimal('31.2') == x.value
+ ##
+ x = self.graphson_reader.read_object(json.dumps({
+ "@type": "g:BigDecimal",
+ "@value": 123456789987654321123456789987654321
+ }))
+ assert isinstance(x, BigDecimal)
+ assert to_bigdecimal(123456789987654321123456789987654321).value == x.value
+ ##
+ x = self.graphson_reader.read_object(json.dumps({
+ "@type": "g:BigInteger",
+ "@value": 31
+ }))
+ assert isinstance(x, long)
+ assert 31 == x
+ ##
+ x = self.graphson_reader.read_object(json.dumps({
+ "@type": "g:BigInteger",
+ "@value": 123456789987654321123456789987654321
+ }))
+ assert isinstance(x, long)
+ assert 123456789987654321123456789987654321 == x
+
+ def test_graph(self):
+ vertex = self.graphson_reader.read_object("""
+ {"@type":"g:Vertex", "@value":{"id":{"@type":"g:Int32","@value":1},"label": ["person"],"outE":{"created":[{"id":{"@type":"g:Int32","@value":9},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":[{"@type":"g:Property","@value":{"key":"weight","value":{"@type":"g:Double","@value":0.4}}}]}}],"knows":[{"id":{"@type":"g:Int32","@value":7},"inV":{"@type":"g:Int32","@value":2},"properties":{"weight":[{"@type":"g:Property","@value":{"key":"weight","value":{"@type":"g:Double","@value":0.5}}}]}},{"id":{"@type":"g:Int32","@value":8},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":[{"@type":"g:Property","@value":{"key":"weight","value":{"@type":"g:Double","@value":1.0}}}]}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":0},"value":"marko"}],"age":[{"id":{"@type":"g:Int64","@value":1},"value":{"@type":"g:Int32","@value":29}}]}}}""")
+ assert isinstance(vertex, Vertex)
+ assert "person" == vertex.label
+ assert 1 == vertex.id
+ assert isinstance(vertex.id, int)
+ assert vertex == Vertex(1)
+ ##
+ vertex = self.graphson_reader.read_object("""
+ {"@type":"g:Vertex", "@value":{"id":{"@type":"g:Float","@value":45.23}}}""")
+ assert isinstance(vertex, Vertex)
+ assert 45.23 == vertex.id
+ assert isinstance(vertex.id, FloatType)
+ assert "vertex" == vertex.label
+ assert vertex == Vertex(45.23)
+ ##
+ vertex_property = self.graphson_reader.read_object("""
+ {"@type":"g:VertexProperty", "@value":{"id":{"@type":"g:Int32","@value":1},"label":["name"],"value":"marko"}}""")
+ assert isinstance(vertex_property, VertexProperty)
+ assert 1 == vertex_property.id
+ assert "name" == vertex_property.label
+ assert "marko" == vertex_property.value
+ assert vertex_property.vertex is None
+ ##
+ edge = self.graphson_reader.read_object("""
+ {"@type":"g:Edge", "@value":{"id":{"@type":"g:Int64","@value":17},"label":["knows"],"inV":{"id":"x","label":["xLabel"]},"outV":{"id":"y","label":["vertex"]},"properties":{"aKey":[{"@type":"g:Property","@value":{"key":"aKey","value":"aValue"}}],"bKey":[{"@type":"g:Property","@value":{"key":"bKey","value":true}}]}}}""")
+ # print edge
+ assert isinstance(edge, Edge)
+ assert 17 == edge.id
+ assert "knows" == edge.label
+ assert edge.inV == Vertex("x", "xLabel")
+ assert edge.outV == Vertex("y", "vertex")
+ ##
+ property = self.graphson_reader.read_object("""
+ {"@type":"g:Property", "@value":{"key":"aKey","value":{"@type":"g:Int64","@value":17}}}""")
+ # print property
+ assert isinstance(property, Property)
+ assert "aKey" == property.key
+ assert 17 == property.value
+
+ def test_path(self):
+ path = self.graphson_reader.read_object(
+ """{"@type":"g:Path","@value":{"labels":{"@type":"g:List","@value":[{"@type":"g:Set","@value":["a"]},{"@type":"g:Set","@value":["b","c"]},{"@type":"g:Set","@value":[]}]},"objects":{"@type":"g:List","@value":[{"@type":"g:Vertex","@value":{"id":{"@type":"g:Int32","@value":1},"label":["person"],"properties":{"name":[{"@type":"g:VertexProperty","@value":{"id":{"@type":"g:Int64","@value":0},"value":"marko","label":["name"]}}],"age":[{"@type":"g:VertexProperty","@value":{"id":{"@type":"g:Int64","@value":1},"value":{"@type":"g:Int32","@value":29},"label":["age"]}}]}}},{"@type":"g:Vertex","@value":{"id":{"@type":"g:Int32","@value":3},"label":["software"],"properties":{"name":[{"@type":"g:VertexProperty","@value":{"id":{"@type":"g:Int64","@value":4},"value":"lop","label":["name"]}}],"lang":[{"@type":"g:VertexProperty","@value":{"id":{"@type":"g:Int64","@value":5},"value":"java","label":["lang"]}}]}}},"lop"]}}}"""
+ )
+ assert isinstance(path, Path)
+ assert "path[v[1], v[3], lop]" == str(path)
+ assert Vertex(1) == path[0]
+ assert Vertex(1) == path["a"]
+ assert "lop" == path[2]
+ assert 3 == len(path)
+
+ def test_custom_mapping(self):
+
+ # extended mapping
+ class X:
+ pass
+
+ type_string = "test:Xtype"
+ override_string = "g:Int64"
+ serdes = Mock()
+
+ reader = GraphSONReader(deserializer_map={type_string: serdes})
+ assert type_string in reader.deserializers
+
+ # base dicts are not modified
+ assert type_string not in gremlin_python.structure.io.graphsonV4._deserializers
+
+ x = X()
+ o = reader.to_object({GraphSONUtil.TYPE_KEY: type_string, GraphSONUtil.VALUE_KEY: x})
+ serdes.objectify.assert_called_once_with(x, reader)
+ assert o is serdes.objectify()
+
+ # overridden mapping
+ type_string = "g:Int64"
+ serdes = Mock()
+ reader = GraphSONReader(deserializer_map={type_string: serdes, override_string: serdes})
+ assert gremlin_python.structure.io.graphsonV4._deserializers[type_string] is not reader.deserializers[
+ type_string]
+
+ value = 3
+ o = reader.to_object({GraphSONUtil.TYPE_KEY: type_string, GraphSONUtil.VALUE_KEY: value})
+ serdes.objectify.assert_called_once_with(value, reader)
+ assert o is serdes.objectify()
+
+ def test_datetime(self):
+ tz = datetime.timezone(datetime.timedelta(seconds=36000))
+ ms = 12345678912
+ expected = datetime.datetime(2022, 5, 20, tzinfo=tz) + datetime.timedelta(microseconds=ms)
+ dt = self.graphson_reader.read_object(json.dumps({"@type": "g:DateTime", "@value": expected.isoformat()}))
+ assert isinstance(dt, datetime.datetime)
+ assert dt == expected
+
+ def test_datetime_zulu(self):
+ tz = datetime.timezone.utc
+ ms = 12345678912
+ expected = datetime.datetime(2022, 5, 20, tzinfo=tz) + datetime.timedelta(microseconds=ms)
+ # simulate zulu format
+ expected_zulu = expected.isoformat()[:-6] + 'Z'
+ dt = self.graphson_reader.read_object(json.dumps({"@type": "g:DateTime", "@value": expected_zulu}))
+ assert isinstance(dt, datetime.datetime)
+ assert dt == expected
+
+ def test_duration(self):
+ d = self.graphson_reader.read_object(json.dumps({"@type": "g:Duration", "@value": "PT120H"}))
+ assert isinstance(d, datetime.timedelta)
+ assert d == datetime.timedelta(hours=120)
+
+ def test_uuid(self):
+ prop = self.graphson_reader.read_object(
+ json.dumps({'@type': 'g:UUID', '@value': "41d2e28a-20a4-4ab0-b379-d810dede3786"}))
+ assert isinstance(prop, uuid.UUID)
+ assert str(prop) == '41d2e28a-20a4-4ab0-b379-d810dede3786'
+
+ def test_binary(self):
+ bb = self.graphson_reader.read_object(
+ json.dumps({"@type": "g:Binary", "@value": "c29tZSBieXRlcyBmb3IgeW91"}))
+ assert isinstance(bb, bytes)
+ assert bytes("some bytes for you", "utf8") == bb
+
+ def test_char(self):
+ c = self.graphson_reader.read_object(json.dumps({"@type": "g:Char", "@value": "L"}))
+ assert isinstance(c, SingleChar)
+ assert chr(76) == c
+
+ def test_null(self):
+ c = self.graphson_reader.read_object(json.dumps(None))
+ assert c is None
+
+
+class TestGraphSONWriter:
+ graphson_writer = GraphSONWriter()
+ graphson_reader = GraphSONReader()
+
+ def test_collections(self):
+ assert {"@type": "g:List", "@value": [{"@type": "g:Int32", "@value": 1},
+ {"@type": "g:Int32", "@value": 2},
+ {"@type": "g:Int32", "@value": 3}]} == json.loads(
+ self.graphson_writer.write_object([1, 2, 3]))
+ assert {"@type": "g:Set", "@value": [{"@type": "g:Int32", "@value": 1},
+ {"@type": "g:Int32", "@value": 2},
+ {"@type": "g:Int32", "@value": 3}]} == json.loads(
+ self.graphson_writer.write_object({1, 2, 3, 3}))
+ assert {"@type": "g:Map",
+ "@value": ['a', {"@type": "g:Int32", "@value": 1}]} == json.loads(
+ self.graphson_writer.write_object({'a': 1}))
+
+ def test_numbers(self):
+ assert {"@type": "g:Byte", "@value": 1} == json.loads(self.graphson_writer.write_object(int.__new__(SingleByte, 1)))
+ assert {"@type": "g:Int16", "@value": 16} == json.loads(self.graphson_writer.write_object(short(16)))
+ assert {"@type": "g:Int16", "@value": -16} == json.loads(self.graphson_writer.write_object(short(-16)))
+ assert {"@type": "g:Int64", "@value": 2} == json.loads(self.graphson_writer.write_object(long(2)))
+ assert {"@type": "g:Int64", "@value": 851401972585122} == json.loads(self.graphson_writer.write_object(long(851401972585122)))
+ assert {"@type": "g:Int64", "@value": -2} == json.loads(self.graphson_writer.write_object(long(-2)))
+ assert {"@type": "g:Int64", "@value": -851401972585122} == json.loads(self.graphson_writer.write_object(long(-851401972585122)))
+ assert {"@type": "g:Int32", "@value": 1} == json.loads(self.graphson_writer.write_object(1))
+ assert {"@type": "g:Int32", "@value": -1} == json.loads(self.graphson_writer.write_object(-1))
+ assert {"@type": "g:Int64", "@value": 851401972585122} == json.loads(self.graphson_writer.write_object(851401972585122))
+ assert {"@type": "g:Double", "@value": 3.2} == json.loads(self.graphson_writer.write_object(3.2))
+ assert {"@type": "g:Double", "@value": "NaN"} == json.loads(self.graphson_writer.write_object(float('nan')))
+ assert {"@type": "g:Double", "@value": "Infinity"} == json.loads(self.graphson_writer.write_object(float('inf')))
+ assert {"@type": "g:Double", "@value": "-Infinity"} == json.loads(self.graphson_writer.write_object(float('-inf')))
+ assert {"@type": "g:BigDecimal", "@value": "123.456789987654321123456789987654321"} == json.loads(self.graphson_writer.write_object(to_bigdecimal("123.456789987654321123456789987654321")))
+ assert {"@type": "g:BigInteger", "@value": "123456789987654321123456789987654321"} == json.loads(self.graphson_writer.write_object(long(123456789987654321123456789987654321)))
+ assert {"@type": "g:BigInteger", "@value": "123456789987654321123456789987654321"} == json.loads(self.graphson_writer.write_object(123456789987654321123456789987654321))
+ assert """true""" == self.graphson_writer.write_object(True)
+
+ def test_enum(self):
+ assert {"@type": "g:Direction", "@value": "OUT"} == json.loads(self.graphson_writer.write_object(Direction.OUT))
+ assert {"@type": "g:Direction", "@value": "OUT"} == json.loads(self.graphson_writer.write_object(Direction.from_))
+
+ def test_graph(self):
+ assert {"@type": "g:Vertex",
+ "@value": {"id": {"@type": "g:Int64", "@value": 12}, "label": ["person"]}} == json.loads(
+ self.graphson_writer.write_object(Vertex(long(12), "person")))
+
+ assert {'@type': 'g:Edge', '@value': {'id': {'@type': 'g:Int32', '@value': 7},
+ 'inV': {'id': {'@type': 'g:Int32', '@value': 1},
+ 'label': ['dog']},
+ 'label': ['knows'],
+ 'outV': {'id': {'@type': 'g:Int32', '@value': 0},
+ 'label': ['person']}}} == json.loads(
+ self.graphson_writer.write_object(Edge(7, Vertex(0, "person"), "knows", Vertex(1, "dog"))))
+ assert {"@type": "g:VertexProperty", "@value": {"id": "blah", "label": ["keyA"], "value": True}} == json.loads(
+ self.graphson_writer.write_object(VertexProperty("blah", "keyA", True, Vertex("stephen"))))
+
+ assert {"@type": "g:Property",
+ "@value": {"key": "name", "value": "marko"}} == json.loads(
+ self.graphson_writer.write_object(
+ Property("name", "marko", VertexProperty(1234, "aKey", 21345, Vertex("vertexId")))))
+
+ vertex = self.graphson_reader.read_object(self.graphson_writer.write_object(Vertex(1, "person")))
+ assert 1 == vertex.id
+ assert "person" == vertex.label
+
+ edge = self.graphson_reader.read_object(
+ self.graphson_writer.write_object(Edge(3, Vertex(1, "person"), "knows", Vertex(2, "dog"))))
+ assert "knows" == edge.label
+ assert 3 == edge.id
+ assert 1 == edge.outV.id
+ assert 2 == edge.inV.id
+
+ vertex_property = self.graphson_reader.read_object(
+ self.graphson_writer.write_object(VertexProperty(1, "age", 32, Vertex(1))))
+ assert 1 == vertex_property.id
+ assert "age" == vertex_property.key
+ assert 32 == vertex_property.value
+
+ property = self.graphson_reader.read_object(self.graphson_writer.write_object(Property("age", 32.2, Edge(1, Vertex(2), "knows", Vertex(3)))))
+ assert "age" == property.key
+ assert 32.2 == property.value
+
+ def test_custom_mapping(self):
+ # extended mapping
+ class X:
+ pass
+
+ serdes = Mock()
+ writer = GraphSONWriter(serializer_map={X: serdes})
+ assert X in writer.serializers
+
+ # base dicts are not modified
+ assert X not in gremlin_python.structure.io.graphsonV4._serializers
+
+ obj = X()
+ d = writer.to_dict(obj)
+ serdes.dictify.assert_called_once_with(obj, writer)
+ assert d is serdes.dictify()
+
+ # overridden mapping
+ serdes = Mock()
+ writer = GraphSONWriter(serializer_map={int: serdes})
+ assert gremlin_python.structure.io.graphsonV4._serializers[int] is not writer.serializers[int]
+
+ value = 3
+ d = writer.to_dict(value)
+ serdes.dictify.assert_called_once_with(value, writer)
+ assert d is serdes.dictify()
+
+ def test_write_long(self):
+ mapping = self.graphson_writer.to_dict(1)
+ assert mapping['@type'] == 'g:Int32'
+ assert mapping['@value'] == 1
+
+ mapping = self.graphson_writer.to_dict(long(1))
+ assert mapping['@type'] == 'g:Int64'
+ assert mapping['@value'] == 1
+
+ def test_datetime(self):
+ expected = json.dumps({"@type": "g:DateTime", "@value": "2022-05-20T03:25:45.678912+10:00"}, separators=(',', ':'))
+ tz = datetime.timezone(datetime.timedelta(seconds=36000))
+ ms = 12345678912
+ dt = datetime.datetime(2022, 5, 20, tzinfo=tz) + datetime.timedelta(microseconds=ms)
+ output = self.graphson_writer.write_object(dt)
+ assert expected == output
+
+ def test_duration(self):
+ expected = json.dumps({"@type": "g:Duration", "@value": "P5D"}, separators=(',', ':'))
+ d = datetime.timedelta(hours=120)
+ output = self.graphson_writer.write_object(d)
+ assert expected == output
+
+ def test_uuid(self):
+ expected = json.dumps({'@type': 'g:UUID', '@value': "41d2e28a-20a4-4ab0-b379-d810dede3786"}, separators=(',', ':'))
+ prop = uuid.UUID("41d2e28a-20a4-4ab0-b379-d810dede3786")
+ output = self.graphson_writer.write_object(prop)
+ assert expected == output
+
+ def test_binary(self):
+ expected = json.dumps({'@type': 'g:Binary', '@value': 'c29tZSBieXRlcyBmb3IgeW91'}, separators=(',', ':'))
+ bb = bytes("some bytes for you", "utf8")
+ output = self.graphson_writer.write_object(bb)
+ assert expected == output
+
+ def test_char(self):
+ expected = json.dumps({'@type': 'g:Char', '@value': 'L'}, separators=(',', ':'))
+ c = str.__new__(SingleChar, chr(76))
+ output = self.graphson_writer.write_object(c)
+ assert expected == output
\ No newline at end of file
diff --git a/gremlin-python/src/main/python/tests/structure/io/test_graphsonv4model.py b/gremlin-python/src/main/python/tests/structure/io/test_graphsonv4model.py
new file mode 100644
index 0000000..6f6886e
--- /dev/null
+++ b/gremlin-python/src/main/python/tests/structure/io/test_graphsonv4model.py
@@ -0,0 +1,306 @@
+"""
+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.
+"""
+import pytest
+
+"""
+Round trip testing of GraphSONV4 compared to a correct "model".
+
+Set the IO_TEST_DIRECTORY environment variable to the directory where
+the .gbin files that represent the serialized "model" are located.
+"""
+
+from gremlin_python.structure.io.graphsonV4 import GraphSONWriter, GraphSONReader
+import math
+import json
+import os
+
+from .model import model
+
+gremlin_test_dir = "gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/"
+directory_search_pattern = "gremlin-python" + os.sep + "src" + os.sep + "main"
+default_dir = __file__[:__file__.find(directory_search_pattern)]
+test_resource_directory = os.environ.get('IO_TEST_DIRECTORY_GRAPHSON', default_dir + gremlin_test_dir)
+writer = GraphSONWriter()
+reader = GraphSONReader()
+
+def get_entry(title):
+ return model[title]
+
+def read_file_by_name(resource_name):
+ full_name = test_resource_directory + resource_name + "-" + "v4" + ".json"
+ with open(full_name, 'r') as resource_file:
+ return json.dumps(json.load(resource_file), separators=(',', ':'))
+
+def test_pos_bigdecimal():
+ def decimal_cmp(x, y):
+ # python json library can only read a BigDecimal into float during deser, precision will be lost with GraphSON
+ # so compare float only
+ if float(x.value) == float(y.value):
+ return True
+ else:
+ return False
+
+ run_writeread("pos-bigdecimal", decimal_cmp)
+
+def test_neg_bigdecimal():
+ def decimal_cmp(x, y):
+ if float(x.value) == float(y.value):
+ return True
+ else:
+ return False
+
+ run_writeread("neg-bigdecimal", decimal_cmp)
+
+def test_pos_biginteger():
+ # gremlin-python adds an extra 0 byte to the value.
+ run_writeread("pos-biginteger")
+
+def test_neg_biginteger():
+ # gremlin-python adds an extra 0 byte to the value.
+ run_writeread("neg-biginteger")
+
+def test_min_byte():
+ run("min-byte")
+
+def test_max_byte():
+ run("max-byte")
+
+def test_empty_binary():
+ run("empty-binary")
+
+def test_str_binary():
+ run("str-binary")
+
+def test_max_double():
+ run("max-double")
+
+def test_min_double():
+ run("min-double")
+
+def test_neg_max_double():
+ run("neg-max-double")
+
+def test_neg_min_double():
+ run("neg-min-double")
+
+def test_nan_double():
+ def nan_cmp(x, y):
+ if math.isnan(x) and math.isnan(y):
+ return True
+ else:
+ return False
+ run("nan-double", nan_cmp)
+
+def test_pos_inf_double():
+ run("pos-inf-double")
+
+def test_neg_inf_double():
+ run("neg-inf-double")
+
+def test_neg_zero_double():
+ run("neg-zero-double")
+
+def test_zero_duration():
+ run("zero-duration")
+
+def test_traversal_edge():
+ # properties aren't serialized in gremlin-python
+ run_writeread("traversal-edge")
+
+def test_no_prop_edge():
+ # gremlin-python serializes/deserializes "null" for props not empty list
+ run_writeread("no-prop-edge")
+
+def test_max_int():
+ run("max-int")
+
+def test_min_int():
+ run("min-int")
+
+def test_max_long():
+ # attempts to serialize a long as an int
+ run_writeread("max-long")
+
+def test_min_long():
+ # attempts to serialize a long as an int
+ run_writeread("min-long")
+
+def test_var_type_list():
+ run("var-type-list")
+
+def test_empty_list():
+ run("empty-list")
+
+def test_var_type_map():
+ # can't write tuple
+ run_read("var-type-map")
+
+def test_empty_map():
+ run("empty-map")
+
+# gremlin-python doesn't serialize path
+def test_traversal_path():
+ run_read("traversal-path")
+
+def test_empty_path():
+ run_read("empty-path")
+
+def test_prop_path():
+ run_read("prop-path")
+
+def test_edge_property():
+ run("edge-property")
+
+def test_null_property():
+ run("null-property")
+
+def test_var_type_set():
+ # ordering within set might be different
+ run_writeread("var-type-set")
+
+def test_empty_set():
+ run("empty-set")
+
+def test_max_short():
+ # short deserialized to int
+ run_writeread("max-short")
+
+def test_min_short():
+ # short deserialized to int
+ run_writeread("min-short")
+
+def test_specified_uuid():
+ run("specified-uuid")
+
+def test_nil_uuid():
+ run("nil-uuid")
+
+def test_no_prop_vertex():
+ # gremlin-python serializes/deserializes "null" for props not empty list
+ run_writeread("no-prop-vertex")
+
+def test_traversal_vertexproperty():
+ # properties aren't serialized in gremlin-python
+ run_writeread("traversal-vertexproperty")
+
+def test_meta_vertexproperty():
+ # properties aren't serialized in gremlin-python
+ run_writeread("meta-vertexproperty")
+
+def test_set_cardinality_vertexproperty():
+ # properties aren't serialized in gremlin-python
+ run_writeread("set-cardinality-vertexproperty")
+
+def test_id_t():
+ run("id-t")
+
+def test_out_direction():
+ run("out-direction")
+
+def test_var_bulklist():
+ run_read("var-bulklist")
+
+def test_empty_bulklist():
+ run_read("empty-bulklist")
+
+def test_single_byte_char():
+ # char is serialized as string
+ run_writeread("single-byte-char")
+
+def test_multi_byte_char():
+ # char is serialized as string
+ run_writeread("multi-byte-char")
+
+def test_unspecified_null():
+ # no serializer for plain null
+ run_writeread("unspecified-null")
+
+def test_true_boolean():
+ run("true-boolean")
+
+def test_false_boolean():
+ run("false-boolean")
+
+def test_single_byte_string():
+ run("single-byte-string")
+
+def test_mixed_string():
+ run("mixed-string")
+
+def run(resource_name, comparator = None):
+ """
+ Runs the regular set of tests for the type which is
+ 1. model to deserialized object
+ 2. written bytes to read bytes
+ 3. round tripped (read then written) bytes to read bytes
+
+ Optionally takes in a comparator that used for comparison 1.
+ """
+ resource_json = read_file_by_name(resource_name)
+
+ model = get_entry(resource_name)
+ read = reader.read_object(resource_json)
+ if comparator is not None:
+ assert comparator(model, read)
+ else:
+ assert model == read
+
+ written = writer.write_object(model)
+ assert resource_json == written
+
+ round_tripped = writer.write_object(reader.read_object(resource_json))
+ assert resource_json == round_tripped
+
+def run_read(resource_name):
+ """
+ Runs the read test which compares the model to deserialized object
+
+ This should only be used in cases where there is only a deserializer
+ but no serializer for the same type.
+ """
+ resource_json = read_file_by_name(resource_name)
+
+ model = get_entry(resource_name)
+ read = reader.read_object(resource_json)
+ assert model == read
+
+def run_writeread(resource_name, comparator = None):
+ """
+ Runs a reduced set of tests for the type which is
+ 1. model to deserialized object
+ 2. model to round tripped (written then read) object
+
+ Optionally takes in a comparator that used for comparison 1.
+
+ Use this in cases where the regular run() function in too stringent.
+ E.g. when ordering doesn't matter like for sets. Ideally, a type
+ should be tested with run() instead when possible.
+ """
+ resource_json = read_file_by_name(resource_name)
+
+ model = get_entry(resource_name)
+ read = reader.read_object(resource_json)
+ round_tripped = reader.read_object(writer.write_object(model))
+
+ if comparator is not None:
+ assert comparator(model, read)
+ assert comparator(model, round_tripped)
+ else:
+ assert model == read
+ assert model == round_tripped
\ No newline at end of file
diff --git a/gremlin-python/src/main/python/tests/test_statics.py b/gremlin-python/src/main/python/tests/test_statics.py
index 2c3f864..e22718e 100644
--- a/gremlin-python/src/main/python/tests/test_statics.py
+++ b/gremlin-python/src/main/python/tests/test_statics.py
@@ -19,6 +19,8 @@
__author__ = 'Marko A. Rodriguez (http://markorodriguez.com)'
+from decimal import Decimal
+
from gremlin_python import statics
from gremlin_python.process.traversal import Cardinality
from gremlin_python.process.traversal import P
@@ -63,3 +65,19 @@
raise Exception("SingleChar should throw a value error if input is not a single character string")
except ValueError:
pass
+
+ def test_bigdecimal(self):
+ assert statics.to_bigdecimal(1.23456).value == statics.BigDecimal(5,123456).value
+ assert statics.to_bigdecimal(-1.23456).value == statics.BigDecimal(5,-123456).value
+ # make sure the precision isn't changed globally
+ assert Decimal("123456789").scaleb(-5) == Decimal('1234.56789')
+ try:
+ statics.to_bigdecimal('NaN')
+ raise Exception("to_bigdecimal should throw a value error with NaN, Infinity or -Infinity")
+ except ValueError:
+ pass
+ try:
+ statics.to_bigdecimal('abc')
+ raise Exception("to_bigdecimal should throw a value error if input is not a convertable to Decimal")
+ except ValueError:
+ pass
diff --git a/gremlin-server/conf/gremlin-server-classic.yaml b/gremlin-server/conf/gremlin-server-classic.yaml
index 58429c2..37b51f5 100644
--- a/gremlin-server/conf/gremlin-server-classic.yaml
+++ b/gremlin-server/conf/gremlin-server-classic.yaml
@@ -21,6 +21,7 @@
graphs: {
graph: conf/tinkergraph-empty.properties}
scriptEngines: {
+ gremlin-lang: {},
gremlin-groovy: {
plugins: { org.apache.tinkerpop.gremlin.server.jsr223.GremlinServerGremlinPlugin: {},
org.apache.tinkerpop.gremlin.tinkergraph.jsr223.TinkerGraphGremlinPlugin: {},
@@ -38,6 +39,6 @@
maxInitialLineLength: 4096
maxHeaderSize: 8192
maxChunkSize: 8192
-maxContentLength: 10485760
+maxRequestContentLength: 10485760
maxAccumulationBufferComponents: 1024
resultIterationBatchSize: 64
diff --git a/gremlin-server/conf/gremlin-server-modern-readonly.yaml b/gremlin-server/conf/gremlin-server-modern-readonly.yaml
index de0a84a..3c6ad63 100644
--- a/gremlin-server/conf/gremlin-server-modern-readonly.yaml
+++ b/gremlin-server/conf/gremlin-server-modern-readonly.yaml
@@ -21,6 +21,7 @@
graphs: {
graph: conf/tinkergraph-empty.properties}
scriptEngines: {
+ gremlin-lang: {},
gremlin-groovy: {
plugins: { org.apache.tinkerpop.gremlin.server.jsr223.GremlinServerGremlinPlugin: {},
org.apache.tinkerpop.gremlin.tinkergraph.jsr223.TinkerGraphGremlinPlugin: {},
@@ -38,6 +39,6 @@
maxInitialLineLength: 4096
maxHeaderSize: 8192
maxChunkSize: 8192
-maxContentLength: 10485760
+maxRequestContentLength: 10485760
maxAccumulationBufferComponents: 1024
resultIterationBatchSize: 64
diff --git a/gremlin-server/conf/gremlin-server-modern.yaml b/gremlin-server/conf/gremlin-server-modern.yaml
index 1a477e1..4551023 100644
--- a/gremlin-server/conf/gremlin-server-modern.yaml
+++ b/gremlin-server/conf/gremlin-server-modern.yaml
@@ -18,9 +18,11 @@
host: localhost
port: 8182
evaluationTimeout: 30000
+channelizer: org.apache.tinkerpop.gremlin.server.channel.HttpChannelizer
graphs: {
graph: conf/tinkergraph-empty.properties}
scriptEngines: {
+ gremlin-lang: {},
gremlin-groovy: {
plugins: { org.apache.tinkerpop.gremlin.server.jsr223.GremlinServerGremlinPlugin: {},
org.apache.tinkerpop.gremlin.tinkergraph.jsr223.TinkerGraphGremlinPlugin: {},
@@ -28,9 +30,8 @@
org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin: {classImports: [java.lang.Math], methodImports: [java.lang.Math#*]},
org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin: {files: [scripts/generate-modern.groovy]}}}}
serializers:
- - { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3] }} # application/json
- - { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1 } # application/vnd.graphbinary-v1.0
- - { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1, config: { serializeResultToString: true }} # application/vnd.graphbinary-v1.0-stringd
+ - { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV4, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3] }} # application/json
+ - { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV4} # application/vnd.graphbinary-v4.0
metrics: {
slf4jReporter: {enabled: true, interval: 180000}}
strictTransactionManagement: false
@@ -39,6 +40,10 @@
maxInitialLineLength: 4096
maxHeaderSize: 8192
maxChunkSize: 8192
-maxContentLength: 10485760
+maxRequestContentLength: 10485760
maxAccumulationBufferComponents: 1024
resultIterationBatchSize: 64
+writeBufferLowWaterMark: 32768
+writeBufferHighWaterMark: 65536
+ssl: {
+ enabled: false}
\ No newline at end of file
diff --git a/gremlin-server/conf/gremlin-server-neo4j.yaml b/gremlin-server/conf/gremlin-server-neo4j.yaml
index 4610890..e11500a 100644
--- a/gremlin-server/conf/gremlin-server-neo4j.yaml
+++ b/gremlin-server/conf/gremlin-server-neo4j.yaml
@@ -28,10 +28,11 @@
host: localhost
port: 8182
evaluationTimeout: 30000
-channelizer: org.apache.tinkerpop.gremlin.server.channel.WebSocketChannelizer
+channelizer: org.apache.tinkerpop.gremlin.server.channel.HttpChannelizer
graphs: {
graph: conf/neo4j-empty.properties}
scriptEngines: {
+ gremlin-lang: {},
gremlin-groovy: {
plugins: { org.apache.tinkerpop.gremlin.server.jsr223.GremlinServerGremlinPlugin: {},
org.apache.tinkerpop.gremlin.neo4j.jsr223.Neo4jGremlinPlugin: {},
@@ -41,9 +42,6 @@
- { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3] }} # application/json
- { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1 } # application/vnd.graphbinary-v1.0
- { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1, config: { serializeResultToString: true }} # application/vnd.graphbinary-v1.0-stringd
-processors:
- - { className: org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: { sessionTimeout: 28800000 }}
- - { className: org.apache.tinkerpop.gremlin.server.op.traversal.TraversalOpProcessor}
metrics: {
consoleReporter: {enabled: true, interval: 180000},
csvReporter: {enabled: true, interval: 180000, fileName: /tmp/gremlin-server-metrics.csv},
@@ -55,7 +53,7 @@
maxInitialLineLength: 4096
maxHeaderSize: 8192
maxChunkSize: 8192
-maxContentLength: 10485760
+maxRequestContentLength: 10485760
maxAccumulationBufferComponents: 1024
resultIterationBatchSize: 64
writeBufferLowWaterMark: 32768
diff --git a/gremlin-server/conf/gremlin-server-rest-modern.yaml b/gremlin-server/conf/gremlin-server-rest-modern.yaml
index 5da2f36..905a9ca 100644
--- a/gremlin-server/conf/gremlin-server-rest-modern.yaml
+++ b/gremlin-server/conf/gremlin-server-rest-modern.yaml
@@ -22,6 +22,7 @@
graphs: {
graph: conf/tinkergraph-empty.properties}
scriptEngines: {
+ gremlin-lang: {},
gremlin-groovy: {
plugins: { org.apache.tinkerpop.gremlin.server.jsr223.GremlinServerGremlinPlugin: {},
org.apache.tinkerpop.gremlin.tinkergraph.jsr223.TinkerGraphGremlinPlugin: {},
@@ -38,6 +39,6 @@
maxInitialLineLength: 4096
maxHeaderSize: 8192
maxChunkSize: 8192
-maxContentLength: 10485760
+maxRequestContentLength: 10485760
maxAccumulationBufferComponents: 1024
resultIterationBatchSize: 64
diff --git a/gremlin-server/conf/gremlin-server-rest-secure.yaml b/gremlin-server/conf/gremlin-server-rest-secure.yaml
index 30327f7..8a62795 100644
--- a/gremlin-server/conf/gremlin-server-rest-secure.yaml
+++ b/gremlin-server/conf/gremlin-server-rest-secure.yaml
@@ -30,6 +30,7 @@
graphs: {
graph: conf/tinkergraph-empty.properties}
scriptEngines: {
+ gremlin-lang: {},
gremlin-groovy: {
plugins: { org.apache.tinkerpop.gremlin.server.jsr223.GremlinServerGremlinPlugin: {},
org.apache.tinkerpop.gremlin.tinkergraph.jsr223.TinkerGraphGremlinPlugin: {},
@@ -38,9 +39,6 @@
org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin: {files: [scripts/empty-sample-secure.groovy]}}}}
serializers:
- { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3] }} # application/json
-processors:
- - { className: org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: { sessionTimeout: 28800000 }}
- - { className: org.apache.tinkerpop.gremlin.server.op.traversal.TraversalOpProcessor}
metrics: {
consoleReporter: {enabled: true, interval: 180000},
csvReporter: {enabled: true, interval: 180000, fileName: /tmp/gremlin-server-metrics.csv},
@@ -50,7 +48,7 @@
maxInitialLineLength: 4096
maxHeaderSize: 8192
maxChunkSize: 8192
-maxContentLength: 10485760
+maxRequestContentLength: 10485760
maxAccumulationBufferComponents: 1024
resultIterationBatchSize: 64
writeBufferLowWaterMark: 32768
diff --git a/gremlin-server/conf/gremlin-server-secure.yaml b/gremlin-server/conf/gremlin-server-secure.yaml
index 9c996f4..ddc57c0 100644
--- a/gremlin-server/conf/gremlin-server-secure.yaml
+++ b/gremlin-server/conf/gremlin-server-secure.yaml
@@ -26,10 +26,11 @@
host: localhost
port: 8182
evaluationTimeout: 30000
-channelizer: org.apache.tinkerpop.gremlin.server.channel.WebSocketChannelizer
+channelizer: org.apache.tinkerpop.gremlin.server.channel.HttpChannelizer
graphs: {
graph: conf/tinkergraph-empty.properties}
scriptEngines: {
+ gremlin-lang: {},
gremlin-groovy: {
plugins: { org.apache.tinkerpop.gremlin.server.jsr223.GremlinServerGremlinPlugin: {},
org.apache.tinkerpop.gremlin.tinkergraph.jsr223.TinkerGraphGremlinPlugin: {},
@@ -40,9 +41,6 @@
- { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3] }} # application/json
- { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1 } # application/vnd.graphbinary-v1.0
- { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1, config: { serializeResultToString: true }} # application/vnd.graphbinary-v1.0-stringd
-processors:
- - { className: org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: { sessionTimeout: 28800000 }}
- - { className: org.apache.tinkerpop.gremlin.server.op.traversal.TraversalOpProcessor}
metrics: {
consoleReporter: {enabled: true, interval: 180000},
csvReporter: {enabled: true, interval: 180000, fileName: /tmp/gremlin-server-metrics.csv},
@@ -54,7 +52,7 @@
maxInitialLineLength: 4096
maxHeaderSize: 8192
maxChunkSize: 8192
-maxContentLength: 10485760
+maxRequestContentLength: 10485760
maxAccumulationBufferComponents: 1024
resultIterationBatchSize: 64
writeBufferLowWaterMark: 32768
diff --git a/gremlin-server/conf/gremlin-server-spark.yaml b/gremlin-server/conf/gremlin-server-spark.yaml
index b7c6f5d..e088106 100644
--- a/gremlin-server/conf/gremlin-server-spark.yaml
+++ b/gremlin-server/conf/gremlin-server-spark.yaml
@@ -41,10 +41,11 @@
host: localhost
port: 8182
evaluationTimeout: 30000
-channelizer: org.apache.tinkerpop.gremlin.server.channel.WebSocketChannelizer
+channelizer: org.apache.tinkerpop.gremlin.server.channel.HttpChannelizer
graphs: {
graph: conf/hadoop-gryo.properties}
scriptEngines: {
+ gremlin-lang: {},
gremlin-groovy: {
plugins: { org.apache.tinkerpop.gremlin.server.jsr223.GremlinServerGremlinPlugin: {},
org.apache.tinkerpop.gremlin.spark.jsr223.SparkGremlinPlugin: {},
@@ -54,9 +55,6 @@
- { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3] }} # application/json
- { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1 } # application/vnd.graphbinary-v1.0
- { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1, config: { serializeResultToString: true }} # application/vnd.graphbinary-v1.0-stringd
-processors:
- - { className: org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: { sessionTimeout: 28800000 }}
- - { className: org.apache.tinkerpop.gremlin.server.op.traversal.TraversalOpProcessor}
metrics: {
consoleReporter: {enabled: true, interval: 180000},
csvReporter: {enabled: true, interval: 180000, fileName: /tmp/gremlin-server-metrics.csv},
@@ -68,7 +66,7 @@
maxInitialLineLength: 4096
maxHeaderSize: 8192
maxChunkSize: 8192
-maxContentLength: 10485760
+maxRequestContentLength: 10485760
maxAccumulationBufferComponents: 1024
resultIterationBatchSize: 64
writeBufferLowWaterMark: 32768
diff --git a/gremlin-server/conf/gremlin-server-transaction.yaml b/gremlin-server/conf/gremlin-server-transaction.yaml
index 1b0b397..e4cc804 100644
--- a/gremlin-server/conf/gremlin-server-transaction.yaml
+++ b/gremlin-server/conf/gremlin-server-transaction.yaml
@@ -18,10 +18,11 @@
host: localhost
port: 8182
evaluationTimeout: 30000
-channelizer: org.apache.tinkerpop.gremlin.server.channel.WebSocketChannelizer
+channelizer: org.apache.tinkerpop.gremlin.server.channel.HttpChannelizer
graphs: {
graph: conf/tinkertransactiongraph-empty.properties}
scriptEngines: {
+ gremlin-lang: {},
gremlin-groovy: {
plugins: { org.apache.tinkerpop.gremlin.server.jsr223.GremlinServerGremlinPlugin: {},
org.apache.tinkerpop.gremlin.tinkergraph.jsr223.TinkerGraphGremlinPlugin: {},
@@ -31,9 +32,6 @@
- { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3] }} # application/json
- { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1 } # application/vnd.graphbinary-v1.0
- { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1, config: { serializeResultToString: true }} # application/vnd.graphbinary-v1.0-stringd
-processors:
- - { className: org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: { sessionTimeout: 28800000 }}
- - { className: org.apache.tinkerpop.gremlin.server.op.traversal.TraversalOpProcessor}
metrics: {
consoleReporter: {enabled: true, interval: 180000},
csvReporter: {enabled: true, interval: 180000, fileName: /tmp/gremlin-server-metrics.csv},
@@ -45,7 +43,7 @@
maxInitialLineLength: 4096
maxHeaderSize: 8192
maxChunkSize: 8192
-maxContentLength: 10485760
+maxRequestContentLength: 10485760
maxAccumulationBufferComponents: 1024
resultIterationBatchSize: 64
writeBufferLowWaterMark: 32768
diff --git a/gremlin-server/conf/gremlin-server.yaml b/gremlin-server/conf/gremlin-server.yaml
index eb33874..286f7f1 100644
--- a/gremlin-server/conf/gremlin-server.yaml
+++ b/gremlin-server/conf/gremlin-server.yaml
@@ -18,22 +18,20 @@
host: localhost
port: 8182
evaluationTimeout: 30000
-channelizer: org.apache.tinkerpop.gremlin.server.channel.WebSocketChannelizer
+channelizer: org.apache.tinkerpop.gremlin.server.channel.HttpChannelizer
graphs: {
graph: conf/tinkergraph-empty.properties}
scriptEngines: {
+ gremlin-lang: {},
gremlin-groovy: {
plugins: { org.apache.tinkerpop.gremlin.server.jsr223.GremlinServerGremlinPlugin: {},
org.apache.tinkerpop.gremlin.tinkergraph.jsr223.TinkerGraphGremlinPlugin: {},
org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin: {classImports: [java.lang.Math], methodImports: [java.lang.Math#*]},
org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin: {files: [scripts/empty-sample.groovy]}}}}
serializers:
- - { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3] }} # application/json
- - { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1 } # application/vnd.graphbinary-v1.0
- - { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1, config: { serializeResultToString: true }} # application/vnd.graphbinary-v1.0-stringd
-processors:
- - { className: org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: { sessionTimeout: 28800000 }}
- - { className: org.apache.tinkerpop.gremlin.server.op.traversal.TraversalOpProcessor}
+ - { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV4, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3] }} # application/json
+ - { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV4 } # application/vnd.graphbinary-v1.0
+ - { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV4, config: { serializeResultToString: true }} # application/vnd.graphbinary-v1.0-stringd
metrics: {
consoleReporter: {enabled: true, interval: 180000},
csvReporter: {enabled: true, interval: 180000, fileName: /tmp/gremlin-server-metrics.csv},
@@ -45,7 +43,7 @@
maxInitialLineLength: 4096
maxHeaderSize: 8192
maxChunkSize: 8192
-maxContentLength: 10485760
+maxRequestContentLength: 10485760
maxAccumulationBufferComponents: 1024
resultIterationBatchSize: 64
writeBufferLowWaterMark: 32768
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index 73983bc..0776ce4 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>gremlin-server</artifactId>
<name>Apache TinkerPop :: Gremlin Server</name>
@@ -51,8 +51,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java
index 9af5269..5d81327 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java
@@ -31,19 +31,17 @@
import org.apache.tinkerpop.gremlin.util.MessageSerializer;
import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1;
-import org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV2;
import org.apache.tinkerpop.gremlin.groovy.engine.GremlinExecutor;
import org.apache.tinkerpop.gremlin.server.auth.Authenticator;
import org.apache.tinkerpop.gremlin.server.authz.Authorizer;
import org.apache.tinkerpop.gremlin.server.handler.AbstractAuthenticationHandler;
-import org.apache.tinkerpop.gremlin.server.handler.OpExecutorHandler;
-import org.apache.tinkerpop.gremlin.server.handler.OpSelectorHandler;
import org.apache.tinkerpop.gremlin.server.util.ServerGremlinExecutor;
import org.apache.tinkerpop.gremlin.structure.Graph;
import io.netty.channel.ChannelInitializer;
import io.netty.channel.ChannelPipeline;
import io.netty.channel.socket.SocketChannel;
+import org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV4;
+import org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV4;
import org.javatuples.Pair;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -71,7 +69,7 @@
* Gremlin scripts).
* <p/>
* Implementers need only worry about determining how incoming data is converted to a
- * {@link RequestMessage} and outgoing data is converted from a {@link ResponseMessage} to whatever expected format is
+ * {@link RequestMessage} and outgoing data is converted from a {@link ResponseMessage} to whatever expected format is
* needed by the pipeline.
*
* @author Stephen Mallette (http://stephen.genoprime.com)
@@ -79,11 +77,8 @@
public abstract class AbstractChannelizer extends ChannelInitializer<SocketChannel> implements Channelizer {
private static final Logger logger = LoggerFactory.getLogger(AbstractChannelizer.class);
protected static final List<Settings.SerializerSettings> DEFAULT_SERIALIZERS = Arrays.asList(
- new Settings.SerializerSettings(GraphSONMessageSerializerV2.class.getName(), Collections.emptyMap()),
- new Settings.SerializerSettings(GraphBinaryMessageSerializerV1.class.getName(), Collections.emptyMap()),
- new Settings.SerializerSettings(GraphBinaryMessageSerializerV1.class.getName(), new HashMap<String,Object>(){{
- put(GraphBinaryMessageSerializerV1.TOKEN_SERIALIZE_RESULT_TO_STRING, true);
- }})
+ new Settings.SerializerSettings(GraphSONMessageSerializerV4.class.getName(), Collections.emptyMap()),
+ new Settings.SerializerSettings(GraphBinaryMessageSerializerV4.class.getName(), Collections.emptyMap())
);
protected Settings settings;
@@ -99,12 +94,9 @@
public static final String PIPELINE_REQUEST_HANDLER = "request-handler";
public static final String PIPELINE_HTTP_RESPONSE_ENCODER = "http-response-encoder";
public static final String PIPELINE_HTTP_AGGREGATOR = "http-aggregator";
- public static final String PIPELINE_WEBSOCKET_SERVER_COMPRESSION = "web-socket-server-compression-handler";
public static final String PIPELINE_HTTP_USER_AGENT_HANDLER = "http-user-agent-handler";
protected static final String PIPELINE_SSL = "ssl";
- protected static final String PIPELINE_OP_SELECTOR = "op-selector";
- protected static final String PIPELINE_OP_EXECUTOR = "op-executor";
protected static final String PIPELINE_HTTP_REQUEST_DECODER = "http-request-decoder";
protected static final String GREMLIN_ENDPOINT = "/gremlin";
@@ -112,9 +104,6 @@
protected ChannelGroup channels;
- private OpSelectorHandler opSelectorHandler;
- private OpExecutorHandler opExecutorHandler;
-
protected Authenticator authenticator;
protected Authorizer authorizer;
@@ -124,14 +113,6 @@
*/
public abstract void configure(final ChannelPipeline pipeline);
- /**
- * This method is called after the pipeline is completely configured. It can be overridden to make any
- * final changes to the pipeline before it goes into use.
- */
- public void finalize(final ChannelPipeline pipeline) {
- // do nothing
- }
-
@Override
public void init(final ServerGremlinExecutor serverGremlinExecutor) {
settings = serverGremlinExecutor.getSettings();
@@ -178,15 +159,11 @@
authenticator = createAuthenticator(settings.authentication);
authorizer = createAuthorizer(settings.authorization);
-
- // these handlers don't share any state and can thus be initialized once per pipeline
- opSelectorHandler = new OpSelectorHandler(settings, graphManager, gremlinExecutor, scheduledExecutorService, this);
- opExecutorHandler = new OpExecutorHandler(settings, graphManager, gremlinExecutor, scheduledExecutorService);
}
/**
* It is best not to override this method as it sets up some core parts to the server. Prefer implementing the
- * {@link #configure(ChannelPipeline)} and {@link #finalize(ChannelPipeline)} methods to alter the pipeline.
+ * {@link #configure(ChannelPipeline)} methods to alter the pipeline.
*/
@Override
public void initChannel(final SocketChannel ch) throws Exception {
@@ -207,42 +184,18 @@
// instance
configure(pipeline);
- pipeline.addLast(PIPELINE_OP_SELECTOR, opSelectorHandler);
- pipeline.addLast(PIPELINE_OP_EXECUTOR, opExecutorHandler);
-
- finalize(pipeline);
-
// track the newly created channel in the channel group
channels.add(ch);
-
}
protected AbstractAuthenticationHandler createAuthenticationHandler(final Settings settings) {
try {
final Class<?> clazz = Class.forName(settings.authentication.authenticationHandler);
AbstractAuthenticationHandler aah;
- try {
- // the three arg constructor is the new form as a handler may need the authorizer in some cases
- final Class<?>[] threeArgForm = new Class[]{Authenticator.class, Authorizer.class, Settings.class};
- final Constructor<?> twoArgConstructor = clazz.getDeclaredConstructor(threeArgForm);
- return (AbstractAuthenticationHandler) twoArgConstructor.newInstance(authenticator, authorizer, settings);
- } catch (Exception threeArgEx) {
- try {
- // the two arg constructor is the "old form" that existed prior to Authorizers. should probably
- // deprecate this form
- final Class<?>[] twoArgForm = new Class[]{Authenticator.class, Settings.class};
- final Constructor<?> twoArgConstructor = clazz.getDeclaredConstructor(twoArgForm);
-
- if (authorizer != null) {
- logger.warn("There is an authorizer configured but the {} does not have a constructor of ({}, {}, {}) so it cannot be added",
- clazz.getName(), Authenticator.class.getSimpleName(), Authorizer.class.getSimpleName(), Settings.class.getSimpleName());
- }
-
- return (AbstractAuthenticationHandler) twoArgConstructor.newInstance(authenticator, settings);
- } catch (Exception twoArgEx) {
- throw twoArgEx;
- }
- }
+ // the three arg constructor is the new form as a handler may need the authorizer in some cases
+ final Class<?>[] threeArgForm = new Class[]{Authenticator.class, Authorizer.class, Settings.class};
+ final Constructor<?> threeArgConstructor = clazz.getDeclaredConstructor(threeArgForm);
+ return (AbstractAuthenticationHandler) threeArgConstructor.newInstance(authenticator, authorizer, settings);
} catch (Exception ex) {
logger.warn(ex.getMessage());
throw new IllegalStateException(String.format("Could not create/configure AuthenticationHandler %s", settings.authentication.authenticationHandler), ex);
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Context.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Context.java
index f5bcdbd..b77838f 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Context.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Context.java
@@ -19,25 +19,18 @@
package org.apache.tinkerpop.gremlin.server;
import org.apache.tinkerpop.gremlin.process.traversal.Path;
+import io.netty.channel.ChannelHandlerContext;
+import org.apache.tinkerpop.gremlin.groovy.engine.GremlinExecutor;
+import org.apache.tinkerpop.gremlin.jsr223.GremlinScriptChecker;
import org.apache.tinkerpop.gremlin.process.traversal.traverser.util.AbstractTraverser;
+import org.apache.tinkerpop.gremlin.server.handler.HttpGremlinEndpointHandler;
import org.apache.tinkerpop.gremlin.structure.Element;
+import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceFactory;
import org.apache.tinkerpop.gremlin.util.Tokens;
import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.groovy.engine.GremlinExecutor;
-import io.netty.channel.ChannelHandlerContext;
-import org.apache.tinkerpop.gremlin.jsr223.GremlinScriptChecker;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
-import org.apache.tinkerpop.gremlin.server.handler.Frame;
-import org.apache.tinkerpop.gremlin.server.handler.WsUserAgentHandler;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.util.List;
-import java.util.Map;
import java.util.Optional;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
@@ -49,46 +42,32 @@
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
public class Context {
- private static final Logger logger = LoggerFactory.getLogger(Context.class);
private final RequestMessage requestMessage;
private final ChannelHandlerContext channelHandlerContext;
private final Settings settings;
private final GraphManager graphManager;
private final GremlinExecutor gremlinExecutor;
private final ScheduledExecutorService scheduledExecutorService;
- private final AtomicBoolean finalResponseWritten = new AtomicBoolean();
private final long requestTimeout;
private final String materializeProperties;
- private final RequestContentType requestContentType;
private final Object gremlinArgument;
+ private HttpGremlinEndpointHandler.RequestState requestState;
private final AtomicBoolean startedResponse = new AtomicBoolean(false);
private ScheduledFuture<?> timeoutExecutor = null;
private boolean timeoutExecutorGrabbed = false;
private final Object timeoutExecutorLock = new Object();
- /**
- * The type of the request as determined by the contents of {@link Tokens#ARGS_GREMLIN}.
- */
- public enum RequestContentType {
- /**
- * Contents is of type {@link Bytecode}.
- */
- BYTECODE,
-
- /**
- * Contents is of type {@code String}.
- */
- SCRIPT,
-
- /**
- * Contents are not of a type that is expected.
- */
- UNKNOWN
+ public Context(final RequestMessage requestMessage, final ChannelHandlerContext ctx,
+ final Settings settings, final GraphManager graphManager,
+ final GremlinExecutor gremlinExecutor, final ScheduledExecutorService scheduledExecutorService) {
+ this(requestMessage, ctx, settings, graphManager, gremlinExecutor, scheduledExecutorService,
+ HttpGremlinEndpointHandler.RequestState.NOT_STARTED);
}
public Context(final RequestMessage requestMessage, final ChannelHandlerContext ctx,
final Settings settings, final GraphManager graphManager,
- final GremlinExecutor gremlinExecutor, final ScheduledExecutorService scheduledExecutorService) {
+ final GremlinExecutor gremlinExecutor, final ScheduledExecutorService scheduledExecutorService,
+ final HttpGremlinEndpointHandler.RequestState requestState) {
this.requestMessage = requestMessage;
this.channelHandlerContext = ctx;
this.settings = settings;
@@ -97,8 +76,8 @@
this.scheduledExecutorService = scheduledExecutorService;
// order of calls matter as one depends on the next
- this.gremlinArgument = requestMessage.getArgs().get(Tokens.ARGS_GREMLIN);
- this.requestContentType = determineRequestContents();
+ this.gremlinArgument = requestMessage.getGremlin();
+ this.requestState = requestState;
this.requestTimeout = determineTimeout();
this.materializeProperties = determineMaterializeProperties();
}
@@ -125,7 +104,7 @@
/**
* The timeout for the request. If the request is a script it examines the script for a timeout setting using
* {@code with()}. If that is not found then it examines the request itself to see if the timeout is provided by
- * {@link Tokens#ARGS_EVAL_TIMEOUT}. If that is not provided then the {@link Settings#evaluationTimeout} is
+ * {@link Tokens#TIMEOUT_MS}. If that is not provided then the {@link Settings#evaluationTimeout} is
* utilized as the default.
*/
public long getRequestTimeout() {
@@ -136,18 +115,6 @@
return materializeProperties;
}
- public boolean isFinalResponseWritten() {
- return this.finalResponseWritten.get();
- }
-
- public RequestContentType getRequestContentType() {
- return requestContentType;
- }
-
- public Object getGremlinArgument() {
- return gremlinArgument;
- }
-
public ScheduledExecutorService getScheduledExecutorService() {
return scheduledExecutorService;
}
@@ -189,15 +156,6 @@
}
/**
- * Returns the user agent (if any) which was sent from the client during the web socket handshake.
- * Returns empty string if no user agent exists
- */
- public String getUserAgent() {
- return getChannelHandlerContext().channel().hasAttr(WsUserAgentHandler.USER_AGENT_ATTR_KEY) ?
- getChannelHandlerContext().channel().attr(WsUserAgentHandler.USER_AGENT_ATTR_KEY).get() : "";
- }
-
- /**
* Gets whether the server has started processing the response for this request.
*/
public boolean getStartedResponse() { return startedResponse.get(); }
@@ -207,118 +165,29 @@
*/
public void setStartedResponse() { startedResponse.set(true); }
- /**
- * Writes a default timeout error response message to the underlying channel.
- */
- public void sendTimeoutResponse() {
- sendTimeoutResponse(String.format("A timeout occurred during traversal evaluation of [%s] - consider increasing the limit given to evaluationTimeout", requestMessage));
- }
-
- /**
- * Writes a specific timeout error response message to the underlying channel.
- */
- public void sendTimeoutResponse(final String message) {
- logger.warn(message);
- writeAndFlush(ResponseMessage.build(requestMessage)
- .code(ResponseStatusCode.SERVER_ERROR_TIMEOUT)
- .statusMessage(message)
- .statusAttributeException(new InterruptedException()).create());
- }
-
- /**
- * Writes a response message to the underlying channel while ensuring that at most one
- * {@link ResponseStatusCode#isFinalResponse() final} response is written.
- * <p>Note: this method should be used instead of writing to the channel directly when multiple threads
- * are expected to produce response messages concurrently.</p>
- * <p>Attempts to write more than one final response message will be ignored.</p>
- * @see #writeAndFlush(ResponseStatusCode, Object)
- */
- public void writeAndFlush(final ResponseMessage message) {
- writeAndFlush(message.getStatus().getCode(), message);
- }
-
- /**
- * Writes a response message to the underlying channel while ensuring that at most one
- * {@link ResponseStatusCode#isFinalResponse() final} response is written.
- * <p>The caller must make sure that the provided response status code matches the content of the message.</p>
- * <p>Note: this method should be used instead of writing to the channel directly when multiple threads
- * are expected to produce response messages concurrently.</p>
- * <p>Attempts to write more than one final response message will be ignored.</p>
- * @see #writeAndFlush(ResponseMessage)
- */
- public void writeAndFlush(final ResponseStatusCode code, final Object responseMessage) {
- writeAndMaybeFlush(code, responseMessage, true);
- }
-
- public void write(final ResponseMessage message) {
- this.write(message.getStatus().getCode(), message);
- }
-
- public void write(final ResponseStatusCode code, final Object responseMessage) {
- writeAndMaybeFlush(code, responseMessage, false);
- }
-
- /**
- * Flushes messages to the underlying transport.
- */
- public void flush() {
- this.getChannelHandlerContext().flush();
- }
-
- private void writeAndMaybeFlush(final ResponseStatusCode code, final Object responseMessage, final boolean flush) {
- final boolean messageIsFinal = code.isFinalResponse();
- if (finalResponseWritten.compareAndSet(false, messageIsFinal)) {
- this.getChannelHandlerContext().write(responseMessage);
- if (flush) this.getChannelHandlerContext().flush();
- } else {
- if (responseMessage instanceof Frame) {
- ((Frame) responseMessage).tryRelease();
- }
-
- final String logMessage = String.format("Another final response message was already written for request %s, ignoring response code: %s",
- this.getRequestMessage().getRequestId(), code);
- logger.warn(logMessage);
- }
- }
-
- private RequestContentType determineRequestContents() {
- if (gremlinArgument instanceof Bytecode)
- return RequestContentType.BYTECODE;
- else if (gremlinArgument instanceof String)
- return RequestContentType.SCRIPT;
- else
- return RequestContentType.UNKNOWN;
- }
-
private long determineTimeout() {
// timeout override - handle both deprecated and newly named configuration. earlier logic should prevent
// both configurations from being submitted at the same time
- final Map<String, Object> args = requestMessage.getArgs();
- final long seto = args.containsKey(Tokens.ARGS_EVAL_TIMEOUT) ?
- ((Number) args.get(Tokens.ARGS_EVAL_TIMEOUT)).longValue() : settings.getEvaluationTimeout();
+ final Long timeoutMs = requestMessage.getField(Tokens.TIMEOUT_MS);
+ final long seto = (null != timeoutMs) ? timeoutMs : settings.getEvaluationTimeout();
// override the timeout if the lifecycle has a value assigned. if the script contains with(timeout)
// options then allow that value to override what's provided on the lifecycle
- final Optional<Long> timeoutDefinedInScript = requestContentType == RequestContentType.SCRIPT ?
- GremlinScriptChecker.parse(gremlinArgument.toString()).getTimeout() : Optional.empty();
+ final Optional<Long> timeoutDefinedInScript = GremlinScriptChecker.parse(gremlinArgument.toString()).getTimeout();
return timeoutDefinedInScript.orElse(seto);
}
private String determineMaterializeProperties() {
- // with() in Script request has the highest priority
- if (requestContentType == RequestContentType.SCRIPT) {
- final Optional<String> mp = GremlinScriptChecker.parse(gremlinArgument.toString()).getMaterializeProperties();
- if (mp.isPresent())
- return mp.get().equals(Tokens.MATERIALIZE_PROPERTIES_TOKENS)
- ? Tokens.MATERIALIZE_PROPERTIES_TOKENS
- : Tokens.MATERIALIZE_PROPERTIES_ALL;
- }
+ final Optional<String> mp = GremlinScriptChecker.parse(gremlinArgument.toString()).getMaterializeProperties();
+ if (mp.isPresent())
+ return mp.get().equals(Tokens.MATERIALIZE_PROPERTIES_TOKENS)
+ ? Tokens.MATERIALIZE_PROPERTIES_TOKENS
+ : Tokens.MATERIALIZE_PROPERTIES_ALL;
- final Map<String, Object> args = requestMessage.getArgs();
+ final String materializeProperties = requestMessage.getField(Tokens.ARGS_MATERIALIZE_PROPERTIES);
// all options except MATERIALIZE_PROPERTIES_TOKENS treated as MATERIALIZE_PROPERTIES_ALL
- return args.containsKey(Tokens.ARGS_MATERIALIZE_PROPERTIES)
- && args.get(Tokens.ARGS_MATERIALIZE_PROPERTIES).equals(Tokens.MATERIALIZE_PROPERTIES_TOKENS)
+ return Tokens.MATERIALIZE_PROPERTIES_TOKENS.equals(materializeProperties)
? Tokens.MATERIALIZE_PROPERTIES_TOKENS
: Tokens.MATERIALIZE_PROPERTIES_ALL;
}
@@ -335,4 +204,12 @@
}
}
}
+
+ public HttpGremlinEndpointHandler.RequestState getRequestState() {
+ return requestState;
+ }
+
+ public void setRequestState(HttpGremlinEndpointHandler.RequestState requestState) {
+ this.requestState = requestState;
+ }
}
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GraphManager.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GraphManager.java
index bbd9ab5..e8acaf2 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GraphManager.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GraphManager.java
@@ -18,7 +18,6 @@
*/
package org.apache.tinkerpop.gremlin.server;
-import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
import org.apache.tinkerpop.gremlin.structure.Graph;
@@ -125,34 +124,4 @@
return graph.features().graph().supportsTransactions() && graph.tx().isOpen();
});
}
-
- /**
- * This method will be called before a script or query is processed by the
- * gremlin-server.
- *
- * @param msg the {@link RequestMessage} received by the gremlin-server.
- */
- default void beforeQueryStart(final RequestMessage msg) {
-
- }
-
- /**
- * This method will be called before a script or query is processed by the
- * gremlin-server.
- *
- * @param msg the {@link RequestMessage} received by the gremlin-server.
- * @param error the exception encountered during processing from the gremlin-server.
- */
- default void onQueryError(final RequestMessage msg, final Throwable error) {
-
- }
-
- /**
- * When a script or query successfully completes this method will be called.
- *
- * @param msg the {@link RequestMessage} received by the gremlin-server.
- */
- default void onQuerySuccess(final RequestMessage msg) {
-
- }
}
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java
index 565a471..f499be4 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java
@@ -33,8 +33,6 @@
import io.netty.util.internal.logging.InternalLoggerFactory;
import io.netty.util.internal.logging.Slf4JLoggerFactory;
import org.apache.commons.lang3.SystemUtils;
-import org.apache.tinkerpop.gremlin.server.handler.FrameMessageSizeEstimator;
-import org.apache.tinkerpop.gremlin.server.op.OpLoader;
import org.apache.tinkerpop.gremlin.server.util.LifeCycleHook;
import org.apache.tinkerpop.gremlin.server.util.MetricManager;
import org.apache.tinkerpop.gremlin.server.util.ServerGremlinExecutor;
@@ -129,9 +127,6 @@
// use the ExecutorService returned from ServerGremlinExecutor as it might be initialized there
serverGremlinExecutor = new ServerGremlinExecutor(settings, gremlinExecutorService, workerGroup);
this.gremlinExecutorService = serverGremlinExecutor.getGremlinExecutorService();
-
- // initialize the OpLoader with configurations being passed to each OpProcessor implementation loaded
- OpLoader.init(settings);
}
/**
@@ -148,14 +143,16 @@
try {
final ServerBootstrap b = new ServerBootstrap();
- // need a custom MessageSizeEstimator to cover Frame
- b.childOption(ChannelOption.MESSAGE_SIZE_ESTIMATOR, FrameMessageSizeEstimator.instance());
-
// when high value is reached then the channel becomes non-writable and stays like that until the
// low value is so that there is time to recover
b.childOption(ChannelOption.WRITE_BUFFER_WATER_MARK,
new WriteBufferWaterMark(settings.writeBufferLowWaterMark, settings.writeBufferHighWaterMark));
b.childOption(ChannelOption.ALLOCATOR, PooledByteBufAllocator.DEFAULT);
+ // Enable TCP Keep-Alive to detect if the remote peer is still reachable.
+ // Keep-Alive sends periodic probes to check if the remote peer is still active.
+ // If the remote peer is unreachable, the connection will be closed, preventing
+ // resource leaks and avoiding the maintenance of stale connections.
+ b.childOption(ChannelOption.SO_KEEPALIVE, true);
// fire off any lifecycle scripts that were provided by the user. hooks get initialized during
// ServerGremlinExecutor initialization
@@ -240,16 +237,6 @@
serverStopped = new CompletableFuture<>();
final CountDownLatch servicesLeftToShutdown = new CountDownLatch(3);
- // release resources in the OpProcessors (e.g. kill sessions)
- OpLoader.getProcessors().entrySet().forEach(kv -> {
- logger.info("Shutting down OpProcessor[{}]", kv.getKey());
- try {
- kv.getValue().close();
- } catch (Exception ex) {
- logger.warn("Shutdown will continue but, there was an error encountered while closing " + kv.getKey(), ex);
- }
- });
-
// it's possible that a channel might not be initialized in the first place if bind() fails because
// of port conflict. in that case, there's no need to wait for the channel to close.
if (null == serverSocketChannel)
@@ -403,7 +390,7 @@
builder.append(Gremlin.version() + "\r\n");
builder.append(" \\,,,/\r\n");
builder.append(" (o o)\r\n");
- builder.append("-----oOOo-(3)-oOOo-----\r\n");
+ builder.append("-----oOOo-(" + Gremlin.majorVersion() + ")-oOOo-----\r\n");
return builder.toString();
}
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/OpProcessor.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/OpProcessor.java
deleted file mode 100644
index 62a721b..0000000
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/OpProcessor.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.server;
-
-import org.apache.tinkerpop.gremlin.server.op.OpProcessorException;
-import org.apache.tinkerpop.gremlin.util.function.ThrowingConsumer;
-
-/**
- * Interface for providing commands that websocket requests will respond to.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public interface OpProcessor extends AutoCloseable {
-
- /**
- * The name of the processor which requests must refer to "processor" field on a request.
- */
- public String getName();
-
- /**
- * Initialize the {@code OpProcessor} with settings from the server. This method should only be called once at
- * server startup by a single thread.
- */
- public default void init(final Settings settings) {
- // do nothing by default
- }
-
- /**
- * Given the context (which contains the RequestMessage), return back a Consumer function that will be
- * executed with the context. A typical implementation will simply check the "op" field on the RequestMessage
- * and return the Consumer function for that particular operation.
- * @param ctx
- * @return
- */
- public ThrowingConsumer<Context> select(final Context ctx) throws OpProcessorException;
-}
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/ProcessingException.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/ProcessingException.java
new file mode 100644
index 0000000..a68d9d3
--- /dev/null
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/ProcessingException.java
@@ -0,0 +1,37 @@
+/*
+ * 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.server;
+
+import org.apache.tinkerpop.gremlin.server.util.GremlinError;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public class ProcessingException extends Exception {
+ private final GremlinError error;
+
+ public ProcessingException(final GremlinError error) {
+ super(error.getMessage());
+ this.error = error;
+ }
+
+ public GremlinError getError() {
+ return this.error;
+ }
+}
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java
index b8df462..2d7cc6b 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java
@@ -20,7 +20,6 @@
import io.netty.handler.ssl.ClientAuth;
import io.netty.handler.ssl.SslContext;
-import org.apache.tinkerpop.gremlin.util.MessageSerializer;
import org.apache.tinkerpop.gremlin.jsr223.GremlinPlugin;
import org.apache.tinkerpop.gremlin.jsr223.GremlinScriptEngine;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
@@ -28,13 +27,12 @@
import org.apache.tinkerpop.gremlin.server.auth.AllowAllAuthenticator;
import org.apache.tinkerpop.gremlin.server.auth.Authenticator;
import org.apache.tinkerpop.gremlin.server.authz.Authorizer;
-import org.apache.tinkerpop.gremlin.server.channel.UnifiedChannelizer;
-import org.apache.tinkerpop.gremlin.server.channel.WebSocketChannelizer;
+import org.apache.tinkerpop.gremlin.server.channel.HttpChannelizer;
import org.apache.tinkerpop.gremlin.server.handler.AbstractAuthenticationHandler;
-import org.apache.tinkerpop.gremlin.server.handler.Session;
import org.apache.tinkerpop.gremlin.server.util.DefaultGraphManager;
import org.apache.tinkerpop.gremlin.server.util.LifeCycleHook;
import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.util.MessageSerializer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.yaml.snakeyaml.LoaderOptions;
@@ -42,6 +40,7 @@
import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.constructor.Constructor;
+import javax.net.ssl.TrustManager;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
@@ -53,11 +52,8 @@
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
-import java.util.ServiceLoader;
import java.util.UUID;
-import javax.net.ssl.TrustManager;
-
/**
* Server settings as configured by a YAML file.
*
@@ -68,9 +64,9 @@
private static final Logger logger = LoggerFactory.getLogger(Settings.class);
public Settings() {
- // setup some sensible defaults like gremlin-groovy
+ // setup some sensible defaults like gremlin-lang
scriptEngines = new HashMap<>();
- scriptEngines.put("gremlin-groovy", new ScriptEngineSettings());
+ scriptEngines.put("gremlin-lang", new ScriptEngineSettings());
}
/**
@@ -109,7 +105,7 @@
public int threadPoolBoss = 1;
/**
- * Time in milliseconds to wait for a request (script or bytecode) to complete execution. Defaults to 30000.
+ * Time in milliseconds to wait for a request to complete execution. Defaults to 30000.
*/
public long evaluationTimeout = 30000L;
@@ -139,12 +135,11 @@
public int maxChunkSize = 8192;
/**
- * The maximum length of the aggregated content for a message. Works in concert with {@link #maxChunkSize} where
+ * The maximum length of the aggregated content for a request message. Works in concert with {@link #maxChunkSize} where
* chunked requests are accumulated back into a single message. A request exceeding this size will
- * return a 413 - Request Entity Too Large status code. A response exceeding this size will raise an internal
- * exception.
+ * return a 413 - Request Entity Too Large status code.
*/
- public int maxContentLength = 1024 * 1024 * 10;
+ public int maxRequestContentLength = 1024 * 1024 * 10;
/**
* Maximum number of request components that can be aggregated for a message.
@@ -192,7 +187,7 @@
/**
* The full class name of the {@link Channelizer} to use in Gremlin Server.
*/
- public String channelizer = WebSocketChannelizer.class.getName();
+ public String channelizer = HttpChannelizer.class.getName();
/**
* The full class name of the {@link GraphManager} to use in Gremlin Server.
@@ -205,68 +200,17 @@
* will be processed by this thread pool. If the threads are exhausted, the requests will queue to the size
* specified by this value after which they will begin to reject the requests.
* <p/>
- * This value should be taken in account with the {@link #maxSessionTaskQueueSize} which is related in some
- * respects. A request that starts a new {@link Session} is handled by this queue, but additional requests to a
- * created {@link Session} will queue separately given that setting per session.
- * <p/>
* By default this value is set to 8192.
*/
public int maxWorkQueueSize = 8192;
/**
- * Maximum size that an individual {@link Session} can queue requests before starting to reject them. Note that this
- * configuration only applies to the {@link UnifiedChannelizer}. By default this value is set to 4096.
- *
- * @see #maxWorkQueueSize
- * @deprecated As of release 3.8.0, not replaced.
- */
- @Deprecated
- public int maxSessionTaskQueueSize = 4096;
-
- /**
* Maximum number of parameters that can be passed on a request. Larger numbers may impact performance for scripts.
- * The default is 16 and this setting only applies to the {@link UnifiedChannelizer}.
+ * The default is 16 and this setting only applies to the {@link org.apache.tinkerpop.gremlin.server.channel.HttpChannelizer}.
*/
public int maxParameters = 16;
/**
- * The time in milliseconds that a {@link UnifiedChannelizer} session can exist. This value cannot be extended
- * beyond this value irrespective of the number of requests and their individual timeouts. Requests must complete
- * within this time frame. If this timeout is reached while there is a running evaluation, there will be an attempt
- * to interrupt it which will result in a timeout error to the client. If there are existing requests enqueued for
- * the session when this timeout is reached, those requests will not be executed and will be closed with server
- * errors. Open transactions will be issued a rollback. The default is 10 minutes.
- *
- * @deprecated As of release 3.8.0, not replaced.
- */
- @Deprecated
- public long sessionLifetimeTimeout = 600000;
-
- /**
- * Enable the global function cache for sessions when using the {@link UnifiedChannelizer}. This setting is only
- * relevant when {@link #useGlobalFunctionCacheForSessions} is {@code false}. When {@link true} it means that
- * functions created in one request to a session remain available on the next request to that session.
- *
- * @deprecated As of release 3.8.0, not replaced.
- */
- @Deprecated
- public boolean useGlobalFunctionCacheForSessions = true;
-
- /**
- * When {@code true} and using the {@link UnifiedChannelizer} the same engine that will be used to server
- * sessionless requests will also be use to serve sessions. The default value of {@code true} is recommended as
- * it reduces the amount of object creation required for each session and should generally lead to better
- * performance especially if the expectation is that there will be many sessions being created and destroyed
- * rapidly. Setting this value to {@code false} is mostly present to support specific use cases that may require
- * each session having its own engine or to match previous functionality provided by the older channelizers
- * produced prior to 3.5.0.
- *
- * @deprecated As of release 3.8.0, not replaced.
- */
- @Deprecated
- public boolean useCommonEngineForSessions = true;
-
- /**
* Configured metrics for Gremlin Server.
*/
public ServerMetrics metrics = null;
@@ -302,22 +246,6 @@
*/
public Boolean enableAuditLog = false;
- /**
- * Custom settings for {@link OpProcessor} implementations. Implementations are loaded via
- * {@link ServiceLoader} but custom configurations can be supplied through this configuration.
- */
- public List<ProcessorSettings> processors = new ArrayList<>();
-
- /**
- * Find the {@link ProcessorSettings} related to the specified class. If there are multiple entries then only the
- * first is returned.
- */
- public Optional<ProcessorSettings> optionalProcessor(final Class<? extends OpProcessor> clazz) {
- return processors.stream()
- .filter(p -> p.className.equals(clazz.getCanonicalName()))
- .findFirst();
- }
-
public Optional<ServerMetrics> optionalMetrics() {
return Optional.ofNullable(metrics);
}
@@ -354,7 +282,6 @@
settingsDescription.addPropertyParameters("graphs", String.class, String.class);
settingsDescription.addPropertyParameters("scriptEngines", String.class, ScriptEngineSettings.class);
settingsDescription.addPropertyParameters("serializers", SerializerSettings.class);
- settingsDescription.addPropertyParameters("processors", ProcessorSettings.class);
constructor.addTypeDescription(settingsDescription);
final TypeDescription serializerSettingsDescription = new TypeDescription(SerializerSettings.class);
@@ -413,23 +340,6 @@
}
/**
- * Custom configurations for any {@link OpProcessor} implementations. These settings will not be relevant
- * unless the referenced {@link OpProcessor} is actually loaded via {@link ServiceLoader}.
- */
- public static class ProcessorSettings {
- /**
- * The fully qualified class name of an {@link OpProcessor} implementation.
- */
- public String className;
-
- /**
- * A set of configurations as expected by the {@link OpProcessor}. Consult the documentation of the
- * {@link OpProcessor} for information on what these configurations should be.
- */
- public Map<String, Object> config;
- }
-
- /**
* Settings for the {@code ScriptEngine}.
*/
public static class ScriptEngineSettings {
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/Authenticator.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/Authenticator.java
index d3a291c..d0ea194 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/Authenticator.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/Authenticator.java
@@ -18,18 +18,17 @@
*/
package org.apache.tinkerpop.gremlin.server.auth;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import org.apache.tinkerpop.gremlin.server.Channelizer;
import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.server.Channelizer;
import java.net.InetAddress;
import java.util.Map;
/**
- * Provides methods related to authentication of a request. Implementations should provide a SASL based
- * authentication method, but a handler can choose to use the {@link #authenticate(Map)} method directly if
- * required for protocols that don't easily support SASL.
+ * Provides methods related to authentication of a request. A handler should use the {@link #authenticate(Map)}
+ * method directly. SASL isn't currently supported but the interface remains available for custom server implementations.
*
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
@@ -65,6 +64,9 @@
* Performs the actual SASL negotiation for a single authentication attempt.
* SASL is stateful, so a new instance should be used for each attempt.
* Non-trivial implementations may delegate to an instance of {@link javax.security.sasl.SaslServer}
+ *
+ * NOTE: This interface is no longer used by default in the Gremlin Server. It remains here for use with custom
+ * server implementations.
*/
public interface SaslNegotiator
{
@@ -77,8 +79,8 @@
* finished. If so, an {@link AuthenticatedUser} is obtained by calling {@link #getAuthenticatedUser()} and
* that user associated with the active connection. If the negotiation is not yet complete,
* the byte[] is returned to the client as a further challenge in an
- * {@link ResponseMessage} with {@link ResponseStatusCode#AUTHENTICATE}. This continues until the negotiation
- * does complete or an error is encountered.
+ * {@link ResponseMessage} with {@link HttpResponseStatus#PROXY_AUTHENTICATION_REQUIRED}. This continues until
+ * the negotiation does complete or an error is encountered.
*/
public byte[] evaluateResponse(final byte[] clientResponse) throws AuthenticationException;
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/authz/Authorizer.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/authz/Authorizer.java
index 8028bf1..32fdde7 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/authz/Authorizer.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/authz/Authorizer.java
@@ -18,10 +18,9 @@
*/
package org.apache.tinkerpop.gremlin.server.authz;
-import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
import org.apache.tinkerpop.gremlin.server.auth.AuthenticatedUser;
+import org.apache.tinkerpop.gremlin.util.Tokens;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
import java.util.Map;
@@ -37,25 +36,17 @@
*/
public void setup(final Map<String,Object> config) throws AuthorizationException;
- /**
- * Checks whether a user is authorized to have a gremlin bytecode request from a client answered and raises an
- * {@link AuthorizationException} if this is not the case. The returned bytecde is used for further processing of
- * the request.
- *
- * @param user {@link AuthenticatedUser} that needs authorization.
- * @param bytecode The gremlin {@link Bytecode} request to authorize the user for.
- * @param aliases A {@link Map} with a single key/value pair that maps the name of the {@link TraversalSource} in the
- * {@link Bytecode} request to name of one configured in Gremlin Server.
- * @return The original or modified {@link Bytecode} to be used for further processing.
- */
- public Bytecode authorize(final AuthenticatedUser user, final Bytecode bytecode, final Map<String, String> aliases) throws AuthorizationException;
+ // todo: implement auth for gremlin-lang
+ public default String authorize(final AuthenticatedUser user, final String gremlin, final Map<String, String> aliases) throws AuthorizationException {
+ return gremlin;
+ }
/**
* Checks whether a user is authorized to have a script request from a gremlin client answered and raises an
* {@link AuthorizationException} if this is not the case.
*
* @param user {@link AuthenticatedUser} that needs authorization.
- * @param msg {@link RequestMessage} in which the {@link org.apache.tinkerpop.gremlin.util.Tokens}.ARGS_GREMLIN argument can contain an arbitrary succession of script statements.
+ * @param msg {@link RequestMessage} in which the {@link Tokens}.ARGS_GREMLIN argument can contain an arbitrary succession of script statements.
*/
public void authorize(final AuthenticatedUser user, final RequestMessage msg) throws AuthorizationException;
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/channel/HttpChannelizer.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/channel/HttpChannelizer.java
index 6d3bdbf..5b8a665 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/channel/HttpChannelizer.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/channel/HttpChannelizer.java
@@ -19,6 +19,9 @@
package org.apache.tinkerpop.gremlin.server.channel;
import io.netty.channel.ChannelInboundHandlerAdapter;
+import io.netty.handler.codec.http.HttpServerKeepAliveHandler;
+import io.netty.handler.codec.http.cors.CorsConfigBuilder;
+import io.netty.handler.codec.http.cors.CorsHandler;
import org.apache.tinkerpop.gremlin.server.AbstractChannelizer;
import org.apache.tinkerpop.gremlin.server.Channelizer;
import org.apache.tinkerpop.gremlin.server.Settings;
@@ -26,6 +29,10 @@
import org.apache.tinkerpop.gremlin.server.handler.AbstractAuthenticationHandler;
import org.apache.tinkerpop.gremlin.server.handler.HttpBasicAuthenticationHandler;
import org.apache.tinkerpop.gremlin.server.handler.HttpBasicAuthorizationHandler;
+import org.apache.tinkerpop.gremlin.server.handler.HttpContentCompressionHandler;
+import org.apache.tinkerpop.gremlin.server.handler.HttpRequestCheckingHandler;
+import org.apache.tinkerpop.gremlin.server.handler.HttpRequestIdHandler;
+import org.apache.tinkerpop.gremlin.server.handler.HttpRequestMessageDecoder;
import org.apache.tinkerpop.gremlin.server.handler.HttpUserAgentHandler;
import org.apache.tinkerpop.gremlin.server.handler.HttpGremlinEndpointHandler;
import io.netty.channel.ChannelPipeline;
@@ -46,11 +53,15 @@
private static final Logger logger = LoggerFactory.getLogger(HttpChannelizer.class);
private HttpGremlinEndpointHandler httpGremlinEndpointHandler;
+ private HttpRequestCheckingHandler httpRequestCheckingHandler = new HttpRequestCheckingHandler();
+ private HttpRequestMessageDecoder httpRequestMessageDecoder = new HttpRequestMessageDecoder(serializers);
+ private HttpRequestIdHandler httpRequestIdHandler = new HttpRequestIdHandler();
+ private HttpContentCompressionHandler httpContentEncoder = new HttpContentCompressionHandler();
@Override
public void init(final ServerGremlinExecutor serverGremlinExecutor) {
super.init(serverGremlinExecutor);
- httpGremlinEndpointHandler = new HttpGremlinEndpointHandler(serializers, gremlinExecutor, graphManager, settings);
+ httpGremlinEndpointHandler = new HttpGremlinEndpointHandler(gremlinExecutor, graphManager, settings);
}
@Override
@@ -63,9 +74,16 @@
if (logger.isDebugEnabled())
pipeline.addLast(new LoggingHandler("http-io", LogLevel.DEBUG));
- final HttpObjectAggregator aggregator = new HttpObjectAggregator(settings.maxContentLength);
+ pipeline.addLast("http-requestid-handler", httpRequestIdHandler);
+ pipeline.addLast("http-keepalive-handler", new HttpServerKeepAliveHandler());
+ pipeline.addLast("http-cors-handler", new CorsHandler(CorsConfigBuilder.forAnyOrigin().build()));
+
+ final HttpObjectAggregator aggregator = new HttpObjectAggregator(settings.maxRequestContentLength);
aggregator.setMaxCumulationBufferComponents(settings.maxAccumulationBufferComponents);
pipeline.addLast(PIPELINE_HTTP_AGGREGATOR, aggregator);
+ pipeline.addLast("http-request-checker", httpRequestCheckingHandler);
+ pipeline.addLast("http-user-agent-handler", new HttpUserAgentHandler());
+ pipeline.addLast("http-compression-handler", httpContentEncoder);
if (authenticator != null) {
// Cannot add the same handler instance multiple times unless
@@ -78,12 +96,14 @@
pipeline.addLast(PIPELINE_AUTHENTICATOR, authenticationHandler);
}
+ // The authorizer needs access to the RequestMessage but the authenticator doesn't.
+ pipeline.addLast("http-requestmessage-decoder", httpRequestMessageDecoder);
+
if (authorizer != null) {
final ChannelInboundHandlerAdapter authorizationHandler = new HttpBasicAuthorizationHandler(authorizer);
pipeline.addLast(PIPELINE_AUTHORIZER, authorizationHandler);
}
- pipeline.addLast("http-user-agent-handler", new HttpUserAgentHandler());
pipeline.addLast("http-gremlin-handler", httpGremlinEndpointHandler);
// Note that channelRead()'s do not propagate down the pipeline past HttpGremlinEndpointHandler
}
@@ -92,15 +112,9 @@
final String authHandlerClass = settings.authentication.authenticationHandler;
if (authHandlerClass == null) {
//Keep things backwards compatible
- return new HttpBasicAuthenticationHandler(authenticator, settings);
+ return new HttpBasicAuthenticationHandler(authenticator, authorizer, settings);
} else {
return createAuthenticationHandler(settings);
}
}
-
- @Override
- public void finalize(final ChannelPipeline pipeline) {
- pipeline.remove(PIPELINE_OP_SELECTOR);
- pipeline.remove(PIPELINE_OP_EXECUTOR);
- }
}
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/channel/UnifiedChannelizer.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/channel/UnifiedChannelizer.java
deleted file mode 100644
index 8d7b054..0000000
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/channel/UnifiedChannelizer.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.server.channel;
-
-import io.netty.channel.ChannelPipeline;
-import org.apache.tinkerpop.gremlin.server.AbstractChannelizer;
-import org.apache.tinkerpop.gremlin.server.Channelizer;
-import org.apache.tinkerpop.gremlin.server.GremlinServer;
-import org.apache.tinkerpop.gremlin.server.handler.HttpGremlinEndpointHandler;
-import org.apache.tinkerpop.gremlin.server.handler.UnifiedHandler;
-import org.apache.tinkerpop.gremlin.server.handler.WsAndHttpChannelizerHandler;
-import org.apache.tinkerpop.gremlin.server.util.ServerGremlinExecutor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * A {@link Channelizer} that supports websocket and HTTP requests and does so with the most streamlined processing
- * model for Gremlin Server introduced with 3.5.0.
- *
- * @deprecated As of release 3.8.0, not replaced.
- */
-@Deprecated
-public class UnifiedChannelizer extends AbstractChannelizer {
- private static final Logger logger = LoggerFactory.getLogger(UnifiedChannelizer.class);
-
- private WsAndHttpChannelizerHandler wsAndHttpChannelizerHandler;
- private UnifiedHandler unifiedHandler;
- protected static final String PIPELINE_UNIFIED = "unified";
-
- @Override
- public void init(final ServerGremlinExecutor serverGremlinExecutor) {
- super.init(serverGremlinExecutor);
-
- logger.warn("The UnifiedChannelizer is deprecated and will be removed in a future release");
-
- wsAndHttpChannelizerHandler = new WsAndHttpChannelizerHandler();
- wsAndHttpChannelizerHandler.init(serverGremlinExecutor, new HttpGremlinEndpointHandler(serializers, gremlinExecutor, graphManager, settings));
-
- // these handlers don't share any state and can thus be initialized once per pipeline
- unifiedHandler = new UnifiedHandler(settings, graphManager, gremlinExecutor, scheduledExecutorService, this);
- }
-
- @Override
- public void configure(final ChannelPipeline pipeline) {
- wsAndHttpChannelizerHandler.configure(pipeline);
- pipeline.addAfter(PIPELINE_HTTP_REQUEST_DECODER, "WsAndHttpChannelizerHandler", wsAndHttpChannelizerHandler);
- }
-
- @Override
- public void finalize(final ChannelPipeline pipeline) {
- super.finalize(pipeline);
-
- // currently the AbstractChannelizer adds the following handlers which prior to 3.5.0 were essentially
- // required by any Gremlin-processing pipeline you could think of because they provided the functionality
- // of the OpProcessor infrastructure. the OpProcessor infrastructure is on its way to deprecation after
- // TINKERPOP-2245 which introduced this channelizer implementation. since AbstractChannelizer does a nice
- // job of rigging up the rest of the pipeline it seemed to make sense to leave it unchanged to ensure it
- // does not break anyone's channelizers that may depend on it (including TinkerPop's and simply remove
- // those bits here. in the future, when we remove OpProcessor stuff completely we can clean this up.
- pipeline.remove(PIPELINE_OP_SELECTOR);
- pipeline.remove(PIPELINE_OP_EXECUTOR);
-
- pipeline.addLast(PIPELINE_UNIFIED, unifiedHandler);
- }
-
- public UnifiedHandler getUnifiedHandler() {
- return unifiedHandler;
- }
-
- @Override
- public boolean supportsIdleMonitor() {
- return true;
- }
-
- @Override
- public Object createIdleDetectionMessage() {
- return wsAndHttpChannelizerHandler.getWsChannelizer().createIdleDetectionMessage();
- }
-}
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/channel/WebSocketChannelizer.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/channel/WebSocketChannelizer.java
deleted file mode 100644
index b8baed1..0000000
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/channel/WebSocketChannelizer.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.server.channel;
-
-import io.netty.channel.ChannelInboundHandlerAdapter;
-import io.netty.handler.codec.http.websocketx.PingWebSocketFrame;
-import io.netty.handler.codec.http.websocketx.WebSocketDecoderConfig;
-import org.apache.tinkerpop.gremlin.server.AbstractChannelizer;
-import org.apache.tinkerpop.gremlin.server.Channelizer;
-import org.apache.tinkerpop.gremlin.server.auth.AllowAllAuthenticator;
-import org.apache.tinkerpop.gremlin.server.handler.AbstractAuthenticationHandler;
-import org.apache.tinkerpop.gremlin.server.handler.WebSocketAuthorizationHandler;
-import org.apache.tinkerpop.gremlin.server.handler.SaslAuthenticationHandler;
-import org.apache.tinkerpop.gremlin.server.handler.WsGremlinBinaryRequestDecoder;
-import org.apache.tinkerpop.gremlin.server.handler.WsGremlinCloseRequestDecoder;
-import org.apache.tinkerpop.gremlin.server.handler.GremlinResponseFrameEncoder;
-import org.apache.tinkerpop.gremlin.server.handler.WsGremlinResponseFrameEncoder;
-import org.apache.tinkerpop.gremlin.server.handler.WsGremlinTextRequestDecoder;
-import org.apache.tinkerpop.gremlin.server.handler.WsUserAgentHandler;
-import org.apache.tinkerpop.gremlin.server.Settings;
-import io.netty.channel.ChannelPipeline;
-import io.netty.handler.codec.http.HttpObjectAggregator;
-import io.netty.handler.codec.http.HttpRequestDecoder;
-import io.netty.handler.codec.http.HttpResponseEncoder;
-import io.netty.handler.codec.http.websocketx.WebSocketServerProtocolHandler;
-import io.netty.handler.codec.http.websocketx.extensions.compression.WebSocketServerCompressionHandler;
-import io.netty.handler.logging.LogLevel;
-import io.netty.handler.logging.LoggingHandler;
-import org.apache.tinkerpop.gremlin.server.util.ServerGremlinExecutor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * A {@link Channelizer} that exposes a WebSocket-based Gremlin endpoint with a custom sub-protocol.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class WebSocketChannelizer extends AbstractChannelizer {
- private static final Logger logger = LoggerFactory.getLogger(WebSocketChannelizer.class);
-
- private GremlinResponseFrameEncoder gremlinResponseFrameEncoder;
- private WsGremlinTextRequestDecoder wsGremlinTextRequestDecoder;
- private WsGremlinBinaryRequestDecoder wsGremlinBinaryRequestDecoder;
- private WsGremlinResponseFrameEncoder wsGremlinResponseFrameEncoder;
- private WsGremlinCloseRequestDecoder wsGremlinCloseRequestDecoder;
- private AbstractAuthenticationHandler authenticationHandler;
- private ChannelInboundHandlerAdapter authorizationHandler;
-
- @Override
- public void init(final ServerGremlinExecutor serverGremlinExecutor) {
- super.init(serverGremlinExecutor);
-
- gremlinResponseFrameEncoder = new GremlinResponseFrameEncoder();
- wsGremlinTextRequestDecoder = new WsGremlinTextRequestDecoder(serializers);
- wsGremlinBinaryRequestDecoder = new WsGremlinBinaryRequestDecoder(serializers);
- wsGremlinCloseRequestDecoder = new WsGremlinCloseRequestDecoder(serializers);
- wsGremlinResponseFrameEncoder = new WsGremlinResponseFrameEncoder();
-
- // configure authentication - null means don't bother to add authentication to the pipeline
- authenticationHandler = authenticator.getClass() == AllowAllAuthenticator.class ?
- null : instantiateAuthenticationHandler(settings);
- if (authorizer != null) {
- authorizationHandler = new WebSocketAuthorizationHandler(authorizer);
- }
- }
-
- @Override
- public void configure(final ChannelPipeline pipeline) {
-
- if (logger.isDebugEnabled())
- pipeline.addLast(new LoggingHandler("log-encoder-aggregator", LogLevel.DEBUG));
-
- pipeline.addLast(PIPELINE_HTTP_RESPONSE_ENCODER, new HttpResponseEncoder());
-
- logger.debug("HttpRequestDecoder settings - maxInitialLineLength={}, maxHeaderSize={}, maxChunkSize={}",
- settings.maxInitialLineLength, settings.maxHeaderSize, settings.maxChunkSize);
- pipeline.addLast(PIPELINE_HTTP_REQUEST_DECODER, new HttpRequestDecoder(settings.maxInitialLineLength, settings.maxHeaderSize, settings.maxChunkSize));
-
- if (logger.isDebugEnabled())
- pipeline.addLast(new LoggingHandler("log-decoder-aggregator", LogLevel.DEBUG));
-
- logger.debug("HttpObjectAggregator settings - maxContentLength={}, maxAccumulationBufferComponents={}",
- settings.maxContentLength, settings.maxAccumulationBufferComponents);
- final HttpObjectAggregator aggregator = new HttpObjectAggregator(settings.maxContentLength);
- aggregator.setMaxCumulationBufferComponents(settings.maxAccumulationBufferComponents);
- pipeline.addLast(PIPELINE_HTTP_AGGREGATOR, aggregator);
- // Add compression extension for WebSocket defined in https://tools.ietf.org/html/rfc7692
- pipeline.addLast(PIPELINE_WEBSOCKET_SERVER_COMPRESSION, new WebSocketServerCompressionHandler());
-
- // setting closeOnProtocolViolation to false prevents causing all the other requests using the same channel
- // to fail when a single request causes a protocol violation.
- final WebSocketDecoderConfig wsDecoderConfig = WebSocketDecoderConfig.newBuilder().
- closeOnProtocolViolation(false).allowExtensions(true).maxFramePayloadLength(settings.maxContentLength).build();
- pipeline.addLast(PIPELINE_REQUEST_HANDLER, new WebSocketServerProtocolHandler(GREMLIN_ENDPOINT,
- null, false, false, 10000L, wsDecoderConfig));
- pipeline.addLast("ws-user-agent-handler", new WsUserAgentHandler());
- if (logger.isDebugEnabled())
- pipeline.addLast(new LoggingHandler("log-aggregator-encoder", LogLevel.DEBUG));
-
- pipeline.addLast("ws-frame-encoder", wsGremlinResponseFrameEncoder);
- pipeline.addLast("response-frame-encoder", gremlinResponseFrameEncoder);
- pipeline.addLast("request-text-decoder", wsGremlinTextRequestDecoder);
- pipeline.addLast("request-binary-decoder", wsGremlinBinaryRequestDecoder);
- pipeline.addLast("request-close-decoder", wsGremlinCloseRequestDecoder);
-
- if (logger.isDebugEnabled())
- pipeline.addLast(new LoggingHandler("log-aggregator-encoder", LogLevel.DEBUG));
-
- if (authenticationHandler != null)
- pipeline.addLast(PIPELINE_AUTHENTICATOR, authenticationHandler);
-
- if (authorizationHandler != null)
- pipeline.addLast(PIPELINE_AUTHORIZER, authorizationHandler);
- }
-
- @Override
- public boolean supportsIdleMonitor() {
- return true;
- }
-
- @Override
- public Object createIdleDetectionMessage() {
- return new PingWebSocketFrame();
- }
-
- private AbstractAuthenticationHandler instantiateAuthenticationHandler(final Settings settings) {
- final String authenticationHandler = settings.authentication.authenticationHandler;
- if (authenticationHandler == null) {
- //Keep things backwards compatible
- return new SaslAuthenticationHandler(authenticator, settings);
- } else {
- return createAuthenticationHandler(settings);
- }
- }
-}
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/channel/WsAndHttpChannelizer.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/channel/WsAndHttpChannelizer.java
deleted file mode 100644
index 365b754..0000000
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/channel/WsAndHttpChannelizer.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.server.channel;
-
-import io.netty.channel.ChannelPipeline;
-import io.netty.channel.EventLoopGroup;
-import org.apache.tinkerpop.gremlin.server.AbstractChannelizer;
-import org.apache.tinkerpop.gremlin.server.handler.HttpGremlinEndpointHandler;
-import org.apache.tinkerpop.gremlin.server.handler.WsAndHttpChannelizerHandler;
-import org.apache.tinkerpop.gremlin.server.util.ServerGremlinExecutor;
-
-/**
- * A channelizer for port unification with websockets and http
- *
- * @author Keith Lohnes lohnesk@gmail.com
- */
-public class WsAndHttpChannelizer extends AbstractChannelizer {
-
- private WsAndHttpChannelizerHandler handler;
-
- @Override
- public void init(final ServerGremlinExecutor serverGremlinExecutor) {
- super.init(serverGremlinExecutor);
- handler = new WsAndHttpChannelizerHandler();
- handler.init(serverGremlinExecutor, new HttpGremlinEndpointHandler(serializers, gremlinExecutor, graphManager, settings));
- }
-
- @Override
- public void configure(final ChannelPipeline pipeline) {
- handler.configure(pipeline);
- pipeline.addAfter(PIPELINE_HTTP_REQUEST_DECODER, "WsAndHttpChannelizerHandler", handler);
- }
-
- @Override
- public boolean supportsIdleMonitor() {
- return true;
- }
-
- @Override
- public Object createIdleDetectionMessage() {
- return handler.getWsChannelizer().createIdleDetectionMessage();
- }
-}
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/AbstractAuthenticationHandler.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/AbstractAuthenticationHandler.java
index 074e4ab..7fa3795 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/AbstractAuthenticationHandler.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/AbstractAuthenticationHandler.java
@@ -30,14 +30,6 @@
protected final Authenticator authenticator;
protected final Authorizer authorizer;
- /**
- * @deprecated As of release 3.5.0, replaced by {@link #AbstractAuthenticationHandler(Authenticator, Authorizer)}.
- */
- @Deprecated
- public AbstractAuthenticationHandler(final Authenticator authenticator) {
- this(authenticator, null);
- }
-
public AbstractAuthenticationHandler(final Authenticator authenticator, final Authorizer authorizer) {
this.authenticator = authenticator;
this.authorizer = authorizer;
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/AbstractSession.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/AbstractSession.java
deleted file mode 100644
index 97a44b5..0000000
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/AbstractSession.java
+++ /dev/null
@@ -1,885 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.server.handler;
-
-import com.codahale.metrics.Timer;
-import groovy.lang.GroovyRuntimeException;
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelHandlerContext;
-import org.apache.commons.lang3.exception.ExceptionUtils;
-import org.apache.tinkerpop.gremlin.util.MessageSerializer;
-import org.apache.tinkerpop.gremlin.util.Tokens;
-import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.util.ser.MessageTextSerializer;
-import org.apache.tinkerpop.gremlin.groovy.engine.GremlinExecutor;
-import org.apache.tinkerpop.gremlin.groovy.jsr223.TimedInterruptTimeoutException;
-import org.apache.tinkerpop.gremlin.jsr223.GremlinScriptEngine;
-import org.apache.tinkerpop.gremlin.jsr223.JavaTranslator;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
-import org.apache.tinkerpop.gremlin.process.traversal.Failure;
-import org.apache.tinkerpop.gremlin.process.traversal.GraphOp;
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.VerificationException;
-import org.apache.tinkerpop.gremlin.process.traversal.util.BytecodeHelper;
-import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalInterruptedException;
-import org.apache.tinkerpop.gremlin.server.GraphManager;
-import org.apache.tinkerpop.gremlin.server.GremlinServer;
-import org.apache.tinkerpop.gremlin.server.Settings;
-import org.apache.tinkerpop.gremlin.server.auth.AuthenticatedUser;
-import org.apache.tinkerpop.gremlin.util.ExceptionHelper;
-import org.apache.tinkerpop.gremlin.server.util.TraverserIterator;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.Transaction;
-import org.apache.tinkerpop.gremlin.structure.util.TemporaryException;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.codehaus.groovy.control.MultipleCompilationErrorsException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.script.Bindings;
-import javax.script.ScriptException;
-import javax.script.SimpleBindings;
-import java.io.InterruptedIOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.Future;
-import java.util.concurrent.FutureTask;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.stream.Stream;
-
-import static org.apache.tinkerpop.gremlin.process.traversal.GraphOp.TX_COMMIT;
-import static org.apache.tinkerpop.gremlin.process.traversal.GraphOp.TX_ROLLBACK;
-import static org.apache.tinkerpop.gremlin.server.op.AbstractOpProcessor.WRITE_PAUSE_TIME_MS;
-import static org.apache.tinkerpop.gremlin.server.op.AbstractOpProcessor.writePausesMeter;
-
-/**
- * A base implementation of {@link Session} which offers some common functionality that matches typical Gremlin Server
- * request response expectations for script, bytecode and graph operations. The class is designed to be extended but
- * take care in understanding the way that different methods are called as they do depend on one another a bit. It
- * maybe best to examine the source code to determine how best to use this class or to extend from the higher order
- * classes of {@link SingleTaskSession} or {@link MultiTaskSession}.
- *
- * @deprecated As of release 3.8.0, not replaced.
- */
-@Deprecated
-public abstract class AbstractSession implements Session, AutoCloseable {
- private static final Logger logger = LoggerFactory.getLogger(AbstractSession.class);
- private static final Logger auditLogger = LoggerFactory.getLogger(GremlinServer.AUDIT_LOGGER_NAME);
-
- private final boolean sessionIdOnRequest;
- private final Channel initialChannel;
- private final boolean transactionManaged;
- private final String sessionId;
- private final AtomicReference<ScheduledFuture<?>> sessionCancelFuture = new AtomicReference<>();
- private final AtomicReference<Future<?>> sessionFuture = new AtomicReference<>();
- private long actualTimeoutLengthWhenClosed = 0;
-
- /**
- * The session thread is a reference to the thread that is running the session and should be set by an
- * implementation as the first line of the {@link #run()} method.
- */
- protected Thread sessionThread;
- protected final boolean maintainStateAfterException;
- protected final AtomicReference<CloseReason> closeReason = new AtomicReference<>();
- protected final GraphManager graphManager;
- protected final ConcurrentMap<String, Session> sessions;
- protected final Set<String> aliasesUsedBySession = new HashSet<>();
- protected final AtomicBoolean sessionTaskStarted = new AtomicBoolean(false);
-
- /**
- * The reason that a particular session closed. The reason for the close is generally not important as a
- * final disposition for the {@link Session} instance and is more useful in aiding flow control during the
- * close process.
- */
- protected enum CloseReason {
-
- /**
- * The session exits in a fashion that did not precipitate from some form of interruption, timeout or
- * exception, i.e. it is simply allowed to process to an exit through its normal execution flow. This status
- * may or may not be possible given the context of the implementation. For example, a {@link MultiTaskSession}
- * needs to be interrupted to stop processing.
- */
- EXIT_PROCESSING,
-
- /**
- * The session was interrupted by the channel closing, which can be something initiated by closing the
- * {@code Client} or might be triggered by the server. This may not be considered an error situation and
- * depending on context, might be similar to a {@link #EXIT_PROCESSING} termination.
- */
- CHANNEL_CLOSED,
-
- /**
- * The session encountered an exception related to execution like a script error, traversal iteration problem,
- * serialization issue, etc.
- */
- PROCESSING_EXCEPTION,
-
- /**
- * The session was interrupted by the session lifetime timeout.
- */
- SESSION_TIMEOUT,
-
- /**
- * The session was interrupted by the request timeout.
- */
- REQUEST_TIMEOUT
- }
-
- AbstractSession(final SessionTask sessionTask, final String sessionId,
- final boolean transactionManaged,
- final ConcurrentMap<String, Session> sessions) {
- // this only applies to sessions
- this.maintainStateAfterException = (boolean) sessionTask.getRequestMessage().
- optionalArgs(Tokens.ARGS_MAINTAIN_STATE_AFTER_EXCEPTION).orElse(false);
- this.sessionIdOnRequest = sessionTask.getRequestMessage().optionalArgs(Tokens.ARGS_SESSION).isPresent();
- this.transactionManaged = transactionManaged;
- this.sessionId = sessionId;
- this.initialChannel = sessionTask.getChannelHandlerContext().channel();
-
- // close session if the channel closes to cleanup and close transactions
- this.initialChannel.closeFuture().addListener(f -> {
- if (closeReason.compareAndSet(null, CloseReason.CHANNEL_CLOSED)) {
- close();
- }
- });
- this.sessions = sessions;
- this.graphManager = sessionTask.getGraphManager();
- }
-
- protected synchronized void cancel(final boolean mayInterruptIfRunning) {
- final FutureTask<?> sf = (FutureTask) sessionFuture.get();
- if (sf != null && !sf.isDone()) {
- sf.cancel(mayInterruptIfRunning);
-
- if (!sessionTaskStarted.get()) {
- sendTimeoutResponseForUncommencedTask();
- }
- }
- }
-
- public boolean isTransactionManaged() {
- return transactionManaged;
- }
-
- @Override
- public String getSessionId() {
- return sessionId;
- }
-
- public boolean isBoundTo(final Channel channel) {
- return channel == initialChannel;
- }
-
- public long getActualTimeoutLengthWhenClosed() {
- return actualTimeoutLengthWhenClosed;
- }
-
- public Optional<CloseReason> getCloseReason() {
- return Optional.ofNullable(closeReason.get());
- }
-
- /**
- * Gets the script engine from the cached one in the {@link GremlinExecutor}.
- */
- public GremlinScriptEngine getScriptEngine(final SessionTask sessionTask, final String language) {
- return sessionTask.getGremlinExecutor().getScriptEngineManager().getEngineByName(language);
- }
-
- /**
- * Respond to the client with the specific timeout response for this Session implementation.
- * This is for situations where the Session hasn't started running.
- */
- protected abstract void sendTimeoutResponseForUncommencedTask();
-
- @Override
- public void setSessionCancelFuture(final ScheduledFuture<?> f) {
- if (!sessionCancelFuture.compareAndSet(null, f))
- throw new IllegalStateException("Session cancellation future is already set");
- }
-
- @Override
- public void setSessionFuture(final Future<?> f) {
- if (!sessionFuture.compareAndSet(null, f))
- throw new IllegalStateException("Session future is already set");
- }
-
- @Override
- public synchronized void triggerTimeout(final long timeout, final boolean causedBySession) {
- // triggering timeout triggers the stop of the session which will end in close()
- // for final cleanup
- final Future<?> f = sessionFuture.get();
- if (f != null && !f.isDone()) {
- if (closeReason.compareAndSet(null, causedBySession ? CloseReason.SESSION_TIMEOUT : CloseReason.REQUEST_TIMEOUT)) {
- actualTimeoutLengthWhenClosed = timeout;
-
- // if caused by a session timeout for a MultiTaskSession OR if it is a request timeout for a
- // SingleTaskSession request then we can just straight cancel() the session instance
- if (causedBySession || !sessionIdOnRequest)
- cancel(true);
- else {
- // in both MultiTaskSession and SingleTaskSession the thread gets set immediately at the start
- // of run() as it should (though "single" has little need for it). As triggerTimeout() for a
- // request MultiTaskSession can only be called AFTER we are deep in the run() there should be
- // no chance of race conditions or situations where the sessionThread is null at this point.
- if (sessionThread != null) {
- sessionThread.interrupt();
- } else {
- logger.debug("{} is a {} which cannot be interrupted as the thread running the session has not " +
- "been set - please check the implementation if this is not desirable",
- sessionId, this.getClass().getSimpleName());
- }
- }
- }
- }
- }
-
- protected void process(final SessionTask sessionTask) throws SessionException {
- final RequestMessage msg = sessionTask.getRequestMessage();
- final Map<String, Object> args = msg.getArgs();
- final Object gremlinToExecute = args.get(Tokens.ARGS_GREMLIN);
-
- // for strict transactions track the aliases used so that we can commit them and only them on close()
- if (sessionTask.getSettings().strictTransactionManagement)
- msg.optionalArgs(Tokens.ARGS_ALIASES).ifPresent(m -> aliasesUsedBySession.addAll(((Map<String,String>) m).values()));
-
- final Timer.Context timer = getMetricsTimer(sessionTask);
- try {
- // itty is optional as Bytecode could be a "graph operation" rather than a Traversal. graph operations
- // don't need to be iterated and handle their own lifecycle
- final Optional<Iterator<?>> itty = gremlinToExecute instanceof Bytecode ?
- fromBytecode(sessionTask, (Bytecode) gremlinToExecute) :
- Optional.of(fromScript(sessionTask, (String) gremlinToExecute));
-
- processAuditLog(sessionTask.getSettings(), sessionTask.getChannelHandlerContext(), gremlinToExecute);
-
- if (itty.isPresent())
- handleIterator(sessionTask, itty.get());
- } catch (Throwable t) {
- handleException(sessionTask, t);
- } finally {
- timer.stop();
- }
- }
-
- protected void handleException(final SessionTask sessionTask, final Throwable t) throws SessionException {
- if (t instanceof SessionException) throw (SessionException) t;
-
- final Optional<Throwable> possibleSpecialException = determineIfSpecialException(t);
- if (possibleSpecialException.isPresent()) {
- final Throwable special = possibleSpecialException.get();
- final ResponseMessage.Builder specialResponseMsg = ResponseMessage.build(sessionTask.getRequestMessage()).
- statusMessage(special.getMessage()).
- statusAttributeException(special);
- if (special instanceof TemporaryException) {
- specialResponseMsg.code(ResponseStatusCode.SERVER_ERROR_TEMPORARY);
- } else if (special instanceof Failure) {
- final Failure failure = (Failure) special;
- specialResponseMsg.code(ResponseStatusCode.SERVER_ERROR_FAIL_STEP).
- statusAttribute(Tokens.STATUS_ATTRIBUTE_FAIL_STEP_MESSAGE, failure.format());
- }
- throw new SessionException(special.getMessage(), specialResponseMsg.create());
- }
-
- final Throwable root = ExceptionHelper.getRootCause(t);
-
- if (root instanceof TimedInterruptTimeoutException) {
- // occurs when the TimedInterruptCustomizerProvider is in play
- final String msg = String.format("A timeout occurred within the script during evaluation of [%s] - consider increasing the limit given to TimedInterruptCustomizerProvider",
- sessionTask.getRequestMessage().getRequestId());
- throw new SessionException(msg, root, ResponseMessage.build(sessionTask.getRequestMessage())
- .code(ResponseStatusCode.SERVER_ERROR_TIMEOUT)
- .statusMessage("Timeout during script evaluation triggered by TimedInterruptCustomizerProvider")
- .create());
- }
-
- if (root instanceof TimeoutException) {
- final String errorMessage = String.format("Script evaluation exceeded the configured threshold for request [%s]",
- sessionTask.getRequestMessage().getRequestId());
- throw new SessionException(errorMessage, root, ResponseMessage.build(sessionTask.getRequestMessage())
- .code(ResponseStatusCode.SERVER_ERROR_TIMEOUT)
- .statusMessage(t.getMessage())
- .create());
- }
-
- if (root instanceof InterruptedException ||
- root instanceof TraversalInterruptedException ||
- root instanceof InterruptedIOException) {
- String msg = "Processing interrupted but the reason why was not known";
- switch (closeReason.get()) {
- case CHANNEL_CLOSED:
- msg = "Processing interrupted because the channel was closed";
- break;
- case SESSION_TIMEOUT:
- msg = String.format("Session closed - %s - sessionLifetimeTimeout of %s ms exceeded", sessionId, actualTimeoutLengthWhenClosed);
- break;
- case REQUEST_TIMEOUT:
- msg = String.format("Evaluation exceeded timeout threshold of %s ms", actualTimeoutLengthWhenClosed);
- break;
- }
- final ResponseStatusCode code = closeReason.get() == CloseReason.SESSION_TIMEOUT || closeReason.get() == CloseReason.REQUEST_TIMEOUT ?
- ResponseStatusCode.SERVER_ERROR_TIMEOUT : ResponseStatusCode.SERVER_ERROR;
- throw new SessionException(msg, root, ResponseMessage.build(sessionTask.getRequestMessage())
- .code(code)
- .statusMessage(msg).create());
- }
-
- if (root instanceof MultipleCompilationErrorsException && root.getMessage().contains("Method too large") &&
- ((MultipleCompilationErrorsException) root).getErrorCollector().getErrorCount() == 1) {
- final String errorMessage = String.format("The Gremlin statement that was submitted exceeds the maximum compilation size allowed by the JVM, please split it into multiple smaller statements - %s", trimMessage(sessionTask.getRequestMessage()));
- logger.warn(errorMessage);
- throw new SessionException(errorMessage, root, ResponseMessage.build(sessionTask.getRequestMessage())
- .code(ResponseStatusCode.SERVER_ERROR_EVALUATION)
- .statusMessage(errorMessage)
- .statusAttributeException(root).create());
- }
-
- // GroovyRuntimeException will hit a pretty wide range of eval type errors, like MissingPropertyException,
- // CompilationFailedException, MissingMethodException, etc. If more specific handling is required then
- // try to catch it earlier above.
- if (root instanceof GroovyRuntimeException ||
- root instanceof VerificationException ||
- root instanceof ScriptException) {
- throw new SessionException(root.getMessage(), root, ResponseMessage.build(sessionTask.getRequestMessage())
- .code(ResponseStatusCode.SERVER_ERROR_EVALUATION)
- .statusMessage(root.getMessage())
- .statusAttributeException(root).create());
- }
-
- throw new SessionException(root.getClass().getSimpleName() + ": " + root.getMessage(), root,
- ResponseMessage.build(sessionTask.getRequestMessage())
- .code(ResponseStatusCode.SERVER_ERROR)
- .statusAttributeException(root)
- .statusMessage(root.getMessage()).create());
- }
-
- /**
- * Used to decrease the size of a Gremlin script that triggered a "method too large" exception so that it
- * doesn't log a massive text string nor return a large error message.
- */
- private RequestMessage trimMessage(final RequestMessage msg) {
- final RequestMessage trimmedMsg = RequestMessage.from(msg).create();
- if (trimmedMsg.getArgs().containsKey(Tokens.ARGS_GREMLIN))
- trimmedMsg.getArgs().put(Tokens.ARGS_GREMLIN, trimmedMsg.getArgs().get(Tokens.ARGS_GREMLIN).toString().substring(0, 1021) + "...");
-
- return trimmedMsg;
- }
-
- /**
- * Check if any exception in the chain is {@link TemporaryException} or {@link Failure} then respond with the
- * right error code so that the client knows to retry.
- */
- protected static Optional<Throwable> determineIfSpecialException(final Throwable ex) {
- return Stream.of(ExceptionUtils.getThrowables(ex)).
- filter(i -> i instanceof TemporaryException || i instanceof Failure).findFirst();
- }
-
- /**
- * Removes the session from the session list and cancels the future that manages the lifetime of the session.
- */
- @Override
- public synchronized void close() {
- // already closing/closed
- if (!sessions.containsKey(sessionId)) return;
-
- sessions.remove(sessionId);
-
- if (sessionCancelFuture.get() != null) {
- final ScheduledFuture<?> f = sessionCancelFuture.get();
- if (!f.isDone()) f.cancel(true);
- }
- }
-
- /**
- * Constructs an {@code Iterator} from the results of a script evaluation provided in the {@link SessionTask}.
- *
- * @param sessionTask The session task which can be used as a context in constructing the {@code Iterator}
- * @param script The script extracted by the calling method from the {@code sessionTask}
- */
- protected Iterator<?> fromScript(final SessionTask sessionTask, final String script) throws Exception {
- final RequestMessage msg = sessionTask.getRequestMessage();
- final Map<String, Object> args = msg.getArgs();
- final String language = args.containsKey(Tokens.ARGS_LANGUAGE) ? (String) args.get(Tokens.ARGS_LANGUAGE) : "gremlin-groovy";
- return IteratorUtils.asIterator(getScriptEngine(sessionTask, language).eval(
- script, mergeBindingsFromRequest(sessionTask, getWorkerBindings())));
- }
-
- /**
- * Constructs an {@code Iterator} from {@link Bytecode} provided in the {@link SessionTask}. If the {@link Bytecode}
- * is found to evalute to a {@link GraphOp} then it is processed and an empty {@code Optional} is returned.
- *
- * @param sessionTask The session task which can be used as a context in constructing the {@code Iterator}
- * @param bytecode The {@link Bytecode} extracted by the calling method from the {@code sessionTask}
- */
- protected Optional<Iterator<?>> fromBytecode(final SessionTask sessionTask, final Bytecode bytecode) throws Exception {
- final RequestMessage msg = sessionTask.getRequestMessage();
-
- final Traversal.Admin<?, ?> traversal;
- final Map<String, String> aliases = (Map<String, String>) msg.optionalArgs(Tokens.ARGS_ALIASES).get();
- final GraphManager graphManager = sessionTask.getGraphManager();
- final String traversalSourceName = aliases.entrySet().iterator().next().getValue();
- final TraversalSource g = graphManager.getTraversalSource(traversalSourceName);
-
- // handle bytecode based graph operations like commit/rollback commands
- if (BytecodeHelper.isGraphOperation(bytecode)) {
- handleGraphOperation(sessionTask, bytecode, g.getGraph());
- return Optional.empty();
- } else {
-
- final Optional<String> lambdaLanguage = BytecodeHelper.getLambdaLanguage(bytecode);
- if (!lambdaLanguage.isPresent())
- traversal = JavaTranslator.of(g).translate(bytecode);
- else {
- final SimpleBindings bindings = new SimpleBindings();
- bindings.put(traversalSourceName, g);
- traversal = sessionTask.getGremlinExecutor().getScriptEngineManager().
- getEngineByName(lambdaLanguage.get()).eval(bytecode, bindings, traversalSourceName);
- }
-
- // compile the traversal - without it getEndStep() has nothing in it
- traversal.applyStrategies();
-
- return Optional.of(new TraverserIterator(traversal));
- }
- }
-
- protected Bindings getWorkerBindings() throws SessionException {
- return new SimpleBindings(graphManager.getAsBindings());
- }
-
- protected Bindings mergeBindingsFromRequest(final SessionTask sessionTask, final Bindings bindings) throws SessionException {
- // alias any global bindings to a different variable.
- final RequestMessage msg = sessionTask.getRequestMessage();
- if (msg.getArgs().containsKey(Tokens.ARGS_ALIASES)) {
- final Map<String, String> aliases = (Map<String, String>) msg.getArgs().get(Tokens.ARGS_ALIASES);
- for (Map.Entry<String,String> aliasKv : aliases.entrySet()) {
- boolean found = false;
-
- // first check if the alias refers to a Graph instance
- final Graph graph = sessionTask.getGraphManager().getGraph(aliasKv.getValue());
- if (null != graph) {
- bindings.put(aliasKv.getKey(), graph);
- found = true;
- }
-
- // if the alias wasn't found as a Graph then perhaps it is a TraversalSource - it needs to be
- // something
- if (!found) {
- final TraversalSource ts = sessionTask.getGraphManager().getTraversalSource(aliasKv.getValue());
- if (null != ts) {
- bindings.put(aliasKv.getKey(), ts);
- found = true;
- }
- }
-
- // this validation is important to calls to GraphManager.commit() and rollback() as they both
- // expect that the aliases supplied are valid
- if (!found) {
- final String error = String.format("Could not alias [%s] to [%s] as [%s] not in the Graph or TraversalSource global bindings",
- aliasKv.getKey(), aliasKv.getValue(), aliasKv.getValue());
- throw new SessionException(error, ResponseMessage.build(msg)
- .code(ResponseStatusCode.REQUEST_ERROR_INVALID_REQUEST_ARGUMENTS).statusMessage(error).create());
- }
- }
- } else {
- // there's no bindings so determine if that's ok with Gremlin Server
- if (sessionTask.getSettings().strictTransactionManagement) {
- final String error = "Gremlin Server is configured with strictTransactionManagement as 'true' - the 'aliases' arguments must be provided";
- throw new SessionException(error, ResponseMessage.build(msg)
- .code(ResponseStatusCode.REQUEST_ERROR_INVALID_REQUEST_ARGUMENTS).statusMessage(error).create());
- }
- }
-
- // add any bindings to override any other supplied
- Optional.ofNullable((Map<String, Object>) msg.getArgs().get(Tokens.ARGS_BINDINGS)).ifPresent(bindings::putAll);
- return bindings;
- }
-
- /**
- * Provides a generic way of iterating a result set back to the client.
- *
- * @param sessionTask The Gremlin Server {@link SessionTask} object containing settings, request message, etc.
- * @param itty The result to iterator
- */
- protected void handleIterator(final SessionTask sessionTask, final Iterator<?> itty) throws InterruptedException {
- final ChannelHandlerContext nettyContext = sessionTask.getChannelHandlerContext();
- final RequestMessage msg = sessionTask.getRequestMessage();
- final Settings settings = sessionTask.getSettings();
-
- // used to limit warnings for when netty fills the buffer and hits the high watermark - prevents
- // over-logging of the same message.
- long lastWarningTime = 0;
- int warnCounter = 0;
-
- // sessionless requests are always transaction managed, but in-session requests are configurable.
- final boolean managedTransactionsForRequest = transactionManaged ?
- true : (Boolean) msg.getArgs().getOrDefault(Tokens.ARGS_MANAGE_TRANSACTION, false);
-
- // we have an empty iterator - happens on stuff like: g.V().iterate()
- if (!itty.hasNext()) {
- final Map<String, Object> attributes = generateStatusAttributes(sessionTask,ResponseStatusCode.NO_CONTENT, itty);
- // as there is nothing left to iterate if we are transaction managed then we should execute a
- // commit here before we send back a NO_CONTENT which implies success
- if (managedTransactionsForRequest)
- closeTransaction(sessionTask, Transaction.Status.COMMIT);
-
- sessionTask.writeAndFlush(ResponseMessage.build(msg)
- .code(ResponseStatusCode.NO_CONTENT)
- .statusAttributes(attributes)
- .create());
- return;
- }
-
- // the batch size can be overridden by the request
- final int resultIterationBatchSize = (Integer) msg.optionalArgs(Tokens.ARGS_BATCH_SIZE)
- .orElse(settings.resultIterationBatchSize);
- List<Object> aggregate = new ArrayList<>(resultIterationBatchSize);
-
- // use an external control to manage the loop as opposed to just checking hasNext() in the while. this
- // prevent situations where auto transactions create a new transaction after calls to commit() withing
- // the loop on calls to hasNext().
- boolean hasMore = itty.hasNext();
-
- while (hasMore) {
- if (Thread.interrupted()) throw new InterruptedException();
-
- // check if an implementation needs to force flush the aggregated results before the iteration batch
- // size is reached.
- // todo: what implementation does this?! can we kill it going forward - seems always false
- // final boolean forceFlush = isForceFlushed(nettyContext, msg, itty);
- final boolean forceFlush = false;
-
- // have to check the aggregate size because it is possible that the channel is not writeable (below)
- // so iterating next() if the message is not written and flushed would bump the aggregate size beyond
- // the expected resultIterationBatchSize. Total serialization time for the response remains in
- // effect so if the client is "slow" it may simply timeout.
- //
- // there is a need to check hasNext() on the iterator because if the channel is not writeable the
- // previous pass through the while loop will have next()'d the iterator and if it is "done" then a
- // NoSuchElementException will raise its head. also need a check to ensure that this iteration doesn't
- // require a forced flush which can be forced by sub-classes.
- //
- // this could be placed inside the isWriteable() portion of the if-then below but it seems better to
- // allow iteration to continue into a batch if that is possible rather than just doing nothing at all
- // while waiting for the client to catch up
- if (aggregate.size() < resultIterationBatchSize && itty.hasNext() && !forceFlush) aggregate.add(itty.next());
-
- // send back a page of results if batch size is met or if it's the end of the results being iterated.
- // also check writeability of the channel to prevent OOME for slow clients.
- //
- // clients might decide to close the Netty channel to the server with a CloseWebsocketFrame after errors
- // like CorruptedFrameException. On the server, although the channel gets closed, there might be some
- // executor threads waiting for watermark to clear which will not clear in these cases since client has
- // already given up on these requests. This leads to these executors waiting for the client to consume
- // results till the timeout. checking for isActive() should help prevent that.
- if (nettyContext.channel().isActive() && nettyContext.channel().isWritable()) {
- if (forceFlush || aggregate.size() == resultIterationBatchSize || !itty.hasNext()) {
- final ResponseStatusCode code = itty.hasNext() ? ResponseStatusCode.PARTIAL_CONTENT : ResponseStatusCode.SUCCESS;
- Frame frame = null;
- try {
- frame = makeFrame(sessionTask, aggregate, code, itty);
- } catch (Exception ex) {
- // a frame may use a Bytebuf which is a countable release - if it does not get written
- // downstream it needs to be released here
- if (frame != null) frame.tryRelease();
-
- // exception is handled in makeFrame() - serialization error gets written back to driver
- // at that point
- if (managedTransactionsForRequest)
- closeTransaction(sessionTask, Transaction.Status.ROLLBACK);
- break;
- }
-
- // track whether there is anything left in the iterator because it needs to be accessed after
- // the transaction could be closed - in that case a call to hasNext() could open a new transaction
- // unintentionally
- final boolean moreInIterator = itty.hasNext();
-
- try {
- // only need to reset the aggregation list if there's more stuff to write
- if (moreInIterator)
- aggregate = new ArrayList<>(resultIterationBatchSize);
- else {
- // iteration and serialization are both complete which means this finished successfully. note that
- // errors internal to script eval or timeout will rollback given GremlinServer's global configurations.
- // local errors will get rolledback below because the exceptions aren't thrown in those cases to be
- // caught by the GremlinExecutor for global rollback logic. this only needs to be committed if
- // there are no more items to iterate and serialization is complete
- if (managedTransactionsForRequest)
- closeTransaction(sessionTask, Transaction.Status.COMMIT);
-
- // exit the result iteration loop as there are no more results left. using this external control
- // because of the above commit. some graphs may open a new transaction on the call to
- // hasNext()
- hasMore = false;
- }
- } catch (Exception ex) {
- // a frame may use a Bytebuf which is a countable release - if it does not get written
- // downstream it needs to be released here
- if (frame != null) frame.tryRelease();
- throw ex;
- }
-
- if (!moreInIterator) iterateComplete(sessionTask, itty);
-
- // the flush is called after the commit has potentially occurred. in this way, if a commit was
- // required then it will be 100% complete before the client receives it. the "frame" at this point
- // should have completely detached objects from the transaction (i.e. serialization has occurred)
- // so a new one should not be opened on the flush down the netty pipeline
- sessionTask.writeAndFlush(code, frame);
- }
- } else {
- final long currentTime = System.currentTimeMillis();
-
- // exponential delay between warnings. don't keep triggering this warning over and over again for the
- // same request. totalPendingWriteBytes is volatile so it is possible that by the time this warning
- // hits the log the low watermark may have been hit
- long interval = (long) Math.pow(2, warnCounter) * 1000;
- if (currentTime - lastWarningTime >= interval) {
- final Channel ch = nettyContext.channel();
- logger.warn("Warning {}: Outbound buffer size={}, pausing response writing as writeBufferHighWaterMark exceeded on request {} for channel {} - writing will continue once client has caught up",
- warnCounter,
- ch.unsafe().outboundBuffer().totalPendingWriteBytes(),
- msg.getRequestId(),
- ch.id());
-
- lastWarningTime = currentTime;
- warnCounter++;
- }
-
- // since the client is lagging we can hold here for a period of time for the client to catch up.
- // this isn't blocking the IO thread - just a worker.
- TimeUnit.MILLISECONDS.sleep(WRITE_PAUSE_TIME_MS);
- writePausesMeter.mark();
- }
- }
- }
-
- /**
- * If {@link Bytecode} is detected to contain a {@link GraphOp} then it gets processed by this method.
- */
- protected void handleGraphOperation(final SessionTask sessionTask, final Bytecode bytecode, final Graph graph) throws Exception {
- final RequestMessage msg = sessionTask.getRequestMessage();
- if (graph.features().graph().supportsTransactions()) {
- if (TX_COMMIT.equals(bytecode) || TX_ROLLBACK.equals(bytecode)) {
- final boolean commit = TX_COMMIT.equals(bytecode);
- closeTransaction(sessionTask, commit ? Transaction.Status.COMMIT : Transaction.Status.ROLLBACK);
-
- // write back a no-op for success
- final Map<String, Object> attributes = generateStatusAttributes(sessionTask,
- ResponseStatusCode.NO_CONTENT, Collections.emptyIterator());
- sessionTask.writeAndFlush(ResponseMessage.build(msg)
- .code(ResponseStatusCode.NO_CONTENT)
- .statusAttributes(attributes)
- .create());
- } else {
- throw new IllegalStateException(String.format(
- "Bytecode in request is not a recognized graph operation: %s", bytecode.toString()));
- }
- } else {
- throw Graph.Exceptions.transactionsNotSupported();
- }
- }
-
- /**
- * Called when iteration within {@link #handleIterator(SessionTask, Iterator)} is on its final pass and the final
- * frame is about to be sent back to the client. This method only gets called on successful iteration of the
- * entire result.
- */
- protected void iterateComplete(final SessionTask sessionTask, final Iterator<?> itty) {
- // do nothing by default
- }
-
- /**
- * Generates response status meta-data to put on a {@link ResponseMessage}.
- *
- * @param itty a reference to the current {@link Iterator} of results - it is not meant to be forwarded in
- * this method
- */
- protected Map<String, Object> generateStatusAttributes(final SessionTask sessionTask,
- final ResponseStatusCode code, final Iterator<?> itty) {
- // only return server metadata on the last message
- if (itty.hasNext()) return Collections.emptyMap();
-
- final Map<String, Object> metaData = new HashMap<>();
- metaData.put(Tokens.ARGS_HOST, sessionTask.getChannelHandlerContext().channel().remoteAddress().toString());
-
- return metaData;
- }
-
- /**
- * Generates response result meta-data to put on a {@link ResponseMessage}.
- *
- * @param itty a reference to the current {@link Iterator} of results - it is not meant to be forwarded in
- * this method
- */
- protected Map<String, Object> generateResponseMetaData(final SessionTask sessionTask,
- final ResponseStatusCode code, final Iterator<?> itty) {
- return Collections.emptyMap();
- }
-
- protected Frame makeFrame(final SessionTask sessionTask, final List<Object> aggregate,
- final ResponseStatusCode code, final Iterator<?> itty) throws Exception {
- final RequestMessage msg = sessionTask.getRequestMessage();
- final ChannelHandlerContext nettyContext = sessionTask.getChannelHandlerContext();
- final MessageSerializer serializer = nettyContext.channel().attr(StateKey.SERIALIZER).get();
- final boolean useBinary = nettyContext.channel().attr(StateKey.USE_BINARY).get();
-
- final Map<String, Object> responseMetaData = generateResponseMetaData(sessionTask, code, itty);
- final Map<String, Object> statusAttributes = generateStatusAttributes(sessionTask, code, itty);
- try {
- sessionTask.handleDetachment(aggregate);
-
- if (useBinary) {
- return new Frame(serializer.serializeResponseAsBinary(ResponseMessage.build(msg)
- .code(code)
- .statusAttributes(statusAttributes)
- .responseMetaData(responseMetaData)
- .result(aggregate).create(), nettyContext.alloc()));
- } else {
- // the expectation is that the GremlinTextRequestDecoder will have placed a MessageTextSerializer
- // instance on the channel.
- final MessageTextSerializer textSerializer = (MessageTextSerializer) serializer;
- return new Frame(textSerializer.serializeResponseAsString(ResponseMessage.build(msg)
- .code(code)
- .statusAttributes(statusAttributes)
- .responseMetaData(responseMetaData)
- .result(aggregate).create(), nettyContext.alloc()));
- }
- } catch (Exception ex) {
- logger.warn("The result [{}] in the request {} could not be serialized and returned.", aggregate, msg.getRequestId(), ex);
- final String errorMessage = String.format("Error during serialization: %s", ExceptionHelper.getMessageFromExceptionOrCause(ex));
- final ResponseMessage error = ResponseMessage.build(msg.getRequestId())
- .statusMessage(errorMessage)
- .statusAttributeException(ex)
- .code(ResponseStatusCode.SERVER_ERROR_SERIALIZATION).create();
- sessionTask.writeAndFlush(error);
- throw ex;
- }
- }
-
- /**
- * Called right before a transaction starts within {@link #run()}. The default implementation checks for open
- * transactions and throws an exception if it finds any and generally assumes auto-transactions are enabled on
- * graphs (i.e. transaction automatically start on read/write).
- * <p/>
- * Providers who do not follow these sorts of transaction semantics should provide an override to this method.
- */
- protected void startTransaction(final SessionTask sessionTask) {
- if (graphManager.hasAnyOpenTransactions()) {
- // logger and handling in calling method
- throw new IllegalStateException(String.format(
- "Attempted to start transaction for %s but the transaction was already open",
- sessionTask.getRequestMessage().getRequestId()));
- }
- }
-
- /**
- * Close the transaction without a {@link SessionTask} which supplies {@code null} to that argument for
- * {@link #closeTransaction(SessionTask, Transaction.Status)}. This method is idempotent.
- */
- protected void closeTransaction(final Transaction.Status status) {
- closeTransaction(null, status);
- }
-
- /**
- * Tries to close the transaction but will catch exceptions and log them. This method is idempotent.
- */
- protected void closeTransactionSafely(final Transaction.Status status) {
- closeTransactionSafely(null, status);
- }
-
- /**
- * Tries to close the transaction but will catch exceptions and log them. This method is idempotent.
- */
- protected void closeTransactionSafely(final SessionTask sessionTask, final Transaction.Status status) {
- try {
- closeTransaction(sessionTask, status);
- } catch (Exception ex) {
- logger.error("Failed to close transaction", ex);
- }
- }
-
- private void processAuditLog(final Settings settings, final ChannelHandlerContext ctx, final Object gremlinToExecute) {
- if (settings.enableAuditLog) {
- AuthenticatedUser user = ctx.channel().attr(StateKey.AUTHENTICATED_USER).get();
- if (null == user) { // This is expected when using the AllowAllAuthenticator
- user = AuthenticatedUser.ANONYMOUS_USER;
- }
- String address = ctx.channel().remoteAddress().toString();
- if (address.startsWith("/") && address.length() > 1) address = address.substring(1);
- auditLogger.info("User {} with address {} requested: {}", user.getName(), address, gremlinToExecute);
- }
- }
-
- /**
- * Closes a transaction with commit or rollback. Strict transaction management settings are observed when
- * configured as such in {@link Settings#strictTransactionManagement} and when aliases are present on the
- * request in the current {@link SessionTask}. If the supplied {@link SessionTask} is {@code null} then "strict" is
- * bypassed so this form must be called with care. Bypassing is often useful to ensure that all transactions
- * are cleaned up when multiple graphs are referenced. Prefer calling {@link #closeTransaction(Transaction.Status)}
- * in this case instead. This method is idempotent.
- */
- protected void closeTransaction(final SessionTask sessionTask, final Transaction.Status status) {
- if (status != Transaction.Status.COMMIT && status != Transaction.Status.ROLLBACK)
- throw new IllegalStateException(String.format("Transaction.Status not supported: %s", status));
-
- final boolean commit = status == Transaction.Status.COMMIT;
- final boolean strict = sessionTask != null && sessionTask.getSettings().strictTransactionManagement;
-
- if (strict) {
- if (commit)
- graphManager.commit(new HashSet<>(aliasesUsedBySession));
- else
- graphManager.rollback(new HashSet<>(aliasesUsedBySession));
- } else {
- if (commit)
- graphManager.commitAll();
- else
- graphManager.rollbackAll();
- }
- }
-
- private Timer.Context getMetricsTimer(final SessionTask sessionTask) {
- // getting something other than bytecode or script at this point is unlikely as earlier validations
- // should have picked this up.
- switch (sessionTask.getRequestContentType()) {
- case BYTECODE:
- return Session.traversalOpTimer.time();
- case SCRIPT:
- return Session.evalOpTimer.time();
- default:
- throw new IllegalStateException("Unrecognized content of the 'gremlin' argument in the request");
- }
- }
-}
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/Frame.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/Frame.java
deleted file mode 100644
index 76d772e..0000000
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/Frame.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.server.handler;
-
-import io.netty.util.ReferenceCounted;
-
-/**
- * A holder for a {@code String} or {@code ByteBuf} that represents a message to be written back to the requesting
- * client.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class Frame {
- private final Object msg;
-
- public Frame(final Object msg) {
- this.msg = msg;
- }
-
- public Object getMsg() {
- return msg;
- }
-
- /**
- * If the object contained in the frame is {@code ReferenceCounted} then it may need to be released or else
- * Netty will generate warnings that counted resources are leaking.
- */
- public void tryRelease() {
- if (msg instanceof ReferenceCounted)
- ((ReferenceCounted) msg).release();
- }
-}
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/FrameMessageSizeEstimator.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/FrameMessageSizeEstimator.java
deleted file mode 100644
index d60be6e..0000000
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/FrameMessageSizeEstimator.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.server.handler;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufHolder;
-import io.netty.channel.FileRegion;
-import io.netty.channel.MessageSizeEstimator;
-
-import static io.netty.util.internal.ObjectUtil.checkPositiveOrZero;
-
-/**
- * A {@code MessageSizeEstimator} that sizes the {@link Frame} class. This is basically an implementation of netty's
- * default but with that additional feature.
- */
-public final class FrameMessageSizeEstimator implements MessageSizeEstimator {
-
- private static final class HandleImpl implements Handle {
- private final int unknownSize;
-
- private HandleImpl(int unknownSize) {
- this.unknownSize = unknownSize;
- }
-
- @Override
- public int size(Object msg) {
- if (msg instanceof Frame) {
- return size0(((Frame) msg).getMsg());
- } else {
- return size0(msg);
- }
- }
-
- /**
- * Standard netty implementation.
- */
- private int size0(final Object msg) {
- if (msg instanceof ByteBuf) {
- return ((ByteBuf) msg).readableBytes();
- }
- if (msg instanceof ByteBufHolder) {
- return ((ByteBufHolder) msg).content().readableBytes();
- }
- if (msg instanceof FileRegion) {
- return 0;
- }
- return unknownSize;
- }
- }
-
- /**
- * Return the default implementation which returns {@code 8} for unknown messages which matches the
- * implementation of netty at {@code DefaultMessageSizeEstimator}
- */
- private static final FrameMessageSizeEstimator instance = new FrameMessageSizeEstimator(8);
-
- private final Handle handle;
-
- /**
- * Create a new instance
- *
- * @param unknownSize The size which is returned for unknown messages.
- */
- public FrameMessageSizeEstimator(int unknownSize) {
- checkPositiveOrZero(unknownSize, "unknownSize");
- handle = new HandleImpl(unknownSize);
- }
-
- public static FrameMessageSizeEstimator instance() {
- return instance;
- }
-
- @Override
- public Handle newHandle() {
- return handle;
- }
-}
\ No newline at end of file
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/GremlinResponseFrameEncoder.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/GremlinResponseFrameEncoder.java
deleted file mode 100644
index 879b44f..0000000
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/GremlinResponseFrameEncoder.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.server.handler;
-
-import com.codahale.metrics.Meter;
-import org.apache.tinkerpop.gremlin.util.MessageSerializer;
-import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.util.ser.MessageTextSerializer;
-import org.apache.tinkerpop.gremlin.server.GremlinServer;
-import org.apache.tinkerpop.gremlin.server.op.session.Session;
-import org.apache.tinkerpop.gremlin.server.util.ExceptionHelper;
-import org.apache.tinkerpop.gremlin.server.util.MetricManager;
-import io.netty.channel.ChannelHandler;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.MessageToMessageEncoder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.List;
-
-import static com.codahale.metrics.MetricRegistry.name;
-
-/**
- * Ensures that any {@link ResponseMessage} manages to get converted to a {@link Frame}. By converting to {@link Frame}
- * downstream protocols can treat the generic {@link Frame} any way it wants (e.g. write it back as a byte array,
- * websocket frame, etc).
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-@ChannelHandler.Sharable
-public class GremlinResponseFrameEncoder extends MessageToMessageEncoder<ResponseMessage> {
- private static final Logger logger = LoggerFactory.getLogger(GremlinResponseFrameEncoder.class);
- static final Meter errorMeter = MetricManager.INSTANCE.getMeter(name(GremlinServer.class, "errors"));
-
- @Override
- protected void encode(final ChannelHandlerContext ctx, final ResponseMessage o, final List<Object> objects) throws Exception {
- final MessageSerializer<?> serializer = ctx.channel().attr(StateKey.SERIALIZER).get();
- final boolean useBinary = ctx.channel().attr(StateKey.USE_BINARY).get();
- final Session session = ctx.channel().attr(StateKey.SESSION).get();
-
- try {
- if (!o.getStatus().getCode().isSuccess())
- errorMeter.mark();
-
- if (useBinary) {
- final Frame serialized;
-
- // if the request came in on a session then the serialization must occur in that same thread, except
- // in the case of an error where we can free the session executor from having to do that job. the
- // problem here is that if the session executor is used in the case of an error and the executor is
- // blocked by parallel requests then there is no thread available to serialize the result and send
- // back the response as the workers get all tied up behind the session executor.
- if (null == session || !o.getStatus().getCode().isSuccess())
- serialized = new Frame(serializer.serializeResponseAsBinary(o, ctx.alloc()));
- else
- serialized = new Frame(session.getExecutor().submit(() -> serializer.serializeResponseAsBinary(o, ctx.alloc())).get());
-
- objects.add(serialized);
- } else {
- // the expectation is that the GremlinTextRequestDecoder will have placed a MessageTextSerializer
- // instance on the channel.
- final MessageTextSerializer<?> textSerializer = (MessageTextSerializer<?>) serializer;
-
- final Frame serialized;
-
- // if the request came in on a session then the serialization must occur that same thread except
- // in the case of errors for reasons described above.
- if (null == session || !o.getStatus().getCode().isSuccess())
- serialized = new Frame(textSerializer.serializeResponseAsString(o, ctx.alloc()));
- else
- serialized = new Frame(session.getExecutor().submit(() -> textSerializer.serializeResponseAsString(o, ctx.alloc())).get());
-
- objects.add(serialized);
- }
- } catch (Exception ex) {
- errorMeter.mark();
- logger.warn("The result [{}] in the request {} could not be serialized and returned.", o.getResult(), o.getRequestId(), ex);
- final String errorMessage = String.format("Error during serialization: %s", ExceptionHelper.getMessageFromExceptionOrCause(ex));
- final ResponseMessage error = ResponseMessage.build(o.getRequestId())
- .statusMessage(errorMessage)
- .statusAttributeException(ex)
- .code(ResponseStatusCode.SERVER_ERROR_SERIALIZATION).create();
- if (useBinary) {
- objects.add(serializer.serializeResponseAsBinary(error, ctx.alloc()));
- } else {
- final MessageTextSerializer<?> textSerializer = (MessageTextSerializer<?>) serializer;
- objects.add(textSerializer.serializeResponseAsString(error, ctx.alloc()));
- }
- }
- }
-}
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpBasicAuthenticationHandler.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpBasicAuthenticationHandler.java
index 41fd3a4..db6d1b7 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpBasicAuthenticationHandler.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpBasicAuthenticationHandler.java
@@ -18,9 +18,7 @@
*/
package org.apache.tinkerpop.gremlin.server.handler;
-import io.netty.channel.ChannelFutureListener;
import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.http.DefaultFullHttpResponse;
import io.netty.handler.codec.http.FullHttpMessage;
import io.netty.util.ReferenceCountUtil;
import org.apache.tinkerpop.gremlin.server.GremlinServer;
@@ -32,16 +30,16 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.util.Base64;
import java.util.HashMap;
import java.util.Map;
import static io.netty.handler.codec.http.HttpResponseStatus.UNAUTHORIZED;
-import static io.netty.handler.codec.http.HttpVersion.HTTP_1_1;
import static org.apache.tinkerpop.gremlin.groovy.jsr223.dsl.credential.CredentialGraphTokens.PROPERTY_ADDRESS;
import static org.apache.tinkerpop.gremlin.groovy.jsr223.dsl.credential.CredentialGraphTokens.PROPERTY_PASSWORD;
import static org.apache.tinkerpop.gremlin.groovy.jsr223.dsl.credential.CredentialGraphTokens.PROPERTY_USERNAME;
+import static org.apache.tinkerpop.gremlin.server.handler.HttpHandlerUtil.sendError;
/**
* Implements basic HTTP authentication for use with the {@link HttpGremlinEndpointHandler} and HTTP based API calls.
@@ -49,20 +47,12 @@
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
public class HttpBasicAuthenticationHandler extends AbstractAuthenticationHandler {
- private static final Logger logger = LoggerFactory.getLogger(HttpBasicAuthenticationHandler.class);
+ private static final String INCORRECT_CREDENTIALS_MESSAGE = "Missing or incorrect credentials";
private static final Logger auditLogger = LoggerFactory.getLogger(GremlinServer.AUDIT_LOGGER_NAME);
private final Settings settings;
private final Base64.Decoder decoder = Base64.getUrlDecoder();
- /**
- * @deprecated As of release 3.5.0, replaced by {@link #HttpBasicAuthenticationHandler(Authenticator, Authorizer, Settings)}.
- */
- @Deprecated
- public HttpBasicAuthenticationHandler(final Authenticator authenticator, final Settings settings) {
- this(authenticator, null, settings);
- }
-
public HttpBasicAuthenticationHandler(final Authenticator authenticator, final Authorizer authorizer, final Settings settings) {
super(authenticator, authorizer);
this.settings = settings;
@@ -73,7 +63,8 @@
if (msg instanceof FullHttpMessage) {
final FullHttpMessage request = (FullHttpMessage) msg;
if (!request.headers().contains("Authorization")) {
- sendError(ctx, msg);
+ sendError(ctx, UNAUTHORIZED, INCORRECT_CREDENTIALS_MESSAGE);
+ ReferenceCountUtil.release(msg);
return;
}
@@ -81,24 +72,24 @@
final String basic = "Basic ";
final String authorizationHeader = request.headers().get("Authorization");
if (!authorizationHeader.startsWith(basic)) {
- sendError(ctx, msg);
+ sendError(ctx, UNAUTHORIZED, INCORRECT_CREDENTIALS_MESSAGE);
+ ReferenceCountUtil.release(msg);
return;
}
- byte[] decodedUserPass = null;
+ byte[] decodedUserPass;
try {
final String encodedUserPass = authorizationHeader.substring(basic.length());
decodedUserPass = decoder.decode(encodedUserPass);
- } catch (IndexOutOfBoundsException iae) {
- sendError(ctx, msg);
- return;
- } catch (IllegalArgumentException iae) {
- sendError(ctx, msg);
+ } catch (IndexOutOfBoundsException | IllegalArgumentException ex) {
+ sendError(ctx, UNAUTHORIZED, ex.getMessage());
+ ReferenceCountUtil.release(msg);
return;
}
- final String authorization = new String(decodedUserPass, Charset.forName("UTF-8"));
+ final String authorization = new String(decodedUserPass, StandardCharsets.UTF_8);
final String[] split = authorization.split(":");
if (split.length != 2) {
- sendError(ctx, msg);
+ sendError(ctx, UNAUTHORIZED, INCORRECT_CREDENTIALS_MESSAGE);
+ ReferenceCountUtil.release(msg);
return;
}
@@ -121,14 +112,9 @@
credentials.get(PROPERTY_USERNAME), address, authClassParts[authClassParts.length - 1]);
}
} catch (AuthenticationException ae) {
- sendError(ctx, msg);
+ sendError(ctx, UNAUTHORIZED, ae.getMessage());
+ ReferenceCountUtil.release(msg);
}
}
}
-
- private void sendError(final ChannelHandlerContext ctx, final Object msg) {
- // Close the connection as soon as the error message is sent.
- ctx.writeAndFlush(new DefaultFullHttpResponse(HTTP_1_1, UNAUTHORIZED)).addListener(ChannelFutureListener.CLOSE);
- ReferenceCountUtil.release(msg);
- }
}
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpBasicAuthorizationHandler.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpBasicAuthorizationHandler.java
index 9477459..0df8003 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpBasicAuthorizationHandler.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpBasicAuthorizationHandler.java
@@ -21,20 +21,19 @@
import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelInboundHandlerAdapter;
-import io.netty.handler.codec.http.FullHttpMessage;
-import io.netty.handler.codec.http.FullHttpRequest;
-import io.netty.handler.codec.http.HttpUtil;
import io.netty.util.ReferenceCountUtil;
-import org.apache.tinkerpop.gremlin.util.Tokens;
-import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
import org.apache.tinkerpop.gremlin.server.GremlinServer;
import org.apache.tinkerpop.gremlin.server.auth.AuthenticatedUser;
import org.apache.tinkerpop.gremlin.server.authz.AuthorizationException;
import org.apache.tinkerpop.gremlin.server.authz.Authorizer;
+import org.apache.tinkerpop.gremlin.util.Tokens;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static io.netty.handler.codec.http.HttpResponseStatus.BAD_REQUEST;
+import java.util.HashMap;
+import java.util.Map;
+
import static io.netty.handler.codec.http.HttpResponseStatus.INTERNAL_SERVER_ERROR;
import static io.netty.handler.codec.http.HttpResponseStatus.UNAUTHORIZED;
@@ -58,16 +57,8 @@
@Override
public void channelRead(final ChannelHandlerContext ctx, final Object msg) {
- if (msg instanceof FullHttpMessage){
- final FullHttpMessage request = (FullHttpMessage) msg;
- final boolean keepAlive = HttpUtil.isKeepAlive(request);
- final RequestMessage requestMessage;
- try {
- requestMessage = HttpHandlerUtil.getRequestMessageFromHttpRequest((FullHttpRequest) request);
- } catch (IllegalArgumentException iae) {
- HttpHandlerUtil.sendError(ctx, BAD_REQUEST, iae.getMessage(), keepAlive);
- return;
- }
+ if (msg instanceof RequestMessage) {
+ final RequestMessage requestMessage = (RequestMessage) msg;
try {
user = ctx.channel().attr(StateKey.AUTHENTICATED_USER).get();
@@ -75,27 +66,25 @@
user = AuthenticatedUser.ANONYMOUS_USER;
}
- authorizer.authorize(user, requestMessage);
- ctx.fireChannelRead(request);
+ final String gremlin = requestMessage.getGremlin();
+ final Map<String, String> aliases = new HashMap<>();
+ aliases.put(Tokens.ARGS_G, requestMessage.getField(Tokens.ARGS_G));
+ final String restrictedGremlin = authorizer.authorize(user, gremlin, aliases);
+ final RequestMessage restrictedMsg = RequestMessage.from(requestMessage, restrictedGremlin).create();
+ ctx.fireChannelRead(restrictedMsg);
+
} catch (AuthorizationException ex) { // Expected: users can alternate between allowed and disallowed requests
String address = ctx.channel().remoteAddress().toString();
if (address.startsWith("/") && address.length() > 1) address = address.substring(1);
- final String script;
- try {
- script = HttpHandlerUtil.getRequestMessageFromHttpRequest((FullHttpRequest) request).getArgOrDefault(Tokens.ARGS_GREMLIN, "");
- } catch (IllegalArgumentException iae) {
- HttpHandlerUtil.sendError(ctx, BAD_REQUEST, requestMessage.getRequestId(), iae.getMessage(), keepAlive);
- return;
- }
+ final String script = requestMessage.getGremlin().toString();
auditLogger.info("User {} with address {} attempted an unauthorized http request: {}",
user.getName(), address, script);
- final String message = String.format("No authorization for script [%s] - check permissions.", script);
- HttpHandlerUtil.sendError(ctx, UNAUTHORIZED, requestMessage.getRequestId(), message, keepAlive);
+ HttpHandlerUtil.sendError(ctx, UNAUTHORIZED, "Failed to authorize: " + ex.getMessage());
ReferenceCountUtil.release(msg);
} catch (Exception ex) {
final String message = String.format(
"%s is not ready to handle requests - unknown error", authorizer.getClass().getSimpleName());
- HttpHandlerUtil.sendError(ctx, INTERNAL_SERVER_ERROR, requestMessage.getRequestId(), message, keepAlive);
+ HttpHandlerUtil.sendError(ctx, INTERNAL_SERVER_ERROR, message);
ReferenceCountUtil.release(msg);
}
} else {
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpContentCompressionHandler.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpContentCompressionHandler.java
new file mode 100644
index 0000000..6b888af
--- /dev/null
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpContentCompressionHandler.java
@@ -0,0 +1,89 @@
+/*
+ * 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.server.handler;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufUtil;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelOutboundHandlerAdapter;
+import io.netty.channel.ChannelPromise;
+import io.netty.handler.codec.http.HttpContent;
+import io.netty.handler.codec.http.HttpHeaderNames;
+import io.netty.handler.codec.http.HttpResponse;
+import io.netty.handler.codec.http.LastHttpContent;
+import io.netty.util.AttributeKey;
+import io.netty.util.ReferenceCountUtil;
+
+import java.util.Arrays;
+import java.util.zip.Deflater;
+
+/**
+ * Handles compression of content when the response contains the "Content-Encoding" header. Currently supports "deflate".
+ * This class is specifically meant to work with serialized GraphBinary chunks as they need to be deflated per chunk such
+ * that the chunk ends with a compressed Marker.END_OF_STREAM.
+ */
+@ChannelHandler.Sharable
+public class HttpContentCompressionHandler extends ChannelOutboundHandlerAdapter {
+ private static final AttributeKey<Deflater> DEFLATER = AttributeKey.valueOf("deflater");
+ private static final int MIN_BUFFER_SIZE = 16; // Don't want a buffer too small as it could cause lots of resizing.
+
+ @Override
+ public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
+ Object out = msg;
+ int writeIdx = 0;
+ int bytesWritten = 0;
+
+ if (msg instanceof HttpResponse && (((HttpResponse) msg).headers().contains(HttpHeaderNames.CONTENT_ENCODING))) {
+ ctx.attr(DEFLATER).set(new Deflater());
+ }
+
+ if (msg instanceof HttpContent) {
+ final ByteBuf chunk = ((HttpContent) msg).content();
+ final Deflater compressor = ctx.attr(DEFLATER).get();
+ if (null == compressor) {
+ super.write(ctx, msg, promise);
+ return;
+ }
+
+ compressor.setInput(ByteBufUtil.getBytes(chunk)); // need to copy bytes as it may be in a direct buffer.
+ if (msg instanceof LastHttpContent) { compressor.finish(); }
+
+ final int compressedSizeEstimate = chunk.readableBytes() / 8;
+ byte[] outBuf = new byte[Math.max(compressedSizeEstimate, MIN_BUFFER_SIZE)];
+ // Need to SYNC_FLUSH to ensure that each chunk's data is completely compressed.
+ bytesWritten = compressor.deflate(outBuf, writeIdx, outBuf.length, Deflater.SYNC_FLUSH);
+
+ while (bytesWritten == (outBuf.length - writeIdx)) {
+ writeIdx += bytesWritten;
+ outBuf = Arrays.copyOf(outBuf, outBuf.length * 2);
+ bytesWritten = compressor.deflate(outBuf, writeIdx, outBuf.length - writeIdx, Deflater.SYNC_FLUSH);
+ }
+
+ writeIdx += bytesWritten;
+ out = ((HttpContent) msg).replace(Unpooled.wrappedBuffer(outBuf).writerIndex(writeIdx));
+ ReferenceCountUtil.release(msg);
+
+ if (out instanceof LastHttpContent) { ctx.attr(DEFLATER).getAndSet(null).end(); }
+ }
+
+ super.write(ctx, out, promise);
+ }
+}
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpGremlinEndpointHandler.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpGremlinEndpointHandler.java
index 665cf1e..269e436 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpGremlinEndpointHandler.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpGremlinEndpointHandler.java
@@ -18,165 +18,186 @@
*/
package org.apache.tinkerpop.gremlin.server.handler;
+import com.codahale.metrics.Meter;
import com.codahale.metrics.Timer;
import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
+import io.netty.channel.Channel;
import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelInboundHandlerAdapter;
-import io.netty.channel.ChannelPromise;
+import io.netty.channel.SimpleChannelInboundHandler;
import io.netty.handler.codec.TooLongFrameException;
-import io.netty.handler.codec.http.DefaultFullHttpResponse;
-import io.netty.handler.codec.http.FullHttpRequest;
-import io.netty.handler.codec.http.FullHttpResponse;
+import io.netty.handler.codec.http.DefaultHttpContent;
+import io.netty.handler.codec.http.DefaultHttpResponse;
import io.netty.handler.codec.http.HttpHeaderNames;
+import io.netty.handler.codec.http.HttpResponse;
import io.netty.handler.codec.http.HttpResponseStatus;
-import io.netty.handler.codec.http.HttpUtil;
-import io.netty.util.ReferenceCountUtil;
+import org.apache.commons.lang3.exception.ExceptionUtils;
import org.apache.tinkerpop.gremlin.groovy.engine.GremlinExecutor;
-import org.apache.tinkerpop.gremlin.jsr223.GremlinScriptChecker;
-import org.apache.tinkerpop.gremlin.process.remote.traversal.DefaultRemoteTraverser;
+import org.apache.tinkerpop.gremlin.groovy.jsr223.TimedInterruptTimeoutException;
+import org.apache.tinkerpop.gremlin.jsr223.GremlinScriptEngine;
+import org.apache.tinkerpop.gremlin.language.grammar.GremlinParserException;
+import org.apache.tinkerpop.gremlin.process.traversal.Failure;
+import org.apache.tinkerpop.gremlin.process.traversal.Operator;
+import org.apache.tinkerpop.gremlin.process.traversal.Order;
+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.TraversalSource;
-import org.apache.tinkerpop.gremlin.process.traversal.traverser.util.AbstractTraverser;
+import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalInterruptedException;
+import org.apache.tinkerpop.gremlin.server.Context;
import org.apache.tinkerpop.gremlin.server.GraphManager;
import org.apache.tinkerpop.gremlin.server.GremlinServer;
+import org.apache.tinkerpop.gremlin.server.ProcessingException;
import org.apache.tinkerpop.gremlin.server.Settings;
import org.apache.tinkerpop.gremlin.server.auth.AuthenticatedUser;
+import org.apache.tinkerpop.gremlin.server.util.GremlinError;
import org.apache.tinkerpop.gremlin.server.util.MetricManager;
-import org.apache.tinkerpop.gremlin.server.util.TextPlainMessageSerializer;
-import org.apache.tinkerpop.gremlin.structure.Element;
+import org.apache.tinkerpop.gremlin.server.util.TraverserIterator;
+import org.apache.tinkerpop.gremlin.structure.Column;
import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceFactory;
+import org.apache.tinkerpop.gremlin.structure.T;
+import org.apache.tinkerpop.gremlin.structure.util.CloseableIterator;
+import org.apache.tinkerpop.gremlin.structure.util.TemporaryException;
import org.apache.tinkerpop.gremlin.util.ExceptionHelper;
import org.apache.tinkerpop.gremlin.util.MessageSerializer;
import org.apache.tinkerpop.gremlin.util.Tokens;
-import org.apache.tinkerpop.gremlin.util.function.FunctionUtils;
import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.util.ser.MessageTextSerializer;
-import org.apache.tinkerpop.gremlin.util.ser.SerializationException;
+import org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV4;
+import org.codehaus.groovy.control.MultipleCompilationErrorsException;
import org.javatuples.Pair;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.script.Bindings;
+import javax.script.ScriptException;
import javax.script.SimpleBindings;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
+import java.lang.reflect.UndeclaredThrowableException;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Optional;
+import java.util.Set;
import java.util.UUID;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
+import java.util.concurrent.Future;
+import java.util.concurrent.FutureTask;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
import java.util.stream.Stream;
import static com.codahale.metrics.MetricRegistry.name;
-import static io.netty.handler.codec.http.HttpMethod.GET;
-import static io.netty.handler.codec.http.HttpMethod.POST;
-import static io.netty.handler.codec.http.HttpResponseStatus.BAD_REQUEST;
-import static io.netty.handler.codec.http.HttpResponseStatus.CONTINUE;
+import static io.netty.handler.codec.http.HttpHeaderNames.ACCEPT_ENCODING;
+import static io.netty.handler.codec.http.HttpHeaderNames.CONTENT_ENCODING;
+import static io.netty.handler.codec.http.HttpHeaderNames.TRANSFER_ENCODING;
+import static io.netty.handler.codec.http.HttpHeaderValues.CHUNKED;
+import static io.netty.handler.codec.http.HttpHeaderValues.DEFLATE;
import static io.netty.handler.codec.http.HttpResponseStatus.INTERNAL_SERVER_ERROR;
-import static io.netty.handler.codec.http.HttpResponseStatus.METHOD_NOT_ALLOWED;
-import static io.netty.handler.codec.http.HttpResponseStatus.NOT_FOUND;
import static io.netty.handler.codec.http.HttpResponseStatus.OK;
import static io.netty.handler.codec.http.HttpVersion.HTTP_1_1;
+import static org.apache.tinkerpop.gremlin.server.handler.HttpGremlinEndpointHandler.RequestState.FINISHED;
+import static org.apache.tinkerpop.gremlin.server.handler.HttpGremlinEndpointHandler.RequestState.FINISHING;
+import static org.apache.tinkerpop.gremlin.server.handler.HttpGremlinEndpointHandler.RequestState.NOT_STARTED;
+import static org.apache.tinkerpop.gremlin.server.handler.HttpGremlinEndpointHandler.RequestState.STREAMING;
+import static org.apache.tinkerpop.gremlin.server.handler.HttpHandlerUtil.sendTrailingHeaders;
+import static org.apache.tinkerpop.gremlin.server.handler.HttpHandlerUtil.writeError;
/**
- * Handler that processes HTTP requests to the HTTP Gremlin endpoint.
+ * Handler that processes RequestMessage. This handler will attempt to execute the query and stream the results back
+ * in HTTP chunks to the client.
*
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
@ChannelHandler.Sharable
-public class HttpGremlinEndpointHandler extends ChannelInboundHandlerAdapter {
+public class HttpGremlinEndpointHandler extends SimpleChannelInboundHandler<RequestMessage> {
private static final Logger logger = LoggerFactory.getLogger(HttpGremlinEndpointHandler.class);
private static final Logger auditLogger = LoggerFactory.getLogger(GremlinServer.AUDIT_LOGGER_NAME);
private static final Timer evalOpTimer = MetricManager.INSTANCE.getTimer(name(GremlinServer.class, "op", "eval"));
/**
- * Serializers for the response.
+ * Length of time to pause writes in milliseconds when the high watermark is exceeded.
*/
- private final Map<String, MessageSerializer<?>> serializers;
+ public static final long WRITE_PAUSE_TIME_MS = 10;
/**
- * Serializer for {@code text/plain} which is a serializer exclusive to HTTP.
+ * Tracks the rate of pause to writes when the high watermark is exceeded.
*/
- private static final TextPlainMessageSerializer textPlainSerializer = new TextPlainMessageSerializer();
+ public static final Meter writePausesMeter = MetricManager.INSTANCE.getMeter(name(GremlinServer.class, "channels", "write-pauses"));
+
+ protected static final Set<String> INVALID_BINDINGS_KEYS = new HashSet<>();
+
+ static {
+ INVALID_BINDINGS_KEYS.addAll(Arrays.asList(
+ T.id.name(), T.key.name(),
+ T.label.name(), T.value.name(),
+ T.id.getAccessor(), T.key.getAccessor(),
+ T.label.getAccessor(), T.value.getAccessor(),
+ T.id.getAccessor().toUpperCase(), T.key.getAccessor().toUpperCase(),
+ T.label.getAccessor().toUpperCase(), T.value.getAccessor().toUpperCase()));
+
+ for (Column enumItem : Column.values()) {
+ INVALID_BINDINGS_KEYS.add(enumItem.name());
+ }
+
+ for (Order enumItem : Order.values()) {
+ INVALID_BINDINGS_KEYS.add(enumItem.name());
+ }
+
+ for (Operator enumItem : Operator.values()) {
+ INVALID_BINDINGS_KEYS.add(enumItem.name());
+ }
+
+ for (Scope enumItem : Scope.values()) {
+ INVALID_BINDINGS_KEYS.add(enumItem.name());
+ }
+
+ for (Pop enumItem : Pop.values()) {
+ INVALID_BINDINGS_KEYS.add(enumItem.name());
+ }
+ }
private final GremlinExecutor gremlinExecutor;
private final GraphManager graphManager;
private final Settings settings;
- private static final Pattern pattern = Pattern.compile("(.*);q=(.*)");
-
- public HttpGremlinEndpointHandler(final Map<String, MessageSerializer<?>> serializers,
- final GremlinExecutor gremlinExecutor,
+ public HttpGremlinEndpointHandler(final GremlinExecutor gremlinExecutor,
final GraphManager graphManager,
final Settings settings) {
- this.serializers = serializers;
this.gremlinExecutor = gremlinExecutor;
this.graphManager = graphManager;
this.settings = settings;
}
@Override
- public void channelRead(final ChannelHandlerContext ctx, final Object msg) {
- if (msg instanceof FullHttpRequest) {
- final FullHttpRequest req = (FullHttpRequest) msg;
- final boolean keepAlive = HttpUtil.isKeepAlive(req);
+ public void channelRead0(final ChannelHandlerContext ctx, final RequestMessage requestMessage) {
+ ctx.channel().attr(StateKey.HTTP_RESPONSE_SENT).set(false);
+ final Pair<String, MessageSerializer<?>> serializer = ctx.channel().attr(StateKey.SERIALIZER).get();
- if ("/favicon.ico".equals(req.uri())) {
- HttpHandlerUtil.sendError(ctx, NOT_FOUND, "Gremlin Server doesn't have a favicon.ico", keepAlive);
- ReferenceCountUtil.release(msg);
- return;
- }
+ final Context requestCtx = new Context(requestMessage, ctx, settings, graphManager, gremlinExecutor,
+ gremlinExecutor.getScheduledExecutorService(), NOT_STARTED);
- if (HttpUtil.is100ContinueExpected(req)) {
- ctx.write(new DefaultFullHttpResponse(HTTP_1_1, CONTINUE));
- }
+ final Timer.Context timerContext = evalOpTimer.time();
+ // timeout override - handle both deprecated and newly named configuration. earlier logic should prevent
+ // both configurations from being submitted at the same time
+ final Long timeoutMs = requestMessage.getField(Tokens.TIMEOUT_MS);
+ final long seto = (null != timeoutMs) ? timeoutMs : requestCtx.getSettings().getEvaluationTimeout();
- if (req.method() != GET && req.method() != POST) {
- HttpHandlerUtil.sendError(ctx, METHOD_NOT_ALLOWED, METHOD_NOT_ALLOWED.toString(), keepAlive);
- ReferenceCountUtil.release(msg);
- return;
- }
-
- final RequestMessage requestMessage;
- try {
- requestMessage = HttpHandlerUtil.getRequestMessageFromHttpRequest(req, serializers);
- } catch (IllegalArgumentException|SerializationException ex) {
- HttpHandlerUtil.sendError(ctx, BAD_REQUEST, ex.getMessage(), keepAlive);
- ReferenceCountUtil.release(msg);
- return;
- }
-
- final UUID requestId = requestMessage.getRequestId();
- final String acceptMime = Optional.ofNullable(req.headers().get(HttpHeaderNames.ACCEPT)).orElse("application/json");
- final Pair<String, MessageTextSerializer<?>> serializer = chooseSerializer(acceptMime);
- if (null == serializer) {
- HttpHandlerUtil.sendError(ctx, BAD_REQUEST, requestId, String.format("no serializer for requested Accept header: %s", acceptMime),
- keepAlive);
- ReferenceCountUtil.release(msg);
- return;
- }
-
- final String origin = req.headers().get(HttpHeaderNames.ORIGIN);
-
- // not using the req anywhere below here - assume it is safe to release at this point.
- ReferenceCountUtil.release(msg);
+ final FutureTask<Void> evalFuture = new FutureTask<>(() -> {
+ requestCtx.setStartedResponse();
try {
logger.debug("Processing request containing script [{}] and bindings of [{}] on {}",
- requestMessage.getArgOrDefault(Tokens.ARGS_GREMLIN, ""),
- requestMessage.getArgOrDefault(Tokens.ARGS_BINDINGS, Collections.emptyMap()),
+ requestMessage.getFieldOrDefault(Tokens.ARGS_GREMLIN, ""),
+ requestMessage.getFieldOrDefault(Tokens.ARGS_BINDINGS, Collections.emptyMap()),
Thread.currentThread().getName());
if (settings.enableAuditLog) {
AuthenticatedUser user = ctx.channel().attr(StateKey.AUTHENTICATED_USER).get();
@@ -186,138 +207,159 @@
String address = ctx.channel().remoteAddress().toString();
if (address.startsWith("/") && address.length() > 1) address = address.substring(1);
auditLogger.info("User {} with address {} requested: {}", user.getName(), address,
- requestMessage.getArgOrDefault(Tokens.ARGS_GREMLIN, ""));
- }
- final ChannelPromise promise = ctx.channel().newPromise();
- final AtomicReference<Object> resultHolder = new AtomicReference<>();
- promise.addListener(future -> {
- // if failed then the error was already written back to the client as part of the eval future
- // processing of the exception
- if (future.isSuccess()) {
- logger.debug("Preparing HTTP response for request with script [{}] and bindings of [{}] with result of [{}] on [{}]",
- requestMessage.getArgOrDefault(Tokens.ARGS_GREMLIN, ""),
- requestMessage.getArgOrDefault(Tokens.ARGS_BINDINGS, Collections.emptyMap()),
- resultHolder.get(), Thread.currentThread().getName());
- final FullHttpResponse response = new DefaultFullHttpResponse(HTTP_1_1, OK, (ByteBuf) resultHolder.get());
- response.headers().set(HttpHeaderNames.CONTENT_TYPE, serializer.getValue0());
-
- // handle cors business
- if (origin != null) response.headers().set(HttpHeaderNames.ACCESS_CONTROL_ALLOW_ORIGIN, origin);
-
- HttpHandlerUtil.sendAndCleanupConnection(ctx, keepAlive, response);
- }
- });
-
- final Timer.Context timerContext = evalOpTimer.time();
-
- final Bindings bindings;
- try {
- bindings = createBindings(requestMessage.getArgOrDefault(Tokens.ARGS_BINDINGS, Collections.emptyMap()),
- requestMessage.getArgOrDefault(Tokens.ARGS_ALIASES, Collections.emptyMap()));
- } catch (IllegalStateException iae) {
- HttpHandlerUtil.sendError(ctx, BAD_REQUEST, requestId, iae.getMessage(), keepAlive);
- ReferenceCountUtil.release(msg);
- return;
+ requestMessage.getGremlin());
}
- // provide a transform function to serialize to message - this will force serialization to occur
- // in the same thread as the eval. after the CompletableFuture is returned from the eval the result
- // is ready to be written as a ByteBuf directly to the response. nothing should be blocking here.
- final CompletableFuture<Object> evalFuture = gremlinExecutor.eval(
- requestMessage.getArg(Tokens.ARGS_GREMLIN), requestMessage.getArg(Tokens.ARGS_LANGUAGE), bindings,
- requestMessage.getArgOrDefault(Tokens.ARGS_EVAL_TIMEOUT, null),
- FunctionUtils.wrapFunction(o -> {
- // stopping the timer here is roughly equivalent to where the timer would have been stopped for
- // this metric in other contexts. we just want to measure eval time not serialization time.
- timerContext.stop();
-
- logger.debug("Transforming result of request with script [{}] and bindings of [{}] with result of [{}] on [{}]",
- requestMessage.getArg(Tokens.ARGS_GREMLIN),
- requestMessage.getArg(Tokens.ARGS_BINDINGS), o, Thread.currentThread().getName());
-
- final Optional<String> mp = requestMessage.getArg(Tokens.ARGS_GREMLIN) instanceof String
- ? GremlinScriptChecker.parse(requestMessage.getArg(Tokens.ARGS_GREMLIN)).getMaterializeProperties()
- : Optional.empty();
-
- // need to replicate what TraversalOpProcessor does with the bytecode op. it converts
- // results to Traverser so that GLVs can handle the results. don't quite get the same
- // benefit here because the bulk has to be 1 since we've already resolved the result,
- // but at least http is compatible
- final List<Object> results = requestMessage.getOp().equals(Tokens.OPS_BYTECODE) ?
- (List<Object>) IteratorUtils.asList(o).stream().map(r -> new DefaultRemoteTraverser<Object>(r, 1)).collect(Collectors.toList()) :
- IteratorUtils.asList(o);
-
- if (mp.isPresent() && mp.get().equals(Tokens.MATERIALIZE_PROPERTIES_TOKENS)) {
- final Object firstElement = results.get(0);
-
- if (firstElement instanceof Element) {
- for (int i = 0; i < results.size(); i++)
- results.set(i, ReferenceFactory.detach((Element) results.get(i)));
- } else if (firstElement instanceof AbstractTraverser) {
- for (final Object item : results)
- ((AbstractTraverser) item).detach();
- }
- }
-
- final ResponseMessage responseMessage = ResponseMessage.build(requestId)
- .code(ResponseStatusCode.SUCCESS)
- .result(results).create();
-
- // http server is sessionless and must handle commit on transactions. the commit occurs
- // before serialization to be consistent with how things work for websocket based
- // communication. this means that failed serialization does not mean that you won't get
- // a commit to the database
- attemptCommit(requestMessage.getArg(Tokens.ARGS_ALIASES), graphManager, settings.strictTransactionManagement);
-
- try {
- return Unpooled.wrappedBuffer(serializer.getValue1().serializeResponseAsBinary(responseMessage, ctx.alloc()));
- } catch (Exception ex) {
- logger.warn(String.format("Error during serialization for %s", responseMessage), ex);
-
- // creating a new SerializationException will clear the cause which will allow the
- // future to report a better error message. if the cause is present, then
- // GremlinExecutor will prefer the cause and we'll get a low level Jackson sort of
- // error in the response.
- if (ex instanceof SerializationException) {
- throw new SerializationException(String.format(
- "Could not serialize the result with %s - %s",
- serializer.getValue0(),
- ex.getMessage()));
- }
-
- throw ex;
- }
- }));
-
- evalFuture.exceptionally(t -> {
- if (t.getMessage() != null)
- HttpHandlerUtil.sendError(ctx, INTERNAL_SERVER_ERROR, requestId, t.getMessage(), Optional.of(t), keepAlive);
- else
- HttpHandlerUtil.sendError(ctx, INTERNAL_SERVER_ERROR, requestId, String.format("Error encountered evaluating script: %s",
- requestMessage.getArg(Tokens.ARGS_GREMLIN))
- , Optional.of(t), keepAlive);
- promise.setFailure(t);
- return null;
- });
-
- evalFuture.thenAcceptAsync(r -> {
- // now that the eval/serialization is done in the same thread - complete the promise so we can
- // write back the HTTP response on the same thread as the original request
- resultHolder.set(r);
- promise.setSuccess();
- }, gremlinExecutor.getExecutorService());
- } catch (Exception ex) {
- // send the error response here and don't rely on exception caught because it might not have the
- // context on whether to close the connection or not, based on keepalive.
- final Throwable t = ExceptionHelper.getRootCause(ex);
- if (t instanceof TooLongFrameException) {
- HttpHandlerUtil.sendError(ctx, HttpResponseStatus.REQUEST_ENTITY_TOO_LARGE, requestId, t.getMessage() + " - increase the maxContentLength", keepAlive);
- } else if (t != null){
- HttpHandlerUtil.sendError(ctx, INTERNAL_SERVER_ERROR, requestId, t.getMessage(), keepAlive);
- } else {
- HttpHandlerUtil.sendError(ctx, INTERNAL_SERVER_ERROR, requestId, ex.getMessage(), keepAlive);
+ // Send back the 200 OK response header here since the response is always chunk transfer encoded. Any
+ // failures that follow this will show up in the response body instead.
+ final HttpResponse responseHeader = new DefaultHttpResponse(HTTP_1_1, OK);
+ if (acceptsDeflateEncoding(ctx.attr(StateKey.REQUEST_HEADERS).get().getAll(ACCEPT_ENCODING))) {
+ responseHeader.headers().add(CONTENT_ENCODING, DEFLATE);
}
+ responseHeader.headers().set(TRANSFER_ENCODING, CHUNKED);
+ responseHeader.headers().set(HttpHeaderNames.CONTENT_TYPE, serializer.getValue0());
+ ctx.writeAndFlush(responseHeader);
+ ctx.channel().attr(StateKey.HTTP_RESPONSE_SENT).set(true);
+
+ iterateScriptEvalResult(requestCtx, serializer.getValue1(), requestMessage);
+ } catch (Throwable t) {
+ writeError(requestCtx, formErrorResponseMessage(t, requestMessage), serializer.getValue1());
+ } finally {
+ timerContext.stop();
+
+ // There is a race condition that this query may have finished before the timeoutFuture was created,
+ // though this is very unlikely. This is handled in the settor, if this has already been grabbed.
+ // If we passed this point and the setter hasn't been called, it will cancel the timeoutFuture inside
+ // the setter to compensate.
+ final ScheduledFuture<?> timeoutFuture = requestCtx.getTimeoutExecutor();
+ if (null != timeoutFuture)
+ timeoutFuture.cancel(true);
}
+
+ return null;
+ });
+
+ try {
+ final Future<?> executionFuture = requestCtx.getGremlinExecutor().getExecutorService().submit(evalFuture);
+ if (seto > 0) {
+ // Schedule a timeout in the thread pool for future execution
+ requestCtx.setTimeoutExecutor(requestCtx.getScheduledExecutorService().schedule(() -> {
+ executionFuture.cancel(true);
+ if (!requestCtx.getStartedResponse()) {
+ writeError(requestCtx, GremlinError.timeout(requestMessage), serializer.getValue1());
+ }
+ }, seto, TimeUnit.MILLISECONDS));
+ }
+ } catch (RejectedExecutionException ree) {
+ writeError(requestCtx, GremlinError.rateLimiting(), serializer.getValue1());
+ }
+ }
+
+ private GremlinError formErrorResponseMessage(Throwable t, RequestMessage requestMessage) {
+ if (t instanceof UndeclaredThrowableException) t = t.getCause();
+
+ // if any exception in the chain is TemporaryException or Failure then we should respond with the
+ // right error code so that the client knows to retry
+ final Optional<Throwable> possibleSpecialException = determineIfSpecialException(t);
+ if (possibleSpecialException.isPresent()) {
+ final Throwable special = possibleSpecialException.get();
+ if (special instanceof TemporaryException) {
+ return GremlinError.temporary(special);
+ }
+ if (special instanceof Failure) {
+ return GremlinError.failStep((Failure) special);
+ }
+ return GremlinError.general(special);
+ }
+ if (t instanceof ProcessingException) {
+ return ((ProcessingException) t).getError();
+ }
+ t = ExceptionHelper.getRootCause(t);
+
+ if (t instanceof TooLongFrameException) {
+ return GremlinError.longFrame(t);
+ }
+ if (t instanceof InterruptedException || t instanceof TraversalInterruptedException) {
+ return GremlinError.timeout(requestMessage);
+ }
+ if (t instanceof TimedInterruptTimeoutException) {
+ // occurs when the TimedInterruptCustomizerProvider is in play
+ logger.warn(String.format("A timeout occurred within the script during evaluation of [%s] - consider increasing the limit given to TimedInterruptCustomizerProvider", requestMessage));
+ return GremlinError.timedInterruptTimeout();
+ }
+ if (t instanceof TimeoutException) {
+ logger.warn(String.format("Script evaluation exceeded the configured threshold for request [%s]", requestMessage));
+ return GremlinError.timeout(requestMessage);
+ }
+ if (t instanceof MultipleCompilationErrorsException && t.getMessage().contains("Method too large") &&
+ ((MultipleCompilationErrorsException) t).getErrorCollector().getErrorCount() == 1) {
+ final GremlinError error = GremlinError.longRequest(requestMessage);
+ logger.warn(error.getMessage());
+ return error;
+ }
+ if (t instanceof GremlinParserException) {
+ return GremlinError.parsing((GremlinParserException) t);
+ }
+
+ logger.warn(String.format("Exception processing request [%s].", requestMessage));
+ return GremlinError.general(t);
+ }
+
+ private void iterateScriptEvalResult(final Context context, MessageSerializer<?> serializer, final RequestMessage message)
+ throws ProcessingException, InterruptedException, ScriptException {
+ if (message.optionalField(Tokens.ARGS_BINDINGS).isPresent()) {
+ final Map bindings = (Map) message.getFields().get(Tokens.ARGS_BINDINGS);
+ if (IteratorUtils.anyMatch(bindings.keySet().iterator(), k -> null == k || !(k instanceof String))) {
+ throw new ProcessingException(GremlinError.binding());
+ }
+
+ final Set<String> badBindings = IteratorUtils.set(IteratorUtils.<String>filter(bindings.keySet().iterator(), INVALID_BINDINGS_KEYS::contains));
+ if (!badBindings.isEmpty()) {
+ throw new ProcessingException(GremlinError.binding(badBindings));
+ }
+
+ // ignore control bindings that get passed in with the "#jsr223" prefix - those aren't used in compilation
+ if (IteratorUtils.count(IteratorUtils.filter(bindings.keySet().iterator(), k -> !k.toString().startsWith("#jsr223"))) > settings.maxParameters) {
+ throw new ProcessingException(GremlinError.binding(bindings.size(), settings.maxParameters));
+ }
+ }
+
+ final Map<String, Object> args = message.getFields();
+ final String language = args.containsKey(Tokens.ARGS_LANGUAGE) ? (String) args.get(Tokens.ARGS_LANGUAGE) : "gremlin-lang";
+ final GremlinScriptEngine scriptEngine = gremlinExecutor.getScriptEngineManager().getEngineByName(language);
+
+ final Bindings mergedBindings = mergeBindingsFromRequest(context, new SimpleBindings(graphManager.getAsBindings()));
+ final Object result = scriptEngine.eval(message.getGremlin(), mergedBindings);
+
+ final String bulkingSetting = context.getChannelHandlerContext().channel().attr(StateKey.REQUEST_HEADERS).get().get(Tokens.BULK_RESULTS);
+ // bulking only applies if it's gremlin-lang, and per request token setting takes precedence over header setting.
+ // The serializer check is temporarily needed because GraphSON hasn't been removed yet and doesn't support bulking.
+ final boolean bulking = language.equals("gremlin-lang") && serializer instanceof GraphBinaryMessageSerializerV4 ?
+ (args.containsKey(Tokens.BULK_RESULTS) ?
+ Objects.equals(args.get(Tokens.BULK_RESULTS), "true") :
+ Objects.equals(bulkingSetting, "true")) :
+ false;
+
+ Iterator itty = null;
+ try {
+ if (bulking) {
+ // optimization for driver requests
+ ((Traversal.Admin<?, ?>) result).applyStrategies();
+ itty = new TraverserIterator((Traversal.Admin<?, ?>) result);
+ handleIterator(context, itty, serializer, true);
+ } else {
+ itty = IteratorUtils.asIterator(result);
+ handleIterator(context, itty, serializer, false);
+ }
+ } catch (Exception ex) {
+ // TINKERPOP-3144 ensure Traversals are closed when exception thrown.
+ if (itty instanceof TraverserIterator) {
+ CloseableIterator.closeIterator(((TraverserIterator) itty).getTraversal());
+ } else if (itty != null) {
+ CloseableIterator.closeIterator(itty);
+ }
+
+ throw ex;
}
}
@@ -326,71 +368,272 @@
logger.error("Error processing HTTP Request", cause);
if (ctx.channel().isActive()) {
- HttpHandlerUtil.sendError(ctx, INTERNAL_SERVER_ERROR, cause.getMessage(), false);
+ HttpHandlerUtil.sendError(ctx, INTERNAL_SERVER_ERROR, cause.getMessage());
}
}
- private Bindings createBindings(final Map<String, Object> bindingMap, final Map<String, String> rebindingMap) {
- final Bindings bindings = new SimpleBindings();
+ private Bindings mergeBindingsFromRequest(final Context ctx, final Bindings bindings) throws ProcessingException {
+ // alias any global bindings to a different variable.
+ final RequestMessage msg = ctx.getRequestMessage();
- // rebind any global bindings to a different variable.
- if (!rebindingMap.isEmpty()) {
- for (Map.Entry<String, String> kv : rebindingMap.entrySet()) {
- boolean found = false;
- final Graph g = this.graphManager.getGraph(kv.getValue());
- if (null != g) {
- bindings.put(kv.getKey(), g);
+ // add any bindings to override any other supplied
+ Optional.ofNullable((Map<String, Object>) msg.getFields().get(Tokens.ARGS_BINDINGS)).ifPresent(bindings::putAll);
+
+ if (msg.getFields().containsKey(Tokens.ARGS_G)) {
+ final String aliased = msg.getField(Tokens.ARGS_G);
+ boolean found = false;
+
+ // first check if the alias refers to a Graph instance
+ final Graph graph = ctx.getGraphManager().getGraph(aliased);
+ if (null != graph) {
+ bindings.put(Tokens.ARGS_G, graph);
+ found = true;
+ }
+
+ // if the alias wasn't found as a Graph then perhaps it is a TraversalSource - it needs to be
+ // something
+ if (!found) {
+ final TraversalSource ts = ctx.getGraphManager().getTraversalSource(aliased);
+ if (null != ts) {
+ bindings.put(Tokens.ARGS_G, ts);
found = true;
}
+ }
- if (!found) {
- final TraversalSource ts = this.graphManager.getTraversalSource(kv.getValue());
- if (null != ts) {
- bindings.put(kv.getKey(), ts);
- found = true;
- }
- }
-
- if (!found) {
- final String error = String.format("Could not rebind [%s] to [%s] as [%s] not in the Graph or TraversalSource global bindings",
- kv.getKey(), kv.getValue(), kv.getValue());
- throw new IllegalStateException(error);
- }
+ // this validation is important to calls to GraphManager.commit() and rollback() as they both
+ // expect that the aliases supplied are valid
+ if (!found) {
+ throw new ProcessingException(GremlinError.binding(aliased));
}
}
- bindings.putAll(bindingMap);
-
return bindings;
}
- private Pair<String, MessageTextSerializer<?>> chooseSerializer(final String mimeType) {
- final List<Pair<String, Double>> ordered = Stream.of(mimeType.split(",")).map(mediaType -> {
- // parse out each mediaType with its params - keeping it simple and just looking for "quality". if
- // that value isn't there, default it to 1.0. not really validating here so users better get their
- // accept headers straight
- final Matcher matcher = pattern.matcher(mediaType);
- return (matcher.matches()) ? Pair.with(matcher.group(1), Double.parseDouble(matcher.group(2))) : Pair.with(mediaType, 1.0);
- }).sorted((o1, o2) -> o2.getValue0().compareTo(o1.getValue0())).collect(Collectors.toList());
+ private void handleIterator(final Context context, final Iterator itty, final MessageSerializer<?> serializer, final boolean bulking) throws InterruptedException {
+ final ChannelHandlerContext nettyContext = context.getChannelHandlerContext();
+ final RequestMessage msg = context.getRequestMessage();
+ final Settings settings = context.getSettings();
- for (Pair<String, Double> p : ordered) {
- // this isn't perfect as it doesn't really account for wildcards. that level of complexity doesn't seem
- // super useful for gremlin server really.
- final String accept = p.getValue0().equals("*/*") ? "application/json" : p.getValue0();
- if (serializers.containsKey(accept))
- return Pair.with(accept, (MessageTextSerializer<?>) serializers.get(accept));
- else if (accept.equals("text/plain")) {
- return Pair.with(accept, textPlainSerializer);
+ // used to limit warnings for when netty fills the buffer and hits the high watermark - prevents
+ // over-logging of the same message.
+ long lastWarningTime = 0;
+ int warnCounter = 0;
+
+ // we have an empty iterator - happens on stuff like: g.V().iterate()
+ if (!itty.hasNext()) {
+ ByteBuf chunk = null;
+ try {
+ chunk = makeChunk(context, serializer, new ArrayList<>(), false, bulking);
+ nettyContext.writeAndFlush(new DefaultHttpContent(chunk));
+ } catch (Exception ex) {
+ // Bytebuf is a countable release - if it does not get written downstream
+ // it needs to be released here
+ if (chunk != null) chunk.release();
+ }
+ sendTrailingHeaders(nettyContext, HttpResponseStatus.OK, "");
+ return;
+ }
+
+ // the batch size can be overridden by the request
+ final int resultIterationBatchSize = (Integer) msg.optionalField(Tokens.ARGS_BATCH_SIZE)
+ .orElse(settings.resultIterationBatchSize);
+ List<Object> aggregate = new ArrayList<>(resultIterationBatchSize);
+
+ // use an external control to manage the loop as opposed to just checking hasNext() in the while. this
+ // prevent situations where auto transactions create a new transaction after calls to commit() withing
+ // the loop on calls to hasNext().
+ boolean hasMore = itty.hasNext();
+
+ while (hasMore) {
+ if (Thread.interrupted()) throw new InterruptedException();
+
+ // have to check the aggregate size because it is possible that the channel is not writeable (below)
+ // so iterating next() if the message is not written and flushed would bump the aggregate size beyond
+ // the expected resultIterationBatchSize. Total serialization time for the response remains in
+ // effect so if the client is "slow" it may simply timeout.
+ //
+ // there is a need to check hasNext() on the iterator because if the channel is not writeable the
+ // previous pass through the while loop will have next()'d the iterator and if it is "done" then a
+ // NoSuchElementException will raise its head. also need a check to ensure that this iteration doesn't
+ // require a forced flush which can be forced by sub-classes.
+ //
+ // this could be placed inside the isWriteable() portion of the if-then below but it seems better to
+ // allow iteration to continue into a batch if that is possible rather than just doing nothing at all
+ // while waiting for the client to catch up
+ if (aggregate.size() < resultIterationBatchSize && itty.hasNext()) {
+ if (bulking) {
+ Traverser traverser = (Traverser) itty.next();
+ aggregate.add(traverser.get());
+ aggregate.add(traverser.bulk());
+ } else {
+ aggregate.add(itty.next());
+ }
+ }
+
+ // Don't keep executor busy if client has already given up; there is no way to catch up if the channel is
+ // not active, and hence we should break the loop.
+ if (!nettyContext.channel().isActive()) {
+ break;
+ }
+
+ // send back a page of results if batch size is met or if it's the end of the results being iterated.
+ // also check writeability of the channel to prevent OOME for slow clients.
+ //
+ // clients might decide to close the Netty channel to the server with a CloseWebsocketFrame after errors
+ // like CorruptedFrameException. On the server, although the channel gets closed, there might be some
+ // executor threads waiting for watermark to clear which will not clear in these cases since client has
+ // already given up on these requests. This leads to these executors waiting for the client to consume
+ // results till the timeout. checking for isActive() should help prevent that.
+ if (nettyContext.channel().isActive() && nettyContext.channel().isWritable()) {
+ if (aggregate.size() == resultIterationBatchSize || !itty.hasNext()) {
+ ByteBuf chunk = null;
+ try {
+ chunk = makeChunk(context, serializer, aggregate, itty.hasNext(), bulking);
+ } catch (Exception ex) {
+ // Bytebuf is a countable release - if it does not get written downstream
+ // it needs to be released here
+ if (chunk != null) chunk.release();
+
+ // exception is handled in makeFrame() - serialization error gets written back to driver
+ // at that point
+ break;
+ }
+
+ // track whether there is anything left in the iterator because it needs to be accessed after
+ // the transaction could be closed - in that case a call to hasNext() could open a new transaction
+ // unintentionally
+ hasMore = itty.hasNext();
+
+ try {
+ // only need to reset the aggregation list if there's more stuff to write
+ if (hasMore) {
+ aggregate = new ArrayList<>(resultIterationBatchSize);
+ }
+ } catch (Exception ex) {
+ // Bytebuf is a countable release - if it does not get written downstream
+ // it needs to be released here
+ if (chunk != null) chunk.release();
+ throw ex;
+ }
+
+ nettyContext.writeAndFlush(new DefaultHttpContent(chunk));
+
+ if (!hasMore) {
+ sendTrailingHeaders(nettyContext, HttpResponseStatus.OK, "");
+ }
+ }
+ } else {
+ final long currentTime = System.currentTimeMillis();
+
+ // exponential delay between warnings. don't keep triggering this warning over and over again for the
+ // same request. totalPendingWriteBytes is volatile so it is possible that by the time this warning
+ // hits the log the low watermark may have been hit
+ long interval = (long) Math.pow(2, warnCounter) * 1000;
+ if (currentTime - lastWarningTime >= interval) {
+ final Channel ch = context.getChannelHandlerContext().channel();
+ logger.warn("Warning {}: Outbound buffer size={}, pausing response writing as writeBufferHighWaterMark exceeded on request {} for channel {} - writing will continue once client has caught up",
+ warnCounter,
+ ch.unsafe().outboundBuffer().totalPendingWriteBytes(),
+ ch.attr(StateKey.REQUEST_ID),
+ ch.id());
+
+ lastWarningTime = currentTime;
+ warnCounter++;
+ }
+
+ // since the client is lagging we can hold here for a period of time for the client to catch up.
+ // this isn't blocking the IO thread - just a worker.
+ TimeUnit.MILLISECONDS.sleep(WRITE_PAUSE_TIME_MS);
+ writePausesMeter.mark();
+ }
+ }
+ }
+
+ /**
+ * Check if any exception in the chain is {@link TemporaryException} or {@link Failure} then respond with the
+ * right error code so that the client knows to retry.
+ */
+ private Optional<Throwable> determineIfSpecialException(final Throwable ex) {
+ return Stream.of(ExceptionUtils.getThrowables(ex)).
+ filter(i -> i instanceof TemporaryException || i instanceof Failure).findFirst();
+ }
+
+ private boolean acceptsDeflateEncoding(List<String> encodings) {
+ for (String encoding : encodings) {
+ if (encoding.contains(DEFLATE.toString())) {
+ return true;
}
}
- return null;
+ return false;
}
- private static void attemptCommit(final Map<String, String> aliases, final GraphManager graphManager, final boolean strict) {
- if (strict)
- graphManager.commit(new HashSet<>(aliases.values()));
- else
- graphManager.commitAll();
+ private static ByteBuf makeChunk(final Context ctx, final MessageSerializer<?> serializer,
+ final List<Object> aggregate, final boolean hasMore,
+ final boolean bulking) throws Exception {
+ try {
+ final ChannelHandlerContext nettyContext = ctx.getChannelHandlerContext();
+
+ ctx.handleDetachment(aggregate);
+
+ if (!hasMore && ctx.getRequestState() == STREAMING) {
+ ctx.setRequestState(FINISHING);
+ }
+
+ ResponseMessage responseMessage = null;
+
+ // for this state no need to build full ResponseMessage
+ if (ctx.getRequestState() != STREAMING) {
+ final ResponseMessage.Builder builder = ResponseMessage.build().result(aggregate);
+
+ // need to put status in last message
+ if (ctx.getRequestState() == FINISHING) {
+ builder.code(HttpResponseStatus.OK);
+ }
+
+ builder.bulked(bulking);
+
+ responseMessage = builder.create();
+ }
+
+ switch (ctx.getRequestState()) {
+ case NOT_STARTED:
+ if (hasMore) {
+ ctx.setRequestState(STREAMING);
+ return serializer.writeHeader(responseMessage, nettyContext.alloc());
+ }
+ ctx.setRequestState(FINISHED);
+
+ return serializer.serializeResponseAsBinary(ResponseMessage.build()
+ .result(aggregate)
+ .bulked(bulking)
+ .code(HttpResponseStatus.OK)
+ .create(), nettyContext.alloc());
+
+ case STREAMING:
+ return serializer.writeChunk(aggregate, nettyContext.alloc());
+ case FINISHING:
+ ctx.setRequestState(FINISHED);
+ return serializer.writeFooter(responseMessage, nettyContext.alloc());
+ }
+
+ return serializer.serializeResponseAsBinary(responseMessage, nettyContext.alloc());
+
+ } catch (Exception ex) {
+ final UUID requestId = ctx.getChannelHandlerContext().attr(StateKey.REQUEST_ID).get();
+ logger.warn("The result [{}] in the request {} could not be serialized and returned.", aggregate, requestId, ex);
+ writeError(ctx, GremlinError.serialization(ex), serializer);
+ throw ex;
+ }
+ }
+
+ public enum RequestState {
+ NOT_STARTED,
+ STREAMING,
+ // last portion of data
+ FINISHING,
+ FINISHED,
+ ERROR
}
}
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpHandlerUtil.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpHandlerUtil.java
index 91b5a12..a7360d6 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpHandlerUtil.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpHandlerUtil.java
@@ -21,47 +21,34 @@
import com.codahale.metrics.Meter;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
-import io.netty.channel.ChannelFuture;
-import io.netty.channel.ChannelFutureListener;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.http.DefaultFullHttpResponse;
-import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.DefaultHttpContent;
+import io.netty.handler.codec.http.DefaultHttpResponse;
+import io.netty.handler.codec.http.DefaultLastHttpContent;
import io.netty.handler.codec.http.FullHttpResponse;
import io.netty.handler.codec.http.HttpHeaderNames;
+import io.netty.handler.codec.http.HttpResponse;
import io.netty.handler.codec.http.HttpResponseStatus;
import io.netty.handler.codec.http.HttpUtil;
-import io.netty.handler.codec.http.QueryStringDecoder;
import io.netty.util.CharsetUtil;
-import org.apache.commons.lang3.exception.ExceptionUtils;
-import org.apache.tinkerpop.gremlin.util.MessageSerializer;
-import org.apache.tinkerpop.gremlin.util.Tokens;
-import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.server.Context;
import org.apache.tinkerpop.gremlin.server.GremlinServer;
-import org.apache.tinkerpop.gremlin.server.op.standard.StandardOpProcessor;
+import org.apache.tinkerpop.gremlin.server.util.GremlinError;
import org.apache.tinkerpop.gremlin.server.util.MetricManager;
+import org.apache.tinkerpop.gremlin.util.MessageSerializer;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.util.ser.SerTokens;
import org.apache.tinkerpop.gremlin.util.ser.SerializationException;
-import org.apache.tinkerpop.shaded.jackson.databind.JsonNode;
import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
-import org.apache.tinkerpop.shaded.jackson.databind.node.ArrayNode;
import org.apache.tinkerpop.shaded.jackson.databind.node.ObjectNode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.UUID;
-
import static com.codahale.metrics.MetricRegistry.name;
import static io.netty.handler.codec.http.HttpHeaderNames.CONTENT_TYPE;
-import static io.netty.handler.codec.http.HttpMethod.GET;
-import static io.netty.handler.codec.http.HttpMethod.POST;
+import static io.netty.handler.codec.http.HttpHeaderNames.TRANSFER_ENCODING;
+import static io.netty.handler.codec.http.HttpHeaderValues.CHUNKED;
import static io.netty.handler.codec.http.HttpVersion.HTTP_1_1;
/**
@@ -72,218 +59,101 @@
public class HttpHandlerUtil {
private static final Logger logger = LoggerFactory.getLogger(HttpHandlerUtil.class);
static final Meter errorMeter = MetricManager.INSTANCE.getMeter(name(GremlinServer.class, "errors"));
- private static final String ARGS_BINDINGS_DOT = Tokens.ARGS_BINDINGS + ".";
- private static final String ARGS_ALIASES_DOT = Tokens.ARGS_ALIASES + ".";
+
/**
- * This is just a generic mapper to interpret the JSON of a POSTed request. It is not used for the serialization
- * of the response.
+ * A generic mapper to return JSON errors in specific cases.
*/
private static final ObjectMapper mapper = new ObjectMapper();
/**
- * Convert a http request into a {@link RequestMessage}.
- * There are 2 payload types options here.
- * 1.
- * existing https://tinkerpop.apache.org/docs/current/reference/#connecting-via-http
- * intended to use with curl, postman, etc. by users
- * both GET and POST
- * Content-Type header can be empty or application/json
- * Accept header can be any, most useful can be application/json, text/plain, application/vnd.gremlin-v3.0+json and application/vnd.gremlin-v3.0+json;types=false
- * Request body example: { "gremlin": "g.V()" }
- * 2.
- * experimental payload with serialized RequestMessage
- * intended for drivers/GLV's. Support both gremlin and bytecode queries.
- * only POST
- * Content-Type is defined by used serializer, expected type GraphSON application/vnd.gremlin-v3.0+json or GraphBinary application/vnd.graphbinary-v1.0. Untyped GraphSON is not supported, it can't deserialize bytecode
- * Accept header can be any.
- * Request body contains serialized RequestMessage
+ * Helper method to send errors back as JSON. Only to be used when the RequestMessage couldn't be parsed, because
+ * a proper serialized ResponseMessage should be sent in that case.
+ *
+ * @param ctx The netty channel context.
+ * @param status The HTTP error status code.
+ * @param message The error message to contain the body.
*/
- public static RequestMessage getRequestMessageFromHttpRequest(final FullHttpRequest request,
- Map<String, MessageSerializer<?>> serializers) throws SerializationException {
- final String contentType = request.headers().get(HttpHeaderNames.CONTENT_TYPE);
-
- if (request.method() == POST && contentType != null && !contentType.equals("application/json") && serializers.containsKey(contentType)) {
- final MessageSerializer<?> serializer = serializers.get(contentType);
-
- final ByteBuf buffer = request.content();
-
- // additional validation for header
- final int first = buffer.readByte();
- // payload can be plain json or can start with additional header with content type.
- // if first character is not "{" (0x7b) then need to verify is correct serializer selected.
- if (first != 0x7b) {
- final byte[] bytes = new byte[first];
- buffer.readBytes(bytes);
- final String mimeType = new String(bytes, StandardCharsets.UTF_8);
-
- if (Arrays.stream(serializer.mimeTypesSupported()).noneMatch(t -> t.equals(mimeType)))
- throw new IllegalArgumentException("Mime type mismatch. Value in content-type header is not equal payload header.");
- } else
- buffer.resetReaderIndex();
-
- return serializer.deserializeRequest(buffer);
- }
-
- return getRequestMessageFromHttpRequest(request);
- }
-
- /**
- * Convert a http request into a {@link RequestMessage}.
- */
- public static RequestMessage getRequestMessageFromHttpRequest(final FullHttpRequest request) {
- // default is just the StandardOpProcessor which maintains compatibility with older versions which only
- // processed scripts.
- final RequestMessage.Builder msgBuilder = RequestMessage.build(StandardOpProcessor.OP_PROCESSOR_NAME);
-
- if (request.method() == GET) {
- final QueryStringDecoder decoder = new QueryStringDecoder(request.uri());
- final List<String> gremlinParms = decoder.parameters().get(Tokens.ARGS_GREMLIN);
-
- if (null == gremlinParms || gremlinParms.size() == 0)
- throw new IllegalArgumentException("no gremlin script supplied");
- final String script = gremlinParms.get(0);
- if (script.isEmpty()) throw new IllegalArgumentException("no gremlin script supplied");
-
- final List<String> requestIdParms = decoder.parameters().get(Tokens.REQUEST_ID);
- if (requestIdParms != null && requestIdParms.size() > 0) {
- msgBuilder.overrideRequestId(UUID.fromString(requestIdParms.get(0)));
- }
-
- // query string parameters - take the first instance of a key only - ignore the rest
- final Map<String, Object> bindings = new HashMap<>();
- decoder.parameters().entrySet().stream().filter(kv -> kv.getKey().startsWith(ARGS_BINDINGS_DOT))
- .forEach(kv -> bindings.put(kv.getKey().substring(ARGS_BINDINGS_DOT.length()), kv.getValue().get(0)));
-
- final Map<String, String> aliases = new HashMap<>();
- decoder.parameters().entrySet().stream().filter(kv -> kv.getKey().startsWith(ARGS_ALIASES_DOT))
- .forEach(kv -> aliases.put(kv.getKey().substring(ARGS_ALIASES_DOT.length()), kv.getValue().get(0)));
-
- final List<String> languageParms = decoder.parameters().get(Tokens.ARGS_LANGUAGE);
- final String language = (null == languageParms || languageParms.size() == 0) ? null : languageParms.get(0);
-
- return msgBuilder.addArg(Tokens.ARGS_GREMLIN, script).addArg(Tokens.ARGS_LANGUAGE, language)
- .addArg(Tokens.ARGS_BINDINGS, bindings).addArg(Tokens.ARGS_ALIASES, aliases).create();
- } else {
- final JsonNode body;
- try {
- body = mapper.readTree(request.content().toString(CharsetUtil.UTF_8));
- } catch (IOException ioe) {
- throw new IllegalArgumentException("body could not be parsed", ioe);
- }
-
- final JsonNode scriptNode = body.get(Tokens.ARGS_GREMLIN);
- if (null == scriptNode) throw new IllegalArgumentException("no gremlin script supplied");
-
- final JsonNode bindingsNode = body.get(Tokens.ARGS_BINDINGS);
- if (bindingsNode != null && !bindingsNode.isObject())
- throw new IllegalArgumentException("bindings must be a Map");
-
- final Map<String, Object> bindings = new HashMap<>();
- if (bindingsNode != null)
- bindingsNode.fields().forEachRemaining(kv -> bindings.put(kv.getKey(), fromJsonNode(kv.getValue())));
-
- final JsonNode aliasesNode = body.get(Tokens.ARGS_ALIASES);
- if (aliasesNode != null && !aliasesNode.isObject())
- throw new IllegalArgumentException("aliases must be a Map");
-
- final Map<String, String> aliases = new HashMap<>();
- if (aliasesNode != null)
- aliasesNode.fields().forEachRemaining(kv -> aliases.put(kv.getKey(), kv.getValue().asText()));
-
- final JsonNode languageNode = body.get(Tokens.ARGS_LANGUAGE);
- final String language = null == languageNode ? null : languageNode.asText();
-
- final JsonNode requestIdNode = body.get(Tokens.REQUEST_ID);
- final UUID requestId = null == requestIdNode ? UUID.randomUUID() : UUID.fromString(requestIdNode.asText());
-
- final JsonNode opNode = body.get("op");
- final String op = null == opNode ? "" : opNode.asText();
-
- return msgBuilder.overrideRequestId(requestId).processor(op)
- .addArg(Tokens.ARGS_GREMLIN, scriptNode.asText()).addArg(Tokens.ARGS_LANGUAGE, language)
- .addArg(Tokens.ARGS_BINDINGS, bindings).addArg(Tokens.ARGS_ALIASES, aliases).create();
- }
- }
-
- private static Object fromJsonNode(final JsonNode node) {
- if (node.isNull())
- return null;
- else if (node.isObject()) {
- final Map<String, Object> map = new HashMap<>();
- final ObjectNode objectNode = (ObjectNode) node;
- final Iterator<String> iterator = objectNode.fieldNames();
- while (iterator.hasNext()) {
- String key = iterator.next();
- map.put(key, fromJsonNode(objectNode.get(key)));
- }
- return map;
- } else if (node.isArray()) {
- final ArrayNode arrayNode = (ArrayNode) node;
- final ArrayList<Object> array = new ArrayList<>();
- for (int i = 0; i < arrayNode.size(); i++) {
- array.add(fromJsonNode(arrayNode.get(i)));
- }
- return array;
- } else if (node.isFloatingPointNumber())
- return node.asDouble();
- else if (node.isIntegralNumber())
- return node.asLong();
- else if (node.isBoolean())
- return node.asBoolean();
- else
- return node.asText();
- }
-
- static void sendError(final ChannelHandlerContext ctx, final HttpResponseStatus status,
- final String message, final boolean keepAlive) {
- sendError(ctx, status, null, message, Optional.empty(), keepAlive);
- }
-
- static void sendError(final ChannelHandlerContext ctx, final HttpResponseStatus status, final UUID requestId,
- final String message, final boolean keepAlive) {
- sendError(ctx, status, requestId, message, Optional.empty(), keepAlive);
- }
-
- static void sendError(final ChannelHandlerContext ctx, final HttpResponseStatus status, final UUID requestId,
- final String message, final Optional<Throwable> t, final boolean keepAlive) {
- if (t.isPresent())
- logger.warn(String.format("Invalid request - responding with %s and %s", status, message), t.get());
- else
- logger.warn(String.format("Invalid request - responding with %s and %s", status, message));
-
+ public static void sendError(final ChannelHandlerContext ctx, final HttpResponseStatus status, final String message) {
+ logger.warn(String.format("Invalid request - responding with %s and %s", status, message));
errorMeter.mark();
+
final ObjectNode node = mapper.createObjectNode();
node.put("message", message);
- if (t.isPresent()) {
- // "Exception-Class" needs to go away - didn't realize it was named that way during review for some reason.
- // replaced with the same method for exception reporting as is used with websocket/nio protocol
- node.put("Exception-Class", t.get().getClass().getName());
- final ArrayNode exceptionList = node.putArray(Tokens.STATUS_ATTRIBUTE_EXCEPTIONS);
- ExceptionUtils.getThrowableList(t.get()).forEach(throwable -> exceptionList.add(throwable.getClass().getName()));
- node.put(Tokens.STATUS_ATTRIBUTE_STACK_TRACE, ExceptionUtils.getStackTrace(t.get()));
- }
- if (requestId != null) {
- node.put("requestId", requestId.toString());
- }
final FullHttpResponse response = new DefaultFullHttpResponse(
HTTP_1_1, status, Unpooled.copiedBuffer(node.toString(), CharsetUtil.UTF_8));
response.headers().set(CONTENT_TYPE, "application/json");
-
- sendAndCleanupConnection(ctx, keepAlive, response);
- }
-
- static void sendAndCleanupConnection(final ChannelHandlerContext ctx,
- final boolean keepAlive,
- final FullHttpResponse response) {
- HttpUtil.setKeepAlive(response, keepAlive);
HttpUtil.setContentLength(response, response.content().readableBytes());
- final ChannelFuture flushPromise = ctx.writeAndFlush(response);
+ ctx.writeAndFlush(response);
+ }
- if (!keepAlive) {
- // Close the connection as soon as the response is sent.
- flushPromise.addListener(ChannelFutureListener.CLOSE);
+ /**
+ * Writes and flushes a {@link ResponseMessage} that contains an error back to the client. Can be used to send
+ * errors while streaming or when no response chunk has been sent. This serves as the end of a response.
+ *
+ * @param context The netty context.
+ * @param responseMessage The response to send back.
+ * @param serializer The serializer to use to serialize the error response.
+ */
+ static void writeError(final Context context, final ResponseMessage responseMessage, final MessageSerializer<?> serializer) {
+ try {
+ final ChannelHandlerContext ctx = context.getChannelHandlerContext();
+ final ByteBuf ByteBuf = context.getRequestState() == HttpGremlinEndpointHandler.RequestState.STREAMING
+ ? serializer.writeErrorFooter(responseMessage, ctx.alloc())
+ : serializer.serializeResponseAsBinary(responseMessage, ctx.alloc());
+
+ context.setRequestState(HttpGremlinEndpointHandler.RequestState.ERROR);
+
+ if (!ctx.channel().attr(StateKey.HTTP_RESPONSE_SENT).get()) {
+ final HttpResponse responseHeader = new DefaultHttpResponse(HTTP_1_1, responseMessage.getStatus().getCode());
+ responseHeader.headers().set(TRANSFER_ENCODING, CHUNKED); // Set this to make it "keep alive" eligible.
+ responseHeader.headers().set(HttpHeaderNames.CONTENT_TYPE, ctx.channel().attr(StateKey.SERIALIZER).get().getValue0());
+ ctx.writeAndFlush(responseHeader);
+ ctx.channel().attr(StateKey.HTTP_RESPONSE_SENT).set(true);
+ }
+
+ ctx.writeAndFlush(new DefaultHttpContent(ByteBuf));
+
+ sendTrailingHeaders(ctx, responseMessage.getStatus().getCode(), responseMessage.getStatus().getException());
+ } catch (SerializationException se) {
+ logger.warn("Unable to serialize ResponseMessage: {} ", responseMessage);
}
}
+
+ /**
+ * Writes a {@link GremlinError} into the status object of a {@link ResponseMessage} and then flushes it. Used to
+ * send specific errors back to the client. This serves as the end of a response.
+ *
+ * @param context The netty context.
+ * @param error The GremlinError used to populate the status.
+ * @param serializer The serializer to use to serialize the error response.
+ */
+ static void writeError(final Context context, final GremlinError error, final MessageSerializer<?> serializer) {
+ final ResponseMessage responseMessage = ResponseMessage.build()
+ .code(error.getCode())
+ .statusMessage(error.getMessage())
+ .exception(error.getException())
+ .create();
+
+ writeError(context, responseMessage, serializer);
+ }
+
+ /**
+ * Adds trailing headers specified in the arguments to a {@link DefaultLastHttpContent} and then flushes it. This
+ * serves as the end of a response.
+ *
+ * @param ctx The netty context.
+ * @param statusCode The status code to include in the trailers.
+ * @param exceptionType The type of exception to include in the trailers. Leave blank or null if no error occurred.
+ */
+ static void sendTrailingHeaders(final ChannelHandlerContext ctx, final HttpResponseStatus statusCode, final String exceptionType) {
+ final DefaultLastHttpContent defaultLastHttpContent = new DefaultLastHttpContent();
+ defaultLastHttpContent.trailingHeaders().add(SerTokens.TOKEN_CODE, statusCode.code());
+ if (exceptionType != null && !exceptionType.isEmpty()) {
+ defaultLastHttpContent.trailingHeaders().add(SerTokens.TOKEN_EXCEPTION, exceptionType);
+ }
+
+ ctx.writeAndFlush(defaultLastHttpContent);
+ }
}
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpRequestCheckingHandler.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpRequestCheckingHandler.java
new file mode 100644
index 0000000..bdb2d6f
--- /dev/null
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpRequestCheckingHandler.java
@@ -0,0 +1,58 @@
+/*
+ * 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.server.handler;
+
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.SimpleChannelInboundHandler;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.util.ReferenceCountUtil;
+
+import static io.netty.handler.codec.http.HttpResponseStatus.HTTP_VERSION_NOT_SUPPORTED;
+import static io.netty.handler.codec.http.HttpResponseStatus.NOT_FOUND;
+import static io.netty.handler.codec.http.HttpVersion.HTTP_1_1;
+
+/**
+ * A handler that checks for errors in the HTTP request for all routes.
+ */
+@ChannelHandler.Sharable
+public class HttpRequestCheckingHandler extends SimpleChannelInboundHandler<FullHttpRequest> {
+ public HttpRequestCheckingHandler() {
+ // This handler only consumes the FullHttpRequest in certain situations so don't release it.
+ super(false);
+ }
+
+ @Override
+ protected void channelRead0(ChannelHandlerContext ctx, FullHttpRequest msg) throws Exception {
+ // Chunked transfer encoding is used to stream back results so only accept HTTP/1.1 requests.
+ if (msg.protocolVersion() != HTTP_1_1) {
+ HttpHandlerUtil.sendError(ctx, HTTP_VERSION_NOT_SUPPORTED, "Only HTTP/1.1 is supported.");
+ ReferenceCountUtil.release(msg);
+ return;
+ }
+
+ if ("/favicon.ico".equals(msg.uri())) {
+ HttpHandlerUtil.sendError(ctx, NOT_FOUND, "Gremlin Server doesn't have a favicon.ico");
+ ReferenceCountUtil.release(msg);
+ return;
+ }
+
+ ctx.fireChannelRead(msg);
+ }
+}
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpRequestIdHandler.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpRequestIdHandler.java
new file mode 100644
index 0000000..19822a0
--- /dev/null
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpRequestIdHandler.java
@@ -0,0 +1,80 @@
+/*
+ * 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.server.handler;
+
+import io.netty.channel.ChannelDuplexHandler;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPromise;
+import io.netty.handler.codec.http.HttpRequest;
+import io.netty.handler.codec.http.HttpResponse;
+import io.netty.handler.codec.http.LastHttpContent;
+import io.netty.util.AttributeKey;
+import io.netty.util.ReferenceCountUtil;
+
+import java.util.UUID;
+
+/**
+ * A handler that generates a Request ID for the incoming HTTP request and injects the same ID into the response header.
+ */
+@ChannelHandler.Sharable
+public class HttpRequestIdHandler extends ChannelDuplexHandler {
+ /**
+ * The key for whether a {@link io.netty.handler.codec.http.HttpResponse} has been sent for the current response.
+ */
+ private static final AttributeKey<Boolean> IN_USE = AttributeKey.valueOf("inUse");
+
+ public static String REQUEST_ID_HEADER_NAME = "Gremlin-RequestId";
+
+ @Override
+ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
+ if (msg instanceof HttpRequest) {
+ final Boolean currentlyInUse = ctx.channel().attr(IN_USE).get();
+ if (currentlyInUse != null && currentlyInUse == true) {
+ // Pipelining not supported so just ignore the request if another request already being handled.
+ ReferenceCountUtil.release(msg);
+ return;
+ }
+
+ ctx.channel().attr(StateKey.REQUEST_ID).set(UUID.randomUUID());
+ ctx.channel().attr(IN_USE).set(true);
+ }
+
+ ctx.fireChannelRead(msg);
+ }
+
+ @Override
+ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
+ ctx.channel().attr(IN_USE).set(false);
+ super.exceptionCaught(ctx, cause);
+ }
+
+ @Override
+ public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
+ if (msg instanceof HttpResponse) {
+ HttpResponse response = (HttpResponse) msg;
+ response.headers().add(REQUEST_ID_HEADER_NAME, ctx.channel().attr(StateKey.REQUEST_ID).get());
+ }
+ if (msg instanceof LastHttpContent) { // possible for an object to be both HttpResponse and LastHttpContent.
+ ctx.channel().attr(IN_USE).set(false);
+ }
+
+ ctx.write(msg, promise);
+ }
+}
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpRequestMessageDecoder.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpRequestMessageDecoder.java
new file mode 100644
index 0000000..aef8dd5
--- /dev/null
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpRequestMessageDecoder.java
@@ -0,0 +1,239 @@
+/*
+ * 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.server.handler;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpHeaderNames;
+import io.netty.util.CharsetUtil;
+import org.apache.tinkerpop.gremlin.server.util.TextPlainMessageSerializer;
+import org.apache.tinkerpop.gremlin.util.MessageSerializer;
+import org.apache.tinkerpop.gremlin.util.Tokens;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.ser.SerializationException;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToMessageDecoder;
+import org.apache.tinkerpop.shaded.jackson.databind.JsonNode;
+import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
+import org.apache.tinkerpop.shaded.jackson.databind.node.ArrayNode;
+import org.apache.tinkerpop.shaded.jackson.databind.node.ObjectNode;
+import org.javatuples.Pair;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static io.netty.handler.codec.http.HttpMethod.POST;
+import static io.netty.handler.codec.http.HttpResponseStatus.BAD_REQUEST;
+import static io.netty.handler.codec.http.HttpResponseStatus.METHOD_NOT_ALLOWED;
+import static org.apache.tinkerpop.gremlin.server.handler.HttpHandlerUtil.sendError;
+
+/**
+ * Decodes the contents of a {@link FullHttpRequest}. This will extract the {@link RequestMessage} from the
+ * {@link FullHttpRequest} or, if unsuccessful, will flush an error back.
+ */
+@ChannelHandler.Sharable
+public class HttpRequestMessageDecoder extends MessageToMessageDecoder<FullHttpRequest> {
+ private static final Pattern pattern = Pattern.compile("(.*);q=(.*)");
+
+ /**
+ * Serializer for {@code text/plain} which is a serializer exclusive to HTTP.
+ */
+ private final TextPlainMessageSerializer textPlainSerializer = new TextPlainMessageSerializer();
+
+ private final Map<String, MessageSerializer<?>> serializers;
+
+ /**
+ * A generic mapper to decode an application/json request.
+ */
+ private final ObjectMapper mapper = new ObjectMapper();
+
+
+ public HttpRequestMessageDecoder(final Map<String, MessageSerializer<?>> serializers) {
+ this.serializers = serializers;
+ }
+
+ @Override
+ protected void decode(final ChannelHandlerContext ctx, final FullHttpRequest req, final List<Object> objects) throws Exception {
+ ctx.channel().attr(StateKey.REQUEST_HEADERS).set(req.headers());
+
+ final String acceptMime = Optional.ofNullable(req.headers().get(HttpHeaderNames.ACCEPT)).orElse("application/json");
+ final Pair<String, MessageSerializer<?>> serializer = chooseSerializer(acceptMime);
+
+ if (req.method() != POST) {
+ sendError(ctx, METHOD_NOT_ALLOWED, METHOD_NOT_ALLOWED.toString());
+ return;
+ }
+
+ if (null == serializer) {
+ sendError(ctx, BAD_REQUEST, String.format("no serializer for requested Accept header: %s", acceptMime));
+ return;
+ }
+
+ final RequestMessage requestMessage;
+ try {
+ requestMessage = getRequestMessageFromHttpRequest(req, serializers);
+ } catch (IllegalArgumentException | SerializationException | NullPointerException ex) {
+ sendError(ctx, BAD_REQUEST, ex.getMessage());
+ return;
+ }
+
+ // checked in getRequestMessageFromHttpRequest
+ ctx.channel().attr(StateKey.SERIALIZER).set(Pair.with(serializer.getValue0(), serializer.getValue1()));
+ objects.add(requestMessage);
+ }
+
+ private Pair<String, MessageSerializer<?>> chooseSerializer(final String mimeType) {
+ final List<Pair<String, Double>> ordered = Stream.of(mimeType.split(",")).map(mediaType -> {
+ // parse out each mediaType with its params - keeping it simple and just looking for "quality". if
+ // that value isn't there, default it to 1.0. not really validating here so users better get their
+ // accept headers straight
+ final Matcher matcher = pattern.matcher(mediaType);
+ return (matcher.matches()) ? Pair.with(matcher.group(1), Double.parseDouble(matcher.group(2))) : Pair.with(mediaType, 1.0);
+ }).sorted((o1, o2) -> o2.getValue0().compareTo(o1.getValue0())).collect(Collectors.toList());
+
+ for (Pair<String, Double> p : ordered) {
+ // this isn't perfect as it doesn't really account for wildcards. that level of complexity doesn't seem
+ // super useful for gremlin server really.
+ final String accept = p.getValue0().equals("*/*") ? "application/json" : p.getValue0();
+ if (serializers.containsKey(accept))
+ return Pair.with(accept, serializers.get(accept));
+ else if (accept.equals("text/plain")) {
+ return Pair.with(accept, textPlainSerializer);
+ }
+ }
+
+ return null;
+ }
+
+ /**
+ * Convert a http request into a {@link RequestMessage}.
+ * There are 2 payload types options here.
+ * 1.
+ * existing https://tinkerpop.apache.org/docs/current/reference/#connecting-via-http
+ * intended to use with curl, postman, etc. by users
+ * both GET and POST
+ * Content-Type header can be empty or application/json
+ * Accept header can be any, most useful can be application/json, text/plain, application/vnd.gremlin-v3.0+json
+ * and application/vnd.gremlin-v3.0+json;types=false
+ * Request body example: { "gremlin": "g.V()" }
+ * 2.
+ * experimental payload with serialized RequestMessage
+ * intended for drivers/GLV's. Support only gremlin.
+ * only POST
+ * Content-Type is defined by used serializer, expected type GraphSON application/vnd.gremlin-v3.0+json or
+ * GraphBinary application/vnd.graphbinary-v1.0. Untyped GraphSON is not supported, it can't deserialize parameters
+ * Accept header can be any.
+ * Request body contains serialized RequestMessage
+ */
+ public RequestMessage getRequestMessageFromHttpRequest(final FullHttpRequest request,
+ Map<String, MessageSerializer<?>> serializers) throws SerializationException {
+ final String contentType = request.headers().get(HttpHeaderNames.CONTENT_TYPE);
+
+ if (contentType != null && !contentType.equals("application/json") && serializers.containsKey(contentType)) {
+ final MessageSerializer<?> serializer = serializers.get(contentType);
+ final ByteBuf buffer = request.content();
+
+ try {
+ return serializer.deserializeBinaryRequest(buffer);
+ } catch (Exception e) {
+ throw new SerializationException("Unable to deserialize request using: " + serializer.getClass().getSimpleName(), e);
+ }
+ }
+ return getRequestMessageFromHttpRequest(request);
+ }
+
+ private RequestMessage getRequestMessageFromHttpRequest(final FullHttpRequest request) {
+ final JsonNode body;
+ try {
+ body = mapper.readTree(request.content().toString(CharsetUtil.UTF_8));
+ } catch (IOException ioe) {
+ throw new IllegalArgumentException("body could not be parsed", ioe);
+ }
+
+ final JsonNode scriptNode = body.get(Tokens.ARGS_GREMLIN);
+ if (null == scriptNode) throw new IllegalArgumentException("no gremlin script supplied");
+
+ final RequestMessage.Builder builder = RequestMessage.build(scriptNode.asText());
+
+ final JsonNode bindingsNode = body.get(Tokens.ARGS_BINDINGS);
+ if (bindingsNode != null && !bindingsNode.isObject())
+ throw new IllegalArgumentException("bindings must be a Map");
+
+ final Map<String, Object> bindings = new HashMap<>();
+ if (bindingsNode != null)
+ bindingsNode.fields().forEachRemaining(kv -> bindings.put(kv.getKey(), fromJsonNode(kv.getValue())));
+ builder.addBindings(bindings);
+
+ final JsonNode gNode = body.get(Tokens.ARGS_G);
+ if (null != gNode) builder.addG(gNode.asText());
+
+ final JsonNode languageNode = body.get(Tokens.ARGS_LANGUAGE);
+ builder.addLanguage((null == languageNode) ? "gremlin-lang" : languageNode.asText());
+
+ final JsonNode chunkSizeNode = body.get(Tokens.ARGS_BATCH_SIZE);
+ if (null != chunkSizeNode) builder.addChunkSize(chunkSizeNode.asInt());
+
+ final JsonNode timeoutMsNode = body.get(Tokens.TIMEOUT_MS);
+ if (null != timeoutMsNode) builder.addTimeoutMillis(timeoutMsNode.asLong());
+
+ final JsonNode matPropsNode = body.get(Tokens.ARGS_MATERIALIZE_PROPERTIES);
+ if (null != matPropsNode) builder.addMaterializeProperties(matPropsNode.asText());
+
+ return builder.create();
+ }
+
+ private Object fromJsonNode(final JsonNode node) {
+ if (node.isNull())
+ return null;
+ else if (node.isObject()) {
+ final Map<String, Object> map = new HashMap<>();
+ final ObjectNode objectNode = (ObjectNode) node;
+ final Iterator<String> iterator = objectNode.fieldNames();
+ while (iterator.hasNext()) {
+ String key = iterator.next();
+ map.put(key, fromJsonNode(objectNode.get(key)));
+ }
+ return map;
+ } else if (node.isArray()) {
+ final ArrayNode arrayNode = (ArrayNode) node;
+ final ArrayList<Object> array = new ArrayList<>();
+ for (int i = 0; i < arrayNode.size(); i++) {
+ array.add(fromJsonNode(arrayNode.get(i)));
+ }
+ return array;
+ } else if (node.isFloatingPointNumber())
+ return node.asDouble();
+ else if (node.isIntegralNumber())
+ return node.asLong();
+ else if (node.isBoolean())
+ return node.asBoolean();
+ else
+ return node.asText();
+ }
+}
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpUserAgentHandler.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpUserAgentHandler.java
index 6f90bd9..4868e3b 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpUserAgentHandler.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpUserAgentHandler.java
@@ -28,8 +28,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.tinkerpop.gremlin.server.handler.WsUserAgentHandler.USER_AGENT_HEADER_NAME;
-
public class HttpUserAgentHandler extends ChannelInboundHandlerAdapter {
/**
* This constant caps the number of unique user agents which will be tracked in the metrics. Any new unique
@@ -38,6 +36,9 @@
private static final int MAX_USER_AGENT_METRICS = 10000;
private static final Logger logger = LoggerFactory.getLogger(HttpUserAgentHandler.class);
+
+ static final String USER_AGENT_HEADER_NAME = "User-Agent";
+
public static final AttributeKey<String> USER_AGENT_ATTR_KEY = AttributeKey.valueOf(USER_AGENT_HEADER_NAME);
@Override
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/MultiTaskSession.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/MultiTaskSession.java
deleted file mode 100644
index 8f02861..0000000
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/MultiTaskSession.java
+++ /dev/null
@@ -1,319 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.server.handler;
-
-import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.groovy.engine.GremlinExecutor;
-import org.apache.tinkerpop.gremlin.groovy.jsr223.GroovyCompilerGremlinPlugin;
-import org.apache.tinkerpop.gremlin.jsr223.GremlinScriptEngine;
-import org.apache.tinkerpop.gremlin.jsr223.GremlinScriptEngineManager;
-import org.apache.tinkerpop.gremlin.server.Settings;
-import org.apache.tinkerpop.gremlin.structure.Transaction;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.script.Bindings;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.RejectedExecutionException;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import static org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor.CONFIG_GLOBAL_FUNCTION_CACHE_ENABLED;
-
-/**
- * A {@link Session} implementation that queues tasks given to it and executes them in a serial fashion within the
- * same thread which thus allows multiple tasks to be executed in the same transaction. The first {@link SessionTask}
- * to execute is supplied on the constructor and additional ones may be added as they arrive with
- * {@link #submitTask(SessionTask)} where they will be added to a queue where they will await execution in the thread
- * bound to this session.
- *
- * @deprecated As of release 3.8.0, not replaced.
- */
-@Deprecated
-public class MultiTaskSession extends AbstractSession {
- private static final Logger logger = LoggerFactory.getLogger(MultiTaskSession.class);
- protected final BlockingQueue<SessionTask> queue;
- private final AtomicBoolean ending = new AtomicBoolean(false);
- private final ScheduledExecutorService scheduledExecutorService;
- private final GremlinScriptEngineManager scriptEngineManager;
- private ScheduledFuture<?> requestCancelFuture;
- private Bindings bindings;
- private final SessionTask initialSessionTask;
-
- /**
- * Creates a new {@code MultiTaskSession} object providing the initial starting {@link SessionTask} that gets
- * executed by the session when it starts.
- *
- * @param initialSessionTask The tasks that starts the session.
- * @param sessionId The id of the session
- * @param sessions The session id to {@link Session} instances mapping
- */
- public MultiTaskSession(final SessionTask initialSessionTask, final String sessionId,
- final ConcurrentMap<String, Session> sessions) {
- super(initialSessionTask, sessionId, false, sessions);
-
- this.initialSessionTask = initialSessionTask;
- queue = new LinkedBlockingQueue<>(initialSessionTask.getSettings().maxSessionTaskQueueSize);
-
- // using a global function cache is cheaper than creating a new on per session especially if you have to
- // create a lot of sessions. it will generate a ton of throw-away objects. mostly keeping the option open
- // to not use it to preserve the ability to use the old functionality if wanted or if there is some specific
- // use case with sessions that needs it. if we wanted this could eventually become a per-request option
- // so that the client could control it as necessary and get scriptengine isolation if they need it.
- if (initialSessionTask.getSettings().useCommonEngineForSessions)
- scriptEngineManager = initialSessionTask.getGremlinExecutor().getScriptEngineManager();
- else
- scriptEngineManager = initializeGremlinExecutor(initialSessionTask).getScriptEngineManager();
-
- scheduledExecutorService = initialSessionTask.getScheduledExecutorService();
-
- // would be odd if this tossed an exception because on construction the queue should be empty,
- // but let's handle it in the same fashion as if it had been rejected by the queue itself but put up
- // an additional log because something would be rather off here if we hit this condition
- if (!submitTask(initialSessionTask)) {
- logger.error("Task {} rejected on creation of the {} for session {}",
- initialSessionTask.getRequestMessage().getRequestId(), this.getClass().getSimpleName(),
- getSessionId());
- final String msg = String.format("Task %s rejected from session %s",
- initialSessionTask.getRequestMessage().getRequestId(), getSessionId());
- throw new RejectedExecutionException(msg);
- }
- }
-
- /**
- * Gets the script engine specific to this session which is dependent on the
- * {@link Settings#useCommonEngineForSessions} configuration.
- */
- @Override
- public GremlinScriptEngine getScriptEngine(final SessionTask sessionTask, final String language) {
- return scriptEngineManager.getEngineByName(language);
- }
-
- @Override
- public boolean isAcceptingTasks() {
- return !ending.get();
- }
-
- @Override
- public void sendTimeoutResponseForUncommencedTask() {
- this.close(); // Need to close as this task won't ever start to run, so it should just end.
- initialSessionTask.sendTimeoutResponse(
- String.format("A session timeout occurred during traversal evaluation of [%s] - consider increasing the limit given to sessionLifetimeTimeout", initialSessionTask.getRequestMessage()));
- }
-
- @Override
- public boolean submitTask(final SessionTask sessionTask) throws RejectedExecutionException {
- try {
- return isAcceptingTasks() && queue.add(sessionTask);
- } catch (IllegalStateException ise) {
- final String msg = String.format("Task %s rejected from session %s",
- sessionTask.getRequestMessage().getRequestId(), getSessionId());
- throw new RejectedExecutionException(msg);
- }
- }
-
- @Override
- public void run() {
- sessionTaskStarted.set(true);
-
- // allow the Session to know about the thread that is running it which will be a thread from the gremlinPool
- // the thread really only has relevance once the session has started. this thread is then held below in the
- // while() loop awaiting items to arrive on the request queue. it will hold until the session is properly
- // closed by the client or through interruption/error
- this.sessionThread = Thread.currentThread();
-
- // there must be one item in the queue at least since addTask() gets called before the worker
- // is ever started
- SessionTask sessionTask = queue.poll();
- if (null == sessionTask)
- throw new IllegalStateException(String.format("Worker has no initial context for session: %s", getSessionId()));
-
- try {
- startTransaction(sessionTask);
- try {
- while (true) {
- // schedule timeout for the current request from the queue
- final long seto = sessionTask.getRequestTimeout();
- requestCancelFuture = scheduledExecutorService.schedule(
- () -> this.triggerTimeout(seto, false),
- seto, TimeUnit.MILLISECONDS);
-
- // only stop processing stuff in the queue if this session isn't configured to hold state between
- // exceptions (i.e. the old OpProcessor way) or if this session is closing down by certain death
- // (i.e. channel close or lifetime session timeout)
- try {
- process(sessionTask);
- } catch (SessionException ex) {
- if (!maintainStateAfterException || closeReason.get() == CloseReason.CHANNEL_CLOSED ||
- closeReason.get() == CloseReason.SESSION_TIMEOUT) {
- throw ex;
- }
-
- // reset the close reason as we are maintaining state
- closeReason.set(null);
-
- logger.warn(ex.getMessage(), ex);
- sessionTask.writeAndFlush(ex.getResponseMessage());
- }
-
- // work is done within the timeout period so cancel it
- cancelRequestTimeout();
-
- sessionTask = queue.take();
- }
- } catch (Exception ex) {
- stopAcceptingRequests();
-
- // the current context gets its exception handled...
- handleException(sessionTask, ex);
- }
- } catch (SessionException rexex) {
- // if the close reason isn't already set then things stopped during gremlin execution somewhere and not
- // more external issues like channel close or timeouts.
- closeReason.compareAndSet(null, CloseReason.PROCESSING_EXCEPTION);
-
- // remaining work items in the queue are ignored since this worker is closing. must send
- // back some sort of response to satisfy the client. writeAndFlush code is different than
- // the ResponseMessage as we don't want the message to be "final" for the Context. that
- // status must be reserved for the message that caused the error
- for (SessionTask st : queue) {
- st.write(ResponseStatusCode.PARTIAL_CONTENT, ResponseMessage.build(st.getRequestMessage())
- .code(ResponseStatusCode.SERVER_ERROR)
- .statusMessage(String.format(
- "An earlier request [%s] failed prior to this one having a chance to execute",
- sessionTask.getRequestMessage().getRequestId())).create());
- }
-
- // exception should trigger a rollback in the session. a more focused rollback may have occurred
- // during process() and the related result iteration IF transaction management was enabled on
- // the request
- closeTransactionSafely(Transaction.Status.ROLLBACK);
-
- // the current context could already be completed with SUCCESS and we're just waiting for another
- // one to show up while a timeout occurs or the channel closes. in these cases, this would be a valid
- // close in all likelihood so there's no reason to log or alert the client as the client already has
- // the best answer
- if (!sessionTask.isFinalResponseWritten()) {
- logger.warn(rexex.getMessage(), rexex);
- sessionTask.write(rexex.getResponseMessage());
- }
- } finally {
- // if this is a normal end to the session or if there is some general processing exception which tanks
- // the entire session or if the session life timeout is exceeded then the session needs to be removed
- // and everything cleaned up
- if (closeReason.compareAndSet(null, CloseReason.EXIT_PROCESSING) ||
- closeReason.get() == CloseReason.PROCESSING_EXCEPTION ||
- closeReason.get() == CloseReason.SESSION_TIMEOUT) {
- close();
-
- // the session is now in a state where it is no longer in the set of current sessions so flush
- // remaining messages to the transport, if any. the remaining message should be failures from
- // the SessionException in the catch. this prevents an unlikely case where a fast client can
- // get ahead of the server and start to send messages to a technically errored out session. that
- // in itself is not necessarily bad but it makes tests fail sometimes because the tests are
- // designed to assert in the same fashion for OpProcessor and UnifiedChannelizer infrastructure
- // and they are slightly at odds with each other in certain situations.
- sessionTask.flush();
- }
- }
- }
-
- /**
- * This method stops incoming requests from being added to the session queue. It then cancels the session lifetime
- * timeout and then calls {@link super#close()} which will then interrupt this {@link #run()} which will clear out
- * remaining requests in the queue. This latter part of the close, where the interruption is concerned, is an
- * asynchronous operation and will not block as it finishes its processing in the "gremlinPool" thread that was
- * originally handling the work.
- */
- @Override
- public void close() {
- stopAcceptingRequests();
- cancelRequestTimeout();
- super.close();
- logger.debug("Session {} closed", getSessionId());
- }
-
- private void cancelRequestTimeout() {
- if (requestCancelFuture != null && !requestCancelFuture.isDone())
- requestCancelFuture.cancel(true);
- else
- logger.debug("Could not cancel request timeout for {} - {}", getSessionId(), requestCancelFuture);
- }
-
- private void stopAcceptingRequests() {
- if (ending.compareAndSet(false, true))
- cancel(true);
- }
-
- @Override
- protected Bindings getWorkerBindings() throws SessionException {
- if (null == bindings)
- bindings = super.getWorkerBindings();
- return this.bindings;
- }
-
- protected GremlinExecutor initializeGremlinExecutor(final SessionTask sessionTask) {
- final Settings settings = sessionTask.getSettings();
- final ExecutorService executor = sessionTask.getGremlinExecutor().getExecutorService();
- final boolean useGlobalFunctionCache = settings.useGlobalFunctionCacheForSessions;
-
- // these initial settings don't matter so much as we don't really execute things through the
- // GremlinExecutor directly. Just doing all this setup to make GremlinExecutor do the work of
- // rigging up the GremlinScriptEngineManager.
- final GremlinExecutor.Builder gremlinExecutorBuilder = GremlinExecutor.build()
- .evaluationTimeout(settings.getEvaluationTimeout())
- .executorService(executor)
- .globalBindings(graphManager.getAsBindings())
- .scheduledExecutorService(scheduledExecutorService);
-
- settings.scriptEngines.forEach((k, v) -> {
- // use plugins if they are present
- if (!v.plugins.isEmpty()) {
- // make sure that server related classes are available at init. the LifeCycleHook stuff will be
- // added explicitly via configuration using GremlinServerGremlinModule in the yaml. need to override
- // scriptengine settings with SessionOpProcessor specific ones as the processing for sessions is
- // different and a global setting may not make sense for a session
- if (v.plugins.containsKey(GroovyCompilerGremlinPlugin.class.getName())) {
- v.plugins.get(GroovyCompilerGremlinPlugin.class.getName()).put(CONFIG_GLOBAL_FUNCTION_CACHE_ENABLED, useGlobalFunctionCache);
- } else {
- final Map<String,Object> pluginConf = new HashMap<>();
- pluginConf.put(CONFIG_GLOBAL_FUNCTION_CACHE_ENABLED, useGlobalFunctionCache);
- v.plugins.put(GroovyCompilerGremlinPlugin.class.getName(), pluginConf);
- }
-
- gremlinExecutorBuilder.addPlugins(k, v.plugins);
- }
- });
-
- return gremlinExecutorBuilder.create();
- }
-
- @Override
- public String toString() {
- return String.format("%s - session: %s", MultiTaskSession.class.getSimpleName(), getSessionId());
- }
-}
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/OpExecutorHandler.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/OpExecutorHandler.java
deleted file mode 100644
index 8e3b1ee..0000000
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/OpExecutorHandler.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.server.handler;
-
-import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.groovy.engine.GremlinExecutor;
-import org.apache.tinkerpop.gremlin.server.Context;
-import org.apache.tinkerpop.gremlin.server.GraphManager;
-import org.apache.tinkerpop.gremlin.server.Settings;
-import org.apache.tinkerpop.gremlin.server.op.OpProcessorException;
-import org.apache.tinkerpop.gremlin.util.function.ThrowingConsumer;
-import io.netty.channel.ChannelHandler;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.SimpleChannelInboundHandler;
-import io.netty.util.ReferenceCountUtil;
-import org.javatuples.Pair;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.concurrent.ScheduledExecutorService;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-@ChannelHandler.Sharable
-public class OpExecutorHandler extends SimpleChannelInboundHandler<Pair<RequestMessage, ThrowingConsumer<Context>>> {
- private static final Logger logger = LoggerFactory.getLogger(OpExecutorHandler.class);
-
- private final Settings settings;
- private final GraphManager graphManager;
- private final ScheduledExecutorService scheduledExecutorService;
- private final GremlinExecutor gremlinExecutor;
-
- public OpExecutorHandler(final Settings settings, final GraphManager graphManager, final GremlinExecutor gremlinExecutor,
- final ScheduledExecutorService scheduledExecutorService) {
- this.settings = settings;
- this.graphManager = graphManager;
- this.gremlinExecutor = gremlinExecutor;
- this.scheduledExecutorService = scheduledExecutorService;
- }
-
- @Override
- protected void channelRead0(final ChannelHandlerContext ctx, final Pair<RequestMessage, ThrowingConsumer<Context>> objects) throws Exception {
- final RequestMessage msg = objects.getValue0();
- final ThrowingConsumer<Context> op = objects.getValue1();
- final Context gremlinServerContext = new Context(msg, ctx,
- settings, graphManager, gremlinExecutor, scheduledExecutorService);
- try {
- op.accept(gremlinServerContext);
- } catch (OpProcessorException ope) {
- // Ops may choose to throw OpProcessorException or write the error ResponseMessage down the line
- // themselves
- logger.warn(ope.getMessage(), ope);
- gremlinServerContext.writeAndFlush(ope.getResponseMessage());
- } catch (Exception ex) {
- // It is possible that an unplanned exception might raise out of an OpProcessor execution. Build a general
- // error to send back to the client
- logger.warn(ex.getMessage(), ex);
- gremlinServerContext.writeAndFlush(ResponseMessage.build(msg)
- .code(ResponseStatusCode.SERVER_ERROR)
- .statusAttributeException(ex)
- .statusMessage(ex.getMessage()).create());
- } finally {
- ReferenceCountUtil.release(objects);
- }
- }
-}
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/OpSelectorHandler.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/OpSelectorHandler.java
deleted file mode 100644
index 340b913..0000000
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/OpSelectorHandler.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.server.handler;
-
-import io.netty.handler.timeout.IdleState;
-import io.netty.handler.timeout.IdleStateEvent;
-import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.groovy.engine.GremlinExecutor;
-import org.apache.tinkerpop.gremlin.server.Channelizer;
-import org.apache.tinkerpop.gremlin.server.Context;
-import org.apache.tinkerpop.gremlin.server.GraphManager;
-import org.apache.tinkerpop.gremlin.server.OpProcessor;
-import org.apache.tinkerpop.gremlin.server.Settings;
-import org.apache.tinkerpop.gremlin.server.op.OpLoader;
-import org.apache.tinkerpop.gremlin.server.op.OpProcessorException;
-import io.netty.channel.ChannelHandler;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.MessageToMessageDecoder;
-import org.javatuples.Pair;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.ScheduledExecutorService;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-@ChannelHandler.Sharable
-public class OpSelectorHandler extends MessageToMessageDecoder<RequestMessage> {
- private static final Logger logger = LoggerFactory.getLogger(OpSelectorHandler.class);
-
- private final Settings settings;
- private final GraphManager graphManager;
-
- private final GremlinExecutor gremlinExecutor;
- private final ScheduledExecutorService scheduledExecutorService;
- private final Channelizer channelizer;
-
- public OpSelectorHandler(final Settings settings, final GraphManager graphManager, final GremlinExecutor gremlinExecutor,
- final ScheduledExecutorService scheduledExecutorService, final Channelizer channelizer) {
- this.settings = settings;
- this.graphManager = graphManager;
- this.gremlinExecutor = gremlinExecutor;
- this.scheduledExecutorService = scheduledExecutorService;
- this.channelizer = channelizer;
- }
-
- @Override
- protected void decode(final ChannelHandlerContext ctx, final RequestMessage msg,
- final List<Object> objects) throws Exception {
- final Context gremlinServerContext = new Context(msg, ctx, settings,
- graphManager, gremlinExecutor, this.scheduledExecutorService);
- try {
- // choose a processor to do the work based on the request message.
- final Optional<OpProcessor> processor = OpLoader.getProcessor(msg.getProcessor());
-
- if (processor.isPresent())
- // the processor is known so use it to evaluate the message
- objects.add(Pair.with(msg, processor.get().select(gremlinServerContext)));
- else {
- // invalid op processor selected so write back an error by way of OpProcessorException.
- final String errorMessage = String.format("Invalid OpProcessor requested [%s]", msg.getProcessor());
- throw new OpProcessorException(errorMessage, ResponseMessage.build(msg)
- .code(ResponseStatusCode.REQUEST_ERROR_INVALID_REQUEST_ARGUMENTS)
- .statusMessage(errorMessage).create());
- }
- } catch (OpProcessorException ope) {
- logger.warn(ope.getMessage(), ope);
- gremlinServerContext.writeAndFlush(ope.getResponseMessage());
- }
- }
-
- @Override
- public void userEventTriggered(final ChannelHandlerContext ctx, final Object evt) throws Exception {
- // only need to handle this event if the idle monitor is on
- if (!channelizer.supportsIdleMonitor()) return;
-
- if (evt instanceof IdleStateEvent) {
- final IdleStateEvent e = (IdleStateEvent) evt;
-
- // if no requests (reader) then close, if no writes from server to client then ping. clients should
- // periodically ping the server, but coming from this direction allows the server to kill channels that
- // have dead clients on the other end
- if (e.state() == IdleState.READER_IDLE) {
- logger.info("Closing channel - client is disconnected after idle period of " + settings.idleConnectionTimeout + " " + ctx.channel().id().asShortText());
- ctx.close();
- } else if (e.state() == IdleState.WRITER_IDLE && settings.keepAliveInterval > 0) {
- logger.info("Checking channel - sending ping to client after idle period of " + settings.keepAliveInterval + " " + ctx.channel().id().asShortText());
- ctx.writeAndFlush(channelizer.createIdleDetectionMessage());
- }
- }
- }
-}
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SaslAndHttpBasicAuthenticationHandler.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SaslAndHttpBasicAuthenticationHandler.java
deleted file mode 100644
index 31dabd0..0000000
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SaslAndHttpBasicAuthenticationHandler.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tinkerpop.gremlin.server.handler;
-
-import io.netty.channel.ChannelHandler;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelInboundHandlerAdapter;
-import io.netty.channel.ChannelPipeline;
-import io.netty.handler.codec.http.HttpMessage;
-import org.apache.tinkerpop.gremlin.server.auth.Authenticator;
-import org.apache.tinkerpop.gremlin.server.Settings;
-import org.apache.tinkerpop.gremlin.server.authz.Authorizer;
-
-import static org.apache.tinkerpop.gremlin.server.AbstractChannelizer.PIPELINE_AUTHORIZER;
-import static org.apache.tinkerpop.gremlin.server.channel.WebSocketChannelizer.PIPELINE_AUTHENTICATOR;
-
-/**
- * An Authentication Handler for doing WebSocket Sasl and Http Basic auth
- */
-@ChannelHandler.Sharable
-public class SaslAndHttpBasicAuthenticationHandler extends SaslAuthenticationHandler {
-
- private final String HTTP_AUTH = "http-authentication";
-
- /**
- * @deprecated As of release 3.5.0, replaced by {@link #SaslAndHttpBasicAuthenticationHandler(Authenticator, Authorizer, Settings)}.
- */
- @Deprecated
- public SaslAndHttpBasicAuthenticationHandler(final Authenticator authenticator, final Settings settings) {
- this(authenticator, null, settings);
- }
-
- public SaslAndHttpBasicAuthenticationHandler(final Authenticator authenticator, final Authorizer authorizer, final Settings settings) {
- super(authenticator, authorizer, settings);
- }
-
- @Override
- public void channelRead(final ChannelHandlerContext ctx, final Object obj) throws Exception {
- if (obj instanceof HttpMessage && !WebSocketHandlerUtil.isWebSocket((HttpMessage)obj)) {
- final ChannelPipeline pipeline = ctx.pipeline();
- if (null != pipeline.get(HTTP_AUTH)) {
- pipeline.remove(HTTP_AUTH);
- }
- pipeline.addAfter(PIPELINE_AUTHENTICATOR, HTTP_AUTH, new HttpBasicAuthenticationHandler(authenticator, this.settings));
-
- if (authorizer != null) {
- final ChannelInboundHandlerAdapter authorizationHandler = new HttpBasicAuthorizationHandler(authorizer);
- pipeline.remove(PIPELINE_AUTHORIZER);
- pipeline.addAfter(HTTP_AUTH, PIPELINE_AUTHORIZER, authorizationHandler);
- }
-
- ctx.fireChannelRead(obj);
- } else {
- super.channelRead(ctx, obj);
- }
- }
-
-}
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SaslAuthenticationHandler.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SaslAuthenticationHandler.java
deleted file mode 100644
index 34345ec..0000000
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SaslAuthenticationHandler.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.server.handler;
-
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelHandler;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.util.Attribute;
-import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.apache.commons.lang3.tuple.Pair;
-import org.apache.tinkerpop.gremlin.server.GremlinServer;
-import org.apache.tinkerpop.gremlin.server.Settings;
-import org.apache.tinkerpop.gremlin.server.auth.AuthenticationException;
-import org.apache.tinkerpop.gremlin.server.auth.Authenticator;
-import org.apache.tinkerpop.gremlin.server.authz.Authorizer;
-import org.apache.tinkerpop.gremlin.server.channel.WebSocketChannelizer;
-import org.apache.tinkerpop.gremlin.util.Tokens;
-import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.SocketAddress;
-import java.time.Duration;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Base64;
-import java.util.HashMap;
-import java.util.List;
-import java.util.function.Function;
-
-/**
- * A SASL authentication handler that allows the {@link Authenticator} to be plugged into it. This handler is meant
- * to be used with protocols that process a {@link RequestMessage} such as the {@link WebSocketChannelizer}
- *
- * @author Stephen Mallette (<a href="http://stephen.genoprime.com">http://stephen.genoprime.com</a>)
- */
-@ChannelHandler.Sharable
-public class SaslAuthenticationHandler extends AbstractAuthenticationHandler {
- private static final Logger logger = LoggerFactory.getLogger(SaslAuthenticationHandler.class);
- private static final Base64.Decoder BASE64_DECODER = Base64.getDecoder();
- private static final Base64.Encoder BASE64_ENCODER = Base64.getEncoder();
- public static final Duration MAX_REQUEST_DEFERRABLE_DURATION = Duration.ofSeconds(5);
- private static final Logger auditLogger = LoggerFactory.getLogger(GremlinServer.AUDIT_LOGGER_NAME);
-
- protected final Settings settings;
-
- /**
- * @deprecated As of release 3.5.0, replaced by {@link #SaslAuthenticationHandler(Authenticator, Authorizer, Settings)}.
- */
- @Deprecated
- public SaslAuthenticationHandler(final Authenticator authenticator, final Settings settings) {
- this(authenticator, null, settings);
- }
-
- public SaslAuthenticationHandler(final Authenticator authenticator, final Authorizer authorizer, final Settings settings) {
- super(authenticator, authorizer);
- this.settings = settings;
- }
-
- @Override
- public void channelRead(final ChannelHandlerContext ctx, final Object msg) throws Exception {
- if (!(msg instanceof RequestMessage)) {
- logger.warn("{} only processes RequestMessage instances - received {} - channel closing",
- this.getClass().getSimpleName(), msg.getClass());
- ctx.close();
- return;
- }
-
- final RequestMessage requestMessage = (RequestMessage) msg;
-
- final Attribute<Authenticator.SaslNegotiator> negotiator = ctx.channel().attr(StateKey.NEGOTIATOR);
- final Attribute<RequestMessage> request = ctx.channel().attr(StateKey.REQUEST_MESSAGE);
- final Attribute<Pair<LocalDateTime, List<RequestMessage>>> deferredRequests = ctx.channel().attr(StateKey.DEFERRED_REQUEST_MESSAGES);
-
- if (negotiator.get() == null) {
- try {
- // First time through so save the request and send an AUTHENTICATE challenge with no data
- negotiator.set(authenticator.newSaslNegotiator(getRemoteInetAddress(ctx)));
- request.set(requestMessage);
- final ResponseMessage authenticate = ResponseMessage.build(requestMessage)
- .code(ResponseStatusCode.AUTHENTICATE).create();
- ctx.writeAndFlush(authenticate);
- } catch (Exception ex) {
- // newSaslNegotiator can cause troubles - if we don't catch and respond nicely the driver seems
- // to hang until timeout which isn't so nice. treating this like a server error as it means that
- // the Authenticator isn't really ready to deal with requests for some reason.
- logger.error(String.format("%s is not ready to handle requests - check its configuration or related services",
- authenticator.getClass().getSimpleName()), ex);
-
- respondWithError(
- requestMessage,
- builder -> builder.statusMessage("Authenticator is not ready to handle requests").code(ResponseStatusCode.SERVER_ERROR),
- ctx);
- }
-
- return;
- } else if (!requestMessage.getOp().equals(Tokens.OPS_AUTHENTICATION)) {
- // If authentication negotiation is pending, store subsequent non-authentication requests for later processing
- deferredRequests.setIfAbsent(new ImmutablePair<>(LocalDateTime.now(), new ArrayList<>()));
- deferredRequests.get().getValue().add(requestMessage);
-
- final Duration deferredDuration = Duration.between(deferredRequests.get().getKey(), LocalDateTime.now());
-
- if (deferredDuration.compareTo(MAX_REQUEST_DEFERRABLE_DURATION) > 0) {
- respondWithError(
- requestMessage,
- builder -> builder.statusMessage("Authentication did not finish in the allowed duration (" + MAX_REQUEST_DEFERRABLE_DURATION + "s).")
- .code(ResponseStatusCode.UNAUTHORIZED),
- ctx);
- return;
- }
-
- return;
- } else if (!requestMessage.getArgs().containsKey(Tokens.ARGS_SASL)) {
- // This is an authentication request that is missing a "sasl" argument.
- respondWithError(
- requestMessage,
- builder -> builder.statusMessage("Failed to authenticate").code(ResponseStatusCode.UNAUTHORIZED),
- ctx);
- return;
- }
-
- final Object saslObject = requestMessage.getArgs().get(Tokens.ARGS_SASL);
-
- if (!(saslObject instanceof String)) {
- respondWithError(
- requestMessage,
- builder -> builder
- .statusMessage("Incorrect type for : " + Tokens.ARGS_SASL + " - base64 encoded String is expected")
- .code(ResponseStatusCode.REQUEST_ERROR_MALFORMED_REQUEST),
- ctx);
- return;
- }
-
- try {
- final byte[] saslResponse = BASE64_DECODER.decode((String) saslObject);
- final byte[] saslMessage = negotiator.get().evaluateResponse(saslResponse);
-
- if (!negotiator.get().isComplete()) {
- // not done here - send back the sasl message for next challenge.
- final HashMap<String, Object> metadata = new HashMap<>();
- metadata.put(Tokens.ARGS_SASL, BASE64_ENCODER.encodeToString(saslMessage));
- final ResponseMessage authenticate = ResponseMessage.build(requestMessage)
- .statusAttributes(metadata)
- .code(ResponseStatusCode.AUTHENTICATE).create();
- ctx.writeAndFlush(authenticate);
- return;
- }
-
- final org.apache.tinkerpop.gremlin.server.auth.AuthenticatedUser user = negotiator.get().getAuthenticatedUser();
- ctx.channel().attr(StateKey.AUTHENTICATED_USER).set(user);
- // User name logged with the remote socket address and authenticator classname for audit logging
- if (settings.enableAuditLog) {
- String address = ctx.channel().remoteAddress().toString();
- if (address.startsWith("/") && address.length() > 1) address = address.substring(1);
- final String[] authClassParts = authenticator.getClass().toString().split("[.]");
- auditLogger.info("User {} with address {} authenticated by {}",
- user.getName(), address, authClassParts[authClassParts.length - 1]);
- }
- // If we have got here we are authenticated so remove the handler and pass
- // the original message down the pipeline for processing
- ctx.pipeline().remove(this);
- final RequestMessage original = request.get();
- ctx.fireChannelRead(original);
-
- // Also send deferred requests if there are any down the pipeline for processing
- if (deferredRequests.get() != null) {
- deferredRequests.getAndSet(null).getValue().forEach(ctx::fireChannelRead);
- }
- } catch (AuthenticationException ae) {
- respondWithError(
- requestMessage,
- builder -> builder.statusMessage(ae.getMessage()).code(ResponseStatusCode.UNAUTHORIZED),
- ctx);
- }
- }
-
- private void respondWithError(final RequestMessage requestMessage, final Function<ResponseMessage.Builder, ResponseMessage.Builder> buildResponse, final ChannelHandlerContext ctx) {
- final Attribute<RequestMessage> originalRequest = ctx.channel().attr(StateKey.REQUEST_MESSAGE);
- final Attribute<Pair<LocalDateTime, List<RequestMessage>>> deferredRequests = ctx.channel().attr(StateKey.DEFERRED_REQUEST_MESSAGES);
-
- if (!requestMessage.getOp().equals(Tokens.OPS_AUTHENTICATION)) {
- ctx.write(buildResponse.apply(ResponseMessage.build(requestMessage)).create());
- }
-
- if (originalRequest.get() != null) {
- ctx.write(buildResponse.apply(ResponseMessage.build(originalRequest.get())).create());
- }
-
- if (deferredRequests.get() != null) {
- deferredRequests
- .getAndSet(null).getValue().stream()
- .map(ResponseMessage::build)
- .map(buildResponse)
- .map(ResponseMessage.Builder::create)
- .forEach(ctx::write);
- }
-
- ctx.flush();
- }
-
- private InetAddress getRemoteInetAddress(final ChannelHandlerContext ctx) {
- final Channel channel = ctx.channel();
-
- if (null == channel)
- return null;
-
- final SocketAddress genericSocketAddr = channel.remoteAddress();
-
- if (!(genericSocketAddr instanceof InetSocketAddress))
- return null;
-
- return ((InetSocketAddress) genericSocketAddr).getAddress();
- }
-}
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/ServerSerializers.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/ServerSerializers.java
deleted file mode 100644
index b107b05..0000000
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/ServerSerializers.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.server.handler;
-
-import org.apache.tinkerpop.gremlin.util.MessageSerializer;
-import org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1;
-import org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryMapper;
-import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-final class ServerSerializers {
-
- private ServerSerializers() {}
-
- /**
- * Default binary serializer used by the server when the serializer requested does not match what is on the server.
- * This defaults to GraphBinary 1.0.
- */
- static final MessageSerializer<GraphBinaryMapper> DEFAULT_BINARY_SERIALIZER = new GraphBinaryMessageSerializerV1();
-
- /**
- * Default binary serializer used by the server when the serializer requested does not match what is on the server.
- * This defaults to GraphSON 3.0.
- */
- static final MessageSerializer<ObjectMapper> DEFAULT_TEXT_SERIALIZER = new GraphSONMessageSerializerV3();
-
-}
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/Session.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/Session.java
deleted file mode 100644
index 3849b84..0000000
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/Session.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.server.handler;
-
-import com.codahale.metrics.Timer;
-import io.netty.channel.Channel;
-import org.apache.tinkerpop.gremlin.server.GremlinServer;
-import org.apache.tinkerpop.gremlin.server.util.MetricManager;
-
-import java.util.concurrent.Future;
-import java.util.concurrent.RejectedExecutionException;
-import java.util.concurrent.ScheduledFuture;
-
-import static com.codahale.metrics.MetricRegistry.name;
-
-/**
- * Requests that arrive through the {@link UnifiedHandler} are all processed within a {@code Session} implementation.
- * A session accepts a {@link SessionTask} as the work it is meant to perform and those tasks are constructed from
- * incoming requests. A session may be as short-lived as processing a single task before exiting, as with the
- * {@link SingleTaskSession} or may be longer-lived by handling multiple tasks, as with the {@link MultiTaskSession}.
- */
-public interface Session extends Runnable {
-
- public static final Timer traversalOpTimer = MetricManager.INSTANCE.getTimer(name(GremlinServer.class, "op", "traversal"));
- public static final Timer evalOpTimer = MetricManager.INSTANCE.getTimer(name(GremlinServer.class, "op", "eval"));
-
- /**
- * Gets the identifier for the session.
- */
- String getSessionId();
-
- /**
- * Adds a task for session to complete.
- *
- * @throws RejectedExecutionException if the task cannot be queued
- */
- boolean submitTask(final SessionTask sessionTask) throws RejectedExecutionException;
-
- /**
- * Sets a reference to the job that will cancel this session if it exceeds its timeout period.
- */
- void setSessionCancelFuture(final ScheduledFuture<?> f);
-
- /**
- * Sets a reference to the job itself that is running this session.
- */
- void setSessionFuture(final Future<?> f);
-
- /**
- * Provides a general way to interrupt the session by way of a timeout.
- *
- * @param timeout the length of time that passed for the timeout to have triggered
- * @param causedBySession determines if the timeout triggered due to a particular request (i.e. {@code false} or
- * because of the session lifetime (i.e. {@code true}
- */
- void triggerTimeout(final long timeout, boolean causedBySession);
-
- /**
- * Determines if the supplied {@code Channel} object is the same as the one bound to the {@code Session}.
- */
- boolean isBoundTo(final Channel channel);
-
- /**
- * Determines if this session can accept additional tasks or not.
- */
- boolean isAcceptingTasks();
-
-}
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SessionException.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SessionException.java
deleted file mode 100644
index bd88393..0000000
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SessionException.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.server.handler;
-
-import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
-
-/**
- * An exception that holds the error-related {@link ResponseMessage} which is meant to be returned to the calling
- * client.
- *
- * @deprecated As of release 3.8.0, not replaced.
- */
-@Deprecated
-public class SessionException extends Exception {
- private final ResponseMessage responseMessage;
-
- public SessionException(final String message, final ResponseMessage responseMessage) {
- super(message);
- this.responseMessage = responseMessage;
- }
-
- public SessionException(final String message, final Throwable cause, final ResponseMessage responseMessage) {
- super(message, cause);
- this.responseMessage = responseMessage;
- }
-
- public ResponseMessage getResponseMessage() {
- return this.responseMessage;
- }
-}
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SessionTask.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SessionTask.java
deleted file mode 100644
index dc26463..0000000
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SessionTask.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.server.handler;
-
-import io.netty.channel.ChannelHandlerContext;
-import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.groovy.engine.GremlinExecutor;
-import org.apache.tinkerpop.gremlin.server.Context;
-import org.apache.tinkerpop.gremlin.server.GraphManager;
-import org.apache.tinkerpop.gremlin.server.OpProcessor;
-import org.apache.tinkerpop.gremlin.server.Settings;
-
-import java.util.concurrent.ScheduledExecutorService;
-
-/**
- * A {@code SessionTask} equates to a particular incoming request to the {@link UnifiedHandler} and is analogous to
- * a {@link Context} in the {@link OpProcessor} approach to handling requests to the server.
- *
- * @deprecated As of release 3.8.0, not replaced.
- */
-@Deprecated
-public class SessionTask extends Context {
- public SessionTask(final RequestMessage requestMessage, final ChannelHandlerContext ctx,
- final Settings settings, final GraphManager graphManager,
- final GremlinExecutor gremlinExecutor,
- final ScheduledExecutorService scheduledExecutorService) {
- super(requestMessage, ctx, settings, graphManager, gremlinExecutor, scheduledExecutorService);
- }
-}
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SingleTaskSession.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SingleTaskSession.java
deleted file mode 100644
index 4d49c02..0000000
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SingleTaskSession.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.server.handler;
-
-import org.apache.tinkerpop.gremlin.structure.Transaction;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.RejectedExecutionException;
-
-/**
- * A simple {@link Session} implementation that accepts one request, processes it and exits.
- *
- * @deprecated As of release 3.8.0, not replaced.
- */
-@Deprecated
-public class SingleTaskSession extends AbstractSession {
- private static final Logger logger = LoggerFactory.getLogger(SingleTaskSession.class);
- protected final SessionTask onlySessionTask;
-
- /**
- * Constructs a {@code SingleTaskSession} that has the task to execute supplied on construction.
- */
- public SingleTaskSession(final SessionTask onlySessionTask, final String sessionId,
- final ConcurrentMap<String, Session> sessions) {
- super(onlySessionTask, sessionId,true, sessions);
- this.onlySessionTask = onlySessionTask;
- }
-
- /**
- * The {@code SingleWorker} can only process one request so the initial construction of it already has the
- * request in it and no more can be added, therefore this method always return {@code false}.
- */
- @Override
- public boolean isAcceptingTasks() {
- return false;
- }
-
- @Override
- public void sendTimeoutResponseForUncommencedTask() {
- onlySessionTask.sendTimeoutResponse();
- }
-
- /**
- * This implementation only take a single {@link SessionTask} on construction - no additional tasks can be
- * submitted.
- */
- @Override
- public boolean submitTask(final SessionTask sessionTask) throws RejectedExecutionException {
- throw new UnsupportedOperationException("SingleWorker doesn't accept tasks beyond the one provided to the constructor");
- }
-
- @Override
- public void run() {
- sessionTaskStarted.set(true);
-
- // allow the Session to know about the thread that is running it - the thread really only has relevance
- // once the session has started.
- this.sessionThread = Thread.currentThread();
-
- try {
- startTransaction(onlySessionTask);
- process(onlySessionTask);
- } catch (SessionException we) {
- // if the close reason isn't already set then things stopped during gremlin execution somewhere and not
- // more external issues like channel close or timeouts.
- closeReason.compareAndSet(null, CloseReason.PROCESSING_EXCEPTION);
-
- logger.warn(we.getMessage(), we);
-
- // should have already rolledback - this is a safety valve
- closeTransactionSafely(onlySessionTask, Transaction.Status.ROLLBACK);
-
- onlySessionTask.writeAndFlush(we.getResponseMessage());
- } finally {
- closeReason.compareAndSet(null, CloseReason.EXIT_PROCESSING);
- close();
- }
- }
-
- @Override
- public String toString() {
- return String.format("%s - session: %s", SingleTaskSession.class.getSimpleName(), getSessionId());
- }
-}
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/StateKey.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/StateKey.java
index 4f69394..2e8cc75 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/StateKey.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/StateKey.java
@@ -18,16 +18,13 @@
*/
package org.apache.tinkerpop.gremlin.server.handler;
-import org.apache.commons.lang3.tuple.Pair;
-import org.apache.tinkerpop.gremlin.util.MessageSerializer;
-import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.server.auth.AuthenticatedUser;
-import org.apache.tinkerpop.gremlin.server.auth.Authenticator;
-import org.apache.tinkerpop.gremlin.server.op.session.Session;
+import io.netty.handler.codec.http.HttpHeaders;
import io.netty.util.AttributeKey;
+import org.apache.tinkerpop.gremlin.util.MessageSerializer;
+import org.apache.tinkerpop.gremlin.server.auth.AuthenticatedUser;
+import org.javatuples.Pair;
-import java.time.LocalDateTime;
-import java.util.List;
+import java.util.UUID;
/**
* Keys used in the various handlers to store state in the pipeline.
@@ -41,32 +38,22 @@
/**
* The key for the current serializer requested by the client.
*/
- public static final AttributeKey<MessageSerializer<?>> SERIALIZER = AttributeKey.valueOf("serializer");
+ public static final AttributeKey<Pair<String, MessageSerializer<?>>> SERIALIZER = AttributeKey.valueOf("serializer");
/**
- * The key to indicate if the serializer should use its binary format.
+ * The key for the current request headers.
*/
- public static final AttributeKey<Boolean> USE_BINARY = AttributeKey.valueOf("useBinary");
+ public static final AttributeKey<HttpHeaders> REQUEST_HEADERS = AttributeKey.valueOf("requestHeaders");
/**
- * The key for the current {@link Session} object.
+ * The key for the current request ID.
*/
- public static final AttributeKey<Session> SESSION = AttributeKey.valueOf("session");
+ public static final AttributeKey<UUID> REQUEST_ID = AttributeKey.valueOf("requestId");
/**
- * The key for the current SASL negotiator.
+ * The key for whether a {@link io.netty.handler.codec.http.HttpResponse} has been sent for the current response.
*/
- public static final AttributeKey<Authenticator.SaslNegotiator> NEGOTIATOR = AttributeKey.valueOf("negotiator");
-
- /**
- * The key for the current request.
- */
- public static final AttributeKey<RequestMessage> REQUEST_MESSAGE = AttributeKey.valueOf("request");
-
- /**
- * The key for the deferred requests.
- */
- public static final AttributeKey<Pair<LocalDateTime, List<RequestMessage>>> DEFERRED_REQUEST_MESSAGES = AttributeKey.valueOf("deferredRequests");
+ public static final AttributeKey<Boolean> HTTP_RESPONSE_SENT = AttributeKey.valueOf("responseSent");
/**
* The key for the current {@link AuthenticatedUser}.
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/UnifiedHandler.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/UnifiedHandler.java
deleted file mode 100644
index 2dfd284..0000000
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/UnifiedHandler.java
+++ /dev/null
@@ -1,359 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.server.handler;
-
-import io.netty.channel.ChannelHandler;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.SimpleChannelInboundHandler;
-import io.netty.handler.timeout.IdleState;
-import io.netty.handler.timeout.IdleStateEvent;
-import io.netty.util.ReferenceCountUtil;
-import org.apache.tinkerpop.gremlin.util.Tokens;
-import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.groovy.engine.GremlinExecutor;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
-import org.apache.tinkerpop.gremlin.process.traversal.Operator;
-import org.apache.tinkerpop.gremlin.process.traversal.Order;
-import org.apache.tinkerpop.gremlin.process.traversal.Pop;
-import org.apache.tinkerpop.gremlin.process.traversal.Scope;
-import org.apache.tinkerpop.gremlin.server.Channelizer;
-import org.apache.tinkerpop.gremlin.server.GraphManager;
-import org.apache.tinkerpop.gremlin.server.Settings;
-import org.apache.tinkerpop.gremlin.server.channel.UnifiedChannelizer;
-import org.apache.tinkerpop.gremlin.structure.Column;
-import org.apache.tinkerpop.gremlin.structure.T;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Future;
-import java.util.concurrent.RejectedExecutionException;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.TimeUnit;
-
-/**
- * Handler for websockets to be used with the {@link UnifiedChannelizer}.
- *
- * @deprecated As of release 3.8.0, not replaced.
- */
-@ChannelHandler.Sharable
-@Deprecated
-public class UnifiedHandler extends SimpleChannelInboundHandler<RequestMessage> {
- private static final Logger logger = LoggerFactory.getLogger(UnifiedHandler.class);
-
- protected final Settings settings;
- protected final GraphManager graphManager;
- protected final GremlinExecutor gremlinExecutor;
- protected final ScheduledExecutorService scheduledExecutorService;
- protected final ExecutorService sessionExecutor;
- protected final Channelizer channelizer;
-
- protected final ConcurrentMap<String, Session> sessions = new ConcurrentHashMap<>();
-
- /**
- * This may or may not be the full set of invalid binding keys. It is dependent on the static imports made to
- * Gremlin Server. This should get rid of the worst offenders though and provide a good message back to the
- * calling client.
- * <p/>
- * Use of {@code toUpperCase()} on the accessor values of {@link T} solves an issue where the {@code ScriptEngine}
- * ignores private scope on {@link T} and imports static fields.
- */
- protected static final Set<String> INVALID_BINDINGS_KEYS = new HashSet<>();
-
- static {
- INVALID_BINDINGS_KEYS.addAll(Arrays.asList(
- T.id.name(), T.key.name(),
- T.label.name(), T.value.name(),
- T.id.getAccessor(), T.key.getAccessor(),
- T.label.getAccessor(), T.value.getAccessor(),
- T.id.getAccessor().toUpperCase(), T.key.getAccessor().toUpperCase(),
- T.label.getAccessor().toUpperCase(), T.value.getAccessor().toUpperCase()));
-
- for (Column enumItem : Column.values()) {
- INVALID_BINDINGS_KEYS.add(enumItem.name());
- }
-
- for (Order enumItem : Order.values()) {
- INVALID_BINDINGS_KEYS.add(enumItem.name());
- }
-
- for (Operator enumItem : Operator.values()) {
- INVALID_BINDINGS_KEYS.add(enumItem.name());
- }
-
- for (Scope enumItem : Scope.values()) {
- INVALID_BINDINGS_KEYS.add(enumItem.name());
- }
-
- for (Pop enumItem : Pop.values()) {
- INVALID_BINDINGS_KEYS.add(enumItem.name());
- }
- }
-
- public UnifiedHandler(final Settings settings, final GraphManager graphManager,
- final GremlinExecutor gremlinExecutor,
- final ScheduledExecutorService scheduledExecutorService,
- final Channelizer channelizer) {
- this.settings = settings;
- this.graphManager = graphManager;
- this.gremlinExecutor = gremlinExecutor;
- this.scheduledExecutorService = scheduledExecutorService;
- this.channelizer = channelizer;
- this.sessionExecutor = gremlinExecutor.getExecutorService();
- }
-
- @Override
- protected void channelRead0(final ChannelHandlerContext ctx, final RequestMessage msg) throws Exception {
- try {
- try {
- validateRequest(msg, graphManager);
- } catch (SessionException we) {
- ctx.writeAndFlush(we.getResponseMessage());
- return;
- }
-
- // this is for backward compatibility for drivers still sending a close message. the close message was
- // removed in 3.5.0 but then added back for 3.5.2.
- if (msg.getOp().equals(Tokens.OPS_CLOSE)) {
- ctx.writeAndFlush(ResponseMessage.build(msg)
- .code(ResponseStatusCode.NO_CONTENT)
- .create());
- return;
- }
-
- final Optional<String> optMultiTaskSession = msg.optionalArgs(Tokens.ARGS_SESSION);
- final String sessionId = optMultiTaskSession.orElse(msg.getRequestId().toString());
-
- // the SessionTask is really a Context from OpProcessor. we still need the GremlinExecutor/ScriptEngine
- // config that is all rigged up into the server nicely right now so it seemed best to just keep the general
- // Context object but extend (essentially rename) it to SessionTask so that it better fits the nomenclature
- // we have here. when we drop OpProcessor stuff and rid ourselves of GremlinExecutor then we can probably
- // pare down the constructor for SessionTask further.
- final SessionTask sessionTask = new SessionTask(msg, ctx, settings, graphManager,
- gremlinExecutor, scheduledExecutorService);
-
- if (sessions.containsKey(sessionId)) {
- final Session session = sessions.get(sessionId);
-
- // check if the session is bound to this channel, thus one client per session
- if (!session.isBoundTo(ctx.channel())) {
- final String sessionClosedMessage = String.format("Session %s is not bound to the connecting client", sessionId);
- final ResponseMessage response = ResponseMessage.build(msg).code(ResponseStatusCode.SERVER_ERROR)
- .statusMessage(sessionClosedMessage).create();
- ctx.writeAndFlush(response);
- return;
- }
-
- // if the session is done accepting tasks then error time
- if (session.isAcceptingTasks() && !session.submitTask(sessionTask)) {
- final String sessionClosedMessage = String.format(
- "Session %s is no longer accepting requests as it has been closed", sessionId);
- final ResponseMessage response = ResponseMessage.build(msg).code(ResponseStatusCode.SERVER_ERROR)
- .statusMessage(sessionClosedMessage).create();
- ctx.writeAndFlush(response);
- }
- } else {
- // determine the type of session to start - one that processes the current request only and close OR
- // one that will process this current request and ones that may arrive in the future.
- final Session session = optMultiTaskSession.isPresent() ?
- createMultiTaskSession(sessionTask, sessionId) :
- createSingleTaskSession(sessionTask, sessionId);
-
- // queue the session to startup when a thread is ready to take it
- final Future<?> sessionFuture = sessionExecutor.submit(session);
- session.setSessionFuture(sessionFuture);
- sessions.put(sessionId, session);
-
- // determine the max session life. for multi that's going to be "session life" and for single that
- // will be the span of the request timeout
- final long seto = sessionTask.getRequestTimeout();
- final long sessionLife = optMultiTaskSession.isPresent() ? settings.sessionLifetimeTimeout : seto;
-
- // if timeout is enabled when greater than zero schedule up a timeout which is a session life timeout
- // for a multi or technically a request timeout for a single. this will be cancelled when the session
- // closes by way of other reasons (i.e. success or exception) - see AbstractSession#close()
- if (seto > 0) {
- final ScheduledFuture<?> sessionCancelFuture =
- scheduledExecutorService.schedule(
- () -> session.triggerTimeout(sessionLife, optMultiTaskSession.isPresent()),
- sessionLife, TimeUnit.MILLISECONDS);
- session.setSessionCancelFuture(sessionCancelFuture);
- }
- }
- } catch (RejectedExecutionException ree) {
- logger.warn(ree.getMessage());
-
- // generic message seems ok here? like, you would know what you were submitting on, i.e. session or
- // sessionless, when you got this error. probably don't need gory details.
- final ResponseMessage response = ResponseMessage.build(msg).code(ResponseStatusCode.TOO_MANY_REQUESTS)
- .statusMessage("Rate limiting").create();
- ctx.writeAndFlush(response);
- } finally {
- ReferenceCountUtil.release(msg);
- }
- }
-
- protected void validateRequest(final RequestMessage message, final GraphManager graphManager) throws SessionException {
- // close message just needs to be accounted for here as of 3.5.2. it will not contain a "gremlin" arg. unified
- // channelizer basically ignores the close message otherwise
- if (!message.getOp().equals(Tokens.OPS_CLOSE) && !message.optionalArgs(Tokens.ARGS_GREMLIN).isPresent()) {
- final String msg = String.format("A message with a [%s] op code requires a [%s] argument.", message.getOp(), Tokens.ARGS_GREMLIN);
- throw new SessionException(msg, ResponseMessage.build(message).code(ResponseStatusCode.REQUEST_ERROR_INVALID_REQUEST_ARGUMENTS).statusMessage(msg).create());
- }
-
- if (message.optionalArgs(Tokens.ARGS_SESSION).isPresent()) {
- final Optional<Object> mtx = message.optionalArgs(Tokens.ARGS_MANAGE_TRANSACTION);
- if (mtx.isPresent() && !(mtx.get() instanceof Boolean)) {
- final String msg = String.format("%s argument must be of type boolean", Tokens.ARGS_MANAGE_TRANSACTION);
- throw new SessionException(msg, ResponseMessage.build(message).code(ResponseStatusCode.REQUEST_ERROR_INVALID_REQUEST_ARGUMENTS).statusMessage(msg).create());
- }
-
- final Optional<Object> msae = message.optionalArgs(Tokens.ARGS_MAINTAIN_STATE_AFTER_EXCEPTION);
- if (msae.isPresent() && !(msae.get() instanceof Boolean)) {
- final String msg = String.format("%s argument must be of type boolean", Tokens.ARGS_MAINTAIN_STATE_AFTER_EXCEPTION);
- throw new SessionException(msg, ResponseMessage.build(message).code(ResponseStatusCode.REQUEST_ERROR_INVALID_REQUEST_ARGUMENTS).statusMessage(msg).create());
- }
- } else {
- if (message.optionalArgs(Tokens.ARGS_MANAGE_TRANSACTION).isPresent()) {
- final String msg = String.format("%s argument only applies to requests made for sessions", Tokens.ARGS_MANAGE_TRANSACTION);
- throw new SessionException(msg, ResponseMessage.build(message).code(ResponseStatusCode.REQUEST_ERROR_INVALID_REQUEST_ARGUMENTS).statusMessage(msg).create());
- }
-
- if (message.optionalArgs(Tokens.ARGS_MAINTAIN_STATE_AFTER_EXCEPTION).isPresent()) {
- final String msg = String.format("%s argument only applies to requests made for sessions", Tokens.ARGS_MAINTAIN_STATE_AFTER_EXCEPTION);
- throw new SessionException(msg, ResponseMessage.build(message).code(ResponseStatusCode.REQUEST_ERROR_INVALID_REQUEST_ARGUMENTS).statusMessage(msg).create());
- }
- }
-
- if (message.optionalArgs(Tokens.ARGS_BINDINGS).isPresent()) {
- final Map bindings = (Map) message.getArgs().get(Tokens.ARGS_BINDINGS);
- if (IteratorUtils.anyMatch(bindings.keySet().iterator(), k -> null == k || !(k instanceof String))) {
- final String msg = String.format("The [%s] message is using one or more invalid binding keys - they must be of type String and cannot be null", Tokens.OPS_EVAL);
- throw new SessionException(msg, ResponseMessage.build(message).code(ResponseStatusCode.REQUEST_ERROR_INVALID_REQUEST_ARGUMENTS).statusMessage(msg).create());
- }
-
- final Set<String> badBindings = IteratorUtils.set(IteratorUtils.<String>filter(bindings.keySet().iterator(), INVALID_BINDINGS_KEYS::contains));
- if (!badBindings.isEmpty()) {
- final String msg = String.format("The [%s] message supplies one or more invalid parameters key of [%s] - these are reserved names.", Tokens.OPS_EVAL, badBindings);
- throw new SessionException(msg, ResponseMessage.build(message).code(ResponseStatusCode.REQUEST_ERROR_INVALID_REQUEST_ARGUMENTS).statusMessage(msg).create());
- }
-
- // ignore control bindings that get passed in with the "#jsr223" prefix - those aren't used in compilation
- if (IteratorUtils.count(IteratorUtils.filter(bindings.keySet().iterator(), k -> !k.toString().startsWith("#jsr223"))) > settings.maxParameters) {
- final String msg = String.format("The [%s] message contains %s bindings which is more than is allowed by the server %s configuration",
- Tokens.OPS_EVAL, bindings.size(), settings.maxParameters);
- throw new SessionException(msg, ResponseMessage.build(message).code(ResponseStatusCode.REQUEST_ERROR_INVALID_REQUEST_ARGUMENTS).statusMessage(msg).create());
- }
- }
-
- // validations for specific op codes
- if (message.getOp().equals(Tokens.OPS_EVAL)) {
- // eval must have gremlin that is type of String
- // likely a problem with the driver and how it is sending requests
- if (!(message.optionalArgs(Tokens.ARGS_GREMLIN).get() instanceof String)) {
- final String msg = String.format("A message with [%s] op code requires a [%s] argument that is of type %s.",
- Tokens.OPS_EVAL, Tokens.ARGS_GREMLIN, String.class.getSimpleName());
- throw new SessionException(msg, ResponseMessage.build(message).code(ResponseStatusCode.REQUEST_ERROR_INVALID_REQUEST_ARGUMENTS).statusMessage(msg).create());
- }
- } else if (message.getOp().equals(Tokens.OPS_BYTECODE)) {
- // bytecode should have gremlin that is of type Bytecode
- // likely a problem with the driver and how it is sending requests
- if (!(message.optionalArgs(Tokens.ARGS_GREMLIN).get() instanceof Bytecode)) {
- final String msg = String.format("A message with [%s] op code requires a [%s] argument that is of type %s.",
- Tokens.OPS_BYTECODE, Tokens.ARGS_GREMLIN, Bytecode.class.getSimpleName());
- throw new SessionException(msg, ResponseMessage.build(message).code(ResponseStatusCode.REQUEST_ERROR_INVALID_REQUEST_ARGUMENTS).statusMessage(msg).create());
- }
-
- // bytecode should have an alias bound
- final Optional<Map<String, String>> aliases = message.optionalArgs(Tokens.ARGS_ALIASES);
- if (!aliases.isPresent()) {
- final String msg = String.format("A message with [%s] op code requires a [%s] argument.", Tokens.OPS_BYTECODE, Tokens.ARGS_ALIASES);
- throw new SessionException(msg, ResponseMessage.build(message).code(ResponseStatusCode.REQUEST_ERROR_INVALID_REQUEST_ARGUMENTS).statusMessage(msg).create());
- }
-
- if (aliases.get().size() != 1 || !aliases.get().containsKey(Tokens.VAL_TRAVERSAL_SOURCE_ALIAS)) {
- final String msg = String.format("A message with [%s] op code requires the [%s] argument to be a Map containing one alias assignment named '%s'.",
- Tokens.OPS_BYTECODE, Tokens.ARGS_ALIASES, Tokens.VAL_TRAVERSAL_SOURCE_ALIAS);
- throw new SessionException(msg, ResponseMessage.build(message).code(ResponseStatusCode.REQUEST_ERROR_INVALID_REQUEST_ARGUMENTS).statusMessage(msg).create());
- }
-
- final String traversalSourceBindingForAlias = aliases.get().values().iterator().next();
- if (!graphManager.getTraversalSourceNames().contains(traversalSourceBindingForAlias)) {
- final String msg = String.format("The traversal source [%s] for alias [%s] is not configured on the server.", traversalSourceBindingForAlias, Tokens.VAL_TRAVERSAL_SOURCE_ALIAS);
- throw new SessionException(msg, ResponseMessage.build(message).code(ResponseStatusCode.REQUEST_ERROR_INVALID_REQUEST_ARGUMENTS).statusMessage(msg).create());
- }
- }
- }
-
- @Override
- public void userEventTriggered(final ChannelHandlerContext ctx, final Object evt) throws Exception {
- // only need to handle this event if the idle monitor is on
- if (!channelizer.supportsIdleMonitor()) return;
-
- if (evt instanceof IdleStateEvent) {
- final IdleStateEvent e = (IdleStateEvent) evt;
-
- // if no requests (reader) then close, if no writes from server to client then ping. clients should
- // periodically ping the server, but coming from this direction allows the server to kill channels that
- // have dead clients on the other end
- if (e.state() == IdleState.READER_IDLE) {
- logger.info("Closing channel - client is disconnected after idle period of " + settings.idleConnectionTimeout + " " + ctx.channel().id().asShortText());
- ctx.close();
- } else if (e.state() == IdleState.WRITER_IDLE && settings.keepAliveInterval > 0) {
- logger.info("Checking channel - sending ping to client after idle period of " + settings.keepAliveInterval + " " + ctx.channel().id().asShortText());
- ctx.writeAndFlush(channelizer.createIdleDetectionMessage());
- }
- }
- }
-
- /**
- * Called when creating a single task session where the provided {@link SessionTask} will be the only one to be
- * executed and can therefore take a more efficient execution path.
- */
- protected Session createSingleTaskSession(final SessionTask sessionTask, final String sessionId) {
- return new SingleTaskSession(sessionTask, sessionId, sessions);
- }
-
- /**
- * Called when creating a {@link Session} that will be long-lived to extend over multiple requests and therefore
- * process the provided {@link SessionTask} as well as ones that may arrive in the future.
- */
- protected Session createMultiTaskSession(final SessionTask sessionTask, final String sessionId) {
- return new MultiTaskSession(sessionTask, sessionId, sessions);
- }
-
- public boolean isActiveSession(final String sessionId) {
- return sessions.containsKey(sessionId);
- }
-
- public int getActiveSessionCount() {
- return sessions.size();
- }
-}
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WebSocketAuthorizationHandler.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WebSocketAuthorizationHandler.java
deleted file mode 100644
index 22df524..0000000
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WebSocketAuthorizationHandler.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.server.handler;
-
-import io.netty.channel.ChannelHandler;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelInboundHandlerAdapter;
-
-import org.apache.tinkerpop.gremlin.util.Tokens;
-import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
-import org.apache.tinkerpop.gremlin.server.GremlinServer;
-import org.apache.tinkerpop.gremlin.server.auth.AuthenticatedUser;
-import org.apache.tinkerpop.gremlin.server.authz.Authorizer;
-import org.apache.tinkerpop.gremlin.server.authz.AuthorizationException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Map;
-
-
-/**
- * An authorization handler for the websockets channel that allows the {@link Authorizer} to be plugged into it.
- *
- * @author Marc de Lignie
- */
-@ChannelHandler.Sharable
-public class WebSocketAuthorizationHandler extends ChannelInboundHandlerAdapter {
- private static final Logger logger = LoggerFactory.getLogger(WebSocketAuthorizationHandler.class);
- private static final Logger auditLogger = LoggerFactory.getLogger(GremlinServer.AUDIT_LOGGER_NAME);
-
- private AuthenticatedUser user;
- private final Authorizer authorizer;
-
- public WebSocketAuthorizationHandler(Authorizer authorizer) {
- this.authorizer = authorizer;
- }
-
- @Override
- public void channelRead(final ChannelHandlerContext ctx, final Object msg) {
- if (msg instanceof RequestMessage){
- final RequestMessage requestMessage = (RequestMessage) msg;
- try {
- user = ctx.channel().attr(StateKey.AUTHENTICATED_USER).get();
- if (null == user) { // This is expected when using the AllowAllAuthenticator
- user = AuthenticatedUser.ANONYMOUS_USER;
- }
- switch (requestMessage.getOp()) {
- case Tokens.OPS_BYTECODE:
- final Bytecode bytecode = (Bytecode) requestMessage.getArgs().get(Tokens.ARGS_GREMLIN);
- final Map<String, String> aliases = (Map<String, String>) requestMessage.getArgs().get(Tokens.ARGS_ALIASES);
- final Bytecode restrictedBytecode = authorizer.authorize(user, bytecode, aliases);
- final RequestMessage restrictedMsg = RequestMessage.from(requestMessage)
- .addArg(Tokens.ARGS_GREMLIN, restrictedBytecode)
- .addArg(Tokens.ARGS_ALIASES, aliases).create();
- ctx.fireChannelRead(restrictedMsg);
- break;
- case Tokens.OPS_EVAL:
- authorizer.authorize(user, requestMessage);
- ctx.fireChannelRead(requestMessage);
- break;
- case Tokens.OPS_CLOSE:
- ctx.fireChannelRead(requestMessage);
- break;
- default:
- throw new AuthorizationException("This AuthorizationHandler only handles requests with OPS_BYTECODE or OPS_EVAL.");
- }
- } catch (AuthorizationException ex) { // Expected: users can alternate between allowed and disallowed requests
- String address = ctx.channel().remoteAddress().toString();
- if (address.startsWith("/") && address.length() > 1) address = address.substring(1);
- auditLogger.info("User {} with address {} attempted an unauthorized request for {} operation: {}",
- user.getName(), address, requestMessage.getOp(), requestMessage.getArgs().get(Tokens.ARGS_GREMLIN));
- interruptEvaluation(ctx, requestMessage, ex.getMessage());
- } catch (Exception ex) {
- logger.error("{} is not ready to handle requests - unknown error",
- authorizer.getClass().getSimpleName());
- interruptEvaluation(ctx, requestMessage, "Unknown error in gremlin-server");
- }
- } else {
- logger.warn("{} only processes RequestMessage instances - received {} - channel closing",
- this.getClass().getSimpleName(), msg.getClass());
- ctx.close();
- }
- }
-
- private void interruptEvaluation(final ChannelHandlerContext ctx, final RequestMessage requestMessage, final String errorMessage) {
- final ResponseMessage error = ResponseMessage.build(requestMessage)
- .statusMessage("Failed to authorize: " + errorMessage)
- .code(ResponseStatusCode.UNAUTHORIZED).create();
- ctx.writeAndFlush(error);
- }
-}
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WebSocketHandlerUtil.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WebSocketHandlerUtil.java
deleted file mode 100644
index ee37e44..0000000
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WebSocketHandlerUtil.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.server.handler;
-
-import io.netty.handler.codec.http.HttpMessage;
-
-import static io.netty.handler.codec.http.HttpHeaderNames.UPGRADE;
-import static io.netty.handler.codec.http.HttpHeaderNames.CONNECTION;
-
-/**
- * A class to handle common WebSocket operations.
- *
- * @author Keith Lohnes lohnesk@gmail.com
- */
-final class WebSocketHandlerUtil {
-
- static boolean isWebSocket(final HttpMessage msg) {
- final String connectionHeader = msg.headers().get(CONNECTION);
- final String upgradeHeader = msg.headers().get(UPGRADE);
- return (null != connectionHeader && connectionHeader.equalsIgnoreCase("Upgrade")) ||
- (null != upgradeHeader && upgradeHeader.equalsIgnoreCase("WebSocket"));
- }
-}
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsAndHttpChannelizerHandler.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsAndHttpChannelizerHandler.java
deleted file mode 100644
index 856a6d4..0000000
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsAndHttpChannelizerHandler.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.server.handler;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import io.netty.channel.ChannelHandler;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelInboundHandlerAdapter;
-import io.netty.channel.ChannelPipeline;
-import io.netty.handler.codec.http.HttpMessage;
-import org.apache.tinkerpop.gremlin.server.Channelizer;
-import org.apache.tinkerpop.gremlin.server.channel.WebSocketChannelizer;
-import org.apache.tinkerpop.gremlin.server.channel.WsAndHttpChannelizer;
-import org.apache.tinkerpop.gremlin.server.util.ServerGremlinExecutor;
-
-import static org.apache.tinkerpop.gremlin.server.AbstractChannelizer.PIPELINE_HTTP_AGGREGATOR;
-import static org.apache.tinkerpop.gremlin.server.AbstractChannelizer.PIPELINE_HTTP_USER_AGENT_HANDLER;
-import static org.apache.tinkerpop.gremlin.server.channel.WebSocketChannelizer.PIPELINE_AUTHENTICATOR;
-import static org.apache.tinkerpop.gremlin.server.channel.WebSocketChannelizer.PIPELINE_REQUEST_HANDLER;
-
-/**
- * A ChannelInboundHandlerAdapter for use with {@link WsAndHttpChannelizer} that toggles between WebSockets
- * and http.
- *
- * @author Keith Lohnes lohnesk@gmail.com
- */
-@ChannelHandler.Sharable
-public class WsAndHttpChannelizerHandler extends ChannelInboundHandlerAdapter {
-
- private static final Logger logger = LoggerFactory.getLogger(WsAndHttpChannelizerHandler.class);
-
- private final WebSocketChannelizer wsChannelizer = new WebSocketChannelizer();
- private HttpGremlinEndpointHandler httpGremlinEndpointHandler;
-
- public void init(final ServerGremlinExecutor serverGremlinExecutor, final HttpGremlinEndpointHandler httpGremlinEndpointHandler) {
- //WebSocketChannelizer has everything needed for the http endpoint to work
- wsChannelizer.init(serverGremlinExecutor);
- this.httpGremlinEndpointHandler = httpGremlinEndpointHandler;
- }
-
- public Channelizer getWsChannelizer() {
- return wsChannelizer;
- }
-
- public void configure(final ChannelPipeline pipeline) {
- wsChannelizer.configure(pipeline);
- }
-
- @Override
- public void channelRead(final ChannelHandlerContext ctx, final Object obj) {
- final ChannelPipeline pipeline = ctx.pipeline();
- if (obj instanceof HttpMessage && !WebSocketHandlerUtil.isWebSocket((HttpMessage)obj)) {
- // If the message is for HTTP and not WS then this handler injects the HTTP user-agent and endpoint handlers
- // in front of the HTTP aggregator to intercept the HttpMessage.
- // This replaces the WS server protocol handler so that the pipeline initially looks like this:
- //
- // IdleStateHandler -> HttpResponseEncoder -> HttpRequestDecoder ->
- // WsAndHttpChannelizerHandler -> HttpObjectAggregator ->
- // WebSocketServerCompressionHandler -> WebSocketServerProtocolHandshakeHandler ->
- // Utf8FrameValidator -> WebSocketServerProtocolHandler -> (more websockets)
- //
- // and shifts to this (setting aside the authentication condition):
- //
- // IdleStateHandler -> HttpResponseEncoder -> HttpRequestDecoder ->
- // WsAndHttpChannelizerHandler -> HttpObjectAggregator ->
- // HttpUserAgentHandler -> HttpGremlinEndpointHandler ->
- // WebSocketServerCompressionHandler -> WebSocketServerProtocolHandshakeHandler ->
- // Utf8FrameValidator -> (more websockets)
- pipeline.remove(PIPELINE_REQUEST_HANDLER);
- if (null != pipeline.get(PIPELINE_HTTP_USER_AGENT_HANDLER)) {
- pipeline.remove(PIPELINE_HTTP_USER_AGENT_HANDLER);
- }
- if (null != pipeline.get(PIPELINE_AUTHENTICATOR)) {
- final ChannelHandler authenticator = pipeline.get(PIPELINE_AUTHENTICATOR);
- pipeline.remove(PIPELINE_AUTHENTICATOR);
- pipeline.addAfter(PIPELINE_HTTP_AGGREGATOR, PIPELINE_AUTHENTICATOR, authenticator);
- pipeline.addAfter(PIPELINE_AUTHENTICATOR, PIPELINE_HTTP_USER_AGENT_HANDLER, new HttpUserAgentHandler());
- pipeline.addAfter(PIPELINE_HTTP_USER_AGENT_HANDLER, PIPELINE_REQUEST_HANDLER, this.httpGremlinEndpointHandler);
- } else {
- pipeline.addAfter(PIPELINE_HTTP_AGGREGATOR, PIPELINE_HTTP_USER_AGENT_HANDLER, new HttpUserAgentHandler());
- pipeline.addAfter(PIPELINE_HTTP_USER_AGENT_HANDLER, PIPELINE_REQUEST_HANDLER, this.httpGremlinEndpointHandler);
- // Note that channelRead()'s do not propagate down the pipeline past HttpGremlinEndpointHandler
- }
- }
- ctx.fireChannelRead(obj);
- }
-
- @Override
- public void exceptionCaught(final ChannelHandlerContext ctx, final Throwable cause) {
- // The log printing here is necessary because when an exception thrown by Netty reaches this method,
- // if the error is not printed, the server side will not be able to perceive what has happened.
- // For example, if the maxContentLength in JanusGraph's Gremlin-Server configuration is set to 65536,
- // and the client sends data over this size via WebSocket, the JanusGraph server logs will appear normal,
- // but the client will experience a disconnection, making it difficult to immediately identify the cause of the issue.
- logger.error("Could not process the request", cause);
- ctx.close();
- }
-
-
-}
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsGremlinBinaryRequestDecoder.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsGremlinBinaryRequestDecoder.java
deleted file mode 100644
index 227b2f7..0000000
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsGremlinBinaryRequestDecoder.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.server.handler;
-
-import org.apache.tinkerpop.gremlin.util.MessageSerializer;
-import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.util.ser.SerializationException;
-import io.netty.buffer.ByteBuf;
-import io.netty.channel.ChannelHandler;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.MessageToMessageDecoder;
-import io.netty.handler.codec.http.websocketx.BinaryWebSocketFrame;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.nio.charset.Charset;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Decodes the contents of a {@code BinaryWebSocketFrame}. Binary-based frames assume that the format is encoded
- * in the first initial bytes of the message. From there the proper serializer can be chosen and the message
- * can then be deserialized.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-@ChannelHandler.Sharable
-public class WsGremlinBinaryRequestDecoder extends MessageToMessageDecoder<BinaryWebSocketFrame> {
- private static final Logger logger = LoggerFactory.getLogger(WsGremlinBinaryRequestDecoder.class);
-
- private static final Charset UTF8 = Charset.forName("UTF-8");
- private final Map<String, MessageSerializer<?>> serializers;
-
- public WsGremlinBinaryRequestDecoder(final Map<String, MessageSerializer<?>> serializers) {
- this.serializers = serializers;
- }
-
- @Override
- protected void decode(final ChannelHandlerContext channelHandlerContext, final BinaryWebSocketFrame frame, final List<Object> objects) throws Exception {
- final ByteBuf messageBytes = frame.content();
- final byte len = messageBytes.readByte();
- if (len <= 0) {
- objects.add(RequestMessage.INVALID);
- return;
- }
-
- final ByteBuf contentTypeBytes = channelHandlerContext.alloc().buffer(len);
- try {
- messageBytes.readBytes(contentTypeBytes);
- final String contentType = contentTypeBytes.toString(UTF8);
- final MessageSerializer<?> serializer = select(contentType, ServerSerializers.DEFAULT_BINARY_SERIALIZER);
-
- // it's important to re-initialize these channel attributes as they apply globally to the channel. in
- // other words, the next request to this channel might not come with the same configuration and mixed
- // state can carry through from one request to the next
- channelHandlerContext.channel().attr(StateKey.SESSION).set(null);
- channelHandlerContext.channel().attr(StateKey.SERIALIZER).set(serializer);
- channelHandlerContext.channel().attr(StateKey.USE_BINARY).set(true);
-
- try {
- objects.add(serializer.deserializeRequest(messageBytes.discardReadBytes()));
- } catch (SerializationException se) {
- logger.warn("Serialization error while decoding request", se);
- objects.add(RequestMessage.INVALID);
- }
- } finally {
- contentTypeBytes.release();
- }
- }
-
- private MessageSerializer<?> select(final String mimeType, final MessageSerializer<?> defaultSerializer) {
- if (logger.isWarnEnabled() && !serializers.containsKey(mimeType))
- logger.warn("Gremlin Server is not configured with a serializer for the requested mime type [{}] - using {} by default",
- mimeType, defaultSerializer.getClass().getName());
-
- return serializers.getOrDefault(mimeType, defaultSerializer);
- }
-}
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsGremlinCloseRequestDecoder.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsGremlinCloseRequestDecoder.java
deleted file mode 100644
index 5e64eb8..0000000
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsGremlinCloseRequestDecoder.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.server.handler;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.channel.ChannelHandler;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.MessageToMessageDecoder;
-import io.netty.handler.codec.http.websocketx.CloseWebSocketFrame;
-import org.apache.tinkerpop.gremlin.util.MessageSerializer;
-import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.util.ser.SerializationException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.nio.charset.Charset;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Handles close requests over web sockets. If the request is session-based then the close operation will not only close
- * the channel but also close the session and rollback uncommitted transactions.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-@ChannelHandler.Sharable
-public class WsGremlinCloseRequestDecoder extends MessageToMessageDecoder<CloseWebSocketFrame> {
- private static final Logger logger = LoggerFactory.getLogger(WsGremlinCloseRequestDecoder.class);
-
- private static final Charset UTF8 = Charset.forName("UTF-8");
- private final Map<String, MessageSerializer<?>> serializers;
-
- public WsGremlinCloseRequestDecoder(final Map<String, MessageSerializer<?>> serializers) {
- this.serializers = serializers;
- }
-
- @Override
- protected void decode(final ChannelHandlerContext channelHandlerContext, final CloseWebSocketFrame frame, final List<Object> objects) throws Exception {
- final ByteBuf messageBytes = frame.content();
- final byte len = messageBytes.readByte();
- if (len <= 0) {
- objects.add(RequestMessage.INVALID);
- return;
- }
-
- final ByteBuf contentTypeBytes = channelHandlerContext.alloc().buffer(len);
- try {
- messageBytes.readBytes(contentTypeBytes);
- final String contentType = contentTypeBytes.toString(UTF8);
- final MessageSerializer<?> serializer = select(contentType, ServerSerializers.DEFAULT_BINARY_SERIALIZER);
-
- // it's important to re-initialize these channel attributes as they apply globally to the channel. in
- // other words, the next request to this channel might not come with the same configuration and mixed
- // state can carry through from one request to the next
- channelHandlerContext.channel().attr(StateKey.SESSION).set(null);
- channelHandlerContext.channel().attr(StateKey.SERIALIZER).set(serializer);
- channelHandlerContext.channel().attr(StateKey.USE_BINARY).set(true);
-
- try {
- objects.add(serializer.deserializeRequest(messageBytes.discardReadBytes()));
- } catch (SerializationException se) {
- objects.add(RequestMessage.INVALID);
- }
- } finally {
- contentTypeBytes.release();
- }
- }
-
- private MessageSerializer<?> select(final String mimeType, final MessageSerializer<?> defaultSerializer) {
- if (logger.isWarnEnabled() && !serializers.containsKey(mimeType))
- logger.warn("Gremlin Server is not configured with a serializer for the requested mime type [{}] - using {} by default",
- mimeType, defaultSerializer.getClass().getName());
-
- return serializers.getOrDefault(mimeType, defaultSerializer);
- }
-}
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsGremlinResponseFrameEncoder.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsGremlinResponseFrameEncoder.java
deleted file mode 100644
index ae9fc10..0000000
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsGremlinResponseFrameEncoder.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.server.handler;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.channel.ChannelHandler;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.MessageToMessageEncoder;
-import io.netty.handler.codec.http.websocketx.BinaryWebSocketFrame;
-import io.netty.handler.codec.http.websocketx.TextWebSocketFrame;
-
-import java.util.List;
-
-/**
- * Encodes {@code ByteBuf} and {@code String} values to Websocket frames.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-@ChannelHandler.Sharable
-public class WsGremlinResponseFrameEncoder extends MessageToMessageEncoder<Frame> {
- @Override
- protected void encode(final ChannelHandlerContext ctx, final Frame o, final List<Object> objects) throws Exception {
- if (o.getMsg() instanceof ByteBuf)
- objects.add(new BinaryWebSocketFrame((ByteBuf) o.getMsg()));
- else if (o.getMsg() instanceof String)
- objects.add(new TextWebSocketFrame(true, 0, o.getMsg().toString()));
- }
-}
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsGremlinTextRequestDecoder.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsGremlinTextRequestDecoder.java
deleted file mode 100644
index 8c564ac..0000000
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsGremlinTextRequestDecoder.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.server.handler;
-
-import org.apache.tinkerpop.gremlin.util.MessageSerializer;
-import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.util.ser.MessageTextSerializer;
-import org.apache.tinkerpop.gremlin.util.ser.SerializationException;
-import io.netty.channel.ChannelHandler;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.MessageToMessageDecoder;
-import io.netty.handler.codec.http.websocketx.TextWebSocketFrame;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * Decodes the contents of a {@link TextWebSocketFrame}. Text-based frames are always assumed to be
- * "application/json" when it comes to serialization.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-@ChannelHandler.Sharable
-public class WsGremlinTextRequestDecoder extends MessageToMessageDecoder<TextWebSocketFrame> {
- private static final Logger logger = LoggerFactory.getLogger(WsGremlinTextRequestDecoder.class);
-
- private final Map<String, MessageSerializer<?>> serializers;
-
- public WsGremlinTextRequestDecoder(final Map<String, MessageSerializer<?>> serializers) {
- this.serializers = serializers;
- }
-
- @Override
- protected void decode(final ChannelHandlerContext channelHandlerContext, final TextWebSocketFrame frame, final List<Object> objects) throws Exception {
- try {
- // the default serializer must be a MessageTextSerializer instance to be compatible with this decoder
- final MessageTextSerializer<?> serializer = (MessageTextSerializer<?>) select("application/json", ServerSerializers.DEFAULT_TEXT_SERIALIZER);
-
- // it's important to re-initialize these channel attributes as they apply globally to the channel. in
- // other words, the next request to this channel might not come with the same configuration and mixed
- // state can carry through from one request to the next
- channelHandlerContext.channel().attr(StateKey.SESSION).set(null);
- channelHandlerContext.channel().attr(StateKey.SERIALIZER).set(serializer);
- channelHandlerContext.channel().attr(StateKey.USE_BINARY).set(false);
-
- objects.add(serializer.deserializeRequest(frame.text()));
- } catch (SerializationException se) {
- logger.warn("Serialization error while decoding request", se);
- objects.add(RequestMessage.INVALID);
- }
- }
-
- private MessageSerializer<?> select(final String mimeType, final MessageSerializer<?> defaultSerializer) {
- if (logger.isWarnEnabled() && !serializers.containsKey(mimeType))
- logger.warn("Gremlin Server is not configured with a serializer for the requested mime type [{}] - using {} by default",
- mimeType, defaultSerializer.getClass().getName());
-
- return serializers.getOrDefault(mimeType, defaultSerializer);
- }
-}
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsUserAgentHandler.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsUserAgentHandler.java
deleted file mode 100644
index 577b4e7..0000000
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsUserAgentHandler.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.server.handler;
-
-import com.codahale.metrics.MetricRegistry;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelInboundHandlerAdapter;
-import io.netty.handler.codec.http.HttpHeaders;
-import io.netty.handler.codec.http.websocketx.WebSocketServerProtocolHandler;
-import io.netty.util.AttributeKey;
-import org.apache.tinkerpop.gremlin.server.GremlinServer;
-import org.apache.tinkerpop.gremlin.server.util.MetricManager;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Channel handler which extracts a user agent header from a web socket handshake if present
- * then logs the user agent and stores it as a channel attribute for future reference.
- */
-public class WsUserAgentHandler extends ChannelInboundHandlerAdapter {
- /**
- * This constant caps the number of unique user agents which will be tracked in the metrics. Any new unique
- * user agents will be replaced with "other" in the metrics after this cap has been reached.
- */
- private static final int MAX_USER_AGENT_METRICS = 10000;
-
- static final String USER_AGENT_HEADER_NAME = "User-Agent";
-
- private static final Logger logger = LoggerFactory.getLogger(WsUserAgentHandler.class);
- public static final AttributeKey<String> USER_AGENT_ATTR_KEY = AttributeKey.valueOf(USER_AGENT_HEADER_NAME);
-
- @Override
- public void userEventTriggered(final ChannelHandlerContext ctx, java.lang.Object evt) {
- if (evt instanceof WebSocketServerProtocolHandler.HandshakeComplete) {
- final HttpHeaders requestHeaders = ((WebSocketServerProtocolHandler.HandshakeComplete) evt).requestHeaders();
-
- if (requestHeaders.contains(USER_AGENT_HEADER_NAME)){
- final String userAgent = requestHeaders.get(USER_AGENT_HEADER_NAME);
-
- ctx.channel().attr(USER_AGENT_ATTR_KEY).set(userAgent);
- logger.debug("New Connection on channel [{}] with user agent [{}]", ctx.channel().id().asShortText(), userAgent);
-
- String metricName = MetricRegistry.name(GremlinServer.class, "user-agent", userAgent);
-
- // This check is to address a concern that an attacker may try to fill the server's memory with a very
- // large number of unique user agents. For this reason the user agent is replaced with "other"
- // for the purpose of metrics if this cap is ever exceeded and the user agent is not already being tracked.
- if(MetricManager.INSTANCE.getCounterSize() > MAX_USER_AGENT_METRICS &&
- !MetricManager.INSTANCE.contains(metricName)) {
- metricName = MetricRegistry.name(GremlinServer.class, "user-agent", "other");
- }
- MetricManager.INSTANCE.getCounter(metricName).inc();
- } else {
- logger.debug("New Connection on channel [{}] with no user agent provided", ctx.channel().id().asShortText());
- }
- }
- ctx.fireUserEventTriggered(evt);
- }
-}
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java
deleted file mode 100644
index d895256..0000000
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java
+++ /dev/null
@@ -1,367 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.server.op;
-
-import com.codahale.metrics.Timer;
-import org.apache.tinkerpop.gremlin.util.Tokens;
-import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.groovy.engine.GremlinExecutor;
-import org.apache.tinkerpop.gremlin.groovy.jsr223.TimedInterruptTimeoutException;
-import org.apache.tinkerpop.gremlin.process.traversal.Failure;
-import org.apache.tinkerpop.gremlin.process.traversal.Operator;
-import org.apache.tinkerpop.gremlin.process.traversal.Order;
-import org.apache.tinkerpop.gremlin.process.traversal.Pop;
-import org.apache.tinkerpop.gremlin.process.traversal.Scope;
-import org.apache.tinkerpop.gremlin.server.OpProcessor;
-import org.apache.tinkerpop.gremlin.server.auth.AuthenticatedUser;
-import org.apache.tinkerpop.gremlin.server.handler.StateKey;
-import org.apache.tinkerpop.gremlin.structure.Column;
-import org.apache.tinkerpop.gremlin.structure.T;
-import org.apache.tinkerpop.gremlin.server.Context;
-import org.apache.tinkerpop.gremlin.server.GremlinServer;
-import org.apache.tinkerpop.gremlin.server.GraphManager;
-import org.apache.tinkerpop.gremlin.server.Settings;
-import org.apache.tinkerpop.gremlin.server.util.MetricManager;
-import org.apache.tinkerpop.gremlin.structure.util.CloseableIterator;
-import org.apache.tinkerpop.gremlin.structure.util.TemporaryException;
-import org.apache.tinkerpop.gremlin.util.function.ThrowingConsumer;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.codehaus.groovy.control.MultipleCompilationErrorsException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.script.Bindings;
-import javax.script.SimpleBindings;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.RejectedExecutionException;
-import java.util.concurrent.TimeoutException;
-import java.util.function.Supplier;
-
-import static com.codahale.metrics.MetricRegistry.name;
-
-/**
- * A base {@link OpProcessor} implementation that helps with operations that deal with script evaluation functions.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public abstract class AbstractEvalOpProcessor extends AbstractOpProcessor {
- private static final Logger logger = LoggerFactory.getLogger(AbstractEvalOpProcessor.class);
- private static final Logger auditLogger = LoggerFactory.getLogger(GremlinServer.AUDIT_LOGGER_NAME);
- public static final Timer evalOpTimer = MetricManager.INSTANCE.getTimer(name(GremlinServer.class, "op", "eval"));
-
- /**
- * The maximum number of parameters that can be passed on a script evaluation request.
- */
- public static final String CONFIG_MAX_PARAMETERS = "maxParameters";
-
- /**
- * Default number of parameters allowed on a script evaluation request.
- */
- public static final int DEFAULT_MAX_PARAMETERS = 16;
-
- protected int maxParameters = DEFAULT_MAX_PARAMETERS;
-
- /**
- * This may or may not be the full set of invalid binding keys. It is dependent on the static imports made to
- * Gremlin Server. This should get rid of the worst offenders though and provide a good message back to the
- * calling client.
- * <p/>
- * Use of {@code toUpperCase()} on the accessor values of {@link T} solves an issue where the {@code ScriptEngine}
- * ignores private scope on {@link T} and imports static fields.
- */
- protected static final Set<String> INVALID_BINDINGS_KEYS = new HashSet<>();
-
- static {
- INVALID_BINDINGS_KEYS.addAll(Arrays.asList(
- T.id.name(), T.key.name(),
- T.label.name(), T.value.name(),
- T.id.getAccessor(), T.key.getAccessor(),
- T.label.getAccessor(), T.value.getAccessor(),
- T.id.getAccessor().toUpperCase(), T.key.getAccessor().toUpperCase(),
- T.label.getAccessor().toUpperCase(), T.value.getAccessor().toUpperCase()));
-
- for (Column enumItem : Column.values()) {
- INVALID_BINDINGS_KEYS.add(enumItem.name());
- }
-
- for (Order enumItem : Order.values()) {
- INVALID_BINDINGS_KEYS.add(enumItem.name());
- }
-
- for (Operator enumItem : Operator.values()) {
- INVALID_BINDINGS_KEYS.add(enumItem.name());
- }
-
- for (Scope enumItem : Scope.values()) {
- INVALID_BINDINGS_KEYS.add(enumItem.name());
- }
-
- for (Pop enumItem : Pop.values()) {
- INVALID_BINDINGS_KEYS.add(enumItem.name());
- }
- }
-
- protected AbstractEvalOpProcessor(final boolean manageTransactions) {
- super(manageTransactions);
- }
-
- /**
- * Provides an operation for evaluating a Gremlin script.
- * @return
- */
- public abstract ThrowingConsumer<Context> getEvalOp();
-
- /**
- * A sub-class may have additional "ops" that it will service. Calls to {@link OpProcessor#select(Context)} that are not
- * handled will be passed to this method to see if the sub-class can service the requested op code.
- * @return
- */
- public abstract Optional<ThrowingConsumer<Context>> selectOther(final Context ctx) throws OpProcessorException;
-
- @Override
- public ThrowingConsumer<Context> select(final Context ctx) throws OpProcessorException {
- final RequestMessage message = ctx.getRequestMessage();
- logger.debug("Selecting processor for RequestMessage {}", message);
-
- final ThrowingConsumer<Context> op;
- switch (message.getOp()) {
- case Tokens.OPS_EVAL:
- op = validateEvalMessage(message).orElse(getEvalOp());
- break;
- case Tokens.OPS_INVALID:
- final String msgInvalid = String.format("Message could not be parsed. Check the format of the request. [%s]", message);
- throw new OpProcessorException(msgInvalid, ResponseMessage.build(message).code(ResponseStatusCode.REQUEST_ERROR_MALFORMED_REQUEST).statusMessage(msgInvalid).create());
- default:
- op = selectOther(ctx).orElseThrow(() -> {
- final String msgDefault = String.format("Message with op code [%s] is not recognized.", message.getOp());
- return new OpProcessorException(msgDefault, ResponseMessage.build(message).code(ResponseStatusCode.REQUEST_ERROR_MALFORMED_REQUEST).statusMessage(msgDefault).create());
- });
- }
-
- return op;
- }
-
- protected Optional<ThrowingConsumer<Context>> validateEvalMessage(final RequestMessage message) throws OpProcessorException {
- if (!message.optionalArgs(Tokens.ARGS_GREMLIN).isPresent()) {
- final String msg = String.format("A message with an [%s] op code requires a [%s] argument.", Tokens.OPS_EVAL, Tokens.ARGS_GREMLIN);
- throw new OpProcessorException(msg, ResponseMessage.build(message).code(ResponseStatusCode.REQUEST_ERROR_INVALID_REQUEST_ARGUMENTS).statusMessage(msg).create());
- }
-
- if (message.optionalArgs(Tokens.ARGS_BINDINGS).isPresent()) {
- final Map bindings = (Map) message.getArgs().get(Tokens.ARGS_BINDINGS);
- if (IteratorUtils.anyMatch(bindings.keySet().iterator(), k -> null == k || !(k instanceof String))) {
- final String msg = String.format("The [%s] message is using one or more invalid binding keys - they must be of type String and cannot be null", Tokens.OPS_EVAL);
- throw new OpProcessorException(msg, ResponseMessage.build(message).code(ResponseStatusCode.REQUEST_ERROR_INVALID_REQUEST_ARGUMENTS).statusMessage(msg).create());
- }
-
- final Set<String> badBindings = IteratorUtils.set(IteratorUtils.<String>filter(bindings.keySet().iterator(), INVALID_BINDINGS_KEYS::contains));
- if (!badBindings.isEmpty()) {
- final String msg = String.format("The [%s] message supplies one or more invalid parameters key of [%s] - these are reserved names.", Tokens.OPS_EVAL, badBindings);
- throw new OpProcessorException(msg, ResponseMessage.build(message).code(ResponseStatusCode.REQUEST_ERROR_INVALID_REQUEST_ARGUMENTS).statusMessage(msg).create());
- }
-
- // ignore control bindings that get passed in with the "#jsr223" prefix - those aren't used in compilation
- if (IteratorUtils.count(IteratorUtils.filter(bindings.keySet().iterator(), k -> !k.toString().startsWith("#jsr223"))) > maxParameters) {
- final String msg = String.format("The [%s] message contains %s bindings which is more than is allowed by the server %s configuration",
- Tokens.OPS_EVAL, bindings.size(), maxParameters);
- throw new OpProcessorException(msg, ResponseMessage.build(message).code(ResponseStatusCode.REQUEST_ERROR_INVALID_REQUEST_ARGUMENTS).statusMessage(msg).create());
- }
- }
-
- return Optional.empty();
- }
-
- /**
- * A generalized implementation of the "eval" operation. It handles script evaluation and iteration of results
- * so as to write {@link ResponseMessage} objects down the Netty pipeline. It also handles script timeouts,
- * iteration timeouts, metrics and building bindings. Note that result iteration is delegated to the
- * {@link #handleIterator(Context, Iterator)} method, so those extending this class could override that method for
- * better control over result iteration.
- * @param ctx The current Gremlin Server {@link Context}. This handler ensures that only a single final
- * response is sent to the client.
- * @param gremlinExecutorSupplier A function that returns the {@link GremlinExecutor} to use in executing the
- * script evaluation.
- * @param bindingsSupplier A function that returns the {@link Bindings} to provide to the
- * {@link GremlinExecutor#eval} method.
- */
- protected void evalOpInternal(final Context ctx, final Supplier<GremlinExecutor> gremlinExecutorSupplier,
- final BindingSupplier bindingsSupplier) {
- final Timer.Context timerContext = evalOpTimer.time();
- final RequestMessage msg = ctx.getRequestMessage();
- final GremlinExecutor gremlinExecutor = gremlinExecutorSupplier.get();
- final GraphManager graphManager = ctx.getGraphManager();
- final Settings settings = ctx.getSettings();
-
- final Map<String, Object> args = msg.getArgs();
-
- final String script = (String) args.get(Tokens.ARGS_GREMLIN);
- final String language = args.containsKey(Tokens.ARGS_LANGUAGE) ? (String) args.get(Tokens.ARGS_LANGUAGE) : null;
- final Bindings bindings = new SimpleBindings();
-
- // sessionless requests are always transaction managed, but in-session requests are configurable.
- final boolean managedTransactionsForRequest = manageTransactions ?
- true : (Boolean) args.getOrDefault(Tokens.ARGS_MANAGE_TRANSACTION, false);
-
- // timeout override - handle both deprecated and newly named configuration. earlier logic should prevent
- // both configurations from being submitted at the same time
- final long seto = args.containsKey(Tokens.ARGS_EVAL_TIMEOUT) ?
- ((Number) args.get(Tokens.ARGS_EVAL_TIMEOUT)).longValue() : settings.getEvaluationTimeout();
-
- final GremlinExecutor.LifeCycle lifeCycle = GremlinExecutor.LifeCycle.build()
- .evaluationTimeoutOverride(seto)
- .afterFailure((b,t) -> {
- graphManager.onQueryError(msg, t);
- if (managedTransactionsForRequest) attemptRollback(msg, ctx.getGraphManager(), settings.strictTransactionManagement);
- })
- .afterTimeout((b, t) -> {
- graphManager.onQueryError(msg, t);
- })
- .beforeEval(b -> {
- graphManager.beforeQueryStart(msg);
- try {
- b.putAll(bindingsSupplier.get());
- } catch (OpProcessorException ope) {
- // this should bubble up in the GremlinExecutor properly as the RuntimeException will be
- // unwrapped and the root cause thrown
- throw new RuntimeException(ope);
- }
- })
- .withResult(o -> {
- final Iterator itty = IteratorUtils.asIterator(o);
-
- logger.debug("Preparing to iterate results from - {} - in thread [{}]", msg, Thread.currentThread().getName());
- if (settings.enableAuditLog) {
- AuthenticatedUser user = ctx.getChannelHandlerContext().channel().attr(StateKey.AUTHENTICATED_USER).get();
- if (null == user) { // This is expected when using the AllowAllAuthenticator
- user = AuthenticatedUser.ANONYMOUS_USER;
- }
- String address = ctx.getChannelHandlerContext().channel().remoteAddress().toString();
- if (address.startsWith("/") && address.length() > 1) address = address.substring(1);
- auditLogger.info("User {} with address {} requested: {}", user.getName(), address, script);
- }
-
- try {
- handleIterator(ctx, itty);
- graphManager.onQuerySuccess(msg);
- } catch (Exception ex) {
- if (managedTransactionsForRequest) attemptRollback(msg, ctx.getGraphManager(), settings.strictTransactionManagement);
-
- CloseableIterator.closeIterator(itty);
-
- // wrap up the exception and rethrow. the error will be written to the client by the evalFuture
- // as it will completeExceptionally in the GremlinExecutor
- throw new RuntimeException(ex);
- }
- }).create();
-
- try {
- final CompletableFuture<Object> evalFuture = gremlinExecutor.eval(script, language, bindings, lifeCycle);
-
- evalFuture.handle((v, t) -> {
- timerContext.stop();
-
- if (t != null) {
- // if any exception in the chain is TemporaryException or Failure then we should respond with the
- // right error code so that the client knows to retry
- final Optional<Throwable> possibleSpecialException = determineIfSpecialException(t);
- if (possibleSpecialException.isPresent()) {
- final Throwable special = possibleSpecialException.get();
- final ResponseMessage.Builder specialResponseMsg = ResponseMessage.build(msg).
- statusMessage(special.getMessage()).
- statusAttributeException(special);
- if (special instanceof TemporaryException) {
- specialResponseMsg.code(ResponseStatusCode.SERVER_ERROR_TEMPORARY);
- } else if (special instanceof Failure) {
- final Failure failure = (Failure) special;
- specialResponseMsg.code(ResponseStatusCode.SERVER_ERROR_FAIL_STEP).
- statusAttribute(Tokens.STATUS_ATTRIBUTE_FAIL_STEP_MESSAGE, failure.format());
- }
- ctx.writeAndFlush(specialResponseMsg.create());
- } else if (t instanceof OpProcessorException) {
- ctx.writeAndFlush(((OpProcessorException) t).getResponseMessage());
- } else if (t instanceof TimedInterruptTimeoutException) {
- // occurs when the TimedInterruptCustomizerProvider is in play
- final String errorMessage = String.format("A timeout occurred within the script during evaluation of [%s] - consider increasing the limit given to TimedInterruptCustomizerProvider", msg);
- logger.warn(errorMessage);
- ctx.writeAndFlush(ResponseMessage.build(msg).code(ResponseStatusCode.SERVER_ERROR_TIMEOUT)
- .statusMessage("Timeout during script evaluation triggered by TimedInterruptCustomizerProvider")
- .statusAttributeException(t).create());
- } else if (t instanceof TimeoutException) {
- final String errorMessage = String.format("Script evaluation exceeded the configured threshold for request [%s]", msg);
- logger.warn(errorMessage, t);
- ctx.writeAndFlush(ResponseMessage.build(msg).code(ResponseStatusCode.SERVER_ERROR_TIMEOUT)
- .statusMessage(t.getMessage())
- .statusAttributeException(t).create());
- } else {
- // try to trap the specific jvm error of "Method code too large!" to re-write it as something nicer,
- // but only re-write if it's the only error because otherwise we might lose some other important
- // information related to the failure. at this point, there hasn't been a scenario that has
- // presented itself where the "Method code too large!" comes with other compilation errors so
- // it seems that this message trumps other compilation errors to some reasonable degree that ends
- // up being favorable for this problem
- if (t instanceof MultipleCompilationErrorsException && t.getMessage().contains("Method too large") &&
- ((MultipleCompilationErrorsException) t).getErrorCollector().getErrorCount() == 1) {
- final String errorMessage = String.format("The Gremlin statement that was submitted exceeds the maximum compilation size allowed by the JVM, please split it into multiple smaller statements - %s", trimMessage(msg));
- logger.warn(errorMessage);
- ctx.writeAndFlush(ResponseMessage.build(msg).code(ResponseStatusCode.SERVER_ERROR_EVALUATION)
- .statusMessage(errorMessage)
- .statusAttributeException(t).create());
- } else {
- final String errorMessage = (t.getMessage() == null) ? t.toString() : t.getMessage();
- logger.warn(String.format("Exception processing a script on request [%s].", msg), t);
- ctx.writeAndFlush(ResponseMessage.build(msg).code(ResponseStatusCode.SERVER_ERROR_EVALUATION)
- .statusMessage(errorMessage)
- .statusAttributeException(t).create());
- }
- }
- }
-
- return null;
- });
- } catch (RejectedExecutionException ree) {
- ctx.writeAndFlush(ResponseMessage.build(msg).code(ResponseStatusCode.TOO_MANY_REQUESTS)
- .statusMessage("Rate limiting").create());
- }
- }
-
- /**
- * Used to decrease the size of a Gremlin script that triggered a "method too large" exception so that it
- * doesn't log a massive text string nor return a large error message.
- */
- private RequestMessage trimMessage(final RequestMessage msg) {
- final RequestMessage trimmedMsg = RequestMessage.from(msg).create();
- if (trimmedMsg.getArgs().containsKey(Tokens.ARGS_GREMLIN))
- trimmedMsg.getArgs().put(Tokens.ARGS_GREMLIN, trimmedMsg.getArgs().get(Tokens.ARGS_GREMLIN).toString().substring(0, 1021) + "...");
-
- return trimmedMsg;
- }
-
- @FunctionalInterface
- public interface BindingSupplier {
- public Bindings get() throws OpProcessorException;
- }
-}
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessor.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessor.java
deleted file mode 100644
index c071780..0000000
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessor.java
+++ /dev/null
@@ -1,374 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.server.op;
-
-import com.codahale.metrics.Meter;
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelHandlerContext;
-import org.apache.commons.lang3.exception.ExceptionUtils;
-import org.apache.tinkerpop.gremlin.server.GremlinServer;
-import org.apache.tinkerpop.gremlin.server.util.MetricManager;
-import org.apache.tinkerpop.gremlin.util.MessageSerializer;
-import org.apache.tinkerpop.gremlin.util.Tokens;
-import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.util.ser.MessageTextSerializer;
-import org.apache.tinkerpop.gremlin.process.traversal.Failure;
-import org.apache.tinkerpop.gremlin.server.Context;
-import org.apache.tinkerpop.gremlin.server.GraphManager;
-import org.apache.tinkerpop.gremlin.server.OpProcessor;
-import org.apache.tinkerpop.gremlin.server.Settings;
-import org.apache.tinkerpop.gremlin.server.handler.Frame;
-import org.apache.tinkerpop.gremlin.server.handler.StateKey;
-import org.apache.tinkerpop.gremlin.util.ExceptionHelper;
-import org.apache.tinkerpop.gremlin.structure.util.TemporaryException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Stream;
-
-import static com.codahale.metrics.MetricRegistry.name;
-
-/**
- * A base {@link OpProcessor} implementation that processes an {@code Iterator} of results in a generalized way while
- * ensuring that graph transactions are properly managed.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public abstract class AbstractOpProcessor implements OpProcessor {
- private static final Logger logger = LoggerFactory.getLogger(AbstractEvalOpProcessor.class);
-
- /**
- * Length of time to pause writes in milliseconds when the high watermark is exceeded.
- */
- public static final long WRITE_PAUSE_TIME_MS = 10;
-
- /**
- * Tracks the rate of pause to writes when the high watermark is exceeded.
- */
- public static final Meter writePausesMeter = MetricManager.INSTANCE.getMeter(name(GremlinServer.class, "channels", "write-pauses"));
-
- /**
- * When set to {@code true}, transactions are always managed otherwise they can be overridden by the request.
- */
- protected final boolean manageTransactions;
-
- protected AbstractOpProcessor(final boolean manageTransactions) {
- this.manageTransactions = manageTransactions;
- }
-
- /**
- * Check if any exception in the chain is {@link TemporaryException} or {@link Failure} then respond with the
- * right error code so that the client knows to retry.
- */
- protected static Optional<Throwable> determineIfSpecialException(final Throwable ex) {
- return Stream.of(ExceptionUtils.getThrowables(ex)).
- filter(i -> i instanceof TemporaryException || i instanceof Failure).findFirst();
- }
-
- /**
- * Provides a generic way of iterating a result set back to the client.
- *
- * @param context The Gremlin Server {@link Context} object containing settings, request message, etc.
- * @param itty The result to iterator
- */
- protected void handleIterator(final Context context, final Iterator itty) throws InterruptedException {
- final ChannelHandlerContext nettyContext = context.getChannelHandlerContext();
- final RequestMessage msg = context.getRequestMessage();
- final Settings settings = context.getSettings();
- final MessageSerializer<?> serializer = nettyContext.channel().attr(StateKey.SERIALIZER).get();
- final boolean useBinary = nettyContext.channel().attr(StateKey.USE_BINARY).get();
-
- // used to limit warnings for when netty fills the buffer and hits the high watermark - prevents
- // over-logging of the same message.
- long lastWarningTime = 0;
- int warnCounter = 0;
-
- // sessionless requests are always transaction managed, but in-session requests are configurable.
- final boolean managedTransactionsForRequest = manageTransactions ?
- true : (Boolean) msg.getArgs().getOrDefault(Tokens.ARGS_MANAGE_TRANSACTION, false);
-
- // we have an empty iterator - happens on stuff like: g.V().iterate()
- if (!itty.hasNext()) {
- final Map<String, Object> attributes = generateStatusAttributes(nettyContext, msg, ResponseStatusCode.NO_CONTENT, itty, settings);
- // as there is nothing left to iterate if we are transaction managed then we should execute a
- // commit here before we send back a NO_CONTENT which implies success
- if (managedTransactionsForRequest) attemptCommit(msg, context.getGraphManager(), settings.strictTransactionManagement);
- context.writeAndFlush(ResponseMessage.build(msg)
- .code(ResponseStatusCode.NO_CONTENT)
- .statusAttributes(attributes)
- .create());
- return;
- }
-
- // the batch size can be overridden by the request
- final int resultIterationBatchSize = (Integer) msg.optionalArgs(Tokens.ARGS_BATCH_SIZE)
- .orElse(settings.resultIterationBatchSize);
- List<Object> aggregate = new ArrayList<>(resultIterationBatchSize);
-
- // use an external control to manage the loop as opposed to just checking hasNext() in the while. this
- // prevent situations where auto transactions create a new transaction after calls to commit() withing
- // the loop on calls to hasNext().
- boolean hasMore = itty.hasNext();
-
- while (hasMore) {
- if (Thread.interrupted()) throw new InterruptedException();
-
- // check if an implementation needs to force flush the aggregated results before the iteration batch
- // size is reached.
- final boolean forceFlush = isForceFlushed(nettyContext, msg, itty);
-
- // have to check the aggregate size because it is possible that the channel is not writeable (below)
- // so iterating next() if the message is not written and flushed would bump the aggregate size beyond
- // the expected resultIterationBatchSize. Total serialization time for the response remains in
- // effect so if the client is "slow" it may simply timeout.
- //
- // there is a need to check hasNext() on the iterator because if the channel is not writeable the
- // previous pass through the while loop will have next()'d the iterator and if it is "done" then a
- // NoSuchElementException will raise its head. also need a check to ensure that this iteration doesn't
- // require a forced flush which can be forced by sub-classes.
- //
- // this could be placed inside the isWriteable() portion of the if-then below but it seems better to
- // allow iteration to continue into a batch if that is possible rather than just doing nothing at all
- // while waiting for the client to catch up
- if (aggregate.size() < resultIterationBatchSize && itty.hasNext() && !forceFlush) aggregate.add(itty.next());
-
- // Don't keep executor busy if client has already given up; there is no way to catch up if the channel is
- // not active, and hence we should break the loop.
- if (!nettyContext.channel().isActive()) {
- if (managedTransactionsForRequest) {
- attemptRollback(msg, context.getGraphManager(), settings.strictTransactionManagement);
- }
- break;
- }
-
- // send back a page of results if batch size is met or if it's the end of the results being iterated.
- // also check writeability of the channel to prevent OOME for slow clients.
- //
- // clients might decide to close the Netty channel to the server with a CloseWebsocketFrame after errors
- // like CorruptedFrameException. On the server, although the channel gets closed, there might be some
- // executor threads waiting for watermark to clear which will not clear in these cases since client has
- // already given up on these requests. This leads to these executors waiting for the client to consume
- // results till the timeout. checking for isActive() should help prevent that.
- if (nettyContext.channel().isActive() && nettyContext.channel().isWritable()) {
- if (forceFlush || aggregate.size() == resultIterationBatchSize || !itty.hasNext()) {
- final ResponseStatusCode code = itty.hasNext() ? ResponseStatusCode.PARTIAL_CONTENT : ResponseStatusCode.SUCCESS;
-
- // serialize here because in sessionless requests the serialization must occur in the same
- // thread as the eval. as eval occurs in the GremlinExecutor there's no way to get back to the
- // thread that processed the eval of the script so, we have to push serialization down into that
- Frame frame = null;
- try {
- frame = makeFrame(context, msg, serializer, useBinary, aggregate, code,
- generateResultMetaData(nettyContext, msg, code, itty, settings),
- generateStatusAttributes(nettyContext, msg, code, itty, settings));
- } catch (Exception ex) {
- // a frame may use a Bytebuf which is a countable release - if it does not get written
- // downstream it needs to be released here
- if (frame != null) frame.tryRelease();
-
- // exception is handled in makeFrame() - serialization error gets written back to driver
- // at that point
- if (managedTransactionsForRequest) attemptRollback(msg, context.getGraphManager(), settings.strictTransactionManagement);
- break;
- }
-
- // track whether there is anything left in the iterator because it needs to be accessed after
- // the transaction could be closed - in that case a call to hasNext() could open a new transaction
- // unintentionally
- hasMore = itty.hasNext();
-
- try {
- // only need to reset the aggregation list if there's more stuff to write
- if (hasMore)
- aggregate = new ArrayList<>(resultIterationBatchSize);
- else {
- // iteration and serialization are both complete which means this finished successfully. note that
- // errors internal to script eval or timeout will rollback given GremlinServer's global configurations.
- // local errors will get rolled back below because the exceptions aren't thrown in those cases to be
- // caught by the GremlinExecutor for global rollback logic. this only needs to be committed if
- // there are no more items to iterate and serialization is complete
- if (managedTransactionsForRequest)
- attemptCommit(msg, context.getGraphManager(), settings.strictTransactionManagement);
- }
- } catch (Exception ex) {
- // a frame may use a Bytebuf which is a countable release - if it does not get written
- // downstream it needs to be released here
- if (frame != null) frame.tryRelease();
- throw ex;
- }
-
- if (!hasMore) iterateComplete(nettyContext, msg, itty);
-
- // the flush is called after the commit has potentially occurred. in this way, if a commit was
- // required then it will be 100% complete before the client receives it. the "frame" at this point
- // should have completely detached objects from the transaction (i.e. serialization has occurred)
- // so a new one should not be opened on the flush down the netty pipeline
- context.writeAndFlush(code, frame);
- }
- } else {
- final long currentTime = System.currentTimeMillis();
-
- // exponential delay between warnings. don't keep triggering this warning over and over again for the
- // same request. totalPendingWriteBytes is volatile so it is possible that by the time this warning
- // hits the log the low watermark may have been hit
- long interval = (long) Math.pow(2, warnCounter) * 1000;
- if (currentTime - lastWarningTime >= interval) {
- final Channel ch = context.getChannelHandlerContext().channel();
- logger.warn("Warning {}: Outbound buffer size={}, pausing response writing as writeBufferHighWaterMark exceeded on request {} for channel {} - writing will continue once client has caught up",
- warnCounter,
- ch.unsafe().outboundBuffer().totalPendingWriteBytes(),
- msg.getRequestId(),
- ch.id());
-
- lastWarningTime = currentTime;
- warnCounter++;
- }
-
- // since the client is lagging we can hold here for a period of time for the client to catch up.
- // this isn't blocking the IO thread - just a worker.
- TimeUnit.MILLISECONDS.sleep(WRITE_PAUSE_TIME_MS);
- writePausesMeter.mark();
- }
- }
- }
-
- /**
- * Called when iteration within {@link #handleIterator(Context, Iterator)} is on its final pass and the final
- * frame is about to be sent back to the client. This method only gets called on successful iteration of the
- * entire result.
- */
- protected void iterateComplete(final ChannelHandlerContext ctx, final RequestMessage msg, final Iterator itty) {
- // do nothing by default
- }
-
- /**
- * Determines if a {@link Frame} should be force flushed outside of the {@code resultIterationBatchSize} and the
- * termination of the iterator. By default this method return {@code false}.
- *
- * @param itty a reference to the current {@link Iterator} of results - it is not meant to be forwarded in
- * this method
- */
- protected boolean isForceFlushed(final ChannelHandlerContext ctx, final RequestMessage msg, final Iterator itty) {
- return false;
- }
-
- /**
- * Generates response result meta-data to put on a {@link ResponseMessage}.
- *
- * @param itty a reference to the current {@link Iterator} of results - it is not meant to be forwarded in
- * this method
- */
- protected Map<String, Object> generateResultMetaData(final ChannelHandlerContext ctx, final RequestMessage msg,
- final ResponseStatusCode code, final Iterator itty,
- final Settings settings) {
- return Collections.emptyMap();
- }
-
- /**
- * Generates response status meta-data to put on a {@link ResponseMessage}.
- *
- * @param itty a reference to the current {@link Iterator} of results - it is not meant to be forwarded in
- * this method
- */
- protected Map<String, Object> generateStatusAttributes(final ChannelHandlerContext ctx, final RequestMessage msg,
- final ResponseStatusCode code, final Iterator itty,
- final Settings settings) {
- // only return server metadata on the last message
- if (itty.hasNext()) return Collections.emptyMap();
-
- final Map<String, Object> metaData = new HashMap<>();
- metaData.put(Tokens.ARGS_HOST, ctx.channel().remoteAddress().toString());
-
- return metaData;
- }
-
- protected static Frame makeFrame(final Context ctx, final RequestMessage msg,
- final MessageSerializer<?> serializer, final boolean useBinary, final List<Object> aggregate,
- final ResponseStatusCode code, final Map<String,Object> responseMetaData,
- final Map<String,Object> statusAttributes) throws Exception {
- try {
- final ChannelHandlerContext nettyContext = ctx.getChannelHandlerContext();
-
- ctx.handleDetachment(aggregate);
-
- if (useBinary) {
- return new Frame(serializer.serializeResponseAsBinary(ResponseMessage.build(msg)
- .code(code)
- .statusAttributes(statusAttributes)
- .responseMetaData(responseMetaData)
- .result(aggregate).create(), nettyContext.alloc()));
- } else {
- // the expectation is that the GremlinTextRequestDecoder will have placed a MessageTextSerializer
- // instance on the channel.
- final MessageTextSerializer<?> textSerializer = (MessageTextSerializer<?>) serializer;
- return new Frame(textSerializer.serializeResponseAsString(ResponseMessage.build(msg)
- .code(code)
- .statusAttributes(statusAttributes)
- .responseMetaData(responseMetaData)
- .result(aggregate).create(), nettyContext.alloc()));
- }
- } catch (Exception ex) {
- logger.warn("The result [{}] in the request {} could not be serialized and returned.", aggregate, msg.getRequestId(), ex);
- final String errorMessage = String.format("Error during serialization: %s", ExceptionHelper.getMessageFromExceptionOrCause(ex));
- final ResponseMessage error = ResponseMessage.build(msg.getRequestId())
- .statusMessage(errorMessage)
- .statusAttributeException(ex)
- .code(ResponseStatusCode.SERVER_ERROR_SERIALIZATION).create();
- ctx.writeAndFlush(error);
- throw ex;
- }
- }
-
- protected static void attemptCommit(final RequestMessage msg, final GraphManager graphManager, final boolean strict) {
- if (strict) {
- if (msg.getArgs().containsKey(Tokens.ARGS_ALIASES)) {
- final Map<String, String> aliases = (Map<String, String>) msg.getArgs().get(Tokens.ARGS_ALIASES);
- graphManager.commit(new HashSet<>(aliases.values()));
- } else {
- graphManager.commitAll();
- }
- } else {
- graphManager.commitAll();
- }
- }
-
- protected static void attemptRollback(final RequestMessage msg, final GraphManager graphManager, final boolean strict) {
- if (strict) {
- if (msg.getArgs().containsKey(Tokens.ARGS_ALIASES)) {
- final Map<String, String> aliases = (Map<String, String>) msg.getArgs().get(Tokens.ARGS_ALIASES);
- graphManager.rollback(new HashSet<>(aliases.values()));
- } else {
- graphManager.rollbackAll();
- }
- } else {
- graphManager.rollbackAll();
- }
- }
-}
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/OpLoader.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/OpLoader.java
deleted file mode 100644
index b165436..0000000
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/OpLoader.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.server.op;
-
-import org.apache.tinkerpop.gremlin.server.OpProcessor;
-import org.apache.tinkerpop.gremlin.server.Settings;
-import org.apache.tinkerpop.gremlin.server.op.standard.StandardOpProcessor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-import java.util.ServiceLoader;
-
-/**
- * Uses {@link ServiceLoader} to load {@link OpProcessor} instances into a cache.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public final class OpLoader {
- private static final Logger logger = LoggerFactory.getLogger(OpLoader.class);
-
- private static final Map<String, OpProcessor> processors = new HashMap<>();
-
- static {
- ServiceLoader.load(OpProcessor.class).forEach(op -> {
- final String name = op.getName();
- logger.info("Adding the {} OpProcessor.", name.equals(StandardOpProcessor.OP_PROCESSOR_NAME) ? "standard" : name);
- if (processors.containsKey(name))
- throw new RuntimeException(String.format("There is a naming conflict with the %s OpProcessor implementations.", name));
-
- processors.put(name, op);
- });
- }
-
- private static volatile boolean initialized = false;
-
- /**
- * Initialize the {@code OpLoader} with server settings. This method should only be called once at startup but is
- * designed to be idempotent.
- */
- public static synchronized void init(final Settings settings) {
- if (!initialized) {
- processors.values().forEach(processor -> processor.init(settings));
- initialized = true;
- }
- }
-
- /**
- * Gets an {@link OpProcessor} by its name. If it cannot be found an {@link Optional#empty()} is returned.
- */
- public static Optional<OpProcessor> getProcessor(final String name) {
- return Optional.ofNullable(processors.get(name));
- }
-
- /**
- * Gets a read-only map of the processors where the key is the {@link OpProcessor} name and the value is the
- * instance created by {@link ServiceLoader}.
- */
- public static Map<String, OpProcessor> getProcessors() {
- return Collections.unmodifiableMap(processors);
- }
-
- /**
- * Reset the processors so that they can be re-initialized with different settings which is useful in testing
- * scenarios.
- */
- public synchronized static void reset() {
- initialized = false;
- }
-}
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/OpProcessorException.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/OpProcessorException.java
deleted file mode 100644
index 2910112..0000000
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/OpProcessorException.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.server.op;
-
-import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class OpProcessorException extends Exception {
- private final ResponseMessage responseMessage;
-
- public OpProcessorException(final String message, final ResponseMessage responseMessage) {
- super(message);
- this.responseMessage = responseMessage;
- }
-
- public ResponseMessage getResponseMessage() {
- return this.responseMessage;
- }
-}
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/session/Session.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/session/Session.java
deleted file mode 100644
index 7836d70..0000000
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/session/Session.java
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.server.op.session;
-
-import io.netty.channel.Channel;
-import org.apache.tinkerpop.gremlin.groovy.engine.GremlinExecutor;
-import org.apache.tinkerpop.gremlin.groovy.jsr223.GroovyCompilerGremlinPlugin;
-import org.apache.tinkerpop.gremlin.jsr223.GremlinScriptEngine;
-import org.apache.tinkerpop.gremlin.server.Context;
-import org.apache.tinkerpop.gremlin.server.GraphManager;
-import org.apache.tinkerpop.gremlin.server.Settings;
-import org.apache.tinkerpop.gremlin.server.util.MetricManager;
-import org.apache.tinkerpop.gremlin.server.util.ThreadFactoryUtil;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.script.Bindings;
-import javax.script.SimpleBindings;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
-
-import static org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor.CONFIG_GLOBAL_FUNCTION_CACHE_ENABLED;
-import static org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor.CONFIG_PER_GRAPH_CLOSE_TIMEOUT;
-import static org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor.CONFIG_SESSION_TIMEOUT;
-import static org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor.DEFAULT_PER_GRAPH_CLOSE_TIMEOUT;
-import static org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor.DEFAULT_SESSION_TIMEOUT;
-
-/**
- * Defines a "session" for the {@link SessionOpProcessor} which preserves state between requests made to Gremlin
- * Server. Since transactions are bound to a single thread the "session" maintains its own thread to process Gremlin
- * statements so that each request can be executed within it to preserve the transaction state from one request to
- * the next.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class Session {
- private static final Logger logger = LoggerFactory.getLogger(Session.class);
- private final Bindings bindings;
- private final Settings settings;
- private final GraphManager graphManager;
- private final String session;
- private final ScheduledExecutorService scheduledExecutorService;
- private final long configuredSessionTimeout;
- private final long configuredPerGraphCloseTimeout;
- private final boolean globalFunctionCacheEnabled;
- private final Channel boundChannel;
-
- private AtomicBoolean killing = new AtomicBoolean(false);
- private AtomicReference<ScheduledFuture> kill = new AtomicReference<>();
-
- /**
- * Each session gets its own ScriptEngine so as to isolate its configuration and the classes loaded to it.
- * This is important as it enables user interfaces built on Gremlin Server to have isolation in what
- * libraries they use and what classes exist.
- */
- private final GremlinExecutor gremlinExecutor;
-
- private final ThreadFactory threadFactoryWorker = ThreadFactoryUtil.create("session-%d");
-
- /**
- * By binding the session to run ScriptEngine evaluations in a specific thread, each request will respect
- * the ThreadLocal nature of Graph implementations.
- */
- private final ExecutorService executor = Executors.newSingleThreadExecutor(threadFactoryWorker);
-
- private final ConcurrentHashMap<String, Session> sessions;
-
- public Session(final String session, final Context context, final ConcurrentHashMap<String, Session> sessions) {
- logger.debug("New session established for {}", session);
- this.session = session;
- this.bindings = new SimpleBindings();
- this.settings = context.getSettings();
- this.graphManager = context.getGraphManager();
- this.scheduledExecutorService = context.getScheduledExecutorService();
- this.sessions = sessions;
-
- final Settings.ProcessorSettings processorSettings = this.settings.optionalProcessor(SessionOpProcessor.class).
- orElse(SessionOpProcessor.DEFAULT_SETTINGS);
- this.configuredSessionTimeout = Long.parseLong(processorSettings.config.getOrDefault(
- CONFIG_SESSION_TIMEOUT, DEFAULT_SESSION_TIMEOUT).toString());
- this.configuredPerGraphCloseTimeout = Long.parseLong(processorSettings.config.getOrDefault(
- CONFIG_PER_GRAPH_CLOSE_TIMEOUT, DEFAULT_PER_GRAPH_CLOSE_TIMEOUT).toString());
- this.globalFunctionCacheEnabled = Boolean.parseBoolean(
- processorSettings.config.getOrDefault(CONFIG_GLOBAL_FUNCTION_CACHE_ENABLED, true).toString());
-
- this.gremlinExecutor = initializeGremlinExecutor().create();
-
- settings.scriptEngines.keySet().forEach(this::registerMetrics);
-
- boundChannel = context.getChannelHandlerContext().channel();
- boundChannel.closeFuture().addListener(future -> manualKill(true));
- }
-
- /**
- * Determines if the supplied {@code Channel} object is the same as the one bound to the {@code Session}.
- */
- public boolean isBoundTo(final Channel channel) {
- return channel == boundChannel;
- }
-
- public GremlinExecutor getGremlinExecutor() {
- return gremlinExecutor;
- }
-
- public Bindings getBindings() {
- return bindings;
- }
-
- public ExecutorService getExecutor() {
- return executor;
- }
-
- public String getSessionId() {
- return session;
- }
-
- public boolean acceptingRequests() {
- return !killing.get();
- }
-
- public void touch() {
- // if the task of killing is cancelled successfully then reset the session monitor. otherwise this session
- // has already been killed and there's nothing left to do with this session.
- kill.updateAndGet(future -> {
- if (null == future || !future.isDone()) {
- if (future != null) future.cancel(false);
- return this.scheduledExecutorService.schedule(() -> {
- logger.info("Session {} has been idle for more than {} milliseconds - preparing to close",
- this.session, this.configuredSessionTimeout);
- kill(false);
- }, this.configuredSessionTimeout, TimeUnit.MILLISECONDS);
- }
-
- return future;
- });
- }
-
- /**
- * Stops the session with call to {@link #kill(boolean)} but also stops the session expiration call which ensures
- * that the session is only killed once. See {@link #kill(boolean)} for information on how what "forcing" the
- * session kill will mean.
- */
- public void manualKill(final boolean force) {
- // seems there is a situation where kill can get nulled. seems to only happen in travis as a result of test
- // runs and i'm guessing it has something to do with a combination of shutdown and session close though i'm
- // not sure why. perhaps this "fix" just masks up a deeper problem but as i reason on it now, it seems mostly
- // bound to shutdown situations which basically means the forced end of the session anyway, so perhaps the
- // root cause isn't something that needs immediate chasing (at least until it can be shown otherwise anyway)
- Optional.ofNullable(kill.get()).ifPresent(f -> f.cancel(true));
- kill(force);
- }
-
- /**
- * Kills the session and rollback any uncommitted changes on transactional graphs. When "force" closed, the
- * session won't bother to try to submit transaction close commands. It will be up to the underlying graph
- * implementation to determine how it will clean up orphaned transactions. The force will try to cancel scheduled
- * jobs and interrupt any currently running ones. Interruption is not guaranteed, but an attempt will be made.
- */
- public synchronized void kill(final boolean force) {
- killing.set(true);
-
- // if the session has already been removed then there's no need to do this process again. it's possible that
- // the manuallKill and the kill future could have both called kill at roughly the same time. this prevents
- // kill() from being called more than once
- if (!sessions.containsKey(session)) return;
-
- if (!force) {
- // when the session is killed open transaction should be rolled back
- graphManager.getGraphNames().forEach(gName -> {
- final Graph g = graphManager.getGraph(gName);
- if (g.features().graph().supportsTransactions()) {
- // have to execute the rollback in the executor because the transaction is associated with
- // that thread of execution from this session
- try {
- executor.submit(() -> {
- if (g.tx().isOpen()) {
- logger.debug("Rolling back open transactions on {} before killing session: {}", gName, session);
- g.tx().rollback();
- }
- }).get(configuredPerGraphCloseTimeout, TimeUnit.MILLISECONDS);
- } catch (Exception ex) {
- logger.warn(String.format("An error occurred while attempting rollback on %s when closing session: %s", gName, session), ex);
- }
- }
- });
- } else {
- logger.debug("Skipped attempt to close open graph transactions on {} - close was forced", session);
- }
-
- // prevent any additional requests from processing. if the kill was not "forced" then jobs were scheduled to
- // try to rollback open transactions. those jobs either timed-out or completed successfully. either way, no
- // additional jobs will be allowed, running jobs will be cancelled (if possible) and any scheduled jobs will
- // be cancelled
- executor.shutdownNow();
-
- sessions.remove(session);
-
- // once a session is dead release the gauges in the registry for it
- MetricManager.INSTANCE.getRegistry().removeMatching((s, metric) -> s.contains(session));
-
- logger.debug("Session {} closed", session);
- }
-
- private GremlinExecutor.Builder initializeGremlinExecutor() {
- final GremlinExecutor.Builder gremlinExecutorBuilder = GremlinExecutor.build()
- .evaluationTimeout(settings.getEvaluationTimeout())
- .afterTimeout((b, e) -> {
- graphManager.rollbackAll();
- this.bindings.clear();
- this.bindings.putAll(b);
- })
- .afterSuccess(b -> {
- this.bindings.clear();
- this.bindings.putAll(b);
- })
- .globalBindings(graphManager.getAsBindings())
- .executorService(executor)
- .scheduledExecutorService(scheduledExecutorService);
-
- settings.scriptEngines.forEach((k, v) -> {
- // use plugins if they are present
- if (!v.plugins.isEmpty()) {
- // make sure that server related classes are available at init. the LifeCycleHook stuff will be
- // added explicitly via configuration using GremlinServerGremlinModule in the yaml. need to override
- // scriptengine settings with SessionOpProcessor specific ones as the processing for sessions is
- // different and a global setting may not make sense for a session
- if (v.plugins.containsKey(GroovyCompilerGremlinPlugin.class.getName())) {
- v.plugins.get(GroovyCompilerGremlinPlugin.class.getName()).put(CONFIG_GLOBAL_FUNCTION_CACHE_ENABLED, globalFunctionCacheEnabled);
- } else {
- final Map<String,Object> pluginConf = new HashMap<>();
- pluginConf.put(CONFIG_GLOBAL_FUNCTION_CACHE_ENABLED, globalFunctionCacheEnabled);
- v.plugins.put(GroovyCompilerGremlinPlugin.class.getName(), pluginConf);
- }
-
- gremlinExecutorBuilder.addPlugins(k, v.plugins);
- }
- });
-
- return gremlinExecutorBuilder;
- }
-
- private void registerMetrics(final String engineName) {
- final GremlinScriptEngine engine = gremlinExecutor.getScriptEngineManager().getEngineByName(engineName);
- MetricManager.INSTANCE.registerGremlinScriptEngineMetrics(engine, engineName, "session", session, "class-cache");
- }
-}
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/session/SessionOpProcessor.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/session/SessionOpProcessor.java
deleted file mode 100644
index e10a0f1..0000000
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/session/SessionOpProcessor.java
+++ /dev/null
@@ -1,764 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.server.op.session;
-
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelHandlerContext;
-import org.apache.tinkerpop.gremlin.util.MessageSerializer;
-import org.apache.tinkerpop.gremlin.util.Tokens;
-import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.groovy.jsr223.GroovyCompilerGremlinPlugin;
-import org.apache.tinkerpop.gremlin.jsr223.JavaTranslator;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
-import org.apache.tinkerpop.gremlin.process.traversal.Failure;
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
-import org.apache.tinkerpop.gremlin.process.traversal.util.BytecodeHelper;
-import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalInterruptedException;
-import org.apache.tinkerpop.gremlin.server.Context;
-import org.apache.tinkerpop.gremlin.server.GraphManager;
-import org.apache.tinkerpop.gremlin.server.GremlinServer;
-import org.apache.tinkerpop.gremlin.server.OpProcessor;
-import org.apache.tinkerpop.gremlin.server.Settings;
-import org.apache.tinkerpop.gremlin.server.auth.AuthenticatedUser;
-import org.apache.tinkerpop.gremlin.server.handler.Frame;
-import org.apache.tinkerpop.gremlin.server.handler.StateKey;
-import org.apache.tinkerpop.gremlin.server.op.AbstractEvalOpProcessor;
-import org.apache.tinkerpop.gremlin.server.op.OpProcessorException;
-import org.apache.tinkerpop.gremlin.server.util.MetricManager;
-import org.apache.tinkerpop.gremlin.server.util.TraverserIterator;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONVersion;
-import org.apache.tinkerpop.gremlin.structure.util.CloseableIterator;
-import org.apache.tinkerpop.gremlin.structure.util.TemporaryException;
-import org.apache.tinkerpop.gremlin.util.function.ThrowingConsumer;
-import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.script.Bindings;
-import javax.script.ScriptException;
-import javax.script.SimpleBindings;
-import java.lang.reflect.UndeclaredThrowableException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.Future;
-import java.util.concurrent.FutureTask;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Function;
-import java.util.function.Supplier;
-
-import static com.codahale.metrics.MetricRegistry.name;
-import static org.apache.tinkerpop.gremlin.process.traversal.GraphOp.TX_COMMIT;
-import static org.apache.tinkerpop.gremlin.process.traversal.GraphOp.TX_ROLLBACK;
-
-/**
- * Simple {@link OpProcessor} implementation that handles {@code ScriptEngine} script evaluation in the context of
- * a session. Note that this processor will also take a "close" op to kill the session and rollback any incomplete transactions.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class SessionOpProcessor extends AbstractEvalOpProcessor {
- private static final ObjectMapper mapper = GraphSONMapper.build().version(GraphSONVersion.V2_0).create().createMapper();
- private static final Logger auditLogger = LoggerFactory.getLogger(GremlinServer.AUDIT_LOGGER_NAME);
- private static final Bindings EMPTY_BINDINGS = new SimpleBindings();
-
- private static final Logger logger = LoggerFactory.getLogger(SessionOpProcessor.class);
- public static final String OP_PROCESSOR_NAME = "session";
-
- /**
- * Script engines are evaluated in a per session context where imports/scripts are isolated per session.
- */
- protected static ConcurrentHashMap<String, Session> sessions = new ConcurrentHashMap<>();
-
- static {
- MetricManager.INSTANCE.getGauge(sessions::size, name(GremlinServer.class, "sessions"));
- }
-
- /**
- * Configuration setting for how long a session will be available before it times out.
- */
- public static final String CONFIG_SESSION_TIMEOUT = "sessionTimeout";
-
- /**
- * Configuration setting for how long to wait in milliseconds for each configured graph to close any open
- * transactions when the session is killed.
- */
- public static final String CONFIG_PER_GRAPH_CLOSE_TIMEOUT = "perGraphCloseTimeout";
-
- /**
- * Configuration setting that behaves as an override to the global script engine setting of the same name that is
- * provided to the {@link GroovyCompilerGremlinPlugin}.
- */
- public static final String CONFIG_GLOBAL_FUNCTION_CACHE_ENABLED = "globalFunctionCacheEnabled";
-
- /**
- * Default timeout for a session is eight hours.
- */
- public static final long DEFAULT_SESSION_TIMEOUT = 28800000;
-
- /**
- * Default amount of time to wait in milliseconds for each configured graph to close any open transactions when
- * the session is killed.
- */
- public static final long DEFAULT_PER_GRAPH_CLOSE_TIMEOUT = 10000;
-
- static final Settings.ProcessorSettings DEFAULT_SETTINGS = new Settings.ProcessorSettings();
-
- static {
- DEFAULT_SETTINGS.className = SessionOpProcessor.class.getCanonicalName();
- DEFAULT_SETTINGS.config = new HashMap<String, Object>() {{
- put(CONFIG_SESSION_TIMEOUT, DEFAULT_SESSION_TIMEOUT);
- put(CONFIG_PER_GRAPH_CLOSE_TIMEOUT, DEFAULT_PER_GRAPH_CLOSE_TIMEOUT);
- put(CONFIG_MAX_PARAMETERS, DEFAULT_MAX_PARAMETERS);
- put(CONFIG_GLOBAL_FUNCTION_CACHE_ENABLED, true);
- }};
- }
-
- public SessionOpProcessor() {
- super(false);
- }
-
- @Override
- public String getName() {
- return OP_PROCESSOR_NAME;
- }
-
- @Override
- public void init(final Settings settings) {
- this.maxParameters = (int) settings.optionalProcessor(SessionOpProcessor.class).orElse(DEFAULT_SETTINGS).config.
- getOrDefault(CONFIG_MAX_PARAMETERS, DEFAULT_MAX_PARAMETERS);
- }
-
- /**
- * Older versions of session-based requests accepted a "close" operator in addition to "eval". This feature
- * effectively acts as a do-nothing for 3.5.0 to allow older versions of the drivers to connect. At some point
- * this may be removed completely. Note that closing the channel kills the session now.
- */
- @Override
- public Optional<ThrowingConsumer<Context>> selectOther(final Context ctx) throws OpProcessorException {
- final RequestMessage requestMessage = ctx.getRequestMessage();
-
- // deprecated the "close" message at 3.3.11 - left this check for the "close" token so that if older versions
- // of the driver connect they won't get an error. basically just writes back a NO_CONTENT
- // for the immediate term in 3.5.0 and then for some future version remove support for the message completely
- // and thus disallow older driver versions from connecting at all.
- if (requestMessage.getOp().equals(Tokens.OPS_CLOSE)) {
- // this must be an in-session request
- if (!requestMessage.optionalArgs(Tokens.ARGS_SESSION).isPresent()) {
- final String msg = String.format("A message with an [%s] op code requires a [%s] argument", Tokens.OPS_CLOSE, Tokens.ARGS_SESSION);
- throw new OpProcessorException(msg, ResponseMessage.build(requestMessage).code(ResponseStatusCode.REQUEST_ERROR_INVALID_REQUEST_ARGUMENTS).statusMessage(msg).create());
- }
-
- return Optional.of(rhc -> {
- // send back a confirmation of the close
- rhc.writeAndFlush(ResponseMessage.build(requestMessage)
- .code(ResponseStatusCode.NO_CONTENT)
- .create());
- });
- } else if (requestMessage.getOp().equals(Tokens.OPS_BYTECODE)) {
- validateTraversalSourceAlias(ctx, requestMessage, validateTraversalRequest(requestMessage));
- return Optional.of(this::iterateBytecodeTraversal);
- } else {
- return Optional.empty();
- }
- }
-
- private static void validateTraversalSourceAlias(final Context ctx, final RequestMessage message, final Map<String, String> aliases) throws OpProcessorException {
- final String traversalSourceBindingForAlias = aliases.values().iterator().next();
- if (!ctx.getGraphManager().getTraversalSourceNames().contains(traversalSourceBindingForAlias)) {
- final String msg = String.format("The traversal source [%s] for alias [%s] is not configured on the server.", traversalSourceBindingForAlias, Tokens.VAL_TRAVERSAL_SOURCE_ALIAS);
- throw new OpProcessorException(msg, ResponseMessage.build(message).code(ResponseStatusCode.REQUEST_ERROR_INVALID_REQUEST_ARGUMENTS).statusMessage(msg).create());
- }
- }
-
- private static Map<String, String> validateTraversalRequest(final RequestMessage message) throws OpProcessorException {
- if (!message.optionalArgs(Tokens.ARGS_GREMLIN).isPresent()) {
- final String msg = String.format("A message with [%s] op code requires a [%s] argument.", Tokens.OPS_BYTECODE, Tokens.ARGS_GREMLIN);
- throw new OpProcessorException(msg, ResponseMessage.build(message).code(ResponseStatusCode.REQUEST_ERROR_INVALID_REQUEST_ARGUMENTS).statusMessage(msg).create());
- }
-
- return validatedAliases(message).get();
- }
-
- private static Optional<Map<String, String>> validatedAliases(final RequestMessage message) throws OpProcessorException {
- final Optional<Map<String, String>> aliases = message.optionalArgs(Tokens.ARGS_ALIASES);
- if (!aliases.isPresent()) {
- final String msg = String.format("A message with [%s] op code requires a [%s] argument.", Tokens.OPS_BYTECODE, Tokens.ARGS_ALIASES);
- throw new OpProcessorException(msg, ResponseMessage.build(message).code(ResponseStatusCode.REQUEST_ERROR_INVALID_REQUEST_ARGUMENTS).statusMessage(msg).create());
- }
-
- if (aliases.get().size() != 1 || !aliases.get().containsKey(Tokens.VAL_TRAVERSAL_SOURCE_ALIAS)) {
- final String msg = String.format("A message with [%s] op code requires the [%s] argument to be a Map containing one alias assignment named '%s'.",
- Tokens.OPS_BYTECODE, Tokens.ARGS_ALIASES, Tokens.VAL_TRAVERSAL_SOURCE_ALIAS);
- throw new OpProcessorException(msg, ResponseMessage.build(message).code(ResponseStatusCode.REQUEST_ERROR_INVALID_REQUEST_ARGUMENTS).statusMessage(msg).create());
- }
-
- return aliases;
- }
-
- @Override
- public ThrowingConsumer<Context> getEvalOp() {
- return this::evalOp;
- }
-
- @Override
- protected Optional<ThrowingConsumer<Context>> validateEvalMessage(final RequestMessage message) throws OpProcessorException {
- super.validateEvalMessage(message);
-
- if (!message.optionalArgs(Tokens.ARGS_SESSION).isPresent()) {
- final String msg = String.format("A message with an [%s] op code requires a [%s] argument", Tokens.OPS_EVAL, Tokens.ARGS_SESSION);
- throw new OpProcessorException(msg, ResponseMessage.build(message).code(ResponseStatusCode.REQUEST_ERROR_INVALID_REQUEST_ARGUMENTS).statusMessage(msg).create());
- }
-
- return Optional.empty();
- }
-
- @Override
- public void close() throws Exception {
- sessions.values().forEach(session -> session.manualKill(false));
- }
-
- protected void evalOp(final Context context) throws OpProcessorException {
- final RequestMessage msg = context.getRequestMessage();
- final Session session = getSession(context, msg);
-
- // check if the session is still accepting requests - if not block further requests
- if (!session.acceptingRequests()) {
- final String sessionClosedMessage = String.format("Session %s is no longer accepting requests as it has been closed",
- session.getSessionId());
- final ResponseMessage response = ResponseMessage.build(msg).code(ResponseStatusCode.SERVER_ERROR)
- .statusMessage(sessionClosedMessage).create();
- throw new OpProcessorException(sessionClosedMessage, response);
- }
-
- // check if the session is bound to this channel, thus one client per session
- if (!session.isBoundTo(context.getChannelHandlerContext().channel())) {
- final String sessionClosedMessage = String.format("Session %s is not bound to the connecting client",
- session.getSessionId());
- final ResponseMessage response = ResponseMessage.build(msg).code(ResponseStatusCode.SERVER_ERROR)
- .statusMessage(sessionClosedMessage).create();
- throw new OpProcessorException(sessionClosedMessage, response);
- }
-
- // place the session on the channel context so that it can be used during serialization. in this way
- // the serialization can occur on the same thread used to execute the gremlin within the session. this
- // is important given the threadlocal nature of Graph implementation transactions.
- context.getChannelHandlerContext().channel().attr(StateKey.SESSION).set(session);
-
- evalOpInternal(context, session::getGremlinExecutor, getBindingMaker(session).apply(context));
- }
-
- /**
- * Examines the {@link RequestMessage} and extracts the session token. The session is then either found or a new
- * one is created.
- */
- protected static Session getSession(final Context context, final RequestMessage msg) {
- final String sessionId = (String) msg.getArgs().get(Tokens.ARGS_SESSION);
-
- logger.debug("In-session request {} for eval for session {} in thread {}",
- msg.getRequestId(), sessionId, Thread.currentThread().getName());
-
- final Session session = sessions.computeIfAbsent(sessionId, k -> new Session(k, context, sessions));
- session.touch();
- return session;
- }
-
- /**
- * A useful method for those extending this class, where the means for binding construction can be supplied
- * to this class. This function is used in {@link #evalOp(Context)} to create the final argument to
- * {@link AbstractEvalOpProcessor#evalOpInternal(Context, Supplier, BindingSupplier)}.
- * In this way an extending class can use the default {@link AbstractEvalOpProcessor.BindingSupplier}
- * which carries a lot of re-usable functionality or provide a new one to override the existing approach.
- */
- protected Function<Context, BindingSupplier> getBindingMaker(final Session session) {
- return context -> () -> {
- final RequestMessage msg = context.getRequestMessage();
- final Bindings bindings = session.getBindings();
-
- // alias any global bindings to a different variable
- if (msg.getArgs().containsKey(Tokens.ARGS_ALIASES)) {
- final Map<String, String> aliases = (Map<String, String>) msg.getArgs().get(Tokens.ARGS_ALIASES);
- for (Map.Entry<String,String> aliasKv : aliases.entrySet()) {
- boolean found = false;
-
- // first check if the alias refers to a Graph instance
- final Graph graph = context.getGraphManager().getGraph(aliasKv.getValue());
- if (null != graph) {
- bindings.put(aliasKv.getKey(), graph);
- found = true;
- }
-
- // if the alias wasn't found as a Graph then perhaps it is a TraversalSource - it needs to be
- // something
- if (!found) {
- final TraversalSource ts = context.getGraphManager().getTraversalSource(aliasKv.getValue());
- if (null != ts) {
- bindings.put(aliasKv.getKey(), ts);
- found = true;
- }
- }
-
- // this validation is important to calls to GraphManager.commit() and rollback() as they both
- // expect that the aliases supplied are valid
- if (!found) {
- final String error = String.format("Could not alias [%s] to [%s] as [%s] not in the Graph or TraversalSource global bindings",
- aliasKv.getKey(), aliasKv.getValue(), aliasKv.getValue());
- throw new OpProcessorException(error, ResponseMessage.build(msg)
- .code(ResponseStatusCode.REQUEST_ERROR_INVALID_REQUEST_ARGUMENTS).statusMessage(error).create());
- }
- }
- }
-
- // add any bindings to override any other supplied
- Optional.ofNullable((Map<String, Object>) msg.getArgs().get(Tokens.ARGS_BINDINGS)).ifPresent(bindings::putAll);
- return bindings;
- };
- }
-
- private void iterateBytecodeTraversal(final Context context) throws Exception {
- final RequestMessage msg = context.getRequestMessage();
- final Settings settings = context.getSettings();
- logger.debug("Traversal request {} for in thread {}", msg.getRequestId(), Thread.currentThread().getName());
-
- // right now the TraversalOpProcessor can take a direct GraphSON representation of Bytecode or directly take
- // deserialized Bytecode object.
- final Object bytecodeObj = msg.getArgs().get(Tokens.ARGS_GREMLIN);
- final Bytecode bytecode = bytecodeObj instanceof Bytecode ? (Bytecode) bytecodeObj :
- mapper.readValue(bytecodeObj.toString(), Bytecode.class);
-
- // earlier validation in selection of this op method should free us to cast this without worry
- final Map<String, String> aliases = (Map<String, String>) msg.optionalArgs(Tokens.ARGS_ALIASES).get();
-
- // timeout override - handle both deprecated and newly named configuration. earlier logic should prevent
- // both configurations from being submitted at the same time
- final Map<String, Object> args = msg.getArgs();
- final long seto = args.containsKey(Tokens.ARGS_EVAL_TIMEOUT) ?
- ((Number) args.get(Tokens.ARGS_EVAL_TIMEOUT)).longValue() : context.getSettings().getEvaluationTimeout();
-
- final GraphManager graphManager = context.getGraphManager();
- final String traversalSourceName = aliases.entrySet().iterator().next().getValue();
- final TraversalSource g = graphManager.getTraversalSource(traversalSourceName);
-
- final Session session = getSession(context, msg);
-
- // handle bytecode based graph operations like commit/rollback commands
- if (BytecodeHelper.isGraphOperation(bytecode)) {
- handleGraphOperation(bytecode, g.getGraph(), context);
- return;
- }
-
- final Traversal.Admin<?, ?> traversal;
- try {
- final Optional<String> lambdaLanguage = BytecodeHelper.getLambdaLanguage(bytecode);
- if (!lambdaLanguage.isPresent())
- traversal = JavaTranslator.of(g).translate(bytecode);
- else
- traversal = session.getGremlinExecutor().eval(bytecode, EMPTY_BINDINGS, lambdaLanguage.get(), traversalSourceName);
- } catch (ScriptException ex) {
- logger.error("Traversal contains a lambda that cannot be compiled", ex);
- throw new OpProcessorException("Traversal contains a lambda that cannot be compiled",
- ResponseMessage.build(msg).code(ResponseStatusCode.SERVER_ERROR_EVALUATION)
- .statusMessage(ex.getMessage())
- .statusAttributeException(ex).create());
- } catch (Exception ex) {
- logger.error("Could not deserialize the Traversal instance", ex);
- throw new OpProcessorException("Could not deserialize the Traversal instance",
- ResponseMessage.build(msg).code(ResponseStatusCode.SERVER_ERROR_SERIALIZATION)
- .statusMessage(ex.getMessage())
- .statusAttributeException(ex).create());
- }
-
- if (settings.enableAuditLog) {
- AuthenticatedUser user = context.getChannelHandlerContext().channel().attr(StateKey.AUTHENTICATED_USER).get();
- if (null == user) { // This is expected when using the AllowAllAuthenticator
- user = AuthenticatedUser.ANONYMOUS_USER;
- }
- String address = context.getChannelHandlerContext().channel().remoteAddress().toString();
- if (address.startsWith("/") && address.length() > 1) address = address.substring(1);
- auditLogger.info("User {} with address {} requested: {}", user.getName(), address, bytecode);
- }
-
- // todo: timer matter???
- // final Timer.Context timerContext = traversalOpTimer.time();
-
- final FutureTask<Void> evalFuture = new FutureTask<>(() -> {
- context.setStartedResponse();
- final Graph graph = g.getGraph();
-
- try {
- beforeProcessing(graph, context);
-
- try {
- // compile the traversal - without it getEndStep() has nothing in it
- traversal.applyStrategies();
- handleIterator(context, new TraverserIterator(traversal), graph);
- } catch (Exception ex) {
- Throwable t = ex;
- if (ex instanceof UndeclaredThrowableException)
- t = t.getCause();
-
- CloseableIterator.closeIterator(traversal);
-
- // if any exception in the chain is TemporaryException or Failure then we should respond with the
- // right error code so that the client knows to retry
- final Optional<Throwable> possibleSpecialException = determineIfSpecialException(ex);
- if (possibleSpecialException.isPresent()) {
- final Throwable special = possibleSpecialException.get();
- final ResponseMessage.Builder specialResponseMsg = ResponseMessage.build(msg).
- statusMessage(special.getMessage()).
- statusAttributeException(special);
- if (special instanceof TemporaryException) {
- specialResponseMsg.code(ResponseStatusCode.SERVER_ERROR_TEMPORARY);
- } else if (special instanceof Failure) {
- final Failure failure = (Failure) special;
- specialResponseMsg.code(ResponseStatusCode.SERVER_ERROR_FAIL_STEP).
- statusAttribute(Tokens.STATUS_ATTRIBUTE_FAIL_STEP_MESSAGE, failure.format());
- }
- context.writeAndFlush(specialResponseMsg.create());
- } else if (t instanceof InterruptedException || t instanceof TraversalInterruptedException) {
- final String errorMessage = String.format("A timeout occurred during traversal evaluation of [%s] - consider increasing the limit given to evaluationTimeout", msg);
- logger.warn(errorMessage);
- context.writeAndFlush(ResponseMessage.build(msg).code(ResponseStatusCode.SERVER_ERROR_TIMEOUT)
- .statusMessage(errorMessage)
- .statusAttributeException(ex).create());
- } else {
- logger.warn(String.format("Exception processing a Traversal on iteration for request [%s].", msg.getRequestId()), ex);
- context.writeAndFlush(ResponseMessage.build(msg).code(ResponseStatusCode.SERVER_ERROR)
- .statusMessage(ex.getMessage())
- .statusAttributeException(ex).create());
- }
- onError(graph, context);
- }
- } catch (Throwable t) {
- onError(graph, context);
- // if any exception in the chain is TemporaryException or Failure then we should respond with the
- // right error code so that the client knows to retry
- final Optional<Throwable> possibleSpecialException = determineIfSpecialException(t);
- if (possibleSpecialException.isPresent()) {
- final Throwable special = possibleSpecialException.get();
- final ResponseMessage.Builder specialResponseMsg = ResponseMessage.build(msg).
- statusMessage(special.getMessage()).
- statusAttributeException(special);
- if (special instanceof TemporaryException) {
- specialResponseMsg.code(ResponseStatusCode.SERVER_ERROR_TEMPORARY);
- } else if (special instanceof Failure) {
- final Failure failure = (Failure) special;
- specialResponseMsg.code(ResponseStatusCode.SERVER_ERROR_FAIL_STEP).
- statusAttribute(Tokens.STATUS_ATTRIBUTE_FAIL_STEP_MESSAGE, failure.format());
- }
- context.writeAndFlush(specialResponseMsg.create());
- } else {
- logger.warn(String.format("Exception processing a Traversal on request [%s].", msg.getRequestId()), t);
- context.writeAndFlush(ResponseMessage.build(msg).code(ResponseStatusCode.SERVER_ERROR)
- .statusMessage(t.getMessage())
- .statusAttributeException(t).create());
- }
- if (t instanceof Error) {
- //Re-throw any errors to be handled by and set as the result of evalFuture
- throw t;
- }
- } finally {
- // todo: timer matter???
- //timerContext.stop();
-
- // There is a race condition that this query may have finished before the timeoutFuture was created,
- // though this is very unlikely. This is handled in the settor, if this has already been grabbed.
- // If we passed this point and the setter hasn't been called, it will cancel the timeoutFuture inside
- // the setter to compensate.
- final ScheduledFuture<?> timeoutFuture = context.getTimeoutExecutor();
- if (null != timeoutFuture)
- timeoutFuture.cancel(true);
- }
-
- return null;
- });
-
- submitToGremlinExecutor(context, seto, session, evalFuture);
- }
-
- private static void submitToGremlinExecutor(final Context context, final long seto, final Session session,
- final FutureTask<Void> evalFuture) {
- final Future<?> executionFuture = session.getGremlinExecutor().getExecutorService().submit(evalFuture);
- if (seto > 0) {
- // Schedule a timeout in the thread pool for future execution
- context.setTimeoutExecutor(context.getScheduledExecutorService().schedule(() -> {
- executionFuture.cancel(true);
- if (!context.getStartedResponse()) {
- context.sendTimeoutResponse();
- }
- }, seto, TimeUnit.MILLISECONDS));
- }
- }
-
- /**
- * If {@link Bytecode} is detected to contain a "graph operation" then it gets processed by this method.
- */
- protected void handleGraphOperation(final Bytecode bytecode, final Graph graph, final Context context) {
- final RequestMessage msg = context.getRequestMessage();
- final Session session = getSession(context, msg);
- if (graph.features().graph().supportsTransactions()) {
- if (TX_COMMIT.equals(bytecode) || TX_ROLLBACK.equals(bytecode)) {
- final boolean commit = TX_COMMIT.equals(bytecode);
-
- // there is no timeout on a commit/rollback
- submitToGremlinExecutor(context, 0, session, new FutureTask<>(() -> {
- try {
- if (graph.tx().isOpen()) {
- if (commit)
- graph.tx().commit();
- else
- graph.tx().rollback();
- }
-
- // write back a no-op for success
- final Map<String, Object> attributes = generateStatusAttributes(
- context.getChannelHandlerContext(), msg,
- ResponseStatusCode.NO_CONTENT, Collections.emptyIterator(), context.getSettings());
- context.writeAndFlush(ResponseMessage.build(msg)
- .code(ResponseStatusCode.NO_CONTENT)
- .statusAttributes(attributes)
- .create());
-
- } catch (Throwable t) {
- onError(graph, context);
- // if any exception in the chain is TemporaryException or Failure then we should respond with the
- // right error code so that the client knows to retry
- final Optional<Throwable> possibleSpecialException = determineIfSpecialException(t);
- if (possibleSpecialException.isPresent()) {
- final Throwable special = possibleSpecialException.get();
- final ResponseMessage.Builder specialResponseMsg = ResponseMessage.build(msg).
- statusMessage(special.getMessage()).
- statusAttributeException(special);
- if (special instanceof TemporaryException) {
- specialResponseMsg.code(ResponseStatusCode.SERVER_ERROR_TEMPORARY);
- } else if (special instanceof Failure) {
- final Failure failure = (Failure) special;
- specialResponseMsg.code(ResponseStatusCode.SERVER_ERROR_FAIL_STEP).
- statusAttribute(Tokens.STATUS_ATTRIBUTE_FAIL_STEP_MESSAGE, failure.format());
- }
- context.writeAndFlush(specialResponseMsg.create());
- } else {
- logger.warn(String.format("Exception processing a Traversal on request [%s] to %s the transaction.",
- msg.getRequestId(), commit ? "commit" : "rollback"), t);
- context.writeAndFlush(ResponseMessage.build(msg).code(ResponseStatusCode.SERVER_ERROR)
- .statusMessage(t.getMessage())
- .statusAttributeException(t).create());
- }
- if (t instanceof Error) {
- //Re-throw any errors to be handled by and set as the result the FutureTask
- throw t;
- }
- }
-
- return null;
- }));
- } else {
- throw new IllegalStateException(String.format(
- "Bytecode in request is not a recognized graph operation: %s", bytecode.toString()));
- }
- } else {
- throw Graph.Exceptions.transactionsNotSupported();
- }
- }
-
- protected void beforeProcessing(final Graph graph, final Context ctx) {
- final boolean managedTransactionsForRequest = manageTransactions ?
- true : (Boolean) ctx.getRequestMessage().getArgs().getOrDefault(Tokens.ARGS_MANAGE_TRANSACTION, false);
- if (managedTransactionsForRequest && graph.features().graph().supportsTransactions() && graph.tx().isOpen()) graph.tx().rollback();
- }
-
- protected void onError(final Graph graph, final Context ctx) {
- final boolean managedTransactionsForRequest = manageTransactions ?
- true : (Boolean) ctx.getRequestMessage().getArgs().getOrDefault(Tokens.ARGS_MANAGE_TRANSACTION, false);
- if (managedTransactionsForRequest && graph.features().graph().supportsTransactions() && graph.tx().isOpen()) graph.tx().rollback();
- }
-
- protected void onTraversalSuccess(final Graph graph, final Context ctx) {
- final boolean managedTransactionsForRequest = manageTransactions ?
- true : (Boolean) ctx.getRequestMessage().getArgs().getOrDefault(Tokens.ARGS_MANAGE_TRANSACTION, false);
- if (managedTransactionsForRequest && graph.features().graph().supportsTransactions() && graph.tx().isOpen()) graph.tx().commit();
- }
-
- protected void handleIterator(final Context context, final Iterator itty, final Graph graph) throws InterruptedException {
- final ChannelHandlerContext nettyContext = context.getChannelHandlerContext();
- final RequestMessage msg = context.getRequestMessage();
- final Settings settings = context.getSettings();
- final MessageSerializer serializer = nettyContext.channel().attr(StateKey.SERIALIZER).get();
- final boolean useBinary = nettyContext.channel().attr(StateKey.USE_BINARY).get();
-
- // used to limit warnings for when netty fills the buffer and hits the high watermark - prevents
- // over-logging of the same message.
- long lastWarningTime = 0;
- int warnCounter = 0;
-
- // we have an empty iterator - happens on stuff like: g.V().iterate()
- if (!itty.hasNext()) {
- final Map<String, Object> attributes = generateStatusAttributes(nettyContext, msg, ResponseStatusCode.NO_CONTENT, itty, settings);
-
- // as there is nothing left to iterate if we are transaction managed then we should execute a
- // commit here before we send back a NO_CONTENT which implies success
- onTraversalSuccess(graph, context);
- context.writeAndFlush(ResponseMessage.build(msg)
- .code(ResponseStatusCode.NO_CONTENT)
- .statusAttributes(attributes)
- .create());
- return;
- }
-
- // the batch size can be overridden by the request
- final int resultIterationBatchSize = (Integer) msg.optionalArgs(Tokens.ARGS_BATCH_SIZE)
- .orElse(settings.resultIterationBatchSize);
- List<Object> aggregate = new ArrayList<>(resultIterationBatchSize);
-
- // use an external control to manage the loop as opposed to just checking hasNext() in the while. this
- // prevent situations where auto transactions create a new transaction after calls to commit() withing
- // the loop on calls to hasNext().
- boolean hasMore = itty.hasNext();
-
- while (hasMore) {
- if (Thread.interrupted()) throw new InterruptedException();
-
- // check if an implementation needs to force flush the aggregated results before the iteration batch
- // size is reached.
- final boolean forceFlush = isForceFlushed(nettyContext, msg, itty);
-
- // have to check the aggregate size because it is possible that the channel is not writeable (below)
- // so iterating next() if the message is not written and flushed would bump the aggregate size beyond
- // the expected resultIterationBatchSize. Total serialization time for the response remains in
- // effect so if the client is "slow" it may simply timeout.
- //
- // there is a need to check hasNext() on the iterator because if the channel is not writeable the
- // previous pass through the while loop will have next()'d the iterator and if it is "done" then a
- // NoSuchElementException will raise its head. also need a check to ensure that this iteration doesn't
- // require a forced flush which can be forced by sub-classes.
- //
- // this could be placed inside the isWriteable() portion of the if-then below but it seems better to
- // allow iteration to continue into a batch if that is possible rather than just doing nothing at all
- // while waiting for the client to catch up
- if (aggregate.size() < resultIterationBatchSize && itty.hasNext() && !forceFlush) aggregate.add(itty.next());
-
- // Don't keep executor busy if client has already given up; there is no way to catch up if the channel is
- // not active, and hence we should break the loop.
- if (!nettyContext.channel().isActive()) {
- onError(graph, context);
- break;
- }
-
- // send back a page of results if batch size is met or if it's the end of the results being iterated.
- // also check writeability of the channel to prevent OOME for slow clients.
- //
- // clients might decide to close the Netty channel to the server with a CloseWebsocketFrame after errors
- // like CorruptedFrameException. On the server, although the channel gets closed, there might be some
- // executor threads waiting for watermark to clear which will not clear in these cases since client has
- // already given up on these requests. This leads to these executors waiting for the client to consume
- // results till the timeout. checking for isActive() should help prevent that.
- if (nettyContext.channel().isActive() && nettyContext.channel().isWritable()) {
- if (forceFlush || aggregate.size() == resultIterationBatchSize || !itty.hasNext()) {
- final ResponseStatusCode code = itty.hasNext() ? ResponseStatusCode.PARTIAL_CONTENT : ResponseStatusCode.SUCCESS;
-
- // serialize here because in sessionless requests the serialization must occur in the same
- // thread as the eval. as eval occurs in the GremlinExecutor there's no way to get back to the
- // thread that processed the eval of the script so, we have to push serialization down into that
- final Map<String, Object> metadata = generateResultMetaData(nettyContext, msg, code, itty, settings);
- final Map<String, Object> statusAttrb = generateStatusAttributes(nettyContext, msg, code, itty, settings);
- Frame frame = null;
- try {
- frame = makeFrame(context, msg, serializer, useBinary, aggregate, code,
- metadata, statusAttrb);
- } catch (Exception ex) {
- // a frame may use a Bytebuf which is a countable release - if it does not get written
- // downstream it needs to be released here
- if (frame != null) frame.tryRelease();
-
- // exception is handled in makeFrame() - serialization error gets written back to driver
- // at that point
- onError(graph, context);
- break;
- }
-
- // track whether there is anything left in the iterator because it needs to be accessed after
- // the transaction could be closed - in that case a call to hasNext() could open a new transaction
- // unintentionally
- hasMore = itty.hasNext();
-
- try {
- // only need to reset the aggregation list if there's more stuff to write
- if (hasMore)
- aggregate = new ArrayList<>(resultIterationBatchSize);
- else {
- // iteration and serialization are both complete which means this finished successfully. note that
- // errors internal to script eval or timeout will rollback given GremlinServer's global configurations.
- // local errors will get rolled back below because the exceptions aren't thrown in those cases to be
- // caught by the GremlinExecutor for global rollback logic. this only needs to be committed if
- // there are no more items to iterate and serialization is complete
- onTraversalSuccess(graph, context);
- }
- } catch (Exception ex) {
- // a frame may use a Bytebuf which is a countable release - if it does not get written
- // downstream it needs to be released here
- if (frame != null) frame.tryRelease();
- throw ex;
- }
-
- if (!hasMore) iterateComplete(nettyContext, msg, itty);
-
- // the flush is called after the commit has potentially occurred. in this way, if a commit was
- // required then it will be 100% complete before the client receives it. the "frame" at this point
- // should have completely detached objects from the transaction (i.e. serialization has occurred)
- // so a new one should not be opened on the flush down the netty pipeline
- context.writeAndFlush(code, frame);
- }
- } else {
- final long currentTime = System.currentTimeMillis();
-
- // exponential delay between warnings. don't keep triggering this warning over and over again for the
- // same request. totalPendingWriteBytes is volatile so it is possible that by the time this warning
- // hits the log the low watermark may have been hit
- long interval = (long) Math.pow(2, warnCounter) * 1000;
- if (currentTime - lastWarningTime >= interval) {
- final Channel ch = context.getChannelHandlerContext().channel();
- logger.warn("Warning {}: Outbound buffer size={}, pausing response writing as writeBufferHighWaterMark exceeded on request {} for channel {} - writing will continue once client has caught up",
- warnCounter,
- ch.unsafe().outboundBuffer().totalPendingWriteBytes(),
- msg.getRequestId(),
- ch.id());
-
- lastWarningTime = currentTime;
- warnCounter++;
- }
-
- // since the client is lagging we can hold here for a period of time for the client to catch up.
- // this isn't blocking the IO thread - just a worker.
- TimeUnit.MILLISECONDS.sleep(WRITE_PAUSE_TIME_MS);
- writePausesMeter.mark();
- }
- }
- }
-}
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/standard/StandardOpProcessor.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/standard/StandardOpProcessor.java
deleted file mode 100644
index bb90ec0..0000000
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/standard/StandardOpProcessor.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.server.op.standard;
-
-import org.apache.tinkerpop.gremlin.util.Tokens;
-import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
-import org.apache.tinkerpop.gremlin.server.Context;
-import org.apache.tinkerpop.gremlin.server.OpProcessor;
-import org.apache.tinkerpop.gremlin.server.Settings;
-import org.apache.tinkerpop.gremlin.server.op.AbstractEvalOpProcessor;
-import org.apache.tinkerpop.gremlin.server.op.OpProcessorException;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.util.function.ThrowingConsumer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.script.Bindings;
-import javax.script.SimpleBindings;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-import java.util.function.Function;
-import java.util.function.Supplier;
-
-/**
- * Simple {@link OpProcessor} implementation that handles {@code ScriptEngine} script evaluation outside the context
- * of a session.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class StandardOpProcessor extends AbstractEvalOpProcessor {
- private static final Logger logger = LoggerFactory.getLogger(StandardOpProcessor.class);
- public static final String OP_PROCESSOR_NAME = "";
-
- protected final Function<Context, BindingSupplier> bindingMaker;
-
- static final Settings.ProcessorSettings DEFAULT_SETTINGS = new Settings.ProcessorSettings();
-
- static {
- DEFAULT_SETTINGS.className = StandardOpProcessor.class.getCanonicalName();
- DEFAULT_SETTINGS.config = new HashMap<String, Object>() {{
- put(CONFIG_MAX_PARAMETERS, DEFAULT_MAX_PARAMETERS);
- }};
- }
-
- public StandardOpProcessor() {
- super(true);
- bindingMaker = getBindingMaker();
- }
-
- @Override
- public String getName() {
- return OP_PROCESSOR_NAME;
- }
-
- @Override
- public void init(final Settings settings) {
- this.maxParameters = (int) settings.optionalProcessor(StandardOpProcessor.class).orElse(DEFAULT_SETTINGS).config.
- getOrDefault(CONFIG_MAX_PARAMETERS, DEFAULT_MAX_PARAMETERS);
- }
-
- @Override
- public ThrowingConsumer<Context> getEvalOp() {
- return this::evalOp;
- }
-
- @Override
- public Optional<ThrowingConsumer<Context>> selectOther(final Context ctx) throws OpProcessorException {
- return Optional.empty();
- }
-
- @Override
- public void close() throws Exception {
- // do nothing = no resources to release
- }
-
- private void evalOp(final Context context) throws OpProcessorException {
- if (logger.isDebugEnabled()) {
- final RequestMessage msg = context.getRequestMessage();
- logger.debug("Sessionless request {} for eval in thread {}", msg.getRequestId(), Thread.currentThread().getName());
- }
-
- evalOpInternal(context, context::getGremlinExecutor, bindingMaker.apply(context));
- }
-
- /**
- * A useful method for those extending this class, where the means for binding construction can be supplied
- * to this class. This function is used in {@link #evalOp(Context)} to create the final argument to
- * {@link AbstractEvalOpProcessor#evalOpInternal(Context, Supplier, BindingSupplier)}.
- * In this way an extending class can use the default {@link AbstractEvalOpProcessor.BindingSupplier}
- * which carries a lot of re-usable functionality or provide a new one to override the existing approach.
- */
- protected Function<Context, BindingSupplier> getBindingMaker() {
- return context -> () -> {
- final RequestMessage msg = context.getRequestMessage();
- final Bindings bindings = new SimpleBindings();
-
- // alias any global bindings to a different variable.
- if (msg.getArgs().containsKey(Tokens.ARGS_ALIASES)) {
- final Map<String, String> aliases = (Map<String, String>) msg.getArgs().get(Tokens.ARGS_ALIASES);
- for (Map.Entry<String,String> aliasKv : aliases.entrySet()) {
- boolean found = false;
-
- // first check if the alias refers to a Graph instance
- final Graph graph = context.getGraphManager().getGraph(aliasKv.getValue());
- if (null != graph) {
- bindings.put(aliasKv.getKey(), graph);
- found = true;
- }
-
- // if the alias wasn't found as a Graph then perhaps it is a TraversalSource - it needs to be
- // something
- if (!found) {
- final TraversalSource ts = context.getGraphManager().getTraversalSource(aliasKv.getValue());
- if (null != ts) {
- bindings.put(aliasKv.getKey(), ts);
- found = true;
- }
- }
-
- // this validation is important to calls to GraphManager.commit() and rollback() as they both
- // expect that the aliases supplied are valid
- if (!found) {
- final String error = String.format("Could not alias [%s] to [%s] as [%s] not in the Graph or TraversalSource global bindings",
- aliasKv.getKey(), aliasKv.getValue(), aliasKv.getValue());
- throw new OpProcessorException(error, ResponseMessage.build(msg)
- .code(ResponseStatusCode.REQUEST_ERROR_INVALID_REQUEST_ARGUMENTS).statusMessage(error).create());
- }
- }
- } else {
- // there's no bindings so determine if that's ok with Gremlin Server
- if (context.getSettings().strictTransactionManagement) {
- final String error = "Gremlin Server is configured with strictTransactionManagement as 'true' - the 'aliases' arguments must be provided";
- throw new OpProcessorException(error, ResponseMessage.build(msg)
- .code(ResponseStatusCode.REQUEST_ERROR_INVALID_REQUEST_ARGUMENTS).statusMessage(error).create());
- }
- }
-
- // add any bindings to override any other supplied
- Optional.ofNullable((Map<String, Object>) msg.getArgs().get(Tokens.ARGS_BINDINGS)).ifPresent(bindings::putAll);
- return bindings;
- };
- }
-}
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/traversal/TraversalOpProcessor.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/traversal/TraversalOpProcessor.java
deleted file mode 100644
index 7b2630a..0000000
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/traversal/TraversalOpProcessor.java
+++ /dev/null
@@ -1,500 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.server.op.traversal;
-
-import com.codahale.metrics.Timer;
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelException;
-import io.netty.channel.ChannelHandlerContext;
-import org.apache.tinkerpop.gremlin.util.MessageSerializer;
-import org.apache.tinkerpop.gremlin.util.Tokens;
-import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.jsr223.JavaTranslator;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
-import org.apache.tinkerpop.gremlin.process.traversal.Failure;
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
-import org.apache.tinkerpop.gremlin.process.traversal.util.BytecodeHelper;
-import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalInterruptedException;
-import org.apache.tinkerpop.gremlin.server.Context;
-import org.apache.tinkerpop.gremlin.server.GraphManager;
-import org.apache.tinkerpop.gremlin.server.GremlinServer;
-import org.apache.tinkerpop.gremlin.server.OpProcessor;
-import org.apache.tinkerpop.gremlin.server.Settings;
-import org.apache.tinkerpop.gremlin.server.auth.AuthenticatedUser;
-import org.apache.tinkerpop.gremlin.server.handler.Frame;
-import org.apache.tinkerpop.gremlin.server.handler.StateKey;
-import org.apache.tinkerpop.gremlin.server.op.AbstractOpProcessor;
-import org.apache.tinkerpop.gremlin.server.op.OpProcessorException;
-import org.apache.tinkerpop.gremlin.server.util.MetricManager;
-import org.apache.tinkerpop.gremlin.server.util.TraverserIterator;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.util.CloseableIterator;
-import org.apache.tinkerpop.gremlin.structure.util.TemporaryException;
-import org.apache.tinkerpop.gremlin.util.function.ThrowingConsumer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.script.Bindings;
-import javax.script.ScriptException;
-import javax.script.SimpleBindings;
-import java.lang.reflect.UndeclaredThrowableException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.concurrent.Future;
-import java.util.concurrent.FutureTask;
-import java.util.concurrent.RejectedExecutionException;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.TimeUnit;
-
-import static com.codahale.metrics.MetricRegistry.name;
-
-/**
- * Simple {@link OpProcessor} implementation that iterates remotely submitted serialized {@link Traversal} objects.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class TraversalOpProcessor extends AbstractOpProcessor {
- private static final Logger logger = LoggerFactory.getLogger(TraversalOpProcessor.class);
- private static final Logger auditLogger = LoggerFactory.getLogger(GremlinServer.AUDIT_LOGGER_NAME);
- public static final String OP_PROCESSOR_NAME = "traversal";
- public static final Timer traversalOpTimer = MetricManager.INSTANCE.getTimer(name(GremlinServer.class, "op", "traversal"));
-
- private static final Bindings EMPTY_BINDINGS = new SimpleBindings();
-
- public TraversalOpProcessor() {
- super(false);
- }
-
- @Override
- public String getName() {
- return OP_PROCESSOR_NAME;
- }
-
- @Override
- public void close() throws Exception {
- // do nothing = no resources to release
- }
-
- @Override
- public ThrowingConsumer<Context> select(final Context context) throws OpProcessorException {
- final RequestMessage message = context.getRequestMessage();
- logger.debug("Selecting processor for RequestMessage {}", message);
-
- final ThrowingConsumer<Context> op;
- switch (message.getOp()) {
- case Tokens.OPS_BYTECODE:
- validateTraversalSourceAlias(context, message, validateTraversalRequest(message));
- op = this::iterateBytecodeTraversal;
- break;
- case Tokens.OPS_INVALID:
- final String msgInvalid = String.format("Message could not be parsed. Check the format of the request. [%s]", message);
- throw new OpProcessorException(msgInvalid, ResponseMessage.build(message).code(ResponseStatusCode.REQUEST_ERROR_MALFORMED_REQUEST).statusMessage(msgInvalid).create());
- default:
- final String msgDefault = String.format("Message with op code [%s] is not recognized.", message.getOp());
- throw new OpProcessorException(msgDefault, ResponseMessage.build(message).code(ResponseStatusCode.REQUEST_ERROR_MALFORMED_REQUEST).statusMessage(msgDefault).create());
- }
-
- return op;
- }
-
- private static void validateTraversalSourceAlias(final Context ctx, final RequestMessage message, final Map<String, String> aliases) throws OpProcessorException {
- final String traversalSourceBindingForAlias = aliases.values().iterator().next();
- if (!ctx.getGraphManager().getTraversalSourceNames().contains(traversalSourceBindingForAlias)) {
- final String msg = String.format("The traversal source [%s] for alias [%s] is not configured on the server.", traversalSourceBindingForAlias, Tokens.VAL_TRAVERSAL_SOURCE_ALIAS);
- throw new OpProcessorException(msg, ResponseMessage.build(message).code(ResponseStatusCode.REQUEST_ERROR_INVALID_REQUEST_ARGUMENTS).statusMessage(msg).create());
- }
- }
-
- private static Map<String, String> validateTraversalRequest(final RequestMessage message) throws OpProcessorException {
- if (!message.optionalArgs(Tokens.ARGS_GREMLIN).isPresent()) {
- final String msg = String.format("A message with [%s] op code requires a [%s] argument.", Tokens.OPS_BYTECODE, Tokens.ARGS_GREMLIN);
- throw new OpProcessorException(msg, ResponseMessage.build(message).code(ResponseStatusCode.REQUEST_ERROR_INVALID_REQUEST_ARGUMENTS).statusMessage(msg).create());
- }
-
- // matches functionality in the UnifiedHandler
- if (!(message.optionalArgs(Tokens.ARGS_GREMLIN).get() instanceof Bytecode)) {
- final String msg = String.format("A message with [%s] op code requires a [%s] argument that is of type %s.",
- Tokens.OPS_BYTECODE, Tokens.ARGS_GREMLIN, Bytecode.class.getSimpleName());
- throw new OpProcessorException(msg, ResponseMessage.build(message).code(ResponseStatusCode.REQUEST_ERROR_INVALID_REQUEST_ARGUMENTS).statusMessage(msg).create());
- }
-
- return validatedAliases(message).get();
- }
-
- private static Optional<Map<String, String>> validatedAliases(final RequestMessage message) throws OpProcessorException {
- final Optional<Map<String, String>> aliases = message.optionalArgs(Tokens.ARGS_ALIASES);
- if (!aliases.isPresent()) {
- final String msg = String.format("A message with [%s] op code requires a [%s] argument.", Tokens.OPS_BYTECODE, Tokens.ARGS_ALIASES);
- throw new OpProcessorException(msg, ResponseMessage.build(message).code(ResponseStatusCode.REQUEST_ERROR_INVALID_REQUEST_ARGUMENTS).statusMessage(msg).create());
- }
-
- if (aliases.get().size() != 1 || !aliases.get().containsKey(Tokens.VAL_TRAVERSAL_SOURCE_ALIAS)) {
- final String msg = String.format("A message with [%s] op code requires the [%s] argument to be a Map containing one alias assignment named '%s'.",
- Tokens.OPS_BYTECODE, Tokens.ARGS_ALIASES, Tokens.VAL_TRAVERSAL_SOURCE_ALIAS);
- throw new OpProcessorException(msg, ResponseMessage.build(message).code(ResponseStatusCode.REQUEST_ERROR_INVALID_REQUEST_ARGUMENTS).statusMessage(msg).create());
- }
-
- return aliases;
- }
-
- private void iterateBytecodeTraversal(final Context context) throws Exception {
- final RequestMessage msg = context.getRequestMessage();
- final Settings settings = context.getSettings();
- logger.debug("Traversal request {} for in thread {}", msg.getRequestId(), Thread.currentThread().getName());
-
- // validateTraversalRequest() ensures that this is of type Bytecode
- final Object bytecodeObj = msg.getArgs().get(Tokens.ARGS_GREMLIN);
- final Bytecode bytecode = (Bytecode) bytecodeObj;
-
- // earlier validation in selection of this op method should free us to cast this without worry
- final Map<String, String> aliases = (Map<String, String>) msg.optionalArgs(Tokens.ARGS_ALIASES).get();
-
- // timeout override - handle both deprecated and newly named configuration. earlier logic should prevent
- // both configurations from being submitted at the same time
- final Map<String, Object> args = msg.getArgs();
- final long seto = args.containsKey(Tokens.ARGS_EVAL_TIMEOUT) ?
- ((Number) args.get(Tokens.ARGS_EVAL_TIMEOUT)).longValue() : context.getSettings().getEvaluationTimeout();
-
- final GraphManager graphManager = context.getGraphManager();
- final String traversalSourceName = aliases.entrySet().iterator().next().getValue();
- final TraversalSource g = graphManager.getTraversalSource(traversalSourceName);
-
- final Traversal.Admin<?, ?> traversal;
- try {
- final Optional<String> lambdaLanguage = BytecodeHelper.getLambdaLanguage(bytecode);
- if (!lambdaLanguage.isPresent())
- traversal = JavaTranslator.of(g).translate(bytecode);
- else
- traversal = context.getGremlinExecutor().eval(bytecode, EMPTY_BINDINGS, lambdaLanguage.get(), traversalSourceName);
- } catch (ScriptException ex) {
- logger.error("Traversal contains a lambda that cannot be compiled", ex);
- throw new OpProcessorException("Traversal contains a lambda that cannot be compiled",
- ResponseMessage.build(msg).code(ResponseStatusCode.SERVER_ERROR_EVALUATION)
- .statusMessage(ex.getMessage())
- .statusAttributeException(ex).create());
- } catch (Exception ex) {
- logger.error("Could not deserialize the Traversal instance", ex);
- throw new OpProcessorException("Could not deserialize the Traversal instance",
- ResponseMessage.build(msg).code(ResponseStatusCode.SERVER_ERROR_SERIALIZATION)
- .statusMessage(ex.getMessage())
- .statusAttributeException(ex).create());
- }
- if (settings.enableAuditLog) {
- AuthenticatedUser user = context.getChannelHandlerContext().channel().attr(StateKey.AUTHENTICATED_USER).get();
- if (null == user) { // This is expected when using the AllowAllAuthenticator
- user = AuthenticatedUser.ANONYMOUS_USER;
- }
- String address = context.getChannelHandlerContext().channel().remoteAddress().toString();
- if (address.startsWith("/") && address.length() > 1) address = address.substring(1);
- auditLogger.info("User {} with address {} requested: {}", user.getName(), address, bytecode);
- }
-
- final Timer.Context timerContext = traversalOpTimer.time();
- final FutureTask<Void> evalFuture = new FutureTask<>(() -> {
- context.setStartedResponse();
- final Graph graph = g.getGraph();
-
- try {
- beforeProcessing(graph, context);
-
- try {
- // compile the traversal - without it getEndStep() has nothing in it
- traversal.applyStrategies();
- handleIterator(context, new TraverserIterator(traversal), graph);
- } catch (Exception ex) {
- Throwable t = ex;
- if (ex instanceof UndeclaredThrowableException)
- t = t.getCause();
-
- CloseableIterator.closeIterator(traversal);
-
- // if any exception in the chain is TemporaryException or Failure then we should respond with the
- // right error code so that the client knows to retry
- final Optional<Throwable> possibleSpecialException = determineIfSpecialException(ex);
- if (possibleSpecialException.isPresent()) {
- final Throwable special = possibleSpecialException.get();
- final ResponseMessage.Builder specialResponseMsg = ResponseMessage.build(msg).
- statusMessage(special.getMessage()).
- statusAttributeException(special);
- if (special instanceof TemporaryException) {
- specialResponseMsg.code(ResponseStatusCode.SERVER_ERROR_TEMPORARY);
- } else if (special instanceof Failure) {
- final Failure failure = (Failure) special;
- specialResponseMsg.code(ResponseStatusCode.SERVER_ERROR_FAIL_STEP).
- statusAttribute(Tokens.STATUS_ATTRIBUTE_FAIL_STEP_MESSAGE, failure.format());
- }
- context.writeAndFlush(specialResponseMsg.create());
- } else if (t instanceof InterruptedException || t instanceof TraversalInterruptedException) {
- graphManager.onQueryError(msg, t);
- final String errorMessage = String.format("A timeout occurred during traversal evaluation of [%s] - consider increasing the limit given to evaluationTimeout", msg);
- logger.warn(errorMessage);
- context.writeAndFlush(ResponseMessage.build(msg).code(ResponseStatusCode.SERVER_ERROR_TIMEOUT)
- .statusMessage(errorMessage)
- .statusAttributeException(ex).create());
- } else {
- logger.warn(String.format("Exception processing a Traversal on iteration for request [%s].", msg.getRequestId()), ex);
- context.writeAndFlush(ResponseMessage.build(msg).code(ResponseStatusCode.SERVER_ERROR)
- .statusMessage(ex.getMessage())
- .statusAttributeException(ex).create());
- }
- onError(graph, context, ex);
- }
- } catch (Throwable t) {
- onError(graph, context, t);
- // if any exception in the chain is TemporaryException or Failure then we should respond with the
- // right error code so that the client knows to retry
- final Optional<Throwable> possibleSpecialException = determineIfSpecialException(t);
- if (possibleSpecialException.isPresent()) {
- final Throwable special = possibleSpecialException.get();
- final ResponseMessage.Builder specialResponseMsg = ResponseMessage.build(msg).
- statusMessage(special.getMessage()).
- statusAttributeException(special);
- if (special instanceof TemporaryException) {
- specialResponseMsg.code(ResponseStatusCode.SERVER_ERROR_TEMPORARY);
- } else if (special instanceof Failure) {
- final Failure failure = (Failure) special;
- specialResponseMsg.code(ResponseStatusCode.SERVER_ERROR_FAIL_STEP).
- statusAttribute(Tokens.STATUS_ATTRIBUTE_FAIL_STEP_MESSAGE, failure.format());
- }
- context.writeAndFlush(specialResponseMsg.create());
- } else {
- logger.warn(String.format("Exception processing a Traversal on request [%s].", msg.getRequestId()), t);
- context.writeAndFlush(ResponseMessage.build(msg).code(ResponseStatusCode.SERVER_ERROR)
- .statusMessage(t.getMessage())
- .statusAttributeException(t).create());
- if (t instanceof Error) {
- //Re-throw any errors to be handled by and set as the result of evalFuture
- throw t;
- }
- }
- } finally {
- timerContext.stop();
-
- // There is a race condition that this query may have finished before the timeoutFuture was created,
- // though this is very unlikely. This is handled in the settor, if this has already been grabbed.
- // If we passed this point and the setter hasn't been called, it will cancel the timeoutFuture inside
- // the setter to compensate.
- final ScheduledFuture<?> timeoutFuture = context.getTimeoutExecutor();
- if (null != timeoutFuture)
- timeoutFuture.cancel(true);
- }
-
- return null;
- });
-
- try {
- final Future<?> executionFuture = context.getGremlinExecutor().getExecutorService().submit(evalFuture);
- if (seto > 0) {
- // Schedule a timeout in the thread pool for future execution
- context.setTimeoutExecutor(context.getScheduledExecutorService().schedule(() -> {
- executionFuture.cancel(true);
- if (!context.getStartedResponse()) {
- context.sendTimeoutResponse();
- }
- }, seto, TimeUnit.MILLISECONDS));
- }
- } catch (RejectedExecutionException ree) {
- context.writeAndFlush(ResponseMessage.build(msg).code(ResponseStatusCode.TOO_MANY_REQUESTS)
- .statusMessage("Rate limiting").create());
- }
- }
-
- protected void beforeProcessing(final Graph graph, final Context ctx) {
- final GraphManager graphManager = ctx.getGraphManager();
- final RequestMessage msg = ctx.getRequestMessage();
- graphManager.beforeQueryStart(msg);
- if (graph.features().graph().supportsTransactions() && graph.tx().isOpen()) graph.tx().rollback();
- }
-
- protected void onError(final Graph graph, final Context ctx, Throwable error) {
- final GraphManager graphManager = ctx.getGraphManager();
- final RequestMessage msg = ctx.getRequestMessage();
- graphManager.onQueryError(msg, error);
- if (graph.features().graph().supportsTransactions() && graph.tx().isOpen()) graph.tx().rollback();
- }
-
- protected void onTraversalSuccess(final Graph graph, final Context ctx) {
- final GraphManager graphManager = ctx.getGraphManager();
- final RequestMessage msg = ctx.getRequestMessage();
- graphManager.onQuerySuccess(msg);
- if (graph.features().graph().supportsTransactions() && graph.tx().isOpen()) graph.tx().commit();
- }
-
- protected void handleIterator(final Context context, final Iterator itty, final Graph graph) throws InterruptedException {
- final ChannelHandlerContext nettyContext = context.getChannelHandlerContext();
- final RequestMessage msg = context.getRequestMessage();
- final Settings settings = context.getSettings();
- final MessageSerializer<?> serializer = nettyContext.channel().attr(StateKey.SERIALIZER).get();
- final boolean useBinary = nettyContext.channel().attr(StateKey.USE_BINARY).get();
-
- // used to limit warnings for when netty fills the buffer and hits the high watermark - prevents
- // over-logging of the same message.
- long lastWarningTime = 0;
- int warnCounter = 0;
-
- // we have an empty iterator - happens on stuff like: g.V().iterate()
- if (!itty.hasNext()) {
- final Map<String, Object> attributes = generateStatusAttributes(nettyContext, msg, ResponseStatusCode.NO_CONTENT, itty, settings);
-
- // as there is nothing left to iterate if we are transaction managed then we should execute a
- // commit here before we send back a NO_CONTENT which implies success
- onTraversalSuccess(graph, context);
- context.writeAndFlush(ResponseMessage.build(msg)
- .code(ResponseStatusCode.NO_CONTENT)
- .statusAttributes(attributes)
- .create());
- return;
- }
-
- // the batch size can be overridden by the request
- final int resultIterationBatchSize = (Integer) msg.optionalArgs(Tokens.ARGS_BATCH_SIZE)
- .orElse(settings.resultIterationBatchSize);
- List<Object> aggregate = new ArrayList<>(resultIterationBatchSize);
-
- // use an external control to manage the loop as opposed to just checking hasNext() in the while. this
- // prevent situations where auto transactions create a new transaction after calls to commit() withing
- // the loop on calls to hasNext().
- boolean hasMore = itty.hasNext();
-
- while (hasMore) {
- if (Thread.interrupted()) throw new InterruptedException();
-
- // check if an implementation needs to force flush the aggregated results before the iteration batch
- // size is reached.
- final boolean forceFlush = isForceFlushed(nettyContext, msg, itty);
-
- // have to check the aggregate size because it is possible that the channel is not writeable (below)
- // so iterating next() if the message is not written and flushed would bump the aggregate size beyond
- // the expected resultIterationBatchSize. Total serialization time for the response remains in
- // effect so if the client is "slow" it may simply timeout.
- //
- // there is a need to check hasNext() on the iterator because if the channel is not writeable the
- // previous pass through the while loop will have next()'d the iterator and if it is "done" then a
- // NoSuchElementException will raise its head. also need a check to ensure that this iteration doesn't
- // require a forced flush which can be forced by sub-classes.
- //
- // this could be placed inside the isWriteable() portion of the if-then below but it seems better to
- // allow iteration to continue into a batch if that is possible rather than just doing nothing at all
- // while waiting for the client to catch up
- if (aggregate.size() < resultIterationBatchSize && itty.hasNext() && !forceFlush) aggregate.add(itty.next());
-
- // Don't keep executor busy if client has already given up; there is no way to catch up if the channel is
- // not active, and hence we should break the loop.
- if (!nettyContext.channel().isActive()) {
- onError(graph, context, new ChannelException("Channel is not active - cannot write any more results"));
- break;
- }
-
- // send back a page of results if batch size is met or if it's the end of the results being iterated.
- // also check writeability of the channel to prevent OOME for slow clients.
- //
- // clients might decide to close the Netty channel to the server with a CloseWebsocketFrame after errors
- // like CorruptedFrameException. On the server, although the channel gets closed, there might be some
- // executor threads waiting for watermark to clear which will not clear in these cases since client has
- // already given up on these requests. This leads to these executors waiting for the client to consume
- // results till the timeout. checking for isActive() should help prevent that.
- if (nettyContext.channel().isActive() && nettyContext.channel().isWritable()) {
- if (forceFlush || aggregate.size() == resultIterationBatchSize || !itty.hasNext()) {
- final ResponseStatusCode code = itty.hasNext() ? ResponseStatusCode.PARTIAL_CONTENT : ResponseStatusCode.SUCCESS;
-
- // serialize here because in sessionless requests the serialization must occur in the same
- // thread as the eval. as eval occurs in the GremlinExecutor there's no way to get back to the
- // thread that processed the eval of the script so, we have to push serialization down into that
- final Map<String, Object> metadata = generateResultMetaData(nettyContext, msg, code, itty, settings);
- final Map<String, Object> statusAttrb = generateStatusAttributes(nettyContext, msg, code, itty, settings);
- Frame frame = null;
- try {
- frame = makeFrame(context, msg, serializer, useBinary, aggregate, code,
- metadata, statusAttrb);
- } catch (Exception ex) {
- // a frame may use a Bytebuf which is a countable release - if it does not get written
- // downstream it needs to be released here
- if (frame != null) frame.tryRelease();
-
- // exception is handled in makeFrame() - serialization error gets written back to driver
- // at that point
- onError(graph, context, ex);
- break;
- }
-
- // track whether there is anything left in the iterator because it needs to be accessed after
- // the transaction could be closed - in that case a call to hasNext() could open a new transaction
- // unintentionally
- hasMore = itty.hasNext();
-
- try {
- // only need to reset the aggregation list if there's more stuff to write
- if (hasMore)
- aggregate = new ArrayList<>(resultIterationBatchSize);
- else {
- // iteration and serialization are both complete which means this finished successfully. note that
- // errors internal to script eval or timeout will rollback given GremlinServer's global configurations.
- // local errors will get rolled back below because the exceptions aren't thrown in those cases to be
- // caught by the GremlinExecutor for global rollback logic. this only needs to be committed if
- // there are no more items to iterate and serialization is complete
- onTraversalSuccess(graph, context);
- }
- } catch (Exception ex) {
- // a frame may use a Bytebuf which is a countable release - if it does not get written
- // downstream it needs to be released here
- if (frame != null) frame.tryRelease();
- throw ex;
- }
-
- if (!hasMore) iterateComplete(nettyContext, msg, itty);
-
- // the flush is called after the commit has potentially occurred. in this way, if a commit was
- // required then it will be 100% complete before the client receives it. the "frame" at this point
- // should have completely detached objects from the transaction (i.e. serialization has occurred)
- // so a new one should not be opened on the flush down the netty pipeline
- context.writeAndFlush(code, frame);
- }
- } else {
- final long currentTime = System.currentTimeMillis();
-
- // exponential delay between warnings. don't keep triggering this warning over and over again for the
- // same request. totalPendingWriteBytes is volatile so it is possible that by the time this warning
- // hits the log the low watermark may have been hit
- long interval = (long) Math.pow(2, warnCounter) * 1000;
- if (currentTime - lastWarningTime >= interval) {
- final Channel ch = context.getChannelHandlerContext().channel();
- logger.warn("Warning {}: Outbound buffer size={}, pausing response writing as writeBufferHighWaterMark exceeded on request {} for channel {} - writing will continue once client has caught up",
- warnCounter,
- ch.unsafe().outboundBuffer().totalPendingWriteBytes(),
- msg.getRequestId(),
- ch.id());
-
- lastWarningTime = currentTime;
- warnCounter++;
- }
-
- // since the client is lagging we can hold here for a period of time for the client to catch up.
- // this isn't blocking the IO thread - just a worker.
- TimeUnit.MILLISECONDS.sleep(WRITE_PAUSE_TIME_MS);
- writePausesMeter.mark();
- }
- }
- }
-}
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/GremlinError.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/GremlinError.java
new file mode 100644
index 0000000..1616c25
--- /dev/null
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/GremlinError.java
@@ -0,0 +1,147 @@
+/*
+ * 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.server.util;
+
+import io.netty.handler.codec.http.HttpResponseStatus;
+import org.apache.tinkerpop.gremlin.language.grammar.GremlinParserException;
+import org.apache.tinkerpop.gremlin.process.traversal.Failure;
+import org.apache.tinkerpop.gremlin.util.ExceptionHelper;
+import org.apache.tinkerpop.gremlin.util.Tokens;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+
+import java.util.Set;
+
+/**
+ * Exception utility class that generates exceptions in the form expected in a {@code ResponseStatus} for different
+ * issues that the server can encounter.
+ */
+public class GremlinError {
+ private final HttpResponseStatus code;
+ private final String message;
+ private final String exception;
+
+ private GremlinError(HttpResponseStatus code, String message, String exception) {
+ this.code = code;
+ this.message = message;
+ this.exception = exception;
+ }
+
+ public HttpResponseStatus getCode() {
+ return code;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+
+ public String getException() {
+ return exception;
+ }
+
+ // ------------ request validation errors
+
+ // script type errors
+ public static GremlinError invalidGremlinType(final RequestMessage requestMessage ) {
+ final String message = String.format("Message could not be parsed. Check the format of the request. [%s]",
+ requestMessage);
+ return new GremlinError(HttpResponseStatus.BAD_REQUEST, message, "InvalidRequestException");
+ }
+
+ // script errors
+ public static GremlinError binding() {
+ final String message = String.format("The message is using one or more invalid binding keys - they must be of type String and cannot be null");
+ return new GremlinError(HttpResponseStatus.BAD_REQUEST, message, "InvalidRequestException");
+ }
+
+ public static GremlinError binding(final Set<String> badBindings) {
+ final String message = String.format("The message supplies one or more invalid parameters key of [%s] - these are reserved names.",
+ badBindings);
+ return new GremlinError(HttpResponseStatus.BAD_REQUEST, message, "InvalidRequestException");
+ }
+
+ public static GremlinError binding(final int bindingsCount, final int allowedSize) {
+ final String message = String.format("The message contains %s bindings which is more than is allowed by the server %s configuration",
+ bindingsCount, allowedSize);
+ return new GremlinError(HttpResponseStatus.BAD_REQUEST, message, "InvalidRequestException");
+ }
+
+ public static GremlinError binding(final String aliased) {
+ final String message = String.format("Could not alias [%s] to [%s] as [%s] not in the Graph or TraversalSource global bindings",
+ Tokens.ARGS_G, aliased, aliased);
+ return new GremlinError(HttpResponseStatus.BAD_REQUEST, message, "InvalidRequestException");
+ }
+
+ public static GremlinError parsing(final GremlinParserException error) {
+ return new GremlinError(HttpResponseStatus.BAD_REQUEST, error.getMessage(), "MalformedQueryException");
+ }
+
+ // execution errors
+ public static GremlinError timeout(final RequestMessage requestMessage ) {
+ final String message = String.format("A timeout occurred during traversal evaluation of [%s] - consider increasing the limit given to evaluationTimeout",
+ requestMessage);
+ return new GremlinError(HttpResponseStatus.INTERNAL_SERVER_ERROR, message, "ServerTimeoutExceededException");
+ }
+
+ public static GremlinError timedInterruptTimeout() {
+ return new GremlinError(HttpResponseStatus.INTERNAL_SERVER_ERROR,
+ "Timeout during script evaluation triggered by TimedInterruptCustomizerProvider",
+ "ServerTimeoutExceededException");
+ }
+
+ public static GremlinError rateLimiting() {
+ return new GremlinError(HttpResponseStatus.TOO_MANY_REQUESTS,
+ "Too many requests have been sent in a given amount of time.", "TooManyRequestsException");
+ }
+
+ public static GremlinError serialization(Exception ex) {
+ final String message = String.format("Error during serialization: %s", ExceptionHelper.getMessageFromExceptionOrCause(ex));
+ return new GremlinError(HttpResponseStatus.INTERNAL_SERVER_ERROR, message, "ServerSerializationException");
+ }
+
+ public static GremlinError wrongSerializer(Exception ex) {
+ final String message = String.format("Error during serialization: %s", ExceptionHelper.getMessageFromExceptionOrCause(ex));
+ return new GremlinError(HttpResponseStatus.INTERNAL_SERVER_ERROR, message, "ServerSerializationException");
+ }
+
+ public static GremlinError longFrame(Throwable t) {
+ final String message = t.getMessage() + " - increase the maxRequestContentLength";
+ // todo: ResponseEntityTooLargeException? !!!
+ return new GremlinError(HttpResponseStatus.REQUEST_ENTITY_TOO_LARGE, message, "RequestEntityTooLargeException");
+ }
+
+ public static GremlinError longRequest(final RequestMessage requestMessage ) {
+ final String message = String.format("The Gremlin statement that was submitted exceeds the maximum compilation size allowed by the JVM, please split it into multiple smaller statements - %s", requestMessage.trimMessage(1021));
+ return new GremlinError(HttpResponseStatus.REQUEST_ENTITY_TOO_LARGE, message, "RequestEntityTooLargeException");
+ }
+
+ public static GremlinError temporary(final Throwable t) {
+ return new GremlinError(HttpResponseStatus.INTERNAL_SERVER_ERROR, t.getMessage(), "ServerEvaluationException");
+ }
+
+ public static GremlinError failStep(final Failure failure) {
+ // todo: double check message
+ return new GremlinError(HttpResponseStatus.INTERNAL_SERVER_ERROR,
+ failure.getMessage(), "ServerFailStepException");
+ }
+
+ public static GremlinError general(final Throwable t) {
+ final String message = (t.getMessage() == null) ? t.toString() : t.getMessage();
+ return new GremlinError(HttpResponseStatus.INTERNAL_SERVER_ERROR, message, "ServerErrorException");
+ }
+}
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/TextPlainMessageSerializer.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/TextPlainMessageSerializer.java
index 002058e..cf31137 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/TextPlainMessageSerializer.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/TextPlainMessageSerializer.java
@@ -20,11 +20,11 @@
import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufAllocator;
+import io.netty.handler.codec.http.HttpResponseStatus;
import io.netty.util.CharsetUtil;
import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.util.ser.MessageTextSerializer;
-import org.apache.tinkerpop.gremlin.util.ser.SerializationException;
+import org.apache.tinkerpop.gremlin.util.ser.AbstractMessageSerializer;
import java.util.List;
import java.util.Objects;
@@ -34,7 +34,7 @@
* A highly use-case specific serializer that only has context for HTTP where results simply need to be converted
* to string in a line by line fashion for text based returns.
*/
-public class TextPlainMessageSerializer implements MessageTextSerializer<Function<Object, String>> {
+public class TextPlainMessageSerializer extends AbstractMessageSerializer<Function<Object, String>> {
@Override
public Function<Object, String> getMapper() {
@@ -42,26 +42,49 @@
}
@Override
- public ByteBuf serializeResponseAsBinary(final ResponseMessage responseMessage, final ByteBufAllocator allocator) throws SerializationException {
- final String payload = serializeResponseAsString(responseMessage, allocator);
- final ByteBuf encodedMessage = allocator.buffer(payload.length());
- encodedMessage.writeCharSequence(payload, CharsetUtil.UTF_8);
-
- return encodedMessage;
+ public ByteBuf serializeResponseAsBinary(final ResponseMessage responseMessage, final ByteBufAllocator allocator) {
+ return (responseMessage.getStatus().getCode() == HttpResponseStatus.OK)
+ ? convertStringData(responseMessage.getResult().getData(), false, allocator)
+ : convertErrorString(responseMessage.getStatus().getMessage(), allocator);
}
@Override
- public ByteBuf serializeRequestAsBinary(final RequestMessage requestMessage, final ByteBufAllocator allocator) throws SerializationException {
- throw new UnsupportedOperationException("text/plain does not produce binary");
+ public ByteBuf writeHeader(ResponseMessage responseMessage, ByteBufAllocator allocator) {
+ return convertStringData(responseMessage.getResult().getData(), false, allocator);
}
@Override
- public RequestMessage deserializeRequest(final ByteBuf msg) throws SerializationException {
+ public ByteBuf writeChunk(Object aggregate, ByteBufAllocator allocator) {
+ return convertStringData((List<Object>) aggregate, true, allocator);
+ }
+
+ @Override
+ public ByteBuf writeFooter(ResponseMessage responseMessage, ByteBufAllocator allocator) {
+ return convertStringData(responseMessage.getResult().getData(), true, allocator);
+ }
+
+ @Override
+ public ByteBuf writeErrorFooter(ResponseMessage responseMessage, ByteBufAllocator allocator) {
+ return convertErrorString(System.lineSeparator() + responseMessage.getStatus().getMessage(), allocator);
+ }
+
+ @Override
+ public ResponseMessage readChunk(ByteBuf byteBuf, boolean isFirstChunk) {
throw new UnsupportedOperationException("text/plain does not have deserialization functions");
}
@Override
- public ResponseMessage deserializeResponse(final ByteBuf msg) throws SerializationException {
+ public ByteBuf serializeRequestAsBinary(final RequestMessage requestMessage, final ByteBufAllocator allocator) {
+ throw new UnsupportedOperationException("text/plain does not produce binary");
+ }
+
+ @Override
+ public RequestMessage deserializeBinaryRequest(final ByteBuf msg) {
+ throw new UnsupportedOperationException("text/plain does not have deserialization functions");
+ }
+
+ @Override
+ public ResponseMessage deserializeBinaryResponse(final ByteBuf msg) {
throw new UnsupportedOperationException("text/plain does not have deserialization functions");
}
@@ -70,33 +93,27 @@
return new String[] { "text/plain" };
}
- @Override
- public String serializeResponseAsString(final ResponseMessage responseMessage, final ByteBufAllocator allocator) throws SerializationException {
+ private ByteBuf convertStringData(final List<Object> data, final boolean addStartingSeparator, final ByteBufAllocator allocator) {
final StringBuilder sb = new StringBuilder();
+ if (addStartingSeparator) sb.append(System.lineSeparator());
// this should only serialize success conditions so all should have data in List form
- final List<Object> data = (List<Object>) responseMessage.getResult().getData();
for (int ix = 0; ix < data.size(); ix ++) {
sb.append("==>");
sb.append(data.get(ix));
if (ix < data.size() - 1)
sb.append(System.lineSeparator());
}
- return sb.toString();
+
+ final ByteBuf encodedMessage = allocator.buffer(sb.length());
+ encodedMessage.writeCharSequence(sb.toString(), CharsetUtil.UTF_8);
+
+ return encodedMessage;
}
- @Override
- public String serializeRequestAsString(final RequestMessage requestMessage, final ByteBufAllocator allocator) throws SerializationException {
- throw new UnsupportedOperationException("text/plain does not have any need to serialize requests");
- }
-
- @Override
- public RequestMessage deserializeRequest(final String msg) throws SerializationException {
- throw new UnsupportedOperationException("text/plain does not have deserialization functions");
- }
-
- @Override
- public ResponseMessage deserializeResponse(final String msg) throws SerializationException {
- throw new UnsupportedOperationException("text/plain does not have deserialization functions");
+ private ByteBuf convertErrorString(final String error, final ByteBufAllocator allocator) {
+ final ByteBuf encodedMessage = allocator.buffer(error.length());
+ encodedMessage.writeCharSequence(error, CharsetUtil.UTF_8);
+ return encodedMessage;
}
}
diff --git a/gremlin-server/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.server.OpProcessor b/gremlin-server/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.server.OpProcessor
deleted file mode 100644
index 4f1bf10..0000000
--- a/gremlin-server/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.server.OpProcessor
+++ /dev/null
@@ -1,3 +0,0 @@
-org.apache.tinkerpop.gremlin.server.op.standard.StandardOpProcessor
-org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor
-org.apache.tinkerpop.gremlin.server.op.traversal.TraversalOpProcessor
\ No newline at end of file
diff --git a/gremlin-server/src/main/static/LICENSE b/gremlin-server/src/main/static/LICENSE
index e4c2b49..bc3a28a 100644
--- a/gremlin-server/src/main/static/LICENSE
+++ b/gremlin-server/src/main/static/LICENSE
@@ -223,8 +223,7 @@
The Apache TinkerPop project bundles the following components under the MIT License:
- JCL 1.1.1 implemented over SLF4J (org.slf4j:jcl-over-slf4j:1.7.25 - http://www.slf4j.org) - for details, see licenses/slf4j
- SLF4J API Module (org.slf4j:slf4j-api:1.7.25 - http://www.slf4j.org) - for details, see licenses/slf4j
+ SLF4J API Module (org.slf4j:slf4j-api:2.0.16 - http://www.slf4j.org) - for details, see licenses/slf4j
Foundation stylesheet for CodeRay (http://foundation.zurb.com) - for details, see licenses/foundation
normalize.css 2.1.2 (http://necolas.github.io/normalize.css/) - for details, see licenses/normalize
@@ -238,5 +237,5 @@
The Apache TinkerPop project bundles the following components under the Eclipse Public License 1.0:
- logback-core (ch.qos.logback:logback-core:1.2.3 - https://logback.qos.ch) - for details, see licenses/logback
- logback-classic (ch.qos.logback:logback-classic:1.2.3 - https://logback.qos.ch) - for details, see licenses/logback
\ No newline at end of file
+ logback-core (ch.qos.logback:logback-core:1.3.15 - https://logback.qos.ch) - for details, see licenses/logback
+ logback-classic (ch.qos.logback:logback-classic:1.3.15 - https://logback.qos.ch) - for details, see licenses/logback
\ No newline at end of file
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/ClientConnectionIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/ClientConnectionIntegrateTest.java
index 6f5c0ce..ef25fe5 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/ClientConnectionIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/ClientConnectionIntegrateTest.java
@@ -20,21 +20,21 @@
import ch.qos.logback.classic.Level;
import ch.qos.logback.classic.Logger;
-import io.netty.handler.codec.CorruptedFrameException;
+import io.netty.handler.codec.TooLongFrameException;
import nl.altindag.log.LogCaptor;
-import org.apache.tinkerpop.gremlin.util.Tokens;
import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
import org.apache.tinkerpop.gremlin.driver.exception.ConnectionException;
import org.apache.tinkerpop.gremlin.driver.exception.NoHostAvailableException;
-import org.apache.tinkerpop.gremlin.util.ser.Serializers;
import org.apache.tinkerpop.gremlin.server.AbstractGremlinServerIntegrationTest;
import org.apache.tinkerpop.gremlin.server.TestClientFactory;
import org.hamcrest.core.Is;
import org.junit.After;
import org.junit.AfterClass;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.runner.Request;
import org.slf4j.LoggerFactory;
import java.util.ArrayList;
@@ -51,7 +51,6 @@
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong;
-import java.util.function.Supplier;
import java.util.stream.IntStream;
import static org.hamcrest.CoreMatchers.is;
@@ -65,7 +64,8 @@
public class ClientConnectionIntegrateTest extends AbstractGremlinServerIntegrationTest {
private static LogCaptor logCaptor;
- private Level previousLevel;
+ private Level previousConnectionLevel;
+ private Level previousConnectionPoolLevel;
@BeforeClass
public static void setupLogCaptor() {
@@ -80,8 +80,11 @@
@Before
public void setupForEachTest() {
final Logger lc = (Logger) LoggerFactory.getLogger(Connection.class);
- previousLevel = lc.getLevel();
+ previousConnectionLevel = lc.getLevel();
lc.setLevel(Level.DEBUG);
+ final Logger lcp = (Logger) LoggerFactory.getLogger(ConnectionPool.class);
+ previousConnectionPoolLevel = lcp.getLevel();
+ lcp.setLevel(Level.DEBUG);
logCaptor.clearLogs();
}
@@ -89,7 +92,9 @@
@After
public void afterEachTest() {
final Logger lc = (Logger) LoggerFactory.getLogger(Connection.class);
- lc.setLevel(previousLevel);
+ lc.setLevel(previousConnectionLevel);
+ final Logger lcp = (Logger) LoggerFactory.getLogger(ConnectionPool.class);
+ lcp.setLevel(previousConnectionPoolLevel);
}
/**
@@ -97,24 +102,22 @@
*/
@Test
public void shouldCloseConnectionDeadDueToUnRecoverableError() throws Exception {
- // Set a low value of maxContentLength to intentionally trigger CorruptedFrameException
+ // Set a low value of maxResponseContentLength to intentionally trigger CorruptedFrameException
final Cluster cluster = TestClientFactory.build()
- .serializer(Serializers.GRAPHBINARY_V1)
- .maxContentLength(64)
- .minConnectionPoolSize(1)
+ .maxResponseContentLength(64)
.maxConnectionPoolSize(2)
.create();
final Client.ClusteredClient client = cluster.connect();
try {
- // Add the test data so that the g.V() response could exceed maxContentLength
+ // Add the test data so that the g.V() response could exceed maxResponseContentLength
client.submit("g.inject(1).repeat(__.addV()).times(20).count()").all().get();
try {
client.submit("g.V().fold()").all().get();
fail("Should throw an exception.");
} catch (Exception re) {
- assertThat(re.getCause() instanceof CorruptedFrameException, is(true));
+ assertThat(re.getCause() instanceof TooLongFrameException, is(true));
}
// without this wait this test is failing randomly on docker/travis with ConcurrentModificationException
@@ -144,7 +147,6 @@
public void shouldBalanceConcurrentRequestsAcrossConnections() throws InterruptedException {
final int connPoolSize = 16;
final Cluster cluster = TestClientFactory.build()
- .minConnectionPoolSize(connPoolSize)
.maxConnectionPoolSize(connPoolSize)
.create();
final Client.ClusteredClient client = cluster.connect();
@@ -152,8 +154,7 @@
final ExecutorService executorServiceForTesting = cluster.executor();
try {
- final RequestMessage.Builder request = client.buildMessage(RequestMessage.build(Tokens.OPS_EVAL))
- .add(Tokens.ARGS_GREMLIN, "Thread.sleep(5000)");
+ final RequestMessage.Builder request = client.buildMessage(RequestMessage.build("Thread.sleep(5000)"));
final Callable<Connection> sendQueryCallable = () -> client.chooseConnection(request.create());
final List<Callable<Connection>> listOfTasks = new ArrayList<>();
for (int i = 0; i < connPoolSize; i++) {
@@ -188,22 +189,17 @@
}
@Test
- public void overLimitOperationsShouldDelegateToSingleNewConnection() throws InterruptedException {
+ public void shouldCreateNewHttpConnectionPerRequestAsNeeded() throws InterruptedException {
final int operations = 6;
- final int usagePerConnection = 3;
final Cluster cluster = TestClientFactory.build()
- .minConnectionPoolSize(1)
.maxConnectionPoolSize(operations)
- .minSimultaneousUsagePerConnection(1)
- .maxSimultaneousUsagePerConnection(usagePerConnection)
.create();
final Client.ClusteredClient client = cluster.connect();
client.init();
final ExecutorService executorServiceForTesting = cluster.executor();
try {
- final RequestMessage.Builder request = client.buildMessage(RequestMessage.build(Tokens.OPS_EVAL))
- .add(Tokens.ARGS_GREMLIN, "Thread.sleep(5000)");
+ final RequestMessage.Builder request = client.buildMessage(RequestMessage.build("Thread.sleep(5000)"));
final Callable<Connection> sendQueryCallable = () -> client.chooseConnection(request.create());
final List<Callable<Connection>> listOfTasks = new ArrayList<>();
for (int i = 0; i < operations; i++) {
@@ -227,9 +223,9 @@
}
});
- assertEquals(2, connectionBorrowCount.size());
+ assertEquals(operations, connectionBorrowCount.size());
for (int finalBorrowCount : connectionBorrowCount.values()) {
- assertEquals(usagePerConnection, finalBorrowCount);
+ assertEquals(1, finalBorrowCount);
}
} finally {
@@ -245,7 +241,7 @@
*/
@Test
public void shouldSucceedWithJitteryConnection() throws Exception {
- final Cluster cluster = TestClientFactory.build().minConnectionPoolSize(1).maxConnectionPoolSize(4).
+ final Cluster cluster = TestClientFactory.build().maxConnectionPoolSize(128).
reconnectInterval(1000).
maxWaitForConnection(4000).validationRequest("g.inject()").create();
final Client.ClusteredClient client = cluster.connect();
@@ -257,7 +253,7 @@
client.hostConnectionPools.forEach((h, pool) -> pool.connectionFactory = connectionFactory);
// get an initial connection which marks the host as available
- assertEquals(2, client.submit("1+1").all().join().get(0).getInt());
+ assertEquals(2, client.submit("g.inject(2)").all().join().get(0).getInt());
// network is gonna get fishy - ConnectionPool should try to grow during the workload below and when it
// does some connections will fail to create in the background which should log some errors but not tank
@@ -272,7 +268,7 @@
new Thread(() -> {
IntStream.range(0, requests).forEach(i -> {
try {
- client.submitAsync("1 + " + i);
+ client.submitAsync(String.format("g.inject(%d)", 1+i));
} catch (Exception ex) {
// we could catch a TimeoutException here in some cases if the jitters cause a borrow of a
// connection to take too long. submitAsync() will wrap in a RuntimeException. can't assert
@@ -301,68 +297,73 @@
cluster.close();
}
- /**
- * Added for TINKERPOP-3181 - this scenario would have previously closed the connection pool and left us with
- * {@link NoHostAvailableException} just because a single connection failed on {@link Client} initialization while
- * others succeeded.
- */
@Test
- public void shouldSucceedWithSingleConnectionFailureOnInit() throws Exception {
- // set the min connection pool size to 4 so that they all get created on init as that's the area we want to
- // test host availability behavior
- final Cluster cluster = TestClientFactory.build().minConnectionPoolSize(4).maxConnectionPoolSize(4).
- reconnectInterval(1000).
- maxWaitForConnection(4000).validationRequest("g.inject()").create();
+ public void shouldCloseIdleConnectionsAndRecreateNewConnections() throws InterruptedException {
+ int idleMillis = 3000;
+ final Cluster cluster = TestClientFactory.build()
+ .idleConnectionTimeoutMillis(idleMillis)
+ .create();
final Client.ClusteredClient client = cluster.connect();
-
- // we let 3 connections succeed but then fail on the 4th
- final SingleFailConnectionFactory connectionFactory = new SingleFailConnectionFactory(3);
- client.connectionFactorySupplier = () -> connectionFactory;
-
- // prior to 3.7.5, we would have seen this pop an exception and close the pool with error like:
- // Could not initialize 4 (minPoolSize) connections in pool. Successful connections=3. Closing the connection pool.
- // which doesn't really make sense because 3 prior connection were good. perhaps this fourth one just had a
- // very temporary network issue. the other 3 could technically still be serviceable. the 4th shouldn't end
- // connectivity and assume the host is dead as ultimately closing the pool at this point in init will end in
- // NoHostAvailableException.
- //
- // Starting at 3.7.5, we can allow a bit more failure here before killing the pool for just a single connection
- // failure. we might be below min pool size at init but we log that warning and expect fast recovery from the
- // driver in the best case and in the worst case, normal processes of reconnect kick in and stabilize.
client.init();
+ final ExecutorService executorServiceForTesting = cluster.executor();
- assertEquals(3, connectionFactory.getConnectionsCreated());
+ try {
+ // create or reuse some connections
+ chooseConnections(3, client, executorServiceForTesting);
- // load up a hella ton of requests
- final int requests = 1000;
- final CountDownLatch latch = new CountDownLatch(requests);
- final AtomicBoolean hadFail = new AtomicBoolean(false);
+ // simulate downtime where there is no traffic so that all connections become idle
+ TimeUnit.MILLISECONDS.sleep(idleMillis * 3);
+ assertEquals(1, client.hostConnectionPools.size());
+ // all connections should have been closed due to idle timeout
+ assertTrue(client.hostConnectionPools.values().iterator().next().getPoolInfo().contains("no connections in pool"));
- new Thread(() -> {
- IntStream.range(0, requests).forEach(i -> {
- try {
- client.submitAsync("1 + " + i);
- } catch (Exception ex) {
- // we could catch a TimeoutException here in some cases if the jitters cause a borrow of a
- // connection to take too long. submitAsync() will wrap in a RuntimeException. can't assert
- // this condition inside this thread or the test locks up
- hadFail.compareAndSet(false, true);
- } finally {
- latch.countDown();
- }
- });
- }, "worker-shouldSucceedWithSingleConnectionFailureOnInit").start();
+ // create or reuse some more connections
+ chooseConnections(4, client, executorServiceForTesting);
- // wait for requests to complete
- assertTrue(latch.await(30000, TimeUnit.MILLISECONDS));
+ } finally {
+ executorServiceForTesting.shutdown();
+ client.close();
+ cluster.close();
+ }
+ }
- // we can send some requests because we have 3 created connections
- assertEquals(2, client.submit("1+1").all().join().get(0).getInt());
+ @Test
+ public void shouldThrowErrorWithHelpfulMessageWhenIdleTimeoutReachedBeforeResponseReceived() throws InterruptedException {
+ int idleMillis = 1000;
+ final Cluster cluster = TestClientFactory.build()
+ .idleConnectionTimeoutMillis(idleMillis)
+ .create();
+ final Client.ClusteredClient client = cluster.connect();
+ final RequestOptions ro = RequestOptions.build().language("gremlin-groovy").create();
- // not expecting any failures
- assertThat(hadFail.get(), is(false));
+ try {
+ client.submit("Thread.sleep(" + idleMillis * 3 + ")", ro).all().get();
+ fail("Expected exception due to idle timeout");
+ } catch (Exception e) {
+ assertTrue(e.getMessage().contains("Idle timeout occurred before response could be received from server - consider increasing idleConnectionTimeout"));
+ } finally {
+ client.close();
+ cluster.close();
+ }
+ }
- cluster.close();
+ private static void chooseConnections(int operations, Client.ClusteredClient client, ExecutorService executorServiceForTesting) throws InterruptedException {
+ final RequestMessage.Builder request = client.buildMessage(RequestMessage.build("g.inject(1)"));
+ final Callable<Connection> sendQueryCallable = () -> client.chooseConnection(request.create());
+ final List<Callable<Connection>> listOfTasks = new ArrayList<>();
+ for (int i = 0; i < operations; i++) {
+ listOfTasks.add(sendQueryCallable);
+ }
+
+ final List<Future<Connection>> executorSubmitFutures = executorServiceForTesting.invokeAll(listOfTasks);
+ executorSubmitFutures.parallelStream().map(fut -> {
+ try {
+ return fut.get();
+ } catch (InterruptedException | ExecutionException e) {
+ fail(e.getMessage());
+ return null;
+ }
+ }).forEach(Assert::assertNotNull);
}
/**
@@ -396,35 +397,4 @@
return ConnectionFactory.super.create(pool);
}
}
-
- /**
- * Introduces a failure after the specified number of {@link Connection} instance are created for the
- * {@link ConnectionPool}.
- */
- public static class SingleFailConnectionFactory implements ConnectionFactory {
-
- private int connectionsCreated = 0;
- private int failAfter;
- private boolean failedOnce = false;
-
- public SingleFailConnectionFactory(final int failAfter) {
- this.failAfter = failAfter;
- }
-
- public int getConnectionsCreated() {
- return connectionsCreated;
- }
-
- @Override
- public Connection create(final ConnectionPool pool) {
- if (!failedOnce && connectionsCreated == failAfter) {
- failedOnce = true;
- throw new ConnectionException(pool.host.getHostUri(),
- new SSLHandshakeException("We big mad on purpose"));
- }
- connectionsCreated++;
-
- return ConnectionFactory.super.create(pool);
- }
- }
}
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/AbstractRemoteGraphProvider.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/AbstractRemoteGraphProvider.java
index 0f97f13..4ab44c9 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/AbstractRemoteGraphProvider.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/AbstractRemoteGraphProvider.java
@@ -24,7 +24,8 @@
import org.apache.tinkerpop.gremlin.TestHelper;
import org.apache.tinkerpop.gremlin.driver.Client;
import org.apache.tinkerpop.gremlin.driver.Cluster;
-import org.apache.tinkerpop.gremlin.util.ser.Serializers;
+import org.apache.tinkerpop.gremlin.driver.RequestOptions;
+import org.apache.tinkerpop.gremlin.groovy.jsr223.GremlinGroovyScriptEngine;
import org.apache.tinkerpop.gremlin.process.computer.Computer;
import org.apache.tinkerpop.gremlin.process.remote.RemoteConnection;
import org.apache.tinkerpop.gremlin.structure.RemoteGraph;
@@ -36,6 +37,7 @@
import org.apache.tinkerpop.gremlin.server.TestClientFactory;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.tinkergraph.process.computer.TinkerGraphComputer;
+import org.apache.tinkerpop.gremlin.util.ser.Serializers;
import java.io.InputStream;
import java.util.HashMap;
@@ -101,16 +103,22 @@
private final Cluster cluster;
private final Client client;
private final boolean useComputer;
+ private final String queryLanguage;
-
- public AbstractRemoteGraphProvider(final Cluster cluster) {
- this(cluster, false);
- }
-
- public AbstractRemoteGraphProvider(final Cluster cluster, final boolean useComputer) {
+ /**
+ * A helper class that can provide a graph for feature testing.
+ *
+ * @param cluster {@link Cluster} to connect.
+ * @param useComputer Test with {@link Computer} or not.
+ * @param queryLanguage available options are "gremlin-lang" and "groovy-test".
+ * "groovy-test" passing incoming Gremlin through the translator to groovy so that
+ * it can be executed in the {@link GremlinGroovyScriptEngine}.
+ */
+ public AbstractRemoteGraphProvider(final Cluster cluster, final boolean useComputer, final String queryLanguage) {
this.cluster = cluster;
this.client = this.cluster.connect();
this.useComputer = useComputer;
+ this.queryLanguage = queryLanguage;
try {
startServer();
} catch (Exception ex) {
@@ -159,10 +167,11 @@
@Override
public void clear(final Graph graph, final Configuration configuration) throws Exception {
// doesn't bother to clear grateful/sink because i don't believe that ever gets mutated - read-only
+ RequestOptions ro = RequestOptions.build().language("gremlin-groovy").create();
client.submit("classic.clear();modern.clear();crew.clear();graph.clear();" +
"TinkerFactory.generateClassic(classic);" +
"TinkerFactory.generateModern(modern);" +
- "TinkerFactory.generateTheCrew(crew);null").all().get();
+ "TinkerFactory.generateTheCrew(crew);null", ro).all().get();
}
@Override
@@ -184,7 +193,9 @@
// concerns and will be likely relegated to the test module so that OptOut can continue to work and we can
// full execute the process tests. we should be able to clean this up considerably when RemoteGraph can be
// moved with breaking change.
- final GraphTraversalSource g = AnonymousTraversalSource.traversal().withRemote(((RemoteGraph) graph).getConnection());
+ final GraphTraversalSource g = AnonymousTraversalSource.traversal()
+ .with(((RemoteGraph) graph).getConnection())
+ .with("language", queryLanguage);
if (useComputer) {
final int state = TestHelper.RANDOM.nextInt(3);
@@ -204,8 +215,8 @@
}
public static Cluster.Builder createClusterBuilder(final Serializers serializer) {
- // match the content length in the server yaml
- return TestClientFactory.build().maxContentLength(1000000).serializer(serializer);
+ // bigger buffer for some tests
+ return TestClientFactory.build().maxResponseContentLength(12_000_000).serializer(serializer);
}
public static void startServer() throws Exception {
@@ -213,7 +224,7 @@
final Settings settings = Settings.read(stream);
ServerTestHelper.rewritePathsInGremlinServerSettings(settings);
- settings.maxContentLength = 1024000;
+ settings.maxRequestContentLength = 1024000;
settings.maxChunkSize = 1024000;
server = new GremlinServer(settings);
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphBinaryGroovyRemoteFeatureTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphBinaryGroovyRemoteFeatureTest.java
new file mode 100644
index 0000000..ec4e436
--- /dev/null
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphBinaryGroovyRemoteFeatureTest.java
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.driver.remote;
+
+import com.google.inject.AbstractModule;
+import com.google.inject.Guice;
+import com.google.inject.Stage;
+import io.cucumber.guice.CucumberModules;
+import io.cucumber.junit.Cucumber;
+import io.cucumber.junit.CucumberOptions;
+import org.apache.tinkerpop.gremlin.features.AbstractGuiceFactory;
+import org.apache.tinkerpop.gremlin.features.World;
+import org.junit.runner.RunWith;
+
+@RunWith(Cucumber.class)
+@CucumberOptions(
+ tags = "not @GraphComputerOnly and not @AllowNullPropertyValues",
+ glue = { "org.apache.tinkerpop.gremlin.features" },
+ objectFactory = GraphBinaryGroovyRemoteFeatureTest.RemoteGuiceFactory.class,
+ features = { "classpath:/org/apache/tinkerpop/gremlin/test/features" },
+ plugin = {"progress", "junit:target/cucumber.xml"})
+public class GraphBinaryGroovyRemoteFeatureTest extends AbstractFeatureTest {
+ public static class RemoteGuiceFactory extends AbstractGuiceFactory {
+ public RemoteGuiceFactory() {
+ super(Guice.createInjector(Stage.PRODUCTION, CucumberModules.createScenarioModule(), new ServiceModule()));
+ }
+ }
+
+ public static final class ServiceModule extends AbstractModule {
+ @Override
+ protected void configure() {
+ bind(World.class).to(RemoteWorld.GraphBinaryGroovyRemoteWorld.class);
+ }
+ }
+}
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphBinaryGroovyRemoteGraphProvider.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphBinaryGroovyRemoteGraphProvider.java
new file mode 100644
index 0000000..f9c9de8
--- /dev/null
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphBinaryGroovyRemoteGraphProvider.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.driver.remote;
+
+import org.apache.tinkerpop.gremlin.util.ser.Serializers;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public class GraphBinaryGroovyRemoteGraphProvider extends AbstractRemoteGraphProvider implements AutoCloseable {
+ public GraphBinaryGroovyRemoteGraphProvider() {
+ super(createClusterBuilder(Serializers.GRAPHBINARY_V4).create(), false, "groovy-test");
+ }
+}
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphBinaryGroovyRemoteParameterizedFeatureTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphBinaryGroovyRemoteParameterizedFeatureTest.java
new file mode 100644
index 0000000..9bca128
--- /dev/null
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphBinaryGroovyRemoteParameterizedFeatureTest.java
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.driver.remote;
+
+import com.google.inject.AbstractModule;
+import com.google.inject.Guice;
+import com.google.inject.Stage;
+import io.cucumber.guice.CucumberModules;
+import io.cucumber.junit.Cucumber;
+import io.cucumber.junit.CucumberOptions;
+import org.apache.tinkerpop.gremlin.features.AbstractGuiceFactory;
+import org.apache.tinkerpop.gremlin.features.World;
+import org.junit.runner.RunWith;
+
+@RunWith(Cucumber.class)
+@CucumberOptions(
+ tags = "not @GraphComputerOnly and not @AllowNullPropertyValues and not @GremlinGroovyNotSupported",
+ glue = { "org.apache.tinkerpop.gremlin.features" },
+ objectFactory = GraphBinaryGroovyRemoteParameterizedFeatureTest.RemoteGuiceFactory.class,
+ features = { "classpath:/org/apache/tinkerpop/gremlin/test/features" },
+ plugin = {"progress", "junit:target/cucumber.xml"})
+public class GraphBinaryGroovyRemoteParameterizedFeatureTest extends AbstractFeatureTest {
+ public static class RemoteGuiceFactory extends AbstractGuiceFactory {
+ public RemoteGuiceFactory() {
+ super(Guice.createInjector(Stage.PRODUCTION, CucumberModules.createScenarioModule(), new ServiceModule()));
+ }
+ }
+
+ public static final class ServiceModule extends AbstractModule {
+ @Override
+ protected void configure() {
+ bind(World.class).to(RemoteWorld.GraphBinaryGroovyParameterizedRemoteWorld.class);
+ }
+ }
+}
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphBinaryLangBulkedRemoteFeatureTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphBinaryLangBulkedRemoteFeatureTest.java
new file mode 100644
index 0000000..a2fc95d
--- /dev/null
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphBinaryLangBulkedRemoteFeatureTest.java
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.driver.remote;
+
+import com.google.inject.AbstractModule;
+import com.google.inject.Guice;
+import com.google.inject.Stage;
+import io.cucumber.guice.CucumberModules;
+import io.cucumber.junit.Cucumber;
+import io.cucumber.junit.CucumberOptions;
+import org.apache.tinkerpop.gremlin.features.AbstractGuiceFactory;
+import org.apache.tinkerpop.gremlin.features.World;
+import org.junit.runner.RunWith;
+
+@RunWith(Cucumber.class)
+@CucumberOptions(
+ tags = "not @GraphComputerOnly and not @AllowNullPropertyValues",
+ glue = { "org.apache.tinkerpop.gremlin.features" },
+ objectFactory = GraphBinaryLangBulkedRemoteFeatureTest.RemoteGuiceFactory.class,
+ features = { "classpath:/org/apache/tinkerpop/gremlin/test/features" },
+ plugin = {"progress", "junit:target/cucumber.xml"})
+public class GraphBinaryLangBulkedRemoteFeatureTest extends AbstractFeatureTest {
+ public static class RemoteGuiceFactory extends AbstractGuiceFactory {
+ public RemoteGuiceFactory() {
+ super(Guice.createInjector(Stage.PRODUCTION, CucumberModules.createScenarioModule(), new ServiceModule()));
+ }
+ }
+
+ public static final class ServiceModule extends AbstractModule {
+ @Override
+ protected void configure() {
+ bind(World.class).to(RemoteWorld.GraphBinaryLangBulkedRemoteWorld.class);
+ }
+ }
+}
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphBinaryLangRemoteFeatureTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphBinaryLangRemoteFeatureTest.java
new file mode 100644
index 0000000..77731f4
--- /dev/null
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphBinaryLangRemoteFeatureTest.java
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.driver.remote;
+
+import com.google.inject.AbstractModule;
+import com.google.inject.Guice;
+import com.google.inject.Stage;
+import io.cucumber.guice.CucumberModules;
+import io.cucumber.junit.Cucumber;
+import io.cucumber.junit.CucumberOptions;
+import org.apache.tinkerpop.gremlin.features.AbstractGuiceFactory;
+import org.apache.tinkerpop.gremlin.features.World;
+import org.junit.runner.RunWith;
+
+@RunWith(Cucumber.class)
+@CucumberOptions(
+ tags = "not @GraphComputerOnly and not @AllowNullPropertyValues and not @StepSubgraph", // TINKERPOP-3154
+ glue = { "org.apache.tinkerpop.gremlin.features" },
+ objectFactory = GraphBinaryLangRemoteFeatureTest.RemoteGuiceFactory.class,
+ features = { "classpath:/org/apache/tinkerpop/gremlin/test/features" },
+ plugin = {"progress", "junit:target/cucumber.xml"})
+public class GraphBinaryLangRemoteFeatureTest extends AbstractFeatureTest {
+ public static class RemoteGuiceFactory extends AbstractGuiceFactory {
+ public RemoteGuiceFactory() {
+ super(Guice.createInjector(Stage.PRODUCTION, CucumberModules.createScenarioModule(), new ServiceModule()));
+ }
+ }
+
+ public static final class ServiceModule extends AbstractModule {
+ @Override
+ protected void configure() {
+ bind(World.class).to(RemoteWorld.GraphBinaryLangRemoteWorld.class);
+ }
+ }
+}
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphBinaryLangRemoteGraphProvider.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphBinaryLangRemoteGraphProvider.java
new file mode 100644
index 0000000..ab678ac
--- /dev/null
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphBinaryLangRemoteGraphProvider.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.driver.remote;
+
+import org.apache.tinkerpop.gremlin.util.ser.Serializers;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public class GraphBinaryLangRemoteGraphProvider extends AbstractRemoteGraphProvider implements AutoCloseable {
+ public GraphBinaryLangRemoteGraphProvider() {
+ super(createClusterBuilder(Serializers.GRAPHBINARY_V4).create(), false, "gremlin-lang");
+ }
+}
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphBinaryLangRemoteParameterizedFeatureTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphBinaryLangRemoteParameterizedFeatureTest.java
new file mode 100644
index 0000000..4efef21
--- /dev/null
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphBinaryLangRemoteParameterizedFeatureTest.java
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.driver.remote;
+
+import com.google.inject.AbstractModule;
+import com.google.inject.Guice;
+import com.google.inject.Stage;
+import io.cucumber.guice.CucumberModules;
+import io.cucumber.junit.Cucumber;
+import io.cucumber.junit.CucumberOptions;
+import org.apache.tinkerpop.gremlin.features.AbstractGuiceFactory;
+import org.apache.tinkerpop.gremlin.features.World;
+import org.junit.runner.RunWith;
+
+@RunWith(Cucumber.class)
+@CucumberOptions(
+ tags = "not @GraphComputerOnly and not @AllowNullPropertyValues",
+ glue = { "org.apache.tinkerpop.gremlin.features" },
+ objectFactory = GraphBinaryLangRemoteParameterizedFeatureTest.RemoteGuiceFactory.class,
+ features = { "classpath:/org/apache/tinkerpop/gremlin/test/features" },
+ plugin = {"progress", "junit:target/cucumber.xml"})
+public class GraphBinaryLangRemoteParameterizedFeatureTest extends AbstractFeatureTest {
+ public static class RemoteGuiceFactory extends AbstractGuiceFactory {
+ public RemoteGuiceFactory() {
+ super(Guice.createInjector(Stage.PRODUCTION, CucumberModules.createScenarioModule(), new ServiceModule()));
+ }
+ }
+
+ public static final class ServiceModule extends AbstractModule {
+ @Override
+ protected void configure() {
+ bind(World.class).to(RemoteWorld.GraphBinaryLangParameterizedRemoteWorld.class);
+ }
+ }
+}
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphBinaryRemoteFeatureTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphBinaryRemoteFeatureTest.java
deleted file mode 100644
index e1f8439..0000000
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphBinaryRemoteFeatureTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver.remote;
-
-import com.google.inject.AbstractModule;
-import com.google.inject.Guice;
-import com.google.inject.Stage;
-import io.cucumber.guice.CucumberModules;
-import io.cucumber.junit.Cucumber;
-import io.cucumber.junit.CucumberOptions;
-import org.apache.tinkerpop.gremlin.features.AbstractGuiceFactory;
-import org.apache.tinkerpop.gremlin.features.World;
-import org.junit.runner.RunWith;
-
-@RunWith(Cucumber.class)
-@CucumberOptions(
- tags = "not @GraphComputerOnly and not @AllowNullPropertyValues",
- glue = { "org.apache.tinkerpop.gremlin.features" },
- objectFactory = GraphBinaryRemoteFeatureTest.RemoteGuiceFactory.class,
- features = { "classpath:/org/apache/tinkerpop/gremlin/test/features" },
- plugin = {"progress", "junit:target/cucumber.xml"})
-public class GraphBinaryRemoteFeatureTest extends AbstractFeatureTest {
- public static class RemoteGuiceFactory extends AbstractGuiceFactory {
- public RemoteGuiceFactory() {
- super(Guice.createInjector(Stage.PRODUCTION, CucumberModules.createScenarioModule(), new ServiceModule()));
- }
- }
-
- public static final class ServiceModule extends AbstractModule {
- @Override
- protected void configure() {
- bind(World.class).to(RemoteWorld.GraphBinaryRemoteWorld.class);
- }
- }
-}
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphBinaryRemoteGraphComputerProvider.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphBinaryRemoteGraphComputerProvider.java
index 6561589..8f3a552 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphBinaryRemoteGraphComputerProvider.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphBinaryRemoteGraphComputerProvider.java
@@ -20,9 +20,9 @@
package org.apache.tinkerpop.gremlin.driver.remote;
import org.apache.tinkerpop.gremlin.GraphProvider;
-import org.apache.tinkerpop.gremlin.util.ser.Serializers;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.tinkergraph.process.computer.TinkerGraphComputer;
+import org.apache.tinkerpop.gremlin.util.ser.Serializers;
/**
* @author Stephen Mallette (http://stephen.genoprime.com)
@@ -92,10 +92,6 @@
method = "g_withBulkXfalseX_withSackX1_sumX_VX1X_localXoutEXknowsX_barrierXnormSackX_inVX_inXknowsX_barrier_sack",
reason = "One bulk is currently not supported on GraphComputer")
@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.PropertiesTest",
- method = "g_injectXg_VX1X_propertiesXnameX_nextX_value",
- reason = "The inject() step is not supported by GraphComputer")
-@Graph.OptOut(
test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.SumTest",
method = "g_injectXnull_10_5_nullX_sum",
reason = "The inject() step is not supported by GraphComputer")
@@ -143,10 +139,14 @@
test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.PathTest",
method = "g_injectX1_null_nullX_path_dedup",
reason = "The inject() step is not supported by GraphComputer")
+@Graph.OptOut(
+ test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.MatchTest$GreedyMatchTraversals",
+ method = "*",
+ reason = "MatchAlgorithmStrategy construction doesn't work for gremlin-groovy")
@GraphProvider.Descriptor(computer = TinkerGraphComputer.class)
public class GraphBinaryRemoteGraphComputerProvider extends AbstractRemoteGraphProvider {
public GraphBinaryRemoteGraphComputerProvider() {
- super(createClusterBuilder(Serializers.GRAPHBINARY_V1).create(), true);
+ super(createClusterBuilder(Serializers.GRAPHBINARY_V4).create(), true, "groovy-test");
}
}
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphBinaryRemoteGraphProvider.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphBinaryRemoteGraphProvider.java
deleted file mode 100644
index aac4139..0000000
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphBinaryRemoteGraphProvider.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver.remote;
-
-import org.apache.tinkerpop.gremlin.util.ser.Serializers;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class GraphBinaryRemoteGraphProvider extends AbstractRemoteGraphProvider implements AutoCloseable {
- public GraphBinaryRemoteGraphProvider() {
- super(createClusterBuilder(Serializers.GRAPHBINARY_V1).create());
- }
-}
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphSONLangRemoteFeatureTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphSONLangRemoteFeatureTest.java
new file mode 100644
index 0000000..064c031
--- /dev/null
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphSONLangRemoteFeatureTest.java
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.driver.remote;
+
+import com.google.inject.AbstractModule;
+import com.google.inject.Guice;
+import com.google.inject.Stage;
+import io.cucumber.guice.CucumberModules;
+import io.cucumber.junit.Cucumber;
+import io.cucumber.junit.CucumberOptions;
+import org.apache.tinkerpop.gremlin.features.AbstractGuiceFactory;
+import org.apache.tinkerpop.gremlin.features.World;
+import org.junit.runner.RunWith;
+
+@RunWith(Cucumber.class)
+@CucumberOptions(
+ tags = "not @GraphComputerOnly and not @AllowNullPropertyValues and not @StepSubgraph",
+ glue = { "org.apache.tinkerpop.gremlin.features" },
+ objectFactory = GraphSONLangRemoteFeatureTest.RemoteGuiceFactory.class,
+ features = { "classpath:/org/apache/tinkerpop/gremlin/test/features" },
+ plugin = {"progress", "junit:target/cucumber.xml"})
+public class GraphSONLangRemoteFeatureTest extends AbstractFeatureTest {
+ public static class RemoteGuiceFactory extends AbstractGuiceFactory {
+ public RemoteGuiceFactory() {
+ super(Guice.createInjector(Stage.PRODUCTION, CucumberModules.createScenarioModule(), new ServiceModule()));
+ }
+ }
+
+ public static final class ServiceModule extends AbstractModule {
+ @Override
+ protected void configure() {
+ bind(World.class).to(RemoteWorld.GraphSONLangRemoteWorld.class);
+ }
+ }
+}
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphSONLangRemoteParameterizedFeatureTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphSONLangRemoteParameterizedFeatureTest.java
new file mode 100644
index 0000000..aee9ac7
--- /dev/null
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphSONLangRemoteParameterizedFeatureTest.java
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.driver.remote;
+
+import com.google.inject.AbstractModule;
+import com.google.inject.Guice;
+import com.google.inject.Stage;
+import io.cucumber.guice.CucumberModules;
+import io.cucumber.junit.Cucumber;
+import io.cucumber.junit.CucumberOptions;
+import org.apache.tinkerpop.gremlin.features.AbstractGuiceFactory;
+import org.apache.tinkerpop.gremlin.features.World;
+import org.junit.runner.RunWith;
+
+@RunWith(Cucumber.class)
+@CucumberOptions(
+ tags = "not @GraphComputerOnly and not @AllowNullPropertyValues and not @StepSubgraph",
+ glue = { "org.apache.tinkerpop.gremlin.features" },
+ objectFactory = GraphSONLangRemoteParameterizedFeatureTest.RemoteGuiceFactory.class,
+ features = { "classpath:/org/apache/tinkerpop/gremlin/test/features" },
+ plugin = {"progress", "junit:target/cucumber.xml"})
+public class GraphSONLangRemoteParameterizedFeatureTest extends AbstractFeatureTest {
+ public static class RemoteGuiceFactory extends AbstractGuiceFactory {
+ public RemoteGuiceFactory() {
+ super(Guice.createInjector(Stage.PRODUCTION, CucumberModules.createScenarioModule(), new ServiceModule()));
+ }
+ }
+
+ public static final class ServiceModule extends AbstractModule {
+ @Override
+ protected void configure() {
+ bind(World.class).to(RemoteWorld.GraphSONLangParameterizedRemoteWorld.class);
+ }
+ }
+}
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphSONRemoteFeatureTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphSONRemoteFeatureTest.java
deleted file mode 100644
index cd97edc..0000000
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphSONRemoteFeatureTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver.remote;
-
-import com.google.inject.AbstractModule;
-import com.google.inject.Guice;
-import com.google.inject.Stage;
-import io.cucumber.guice.CucumberModules;
-import io.cucumber.junit.Cucumber;
-import io.cucumber.junit.CucumberOptions;
-import org.apache.tinkerpop.gremlin.features.AbstractGuiceFactory;
-import org.apache.tinkerpop.gremlin.features.World;
-import org.junit.runner.RunWith;
-
-@RunWith(Cucumber.class)
-@CucumberOptions(
- tags = "not @GraphComputerOnly and not @AllowNullPropertyValues and not @StepSubgraph", // TINKERPOP-3154
- glue = { "org.apache.tinkerpop.gremlin.features" },
- objectFactory = GraphSONRemoteFeatureTest.RemoteGuiceFactory.class,
- features = { "classpath:/org/apache/tinkerpop/gremlin/test/features" },
- plugin = {"progress", "junit:target/cucumber.xml"})
-public class GraphSONRemoteFeatureTest extends AbstractFeatureTest {
- public static class RemoteGuiceFactory extends AbstractGuiceFactory {
- public RemoteGuiceFactory() {
- super(Guice.createInjector(Stage.PRODUCTION, CucumberModules.createScenarioModule(), new ServiceModule()));
- }
- }
-
- public static final class ServiceModule extends AbstractModule {
- @Override
- protected void configure() {
- bind(World.class).to(RemoteWorld.GraphSONRemoteWorld.class);
- }
- }
-}
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphSONRemoteGraphComputerProvider.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphSONRemoteGraphComputerProvider.java
deleted file mode 100644
index 508b69c..0000000
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphSONRemoteGraphComputerProvider.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tinkerpop.gremlin.driver.remote;
-
-import org.apache.tinkerpop.gremlin.GraphProvider;
-import org.apache.tinkerpop.gremlin.util.ser.Serializers;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.tinkergraph.process.computer.TinkerGraphComputer;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.AddEdgeTest",
- method = "*",
- reason = "The addEdge() step is not supported by GraphComputer")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.branch.ChooseTest",
- method = "g_injectX1X_chooseXisX1X__constantX10Xfold__foldX",
- reason = "The inject() step is not supported by GraphComputer")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.branch.ChooseTest",
- method = "g_injectX2X_chooseXisX1X__constantX10Xfold__foldX",
- reason = "The inject() step is not supported by GraphComputer")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.GraphTest",
- method = "g_V_hasLabelXpersonX_asXpX_VXsoftwareX_addInEXuses_pX",
- reason = "Mid-traversal V()/E() is currently not supported on GraphComputer")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.GraphTest",
- method = "g_V_hasXname_GarciaX_inXsungByX_asXsongX_V_hasXname_Willie_DixonX_inXwrittenByX_whereXeqXsongXX_name",
- reason = "Mid-traversal V()/E() is currently not supported on GraphComputer")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.GraphTest",
- method = "g_V_outXknowsX_V_name",
- reason = "Mid-traversal V()/E() is currently not supported on GraphComputer")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.GraphTest",
- method = "g_VX1X_V_valuesXnameX",
- reason = "Mid-traversal V()/E() is currently not supported on GraphComputer")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.EdgeTest",
- method = "*",
- reason = "Mid-traversal V()/E() is currently not supported on GraphComputer")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.InjectTest",
- method = "*",
- reason = "The inject() step is not supported by GraphComputer")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.MathTest",
- method = "g_withSackX1X_injectX1X_repeatXsackXsumX_byXconstantX1XXX_timesX5X_emit_mathXsin__X_byXsackX",
- reason = "The inject() step is not supported by GraphComputer")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.MinTest",
- method = "g_V_foo_injectX9999999999X_min",
- reason = "The inject() step is not supported by GraphComputer")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.branch.OptionalTest",
- method = "g_VX1X_optionalXaddVXdogXX_label",
- reason = "The addV() step is not supported on GraphComputer")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.filter.SimplePathTest",
- method = "g_V_asXaX_out_asXbX_out_asXcX_simplePath_byXlabelX_fromXbX_toXcX_path_byXnameX",
- reason = "It is not possible to access more than a path element's id on GraphComputer")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.VertexTest",
- method = "g_V_hasLabelXpersonX_V_hasLabelXsoftwareX_name",
- reason = "Mid-traversal V()/E() is currently not supported on GraphComputer")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.SackTest",
- method = "g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack",
- reason = "One bulk is currently not supported on GraphComputer")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.SackTest",
- method = "g_withBulkXfalseX_withSackX1_sumX_VX1X_localXoutEXknowsX_barrierXnormSackX_inVX_inXknowsX_barrier_sack",
- reason = "One bulk is currently not supported on GraphComputer")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.PropertiesTest",
- method = "g_injectXg_VX1X_propertiesXnameX_nextX_value",
- reason = "The inject() step is not supported by GraphComputer")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.SumTest",
- method = "g_injectXnull_10_5_nullX_sum",
- reason = "The inject() step is not supported by GraphComputer")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.SumTest",
- method = "g_injectXlistXnull_10_5_nullXX_sumXlocalX",
- reason = "The inject() step is not supported by GraphComputer")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.MeanTest",
- method = "g_injectXlistXnull_10_20_nullXX_meanXlocalX",
- reason = "The inject() step is not supported by GraphComputer")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.MeanTest",
- method = "g_injectXnull_10_20_nullX_mean",
- reason = "The inject() step is not supported by GraphComputer")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.SelectTest",
- method = "g_withSideEffectXk_nullX_injectXxX_selectXkX",
- reason = "The inject() step is not supported by GraphComputer")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.ReadTest",
- method = "*",
- reason = "The io() step is not supported generally by GraphComputer")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.WriteTest",
- method = "*",
- reason = "The io() step is not supported generally by GraphComputer")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.filter.HasTest",
- method = "g_V_hasXk_withinXcXX_valuesXkX",
- reason = "Requires some test data initialization with addV()")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.filter.HasTest",
- method = "g_V_hasXname_regexXTinkerXX",
- reason = "Requires some test data initialization with addV()")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.filter.HasTest",
- method = "g_V_hasXname_regexXTinkerUnicodeXX",
- reason = "Requires some test data initialization with addV()")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.PathTest",
- method = "g_injectX1_null_nullX_path",
- reason = "The inject() step is not supported by GraphComputer")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.PathTest",
- method = "g_injectX1_null_nullX_path_dedup",
- reason = "The inject() step is not supported by GraphComputer")
-@GraphProvider.Descriptor(computer = TinkerGraphComputer.class)
-public class GraphSONRemoteGraphComputerProvider extends AbstractRemoteGraphProvider {
- public GraphSONRemoteGraphComputerProvider() {
- super(createClusterBuilder(Serializers.GRAPHSON_V3).create(), true);
- }
-}
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphSONRemoteGraphProvider.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphSONRemoteGraphProvider.java
deleted file mode 100644
index 4405f0d..0000000
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphSONRemoteGraphProvider.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver.remote;
-
-import org.apache.tinkerpop.gremlin.util.ser.Serializers;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class GraphSONRemoteGraphProvider extends AbstractRemoteGraphProvider implements AutoCloseable {
- public GraphSONRemoteGraphProvider() {
- super(createClusterBuilder(Serializers.GRAPHSON_V3).create());
- }
-}
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/RemoteWorld.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/RemoteWorld.java
index 5735a67..0a44013 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/RemoteWorld.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/RemoteWorld.java
@@ -23,13 +23,13 @@
import org.apache.tinkerpop.gremlin.TestHelper;
import org.apache.tinkerpop.gremlin.driver.Client;
import org.apache.tinkerpop.gremlin.driver.Cluster;
-import org.apache.tinkerpop.gremlin.util.ser.Serializers;
import org.apache.tinkerpop.gremlin.features.World;
import org.apache.tinkerpop.gremlin.process.computer.Computer;
import org.apache.tinkerpop.gremlin.process.traversal.AnonymousTraversalSource;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
import org.apache.tinkerpop.gremlin.server.TestClientFactory;
import org.apache.tinkerpop.gremlin.tinkergraph.process.computer.TinkerGraphComputer;
+import org.apache.tinkerpop.gremlin.util.ser.Serializers;
import org.junit.AssumptionViolatedException;
import java.io.File;
@@ -69,7 +69,7 @@
if (null == graphData) {
try { // Clear data before run because tests are allowed to modify data for the empty graph.
- client.submit("graph.clear();").all().get();
+ client.submit("g.V().drop();").all().get();
} catch (Exception e) {
throw new RuntimeException(e);
}
@@ -140,25 +140,90 @@
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- public static class GraphBinaryRemoteWorld extends RemoteWorld {
- public GraphBinaryRemoteWorld() { super(createTestCluster(Serializers.GRAPHBINARY_V1)); }
+ public static class GraphBinaryLangRemoteWorld extends RemoteWorld {
+ public GraphBinaryLangRemoteWorld() { super(createTestCluster(Serializers.GRAPHBINARY_V4)); }
+
+ @Override
+ public GraphTraversalSource getGraphTraversalSource(final LoadGraphWith.GraphData graphData) {
+ final GraphTraversalSource g = super.getGraphTraversalSource(graphData);
+ return g.with("language", "gremlin-lang");
+ }
+ }
+
+ public static class GraphBinaryLangParameterizedRemoteWorld extends GraphBinaryLangRemoteWorld {
+ @Override
+ public boolean useParametersLiterally() {
+ return false;
+ }
+ }
+
+ public static class GraphBinaryLangBulkedRemoteWorld extends RemoteWorld {
+ public GraphBinaryLangBulkedRemoteWorld() { super(createTestCluster(Serializers.GRAPHBINARY_V4)); }
+
+ @Override
+ public GraphTraversalSource getGraphTraversalSource(final LoadGraphWith.GraphData graphData) {
+ final GraphTraversalSource g = super.getGraphTraversalSource(graphData);
+ return g.with("language", "gremlin-lang").with("bulked", true);
+ }
+ }
+
+ public static class GraphBinaryGroovyRemoteWorld extends RemoteWorld {
+ public GraphBinaryGroovyRemoteWorld() { super(createTestCluster(Serializers.GRAPHBINARY_V4)); }
+
+ @Override
+ public GraphTraversalSource getGraphTraversalSource(final LoadGraphWith.GraphData graphData) {
+ final GraphTraversalSource g = super.getGraphTraversalSource(graphData);
+ return g.with("language", "groovy-test");
+ }
+ }
+
+ public static class GraphBinaryGroovyParameterizedRemoteWorld extends GraphBinaryGroovyRemoteWorld {
+ @Override
+ public boolean useParametersLiterally() {
+ return false;
+ }
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
public static class GraphBinaryRemoteComputerWorld extends RemoteComputerWorld {
- public GraphBinaryRemoteComputerWorld() { super(createTestCluster(Serializers.GRAPHBINARY_V1)); }
+ public GraphBinaryRemoteComputerWorld() { super(createTestCluster(Serializers.GRAPHBINARY_V4)); }
+
+ @Override
+ public GraphTraversalSource getGraphTraversalSource(final LoadGraphWith.GraphData graphData) {
+ final GraphTraversalSource g = super.getGraphTraversalSource(graphData);
+ return g.with("language", "groovy-test");
+ }
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- public static class GraphSONRemoteWorld extends RemoteWorld {
- public GraphSONRemoteWorld() { super(createTestCluster(Serializers.GRAPHSON_V3)); }
+ public static class GraphSONLangRemoteWorld extends RemoteWorld {
+ public GraphSONLangRemoteWorld() { super(createTestCluster(Serializers.GRAPHSON_V4)); }
+
+ @Override
+ public GraphTraversalSource getGraphTraversalSource(final LoadGraphWith.GraphData graphData) {
+ final GraphTraversalSource g = super.getGraphTraversalSource(graphData);
+ return g.with("language", "gremlin-lang");
+ }
+ }
+
+ public static class GraphSONLangParameterizedRemoteWorld extends GraphSONLangRemoteWorld {
+ @Override
+ public boolean useParametersLiterally() {
+ return false;
+ }
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
public static class GraphSONRemoteComputerWorld extends RemoteComputerWorld {
- public GraphSONRemoteComputerWorld() { super(createTestCluster(Serializers.GRAPHSON_V3)); }
+ public GraphSONRemoteComputerWorld() { super(createTestCluster(Serializers.GRAPHSON_V4)); }
+
+ @Override
+ public GraphTraversalSource getGraphTraversalSource(final LoadGraphWith.GraphData graphData) {
+ final GraphTraversalSource g = super.getGraphTraversalSource(graphData);
+ return g.with("language", "groovy-test");
+ }
}
}
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptTestEngine.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptTestEngine.java
new file mode 100644
index 0000000..4dc66db
--- /dev/null
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptTestEngine.java
@@ -0,0 +1,50 @@
+/*
+ * 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.groovy.jsr223;
+
+import org.apache.tinkerpop.gremlin.jsr223.GremlinScriptEngineFactory;
+import org.apache.tinkerpop.gremlin.language.translator.GremlinTranslator;
+import org.apache.tinkerpop.gremlin.language.translator.Translator;
+
+import javax.script.ScriptContext;
+import javax.script.ScriptException;
+
+/**
+ * Designed to be used in tests.
+ * Converts incoming script from gremlin-lang to gremlin-groovy compatible form and executes with
+ * {@code GremlinGroovyScriptEngine}.
+ */
+
+public class GremlinGroovyScriptTestEngine extends GremlinGroovyScriptEngine {
+
+ public GremlinGroovyScriptTestEngine() {
+
+ }
+
+ @Override
+ public GremlinScriptEngineFactory getFactory() {
+ return new GremlinGroovyScriptTestEngineFactory();
+ }
+
+ @Override
+ public Object eval(final String script, final ScriptContext context) throws ScriptException {
+ final String translatedScript = GremlinTranslator.translate(script, Translator.GROOVY).getTranslated();
+ return super.eval(translatedScript, context);
+ }
+}
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptTestEngineFactory.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptTestEngineFactory.java
new file mode 100644
index 0000000..f6345bd
--- /dev/null
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptTestEngineFactory.java
@@ -0,0 +1,47 @@
+/*
+ * 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.groovy.jsr223;
+
+import org.apache.tinkerpop.gremlin.jsr223.AbstractGremlinScriptEngineFactory;
+import org.apache.tinkerpop.gremlin.jsr223.GremlinScriptEngine;
+
+import java.util.Collections;
+public class GremlinGroovyScriptTestEngineFactory extends AbstractGremlinScriptEngineFactory {
+
+ public static final String ENGINE_NAME = "groovy-test";
+
+ public GremlinGroovyScriptTestEngineFactory() {
+ super(ENGINE_NAME, ENGINE_NAME, Collections.singletonList("script"), Collections.singletonList("plain"));
+ }
+
+ @Override
+ public GremlinScriptEngine getScriptEngine() {
+ return new GremlinGroovyScriptTestEngine();
+ }
+
+ @Override
+ public String getMethodCallSyntax(final String obj, final String m, final String... args) {
+ return null;
+ }
+
+ @Override
+ public String getOutputStatement(final String toDisplay) {
+ return "println " + toDisplay;
+ }
+}
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/process/remote/GraphBinaryGroovyRemoteGraphProcessStandardTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/process/remote/GraphBinaryGroovyRemoteGraphProcessStandardTest.java
new file mode 100644
index 0000000..69aa04c
--- /dev/null
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/process/remote/GraphBinaryGroovyRemoteGraphProcessStandardTest.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.remote;
+
+import org.apache.tinkerpop.gremlin.GraphProviderClass;
+import org.apache.tinkerpop.gremlin.driver.remote.GraphBinaryGroovyRemoteGraphProvider;
+import org.apache.tinkerpop.gremlin.process.ProcessStandardSuite;
+import org.apache.tinkerpop.gremlin.structure.RemoteGraph;
+import org.junit.runner.RunWith;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+@RunWith(ProcessStandardSuite.class)
+@GraphProviderClass(provider = GraphBinaryGroovyRemoteGraphProvider.class, graph = RemoteGraph.class)
+public class GraphBinaryGroovyRemoteGraphProcessStandardTest {
+}
\ No newline at end of file
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/process/remote/GraphBinaryLangRemoteGraphProcessStandardTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/process/remote/GraphBinaryLangRemoteGraphProcessStandardTest.java
new file mode 100644
index 0000000..f590d02
--- /dev/null
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/process/remote/GraphBinaryLangRemoteGraphProcessStandardTest.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.remote;
+
+import org.apache.tinkerpop.gremlin.GraphProviderClass;
+import org.apache.tinkerpop.gremlin.driver.remote.GraphBinaryLangRemoteGraphProvider;
+import org.apache.tinkerpop.gremlin.process.ProcessStandardSuite;
+import org.apache.tinkerpop.gremlin.structure.RemoteGraph;
+import org.junit.runner.RunWith;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+@RunWith(ProcessStandardSuite.class)
+@GraphProviderClass(provider = GraphBinaryLangRemoteGraphProvider.class, graph = RemoteGraph.class)
+public class GraphBinaryLangRemoteGraphProcessStandardTest {
+}
\ No newline at end of file
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/process/remote/GraphBinaryRemoteGraphProcessStandardTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/process/remote/GraphBinaryRemoteGraphProcessStandardTest.java
deleted file mode 100644
index 92b1d21..0000000
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/process/remote/GraphBinaryRemoteGraphProcessStandardTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.process.remote;
-
-import org.apache.tinkerpop.gremlin.GraphProviderClass;
-import org.apache.tinkerpop.gremlin.driver.remote.GraphBinaryRemoteGraphProvider;
-import org.apache.tinkerpop.gremlin.process.ProcessStandardSuite;
-import org.apache.tinkerpop.gremlin.structure.RemoteGraph;
-import org.junit.runner.RunWith;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-@RunWith(ProcessStandardSuite.class)
-@GraphProviderClass(provider = GraphBinaryRemoteGraphProvider.class, graph = RemoteGraph.class)
-public class GraphBinaryRemoteGraphProcessStandardTest {
-}
\ No newline at end of file
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/process/remote/GraphSONRemoteGraphProcessComputerTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/process/remote/GraphSONRemoteGraphProcessComputerTest.java
deleted file mode 100644
index 8d6013b..0000000
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/process/remote/GraphSONRemoteGraphProcessComputerTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tinkerpop.gremlin.process.remote;
-
-import org.apache.tinkerpop.gremlin.GraphProviderClass;
-import org.apache.tinkerpop.gremlin.driver.remote.GraphSONRemoteGraphComputerProvider;
-import org.apache.tinkerpop.gremlin.process.ProcessComputerSuite;
-import org.apache.tinkerpop.gremlin.structure.RemoteGraph;
-import org.junit.runner.RunWith;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-@RunWith(ProcessComputerSuite.class)
-@GraphProviderClass(provider = GraphSONRemoteGraphComputerProvider.class, graph = RemoteGraph.class)
-public class GraphSONRemoteGraphProcessComputerTest {
-}
\ No newline at end of file
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/process/remote/GraphSONRemoteGraphProcessStandardTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/process/remote/GraphSONRemoteGraphProcessStandardTest.java
deleted file mode 100644
index c1d429c..0000000
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/process/remote/GraphSONRemoteGraphProcessStandardTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.process.remote;
-
-import org.apache.tinkerpop.gremlin.GraphProviderClass;
-import org.apache.tinkerpop.gremlin.driver.remote.GraphSONRemoteGraphProvider;
-import org.apache.tinkerpop.gremlin.process.ProcessStandardSuite;
-import org.apache.tinkerpop.gremlin.structure.RemoteGraph;
-import org.junit.runner.RunWith;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-@RunWith(ProcessStandardSuite.class)
-@GraphProviderClass(provider = GraphSONRemoteGraphProvider.class, graph = RemoteGraph.class)
-public class GraphSONRemoteGraphProcessStandardTest {
-}
\ No newline at end of file
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/AbstractGremlinServerIntegrationTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/AbstractGremlinServerIntegrationTest.java
index 147014c..b06dfbc 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/AbstractGremlinServerIntegrationTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/AbstractGremlinServerIntegrationTest.java
@@ -18,9 +18,6 @@
*/
package org.apache.tinkerpop.gremlin.server;
-import org.apache.tinkerpop.gremlin.server.channel.UnifiedChannelizer;
-import org.apache.tinkerpop.gremlin.server.channel.UnifiedChannelizerIntegrateTest;
-import org.apache.tinkerpop.gremlin.server.op.OpLoader;
import org.apache.tinkerpop.gremlin.server.util.ServerGremlinExecutor;
import org.apache.tinkerpop.gremlin.tinkergraph.structure.AbstractTinkerGraph;
import org.junit.After;
@@ -105,10 +102,6 @@
} else {
final Settings oSettings = overrideSettings(settings);
- if (shouldTestUnified()) {
- oSettings.channelizer = UnifiedChannelizer.class.getName();
- }
-
ServerTestHelper.rewritePathsInGremlinServerSettings(oSettings);
if (GREMLIN_SERVER_EPOLL) {
oSettings.useEpollEventLoop = true;
@@ -131,10 +124,6 @@
overriddenSettings.useEpollEventLoop = true;
}
- if (shouldTestUnified()) {
- overriddenSettings.channelizer = UnifiedChannelizer.class.getName();
- }
-
this.server = new GremlinServer(overriddenSettings);
return server.start();
@@ -155,15 +144,6 @@
if (server != null) {
server.stop().join();
}
-
- // reset the OpLoader processors so that they can get reconfigured on startup - Settings may have changed
- // between tests
- OpLoader.reset();
- }
-
- protected boolean isUsingUnifiedChannelizer() {
- return server.getServerGremlinExecutor().
- getSettings().channelizer.equals(UnifiedChannelizer.class.getName());
}
public static boolean deleteDirectory(final File directory) {
@@ -187,11 +167,4 @@
logger.info("Running transactional tests using TinkerTransactionGraph");
settings.graphs.put("graph", "conf/tinkertransactiongraph-empty.properties");
}
-
- private boolean shouldTestUnified() {
- // ignore all tests in the UnifiedChannelizerIntegrateTest package as they are already rigged to test
- // over the various channelizer implementations
- return Boolean.parseBoolean(System.getProperty("testUnified", "false")) &&
- !this.getClass().getPackage().equals(UnifiedChannelizerIntegrateTest.class.getPackage());
- }
}
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/ClientWithOptionsIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/ClientWithOptionsIntegrateTest.java
index a120f99..7d8483c 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/ClientWithOptionsIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/ClientWithOptionsIntegrateTest.java
@@ -43,18 +43,6 @@
public class ClientWithOptionsIntegrateTest extends AbstractGremlinServerIntegrationTest {
@Test
- public void shouldTimeOutAliasedClientSendingBytecode() {
- final Cluster cluster = TestClientFactory.build().create();
- final Client client = cluster.connect().alias("ggrateful");
- final GraphTraversalSource g = traversal().withRemote(DriverRemoteConnection.using(client, "g"));
- final GraphTraversal traversal = g.with("evaluationTimeout", 1).V().both().both().both();
- assertThrows(ExecutionException.class, () -> {
- final List<Result> res = client.submit(traversal).all().get();
- fail("Failed to time out. Result: " + res);
- });
- }
-
- @Test
public void shouldTimeOutnonAliasedClientSendingByteCode() {
final Cluster cluster = TestClientFactory.build().create();
final Client client = cluster.connect();
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/ContextTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/ContextTest.java
index 2092713..accdcc8 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/ContextTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/ContextTest.java
@@ -20,28 +20,15 @@
import io.netty.channel.ChannelHandlerContext;
import nl.altindag.log.LogCaptor;
-import org.apache.tinkerpop.gremlin.util.Tokens;
import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.server.handler.Frame;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
import org.mockito.Mockito;
-import java.util.Arrays;
-import java.util.UUID;
-import java.util.function.BiFunction;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.Is.is;
import static org.junit.Assert.assertEquals;
-@RunWith(Parameterized.class)
public class ContextTest {
private static LogCaptor logCaptor;
@@ -61,130 +48,13 @@
logCaptor.clearLogs();
}
- @Parameterized.Parameter(value = 0)
- public BiFunction<Context, ResponseStatusCode, Void> writeInvoker;
-
- private final ChannelHandlerContext ctx = Mockito.mock(ChannelHandlerContext.class);
- private final RequestMessage request = RequestMessage.build("test").create();
- private final Settings settings = new Settings();
- private final Context context = new Context(request, ctx, settings, null, null, null);
-
- @Parameterized.Parameters(name = "{0}")
- public static Iterable<Object[]> data() {
- return Arrays.asList(new Object[][] {
- {
- new BiFunction<Context, ResponseStatusCode, Void>() {
- @Override
- public Void apply(final Context context, final ResponseStatusCode code) {
- context.writeAndFlush(code, "testMessage");
- return null;
- }
-
- @Override
- public String toString() {
- return "writeAndFlush(ResponseStatusCode, Object)";
- }
- }
- }, {
- new BiFunction<Context, ResponseStatusCode, Void>() {
- @Override
- public Void apply(final Context context, final ResponseStatusCode code) {
- context.writeAndFlush(ResponseMessage.build(UUID.randomUUID()).code(code).create());
- return null;
- }
-
- @Override
- public String toString() {
- return "writeAndFlush(ResponseMessage)";
- }
- }
- },
- });
- }
-
- @Test
- public void shouldAllowMultipleNonFinalResponses() {
- writeInvoker.apply(context, ResponseStatusCode.AUTHENTICATE);
- Mockito.verify(ctx, Mockito.times(1)).write(Mockito.any());
- Mockito.verify(ctx, Mockito.times(1)).flush();
-
- writeInvoker.apply(context, ResponseStatusCode.PARTIAL_CONTENT);
- Mockito.verify(ctx, Mockito.times(2)).write(Mockito.any());
- Mockito.verify(ctx, Mockito.times(2)).flush();
-
- writeInvoker.apply(context, ResponseStatusCode.PARTIAL_CONTENT);
- Mockito.verify(ctx, Mockito.times(3)).write(Mockito.any());
- Mockito.verify(ctx, Mockito.times(3)).flush();
- }
-
- @Test
- public void shouldAllowAtMostOneFinalResponse() {
- writeInvoker.apply(context, ResponseStatusCode.AUTHENTICATE);
- Mockito.verify(ctx, Mockito.times(1)).write(Mockito.any());
- Mockito.verify(ctx, Mockito.times(1)).flush();
-
- writeInvoker.apply(context, ResponseStatusCode.SUCCESS);
- Mockito.verify(ctx, Mockito.times(2)).write(Mockito.any());
- Mockito.verify(ctx, Mockito.times(2)).flush();
-
- writeInvoker.apply(context, ResponseStatusCode.SERVER_ERROR_TIMEOUT);
- assertThat(logCaptor.getLogs().stream().anyMatch(m ->
- m.matches(".*" + request.getRequestId() + ".*")), is(true));
- assertThat(logCaptor.getLogs().stream().anyMatch(m ->
- m.matches(".*" + ResponseStatusCode.SERVER_ERROR_TIMEOUT + "$")), is(true));
-
- // ensure there were no other writes to the channel
- Mockito.verify(ctx, Mockito.times(2)).write(Mockito.any());
- Mockito.verify(ctx, Mockito.times(2)).flush();
- }
-
- @Test
- public void shouldNotAllowNonFinalMessagesAfterFinalResponse() {
- writeInvoker.apply(context, ResponseStatusCode.SERVER_ERROR_TIMEOUT);
- Mockito.verify(ctx, Mockito.times(1)).write(Mockito.any());
- Mockito.verify(ctx, Mockito.times(1)).flush();
-
- writeInvoker.apply(context, ResponseStatusCode.PARTIAL_CONTENT);
- assertThat(logCaptor.getLogs().stream().anyMatch(m ->
- m.matches(".*" + request.getRequestId() + ".*")), is(true));
- assertThat(logCaptor.getLogs().stream().anyMatch(m ->
- m.matches(".*" + ResponseStatusCode.PARTIAL_CONTENT + "$")), is(true));
-
- // ensure there were no other writes to the channel
- Mockito.verify(ctx, Mockito.times(1)).write(Mockito.any());
- Mockito.verify(ctx, Mockito.times(1)).flush();
- }
-
- @Test
- public void shouldReleaseIgnoredFrames() {
- writeInvoker.apply(context, ResponseStatusCode.SERVER_ERROR_TIMEOUT);
- Mockito.verify(ctx, Mockito.times(1)).write(Mockito.any());
- Mockito.verify(ctx, Mockito.times(1)).flush();
-
- Frame frame = Mockito.mock(Frame.class);
- context.writeAndFlush(ResponseStatusCode.SUCCESS, frame);
-
- assertThat(logCaptor.getLogs().stream().anyMatch(m ->
- m.matches(".*" + request.getRequestId() + ".*")), is(true));
- assertThat(logCaptor.getLogs().stream().anyMatch(m ->
- m.matches(".*" + ResponseStatusCode.SUCCESS + "$")), is(true));
-
- // ensure there were no other writes to the channel
- Mockito.verify(ctx, Mockito.times(1)).write(Mockito.any());
- Mockito.verify(ctx, Mockito.times(1)).flush();
-
- // ensure the frame was released
- Mockito.verify(frame, Mockito.times(1)).tryRelease();
- Mockito.verify(ctx, Mockito.times(1)).flush();
- }
-
@Test
public void shouldParseParametersFromScriptRequest()
{
final ChannelHandlerContext ctx = Mockito.mock(ChannelHandlerContext.class);
- final RequestMessage request = RequestMessage.build(Tokens.OPS_EVAL)
- .addArg(Tokens.ARGS_GREMLIN, "g.with('evaluationTimeout', 1000).with(true).with('materializeProperties', 'tokens').V().out('knows')")
- .create();
+ final RequestMessage request =
+ RequestMessage.build("g.with('evaluationTimeout', 1000).with(true).with('materializeProperties', 'tokens').V().out('knows')")
+ .create();
final Settings settings = new Settings();
final Context context = new Context(request, ctx, settings, null, null, null);
@@ -196,10 +66,9 @@
public void shouldSkipInvalidMaterializePropertiesParameterFromScriptRequest()
{
final ChannelHandlerContext ctx = Mockito.mock(ChannelHandlerContext.class);
- final RequestMessage request = RequestMessage.build(Tokens.OPS_EVAL)
- .addArg(Tokens.ARGS_GREMLIN,
- "g.with('evaluationTimeout', 1000).with(true).with('materializeProperties', 'some-invalid-value').V().out('knows')")
- .create();
+ final RequestMessage request =
+ RequestMessage.build("g.with('evaluationTimeout', 1000).with(true).with('materializeProperties', 'some-invalid-value').V().out('knows')")
+ .create();
final Settings settings = new Settings();
final Context context = new Context(request, ctx, settings, null, null, null);
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
index 0186af6..15b4734 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
@@ -19,57 +19,37 @@
package org.apache.tinkerpop.gremlin.server;
import ch.qos.logback.classic.Level;
-import ch.qos.logback.classic.Logger;
+import io.netty.handler.codec.http.HttpResponseStatus;
import nl.altindag.log.LogCaptor;
-import org.apache.tinkerpop.gremlin.driver.Channelizer;
-import org.apache.tinkerpop.gremlin.server.channel.HttpChannelizer;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.io.Mapper;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3;
-import org.apache.tinkerpop.gremlin.util.ExceptionHelper;
import org.apache.tinkerpop.gremlin.TestHelper;
import org.apache.tinkerpop.gremlin.driver.Client;
import org.apache.tinkerpop.gremlin.driver.Cluster;
import org.apache.tinkerpop.gremlin.driver.RequestOptions;
import org.apache.tinkerpop.gremlin.driver.Result;
import org.apache.tinkerpop.gremlin.driver.ResultSet;
-import org.apache.tinkerpop.gremlin.util.Tokens;
-import org.apache.tinkerpop.gremlin.driver.exception.ConnectionException;
import org.apache.tinkerpop.gremlin.driver.exception.NoHostAvailableException;
import org.apache.tinkerpop.gremlin.driver.exception.ResponseException;
-import org.apache.tinkerpop.gremlin.driver.handler.WebSocketClientHandler;
-import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.driver.remote.DriverRemoteConnection;
-import org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1;
-import org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV2;
-import org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3;
-import org.apache.tinkerpop.gremlin.util.ser.Serializers;
+import org.apache.tinkerpop.gremlin.driver.interceptor.PayloadSerializingInterceptor;
import org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-import org.apache.tinkerpop.gremlin.server.handler.OpExecutorHandler;
+import org.apache.tinkerpop.gremlin.server.channel.HttpChannelizer;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.apache.tinkerpop.gremlin.structure.io.Storage;
import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
+import org.apache.tinkerpop.gremlin.util.ExceptionHelper;
import org.apache.tinkerpop.gremlin.util.TimeUtil;
import org.apache.tinkerpop.gremlin.util.function.FunctionUtils;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.junit.After;
+import org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV4;
+import org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV4;
+import org.apache.tinkerpop.gremlin.util.ser.Serializers;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
+import org.junit.Ignore;
import org.junit.Test;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mockito;
import org.slf4j.LoggerFactory;
-import java.awt.Color;
+import java.awt.*;
import java.net.ConnectException;
-import java.time.Instant;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -81,9 +61,6 @@
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicInteger;
@@ -91,23 +68,16 @@
import java.util.stream.Collectors;
import java.util.stream.IntStream;
-import static org.apache.tinkerpop.gremlin.process.traversal.AnonymousTraversalSource.traversal;
+import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.AllOf.allOf;
import static org.hamcrest.core.IsInstanceOf.instanceOf;
import static org.hamcrest.core.StringContains.containsString;
-import static org.hamcrest.core.StringEndsWith.endsWith;
-import static org.hamcrest.core.StringStartsWith.startsWith;
-import static org.hamcrest.number.OrderingComparison.greaterThan;
-import static org.hamcrest.number.OrderingComparison.lessThanOrEqualTo;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import static org.hamcrest.CoreMatchers.is;
-import static org.mockito.Mockito.verify;
/**
* Integration tests for gremlin-driver configurations and settings.
@@ -120,6 +90,8 @@
private static LogCaptor logCaptor;
private Level previousLogLevel;
+ private static final RequestOptions groovyRequestOptions = RequestOptions.build().language("gremlin-groovy").create();
+
@BeforeClass
public static void setupLogCaptor() {
logCaptor = LogCaptor.forRoot();
@@ -132,32 +104,9 @@
@Before
public void setupForEachTest() {
- if (name.getMethodName().equals("shouldKeepAliveForWebSockets") ||
- name.getMethodName().equals("shouldKeepAliveForWebSocketsWithNoInFlightRequests")) {
- final Logger webSocketClientHandlerLogger = (Logger) LoggerFactory.getLogger(WebSocketClientHandler.class);
- previousLogLevel = webSocketClientHandlerLogger.getLevel();
- webSocketClientHandlerLogger.setLevel(Level.DEBUG);
- } else if (name.getMethodName().equals("shouldEventuallySucceedAfterMuchFailure")) {
- final Logger opExecutorHandlerLogger = (Logger) LoggerFactory.getLogger(OpExecutorHandler.class);
- previousLogLevel = opExecutorHandlerLogger.getLevel();
- opExecutorHandlerLogger.setLevel(Level.ERROR);
- }
-
logCaptor.clearLogs();
}
- @After
- public void afterEachTest() {
- if (name.getMethodName().equals("shouldKeepAliveForWebSockets") ||
- name.getMethodName().equals("shouldKeepAliveForWebSocketsWithNoInFlightRequests")) {
- final Logger webSocketClientHandlerLogger = (Logger) LoggerFactory.getLogger(WebSocketClientHandler.class);
- webSocketClientHandlerLogger.setLevel(previousLogLevel);
- } else if (name.getMethodName().equals("shouldEventuallySucceedAfterMuchFailure")) {
- final Logger opExecutorHandlerLogger = (Logger) LoggerFactory.getLogger(OpExecutorHandler.class);
- opExecutorHandlerLogger.setLevel(previousLogLevel);
- }
- }
-
/**
* Configure specific Gremlin Server settings for specific tests.
*/
@@ -170,7 +119,6 @@
settings.channelizer = HttpChannelizer.class.getName();
break;
case "shouldAliasTraversalSourceVariables":
- case "shouldAliasTraversalSourceVariablesInSession":
try {
final String p = Storage.toPath(TestHelper.generateTempFileFromResource(
GremlinDriverIntegrateTest.class,
@@ -189,10 +137,7 @@
settings.serializers.stream().filter(s -> s.className.contains("Gryo"))
.forEach(s -> s.config.put("custom", custom));
break;
- case "shouldExecuteScriptInSessionOnTransactionalGraph":
case "shouldExecuteSessionlessScriptOnTransactionalGraph":
- case "shouldExecuteScriptInSessionOnTransactionalWithManualTransactionsGraph":
- case "shouldExecuteInSessionAndSessionlessWithoutOpeningTransaction":
case "shouldManageTransactionsInSession":
useTinkerTransactionGraph(settings);
break;
@@ -217,53 +162,12 @@
}
@Test
- public void shouldSubgraphWithGraphSONV3Serialization() throws Exception {
- // validating subgraph() serialization here b/c we don't have feature tests for it yet in gherkin
- final GraphSONMapper.Builder builder = GraphSONMapper.build().addRegistry(TinkerIoRegistryV3.instance());
- final GraphSONMessageSerializerV3 serializer = new GraphSONMessageSerializerV3(builder);
- final Cluster cluster = TestClientFactory.build().serializer(serializer).create();
- final Client client = cluster.connect();
-
- try {
- final List<Result> r = client.submit("TinkerFactory.createModern().traversal().E().hasLabel('knows').subgraph('x').cap('x')").all().join();
- assertEquals(1, r.size());
-
- final Graph graph = r.get(0).get(Graph.class);
- final GraphTraversalSource g = traversal().withEmbedded(graph);
- assertEquals(2, g.E().count().next().longValue());
- assertEquals(3, g.V().count().next().longValue());
- } finally {
- cluster.close();
- }
- }
-
- @Test
- public void shouldSubgraphWithGraphBinaryV1Serialization() throws Exception {
- // validating subgraph() serialization here b/c we don't have feature tests for it yet in gherkin
- final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHBINARY_V1).create();
- final Client client = cluster.connect();
-
- try {
- final List<Result> r = client.submit("TinkerFactory.createModern().traversal().E().hasLabel('knows').subgraph('x').cap('x')").all().join();
- assertEquals(1, r.size());
-
- final Graph graph = r.get(0).get(Graph.class);
- final GraphTraversalSource g = traversal().withEmbedded(graph);
- assertEquals(2, g.E().count().next().longValue());
- assertEquals(3, g.V().count().next().longValue());
- } finally {
- cluster.close();
- }
- }
-
- @Test
public void shouldInterceptRequests() throws Exception {
final int requestsToMake = 32;
final AtomicInteger httpRequests = new AtomicInteger(0);
final Cluster cluster = TestClientFactory.build().
- channelizer(Channelizer.HttpChannelizer.class).
- requestInterceptor(r -> {
+ addInterceptor("counter", r -> {
httpRequests.incrementAndGet();
return r;
}).create();
@@ -271,7 +175,7 @@
try {
final Client client = cluster.connect();
for (int ix = 0; ix < requestsToMake; ix++) {
- assertEquals(ix + 1, client.submit(ix + "+1").all().get().get(0).getInt());
+ assertEquals(ix + 1, client.submit(String.format("g.inject(%d)", ix+1)).all().get().get(0).getInt());
}
} finally {
cluster.close();
@@ -281,167 +185,174 @@
}
@Test
+ public void shouldRunInterceptorsInOrder() throws Exception {
+ AtomicReference<Object> body = new AtomicReference<>();
+ final Cluster cluster = TestClientFactory.build().
+ addInterceptor("first", r -> {
+ body.set(r.getBody());
+ r.setBody(null);
+ return r;
+ }).
+ addInterceptor("second", r -> {
+ r.setBody(body.get());
+ return r;
+ }).create();
+
+ try {
+ final Client client = cluster.connect();
+ assertEquals(2, client.submit("g.inject(2)").all().get().get(0).getInt());
+ } finally {
+ cluster.close();
+ }
+ }
+
+ @Test
+ public void shouldWorkWithGraphSONSerializer() throws Exception {
+ final Cluster cluster = TestClientFactory.build(new PayloadSerializingInterceptor(new GraphSONMessageSerializerV4()))
+ .serializer(Serializers.GRAPHSON_V4.simpleInstance()).create();
+
+ try {
+ final Client client = cluster.connect();
+ final RequestOptions ro = RequestOptions.build()
+ .addG("gmodern")
+ .language("gremlin-lang")
+ .bulkResults(true)
+ .create();
+ assertEquals(6, client.submit("g.V()", ro).all().get().size());
+ } finally {
+ cluster.close();
+ }
+ }
+
+ @Test
+ public void shouldWorkWithGraphSONRequestAndGraphBinaryResponse() throws Exception {
+ final Cluster cluster = TestClientFactory.build(new PayloadSerializingInterceptor(new GraphSONMessageSerializerV4()))
+ .serializer(Serializers.GRAPHBINARY_V4.simpleInstance()).create();
+
+ try {
+ final Client client = cluster.connect();
+ assertEquals(3, client.submit("g.inject(3)").all().get().get(0).getInt());
+ } finally {
+ cluster.close();
+ }
+ }
+
+ @Test
+ public void shouldWorkWithGraphBinaryRequestAndGraphSONResponse() throws Exception {
+ final Cluster cluster = TestClientFactory.build(new PayloadSerializingInterceptor(new GraphBinaryMessageSerializerV4()))
+ .serializer(Serializers.GRAPHSON_V4.simpleInstance()).create();
+
+ try {
+ final Client client = cluster.connect();
+ assertEquals(5, client.submit("g.inject(5)").all().get().get(0).getInt());
+ } finally {
+ cluster.close();
+ }
+ }
+
+ @Test
public void shouldInterceptRequestsWithHandshake() throws Exception {
final int requestsToMake = 32;
- final AtomicInteger websocketHandshakeRequests = new AtomicInteger(0);
+ final AtomicInteger handshakeRequests = new AtomicInteger(0);
final Cluster cluster = TestClientFactory.build().
- minConnectionPoolSize(1).maxConnectionPoolSize(1).
- handshakeInterceptor(r -> {
- websocketHandshakeRequests.incrementAndGet();
- return r;
- }).create();
+ maxConnectionPoolSize(1).
+ addInterceptor("counter", r -> {
+ handshakeRequests.incrementAndGet();
+ return r;
+ }).create();
try {
final Client client = cluster.connect();
for (int ix = 0; ix < requestsToMake; ix++) {
- assertEquals(ix + 1, client.submit(ix + "+1").all().get().get(0).getInt());
+ final List<Result> result = client.submit(String.format("g.inject(%d)", ix+1)).all().get();
+ assertEquals(ix + 1, result.get(0).getInt());
}
} finally {
cluster.close();
}
- assertEquals(1, websocketHandshakeRequests.get());
+ assertEquals(requestsToMake, handshakeRequests.get());
}
+ @Ignore("Reading for streaming GraphSON is not supported")
@Test
public void shouldReportErrorWhenRequestCantBeSerialized() throws Exception {
- final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHSON_V3).create();
+ final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHSON_V4).create();
try {
final Client client = cluster.connect().alias("g");
try {
final Map<String, Object> params = new HashMap<>();
params.put("r", Color.RED);
- client.submit("r", params).all().get();
+ client.submit("g.inject(r)", params).all().get();
fail("Should have thrown exception over bad serialization");
} catch (Exception ex) {
final Throwable inner = ExceptionHelper.getRootCause(ex);
assertThat(inner, instanceOf(ResponseException.class));
- assertEquals(ResponseStatusCode.REQUEST_ERROR_SERIALIZATION, ((ResponseException) inner).getResponseStatusCode());
+ assertEquals(HttpResponseStatus.BAD_REQUEST, ((ResponseException) inner).getResponseStatusCode());
assertTrue(ex.getMessage().contains("An error occurred during serialization of this request"));
}
// should not die completely just because we had a bad serialization error. that kind of stuff happens
// from time to time, especially in the console if you're just exploring.
- assertEquals(2, client.submit("1+1").all().get().get(0).getInt());
+ assertEquals(2, client.submit("g.inject(2)").all().get().get(0).getInt());
} finally {
cluster.close();
}
}
@Test
- public void shouldProcessTraversalInterruption() throws Exception {
+ public void shouldProcessTraversalInterruption() {
final Cluster cluster = TestClientFactory.open();
final Client client = cluster.connect();
try {
- client.submit("g.inject(1).sideEffect{Thread.sleep(5000)}").all().get();
+ client.submit("g.inject(1).sideEffect{Thread.sleep(5000)}", groovyRequestOptions).all().get();
fail("Should have timed out");
} catch (Exception ex) {
final ResponseException re = (ResponseException) ex.getCause();
- assertEquals(ResponseStatusCode.SERVER_ERROR_TIMEOUT, re.getResponseStatusCode());
+ assertEquals(HttpResponseStatus.INTERNAL_SERVER_ERROR, re.getResponseStatusCode());
+ assertEquals("ServerTimeoutExceededException", re.getRemoteException());
} finally {
cluster.close();
}
}
@Test
- public void shouldProcessEvalInterruption() throws Exception {
+ public void shouldProcessEvalInterruption() {
final Cluster cluster = TestClientFactory.open();
final Client client = cluster.connect();
try {
- client.submit("Thread.sleep(5000);'done'").all().get();
+ client.submit("Thread.sleep(5000);'done'", groovyRequestOptions).all().get();
fail("Should have timed out");
} catch (Exception ex) {
final ResponseException re = (ResponseException) ex.getCause();
- assertEquals(ResponseStatusCode.SERVER_ERROR_TIMEOUT, re.getResponseStatusCode());
+ assertEquals(HttpResponseStatus.INTERNAL_SERVER_ERROR, re.getResponseStatusCode());
+ assertEquals("ServerTimeoutExceededException", re.getRemoteException());
} finally {
cluster.close();
}
}
@Test
- public void shouldKeepAliveForWebSockets() throws Exception {
- // keep the connection pool size at 1 to remove the possibility of lots of connections trying to ping which will
- // complicate the assertion logic
- final Cluster cluster = TestClientFactory.build().
- minConnectionPoolSize(1).
- maxConnectionPoolSize(1).
- keepAliveInterval(1002).create();
- try {
- final Client client = cluster.connect();
-
- // fire up lots of requests so as to schedule/deschedule lots of ping jobs
- for (int ix = 0; ix < 500; ix++) {
- assertEquals(2, client.submit("1+1").all().get().get(0).getInt());
- }
-
- // don't send any messages for a bit so that the driver pings in the background
- Thread.sleep(3000);
-
- // make sure no bonus messages sorta fire off once we get back to sending requests
- for (int ix = 0; ix < 500; ix++) {
- assertEquals(2, client.submit("1+1").all().get().get(0).getInt());
- }
-
- // there really shouldn't be more than 3 of these sent. should definitely be at least one though
- final long messages = logCaptor.getLogs().stream().filter(m -> m.contains("Sending ping frame to the server")).count();
- assertThat(messages, allOf(greaterThan(0L), lessThanOrEqualTo(3L)));
- } finally {
- cluster.close();
- }
- }
-
- @Test
- public void shouldKeepAliveForWebSocketsWithNoInFlightRequests() throws Exception {
- // keep the connection pool size at 1 to remove the possibility of lots of connections trying to ping which will
- // complicate the assertion logic
- final Cluster cluster = TestClientFactory.build().
- minConnectionPoolSize(1).
- maxConnectionPoolSize(1).
- keepAliveInterval(1002).create();
- try {
- final Client client = cluster.connect();
-
- // forcefully initialize the client to mimic a scenario when client has some active connection with no
- // in flight requests on them.
- client.init();
-
- // don't send any messages for a bit so that the driver pings in the background
- Thread.sleep(3000);
-
- // make sure no bonus messages sorta fire off once we get back to sending requests
- for (int ix = 0; ix < 500; ix++) {
- assertEquals(2, client.submit("1+1").all().get().get(0).getInt());
- }
-
- // there really shouldn't be more than 3 of these sent. should definitely be at least one though
- final long messages = logCaptor.getLogs().stream().filter(m -> m.contains("Sending ping frame to the server")).count();
- assertThat(messages, allOf(greaterThan(0L), lessThanOrEqualTo(3L)));
- } finally {
- cluster.close();
- }
- }
-
- @Test
- public void shouldEventuallySucceedAfterChannelLevelError() throws Exception {
+ public void shouldEventuallySucceedAfterChannelLevelError() {
final Cluster cluster = TestClientFactory.build()
.reconnectInterval(500)
- .maxContentLength(64).create();
+ .maxResponseContentLength(32).create(); // Warning: compression can change the content length. Adjust as needed.
final Client client = cluster.connect();
try {
try {
- client.submit("def x = '';(0..<1024).each{x = x + '$it'};x").all().get();
+ client.submit("g.inject('x').repeat(concat('x')).times(512)").all().get();
fail("Request should have failed because it exceeded the max content length allowed");
} catch (Exception ex) {
final Throwable root = ExceptionHelper.getRootCause(ex);
- assertThat(root.getMessage(), containsString("Max frame length of 64 has been exceeded."));
+ assertThat(root.getMessage(), containsString("Response entity too large"));
}
- assertEquals(2, client.submit("1+1").all().join().get(0).getInt());
+ assertEquals(2, client.submit("g.inject(2)").all().join().get(0).getInt());
} finally {
cluster.close();
@@ -449,7 +360,7 @@
}
@Test
- public void shouldEventuallySucceedAfterMuchFailure() throws Exception {
+ public void shouldEventuallySucceedAfterMuchFailure() {
final Cluster cluster = TestClientFactory.open();
final Client client = cluster.connect();
@@ -465,7 +376,7 @@
}
});
- assertEquals(2, client.submit("1+1").all().join().get(0).getInt());
+ assertEquals(2, client.submit("g.inject(2)").all().join().get(0).getInt());
} finally {
cluster.close();
@@ -480,7 +391,7 @@
final Client client = cluster.connect();
try {
- client.submit("1+1").all().join().get(0).getInt();
+ client.submit("g.inject(2)").all().join().get(0).getInt();
fail("Should not have gone through because the server is not running");
} catch (Exception i) {
assertThat(i, instanceOf(NoHostAvailableException.class));
@@ -496,7 +407,7 @@
for (int ix = 3; ix < 13; ix++) {
TimeUnit.SECONDS.sleep(ix);
try {
- final int result = client.submit("1+1").all().join().get(0).getInt();
+ final int result = client.submit("g.inject(2)").all().join().get(0).getInt();
assertEquals(2, result);
break;
} catch (Exception ignored) {
@@ -508,7 +419,7 @@
}
@Test
- public void shouldEventuallySucceedWithRoundRobin() throws Exception {
+ public void shouldEventuallySucceedWithRoundRobin() {
final String noGremlinServer = "74.125.225.19";
final Cluster cluster = TestClientFactory.build().addContactPoint(noGremlinServer).create();
@@ -517,11 +428,11 @@
client.init();
// the first host is dead on init. request should succeed on localhost
- assertEquals(2, client.submit("1+1").all().join().get(0).getInt());
- assertEquals(2, client.submit("1+1").all().join().get(0).getInt());
- assertEquals(2, client.submit("1+1").all().join().get(0).getInt());
- assertEquals(2, client.submit("1+1").all().join().get(0).getInt());
- assertEquals(2, client.submit("1+1").all().join().get(0).getInt());
+ assertEquals(2, client.submit("g.inject(2)").all().join().get(0).getInt());
+ assertEquals(2, client.submit("g.inject(2)").all().join().get(0).getInt());
+ assertEquals(2, client.submit("g.inject(2)").all().join().get(0).getInt());
+ assertEquals(2, client.submit("g.inject(2)").all().join().get(0).getInt());
+ assertEquals(2, client.submit("g.inject(2)").all().join().get(0).getInt());
} finally {
cluster.close();
}
@@ -560,6 +471,7 @@
for (Integer size : sizes) {
final Map<String, Object> params = new HashMap<>();
params.put("size", size - 1);
+ params.put("language", "gremlin-groovy");
final ResultSet results = client.submit(script, params);
assertEquals(size.intValue(), results.all().get().size());
@@ -576,7 +488,7 @@
try {
- final ResultSet results = client.submit("java.awt.Color.RED");
+ final ResultSet results = client.submit("java.awt.Color.RED", groovyRequestOptions);
try {
results.all().join();
@@ -584,12 +496,12 @@
} catch (Exception ex) {
final Throwable inner = ExceptionHelper.getRootCause(ex);
assertThat(inner, instanceOf(ResponseException.class));
- assertEquals(ResponseStatusCode.SERVER_ERROR_SERIALIZATION, ((ResponseException) inner).getResponseStatusCode());
+ assertEquals(HttpResponseStatus.INTERNAL_SERVER_ERROR, ((ResponseException) inner).getResponseStatusCode());
}
// should not die completely just because we had a bad serialization error. that kind of stuff happens
// from time to time, especially in the console if you're just exploring.
- assertEquals(2, client.submit("1+1").all().get().get(0).getInt());
+ assertEquals(2, client.submit("g.inject(2)").all().get().get(0).getInt());
} finally {
cluster.close();
}
@@ -601,23 +513,21 @@
final Client client = cluster.connect();
try {
try {
- final ResultSet results = client.submit("1/0");
+ final ResultSet results = client.submit("g.inject(1).math('_/0')");
results.all().join();
fail("Should have thrown exception over division by zero");
} catch (Exception ex) {
final Throwable inner = ExceptionHelper.getRootCause(ex);
assertTrue(inner instanceof ResponseException);
- assertThat(inner.getMessage(), endsWith("Division by zero"));
+ assertThat(inner.getMessage(), containsString("Division by zero"));
final ResponseException rex = (ResponseException) inner;
- assertEquals("java.lang.ArithmeticException", rex.getRemoteExceptionHierarchy().get().get(0));
- assertEquals(1, rex.getRemoteExceptionHierarchy().get().size());
- assertThat(rex.getRemoteStackTrace().get(), containsString("Division by zero"));
+ assertEquals("ServerErrorException", rex.getRemoteException());
}
// should not die completely just because we had a bad serialization error. that kind of stuff happens
// from time to time, especially in the console if you're just exploring.
- assertEquals(2, client.submit("1+1").all().get().get(0).getInt());
+ assertEquals(2, client.submit("g.inject(2)").all().get().get(0).getInt());
} finally {
cluster.close();
}
@@ -629,8 +539,8 @@
try {
final Client client = cluster.connect();
- final ResultSet rsFive = client.submit("Thread.sleep(5000);'five'");
- final ResultSet rsZero = client.submit("'zero'");
+ final ResultSet rsFive = client.submit("Thread.sleep(5000);'five'", groovyRequestOptions);
+ final ResultSet rsZero = client.submit("'zero'", groovyRequestOptions);
final CompletableFuture<List<Result>> futureFive = rsFive.all();
final CompletableFuture<List<Result>> futureZero = rsZero.all();
@@ -650,49 +560,6 @@
}
}
- /**
- * This test validates that the session requests are processed in-order on the server. The order of results
- * returned to the client might be different though since each result is handled by a different executor thread.
- */
- @Test
- public void shouldProcessSessionRequestsInOrder() throws Exception {
- final Cluster cluster = TestClientFactory.open();
- try {
- final Client client = cluster.connect(name.getMethodName());
-
- final ResultSet first = client.submit("Thread.sleep(5000);g.V().fold().coalesce(unfold(), __.addV('person'))");
- final ResultSet second = client.submit("g.V().count()");
-
- final CompletableFuture<List<Result>> futureFirst = first.all();
- final CompletableFuture<List<Result>> futureSecond = second.all();
-
- final CountDownLatch latch = new CountDownLatch(2);
- final List<Object> results = new ArrayList<>();
- final ExecutorService executor = Executors.newSingleThreadExecutor();
-
- futureFirst.thenAcceptAsync(r -> {
- results.add(r.get(0).getVertex().label());
- latch.countDown();
- }, executor);
-
- futureSecond.thenAcceptAsync(r -> {
- results.add(r.get(0).getLong());
- latch.countDown();
- }, executor);
-
- // wait for both results
- latch.await(30000, TimeUnit.MILLISECONDS);
-
- assertThat("Should contain 2 results", results.size() == 2);
- assertThat("The numeric result should be 1", results.contains(1L));
- assertThat("The string result contain label person", results.contains("person"));
-
- executor.shutdown();
- } finally {
- cluster.close();
- }
- }
-
@Test
public void shouldWaitForAllResultsToArrive() throws Exception {
final Cluster cluster = TestClientFactory.open();
@@ -700,7 +567,7 @@
final Client client = cluster.connect();
final AtomicInteger checked = new AtomicInteger(0);
- final ResultSet results = client.submit("[1,2,3,4,5,6,7,8,9]");
+ final ResultSet results = client.submit("g.inject(1,2,3,4,5,6,7,8,9)");
while (!results.allItemsAvailable()) {
assertTrue(results.getAvailableItemCount() < 10);
checked.incrementAndGet();
@@ -715,12 +582,12 @@
}
@Test
- public void shouldStream() throws Exception {
+ public void shouldStream() {
final Cluster cluster = TestClientFactory.open();
final Client client = cluster.connect();
try {
- final ResultSet results = client.submit("[1,2,3,4,5,6,7,8,9]");
+ final ResultSet results = client.submit("g.inject(1,2,3,4,5,6,7,8,9)");
final AtomicInteger counter = new AtomicInteger(0);
results.stream().map(i -> i.get(Integer.class) * 2).forEach(i -> assertEquals(counter.incrementAndGet() * 2, Integer.parseInt(i.toString())));
assertEquals(9, counter.get());
@@ -734,12 +601,12 @@
}
@Test
- public void shouldIterate() throws Exception {
+ public void shouldIterate() {
final Cluster cluster = TestClientFactory.open();
final Client client = cluster.connect();
try {
- final ResultSet results = client.submit("[1,2,3,4,5,6,7,8,9]");
+ final ResultSet results = client.submit("g.inject(1,2,3,4,5,6,7,8,9)");
final Iterator<Result> itty = results.iterator();
final AtomicInteger counter = new AtomicInteger(0);
while (itty.hasNext()) {
@@ -763,7 +630,7 @@
final Client client = cluster.connect();
try {
- final ResultSet results = client.submit("[1,2,3,4,5,6,7,8,9]");
+ final ResultSet results = client.submit("g.inject(1,2,3,4,5,6,7,8,9)");
final CompletableFuture<List<Result>> batch1 = results.some(5);
final CompletableFuture<List<Result>> batch2 = results.some(5);
final CompletableFuture<List<Result>> batchNothingLeft = results.some(5);
@@ -793,7 +660,7 @@
final Client client = cluster.connect();
try {
- final ResultSet results = client.submit("[1,2,3,4,5,6,7,8,9]");
+ final ResultSet results = client.submit("g.inject(1,2,3,4,5,6,7,8,9)");
final Result one = results.one();
final CompletableFuture<List<Result>> batch1 = results.some(4);
final CompletableFuture<List<Result>> batch2 = results.some(5);
@@ -850,7 +717,7 @@
final AtomicReference[] refs = new AtomicReference[requests];
IntStream.range(0, requests).forEach(ix -> {
refs[ix] = new AtomicReference();
- client.submitAsync("Thread.sleep(5000);[1,2,3,4,5,6,7,8,9]").thenAccept(rs ->
+ client.submitAsync("Thread.sleep(5000);[1,2,3,4,5,6,7,8,9]", groovyRequestOptions).thenAccept(rs ->
rs.all().thenAccept(refs[ix]::set).thenRun(latch::countDown));
});
@@ -913,10 +780,11 @@
}
try {
- client1.submit("1+1").all().join();
+ client1.submit("g.inject(2)").all().join();
fail("Expecting an exception because the server is shut down.");
} catch (Exception ex) {
- // ignore the exception
+ assertTrue(ex.getCause() instanceof TimeoutException);
+ assertThat(ex.getMessage(), containsString("waiting for connection"));
}
assertEquals(0, cluster.availableHosts().size());
@@ -931,7 +799,7 @@
final Client client = cluster.connect();
try {
- final ResultSet results = client.submit("TinkerGraph.open().variables()");
+ final ResultSet results = client.submit("TinkerGraph.open().variables()", groovyRequestOptions);
try {
results.all().join();
@@ -939,154 +807,25 @@
} catch (Exception ex) {
final Throwable inner = ExceptionHelper.getRootCause(ex);
assertTrue(inner instanceof ResponseException);
- assertEquals(ResponseStatusCode.SERVER_ERROR_SERIALIZATION, ((ResponseException) inner).getResponseStatusCode());
+ assertEquals(HttpResponseStatus.INTERNAL_SERVER_ERROR, ((ResponseException) inner).getResponseStatusCode());
+ assertEquals("ServerSerializationException", ((ResponseException) inner).getRemoteException());
}
// should not die completely just because we had a bad serialization error. that kind of stuff happens
// from time to time, especially in the console if you're just exploring.
- assertEquals(2, client.submit("1+1").all().get().get(0).getInt());
+ assertEquals(2, client.submit("g.inject(2)").all().get().get(0).getInt());
} finally {
cluster.close();
}
}
@Test
- public void shouldSerializeToStringWhenRequestedGraphBinaryV1() throws Exception {
- final Map<String, Object> m = new HashMap<>();
- m.put("serializeResultToString", true);
- final GraphBinaryMessageSerializerV1 serializer = new GraphBinaryMessageSerializerV1();
- serializer.configure(m, null);
-
- final Cluster cluster = TestClientFactory.build().serializer(serializer).create();
- final Client client = cluster.connect();
-
- final ResultSet resultSet = client.submit("TinkerFactory.createClassic()");
- final List<Result> results = resultSet.all().join();
- assertEquals(1, results.size());
- assertEquals("tinkergraph[vertices:6 edges:6]", results.get(0).getString());
-
- cluster.close();
- }
-
- @Test
- public void shouldWorkWithGraphSONV1Serialization() throws Exception {
- final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHSON_V1_UNTYPED).create();
+ public void shouldWorkWithGraphBinaryV4Serialization() throws Exception {
+ final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHBINARY_V4).create();
final Client client = cluster.connect();
try {
- final List<Result> r = client.submit("TinkerFactory.createModern().traversal().V(1)").all().join();
- assertEquals(1, r.size());
-
- final Map<String, Object> m = r.get(0).get(Map.class);
- assertEquals(4, m.size());
- assertEquals(1, m.get("id"));
- assertEquals("person", m.get("label"));
- assertEquals("vertex", m.get("type"));
-
- final Map<String, Object> properties = (Map<String, Object>) m.get("properties");
- assertEquals(2, properties.size());
-
- final List<Object> names = (List<Object>) properties.get("name");
- assertEquals(1, names.size());
-
- final Map<String, Object> nameProperties = (Map<String, Object>) names.get(0);
- assertEquals(2, nameProperties.size());
- assertEquals(0, nameProperties.get("id"));
- assertEquals("marko", nameProperties.get("value"));
-
- final List<Object> ages = (List<Object>) properties.get("age");
- assertEquals(1, ages.size());
-
- final Map<String, Object> ageProperties = (Map<String, Object>) ages.get(0);
- assertEquals(2, ageProperties.size());
- assertEquals(1, ageProperties.get("id"));
- assertEquals(29, ageProperties.get("value"));
- } finally {
- cluster.close();
- }
- }
-
- @Test
- public void shouldWorkWithGraphSONV2Serialization() throws Exception {
- final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHSON_V2).create();
- final Client client = cluster.connect();
-
- try {
- final List<Result> r = client.submit("TinkerFactory.createModern().traversal().V(1)").all().join();
- assertEquals(1, r.size());
-
- final Vertex v = r.get(0).get(DetachedVertex.class);
- assertEquals(1, v.id());
- assertEquals("person", v.label());
-
- assertEquals(2, IteratorUtils.count(v.properties()));
- assertEquals("marko", v.value("name"));
- assertEquals(29, Integer.parseInt(v.value("age").toString()));
- } finally {
- cluster.close();
- }
- }
-
- @Test
- public void shouldWorkWithGraphSONExtendedV2Serialization() throws Exception {
- final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHSON_V2).create();
- final Client client = cluster.connect();
-
- try {
- final List<Result> r = client.submit("java.time.Instant.EPOCH").all().join();
- assertEquals(1, r.size());
-
- final Instant then = r.get(0).get(Instant.class);
- assertEquals(Instant.EPOCH, then);
- } finally {
- cluster.close();
- }
- }
-
- @Test
- public void shouldWorkWithGraphSONV3Serialization() throws Exception {
- final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHSON_V3).create();
- final Client client = cluster.connect();
-
- try {
- final List<Result> r = client.submit("TinkerFactory.createModern().traversal().V(1)").all().join();
- assertEquals(1, r.size());
-
- final Vertex v = r.get(0).get(DetachedVertex.class);
- assertEquals(1, v.id());
- assertEquals("person", v.label());
-
- assertEquals(2, IteratorUtils.count(v.properties()));
- assertEquals("marko", v.value("name"));
- assertEquals(29, Integer.parseInt(v.value("age").toString()));
- } finally {
- cluster.close();
- }
- }
-
- @Test
- public void shouldWorkWithGraphSONExtendedV3Serialization() throws Exception {
- final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHSON_V3).create();
- final Client client = cluster.connect();
-
- try {
- final List<Result> r = client.submit("java.time.Instant.EPOCH").all().join();
- assertEquals(1, r.size());
-
- final Instant then = r.get(0).get(Instant.class);
- assertEquals(Instant.EPOCH, then);
- } finally {
- cluster.close();
- }
- }
-
- @Test
- public void shouldWorkWithGraphBinaryV1Serialization() throws Exception {
- final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHBINARY_V1).create();
- final Client client = cluster.connect();
-
- try {
- final List<Result> r = client.submit("TinkerFactory.createModern().traversal().V(1)").all().join();
+ final List<Result> r = client.submit("TinkerFactory.createModern().traversal().V(1)", groovyRequestOptions).all().join();
assertEquals(1, r.size());
final Vertex v = r.get(0).get(DetachedVertex.class);
@@ -1099,57 +838,35 @@
@Test
public void shouldFailClientSideWithTooLargeAResponse() {
- final Cluster cluster = TestClientFactory.build().maxContentLength(1).create();
+ final Cluster cluster = TestClientFactory.build().maxResponseContentLength(1).create();
final Client client = cluster.connect();
try {
final String fatty = IntStream.range(0, 100).mapToObj(String::valueOf).collect(Collectors.joining());
- client.submit("'" + fatty + "'").all().get();
+ client.submit(String.format("g.inject('%s')", fatty)).all().get();
fail("Should throw an exception.");
} catch (Exception re) {
final Throwable root = ExceptionHelper.getRootCause(re);
- assertTrue(root.getMessage().equals("Max frame length of 1 has been exceeded."));
+ assertTrue(root.getMessage().contains("Response entity too large"));
} finally {
cluster.close();
}
}
@Test
- public void shouldReturnNiceMessageFromOpSelector() {
- final Cluster cluster = TestClientFactory.build().create();
+ public void shouldSucceedClientSideWithLargeResponseIfMaxResponseContentLengthZero() throws Exception {
+ final Cluster cluster = TestClientFactory.build().maxResponseContentLength(0).create();
final Client client = cluster.connect();
try {
- final Map m = new HashMap<>();
- m.put(null, "a null key will force a throw of OpProcessorException in message validation");
- client.submit("1+1", m).all().get();
- fail("Should throw an exception.");
- } catch (Exception re) {
- final Throwable root = ExceptionHelper.getRootCause(re);
- assertEquals("The [eval] message is using one or more invalid binding keys - they must be of type String and cannot be null", root.getMessage());
+ final String fatty = IntStream.range(0, 10000).mapToObj(String::valueOf).collect(Collectors.joining());
+ assertEquals(fatty, client.submit(String.format("g.inject('%s')", fatty)).all().get().get(0).getString());
} finally {
cluster.close();
}
}
@Test
- public void shouldExecuteScriptInSession() throws Exception {
- final Cluster cluster = TestClientFactory.build().create();
- final Client client = cluster.connect(name.getMethodName());
-
- final ResultSet results1 = client.submit("x = [1,2,3,4,5,6,7,8,9]");
- assertEquals(9, results1.all().get().size());
-
- final ResultSet results2 = client.submit("x[0]+1");
- assertEquals(2, results2.all().get().get(0).getInt());
-
- final ResultSet results3 = client.submit("x[1]+2");
- assertEquals(4, results3.all().get().get(0).getInt());
-
- cluster.close();
- }
-
- @Test
public void shouldNotThrowNoSuchElementException() throws Exception {
final Cluster cluster = TestClientFactory.open();
final Client client = cluster.connect();
@@ -1163,19 +880,6 @@
}
@Test
- public void shouldEvalInGremlinLang() {
- final Cluster cluster = TestClientFactory.open();
- final Client client = cluster.connect();
-
- try {
- final RequestOptions ro = RequestOptions.build().language("gremlin-lang").create();
- assertEquals(111, client.submit("g.inject(111)", ro).one().getInt());
- } finally {
- cluster.close();
- }
- }
-
- @Test
public void shouldEvalInGremlinLangWithParameters() throws Exception {
final Cluster cluster = TestClientFactory.open();
final Client client = cluster.connect();
@@ -1194,127 +898,7 @@
}
}
- @Test
- public void shouldCloseSession() throws Exception {
- final Cluster cluster = TestClientFactory.build().create();
- final Client client = cluster.connect(name.getMethodName());
-
- final ResultSet results1 = client.submit("x = [1,2,3,4,5,6,7,8,9]");
- assertEquals(9, results1.all().get().size());
- final ResultSet results2 = client.submit("x[0]+1");
- assertEquals(2, results2.all().get().get(0).getInt());
-
- client.close();
-
- try {
- client.submit("x[0]+1").all().get();
- fail("Should have thrown an exception because the connection is closed");
- } catch (Exception ex) {
- final Throwable root = ExceptionHelper.getRootCause(ex);
- assertThat(root, instanceOf(IllegalStateException.class));
- } finally {
- cluster.close();
- }
- }
-
- @Test
- public void shouldExecuteScriptInSessionAssumingDefaultedImports() throws Exception {
- final Cluster cluster = TestClientFactory.open();
- final Client client = cluster.connect(name.getMethodName());
-
- final ResultSet results1 = client.submit("TinkerFactory.class.name");
- assertEquals(TinkerFactory.class.getName(), results1.all().get().get(0).getString());
-
- cluster.close();
- }
-
- @Test
- public void shouldExecuteScriptInSessionOnTransactionalGraph() throws Exception {
-
- final Cluster cluster = TestClientFactory.open();
- final Client client = cluster.connect(name.getMethodName());
-
- final Vertex vertexBeforeTx = client.submit("v=g.addV(\"person\").property(\"name\",\"stephen\").next()").all().get().get(0).getVertex();
- assertEquals("person", vertexBeforeTx.label());
-
- final String nameValueFromV = client.submit("g.V().values('name').next()").all().get().get(0).getString();
- assertEquals("stephen", nameValueFromV);
-
- final Vertex vertexFromBinding = client.submit("v").all().get().get(0).getVertex();
- assertEquals("person", vertexFromBinding.label());
-
- final Map<String,Object> vertexAfterTx = client.submit("g.V(v).property(\"color\",\"blue\").iterate(); g.tx().commit(); g.V(v).valueMap().by(unfold())").all().get().get(0).get(Map.class);
- assertEquals("stephen", vertexAfterTx.get("name"));
- assertEquals("blue", vertexAfterTx.get("color"));
-
- cluster.close();
- }
-
- @Test
- public void shouldExecuteScriptInSessionOnTransactionalWithManualTransactionsGraph() throws Exception {
-
- final Cluster cluster = TestClientFactory.open();
- final Client client = cluster.connect(name.getMethodName());
- final Client sessionlessClient = cluster.connect();
- client.submit("graph.tx().onReadWrite(Transaction.READ_WRITE_BEHAVIOR.MANUAL);null").all().get();
- client.submit("graph.tx().open()").all().get();
-
- final Vertex vertexBeforeTx = client.submit("v=g.addV(\"person\").property(\"name\", \"stephen\").next()").all().get().get(0).getVertex();
- assertEquals("person", vertexBeforeTx.label());
-
- final String nameValueFromV = client.submit("g.V().values(\"name\").next()").all().get().get(0).getString();
- assertEquals("stephen", nameValueFromV);
-
- final Vertex vertexFromBinding = client.submit("v").all().get().get(0).getVertex();
- assertEquals("person", vertexFromBinding.label());
-
- client.submit("g.V(v).property(\"color\",\"blue\")").all().get();
- client.submit("g.tx().commit()").all().get();
-
- // Run a sessionless request to change transaction.readWriteConsumer back to AUTO
- // The will make the next in session request fail if consumers aren't ThreadLocal
- sessionlessClient.submit("g.V().next()").all().get();
-
- client.submit("g.tx().open()").all().get();
-
- final Map<String,Object> vertexAfterTx = client.submit("g.V().valueMap().by(unfold())").all().get().get(0).get(Map.class);
- assertEquals("stephen", vertexAfterTx.get("name"));
- assertEquals("blue", vertexAfterTx.get("color"));
-
- client.submit("g.tx().rollback()").all().get();
-
- cluster.close();
- }
-
- @Test
- public void shouldExecuteInSessionAndSessionlessWithoutOpeningTransaction() throws Exception {
-
- final Cluster cluster = TestClientFactory.open();
- try {
- final Client sessionClient = cluster.connect(name.getMethodName());
- final Client sessionlessClient = cluster.connect();
-
- //open transaction in session, then add vertex and commit
- sessionClient.submit("g.tx().open()").all().get();
- final Vertex vertexBeforeTx = sessionClient.submit("v=g.addV(\"person\").property(\"name\",\"stephen\").next()").all().get().get(0).getVertex();
- assertEquals("person", vertexBeforeTx.label());
- sessionClient.submit("g.tx().commit()").all().get();
-
- // check that session transaction is closed
- final boolean isOpen = sessionClient.submit("g.tx().isOpen()").all().get().get(0).getBoolean();
- assertTrue("Transaction should be closed", !isOpen);
-
- //run a sessionless read
- sessionlessClient.submit("g.V()").all().get();
-
- // check that session transaction is still closed
- final boolean isOpenAfterSessionless = sessionClient.submit("g.tx().isOpen()").all().get().get(0).getBoolean();
- assertTrue("Transaction should stil be closed", !isOpenAfterSessionless);
- } finally {
- cluster.close();
- }
- }
-
+ @Ignore("Server doesn't currently support transactions.")
@Test
public void shouldExecuteSessionlessScriptOnTransactionalGraph() throws Exception {
@@ -1322,89 +906,37 @@
final Client client = cluster.connect();
// this line is important because it tests GraphTraversal which has a certain transactional path
- final Vertex vertexRequest1 = client.submit("g.addV().property(\"name\",\"stephen\")").all().get().get(0).getVertex();
+ final Vertex vertexRequest1 = client.submit("g.addV().property(\"name\",\"stephen\")", groovyRequestOptions)
+ .all().get().get(0).getVertex();
- final Vertex vertexRequest2 = client.submit("graph.vertices().next()").all().get().get(0).getVertex();
+ final Vertex vertexRequest2 = client.submit("graph.vertices().next()", groovyRequestOptions)
+ .all().get().get(0).getVertex();
assertEquals(vertexRequest1.id(), vertexRequest2.id());
// this line is important because it tests the other transactional path
- client.submit("graph.addVertex(\"name\",\"marko\")").all().get().get(0).getVertex();
+ client.submit("graph.addVertex(\"name\",\"marko\")", groovyRequestOptions).all().get().get(0).getVertex();
- assertEquals(2, client.submit("g.V().count()").all().get().get(0).getLong());
+ assertEquals(2, client.submit("g.V().count()", groovyRequestOptions).all().get().get(0).getLong());
cluster.close();
}
@Test
- public void shouldExecuteScriptInSessionWithBindingsSavedOnServerBetweenRequests() throws Exception {
- final Cluster cluster = TestClientFactory.open();
- final Client client = cluster.connect(name.getMethodName());
-
- final Map<String, Object> bindings1 = new HashMap<>();
- bindings1.put("a", 100);
- bindings1.put("b", 200);
- final ResultSet results1 = client.submit("x = a + b", bindings1);
- assertEquals(300, results1.one().getInt());
-
- final Map<String, Object> bindings2 = new HashMap<>();
- bindings2.put("b", 100);
- final ResultSet results2 = client.submit("x + b + a", bindings2);
- assertEquals(500, results2.one().getInt());
-
- final Map<String, Object> bindings3 = new HashMap<>();
- bindings3.put("x", 100);
- final ResultSet results3 = client.submit("x + b + a + 1", bindings3);
- assertEquals(301, results3.one().getInt());
-
- final Map<String, Object> bindings4 = new HashMap<>();
- final ResultSet results4 = client.submit("x + b + a + 1", bindings4);
- assertEquals(301, results4.one().getInt());
-
- cluster.close();
- }
-
- @Test
- public void shouldExecuteScriptsInMultipleSession() throws Exception {
- final Cluster cluster = TestClientFactory.open();
- try {
- final Client client1 = cluster.connect(name.getMethodName() + "1");
- final Client client2 = cluster.connect(name.getMethodName() + "2");
- final Client client3 = cluster.connect(name.getMethodName() + "3");
-
- final ResultSet results11 = client1.submit("x = 1");
- final ResultSet results21 = client2.submit("x = 2");
- final ResultSet results31 = client3.submit("x = 3");
- assertEquals(1, results11.all().get().get(0).getInt());
- assertEquals(2, results21.all().get().get(0).getInt());
- assertEquals(3, results31.all().get().get(0).getInt());
-
- final ResultSet results12 = client1.submit("x + 100");
- final ResultSet results22 = client2.submit("x * 2");
- final ResultSet results32 = client3.submit("x * 10");
- assertEquals(101, results12.all().get().get(0).getInt());
- assertEquals(4, results22.all().get().get(0).getInt());
- assertEquals(30, results32.all().get().get(0).getInt());
- } finally {
- cluster.close();
- }
- }
-
- @Test
public void shouldNotHaveKnowledgeOfBindingsBetweenRequestsWhenSessionless() throws Exception {
final Cluster cluster = TestClientFactory.open();
final Client client1 = cluster.connect();
final Client client2 = cluster.connect();
final Client client3 = cluster.connect();
- final ResultSet results11 = client1.submit("x = 1");
- final ResultSet results21 = client2.submit("x = 2");
- final ResultSet results31 = client3.submit("x = 3");
+ final ResultSet results11 = client1.submit("x = 1", groovyRequestOptions);
+ final ResultSet results21 = client2.submit("x = 2", groovyRequestOptions);
+ final ResultSet results31 = client3.submit("x = 3", groovyRequestOptions);
assertEquals(1, results11.all().get().get(0).getInt());
assertEquals(2, results21.all().get().get(0).getInt());
assertEquals(3, results31.all().get().get(0).getInt());
try {
- client1.submit("x").all().get();
+ client1.submit("x", groovyRequestOptions).all().get();
fail("The variable 'x' should not be present on the new request.");
} catch (Exception ex) {
final Throwable root = ExceptionHelper.getRootCause(ex);
@@ -1413,7 +945,7 @@
}
try {
- client2.submit("x").all().get();
+ client2.submit("x", groovyRequestOptions).all().get();
fail("The variable 'x' should not be present on the new request.");
} catch (Exception ex) {
final Throwable root = ExceptionHelper.getRootCause(ex);
@@ -1422,7 +954,7 @@
}
try {
- client3.submit("x").all().get();
+ client3.submit("x", groovyRequestOptions).all().get();
fail("The variable 'x' should not be present on the new request.");
} catch (Exception ex) {
final Throwable root = ExceptionHelper.getRootCause(ex);
@@ -1436,10 +968,7 @@
@Test
public void shouldBeThreadSafeToUseOneClient() throws Exception {
final Cluster cluster = TestClientFactory.build().workerPoolSize(2)
- .maxInProcessPerConnection(64)
- .minInProcessPerConnection(32)
- .maxConnectionPoolSize(16)
- .minConnectionPoolSize(8).create();
+ .maxConnectionPoolSize(16).create();
final Client client = cluster.connect();
final Map<Integer, Integer> results = new ConcurrentHashMap<>();
@@ -1448,7 +977,7 @@
final int otherNum = ix;
final Thread t = new Thread(()->{
try {
- results.put(otherNum, client.submit("1000+" + otherNum).all().get().get(0).getInt());
+ results.put(otherNum, client.submit(String.format("g.inject(%d)", 1000+otherNum)).all().get().get(0).getInt());
} catch (Exception ex) {
ex.printStackTrace();
}
@@ -1468,24 +997,26 @@
cluster.close();
}
+ @Ignore("used tx")
@Test
public void shouldRequireAliasedGraphVariablesInStrictTransactionMode() throws Exception {
final Cluster cluster = TestClientFactory.open();
final Client client = cluster.connect();
try {
- client.submit("1+1").all().get();
+ client.submit("g.inject(2)").all().get();
fail("Should have tossed an exception because strict mode is on and no aliasing was performed");
} catch (Exception ex) {
final Throwable root = ExceptionHelper.getRootCause(ex);
assertThat(root, instanceOf(ResponseException.class));
final ResponseException re = (ResponseException) root;
- assertEquals(ResponseStatusCode.REQUEST_ERROR_INVALID_REQUEST_ARGUMENTS, re.getResponseStatusCode());
+ assertEquals(HttpResponseStatus.BAD_REQUEST, re.getResponseStatusCode());
} finally {
cluster.close();
}
}
+ @Ignore("strict transactions not currently supported")
@Test
public void shouldAliasGraphVariablesInStrictTransactionMode() throws Exception {
@@ -1493,16 +1024,18 @@
final Client client = cluster.connect();
try {
- client.submit("g.addVertex('name','stephen');").all().get().get(0).getVertex();
+ client.submit("g.addVertex('name','stephen');",
+ groovyRequestOptions).all().get().get(0).getVertex();
fail("Should have tossed an exception because \"g\" does not have the addVertex method under default config");
} catch (Exception ex) {
final Throwable root = ExceptionHelper.getRootCause(ex);
assertThat(root, instanceOf(ResponseException.class));
final ResponseException re = (ResponseException) root;
- assertEquals(ResponseStatusCode.REQUEST_ERROR_INVALID_REQUEST_ARGUMENTS, re.getResponseStatusCode());
+ assertEquals(HttpResponseStatus.BAD_REQUEST, re.getResponseStatusCode());
final Client rebound = cluster.connect().alias("graph");
- final Vertex v = rebound.submit("g.addVertex(T.label,'person')").all().get().get(0).getVertex();
+ final Vertex v = rebound.submit("g.addVertex(T.label,'person')", groovyRequestOptions)
+ .all().get().get(0).getVertex();
assertEquals("person", v.label());
} finally {
cluster.close();
@@ -1515,16 +1048,18 @@
final Client client = cluster.connect();
try {
- client.submit("g.addVertex(label,'person','name','stephen');").all().get().get(0).getVertex();
+ client.submit("g.addVertex(label,'person','name','stephen');",
+ groovyRequestOptions).all().get().get(0).getVertex();
fail("Should have tossed an exception because \"g\" does not have the addVertex method under default config");
} catch (Exception ex) {
final Throwable root = ExceptionHelper.getRootCause(ex);
assertThat(root, instanceOf(ResponseException.class));
final ResponseException re = (ResponseException) root;
- assertEquals(ResponseStatusCode.SERVER_ERROR_EVALUATION, re.getResponseStatusCode());
+ assertEquals(HttpResponseStatus.INTERNAL_SERVER_ERROR, re.getResponseStatusCode());
final Client rebound = cluster.connect().alias("graph");
- final Vertex v = rebound.submit("g.addVertex(label,'person','name','jason')").all().get().get(0).getVertex();
+ final Vertex v = rebound.submit("g.addVertex(label,'person','name','jason')", groovyRequestOptions)
+ .all().get().get(0).getVertex();
assertEquals("person", v.label());
} finally {
cluster.close();
@@ -1533,7 +1068,7 @@
@Test
public void shouldAliasTraversalSourceVariables() throws Exception {
- final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHBINARY_V1).create();
+ final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHBINARY_V4).create();
final Client client = cluster.connect();
try {
try {
@@ -1543,7 +1078,7 @@
final Throwable root = ExceptionHelper.getRootCause(ex);
assertThat(root, instanceOf(ResponseException.class));
final ResponseException re = (ResponseException) root;
- assertEquals(ResponseStatusCode.SERVER_ERROR_EVALUATION, re.getResponseStatusCode());
+ assertEquals(HttpResponseStatus.INTERNAL_SERVER_ERROR, re.getResponseStatusCode());
}
final Client clientAliased = client.alias("g1");
@@ -1554,154 +1089,7 @@
}
}
- @Test
- public void shouldAliasGraphVariablesInSession() throws Exception {
- final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHBINARY_V1).create();
- final Client client = cluster.connect(name.getMethodName());
-
- try {
- client.submit("g.addVertex('name','stephen');").all().get().get(0).getVertex();
- fail("Should have tossed an exception because \"g\" does not have the addVertex method under default config");
- } catch (Exception ex) {
- final Throwable root = ExceptionHelper.getRootCause(ex);
- assertThat(root, instanceOf(ResponseException.class));
- final ResponseException re = (ResponseException) root;
- assertEquals(ResponseStatusCode.SERVER_ERROR_EVALUATION, re.getResponseStatusCode());
- client.close();
- }
-
- try {
- final Client aliased = cluster.connect(name.getMethodName()).alias("graph");
- assertEquals("jason", aliased.submit("n='jason'").all().get().get(0).getString());
- final String name = aliased.submit("g.addVertex('name',n).values('name')").all().get().get(0).getString();
- assertEquals("jason", name);
- } finally {
- cluster.close();
- }
- }
-
- @Test
- public void shouldAliasTraversalSourceVariablesInSession() throws Exception {
- final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHBINARY_V1).create();
- final Client client = cluster.connect(name.getMethodName());
-
- try {
- client.submit("g.addV().property('name','stephen')").all().get().get(0).getVertex();
- fail("Should have tossed an exception because \"g\" is readonly in this context");
- } catch (Exception ex) {
- final Throwable root = ExceptionHelper.getRootCause(ex);
- assertThat(root, instanceOf(ResponseException.class));
- final ResponseException re = (ResponseException) root;
- assertEquals(ResponseStatusCode.SERVER_ERROR_EVALUATION, re.getResponseStatusCode());
- }
-
- final Client clientAliased = client.alias("g1");
- assertEquals("jason", clientAliased.submit("n='jason'").all().get().get(0).getString());
- final String name = clientAliased.submit("g.addV().property('name',n).values('name')").all().get().get(0).getString();
- assertEquals("jason", name);
-
- cluster.close();
- }
-
- @Test
- public void shouldManageTransactionsInSession() throws Exception {
-
- final Cluster cluster = TestClientFactory.open();
- final Client client = cluster.connect();
- final Client sessionWithManagedTx = cluster.connect(name.getMethodName() + "-managed", true);
- final Client sessionWithoutManagedTx = cluster.connect(name.getMethodName() + "-not-managed");
-
- // this should auto-commit
- sessionWithManagedTx.submit("v = g.addV().property('name','stephen').next()").all().get().get(0).getVertex();
-
- // the other clients should see that change because of auto-commit
- assertThat(client.submit("g.V().has('name','stephen').hasNext()").all().get().get(0).getBoolean(), is(true));
- assertThat(sessionWithoutManagedTx.submit("g.V().has('name','stephen').hasNext()").all().get().get(0).getBoolean(), is(true));
-
- // this should NOT auto-commit
- final Vertex vDaniel = sessionWithoutManagedTx.submit("v = g.addV().property('name','daniel').next()").all().get().get(0).getVertex();
-
- // the other clients should NOT see that change because of auto-commit
- assertThat(client.submit("g.V().has('name','daniel').hasNext()").all().get().get(0).getBoolean(), is(false));
- assertThat(sessionWithManagedTx.submit("g.V().has('name','daniel').hasNext()").all().get().get(0).getBoolean(), is(false));
-
- // but "v" should still be there
- final Vertex vDanielAgain = sessionWithoutManagedTx.submit("v").all().get().get(0).getVertex();
- assertEquals(vDaniel.id(), vDanielAgain.id());
-
- // now commit manually
- sessionWithoutManagedTx.submit("g.tx().commit()").all().get();
-
- // should be there for all now
- assertThat(client.submit("g.V().has('name','daniel').hasNext()").all().get().get(0).getBoolean(), is(true));
- assertThat(sessionWithManagedTx.submit("g.V().has('name','daniel').hasNext()").all().get().get(0).getBoolean(), is(true));
- assertThat(sessionWithoutManagedTx.submit("g.V().has('name','daniel').hasNext()").all().get().get(0).getBoolean(), is(true));
-
- cluster.close();
- }
-
- @Test
- public void shouldProcessSessionRequestsInOrderAfterTimeout() throws Exception {
- final Cluster cluster = TestClientFactory.open();
-
- try {
- // this configures the client to behave like OpProcessor for UnifiedChannelizer
- final Client.SessionSettings settings = Client.SessionSettings.build().
- sessionId(name.getMethodName()).maintainStateAfterException(true).create();
- final Client client = cluster.connect(Client.Settings.build().useSession(settings).create());
-
- for (int index = 0; index < 50; index++) {
- final CompletableFuture<ResultSet> first = client.submitAsync(
- "Object mon1 = 'mon1';\n" +
- "synchronized (mon1) {\n" +
- " mon1.wait();\n" +
- "} ");
-
- final CompletableFuture<ResultSet> second = client.submitAsync(
- "Object mon2 = 'mon2';\n" +
- "synchronized (mon2) {\n" +
- " mon2.wait();\n" +
- "}");
-
- final CompletableFuture<ResultSet> third = client.submitAsync(
- "Object mon3 = 'mon3';\n" +
- "synchronized (mon3) {\n" +
- " mon3.wait();\n" +
- "}");
-
- final CompletableFuture<ResultSet> fourth = client.submitAsync(
- "Object mon4 = 'mon4';\n" +
- "synchronized (mon4) {\n" +
- " mon4.wait();\n" +
- "}");
-
- final CompletableFuture<List<Result>> futureFirst = first.get().all();
- final CompletableFuture<List<Result>> futureSecond = second.get().all();
- final CompletableFuture<List<Result>> futureThird = third.get().all();
- final CompletableFuture<List<Result>> futureFourth = fourth.get().all();
-
- assertFutureTimeout(futureFirst);
- assertFutureTimeout(futureSecond);
- assertFutureTimeout(futureThird);
- assertFutureTimeout(futureFourth);
- }
- } finally {
- cluster.close();
- }
- }
-
- private void assertFutureTimeout(final CompletableFuture<List<Result>> f) {
- try {
- f.get();
- fail("Should have timed out");
- } catch (Exception ex) {
- final Throwable root = ExceptionHelper.getRootCause(ex);
- assertThat(root, instanceOf(ResponseException.class));
- assertEquals(ResponseStatusCode.SERVER_ERROR_TIMEOUT, ((ResponseException) root).getResponseStatusCode());
- assertThat(root.getMessage(), allOf(startsWith("Evaluation exceeded"), containsString("250 ms")));
- }
- }
-
+ @Ignore("used sessions")
@Test
public void shouldCloseAllClientsOnCloseOfCluster() throws Exception {
final Cluster cluster = TestClientFactory.open();
@@ -1711,10 +1099,10 @@
final Client sessionlessThree = cluster.connect();
final Client sessionlessFour = cluster.connect();
- assertEquals(2, sessionlessOne.submit("1+1").all().get().get(0).getInt());
- assertEquals(2, session.submit("1+1").all().get().get(0).getInt());
- assertEquals(2, sessionlessTwo.submit("1+1").all().get().get(0).getInt());
- assertEquals(2, sessionlessThree.submit("1+1").all().get().get(0).getInt());
+ assertEquals(2, sessionlessOne.submit("g.inject(2)").all().get().get(0).getInt());
+ assertEquals(2, session.submit("g.inject(2)").all().get().get(0).getInt());
+ assertEquals(2, sessionlessTwo.submit("g.inject(2)").all().get().get(0).getInt());
+ assertEquals(2, sessionlessThree.submit("g.inject(2)").all().get().get(0).getInt());
// dont' send anything on the 4th client
// close one of these Clients before the Cluster
@@ -1722,7 +1110,7 @@
cluster.close();
try {
- sessionlessOne.submit("1+1").all().get();
+ sessionlessOne.submit("g.inject(2)").all().get();
fail("Should have tossed an exception because cluster was closed");
} catch (Exception ex) {
final Throwable root = ExceptionHelper.getRootCause(ex);
@@ -1731,7 +1119,7 @@
}
try {
- session.submit("1+1").all().get();
+ session.submit("g.inject(2)").all().get();
fail("Should have tossed an exception because cluster was closed");
} catch (Exception ex) {
final Throwable root = ExceptionHelper.getRootCause(ex);
@@ -1740,7 +1128,7 @@
}
try {
- sessionlessTwo.submit("1+1").all().get();
+ sessionlessTwo.submit("g.inject(2)").all().get();
fail("Should have tossed an exception because cluster was closed");
} catch (Exception ex) {
final Throwable root = ExceptionHelper.getRootCause(ex);
@@ -1749,7 +1137,7 @@
}
try {
- sessionlessThree.submit("1+1").all().get();
+ sessionlessThree.submit("g.inject(2)").all().get();
fail("Should have tossed an exception because cluster was closed");
} catch (Exception ex) {
final Throwable root = ExceptionHelper.getRootCause(ex);
@@ -1758,7 +1146,7 @@
}
try {
- sessionlessFour.submit("1+1").all().get();
+ sessionlessFour.submit("g.inject(2)").all().get();
fail("Should have tossed an exception because cluster was closed");
} catch (Exception ex) {
final Throwable root = ExceptionHelper.getRootCause(ex);
@@ -1775,118 +1163,34 @@
}
@Test
- public void shouldSendUserAgent() throws Exception {
- final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHSON_V3).create();
- final Client client = Mockito.spy(cluster.connect().alias("g"));
- client.submit("", RequestOptions.build().userAgent("test").create()).all().get();
- cluster.close();
-
- final ArgumentCaptor<RequestMessage> requestMessageCaptor = ArgumentCaptor.forClass(RequestMessage.class);
- verify(client).submitAsync(requestMessageCaptor.capture());
- final RequestMessage requestMessage = requestMessageCaptor.getValue();
- assertEquals("test", requestMessage.getArgs().get(Tokens.ARGS_USER_AGENT));
- }
-
- @Test
- public void shouldSendUserAgentBytecode() {
- final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHSON_V3).create();
- final Client client = Mockito.spy(cluster.connect().alias("g"));
- Mockito.when(client.alias("g")).thenReturn(client);
- final GraphTraversalSource g = traversal().withRemote(DriverRemoteConnection.using(client));
- g.with(Tokens.ARGS_USER_AGENT, "test").V().iterate();
- cluster.close();
-
- final ArgumentCaptor<RequestOptions> requestOptionsCaptor = ArgumentCaptor.forClass(RequestOptions.class);
- verify(client).submitAsync(Mockito.any(Bytecode.class), requestOptionsCaptor.capture());
- final RequestOptions requestOptions = requestOptionsCaptor.getValue();
- assertEquals("test", requestOptions.getUserAgent().get());
-
- final ArgumentCaptor<RequestMessage> requestMessageCaptor = ArgumentCaptor.forClass(RequestMessage.class);
- verify(client).submitAsync(requestMessageCaptor.capture());
- final RequestMessage requestMessage = requestMessageCaptor.getValue();
- assertEquals("test", requestMessage.getArgs().getOrDefault(Tokens.ARGS_USER_AGENT, null));
- }
-
- @Test
- public void shouldSendRequestIdBytecode() {
- final UUID overrideRequestId = UUID.randomUUID();
- final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHSON_V3).create();
- final Client client = Mockito.spy(cluster.connect().alias("g"));
- Mockito.when(client.alias("g")).thenReturn(client);
- final GraphTraversalSource g = traversal().withRemote(DriverRemoteConnection.using(client));
- g.with(Tokens.REQUEST_ID, overrideRequestId).V().iterate();
- cluster.close();
-
- final ArgumentCaptor<RequestOptions> requestOptionsCaptor = ArgumentCaptor.forClass(RequestOptions.class);
- verify(client).submitAsync(Mockito.any(Bytecode.class), requestOptionsCaptor.capture());
- final RequestOptions requestOptions = requestOptionsCaptor.getValue();
- assertTrue(requestOptions.getOverrideRequestId().isPresent());
- assertEquals(overrideRequestId, requestOptions.getOverrideRequestId().get());
-
- final ArgumentCaptor<RequestMessage> requestMessageCaptor = ArgumentCaptor.forClass(RequestMessage.class);
- verify(client).submitAsync(requestMessageCaptor.capture());
- final RequestMessage requestMessage = requestMessageCaptor.getValue();
- assertEquals(overrideRequestId, requestMessage.getRequestId());
- }
-
- @Test
public void shouldClusterReadFileFromResources() throws Exception {
final Cluster cluster = Cluster.open(TestClientFactory.RESOURCE_PATH);
assertNotNull(cluster);
cluster.close();
}
- @Test
- public void shouldNotHangWhenSameRequestIdIsUsed() throws Exception {
- final Cluster cluster = TestClientFactory.build().maxConnectionPoolSize(1).minConnectionPoolSize(1).create();
- final Client client = cluster.connect();
- final UUID requestId = UUID.randomUUID();
-
- final Future<ResultSet> result1 = client.submitAsync("Thread.sleep(2000);100",
- RequestOptions.build().overrideRequestId(requestId).create());
-
- // wait for some business to happen on the server
- Thread.sleep(100);
- try {
- // re-use the id and fail
- client.submit("1+1+97", RequestOptions.build().overrideRequestId(requestId).create());
- fail("Request should not have been sent due to duplicate id");
- } catch(Exception ex) {
- // should get a rejection here
- final Throwable root = ExceptionHelper.getRootCause(ex);
- assertThat(root.getMessage(), startsWith("There is already a request pending with an id of:"));
- assertEquals(100, result1.get().one().getInt());
- } finally {
- cluster.close();
- }
- }
-
/**
* Tests to make sure that the stack trace contains an informative cause when the request times out because the
* client was unable to get a connection and the pool is already maxed out.
*/
@Test
public void shouldReturnClearExceptionCauseWhenClientIsTooBusyAndConnectionPoolIsFull() throws InterruptedException {
+ int maxSize = 1;
final Cluster cluster = TestClientFactory.build()
- .minConnectionPoolSize(1)
.maxConnectionPoolSize(1)
.connectionSetupTimeoutMillis(100)
.maxWaitForConnection(150)
- .minInProcessPerConnection(0)
- .maxInProcessPerConnection(1)
- .minSimultaneousUsagePerConnection(0)
- .maxSimultaneousUsagePerConnection(1)
.create();
final Client.ClusteredClient client = cluster.connect();
for (int i = 0; i < 3; i++) {
try {
- client.submitAsync("Thread.sleep(5000);");
+ client.submitAsync("Thread.sleep(5000);", groovyRequestOptions);
} catch (Exception e) {
final Throwable root = ExceptionHelper.getRootCause(e);
assertTrue(root instanceof TimeoutException);
- assertTrue(root.getMessage().contains(Client.TOO_MANY_IN_FLIGHT_REQUESTS));
+ assertTrue(root.getMessage().contains(String.format(Client.TOO_MANY_IN_FLIGHT_REQUESTS, maxSize, maxSize)));
}
}
@@ -1895,14 +1199,14 @@
/**
* Client created on an initially dead host should fail initially, and recover after the dead host has restarted
- * @param testClusterClient - boolean flag set to test clustered client if true and sessioned client if false.
*/
- private void testShouldFailOnInitiallyDeadHost(final boolean testClusterClient) throws Exception {
+ @Test
+ public void shouldFailOnInitiallyDeadHostForClusterClient() throws Exception {
logger.info("Stopping server.");
this.stopServer();
final Cluster cluster = TestClientFactory.build().create();
- final Client client = testClusterClient? cluster.connect() : cluster.connect("sessionClient");
+ final Client client = cluster.connect();
try {
// try to re-issue a request now that the server is down
@@ -1915,14 +1219,11 @@
assertThat(re, instanceOf(NoHostAvailableException.class));
try {
- client.submit("1+1").all().get(3000, TimeUnit.MILLISECONDS);
+ client.submit("g.inject(2)").all().get(3000, TimeUnit.MILLISECONDS);
fail("Should throw exception on the retry");
} catch (RuntimeException re2) {
- if (client instanceof Client.SessionedClient) {
- assertThat(re2.getCause().getCause(), instanceOf(ConnectionException.class));
- } else {
- assertThat(re2.getCause().getCause().getCause(), instanceOf(ConnectException.class));
- }
+ assertThat(re2.getCause().getCause().getCause(), instanceOf(ConnectException.class));
+
}
//
@@ -1940,7 +1241,7 @@
try {
logger.info(String.format("Connecting driver to server - attempt # %s. ", 1 + ix));
- final List<Result> results = client.submit("1+1").all().get(3000, TimeUnit.MILLISECONDS);
+ final List<Result> results = client.submit("g.inject(2)").all().get(3000, TimeUnit.MILLISECONDS);
assertEquals(1, results.size());
assertEquals(2, results.get(0).getInt());
logger.info("Connection successful.");
@@ -1956,18 +1257,8 @@
}
@Test
- public void shouldFailOnInitiallyDeadHostForClusterClient() throws Exception {
- testShouldFailOnInitiallyDeadHost(true);
- }
-
- @Test
- public void shouldFailOnInitiallyDeadHostForSessionClient() throws Exception {
- testShouldFailOnInitiallyDeadHost(false);
- }
-
- @Test
public void shouldReturnUuid() throws Exception {
- final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHSON_V3).create();
+ final Cluster cluster = TestClientFactory.build().create();
try {
final Client client = cluster.connect().alias("g");
List<Result> returnedList = client.submit("g.inject(UUID())", RequestOptions.build().language("gremlin-lang").create()).all().get();
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinResultSetIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinResultSetIntegrateTest.java
index 0030f91..32ccead 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinResultSetIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinResultSetIntegrateTest.java
@@ -20,11 +20,10 @@
import org.apache.tinkerpop.gremlin.driver.Client;
import org.apache.tinkerpop.gremlin.driver.Cluster;
+import org.apache.tinkerpop.gremlin.driver.RequestOptions;
import org.apache.tinkerpop.gremlin.driver.Result;
import org.apache.tinkerpop.gremlin.driver.ResultSet;
import org.apache.tinkerpop.gremlin.process.traversal.Path;
-import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
import org.apache.tinkerpop.gremlin.structure.Edge;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.Property;
@@ -39,10 +38,8 @@
import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceProperty;
import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
import org.apache.tinkerpop.gremlin.util.MessageSerializer;
-import org.apache.tinkerpop.gremlin.util.Tokens;
-import org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1;
+import org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV4;
import org.apache.tinkerpop.gremlin.util.ser.Serializers;
-import org.hamcrest.CoreMatchers;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -53,9 +50,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.concurrent.TimeUnit;
-import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.IsInstanceOf.instanceOf;
import static org.junit.Assert.assertEquals;
@@ -72,10 +67,10 @@
@Parameterized.Parameters(name = "{0}")
public static Iterable<Object[]> data() {
- final MessageSerializer<GraphBinaryMapper> graphBinaryMessageSerializerV1 = new GraphBinaryMessageSerializerV1();
+ final MessageSerializer<GraphBinaryMapper> graphBinaryMessageSerializerV4 = new GraphBinaryMessageSerializerV4();
return Arrays.asList(new Object[][]{
- {Serializers.GRAPHBINARY_V1, graphBinaryMessageSerializerV1}
+ {Serializers.GRAPHBINARY_V4, graphBinaryMessageSerializerV4}
});
}
@@ -97,87 +92,68 @@
}
@Test
- public void shouldReturnResponseAttributesViaNoContent() throws Exception {
- final ResultSet results = client.submit("[]");
- final Map<String,Object> attr = results.statusAttributes().get(20000, TimeUnit.MILLISECONDS);
- assertThat(attr.containsKey(Tokens.ARGS_HOST), is(true));
- }
-
- @Test
- public void shouldReturnResponseAttributesViaSuccess() throws Exception {
- final ResultSet results = client.submit("gmodern.V()");
- final Map<String,Object> attr = results.statusAttributes().get(20000, TimeUnit.MILLISECONDS);
- assertThat(attr.containsKey(Tokens.ARGS_HOST), is(true));
- }
-
- @Test
- public void shouldHandleVertexResultFromTraversalBulked() throws Exception {
- final Graph graph = TinkerGraph.open();
- final GraphTraversalSource g = graph.traversal();
- final Client aliased = client.alias("gmodern");
- final ResultSet resultSetUnrolled = aliased.submit(g.V().both().barrier().both().barrier());
- final List<Result> results = resultSetUnrolled.all().get();
-
- assertThat(results.get(0).getObject(), CoreMatchers.instanceOf(Traverser.class));
- assertEquals(6, results.size());
- }
-
- @Test
public void shouldHandleNullResult() throws Exception {
- final ResultSet results = client.submit("gmodern.V().drop().iterate();null");
+ final ResultSet results = client.submit("g.inject(null)");
assertNull(results.all().get().get(0).getObject());
}
@Test
public void shouldHandleVoidResult() throws Exception {
- final ResultSet results = client.submit("gmodern.V().drop().iterate()");
+ final ResultSet results = client.submit("g.V().drop().iterate()");
assertEquals(0, results.all().get().size());
}
@Test
public void shouldHandleEmptyResult() throws Exception {
- final ResultSet results = client.submit("gmodern.V(100,1000,1000)");
+ RequestOptions options = RequestOptions.build().addG("gmodern").create();
+ final ResultSet results = client.submit("g.V(100,1000,1000)", options);
assertEquals(0, results.all().get().size());
}
@Test
public void shouldHandleVertexResult() throws Exception {
- final ResultSet results = client.submit("gmodern.V(1).next()");
+ RequestOptions options = RequestOptions.build().addG("gmodern").create();
+ final ResultSet results = client.submit("g.V(1).next()", options);
final Vertex v = results.all().get().get(0).getVertex();
assertThat(v, instanceOf(DetachedVertex.class));
}
@Test
public void shouldHandleVertexPropertyResult() throws Exception {
- final ResultSet results = client.submit("gmodern.V().properties('name').next()");
+ RequestOptions options = RequestOptions.build().addG("gmodern").create();
+ final ResultSet results = client.submit("g.V().properties('name').next()", options);
final VertexProperty<String> v = results.all().get().get(0).getVertexProperty();
assertThat(v, instanceOf(DetachedVertexProperty.class));
}
@Test
public void shouldHandleEdgeResult() throws Exception {
- final ResultSet results = client.submit("gmodern.E().next()");
+ RequestOptions options = RequestOptions.build().addG("gmodern").create();
+ final ResultSet results = client.submit("g.E().next()", options);
final Edge e = results.all().get().get(0).getEdge();
assertThat(e, instanceOf(DetachedEdge.class));
}
@Test
public void shouldHandlePropertyResult() throws Exception {
- final ResultSet results = client.submit("gmodern.E().properties('weight').next()");
+ RequestOptions options = RequestOptions.build().addG("gmodern").create();
+ final ResultSet results = client.submit("g.E().properties('weight').next()", options);
final Property<Double> p = results.all().get().get(0).getProperty();
assertThat(p, instanceOf(ReferenceProperty.class));
}
@Test
public void shouldHandlePathResult() throws Exception {
- final ResultSet results = client.submit("gmodern.V().out().path()");
+ RequestOptions options = RequestOptions.build().addG("gmodern").create();
+ final ResultSet results = client.submit("g.V().out().path()", options);
final Path p = results.all().get().get(0).getPath();
assertThat(p, instanceOf(Path.class));
}
@Test
public void shouldHandleTinkerGraphResult() throws Exception {
- final ResultSet results = client.submit("modern");
+ RequestOptions options = RequestOptions.build().language("gremlin-groovy").create();
+ final ResultSet results = client.submit("modern", options);
final Graph graph = results.all().get().get(0).get(TinkerGraph.class);
// test is "lossy for id" because TinkerGraph is configured by default to use the ANY id manager
@@ -188,7 +164,8 @@
@Test
public void shouldHandleMapIteratedResult() throws Exception {
- final ResultSet results = client.submit("gmodern.V().groupCount().by(bothE().count())");
+ RequestOptions options = RequestOptions.build().addG("gmodern").create();
+ final ResultSet results = client.submit("g.V().groupCount().by(bothE().count())", options);
final List<Result> resultList = results.all().get();
final Map m = resultList.get(0).get(HashMap.class);
assertEquals(2, m.size());
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuditLogIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuditLogIntegrateTest.java
index 1bc22d4..758878b 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuditLogIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuditLogIntegrateTest.java
@@ -19,8 +19,10 @@
package org.apache.tinkerpop.gremlin.server;
import nl.altindag.log.LogCaptor;
+import org.apache.http.Consts;
import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.util.EntityUtils;
@@ -34,8 +36,9 @@
import org.apache.tinkerpop.gremlin.server.auth.Krb5Authenticator;
import org.apache.tinkerpop.gremlin.server.auth.SimpleAuthenticator;
import org.apache.tinkerpop.gremlin.server.channel.HttpChannelizer;
-import org.apache.tinkerpop.gremlin.server.handler.SaslAndHttpBasicAuthenticationHandler;
+import org.apache.tinkerpop.gremlin.server.handler.HttpBasicAuthenticationHandler;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens;
+import org.apache.tinkerpop.gremlin.util.ser.SerTokens;
import org.apache.tinkerpop.shaded.jackson.databind.JsonNode;
import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
import org.junit.AfterClass;
@@ -48,8 +51,8 @@
import java.util.HashMap;
import java.util.Map;
+import static org.apache.tinkerpop.gremlin.driver.auth.Auth.basic;
import static org.apache.tinkerpop.gremlin.server.GremlinServer.AUDIT_LOGGER_NAME;
-import static org.apache.tinkerpop.gremlin.server.GremlinServerAuthKrb5IntegrateTest.TESTCONSOLE;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -147,7 +150,7 @@
settings.host = "localhost";
settings.channelizer = HttpChannelizer.class.getName();
authSettings.authenticator = SimpleAuthenticator.class.getName();
- authSettings.authenticationHandler = SaslAndHttpBasicAuthenticationHandler.class.getName();
+ authSettings.authenticationHandler = HttpBasicAuthenticationHandler.class.getName();
authConfig.put(SimpleAuthenticator.CONFIG_CREDENTIALS_DB, "conf/tinkergraph-credentials.properties");
break;
}
@@ -161,9 +164,9 @@
final Client client = cluster.connect();
try {
- assertEquals(2, client.submit("1+1").all().get().get(0).getInt());
- assertEquals(3, client.submit("1+2").all().get().get(0).getInt());
- assertEquals(4, client.submit("1+3").all().get().get(0).getInt());
+ assertEquals(2, client.submit("g.inject(2)").all().get().get(0).getInt());
+ assertEquals(3, client.submit("g.inject(3)").all().get().get(0).getInt());
+ assertEquals(4, client.submit("g.inject(4)").all().get().get(0).getInt());
} finally {
cluster.close();
}
@@ -175,11 +178,11 @@
// WebSocketChannelizer does not add SaslAuthenticationHandler for AllowAllAuthenticator,
// so no authenticated user log line available
assertTrue(logCaptor.getLogs().stream().anyMatch(m -> m.matches(String.format(
- "User %s with address .+? requested: 1\\+1", AuthenticatedUser.ANONYMOUS_USERNAME))));
+ "User %s with address .+? requested: g.inject\\(2\\)", AuthenticatedUser.ANONYMOUS_USERNAME))));
assertTrue(logCaptor.getLogs().stream().anyMatch(m -> m.matches(String.format(
- "User %s with address .+? requested: 1\\+2", AuthenticatedUser.ANONYMOUS_USERNAME))));
+ "User %s with address .+? requested: g.inject\\(3\\)", AuthenticatedUser.ANONYMOUS_USERNAME))));
assertTrue(logCaptor.getLogs().stream().anyMatch(m -> m.matches(String.format(
- "User %s with address .+? requested: 1\\+3", AuthenticatedUser.ANONYMOUS_USERNAME))));
+ "User %s with address .+? requested: g.inject\\(4\\)", AuthenticatedUser.ANONYMOUS_USERNAME))));
}
@Test
@@ -187,14 +190,14 @@
final String username = "stephen";
final String password = "password";
- final Cluster cluster = TestClientFactory.build(kdcServer.gremlinHostname).credentials(username, password).create();
+ final Cluster cluster = TestClientFactory.build(kdcServer.gremlinHostname).auth(basic(username, password)).create();
final Client client = cluster.connect();
try {
- assertEquals(2, client.submit("1+1").all().get().get(0).getInt());
- assertEquals(3, client.submit("1+2").all().get().get(0).getInt());
- assertEquals(4, client.submit("1+3").all().get().get(0).getInt());
- assertEquals(5, client.submit("1+4").all().get().get(0).getInt());
+ assertEquals(2, client.submit("g.inject(2)").all().get().get(0).getInt());
+ assertEquals(3, client.submit("g.inject(3)").all().get().get(0).getInt());
+ assertEquals(4, client.submit("g.inject(4)").all().get().get(0).getInt());
+ assertEquals(5, client.submit("g.inject(5)").all().get().get(0).getInt());
} finally {
cluster.close();
}
@@ -207,48 +210,24 @@
assertTrue(logCaptor.getLogs().stream().anyMatch(m -> m.matches(
String.format("User %s with address .+? authenticated by %s", username, simpleAuthenticatorName))));
assertTrue(logCaptor.getLogs().stream().anyMatch(m -> m.matches(
- "User stephen with address .+? requested: 1\\+1")));
+ "User stephen with address .+? requested: g.inject\\(2\\)")));
assertTrue(logCaptor.getLogs().stream().anyMatch(m -> m.matches(
- "User stephen with address .+? requested: 1\\+2")));
+ "User stephen with address .+? requested: g.inject\\(3\\)")));
assertTrue(logCaptor.getLogs().stream().anyMatch(m -> m.matches(
- "User stephen with address .+? requested: 1\\+3")));
- }
-
- @Test
- public void shouldAuditLogWithKrb5Authenticator() throws Exception {
- final Cluster cluster = TestClientFactory.build(kdcServer.gremlinHostname).jaasEntry(TESTCONSOLE).protocol(kdcServer.serverPrincipalName).create();
- final Client client = cluster.connect();
- try {
- assertEquals(2, client.submit("1+1").all().get().get(0).getInt());
- assertEquals(3, client.submit("1+2").all().get().get(0).getInt());
- assertEquals(4, client.submit("1+3").all().get().get(0).getInt());
- } finally {
- cluster.close();
- }
-
- // wait for logger to flush - (don't think there is a way to detect this)
- stopServer();
- Thread.sleep(1000);
-
- final String authenticatorName = Krb5Authenticator.class.getSimpleName();
- assertTrue(logCaptor.getLogs().stream().anyMatch(m -> m.matches(
- String.format("User %s with address .+? authenticated by %s", kdcServer.clientPrincipalName, authenticatorName))));
- assertTrue(logCaptor.getLogs().stream().anyMatch(m -> m.matches(
- "User drankye with address .+? requested: 1\\+1")));
- assertTrue(logCaptor.getLogs().stream().anyMatch(m -> m.matches(
- "User drankye with address .+? requested: 1\\+2")));
- assertTrue(logCaptor.getLogs().stream().anyMatch(m -> m.matches(
- "User drankye with address .+? requested: 1\\+3")));
+ "User stephen with address .+? requested: g.inject\\(4\\)")));
}
@Test
public void shouldNotAuditLogWhenDisabled() throws Exception {
- final Cluster cluster = TestClientFactory.build(kdcServer.gremlinHostname).jaasEntry(TESTCONSOLE).protocol(kdcServer.serverPrincipalName).create();
+ final String username = "stephen";
+ final String password = "password";
+
+ final Cluster cluster = TestClientFactory.build(kdcServer.gremlinHostname).auth(basic(username, password)).create();
final Client client = cluster.connect();
try {
- assertEquals(2, client.submit("1+1").all().get().get(0).getInt());
- assertEquals(3, client.submit("1+2").all().get().get(0).getInt());
- assertEquals(4, client.submit("1+3").all().get().get(0).getInt());
+ assertEquals(2, client.submit("g.inject(2)").all().get().get(0).getInt());
+ assertEquals(3, client.submit("g.inject(3)").all().get().get(0).getInt());
+ assertEquals(4, client.submit("g.inject(4)").all().get().get(0).getInt());
} finally {
cluster.close();
}
@@ -257,29 +236,30 @@
stopServer();
Thread.sleep(1000);
- final String authenticatorName = Krb5Authenticator.class.getSimpleName();
+ final String simpleAuthenticatorName = SimpleAuthenticator.class.getSimpleName();
assertFalse(logCaptor.getLogs().stream().anyMatch(m -> m.matches(
- String.format("User %s with address .+? authenticated by %s", kdcServer.clientPrincipalName, authenticatorName))));
+ String.format("User %s with address .+? authenticated by %s", username, simpleAuthenticatorName))));
assertFalse(logCaptor.getLogs().stream().anyMatch(m -> m.matches(
- "User drankye with address .+? requested: 1\\+1")));
+ "User stephen with address .+? requested: g.inject\\(2\\)")));
assertFalse(logCaptor.getLogs().stream().anyMatch(m -> m.matches(
- "User drankye with address .+? requested: 1\\+2")));
+ "User stephen with address .+? requested: g.inject\\(3\\)")));
assertFalse(logCaptor.getLogs().stream().anyMatch(m -> m.matches(
- "User drankye with address .+? requested: 1\\+3")));
+ "User stephen with address .+? requested: g.inject\\(4\\)")));
}
@Test
public void shouldAuditLogWithHttpTransport() throws Exception {
final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpGet httpget = new HttpGet(TestClientFactory.createURLString("?gremlin=2-1"));
- httpget.addHeader("Authorization", "Basic " + encoder.encodeToString("stephen:password".getBytes()));
+ final HttpPost httpPost = new HttpPost(TestClientFactory.createURLString());
+ httpPost.addHeader("Authorization", "Basic " + encoder.encodeToString("stephen:password".getBytes()));
+ httpPost.setEntity(new StringEntity("{\"gremlin\":\"g.inject(1)\"}", Consts.UTF_8));
- try (final CloseableHttpResponse response = httpclient.execute(httpget)) {
+ try (final CloseableHttpResponse response = httpclient.execute(httpPost)) {
assertEquals(200, response.getStatusLine().getStatusCode());
assertEquals("application/json", response.getEntity().getContentType().getValue());
final String json = EntityUtils.toString(response.getEntity());
final JsonNode node = mapper.readTree(json);
- assertEquals(1, node.get("result").get("data").get(GraphSONTokens.VALUEPROP).get(0).get(GraphSONTokens.VALUEPROP).intValue());
+ assertEquals(1, node.get("result").get(SerTokens.TOKEN_DATA).get(GraphSONTokens.VALUEPROP).get(0).get(GraphSONTokens.VALUEPROP).intValue());
}
// wait for logger to flush - (don't think there is a way to detect this)
@@ -290,7 +270,7 @@
assertTrue(logCaptor.getLogs().stream().anyMatch(m -> m.matches(
String.format("User stephen with address .+? authenticated by %s", authenticatorName))));
assertTrue(logCaptor.getLogs().stream().anyMatch(m -> m.matches(
- "User stephen with address .+? requested: 2-1")));
+ "User stephen with address .+? requested: g.inject\\(1\\)")));
}
@Test
@@ -298,7 +278,7 @@
final String username = "stephen";
final String password = "password";
- final Cluster cluster = TestClientFactory.build(kdcServer.gremlinHostname).credentials(username, password).create();
+ final Cluster cluster = TestClientFactory.build(kdcServer.gremlinHostname).auth(basic(username, password)).create();
final GraphTraversalSource g = AnonymousTraversalSource.traversal().
withRemote(DriverRemoteConnection.using(cluster, "gmodern"));
@@ -316,55 +296,6 @@
assertTrue(logCaptor.getLogs().stream().anyMatch(m -> m.matches(
String.format("User %s with address .+? authenticated by %s", username, authenticatorName))));
assertTrue(logCaptor.getLogs().stream().anyMatch(m ->
- m.matches("User .+? with address .+? requested: \\[\\[], \\[V\\(\\), count\\(\\)]]")));
- }
-
- @Test
- public void shouldAuditLogTwoClientsWithKrb5Authenticator() throws Exception {
- // calling init to make sure the clusters get their connections primed in low resource environments like travis
- final Cluster cluster = TestClientFactory.build(kdcServer.gremlinHostname).jaasEntry(TESTCONSOLE).
- protocol(kdcServer.serverPrincipalName).create();
- final Client client = cluster.connect();
- client.init();
-
- final Cluster cluster2 = TestClientFactory.build(kdcServer.gremlinHostname).jaasEntry(TESTCONSOLE2).
- protocol(kdcServer.serverPrincipalName).create();
- final Client client2 = cluster2.connect();
- client2.init();
-
- try {
- assertEquals(2, client.submit("1+1").all().get().get(0).getInt());
- assertEquals(22, client2.submit("11+11").all().get().get(0).getInt());
- assertEquals(3, client.submit("1+2").all().get().get(0).getInt());
- assertEquals(23, client2.submit("11+12").all().get().get(0).getInt());
- assertEquals(24, client2.submit("11+13").all().get().get(0).getInt());
- assertEquals(4, client.submit("1+3").all().get().get(0).getInt());
- } finally {
- cluster.close();
- cluster2.close();
- }
-
- // wait for logger to flush - (don't think there is a way to detect this)
- stopServer();
- Thread.sleep(1000);
-
- final String authenticatorName = Krb5Authenticator.class.getSimpleName();
- assertTrue(logCaptor.getLogs().stream().anyMatch(m -> m.matches(
- String.format("User %s with address .+? authenticated by %s", kdcServer.clientPrincipalName, authenticatorName))));
- assertTrue(logCaptor.getLogs().stream().anyMatch(m ->
- m.matches("User drankye with address .+? requested: 1\\+1")));
- assertTrue(logCaptor.getLogs().stream().anyMatch(m ->
- m.matches("User drankye with address .+? requested: 1\\+2")));
- assertTrue(logCaptor.getLogs().stream().anyMatch(m ->
- m.matches("User drankye with address .+? requested: 1\\+3")));
-
- assertTrue(logCaptor.getLogs().stream().anyMatch(m -> m.matches(
- String.format("User %s with address .+? authenticated by %s", kdcServer.clientPrincipalName2, authenticatorName))));
- assertTrue(logCaptor.getLogs().stream().anyMatch(m ->
- m.matches("User drankye2 with address .+? requested: 11\\+11")));
- assertTrue(logCaptor.getLogs().stream().anyMatch(m ->
- m.matches("User drankye2 with address .+? requested: 11\\+12")));
- assertTrue(logCaptor.getLogs().stream().anyMatch(m ->
- m.matches("User drankye2 with address .+? requested: 11\\+13")));
+ m.matches("User .+? with address .+? requested: g.V\\(\\).count\\(\\)")));
}
}
\ No newline at end of file
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthIntegrateTest.java
index 01367ec..f7b020e 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthIntegrateTest.java
@@ -20,38 +20,33 @@
import org.apache.tinkerpop.gremlin.driver.Client;
import org.apache.tinkerpop.gremlin.driver.Cluster;
-import org.apache.tinkerpop.gremlin.driver.Result;
-import org.apache.tinkerpop.gremlin.driver.ResultSet;
-import org.apache.tinkerpop.gremlin.driver.exception.NoHostAvailableException;
+import org.apache.tinkerpop.gremlin.driver.HttpRequest;
import org.apache.tinkerpop.gremlin.driver.exception.ResponseException;
-import org.apache.tinkerpop.gremlin.driver.simple.WebSocketClient;
import org.apache.tinkerpop.gremlin.server.auth.SimpleAuthenticator;
-import org.apache.tinkerpop.gremlin.server.handler.SaslAuthenticationHandler;
-import org.apache.tinkerpop.gremlin.structure.Property;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.apache.tinkerpop.gremlin.util.ExceptionHelper;
-import org.apache.tinkerpop.gremlin.util.Tokens;
-import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.util.ser.Serializers;
import org.ietf.jgss.GSSException;
import org.junit.Test;
-import java.time.Duration;
-import java.util.ArrayList;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
-import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
+import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
+import software.amazon.awssdk.auth.credentials.AwsSessionCredentials;
+import static org.apache.tinkerpop.gremlin.driver.auth.Auth.basic;
+import static org.apache.tinkerpop.gremlin.driver.auth.Auth.sigv4;
+import static org.hamcrest.CoreMatchers.allOf;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.startsWith;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.AnyOf.anyOf;
import static org.hamcrest.core.IsInstanceOf.instanceOf;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
/**
* @author Stephen Mallette (http://stephen.genoprime.com)
@@ -67,7 +62,7 @@
authSettings.authenticator = SimpleAuthenticator.class.getName();
// use a credentials graph with two users in it: stephen/password and marko/rainbow-dash
- final Map<String,Object> authConfig = new HashMap<>();
+ final Map<String, Object> authConfig = new HashMap<>();
authConfig.put(SimpleAuthenticator.CONFIG_CREDENTIALS_DB, "conf/tinkergraph-credentials.properties");
authSettings.config = authConfig;
@@ -75,6 +70,9 @@
final String nameOfTest = name.getMethodName();
switch (nameOfTest) {
+ case "shouldPassSigv4ToServer":
+ settings.authentication = new Settings.AuthenticationSettings();
+ break;
case "shouldAuthenticateOverSslWithPlainText":
case "shouldFailIfSslEnabledOnServerButNotClient":
final Settings.SslSettings sslConfig = new Settings.SslSettings();
@@ -89,17 +87,43 @@
}
@Test
+ public void shouldPassSigv4ToServer() throws Exception {
+ final AwsCredentialsProvider credentialsProvider = mock(AwsCredentialsProvider.class);
+ final AwsSessionCredentials credentials = AwsSessionCredentials.create("I am AWSAccessKeyId", "I am AWSSecretKey", "I am AWSSessionToken");
+ when(credentialsProvider.resolveCredentials()).thenReturn(credentials);
+
+ final AtomicReference<HttpRequest> httpRequest = new AtomicReference<>();
+ final Cluster cluster = TestClientFactory.build()
+ .auth(sigv4("us-west2", credentialsProvider, "service-name"))
+ .addInterceptor("header-checker", r -> {
+ httpRequest.set(r);
+ return r;
+ })
+ .create();
+ final Client client = cluster.connect();
+ client.submit("g.inject(2)").all().get();
+
+ Map<String, String> headers = httpRequest.get().headers();
+ assertNotNull(headers.get("X-Amz-Date"));
+ assertThat(headers.get("Authorization"), startsWith("AWS4-HMAC-SHA256 Credential=I am AWSAccessKeyId"));
+ assertThat(headers.get("Authorization"),
+ allOf(containsString("/us-west2/service-name/aws4_request"), containsString("Signature=")));
+
+ cluster.close();
+ }
+
+ @Test
public void shouldFailIfSslEnabledOnServerButNotClient() throws Exception {
final Cluster cluster = TestClientFactory.open();
final Client client = cluster.connect();
try {
- client.submit("1+1").all().get();
+ client.submit("g.inject(2)").all().get();
fail("This should not succeed as the client did not enable SSL");
- } catch(Exception ex) {
- assertThat(ex, instanceOf(NoHostAvailableException.class));
+ } catch (Exception ex) {
+ assertThat(ex, instanceOf(ExecutionException.class));
final Throwable root = ExceptionHelper.getRootCause(ex);
- assertThat(root, instanceOf(RuntimeException.class));
+ assertThat(root.getMessage(), containsString("The server may be expecting SSL to be enabled"));
} finally {
cluster.close();
}
@@ -107,7 +131,7 @@
@Test
public void shouldAuthenticateWithPlainText() throws Exception {
- final Cluster cluster = TestClientFactory.build().credentials("stephen", "password").create();
+ final Cluster cluster = TestClientFactory.build().auth(basic("stephen", "password")).create();
final Client client = cluster.connect();
assertConnection(cluster, client);
@@ -117,21 +141,24 @@
public void shouldAuthenticateOverSslWithPlainText() throws Exception {
final Cluster cluster = TestClientFactory.build()
.enableSsl(true).sslSkipCertValidation(true)
- .credentials("stephen", "password").create();
+ .auth(basic("stephen", "password")).create();
+
final Client client = cluster.connect();
+ client.submit("g.inject(2)").all().get();
+
assertConnection(cluster, client);
}
@Test
- public void shouldFailAuthenticateWithPlainTextNoCredentials() throws Exception {
+ public void shouldFailAuthenticateWithPlainTextNoCredentials() {
final Cluster cluster = TestClientFactory.open();
final Client client = cluster.connect();
try {
- client.submit("1+1").all().get();
+ client.submit("g.inject(2)").all().get();
fail("This should not succeed as the client did not provide credentials");
- } catch(Exception ex) {
+ } catch (Exception ex) {
final Throwable root = ExceptionHelper.getRootCause(ex);
// depending on the configuration of the system environment you might get either of these
@@ -142,16 +169,17 @@
}
@Test
- public void shouldFailAuthenticateWithPlainTextBadPassword() throws Exception {
- final Cluster cluster = TestClientFactory.build().credentials("stephen", "bad").create();
+ public void shouldFailAuthenticateWithPlainTextBadPassword() {
+ final Cluster cluster = TestClientFactory.build().auth(basic("stephen", "bad")).create();
final Client client = cluster.connect();
try {
- client.submit("1+1").all().get();
+ client.submit("g.inject(2)").all().get();
fail("This should not succeed as the client did not provide valid credentials");
- } catch(Exception ex) {
+ } catch (Exception ex) {
final Throwable root = ExceptionHelper.getRootCause(ex);
assertEquals(ResponseException.class, root.getClass());
+ // server do not send error message now
assertEquals("Username and/or password are incorrect", root.getMessage());
} finally {
cluster.close();
@@ -159,13 +187,13 @@
}
@Test
- public void shouldFailAuthenticateWithPlainTextBadUsername() throws Exception {
- final Cluster cluster = TestClientFactory.build().credentials("marko", "password").create();
+ public void shouldFailAuthenticateWithPlainTextBadUsername() {
+ final Cluster cluster = TestClientFactory.build().auth(basic("marko", "password")).create();
final Client client = cluster.connect();
try {
- client.submit("1+1").all().get();
- } catch(Exception ex) {
+ client.submit("g.inject(2)").all().get();
+ } catch (Exception ex) {
final Throwable root = ExceptionHelper.getRootCause(ex);
assertEquals(ResponseException.class, root.getClass());
assertEquals("Username and/or password are incorrect", root.getMessage());
@@ -174,126 +202,11 @@
}
}
- @Test
- public void shouldFailAuthenticateWithUnAuthenticatedRequestAfterMaxDeferrableDuration() throws Exception {
- try (WebSocketClient client = TestClientFactory.createWebSocketClient()) {
- // First request will initiate the authentication handshake
- // Subsequent requests will be deferred
- CompletableFuture<List<ResponseMessage>> futureOfRequestWithinAuthDuration1 = client.submitAsync("");
- CompletableFuture<List<ResponseMessage>> futureOfRequestWithinAuthDuration2 = client.submitAsync("");
- CompletableFuture<List<ResponseMessage>> futureOfRequestWithinAuthDuration3 = client.submitAsync("");
-
- // After the maximum allowed deferred request duration,
- // any non-authenticated request will invalidate all requests with 429 error
- CompletableFuture<List<ResponseMessage>> futureOfRequestSubmittedTooLate = CompletableFuture.runAsync(() -> {
- try {
- Thread.sleep(SaslAuthenticationHandler.MAX_REQUEST_DEFERRABLE_DURATION.plus(Duration.ofSeconds(1)).toMillis());
- } catch (InterruptedException e) {
- throw new RuntimeException(e);
- }
- }).thenCompose((__) -> {
- try {
- return client.submitAsync("");
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- });
-
- assertEquals(2, futureOfRequestWithinAuthDuration1.get().size());
- assertEquals(1, futureOfRequestWithinAuthDuration2.get().size());
- assertEquals(1, futureOfRequestWithinAuthDuration3.get().size());
- assertEquals(1, futureOfRequestSubmittedTooLate.get().size());
-
- assertEquals(ResponseStatusCode.AUTHENTICATE, futureOfRequestWithinAuthDuration1.get().get(0).getStatus().getCode());
- assertEquals(ResponseStatusCode.UNAUTHORIZED, futureOfRequestWithinAuthDuration1.get().get(1).getStatus().getCode());
- assertEquals(ResponseStatusCode.UNAUTHORIZED, futureOfRequestWithinAuthDuration2.get().get(0).getStatus().getCode());
- assertEquals(ResponseStatusCode.UNAUTHORIZED, futureOfRequestWithinAuthDuration3.get().get(0).getStatus().getCode());
- assertEquals(ResponseStatusCode.UNAUTHORIZED, futureOfRequestSubmittedTooLate.get().get(0).getStatus().getCode());
- }
- }
-
- @Test
- public void shouldFailAuthenticateWithIncorrectParallelRequests() throws Exception {
- try (WebSocketClient client = TestClientFactory.createWebSocketClient()) {
-
- CompletableFuture<List<ResponseMessage>> firstRequest = client.submitAsync("1");
- CompletableFuture<List<ResponseMessage>> secondRequest = client.submitAsync("2");
- CompletableFuture<List<ResponseMessage>> thirdRequest = client.submitAsync("3");
-
- Thread.sleep(500);
-
- // send some incorrect value for username password which should cause all requests to fail.
- client.submitAsync(RequestMessage.build(Tokens.OPS_AUTHENTICATION).addArg(Tokens.ARGS_SASL, "someincorrectvalue").create());
-
- assertEquals(2, firstRequest.get().size());
- assertEquals(1, secondRequest.get().size());
- assertEquals(1, thirdRequest.get().size());
-
- assertEquals(ResponseStatusCode.AUTHENTICATE, firstRequest.get().get(0).getStatus().getCode());
- assertEquals(ResponseStatusCode.UNAUTHORIZED, firstRequest.get().get(1).getStatus().getCode());
- assertEquals(ResponseStatusCode.UNAUTHORIZED, secondRequest.get().get(0).getStatus().getCode());
- assertEquals(ResponseStatusCode.UNAUTHORIZED, thirdRequest.get().get(0).getStatus().getCode());
- }
- }
-
- @Test
- public void shouldAuthenticateWithPlainTextOverDefaultJSONSerialization() throws Exception {
- final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHSON)
- .credentials("stephen", "password").create();
- final Client client = cluster.connect();
-
- assertConnection(cluster, client);
- }
-
- @Test
- public void shouldAuthenticateWithPlainTextOverGraphSONV1Serialization() throws Exception {
- final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHSON_V1_UNTYPED)
- .credentials("stephen", "password").create();
- final Client client = cluster.connect();
-
- assertConnection(cluster, client);
- }
-
- @Test
- public void shouldAuthenticateAndWorkWithVariablesOverDefaultJsonSerialization() throws Exception {
- final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHSON)
- .credentials("stephen", "password").create();
- final Client client = cluster.connect(name.getMethodName());
-
- try {
- final Vertex vertex = (Vertex) client.submit("v=graph.addVertex(\"name\", \"stephen\")").all().get().get(0).getObject();
- assertEquals("stephen", vertex.value("name"));
-
- final Property vpName = (Property)client.submit("v.property('name')").all().get().get(0).getObject();
- assertEquals("stephen", vpName.value());
- } finally {
- cluster.close();
- }
- }
-
- @Test
- public void shouldAuthenticateAndWorkWithVariablesOverGraphSONV1Serialization() throws Exception {
- final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHSON_V1_UNTYPED)
- .credentials("stephen", "password").create();
- final Client client = cluster.connect(name.getMethodName());
-
- try {
- final Map vertex = (Map) client.submit("v=graph.addVertex('name', 'stephen')").all().get().get(0).getObject();
- final Map<String, List<Map>> properties = (Map) vertex.get("properties");
- assertEquals("stephen", properties.get("name").get(0).get("value"));
-
- final Map vpName = (Map)client.submit("v.property('name')").all().get().get(0).getObject();
- assertEquals("stephen", vpName.get("value"));
- } finally {
- cluster.close();
- }
- }
-
private static void assertConnection(final Cluster cluster, final Client client) throws InterruptedException, ExecutionException {
try {
- assertEquals(2, client.submit("1+1").all().get().get(0).getInt());
- assertEquals(3, client.submit("1+2").all().get().get(0).getInt());
- assertEquals(4, client.submit("1+3").all().get().get(0).getInt());
+ assertEquals(2, client.submit("g.inject(2)").all().get().get(0).getInt());
+ assertEquals(3, client.submit("g.inject(3)").all().get().get(0).getInt());
+ assertEquals(4, client.submit("g.inject(4)").all().get().get(0).getInt());
} finally {
cluster.close();
}
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthKrb5IntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthKrb5IntegrateTest.java
deleted file mode 100644
index 2a534bf..0000000
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthKrb5IntegrateTest.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.server;
-
-import org.apache.tinkerpop.gremlin.util.ExceptionHelper;
-import org.apache.tinkerpop.gremlin.driver.Client;
-import org.apache.tinkerpop.gremlin.driver.Cluster;
-import org.apache.tinkerpop.gremlin.util.MessageSerializer;
-import org.apache.tinkerpop.gremlin.driver.exception.ResponseException;
-import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1;
-import org.apache.tinkerpop.gremlin.server.auth.Krb5Authenticator;
-import org.ietf.jgss.GSSException;
-import org.junit.Test;
-import org.slf4j.LoggerFactory;
-
-import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.ExecutionException;
-import javax.security.auth.login.LoginException;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-/**
- * @author Marc de Lignie
- */
-public class GremlinServerAuthKrb5IntegrateTest extends AbstractGremlinServerIntegrationTest {
- private static final org.slf4j.Logger logger = LoggerFactory.getLogger(GremlinServerAuthKrb5IntegrateTest.class);
-
- static final String TESTCONSOLE = "GremlinConsole";
- static final String TESTCONSOLE_NOT_LOGGED_IN = "UserNotLoggedIn";
-
- private KdcFixture kdcServer;
-
- @Override
- public void setUp() throws Exception {
-
- try {
- final String projectBaseDir = System.getProperty("basedir", ".");
- final String authConfigName = projectBaseDir + "/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-console-jaas.conf";
- System.setProperty("java.security.auth.login.config", authConfigName);
- kdcServer = new KdcFixture(projectBaseDir);
- kdcServer.setUp();
- } catch(Exception e) {
- logger.warn(e.getMessage());
- }
- super.setUp();
- }
-
- @Override
- public void tearDown() throws Exception {
- kdcServer.close();
- System.clearProperty("java.security.auth.login.config");
- super.tearDown();
- }
-
- /**
- * Configure specific Gremlin Server settings for specific tests.
- */
- @Override
- public Settings overrideSettings(final Settings settings) {
- settings.host = kdcServer.gremlinHostname;
- final Settings.SslSettings sslConfig = new Settings.SslSettings();
- sslConfig.enabled = false;
- settings.ssl = sslConfig;
- final Settings.AuthenticationSettings authSettings = new Settings.AuthenticationSettings();
- settings.authentication = authSettings;
- authSettings.authenticator = Krb5Authenticator.class.getName();
- final Map<String,Object> authConfig = new HashMap<>();
- authConfig.put("principal", kdcServer.serverPrincipal);
- authConfig.put("keytab", kdcServer.serviceKeytabFile.getAbsolutePath());
- authSettings.config = authConfig;
-
- final String nameOfTest = name.getMethodName();
- switch (nameOfTest) {
- case "shouldAuthenticateWithDefaults":
- case "shouldFailWithoutClientJaasEntry":
- case "shouldFailWithoutClientTicketCache":
- break;
- case "shouldFailWithNonexistentServerPrincipal":
- authConfig.put("principal", "no-service");
- break;
- case "shouldFailWithEmptyServerKeytab":
- final File keytabFile = new File(".", "no-file");
- authConfig.put("keytab", keytabFile);
- break;
- case "shouldFailWithWrongServerKeytab":
- final String principal = "no-principal/somehost@TEST.COM";
- try { kdcServer.createPrincipal(principal); } catch(Exception e) {
- logger.error("Cannot create principal in overrideSettings(): " + e.getMessage());
- }
- authConfig.put("principal", principal);
- break;
- case "shouldAuthenticateWithSsl":
- sslConfig.enabled = true;
- sslConfig.keyStore = JKS_SERVER_KEY;
- sslConfig.keyStorePassword = KEY_PASS;
- sslConfig.keyStoreType = KEYSTORE_TYPE_JKS;
- break;
- case "shouldAuthenticateWithQop":
- break;
- }
- return settings;
- }
-
- @Test
- public void shouldAuthenticateWithDefaults() throws Exception {
- final Cluster cluster = TestClientFactory.build(kdcServer.gremlinHostname).jaasEntry(TESTCONSOLE)
- .protocol(kdcServer.serverPrincipalName).create();
- final Client client = cluster.connect();
- assertConnection(cluster, client);
- }
-
- @Test
- public void shouldFailWithoutClientJaasEntry() {
- final Cluster cluster = TestClientFactory.build(kdcServer.gremlinHostname)
- .protocol(kdcServer.serverPrincipalName).create();
- final Client client = cluster.connect();
- try {
- client.submit("1+1").all().get();
- fail("This should not succeed as the client config does not contain a JaasEntry");
- } catch(Exception ex) {
- final Throwable root = ExceptionHelper.getRootCause(ex);
- assertTrue(root instanceof ResponseException || root instanceof GSSException);
- } finally {
- cluster.close();
- }
- }
-
- @Test
- public void shouldFailWithoutClientTicketCache() {
- final Cluster cluster = TestClientFactory.build(kdcServer.gremlinHostname).jaasEntry(TESTCONSOLE_NOT_LOGGED_IN)
- .protocol(kdcServer.serverPrincipalName).create();
- final Client client = cluster.connect();
- try {
- client.submit("1+1").all().get();
- fail("This should not succeed as the client config does not contain a valid ticket cache");
- } catch(Exception ex) {
- final Throwable root = ExceptionHelper.getRootCause(ex);
- assertEquals(LoginException.class, root.getClass());
- } finally {
- cluster.close();
- }
- }
-
- @Test
- public void shouldFailWithNonexistentServerPrincipal() {
- assertFailedLogin();
- }
-
- @Test
- public void shouldFailWithEmptyServerKeytab() {
- assertFailedLogin();
- }
-
- @Test
- public void shouldFailWithWrongServerKeytab() {
- assertFailedLogin();
- }
-
- @Test
- public void shouldAuthenticateWithQop() throws Exception {
- final String oldQop = System.getProperty("javax.security.sasl.qop", "");
- System.setProperty("javax.security.sasl.qop", "auth-conf");
- final Cluster cluster = TestClientFactory.build(kdcServer.gremlinHostname).jaasEntry(TESTCONSOLE)
- .protocol(kdcServer.serverPrincipalName).create();
- final Client client = cluster.connect();
- try {
- assertEquals(2, client.submit("1+1").all().get().get(0).getInt());
- assertEquals(3, client.submit("1+2").all().get().get(0).getInt());
- assertEquals(4, client.submit("1+3").all().get().get(0).getInt());
- } finally {
- cluster.close();
- System.setProperty("javax.security.sasl.qop", oldQop);
- }
- }
-
- @Test
- public void shouldAuthenticateWithSsl() throws Exception {
- final Cluster cluster = TestClientFactory.build(kdcServer.gremlinHostname).jaasEntry(TESTCONSOLE).enableSsl(true).sslSkipCertValidation(true)
- .protocol(kdcServer.serverPrincipalName).create();
- final Client client = cluster.connect();
- assertConnection(cluster, client);
- }
-
- @Test
- public void shouldAuthenticateWithSerializeResultToStringGraphBinaryV1() throws Exception {
- assertAuthViaToStringWithSpecifiedSerializer(new GraphBinaryMessageSerializerV1());
- }
-
- public void assertAuthViaToStringWithSpecifiedSerializer(final MessageSerializer<?> serializer) throws InterruptedException, ExecutionException {
- final Map<String,Object> config = new HashMap<>();
- config.put("serializeResultToString", true);
- serializer.configure(config, null);
- final Cluster cluster = TestClientFactory.build(kdcServer.gremlinHostname).jaasEntry(TESTCONSOLE)
- .protocol(kdcServer.serverPrincipalName).serializer(serializer).create();
- final Client client = cluster.connect();
- assertConnection(cluster, client);
- }
-
- private static void assertConnection(final Cluster cluster, final Client client) throws InterruptedException, ExecutionException {
- try {
- assertEquals(2, client.submit("1+1").all().get().get(0).getInt());
- assertEquals(3, client.submit("1+2").all().get().get(0).getInt());
- assertEquals(4, client.submit("1+3").all().get().get(0).getInt());
- } finally {
- cluster.close();
- }
- }
-
- /**
- * Tries to force the logger to flush fully or at least wait until it does.
- */
- private void assertFailedLogin() {
- final Cluster cluster = TestClientFactory.build(kdcServer.gremlinHostname).jaasEntry(TESTCONSOLE)
- .protocol(kdcServer.serverPrincipalName).create();
- final Client client = cluster.connect();
- try {
- client.submit("1+1").all().get();
- fail("The kerberos config is a bust so this request should fail");
- } catch (Exception ex) {
- final ResponseException re = (ResponseException) ex.getCause();
- assertEquals(ResponseStatusCode.SERVER_ERROR, re.getResponseStatusCode());
- assertEquals("Authenticator is not ready to handle requests", re.getMessage());
- } finally {
- cluster.close();
- }
- }
-}
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthzIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthzIntegrateTest.java
index 73eec60..ee4ce58 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthzIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthzIntegrateTest.java
@@ -19,45 +19,37 @@
package org.apache.tinkerpop.gremlin.server;
import nl.altindag.log.LogCaptor;
+import org.apache.http.Consts;
import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.util.EntityUtils;
import org.apache.tinkerpop.gremlin.driver.Client;
import org.apache.tinkerpop.gremlin.driver.Cluster;
-import org.apache.tinkerpop.gremlin.driver.exception.ResponseException;
-import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
+import org.apache.tinkerpop.gremlin.driver.RequestOptions;
import org.apache.tinkerpop.gremlin.driver.remote.DriverRemoteConnection;
import org.apache.tinkerpop.gremlin.process.traversal.AnonymousTraversalSource;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
-import org.apache.tinkerpop.gremlin.server.auth.AllowAllAuthenticator;
import org.apache.tinkerpop.gremlin.server.auth.SimpleAuthenticator;
import org.apache.tinkerpop.gremlin.server.authz.AllowListAuthorizer;
-import org.apache.tinkerpop.gremlin.server.channel.HttpChannelizer;
-import org.apache.tinkerpop.gremlin.server.channel.WebSocketChannelizer;
-import org.apache.tinkerpop.gremlin.server.handler.SaslAndHttpBasicAuthenticationHandler;
+import org.apache.tinkerpop.gremlin.server.handler.HttpBasicAuthenticationHandler;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens;
-import org.apache.tinkerpop.gremlin.util.function.Lambda;
+import org.apache.tinkerpop.gremlin.util.ser.SerTokens;
import org.apache.tinkerpop.shaded.jackson.databind.JsonNode;
import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import java.time.Instant;
import java.util.Base64;
import java.util.HashMap;
import java.util.Objects;
-import java.util.concurrent.CompletionException;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.Is.is;
+import static org.apache.tinkerpop.gremlin.driver.auth.Auth.basic;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
/**
* Run with:
@@ -66,7 +58,6 @@
* @author Marc de Lignie
*/
public class GremlinServerAuthzIntegrateTest extends AbstractGremlinServerIntegrationTest {
- private static final Long DEFAULT_EVALUATION_TIMEOUT = 2000L;
private static LogCaptor logCaptor;
private final ObjectMapper mapper = new ObjectMapper();
@@ -112,41 +103,19 @@
settings.authentication = authSettings;
settings.authorization = authzSettings;
settings.enableAuditLog = true;
- settings.evaluationTimeout = DEFAULT_EVALUATION_TIMEOUT;
final String nameOfTest = name.getMethodName();
- switch (nameOfTest) {
- case "shouldFailBytecodeRequestWithAllowAllAuthenticator":
- case "shouldFailStringRequestWithAllowAllAuthenticator":
- authSettings.authenticator = AllowAllAuthenticator.class.getName();
- break;
- case "shouldAuthorizeSessionsWithWebsocketTransport":
- settings.channelizer = WebSocketChannelizer.class.getName();
- break;
- case "shouldAuthorizeWithHttpTransport":
- case "shouldFailAuthorizeWithHttpTransport":
- case "shouldKeepAuthorizingWithHttpTransport":
- settings.channelizer = HttpChannelizer.class.getName();
- authSettings.authenticationHandler = SaslAndHttpBasicAuthenticationHandler.class.getName();
- break;
- case "shouldAuthorizeWithAllowAllAuthenticatorAndHttpTransport":
- settings.channelizer = HttpChannelizer.class.getName();
- authSettings.authenticator = AllowAllAuthenticator.class.getName();
- authSettings.authenticationHandler = SaslAndHttpBasicAuthenticationHandler.class.getName();
- authSettings.config = null;
- final String fileHttp = Objects.requireNonNull(getClass().getClassLoader().getResource(yamlHttpName)).getFile();
- authzSettings.config.put(AllowListAuthorizer.KEY_AUTHORIZATION_ALLOWLIST, fileHttp);
- break;
+ if (nameOfTest.equals("shouldAuthorizeWithHttpTransport")) {
+ authSettings.authenticationHandler = HttpBasicAuthenticationHandler.class.getName();
}
return settings;
}
@Test
- public void shouldAuthorizeBytecodeRequest() {
- final Cluster cluster = TestClientFactory.build().credentials("stephen", "password").create();
- final GraphTraversalSource g = AnonymousTraversalSource.traversal().withRemote(
+ public void shouldAuthorizeGremlinLangRequest() {
+ final Cluster cluster = TestClientFactory.build().auth(basic("marko", "rainbow-dash")).create();
+ final GraphTraversalSource g = AnonymousTraversalSource.traversal().with(
DriverRemoteConnection.using(cluster, "gmodern"));
-
try {
assertEquals(6, (long) g.V().count().next());
} finally {
@@ -155,184 +124,17 @@
}
@Test
- public void shouldAuthorizeBytecodeRequestWithLambda() {
- final Cluster cluster = TestClientFactory.build().credentials("marko", "rainbow-dash").create();
- final GraphTraversalSource g = AnonymousTraversalSource.traversal().withRemote(
- DriverRemoteConnection.using(cluster, "gclassic"));
-
- try {
- assertEquals(6, (long) g.V().count().next());
- assertEquals(6, (long) g.V().map(Lambda.function("it.get().value('name')")).count().next());
- } finally {
- cluster.close();
- }
- }
-
- @Test
- public void shouldFailBytecodeRequestWithLambda() throws Exception{
- final Cluster cluster = TestClientFactory.build().credentials("stephen", "password").create();
- final GraphTraversalSource g = AnonymousTraversalSource.traversal().withRemote(
- DriverRemoteConnection.using(cluster, "gmodern"));
-
- try {
- g.V().map(Lambda.function("it.get().value('name')")).count().next();
- fail("Authorization for bytecode request with lambda should fail");
- } catch (Exception ex) {
- final ResponseException re = (ResponseException) ex.getCause();
- assertEquals(ResponseStatusCode.UNAUTHORIZED, re.getResponseStatusCode());
- assertEquals("Failed to authorize: User not authorized for bytecode requests on [gmodern] using lambdas.", re.getMessage());
-
- // wait for logger to flush - (don't think there is a way to detect this)
- stopServer();
- Thread.sleep(1000);
-
- assertThat(logCaptor.getLogs().stream().anyMatch(m -> m.matches(
- "User stephen with address .+? attempted an unauthorized request for bytecode operation: " +
- "\\[\\[], \\[V\\(\\), map\\(lambda\\[it.get\\(\\).value\\('name'\\)]\\), count\\(\\)]]")), is(true));
- } finally {
- cluster.close();
- }
- }
-
- @Test
- public void shouldKeepAuthorizingBytecodeRequests() {
- final Cluster cluster = TestClientFactory.build().credentials("stephen", "password").create();
- final GraphTraversalSource g = AnonymousTraversalSource.traversal().withRemote(
- DriverRemoteConnection.using(cluster, "gmodern"));
-
- try {
- assertEquals(6, (long) g.V().count().next());
- try {
- g.V().map(Lambda.function("it.get().value('name')")).count().next();
- fail("Authorization for bytecode request with lambda should fail");
- } catch (Exception ex) {
- final ResponseException re = (ResponseException) ex.getCause();
- assertEquals(ResponseStatusCode.UNAUTHORIZED, re.getResponseStatusCode());
- assertEquals("Failed to authorize: User not authorized for bytecode requests on [gmodern] using lambdas.", re.getMessage());
- }
- assertEquals(6, (long) g.V().count().next());
- } finally {
- cluster.close();
- }
- }
-
- @Test
public void shouldAuthorizeStringRequest() throws Exception {
- final Cluster cluster = TestClientFactory.build().credentials("marko", "rainbow-dash").create();
+ final Cluster cluster = TestClientFactory.build().auth(basic("marko", "rainbow-dash")).create();
final Client client = cluster.connect();
- try {
- assertEquals(2, client.submit("1+1").all().get().get(0).getInt());
- assertEquals(6, client.submit("gclassic.V().count()").all().get().get(0).getInt());
- assertEquals(6, client.submit("gmodern.V().map{it.get().value('name')}.count()").all().get().get(0).getInt());
- } finally {
- cluster.close();
- }
- }
-
- @Test
- public void shouldFailStringRequestWithGroovyScript() throws Exception {
- final Cluster cluster = TestClientFactory.build().credentials("stephen", "password").create();
- final Client client = cluster.connect();
+ RequestOptions modern = RequestOptions.build().addG("gmodern").create();
+ RequestOptions classic = RequestOptions.build().addG("gclassic").create();
try {
- client.submit("1+1").all().get();
- fail("Authorization without authentication should fail");
- } catch (Exception ex) {
- final ResponseException re = (ResponseException) ex.getCause();
- assertEquals(ResponseStatusCode.UNAUTHORIZED, re.getResponseStatusCode());
- assertEquals("Failed to authorize: User not authorized for string-based requests.", re.getMessage());
-
- // wait for logger to flush - (don't think there is a way to detect this)
- stopServer();
- Thread.sleep(1000);
-
- assertThat(logCaptor.getLogs().stream().anyMatch(m -> m.matches(
- "User stephen with address .+? attempted an unauthorized request for eval operation: 1\\+1")), is(true));
- } finally {
- cluster.close();
- }
- }
-
- @Test
- public void shouldFailStringRequestWithGremlinTraversal() {
- final Cluster cluster = TestClientFactory.build().credentials("stephen", "password").create();
- final Client client = cluster.connect();
-
- try {
- client.submit("gmodern.V().count()").all().get();
- fail("Authorization without authentication should fail");
- } catch (Exception ex) {
- final ResponseException re = (ResponseException) ex.getCause();
- assertEquals(ResponseStatusCode.UNAUTHORIZED, re.getResponseStatusCode());
- assertEquals("Failed to authorize: User not authorized for string-based requests.", re.getMessage());
- } finally {
- cluster.close();
- }
- }
-
- @Test
- public void shouldAuthorizeSessionedStringRequest() throws Exception {
- final Cluster cluster = TestClientFactory.build().credentials("marko", "rainbow-dash").create();
- final Client client = cluster.connect("session1");
-
- try {
- assertEquals(2, client.submit("a = 4; 1+1").all().get().get(0).getInt());
- assertEquals(10, client.submit("gclassic.V().count().next() + a").all().get().get(0).getInt());
- assertEquals(6, client.submit("gmodern.V().map{it.get().value('name')}.count()").all().get().get(0).getInt());
- } finally {
- cluster.close();
- }
- }
-
- @Test
- public void shouldAuthorizeSessionsWithWebsocketTransport() throws Exception {
- final Cluster cluster = TestClientFactory.build().credentials("marko", "rainbow-dash").create();
- final Client client = cluster.connect("session1");
-
- try {
- assertEquals(2, client.submit("a = 4; 1+1").all().get().get(0).getInt());
- assertEquals(10, client.submit("gclassic.V().count().next() + a").all().get().get(0).getInt());
- assertEquals(6, client.submit("gmodern.V().map{it.get().value('name')}.count()").all().get().get(0).getInt());
- } finally {
- cluster.close();
- }
-
- Thread.sleep(1000);
-
- assertThat(logCaptor.getLogs().stream().anyMatch(m -> m.matches(
- "Encountered an error trying to close connection on session1 .*")), is(false));
- }
-
- @Test
- public void shouldFailBytecodeRequestWithAllowAllAuthenticator() {
- final Cluster cluster = TestClientFactory.build().create();
- try {
- final GraphTraversalSource g = AnonymousTraversalSource.traversal().withRemote(
- DriverRemoteConnection.using(cluster, "gclassic"));
- g.V().count().next();
- fail("Authorization without authentication should fail");
- } catch (Exception ex) {
- final ResponseException re = (ResponseException) ex.getCause();
- assertEquals(ResponseStatusCode.UNAUTHORIZED, re.getResponseStatusCode());
- assertEquals("Failed to authorize: User not authorized for bytecode requests on [gclassic].", re.getMessage());
- } finally {
- cluster.close();
- }
- }
-
- @Test
- public void shouldFailStringRequestWithAllowAllAuthenticator() {
- final Cluster cluster = TestClientFactory.build().create();
- final Client client = cluster.connect();
-
- try {
- client.submit("1+1").all().get();
- fail("Authorization without authentication should fail");
- } catch (Exception ex) {
- final ResponseException re = (ResponseException) ex.getCause();
- assertEquals(ResponseStatusCode.UNAUTHORIZED, re.getResponseStatusCode());
- assertEquals("Failed to authorize: User not authorized for string-based requests.", re.getMessage());
+ assertEquals(2, client.submit("g.inject(2)").all().get().get(0).getInt());
+ assertEquals(6, client.submit("g.V().count()", classic).all().get().get(0).getInt());
+ assertEquals(6, client.submit("g.V().values('name').count()", modern).all().get().get(0).getInt());
} finally {
cluster.close();
}
@@ -341,97 +143,16 @@
@Test
public void shouldAuthorizeWithHttpTransport() throws Exception {
final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpGet httpget = new HttpGet(TestClientFactory.createURLString("?gremlin=2-1"));
- httpget.addHeader("Authorization", "Basic " + encoder.encodeToString("marko:rainbow-dash".getBytes()));
+ final HttpPost httpPost = new HttpPost(TestClientFactory.createURLString());
+ httpPost.setEntity(new StringEntity("{\"gremlin\":\"g.inject(1)\"}", Consts.UTF_8));
+ httpPost.addHeader("Authorization", "Basic " + encoder.encodeToString("marko:rainbow-dash".getBytes()));
- try (final CloseableHttpResponse response = httpclient.execute(httpget)) {
+ try (final CloseableHttpResponse response = httpclient.execute(httpPost)) {
assertEquals(200, response.getStatusLine().getStatusCode());
assertEquals("application/json", response.getEntity().getContentType().getValue());
final String json = EntityUtils.toString(response.getEntity());
final JsonNode node = mapper.readTree(json);
- assertEquals(1, node.get("result").get("data").get(GraphSONTokens.VALUEPROP).get(0).get(GraphSONTokens.VALUEPROP).intValue());
- }
- }
-
- @Test
- public void shouldFailAuthorizeWithHttpTransport() throws Exception {
- final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpGet httpget = new HttpGet(TestClientFactory.createURLString("?gremlin=3-1"));
- httpget.addHeader("Authorization", "Basic " + encoder.encodeToString("stephen:password".getBytes()));
-
- try (final CloseableHttpResponse response = httpclient.execute(httpget)) {
- assertEquals(401, response.getStatusLine().getStatusCode());
- }
- // wait for logger to flush - (don't think there is a way to detect this)
- stopServer();
- Thread.sleep(1000);
-
- assertThat(logCaptor.getLogs().stream().anyMatch(m -> m.matches(
- "User stephen with address .+? attempted an unauthorized http request: 3-1")), is(true));
- }
-
- @Test
- public void shouldKeepAuthorizingWithHttpTransport() throws Exception {
- HttpGet httpget;
- final CloseableHttpClient httpclient = HttpClients.createDefault();
-
- httpget = new HttpGet(TestClientFactory.createURLString("?gremlin=4-1"));
- httpget.addHeader("Authorization", "Basic " + encoder.encodeToString("marko:rainbow-dash".getBytes()));
- try (final CloseableHttpResponse response = httpclient.execute(httpget)) {
- assertEquals(200, response.getStatusLine().getStatusCode());
- assertEquals("application/json", response.getEntity().getContentType().getValue());
- final String json = EntityUtils.toString(response.getEntity());
- final JsonNode node = mapper.readTree(json);
- assertEquals(3, node.get("result").get("data").get(GraphSONTokens.VALUEPROP).get(0).get(GraphSONTokens.VALUEPROP).intValue());
- }
-
- httpget = new HttpGet(TestClientFactory.createURLString("?gremlin=5-1"));
- httpget.addHeader("Authorization", "Basic " + encoder.encodeToString("stephen:password".getBytes()));
- try (final CloseableHttpResponse response = httpclient.execute(httpget)) {
- assertEquals(401, response.getStatusLine().getStatusCode());
- }
-
- httpget = new HttpGet(TestClientFactory.createURLString("?gremlin=6-1"));
- httpget.addHeader("Authorization", "Basic " + encoder.encodeToString("marko:rainbow-dash".getBytes()));
- try (final CloseableHttpResponse response = httpclient.execute(httpget)) {
- assertEquals(200, response.getStatusLine().getStatusCode());
- assertEquals("application/json", response.getEntity().getContentType().getValue());
- final String json = EntityUtils.toString(response.getEntity());
- final JsonNode node = mapper.readTree(json);
- assertEquals(5, node.get("result").get("data").get(GraphSONTokens.VALUEPROP).get(0).get(GraphSONTokens.VALUEPROP).intValue());
- }
- }
-
- @Test
- public void shouldAuthorizeWithAllowAllAuthenticatorAndHttpTransport() throws Exception {
- final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpGet httpget = new HttpGet(TestClientFactory.createURLString("?gremlin=7-1"));
-
- try (final CloseableHttpResponse response = httpclient.execute(httpget)) {
- assertEquals(200, response.getStatusLine().getStatusCode());
- assertEquals("application/json", response.getEntity().getContentType().getValue());
- final String json = EntityUtils.toString(response.getEntity());
- final JsonNode node = mapper.readTree(json);
- assertEquals(6, node.get("result").get("data").get(GraphSONTokens.VALUEPROP).get(0).get(GraphSONTokens.VALUEPROP).intValue());
- }
- }
-
- @Test
- public void shouldRespectTimeoutWithAuth() {
- final Cluster cluster = TestClientFactory.build().credentials("stephen", "password").create();
- final GraphTraversalSource g = AnonymousTraversalSource.traversal().withRemote(
- DriverRemoteConnection.using(cluster, "gmodern"));
- final Instant instant = Instant.now();
- try {
- g.with("evaluationTimeout", DEFAULT_EVALUATION_TIMEOUT / 20).
- V().
- repeat(__.both()).
- until(__.count().is(0)).
- toList();
- } catch (final CompletionException e) {
- Assert.assertTrue(Instant.now().toEpochMilli() - instant.toEpochMilli() < DEFAULT_EVALUATION_TIMEOUT / 2);
- } finally {
- cluster.close();
+ assertEquals(1, node.get("result").get(SerTokens.TOKEN_DATA).get(GraphSONTokens.VALUEPROP).get(0).get(GraphSONTokens.VALUEPROP).intValue());
}
}
}
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java
index 6476580..cf10a4d 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java
@@ -20,56 +20,74 @@
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
+import io.netty.buffer.UnpooledByteBufAllocator;
import org.apache.commons.lang3.RandomStringUtils;
+import org.apache.http.Consts;
+import org.apache.http.Header;
import org.apache.http.HttpEntity;
import org.apache.http.HttpHeaders;
-import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1;
-import org.apache.tinkerpop.gremlin.util.Tokens;
-import org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV1;
-import org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV2;
-import org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3;
-import org.apache.tinkerpop.gremlin.util.ser.GraphSONUntypedMessageSerializerV1;
-import org.apache.tinkerpop.gremlin.util.ser.GraphSONUntypedMessageSerializerV2;
-import org.apache.tinkerpop.gremlin.util.ser.GraphSONUntypedMessageSerializerV3;
-import org.apache.tinkerpop.gremlin.util.ser.SerTokens;
-import org.apache.tinkerpop.gremlin.server.auth.SimpleAuthenticator;
-import org.apache.tinkerpop.gremlin.server.channel.HttpChannelizer;
-import org.apache.http.Consts;
+import org.apache.http.HttpVersion;
+import org.apache.http.client.config.RequestConfig;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpPost;
+import org.apache.http.conn.EofSensorInputStream;
+import org.apache.http.entity.ByteArrayEntity;
+import org.apache.http.entity.HttpEntityWrapper;
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
+import org.apache.http.impl.io.ChunkedInputStream;
import org.apache.http.util.EntityUtils;
-import org.apache.tinkerpop.gremlin.server.handler.SaslAndHttpBasicAuthenticationHandler;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.io.binary.TypeSerializerRegistry;
+import org.apache.tinkerpop.gremlin.process.traversal.GremlinLang;
+import org.apache.tinkerpop.gremlin.server.auth.SimpleAuthenticator;
+import org.apache.tinkerpop.gremlin.server.channel.HttpChannelizer;
+import org.apache.tinkerpop.gremlin.server.handler.HttpBasicAuthenticationHandler;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens;
+import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV4;
+import org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV4;
+import org.apache.tinkerpop.gremlin.util.ser.GraphSONUntypedMessageSerializerV4;
+import org.apache.tinkerpop.gremlin.util.ser.SerTokens;
+import org.apache.tinkerpop.gremlin.util.ser.Serializers;
import org.apache.tinkerpop.shaded.jackson.databind.JsonNode;
import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
+import org.junit.Assert;
import org.junit.Test;
+import javax.script.SimpleBindings;
import java.io.IOException;
-import java.time.Instant;
+import java.io.InputStream;
+import java.lang.reflect.Field;
+import java.time.OffsetDateTime;
import java.util.Base64;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.UUID;
import java.util.concurrent.Callable;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
+import static org.apache.tinkerpop.gremlin.server.handler.HttpRequestIdHandler.REQUEST_ID_HEADER_NAME;
+import static org.apache.tinkerpop.gremlin.util.Tokens.ARGS_MATERIALIZE_PROPERTIES;
+import static org.apache.tinkerpop.gremlin.util.Tokens.MATERIALIZE_PROPERTIES_ALL;
+import static org.apache.tinkerpop.gremlin.util.Tokens.MATERIALIZE_PROPERTIES_TOKENS;
+import static org.apache.tinkerpop.gremlin.util.Tokens.TIMEOUT_MS;
+import static org.apache.tinkerpop.gremlin.util.ser.SerTokens.TOKEN_DATA;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.Is.is;
-import static org.hamcrest.core.IsInstanceOf.instanceOf;
-import static org.hamcrest.core.StringContains.containsString;
import static org.hamcrest.core.StringRegularExpression.matchesRegex;
import static org.hamcrest.core.StringStartsWith.startsWith;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
/**
* Integration tests for server-side settings and processing.
@@ -90,7 +108,7 @@
final String nameOfTest = name.getMethodName();
switch (nameOfTest) {
case "should413OnPostWithResultTooLarge":
- settings.maxContentLength = 31;
+ settings.maxRequestContentLength = 31;
break;
case "should200OnPOSTTransactionalGraph":
useTinkerTransactionGraph(settings);
@@ -99,46 +117,12 @@
useTinkerTransactionGraph(settings);
settings.strictTransactionManagement = true;
break;
- case "should200OnPOSTWithGraphSON1d0AcceptHeaderDefaultResultToJson":
+ case "should200OnPOSTWithGraphSON4d0AcceptHeaderDefaultResultToJson":
settings.serializers.clear();
- final Settings.SerializerSettings serializerSettingsV1 = new Settings.SerializerSettings();
- serializerSettingsV1.className = GraphSONUntypedMessageSerializerV1.class.getName();
- settings.serializers.add(serializerSettingsV1);
+ final Settings.SerializerSettings serializerSettingsV4 = new Settings.SerializerSettings();
+ serializerSettingsV4.className = GraphSONUntypedMessageSerializerV4.class.getName();
+ settings.serializers.add(serializerSettingsV4);
break;
- case "should200OnPOSTWithGraphSON2d0AcceptHeaderDefaultResultToJson":
- settings.serializers.clear();
- final Settings.SerializerSettings serializerSettingsV2 = new Settings.SerializerSettings();
- serializerSettingsV2.className = GraphSONMessageSerializerV2.class.getName();
- settings.serializers.add(serializerSettingsV2);
- break;
- case "should200OnPOSTWithGraphSON3d0AcceptHeaderDefaultResultToJson":
- settings.serializers.clear();
- final Settings.SerializerSettings serializerSettingsV3 = new Settings.SerializerSettings();
- serializerSettingsV3.className = GraphSONMessageSerializerV3.class.getName();
- settings.serializers.add(serializerSettingsV3);
- break;
- case "should200OnPOSTWithAnyGraphSONAcceptHeaderDefaultResultToJson":
- settings.serializers.clear();
- final Settings.SerializerSettings serializerSettingsUntypedV1 = new Settings.SerializerSettings();
- serializerSettingsUntypedV1.className = GraphSONUntypedMessageSerializerV1.class.getName();
- settings.serializers.add(serializerSettingsUntypedV1);
- final Settings.SerializerSettings serializerSettingsTypedV1 = new Settings.SerializerSettings();
- serializerSettingsTypedV1.className = GraphSONMessageSerializerV1.class.getName();
- settings.serializers.add(serializerSettingsTypedV1);
- final Settings.SerializerSettings serializerSettingsUntypedV2 = new Settings.SerializerSettings();
- serializerSettingsUntypedV2.className = GraphSONUntypedMessageSerializerV2.class.getName();
- settings.serializers.add(serializerSettingsUntypedV2);
- final Settings.SerializerSettings serializerSettingsTypedV2 = new Settings.SerializerSettings();
- serializerSettingsTypedV2.className = GraphSONMessageSerializerV2.class.getName();
- settings.serializers.add(serializerSettingsTypedV2);
- final Settings.SerializerSettings serializerSettingsUntypedV3 = new Settings.SerializerSettings();
- serializerSettingsUntypedV3.className = GraphSONUntypedMessageSerializerV3.class.getName();
- settings.serializers.add(serializerSettingsUntypedV3);
- final Settings.SerializerSettings serializerSettingsTypedV3 = new Settings.SerializerSettings();
- serializerSettingsTypedV3.className = GraphSONMessageSerializerV3.class.getName();
- settings.serializers.add(serializerSettingsTypedV3);
- break;
- case "should401OnGETWithNoAuthorizationHeader":
case "should401OnPOSTWithNoAuthorizationHeader":
case "should401OnGETWithBadAuthorizationHeader":
case "should401OnPOSTWithBadAuthorizationHeader":
@@ -146,17 +130,25 @@
case "should401OnPOSTWithBadEncodedAuthorizationHeader":
case "should401OnGETWithInvalidPasswordAuthorizationHeader":
case "should401OnPOSTWithInvalidPasswordAuthorizationHeader":
- case "should200OnGETWithAuthorizationHeader":
case "should200OnPOSTWithAuthorizationHeaderExplicitHandlerSetting":
configureForAuthenticationWithHandlerClass(settings);
break;
case "should200OnPOSTWithAuthorizationHeader":
configureForAuthentication(settings);
break;
- case "should500OnGETWithEvaluationTimeout":
+ case "should500OnPOSTWithEvaluationTimeout":
settings.evaluationTimeout = 5000;
settings.gremlinPool = 1;
break;
+ case "should200OnPOSTWithChunkedResponse":
+ case "shouldHandleErrorsInFirstChunkPOSTWithChunkedResponse":
+ case "shouldHandleErrorsInFirstChunkPOSTWithChunkedResponseUsingTextPlain":
+ case "shouldHandleErrorsNotInFirstChunkPOSTWithChunkedResponse":
+ case "shouldHandleErrorsNotInFirstChunkPOSTWithChunkedResponseUsingTextPlain":
+ case "should200OnPOSTWithChunkedResponseGraphBinary":
+ case "should200OnPOSTWithChunkedResponseUsingTextPlain":
+ settings.resultIterationBatchSize = 16;
+ break;
}
return settings;
}
@@ -164,7 +156,7 @@
private void configureForAuthentication(final Settings settings) {
final Settings.AuthenticationSettings authSettings = new Settings.AuthenticationSettings();
authSettings.authenticator = SimpleAuthenticator.class.getName();
- authSettings.authenticationHandler = SaslAndHttpBasicAuthenticationHandler.class.getName();
+ authSettings.authenticationHandler = HttpBasicAuthenticationHandler.class.getName();
// use a credentials graph with two users in it: stephen/password and marko/rainbow-dash
final Map<String,Object> authConfig = new HashMap<>();
@@ -179,7 +171,7 @@
authSettings.authenticator = SimpleAuthenticator.class.getName();
//Add basic auth handler to make sure the reflection code path works.
- authSettings.authenticationHandler = SaslAndHttpBasicAuthenticationHandler.class.getName();
+ authSettings.authenticationHandler = HttpBasicAuthenticationHandler.class.getName();
// use a credentials graph with two users in it: stephen/password and marko/rainbow-dash
final Map<String,Object> authConfig = new HashMap<>();
@@ -195,7 +187,7 @@
final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
httppost.addHeader("Content-Type", "application/json");
final String bigPost = RandomStringUtils.random(32);
- httppost.setEntity(new StringEntity("{\"gremlin\":\""+ bigPost + "\", \"bindings\":{\"x\":\"10\"}}", Consts.UTF_8));
+ httppost.setEntity(new StringEntity("{\"gremlin\":\""+ String.format("g.inject('%s')", bigPost) + "\", \"bindings\":{\"x\":\"10\"}}", Consts.UTF_8));
try (final CloseableHttpResponse response = httpclient.execute(httppost)) {
assertEquals(413, response.getStatusLine().getStatusCode());
@@ -203,12 +195,14 @@
}
@Test
- public void should401OnGETWithNoAuthorizationHeader() throws Exception {
+ public void should405OnGETRequest() throws Exception {
+ // /gremlin endpoint only allows POST request for now until GET is implemented to return status
final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpGet httpget = new HttpGet(TestClientFactory.createURLString("?gremlin=2-1"));
+ final HttpGet httpget = new HttpGet(TestClientFactory.createURLString());
try (final CloseableHttpResponse response = httpclient.execute(httpget)) {
- assertEquals(401, response.getStatusLine().getStatusCode());
+ assertEquals(405, response.getStatusLine().getStatusCode());
+ assertTrue(response.containsHeader(REQUEST_ID_HEADER_NAME));
}
}
@@ -217,29 +211,18 @@
final CloseableHttpClient httpclient = HttpClients.createDefault();
final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
httppost.addHeader("Content-Type", "application/json");
- httppost.setEntity(new StringEntity("{\"gremlin\":\"2-1\"}", Consts.UTF_8));
+ httppost.setEntity(new StringEntity("{\"gremlin\":\"g.inject(1)\"}", Consts.UTF_8));
try (final CloseableHttpResponse response = httpclient.execute(httppost)) {
assertEquals(401, response.getStatusLine().getStatusCode());
- }
- }
-
- @Test
- public void should400OnPOSTWithNonUUIDRequestId() throws Exception {
- final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
- httppost.addHeader("Content-Type", "application/json");
- httppost.setEntity(new StringEntity("{\"gremlin\":\"2-1\", \"requestId\":\"nonsense\"}", Consts.UTF_8));
-
- try (final CloseableHttpResponse response = httpclient.execute(httppost)) {
- assertEquals(400, response.getStatusLine().getStatusCode());
+ assertTrue(response.containsHeader(REQUEST_ID_HEADER_NAME));
}
}
@Test
public void should401OnGETWithBadAuthorizationHeader() throws Exception {
final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpGet httpget = new HttpGet(TestClientFactory.createURLString("?gremlin=2-1"));
+ final HttpGet httpget = new HttpGet(TestClientFactory.createURLString("?gremlin=g.inject(1)"));
httpget.addHeader("Authorization", "not-base-64-encoded");
try (final CloseableHttpResponse response = httpclient.execute(httpget)) {
@@ -253,7 +236,7 @@
final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
httppost.addHeader("Content-Type", "application/json");
httppost.addHeader("Authorization", "not-base-64-encoded");
- httppost.setEntity(new StringEntity("{\"gremlin\":\"2-1\"}", Consts.UTF_8));
+ httppost.setEntity(new StringEntity("{\"gremlin\":\"g.inject(1)\"}", Consts.UTF_8));
try (final CloseableHttpResponse response = httpclient.execute(httppost)) {
assertEquals(401, response.getStatusLine().getStatusCode());
@@ -263,7 +246,7 @@
@Test
public void should401OnGETWithBadEncodedAuthorizationHeader() throws Exception {
final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpGet httpget = new HttpGet(TestClientFactory.createURLString("?gremlin=2-1"));
+ final HttpGet httpget = new HttpGet(TestClientFactory.createURLString("?gremlin=g.inject(1)"));
httpget.addHeader("Authorization", "Basic: not-base-64-encoded");
try (final CloseableHttpResponse response = httpclient.execute(httpget)) {
@@ -277,7 +260,7 @@
final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
httppost.addHeader("Content-Type", "application/json");
httppost.addHeader("Authorization", "Basic: not-base-64-encoded");
- httppost.setEntity(new StringEntity("{\"gremlin\":\"2-1\"}", Consts.UTF_8));
+ httppost.setEntity(new StringEntity("{\"gremlin\":\"g.inject(1)\"}", Consts.UTF_8));
try (final CloseableHttpResponse response = httpclient.execute(httppost)) {
assertEquals(401, response.getStatusLine().getStatusCode());
@@ -287,7 +270,7 @@
@Test
public void should401OnGETWithInvalidPasswordAuthorizationHeader() throws Exception {
final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpGet httpget = new HttpGet(TestClientFactory.createURLString("?gremlin=2-1"));
+ final HttpGet httpget = new HttpGet(TestClientFactory.createURLString("?gremlin=g.inject(1)"));
httpget.addHeader("Authorization", "Basic " + encoder.encodeToString("stephen:not-my-password".getBytes()));
try (final CloseableHttpResponse response = httpclient.execute(httpget)) {
@@ -301,7 +284,7 @@
final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
httppost.addHeader("Content-Type", "application/json");
httppost.addHeader("Authorization", "Basic " + encoder.encodeToString("stephen:not-my-password".getBytes()));
- httppost.setEntity(new StringEntity("{\"gremlin\":\"2-1\"}", Consts.UTF_8));
+ httppost.setEntity(new StringEntity("{\"gremlin\":\"g.inject(1)\"}", Consts.UTF_8));
try (final CloseableHttpResponse response = httpclient.execute(httppost)) {
assertEquals(401, response.getStatusLine().getStatusCode());
@@ -309,34 +292,19 @@
}
@Test
- public void should200OnGETWithAuthorizationHeader() throws Exception {
- final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpGet httpget = new HttpGet(TestClientFactory.createURLString("?gremlin=2-1"));
- httpget.addHeader("Authorization", "Basic " + encoder.encodeToString("stephen:password".getBytes()));
-
- try (final CloseableHttpResponse response = httpclient.execute(httpget)) {
- assertEquals(200, response.getStatusLine().getStatusCode());
- assertEquals("application/json", response.getEntity().getContentType().getValue());
- final String json = EntityUtils.toString(response.getEntity());
- final JsonNode node = mapper.readTree(json);
- assertEquals(1, node.get("result").get("data").get(GraphSONTokens.VALUEPROP).get(0).get(GraphSONTokens.VALUEPROP).intValue());
- }
- }
-
- @Test
public void should200OnPOSTWithAuthorizationHeader() throws Exception {
final CloseableHttpClient httpclient = HttpClients.createDefault();
final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
httppost.addHeader("Content-Type", "application/json");
httppost.addHeader("Authorization", "Basic " + encoder.encodeToString("stephen:password".getBytes()));
- httppost.setEntity(new StringEntity("{\"gremlin\":\"2-1\"}", Consts.UTF_8));
+ httppost.setEntity(new StringEntity("{\"gremlin\":\"g.inject(1)\"}", Consts.UTF_8));
try (final CloseableHttpResponse response = httpclient.execute(httppost)) {
assertEquals(200, response.getStatusLine().getStatusCode());
assertEquals("application/json", response.getEntity().getContentType().getValue());
final String json = EntityUtils.toString(response.getEntity());
final JsonNode node = mapper.readTree(json);
- assertEquals(1, node.get("result").get("data").get(GraphSONTokens.VALUEPROP).get(0).get(GraphSONTokens.VALUEPROP).intValue());
+ assertEquals(1, node.get("result").get(TOKEN_DATA).get(GraphSONTokens.VALUEPROP).get(0).get(GraphSONTokens.VALUEPROP).intValue());
}
}
@@ -346,110 +314,136 @@
final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
httppost.addHeader("Content-Type", "application/json");
httppost.addHeader("Authorization", "Basic " + encoder.encodeToString("stephen:password".getBytes()));
- httppost.setEntity(new StringEntity("{\"gremlin\":\"2-1\"}", Consts.UTF_8));
+ httppost.setEntity(new StringEntity("{\"gremlin\":\"g.inject(1)\"}", Consts.UTF_8));
try (final CloseableHttpResponse response = httpclient.execute(httppost)) {
assertEquals(200, response.getStatusLine().getStatusCode());
assertEquals("application/json", response.getEntity().getContentType().getValue());
final String json = EntityUtils.toString(response.getEntity());
final JsonNode node = mapper.readTree(json);
- assertEquals(1, node.get("result").get("data").get(GraphSONTokens.VALUEPROP).get(0).get(GraphSONTokens.VALUEPROP).intValue());
+ assertEquals(1, node.get("result").get(TOKEN_DATA).get(GraphSONTokens.VALUEPROP).get(0).get(GraphSONTokens.VALUEPROP).intValue());
}
}
@Test
- public void should200OnGETWithGremlinQueryStringArgumentWithBindingsAndFunction() throws Exception {
+ public void should200OnPOSTWithGremlinQueryStringArgumentWithBindingsAndFunction() throws Exception {
final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpGet httpget = new HttpGet(TestClientFactory.createURLString("?gremlin=addItUp(Integer.parseInt(x),Integer.parseInt(y))&bindings.x=10&bindings.y=10"));
+ final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
+ httppost.setEntity(new StringEntity("{\"gremlin\":\"addItUp(Integer.parseInt(x),Integer.parseInt(y))\",\"language\":\"gremlin-groovy\",\"bindings\":{\"x\":\"10\", \"y\":\"10\"}}", Consts.UTF_8));
- try (final CloseableHttpResponse response = httpclient.execute(httpget)) {
+ try (final CloseableHttpResponse response = httpclient.execute(httppost)) {
assertEquals(200, response.getStatusLine().getStatusCode());
assertEquals("application/json", response.getEntity().getContentType().getValue());
final String json = EntityUtils.toString(response.getEntity());
final JsonNode node = mapper.readTree(json);
- assertEquals(20, node.get("result").get("data").get(GraphSONTokens.VALUEPROP).get(0).get(GraphSONTokens.VALUEPROP).intValue());
+ assertEquals(20, node.get("result").get(TOKEN_DATA).get(GraphSONTokens.VALUEPROP).get(0).get(GraphSONTokens.VALUEPROP).intValue());
}
}
@Test
- public void should200OnGETOverGremlinLangWithGremlinQueryStringArgumentWithIteratorResult() throws Exception {
+ public void should200OnPOSTOverGremlinLangWithGremlinQueryStringArgumentWithIteratorResult() throws Exception {
final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpGet httpget = new HttpGet(TestClientFactory.createURLString("?gremlin=g.inject(111)&language=gremlin-lang"));
+ final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
+ httppost.setEntity(new StringEntity("{\"gremlin\":\"g.inject(111)\",\"language\":\"gremlin-lang\"}", Consts.UTF_8));
- try (final CloseableHttpResponse response = httpclient.execute(httpget)) {
+ try (final CloseableHttpResponse response = httpclient.execute(httppost)) {
assertEquals(200, response.getStatusLine().getStatusCode());
assertEquals("application/json", response.getEntity().getContentType().getValue());
final String json = EntityUtils.toString(response.getEntity());
final JsonNode node = mapper.readTree(json);
- assertEquals(111, node.get("result").get("data").get(GraphSONTokens.VALUEPROP).get(0).get(GraphSONTokens.VALUEPROP).intValue());
+ assertEquals(111, node.get("result").get(TOKEN_DATA).get(GraphSONTokens.VALUEPROP).get(0).get(GraphSONTokens.VALUEPROP).intValue());
}
}
@Test
- public void should200OnGETWithGremlinQueryStringArgumentWithIteratorResult() throws Exception {
- final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpGet httpget = new HttpGet(TestClientFactory.createURLString("?gremlin=gclassic.V()"));
+ public void shouldHaveSameVertexResultsWithGremlinLangOrGremlinGroovy() throws Exception {
+ String gremlinLangResult;
+ String gremlinGroovyResult;
- try (final CloseableHttpResponse response = httpclient.execute(httpget)) {
+ final CloseableHttpClient httpclient = HttpClients.createDefault();
+ final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
+ httppost.setEntity(new StringEntity("{\"gremlin\":\"g.V()\",\"language\":\"gremlin-lang\",\"g\":\"gmodern\"}", Consts.UTF_8));
+
+ try (final CloseableHttpResponse response = httpclient.execute(httppost)) {
assertEquals(200, response.getStatusLine().getStatusCode());
assertEquals("application/json", response.getEntity().getContentType().getValue());
final String json = EntityUtils.toString(response.getEntity());
final JsonNode node = mapper.readTree(json);
- assertEquals(6, node.get("result").get("data").get(GraphSONTokens.VALUEPROP).size());
+ gremlinLangResult = node.get("result").get(TOKEN_DATA).get(GraphSONTokens.VALUEPROP).toString();
}
- }
- @Test
- public void should200OnGETWithGremlinQueryStringArgumentWithIteratorResultGraphBinary() throws Exception {
- final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpGet httpget = new HttpGet(TestClientFactory.createURLString("?gremlin=gclassic.V()"));
- final String mime = SerTokens.MIME_GRAPHBINARY_V1;
- httpget.addHeader("Accept", mime);
-
- try (final CloseableHttpResponse response = httpclient.execute(httpget)) {
+ httppost.setEntity(new StringEntity("{\"gremlin\":\"g.V()\",\"language\":\"gremlin-groovy\",\"g\":\"gmodern\"}", Consts.UTF_8));
+ try (final CloseableHttpResponse response = httpclient.execute(httppost)) {
assertEquals(200, response.getStatusLine().getStatusCode());
- assertEquals(mime, response.getEntity().getContentType().getValue());
-
- final GraphBinaryMessageSerializerV1 serializer = new GraphBinaryMessageSerializerV1(TypeSerializerRegistry.INSTANCE);
- final ResponseMessage msg = serializer.deserializeResponse(toByteBuf(response.getEntity()));
- final List<Object> data = (List<Object>) msg.getResult().getData();
- assertEquals(6, data.size());
- for (Object o : data) {
- assertThat(o, instanceOf(Vertex.class));
- }
+ assertEquals("application/json", response.getEntity().getContentType().getValue());
+ final String json = EntityUtils.toString(response.getEntity());
+ final JsonNode node = mapper.readTree(json);
+ gremlinGroovyResult = node.get("result").get(TOKEN_DATA).get(GraphSONTokens.VALUEPROP).toString();
}
+
+ assertEquals(gremlinGroovyResult, gremlinLangResult);
}
@Test
- public void should200OnGETWithGremlinQueryStringArgumentWithIteratorResultGraphBinaryToString() throws Exception {
- final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpGet httpget = new HttpGet(TestClientFactory.createURLString("?gremlin=gclassic.V()"));
- final String mime = SerTokens.MIME_GRAPHBINARY_V1 + "-stringd";
- httpget.addHeader("Accept", mime);
+ public void shouldNotHaveBindingsAffectLaterQueries() throws Exception {
+ final String firstResult;
+ final String secondResult;
- try (final CloseableHttpResponse response = httpclient.execute(httpget)) {
+ final CloseableHttpClient httpclient = HttpClients.createDefault();
+ final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
+
+ httppost.setEntity(new StringEntity("{\"gremlin\":\"g.V()\"}", Consts.UTF_8));
+ try (final CloseableHttpResponse response = httpclient.execute(httppost)) {
assertEquals(200, response.getStatusLine().getStatusCode());
- assertEquals(mime, response.getEntity().getContentType().getValue());
+ assertEquals("application/json", response.getEntity().getContentType().getValue());
+ final String json = EntityUtils.toString(response.getEntity());
+ final JsonNode node = mapper.readTree(json);
+ firstResult = node.get("result").get(TOKEN_DATA).get(GraphSONTokens.VALUEPROP).toString();
+ }
- final GraphBinaryMessageSerializerV1 serializer = new GraphBinaryMessageSerializerV1(TypeSerializerRegistry.INSTANCE);
- final ResponseMessage msg = serializer.deserializeResponse(toByteBuf(response.getEntity()));
- final List<Object> data = (List<Object>) msg.getResult().getData();
- assertEquals(6, data.size());
- for (Object o : data) {
- assertThat(o, instanceOf(String.class));
- assertThat((String) o, matchesRegex("v\\[\\d\\]"));
- }
+ httppost.setEntity(new StringEntity("{\"gremlin\":\"g.V()\",\"g\":\"gmodern\"}", Consts.UTF_8));
+ try (final CloseableHttpResponse response = httpclient.execute(httppost)) {
+ assertEquals(200, response.getStatusLine().getStatusCode());
+ assertEquals("application/json", response.getEntity().getContentType().getValue());
+ EntityUtils.toString(response.getEntity());
+ }
+
+ httppost.setEntity(new StringEntity("{\"gremlin\":\"g.V()\"}", Consts.UTF_8));
+ try (final CloseableHttpResponse response = httpclient.execute(httppost)) {
+ assertEquals(200, response.getStatusLine().getStatusCode());
+ assertEquals("application/json", response.getEntity().getContentType().getValue());
+ final String json = EntityUtils.toString(response.getEntity());
+ final JsonNode node = mapper.readTree(json);
+ secondResult = node.get("result").get(TOKEN_DATA).get(GraphSONTokens.VALUEPROP).toString();
+ }
+
+ assertEquals(firstResult, secondResult);
+ }
+
+ @Test
+ public void should200OnPOSTWithGremlinQueryStringArgumentWithIteratorResult() throws Exception {
+ final CloseableHttpClient httpclient = HttpClients.createDefault();
+ final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
+ httppost.setEntity(new StringEntity("{\"gremlin\":\"g.V()\",\"g\":\"gclassic\"}", Consts.UTF_8));
+
+ try (final CloseableHttpResponse response = httpclient.execute(httppost)) {
+ assertEquals(200, response.getStatusLine().getStatusCode());
+ assertEquals("application/json", response.getEntity().getContentType().getValue());
+ final String json = EntityUtils.toString(response.getEntity());
+ final JsonNode node = mapper.readTree(json);
+ assertEquals(6, node.get("result").get(TOKEN_DATA).get(GraphSONTokens.VALUEPROP).size());
}
}
@Test
- public void should200OnGETWithGremlinQueryStringArgumentWithIteratorResultTextPlain() throws Exception {
+ public void should200OnPOSTWithGremlinQueryStringArgumentWithIteratorResultTextPlain() throws Exception {
final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpGet httpget = new HttpGet(TestClientFactory.createURLString("?gremlin=gclassic.V()"));
+ final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
+ httppost.setEntity(new StringEntity("{\"gremlin\":\"g.V()\",\"g\":\"gclassic\"}", Consts.UTF_8));
final String mime = "text/plain";
- httpget.addHeader("Accept", mime);
+ httppost.addHeader("Accept", mime);
- try (final CloseableHttpResponse response = httpclient.execute(httpget)) {
+ try (final CloseableHttpResponse response = httpclient.execute(httppost)) {
assertEquals(200, response.getStatusLine().getStatusCode());
assertEquals(mime, response.getEntity().getContentType().getValue());
final String text = EntityUtils.toString(response.getEntity());
@@ -462,96 +456,18 @@
}
@Test
- public void should200OnGETWithGremlinQueryStringArgument() throws Exception {
- final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpGet httpget = new HttpGet(TestClientFactory.createURLString("?gremlin=2-1"));
-
- try (final CloseableHttpResponse response = httpclient.execute(httpget)) {
- assertEquals(200, response.getStatusLine().getStatusCode());
- assertEquals("application/json", response.getEntity().getContentType().getValue());
- final String json = EntityUtils.toString(response.getEntity());
- final JsonNode node = mapper.readTree(json);
- assertEquals(1, node.get("result").get("data").get(GraphSONTokens.VALUEPROP).get(0).get(GraphSONTokens.VALUEPROP).intValue());
- }
- }
-
- @Test
- public void should200OnGETWithGremlinQueryStringArgumentReturningVertex() throws Exception {
- final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpGet httpget = new HttpGet(TestClientFactory.createURLString("?gremlin=graph.addVertex('name','stephen')"));
-
- try (final CloseableHttpResponse response = httpclient.execute(httpget)) {
- assertEquals(200, response.getStatusLine().getStatusCode());
- assertEquals("application/json", response.getEntity().getContentType().getValue());
- final String json = EntityUtils.toString(response.getEntity());
- final JsonNode node = mapper.readTree(json);
- assertEquals("stephen", node.get("result").get("data").get(GraphSONTokens.VALUEPROP).get(0).get(GraphSONTokens.VALUEPROP).get("properties").get("name").get(0).get(GraphSONTokens.VALUEPROP).get(GraphSONTokens.VALUE).asText());
- }
- }
-
- @Test
- public void should200OnGETWithGremlinQueryStringArgumentWithBindings() throws Exception {
- final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpGet httpget = new HttpGet(TestClientFactory.createURLString("?gremlin=Integer.parseInt(x)%2BInteger.parseInt(y)&bindings.x=10&bindings.y=10"));
-
- try (final CloseableHttpResponse response = httpclient.execute(httpget)) {
- assertEquals(200, response.getStatusLine().getStatusCode());
- assertEquals("application/json", response.getEntity().getContentType().getValue());
- final String json = EntityUtils.toString(response.getEntity());
- final JsonNode node = mapper.readTree(json);
- assertEquals(20, node.get("result").get("data").get(GraphSONTokens.VALUEPROP).get(0).get(GraphSONTokens.VALUEPROP).intValue());
- }
- }
-
- @Test
- public void should400OnGETWithNoGremlinQueryStringArgument() throws Exception {
- final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpGet httpget = new HttpGet(TestClientFactory.createURLString());
-
- try (final CloseableHttpResponse response = httpclient.execute(httpget)) {
- assertEquals(400, response.getStatusLine().getStatusCode());
- }
- }
-
- @Test
- public void should200OnGETWithAnyAcceptHeaderDefaultResultToJson() throws Exception {
- final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpGet httpget = new HttpGet(TestClientFactory.createURLString("?gremlin=2-1"));
- httpget.addHeader("Accept", "*/*");
-
- try (final CloseableHttpResponse response = httpclient.execute(httpget)) {
- assertEquals(200, response.getStatusLine().getStatusCode());
- assertEquals("application/json", response.getEntity().getContentType().getValue());
- final String json = EntityUtils.toString(response.getEntity());
- final JsonNode node = mapper.readTree(json);
- assertEquals(1, node.get("result").get("data").get(GraphSONTokens.VALUEPROP).get(0).get(GraphSONTokens.VALUEPROP).asInt());
- }
- }
-
- @Test
- public void should400OnGETWithBadAcceptHeader() throws Exception {
- final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpGet httpget = new HttpGet(TestClientFactory.createURLString("?gremlin=2-1"));
- httpget.addHeader("Accept", "application/json+something-else-that-does-not-exist");
-
- try (final CloseableHttpResponse response = httpclient.execute(httpget)) {
- assertEquals(400, response.getStatusLine().getStatusCode());
- }
- }
-
- @Test
public void should200OnPOSTWithGremlinJsonEndcodedBody() throws Exception {
final CloseableHttpClient httpclient = HttpClients.createDefault();
final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
httppost.addHeader("Content-Type", "application/json");
- httppost.setEntity(new StringEntity("{\"gremlin\":\"2-1\"}", Consts.UTF_8));
+ httppost.setEntity(new StringEntity("{\"gremlin\":\"g.inject(1)\"}", Consts.UTF_8));
try (final CloseableHttpResponse response = httpclient.execute(httppost)) {
assertEquals(200, response.getStatusLine().getStatusCode());
assertEquals("application/json", response.getEntity().getContentType().getValue());
final String json = EntityUtils.toString(response.getEntity());
final JsonNode node = mapper.readTree(json);
- assertEquals(1, node.get("result").get("data").get(GraphSONTokens.VALUEPROP).get(0).get(GraphSONTokens.VALUEPROP).intValue());
+ assertEquals(1, node.get("result").get(TOKEN_DATA).get(GraphSONTokens.VALUEPROP).get(0).get(GraphSONTokens.VALUEPROP).intValue());
}
}
@@ -562,20 +478,19 @@
final CloseableHttpClient httpclient = HttpClients.createDefault();
final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
httppost.addHeader("Content-Type", "application/json");
- httppost.setEntity(new StringEntity("{\"gremlin\":\"java.time.Instant.MAX\"}", Consts.UTF_8));
+ httppost.setEntity(new StringEntity("{\"gremlin\":\"java.time.OffsetDateTime.MAX\", \"language\":\"gremlin-groovy\"}", Consts.UTF_8));
try (final CloseableHttpResponse response = httpclient.execute(httppost)) {
assertEquals(200, response.getStatusLine().getStatusCode());
assertEquals("application/json", response.getEntity().getContentType().getValue());
final String json = EntityUtils.toString(response.getEntity());
final JsonNode node = mapper.readTree(json);
- assertEquals(Instant.MAX, Instant.parse(node.get("result").get("data").get(GraphSONTokens.VALUEPROP).get(0).get(GraphSONTokens.VALUEPROP).asText()));
+ assertEquals(OffsetDateTime.MAX, OffsetDateTime.parse(node.get("result").get(TOKEN_DATA).get(GraphSONTokens.VALUEPROP).get(0).get(GraphSONTokens.VALUEPROP).asText()));
}
}
- @Test
+ /*@Test disabled for now as current implementation doesn't support implicit transactions.
public void should200OnPOSTTransactionalGraph() throws Exception {
-
final CloseableHttpClient httpclient = HttpClients.createDefault();
final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
httppost.addHeader("Content-Type", "application/json");
@@ -586,7 +501,7 @@
assertEquals("application/json", response.getEntity().getContentType().getValue());
final String json = EntityUtils.toString(response.getEntity());
final JsonNode node = mapper.readTree(json);
- assertEquals(1, node.get("result").get("data").get(GraphSONTokens.VALUEPROP).get(0).get(GraphSONTokens.VALUEPROP).intValue());
+ assertEquals(1, node.get("result").get(TOKEN_DATA).get(GraphSONTokens.VALUEPROP).get(0).get(GraphSONTokens.VALUEPROP).intValue());
}
final HttpGet httpget = new HttpGet(TestClientFactory.createURLString("?gremlin=g.V().count()"));
@@ -600,10 +515,10 @@
assertEquals("application/json", response.getEntity().getContentType().getValue());
final String json = EntityUtils.toString(response.getEntity());
final JsonNode node = mapper.readTree(json);
- assertEquals(1, node.get("result").get("data").get(GraphSONTokens.VALUEPROP).get(0).get(GraphSONTokens.VALUEPROP).intValue());
+ assertEquals(1, node.get("result").get(TOKEN_DATA).get(GraphSONTokens.VALUEPROP).get(0).get(GraphSONTokens.VALUEPROP).intValue());
}
}
- }
+ } */
@Test
public void should200OnPOSTTransactionalGraphInStrictMode() throws Exception {
@@ -611,14 +526,14 @@
final CloseableHttpClient httpclient = HttpClients.createDefault();
final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
httppost.addHeader("Content-Type", "application/json");
- httppost.setEntity(new StringEntity("{\"gremlin\":\"g1.addV()\",\"aliases\":{\"g1\":\"g\"}}", Consts.UTF_8));
+ httppost.setEntity(new StringEntity("{\"gremlin\":\"g.addV()\",\"g\":\"g\"}", Consts.UTF_8));
try (final CloseableHttpResponse response = httpclient.execute(httppost)) {
assertEquals(200, response.getStatusLine().getStatusCode());
assertEquals("application/json", response.getEntity().getContentType().getValue());
final String json = EntityUtils.toString(response.getEntity());
final JsonNode node = mapper.readTree(json);
- assertEquals(1, node.get("result").get("data").get(GraphSONTokens.VALUEPROP).size());
+ assertEquals(1, node.get("result").get(TOKEN_DATA).get(GraphSONTokens.VALUEPROP).size());
}
}
@@ -627,14 +542,14 @@
final CloseableHttpClient httpclient = HttpClients.createDefault();
final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
httppost.addHeader("Content-Type", "application/json");
- httppost.setEntity(new StringEntity("{\"gremlin\":\"gclassic.V()\"}", Consts.UTF_8));
+ httppost.setEntity(new StringEntity("{\"gremlin\":\"g.V()\",\"g\":\"gclassic\"}", Consts.UTF_8));
try (final CloseableHttpResponse response = httpclient.execute(httppost)) {
assertEquals(200, response.getStatusLine().getStatusCode());
assertEquals("application/json", response.getEntity().getContentType().getValue());
final String json = EntityUtils.toString(response.getEntity());
final JsonNode node = mapper.readTree(json);
- assertEquals(6, node.get("result").get("data").get(GraphSONTokens.VALUEPROP).size());
+ assertEquals(6, node.get("result").get(TOKEN_DATA).get(GraphSONTokens.VALUEPROP).size());
}
}
@@ -643,14 +558,14 @@
final CloseableHttpClient httpclient = HttpClients.createDefault();
final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
httppost.addHeader("Content-Type", "application/json");
- httppost.setEntity(new StringEntity("{\"gremlin\":\"org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory.createModern()\"}", Consts.UTF_8));
+ httppost.setEntity(new StringEntity("{\"gremlin\":\"org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory.createModern()\",\"language\":\"gremlin-groovy\"}", Consts.UTF_8));
try (final CloseableHttpResponse response = httpclient.execute(httppost)) {
assertEquals(200, response.getStatusLine().getStatusCode());
assertEquals("application/json", response.getEntity().getContentType().getValue());
final String json = EntityUtils.toString(response.getEntity());
final JsonNode resultJson = mapper.readTree(json);
- final JsonNode data = resultJson.get("result").get("data");
+ final JsonNode data = resultJson.get("result").get(TOKEN_DATA);
assertEquals(1, data.get(GraphSONTokens.VALUEPROP).size());
assertEquals(6, data.get(GraphSONTokens.VALUEPROP).get(0).get(GraphSONTokens.VALUEPROP).get(GraphSONTokens.VERTICES).size());
@@ -663,14 +578,16 @@
final CloseableHttpClient httpclient = HttpClients.createDefault();
final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
httppost.addHeader("Content-Type", "application/json");
- httppost.setEntity(new StringEntity("{\"gremlin\":\"g1.V()\",\"aliases\":{\"g1\":\"gclassic\"}}", Consts.UTF_8));
+ httppost.setEntity(new StringEntity("{\"gremlin\":\"g.V()\",\"g\":\"gclassic\"}", Consts.UTF_8));
try (final CloseableHttpResponse response = httpclient.execute(httppost)) {
assertEquals(200, response.getStatusLine().getStatusCode());
assertEquals("application/json", response.getEntity().getContentType().getValue());
final String json = EntityUtils.toString(response.getEntity());
final JsonNode node = mapper.readTree(json);
- assertEquals(6, node.get("result").get("data").get(GraphSONTokens.VALUEPROP).size());
+ assertEquals(6, node.get("result").get(TOKEN_DATA).get(GraphSONTokens.VALUEPROP).size());
+ assertEquals(GraphSONTokens.VERTEX,
+ node.get("result").get(TOKEN_DATA).get(GraphSONTokens.VALUEPROP).get(0).get(GraphSONTokens.VALUEPROP).get(GraphSONTokens.LABEL).get(0).textValue());
}
}
@@ -679,14 +596,14 @@
final CloseableHttpClient httpclient = HttpClients.createDefault();
final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
httppost.addHeader("Content-Type", "application/json");
- httppost.setEntity(new StringEntity("{\"gremlin\":\"x+y\", \"bindings\":{\"x\":10, \"y\":10}}", Consts.UTF_8));
+ httppost.setEntity(new StringEntity("{\"gremlin\":\"x+y\", \"bindings\":{\"x\":10, \"y\":10}, \"language\":\"gremlin-groovy\"}", Consts.UTF_8));
try (final CloseableHttpResponse response = httpclient.execute(httppost)) {
assertEquals(200, response.getStatusLine().getStatusCode());
assertEquals("application/json", response.getEntity().getContentType().getValue());
final String json = EntityUtils.toString(response.getEntity());
final JsonNode node = mapper.readTree(json);
- assertEquals(20, node.get("result").get("data").get(GraphSONTokens.VALUEPROP).get(0).get(GraphSONTokens.VALUEPROP).intValue());
+ assertEquals(20, node.get("result").get(TOKEN_DATA).get(GraphSONTokens.VALUEPROP).get(0).get(GraphSONTokens.VALUEPROP).intValue());
}
}
@@ -695,14 +612,14 @@
final CloseableHttpClient httpclient = HttpClients.createDefault();
final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
httppost.addHeader("Content-Type", "application/json");
- httppost.setEntity(new StringEntity("{\"gremlin\":\"x\", \"bindings\":{\"x\":10}}", Consts.UTF_8));
+ httppost.setEntity(new StringEntity("{\"gremlin\":\"g.inject(x)\", \"bindings\":{\"x\":10}, \"language\":\"gremlin-groovy\"}", Consts.UTF_8));
try (final CloseableHttpResponse response = httpclient.execute(httppost)) {
assertEquals(200, response.getStatusLine().getStatusCode());
assertEquals("application/json", response.getEntity().getContentType().getValue());
final String json = EntityUtils.toString(response.getEntity());
final JsonNode node = mapper.readTree(json);
- assertEquals(10, node.get("result").get("data").get(GraphSONTokens.VALUEPROP).get(0).get(GraphSONTokens.VALUEPROP).intValue());
+ assertEquals(10, node.get("result").get(TOKEN_DATA).get(GraphSONTokens.VALUEPROP).get(0).get(GraphSONTokens.VALUEPROP).intValue());
}
}
@@ -711,14 +628,14 @@
final CloseableHttpClient httpclient = HttpClients.createDefault();
final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
httppost.addHeader("Content-Type", "application/json");
- httppost.setEntity(new StringEntity("{\"gremlin\":\"x\", \"bindings\":{\"x\":10.5}}", Consts.UTF_8));
+ httppost.setEntity(new StringEntity("{\"gremlin\":\"g.inject(x)\", \"bindings\":{\"x\":10.5}, \"language\":\"gremlin-groovy\"}", Consts.UTF_8));
try (final CloseableHttpResponse response = httpclient.execute(httppost)) {
assertEquals(200, response.getStatusLine().getStatusCode());
assertEquals("application/json", response.getEntity().getContentType().getValue());
final String json = EntityUtils.toString(response.getEntity());
final JsonNode node = mapper.readTree(json);
- assertEquals(10.5d, node.get("result").get("data").get(GraphSONTokens.VALUEPROP).get(0).get(GraphSONTokens.VALUEPROP).doubleValue(), 0.0001);
+ assertEquals(10.5d, node.get("result").get(TOKEN_DATA).get(GraphSONTokens.VALUEPROP).get(0).get(GraphSONTokens.VALUEPROP).doubleValue(), 0.0001);
}
}
@@ -727,14 +644,14 @@
final CloseableHttpClient httpclient = HttpClients.createDefault();
final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
httppost.addHeader("Content-Type", "application/json");
- httppost.setEntity(new StringEntity("{\"gremlin\":\"x\", \"bindings\":{\"x\":\"10\"}}", Consts.UTF_8));
+ httppost.setEntity(new StringEntity("{\"gremlin\":\"g.V(1).out(x).values('name')\", \"bindings\":{\"x\":\"knows\"}, \"g\":\"gmodern\"}", Consts.UTF_8));
try (final CloseableHttpResponse response = httpclient.execute(httppost)) {
assertEquals(200, response.getStatusLine().getStatusCode());
assertEquals("application/json", response.getEntity().getContentType().getValue());
final String json = EntityUtils.toString(response.getEntity());
final JsonNode node = mapper.readTree(json);
- assertEquals("10", node.get("result").get("data").get(GraphSONTokens.VALUEPROP).get(0).textValue());
+ assertEquals("vadas", node.get("result").get(TOKEN_DATA).get(GraphSONTokens.VALUEPROP).get(0).textValue());
}
}
@@ -743,14 +660,14 @@
final CloseableHttpClient httpclient = HttpClients.createDefault();
final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
httppost.addHeader("Content-Type", "application/json");
- httppost.setEntity(new StringEntity("{\"gremlin\":\"x\", \"bindings\":{\"x\":true}}", Consts.UTF_8));
+ httppost.setEntity(new StringEntity("{\"gremlin\":\"g.inject(x)\", \"bindings\":{\"x\":true}, \"language\":\"gremlin-groovy\"}", Consts.UTF_8));
try (final CloseableHttpResponse response = httpclient.execute(httppost)) {
assertEquals(200, response.getStatusLine().getStatusCode());
assertEquals("application/json", response.getEntity().getContentType().getValue());
final String json = EntityUtils.toString(response.getEntity());
final JsonNode node = mapper.readTree(json);
- assertThat(node.get("result").get("data").get(GraphSONTokens.VALUEPROP).get(0).booleanValue(), is(true));
+ assertThat(node.get("result").get(TOKEN_DATA).get(GraphSONTokens.VALUEPROP).get(0).booleanValue(), is(true));
}
}
@@ -759,14 +676,14 @@
final CloseableHttpClient httpclient = HttpClients.createDefault();
final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
httppost.addHeader("Content-Type", "application/json");
- httppost.setEntity(new StringEntity("{\"gremlin\":\"x\", \"bindings\":{\"x\":null}}", Consts.UTF_8));
+ httppost.setEntity(new StringEntity("{\"gremlin\":\"g.inject(x)\", \"bindings\":{\"x\":null}, \"language\":\"gremlin-groovy\"}", Consts.UTF_8));
try (final CloseableHttpResponse response = httpclient.execute(httppost)) {
assertEquals(200, response.getStatusLine().getStatusCode());
assertEquals("application/json", response.getEntity().getContentType().getValue());
final String json = EntityUtils.toString(response.getEntity());
final JsonNode node = mapper.readTree(json);
- assertThat(node.get("result").get("data").get(GraphSONTokens.VALUEPROP).get(0).isNull(), is(true));
+ assertThat(node.get("result").get(TOKEN_DATA).get(GraphSONTokens.VALUEPROP).get(0).isNull(), is(true));
}
}
@@ -775,17 +692,17 @@
final CloseableHttpClient httpclient = HttpClients.createDefault();
final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
httppost.addHeader("Content-Type", "application/json");
- httppost.setEntity(new StringEntity("{\"gremlin\":\"x\", \"bindings\":{\"x\":[1,2,3]}}", Consts.UTF_8));
+ httppost.setEntity(new StringEntity("{\"gremlin\":\"g.inject(x).unfold()\", \"bindings\":{\"x\":[1,2,3]}, \"language\":\"gremlin-groovy\"}", Consts.UTF_8));
try (final CloseableHttpResponse response = httpclient.execute(httppost)) {
assertEquals(200, response.getStatusLine().getStatusCode());
assertEquals("application/json", response.getEntity().getContentType().getValue());
final String json = EntityUtils.toString(response.getEntity());
final JsonNode node = mapper.readTree(json);
- assertThat(node.get("result").get("data").get(GraphSONTokens.VALUEPROP).isArray(), is(true));
- assertEquals(1, node.get("result").get("data").get(GraphSONTokens.VALUEPROP).get(0).get(GraphSONTokens.VALUEPROP).intValue());
- assertEquals(2, node.get("result").get("data").get(GraphSONTokens.VALUEPROP).get(1).get(GraphSONTokens.VALUEPROP).intValue());
- assertEquals(3, node.get("result").get("data").get(GraphSONTokens.VALUEPROP).get(2).get(GraphSONTokens.VALUEPROP).intValue());
+ assertThat(node.get("result").get(TOKEN_DATA).get(GraphSONTokens.VALUEPROP).isArray(), is(true));
+ assertEquals(1, node.get("result").get(TOKEN_DATA).get(GraphSONTokens.VALUEPROP).get(0).get(GraphSONTokens.VALUEPROP).intValue());
+ assertEquals(2, node.get("result").get(TOKEN_DATA).get(GraphSONTokens.VALUEPROP).get(1).get(GraphSONTokens.VALUEPROP).intValue());
+ assertEquals(3, node.get("result").get(TOKEN_DATA).get(GraphSONTokens.VALUEPROP).get(2).get(GraphSONTokens.VALUEPROP).intValue());
}
}
@@ -794,15 +711,15 @@
final CloseableHttpClient httpclient = HttpClients.createDefault();
final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
httppost.addHeader("Content-Type", "application/json");
- httppost.setEntity(new StringEntity("{\"gremlin\":\"x\", \"bindings\":{\"x\":{\"y\":1}}}", Consts.UTF_8));
+ httppost.setEntity(new StringEntity("{\"gremlin\":\"g.inject(x)\", \"bindings\":{\"x\":{\"y\":1}}, \"language\":\"gremlin-groovy\"}", Consts.UTF_8));
try (final CloseableHttpResponse response = httpclient.execute(httppost)) {
assertEquals(200, response.getStatusLine().getStatusCode());
assertEquals("application/json", response.getEntity().getContentType().getValue());
final String json = EntityUtils.toString(response.getEntity());
final JsonNode node = mapper.readTree(json);
- assertEquals("g:Map", node.get("result").get("data").get(GraphSONTokens.VALUEPROP).get(0).get("@type").asText());
- assertEquals(1, node.get("result").get("data").get(GraphSONTokens.VALUEPROP).get(0).get(GraphSONTokens.VALUEPROP).get(1).get(GraphSONTokens.VALUEPROP).asInt());
+ assertEquals("g:Map", node.get("result").get(TOKEN_DATA).get(GraphSONTokens.VALUEPROP).get(0).get("@type").asText());
+ assertEquals(1, node.get("result").get(TOKEN_DATA).get(GraphSONTokens.VALUEPROP).get(0).get(GraphSONTokens.VALUEPROP).get(1).get(GraphSONTokens.VALUEPROP).asInt());
}
}
@@ -811,7 +728,7 @@
final CloseableHttpClient httpclient = HttpClients.createDefault();
final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
httppost.addHeader("Content-Type", "application/json");
- httppost.setEntity(new StringEntity("{\"gremlin\":\"x+y\", \"bindings\":10}}", Consts.UTF_8));
+ httppost.setEntity(new StringEntity("{\"gremlin\":\"g.inject(x, y)\", \"bindings\":10}, \"language\":\"gremlin-groovy\"}", Consts.UTF_8));
try (final CloseableHttpResponse response = httpclient.execute(httppost)) {
assertEquals(400, response.getStatusLine().getStatusCode());
@@ -823,7 +740,7 @@
final CloseableHttpClient httpclient = HttpClients.createDefault();
final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
httppost.addHeader("Content-Type", "application/json");
- httppost.setEntity(new StringEntity("{\"gremadfadflin\":\"1-1\"}", Consts.UTF_8));
+ httppost.setEntity(new StringEntity("{\"gremadfadflin\":\"g.inject(0)\"}", Consts.UTF_8));
try (final CloseableHttpResponse response = httpclient.execute(httppost)) {
assertEquals(400, response.getStatusLine().getStatusCode());
@@ -836,7 +753,7 @@
final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
httppost.addHeader("Content-Type", "application/json");
httppost.addHeader("Accept", "application/json+something-else-that-does-not-exist");
- httppost.setEntity(new StringEntity("{\"gremlin\":\"1-1\"}", Consts.UTF_8));
+ httppost.setEntity(new StringEntity("{\"gremlin\":\"g.inject(0)\"}", Consts.UTF_8));
try (final CloseableHttpResponse response = httpclient.execute(httppost)) {
assertEquals(400, response.getStatusLine().getStatusCode());
@@ -849,14 +766,14 @@
final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
httppost.addHeader("Content-Type", "application/json");
httppost.addHeader("Accept", "*/*");
- httppost.setEntity(new StringEntity("{\"gremlin\":\"1-1\"}", Consts.UTF_8));
+ httppost.setEntity(new StringEntity("{\"gremlin\":\"g.inject(0)\"}", Consts.UTF_8));
try (final CloseableHttpResponse response = httpclient.execute(httppost)) {
assertEquals(200, response.getStatusLine().getStatusCode());
assertEquals("application/json", response.getEntity().getContentType().getValue());
final String json = EntityUtils.toString(response.getEntity());
final JsonNode node = mapper.readTree(json);
- assertEquals(0, node.get("result").get("data").get(GraphSONTokens.VALUEPROP).get(0).get(GraphSONTokens.VALUEPROP).asInt());
+ assertEquals(0, node.get("result").get(TOKEN_DATA).get(GraphSONTokens.VALUEPROP).get(0).get(GraphSONTokens.VALUEPROP).asInt());
}
}
@@ -866,158 +783,45 @@
final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
httppost.addHeader("Content-Type", "*.*;q=0.8,application/xhtml");
httppost.addHeader("Accept", "*/*");
- httppost.setEntity(new StringEntity("{\"gremlin\":\"1-1\"}", Consts.UTF_8));
+ httppost.setEntity(new StringEntity("{\"gremlin\":\"g.inject(0)\"}", Consts.UTF_8));
try (final CloseableHttpResponse response = httpclient.execute(httppost)) {
assertEquals(200, response.getStatusLine().getStatusCode());
assertEquals("application/json", response.getEntity().getContentType().getValue());
final String json = EntityUtils.toString(response.getEntity());
final JsonNode node = mapper.readTree(json);
- assertEquals(0, node.get("result").get("data").get(GraphSONTokens.VALUEPROP).get(0).get(GraphSONTokens.VALUEPROP).asInt());
+ assertEquals(0, node.get("result").get(TOKEN_DATA).get(GraphSONTokens.VALUEPROP).get(0).get(GraphSONTokens.VALUEPROP).asInt());
}
}
@Test
- public void should500OnGETWithGremlinEvalFailure() throws Exception {
+ public void should500OnPOSTWithGremlinEvalFailure() throws Exception {
final CloseableHttpClient httpclient = HttpClients.createDefault();
final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
httppost.addHeader("Content-Type", "application/json");
- httppost.setEntity(new StringEntity("{\"gremlin\":\"1/0\"}", Consts.UTF_8));
+ httppost.setEntity(new StringEntity("{\"gremlin\":\"g.inject(1).math('_/0')\"}", Consts.UTF_8));
try (final CloseableHttpResponse response = httpclient.execute(httppost)) {
- assertEquals(500, response.getStatusLine().getStatusCode());
+ assertEquals(200, response.getStatusLine().getStatusCode()); // Temporarily 200 OK.
+ assertTrue(response.containsHeader(REQUEST_ID_HEADER_NAME));
final String json = EntityUtils.toString(response.getEntity());
final JsonNode node = mapper.readTree(json);
- assertEquals("java.lang.ArithmeticException", node.get(Tokens.STATUS_ATTRIBUTE_EXCEPTIONS).get(0).asText());
- assertEquals(1, node.get(Tokens.STATUS_ATTRIBUTE_EXCEPTIONS).size());
- assertThat(node.get(Tokens.STATUS_ATTRIBUTE_STACK_TRACE).asText(), containsString("Division by zero"));
+ assertEquals("Division by zero!", node.get("status").get("message").asText());
}
}
@Test
- public void should200OnPOSTWithGraphSON1d0AcceptHeaderDefaultResultToJson() throws Exception {
+ public void should200OnPOSTWithGraphSON4d0AcceptHeaderDefaultResultToJson() throws Exception {
final CloseableHttpClient httpclient = HttpClients.createDefault();
final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
- httppost.setEntity(new StringEntity("{\"gremlin\":\"1-1\"}", Consts.UTF_8));
+ httppost.setEntity(new StringEntity("{\"gremlin\":\"g.inject(0)\"}", Consts.UTF_8));
try (final CloseableHttpResponse response = httpclient.execute(httppost)) {
assertEquals(200, response.getStatusLine().getStatusCode());
assertEquals(SerTokens.MIME_JSON, response.getEntity().getContentType().getValue());
final String json = EntityUtils.toString(response.getEntity());
final JsonNode node = mapper.readTree(json);
- assertEquals(0, node.get("result").get("data").get(0).asInt());
- }
- }
-
- @Test
- public void should200OnPOSTWithGraphSON2d0AcceptHeaderDefaultResultToJson() throws Exception {
- final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
- httppost.setEntity(new StringEntity("{\"gremlin\":\"1-1\"}", Consts.UTF_8));
-
- try (final CloseableHttpResponse response = httpclient.execute(httppost)) {
- assertEquals(200, response.getStatusLine().getStatusCode());
- assertEquals(SerTokens.MIME_JSON, response.getEntity().getContentType().getValue());
- final String json = EntityUtils.toString(response.getEntity());
- final JsonNode node = mapper.readTree(json);
- assertEquals(0, node.get("result").get("data").get(0).asInt());
- }
- }
-
- @Test
- public void should200OnPOSTWithGraphSON3d0AcceptHeaderDefaultResultToJson() throws Exception {
- final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
- httppost.setEntity(new StringEntity("{\"gremlin\":\"1-1\"}", Consts.UTF_8));
-
- try (final CloseableHttpResponse response = httpclient.execute(httppost)) {
- assertEquals(200, response.getStatusLine().getStatusCode());
- assertEquals(SerTokens.MIME_JSON, response.getEntity().getContentType().getValue());
- final String json = EntityUtils.toString(response.getEntity());
- final JsonNode node = mapper.readTree(json);
- assertEquals(0, node.get("result").get("data").get(GraphSONTokens.VALUEPROP).get(0).get(GraphSONTokens.VALUEPROP).asInt());
- }
- }
-
- @Test
- public void should200OnPOSTWithAnyGraphSONAcceptHeaderDefaultResultToJson() throws Exception {
- final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpPost httppost1 = new HttpPost(TestClientFactory.createURLString());
- httppost1.setHeader(HttpHeaders.CONTENT_TYPE, SerTokens.MIME_JSON);
- httppost1.setHeader(HttpHeaders.ACCEPT, SerTokens.MIME_JSON);
- httppost1.setEntity(new StringEntity("{\"gremlin\":\"1-1\"}", Consts.UTF_8));
-
- try (final CloseableHttpResponse response = httpclient.execute(httppost1)) {
- assertEquals(200, response.getStatusLine().getStatusCode());
- assertEquals(SerTokens.MIME_JSON, response.getEntity().getContentType().getValue());
- final String json = EntityUtils.toString(response.getEntity());
- final JsonNode node = mapper.readTree(json);
- assertEquals(0, node.get("result").get("data").get(0).asInt());
- }
-
- final HttpPost httppost1Untyped = new HttpPost(TestClientFactory.createURLString());
- httppost1Untyped.setHeader(HttpHeaders.CONTENT_TYPE, SerTokens.MIME_JSON);
- httppost1Untyped.setHeader(HttpHeaders.ACCEPT, SerTokens.MIME_GRAPHSON_V1_UNTYPED);
- httppost1Untyped.setEntity(new StringEntity("{\"gremlin\":\"1-1\"}", Consts.UTF_8));
-
- try (final CloseableHttpResponse response = httpclient.execute(httppost1Untyped)) {
- assertEquals(200, response.getStatusLine().getStatusCode());
- assertEquals(SerTokens.MIME_GRAPHSON_V1_UNTYPED, response.getEntity().getContentType().getValue());
- final String json = EntityUtils.toString(response.getEntity());
- final JsonNode node = mapper.readTree(json);
- assertEquals(0, node.get("result").get("data").get(0).asInt());
- }
-
- final HttpPost httppost2 = new HttpPost(TestClientFactory.createURLString());
- httppost2.setHeader(HttpHeaders.CONTENT_TYPE, SerTokens.MIME_JSON);
- httppost2.setHeader(HttpHeaders.ACCEPT, SerTokens.MIME_GRAPHSON_V2);
- httppost2.setEntity(new StringEntity("{\"gremlin\":\"1-1\"}", Consts.UTF_8));
-
- try (final CloseableHttpResponse response = httpclient.execute(httppost2)) {
- assertEquals(200, response.getStatusLine().getStatusCode());
- assertEquals(SerTokens.MIME_GRAPHSON_V2, response.getEntity().getContentType().getValue());
- final String json = EntityUtils.toString(response.getEntity());
- final JsonNode node = mapper.readTree(json);
- assertEquals(0, node.get("result").get("data").get(0).get(GraphSONTokens.VALUEPROP).asInt());
- }
-
- final HttpPost httppost2Untyped = new HttpPost(TestClientFactory.createURLString());
- httppost2Untyped.setHeader(HttpHeaders.CONTENT_TYPE, SerTokens.MIME_JSON);
- httppost2Untyped.setHeader(HttpHeaders.ACCEPT, SerTokens.MIME_GRAPHSON_V2_UNTYPED);
- httppost2Untyped.setEntity(new StringEntity("{\"gremlin\":\"1-1\"}", Consts.UTF_8));
-
- try (final CloseableHttpResponse response = httpclient.execute(httppost2Untyped)) {
- assertEquals(200, response.getStatusLine().getStatusCode());
- assertEquals(SerTokens.MIME_GRAPHSON_V2_UNTYPED, response.getEntity().getContentType().getValue());
- final String json = EntityUtils.toString(response.getEntity());
- final JsonNode node = mapper.readTree(json);
- assertEquals(0, node.get("result").get("data").get(0).asInt());
- }
-
- final HttpPost httppost3 = new HttpPost(TestClientFactory.createURLString());
- httppost3.setHeader(HttpHeaders.CONTENT_TYPE, SerTokens.MIME_JSON);
- httppost3.setHeader(HttpHeaders.ACCEPT, SerTokens.MIME_GRAPHSON_V3);
- httppost3.setEntity(new StringEntity("{\"gremlin\":\"1-1\"}", Consts.UTF_8));
-
- try (final CloseableHttpResponse response = httpclient.execute(httppost3)) {
- assertEquals(200, response.getStatusLine().getStatusCode());
- assertEquals(SerTokens.MIME_GRAPHSON_V3, response.getEntity().getContentType().getValue());
- final String json = EntityUtils.toString(response.getEntity());
- final JsonNode node = mapper.readTree(json);
- assertEquals(0, node.get("result").get("data").get(GraphSONTokens.VALUEPROP).get(0).get(GraphSONTokens.VALUEPROP).asInt());
- }
-
- final HttpPost httppost3Untyped = new HttpPost(TestClientFactory.createURLString());
- httppost3Untyped.setHeader(HttpHeaders.CONTENT_TYPE, SerTokens.MIME_JSON);
- httppost3Untyped.setHeader(HttpHeaders.ACCEPT, SerTokens.MIME_GRAPHSON_V3_UNTYPED);
- httppost3Untyped.setEntity(new StringEntity("{\"gremlin\":\"1-1\"}", Consts.UTF_8));
-
- try (final CloseableHttpResponse response = httpclient.execute(httppost3Untyped)) {
- assertEquals(200, response.getStatusLine().getStatusCode());
- assertEquals(SerTokens.MIME_GRAPHSON_V3_UNTYPED, response.getEntity().getContentType().getValue());
- final String json = EntityUtils.toString(response.getEntity());
- final JsonNode node = mapper.readTree(json);
- assertEquals(0, node.get("result").get("data").get(0).asInt());
+ assertEquals(0, node.get("result").get(TOKEN_DATA).get(0).asInt());
}
}
@@ -1028,31 +832,32 @@
httppost.setEntity(new StringEntity("{\"gremlin\":\"g\"}", Consts.UTF_8));
try (final CloseableHttpResponse response = httpclient.execute(httppost)) {
- assertEquals(500, response.getStatusLine().getStatusCode());
+ assertEquals(200, response.getStatusLine().getStatusCode()); // Temporarily 200
assertEquals(SerTokens.MIME_JSON, response.getEntity().getContentType().getValue());
final String json = EntityUtils.toString(response.getEntity());
final JsonNode node = mapper.readTree(json);
- assertThat(node.get("message").asText(), startsWith("Could not serialize the result with "));
+ assertThat(node.get("status").get("message").asText(), startsWith("Error during serialization: No serializer found"));
}
}
@Test
- public void should200OnGETWithGremlinQueryStringArgumentCallingDatetimeFunction() throws Exception {
+ public void should200OnPOSTWithGremlinQueryStringArgumentCallingDatetimeFunction() throws Exception {
final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpGet httpget = new HttpGet(TestClientFactory.createURLString("?gremlin=datetime%28%272018-03-22T00%3A35%3A44.741%2B1600%27%29"));
+ final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
+ httppost.setEntity(new StringEntity("{\"gremlin\":\"g.inject(datetime('2018-03-22T00:35:44.741+1600'))\"}", Consts.UTF_8));
- try (final CloseableHttpResponse response = httpclient.execute(httpget)) {
+ try (final CloseableHttpResponse response = httpclient.execute(httppost)) {
assertEquals(200, response.getStatusLine().getStatusCode());
assertEquals("application/json", response.getEntity().getContentType().getValue());
final String json = EntityUtils.toString(response.getEntity());
final JsonNode node = mapper.readTree(json);
- assertEquals("2018-03-22T00:35:44.741+16:00", node.get("result").get("data").get(GraphSONTokens.VALUEPROP).get(0).get(GraphSONTokens.VALUEPROP).textValue());
+ assertEquals("2018-03-22T00:35:44.741+16:00", node.get("result").get(TOKEN_DATA).get(GraphSONTokens.VALUEPROP).get(0).get(GraphSONTokens.VALUEPROP).textValue());
}
}
- @Test
- public void should500OnGETWithEvaluationTimeout() throws Exception {
- // Related to TINKERPOP-2769. This is a similar test to those for WebSocketChannelizer and UnifiedChannelizer.
+ @Test(timeout = 10000) // Add test timeout to prevent incorrect timeout behavior from stopping test run.
+ public void should500OnPOSTWithEvaluationTimeout() throws Exception {
+ // Related to TINKERPOP-2769. This is a similar test to the one for the WebSocketChannelizer.
final CloseableHttpClient firstClient = HttpClients.createDefault();
final CloseableHttpClient secondClient = HttpClients.createDefault();
@@ -1063,18 +868,20 @@
}
// This query has a cycle, so it runs until it times out.
- final HttpGet firstGet = new HttpGet(TestClientFactory.createURLString("?gremlin=g.V().repeat(__.out()).until(__.outE().count().is(0)).iterate()"));
+ final HttpPost firstPost = new HttpPost(TestClientFactory.createURLString());
+ firstPost.setEntity(new StringEntity("{\"gremlin\":\"g.V().repeat(__.out()).until(__.outE().count().is(0)).iterate()\"}", Consts.UTF_8));
// Add a shorter timeout to the second query to ensure that its timeout is less than the first query's running time.
- final HttpGet secondGet = new HttpGet(TestClientFactory.createURLString("?gremlin=g.with('evaluationTimeout',1000).V().repeat(__.out()).until(__.outE().count().is(0)).iterate()"));
+ final HttpPost secondPost = new HttpPost(TestClientFactory.createURLString());
+ secondPost.setEntity(new StringEntity("{\"gremlin\":\"g.V().repeat(__.out()).until(__.outE().count().is(0)).iterate()\"}", Consts.UTF_8));
final Callable<Integer> firstQueryWrapper = () -> {
- try (final CloseableHttpResponse response = firstClient.execute(firstGet)) {
+ try (final CloseableHttpResponse response = firstClient.execute(firstPost)) {
return response.getStatusLine().getStatusCode();
}
};
final Callable<Integer> secondQueryWrapper = () -> {
- try (final CloseableHttpResponse response = secondClient.execute(secondGet)) {
+ try (final CloseableHttpResponse response = secondClient.execute(secondPost)) {
return response.getStatusLine().getStatusCode();
}
};
@@ -1084,17 +891,421 @@
final Future<Integer> secondGetResult = threadPool.schedule(secondQueryWrapper, 1500, TimeUnit.MILLISECONDS);
// Make sure both requests return a response and don't hang.
- assertEquals(500, firstGetResult.get().intValue());
- assertEquals(500, secondGetResult.get().intValue());
+ assertEquals(200, firstGetResult.get().intValue());
+ assertEquals(200, secondGetResult.get().intValue());
threadPool.shutdown();
}
+ @Test
+ public void shouldErrorWhenTryingToConnectWithHttp1() throws Exception {
+ final CloseableHttpClient httpclient = HttpClients.createDefault();
+ final HttpGet httpget = new HttpGet(TestClientFactory.createURLString("?gremlin=g.inject(1)"));
+ httpget.setProtocolVersion(HttpVersion.HTTP_1_0);
+
+ try (final CloseableHttpResponse response = httpclient.execute(httpget)) {
+ assertEquals(505, response.getStatusLine().getStatusCode());
+ }
+ }
+
+ @Test
+ public void should200OnPOSTWithChunkedResponse() throws Exception {
+ final CloseableHttpClient httpclient = HttpClients.createDefault();
+ final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
+ httppost.addHeader("Content-Type", "application/json");
+ // chunk size is 8, so should be 2 chunks
+ httppost.setEntity(new StringEntity("{\"gremlin\":\"g.inject(0,1,2,3,4,5,6,7,8,9,'ten',11,12,13,14,15,'new chunk')\"}", Consts.UTF_8));
+
+ try (final CloseableHttpResponse response = httpclient.execute(httppost)) {
+ assertEquals(200, response.getStatusLine().getStatusCode());
+ assertTrue(response.getEntity().isChunked());
+
+ final String json = EntityUtils.toString(response.getEntity());
+ final JsonNode node = mapper.readTree(json);
+ assertEquals(8, node.get("result").get(TOKEN_DATA).get(GraphSONTokens.VALUEPROP).get(8).get(GraphSONTokens.VALUEPROP).intValue());
+ assertEquals("ten", node.get("result").get(TOKEN_DATA).get(GraphSONTokens.VALUEPROP).get(10).textValue());
+ assertEquals("new chunk", node.get("result").get(TOKEN_DATA).get(GraphSONTokens.VALUEPROP).get(16).textValue());
+
+ final Header[] footers = getTrailingHeaders(response);
+ assertEquals(1, footers.length);
+ assertEquals("code", footers[0].getName());
+ assertEquals("200", footers[0].getValue());
+ }
+ }
+
+ @Test
+ public void should200OnPOSTWithChunkedResponseGraphBinary() throws Exception {
+ final String gremlin = "g.inject(0,1,2,3,4,5,6,7,8,9,'ten',11,12,13,14,15,'new chunk')";
+ final GraphBinaryMessageSerializerV4 serializer = new GraphBinaryMessageSerializerV4();
+ final ByteBuf serializedRequest = serializer.serializeRequestAsBinary(
+ RequestMessage.build(gremlin).create(), new UnpooledByteBufAllocator(false));
+
+ final CloseableHttpClient httpclient = HttpClients.createDefault();
+ final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
+ httppost.addHeader(HttpHeaders.CONTENT_TYPE, Serializers.GRAPHBINARY_V4.getValue());
+ httppost.addHeader(HttpHeaders.ACCEPT, Serializers.GRAPHBINARY_V4.getValue());
+ httppost.setEntity(new ByteArrayEntity(serializedRequest.array()));
+
+ try (final CloseableHttpResponse response = httpclient.execute(httppost)) {
+ assertEquals(200, response.getStatusLine().getStatusCode());
+ assertTrue(response.getEntity().isChunked());
+
+ final ResponseMessage responseMessage = serializer.readChunk(toByteBuf(response.getEntity()), true);
+ assertEquals(17, ((List)responseMessage.getResult().getData()).size());
+
+ final Header[] footers = getTrailingHeaders(response);
+ assertEquals(1, footers.length);
+ assertEquals("code", footers[0].getName());
+ assertEquals("200", footers[0].getValue());
+ }
+ }
+
+ @Test
+ public void should200OnPOSTWithEmptyChunkedResponseGraphBinary() throws Exception {
+ final String gremlin = "g.V().iterate()";
+ final GraphBinaryMessageSerializerV4 serializer = new GraphBinaryMessageSerializerV4();
+ final ByteBuf serializedRequest = serializer.serializeRequestAsBinary(
+ RequestMessage.build(gremlin).create(), new UnpooledByteBufAllocator(false));
+
+ final CloseableHttpClient httpclient = HttpClients.createDefault();
+ final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
+ httppost.addHeader(HttpHeaders.CONTENT_TYPE, Serializers.GRAPHBINARY_V4.getValue());
+ httppost.addHeader(HttpHeaders.ACCEPT, Serializers.GRAPHBINARY_V4.getValue());
+ httppost.setEntity(new ByteArrayEntity(serializedRequest.array()));
+
+ try (final CloseableHttpResponse response = httpclient.execute(httppost)) {
+ assertEquals(200, response.getStatusLine().getStatusCode());
+ assertTrue(response.getEntity().isChunked());
+
+ final ResponseMessage responseMessage = serializer.readChunk(toByteBuf(response.getEntity()), true);
+ assertEquals(0, ((List)responseMessage.getResult().getData()).size());
+
+ final Header[] footers = getTrailingHeaders(response);
+ assertEquals(1, footers.length);
+ assertEquals("code", footers[0].getName());
+ assertEquals("200", footers[0].getValue());
+ }
+ }
+
+ @Test
+ public void should200OnPOSTWithChunkedResponseUsingTextPlain() throws Exception {
+ final CloseableHttpClient httpclient = HttpClients.createDefault();
+ final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
+ httppost.addHeader(HttpHeaders.CONTENT_TYPE, "application/json");
+ httppost.addHeader(HttpHeaders.ACCEPT, "text/plain");
+ // chunk size is 8, so should be 2 chunks
+ httppost.setEntity(new StringEntity("{\"gremlin\":\"g.inject(0,1,2,3,4,5,6,7,8,9,'ten',11,12,13,14,15,'new chunk')\"}", Consts.UTF_8));
+
+ try (final CloseableHttpResponse response = httpclient.execute(httppost)) {
+ assertEquals(200, response.getStatusLine().getStatusCode());
+ assertTrue(response.getEntity().isChunked());
+
+ String textPlainResponse = EntityUtils.toString(response.getEntity());
+ assertTrue(textPlainResponse.startsWith("==>0"));
+ assertTrue(textPlainResponse.endsWith(System.lineSeparator() + "==>new chunk"));
+ }
+ }
+
+ @Test
+ public void should200OnPOSTWithEmptyChunkedResponseUsingTextPlain() throws Exception {
+ final CloseableHttpClient httpclient = HttpClients.createDefault();
+ final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
+ httppost.addHeader(HttpHeaders.CONTENT_TYPE, "application/json");
+ httppost.addHeader(HttpHeaders.ACCEPT, "text/plain");
+ httppost.setEntity(new StringEntity("{\"gremlin\":\"g.V().iterate()\"}", Consts.UTF_8));
+
+ try (final CloseableHttpResponse response = httpclient.execute(httppost)) {
+ assertEquals(200, response.getStatusLine().getStatusCode());
+ assertTrue(response.getEntity().isChunked());
+
+ String textPlainResponse = EntityUtils.toString(response.getEntity());
+ assertEquals("", textPlainResponse);
+ }
+ }
+
+ @Test
+ public void shouldHandleErrorsInFirstChunkPOSTWithChunkedResponseUsingTextPlain() throws Exception {
+ final CloseableHttpClient httpclient = HttpClients.createDefault();
+ final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
+ httppost.addHeader(HttpHeaders.CONTENT_TYPE, "application/json");
+ httppost.addHeader(HttpHeaders.ACCEPT, "text/plain");
+ httppost.setEntity(new StringEntity("{\"gremlin\":\"g.inject(0,1,2,3,4,5,6,7,8,9,'ten',11,12,13,14,15,16).coalesce(is(lt(0)),fail('some error'))\"}", Consts.UTF_8));
+
+ try (final CloseableHttpResponse response = httpclient.execute(httppost)) {
+ assertEquals(200, response.getStatusLine().getStatusCode());
+ assertTrue(response.getEntity().isChunked());
+
+ String textPlainResponse = EntityUtils.toString(response.getEntity());
+ assertTrue(textPlainResponse.startsWith("some error"));
+ }
+ }
+
+ @Test
+ public void shouldHandleErrorsNotInFirstChunkPOSTWithChunkedResponseUsingTextPlain() throws Exception {
+ final CloseableHttpClient httpclient = HttpClients.createDefault();
+ final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
+ httppost.addHeader(HttpHeaders.CONTENT_TYPE, "application/json");
+ httppost.addHeader(HttpHeaders.ACCEPT, "text/plain");
+ httppost.setEntity(new StringEntity("{\"gremlin\":\"g.inject(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17).coalesce(is(lt(17)),fail('some error'))\"}", Consts.UTF_8));
+
+ try (final CloseableHttpResponse response = httpclient.execute(httppost)) {
+ assertEquals(200, response.getStatusLine().getStatusCode());
+ assertTrue(response.getEntity().isChunked());
+
+ String textPlainResponse = EntityUtils.toString(response.getEntity());
+ assertTrue(textPlainResponse.startsWith("==>0"));
+ assertTrue(textPlainResponse.contains("==>5"));
+ assertTrue(textPlainResponse.contains("==>15"));
+ assertTrue(textPlainResponse.endsWith(System.lineSeparator() + "some error"));
+ }
+ }
+
+ @Test
+ public void shouldHandleErrorsInFirstChunkPOSTWithChunkedResponse() throws Exception {
+ final CloseableHttpClient httpclient = HttpClients.createDefault();
+ final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
+ httppost.addHeader("Content-Type", "application/json");
+ // default chunk size is 16, so should be 2 chunks
+ httppost.setEntity(new StringEntity(
+ "{\"gremlin\":\"g.inject(0,1,2,3,4,5,6,7,8,9,'ten',11,12,13,14,15,16).coalesce(is(lt(0)),fail('some error'))\"}", Consts.UTF_8));
+
+ try (final CloseableHttpResponse response = httpclient.execute(httppost)) {
+ assertEquals(200, response.getStatusLine().getStatusCode());
+ assertTrue(response.containsHeader(REQUEST_ID_HEADER_NAME));
+ assertTrue(response.getEntity().isChunked());
+
+ final String json = EntityUtils.toString(response.getEntity());
+ final JsonNode node = mapper.readTree(json);
+ assertThat(node.get("status").get("message").textValue(), startsWith("some error"));
+ assertEquals(500, node.get("status").get("code").intValue());
+
+ final Header[] footers = getTrailingHeaders(response);
+ assertEquals(2, footers.length);
+ assertEquals("code", footers[0].getName());
+ assertEquals("500", footers[0].getValue());
+ assertEquals("exception", footers[1].getName());
+ assertThat(footers[1].getValue(), is("ServerFailStepException"));
+ }
+ }
+
+ @Test
+ public void shouldHandleErrorsNotInFirstChunkPOSTWithChunkedResponse() throws Exception {
+ final CloseableHttpClient httpclient = HttpClients.createDefault();
+ final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
+ httppost.addHeader("Content-Type", "application/json");
+ // chunk size is 16, so should be 2 chunks
+ httppost.setEntity(new StringEntity(
+ "{\"gremlin\":\"g.inject(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17).coalesce(is(lt(17)),fail('some error'))\"}", Consts.UTF_8));
+
+ try (final CloseableHttpResponse response = httpclient.execute(httppost)) {
+ assertEquals(200, response.getStatusLine().getStatusCode());
+ assertTrue(response.containsHeader(REQUEST_ID_HEADER_NAME));
+ assertTrue(response.getEntity().isChunked());
+
+ final String json = EntityUtils.toString(response.getEntity());
+ final JsonNode node = mapper.readTree(json);
+ assertEquals(0, node.get("result").get(TOKEN_DATA).get(GraphSONTokens.VALUEPROP).get(0).get(GraphSONTokens.VALUEPROP).intValue());
+ Assert.assertThat(node.get("status").get("message").textValue(), startsWith("some error"));
+ assertEquals(500, node.get("status").get("code").intValue());
+
+ final Header[] footers = getTrailingHeaders(response);
+ assertEquals(2, footers.length);
+ assertEquals("code", footers[0].getName());
+ assertEquals("500", footers[0].getValue());
+ assertEquals("exception", footers[1].getName());
+ Assert.assertThat(footers[1].getValue(), is("ServerFailStepException"));
+ }
+ }
+
+ private Header[] getTrailingHeaders(final CloseableHttpResponse response) throws IOException, NoSuchFieldException, IllegalAccessException {
+ final InputStream content = response.getEntity().getContent();
+ final Field field = content.getClass().getDeclaredField("wrappedStream");
+ field.setAccessible(true);
+ final EofSensorInputStream stream = (EofSensorInputStream) field.get(content);
+ final Field eofStreamField = stream.getClass().getDeclaredField("eofWatcher");
+ eofStreamField.setAccessible(true);
+ final HttpEntityWrapper entityProxy = (HttpEntityWrapper) eofStreamField.get(stream);
+ final EofSensorInputStream innerEofStream = (EofSensorInputStream) entityProxy.getContent();
+ final Field eofWrappedStreamField = innerEofStream.getClass().getDeclaredField("wrappedStream");
+ eofWrappedStreamField.setAccessible(true);
+ return ((ChunkedInputStream) eofWrappedStreamField.get(innerEofStream)).getFooters();
+ }
+
+ @Test
+ public void should200OnPOSTWithGremlinGraphSONEndcodedBodyAndDoubleBindings() throws Exception {
+ final GraphSONMessageSerializerV4 serializer = new GraphSONMessageSerializerV4();
+ final SimpleBindings bindings = new SimpleBindings();
+ bindings.put("x", 10.5d);
+ final ByteBuf serializedRequest = serializer.serializeRequestAsBinary(
+ RequestMessage.build("g.inject(x)").addBindings(bindings).addLanguage("gremlin-groovy").create(),
+ new UnpooledByteBufAllocator(false));
+
+ final CloseableHttpClient httpclient = HttpClients.createDefault();
+ final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
+ httppost.addHeader(HttpHeaders.ACCEPT, Serializers.GRAPHSON_V4.getValue());
+ httppost.addHeader("Content-Type", Serializers.GRAPHSON_V4.getValue());
+ httppost.setEntity(new ByteArrayEntity(serializedRequest.array()));
+
+ try (final CloseableHttpResponse response = httpclient.execute(httppost)) {
+ assertEquals(200, response.getStatusLine().getStatusCode());
+ assertEquals(Serializers.GRAPHSON_V4.getValue(), response.getEntity().getContentType().getValue());
+ final String json = EntityUtils.toString(response.getEntity());
+ final JsonNode node = mapper.readTree(json);
+ assertEquals(10.5d, node.get("result").get(TOKEN_DATA).get(GraphSONTokens.VALUEPROP).get(0).get(GraphSONTokens.VALUEPROP).doubleValue(), 0.0001);
+ }
+ }
+
+ @Test
+ public void should400OnPOSTWithInvalidRequestArgsWhenInvalidBindingsSupplied() throws Exception {
+ final GraphSONMessageSerializerV4 serializer = new GraphSONMessageSerializerV4();
+ final ByteBuf serializedRequest = serializer.serializeRequestAsBinary(
+ RequestMessage.build("g.V(id)").addBinding("id", "1").create(),
+ new UnpooledByteBufAllocator(false));
+
+ final CloseableHttpClient httpclient = HttpClients.createDefault();
+ final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
+ httppost.addHeader(HttpHeaders.ACCEPT, Serializers.GRAPHSON_V4.getValue());
+ httppost.addHeader("Content-Type", Serializers.GRAPHSON_V4.getValue());
+ httppost.setEntity(new ByteArrayEntity(serializedRequest.array()));
+
+ try (final CloseableHttpResponse response = httpclient.execute(httppost)) {
+ assertEquals(200, response.getStatusLine().getStatusCode());
+ final String json = EntityUtils.toString(response.getEntity());
+ final JsonNode node = mapper.readTree(json);
+ assertTrue(node.get("status").get("message").asText().contains("The message supplies one or more invalid parameters key"));
+ }
+ }
+
+ @Test
+ public void shouldErrorOnGremlinFromApplicationJsonPostRequest() throws Exception {
+ final GremlinLang gremlin = EmptyGraph.instance().traversal().V().asAdmin().getGremlinLang();
+ final UUID requestId = UUID.fromString("1e55c495-22d5-4a39-934a-a2744ba010ef");
+ final String body = "{ \"gremlin\": \"" + gremlin + "\", \"g\": \"gmodern" + "\", \"language\": \"gremlin-lang\"}";
+ final CloseableHttpClient httpclient = HttpClients.createDefault();
+ final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
+ httppost.addHeader("Content-Type", "application/json");
+ httppost.setEntity(new StringEntity(body, Consts.UTF_8));
+
+ try (final CloseableHttpResponse response = httpclient.execute(httppost)) {
+ assertEquals(200, response.getStatusLine().getStatusCode());
+ final JsonNode node = mapper.readTree(EntityUtils.toString(response.getEntity()));
+ assertTrue(node.get("status").get("message").asText().contains("Failed to interpret Gremlin query"));
+ }
+ }
+
+ @Test
+ public void shouldIgnoreRequestIdInPostRequest() throws Exception {
+ final UUID requestId = UUID.fromString("1e55c495-22d5-4a39-934a-a2744ba010ef");
+ final String body = "{ \"gremlin\": \"" + "g.V()" + "\", \"requestId\": \"" + requestId + "\", \"g\": \"gmodern" + "\", \"language\": \"gremlin-lang\"}";
+ final CloseableHttpClient httpclient = HttpClients.createDefault();
+ final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
+ httppost.addHeader("Content-Type", "application/json");
+ httppost.setEntity(new StringEntity(body, Consts.UTF_8));
+
+ try (final CloseableHttpResponse response = httpclient.execute(httppost)) {
+ assertEquals(200, response.getStatusLine().getStatusCode());
+ assertTrue(response.containsHeader(REQUEST_ID_HEADER_NAME));
+ assertNotEquals(requestId, UUID.fromString(response.getLastHeader(REQUEST_ID_HEADER_NAME).getValue()));
+ }
+ }
+
+ @Test
+ public void should100onExpectContinueRequest() throws Exception {
+ final GraphSONMessageSerializerV4 serializer = new GraphSONMessageSerializerV4();
+ final ByteBuf serializedRequest = serializer.serializeRequestAsBinary(
+ RequestMessage.build("g.V()").addG("gmodern").create(),
+ new UnpooledByteBufAllocator(false));
+
+ final CloseableHttpClient httpclient = HttpClients.createDefault();
+ final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
+ httppost.setConfig(RequestConfig.custom().setExpectContinueEnabled(true).build());
+ httppost.addHeader(HttpHeaders.ACCEPT, Serializers.GRAPHSON_V4.getValue());
+ httppost.addHeader("Content-Type", Serializers.GRAPHSON_V4.getValue());
+ httppost.setEntity(new ByteArrayEntity(serializedRequest.array()));
+
+ try (final CloseableHttpResponse response = httpclient.execute(httppost)) {
+ assertEquals(200, response.getStatusLine().getStatusCode());
+ final String json = EntityUtils.toString(response.getEntity());
+ final JsonNode node = mapper.readTree(json);
+ assertEquals(6, node.get("result").get(TOKEN_DATA).get(GraphSONTokens.VALUEPROP).size());
+ }
+ }
+
+ @Test
+ public void shouldAcceptTimeoutInRequestBody() throws Exception {
+ final String body = "{ \"gremlin\": \"" + "Thread.sleep(5000)" + "\",\"language\":\"gremlin-groovy\",\"" + TIMEOUT_MS + "\":\"100\"}";
+ final CloseableHttpClient httpclient = HttpClients.createDefault();
+ final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
+ httppost.addHeader("Content-Type", "application/json");
+ httppost.setEntity(new StringEntity(body, Consts.UTF_8));
+
+ try (final CloseableHttpResponse response = httpclient.execute(httppost)) {
+ assertEquals(200, response.getStatusLine().getStatusCode());
+
+ final String json = EntityUtils.toString(response.getEntity());
+ assertTrue(json.contains("timeout occurred"));
+ }
+ }
+
+ @Test
+ public void shouldAcceptMaterializePropertiesAllInRequestBody() throws Exception {
+ final String body = "{ \"gremlin\": \"" + "gmodern.V().limit(1)" + "\",\"language\":\"gremlin-groovy\",\""
+ + ARGS_MATERIALIZE_PROPERTIES + "\":\"" + MATERIALIZE_PROPERTIES_ALL + "\"}";
+ final CloseableHttpClient httpclient = HttpClients.createDefault();
+ final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
+ httppost.addHeader("Content-Type", "application/json");
+ httppost.setEntity(new StringEntity(body, Consts.UTF_8));
+
+ try (final CloseableHttpResponse response = httpclient.execute(httppost)) {
+ assertEquals(200, response.getStatusLine().getStatusCode());
+
+ final String json = EntityUtils.toString(response.getEntity());
+ final JsonNode node = mapper.readTree(json);
+ assertNotNull(node.get("result").get(TOKEN_DATA).get(GraphSONTokens.VALUEPROP).get(0).get(GraphSONTokens.VALUEPROP).get(GraphSONTokens.PROPERTIES));
+ }
+ }
+
+ @Test
+ public void shouldAcceptMaterializePropertiesTokensInRequestBody() throws Exception {
+ final String body = "{ \"gremlin\": \"" + "gmodern.V().limit(1)" + "\",\"language\":\"gremlin-groovy\",\""
+ + ARGS_MATERIALIZE_PROPERTIES + "\":\"" + MATERIALIZE_PROPERTIES_TOKENS + "\"}";
+ final CloseableHttpClient httpclient = HttpClients.createDefault();
+ final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
+ httppost.addHeader("Content-Type", "application/json");
+ httppost.setEntity(new StringEntity(body, Consts.UTF_8));
+
+ try (final CloseableHttpResponse response = httpclient.execute(httppost)) {
+ assertEquals(200, response.getStatusLine().getStatusCode());
+
+ final String json = EntityUtils.toString(response.getEntity());
+ final JsonNode node = mapper.readTree(json);
+ assertNull(node.get("result").get(TOKEN_DATA).get(GraphSONTokens.VALUEPROP).get(0).get(GraphSONTokens.VALUEPROP).get(GraphSONTokens.PROPERTIES));
+ }
+ }
+
+ @Test
+ public void shouldNotContainStatusMessageOrExceptionWith200() throws Exception {
+ final GraphSONMessageSerializerV4 serializer = new GraphSONMessageSerializerV4();
+ final ByteBuf serializedRequest = serializer.serializeRequestAsBinary(
+ RequestMessage.build("g.inject(2)").create(),
+ new UnpooledByteBufAllocator(false));
+
+ final CloseableHttpClient httpclient = HttpClients.createDefault();
+ final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
+ httppost.addHeader(HttpHeaders.ACCEPT, Serializers.GRAPHSON_V4.getValue());
+ httppost.addHeader("Content-Type", Serializers.GRAPHSON_V4.getValue());
+ httppost.setEntity(new ByteArrayEntity(serializedRequest.array()));
+
+ try (final CloseableHttpResponse response = httpclient.execute(httppost)) {
+ assertEquals(200, response.getStatusLine().getStatusCode());
+ final String json = EntityUtils.toString(response.getEntity());
+ final JsonNode node = mapper.readTree(json);
+ assertNull(node.get("status").get("message"));
+ assertNull(node.get("status").get("exception"));
+ }
+ }
private static ByteBuf toByteBuf(final HttpEntity httpEntity) throws IOException {
- final byte[] asArray = new byte[(int)httpEntity.getContentLength()];
-
- httpEntity.getContent().read(asArray);
-
+ final byte[] asArray = EntityUtils.toByteArray(httpEntity);
return Unpooled.wrappedBuffer(asArray);
}
}
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
index 5424e9f..3705f4a 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
@@ -18,78 +18,57 @@
*/
package org.apache.tinkerpop.gremlin.server;
-import ch.qos.logback.classic.Level;
-import ch.qos.logback.classic.Logger;
import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.http.HttpResponseStatus;
import io.netty.util.AttributeKey;
import java.math.BigDecimal;
import nl.altindag.log.LogCaptor;
import org.apache.commons.configuration2.BaseConfiguration;
import org.apache.commons.configuration2.Configuration;
-import org.apache.commons.lang3.RandomStringUtils;
import org.apache.tinkerpop.gremlin.driver.RequestOptions;
import org.apache.tinkerpop.gremlin.server.channel.HttpTestChannelizer;
import org.apache.tinkerpop.gremlin.server.channel.TestChannelizer;
-import org.apache.tinkerpop.gremlin.server.channel.UnifiedChannelizer;
-import org.apache.tinkerpop.gremlin.server.channel.UnifiedTestChannelizer;
-import org.apache.tinkerpop.gremlin.server.channel.WebSocketChannelizer;
-import org.apache.tinkerpop.gremlin.server.channel.WebSocketTestChannelizer;
-import org.apache.tinkerpop.gremlin.server.channel.WsAndHttpTestChannelizer;
import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.apache.tinkerpop.gremlin.util.ExceptionHelper;
import org.apache.tinkerpop.gremlin.TestHelper;
import org.apache.tinkerpop.gremlin.driver.Client;
import org.apache.tinkerpop.gremlin.driver.Cluster;
import org.apache.tinkerpop.gremlin.driver.Result;
import org.apache.tinkerpop.gremlin.driver.ResultSet;
-import org.apache.tinkerpop.gremlin.util.Tokens;
-import org.apache.tinkerpop.gremlin.driver.exception.ResponseException;
-import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.driver.remote.DriverRemoteConnection;
-import org.apache.tinkerpop.gremlin.util.ser.Serializers;
-import org.apache.tinkerpop.gremlin.driver.simple.SimpleClient;
import org.apache.tinkerpop.gremlin.driver.UserAgent;
+import org.apache.tinkerpop.gremlin.driver.exception.ResponseException;
+import org.apache.tinkerpop.gremlin.driver.remote.DriverRemoteConnection;
+import org.apache.tinkerpop.gremlin.driver.simple.SimpleClient;
import org.apache.tinkerpop.gremlin.groovy.jsr223.GremlinGroovyScriptEngine;
import org.apache.tinkerpop.gremlin.groovy.jsr223.GroovyCompilerGremlinPlugin;
import org.apache.tinkerpop.gremlin.groovy.jsr223.customizer.SimpleSandboxExtension;
import org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin;
-import org.apache.tinkerpop.gremlin.server.handler.OpSelectorHandler;
-import org.apache.tinkerpop.gremlin.server.handler.UnifiedHandler;
-import org.apache.tinkerpop.gremlin.structure.RemoteGraph;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
-import org.apache.tinkerpop.gremlin.server.op.AbstractEvalOpProcessor;
-import org.apache.tinkerpop.gremlin.server.op.standard.StandardOpProcessor;
-import org.apache.tinkerpop.gremlin.server.handler.WsUserAgentHandler;
import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.RemoteGraph;
import org.apache.tinkerpop.gremlin.structure.T;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.util.ExceptionHelper;
import org.apache.tinkerpop.gremlin.util.function.Lambda;
-import org.hamcrest.CoreMatchers;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
import org.hamcrest.Matchers;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
+import org.junit.Ignore;
import org.junit.Test;
-
import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -97,24 +76,21 @@
import java.util.stream.Collectors;
import java.util.stream.IntStream;
-import static org.apache.tinkerpop.gremlin.util.Tokens.ARGS_EVAL_TIMEOUT;
import static org.apache.tinkerpop.gremlin.groovy.jsr223.GroovyCompilerGremlinPlugin.Compilation.COMPILE_STATIC;
import static org.apache.tinkerpop.gremlin.process.remote.RemoteConnection.GREMLIN_REMOTE;
import static org.apache.tinkerpop.gremlin.process.remote.RemoteConnection.GREMLIN_REMOTE_CONNECTION_CLASS;
import static org.apache.tinkerpop.gremlin.process.traversal.AnonymousTraversalSource.traversal;
+import static org.apache.tinkerpop.gremlin.util.Tokens.ARGS_EVAL_TIMEOUT;
import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.AllOf.allOf;
import static org.hamcrest.core.IsInstanceOf.instanceOf;
-import static org.hamcrest.core.IsNot.not;
import static org.hamcrest.core.StringStartsWith.startsWith;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeThat;
/**
* Integration tests for server-side settings and processing.
@@ -123,7 +99,6 @@
*/
public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegrationTest {
- private Level previousLogLevel;
private static final org.slf4j.Logger logger = LoggerFactory.getLogger(GremlinServerIntegrateTest.class);
private final Supplier<Graph> graphGetter = () -> server.getServerGremlinExecutor().getGraphManager().getGraph("graph");
@@ -135,10 +110,11 @@
setProperty("clusterConfiguration.port", TestClientFactory.PORT);
setProperty("clusterConfiguration.hosts", "localhost");
}};
- private static final int POOL_SIZE_FOR_TIMEOUT_TESTS = 1;
private static LogCaptor logCaptor;
+ private static final RequestOptions groovyRequestOptions = RequestOptions.build().language("gremlin-groovy").create();
+
@BeforeClass
public static void setupLogCaptor() {
logCaptor = LogCaptor.forRoot();
@@ -151,34 +127,11 @@
@Before
public void setupForEachTest() {
-
- if (name.getMethodName().equals("shouldPingChannelIfClientDies") ||
- name.getMethodName().equals("shouldCloseChannelIfClientDoesntRespond") ||
- name.getMethodName().equals("shouldCaptureUserAgentFromClient")) {
- final Logger opSelectorHandlerLogger = (Logger) LoggerFactory.getLogger(OpSelectorHandler.class);
- final Logger unifiedHandlerLogger = (Logger) LoggerFactory.getLogger(UnifiedHandler.class);
- final Logger wsUserAgentHandlerLogger = (Logger) LoggerFactory.getLogger(WsUserAgentHandler.class);
- previousLogLevel = opSelectorHandlerLogger.getLevel();
- opSelectorHandlerLogger.setLevel(Level.INFO);
- unifiedHandlerLogger.setLevel(Level.INFO);
- wsUserAgentHandlerLogger.setLevel(Level.DEBUG);
- }
-
logCaptor.clearLogs();
}
@After
public void teardownForEachTest() {
- if (name.getMethodName().equals("shouldPingChannelIfClientDies") ||
- name.getMethodName().equals("shouldCloseChannelIfClientDoesntRespond") ||
- name.getMethodName().equals("shouldCaptureUserAgentFromClient")) {
- final Logger opSelectorHandlerLogger = (Logger) LoggerFactory.getLogger(OpSelectorHandler.class);
- opSelectorHandlerLogger.setLevel(previousLogLevel);
- final Logger unifiedHandlerLogger = (Logger) LoggerFactory.getLogger(UnifiedHandler.class);
- unifiedHandlerLogger.setLevel(previousLogLevel);
- final Logger wsUserAgentHandlerLogger = (Logger) LoggerFactory.getLogger(WsUserAgentHandler.class);
- wsUserAgentHandlerLogger.setLevel(previousLogLevel);
- }
}
/**
@@ -189,18 +142,7 @@
final String nameOfTest = name.getMethodName();
switch (nameOfTest) {
case "shouldProvideBetterExceptionForMethodCodeTooLarge":
- settings.maxContentLength = 4096000;
-
- // OpProcessor setting
- final Settings.ProcessorSettings processorSettingsBig = new Settings.ProcessorSettings();
- processorSettingsBig.className = StandardOpProcessor.class.getName();
- processorSettingsBig.config = new HashMap<String,Object>() {{
- put(AbstractEvalOpProcessor.CONFIG_MAX_PARAMETERS, Integer.MAX_VALUE);
- }};
- settings.processors.clear();
- settings.processors.add(processorSettingsBig);
-
- // Unified setting
+ settings.maxRequestContentLength = 4096000;
settings.maxParameters = Integer.MAX_VALUE;
break;
case "shouldRespectHighWaterMarkSettingAndSucceed":
@@ -211,7 +153,7 @@
settings.evaluationTimeout = 1000;
break;
case "shouldBlockRequestWhenTooBig":
- settings.maxContentLength = 1024;
+ settings.maxRequestContentLength = 1024;
break;
case "shouldBatchResultsByTwos":
case "shouldBatchResultsByTwosToDriver":
@@ -222,9 +164,6 @@
// remove the script because it isn't used in the test but also because it's not CompileStatic ready
settings.scriptEngines.get("gremlin-groovy").plugins.remove(ScriptFileGremlinPlugin.class.getName());
break;
- case "shouldUseInterpreterMode":
- settings.scriptEngines.get("gremlin-groovy").plugins.put(GroovyCompilerGremlinPlugin.class.getName(), getScriptEngineConfForInterpreterMode());
- break;
case "shouldReceiveFailureTimeOutOnScriptEvalOfOutOfControlLoop":
settings.scriptEngines.get("gremlin-groovy").plugins.put(GroovyCompilerGremlinPlugin.class.getName(), getScriptEngineConfForTimedInterrupt());
break;
@@ -233,62 +172,18 @@
settings.scriptEngines.get("gremlin-groovy").config = getScriptEngineConfForBaseScript();
break;
case "shouldReturnInvalidRequestArgsWhenBindingCountExceedsAllowable":
- // OpProcessor settings
- final Settings.ProcessorSettings processorSettingsSmall = new Settings.ProcessorSettings();
- processorSettingsSmall.className = StandardOpProcessor.class.getName();
- processorSettingsSmall.config = new HashMap<String,Object>() {{
- put(AbstractEvalOpProcessor.CONFIG_MAX_PARAMETERS, 1);
- }};
- settings.processors.clear();
- settings.processors.add(processorSettingsSmall);
-
- // Unified settings
settings.maxParameters = 1;
break;
case "shouldTimeOutRemoteTraversal":
settings.evaluationTimeout = 500;
break;
- case "shouldPingChannelIfClientDies":
- settings.keepAliveInterval = 1000;
- break;
- case "shouldCloseChannelIfClientDoesntRespond":
- settings.idleConnectionTimeout = 1000;
- break;
case "shouldBlowTheWorkQueueSize":
settings.gremlinPool = 1;
settings.maxWorkQueueSize = 1;
break;
- case "shouldRespondToTimeoutCancelledWsRequest":
- case "shouldRespondToTimeoutCancelledSessionRequest":
- useTinkerTransactionGraph(settings);
- settings.evaluationTimeout = 5000;
- settings.gremlinPool = POOL_SIZE_FOR_TIMEOUT_TESTS;
- settings.channelizer = WebSocketChannelizer.class.getName();
- break;
- case "shouldRespondToTimeoutCancelledSingleTaskUnifiedRequest":
- settings.evaluationTimeout = 5000;
- settings.gremlinPool = POOL_SIZE_FOR_TIMEOUT_TESTS;
- settings.channelizer = UnifiedChannelizer.class.getName();
- break;
- case "shouldRespondToTimeoutCancelledMultiTaskUnifiedRequest":
- useTinkerTransactionGraph(settings);
- settings.evaluationTimeout = 30000;
- settings.sessionLifetimeTimeout = 5000; // This needs to be shorter because of the delay in scheduling session task.
- settings.gremlinPool = POOL_SIZE_FOR_TIMEOUT_TESTS;
- settings.channelizer = UnifiedChannelizer.class.getName();
- break;
- case "shouldStoreUserAgentInContextWebSocket":
- settings.channelizer = WebSocketTestChannelizer.class.getName();
- break;
case "shouldStoreUserAgentInContextHttp":
settings.channelizer = HttpTestChannelizer.class.getName();
break;
- case "shouldStoreUserAgentInContextWsAndHttp":
- settings.channelizer = WsAndHttpTestChannelizer.class.getName();
- break;
- case "shouldStoreUserAgentInContextUnified":
- settings.channelizer = UnifiedTestChannelizer.class.getName();
- break;
default:
break;
}
@@ -324,63 +219,16 @@
}
@Test
- public void shouldCaptureUserAgentFromClient() {
- final Cluster cluster = TestClientFactory.build().enableUserAgentOnConnect(true).create();
- final Client client = cluster.connect();
- client.submit("test");
-
- assertThat(logCaptor.getLogs().stream().anyMatch(m -> m.matches(
- ".*New Connection on channel .* with user agent.*$")), is(true));
-
- cluster.close();
- }
-
- @Test
- public void shouldStoreUserAgentInContextWebSocket() throws InterruptedException {
- shouldStoreUserAgentInContext();
- }
-
- @Test
public void shouldStoreUserAgentInContextHttp() throws InterruptedException {
shouldStoreUserAgentInHttpContext();
}
- @Test
- public void shouldStoreUserAgentInContextWsAndHttp() throws InterruptedException {
- shouldStoreUserAgentInContext();
- shouldStoreUserAgentInHttpContext();
- }
-
- @Test
- public void shouldStoreUserAgentInContextUnified() throws InterruptedException {
- shouldStoreUserAgentInContext();
- shouldStoreUserAgentInHttpContext();
- }
-
- private void shouldStoreUserAgentInContext() {
- if(server.getChannelizer() instanceof TestChannelizer) {
- TestChannelizer channelizer = (TestChannelizer) server.getChannelizer();
- channelizer.resetChannelHandlerContext();
- assertNull(getUserAgentIfAvailable());
- final Cluster cluster = TestClientFactory.build().enableUserAgentOnConnect(true).create();
- final Client client = cluster.connect();
-
- client.submit("test");
- assertEquals(UserAgent.USER_AGENT, getUserAgentIfAvailable());
- client.submit("test");
- assertEquals(UserAgent.USER_AGENT, getUserAgentIfAvailable());
- client.close();
- cluster.close();
- }
- }
-
private void shouldStoreUserAgentInHttpContext() throws InterruptedException {
if(server.getChannelizer() instanceof TestChannelizer) {
TestChannelizer channelizer = (TestChannelizer) server.getChannelizer();
channelizer.resetChannelHandlerContext();
assertNull(getUserAgentIfAvailable());
final Cluster cluster = TestClientFactory.build()
- .channelizer(org.apache.tinkerpop.gremlin.driver.Channelizer.HttpChannelizer.class)
.enableUserAgentOnConnect(true)
.create();
final Client client = cluster.connect();
@@ -427,18 +275,18 @@
// maxWorkQueueSize=1 && gremlinPool=1
// we should be able to do one request at a time serially
- assertEquals("test1", client.submit("'test1'").all().get().get(0).getString());
- assertEquals("test2", client.submit("'test2'").all().get().get(0).getString());
- assertEquals("test3", client.submit("'test3'").all().get().get(0).getString());
+ assertEquals("test1", client.submit("'test1'", groovyRequestOptions).all().get().get(0).getString());
+ assertEquals("test2", client.submit("'test2'", groovyRequestOptions).all().get().get(0).getString());
+ assertEquals("test3", client.submit("'test3'", groovyRequestOptions).all().get().get(0).getString());
final AtomicBoolean errorTriggered = new AtomicBoolean();
- final ResultSet r1 = client.submitAsync("Thread.sleep(1000);'test4'").get();
+ final ResultSet r1 = client.submitAsync("Thread.sleep(1000);'test4'", groovyRequestOptions).get();
final List<CompletableFuture<List<Result>>> blockers = new ArrayList<>();
for (int ix = 0; ix < 512 && !errorTriggered.get(); ix++) {
- blockers.add(client.submit("'test'").all().exceptionally(t -> {
+ blockers.add(client.submit("'test'", groovyRequestOptions).all().exceptionally(t -> {
final ResponseException re = (ResponseException) t.getCause();
- errorTriggered.compareAndSet(false, ResponseStatusCode.TOO_MANY_REQUESTS == re.getResponseStatusCode());
+ errorTriggered.compareAndSet(false, HttpResponseStatus.TOO_MANY_REQUESTS == re.getResponseStatusCode());
return null;
}));
}
@@ -450,12 +298,13 @@
blockers.forEach(CompletableFuture::join);
// should be accepting test6 now
- assertEquals("test6", client.submit("'test6'").all().get().get(0).getString());
+ assertEquals("test6", client.submit("'test6'", groovyRequestOptions).all().get().get(0).getString());
cluster.close();
}
@Test
+ @Ignore("Lambda is not supported")
public void shouldScriptEvaluationErrorForRemoteTraversal() throws Exception {
final GraphTraversalSource g = traversal().withRemote(conf);
@@ -466,7 +315,7 @@
} catch (Exception ex) {
final Throwable t = ex.getCause();
assertThat(t, instanceOf(ResponseException.class));
- assertEquals(ResponseStatusCode.SERVER_ERROR_EVALUATION, ((ResponseException) t).getResponseStatusCode());
+ assertEquals(HttpResponseStatus.BAD_REQUEST, ((ResponseException) t).getResponseStatusCode());
}
// make a graph with a cycle in it to force a long run traversal
@@ -479,48 +328,14 @@
} catch (Exception ex) {
final Throwable t = ex.getCause();
assertThat(t, instanceOf(ResponseException.class));
- assertEquals(ResponseStatusCode.SERVER_ERROR_TIMEOUT, ((ResponseException) t).getResponseStatusCode());
+ assertEquals(HttpResponseStatus.INTERNAL_SERVER_ERROR, ((ResponseException) t).getResponseStatusCode());
}
g.close();
}
@Test
- public void shouldCloseChannelIfClientDoesntRespond() throws Exception {
- final SimpleClient client = TestClientFactory.createWebSocketClient();
- client.submit("1+1");
-
- // since we do nothing for 2 seconds and the time limit for timeout on the server is 1 second, the server
- // will autoclose the channel
- Thread.sleep(2000);
-
- assertThat(logCaptor.getLogs().stream().anyMatch(m -> m.matches(
- ".*Closing channel - client is disconnected after idle period of .*$")), is(true));
-
- client.close();
- }
-
- @Test
- public void shouldPingChannelIfClientDies() throws Exception {
- final Cluster cluster = TestClientFactory.build().maxConnectionPoolSize(1).minConnectionPoolSize(1).keepAliveInterval(0).create();
- final Client client = cluster.connect();
- client.submit("1+1").all().get();
-
- // since we do nothing for 3 seconds and the time limit for ping is 1 second we should get *about* 3 pings -
- // i don't think the assertion needs to be too accurate. just need to make sure there's a ping message out
- // there record
- Thread.sleep(3000);
-
- cluster.close();
-
- // stop the server to be sure that logs flush
- stopServer();
-
- assertThat(logCaptor.getLogs().stream().anyMatch(m -> m.matches(
- ".*Checking channel - sending ping to client after idle period of .*$")), is(true));
- }
-
- @Test
+ @Ignore("Lambda is not supported")
public void shouldTimeOutRemoteTraversal() throws Exception {
final GraphTraversalSource g = traversal().withRemote(conf);
@@ -531,7 +346,7 @@
} catch (Exception ex) {
final Throwable t = ex.getCause();
assertThat(t, instanceOf(ResponseException.class));
- assertEquals(ResponseStatusCode.SERVER_ERROR_TIMEOUT, ((ResponseException) t).getResponseStatusCode());
+ assertEquals(HttpResponseStatus.INTERNAL_SERVER_ERROR, ((ResponseException) t).getResponseStatusCode());
}
// make a graph with a cycle in it to force a long run traversal
@@ -544,13 +359,14 @@
} catch (Exception ex) {
final Throwable t = ex.getCause();
assertThat(t, instanceOf(ResponseException.class));
- assertEquals(ResponseStatusCode.SERVER_ERROR_TIMEOUT, ((ResponseException) t).getResponseStatusCode());
+ assertEquals(HttpResponseStatus.INTERNAL_SERVER_ERROR, ((ResponseException) t).getResponseStatusCode());
}
g.close();
}
@Test
+ @Ignore("Lambda is not supported")
public void shouldTimeOutRemoteTraversalWithPerRequestOption() throws Exception {
final GraphTraversalSource g = traversal().withRemote(conf);
@@ -561,7 +377,7 @@
} catch (Exception ex) {
final Throwable t = ex.getCause();
assertThat(t, instanceOf(ResponseException.class));
- assertEquals(ResponseStatusCode.SERVER_ERROR_TIMEOUT, ((ResponseException) t).getResponseStatusCode());
+ assertEquals(HttpResponseStatus.INTERNAL_SERVER_ERROR, ((ResponseException) t).getResponseStatusCode());
}
// make a graph with a cycle in it to force a long run traversal
@@ -574,7 +390,7 @@
} catch (Exception ex) {
final Throwable t = ex.getCause();
assertThat(t, instanceOf(ResponseException.class));
- assertEquals(ResponseStatusCode.SERVER_ERROR_TIMEOUT, ((ResponseException) t).getResponseStatusCode());
+ assertEquals(HttpResponseStatus.INTERNAL_SERVER_ERROR, ((ResponseException) t).getResponseStatusCode());
}
g.close();
@@ -582,11 +398,8 @@
@Test
public void shouldProduceProperExceptionOnTimeout() throws Exception {
- // this test will not work quite right on UnifiedChannelizer
- assumeThat("Must use OpProcessor", isUsingUnifiedChannelizer(), is(false));
-
final Cluster cluster = TestClientFactory.open();
- final Client client = cluster.connect(name.getMethodName());
+ final Client client = cluster.connect();
boolean success = false;
// Run a short test script a few times with progressively longer timeouts.
@@ -594,7 +407,7 @@
// Note: the range of timeouts is intended to cover the case when the script finishes at about the
// same time when the timeout occurs. In this situation either a timeout response or a successful
// response is acceptable, however no other processing errors should occur.
- // Note: the timeout of 30 ms is generally sufficient for running a simple groovy script, so using longer
+ // Note: the timeout of 30 ms is generally sufficient for running a simple traversal, so using longer
// timeouts are not likely to results in a success/timeout response collision, which is the purpose
// of this test.
// Note: this test may have a false negative result, but a failure would indicate a real problem.
@@ -603,12 +416,12 @@
overrideEvaluationTimeout(timeout);
try {
- client.submit("x = 1 + 1").all().get().get(0).getInt();
+ client.submit("g.inject(2)").all().get().get(0).getInt();
success = true;
} catch (Exception ex) {
final Throwable t = ex.getCause();
assertThat("Unexpected exception with script evaluation timeout: " + timeout, t, instanceOf(ResponseException.class));
- assertEquals(ResponseStatusCode.SERVER_ERROR_TIMEOUT, ((ResponseException) t).getResponseStatusCode());
+ assertEquals(HttpResponseStatus.INTERNAL_SERVER_ERROR, ((ResponseException) t).getResponseStatusCode());
}
}
@@ -620,53 +433,9 @@
@Test
public void shouldUseBaseScript() throws Exception {
final Cluster cluster = TestClientFactory.open();
- final Client client = cluster.connect(name.getMethodName());
+ final Client client = cluster.connect();
- assertEquals("hello, stephen", client.submit("hello('stephen')").all().get().get(0).getString());
-
- cluster.close();
- }
-
- @Test
- public void shouldUseInterpreterMode() throws Exception {
- final Cluster cluster = TestClientFactory.open();
- final Client client = cluster.connect(name.getMethodName());
-
- client.submit("def subtractAway(x,y){x-y};[]").all().get();
- client.submit("multiplyIt = { x,y -> x * y};[]").all().get();
-
- assertEquals(2, client.submit("x = 1 + 1").all().get().get(0).getInt());
- assertEquals(3, client.submit("int y = x + 1").all().get().get(0).getInt());
- assertEquals(5, client.submit("def z = x + y").all().get().get(0).getInt());
-
- final Map<String,Object> m = new HashMap<>();
- m.put("x", 10);
- assertEquals(-5, client.submit("z - x", m).all().get().get(0).getInt());
- assertEquals(15, client.submit("addItUp(x,z)", m).all().get().get(0).getInt());
- assertEquals(5, client.submit("subtractAway(x,z)", m).all().get().get(0).getInt());
- assertEquals(50, client.submit("multiplyIt(x,z)", m).all().get().get(0).getInt());
-
- cluster.close();
- }
-
- @Test
- public void shouldNotUseInterpreterMode() throws Exception {
- final Cluster cluster = TestClientFactory.open();
- final Client client = cluster.connect(name.getMethodName());
-
- client.submit("def subtractAway(x,y){x-y};[]").all().get();
- client.submit("multiplyIt = { x,y -> x * y};[]").all().get();
-
- assertEquals(2, client.submit("x = 1 + 1").all().get().get(0).getInt());
- assertEquals(3, client.submit("y = x + 1").all().get().get(0).getInt());
- assertEquals(5, client.submit("z = x + y").all().get().get(0).getInt());
-
- final Map<String,Object> m = new HashMap<>();
- m.put("x", 10);
- assertEquals(-5, client.submit("z - x", m).all().get().get(0).getInt());
- assertEquals(15, client.submit("addItUp(x,z)", m).all().get().get(0).getInt());
- assertEquals(5, client.submit("subtractAway(x,z)", m).all().get().get(0).getInt());
- assertEquals(50, client.submit("multiplyIt(x,z)", m).all().get().get(0).getInt());
+ assertEquals("hello, stephen", client.submit("hello('stephen')", groovyRequestOptions).all().get().get(0).getString());
cluster.close();
}
@@ -676,11 +445,11 @@
final Cluster cluster = TestClientFactory.open();
final Client client = cluster.connect();
- assertEquals(2, client.submit("1+1").all().get().get(0).getInt());
+ assertEquals(2, client.submit("1+1", groovyRequestOptions).all().get().get(0).getInt());
try {
// this should return "nothing" - there should be no exception
- client.submit("java.lang.System.exit(0)").all().get();
+ client.submit("java.lang.System.exit(0)", groovyRequestOptions).all().get();
fail("The above should not have executed in any successful way as sandboxing is enabled");
} catch (Exception ex) {
assertThat(ex.getCause().getMessage(), containsString("[Static type checking] - Not authorized to call this method: java.lang.System#exit(int)"));
@@ -690,7 +459,7 @@
}
@Test
- public void shouldRespectHighWaterMarkSettingAndSucceed() throws Exception {
+ public void shouldRespectHighWaterMarkSettingAndSucceed() {
// the highwatermark should get exceeded on the server and thus pause the writes, but have no problem catching
// itself up - this is a tricky tests to get passing on all environments so this assumption will deny the
// test for most cases
@@ -700,20 +469,17 @@
final Client client = cluster.connect();
try {
- final int resultCountToGenerate = 300;
- final int batchSize = 1;
- final String fatty = RandomStringUtils.random(128);
- final String fattyX = "[x] * " + resultCountToGenerate;
+ final int resultCountToGenerate = 1000;
+ final int batchSize = 3;
+ final String fatty = IntStream.range(0, 175).mapToObj(String::valueOf).collect(Collectors.joining());
+ final String gremlin = String.format("g.inject('%s').repeat(inject('%s').times(%d))", fatty, fatty, resultCountToGenerate-1);
// don't allow the thread to proceed until all results are accounted for
final CountDownLatch latch = new CountDownLatch(resultCountToGenerate);
final AtomicBoolean expected = new AtomicBoolean(false);
final AtomicBoolean faulty = new AtomicBoolean(false);
- final RequestMessage request = RequestMessage.build(Tokens.OPS_EVAL)
- .addArg(ARGS_EVAL_TIMEOUT, 10 * 60 * 1000)
- .addArg(Tokens.ARGS_BATCH_SIZE, batchSize)
- .addArg(Tokens.ARGS_BINDINGS, new HashMap<String,Object>() {{ put("x", fatty); }})
- .addArg(Tokens.ARGS_GREMLIN, fattyX).create();
+ final RequestMessage request = RequestMessage.build(gremlin)
+ .addChunkSize(batchSize).create();
client.submitAsync(request).thenAcceptAsync(r -> {
r.stream().forEach(item -> {
@@ -744,28 +510,17 @@
}
@Test
- public void shouldReturnInvalidRequestArgsWhenGremlinArgIsNotSupplied() throws Exception {
- try (SimpleClient client = TestClientFactory.createWebSocketClient()) {
- final RequestMessage request = RequestMessage.build(Tokens.OPS_EVAL).create();
- final ResponseMessage result = client.submit(request).get(0);
- assertThat(result.getStatus().getCode(), is(not(ResponseStatusCode.PARTIAL_CONTENT)));
- assertEquals(result.getStatus().getCode(), ResponseStatusCode.REQUEST_ERROR_INVALID_REQUEST_ARGUMENTS);
- }
- }
-
- @Test
public void shouldReturnInvalidRequestArgsWhenInvalidReservedBindingKeyIsUsed() throws Exception {
- try (SimpleClient client = TestClientFactory.createWebSocketClient()) {
+ try (SimpleClient client = TestClientFactory.createSimpleHttpClient()) {
final Map<String, Object> bindings = new HashMap<>();
bindings.put(T.id.getAccessor(), "123");
- final RequestMessage request = RequestMessage.build(Tokens.OPS_EVAL)
- .addArg(Tokens.ARGS_GREMLIN, "[1,2,3,4,5,6,7,8,9,0]")
- .addArg(Tokens.ARGS_BINDINGS, bindings).create();
+ final RequestMessage request = RequestMessage.build("g.inject(1,2,3,4,5,6,7,8,9,0)")
+ .addBindings(bindings).create();
final CountDownLatch latch = new CountDownLatch(1);
final AtomicBoolean pass = new AtomicBoolean(false);
client.submit(request, result -> {
- if (result.getStatus().getCode() != ResponseStatusCode.PARTIAL_CONTENT) {
- pass.set(ResponseStatusCode.REQUEST_ERROR_INVALID_REQUEST_ARGUMENTS == result.getStatus().getCode());
+ if (HttpResponseStatus.BAD_REQUEST == result.getStatus().getCode()) {
+ pass.set(true);
latch.countDown();
}
});
@@ -775,17 +530,16 @@
assertThat(pass.get(), is(true));
}
- try (SimpleClient client = TestClientFactory.createWebSocketClient()) {
+ try (SimpleClient client = TestClientFactory.createSimpleHttpClient()) {
final Map<String, Object> bindings = new HashMap<>();
bindings.put("id", "123");
- final RequestMessage request = RequestMessage.build(Tokens.OPS_EVAL)
- .addArg(Tokens.ARGS_GREMLIN, "[1,2,3,4,5,6,7,8,9,0]")
- .addArg(Tokens.ARGS_BINDINGS, bindings).create();
+ final RequestMessage request = RequestMessage.build("g.inject(1,2,3,4,5,6,7,8,9,0)")
+ .addBindings(bindings).create();
final CountDownLatch latch = new CountDownLatch(1);
final AtomicBoolean pass = new AtomicBoolean(false);
client.submit(request, result -> {
- if (result.getStatus().getCode() != ResponseStatusCode.PARTIAL_CONTENT) {
- pass.set(ResponseStatusCode.REQUEST_ERROR_INVALID_REQUEST_ARGUMENTS == result.getStatus().getCode());
+ if (HttpResponseStatus.BAD_REQUEST == result.getStatus().getCode()) {
+ pass.set(true);
latch.countDown();
}
});
@@ -797,42 +551,18 @@
}
@Test
- public void shouldReturnInvalidRequestArgsWhenInvalidTypeBindingKeyIsUsed() throws Exception {
- try (SimpleClient client = TestClientFactory.createWebSocketClient()) {
- final Map<Object, Object> bindings = new HashMap<>();
- bindings.put(1, "123");
- final RequestMessage request = RequestMessage.build(Tokens.OPS_EVAL)
- .addArg(Tokens.ARGS_GREMLIN, "[1,2,3,4,5,6,7,8,9,0]")
- .addArg(Tokens.ARGS_BINDINGS, bindings).create();
- final CountDownLatch latch = new CountDownLatch(1);
- final AtomicBoolean pass = new AtomicBoolean(false);
- client.submit(request, result -> {
- if (result.getStatus().getCode() != ResponseStatusCode.PARTIAL_CONTENT) {
- pass.set(ResponseStatusCode.REQUEST_ERROR_INVALID_REQUEST_ARGUMENTS == result.getStatus().getCode());
- latch.countDown();
- }
- });
-
- if (!latch.await(3000, TimeUnit.MILLISECONDS))
- fail("Request should have returned error, but instead timed out");
- assertThat(pass.get(), is(true));
- }
- }
-
- @Test
public void shouldReturnInvalidRequestArgsWhenBindingCountExceedsAllowable() throws Exception {
- try (SimpleClient client = TestClientFactory.createWebSocketClient()) {
- final Map<Object, Object> bindings = new HashMap<>();
- bindings.put("x", 123);
- bindings.put("y", 123);
- final RequestMessage request = RequestMessage.build(Tokens.OPS_EVAL)
- .addArg(Tokens.ARGS_GREMLIN, "x+y")
- .addArg(Tokens.ARGS_BINDINGS, bindings).create();
+ try (SimpleClient client = TestClientFactory.createSimpleHttpClient()) {
+ final Map<String, Object> bindings = new HashMap<>();
+ bindings.put("x", 1);
+ bindings.put("y", "knows");
+ final RequestMessage request = RequestMessage.build("g.V(x).out(y).values('name')")
+ .addBindings(bindings).addG("gmodern").create();
final CountDownLatch latch = new CountDownLatch(1);
final AtomicBoolean pass = new AtomicBoolean(false);
client.submit(request, result -> {
- if (result.getStatus().getCode() != ResponseStatusCode.PARTIAL_CONTENT) {
- pass.set(ResponseStatusCode.REQUEST_ERROR_INVALID_REQUEST_ARGUMENTS == result.getStatus().getCode());
+ if (HttpResponseStatus.BAD_REQUEST == result.getStatus().getCode()) {
+ pass.set(true);
latch.countDown();
}
});
@@ -842,17 +572,16 @@
assertThat(pass.get(), is(true));
}
- try (SimpleClient client = TestClientFactory.createWebSocketClient()) {
- final Map<Object, Object> bindings = new HashMap<>();
- bindings.put("x", 123);
- final RequestMessage request = RequestMessage.build(Tokens.OPS_EVAL)
- .addArg(Tokens.ARGS_GREMLIN, "x+123")
- .addArg(Tokens.ARGS_BINDINGS, bindings).create();
+ try (SimpleClient client = TestClientFactory.createSimpleHttpClient()) {
+ final Map<String, Object> bindings = new HashMap<>();
+ bindings.put("x", 1);
+ final RequestMessage request = RequestMessage.build("g.V(x).out('knows').values('name')")
+ .addBindings(bindings).addG("gmodern").create();
final CountDownLatch latch = new CountDownLatch(1);
final AtomicBoolean pass = new AtomicBoolean(false);
client.submit(request, result -> {
- if (result.getStatus().getCode() != ResponseStatusCode.PARTIAL_CONTENT) {
- pass.set(ResponseStatusCode.SUCCESS == result.getStatus().getCode() && (((int) ((List) result.getResult().getData()).get(0) == 246)));
+ if (HttpResponseStatus.OK == result.getStatus().getCode()) {
+ pass.set((result.getResult().getData().get(0)).equals("vadas"));
latch.countDown();
}
});
@@ -865,17 +594,16 @@
@Test
public void shouldReturnInvalidRequestArgsWhenInvalidNullBindingKeyIsUsed() throws Exception {
- try (SimpleClient client = TestClientFactory.createWebSocketClient()) {
+ try (SimpleClient client = TestClientFactory.createSimpleHttpClient()) {
final Map<String, Object> bindings = new HashMap<>();
bindings.put(null, "123");
- final RequestMessage request = RequestMessage.build(Tokens.OPS_EVAL)
- .addArg(Tokens.ARGS_GREMLIN, "[1,2,3,4,5,6,7,8,9,0]")
- .addArg(Tokens.ARGS_BINDINGS, bindings).create();
+ final RequestMessage request = RequestMessage.build("g.inject(1,2,3,4,5,6,7,8,9,0)")
+ .addBindings(bindings).create();
final CountDownLatch latch = new CountDownLatch(1);
final AtomicBoolean pass = new AtomicBoolean(false);
client.submit(request, result -> {
- if (result.getStatus().getCode() != ResponseStatusCode.PARTIAL_CONTENT) {
- pass.set(ResponseStatusCode.REQUEST_ERROR_INVALID_REQUEST_ARGUMENTS == result.getStatus().getCode());
+ if (HttpResponseStatus.BAD_REQUEST == result.getStatus().getCode()) {
+ pass.set(true);
latch.countDown();
}
});
@@ -889,112 +617,103 @@
@Test
@SuppressWarnings("unchecked")
public void shouldBatchResultsByTwos() throws Exception {
- // this test will not work quite right on UnifiedChannelizer, but seems to only be a problem in Travis
- assumeThat("Must use OpProcessor", isUsingUnifiedChannelizer(), is(false));
-
- try (SimpleClient client = TestClientFactory.createWebSocketClient()) {
- final RequestMessage request = RequestMessage.build(Tokens.OPS_EVAL)
- .addArg(Tokens.ARGS_GREMLIN, "[0,1,2,3,4,5,6,7,8,9]").create();
+ try (SimpleClient client = TestClientFactory.createSimpleHttpClient()) {
+ final RequestMessage request = RequestMessage.build("g.inject(0,1,2,3,4,5,6,7,8,9)").create();
final List<ResponseMessage> msgs = client.submit(request);
- assertEquals(5, client.submit(request).size());
- assertEquals(0, ((List<Integer>) msgs.get(0).getResult().getData()).get(0).intValue());
- assertEquals(1, ((List<Integer>) msgs.get(0).getResult().getData()).get(1).intValue());
- assertEquals(2, ((List<Integer>) msgs.get(1).getResult().getData()).get(0).intValue());
- assertEquals(3, ((List<Integer>) msgs.get(1).getResult().getData()).get(1).intValue());
- assertEquals(4, ((List<Integer>) msgs.get(2).getResult().getData()).get(0).intValue());
- assertEquals(5, ((List<Integer>) msgs.get(2).getResult().getData()).get(1).intValue());
- assertEquals(6, ((List<Integer>) msgs.get(3).getResult().getData()).get(0).intValue());
- assertEquals(7, ((List<Integer>) msgs.get(3).getResult().getData()).get(1).intValue());
- assertEquals(8, ((List<Integer>) msgs.get(4).getResult().getData()).get(0).intValue());
- assertEquals(9, ((List<Integer>) msgs.get(4).getResult().getData()).get(1).intValue());
+ assertEquals(0, (int) msgs.get(0).getResult().getData().get(0));
+ assertEquals(1, (int) msgs.get(0).getResult().getData().get(1));
+ assertEquals(2, (int) msgs.get(1).getResult().getData().get(0));
+ assertEquals(3, (int) msgs.get(1).getResult().getData().get(1));
+ assertEquals(4, (int) msgs.get(2).getResult().getData().get(0));
+ assertEquals(5, (int) msgs.get(2).getResult().getData().get(1));
+ assertEquals(6, (int) msgs.get(3).getResult().getData().get(0));
+ assertEquals(7, (int) msgs.get(3).getResult().getData().get(1));
+ assertEquals(8, (int) msgs.get(4).getResult().getData().get(0));
+ assertEquals(9, (int) msgs.get(4).getResult().getData().get(1));
+ for (ResponseMessage resp : msgs.subList(5, msgs.size())) {
+ assertEquals(0, resp.getResult().getData().size());
+ }
}
}
-// @Test
-// public void shouldBatchResultsByTwosWithDriver() throws Exception {
-// final Cluster cluster = TestClientFactory.build().create();
-// final Client client = cluster.connect();
-//
-// try {
-// final List<Result> results = client.submit("[0,1,2,3,4,5,6,7,8,9]").all().join();
-// for (int ix = 0; ix < results.size(); ix++) {
-// assertEquals(ix, results.get(ix).getInt());
-// }
-// } finally {
-// cluster.close();
-// }
-// }
-
@Test
- @SuppressWarnings("unchecked")
- public void shouldBatchResultsByOnesByOverridingFromClientSide() throws Exception {
- try (SimpleClient client = TestClientFactory.createWebSocketClient()) {
- final RequestMessage request = RequestMessage.build(Tokens.OPS_EVAL)
- .addArg(Tokens.ARGS_GREMLIN, "[0,1,2,3,4,5,6,7,8,9]")
- .addArg(Tokens.ARGS_BATCH_SIZE, 1).create();
+ public void shouldBatchResultsByTwosWithDriver() throws Exception {
+ final Cluster cluster = TestClientFactory.build().create();
+ final Client client = cluster.connect();
- final List<ResponseMessage> msgs = client.submit(request);
- assertEquals(10, msgs.size());
- IntStream.rangeClosed(0, 9).forEach(i -> assertEquals(i, ((List<Integer>) msgs.get(i).getResult().getData()).get(0).intValue()));
+ try {
+ final List<Result> results = client.submit("g.inject(0,1,2,3,4,5,6,7,8,9)").all().join();
+ for (int ix = 0; ix < results.size(); ix++) {
+ assertEquals(ix, results.get(ix).getInt());
+ }
+ } finally {
+ cluster.close();
}
}
@Test
public void shouldNotThrowNoSuchElementException() throws Exception {
- try (SimpleClient client = TestClientFactory.createWebSocketClient()){
+ try (SimpleClient client = TestClientFactory.createSimpleHttpClient()){
// this should return "nothing" - there should be no exception
final List<ResponseMessage> responses = client.submit("g.V().has('name','kadfjaldjfla')");
- assertNull(responses.get(0).getResult().getData());
+ assertTrue(((List) responses.get(0).getResult().getData()).isEmpty());
}
}
@Test
@SuppressWarnings("unchecked")
public void shouldReceiveFailureTimeOutOnScriptEval() throws Exception {
- try (SimpleClient client = TestClientFactory.createWebSocketClient()){
- final List<ResponseMessage> responses = client.submit("Thread.sleep(3000);'some-stuff-that-should not return'");
- assertThat(responses.get(0).getStatus().getMessage(), allOf(startsWith("Evaluation exceeded"), containsString("1000 ms")));
+ try (SimpleClient client = TestClientFactory.createSimpleHttpClient()){
+ final List<ResponseMessage> responses = client.submit(
+ RequestMessage.build("Thread.sleep(3000);'some-stuff-that-should not return'")
+ .addLanguage("gremlin-groovy").create()
+ );
+ assertTrue(responses.get(0).getStatus().getMessage().contains("timeout occurred"));
// validate that we can still send messages to the server
- assertEquals(2, ((List<Integer>) client.submit("1+1").get(0).getResult().getData()).get(0).intValue());
+ assertEquals(2, ((Integer) (client.submit("g.inject(2)").get(0).getResult().getData()).get(0)).intValue());
}
}
@Test
@SuppressWarnings("unchecked")
public void shouldReceiveFailureTimeOutOnEvalUsingOverride() throws Exception {
- try (SimpleClient client = TestClientFactory.createWebSocketClient()) {
- final RequestMessage msg = RequestMessage.build("eval")
- .addArg(Tokens.ARGS_EVAL_TIMEOUT, 100L)
- .addArg(Tokens.ARGS_GREMLIN, "Thread.sleep(3000);'some-stuff-that-should not return'")
+ try (SimpleClient client = TestClientFactory.createSimpleHttpClient()) {
+ final RequestMessage msg = RequestMessage.build("Thread.sleep(3000);'some-stuff-that-should not return'")
+ .addTimeoutMillis(100L)
+ .addLanguage("gremlin-groovy")
.create();
final List<ResponseMessage> responses = client.submit(msg);
- assertThat(responses.get(0).getStatus().getMessage(), allOf(startsWith("Evaluation exceeded"), containsString("100 ms")));
+ assertThat(responses.get(0).getStatus().getMessage(), containsString("A timeout occurred during traversal evaluation"));
// validate that we can still send messages to the server
- assertEquals(2, ((List<Integer>) client.submit("1+1").get(0).getResult().getData()).get(0).intValue());
+ assertEquals(2, ((Integer) (client.submit("g.inject(2)").get(0).getResult().getData()).get(0)).intValue());
}
}
@Test
public void shouldReceiveFailureTimeOutOnScriptEvalOfOutOfControlLoop() throws Exception {
- try (SimpleClient client = TestClientFactory.createWebSocketClient()){
+ try (SimpleClient client = TestClientFactory.createSimpleHttpClient()){
// timeout configured for 1 second so the timed interrupt should trigger prior to the
// evaluationTimeout which is at 30 seconds by default
- final List<ResponseMessage> responses = client.submit("while(true){}");
+ final List<ResponseMessage> responses = client.submit(
+ RequestMessage.build("while(true){}").addLanguage("gremlin-groovy").create()
+ );
assertThat(responses.get(0).getStatus().getMessage(), startsWith("Timeout during script evaluation triggered by TimedInterruptCustomizerProvider"));
// validate that we can still send messages to the server
- assertEquals(2, ((List<Integer>) client.submit("1+1").get(0).getResult().getData()).get(0).intValue());
+ assertEquals(2, ((Integer) (client.submit("g.inject(2)").get(0).getResult().getData()).get(0)).intValue());
}
}
@Test
@SuppressWarnings("unchecked")
public void shouldLoadInitScript() throws Exception {
- try (SimpleClient client = TestClientFactory.createWebSocketClient()){
- assertEquals(2, ((List<Integer>) client.submit("addItUp(1,1)").get(0).getResult().getData()).get(0).intValue());
+ try (SimpleClient client = TestClientFactory.createSimpleHttpClient()){
+ assertEquals(2, ((Integer) (client.submit(
+ RequestMessage.build("addItUp(1,1)").addLanguage("gremlin-groovy").create()
+ ).get(0).getResult().getData()).get(0)).intValue());
}
}
@@ -1003,16 +722,18 @@
final Cluster cluster = TestClientFactory.open();
final Client client = cluster.connect();
- assertEquals(2, client.submit("addItUp(1,1)").all().join().get(0).getInt());
- assertEquals(0, client.submit("def subtract(x,y){x-y};subtract(1,1)").all().join().get(0).getInt());
- assertEquals(0, client.submit("subtract(1,1)").all().join().get(0).getInt());
+ assertEquals(2, client.submit("addItUp(1,1)", groovyRequestOptions).all().join().get(0).getInt());
+ assertEquals(0, client.submit("def subtract(x,y){x-y};subtract(1,1)", groovyRequestOptions).all().join().get(0).getInt());
+ assertEquals(0, client.submit("subtract(1,1)", groovyRequestOptions).all().join().get(0).getInt());
- final Map<String, Object> bindings = new HashMap<>();
- bindings.put(GremlinGroovyScriptEngine.KEY_REFERENCE_TYPE, GremlinGroovyScriptEngine.REFERENCE_TYPE_PHANTOM);
- assertEquals(4, client.submit("def multiply(x,y){x*y};multiply(2,2)", bindings).all().join().get(0).getInt());
+ RequestOptions options = RequestOptions.build()
+ .addParameter(GremlinGroovyScriptEngine.KEY_REFERENCE_TYPE, GremlinGroovyScriptEngine.REFERENCE_TYPE_PHANTOM)
+ .language("gremlin-groovy")
+ .create();
+ assertEquals(4, client.submit("def multiply(x,y){x*y};multiply(2,2)", options).all().join().get(0).getInt());
try {
- client.submit("multiply(2,2)").all().join().get(0).getInt();
+ client.submit("multiply(2,2)", groovyRequestOptions).all().join().get(0).getInt();
fail("Should throw an exception since reference is phantom.");
} catch (RuntimeException ignored) {
@@ -1021,25 +742,6 @@
}
}
- @Test
- public void shouldReceiveFailureOnBadGraphSONSerialization() throws Exception {
- final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHSON_V3).create();
- final Client client = cluster.connect();
-
- try {
- client.submit("class C { def C getC(){return this}}; new C()").all().join();
- fail("Should throw an exception.");
- } catch (RuntimeException re) {
- final Throwable root = ExceptionHelper.getRootCause(re);
- assertThat(root.getMessage(), CoreMatchers.startsWith("Error during serialization: Direct self-reference leading to cycle (through reference chain:"));
-
- // validate that we can still send messages to the server
- assertEquals(2, client.submit("1+1").all().join().get(0).getInt());
- } finally {
- cluster.close();
- }
- }
-
@SuppressWarnings("ThrowableResultOfMethodCallIgnored")
@Test
public void shouldBlockRequestWhenTooBig() throws Exception {
@@ -1048,7 +750,7 @@
try {
final String fatty = IntStream.range(0, 1024).mapToObj(String::valueOf).collect(Collectors.joining());
- final CompletableFuture<ResultSet> result = client.submitAsync("'" + fatty + "';'test'");
+ final CompletableFuture<ResultSet> result = client.submitAsync(String.format("g.inject('%s').constant('test')", fatty));
final ResultSet resultSet = result.get(10000, TimeUnit.MILLISECONDS);
resultSet.all().get(10000, TimeUnit.MILLISECONDS);
fail("Should throw an exception.");
@@ -1060,12 +762,12 @@
} catch (Exception re) {
final Throwable root = ExceptionHelper.getRootCause(re);
- // went with two possible error messages here as i think that there is some either non-deterministic
- // behavior around the error message or it's environmentally dependent (e.g. different jdk, versions, etc)
- assertThat(root.getMessage(), Matchers.anyOf(is("Connection to server is no longer active"), is("Connection reset by peer")));
+ // the server sends back a 413 Request Entity Too Large now in HTTP so detect that rather than the
+ // underlying connection closing due to error.
+ assertThat(root.getMessage(), Matchers.anyOf(is("Request Entity Too Large")));
// validate that we can still send messages to the server
- assertEquals(2, client.submit("1+1").all().join().get(0).getInt());
+ assertEquals(2, client.submit("g.inject(2)").all().join().get(0).getInt());
} finally {
cluster.close();
}
@@ -1077,14 +779,14 @@
final Client client = cluster.connect();
// ensure that connection to server is good
- assertEquals(2, client.submit("1+1").all().join().get(0).getInt());
+ assertEquals(2, client.submit("g.inject(2)").all().join().get(0).getInt());
// kill the server which will make the client mark the host as unavailable
this.stopServer();
try {
// try to re-issue a request now that the server is down
- client.submit("g").all().join();
+ client.submit("g.inject(2)").all().join();
fail("Should throw an exception.");
} catch (RuntimeException re) {
// Client would have no active connections to the host, hence it would encounter a timeout
@@ -1107,7 +809,7 @@
try {
// just need to succeed at reconnect one time
- final List<Result> results = client.submit("1+1").all().join();
+ final List<Result> results = client.submit("g.inject(2)").all().join();
assertEquals(1, results.size());
assertEquals(2, results.get(0).getInt());
break;
@@ -1123,42 +825,66 @@
@Test
public void shouldNotHavePartialContentWithOneResult() throws Exception {
- try (SimpleClient client = TestClientFactory.createWebSocketClient()) {
- final RequestMessage request = RequestMessage.build(Tokens.OPS_EVAL)
- .addArg(Tokens.ARGS_GREMLIN, "10").create();
+ try (SimpleClient client = TestClientFactory.createSimpleHttpClient()) {
+ final RequestMessage request = RequestMessage.build("g.inject(10)").create();
final List<ResponseMessage> responses = client.submit(request);
- assertEquals(1, responses.size());
- assertEquals(ResponseStatusCode.SUCCESS, responses.get(0).getStatus().getCode());
- }
- }
-
- @Test
- public void shouldHavePartialContentWithLongResultsCollection() throws Exception {
- try (SimpleClient client = TestClientFactory.createWebSocketClient()) {
- final RequestMessage request = RequestMessage.build(Tokens.OPS_EVAL)
- .addArg(Tokens.ARGS_GREMLIN, "new String[100]").create();
- final List<ResponseMessage> responses = client.submit(request);
- assertThat(responses.size(), Matchers.greaterThan(1));
- for (Iterator<ResponseMessage> it = responses.iterator(); it.hasNext(); ) {
- final ResponseMessage msg = it.next();
- final ResponseStatusCode expected = it.hasNext() ? ResponseStatusCode.PARTIAL_CONTENT : ResponseStatusCode.SUCCESS;
- assertEquals(expected, msg.getStatus().getCode());
+ assertEquals(10, responses.get(0).getResult().getData().get(0));
+ for (ResponseMessage resp : responses.subList(1, responses.size())) {
+ assertEquals(0, resp.getResult().getData().size());
}
}
}
@Test
- public void shouldFailWithBadScriptEval() throws Exception {
- try (SimpleClient client = TestClientFactory.createWebSocketClient()) {
- final RequestMessage request = RequestMessage.build(Tokens.OPS_EVAL)
- .addArg(Tokens.ARGS_GREMLIN, "new String().doNothingAtAllBecauseThis is a syntax error").create();
+ public void shouldHavePartialContentWithLongResultsCollection() throws Exception {
+ try (SimpleClient client = TestClientFactory.createSimpleHttpClient()) {
+ final RequestMessage request = RequestMessage.build("g.inject('a').repeat(inject('a')).times(100)").create();
final List<ResponseMessage> responses = client.submit(request);
- assertEquals(ResponseStatusCode.SERVER_ERROR_EVALUATION, responses.get(0).getStatus().getCode());
- assertEquals(1, responses.size());
+ assertThat(responses.size(), Matchers.greaterThan(1));
+
+ // first message have no status
+ assertNull(responses.get(0).getStatus());
+ // first message contains data
+ assertFalse(responses.get(0).getResult().getData().isEmpty());
+ // second one contains last piece of data
+ assertEquals(HttpResponseStatus.OK, responses.get(1).getStatus().getCode());
+ // second message contains data
+ assertFalse(responses.get(1).getResult().getData().isEmpty());
}
}
@Test
+ public void shouldFailWithBadScriptEval() throws Exception {
+ try (SimpleClient client = TestClientFactory.createSimpleHttpClient()) {
+ final RequestMessage request = RequestMessage
+ .build("new String().doNothingAtAllBecauseThis is a syntax error")
+ .addLanguage("gremlin-groovy")
+ .create();
+ final List<ResponseMessage> responses = client.submit(request);
+ assertEquals(HttpResponseStatus.INTERNAL_SERVER_ERROR, responses.get(0).getStatus().getCode());
+ for (ResponseMessage resp : responses.subList(1, responses.size())) {
+ assertEquals(0, resp.getResult().getData().size());
+ }
+ }
+ }
+
+ @Test
+ public void shouldFailWithMalformedQuery() throws Exception {
+ try (SimpleClient client = TestClientFactory.createSimpleHttpClient()) {
+ final RequestMessage request = RequestMessage
+ .build("g.inject(1, 2, g.V())")
+ .create();
+ final List<ResponseMessage> responses = client.submit(request);
+ assertEquals(HttpResponseStatus.BAD_REQUEST, responses.get(0).getStatus().getCode());
+ assertEquals("MalformedQueryException", responses.get(0).getStatus().getException());
+ for (ResponseMessage resp : responses.subList(1, responses.size())) {
+ assertEquals(0, resp.getResult().getData().size());
+ }
+ }
+ }
+
+ @Test
+ @Ignore("Lambda is not supported")
public void shouldSupportLambdasUsingWithRemote() throws Exception {
final GraphTraversalSource g = traversal().withRemote(conf);
g.addV("person").property("age", 20).iterate();
@@ -1168,6 +894,7 @@
}
@Test
+ @Ignore("Lambda is not supported")
public void shouldDoNonBlockingPromiseWithRemote() throws Exception {
final GraphTraversalSource g = traversal().withRemote(conf);
g.addV("person").property("age", 20).promise(Traversal::iterate).join();
@@ -1194,23 +921,23 @@
@Test
public void shouldProvideBetterExceptionForMethodCodeTooLarge() {
final int numberOfParameters = 6000;
- final Map<String,Object> b = new HashMap<>();
+ RequestOptions.Builder optionsBuilder = RequestOptions.build().language("gremlin-groovy");
- // generate a script with a ton of bindings usage to generate a "code too large" exception
+ // generate a script with a ton of parameter usage to generate a "code too large" exception
String script = "x = 0";
for (int ix = 0; ix < numberOfParameters; ix++) {
if (ix > 0 && ix % 100 == 0) {
script = script + ";" + System.lineSeparator() + "x = x";
}
script = script + " + x" + ix;
- b.put("x" + ix, ix);
+ optionsBuilder.addParameter("x" + ix, ix);
}
- final Cluster cluster = TestClientFactory.build().maxContentLength(4096000).create();
+ final Cluster cluster = TestClientFactory.build().maxResponseContentLength(4096000).create();
final Client client = cluster.connect();
try {
- client.submit(script, b).all().get();
+ client.submit(script, optionsBuilder.create()).all().get();
fail("Should have tanked out because of number of parameters used and size of the compile script");
} catch (Exception ex) {
assertThat(ex.getMessage(), containsString("The Gremlin statement that was submitted exceeds the maximum compilation size allowed by the JVM"));
@@ -1225,129 +952,23 @@
final Client client = cluster.connect();
try {
- client.submit("g.addV('person').sideEffect{throw new org.apache.tinkerpop.gremlin.server.util.DefaultTemporaryException('try again!')}").all().get();
+ client.submit("g.addV('person').sideEffect{throw new org.apache.tinkerpop.gremlin.server.util.DefaultTemporaryException('try again!')}", groovyRequestOptions).all().get();
fail("Should have tanked since we threw an exception out manually");
} catch (Exception ex) {
final Throwable t = ex.getCause();
assertThat(t, instanceOf(ResponseException.class));
assertEquals("try again!", t.getMessage());
- assertEquals(ResponseStatusCode.SERVER_ERROR_TEMPORARY, ((ResponseException) t).getResponseStatusCode());
+ assertEquals(HttpResponseStatus.INTERNAL_SERVER_ERROR, ((ResponseException) t).getResponseStatusCode());
} finally {
cluster.close();
}
}
/**
- * Reproducer for TINKERPOP-2769 with request sent to WebSocketChannelizer.
- */
- @Test(timeout = 180000) // Add timeout in case the test hangs.
- public void shouldRespondToTimeoutCancelledWsRequest() throws Exception {
- final GraphTraversalSource g = traversal().withRemote(conf);
- runTimeoutTest(g);
- g.close();
- }
-
- /**
- * Reproducer for TINKERPOP-2769 with request having a Session ID sent to WebSocketChannelizer.
- */
- @Test(timeout = 180000) // Add timeout in case the test hangs.
- public void shouldRespondToTimeoutCancelledSessionRequest() throws Exception {
- // Don't test with UnifiedChannelizer since we only want to test the case where a task is cancelled before
- // running which is handled by shouldRespondToTimeoutCancelledMultiTaskUnifiedRequest.
- assumeThat("Must use OpProcessor", isUsingUnifiedChannelizer(), is(false));
-
- final Cluster cluster = TestClientFactory.build().create();
- final GraphTraversalSource g = traversal().withRemote(DriverRemoteConnection.using(cluster));
- final GraphTraversalSource gtx = g.tx().begin();
-
- runTimeoutTest(gtx);
-
- gtx.tx().commit();
- cluster.close();
- }
-
- /**
- * Reproducer for TINKERPOP-2769 with request sent to UnifiedChannelizer.
- */
- @Test(timeout = 180000) // Add timeout in case the test hangs.
- public void shouldRespondToTimeoutCancelledSingleTaskUnifiedRequest() throws Exception {
- final GraphTraversalSource g = traversal().withRemote(conf);
- runTimeoutTest(g);
- g.close();
- }
-
- /**
- * Reproducer for TINKERPOP-2769 with request having a Session ID sent to UnifiedChannelizer.
- */
- @Test(timeout = 180000) // Add timeout in case the test hangs.
- public void shouldRespondToTimeoutCancelledMultiTaskUnifiedRequest() throws Exception {
- final Cluster cluster = TestClientFactory.build().create();
- final GraphTraversalSource g = traversal().withRemote(DriverRemoteConnection.using(cluster));
- final GraphTraversalSource gtx = g.tx().begin();
-
- g.addV("person").as("p").addE("self").to("p").iterate();
-
- // Number of threads/tasks must be larger than the size of the gremlinPool set in overrideSettings().
- final ScheduledExecutorService threadPool = Executors.newScheduledThreadPool(2);
- // Use a request without session to fill the queue since we want to test cancel on first session request.
- final Future<?> firstResult = threadPool.submit(() -> g.V().repeat(__.out()).until(__.outE().count().is(0)).iterate());
- // Delay this request slightly as we want to test that the MultiTaskSession is properly returning an error when it is cancelled.
- final Future<?> secondResult = threadPool.schedule(() -> gtx.V().repeat(__.out()).until(__.outE().count().is(0)).iterate(), 5000, TimeUnit.MILLISECONDS);
-
- try {
- firstResult.get();
- fail("This traversal should have timed out");
- } catch (Exception ex) {
- final Throwable t = ex.getCause().getCause(); // Get the nested ResponseException.
- assertThat(t, instanceOf(ResponseException.class));
- assertEquals(ResponseStatusCode.SERVER_ERROR_TIMEOUT, ((ResponseException) t).getResponseStatusCode());
- }
-
- try {
- secondResult.get();
- fail("This traversal should have timed out");
- } catch (Exception ex) {
- final Throwable t = ex.getCause().getCause(); // Get the nested ResponseException.
- assertThat(t, instanceOf(ResponseException.class));
- assertEquals(ResponseStatusCode.SERVER_ERROR_TIMEOUT, ((ResponseException) t).getResponseStatusCode());
- }
-
- threadPool.shutdown();
- gtx.tx().rollback();
- cluster.close();
- }
-
- private void runTimeoutTest(GraphTraversalSource g) throws Exception {
- // make a graph with a cycle in it to force a long run traversal
- g.addV("person").as("p").addE("self").to("p").iterate();
-
- // Number of threads/tasks must be larger than the size of the gremlinPool set in overrideSettings().
- final int numTasksNeededToOverloadPool = POOL_SIZE_FOR_TIMEOUT_TESTS + 2;
- final ExecutorService threadPool = Executors.newFixedThreadPool(numTasksNeededToOverloadPool);
- // test "unending" traversals
- final List<Future<?>> results = new ArrayList<>();
- for (int i = 0; i < numTasksNeededToOverloadPool; i++) {
- results.add(threadPool.submit(() -> g.V().repeat(__.out()).until(__.outE().count().is(0)).iterate()));
- }
-
- for (final Future<?> result : results) {
- try {
- result.get();
- fail("This traversal should have timed out");
- } catch (Exception ex) {
- final Throwable t = ex.getCause().getCause(); // Get the nested ResponseException.
- assertThat(t, instanceOf(ResponseException.class));
- assertEquals(ResponseStatusCode.SERVER_ERROR_TIMEOUT, ((ResponseException) t).getResponseStatusCode());
- }
- }
-
- threadPool.shutdown();
- }
-
- /**
- * Reproducer for TINKERPOP-2765 when run using the UnifiedChannelizer.
+ * Reproducer for TINKERPOP-2765.
*/
@Test
+ @Ignore("Lambda is no longer supported in serialization")
public void shouldHandleMultipleLambdaTranslationsInParallel() throws Exception {
final GraphTraversalSource g = traversal().withRemote(conf);
@@ -1377,8 +998,8 @@
} catch (Exception ex) {
final Throwable t = ex.getCause();
assertThat(t, instanceOf(ResponseException.class));
- assertEquals("make it stop", t.getMessage());
- assertEquals(ResponseStatusCode.SERVER_ERROR_FAIL_STEP, ((ResponseException) t).getResponseStatusCode());
+ assertThat(t.getMessage(), startsWith("make it stop"));
+ assertEquals(HttpResponseStatus.INTERNAL_SERVER_ERROR, ((ResponseException) t).getResponseStatusCode());
}
}
@@ -1404,6 +1025,54 @@
assertFalse(r2_tokens.properties().hasNext());
}
+ @Test
+ public void shouldBulkResultsWithClusterOptions() {
+ final Cluster cluster = TestClientFactory.build().bulkResults(true).create();
+ try {
+ final GraphTraversalSource g = traversal().with(DriverRemoteConnection.using(cluster));
+ final List resultBulked = g.with("language", "gremlin-lang").inject(1, 2, 3, 2, 1).toList();
+ assertTrue(cluster.isBulkResultsEnabled());
+ assertEquals(5, resultBulked.size());
+
+ // the result itself should not be affected by bulking through the wire
+ final List result = g.with("language", "gremlin-lang").with("bulkResults", false).inject(1, 2, 3, 2, 1).toList();
+ assertEquals(5, result.size());
+
+ assertTrue(cluster.isBulkResultsEnabled());
+
+ // the result itself should not be affected by bulking through the wire
+ final List resultBulked2 = g.with("language", "gremlin-lang").with("bulkResults", true).inject(1, 2, 3, 2, 1).toList();
+ assertEquals(5, resultBulked2.size());
+
+ } finally {
+ cluster.close();
+ }
+ }
+
+ @Test
+ public void shouldBulkResultsWithRequestOptions() {
+ final Cluster cluster = TestClientFactory.build().create();
+ try {
+ final GraphTraversalSource g = traversal().with(DriverRemoteConnection.using(cluster));
+ final List result = g.inject(1, 2, 3, 2, 1).toList();
+ assertEquals(5, result.size());
+ assertFalse(cluster.isBulkResultsEnabled());
+
+ // the result itself should not be affected by bulking through the wire
+ final List resultBulked = g.with("language", "gremlin-lang").with("bulkResults", true).inject(1, 2, 3, 2, 1).toList();
+ assertEquals(5, resultBulked.size());
+
+ assertFalse(cluster.isBulkResultsEnabled());
+
+ // the result itself should not be affected by bulking through the wire
+ final List result2 = g.with("language", "gremlin-lang").with("bulkResults", false).inject(1, 2, 3, 2, 1).toList();
+ assertEquals(5, result2.size());
+
+ } finally {
+ cluster.close();
+ }
+ }
+
@Test
public void shouldParseFloatLiteralWithoutSuffixDependingOnLanguage() {
final Cluster cluster = TestClientFactory.build().create();
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSerializationIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSerializationIntegrateTest.java
index cca1b80..36e69ae 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSerializationIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSerializationIntegrateTest.java
@@ -20,6 +20,7 @@
import org.apache.tinkerpop.gremlin.driver.Client;
import org.apache.tinkerpop.gremlin.driver.Cluster;
+import org.apache.tinkerpop.gremlin.driver.RequestOptions;
import org.apache.tinkerpop.gremlin.driver.remote.DriverRemoteConnection;
import org.apache.tinkerpop.gremlin.process.traversal.AnonymousTraversalSource;
import org.apache.tinkerpop.gremlin.process.traversal.Path;
@@ -31,9 +32,7 @@
import org.apache.tinkerpop.gremlin.util.Tokens;
import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
import org.apache.tinkerpop.gremlin.util.ser.AbstractMessageSerializer;
-import org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1;
-import org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV2;
-import org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3;
+import org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV4;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -58,6 +57,10 @@
private Client client = null;
private GraphTraversalSource g = null;
+ private final RequestOptions gmodern = RequestOptions.build().addG("gmodern").create();
+ private final RequestOptions gcrew = RequestOptions.build().addG("gcrew").create();
+
+
public GremlinServerSerializationIntegrateTest(AbstractMessageSerializer serializer) {
this.serializer = serializer;
}
@@ -65,9 +68,7 @@
@Parameterized.Parameters(name = "{0}")
public static Collection serializers() {
return Arrays.asList(new Object[][]{
- {new GraphBinaryMessageSerializerV1()},
- {new GraphSONMessageSerializerV3()},
- {new GraphSONMessageSerializerV2()}
+ {new GraphBinaryMessageSerializerV4()}
});
}
@@ -90,14 +91,14 @@
@Test
public void shouldDeserializeVertexPropertiesForScripts() {
- final Vertex vertex = client.submit("gmodern.V(1)").one().getVertex();
+ final Vertex vertex = client.submit("g.V(1)", gmodern).one().getVertex();
assertVertexWithProperties(vertex);
}
@Test
public void shouldSkipVertexPropertiesForScripts() {
- final Vertex vertex = client.submit("gmodern.with('materializeProperties', 'tokens').V(1)").one().getVertex();
+ final Vertex vertex = client.submit("g.with('materializeProperties', 'tokens').V(1)", gmodern).one().getVertex();
assertVertexWithoutProperties(vertex);
}
@@ -118,14 +119,14 @@
@Test
public void shouldDeserializeEdgePropertiesForScripts() {
- final Edge edge = client.submit("gmodern.E(7)").one().getEdge();
+ final Edge edge = client.submit("g.E(7)", gmodern).one().getEdge();
assertEdgeWithProperties(edge);
}
@Test
public void shouldSkipEdgePropertiesForScripts() {
- final Edge edge = client.submit("gmodern.with('materializeProperties', 'tokens').E(7)").one().getEdge();
+ final Edge edge = client.submit("g.with('materializeProperties', 'tokens').E(7)", gmodern).one().getEdge();
assertEdgeWithoutProperties(edge);
}
@@ -146,14 +147,14 @@
@Test
public void shouldDeserializeVertexPropertyPropertiesForScripts() {
- final Vertex vertex = client.submit("gcrew.V(7)").one().getVertex();
+ final Vertex vertex = client.submit("g.V(7)", gcrew).one().getVertex();
assertVertexWithVertexProperties(vertex);
}
@Test
public void shouldSkipVertexPropertyPropertiesForScripts() {
- final Vertex vertex = client.submit("gcrew.with('materializeProperties', 'tokens').V(7)").one().getVertex();
+ final Vertex vertex = client.submit("g.with('materializeProperties', 'tokens').V(7)", gcrew).one().getVertex();
assertVertexWithoutVertexProperties(vertex);
}
@@ -174,13 +175,13 @@
@Test
public void shouldDeserializePathPropertiesForScripts() {
- final Path p = client.submit("gmodern.V().has('name','marko').outE().inV().hasLabel('software').path()").one().getPath();
+ final Path p = client.submit("g.V().has('name','marko').outE().inV().hasLabel('software').path()", gmodern).one().getPath();
assertPathElementsWithProperties(p);
}
@Test
public void shouldDeserializePathPropertiesForScriptsWithTokens() {
- final Path p = client.submit("gmodern.with('materializeProperties','tokens').V().has('name','marko').outE().inV().hasLabel('software').path()").one().getPath();
+ final Path p = client.submit("g.with('materializeProperties','tokens').V().has('name','marko').outE().inV().hasLabel('software').path()", gmodern).one().getPath();
assertPathElementsWithoutProperties(p);
}
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSessionIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSessionIntegrateTest.java
deleted file mode 100644
index 2b6c25f..0000000
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSessionIntegrateTest.java
+++ /dev/null
@@ -1,722 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.server;
-
-import ch.qos.logback.classic.Level;
-import ch.qos.logback.classic.Logger;
-import nl.altindag.log.LogCaptor;
-import org.apache.tinkerpop.gremlin.driver.remote.DriverRemoteConnection;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-import org.apache.tinkerpop.gremlin.util.ExceptionHelper;
-import org.apache.tinkerpop.gremlin.driver.Client;
-import org.apache.tinkerpop.gremlin.driver.Cluster;
-import org.apache.tinkerpop.gremlin.driver.Result;
-import org.apache.tinkerpop.gremlin.driver.ResultSet;
-import org.apache.tinkerpop.gremlin.util.Tokens;
-import org.apache.tinkerpop.gremlin.driver.exception.ResponseException;
-import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.driver.simple.SimpleClient;
-import org.apache.tinkerpop.gremlin.server.channel.UnifiedChannelizer;
-import org.apache.tinkerpop.gremlin.server.op.session.Session;
-import org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.slf4j.LoggerFactory;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.IntStream;
-
-import static org.apache.tinkerpop.gremlin.process.traversal.AnonymousTraversalSource.traversal;
-import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.IsIterableContaining.hasItem;
-import static org.hamcrest.core.StringStartsWith.startsWith;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeThat;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class GremlinServerSessionIntegrateTest extends AbstractGremlinServerIntegrationTest {
- private static LogCaptor logCaptor;
- private Level originalLevel;
-
- @BeforeClass
- public static void setupLogCaptor() {
- logCaptor = LogCaptor.forRoot();
- }
-
- @AfterClass
- public static void tearDownAfterClass() {
- logCaptor.close();
- }
-
- @Before
- public void setupForEachTest() {
- final String nameOfTest = name.getMethodName();
- switch (nameOfTest) {
- case "shouldCloseSessionOnceOnRequest":
- case "shouldHaveTheSessionTimeout":
- case "shouldCloseSessionOnClientClose":
- final Logger sessionLogger = (Logger) LoggerFactory.getLogger(Session.class);
- originalLevel = sessionLogger.getLevel();
- sessionLogger.setLevel(Level.DEBUG);
- break;
- }
-
- logCaptor.clearLogs();
- }
-
- @After
- public void teardownForEachTest() {
- final Logger sessionLogger = (Logger) LoggerFactory.getLogger(Session.class);
- sessionLogger.setLevel(originalLevel);
- }
-
- /**
- * Configure specific Gremlin Server settings for specific tests.
- */
- @Override
- public Settings overrideSettings(final Settings settings) {
- final String nameOfTest = name.getMethodName();
- switch (nameOfTest) {
- case "shouldHaveTheSessionTimeout":
- case "shouldCloseSessionOnceOnRequest":
- settings.processors.clear();
-
- // OpProcessor setting
- final Settings.ProcessorSettings processorSettings = new Settings.ProcessorSettings();
- processorSettings.className = SessionOpProcessor.class.getCanonicalName();
- processorSettings.config = new HashMap<>();
- processorSettings.config.put(SessionOpProcessor.CONFIG_SESSION_TIMEOUT, 3000L);
- settings.processors.add(processorSettings);
-
- // Unified setting
- settings.sessionLifetimeTimeout = 3000L;
- break;
- case "shouldBlowTheSessionQueueSize":
- settings.maxSessionTaskQueueSize = 1;
- case "shouldCloseSessionOnClientClose":
- case "shouldCloseSessionOnClientCloseWithStateMaintainedBetweenExceptions":
- case "shouldExecuteInSessionAndSessionlessWithoutOpeningTransactionWithSingleClient":
- case "shouldExecuteInSessionWithTransactionManagement":
- case "shouldRollbackOnEvalExceptionForManagedTransaction":
- case "shouldNotExecuteQueuedRequestsIfOneInFrontOfItFails":
- useTinkerTransactionGraph(settings);
- break;
- case "shouldEnsureSessionBindingsAreThreadSafe":
- settings.threadPoolWorker = 2;
- break;
- case "shouldUseGlobalFunctionCache":
- // OpProcessor settings are good by default
- // UnifiedHandler settings
- settings.useCommonEngineForSessions = false;
- settings.useGlobalFunctionCacheForSessions = true;
-
- break;
- case "shouldNotUseGlobalFunctionCache":
- settings.processors.clear();
-
- // OpProcessor settings
- final Settings.ProcessorSettings processorSettingsForDisableFunctionCache = new Settings.ProcessorSettings();
- processorSettingsForDisableFunctionCache.className = SessionOpProcessor.class.getCanonicalName();
- processorSettingsForDisableFunctionCache.config = new HashMap<>();
- processorSettingsForDisableFunctionCache.config.put(SessionOpProcessor.CONFIG_GLOBAL_FUNCTION_CACHE_ENABLED, false);
- settings.processors.add(processorSettingsForDisableFunctionCache);
-
- // UnifiedHandler settings
- settings.useCommonEngineForSessions = false;
- settings.useGlobalFunctionCacheForSessions = false;
-
- break;
- }
-
- return settings;
- }
-
- @Test
- public void shouldBlowTheSessionQueueSize() throws Exception {
- assumeThat(isUsingUnifiedChannelizer(), is(true));
-
- final Cluster cluster = TestClientFactory.open();
- final Client session = cluster.connect(name.getMethodName());
-
- // maxSessionQueueSize=1
- // we should be able to do one request at a time serially
- assertEquals("test1", session.submit("'test1'").all().get().get(0).getString());
- assertEquals("test2", session.submit("'test2'").all().get().get(0).getString());
- assertEquals("test3", session.submit("'test3'").all().get().get(0).getString());
-
- final AtomicBoolean errorTriggered = new AtomicBoolean();
- final ResultSet r1 = session.submitAsync("Thread.sleep(1000);'test4'").get();
-
- final List<CompletableFuture<List<Result>>> blockers = new ArrayList<>();
- for (int ix = 0; ix < 512 && !errorTriggered.get(); ix++) {
- blockers.add(session.submit("'test'").all().exceptionally(t -> {
- final ResponseException re = (ResponseException) t.getCause();
- errorTriggered.compareAndSet(false, ResponseStatusCode.TOO_MANY_REQUESTS == re.getResponseStatusCode());
- return null;
- }));
-
- // low resource environments like travis might need a break
- if (ix % 32 == 0) Thread.sleep(500);
- }
-
- // wait for the blockage to clear for sure
- assertEquals("test4", r1.all().get().get(0).getString());
- blockers.forEach(CompletableFuture::join);
-
- assertThat(errorTriggered.get(), is(true));
-
- // should be accepting test6 now
- assertEquals("test6", session.submit("'test6'").all().get().get(0).getString());
-
- session.close();
- cluster.close();
- }
-
- @Test
- public void shouldNotExecuteQueuedRequestsIfOneInFrontOfItFails() throws Exception {
- assumeThat(isUsingUnifiedChannelizer(), is(true));
-
- final Cluster cluster = TestClientFactory.open();
- final Client session = cluster.connect(name.getMethodName());
- final List<CompletableFuture<ResultSet>> futuresAfterFailure = new ArrayList<>();
-
- // short, sweet and successful - but will rollback after close
- final CompletableFuture<List<Result>> first = session.submit("g.addV('person').iterate();1").all();
- assertEquals(1, first.get().get(0).getInt());
-
- // leave enough time for the results to queue behind this
- final int followOnRequestCount = 8;
- final CompletableFuture<ResultSet> second = session.submitAsync("g.addV('person').sideEffect{Thread.sleep(60000)}");
-
- // these requests will queue
- for (int ix = 0; ix < followOnRequestCount; ix ++) {
- futuresAfterFailure.add(session.submitAsync("g.addV('software')"));
- }
-
- // close the session which will interrupt "second" request and flush the queue of requests behind it
- session.close();
-
- try {
- second.join().all().join();
- fail("should have been interrupted by channel close");
- } catch (Exception ex) {
- assertEquals("Connection to server is no longer active", ex.getCause().getMessage());
- }
-
- final AtomicInteger fails = new AtomicInteger(0);
- futuresAfterFailure.forEach(f -> {
- try {
- f.join().all().join();
- fail("should have been interrupted by channel close");
- } catch (Exception ex) {
- assertEquals("Connection to server is no longer active", ex.getCause().getMessage());
- fails.incrementAndGet();
- }
- });
-
- // all are failures
- assertEquals(followOnRequestCount, fails.get());
-
- // validate the rollback
- final Client client = cluster.connect();
- assertEquals(0, client.submit("g.V().count()").all().get().get(0).getInt());
- cluster.close();
- }
-
- @Test
- public void shouldCloseSessionOnClientClose() throws Exception {
-
- final Cluster cluster1 = TestClientFactory.open();
- final Client client1 = cluster1.connect(name.getMethodName());
- client1.submit("x = 1").all().join();
- client1.submit("graph.addVertex()").all().join();
- client1.close();
- cluster1.close();
-
- // the following session close log message is no longer relevant as
- if (isUsingUnifiedChannelizer()) {
- assertThat(((UnifiedChannelizer) server.getChannelizer()).getUnifiedHandler().isActiveSession(name.getMethodName()), is(false));
- } else {
- assertThat(logCaptor.getLogs(), hasItem("Skipped attempt to close open graph transactions on shouldCloseSessionOnClientClose - close was forced"));
- assertThat(logCaptor.getLogs(), hasItem("Session shouldCloseSessionOnClientClose closed"));
- }
-
- // try to reconnect to that session and make sure no state is there
- final Cluster clusterReconnect = TestClientFactory.open();
- final Client clientReconnect = clusterReconnect.connect(name.getMethodName());
-
- // should get an error because "x" is not defined as this is a new session
- try {
- clientReconnect.submit("y=100").all().join();
- clientReconnect.submit("x").all().join();
- fail("Should not have been successful as 'x' was only defined in the old session");
- } catch(Exception ex) {
- final Throwable root = ExceptionHelper.getRootCause(ex);
- assertThat(root.getMessage(), startsWith("No such property"));
- }
-
- // the commit from client1 should not have gone through so there should be no data present.
- assertEquals(0, clientReconnect.submit("graph.traversal().V().count()").all().join().get(0).getInt());
-
- // must turn on maintainStateAfterException for unified channelizer
- if (!isUsingUnifiedChannelizer()) {
- assertEquals(100, clientReconnect.submit("y").all().join().get(0).getInt());
- }
-
- clusterReconnect.close();
-
- if (isUsingUnifiedChannelizer()) {
- assertEquals(0, ((UnifiedChannelizer) server.getChannelizer()).getUnifiedHandler().getActiveSessionCount());
- }
- }
-
- @Test
- public void shouldCloseSessionOnClientCloseWithStateMaintainedBetweenExceptions() throws Exception {
- assumeThat("Must use UnifiedChannelizer", isUsingUnifiedChannelizer(), is(true));
-
- final Cluster cluster1 = TestClientFactory.open();
- final Client client1 = cluster1.connect(name.getMethodName());
- client1.submit("x = 1").all().join();
- client1.submit("graph.addVertex()").all().join();
- client1.close();
- cluster1.close();
-
- assertThat(((UnifiedChannelizer) server.getChannelizer()).getUnifiedHandler().isActiveSession(name.getMethodName()), is(false));
-
- // try to reconnect to that session and make sure no state is there
- final Cluster clusterReconnect = TestClientFactory.open();
-
- // this configures the client to behave like OpProcessor for UnifiedChannelizer
- final Client.SessionSettings settings = Client.SessionSettings.build().
- sessionId(name.getMethodName()).maintainStateAfterException(true).create();
- final Client clientReconnect = clusterReconnect.connect(Client.Settings.build().useSession(settings).create());
-
- // should get an error because "x" is not defined as this is a new session
- try {
- clientReconnect.submit("y=100").all().join();
- clientReconnect.submit("x").all().join();
- fail("Should not have been successful as 'x' was only defined in the old session");
- } catch(Exception ex) {
- final Throwable root = ExceptionHelper.getRootCause(ex);
- assertThat(root.getMessage(), startsWith("No such property"));
- }
-
- // the commit from client1 should not have gone through so there should be no data present.
- assertEquals(0, clientReconnect.submit("graph.traversal().V().count()").all().join().get(0).getInt());
-
- // since maintainStateAfterException is enabled the UnifiedChannelizer works like OpProcessor
- assertEquals(100, clientReconnect.submit("y").all().join().get(0).getInt());
-
- clusterReconnect.close();
-
- assertEquals(0, ((UnifiedChannelizer) server.getChannelizer()).getUnifiedHandler().getActiveSessionCount());
- }
-
- @Test
- public void shouldUseGlobalFunctionCache() throws Exception {
- final Cluster cluster = TestClientFactory.open();
- final Client session = cluster.connect(name.getMethodName());
- final Client client = cluster.connect();
-
- assertEquals(3, session.submit("def sumItUp(x,y){x+y};sumItUp(1,2)").all().get().get(0).getInt());
- assertEquals(3, session.submit("sumItUp(1,2)").all().get().get(0).getInt());
-
- try {
- client.submit("sumItUp(1,2)").all().get().get(0).getInt();
- fail("Global functions should not be cached so the call to sumItUp() should fail");
- } catch (Exception ex) {
- final Throwable root = ExceptionHelper.getRootCause(ex);
- assertThat(root.getMessage(), startsWith("No signature of method"));
- } finally {
- cluster.close();
- }
- }
-
- @Test
- public void shouldNotUseGlobalFunctionCache() throws Exception {
- final Cluster cluster = TestClientFactory.open();
- final Client client = cluster.connect(name.getMethodName());
-
- try {
- assertEquals(3, client.submit("def sumItUp(x,y){x+y};sumItUp(1,2)").all().get().get(0).getInt());
- } catch (Exception ex) {
- cluster.close();
- throw ex;
- }
-
- try {
- client.submit("sumItUp(1,2)").all().get().get(0).getInt();
- fail("Global functions should not be cached so the call to addItUp() should fail");
- } catch (Exception ex) {
- final Throwable root = ExceptionHelper.getRootCause(ex);
- assertThat(root.getMessage(), startsWith("No signature of method"));
- } finally {
- cluster.close();
- }
- }
-
- @Test
- public void shouldNotAllowMoreThanOneClientPerSession() throws Exception {
- final Cluster cluster1 = TestClientFactory.open();
- final Client client1 = cluster1.connect(name.getMethodName());
- client1.submit("1+1").all().join();
- final Cluster cluster2 = TestClientFactory.open();
- final Client.SessionSettings sessionSettings = Client.SessionSettings.build()
- .sessionId(name.getMethodName())
- .forceClosed(true).create();
- final Client client2 = cluster2.connect(Client.Settings.build().useSession(sessionSettings).create());
-
- try {
- client2.submit("2+2").all().join();
- fail("Can't have more than one client connecting to the same session");
- } catch (Exception ex) {
- final Throwable root = ExceptionHelper.getRootCause(ex);
- assertEquals("Session shouldNotAllowMoreThanOneClientPerSession is not bound to the connecting client", root.getMessage());
- }
-
- cluster1.close();
- cluster2.close();
- }
-
- @Test
- public void shouldRollbackOnEvalExceptionForManagedTransaction() throws Exception {
-
- final Cluster cluster = TestClientFactory.open();
- final Client.SessionSettings sessionSettings = Client.SessionSettings.build().
- sessionId(name.getMethodName()).
- manageTransactions(true).
- maintainStateAfterException(false).
- create();
- final Client.Settings clientSettings = Client.Settings.build().useSession(sessionSettings).create();
- final Client client = cluster.connect(clientSettings);
-
- try {
- client.submit("graph.addVertex(); throw new Exception('no worky')").all().get();
- fail("Should have tossed the manually generated exception");
- } catch (Exception ex) {
- final Throwable root = ExceptionHelper.getRootCause(ex);
- assertEquals("no worky", root.getMessage());
- }
-
- try {
- // just force a commit here of "something" to ensure the rollback of the previous request
- client.submit("graph.addVertex(); graph.tx().commit()").all().get(10, TimeUnit.SECONDS);
-
- // the transaction is managed so a rollback should have executed
- assertEquals(1, client.submit("g.V().count()").all().get(10, TimeUnit.SECONDS).get(0).getInt());
- } finally {
- cluster.close();
- }
- }
-
- @Test
- public void shouldCloseSessionOnceOnRequest() throws Exception {
- final Cluster cluster = TestClientFactory.open();
- final Client client = cluster.connect(name.getMethodName());
-
- final ResultSet results1 = client.submit("x = [1,2,3,4,5,6,7,8,9]");
- final AtomicInteger counter = new AtomicInteger(0);
- results1.stream().map(i -> i.get(Integer.class) * 2).forEach(i -> assertEquals(counter.incrementAndGet() * 2, Integer.parseInt(i.toString())));
-
- final ResultSet results2 = client.submit("x[0]+1");
- assertEquals(2, results2.all().get().get(0).getInt());
-
- // explicitly close the session
- client.close();
-
- // wait past automatic session expiration
- Thread.sleep(3500);
-
- try {
- // the original session should be dead so this call will open a new session with the same name but fail
- // because the state is now gone - x is an invalid property
- client.submit("x[1]+2").all().get();
- fail("Session should be dead");
- } catch (Exception ex) {
- final Throwable root = ExceptionHelper.getRootCause(ex);
- assertThat(root, instanceOf(IllegalStateException.class));
- } finally {
- cluster.close();
- }
-
- if (isUsingUnifiedChannelizer()) {
- assertThat(((UnifiedChannelizer) server.getChannelizer()).getUnifiedHandler().isActiveSession(name.getMethodName()), is(false));
- } else {
- assertEquals(1, logCaptor.getLogs().stream()
- .filter(msg -> msg.equals("Session shouldCloseSessionOnceOnRequest closed")).count());
- }
- }
-
- @Test
- public void shouldHaveTheSessionTimeout() throws Exception {
- final Cluster cluster = TestClientFactory.open();
- final Client.SessionSettings settings = Client.SessionSettings.build().
- sessionId(name.getMethodName()).maintainStateAfterException(true).create();
- final Client session = cluster.connect(Client.Settings.build().useSession(settings).create());
-
- final ResultSet results1 = session.submit("x = [1,2,3,4,5,6,7,8,9]");
- final AtomicInteger counter = new AtomicInteger(0);
- results1.stream().map(i -> i.get(Integer.class) * 2).forEach(i -> assertEquals(counter.incrementAndGet() * 2, Integer.parseInt(i.toString())));
-
- final ResultSet results2 = session.submit("x[0]+1");
- assertEquals(2, results2.all().get().get(0).getInt());
-
- // session times out in 3 seconds but slow environments like travis might not be so exacting in the
- // shutdown process so be patient
- if (isUsingUnifiedChannelizer()) {
- boolean sessionAlive = true;
- for (int ix = 1; ix < 11; ix++) {
- sessionAlive = ((UnifiedChannelizer) server.getChannelizer()).getUnifiedHandler().isActiveSession(name.getMethodName());
- if (!sessionAlive) break;
- Thread.sleep(ix * 500);
- }
-
- assertThat(sessionAlive, is(false));
- } else {
- Thread.sleep(5000);
- }
-
- try {
- // the original session should be dead so this call will open a new session with the same name but fail
- // because the state is now gone - x is an invalid property.
- session.submit("x[1]+2").all().get();
- fail("Session should be dead");
- } catch (Exception ex) {
- final Throwable cause = ex.getCause();
- assertThat(cause, instanceOf(ResponseException.class));
- assertEquals(ResponseStatusCode.SERVER_ERROR_EVALUATION, ((ResponseException) cause).getResponseStatusCode());
-
- // validate that we can still send messages to the server
- assertEquals(2, session.submit("1+1").all().join().get(0).getInt());
- } finally {
- cluster.close();
- }
-
- if (isUsingUnifiedChannelizer()) {
- assertThat(((UnifiedChannelizer) server.getChannelizer()).getUnifiedHandler().isActiveSession(name.getMethodName()), is(false));
- } else {
- // there will be one for the timeout and a second for closing the cluster
- assertEquals(2, logCaptor.getLogs().stream()
- .filter(msg -> msg.equals("Session shouldHaveTheSessionTimeout closed")).count());
- }
- }
-
- @Test
- public void shouldEnsureSessionBindingsAreThreadSafe() throws Exception {
- final Cluster cluster = TestClientFactory.build().
- minInProcessPerConnection(16).maxInProcessPerConnection(64).create();
- final Client client = cluster.connect(name.getMethodName());
-
- try {
- client.submit("a=100;b=1000;c=10000;null").all().get();
- final int requests = 10000;
- final List<CompletableFuture<ResultSet>> futures = new ArrayList<>(requests);
- IntStream.range(0, requests).forEach(i -> {
- try {
- futures.add(client.submitAsync("a+b+c"));
- } catch (Exception ex) {
- throw new RuntimeException(ex);
- }
- });
-
- assertEquals(requests, futures.size());
-
- int counter = 0;
- for (CompletableFuture<ResultSet> f : futures) {
- final Result r = f.get().all().get(30000, TimeUnit.MILLISECONDS).get(0);
- assertEquals(11100, r.getInt());
- counter++;
- }
-
- assertEquals(requests, counter);
- } catch (Exception ex) {
- fail(ex.getMessage());
- } finally {
- cluster.close();
- }
- }
-
- @Test
- @SuppressWarnings("unchecked")
- public void shouldExecuteInSessionAndSessionlessWithoutOpeningTransactionWithSingleClient() throws Exception {
-
- try (final SimpleClient client = TestClientFactory.createWebSocketClient()) {
-
- //open a transaction, create a vertex, commit
- final RequestMessage openRequest = RequestMessage.build(Tokens.OPS_EVAL)
- .processor("session")
- .addArg(Tokens.ARGS_SESSION, name.getMethodName())
- .addArg(Tokens.ARGS_GREMLIN, "graph.tx().open()")
- .create();
- final List<ResponseMessage> openResponses = client.submit(openRequest);
- assertEquals(1, openResponses.size());
- assertEquals(ResponseStatusCode.SUCCESS, openResponses.get(0).getStatus().getCode());
-
- final RequestMessage addRequest = RequestMessage.build(Tokens.OPS_EVAL)
- .processor("session")
- .addArg(Tokens.ARGS_SESSION, name.getMethodName())
- .addArg(Tokens.ARGS_GREMLIN, "v=graph.addVertex(\"name\",\"stephen\")")
- .create();
- final List<ResponseMessage> addResponses = client.submit(addRequest);
- assertEquals(1, addResponses.size());
- assertEquals(ResponseStatusCode.SUCCESS, addResponses.get(0).getStatus().getCode());
-
- final RequestMessage commitRequest = RequestMessage.build(Tokens.OPS_EVAL)
- .processor("session")
- .addArg(Tokens.ARGS_SESSION, name.getMethodName())
- .addArg(Tokens.ARGS_GREMLIN, "graph.tx().commit()")
- .create();
- final List<ResponseMessage> commitResponses = client.submit(commitRequest);
- assertEquals(1, commitResponses.size());
- assertEquals(ResponseStatusCode.SUCCESS, commitResponses.get(0).getStatus().getCode());
-
- // Check to see if the transaction is closed.
- final RequestMessage checkRequest = RequestMessage.build(Tokens.OPS_EVAL)
- .processor("session")
- .addArg(Tokens.ARGS_SESSION, name.getMethodName())
- .addArg(Tokens.ARGS_GREMLIN, "graph.tx().isOpen()")
- .create();
- final List<ResponseMessage> checkResponses = client.submit(checkRequest);
- assertEquals(1, checkResponses.size());
- assertEquals(ResponseStatusCode.SUCCESS, checkResponses.get(0).getStatus().getCode());
- assertThat(((List<Boolean>) checkResponses.get(0).getResult().getData()).get(0), is(false));
-
- //lets run a sessionless read
- final RequestMessage sessionlessRequest = RequestMessage.build(Tokens.OPS_EVAL)
- .addArg(Tokens.ARGS_GREMLIN, "graph.traversal().V()")
- .create();
- final List<ResponseMessage> sessionlessResponses = client.submit(sessionlessRequest);
- assertEquals(1, sessionlessResponses.size());
- assertEquals(ResponseStatusCode.SUCCESS, sessionlessResponses.get(0).getStatus().getCode());
-
- // Check to see if the transaction is still closed.
- final RequestMessage checkAgainRequest = RequestMessage.build(Tokens.OPS_EVAL)
- .processor("session")
- .addArg(Tokens.ARGS_SESSION, name.getMethodName())
- .addArg(Tokens.ARGS_GREMLIN, "graph.tx().isOpen()")
- .create();
- final List<ResponseMessage> checkAgainstResponses = client.submit(checkAgainRequest);
- assertEquals(1, checkAgainstResponses.size());
- assertEquals(ResponseStatusCode.SUCCESS, checkAgainstResponses.get(0).getStatus().getCode());
- assertThat(((List<Boolean>) checkAgainstResponses.get(0).getResult().getData()).get(0), is(false));
- }
- }
-
- @Test
- @SuppressWarnings("unchecked")
- public void shouldExecuteInSessionWithTransactionManagement() throws Exception {
-
- try (final SimpleClient client = TestClientFactory.createWebSocketClient()) {
- final RequestMessage addRequest = RequestMessage.build(Tokens.OPS_EVAL)
- .processor("session")
- .addArg(Tokens.ARGS_SESSION, name.getMethodName())
- .addArg(Tokens.ARGS_GREMLIN, "v=graph.addVertex(\"name\",\"stephen\")")
- .addArg(Tokens.ARGS_MANAGE_TRANSACTION, true)
- .create();
- final List<ResponseMessage> addResponses = client.submit(addRequest);
- assertEquals(1, addResponses.size());
- assertEquals(ResponseStatusCode.SUCCESS, addResponses.get(0).getStatus().getCode());
-
- // Check to see if the transaction is closed.
- final RequestMessage checkRequest = RequestMessage.build(Tokens.OPS_EVAL)
- .processor("session")
- .addArg(Tokens.ARGS_SESSION, name.getMethodName())
- .addArg(Tokens.ARGS_GREMLIN, "graph.tx().isOpen()")
- .create();
- final List<ResponseMessage> checkResponses = client.submit(checkRequest);
- assertEquals(1, checkResponses.size());
- assertEquals(ResponseStatusCode.SUCCESS, checkResponses.get(0).getStatus().getCode());
- assertThat(((List<Boolean>) checkResponses.get(0).getResult().getData()).get(0), is(false));
-
- // lets run a sessionless read and validate that the transaction was managed
- final RequestMessage sessionlessRequest = RequestMessage.build(Tokens.OPS_EVAL)
- .addArg(Tokens.ARGS_GREMLIN, "graph.traversal().V().values('name')")
- .create();
- final List<ResponseMessage> sessionlessResponses = client.submit(sessionlessRequest);
- assertEquals(1, sessionlessResponses.size());
- assertEquals(ResponseStatusCode.SUCCESS, sessionlessResponses.get(0).getStatus().getCode());
- assertEquals("stephen", ((List<String>) sessionlessResponses.get(0).getResult().getData()).get(0));
-
- // make sure the session is intact
- final RequestMessage getRequest = RequestMessage.build(Tokens.OPS_EVAL)
- .processor("session")
- .addArg(Tokens.ARGS_SESSION, name.getMethodName())
- .addArg(Tokens.ARGS_GREMLIN, "v.values(\"name\")")
- .addArg(Tokens.ARGS_MANAGE_TRANSACTION, true)
- .create();
- final List<ResponseMessage> getResponses = client.submit(getRequest);
- assertEquals(1, getResponses.size());
- assertEquals(ResponseStatusCode.SUCCESS, getResponses.get(0).getStatus().getCode());
- assertEquals("stephen", ((List<String>) getResponses.get(0).getResult().getData()).get(0));
-
- // Check to see if the transaction is still closed.
- final RequestMessage checkAgainRequest = RequestMessage.build(Tokens.OPS_EVAL)
- .processor("session")
- .addArg(Tokens.ARGS_SESSION, name.getMethodName())
- .addArg(Tokens.ARGS_GREMLIN, "graph.tx().isOpen()")
- .create();
- final List<ResponseMessage> checkAgainstResponses = client.submit(checkAgainRequest);
- assertEquals(1, checkAgainstResponses.size());
- assertEquals(ResponseStatusCode.SUCCESS, checkAgainstResponses.get(0).getStatus().getCode());
- assertThat(((List<Boolean>) checkAgainstResponses.get(0).getResult().getData()).get(0), is(false));
- }
- }
-
- /**
- * Reproducer for TINKERPOP-2751
- */
- @Test(timeout=30000)
- public void shouldThrowExceptionOnTransactionUnsupportedGraph() throws Exception {
- final Cluster cluster = TestClientFactory.build().create();
- final GraphTraversalSource g = traversal().withRemote(DriverRemoteConnection.using(cluster));
-
- final GraphTraversalSource gtx = g.tx().begin();
- assertThat(gtx.tx().isOpen(), is(true));
-
- gtx.addV("person").iterate();
- assertEquals(1, (long) gtx.V().count().next());
-
- try {
- // Without Neo4j plugin this should fail on gremlin-server
- gtx.tx().commit();
- fail("commit should throw exception on non-transaction supported graph");
- } catch (Exception ex){
- final Throwable root = ExceptionHelper.getRootCause(ex);
- assertEquals("Graph does not support transactions", root.getMessage());
- }
-
- cluster.close();
- }
-}
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSessionIntegrateWithUnifiedChannelizerTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSessionIntegrateWithUnifiedChannelizerTest.java
deleted file mode 100644
index bf51bc9..0000000
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSessionIntegrateWithUnifiedChannelizerTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.server;
-
-import org.apache.tinkerpop.gremlin.driver.Cluster;
-import org.apache.tinkerpop.gremlin.driver.remote.DriverRemoteConnection;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-import org.apache.tinkerpop.gremlin.server.channel.UnifiedChannelizerIntegrateTest;
-import org.apache.tinkerpop.gremlin.util.ExceptionHelper;
-import org.junit.Test;
-
-import static org.apache.tinkerpop.gremlin.process.traversal.AnonymousTraversalSource.traversal;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-public class GremlinServerSessionIntegrateWithUnifiedChannelizerTest extends UnifiedChannelizerIntegrateTest {
-
- /**
- * Reproducer for TINKERPOP-2751
- */
- @Test(timeout=30000)
- public void shouldThrowExceptionOnTransactionUnsupportedGraph() throws Exception {
- final Cluster cluster = TestClientFactory.build().create();
- final GraphTraversalSource g = traversal().withRemote(DriverRemoteConnection.using(cluster));
-
- final GraphTraversalSource gtx = g.tx().begin();
- assertThat(gtx.tx().isOpen(), is(true));
-
- gtx.addV("person").iterate();
- assertEquals(1, (long) gtx.V().count().next());
-
- try {
- // Without Neo4j plugin this should fail on gremlin-server
- gtx.tx().commit();
- fail("commit should throw exception on non-transaction supported graph");
- } catch (Exception ex){
- final Throwable root = ExceptionHelper.getRootCause(ex);
- assertEquals("Graph does not support transactions", root.getMessage());
- }
-
- cluster.close();
- }
-}
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSslIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSslIntegrateTest.java
index ba2a238..65ebcbf 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSslIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSslIntegrateTest.java
@@ -18,20 +18,18 @@
*/
package org.apache.tinkerpop.gremlin.server;
+import io.netty.handler.codec.http.HttpResponseStatus;
import io.netty.handler.ssl.ClientAuth;
import io.netty.handler.ssl.SslContext;
import io.netty.handler.ssl.SslContextBuilder;
import io.netty.handler.ssl.SslProvider;
import io.netty.handler.ssl.util.InsecureTrustManagerFactory;
import io.netty.handler.ssl.util.SelfSignedCertificate;
-import org.apache.tinkerpop.gremlin.driver.simple.SimpleClient;
-import org.apache.tinkerpop.gremlin.util.ExceptionHelper;
import org.apache.tinkerpop.gremlin.driver.Client;
import org.apache.tinkerpop.gremlin.driver.Cluster;
-import org.apache.tinkerpop.gremlin.driver.exception.NoHostAvailableException;
-import org.apache.tinkerpop.gremlin.util.Tokens;
+import org.apache.tinkerpop.gremlin.driver.simple.SimpleClient;
+import org.apache.tinkerpop.gremlin.util.ExceptionHelper;
import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
import org.junit.Test;
import javax.net.ssl.SSLException;
@@ -43,7 +41,10 @@
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.IsInstanceOf.instanceOf;
@@ -51,6 +52,7 @@
import static org.junit.Assert.fail;
public class GremlinServerSslIntegrateTest extends AbstractGremlinServerIntegrationTest {
+ private static final Logger logger = LoggerFactory.getLogger(GremlinServerSslIntegrateTest.class);
/**
* Configure specific Gremlin Server settings for specific tests.
@@ -156,7 +158,7 @@
try {
// this should return "nothing" - there should be no exception
- assertEquals("test", client.submit("'test'").one().getString());
+ assertEquals("test", client.submit("g.inject('test')").one().getString());
} finally {
cluster.close();
}
@@ -164,19 +166,18 @@
@Test
public void shouldEnableWebSocketSsl() throws Exception {
- try (SimpleClient client = TestClientFactory.createSSLWebSocketClient()) {
- final Map<Object, Object> bindings = new HashMap<>();
+ try (SimpleClient client = TestClientFactory.createSSLSimpleHttpClient()) {
+ final Map<String, Object> bindings = new HashMap<>();
bindings.put("x", 123);
bindings.put("y", 123);
- final RequestMessage request = RequestMessage.build(Tokens.OPS_EVAL)
- .addArg(Tokens.ARGS_GREMLIN, "x+y")
- .addArg(Tokens.ARGS_BINDINGS, bindings).create();
+ final RequestMessage request = RequestMessage.build("x+y")
+ .addBindings(bindings).addLanguage("gremlin-groovy").create();
final CountDownLatch latch = new CountDownLatch(1);
final AtomicBoolean pass = new AtomicBoolean(false);
client.submit(request, result -> {
System.out.println(result.getStatus());
- if (result.getStatus().getCode() != ResponseStatusCode.PARTIAL_CONTENT) {
- pass.set(ResponseStatusCode.SUCCESS == result.getStatus().getCode() &&
+ if (result.getStatus().getCode() != HttpResponseStatus.PARTIAL_CONTENT) {
+ pass.set(HttpResponseStatus.OK == result.getStatus().getCode() &&
(((int) ((List) result.getResult().getData()).get(0) == 246)));
}
latch.countDown();
@@ -200,7 +201,7 @@
try {
// this should return "nothing" - there should be no exception
- assertEquals("test", client.submit("'test'").one().getString());
+ assertEquals("test", client.submit("g.inject('test')").one().getString());
} finally {
cluster.close();
}
@@ -212,12 +213,12 @@
final Client client = cluster.connect();
try {
- client.submit("'test'").one();
+ client.submit("g.inject('test')").one();
fail("Should throw exception because ssl is enabled on the server but not on client");
} catch(Exception x) {
- assertThat(x, instanceOf(NoHostAvailableException.class));
final Throwable root = ExceptionHelper.getRootCause(x);
assertThat(root, instanceOf(RuntimeException.class));
+ assertThat(root.getMessage(), containsString("The server may be expecting SSL to be enabled"));
} finally {
cluster.close();
}
@@ -230,7 +231,7 @@
final Client client = cluster.connect();
try {
- assertEquals("test", client.submit("'test'").one().getString());
+ assertEquals("test", client.submit("g.inject('test')").one().getString());
} finally {
cluster.close();
}
@@ -243,7 +244,7 @@
final Client client = cluster.connect();
try {
- assertEquals("test", client.submit("'test'").one().getString());
+ assertEquals("test", client.submit("g.inject('test')").one().getString());
} finally {
cluster.close();
}
@@ -256,12 +257,10 @@
final Client client = cluster.connect();
try {
- client.submit("'test'").one();
+ client.submit("g.inject('test')").one();
fail("Should throw exception because ssl client auth is enabled on the server but client does not have a cert");
} catch (Exception x) {
- assertThat(x, instanceOf(NoHostAvailableException.class));
- final Throwable root = ExceptionHelper.getRootCause(x);
- assertThat(root, instanceOf(SSLException.class));
+ assertSslException(x, "bad_certificate");
} finally {
cluster.close();
}
@@ -274,12 +273,10 @@
final Client client = cluster.connect();
try {
- client.submit("'test'").one();
+ client.submit("g.inject('test')").one();
fail("Should throw exception because ssl client auth is enabled on the server but does not trust client's cert");
} catch (Exception x) {
- assertThat(x, instanceOf(NoHostAvailableException.class));
- final Throwable root = ExceptionHelper.getRootCause(x);
- assertThat(root, instanceOf(SSLException.class));
+ assertSslException(x, "bad_certificate");
} finally {
cluster.close();
}
@@ -292,12 +289,10 @@
final Client client = cluster.connect();
try {
- client.submit("'test'").one();
+ client.submit("g.inject('test')").one();
fail("Should throw exception because ssl client requires TLSv1.2 whereas server supports only TLSv1.1");
} catch (Exception x) {
- assertThat(x, instanceOf(NoHostAvailableException.class));
- final Throwable root = ExceptionHelper.getRootCause(x);
- assertThat(root, instanceOf(SSLException.class));
+ assertSslException(x ,"protocol_version");
} finally {
cluster.close();
}
@@ -310,10 +305,9 @@
final Client client = cluster.connect();
try {
- client.submit("'test'").one();
+ client.submit("g.inject('test')").one();
fail("Should throw exception because ssl client requires TLSv1.2 whereas server supports only TLSv1.1");
} catch (Exception x) {
- assertThat(x, instanceOf(NoHostAvailableException.class));
final Throwable root = ExceptionHelper.getRootCause(x);
assertThat(root, instanceOf(SSLException.class));
} finally {
@@ -330,7 +324,7 @@
final Client client = cluster.connect();
try {
- assertEquals("test", client.submit("'test'").one().getString());
+ assertEquals("test", client.submit("g.inject('test')").one().getString());
} finally {
cluster.close();
}
@@ -342,9 +336,16 @@
final Client client2 = cluster2.connect();
try {
- assertEquals("test", client2.submit("'test'").one().getString());
+ assertEquals("test", client2.submit("g.inject('test')").one().getString());
} finally {
cluster2.close();
}
}
+
+ private static void assertSslException(Exception x, String expectedSubstring) {
+ logger.warn("Exception caught: {}", x.getMessage(), x);
+ final Throwable root = ExceptionHelper.getRootCause(x);
+ assertThat(root, instanceOf(SSLException.class));
+ assertThat(root.getMessage(), containsString(expectedSubstring));
+ }
}
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinSessionTxIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinSessionTxIntegrateTest.java
deleted file mode 100644
index cf22cf9..0000000
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinSessionTxIntegrateTest.java
+++ /dev/null
@@ -1,406 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.server;
-
-import org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor;
-import org.apache.tinkerpop.gremlin.util.ExceptionHelper;
-import org.apache.tinkerpop.gremlin.driver.Client;
-import org.apache.tinkerpop.gremlin.driver.Cluster;
-import org.apache.tinkerpop.gremlin.driver.RequestOptions;
-import org.apache.tinkerpop.gremlin.driver.remote.DriverRemoteConnection;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-import org.apache.tinkerpop.gremlin.structure.Transaction;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import java.io.File;
-import java.util.HashMap;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-
-import static org.apache.tinkerpop.gremlin.process.traversal.AnonymousTraversalSource.traversal;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-/**
- * Integration tests for gremlin-driver and bytecode sessions.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class GremlinSessionTxIntegrateTest extends AbstractGremlinServerIntegrationTest {
-
- /**
- * Configure specific Gremlin Server settings for specific tests.
- */
- @Override
- public Settings overrideSettings(final Settings settings) {
- final String nameOfTest = name.getMethodName();
-
- settings.graphs.put("graph", "conf/tinkertransactiongraph-empty.properties");
-
- switch (nameOfTest) {
- case "shouldExecuteBytecodeInSession":
- break;
- case "shouldTimeoutTxBytecode":
- settings.processors.clear();
-
- // OpProcessor setting
- final Settings.ProcessorSettings processorSettings = new Settings.ProcessorSettings();
- processorSettings.className = SessionOpProcessor.class.getCanonicalName();
- processorSettings.config = new HashMap<>();
- processorSettings.config.put(SessionOpProcessor.CONFIG_SESSION_TIMEOUT, 3000L);
- settings.processors.add(processorSettings);
-
- // Unified setting
- settings.sessionLifetimeTimeout = 3000L;
- break;
- }
-
- return settings;
- }
-
- @Test
- @Ignore("TINKERPOP-2832")
- public void shouldTimeoutTxBytecode() throws Exception {
-
- final Cluster cluster = TestClientFactory.build().create();
- final GraphTraversalSource g = traversal().withRemote(DriverRemoteConnection.using(cluster));
-
- GraphTraversalSource gtx = g.tx().begin();
- gtx.addV("person").addE("link").iterate();
- gtx.tx().commit();
-
- assertEquals(1L, g.V().count().next().longValue());
- assertEquals(1L, g.E().count().next().longValue());
-
- try {
- gtx = g.tx().begin();
-
- assertEquals(1L, gtx.V().count().next().longValue());
- assertEquals(1L, gtx.E().count().next().longValue());
-
- // wait long enough for the session to die
- Thread.sleep(4000);
-
- // the following should fail with a dead session
- gtx.V().count().iterate();
- fail("Session is dead - a new one should not reopen to server this request");
- } catch (Exception ex) {
- ex.printStackTrace();
- }
-
- cluster.close();
- }
-
- @Test
- public void shouldCommitTxBytecodeInSession() throws Exception {
-
- final Cluster cluster = TestClientFactory.build().create();
- final GraphTraversalSource g = traversal().withRemote(DriverRemoteConnection.using(cluster));
-
- final GraphTraversalSource gtx = g.tx().begin();
- assertThat(gtx.tx().isOpen(), is(true));
-
- gtx.addV("person").iterate();
- assertEquals(1, (long) gtx.V().count().next());
-
- // outside the session we should be at zero
- assertEquals(0, (long) g.V().count().next());
-
- gtx.tx().commit();
- assertThat(gtx.tx().isOpen(), is(false));
-
- // sessionless connections should still be good - close() should not affect that
- assertEquals(1, (long) g.V().count().next());
-
- // but the spawned gtx should be dead
- try {
- gtx.addV("software").iterate();
- fail("Should have failed since we committed the transaction");
- } catch (Exception ex) {
- final Throwable root = ExceptionHelper.getRootCause(ex);
- assertEquals("Client is closed", root.getMessage());
- }
-
- cluster.close();
- }
-
- @Test
- public void shouldCommitTxBytecodeInSessionWithExplicitTransactionObject() throws Exception {
-
- final Cluster cluster = TestClientFactory.build().create();
- final GraphTraversalSource g = traversal().withRemote(DriverRemoteConnection.using(cluster));
- final Transaction tx = g.tx();
- assertThat(tx.isOpen(), is(true));
-
- final GraphTraversalSource gtx = tx.begin();
- gtx.addV("person").iterate();
- assertEquals(1, (long) gtx.V().count().next());
- tx.commit();
- assertThat(tx.isOpen(), is(false));
-
- // sessionless connections should still be good - close() should not affect that
- assertEquals(1, (long) g.V().count().next());
-
- cluster.close();
- }
-
- @Test
- public void shouldRollbackTxBytecodeInSession() throws Exception {
-
- final Cluster cluster = TestClientFactory.build().create();
- final GraphTraversalSource g = traversal().withRemote(DriverRemoteConnection.using(cluster));
-
- final GraphTraversalSource gtx = g.tx().begin();
- assertThat(gtx.tx().isOpen(), is(true));
-
- gtx.addV("person").iterate();
- assertEquals(1, (long) gtx.V().count().next());
- gtx.tx().rollback();
- assertThat(gtx.tx().isOpen(), is(false));
-
- // sessionless connections should still be good - close() should not affect that
- assertEquals(0, (long) g.V().count().next());
-
- // but the spawned gtx should be dead
- try {
- gtx.addV("software").iterate();
- fail("Should have failed since we committed the transaction");
- } catch (Exception ex) {
- final Throwable root = ExceptionHelper.getRootCause(ex);
- assertEquals("Client is closed", root.getMessage());
- }
-
- cluster.close();
- }
-
- @Test
- public void shouldCommitTxBytecodeInSessionOnCloseOfGtx() throws Exception {
-
- final Cluster cluster = TestClientFactory.build().create();
- final GraphTraversalSource g = traversal().withRemote(DriverRemoteConnection.using(cluster));
-
- final GraphTraversalSource gtx = g.tx().begin();
- assertThat(gtx.tx().isOpen(), is(true));
-
- gtx.addV("person").iterate();
- assertEquals(1, (long) gtx.V().count().next());
- gtx.close();
- assertThat(gtx.tx().isOpen(), is(false));
-
- // sessionless connections should still be good - close() should not affect that
- assertEquals(1, (long) g.V().count().next());
-
- // but the spawned gtx should be dead
- try {
- gtx.addV("software").iterate();
- fail("Should have failed since we committed the transaction");
- } catch (Exception ex) {
- final Throwable root = ExceptionHelper.getRootCause(ex);
- assertEquals("Client is closed", root.getMessage());
- }
-
- cluster.close();
- }
-
- @Test
- public void shouldCommitTxBytecodeInSessionOnCloseTx() throws Exception {
-
- final Cluster cluster = TestClientFactory.build().create();
- final GraphTraversalSource g = traversal().withRemote(DriverRemoteConnection.using(cluster));
-
- final GraphTraversalSource gtx = g.tx().begin();
- assertThat(gtx.tx().isOpen(), is(true));
-
- gtx.addV("person").iterate();
- assertEquals(1, (long) gtx.V().count().next());
- gtx.close();
- assertThat(gtx.tx().isOpen(), is(false));
-
- // sessionless connections should still be good - close() should not affect that
- assertEquals(1, (long) g.V().count().next());
-
- // but the spawned gtx should be dead
- try {
- gtx.addV("software").iterate();
- fail("Should have failed since we committed the transaction");
- } catch (Exception ex) {
- final Throwable root = ExceptionHelper.getRootCause(ex);
- assertEquals("Client is closed", root.getMessage());
- }
-
- cluster.close();
- }
-
- @Test
- public void shouldOpenAndCloseObsceneAmountOfSessions() throws Exception {
-
- final Cluster cluster = TestClientFactory.build().create();
- final GraphTraversalSource g = traversal().withRemote(DriverRemoteConnection.using(cluster));
-
- // need to open significantly more sessions that we have threads in gremlinPool. if we go too obscene on
- // OpProcessor this test will take too long
- final int numberOfSessions = isUsingUnifiedChannelizer() ? 1000 : 100;
- for (int ix = 0; ix < numberOfSessions; ix ++) {
- final Transaction tx = g.tx();
- final GraphTraversalSource gtx = tx.begin();
- try {
- final Vertex v1 = gtx.addV("person").property("pid", ix + "a").next();
- final Vertex v2 = gtx.addV("person").property("pid", ix + "b").next();
- gtx.addE("knows").from(v1).to(v2).iterate();
- tx.commit();
- } catch (Exception ex) {
- tx.rollback();
- fail("Should not expect any failures");
- } finally {
- assertThat(tx.isOpen(), is(false));
- }
- }
-
- // sessionless connections should still be good - close() should not affect that
- assertEquals(numberOfSessions * 2, (long) g.V().count().next());
- assertEquals(numberOfSessions, (long) g.E().count().next());
-
- cluster.close();
- }
-
- @Test
- public void shouldCommitTxBytecodeInSessionReusingGtxAcrossThreads() throws Exception {
-
- final ExecutorService service = Executors.newFixedThreadPool(2);
-
- final Cluster cluster = TestClientFactory.build().create();
- final GraphTraversalSource g = traversal().withRemote(DriverRemoteConnection.using(cluster));
-
- final GraphTraversalSource gtx = g.tx().begin();
- assertThat(gtx.tx().isOpen(), is(true));
-
- final int verticesToAdd = 64;
- for (int ix = 0; ix < verticesToAdd; ix++) {
- service.submit(() -> gtx.addV("person").iterate());
- }
-
- service.shutdown();
- service.awaitTermination(90000, TimeUnit.MILLISECONDS);
-
- // outside the session we should be at zero
- assertEquals(0, (long) g.V().count().next());
-
- assertEquals(verticesToAdd, (long) gtx.V().count().next());
- gtx.tx().commit();
- assertThat(gtx.tx().isOpen(), is(false));
-
- // sessionless connections should still be good - close() should not affect that
- assertEquals(verticesToAdd, (long) g.V().count().next());
-
- cluster.close();
- }
-
- @Test
- public void shouldSpawnMultipleTraversalSourceInSameTransaction() throws Exception {
-
- final Cluster cluster = TestClientFactory.build().create();
- final GraphTraversalSource g = traversal().withRemote(DriverRemoteConnection.using(cluster));
-
- final Transaction tx1 = g.tx();
- final GraphTraversalSource gtx1a = tx1.begin();
- final GraphTraversalSource gtx1b = tx1.begin();
- final Transaction tx2 = g.tx();
- final GraphTraversalSource gtx2 = tx2.begin();
-
- gtx1a.addV("person").iterate();
- assertEquals(1, (long) gtx1a.V().count().next());
- assertEquals(1, (long) gtx1b.V().count().next());
-
- // outside the session we should be at zero
- assertEquals(0, (long) g.V().count().next());
- assertEquals(0, (long) gtx2.V().count().next());
-
- // either can commit to end the transaction
- gtx1b.tx().commit();
- assertThat(gtx1a.tx().isOpen(), is(false));
- assertThat(gtx1b.tx().isOpen(), is(false));
-
- // sessionless connections should still be good - close() should not affect that
- assertEquals(1, (long) g.V().count().next());
-
- // but the spawned gtx should be dead
- try {
- gtx1a.addV("software").iterate();
- fail("Should have failed since we committed the transaction");
- } catch (Exception ex) {
- final Throwable root = ExceptionHelper.getRootCause(ex);
- assertEquals("Client is closed", root.getMessage());
- }
-
- try {
- gtx1b.addV("software").iterate();
- fail("Should have failed since we committed the transaction");
- } catch (Exception ex) {
- final Throwable root = ExceptionHelper.getRootCause(ex);
- assertEquals("Client is closed", root.getMessage());
- }
-
- cluster.close();
- }
-
- @Test
- public void shouldCommitRollbackInScriptUsingGremlinLang() throws Exception {
- final Cluster cluster = TestClientFactory.open();
- final Client.SessionSettings sessionSettings = Client.SessionSettings.build().
- sessionId(name.getMethodName()).
- manageTransactions(false).
- maintainStateAfterException(false).
- create();
- final Client.Settings clientSettings = Client.Settings.build().useSession(sessionSettings).create();
- final Client client = cluster.connect();
- final Client session = cluster.connect(clientSettings);
-
- // this test mixes calls across scriptengines - probably not a use case but interesting
- try {
- session.submit("g.addV('person')").all().get(10, TimeUnit.SECONDS);
- session.submit("g.addV('person')").all().get(10, TimeUnit.SECONDS);
-
- // outside of session graph should be empty still but in session we should have 2
- assertEquals(0, client.submit("g.V().count()").all().get(10, TimeUnit.SECONDS).get(0).getInt());
- assertEquals(2, session.submit("g.V().count()").all().get(10, TimeUnit.SECONDS).get(0).getInt());
-
- // commit whats there using gremlin-language and test again
- session.submit("g.tx().commit()", RequestOptions.build().language("gremlin-lang").create()).all().get(10, TimeUnit.SECONDS);
- assertEquals(2, client.submit("g.V().count()").all().get(10, TimeUnit.SECONDS).get(0).getInt());
- assertEquals(2, session.submit("g.V().count()").all().get(10, TimeUnit.SECONDS).get(0).getInt());
-
- // add one more in session and test
- session.submit("g.addV('person')").all().get(10, TimeUnit.SECONDS);
- assertEquals(2, client.submit("g.V().count()").all().get(10, TimeUnit.SECONDS).get(0).getInt());
- assertEquals(3, session.submit("g.V().count()").all().get(10, TimeUnit.SECONDS).get(0).getInt());
-
- // rollback the additional one and test
- session.submit("g.tx().rollback()", RequestOptions.build().language("gremlin-lang").create()).all().get(10, TimeUnit.SECONDS);
- assertEquals(2, client.submit("g.V().count()").all().get(10, TimeUnit.SECONDS).get(0).getInt());
- assertEquals(2, session.submit("g.V().count()").all().get(10, TimeUnit.SECONDS).get(0).getInt());
- } finally {
- cluster.close();
- }
- }
-}
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/HttpDriverIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/HttpDriverIntegrateTest.java
index 2d08b77..22b112e 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/HttpDriverIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/HttpDriverIntegrateTest.java
@@ -18,23 +18,45 @@
*/
package org.apache.tinkerpop.gremlin.server;
-import io.netty.handler.codec.EncoderException;
+import io.netty.handler.codec.http.HttpResponseStatus;
import org.apache.commons.lang3.exception.ExceptionUtils;
-import org.apache.tinkerpop.gremlin.driver.Channelizer;
import org.apache.tinkerpop.gremlin.driver.Client;
import org.apache.tinkerpop.gremlin.driver.Cluster;
+import org.apache.tinkerpop.gremlin.driver.RequestOptions;
+import org.apache.tinkerpop.gremlin.driver.Result;
+import org.apache.tinkerpop.gremlin.driver.ResultSet;
+import org.apache.tinkerpop.gremlin.driver.exception.ResponseException;
import org.apache.tinkerpop.gremlin.driver.remote.DriverRemoteConnection;
+import org.apache.tinkerpop.gremlin.process.traversal.Merge;
+import org.apache.tinkerpop.gremlin.process.traversal.P;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
import org.apache.tinkerpop.gremlin.server.channel.HttpChannelizer;
-import org.apache.tinkerpop.gremlin.structure.Transaction;
-import org.apache.tinkerpop.gremlin.util.ser.Serializers;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.util.CollectionUtil;
+import org.apache.tinkerpop.gremlin.util.ExceptionHelper;
+import org.junit.Ignore;
import org.junit.Test;
+import java.awt.Color;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+
import static org.apache.tinkerpop.gremlin.process.traversal.AnonymousTraversalSource.traversal;
+import static org.apache.tinkerpop.gremlin.structure.VertexProperty.Cardinality.list;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.startsWith;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.AllOf.allOf;
-import static org.hamcrest.core.StringContains.containsString;
+import static org.hamcrest.core.IsInstanceOf.instanceOf;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
public class HttpDriverIntegrateTest extends AbstractGremlinServerIntegrationTest {
@@ -46,30 +68,12 @@
}
@Test
- public void shouldSubmitScriptWithGraphSON() throws Exception {
- final Cluster cluster = TestClientFactory.build()
- .channelizer(Channelizer.HttpChannelizer.class)
- .serializer(Serializers.GRAPHSON_V3)
- .create();
- try {
- final Client client = cluster.connect();
- assertEquals(2, client.submit("1+1").all().get().get(0).getInt());
- } catch (Exception ex) {
- throw ex;
- } finally {
- cluster.close();
- }
- }
-
- @Test
public void shouldSubmitScriptWithGraphBinary() throws Exception {
- final Cluster cluster = TestClientFactory.build()
- .channelizer(Channelizer.HttpChannelizer.class)
- .serializer(Serializers.GRAPHBINARY_V1)
- .create();
+ final Cluster cluster = TestClientFactory.build().create();
try {
final Client client = cluster.connect();
- assertEquals(2, client.submit("1+1").all().get().get(0).getInt());
+ // default chunk size is 64
+ assertEquals(100, client.submit("g.inject(0).repeat(inject(0)).times(99)").all().get().size());
} catch (Exception ex) {
throw ex;
} finally {
@@ -78,13 +82,44 @@
}
@Test
- public void shouldSubmitBytecodeWithGraphSON() throws Exception {
- final Cluster cluster = TestClientFactory.build()
- .channelizer(Channelizer.HttpChannelizer.class)
- .serializer(Serializers.GRAPHSON_V3)
- .create();
+ public void shouldFailWhenNeeded() {
+ final Cluster cluster = TestClientFactory.build().create();
+ final Client client = cluster.connect();
try {
- final GraphTraversalSource g = traversal().withRemote(DriverRemoteConnection.using(cluster));
+ final RequestOptions ro = RequestOptions.build().language("gremlin-lang").create();
+ client.submit("g.inject(1).fail('Good bye, world!')", ro).all().get();
+ fail("should throw exception");
+ } catch (Exception ex) {
+ final Throwable inner = ExceptionHelper.getRootCause(ex);
+ assertThat(inner, instanceOf(ResponseException.class));
+ assertEquals(HttpResponseStatus.INTERNAL_SERVER_ERROR, ((ResponseException) inner).getResponseStatusCode());
+ assertTrue(ex.getMessage().contains("Good bye, world!"));
+ } finally {
+ cluster.close();
+ }
+ }
+
+ @Test
+ public void shouldHandleObjectBiggerThen8kb() throws Exception {
+ final Cluster cluster = TestClientFactory.build().create();
+ try {
+ final Client client = cluster.connect();
+ final RequestOptions ro = RequestOptions.build().language("gremlin-groovy").create();
+ final List r = client.submit("[\" \".repeat(200000), \" \".repeat(100000)]", ro).all().get();
+ assertEquals(200000, ((Result) r.get(0)).getString().length());
+ assertEquals(100000, ((Result) r.get(1)).getString().length());
+ } catch (Exception ex) {
+ throw ex;
+ } finally {
+ cluster.close();
+ }
+ }
+
+ @Test
+ public void shouldSubmitTraversalWithGraphBinary() {
+ final Cluster cluster = TestClientFactory.build().create();
+ try {
+ final GraphTraversalSource g = traversal().with(DriverRemoteConnection.using(cluster));
final String result = g.inject("2").toList().get(0);
assertEquals("2", result);
} catch (Exception ex) {
@@ -95,33 +130,12 @@
}
@Test
- public void shouldGetErrorForBytecodeWithUntypedGraphSON() throws Exception {
- final Cluster cluster = TestClientFactory.build()
- .channelizer(Channelizer.HttpChannelizer.class)
- .serializer(Serializers.GRAPHSON_V2_UNTYPED)
- .create();
+ public void shouldSubmitGremlinWithCollectionAsArgument() {
+ final Cluster cluster = TestClientFactory.build().create();
try {
- final GraphTraversalSource g = traversal().withRemote(DriverRemoteConnection.using(cluster));
- g.inject("2").toList();
- fail("Exception expected");
- } catch (EncoderException ex) {
- assertThat(ex.getMessage(), allOf(containsString("An error occurred during serialization of this request"),
- containsString("it could not be sent to the server - Reason: only GraphSON3 and GraphBinary recommended for serialization of Bytecode requests, but used org.apache.tinkerpop.gremlin.")));
- } finally {
- cluster.close();
- }
- }
-
- @Test
- public void shouldSubmitBytecodeWithGraphBinary() throws Exception {
- final Cluster cluster = TestClientFactory.build()
- .channelizer(Channelizer.HttpChannelizer.class)
- .serializer(Serializers.GRAPHBINARY_V1)
- .create();
- try {
- final GraphTraversalSource g = traversal().withRemote(DriverRemoteConnection.using(cluster));
- final String result = g.inject("2").toList().get(0);
- assertEquals("2", result);
+ final GraphTraversalSource g = traversal().with(DriverRemoteConnection.using(cluster));
+ final List<?> result = g.inject(Arrays.asList("test", 2L, null)).toList().get(0);
+ assertThat(result, is(Arrays.asList("test", 2L, null)));
} catch (Exception ex) {
throw ex;
} finally {
@@ -130,17 +144,21 @@
}
@Test
- public void shouldSubmitMultipleRequestsOverSingleConnection() throws Exception {
- final Cluster cluster = TestClientFactory.build()
- .channelizer(Channelizer.HttpChannelizer.class)
- .minConnectionPoolSize(1).maxConnectionPoolSize(1)
- .serializer(Serializers.GRAPHBINARY_V1)
- .create();
+ public void shouldSubmitGremlinWithMergeV() {
+ final Cluster cluster = TestClientFactory.build().create();
try {
- for (int ix = 0; ix < 100; ix++) {
- final GraphTraversalSource g = traversal().withRemote(DriverRemoteConnection.using(cluster));
- assertEquals(ix, g.inject(ix).toList().get(0).intValue());
- }
+ final GraphTraversalSource g = traversal().with(DriverRemoteConnection.using(cluster));
+ g.addV("person").property("name", "marko")
+ .property(list, "age", 29)
+ .property(list, "age", 31)
+ .property(list, "age", 32)
+ .iterate();
+
+ final long result = g.mergeV(CollectionUtil.asMap("name", "marko"))
+ .option(Merge.onMatch, CollectionUtil.asMap("age", 33), VertexProperty.Cardinality.single)
+ .count()
+ .next();
+ assertEquals(1L, result);
} catch (Exception ex) {
throw ex;
} finally {
@@ -149,17 +167,12 @@
}
@Test
- public void shouldSubmitMultipleRequestsOverMultiConnection() throws Exception {
- final Cluster cluster = TestClientFactory.build()
- .channelizer(Channelizer.HttpChannelizer.class)
- .minConnectionPoolSize(1).maxConnectionPoolSize(8)
- .serializer(Serializers.GRAPHBINARY_V1)
- .create();
+ public void shouldHandleInfinity() {
+ final Cluster cluster = TestClientFactory.build().create();
try {
- for (int ix = 0; ix < 100; ix++) {
- final GraphTraversalSource g = traversal().withRemote(DriverRemoteConnection.using(cluster));
- assertEquals(ix, g.inject(ix).toList().get(0).intValue());
- }
+ final GraphTraversalSource g = traversal().with(DriverRemoteConnection.using(cluster)).with("language", "gremlin-lang");
+ final double result = g.inject(Double.POSITIVE_INFINITY).is(P.eq(Double.POSITIVE_INFINITY)).toList().get(0);
+ assertEquals(result, Double.POSITIVE_INFINITY, 0.01);
} catch (Exception ex) {
throw ex;
} finally {
@@ -168,72 +181,426 @@
}
@Test
- public void shouldFailToUseSession() throws Exception {
- final Cluster cluster = TestClientFactory.build()
- .channelizer(Channelizer.HttpChannelizer.class)
- .serializer(Serializers.GRAPHBINARY_V1)
- .create();
+ public void shouldSubmitMultipleQueriesWithSameConnection() throws InterruptedException, ExecutionException {
+ final Cluster cluster = TestClientFactory.build().create();
+ final Client client = cluster.connect();
+
+ try {
+ final RequestOptions ro = RequestOptions.build().language("gremlin-groovy").create();
+ final int result = client.submit("Thread.sleep(1000);1", ro).all().get().get(0).getInt();
+ assertEquals(1, result);
+
+ final AtomicInteger result2 = new AtomicInteger(-1);
+ final Thread thread = new Thread(() -> {
+ try {
+ result2.set(client.submit("g.inject(2)").all().get().get(0).getInt());
+ } catch (InterruptedException | ExecutionException e) {
+ throw new RuntimeException(e);
+ }
+ });
+ thread.start();
+ thread.join();
+
+ assertEquals(2, result2.get());
+ } catch (Exception ex) {
+ throw ex;
+ } finally {
+ cluster.close();
+ }
+ }
+
+ @Test
+ public void shouldFailToUseSession() {
+ final Cluster cluster = TestClientFactory.build().create();
try {
final Client client = cluster.connect("shouldFailToUseSession");
- client.submit("1+1").all().get();
+ client.submit("g.inject(2)").all().get();
fail("Can't use session with HTTP");
} catch (Exception ex) {
final Throwable t = ExceptionUtils.getRootCause(ex);
- assertEquals("Cannot use sessions or tx() with HttpChannelizer", t.getMessage());
+ // assertEquals("Cannot use sessions or tx() with HttpChannelizer", t.getMessage());
+ assertEquals("not implemented", t.getMessage());
} finally {
cluster.close();
}
}
@Test
- public void shouldFailToUseTx() throws Exception {
- final Cluster cluster = TestClientFactory.build()
- .channelizer(Channelizer.HttpChannelizer.class)
- .serializer(Serializers.GRAPHBINARY_V1)
- .create();
+ public void shouldDeserializeErrorWithGraphBinary() {
+ final Cluster cluster = TestClientFactory.build().create();
try {
- final GraphTraversalSource g = traversal().withRemote(DriverRemoteConnection.using(cluster));
- final Transaction tx = g.tx();
- final GraphTraversalSource gtx = tx.begin();
- gtx.inject("1").toList();
- fail("Can't use tx() with HTTP");
- } catch (Exception ex) {
- final Throwable t = ExceptionUtils.getRootCause(ex);
- assertEquals("Cannot use sessions or tx() with HttpChannelizer", t.getMessage());
- } finally {
- cluster.close();
- }
- }
-
- @Test
- public void shouldDeserializeErrorWithGraphBinary() throws Exception {
- final Cluster cluster = TestClientFactory.build()
- .channelizer(Channelizer.HttpChannelizer.class)
- .serializer(Serializers.GRAPHBINARY_V1)
- .create();
- try {
- final GraphTraversalSource g = traversal().withRemote(DriverRemoteConnection.using(cluster, "doesNotExist"));
+ final GraphTraversalSource g = traversal().with(DriverRemoteConnection.using(cluster, "doesNotExist"));
g.V().next();
fail("Expected exception to be thrown.");
} catch (Exception ex) {
- assert ex.getMessage().contains("Could not rebind");
+ assert ex.getMessage().contains("Could not alias [g] to [doesNotExist] as [doesNotExist] not in the Graph or TraversalSource global bindings");
} finally {
cluster.close();
}
}
@Test
- public void shouldDeserializeErrorWithGraphSON() throws Exception {
- final Cluster cluster = TestClientFactory.build()
- .channelizer(Channelizer.HttpChannelizer.class)
- .serializer(Serializers.GRAPHSON_V3)
- .create();
+ public void shouldReportErrorWhenRequestCantBeSerialized() throws Exception {
+ final Cluster cluster = TestClientFactory.build().create();
try {
- final GraphTraversalSource g = traversal().withRemote(DriverRemoteConnection.using(cluster, "doesNotExist"));
- g.V().next();
- fail("Expected exception to be thrown.");
+ final Client client = cluster.connect();
+
+ try {
+ RequestOptions ro = RequestOptions.build()
+ .language("gremlin-groovy")
+ .addParameter("r", Color.RED)
+ .create();
+ client.submit("r", ro).all().get();
+ fail("Should have thrown exception over bad serialization");
+ } catch (Exception ex) {
+ final Throwable inner = ExceptionHelper.getRootCause(ex);
+ assertThat(inner, instanceOf(ResponseException.class));
+ assertEquals(HttpResponseStatus.BAD_REQUEST, ((ResponseException) inner).getResponseStatusCode());
+ assertTrue(ex.getMessage().contains("An error occurred during serialization of this request"));
+ }
+
+ // should not die completely just because we had a bad serialization error. that kind of stuff happens
+ // from time to time, especially in the console if you're just exploring.
+ assertEquals(2, client.submit("g.inject(2)").all().get().get(0).getInt());
+ } finally {
+ cluster.close();
+ }
+ }
+
+ @Ignore("not implemented in driver")
+ @Test
+ public void shouldProcessTraversalInterruption() {
+ final Cluster cluster = TestClientFactory.build().create();
+
+ try {
+ final Client client = cluster.connect();
+ final RequestOptions ro = RequestOptions.build().language("gremlin-groovy").create();
+ client.submit("g.inject(1).sideEffect{Thread.sleep(5000)}", ro).all().get();
+ fail("Should have timed out");
} catch (Exception ex) {
- assert ex.getMessage().contains("Could not rebind");
+ final ResponseException re = (ResponseException) ex.getCause();
+ assertEquals(HttpResponseStatus.INTERNAL_SERVER_ERROR, re.getResponseStatusCode());
+ } finally {
+ cluster.close();
+ }
+ }
+
+ @Ignore("not implemented in driver")
+ @Test
+ public void shouldProcessEvalInterruption() {
+ final Cluster cluster = TestClientFactory.build().create();
+
+ try {
+ final Client client = cluster.connect();
+ final RequestOptions ro = RequestOptions.build().language("gremlin-groovy").create();
+ client.submit("Thread.sleep(5000);'done'", ro).all().get();
+ fail("Should have timed out");
+ } catch (Exception ex) {
+ final ResponseException re = (ResponseException) ex.getCause();
+ assertEquals(HttpResponseStatus.INTERNAL_SERVER_ERROR, re.getResponseStatusCode());
+ } finally {
+ cluster.close();
+ }
+ }
+
+ @Test
+ public void shouldFailWithBadClientSideSerialization() throws Exception {
+ final Cluster cluster = TestClientFactory.build().create();
+ final Client client = cluster.connect();
+
+ final RequestOptions ro = RequestOptions.build().language("gremlin-groovy").create();
+
+ try {
+ final ResultSet results = client.submit("java.awt.Color.RED", ro);
+
+ try {
+ results.all().join();
+ fail("Should have thrown exception over bad serialization");
+ } catch (Exception ex) {
+ final Throwable inner = ExceptionHelper.getRootCause(ex);
+ assertThat(inner, instanceOf(ResponseException.class));
+ assertEquals(HttpResponseStatus.INTERNAL_SERVER_ERROR, ((ResponseException) inner).getResponseStatusCode());
+ }
+
+ // should not die completely just because we had a bad serialization error. that kind of stuff happens
+ // from time to time, especially in the console if you're just exploring.
+ assertEquals(2, client.submit("g.inject(2)").all().get().get(0).getInt());
+ } finally {
+ cluster.close();
+ }
+ }
+
+ @Test
+ public void shouldFailWithScriptExecutionException() throws Exception {
+ final Cluster cluster = TestClientFactory.build().create();
+ final Client client = cluster.connect();
+
+ try {
+ try {
+ final ResultSet results = client.submit("g.inject(1).math('_/0')");
+ results.all().join();
+ fail("Should have thrown exception over division by zero");
+ } catch (Exception ex) {
+ final Throwable inner = ExceptionHelper.getRootCause(ex);
+ assertTrue(inner instanceof ResponseException);
+ assertThat(inner.getMessage(), containsString("Division by zero"));
+ assertEquals(HttpResponseStatus.INTERNAL_SERVER_ERROR, ((ResponseException) inner).getResponseStatusCode());
+ }
+
+ // should not die completely just because we had a bad serialization error. that kind of stuff happens
+ // from time to time, especially in the console if you're just exploring.
+ assertEquals(2, client.submit("g.inject(2)").all().get().get(0).getInt());
+ } finally {
+ cluster.close();
+ }
+ }
+
+ @Test
+ public void shouldProcessRequestsOutOfOrder() throws Exception {
+ final Cluster cluster = TestClientFactory.build().create();
+ final RequestOptions ro = RequestOptions.build().language("gremlin-groovy").create();
+ try {
+ final Client client = cluster.connect();
+
+ final ResultSet rsFive = client.submit("Thread.sleep(5000);'five'", ro);
+ final ResultSet rsZero = client.submit("'zero'", ro);
+
+ final CompletableFuture<List<Result>> futureFive = rsFive.all();
+ final CompletableFuture<List<Result>> futureZero = rsZero.all();
+
+ assertFalse(futureFive.isDone());
+ assertEquals("zero", futureZero.get().get(0).getString());
+
+ assertFalse(futureFive.isDone());
+ assertEquals("five", futureFive.get(10, TimeUnit.SECONDS).get(0).getString());
+ } finally {
+ cluster.close();
+ }
+ }
+
+ @Test
+ public void shouldWaitForAllResultsToArrive() throws Exception {
+ final Cluster cluster = TestClientFactory.build().create();
+ try {
+ final Client client = cluster.connect();
+
+ final AtomicInteger checked = new AtomicInteger(0);
+ final ResultSet results = client.submit("g.inject(1,2,3,4,5,6,7,8,9)");
+ while (!results.allItemsAvailable()) {
+ assertTrue(results.getAvailableItemCount() < 10);
+ checked.incrementAndGet();
+ Thread.sleep(100);
+ }
+
+ assertTrue(checked.get() > 0);
+ assertEquals(9, results.getAvailableItemCount());
+ } finally {
+ cluster.close();
+ }
+ }
+
+ @Test
+ public void shouldStream() throws Exception {
+ final Cluster cluster = TestClientFactory.build().create();
+ final Client client = cluster.connect();
+
+ try {
+ final ResultSet results = client.submit("g.inject(1,2,3,4,5,6,7,8,9)");
+ final AtomicInteger counter = new AtomicInteger(0);
+ results.stream().map(i -> i.get(Integer.class) * 2).forEach(i -> assertEquals(counter.incrementAndGet() * 2, Integer.parseInt(i.toString())));
+ assertEquals(9, counter.get());
+ assertThat(results.allItemsAvailable(), is(true));
+
+ // cant stream it again
+ assertThat(results.stream().iterator().hasNext(), is(false));
+ } finally {
+ cluster.close();
+ }
+ }
+
+ @Test
+ public void shouldIterate() throws Exception {
+ final Cluster cluster = TestClientFactory.build().create();
+ final Client client = cluster.connect();
+
+ try {
+ final ResultSet results = client.submit("g.inject(1,2,3,4,5,6,7,8,9)");
+ final Iterator<Result> itty = results.iterator();
+ final AtomicInteger counter = new AtomicInteger(0);
+ while (itty.hasNext()) {
+ counter.incrementAndGet();
+ assertEquals(counter.get(), itty.next().getInt());
+ }
+
+ assertEquals(9, counter.get());
+ assertThat(results.allItemsAvailable(), is(true));
+
+ // can't stream it again
+ assertThat(results.iterator().hasNext(), is(false));
+ } finally {
+ cluster.close();
+ }
+ }
+
+ @Test
+ public void shouldGetSomeThenSomeMore() throws Exception {
+ final Cluster cluster = TestClientFactory.build().create();
+ final Client client = cluster.connect();
+
+ try {
+ final ResultSet results = client.submit("g.inject(1,2,3,4,5,6,7,8,9)");
+ final CompletableFuture<List<Result>> batch1 = results.some(5);
+ final CompletableFuture<List<Result>> batch2 = results.some(5);
+ final CompletableFuture<List<Result>> batchNothingLeft = results.some(5);
+
+ assertEquals(5, batch1.get().size());
+ assertEquals(1, batch1.get().get(0).getInt());
+ assertEquals(2, batch1.get().get(1).getInt());
+ assertEquals(3, batch1.get().get(2).getInt());
+ assertEquals(4, batch1.get().get(3).getInt());
+ assertEquals(5, batch1.get().get(4).getInt());
+
+ assertEquals(4, batch2.get().size());
+ assertEquals(6, batch2.get().get(0).getInt());
+ assertEquals(7, batch2.get().get(1).getInt());
+ assertEquals(8, batch2.get().get(2).getInt());
+ assertEquals(9, batch2.get().get(3).getInt());
+
+ assertEquals(0, batchNothingLeft.get().size());
+ } finally {
+ cluster.close();
+ }
+ }
+
+ @Test
+ public void shouldGetOneThenSomeThenSomeMore() throws Exception {
+ final Cluster cluster = TestClientFactory.build().create();
+ final Client client = cluster.connect();
+
+ try {
+ final ResultSet results = client.submit("g.inject(1,2,3,4,5,6,7,8,9)");
+ final Result one = results.one();
+ final CompletableFuture<List<Result>> batch1 = results.some(4);
+ final CompletableFuture<List<Result>> batch2 = results.some(5);
+ final CompletableFuture<List<Result>> batchNothingLeft = results.some(5);
+
+ assertEquals(1, one.getInt());
+
+ assertEquals(4, batch1.get().size());
+ assertEquals(2, batch1.get().get(0).getInt());
+ assertEquals(3, batch1.get().get(1).getInt());
+ assertEquals(4, batch1.get().get(2).getInt());
+ assertEquals(5, batch1.get().get(3).getInt());
+
+ assertEquals(4, batch2.get().size());
+ assertEquals(6, batch2.get().get(0).getInt());
+ assertEquals(7, batch2.get().get(1).getInt());
+ assertEquals(8, batch2.get().get(2).getInt());
+ assertEquals(9, batch2.get().get(3).getInt());
+
+ assertEquals(0, batchNothingLeft.get().size());
+ } finally {
+ cluster.close();
+ }
+ }
+
+ @Test
+ public void shouldCloseWithServerDown() throws Exception {
+ final Cluster cluster = TestClientFactory.build().create();
+ try {
+ cluster.connect().init();
+
+ stopServer();
+ } finally {
+ cluster.close();
+ }
+ }
+
+ @Test
+ public void shouldFailWithBadServerSideSerialization() throws Exception {
+ final Cluster cluster = TestClientFactory.build().create();
+ final Client client = cluster.connect();
+ final RequestOptions ro = RequestOptions.build().language("gremlin-groovy").create();
+ try {
+
+ final ResultSet results = client.submit("TinkerGraph.open().variables()", ro);
+
+ try {
+ results.all().join();
+ fail();
+ } catch (Exception ex) {
+ final Throwable inner = ExceptionHelper.getRootCause(ex);
+ assertTrue(inner instanceof ResponseException);
+ assertThat(inner.getMessage(), startsWith("Error during serialization"));
+ assertEquals(HttpResponseStatus.INTERNAL_SERVER_ERROR, ((ResponseException) inner).getResponseStatusCode());
+ }
+
+ // should not die completely just because we had a bad serialization error. that kind of stuff happens
+ // from time to time, especially in the console if you're just exploring.
+ assertEquals(2, client.submit("g.inject(2)").all().get().get(0).getInt());
+ } finally {
+ cluster.close();
+ }
+ }
+
+ @Test
+ public void shouldNotThrowNoSuchElementException() {
+ final Cluster cluster = TestClientFactory.build().create();
+ final Client client = cluster.connect();
+
+ try {
+ // this should return "nothing" - there should be no exception
+ assertNull(client.submit("g.V().has('name','kadfjaldjfla')").one());
+ } finally {
+ cluster.close();
+ }
+ }
+
+ @Test
+ public void shouldSubmitTraversalInGremlinLang() {
+ final Cluster cluster = TestClientFactory.build().create();
+ try {
+ final GraphTraversalSource g = traversal().with(DriverRemoteConnection.using(cluster));
+
+ final List result = g.with("language", "gremlin-lang").inject(null, null).inject(null, null).toList();
+ assertEquals(4, result.size());
+ } catch (Exception ex) {
+ throw ex;
+ } finally {
+ cluster.close();
+ }
+ }
+
+ @Test
+ public void shouldEvalInGremlinLang() {
+ final Cluster cluster = TestClientFactory.build().create();
+ final Client client = cluster.connect();
+
+ try {
+ final RequestOptions ro = RequestOptions.build().language("gremlin-lang").create();
+ assertEquals(111, client.submit("g.inject(111)", ro).one().getInt());
+ } finally {
+ cluster.close();
+ }
+ }
+
+ @Test
+ public void shouldEvalInGremlinLangWithParameters() throws Exception {
+ final Cluster cluster = TestClientFactory.build().create();
+ final Client client = cluster.connect();
+
+ try {
+ final RequestOptions ro = RequestOptions.build().language("gremlin-lang").
+ addG("gmodern").
+ addParameter("x", 1).
+ addParameter("y", "knows").
+ addParameter("z", "created").
+ addParameter("low", 1).
+ addParameter("high", 3).create();
+ final List<Result> l = client.submit("g.V(x).out(y, z).values('name').range(low, high)", ro).all().get();
+ assertEquals(2, l.size());
+ assertEquals("josh", l.get(0).getString());
+ assertEquals("lop", l.get(1).getString());
} finally {
cluster.close();
}
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/TestClientFactory.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/TestClientFactory.java
index a2554a2..ff7de89 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/TestClientFactory.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/TestClientFactory.java
@@ -19,7 +19,8 @@
package org.apache.tinkerpop.gremlin.server;
import org.apache.tinkerpop.gremlin.driver.Cluster;
-import org.apache.tinkerpop.gremlin.driver.simple.WebSocketClient;
+import org.apache.tinkerpop.gremlin.driver.RequestInterceptor;
+import org.apache.tinkerpop.gremlin.driver.simple.SimpleHttpClient;
import java.net.URI;
@@ -29,8 +30,8 @@
public final class TestClientFactory {
public static final int PORT = 45940;
- public static final URI WEBSOCKET_URI = URI.create("ws://localhost:" + PORT + "/gremlin");
- public static final URI SSL_WEBSOCKET_URI = URI.create("wss://localhost:" + PORT + "/gremlin");
+ public static final URI HTTP_URI = URI.create("http://localhost:" + PORT + "/gremlin");
+ public static final URI SSL_HTTP_URI = URI.create("https://localhost:" + PORT + "/gremlin");
public static final String HTTP = "http://localhost:" + PORT;
public static final String RESOURCE_PATH = "conf/remote-objects.yaml";
@@ -42,16 +43,20 @@
return Cluster.build(address).port(PORT);
}
+ public static Cluster.Builder build(final RequestInterceptor serializingInterceptor) {
+ return Cluster.build(serializingInterceptor).port(PORT);
+ }
+
public static Cluster open() {
return build().create();
}
- public static WebSocketClient createWebSocketClient() {
- return new WebSocketClient(WEBSOCKET_URI);
+ public static SimpleHttpClient createSimpleHttpClient() {
+ return new SimpleHttpClient(HTTP_URI);
}
- public static WebSocketClient createSSLWebSocketClient() {
- return new WebSocketClient(SSL_WEBSOCKET_URI);
+ public static SimpleHttpClient createSSLSimpleHttpClient() {
+ return new SimpleHttpClient(SSL_HTTP_URI);
}
public static String createURLString() {
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/authz/AllowListAuthorizer.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/authz/AllowListAuthorizer.java
index e8c686c..ccbd54a 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/authz/AllowListAuthorizer.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/authz/AllowListAuthorizer.java
@@ -18,15 +18,11 @@
*/
package org.apache.tinkerpop.gremlin.server.authz;
-import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.verification.VertexProgramRestrictionStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SubgraphStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ReadOnlyStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.util.BytecodeHelper;
import org.apache.tinkerpop.gremlin.server.Settings.AuthorizationSettings;
import org.apache.tinkerpop.gremlin.server.auth.AuthenticatedUser;
+import org.apache.tinkerpop.gremlin.util.Tokens;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
import java.util.ArrayList;
import java.util.HashMap;
@@ -37,9 +33,9 @@
/**
- * Authorizes a user per request, based on a list that grants access to {@link TraversalSource} instances for
- * bytecode requests and to gremlin server's sandbox for string requests and lambdas. The {@link
- * AuthorizationSettings}.config must have an authorizationAllowList entry that contains the name of a YAML file.
+ * Authorizes a user per request, based on a list that grants access to {@link TraversalSource} instances
+ * to gremlin server's sandbox for string requests and lambdas. The {@link AuthorizationSettings}.config must have
+ * an authorizationAllowList entry that contains the name of a YAML file.
* This authorizer is for demonstration purposes only. It does not scale well in the number of users regarding
* memory usage and administrative burden.
*
@@ -48,8 +44,7 @@
public class AllowListAuthorizer implements Authorizer {
public static final String SANDBOX = "sandbox";
- public static final String REJECT_BYTECODE = "User not authorized for bytecode requests on %s";
- public static final String REJECT_LAMBDA = "lambdas";
+
public static final String REJECT_MUTATE = "the ReadOnlyStrategy";
public static final String REJECT_OLAP = "the VertexProgramRestrictionStrategy";
public static final String REJECT_SUBGRAPH = "the SubgraphStrategy";
@@ -91,63 +86,11 @@
}
/**
- * Checks whether a user is authorized to have a gremlin bytecode request from a client answered and raises an
- * {@link AuthorizationException} if this is not the case. For a request to be authorized, the user must either
- * have a grant for the requested {@link TraversalSource}, without using lambdas, mutating steps or OLAP, or have a
- * sandbox grant.
- *
- * @param user {@link AuthenticatedUser} that needs authorization.
- * @param bytecode The gremlin {@link Bytecode} request to authorize the user for.
- * @param aliases A {@link Map} with a single key/value pair that maps the name of the {@link TraversalSource} in the
- * {@link Bytecode} request to name of one configured in Gremlin Server.
- * @return The original or modified {@link Bytecode} to be used for further processing.
- */
- @Override
- public Bytecode authorize(final AuthenticatedUser user, final Bytecode bytecode, final Map<String, String> aliases) throws AuthorizationException {
- final Set<String> usernames = new HashSet<>();
-
- for (final String resource: aliases.values()) {
- usernames.addAll(usernamesByTraversalSource.get(resource));
- }
- final boolean userHasTraversalSourceGrant = usernames.contains(user.getName()) || usernames.contains(AuthenticatedUser.ANONYMOUS_USERNAME);
- final boolean userHasSandboxGrant = usernamesSandbox.contains(user.getName()) || usernamesSandbox.contains(AuthenticatedUser.ANONYMOUS_USERNAME);
- final boolean runsLambda = BytecodeHelper.getLambdaLanguage(bytecode).isPresent();
- final boolean touchesReadOnlyStrategy = bytecode.toString().contains(ReadOnlyStrategy.class.getSimpleName());
- final boolean touchesOLAPRestriction = bytecode.toString().contains(VertexProgramRestrictionStrategy.class.getSimpleName());
- // This element becomes obsolete after resolving TINKERPOP-2473 for allowing only a single instance of each traversal strategy.
- final boolean touchesSubgraphStrategy = bytecode.toString().contains(SubgraphStrategy.class.getSimpleName());
-
- final List<String> rejections = new ArrayList<>();
- if (runsLambda) {
- rejections.add(REJECT_LAMBDA);
- }
- if (touchesReadOnlyStrategy) {
- rejections.add(REJECT_MUTATE);
- }
- if (touchesOLAPRestriction) {
- rejections.add(REJECT_OLAP);
- }
- if (touchesSubgraphStrategy) {
- rejections.add(REJECT_SUBGRAPH);
- }
- String rejectMessage = REJECT_BYTECODE;
- if (rejections.size() > 0) {
- rejectMessage += " using " + String.join(", ", rejections);
- }
- rejectMessage += ".";
-
- if ( (!userHasTraversalSourceGrant || runsLambda || touchesOLAPRestriction || touchesReadOnlyStrategy || touchesSubgraphStrategy) && !userHasSandboxGrant) {
- throw new AuthorizationException(String.format(rejectMessage, aliases.values()));
- }
- return bytecode;
- }
-
- /**
* Checks whether a user is authorized to have a script request from a gremlin client answered and raises an
* {@link AuthorizationException} if this is not the case.
*
* @param user {@link AuthenticatedUser} that needs authorization.
- * @param msg {@link RequestMessage} in which the {@link org.apache.tinkerpop.gremlin.util.Tokens}.ARGS_GREMLIN argument can contain an arbitrary succession of script statements.
+ * @param msg {@link RequestMessage} in which the {@link Tokens}.ARGS_GREMLIN argument can contain an arbitrary succession of script statements.
*/
public void authorize(final AuthenticatedUser user, final RequestMessage msg) throws AuthorizationException {
if (!usernamesSandbox.contains(user.getName())) {
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/authz/AuthorizerTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/authz/AuthorizerTest.java
index b8ec8b7..e345f1c 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/authz/AuthorizerTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/authz/AuthorizerTest.java
@@ -18,17 +18,13 @@
*/
package org.apache.tinkerpop.gremlin.server.authz;
-import org.apache.tinkerpop.gremlin.util.Tokens;
-import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.verification.VertexProgramRestrictionStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
+import org.apache.tinkerpop.gremlin.process.traversal.GremlinLang;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SubgraphStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ReadOnlyStrategy;
import org.apache.tinkerpop.gremlin.server.auth.AuthenticatedUser;
import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
-import org.apache.tinkerpop.gremlin.util.function.Lambda;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -41,11 +37,6 @@
import java.util.Objects;
import java.util.function.Supplier;
-import static org.apache.tinkerpop.gremlin.server.authz.AllowListAuthorizer.REJECT_BYTECODE;
-import static org.apache.tinkerpop.gremlin.server.authz.AllowListAuthorizer.REJECT_LAMBDA;
-import static org.apache.tinkerpop.gremlin.server.authz.AllowListAuthorizer.REJECT_MUTATE;
-import static org.apache.tinkerpop.gremlin.server.authz.AllowListAuthorizer.REJECT_OLAP;
-import static org.apache.tinkerpop.gremlin.server.authz.AllowListAuthorizer.REJECT_SUBGRAPH;
import static org.apache.tinkerpop.gremlin.server.authz.AllowListAuthorizer.REJECT_STRING;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
@@ -59,14 +50,7 @@
*/
public class AuthorizerTest {
- final String BYTECODE = "bytecode";
- final String BYTECODE_LAMBDA = "bytecode-lambda";
- final String BYTECODE_MUTATE = "bytecode-mutate";
- final String BYTECODE_OLAP = "bytecode-OLAP";
- final String BYTECODE_SUBGRAPH = "bytecode-subgraph";
-
AllowListAuthorizer authorizer;
- SubgraphTraversals subgraphTraversals;
@Rule
public TestName name = new TestName();
@@ -82,109 +66,6 @@
}
@Test
- public void shouldAuthorizeBytecodeRequest() throws AuthorizationException {
- positiveBytecode("userclassic", "gclassic", BYTECODE);
- positiveBytecode("usermodern", "gmodern", BYTECODE);
- positiveBytecode("stephen", "gmodern", BYTECODE);
- positiveBytecode("userclassic", "gcrew", BYTECODE);
- positiveBytecode("usermodern", "gcrew", BYTECODE);
- positiveBytecode("stephen", "gcrew", BYTECODE);
- positiveBytecode("userclassic", "ggrateful", BYTECODE);
- positiveBytecode("usersink", "ggrateful", BYTECODE);
- positiveBytecode("anyuser", "ggrateful", BYTECODE);
- positiveBytecode("usersandbox", "gclassic", BYTECODE);
- positiveBytecode("marko", "gcrew", BYTECODE);
- }
-
- @Test
- public void shouldNotAuthorizeBytecodeRequest() {
- negativeBytecode("usersink", "gclassic", BYTECODE);
- negativeBytecode("usersink", "gmodern", BYTECODE);
- negativeBytecode("usersink", "gcrew", BYTECODE);
- negativeBytecode("anyuser", "gclassic", BYTECODE);
- negativeBytecode("anyuser", "gmodern", BYTECODE);
- negativeBytecode("anyuser", "gcrew", BYTECODE);
- }
-
- @Test
- public void shouldAuthorizeLambdaBytecodeRequest() throws AuthorizationException {
- positiveBytecode("usersandbox", "gclassic", BYTECODE_LAMBDA);
- positiveBytecode("marko", "gcrew", BYTECODE_LAMBDA);
- }
-
- @Test
- public void shouldNotAuthorizeLambdaBytecodeRequest() {
- negativeBytecode("userclassic", "gclassic", BYTECODE_LAMBDA);
- negativeBytecode("usermodern", "gmodern", BYTECODE_LAMBDA);
- negativeBytecode("stephen", "gmodern", BYTECODE_LAMBDA);
- negativeBytecode("userclassic", "gcrew", BYTECODE_LAMBDA);
- negativeBytecode("usermodern", "gcrew", BYTECODE_LAMBDA);
- negativeBytecode("stephen", "gcrew", BYTECODE_LAMBDA);
- negativeBytecode("userclassic", "ggrateful", BYTECODE_LAMBDA);
- negativeBytecode("usersink", "ggrateful", BYTECODE_LAMBDA);
- negativeBytecode("anyuser", "ggrateful", BYTECODE_LAMBDA);
- }
-
- @Test
- public void shouldAuthorizeMutatingBytecodeRequest() throws AuthorizationException {
- positiveBytecode("usersandbox", "gclassic", BYTECODE_MUTATE);
- positiveBytecode("marko", "gcrew", BYTECODE_MUTATE);
- }
-
- @Test
- public void shouldNotAuthorizeMutatingBytecodeRequest() {
- negativeBytecode("userclassic", "gclassic", BYTECODE_MUTATE);
- negativeBytecode("usermodern", "gmodern", BYTECODE_MUTATE);
- negativeBytecode("stephen", "gmodern", BYTECODE_MUTATE);
- negativeBytecode("userclassic", "gcrew", BYTECODE_MUTATE);
- negativeBytecode("usermodern", "gcrew", BYTECODE_MUTATE);
- negativeBytecode("stephen", "gcrew", BYTECODE_MUTATE);
- negativeBytecode("userclassic", "ggrateful", BYTECODE_MUTATE);
- negativeBytecode("usersink", "ggrateful", BYTECODE_MUTATE);
- negativeBytecode("anyuser", "ggrateful", BYTECODE_MUTATE);
- }
-
- @Test
- public void shouldAuthorizeOLAPBytecodeRequest() throws AuthorizationException {
- positiveBytecode("usersandbox", "gclassic", BYTECODE_OLAP);
- positiveBytecode("marko", "gcrew", BYTECODE_OLAP);
- }
-
- @Test
- public void shouldNotAuthorizeOLAPBytecodeRequest() {
- negativeBytecode("userclassic", "gclassic", BYTECODE_OLAP);
- negativeBytecode("usermodern", "gmodern", BYTECODE_OLAP);
- negativeBytecode("stephen", "gmodern", BYTECODE_OLAP);
- negativeBytecode("userclassic", "gcrew", BYTECODE_OLAP);
- negativeBytecode("usermodern", "gcrew", BYTECODE_OLAP);
- negativeBytecode("stephen", "gcrew", BYTECODE_OLAP);
- negativeBytecode("userclassic", "ggrateful", BYTECODE_OLAP);
- negativeBytecode("usersink", "ggrateful", BYTECODE_OLAP);
- negativeBytecode("anyuser", "ggrateful", BYTECODE_OLAP);
- }
-
- @Test
- public void shouldAuthorizeSubgraphStrategyBytecodeRequest() throws AuthorizationException {
- subgraphTraversals = new SubgraphTraversals();
- positiveBytecode("usersandbox", "gclassic", BYTECODE_SUBGRAPH);
- positiveBytecode("marko", "gcrew", BYTECODE_SUBGRAPH);
- }
-
- @Test
- public void shouldNotAuthorizeSubgraphStrategyBytecodeRequest() {
- subgraphTraversals = new SubgraphTraversals();
- negativeBytecode("userclassic", "gclassic", BYTECODE_SUBGRAPH);
- negativeBytecode("usermodern", "gmodern", BYTECODE_SUBGRAPH);
- negativeBytecode("stephen", "gmodern", BYTECODE_SUBGRAPH);
- negativeBytecode("userclassic", "gcrew", BYTECODE_SUBGRAPH);
- negativeBytecode("usermodern", "gcrew", BYTECODE_SUBGRAPH);
- negativeBytecode("stephen", "gcrew", BYTECODE_SUBGRAPH);
- negativeBytecode("userclassic", "ggrateful", BYTECODE_SUBGRAPH);
- negativeBytecode("usersink", "ggrateful", BYTECODE_SUBGRAPH);
- negativeBytecode("anyuser", "ggrateful", BYTECODE_SUBGRAPH);
- }
-
- @Test
public void shouldAuthorizeStringRequest() throws AuthorizationException {
authorizer.authorize(new AuthenticatedUser("usersandbox"), buildRequestMessage("gclassic"));
authorizer.authorize(new AuthenticatedUser("marko"), buildRequestMessage("gcrew"));
@@ -199,47 +80,6 @@
negativeString("anyuser", "ggrateful");
}
- private void positiveBytecode(final String username, final String traversalSource, final String requestType) throws AuthorizationException {
- final Map<String, String> aliases = new HashMap<>();
- aliases.put("g", traversalSource);
- authorizer.authorize(new AuthenticatedUser(username), bytecodeRequest(requestType), aliases);
- }
-
- private void negativeBytecode(final String username, final String traversalSource, final String requestType) {
- final Map<String, String> aliases = new HashMap<>();
- aliases.put("g", traversalSource);
- final String message;
- switch (requestType) {
- case BYTECODE: message = String.format(REJECT_BYTECODE + ".", "[" + traversalSource + "]"); break;
- case BYTECODE_LAMBDA: message = String.format(REJECT_BYTECODE + " using " + REJECT_LAMBDA + ".", "[" + traversalSource + "]"); break;
- case BYTECODE_MUTATE: message = String.format(REJECT_BYTECODE + " using " + REJECT_MUTATE + ".", "[" + traversalSource + "]"); break;
- case BYTECODE_OLAP: message = String.format(REJECT_BYTECODE + " using " + REJECT_OLAP + ".", "[" + traversalSource + "]"); break;
- case BYTECODE_SUBGRAPH: message = String.format(REJECT_BYTECODE + " using " + REJECT_SUBGRAPH + ".", "[" + traversalSource + "]"); break;
- default: throw new IllegalArgumentException();
- }
- try {
- authorizer.authorize(new AuthenticatedUser(username), bytecodeRequest(requestType), aliases);
- fail("Test code did not fail while it should have failed!");
- } catch(AuthorizationException e) {
- assertEquals(message, e.getMessage());
- }
- }
-
- private Bytecode bytecodeRequest(final String requestType) {
- final GraphTraversalSource g = TinkerGraph.open().traversal();
- final Bytecode bytecode;
-
- switch (requestType) {
- case BYTECODE: bytecode = g.V().asAdmin().getBytecode(); break;
- case BYTECODE_LAMBDA: bytecode = g.V().map(Lambda.function("it.get()")).asAdmin().getBytecode(); break;
- case BYTECODE_MUTATE: bytecode = g.withoutStrategies(ReadOnlyStrategy.class).V().addV().asAdmin().getBytecode(); break;
- case BYTECODE_OLAP: bytecode = g.withoutStrategies(VertexProgramRestrictionStrategy.class).withComputer().V().asAdmin().getBytecode(); break;
- case BYTECODE_SUBGRAPH: bytecode = subgraphTraversals.get(); break;
- default: throw new IllegalArgumentException();
- }
- return bytecode;
- }
-
private void negativeString(final String username, final String traversalSource) {
try {
authorizer.authorize(new AuthenticatedUser(username), buildRequestMessage(traversalSource));
@@ -251,27 +91,27 @@
private RequestMessage buildRequestMessage(final String traversalSource) {
final String script = String.format("1+1; %s.V().map{it.get()}", traversalSource);
- return RequestMessage.build(Tokens.OPS_EVAL).addArg(Tokens.ARGS_GREMLIN, script).create();
+ return RequestMessage.build(script).create();
}
- private static class SubgraphTraversals implements Supplier<Bytecode> {
+ private static class SubgraphTraversals implements Supplier<GremlinLang> {
final GraphTraversalSource g = TinkerGraph.open().traversal();
- final Iterator<Bytecode> mutatingBytecodes = Arrays.asList(
- g.withoutStrategies(SubgraphStrategy.class).V().asAdmin().getBytecode(),
- g.withStrategies(SubgraphStrategy.build().vertices(__.bothE()).create()).V().asAdmin().getBytecode(),
- g.withoutStrategies(SubgraphStrategy.class).V().asAdmin().getBytecode(),
- g.withStrategies(SubgraphStrategy.build().vertices(__.bothE()).create()).V().asAdmin().getBytecode(),
- g.withoutStrategies(SubgraphStrategy.class).V().asAdmin().getBytecode(),
- g.withStrategies(SubgraphStrategy.build().vertices(__.bothE()).create()).V().asAdmin().getBytecode(),
- g.withoutStrategies(SubgraphStrategy.class).V().asAdmin().getBytecode(),
- g.withStrategies(SubgraphStrategy.build().vertices(__.bothE()).create()).V().asAdmin().getBytecode(),
- g.withoutStrategies(SubgraphStrategy.class).V().asAdmin().getBytecode(),
- g.withStrategies(SubgraphStrategy.build().vertices(__.bothE()).create()).V().asAdmin().getBytecode(),
- g.withoutStrategies(SubgraphStrategy.class).V().asAdmin().getBytecode(),
- g.withStrategies(SubgraphStrategy.build().vertices(__.bothE()).create()).V().asAdmin().getBytecode()
+ final Iterator<GremlinLang> mutatingBytecodes = Arrays.asList(
+ g.withoutStrategies(SubgraphStrategy.class).V().asAdmin().getGremlinLang(),
+ g.withStrategies(SubgraphStrategy.build().vertices(__.bothE()).create()).V().asAdmin().getGremlinLang(),
+ g.withoutStrategies(SubgraphStrategy.class).V().asAdmin().getGremlinLang(),
+ g.withStrategies(SubgraphStrategy.build().vertices(__.bothE()).create()).V().asAdmin().getGremlinLang(),
+ g.withoutStrategies(SubgraphStrategy.class).V().asAdmin().getGremlinLang(),
+ g.withStrategies(SubgraphStrategy.build().vertices(__.bothE()).create()).V().asAdmin().getGremlinLang(),
+ g.withoutStrategies(SubgraphStrategy.class).V().asAdmin().getGremlinLang(),
+ g.withStrategies(SubgraphStrategy.build().vertices(__.bothE()).create()).V().asAdmin().getGremlinLang(),
+ g.withoutStrategies(SubgraphStrategy.class).V().asAdmin().getGremlinLang(),
+ g.withStrategies(SubgraphStrategy.build().vertices(__.bothE()).create()).V().asAdmin().getGremlinLang(),
+ g.withoutStrategies(SubgraphStrategy.class).V().asAdmin().getGremlinLang(),
+ g.withStrategies(SubgraphStrategy.build().vertices(__.bothE()).create()).V().asAdmin().getGremlinLang()
).iterator();
- public Bytecode get() {
+ public GremlinLang get() {
return mutatingBytecodes.next();
}
}
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/channel/AbstractGremlinServerChannelizerIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/channel/AbstractGremlinServerChannelizerIntegrateTest.java
index 38f2c9a..bcd76af 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/channel/AbstractGremlinServerChannelizerIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/channel/AbstractGremlinServerChannelizerIntegrateTest.java
@@ -19,7 +19,6 @@
package org.apache.tinkerpop.gremlin.server.channel;
import org.apache.http.conn.ssl.NoopHostnameVerifier;
-import org.apache.tinkerpop.gremlin.driver.AuthProperties;
import org.apache.tinkerpop.gremlin.driver.Client;
import org.apache.tinkerpop.gremlin.driver.Cluster;
import org.apache.tinkerpop.gremlin.server.AbstractGremlinServerIntegrationTest;
@@ -39,6 +38,7 @@
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
import org.apache.http.util.EntityUtils;
+import org.apache.tinkerpop.gremlin.util.ser.SerTokens;
import org.apache.tinkerpop.shaded.jackson.databind.JsonNode;
import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
import org.junit.Test;
@@ -48,7 +48,6 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
-import static org.apache.tinkerpop.gremlin.driver.AuthProperties.Property;
abstract class AbstractGremlinServerChannelizerIntegrateTest extends AbstractGremlinServerIntegrationTest {
@@ -56,11 +55,7 @@
private final Base64.Encoder encoder = Base64.getUrlEncoder();
protected static final String HTTP = "http";
- protected static final String WS = "ws";
protected static final String HTTPS = "https";
- protected static final String WSS = "wss";
- protected static final String WS_AND_HTTP = "wsAndHttp";
- protected static final String WSS_AND_HTTPS = "wssAndHttps";
public abstract String getProtocol();
public abstract String getSecureProtocol();
@@ -108,7 +103,7 @@
public void shouldReturnResult() throws Exception {
final CombinedTestClient client = new CombinedTestClient(getProtocol());
try {
- client.sendAndAssert("2+2", 4);
+ client.sendAndAssert("g.inject(4)", 4);
} finally {
client.close();
}
@@ -118,7 +113,7 @@
public void shouldWorkWithSSL() throws Exception {
final CombinedTestClient client = new CombinedTestClient(getSecureProtocol());
try {
- client.sendAndAssert("2+2", 4);
+ client.sendAndAssert("g.inject(4)", 4);
} finally {
client.close();
}
@@ -128,14 +123,14 @@
public void shouldWorkWithAuth() throws Exception {
CombinedTestClient client = new CombinedTestClient(getProtocol());
try {
- client.sendAndAssertUnauthorized("2+2", "stephen", "notpassword");
+ client.sendAndAssertUnauthorized("g.inject(4)", "stephen", "notpassword");
} finally {
client.close();
}
client = new CombinedTestClient(getProtocol());
try {
- client.sendAndAssert("2+2", 4, "stephen", "password");
+ client.sendAndAssert("g.inject(4)", 4, "stephen", "password");
} finally {
client.close();
}
@@ -143,7 +138,7 @@
client = new CombinedTestClient(getProtocol());
try {
// Expect exception when try again if the server pipeline is correct
- client.sendAndAssertUnauthorized("2+2", "stephen", "notpassword");
+ client.sendAndAssertUnauthorized("g.inject(4)", "stephen", "notpassword");
} finally {
client.close();
}
@@ -153,14 +148,14 @@
public void shouldWorkWithSSLAndAuth() throws Exception {
CombinedTestClient client = new CombinedTestClient(getSecureProtocol());
try {
- client.sendAndAssertUnauthorized("2+2", "stephen", "incorrect-password");
+ client.sendAndAssertUnauthorized("g.inject(4)", "stephen", "incorrect-password");
} finally {
client.close();
}
client = new CombinedTestClient(getSecureProtocol());
try {
- client.sendAndAssert("2+2", 4, "stephen", "password");
+ client.sendAndAssert("g.inject(4)", 4, "stephen", "password");
} finally {
client.close();
}
@@ -168,7 +163,7 @@
client = new CombinedTestClient(getSecureProtocol());
try {
// Expect exception when try again if the server pipeline is correct
- client.sendAndAssertUnauthorized("2+2", "stephen", "incorrect-password");
+ client.sendAndAssertUnauthorized("g.inject(4)", "stephen", "incorrect-password");
} finally {
client.close();
}
@@ -176,9 +171,6 @@
public class CombinedTestClient {
private CloseableHttpClient httpClient = null;
- private Cluster wsCluster = null;
- private Cluster.Builder wsBuilder = null;
- private Client wsClient = null;
private boolean secure = false;
@@ -191,22 +183,6 @@
httpClient = createSslHttpClient();
secure = true;
break;
- case WS:
- this.wsBuilder = TestClientFactory.build();
- break;
- case WSS:
- this.wsBuilder = TestClientFactory.build();
- secure = true;
- break;
- case WS_AND_HTTP:
- httpClient = HttpClients.createDefault();
- this.wsBuilder = TestClientFactory.build();
- break;
- case WSS_AND_HTTPS:
- httpClient = createSslHttpClient();
- secure = true;
- this.wsBuilder = TestClientFactory.build();
- break;
}
}
@@ -236,9 +212,6 @@
if (httpClient != null) {
httpClient.close();
}
- if (wsCluster != null) {
- wsCluster.close();
- }
}
public void sendAndAssertUnauthorized(final String gremlin, final String username, final String password) throws Exception {
@@ -248,15 +221,6 @@
assertEquals(401, response.getStatusLine().getStatusCode());
}
}
- if (wsBuilder != null) {
- setWsClient(username, password);
- try {
- wsClient.submit(gremlin).all().get();
- fail("Should not authorize on incorrect auth creds");
- } catch(Exception e) {
- assertEquals("Username and/or password are incorrect", e.getCause().getMessage());
- }
- }
}
public void sendAndAssert(final String gremlin, final Object result, final String username, final String password) throws Exception {
@@ -267,27 +231,9 @@
assertEquals("application/json", response.getEntity().getContentType().getValue());
final String json = EntityUtils.toString(response.getEntity());
final JsonNode node = mapper.readTree(json);
- assertEquals(result, node.get("result").get("data").get("@value").get(0).get("@value").intValue());
+ assertEquals(result, node.get("result").get(SerTokens.TOKEN_DATA).get("@value").get(0).get("@value").intValue());
}
}
- if (wsBuilder != null) {
- setWsClient(username, password);
- assertEquals(result, wsClient.submit(gremlin).all().get().get(0).getInt());
- }
- }
-
- private void setWsClient(final String username, final String password) {
- if (username != null && password != null) {
- final AuthProperties authProps = new AuthProperties()
- .with(Property.USERNAME, username)
- .with(Property.PASSWORD, password);
-
- wsCluster = wsBuilder.enableSsl(secure).sslSkipCertValidation(true).authProperties(authProps).create();
- wsClient = wsCluster.connect();
- } else {
- wsCluster = wsBuilder.enableSsl(secure).sslSkipCertValidation(true).create();
- wsClient = wsCluster.connect();
- }
}
private HttpPost createPost(final String gremlin, final String username, final String password) {
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/channel/HttpChannelizerIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/channel/HttpChannelizerIntegrateTest.java
index f28969c..8e97726 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/channel/HttpChannelizerIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/channel/HttpChannelizerIntegrateTest.java
@@ -22,7 +22,7 @@
import org.apache.tinkerpop.gremlin.server.auth.SimpleAuthenticator;
import org.apache.tinkerpop.gremlin.server.Settings;
-import org.apache.tinkerpop.gremlin.server.handler.SaslAndHttpBasicAuthenticationHandler;
+import org.apache.tinkerpop.gremlin.server.handler.HttpBasicAuthenticationHandler;
import org.junit.Test;
import org.junit.Assert;
@@ -78,7 +78,7 @@
final Settings.AuthenticationSettings authSettings = new Settings.AuthenticationSettings();
final Map<String,Object> authConfig = new HashMap<>();
authSettings.authenticator = SimpleAuthenticator.class.getName();
- authSettings.authenticationHandler = SaslAndHttpBasicAuthenticationHandler.class.getName();
+ authSettings.authenticationHandler = HttpBasicAuthenticationHandler.class.getName();
authConfig.put(SimpleAuthenticator.CONFIG_CREDENTIALS_DB, "conf/tinkergraph-credentials.properties");
authSettings.config = authConfig;
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/channel/UnifiedChannelizerIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/channel/UnifiedChannelizerIntegrateTest.java
deleted file mode 100644
index a090a20..0000000
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/channel/UnifiedChannelizerIntegrateTest.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.server.channel;
-
-import org.apache.tinkerpop.gremlin.server.Settings;
-import org.apache.tinkerpop.gremlin.server.auth.SimpleAuthenticator;
-import org.apache.tinkerpop.gremlin.server.handler.SaslAndHttpBasicAuthenticationHandler;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class UnifiedChannelizerIntegrateTest extends AbstractGremlinServerChannelizerIntegrateTest {
-
- @Override
- public String getProtocol() {
- return WS_AND_HTTP;
- }
-
- @Override
- public String getSecureProtocol() {
- return WSS_AND_HTTPS;
- }
-
- @Override
- public String getChannelizer() {
- return UnifiedChannelizer.class.getName();
- }
-
- @Override
- public Settings.AuthenticationSettings getAuthSettings() {
- final Settings.AuthenticationSettings authSettings = new Settings.AuthenticationSettings();
- final Map<String,Object> authConfig = new HashMap<>();
- authSettings.authenticator = SimpleAuthenticator.class.getName();
- authSettings.authenticationHandler = SaslAndHttpBasicAuthenticationHandler.class.getName();
- authConfig.put(SimpleAuthenticator.CONFIG_CREDENTIALS_DB, "conf/tinkergraph-credentials.properties");
- authSettings.config = authConfig;
-
- return authSettings;
- }
-
-}
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/channel/UnifiedTestChannelizer.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/channel/UnifiedTestChannelizer.java
deleted file mode 100644
index 149ecd0..0000000
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/channel/UnifiedTestChannelizer.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.server.channel;
-
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelPipeline;
-
-/**
- * A wrapper around UnifiedChannelizer which saves and exposes the ChannelHandlerContext for testing purposes
- */
-public class UnifiedTestChannelizer extends UnifiedChannelizer implements TestChannelizer {
-
- final ContextHandler contextHandler;
-
- public UnifiedTestChannelizer() {
- contextHandler = new ContextHandler();
- }
-
- @Override
- public void configure(final ChannelPipeline pipeline) {
- super.configure(pipeline);
- pipeline.addFirst(contextHandler);
- }
-
- public ChannelHandlerContext getMostRecentChannelHandlerContext() {
- return contextHandler.getMostRecentChannelHandlerContext();
- }
-
- public void resetChannelHandlerContext() {
- contextHandler.resetChannelHandlerContext();
- }
-}
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/channel/WebSocketChannelizerIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/channel/WebSocketChannelizerIntegrateTest.java
deleted file mode 100644
index 9ae600e..0000000
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/channel/WebSocketChannelizerIntegrateTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.server.channel;
-
-
-import org.apache.tinkerpop.gremlin.server.auth.SimpleAuthenticator;
-import org.apache.tinkerpop.gremlin.server.Settings;
-
-import java.util.Map;
-import java.util.HashMap;
-
-public class WebSocketChannelizerIntegrateTest extends AbstractGremlinServerChannelizerIntegrateTest {
-
- @Override
- public String getProtocol() {
- return WS;
- }
-
- @Override
- public String getSecureProtocol() {
- return WSS;
- }
-
- @Override
- public String getChannelizer() {
- return WebSocketChannelizer.class.getName();
- }
-
- @Override
- public Settings.AuthenticationSettings getAuthSettings() {
- final Settings.AuthenticationSettings authSettings = new Settings.AuthenticationSettings();
- final Map<String,Object> authConfig = new HashMap<>();
- authSettings.authenticator = SimpleAuthenticator.class.getName();
- authConfig.put(SimpleAuthenticator.CONFIG_CREDENTIALS_DB, "conf/tinkergraph-credentials.properties");
- authSettings.config = authConfig;
-
- return authSettings;
- }
-
-}
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/channel/WebSocketTestChannelizer.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/channel/WebSocketTestChannelizer.java
deleted file mode 100644
index 54f1efc..0000000
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/channel/WebSocketTestChannelizer.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.server.channel;
-
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelPipeline;
-
-/**
- * A wrapper around WebSocketChannelizer which saves and exposes the ChannelHandlerContext for testing purposes
- */
-public class WebSocketTestChannelizer extends WebSocketChannelizer implements TestChannelizer {
-
- final ContextHandler contextHandler;
-
- public WebSocketTestChannelizer() {
- contextHandler = new ContextHandler();
- }
-
- @Override
- public void configure(final ChannelPipeline pipeline) {
- super.configure(pipeline);
- pipeline.addFirst(contextHandler);
- }
-
- public ChannelHandlerContext getMostRecentChannelHandlerContext() {
- return contextHandler.getMostRecentChannelHandlerContext();
- }
-
- public void resetChannelHandlerContext() {
- contextHandler.resetChannelHandlerContext();
- }
-}
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/channel/WsAndHttpChannelizerIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/channel/WsAndHttpChannelizerIntegrateTest.java
deleted file mode 100644
index 0bda809..0000000
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/channel/WsAndHttpChannelizerIntegrateTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.server.channel;
-
-
-import org.apache.tinkerpop.gremlin.server.auth.SimpleAuthenticator;
-import org.apache.tinkerpop.gremlin.server.handler.SaslAndHttpBasicAuthenticationHandler;
-import org.apache.tinkerpop.gremlin.server.Settings;
-
-import java.util.Map;
-import java.util.HashMap;
-
-public class WsAndHttpChannelizerIntegrateTest extends AbstractGremlinServerChannelizerIntegrateTest {
-
- @Override
- public String getProtocol() {
- return WS_AND_HTTP;
- }
-
- @Override
- public String getSecureProtocol() {
- return WSS_AND_HTTPS;
- }
-
- @Override
- public String getChannelizer() {
- return WsAndHttpChannelizer.class.getName();
- }
-
- @Override
- public Settings.AuthenticationSettings getAuthSettings() {
- final Settings.AuthenticationSettings authSettings = new Settings.AuthenticationSettings();
- final Map<String,Object> authConfig = new HashMap<>();
- authSettings.authenticator = SimpleAuthenticator.class.getName();
- authSettings.authenticationHandler = SaslAndHttpBasicAuthenticationHandler.class.getName();
- authConfig.put(SimpleAuthenticator.CONFIG_CREDENTIALS_DB, "conf/tinkergraph-credentials.properties");
- authSettings.config = authConfig;
-
- return authSettings;
- }
-
-}
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/channel/WsAndHttpTestChannelizer.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/channel/WsAndHttpTestChannelizer.java
deleted file mode 100644
index ca21158..0000000
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/channel/WsAndHttpTestChannelizer.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.server.channel;
-
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelPipeline;
-
-/**
- * A wrapper around UnifiedChannelizer which saves and exposes the ChannelHandlerContext for testing purposes
- */
-public class WsAndHttpTestChannelizer extends WsAndHttpChannelizer implements TestChannelizer {
-
- final ContextHandler contextHandler;
-
- public WsAndHttpTestChannelizer() {
- contextHandler = new ContextHandler();
- }
-
- @Override
- public void configure(final ChannelPipeline pipeline) {
- super.configure(pipeline);
- pipeline.addFirst(contextHandler);
- }
-
- public ChannelHandlerContext getMostRecentChannelHandlerContext() {
- return contextHandler.getMostRecentChannelHandlerContext();
- }
-
- public void resetChannelHandlerContext() {
- contextHandler.resetChannelHandlerContext();
- }
-}
-
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/handler/HttpContentCompressionHandlerTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/handler/HttpContentCompressionHandlerTest.java
new file mode 100644
index 0000000..74ade96
--- /dev/null
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/handler/HttpContentCompressionHandlerTest.java
@@ -0,0 +1,208 @@
+/*
+ * 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.server.handler;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufUtil;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.embedded.EmbeddedChannel;
+import io.netty.handler.codec.http.DefaultFullHttpResponse;
+import io.netty.handler.codec.http.DefaultHttpContent;
+import io.netty.handler.codec.http.DefaultHttpHeaders;
+import io.netty.handler.codec.http.DefaultHttpResponse;
+import io.netty.handler.codec.http.FullHttpResponse;
+import io.netty.handler.codec.http.HttpContent;
+import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.HttpResponse;
+import io.netty.util.CharsetUtil;
+import org.junit.Test;
+
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Random;
+import java.util.zip.Inflater;
+
+import static io.netty.buffer.Unpooled.EMPTY_BUFFER;
+import static io.netty.handler.codec.http.HttpHeaderNames.CONTENT_ENCODING;
+import static io.netty.handler.codec.http.HttpHeaderValues.DEFLATE;
+import static io.netty.handler.codec.http.HttpResponseStatus.OK;
+import static io.netty.handler.codec.http.HttpVersion.HTTP_1_1;
+import static io.netty.handler.codec.http.LastHttpContent.EMPTY_LAST_CONTENT;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class HttpContentCompressionHandlerTest {
+ @Test
+ public void shouldNotCompressIfResponseDoesNotContainContentEncoding() {
+ final HttpContentCompressionHandler compressionHandler = new HttpContentCompressionHandler();
+ final EmbeddedChannel testChannel = new EmbeddedChannel(compressionHandler);
+ final ByteBuf content = testChannel.alloc().buffer();
+ content.writeCharSequence("abc", CharsetUtil.UTF_8);
+ final HttpHeaders headers = new DefaultHttpHeaders();
+ final FullHttpResponse response = new DefaultFullHttpResponse(HTTP_1_1, OK, content, headers, headers);
+
+ testChannel.writeOutbound(response);
+
+ final FullHttpResponse actualResponse = testChannel.readOutbound();
+
+ assertFalse(actualResponse.headers().contains(CONTENT_ENCODING));
+ assertEquals("abc", actualResponse.content().toString(CharsetUtil.UTF_8));
+ }
+
+ @Test
+ public void shouldCompressIfResponseDoesContainContentEncoding() {
+ final HttpContentCompressionHandler compressionHandler = new HttpContentCompressionHandler();
+ final EmbeddedChannel testChannel = new EmbeddedChannel(compressionHandler);
+ final ByteBuf content = testChannel.alloc().buffer();
+ content.writeCharSequence("aaa", CharsetUtil.UTF_8);
+ final HttpHeaders headers = new DefaultHttpHeaders().add(CONTENT_ENCODING, DEFLATE);
+ final FullHttpResponse response = new DefaultFullHttpResponse(HTTP_1_1, OK, content, headers, new DefaultHttpHeaders());
+
+ testChannel.writeOutbound(response);
+
+ final FullHttpResponse actualResponse = testChannel.readOutbound();
+ assertTrue(actualResponse.headers().contains(CONTENT_ENCODING));
+
+ final byte[] contentBytes = new byte[actualResponse.content().readableBytes()];
+ actualResponse.content().readBytes(contentBytes);
+ assertArrayEquals(new byte[] {0x78, (byte) 0x9c, 0x4b, 0x4c, 0x4c, 0x4, 0x0, 0x2, 0x49, 0x1, 0x24}, contentBytes);
+ }
+
+ @Test
+ public void shouldCompressLargeChunk() throws Exception {
+ final int largeArraySize = 64 * 1024 * 1024;
+ byte[] largeArray = new byte[largeArraySize];
+ Arrays.fill(largeArray, (byte) 0x65);
+
+ final HttpContentCompressionHandler compressionHandler = new HttpContentCompressionHandler();
+ final EmbeddedChannel testChannel = new EmbeddedChannel(compressionHandler);
+ final HttpHeaders headers = new DefaultHttpHeaders().add(CONTENT_ENCODING, DEFLATE);
+ final FullHttpResponse outbound = new DefaultFullHttpResponse(HTTP_1_1, OK, Unpooled.wrappedBuffer(largeArray), headers, new DefaultHttpHeaders());
+
+ testChannel.writeOutbound(outbound);
+
+ final FullHttpResponse response = testChannel.readOutbound();
+ assertTrue(response.headers().contains(CONTENT_ENCODING));
+ final byte[] contentBytes = new byte[response.content().readableBytes()];
+ response.content().readBytes(contentBytes);
+ response.release();
+
+ final Inflater decompressor = new Inflater();
+ decompressor.setInput(contentBytes);
+ final byte[] inflatedBytes = new byte[largeArraySize];
+ decompressor.inflate(inflatedBytes);
+
+ assertTrue(decompressor.finished());
+ decompressor.end();
+
+ assertArrayEquals(largeArray, inflatedBytes);
+ }
+
+ @Test
+ public void shouldCompressContentInMultipleChunks() throws Exception {
+ final HttpContentCompressionHandler compressionHandler = new HttpContentCompressionHandler();
+ final EmbeddedChannel testChannel = new EmbeddedChannel(compressionHandler);
+
+ final HttpHeaders headers = new DefaultHttpHeaders().add(CONTENT_ENCODING, DEFLATE);
+ final HttpResponse response = new DefaultHttpResponse(HTTP_1_1, OK, headers);
+
+ final ByteBuf firstChunk = testChannel.alloc().buffer();
+ firstChunk.writeCharSequence("aaa", CharsetUtil.UTF_8);
+
+ final ByteBuf secondChunk = testChannel.alloc().buffer();
+ secondChunk.writeCharSequence("bbb", CharsetUtil.UTF_8);
+
+ final ByteBuf thirdChunk = testChannel.alloc().buffer();
+ thirdChunk.writeCharSequence("ccc", CharsetUtil.UTF_8);
+
+ testChannel.writeOutbound(response);
+ testChannel.writeOutbound(new DefaultHttpContent(firstChunk));
+ testChannel.writeOutbound(new DefaultHttpContent(secondChunk));
+ testChannel.writeOutbound(new DefaultHttpContent(thirdChunk));
+ testChannel.writeOutbound(EMPTY_LAST_CONTENT);
+
+ assertEquals(5, testChannel.outboundMessages().size());
+
+ testChannel.readOutbound(); // Discard HttpResponse.
+
+ Inflater decompressor = new Inflater();
+ final List<byte[]> decompressedChunks = new ArrayList<>();
+
+ for (int i = 0; i < 3; i++) {
+ HttpContent content = testChannel.readOutbound();
+ decompressor.setInput(ByteBufUtil.getBytes(content.content()));
+ byte[] inflatedBytes = new byte[3];
+ decompressor.inflate(inflatedBytes);
+ decompressedChunks.add(inflatedBytes);
+ }
+
+ assertEquals("aaa", new String(decompressedChunks.get(0), StandardCharsets.UTF_8));
+ assertEquals("bbb", new String(decompressedChunks.get(1), StandardCharsets.UTF_8));
+ assertEquals("ccc", new String(decompressedChunks.get(2), StandardCharsets.UTF_8));
+ }
+
+ @Test
+ public void shouldHandleEmptyFrameCompression() throws Exception {
+ final HttpContentCompressionHandler compressionHandler = new HttpContentCompressionHandler();
+ final EmbeddedChannel testChannel = new EmbeddedChannel(compressionHandler);
+ final HttpHeaders headers = new DefaultHttpHeaders().add(CONTENT_ENCODING, DEFLATE);
+ final FullHttpResponse out = new DefaultFullHttpResponse(HTTP_1_1, OK, EMPTY_BUFFER, headers, new DefaultHttpHeaders());
+
+ testChannel.writeOutbound(out);
+
+ final FullHttpResponse response = testChannel.readOutbound();
+ assertTrue(response.headers().contains(CONTENT_ENCODING));
+ assertTrue(response.content().readableBytes() > 0);
+ // Really just testing to make sure no exceptions occur.
+ }
+
+ @Test
+ public void shouldHandleUncompressableChunk() throws Exception {
+ final int arraySize = 128;
+ byte[] data = new byte[arraySize];
+ new Random().nextBytes(data);
+
+ final HttpContentCompressionHandler compressionHandler = new HttpContentCompressionHandler();
+ final EmbeddedChannel testChannel = new EmbeddedChannel(compressionHandler);
+ final HttpHeaders headers = new DefaultHttpHeaders().add(CONTENT_ENCODING, DEFLATE);
+ final FullHttpResponse outbound = new DefaultFullHttpResponse(HTTP_1_1, OK, Unpooled.wrappedBuffer(data), headers, new DefaultHttpHeaders());
+
+ testChannel.writeOutbound(outbound);
+
+ final FullHttpResponse response = testChannel.readOutbound();
+ assertTrue(response.headers().contains(CONTENT_ENCODING));
+ final byte[] contentBytes = new byte[response.content().readableBytes()];
+ response.content().readBytes(contentBytes);
+ response.release();
+
+ final Inflater decompressor = new Inflater();
+ decompressor.setInput(contentBytes);
+ byte[] inflatedBytes = new byte[arraySize];
+ decompressor.inflate(inflatedBytes);
+
+ assertTrue(decompressor.finished());
+ decompressor.end();
+
+ assertArrayEquals(data, inflatedBytes);
+ }
+}
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/handler/HttpHandlerUtilTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/handler/HttpHandlerUtilTest.java
deleted file mode 100644
index 51aacf2..0000000
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/handler/HttpHandlerUtilTest.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.server.handler;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufAllocator;
-import io.netty.handler.codec.http.DefaultFullHttpRequest;
-import io.netty.handler.codec.http.DefaultHttpHeaders;
-import io.netty.handler.codec.http.FullHttpRequest;
-import io.netty.handler.codec.http.HttpHeaderNames;
-import io.netty.handler.codec.http.HttpHeaders;
-import io.netty.handler.codec.http.HttpMethod;
-import io.netty.handler.codec.http.HttpVersion;
-import io.netty.handler.codec.http.QueryStringEncoder;
-import io.netty.util.CharsetUtil;
-import org.apache.tinkerpop.gremlin.util.MessageSerializer;
-import org.apache.tinkerpop.gremlin.util.Tokens;
-import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1;
-import org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3;
-import org.apache.tinkerpop.gremlin.util.ser.SerTokens;
-import org.apache.tinkerpop.gremlin.util.ser.SerializationException;
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.samePropertyValuesAs;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-public class HttpHandlerUtilTest {
-
- private final ByteBufAllocator allocator = ByteBufAllocator.DEFAULT;
- private final GraphBinaryMessageSerializerV1 graphBinarySerializer = new GraphBinaryMessageSerializerV1();
- public final GraphSONMessageSerializerV3 graphSONSerializer = new GraphSONMessageSerializerV3();
-
- @Test
- public void shouldFailWhenIncorrectSerializerUsed() throws SerializationException {
- final RequestMessage request = RequestMessage.build(Tokens.OPS_BYTECODE)
- .processor("traversal")
- .overrideRequestId(UUID.randomUUID())
- .addArg(Tokens.ARGS_GREMLIN, "g.V()")
- .create();
-
- final ByteBuf buffer = graphSONSerializer.serializeRequestAsBinary(request, allocator);
-
- final HttpHeaders headers = new DefaultHttpHeaders();
- headers.add(HttpHeaderNames.CONTENT_TYPE, SerTokens.MIME_GRAPHBINARY_V1);
-
- final FullHttpRequest httpRequest = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.POST, "some uri",
- buffer, headers, new DefaultHttpHeaders());
-
- final Map<String, MessageSerializer<?>> serializers = new HashMap<>();
- serializers.put(SerTokens.MIME_GRAPHBINARY_V1, graphBinarySerializer);
-
- try {
- HttpHandlerUtil.getRequestMessageFromHttpRequest(httpRequest, serializers);
- fail("SerializationException expected");
- } catch (IllegalArgumentException ex) {
- assertEquals("Mime type mismatch. Value in content-type header is not equal payload header.", ex.getMessage());
- }
- }
-
- @Test
- public void shouldCorrectlyDeserializeRequestMessage() throws SerializationException {
- final RequestMessage request = RequestMessage.build(Tokens.OPS_BYTECODE)
- .processor("traversal")
- .overrideRequestId(UUID.randomUUID())
- .addArg(Tokens.ARGS_GREMLIN, "g.V()")
- .create();
-
- final ByteBuf buffer = graphBinarySerializer.serializeRequestAsBinary(request, allocator);
-
- final HttpHeaders headers = new DefaultHttpHeaders();
- headers.add(HttpHeaderNames.CONTENT_TYPE, SerTokens.MIME_GRAPHBINARY_V1);
-
- final FullHttpRequest httpRequest = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.POST, "some uri",
- buffer, headers, new DefaultHttpHeaders());
-
- final Map<String, MessageSerializer<?>> serializers = new HashMap<>();
- serializers.put(SerTokens.MIME_GRAPHBINARY_V1, graphBinarySerializer);
-
- final RequestMessage deserialized = HttpHandlerUtil.getRequestMessageFromHttpRequest(httpRequest, serializers);
- assertThat(request, samePropertyValuesAs(deserialized));
- }
-
- @Test
- public void shouldCorrectlyDeserializeGremlinFromPostRequest() throws SerializationException {
- final String gremlin = "g.V().hasLabel('person')";
- final UUID requestId = UUID.randomUUID();
- final ByteBuf buffer = allocator.buffer();
- buffer.writeCharSequence("{ \"gremlin\": \"" + gremlin +
- "\", \"requestId\": \"" + requestId +
- "\", \"language\": \"gremlin-groovy\"}",
- CharsetUtil.UTF_8);
-
- final HttpHeaders headers = new DefaultHttpHeaders();
- headers.add(HttpHeaderNames.CONTENT_TYPE, SerTokens.MIME_JSON);
-
- final FullHttpRequest httpRequest = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.POST, "some uri",
- buffer, headers, new DefaultHttpHeaders());
-
- final Map<String, MessageSerializer<?>> serializers = new HashMap<>();
- serializers.put(SerTokens.MIME_GRAPHBINARY_V1, graphBinarySerializer);
-
- final RequestMessage deserialized = HttpHandlerUtil.getRequestMessageFromHttpRequest(httpRequest, serializers);
- assertEquals(gremlin, deserialized.getArgs().get(Tokens.ARGS_GREMLIN));
- assertEquals(requestId, deserialized.getRequestId());
- assertEquals("gremlin-groovy", deserialized.getArg(Tokens.ARGS_LANGUAGE));
- }
-
- @Test
- public void shouldCorrectlyDeserializeGremlinFromGetRequest() throws SerializationException {
- final String gremlin = "g.V().hasLabel('person')";
- final UUID requestId = UUID.randomUUID();
- final ByteBuf buffer = allocator.buffer();
-
- final List<String> headerOptions = Arrays.asList("", null, SerTokens.MIME_JSON, "some invalid value");
-
- for (final String contentTypeValue : headerOptions) {
- final HttpHeaders headers = new DefaultHttpHeaders();
- if (contentTypeValue != null) {
- headers.add(HttpHeaderNames.CONTENT_TYPE, contentTypeValue);
- }
-
- final QueryStringEncoder encoder = new QueryStringEncoder("/");
- encoder.addParam("gremlin", gremlin);
- encoder.addParam("requestId", requestId.toString());
- encoder.addParam("language", "gremlin-groovy");
-
- final FullHttpRequest httpRequest = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.GET,
- encoder.toString(), buffer, headers, new DefaultHttpHeaders());
-
- final Map<String, MessageSerializer<?>> serializers = new HashMap<>();
- serializers.put(SerTokens.MIME_GRAPHBINARY_V1, graphBinarySerializer);
-
- final RequestMessage deserialized = HttpHandlerUtil.getRequestMessageFromHttpRequest(httpRequest, serializers);
- assertEquals(gremlin, deserialized.getArgs().get(Tokens.ARGS_GREMLIN));
- assertEquals(requestId, deserialized.getRequestId());
- assertEquals("gremlin-groovy", deserialized.getArg(Tokens.ARGS_LANGUAGE));
- }
- }
-}
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/handler/HttpRequestIdHandlerTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/handler/HttpRequestIdHandlerTest.java
new file mode 100644
index 0000000..0fc2247
--- /dev/null
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/handler/HttpRequestIdHandlerTest.java
@@ -0,0 +1,82 @@
+/*
+ * 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.server.handler;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.embedded.EmbeddedChannel;
+import io.netty.handler.codec.http.DefaultFullHttpRequest;
+import io.netty.handler.codec.http.DefaultFullHttpResponse;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.FullHttpResponse;
+import io.netty.handler.codec.http.HttpMethod;
+import io.netty.handler.codec.http.HttpRequest;
+import io.netty.handler.codec.http.HttpResponse;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.handler.codec.http.HttpServerCodec;
+import io.netty.handler.codec.http.HttpVersion;
+import io.netty.util.CharsetUtil;
+import org.junit.Test;
+
+import java.util.UUID;
+
+import static org.apache.tinkerpop.gremlin.server.handler.HttpRequestIdHandler.REQUEST_ID_HEADER_NAME;
+import static org.junit.Assert.assertTrue;
+
+public class HttpRequestIdHandlerTest {
+ @Test
+ public void shouldProvideRequestIdToFollowingHandlers() {
+ final HttpRequestIdHandler httpRequestIdHandler = new HttpRequestIdHandler();
+ final EmbeddedChannel testChannel = new EmbeddedChannel(new HttpServerCodec(), httpRequestIdHandler);
+
+ final ByteBuf buffer = testChannel.alloc().buffer();
+ buffer.writeCharSequence("abc", CharsetUtil.UTF_8);
+ final FullHttpRequest httpRequest = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.POST, "/gremlin", buffer);
+
+ testChannel.writeInbound(httpRequest);
+ testChannel.finish();
+
+ assertTrue(testChannel.readInbound() instanceof HttpRequest);
+ assertTrue(testChannel.attr(StateKey.REQUEST_ID) != null);
+
+ buffer.release();
+ }
+
+ @Test
+ public void shouldInjectRequestIdHeaderToOutgoingWrites() {
+ final HttpRequestIdHandler httpRequestIdHandler = new HttpRequestIdHandler();
+ final EmbeddedChannel testServerChannel = new EmbeddedChannel(httpRequestIdHandler);
+
+ final ByteBuf buffer = testServerChannel.alloc().buffer();
+ buffer.writeCharSequence("abc", CharsetUtil.UTF_8);
+ final FullHttpRequest httpRequest = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.POST, "/gremlin", buffer);
+
+ final FullHttpResponse httpResponse = new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, HttpResponseStatus.OK);
+
+ testServerChannel.writeInbound(httpRequest);
+ testServerChannel.writeOutbound(httpResponse);
+ final HttpResponse updatedResponse = testServerChannel.readOutbound();
+
+ testServerChannel.finish();
+ assertTrue(updatedResponse.headers().contains(REQUEST_ID_HEADER_NAME));
+ UUID.fromString(updatedResponse.headers().get(REQUEST_ID_HEADER_NAME));
+
+ httpRequest.release();
+ httpResponse.release();
+ }
+}
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/handler/HttpRequestMessageDecoderTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/handler/HttpRequestMessageDecoderTest.java
new file mode 100644
index 0000000..4c0e15f
--- /dev/null
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/handler/HttpRequestMessageDecoderTest.java
@@ -0,0 +1,339 @@
+/*
+ * 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.server.handler;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.embedded.EmbeddedChannel;
+import io.netty.handler.codec.http.DefaultFullHttpRequest;
+import io.netty.handler.codec.http.DefaultHttpHeaders;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpHeaderNames;
+import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.HttpMethod;
+import io.netty.handler.codec.http.HttpObjectAggregator;
+import io.netty.handler.codec.http.HttpServerCodec;
+import io.netty.handler.codec.http.HttpVersion;
+import io.netty.util.CharsetUtil;
+import org.apache.tinkerpop.gremlin.util.MessageSerializer;
+import org.apache.tinkerpop.gremlin.util.Tokens;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV4;
+import org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV4;
+import org.apache.tinkerpop.gremlin.util.ser.SerTokens;
+import org.apache.tinkerpop.gremlin.util.ser.SerializationException;
+import org.apache.tinkerpop.gremlin.util.ser.Serializers;
+import org.junit.Test;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.samePropertyValuesAs;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+public class HttpRequestMessageDecoderTest {
+
+ private final ByteBufAllocator allocator = ByteBufAllocator.DEFAULT;
+ private final GraphBinaryMessageSerializerV4 graphBinarySerializer = new GraphBinaryMessageSerializerV4();
+ public final GraphSONMessageSerializerV4 graphSONSerializer = new GraphSONMessageSerializerV4();
+
+ private final static Map<String, MessageSerializer<?>> serializers = new HashMap<>();
+ static {
+ serializers.put(Serializers.GRAPHSON_V4_UNTYPED.getValue(), Serializers.GRAPHSON_V4_UNTYPED.simpleInstance());
+ serializers.put("application/json", Serializers.GRAPHSON_V4_UNTYPED.simpleInstance());
+ serializers.put(Serializers.GRAPHSON_V4.getValue(), Serializers.GRAPHSON_V4.simpleInstance());
+ serializers.put(Serializers.GRAPHBINARY_V4.getValue(), Serializers.GRAPHBINARY_V4.simpleInstance());
+ }
+
+ @Test
+ public void shouldFailWhenIncorrectSerializerUsed() throws SerializationException {
+ final HttpRequestMessageDecoder requestMessageDecoder = new HttpRequestMessageDecoder(serializers);
+ final EmbeddedChannel testChannel = new EmbeddedChannel(new HttpServerCodec(), new HttpObjectAggregator(Integer.MAX_VALUE), requestMessageDecoder);
+
+ final RequestMessage request = RequestMessage.build("g.V()").create();
+
+ final ByteBuf buffer = graphSONSerializer.serializeRequestAsBinary(request, allocator);
+
+ final HttpHeaders headers = new DefaultHttpHeaders();
+ headers.add(HttpHeaderNames.CONTENT_TYPE, SerTokens.MIME_GRAPHBINARY_V4);
+
+ final FullHttpRequest httpRequest = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.POST, "some uri",
+ buffer, headers, new DefaultHttpHeaders());
+
+ testChannel.writeInbound(httpRequest);
+ testChannel.finish();
+
+ assertNull(testChannel.readInbound());
+
+ ByteBuf out = testChannel.readOutbound();
+ assertTrue(out.toString(CharsetUtil.UTF_8).contains("Unable to deserialize request using"));
+ }
+
+ @Test
+ public void shouldCorrectlyDeserializeRequestMessage() throws SerializationException {
+ final HttpRequestMessageDecoder requestMessageDecoder = new HttpRequestMessageDecoder(serializers);
+ final EmbeddedChannel testChannel = new EmbeddedChannel(new HttpServerCodec(), new HttpObjectAggregator(Integer.MAX_VALUE), requestMessageDecoder);
+
+ final RequestMessage request = RequestMessage.build("g.V()").addLanguage("gremlin-lang").create();
+
+ final ByteBuf buffer = graphBinarySerializer.serializeRequestAsBinary(request, allocator);
+
+ final HttpHeaders headers = new DefaultHttpHeaders();
+ headers.add(HttpHeaderNames.CONTENT_TYPE, SerTokens.MIME_GRAPHBINARY_V4);
+
+ final FullHttpRequest httpRequest = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.POST, "some uri",
+ buffer, headers, new DefaultHttpHeaders());
+
+ testChannel.writeInbound(httpRequest);
+ testChannel.finish();
+
+ final RequestMessage decodedRequestMessage = testChannel.readInbound();
+ assertThat(request.getFields(), samePropertyValuesAs(decodedRequestMessage.getFields()));
+ assertEquals(request.getGremlin(), decodedRequestMessage.getGremlin());
+ }
+
+ @Test
+ public void shouldCorrectlyDeserializeGremlinFromPostRequest() throws SerializationException {
+ final HttpRequestMessageDecoder requestMessageDecoder = new HttpRequestMessageDecoder(serializers);
+ final EmbeddedChannel testChannel = new EmbeddedChannel(new HttpServerCodec(), new HttpObjectAggregator(Integer.MAX_VALUE), requestMessageDecoder);
+
+ final String gremlin = "g.V().hasLabel('person')";
+ final ByteBuf buffer = allocator.buffer();
+ buffer.writeCharSequence("{ \"gremlin\": \"" + gremlin +
+ "\", \"language\": \"gremlin-groovy\"}",
+ CharsetUtil.UTF_8);
+
+ final HttpHeaders headers = new DefaultHttpHeaders();
+ headers.add(HttpHeaderNames.CONTENT_TYPE, SerTokens.MIME_JSON);
+
+ final FullHttpRequest httpRequest = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.POST, "some uri",
+ buffer, headers, new DefaultHttpHeaders());
+
+ testChannel.writeInbound(httpRequest);
+ testChannel.finish();
+
+ final RequestMessage decodedRequestMessage = testChannel.readInbound();
+ assertEquals(gremlin, decodedRequestMessage.getGremlin());
+ assertEquals("gremlin-groovy", decodedRequestMessage.getField(Tokens.ARGS_LANGUAGE));
+ }
+
+ @Test
+ public void shouldCorrectlyDeserializeGremlinFromPostRequestWithAllScriptFieldsSet() throws SerializationException {
+ final HttpRequestMessageDecoder requestMessageDecoder = new HttpRequestMessageDecoder(serializers);
+ final EmbeddedChannel testChannel = new EmbeddedChannel(new HttpServerCodec(), new HttpObjectAggregator(Integer.MAX_VALUE), requestMessageDecoder);
+
+ final String gremlin = "g.V(x)";
+ final ByteBuf buffer = allocator.buffer();
+ buffer.writeCharSequence("{ \"gremlin\": \"" + gremlin +
+ "\", \"bindings\":{\"x\":\"2\"}" +
+ ", \"language\": \"gremlin-groovy\"}",
+ CharsetUtil.UTF_8);
+
+ final HttpHeaders headers = new DefaultHttpHeaders();
+ headers.add(HttpHeaderNames.CONTENT_TYPE, SerTokens.MIME_JSON);
+
+ final FullHttpRequest httpRequest = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.POST, "",
+ buffer, headers, new DefaultHttpHeaders());
+
+ testChannel.writeInbound(httpRequest);
+ testChannel.finish();
+
+ final RequestMessage decodedRequestMessage = testChannel.readInbound();
+ assertEquals(gremlin, decodedRequestMessage.getGremlin());
+ assertEquals("gremlin-groovy", decodedRequestMessage.getField(Tokens.ARGS_LANGUAGE));
+ assertEquals("2", ((Map)decodedRequestMessage.getField(Tokens.ARGS_BINDINGS)).get("x"));
+ }
+
+ @Test
+ public void shouldErrorOnBadRequestWithMalformedJson() throws SerializationException {
+ final HttpRequestMessageDecoder requestMessageDecoder = new HttpRequestMessageDecoder(serializers);
+ final EmbeddedChannel testChannel = new EmbeddedChannel(new HttpServerCodec(), new HttpObjectAggregator(Integer.MAX_VALUE), requestMessageDecoder);
+
+ final String gremlin = "g.V(x)";
+ final ByteBuf buffer = allocator.buffer();
+ buffer.writeCharSequence("{ \"gremlin\": \"" + gremlin +
+ "\" \"language\": \"gremlin-groovy\"}",
+ CharsetUtil.UTF_8);
+
+ final HttpHeaders headers = new DefaultHttpHeaders();
+ headers.add(HttpHeaderNames.CONTENT_TYPE, SerTokens.MIME_JSON);
+
+ final FullHttpRequest httpRequest = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.POST, "",
+ buffer, headers, new DefaultHttpHeaders());
+
+ testChannel.writeInbound(httpRequest);
+ testChannel.finish();
+
+ assertNull(testChannel.readInbound());
+
+ ByteBuf out = testChannel.readOutbound();
+ assertTrue(out.toString(CharsetUtil.UTF_8).contains("body could not be parsed"));
+ }
+
+ @Test
+ public void shouldIgnoreInvalidRequestMessageParameter() throws SerializationException {
+ final HttpRequestMessageDecoder requestMessageDecoder = new HttpRequestMessageDecoder(serializers);
+ final EmbeddedChannel testChannel = new EmbeddedChannel(new HttpServerCodec(), new HttpObjectAggregator(Integer.MAX_VALUE), requestMessageDecoder);
+
+ final String gremlin = "g.V(x)";
+ final ByteBuf buffer = allocator.buffer();
+ // language contains a typo here as lnguage
+ buffer.writeCharSequence("{ \"gremlin\": \"" + gremlin +
+ "\", \"lnguage\": \"abc\"}",
+ CharsetUtil.UTF_8);
+
+ final HttpHeaders headers = new DefaultHttpHeaders();
+ headers.add(HttpHeaderNames.CONTENT_TYPE, SerTokens.MIME_JSON);
+
+ final FullHttpRequest httpRequest = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.POST, "",
+ buffer, headers, new DefaultHttpHeaders());
+
+ testChannel.writeInbound(httpRequest);
+ testChannel.finish();
+
+ final RequestMessage decodedRequestMessage = testChannel.readInbound();
+ assertNotEquals("abc", decodedRequestMessage.getField(Tokens.ARGS_LANGUAGE));
+ }
+
+ @Test
+ public void shouldErrorOnBadRequestWithNoParameter() throws SerializationException {
+ final HttpRequestMessageDecoder requestMessageDecoder = new HttpRequestMessageDecoder(serializers);
+ final EmbeddedChannel testChannel = new EmbeddedChannel(new HttpServerCodec(), new HttpObjectAggregator(Integer.MAX_VALUE), requestMessageDecoder);
+
+ final ByteBuf buffer = allocator.buffer();
+ buffer.writeCharSequence("{ }", CharsetUtil.UTF_8);
+
+ final HttpHeaders headers = new DefaultHttpHeaders();
+ headers.add(HttpHeaderNames.CONTENT_TYPE, SerTokens.MIME_JSON);
+
+ final FullHttpRequest httpRequest = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.POST, "",
+ buffer, headers, new DefaultHttpHeaders());
+
+ testChannel.writeInbound(httpRequest);
+ testChannel.finish();
+
+ assertNull(testChannel.readInbound());
+
+ ByteBuf out = testChannel.readOutbound();
+ assertTrue(out.toString(CharsetUtil.UTF_8).contains("no gremlin script supplied"));
+ }
+
+ @Test
+ public void shouldAttemptToParseRequestWithNonsenseContentType() throws SerializationException {
+ final HttpRequestMessageDecoder requestMessageDecoder = new HttpRequestMessageDecoder(serializers);
+ final EmbeddedChannel testChannel = new EmbeddedChannel(new HttpServerCodec(), new HttpObjectAggregator(Integer.MAX_VALUE), requestMessageDecoder);
+
+ final ByteBuf buffer = allocator.buffer();
+ buffer.writeCharSequence("{\"gremlin\":\"g.V()\"}", CharsetUtil.UTF_8);
+
+ final HttpHeaders headers = new DefaultHttpHeaders();
+ headers.add(HttpHeaderNames.CONTENT_TYPE, "some-nonexistent-serializer");
+
+ final FullHttpRequest httpRequest = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.POST, "",
+ buffer, headers, new DefaultHttpHeaders());
+
+ testChannel.writeInbound(httpRequest);
+ testChannel.finish();
+
+ RequestMessage decodedRequest = testChannel.readInbound();
+ assertNotNull(decodedRequest);
+ }
+
+ @Test
+ public void shouldErrorWithNonexistentAcceptHeader() throws SerializationException {
+ final HttpRequestMessageDecoder requestMessageDecoder = new HttpRequestMessageDecoder(serializers);
+ final EmbeddedChannel testChannel = new EmbeddedChannel(new HttpServerCodec(), new HttpObjectAggregator(Integer.MAX_VALUE), requestMessageDecoder);
+
+ final ByteBuf buffer = allocator.buffer();
+ buffer.writeCharSequence("{\"gremlin\":\"g.V()\"}", CharsetUtil.UTF_8);
+
+ final HttpHeaders headers = new DefaultHttpHeaders();
+ headers.add(HttpHeaderNames.ACCEPT, "some-nonexistent-serializer");
+
+ final FullHttpRequest httpRequest = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.POST, "",
+ buffer, headers, new DefaultHttpHeaders());
+
+ testChannel.writeInbound(httpRequest);
+ testChannel.finish();
+
+ assertNull(testChannel.readInbound());
+
+ ByteBuf response = testChannel.readOutbound();
+ assertTrue(response.toString(CharsetUtil.UTF_8).contains("no serializer for requested Accept header"));
+ }
+
+ @Test
+ public void shouldNotAddInvalidFieldToRequestMessage() throws SerializationException {
+ final HttpRequestMessageDecoder requestMessageDecoder = new HttpRequestMessageDecoder(serializers);
+ final EmbeddedChannel testChannel = new EmbeddedChannel(new HttpServerCodec(), new HttpObjectAggregator(Integer.MAX_VALUE), requestMessageDecoder);
+
+ final ByteBuf buffer = allocator.buffer();
+ buffer.writeCharSequence("{\"gremlin\":\"g.V()\",\"nonfield\":\"shouldntgetadded\"}", CharsetUtil.UTF_8);
+
+ final HttpHeaders headers = new DefaultHttpHeaders();
+ headers.add(HttpHeaderNames.CONTENT_TYPE, SerTokens.MIME_JSON);
+
+ final FullHttpRequest httpRequest = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.POST, "",
+ buffer, headers, new DefaultHttpHeaders());
+
+ testChannel.writeInbound(httpRequest);
+ testChannel.finish();
+
+ RequestMessage decodedRequest = testChannel.readInbound();
+ assertNull(decodedRequest.getField("nonfield"));
+ assertEquals("g.V()", decodedRequest.getGremlin());
+ }
+
+ @Test
+ public void shouldAddValidFieldsToRequestMessage() throws SerializationException {
+ final HttpRequestMessageDecoder requestMessageDecoder = new HttpRequestMessageDecoder(serializers);
+ final EmbeddedChannel testChannel = new EmbeddedChannel(new HttpServerCodec(), new HttpObjectAggregator(Integer.MAX_VALUE), requestMessageDecoder);
+
+ final UUID rid = UUID.randomUUID();
+ final ByteBuf buffer = allocator.buffer();
+ buffer.writeCharSequence("{\"gremlin\":\"g.V().limit(2)\",\"batchSize\":\"10\",\"language\":\"gremlin-lang\"," +
+ "\"g\":\"gmodern\",\"bindings\":{\"x\":\"1\"},\"timeoutMs\":\"12\"," +
+ "\"materializeProperties\":\"" + Tokens.MATERIALIZE_PROPERTIES_TOKENS + "\"}", CharsetUtil.UTF_8);
+
+ final HttpHeaders headers = new DefaultHttpHeaders();
+ headers.add(HttpHeaderNames.CONTENT_TYPE, SerTokens.MIME_JSON);
+
+ final FullHttpRequest httpRequest = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.POST, "",
+ buffer, headers, new DefaultHttpHeaders());
+
+ testChannel.writeInbound(httpRequest);
+ testChannel.finish();
+
+ RequestMessage decodedRequest = testChannel.readInbound();
+ assertEquals("g.V().limit(2)", decodedRequest.getGremlin());
+ assertEquals(10, (int) decodedRequest.getField(Tokens.ARGS_BATCH_SIZE));
+ assertEquals("gremlin-lang", decodedRequest.getField(Tokens.ARGS_LANGUAGE));
+ assertEquals("gmodern", decodedRequest.getField(Tokens.ARGS_G));
+ assertEquals("1", ((Map) decodedRequest.getField(Tokens.ARGS_BINDINGS)).get("x"));
+ assertEquals(1, ((Map) decodedRequest.getField(Tokens.ARGS_BINDINGS)).size());
+ assertEquals(12, (long) decodedRequest.getField(Tokens.TIMEOUT_MS));
+ assertEquals(Tokens.MATERIALIZE_PROPERTIES_TOKENS, decodedRequest.getField(Tokens.ARGS_MATERIALIZE_PROPERTIES));
+ }
+}
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/notifications/GraphManagerNotificationsTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/notifications/GraphManagerNotificationsTest.java
deleted file mode 100644
index 34fbd99..0000000
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/notifications/GraphManagerNotificationsTest.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.server.notifications;
-
-import org.apache.tinkerpop.gremlin.TestHelper;
-import org.apache.tinkerpop.gremlin.driver.Client;
-import org.apache.tinkerpop.gremlin.driver.Cluster;
-import org.apache.tinkerpop.gremlin.driver.RequestOptions;
-import org.apache.tinkerpop.gremlin.util.Tokens;
-import org.apache.tinkerpop.gremlin.server.AbstractGremlinServerIntegrationTest;
-import org.apache.tinkerpop.gremlin.server.Settings;
-import org.apache.tinkerpop.gremlin.server.TestClientFactory;
-import org.junit.Test;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-import java.util.Map;
-import java.util.Random;
-import java.util.UUID;
-
-public class GraphManagerNotificationsTest extends AbstractGremlinServerIntegrationTest {
-
- @Override
- public Settings overrideSettings(final Settings settings) {
- settings.graphManager = "org.apache.tinkerpop.gremlin.server.notifications.ProviderGraphManagerHelper";
- return settings;
- }
-
- @Test
- public void scriptSuccessShouldNotifyGraphManager() throws Exception {
- final Cluster cluster = TestClientFactory.open();
- final Client client = cluster.connect(name.getMethodName());
- final Random random = TestHelper.RANDOM;
- final UUID requestID = new UUID(random.nextLong(), random.nextLong());
- final RequestOptions options = RequestOptions.build().overrideRequestId(requestID).create();
-
- final String script = "1+1";
- client.submit(script, options).all().get().get(0);
-
- final ProviderGraphManagerHelper graphManager = (ProviderGraphManagerHelper) server.getServerGremlinExecutor()
- .getGraphManager();
- final Map<String, Object> requestArgs = graphManager.getBeforeQueryStartTracking(requestID.toString());
- assertEquals(script, requestArgs.get(Tokens.ARGS_GREMLIN));
- assertThat(graphManager.didRequestSucceed(requestID.toString()), is(true));
- assertThat(graphManager.didRequestFail(requestID.toString()), is(false));
- cluster.close();
- }
-
- @Test
- public void scriptFailureShouldNotifyGraphManager() throws Exception {
- final Cluster cluster = TestClientFactory.open();
- final Client client = cluster.connect(name.getMethodName());
- final Random random = TestHelper.RANDOM;
- final UUID requestID = new UUID(random.nextLong(), random.nextLong());
- final RequestOptions options = RequestOptions.build().overrideRequestId(requestID).create();
-
- final String script = "x";
- try {
- client.submit(script, options).all().get().get(0);
- fail("This script should fail since the variable x is not defined");
- } catch (Exception e) {
- //
- }
-
- final ProviderGraphManagerHelper graphManager = (ProviderGraphManagerHelper) server.getServerGremlinExecutor()
- .getGraphManager();
- final Map<String, Object> requestArgs = graphManager.getBeforeQueryStartTracking(requestID.toString());
- assertEquals(script, requestArgs.get(Tokens.ARGS_GREMLIN));
- assertThat(graphManager.didRequestSucceed(requestID.toString()), is(false));
- assertThat(graphManager.didRequestFail(requestID.toString()), is(true));
- cluster.close();
- }
-
-}
\ No newline at end of file
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/notifications/ProviderGraphManagerHelper.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/notifications/ProviderGraphManagerHelper.java
deleted file mode 100644
index 94bd6fb..0000000
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/notifications/ProviderGraphManagerHelper.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tinkerpop.gremlin.server.notifications;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.server.Settings;
-import org.apache.tinkerpop.gremlin.server.util.DefaultGraphManager;
-
-public class ProviderGraphManagerHelper extends DefaultGraphManager {
-
- private Map<String, Map<String, Object>> beforeQueryStartTracking;
-
- private List<String> onQuerySuccessCount;
-
- private List<String> onQueryErrorCount;
-
- public ProviderGraphManagerHelper(final Settings settings) {
- super(settings);
- this.beforeQueryStartTracking = new HashMap<String, Map<String, Object>>();
- this.onQuerySuccessCount = new ArrayList<String>();
- this.onQueryErrorCount = new ArrayList<String>();
- }
-
- @Override
- public void beforeQueryStart(final RequestMessage msg) {
- final Map<String, Object> args = msg.getArgs();
- final String requestID = msg.getRequestId().toString();
- this.beforeQueryStartTracking.put(requestID, args);
- }
-
- @Override
- public void onQuerySuccess(final RequestMessage msg) {
- final String requestID = msg.getRequestId().toString();
- this.onQuerySuccessCount.add(requestID);
- }
-
- @Override
- public void onQueryError(final RequestMessage msg, final Throwable e) {
- final String requestID = msg.getRequestId().toString();
- this.onQueryErrorCount.add(requestID);
- }
-
- public Map<String, Object> getBeforeQueryStartTracking(final String requestID) {
- return this.beforeQueryStartTracking.get(requestID);
- }
-
- public boolean didRequestSucceed(final String requestID) {
- return this.onQuerySuccessCount.contains(requestID);
- }
-
- public boolean didRequestFail(final String requestID) {
- return this.onQueryErrorCount.contains(requestID);
- }
-
-}
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessorTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessorTest.java
deleted file mode 100644
index 42852f4..0000000
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessorTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.server.op;
-
-import io.netty.channel.ChannelHandlerContext;
-import org.apache.tinkerpop.gremlin.util.Tokens;
-import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.groovy.engine.GremlinExecutor;
-import org.apache.tinkerpop.gremlin.server.Context;
-import org.apache.tinkerpop.gremlin.server.Settings;
-import org.apache.tinkerpop.gremlin.server.op.standard.StandardOpProcessor;
-import org.hamcrest.CoreMatchers;
-import org.junit.Test;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mockito;
-
-import javax.script.SimpleBindings;
-
-import java.util.concurrent.CompletableFuture;
-
-import static org.junit.Assert.assertEquals;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.ArgumentMatchers.anyString;
-
-public class AbstractEvalOpProcessorTest {
-
- @Test
- public void evalOpInternalShouldHandleAllEvaluationExceptions() throws OpProcessorException {
- final AbstractEvalOpProcessor processor = new StandardOpProcessor();
- final RequestMessage request = RequestMessage.build("test").
- addArg(Tokens.ARGS_LANGUAGE, "gremlin-groovy").
- addArg(Tokens.ARGS_GREMLIN, "1+1").create();
- final Settings settings = new Settings();
- final ChannelHandlerContext ctx = Mockito.mock(ChannelHandlerContext.class);
- final ArgumentCaptor<ResponseMessage> responseCaptor = ArgumentCaptor.forClass(ResponseMessage.class);
-
- final GremlinExecutor gremlinExecutor = Mockito.mock(GremlinExecutor.class);
- final CompletableFuture<Object> exFut = new CompletableFuture<>();
- Mockito.when(gremlinExecutor.eval(anyString(), anyString(), Mockito.any(), Mockito.<GremlinExecutor.LifeCycle>any()))
- .thenReturn(exFut);
- exFut.completeExceptionally(new IllegalStateException("test-exception"));
-
- final Context contextspy = Mockito.spy(new Context(request, ctx, settings, null, gremlinExecutor, null));
-
- processor.evalOpInternal(contextspy, contextspy::getGremlinExecutor, SimpleBindings::new);
-
- Mockito.verify(contextspy, Mockito.times(1)).writeAndFlush(responseCaptor.capture());
- assertEquals(ResponseStatusCode.SERVER_ERROR_EVALUATION, responseCaptor.getValue().getStatus().getCode());
- assertEquals(request.getRequestId(), responseCaptor.getValue().getRequestId());
- assertThat(responseCaptor.getValue().getStatus().getMessage(), CoreMatchers.containsString("test-exception"));
- }
-}
\ No newline at end of file
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessorTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessorTest.java
deleted file mode 100644
index 0117562..0000000
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessorTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.server.op;
-
-import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.server.Context;
-import org.junit.Test;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mockito;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-public class AbstractOpProcessorTest {
-
- @Test
- public void makeFrameMethodTest() throws Exception {
- final RequestMessage request = RequestMessage.build("test").create();
- final Context ctx = Mockito.mock(Context.class);
-
- final ArgumentCaptor<ResponseMessage> responseCaptor = ArgumentCaptor.forClass(ResponseMessage.class);
-
- try {
- // Induce a NullPointerException to validate error response message writing
- AbstractOpProcessor.makeFrame(ctx, request, null, true, null, ResponseStatusCode.PARTIAL_CONTENT, null, null);
- fail("Expected a NullPointerException");
- } catch (NullPointerException expected) {
- // nop
- }
-
- Mockito.verify(ctx, Mockito.times(1)).writeAndFlush(responseCaptor.capture());
- assertEquals(ResponseStatusCode.SERVER_ERROR_SERIALIZATION, responseCaptor.getValue().getStatus().getCode());
- assertEquals(request.getRequestId(), responseCaptor.getValue().getRequestId());
- }
-
-}
\ No newline at end of file
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/util/TextPlainMessageSerializerTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/util/TextPlainMessageSerializerTest.java
index b88daaf..6772f9b 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/util/TextPlainMessageSerializerTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/util/TextPlainMessageSerializerTest.java
@@ -18,31 +18,33 @@
*/
package org.apache.tinkerpop.gremlin.server.util;
+import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufAllocator;
-import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.util.CharsetUtil;
import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
import org.junit.Test;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
-import java.util.UUID;
import static org.junit.Assert.assertEquals;
public class TextPlainMessageSerializerTest {
-
@Test
public void shouldProducePlainText() throws Exception {
final Map<String, Object> m = new HashMap<>();
- final ResponseMessage msg = ResponseMessage.build(UUID.randomUUID()).
+ final ResponseMessage msg = ResponseMessage.build().
+ code(HttpResponseStatus.OK).
result(Arrays.asList(1, new DetachedVertex(100, "person", m), java.awt.Color.RED)).create();
final TextPlainMessageSerializer messageSerializer = new TextPlainMessageSerializer();
- final String output = messageSerializer.serializeResponseAsString(msg, ByteBufAllocator.DEFAULT);
+ final ByteBuf output = messageSerializer.serializeResponseAsBinary(msg, ByteBufAllocator.DEFAULT);
final String exp = "==>1" + System.lineSeparator() +
- "==>v[100]" + System.lineSeparator() +
- "==>java.awt.Color[r=255,g=0,b=0]";
- assertEquals(exp, output);
+ "==>v[100]" + System.lineSeparator() +
+ "==>java.awt.Color[r=255,g=0,b=0]";
+ assertEquals(exp, output.toString(CharsetUtil.UTF_8));
}
}
diff --git a/gremlin-server/src/test/resources/META-INF/services/io.cucumber.core.backend.ObjectFactory b/gremlin-server/src/test/resources/META-INF/services/io.cucumber.core.backend.ObjectFactory
index 0233501..409c7dc 100644
--- a/gremlin-server/src/test/resources/META-INF/services/io.cucumber.core.backend.ObjectFactory
+++ b/gremlin-server/src/test/resources/META-INF/services/io.cucumber.core.backend.ObjectFactory
@@ -1,4 +1,9 @@
-org.apache.tinkerpop.gremlin.driver.remote.GraphBinaryRemoteFeatureTest$RemoteGuiceFactory
+org.apache.tinkerpop.gremlin.driver.remote.GraphBinaryLangRemoteFeatureTest$RemoteGuiceFactory
+org.apache.tinkerpop.gremlin.driver.remote.GraphBinaryLangRemoteParameterizedFeatureTest$RemoteGuiceFactory
+org.apache.tinkerpop.gremlin.driver.remote.GraphBinaryLangBulkedRemoteFeatureTest$RemoteGuiceFactory
+org.apache.tinkerpop.gremlin.driver.remote.GraphBinaryGroovyRemoteFeatureTest$RemoteGuiceFactory
+org.apache.tinkerpop.gremlin.driver.remote.GraphBinaryGroovyRemoteParameterizedFeatureTest$RemoteGuiceFactory
org.apache.tinkerpop.gremlin.driver.remote.GraphBinaryRemoteComputerFeatureTest$RemoteGuiceFactory
-org.apache.tinkerpop.gremlin.driver.remote.GraphSONRemoteFeatureTest$RemoteGuiceFactory
+org.apache.tinkerpop.gremlin.driver.remote.GraphSONLangRemoteFeatureTest$RemoteGuiceFactory
+org.apache.tinkerpop.gremlin.driver.remote.GraphSONLangRemoteParameterizedFeatureTest$RemoteGuiceFactory
org.apache.tinkerpop.gremlin.driver.remote.GraphSONRemoteComputerFeatureTest$RemoteGuiceFactory
diff --git a/gremlin-server/src/test/resources/META-INF/services/org.apache.tinkerpop.gremlin.jsr223.GremlinScriptEngineFactory b/gremlin-server/src/test/resources/META-INF/services/org.apache.tinkerpop.gremlin.jsr223.GremlinScriptEngineFactory
new file mode 100644
index 0000000..4f10ee0
--- /dev/null
+++ b/gremlin-server/src/test/resources/META-INF/services/org.apache.tinkerpop.gremlin.jsr223.GremlinScriptEngineFactory
@@ -0,0 +1 @@
+org.apache.tinkerpop.gremlin.groovy.jsr223.GremlinGroovyScriptTestEngineFactory
\ No newline at end of file
diff --git a/gremlin-server/src/test/resources/conf/remote-objects.yaml b/gremlin-server/src/test/resources/conf/remote-objects.yaml
index f9043f0..a0f3318 100644
--- a/gremlin-server/src/test/resources/conf/remote-objects.yaml
+++ b/gremlin-server/src/test/resources/conf/remote-objects.yaml
@@ -29,4 +29,4 @@
hosts: [localhost]
port: 45940
-serializer: { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1 }
\ No newline at end of file
+serializer: { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV4 }
\ No newline at end of file
diff --git a/gremlin-server/src/test/resources/logback-test.xml b/gremlin-server/src/test/resources/logback-test.xml
index b115427..647f967 100644
--- a/gremlin-server/src/test/resources/logback-test.xml
+++ b/gremlin-server/src/test/resources/logback-test.xml
@@ -20,16 +20,12 @@
<pattern>[%p] %C - %m%n</pattern>
</encoder>
</appender>
- <logger name="org.apache.tinkerpop.gremlin.server.handler.MultiTaskSession" level="ERROR"/>
- <logger name="org.apache.tinkerpop.gremlin.server.op.AbstractEvalOpProcessor" level="ERROR"/>
- <logger name="org.apache.tinkerpop.gremlin.server.op.traversal.TraversalOpProcessor" level="ERROR"/>
<logger name="org.apache.tinkerpop.gremlin.server.AbstractGremlinServerIntegrationTest" level="INFO"/>
<logger name="audit.org.apache.tinkerpop.gremlin.server" level="INFO"/>
- <logger name="org.apache.tinkerpop.gremlin.server.handler.SingleTaskSession" level="ERROR"/>
<logger name="org.apache.tinkerpop.gremlin.server.AbstractChannelizer" level="ERROR"/>
<!-- this logger is noisy and we don't assert anything and the error is already tracked on the server so we can
trim the logs a bit with this. -->
- <logger name="org.apache.tinkerpop.gremlin.driver.Handler$GremlinResponseHandler" level="OFF"/>
+ <logger name="org.apache.tinkerpop.gremlin.driver.handler.GremlinResponseHandler" level="OFF"/>
<root level="WARN">
<appender-ref ref="stdout"/>
</root>
diff --git a/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-integration.yaml b/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-integration.yaml
index 1590489..13a1c6f 100644
--- a/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-integration.yaml
+++ b/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-integration.yaml
@@ -50,14 +50,13 @@
org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin: {classImports: [java.lang.Math], methodImports: [java.lang.Math#*]},
org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin: {files: [scripts/generate-all.groovy]}}}}
serializers:
+ - { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV4, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3] }}
- { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3] }}
- { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV2, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2] }}
- { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONUntypedMessageSerializerV1, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1] }}
+ - { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV4 }
- { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1 }
- { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1, config: { serializeResultToString: true }}
-processors:
- - { className: org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: { sessionTimeout: 28800000 }}
- - { className: org.apache.tinkerpop.gremlin.server.op.standard.StandardOpProcessor, config: {}}
metrics: {
slf4jReporter: {enabled: true, interval: 180000}}
gremlinPool: 8
@@ -67,7 +66,7 @@
maxInitialLineLength: 4096
maxHeaderSize: 8192
maxChunkSize: 8192
-maxContentLength: 10485760
+maxRequestContentLength: 10485760
maxAccumulationBufferComponents: 1024
resultIterationBatchSize: 64
writeBufferLowWaterMark: 32768
diff --git a/gremlin-shaded/pom.xml b/gremlin-shaded/pom.xml
index c414101..0438ad6 100644
--- a/gremlin-shaded/pom.xml
+++ b/gremlin-shaded/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>gremlin-shaded</artifactId>
<name>Apache TinkerPop :: Gremlin Shaded</name>
diff --git a/gremlin-test/pom.xml b/gremlin-test/pom.xml
index 8364c16..9ad2a6c 100644
--- a/gremlin-test/pom.xml
+++ b/gremlin-test/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>gremlin-test</artifactId>
<name>Apache TinkerPop :: Gremlin Test</name>
@@ -88,6 +88,17 @@
<groupId>org.apache.kerby</groupId>
<artifactId>kerb-simplekdc</artifactId>
<version>${kerby.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.wildfly.common</groupId>
+ <artifactId>wildfly-common</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.wildfly.common</groupId>
+ <artifactId>wildfly-common</artifactId>
+ <version>1.5.4.Final</version>
</dependency>
</dependencies>
<build>
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 80ac7a7..899e8da 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
@@ -45,6 +45,7 @@
import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
import org.apache.tinkerpop.gremlin.structure.Direction;
import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Property;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.Property;
import org.apache.tinkerpop.gremlin.structure.T;
@@ -65,6 +66,26 @@
import org.javatuples.Triplet;
import org.junit.AssumptionViolatedException;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.Arrays;
+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;
+import java.util.Map;
+import java.util.Objects;
+import java.util.function.Function;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import java.util.UUID;
+
import static org.apache.commons.text.StringEscapeUtils.escapeJava;
import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData;
import static org.apache.tinkerpop.gremlin.process.traversal.P.eq;
@@ -80,25 +101,6 @@
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.function.Function;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-import java.util.UUID;
-
@ScenarioScoped
public final class StepDefinition {
@@ -135,6 +137,12 @@
final String listItems = Stream.of(items).map(String::trim).map(x -> convertToString(x)).collect(Collectors.joining(","));
return String.format("[%s]", listItems);
}));
+ add(Pair.with(Pattern.compile("s\\[\\]"), s -> "{}"));
+ add(Pair.with(Pattern.compile("s\\[(.*)\\]"), s -> {
+ final String[] items = s.split(",");
+ final String setItems = Stream.of(items).map(String::trim).map(x -> convertToString(x)).collect(Collectors.joining(","));
+ return String.format("{%s}", setItems);
+ }));
add(Pair.with(Pattern.compile("s\\[\\]"), s -> String.format("{}")));
add(Pair.with(Pattern.compile("s\\[(.*)\\]"), s -> {
final String[] items = s.split(",");
@@ -193,13 +201,13 @@
}
}));
- 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());
@@ -393,6 +401,7 @@
// skip the header in the dataTable
final Object[] expected = dataTable.asList().stream().skip(1).map(this::convertToObject).toArray();
+
assertThat(actual, containsInAnyOrder(expected));
}
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/features/TestFiles.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/features/TestFiles.java
index 838a618..5b3b2a9 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/features/TestFiles.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/features/TestFiles.java
@@ -67,7 +67,6 @@
final List<String> scriptResources = Arrays.asList(
"tinkerpop-classic.txt",
- "script-input.groovy",
"script-output.groovy",
"grateful-dead.txt",
"script-input-grateful-dead.groovy",
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/jsr223/BindingsScriptEngineTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/jsr223/BindingsScriptEngineTest.java
deleted file mode 100644
index 3ea1e79..0000000
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/jsr223/BindingsScriptEngineTest.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.jsr223;
-
-import org.apache.tinkerpop.gremlin.TestHelper;
-import org.apache.tinkerpop.gremlin.structure.io.Storage;
-import org.junit.Test;
-
-import javax.script.Bindings;
-import javax.script.ScriptContext;
-import javax.script.ScriptException;
-import javax.script.SimpleBindings;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.apache.tinkerpop.gremlin.jsr223.GremlinScriptEngineSuite.ENGINE_TO_TEST;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assume.assumeThat;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class BindingsScriptEngineTest {
-
- @Test
- public void shouldIncludeGlobalBindings() throws ScriptException {
- final GremlinScriptEngineManager manager = new DefaultGremlinScriptEngineManager();
- final Bindings b = new SimpleBindings();
- b.put("x", 1);
- b.put("y", 2);
-
- manager.addPlugin(BindingsGremlinPlugin.build().
- bindings(b).create());
-
- final GremlinScriptEngine engine = manager.getEngineByName(ENGINE_TO_TEST);
- assertEquals(1, engine.eval("x"));
- assertEquals(2, engine.eval("y"));
- }
-
- @Test
- public void shouldRemoveGlobalBindings() throws Exception {
- final DefaultGremlinScriptEngineManager manager = new DefaultGremlinScriptEngineManager();
- manager.put("x", 100);
-
- final GremlinScriptEngine engine1 = manager.getEngineByName(ENGINE_TO_TEST);
- assertThat(engine1.getBindings(ScriptContext.GLOBAL_SCOPE).size(), is(1));
- assertEquals(101, (int) engine1.eval("x+1"));
-
- manager.getBindings().remove("x");
- final GremlinScriptEngine engine2 = manager.getEngineByName(ENGINE_TO_TEST);
- assertThat(engine2.getBindings(ScriptContext.GLOBAL_SCOPE).size(), is(0));
- }
-
- @Test
- public void shouldAddLazyGlobalBindingsViaPlugin() throws Exception {
- final Bindings bindings = new SimpleBindings();
- bindings.put("x", 100);
- final BindingsGremlinPlugin plugin = new BindingsGremlinPlugin(() -> bindings);
-
- final DefaultGremlinScriptEngineManager manager = new DefaultGremlinScriptEngineManager();
- manager.addPlugin(plugin);
- final GremlinScriptEngine engine = manager.getEngineByName(ENGINE_TO_TEST);
- assertThat(engine.getBindings(ScriptContext.GLOBAL_SCOPE).size(), is(1));
- assertEquals(101, (int) engine.eval("x+1"));
- }
-
- @Test
- public void shouldExtractGlobalBindingsAfterScriptExecution() throws Exception {
- assumeThat("Only works with gremlin-groovy", ENGINE_TO_TEST, is("gremlin-groovy"));
- final GremlinScriptEngineManager manager = new DefaultGremlinScriptEngineManager();
-
- final Bindings b1 = new SimpleBindings();
- b1.put("x", 1);
- b1.put("y", 2);
- manager.addPlugin(BindingsGremlinPlugin.build().bindings(b1).create());
-
- final Bindings b2 = new SimpleBindings();
- b2.put("x", 100);
- b2.put("y", 200);
- manager.addPlugin(BindingsGremlinPlugin.build().bindings(b2).create());
-
- final File scriptFile = TestHelper.generateTempFileFromResource(BindingsScriptEngineTest.class, "bindings-init.groovy", ".groovy");
- final List<String> files = new ArrayList<>();
- files.add(Storage.toPath(scriptFile));
- manager.addPlugin(ScriptFileGremlinPlugin.build().files(files).create());
-
- final GremlinScriptEngine engine = manager.getEngineByName(ENGINE_TO_TEST);
- assertEquals(100, engine.eval("x"));
- assertEquals(200, engine.eval("y"));
- assertEquals(300, engine.eval("z"));
- assertEquals(600, engine.eval("addItUp(z, addItUp(x,y))"));
-
- assertEquals(300, engine.getBindings(ScriptContext.GLOBAL_SCOPE).get("z"));
- assertThat(engine.getBindings(ScriptContext.ENGINE_SCOPE).containsKey("z"), is(false));
- }
-}
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/jsr223/GremlinEnabledScriptEngineTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/jsr223/GremlinEnabledScriptEngineTest.java
index 1ff71d4..d0ebc15 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/jsr223/GremlinEnabledScriptEngineTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/jsr223/GremlinEnabledScriptEngineTest.java
@@ -26,18 +26,14 @@
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
import org.apache.tinkerpop.gremlin.util.function.Lambda;
import org.junit.Test;
-import javax.script.Bindings;
-import javax.script.SimpleBindings;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import static org.apache.tinkerpop.gremlin.jsr223.GremlinScriptEngineSuite.ENGINE_TO_TEST;
-import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.Is.is;
import static org.junit.Assert.assertEquals;
import static org.junit.Assume.assumeThat;
@@ -52,92 +48,6 @@
private static final GremlinScriptEngineManager manager = new DefaultGremlinScriptEngineManager();
@Test
- public void shouldEvalBytecode() throws Exception {
- final GremlinScriptEngine scriptEngine = manager.getEngineByName(ENGINE_TO_TEST);
- final Graph graph = EmptyGraph.instance();
- final GraphTraversalSource g = graph.traversal();
-
- // purposefully use "x" to match the name of the traversal source binding for "x" below and
- // thus tests the alias added for "x"
- final GraphTraversal t = getTraversalWithLambda(g);
-
- final Bindings bindings = new SimpleBindings();
- bindings.put("x", g);
-
- final Traversal evald = scriptEngine.eval(t.asAdmin().getBytecode(), bindings, "x");
-
- assertTraversals(t, evald);
-
- assertThat(manager.getBindings().containsKey(GremlinScriptEngine.HIDDEN_G), is(false));
- }
-
- @Test(expected = IllegalArgumentException.class)
- public void shouldNotAllowBytecodeEvalWithAliasInBindings() throws Exception {
- final GremlinScriptEngine scriptEngine = manager.getEngineByName(ENGINE_TO_TEST);
- final Graph graph = EmptyGraph.instance();
- final GraphTraversalSource g = graph.traversal();
-
- // purposefully use "x" to match the name of the traversal source binding for "x" below and
- // thus tests the alias added for "x"
- final GraphTraversal t = getTraversalWithLambda(g);
-
- final Bindings bindings = new SimpleBindings();
- bindings.put("x", g);
- bindings.put(GremlinScriptEngine.HIDDEN_G, g);
-
- scriptEngine.eval(t.asAdmin().getBytecode(), bindings, "x");
- }
-
- @Test(expected = IllegalArgumentException.class)
- public void shouldNotAllowBytecodeEvalWithAliasAsTraversalSource() throws Exception {
- final GremlinScriptEngine scriptEngine = manager.getEngineByName(ENGINE_TO_TEST);
- final Graph graph = EmptyGraph.instance();
- final GraphTraversalSource g = graph.traversal();
-
- // purposefully use "x" to match the name of the traversal source binding for "x" below and
- // thus tests the alias added for "x"
- final GraphTraversal t = getTraversalWithLambda(g);
-
- final Bindings bindings = new SimpleBindings();
- bindings.put("x", g);
-
- scriptEngine.eval(t.asAdmin().getBytecode(), bindings, GremlinScriptEngine.HIDDEN_G);
- }
-
- @Test(expected = IllegalArgumentException.class)
- public void shouldNotAllowBytecodeEvalWithMissingBinding() throws Exception {
- final GremlinScriptEngine scriptEngine = manager.getEngineByName(ENGINE_TO_TEST);
- final Graph graph = EmptyGraph.instance();
- final GraphTraversalSource g = graph.traversal();
-
- // purposefully use "x" to match the name of the traversal source binding for "x" below and
- // thus tests the alias added for "x"
- final GraphTraversal t = getTraversalWithLambda(g);
-
- final Bindings bindings = new SimpleBindings();
- bindings.put("z", g);
-
- scriptEngine.eval(t.asAdmin().getBytecode(), bindings, "x");
- }
-
- @Test(expected = IllegalArgumentException.class)
- public void shouldNotAllowBytecodeEvalWithInvalidBinding() throws Exception {
- final GremlinScriptEngine scriptEngine = manager.getEngineByName(ENGINE_TO_TEST);
- final Graph graph = EmptyGraph.instance();
- final GraphTraversalSource g = graph.traversal();
-
- // purposefully use "x" to match the name of the traversal source binding for "x" below and
- // thus tests the alias added for "x"
- final GraphTraversal t = getTraversalWithLambda(g);
-
- final Bindings bindings = new SimpleBindings();
- bindings.put("z", g);
- bindings.put("x", "invalid-binding-for-x-given-x-should-be-traversal-source");
-
- scriptEngine.eval(t.asAdmin().getBytecode(), bindings, "x");
- }
-
- @Test
public void shouldGetEngineByName() throws Exception {
final GremlinScriptEngine scriptEngine = manager.getEngineByName(ENGINE_TO_TEST);
assertEquals(ENGINE_TO_TEST, scriptEngine.getFactory().getEngineName());
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/jsr223/GremlinScriptEngineSuite.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/jsr223/GremlinScriptEngineSuite.java
index 70c585c..8ccde91 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/jsr223/GremlinScriptEngineSuite.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/jsr223/GremlinScriptEngineSuite.java
@@ -29,7 +29,6 @@
static String ENGINE_TO_TEST;
private static final Class<?>[] allTests = new Class<?>[]{
- BindingsScriptEngineTest.class,
CachedGremlinScriptEngineManagerTest.class,
GremlinEnabledScriptEngineTest.class,
ScriptEngineLambdaTest.class };
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/jsr223/MockGremlinScriptEngine.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/jsr223/MockGremlinScriptEngine.java
index 4380df7..e471683 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/jsr223/MockGremlinScriptEngine.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/jsr223/MockGremlinScriptEngine.java
@@ -18,7 +18,7 @@
*/
package org.apache.tinkerpop.gremlin.jsr223;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
+import org.apache.tinkerpop.gremlin.process.traversal.GremlinLang;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import javax.script.AbstractScriptEngine;
@@ -51,11 +51,6 @@
}
@Override
- public Traversal.Admin eval(Bytecode bytecode, Bindings bindings, String traversalSource) throws ScriptException {
- return null;
- }
-
- @Override
public Bindings createBindings() {
return new SimpleBindings();
}
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessComputerSuite.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessComputerSuite.java
index 621d8a4..94bd9ed 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessComputerSuite.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessComputerSuite.java
@@ -72,8 +72,8 @@
import org.apache.tinkerpop.gremlin.process.traversal.step.map.ProjectTest;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.PropertiesTest;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.ReadTest;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.ShortestPathTest;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.SelectTest;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.ShortestPathTest;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.SumTest;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.UnfoldTest;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.ValueMapTest;
@@ -92,7 +92,6 @@
import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.TreeTest;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SeedStrategyProcessTest;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SubgraphStrategyProcessTest;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.TranslationStrategyProcessTest;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.EarlyLimitStrategyProcessTest;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.IncidentToAdjacentStrategyProcessTest;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ReadOnlyStrategyProcessTest;
@@ -208,9 +207,6 @@
ShortestPathVertexProgramTest.class,
CloneVertexProgramTest.class,
- // creations
- TranslationStrategyProcessTest.class,
-
// decorations
ReadOnlyStrategyProcessTest.class,
SeedStrategyProcessTest.class,
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessEmbeddedComputerSuite.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessEmbeddedComputerSuite.java
index f66752a..ffcf0a5 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessEmbeddedComputerSuite.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessEmbeddedComputerSuite.java
@@ -25,17 +25,12 @@
import org.apache.tinkerpop.gremlin.process.computer.search.path.ShortestPathVertexProgramTest;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalInterruptionComputerTest;
-import org.apache.tinkerpop.gremlin.process.traversal.step.ComplexTest;
import org.apache.tinkerpop.gremlin.process.traversal.step.LambdaStepTest;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.MatchTest;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.ProfileTest;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.ProgramTest;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.WriteTest;
import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.ExplainTest;
-import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.SideEffectTest;
-import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.SubgraphTest;
-import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.TreeTest;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.TranslationStrategyProcessTest;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.EarlyLimitStrategyProcessTest;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.IncidentToAdjacentStrategyProcessTest;
import org.apache.tinkerpop.gremlin.structure.Graph;
@@ -72,9 +67,6 @@
ShortestPathVertexProgramTest.class,
CloneVertexProgramTest.class,
- // creations
- TranslationStrategyProcessTest.class,
-
// optimizations
IncidentToAdjacentStrategyProcessTest.class,
EarlyLimitStrategyProcessTest.class
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessEmbeddedStandardSuite.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessEmbeddedStandardSuite.java
index e207ea5..52acdd6 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessEmbeddedStandardSuite.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessEmbeddedStandardSuite.java
@@ -28,11 +28,8 @@
import org.apache.tinkerpop.gremlin.process.traversal.step.map.ProfileTest;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.WriteTest;
import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.ExplainTest;
-import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.SubgraphTest;
-import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.TreeTest;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.ElementIdStrategyProcessTest;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.EventStrategyProcessTest;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.TranslationStrategyProcessTest;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.EarlyLimitStrategyProcessTest;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.IncidentToAdjacentStrategyProcessTest;
import org.apache.tinkerpop.gremlin.structure.Graph;
@@ -64,9 +61,6 @@
CoreTraversalTest.class,
TraversalInterruptionTest.class,
- // creations
- TranslationStrategyProcessTest.class,
-
// decorations
ElementIdStrategyProcessTest.class,
EventStrategyProcessTest.class,
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessStandardSuite.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessStandardSuite.java
index 6207aa8..d7fe42e 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessStandardSuite.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessStandardSuite.java
@@ -93,7 +93,6 @@
import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategyProcessTest;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SeedStrategyProcessTest;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SubgraphStrategyProcessTest;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.TranslationStrategyProcessTest;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.EarlyLimitStrategyProcessTest;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.IncidentToAdjacentStrategyProcessTest;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ReadOnlyStrategyProcessTest;
@@ -199,9 +198,6 @@
CoreTraversalTest.class,
TraversalInterruptionTest.class,
- // creations
- TranslationStrategyProcessTest.class,
-
// decorations
ElementIdStrategyProcessTest.class,
EventStrategyProcessTest.class,
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/CoreTraversalTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/CoreTraversalTest.java
index bbf59db..0bbcbbb 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/CoreTraversalTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/CoreTraversalTest.java
@@ -46,11 +46,11 @@
import static org.apache.tinkerpop.gremlin.process.traversal.AnonymousTraversalSource.traversal;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.inject;
import static org.apache.tinkerpop.gremlin.structure.Graph.Features.GraphFeatures.FEATURE_TRANSACTIONS;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
import static org.hamcrest.core.StringStartsWith.startsWith;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.Is.is;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -106,7 +106,6 @@
assertEquals(2, traversal.asAdmin().getSideEffects().<BulkSet>get("x").size());
assertTrue(traversal.asAdmin().getSideEffects().<BulkSet>get("x").contains("ripple"));
assertTrue(traversal.asAdmin().getSideEffects().<BulkSet>get("x").contains("lop"));
- assertEquals(Traversal.Symbols.discard, traversal.asAdmin().getBytecode().getStepInstructions().get(traversal.asAdmin().getBytecode().getStepInstructions().size()-1).getOperator());
}
@Test
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/RepeatTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/RepeatTest.java
index 9783a5e..5ef705a 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/RepeatTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/RepeatTest.java
@@ -29,6 +29,7 @@
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.RepeatUnrollStrategy;
import org.apache.tinkerpop.gremlin.structure.T;
import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -343,6 +344,7 @@
}
@Test
+ @Ignore("RepeatUnrollStrategy ")
@LoadGraphWith(MODERN)
public void g_V_repeatXout_repeatXout_order_byXname_descXX_timesX1XX_timesX1X_limitX1X_path_byXnameX() {
// This traversal gets optimised by the RepeatUnrollStrategy
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WhereTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WhereTest.java
index 0dc5d10..5564d33 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WhereTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WhereTest.java
@@ -46,6 +46,7 @@
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.and;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.as;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.bothE;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.id;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.in;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.not;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.or;
@@ -91,7 +92,7 @@
public abstract Traversal<Vertex, Vertex> get_g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX(final Object v1Id);
- public abstract Traversal<Vertex, Vertex> get_g_withSideEffectXa_graph_verticesX2XX_VX1X_out_whereXneqXaXX(final Object v1Id, final Object v2Id);
+ public abstract Traversal<Vertex, Vertex> get_g_withSideEffectXa_graph_verticesX2XX_VX1X_out_whereXid_whereXneqXaXXX(final Object v1Id, final Object v2Id);
public abstract Traversal<Vertex, Path> get_g_VX1X_repeatXbothEXcreatedX_whereXwithoutXeXX_aggregateXeX_otherVX_emit_path(final Object v1Id);
@@ -276,8 +277,8 @@
@Test
@LoadGraphWith(MODERN)
- public void g_withSideEffectXa_g_VX2XX_VX1X_out_whereXneqXaXX() {
- final Traversal<Vertex, Vertex> traversal = get_g_withSideEffectXa_graph_verticesX2XX_VX1X_out_whereXneqXaXX(convertToVertexId("marko"), convertToVertex(graph,"vadas"));
+ public void g_withSideEffectXa_graph_verticesX2XX_VX1X_out_whereXid_whereXneqXaXXX() {
+ final Traversal<Vertex, Vertex> traversal = get_g_withSideEffectXa_graph_verticesX2XX_VX1X_out_whereXid_whereXneqXaXXX(convertToVertexId("marko"), convertToVertexId("vadas"));
printTraversalForm(traversal);
int counter = 0;
final Set<Vertex> vertices = new HashSet<>();
@@ -483,8 +484,8 @@
}
@Override
- public Traversal<Vertex, Vertex> get_g_withSideEffectXa_graph_verticesX2XX_VX1X_out_whereXneqXaXX(final Object v1Id, final Object v2) {
- return g.withSideEffect("a", v2).V(v1Id).out().where(neq("a"));
+ public Traversal<Vertex, Vertex> get_g_withSideEffectXa_graph_verticesX2XX_VX1X_out_whereXid_whereXneqXaXXX(final Object v1Id, final Object v2Id) {
+ return g.withSideEffect("a", v2Id).V(v1Id).out().where(id().where(neq("a")));
}
@Override
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MatchTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MatchTest.java
index a5a7595..b0b6262 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MatchTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MatchTest.java
@@ -43,10 +43,10 @@
import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.GRATEFUL;
import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN;
import static org.apache.tinkerpop.gremlin.process.traversal.Order.desc;
-import static org.apache.tinkerpop.gremlin.process.traversal.P.eq;
import static org.apache.tinkerpop.gremlin.process.traversal.P.neq;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.and;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.as;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.fail;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.inE;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.match;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.not;
@@ -58,7 +58,7 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.mockito.ArgumentMatchers.eq;
/**
* @author Joshua Shinavier (http://fortytwo.net)
@@ -801,7 +801,7 @@
@Override
public Traversal<Vertex, Map<String, Object>> get_g_V_matchXa_whereXa_neqXcXX__a_created_b__orXa_knows_vadas__a_0knows_and_a_hasXlabel_personXX__b_0created_c__b_0created_count_isXgtX1XXX_selectXa_b_cX_byXidX() {
return g.V().match(
- where("a", P.neq("c")),
+ where("a", neq("c")),
as("a").out("created").as("b"),
or(
as("a").out("knows").has("name", "vadas"),
@@ -824,7 +824,7 @@
as("a").in("writtenBy").as("b"),
as("b").out("followedBy").as("c"),
as("c").out("writtenBy").as("d"),
- where("d", P.neq("a")));
+ where("d", neq("a")));
}
@Override
@@ -865,7 +865,7 @@
return g.V().match(
where(and(
as("a").out("created").as("b"),
- as("b").in("created").count().is(eq(3)))),
+ as("b").in("created").count().is(P.eq(3)))),
as("a").both().as("b"),
where(as("b").in()));
}
@@ -907,7 +907,7 @@
@Override
public Traversal<Vertex, String> get_g_V_notXmatchXa_age_b__a_name_cX_whereXb_eqXcXX_selectXaXX_name() {
- return g.V().not(match(__.as("a").values("age").as("b"), __.as("a").values("name").as("c")).where("b", eq("c")).select("a")).values("name");
+ return g.V().not(match(__.as("a").values("age").as("b"), __.as("a").values("name").as("c")).where("b", P.eq("c")).select("a")).values("name");
}
@Override
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeEdgeTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeEdgeTest.java
index 226c0f3..34fbc08 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeEdgeTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeEdgeTest.java
@@ -122,7 +122,7 @@
traversal.next();
fail("Should have failed as vertices are not created");
} catch (Exception ex) {
- assertThat(ex.getMessage(), endsWith("Vertex id could not be resolved from mergeE: 100"));
+ assertThat(ex.getMessage(), endsWith("Vertex does not exist for mergeE: 100"));
}
assertEquals(0, IteratorUtils.count(g.E()));
}
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertiesTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertiesTest.java
index 2b665dc..975a8e4 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertiesTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertiesTest.java
@@ -52,8 +52,6 @@
public abstract Traversal<Vertex, VertexProperty<String>> get_g_V_hasXageX_propertiesXnameX();
- public abstract Traversal<VertexProperty<String>, String> get_g_injectXg_VX1X_propertiesXnameX_nextX_value(final Object v1Id);
-
@Test
@LoadGraphWith(MODERN)
public void g_V_hasXageX_propertiesXname_ageX_value() {
@@ -121,14 +119,6 @@
assertEquals(4, ids.size());
}
- @Test
- @LoadGraphWith(MODERN)
- public void g_injectXg_VX1X_propertiesXnameX_nextX_value() {
- final Traversal<VertexProperty<String>, String> traversal = get_g_injectXg_VX1X_propertiesXnameX_nextX_value(convertToVertexId(graph, "marko"));
- printTraversalForm(traversal);
- checkResults(Collections.singletonList("marko"), traversal);
- }
-
public static class Traversals extends PropertiesTest {
@Override
public Traversal<Vertex, Object> get_g_V_hasXageX_propertiesXname_ageX_value() {
@@ -149,11 +139,6 @@
public Traversal<Vertex, VertexProperty<String>> get_g_V_hasXageX_propertiesXnameX() {
return (Traversal<Vertex, VertexProperty<String>>) g.V().has("age").<String>properties("name");
}
-
- @Override
- public Traversal<VertexProperty<String>, String> get_g_injectXg_VX1X_propertiesXnameX_nextX_value(final Object v1Id) {
- return g.<VertexProperty<String>>inject((VertexProperty) g.V(v1Id).properties("name").next()).value();
- }
}
}
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/VertexTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/VertexTest.java
index b5f3145..c40ddc5 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/VertexTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/VertexTest.java
@@ -30,6 +30,7 @@
import org.apache.tinkerpop.gremlin.structure.Edge;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -276,6 +277,7 @@
}
@Test
+ @Ignore("g.E(Arrays.asList(e7, e11)) is not valid for gremlin-lang")
@LoadGraphWith(MODERN)
public void g_EXlistXe7_e11XX() {
final Edge e7 = convertToEdge(graph, "marko", "knows", "vadas");
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/InjectTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/InjectTest.java
index a5151be..854d7cf 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/InjectTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/InjectTest.java
@@ -43,10 +43,6 @@
@RunWith(GremlinProcessRunner.class)
public abstract class InjectTest extends AbstractGremlinProcessTest {
- public abstract Traversal<Vertex, String> get_g_VX1X_out_injectXv2X_name(final Object v1Id, final Object v2Id);
-
- public abstract Traversal<Vertex, String> get_g_VX1X_injectXg_VX4XX_out_name(final Object v1Id, final Object v4Id);
-
public abstract Traversal<Integer, Integer> get_g_injectXnull_1_3_nullX();
public abstract Traversal<Integer, Integer> get_g_injectXnull_nullX();
@@ -68,22 +64,6 @@
public abstract Traversal<Integer, Integer> get_g_injectXnull_1_3_nullX_asXaX_selectXaX();
@Test
- @LoadGraphWith(MODERN)
- public void g_VX1X_out_injectXv2X_name() {
- final Traversal<Vertex, String> traversal = get_g_VX1X_out_injectXv2X_name(convertToVertexId("marko"), convertToVertexId("vadas"));
- printTraversalForm(traversal);
- final Map<String, Long> counter = new HashMap<>();
- while (traversal.hasNext()) {
- MapHelper.incr(counter, traversal.next(), 1l);
- }
- assertEquals(3, counter.size());
- assertEquals(1l, counter.get("josh").longValue());
- assertEquals(1l, counter.get("lop").longValue());
- assertEquals(2l, counter.get("vadas").longValue());
- assertFalse(traversal.hasNext());
- }
-
- @Test
public void g_injectXnull_1_3_nullX() {
final Traversal<Integer, Integer> traversal = get_g_injectXnull_1_3_nullX();
printTraversalForm(traversal);
@@ -153,14 +133,6 @@
}
@Test
- @LoadGraphWith(MODERN)
- public void g_VX1X_injectXg_VX4XX_out_name() {
- final Traversal<Vertex, String> traversal = get_g_VX1X_injectXg_VX4XX_out_name(convertToVertexId("marko"), convertToVertexId("josh"));
- printTraversalForm(traversal);
- checkResults(Arrays.asList("ripple", "lop", "lop", "vadas", "josh"), traversal);
- }
-
- @Test
public void g_injectXnull_1_3_nullX_asXaX_selectXaX() {
final Traversal<Integer, Integer> traversal = get_g_injectXnull_1_3_nullX_asXaX_selectXaX();
printTraversalForm(traversal);
@@ -170,16 +142,6 @@
public static class Traversals extends InjectTest {
@Override
- public Traversal<Vertex, String> get_g_VX1X_out_injectXv2X_name(final Object v1Id, final Object v2Id) {
- return g.V(v1Id).out().inject(g.V(v2Id).next()).values("name");
- }
-
- @Override
- public Traversal<Vertex, String> get_g_VX1X_injectXg_VX4XX_out_name(final Object v1Id, final Object v4Id) {
- return g.V(v1Id).inject(g.V(v4Id).next()).out().values("name");
- }
-
- @Override
public Traversal<Integer, Integer> get_g_injectXnull_1_3_nullX() {
return g.inject(null, 1, 3, null);
}
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/TranslationStrategy.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/TranslationStrategy.java
deleted file mode 100644
index 5f3458e..0000000
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/TranslationStrategy.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration;
-
-import org.apache.tinkerpop.gremlin.jsr223.GremlinScriptEngine;
-import org.apache.tinkerpop.gremlin.jsr223.SingleGremlinScriptEngineManager;
-import org.apache.tinkerpop.gremlin.process.computer.traversal.step.map.ProgramVertexProgramStep;
-import org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.decoration.VertexProgramStrategy;
-import org.apache.tinkerpop.gremlin.process.remote.traversal.strategy.decoration.RemoteStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
-import org.apache.tinkerpop.gremlin.process.traversal.Step;
-import org.apache.tinkerpop.gremlin.process.traversal.Translator;
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
-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.strategy.verification.VerificationException;
-import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
-
-import javax.script.Bindings;
-import javax.script.ScriptContext;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- */
-public final class TranslationStrategy extends AbstractTraversalStrategy<TraversalStrategy.DecorationStrategy> implements TraversalStrategy.DecorationStrategy {
-
- private final TraversalSource traversalSource;
- private final Translator translator;
- private final boolean assertBytecode;
-
- private static final Set<Class<? extends DecorationStrategy>> POSTS = new HashSet<>(Arrays.asList(
- ConnectiveStrategy.class,
- ElementIdStrategy.class,
- EventStrategy.class,
- HaltedTraverserStrategy.class,
- PartitionStrategy.class,
- RequirementsStrategy.class,
- SackStrategy.class,
- SeedStrategy.class,
- SideEffectStrategy.class,
- SubgraphStrategy.class,
- RemoteStrategy.class,
- VertexProgramStrategy.class));
-
- public TranslationStrategy(final TraversalSource traversalSource, final Translator translator, final boolean assertBytecode) {
- this.traversalSource = traversalSource;
- this.translator = translator;
- this.assertBytecode = assertBytecode;
- }
-
- @Override
- public void apply(final Traversal.Admin<?, ?> traversal) {
- if (!(traversal.isRoot()) || traversal.getBytecode().isEmpty())
- return;
-
- final Traversal.Admin<?, ?> translatedTraversal;
- final Bytecode bytecode = removeTranslationStrategy(insertBindingsForTesting(traversal.getBytecode()));
-
- ////////////////
- if (this.translator instanceof Translator.StepTranslator) {
- // reflection based translation
- translatedTraversal = (Traversal.Admin<?, ?>) this.translator.translate(bytecode);
- } else if (this.translator instanceof Translator.ScriptTranslator) {
- try {
- // script based translation
- final GremlinScriptEngine scriptEngine = SingleGremlinScriptEngineManager.get(this.translator.getTargetLanguage());
- final Bindings bindings = scriptEngine.createBindings();
- bindings.putAll(scriptEngine.getContext().getBindings(ScriptContext.ENGINE_SCOPE));
- bindings.put(this.translator.getTraversalSource().toString(), this.traversalSource);
- translatedTraversal = (Traversal.Admin<?, ?>) scriptEngine.eval(bytecode, bindings, this.translator.getTraversalSource().toString());
- } catch (final Exception e) {
- throw new IllegalArgumentException(e.getMessage(), e);
- }
- } else {
- throw new IllegalArgumentException("TranslationStrategy does not know how to process the provided translator type: " + this.translator.getClass().getSimpleName());
- }
- ////////////////
- assert !translatedTraversal.isLocked();
- assert !traversal.isLocked();
- traversal.setSideEffects(translatedTraversal.getSideEffects());
- TraversalHelper.removeAllSteps(traversal);
- TraversalHelper.removeToTraversal((Step) translatedTraversal.getStartStep(), EmptyStep.instance(), traversal);
- ////////////////
-
- // this tests to ensure that the bytecode being translated is the same as the bytecode of the generated
- // traversal. we might not do this sometimes in testing if lambdas are present but still want to use
- // TranslationStrategy
- if (assertBytecode)
- assertEquals(removeTranslationStrategy(traversal.getBytecode()), translatedTraversal.getBytecode());
- }
-
-
- @Override
- public Set<Class<? extends DecorationStrategy>> applyPost() {
- return POSTS;
- }
-
- private static final Bytecode removeTranslationStrategy(final Bytecode bytecode) {
- if (bytecode.getSourceInstructions().size() > 0)
- bytecode.getSourceInstructions().remove(0);
- return bytecode;
- }
-
- private static final Bytecode insertBindingsForTesting(final Bytecode bytecode) {
- final Bytecode newBytecode = new Bytecode();
- for (final Bytecode.Instruction instruction : bytecode.getSourceInstructions()) {
- newBytecode.addSource(instruction.getOperator(), instruction.getArguments());
- }
- for (final Bytecode.Instruction instruction : bytecode.getStepInstructions()) {
- final Object[] args = instruction.getArguments();
- final Object[] newArgs = new Object[args.length];
-
- for (int i = 0; i < args.length; i++) {
- if (args[i] == null)
- newArgs[i] = null;
- else if (args[i].equals("knows"))
- newArgs[i] = new Bytecode.Binding<>("a", "knows");
- else if (args[i].equals("created"))
- newArgs[i] = new Bytecode.Binding<>("b", "created");
- else if (args[i].equals(10))
- newArgs[i] = new Bytecode.Binding<>("c", 10);
- else
- newArgs[i] = args[i];
- }
- newBytecode.addStep(instruction.getOperator(), newArgs);
- }
- return newBytecode;
- }
-
-}
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/TranslationStrategyProcessTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/TranslationStrategyProcessTest.java
deleted file mode 100644
index 0b81cce..0000000
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/TranslationStrategyProcessTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration;
-
-import org.apache.tinkerpop.gremlin.LoadGraphWith;
-import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
-import org.apache.tinkerpop.gremlin.process.GremlinProcessRunner;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN;
-import static org.junit.Assert.assertEquals;
-
-/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- */
-@RunWith(GremlinProcessRunner.class)
-public class TranslationStrategyProcessTest extends AbstractGremlinProcessTest {
- private static final Logger logger = LoggerFactory.getLogger(TranslationStrategyProcessTest.class);
-
- @Test
- @LoadGraphWith(MODERN)
- public void shouldNotHaveAnonymousTraversalMixups() throws Exception {
- if (!g.getStrategies().getStrategy(TranslationStrategy.class).isPresent()) {
- logger.debug("No " + TranslationStrategy.class.getSimpleName() + " is registered and thus, skipping test.");
- return;
- }
-
- final GraphTraversalSource a = g;
- final GraphTraversalSource b = g.withoutStrategies(TranslationStrategy.class);
-
- assert a.getStrategies().getStrategy(TranslationStrategy.class).isPresent();
- assert !b.getStrategies().getStrategy(TranslationStrategy.class).isPresent();
-
- assertEquals(6l, a.V().out().count().next().longValue());
- assertEquals(6l, b.V().out().count().next().longValue());
-
- assert a.getStrategies().getStrategy(TranslationStrategy.class).isPresent();
- assert !b.getStrategies().getStrategy(TranslationStrategy.class).isPresent();
-
- assertEquals(2l, a.V().repeat(__.out()).times(2).count().next().longValue());
- assertEquals(2l, b.V().repeat(__.out()).times(2).count().next().longValue());
-
- assert a.getStrategies().getStrategy(TranslationStrategy.class).isPresent();
- assert !b.getStrategies().getStrategy(TranslationStrategy.class).isPresent();
-
- }
-
-}
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/EarlyLimitStrategyProcessTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/EarlyLimitStrategyProcessTest.java
index 2bf5c42..75792ba 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/EarlyLimitStrategyProcessTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/EarlyLimitStrategyProcessTest.java
@@ -28,6 +28,7 @@
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics;
import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -49,6 +50,7 @@
@Test
@LoadGraphWith(GRATEFUL)
@IgnoreEngine(TraversalEngine.Type.COMPUTER)
+ @Ignore // todo: re-enable after traversal metrics serialization is implemented
public void shouldHandleRangeSteps() throws Exception {
final GraphTraversal<Vertex, Map<String, List<String>>> t =
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphbinary/GraphBinaryResourceAccess.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphbinary/GraphBinaryResourceAccess.java
new file mode 100644
index 0000000..5520029
--- /dev/null
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphbinary/GraphBinaryResourceAccess.java
@@ -0,0 +1,22 @@
+/*
+ * 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.structure.io.graphbinary;
+
+public class GraphBinaryResourceAccess {
+}
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/property-v1.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/edge-property-v4.gbin
similarity index 100%
rename from gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/property-v1.gbin
rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/edge-property-v4.gbin
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/empty-binary-v4.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/empty-binary-v4.gbin
new file mode 100644
index 0000000..bb44d2b
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/empty-binary-v4.gbin
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/empty-bulklist-v4.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/empty-bulklist-v4.gbin
new file mode 100644
index 0000000..0f238fc
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/empty-bulklist-v4.gbin
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/empty-list-v4.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/empty-list-v4.gbin
new file mode 100644
index 0000000..541fdf3
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/empty-list-v4.gbin
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/empty-map-v4.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/empty-map-v4.gbin
new file mode 100644
index 0000000..671d59f
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/empty-map-v4.gbin
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/empty-path-v4.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/empty-path-v4.gbin
new file mode 100644
index 0000000..4f9b5b6
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/empty-path-v4.gbin
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/empty-set-v4.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/empty-set-v4.gbin
new file mode 100644
index 0000000..3426f04
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/empty-set-v4.gbin
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/false-boolean-v4.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/false-boolean-v4.gbin
new file mode 100644
index 0000000..d33346d
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/false-boolean-v4.gbin
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/forever-duration-v4.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/forever-duration-v4.gbin
new file mode 100644
index 0000000..3b1ba92
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/forever-duration-v4.gbin
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/id-t-v4.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/id-t-v4.gbin
new file mode 100644
index 0000000..8a9235d
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/id-t-v4.gbin
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/max-byte-v4.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/max-byte-v4.gbin
new file mode 100644
index 0000000..c817f13
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/max-byte-v4.gbin
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/max-double-v4.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/max-double-v4.gbin
new file mode 100644
index 0000000..b768fbb
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/max-double-v4.gbin
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/max-float-v4.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/max-float-v4.gbin
new file mode 100644
index 0000000..82c3094
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/max-float-v4.gbin
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/max-int-v4.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/max-int-v4.gbin
new file mode 100644
index 0000000..9577d1f
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/max-int-v4.gbin
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/max-long-v4.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/max-long-v4.gbin
new file mode 100644
index 0000000..f30240c
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/max-long-v4.gbin
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/max-offsetdatetime-v4.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/max-offsetdatetime-v4.gbin
new file mode 100644
index 0000000..e59db1e
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/max-offsetdatetime-v4.gbin
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/max-short-v4.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/max-short-v4.gbin
new file mode 100644
index 0000000..a7d7c33
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/max-short-v4.gbin
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/meta-vertexproperty-v4.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/meta-vertexproperty-v4.gbin
new file mode 100644
index 0000000..dd181d4
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/meta-vertexproperty-v4.gbin
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/min-byte-v4.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/min-byte-v4.gbin
new file mode 100644
index 0000000..e51d9ad
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/min-byte-v4.gbin
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/min-double-v4.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/min-double-v4.gbin
new file mode 100644
index 0000000..a68796f
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/min-double-v4.gbin
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/min-float-v4.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/min-float-v4.gbin
new file mode 100644
index 0000000..6637c50
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/min-float-v4.gbin
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/min-int-v4.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/min-int-v4.gbin
new file mode 100644
index 0000000..089e279
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/min-int-v4.gbin
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/min-long-v4.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/min-long-v4.gbin
new file mode 100644
index 0000000..c0c1ffa
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/min-long-v4.gbin
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/min-offsetdatetime-v4.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/min-offsetdatetime-v4.gbin
new file mode 100644
index 0000000..e1ca5d6
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/min-offsetdatetime-v4.gbin
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/min-short-v4.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/min-short-v4.gbin
new file mode 100644
index 0000000..f4ba58f
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/min-short-v4.gbin
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/mixed-string-v4.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/mixed-string-v4.gbin
new file mode 100644
index 0000000..d5e21d3
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/mixed-string-v4.gbin
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/multi-byte-char-v4.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/multi-byte-char-v4.gbin
new file mode 100644
index 0000000..2f2570a
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/multi-byte-char-v4.gbin
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/nan-double-v4.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/nan-double-v4.gbin
new file mode 100644
index 0000000..8a03144
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/nan-double-v4.gbin
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/nan-float-v4.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/nan-float-v4.gbin
new file mode 100644
index 0000000..7d2d013
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/nan-float-v4.gbin
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/neg-bigdecimal-v4.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/neg-bigdecimal-v4.gbin
new file mode 100644
index 0000000..3fda500
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/neg-bigdecimal-v4.gbin
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/neg-biginteger-v4.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/neg-biginteger-v4.gbin
new file mode 100644
index 0000000..464792b
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/neg-biginteger-v4.gbin
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/neg-inf-double-v4.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/neg-inf-double-v4.gbin
new file mode 100644
index 0000000..b60a57f
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/neg-inf-double-v4.gbin
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/neg-inf-float-v4.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/neg-inf-float-v4.gbin
new file mode 100644
index 0000000..a84b743
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/neg-inf-float-v4.gbin
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/neg-max-double-v4.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/neg-max-double-v4.gbin
new file mode 100644
index 0000000..db658bf
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/neg-max-double-v4.gbin
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/neg-max-float-v4.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/neg-max-float-v4.gbin
new file mode 100644
index 0000000..e6bf5c3
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/neg-max-float-v4.gbin
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/neg-min-double-v4.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/neg-min-double-v4.gbin
new file mode 100644
index 0000000..7d6b5cf
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/neg-min-double-v4.gbin
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/neg-min-float-v4.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/neg-min-float-v4.gbin
new file mode 100644
index 0000000..583801e
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/neg-min-float-v4.gbin
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/neg-zero-double-v4.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/neg-zero-double-v4.gbin
new file mode 100644
index 0000000..f76a022
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/neg-zero-double-v4.gbin
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/neg-zero-float-v4.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/neg-zero-float-v4.gbin
new file mode 100644
index 0000000..cfd00ec
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/neg-zero-float-v4.gbin
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/nil-uuid-v4.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/nil-uuid-v4.gbin
new file mode 100644
index 0000000..828e057
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/nil-uuid-v4.gbin
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/no-prop-edge-v4.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/no-prop-edge-v4.gbin
new file mode 100644
index 0000000..17ebdda
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/no-prop-edge-v4.gbin
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/no-prop-vertex-v4.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/no-prop-vertex-v4.gbin
new file mode 100644
index 0000000..4621871
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/no-prop-vertex-v4.gbin
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/null-property-v4.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/null-property-v4.gbin
new file mode 100644
index 0000000..12b81db
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/null-property-v4.gbin
Binary files differ
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/direction-v1.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/out-direction-v4.gbin
similarity index 100%
rename from gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/direction-v1.gbin
rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/out-direction-v4.gbin
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/pos-bigdecimal-v4.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/pos-bigdecimal-v4.gbin
new file mode 100644
index 0000000..a855c66
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/pos-bigdecimal-v4.gbin
Binary files differ
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/biginteger-v1.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/pos-biginteger-v4.gbin
similarity index 100%
rename from gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/biginteger-v1.gbin
rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/pos-biginteger-v4.gbin
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/pos-inf-double-v4.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/pos-inf-double-v4.gbin
new file mode 100644
index 0000000..6ccb171
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/pos-inf-double-v4.gbin
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/pos-inf-float-v4.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/pos-inf-float-v4.gbin
new file mode 100644
index 0000000..e17e136
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/pos-inf-float-v4.gbin
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/prop-path-v4.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/prop-path-v4.gbin
new file mode 100644
index 0000000..4213e12
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/prop-path-v4.gbin
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/set-cardinality-vertexproperty-v4.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/set-cardinality-vertexproperty-v4.gbin
new file mode 100644
index 0000000..a5ee87e
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/set-cardinality-vertexproperty-v4.gbin
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/single-byte-char-v4.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/single-byte-char-v4.gbin
new file mode 100644
index 0000000..3c39167
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/single-byte-char-v4.gbin
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/single-byte-string-v4.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/single-byte-string-v4.gbin
new file mode 100644
index 0000000..86e87d5
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/single-byte-string-v4.gbin
Binary files differ
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/uuid-v1.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/specified-uuid-v4.gbin
similarity index 100%
rename from gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/uuid-v1.gbin
rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/specified-uuid-v4.gbin
Binary files differ
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/bytebuffer-v1.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/str-binary-v4.gbin
similarity index 100%
rename from gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/bytebuffer-v1.gbin
rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/str-binary-v4.gbin
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/tinker-graph-v4.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/tinker-graph-v4.gbin
new file mode 100644
index 0000000..c1f53cb
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/tinker-graph-v4.gbin
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/traversal-edge-v4.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/traversal-edge-v4.gbin
new file mode 100644
index 0000000..25b658e
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/traversal-edge-v4.gbin
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/traversal-path-v4.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/traversal-path-v4.gbin
new file mode 100644
index 0000000..fda24e9
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/traversal-path-v4.gbin
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/traversal-tree-v4.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/traversal-tree-v4.gbin
new file mode 100644
index 0000000..e1112df
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/traversal-tree-v4.gbin
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/traversal-vertex-v4.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/traversal-vertex-v4.gbin
new file mode 100644
index 0000000..6b592bf
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/traversal-vertex-v4.gbin
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/traversal-vertexproperty-v4.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/traversal-vertexproperty-v4.gbin
new file mode 100644
index 0000000..4120d8c
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/traversal-vertexproperty-v4.gbin
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/true-boolean-v4.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/true-boolean-v4.gbin
new file mode 100644
index 0000000..a4575b9
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/true-boolean-v4.gbin
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/unspecified-null-v4.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/unspecified-null-v4.gbin
new file mode 100644
index 0000000..b3edade
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/unspecified-null-v4.gbin
@@ -0,0 +1 @@
+þ
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/var-bulklist-v4.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/var-bulklist-v4.gbin
new file mode 100644
index 0000000..7d1dd49
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/var-bulklist-v4.gbin
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/var-type-list-v4.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/var-type-list-v4.gbin
new file mode 100644
index 0000000..273766e
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/var-type-list-v4.gbin
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/var-type-map-v4.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/var-type-map-v4.gbin
new file mode 100644
index 0000000..9633ecf
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/var-type-map-v4.gbin
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/var-type-set-v4.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/var-type-set-v4.gbin
new file mode 100644
index 0000000..55e78f6
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/var-type-set-v4.gbin
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/zero-duration-v4.gbin b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/zero-duration-v4.gbin
new file mode 100644
index 0000000..2e103d7
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/zero-duration-v4.gbin
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/edge-property-v4-no-types.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/edge-property-v4-no-types.json
new file mode 100644
index 0000000..c051c0a
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/edge-property-v4-no-types.json
@@ -0,0 +1,4 @@
+{
+ "key" : "since",
+ "value" : 2009
+}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/property-v2.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/edge-property-v4.json
similarity index 100%
rename from gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/property-v2.json
rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/edge-property-v4.json
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/empty-binary-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/empty-binary-v4.json
new file mode 100644
index 0000000..8905fc0
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/empty-binary-v4.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Binary",
+ "@value" : ""
+}
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/empty-bulklist-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/empty-bulklist-v4.json
new file mode 100644
index 0000000..aacbd80
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/empty-bulklist-v4.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:List",
+ "@value" : [ ]
+}
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/empty-list-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/empty-list-v4.json
new file mode 100644
index 0000000..aacbd80
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/empty-list-v4.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:List",
+ "@value" : [ ]
+}
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/empty-map-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/empty-map-v4.json
new file mode 100644
index 0000000..2856adc
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/empty-map-v4.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Map",
+ "@value" : [ ]
+}
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/empty-path-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/empty-path-v4.json
new file mode 100644
index 0000000..9cb13f2
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/empty-path-v4.json
@@ -0,0 +1,13 @@
+{
+ "@type" : "g:Path",
+ "@value" : {
+ "labels" : {
+ "@type" : "g:List",
+ "@value" : [ ]
+ },
+ "objects" : {
+ "@type" : "g:List",
+ "@value" : [ ]
+ }
+ }
+}
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/empty-set-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/empty-set-v4.json
new file mode 100644
index 0000000..76789a4
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/empty-set-v4.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Set",
+ "@value" : [ ]
+}
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/false-boolean-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/false-boolean-v4.json
new file mode 100644
index 0000000..02e4a84
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/false-boolean-v4.json
@@ -0,0 +1 @@
+false
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/forever-duration-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/forever-duration-v4.json
new file mode 100644
index 0000000..f72bcf5
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/forever-duration-v4.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Duration",
+ "@value" : "PT2562047788015215H30M7.999999999S"
+}
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/id-t-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/id-t-v4.json
new file mode 100644
index 0000000..7f2e178
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/id-t-v4.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:T",
+ "@value" : "id"
+}
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/max-byte-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/max-byte-v4.json
new file mode 100644
index 0000000..f883216
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/max-byte-v4.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Byte",
+ "@value" : 127
+}
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/max-double-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/max-double-v4.json
new file mode 100644
index 0000000..37e607b
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/max-double-v4.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Double",
+ "@value" : 1.7976931348623157E308
+}
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/max-float-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/max-float-v4.json
new file mode 100644
index 0000000..b008f1d
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/max-float-v4.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Float",
+ "@value" : 3.4028235E38
+}
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/max-int-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/max-int-v4.json
new file mode 100644
index 0000000..f3bc62c
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/max-int-v4.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Int32",
+ "@value" : 2147483647
+}
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/max-long-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/max-long-v4.json
new file mode 100644
index 0000000..9bc12dc
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/max-long-v4.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Int64",
+ "@value" : 9223372036854775807
+}
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/max-offsetdatetime-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/max-offsetdatetime-v4.json
new file mode 100644
index 0000000..022ea63
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/max-offsetdatetime-v4.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:DateTime",
+ "@value" : "+999999999-12-31T23:59:59.999999999-18:00"
+}
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/max-short-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/max-short-v4.json
new file mode 100644
index 0000000..281f016
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/max-short-v4.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Int16",
+ "@value" : 32767
+}
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/meta-vertexproperty-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/meta-vertexproperty-v4.json
new file mode 100644
index 0000000..13da91c
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/meta-vertexproperty-v4.json
@@ -0,0 +1,14 @@
+{
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "value" : "stephen",
+ "label" : [ "person" ],
+ "properties" : {
+ "a" : "b"
+ }
+ }
+}
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/min-byte-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/min-byte-v4.json
new file mode 100644
index 0000000..72192f1
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/min-byte-v4.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Byte",
+ "@value" : -128
+}
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/min-double-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/min-double-v4.json
new file mode 100644
index 0000000..689fe38
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/min-double-v4.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Double",
+ "@value" : 4.9E-324
+}
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/min-float-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/min-float-v4.json
new file mode 100644
index 0000000..aa97eff
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/min-float-v4.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Float",
+ "@value" : 1.4E-45
+}
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/min-int-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/min-int-v4.json
new file mode 100644
index 0000000..6e43d75
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/min-int-v4.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Int32",
+ "@value" : -2147483648
+}
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/min-long-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/min-long-v4.json
new file mode 100644
index 0000000..1f41b9c
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/min-long-v4.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Int64",
+ "@value" : -9223372036854775808
+}
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/min-offsetdatetime-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/min-offsetdatetime-v4.json
new file mode 100644
index 0000000..2b73140
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/min-offsetdatetime-v4.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:DateTime",
+ "@value" : "-999999999-01-01T00:00+18:00"
+}
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/min-short-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/min-short-v4.json
new file mode 100644
index 0000000..946d481
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/min-short-v4.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Int16",
+ "@value" : -32768
+}
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/mixed-string-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/mixed-string-v4.json
new file mode 100644
index 0000000..6c4ca64
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/mixed-string-v4.json
@@ -0,0 +1 @@
+"abcΑΒΓ"
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/multi-byte-char-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/multi-byte-char-v4.json
new file mode 100644
index 0000000..46aceff
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/multi-byte-char-v4.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Char",
+ "@value" : "Ω"
+}
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/nan-double-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/nan-double-v4.json
new file mode 100644
index 0000000..7b10376
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/nan-double-v4.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Double",
+ "@value" : "NaN"
+}
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/nan-float-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/nan-float-v4.json
new file mode 100644
index 0000000..b831121
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/nan-float-v4.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Float",
+ "@value" : "NaN"
+}
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/neg-bigdecimal-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/neg-bigdecimal-v4.json
new file mode 100644
index 0000000..be48f4f
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/neg-bigdecimal-v4.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:BigDecimal",
+ "@value" : -123.456789987654321123456789987654321
+}
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/neg-biginteger-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/neg-biginteger-v4.json
new file mode 100644
index 0000000..97b812f
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/neg-biginteger-v4.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:BigInteger",
+ "@value" : -123456789987654321123456789987654321
+}
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/neg-inf-double-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/neg-inf-double-v4.json
new file mode 100644
index 0000000..1c8db0f
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/neg-inf-double-v4.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Double",
+ "@value" : "-Infinity"
+}
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/neg-inf-float-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/neg-inf-float-v4.json
new file mode 100644
index 0000000..7eeef11
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/neg-inf-float-v4.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Float",
+ "@value" : "-Infinity"
+}
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/neg-max-double-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/neg-max-double-v4.json
new file mode 100644
index 0000000..22ee62b
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/neg-max-double-v4.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Double",
+ "@value" : -1.7976931348623157E308
+}
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/neg-max-float-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/neg-max-float-v4.json
new file mode 100644
index 0000000..a1fb83b
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/neg-max-float-v4.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Float",
+ "@value" : -3.4028235E38
+}
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/neg-min-double-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/neg-min-double-v4.json
new file mode 100644
index 0000000..d71c0c4
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/neg-min-double-v4.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Double",
+ "@value" : -4.9E-324
+}
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/neg-min-float-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/neg-min-float-v4.json
new file mode 100644
index 0000000..4992540
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/neg-min-float-v4.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Float",
+ "@value" : -1.4E-45
+}
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/neg-zero-double-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/neg-zero-double-v4.json
new file mode 100644
index 0000000..92df6fc
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/neg-zero-double-v4.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Double",
+ "@value" : -0.0
+}
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/neg-zero-float-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/neg-zero-float-v4.json
new file mode 100644
index 0000000..fb673f6
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/neg-zero-float-v4.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Float",
+ "@value" : -0.0
+}
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/nil-uuid-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/nil-uuid-v4.json
new file mode 100644
index 0000000..a016ec2
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/nil-uuid-v4.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:UUID",
+ "@value" : "00000000-0000-0000-0000-000000000000"
+}
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/no-prop-edge-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/no-prop-edge-v4.json
new file mode 100644
index 0000000..b4f16b3
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/no-prop-edge-v4.json
@@ -0,0 +1,24 @@
+{
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 13
+ },
+ "label" : [ "develops" ],
+ "inV" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "label" : [ "software" ]
+ },
+ "outV" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "label" : [ "person" ]
+ }
+ }
+}
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/no-prop-vertex-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/no-prop-vertex-v4.json
new file mode 100644
index 0000000..a26f344
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/no-prop-vertex-v4.json
@@ -0,0 +1,10 @@
+{
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "label" : [ "person" ]
+ }
+}
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/null-property-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/null-property-v4.json
new file mode 100644
index 0000000..bc62d63
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/null-property-v4.json
@@ -0,0 +1,7 @@
+{
+ "@type" : "g:Property",
+ "@value" : {
+ "key" : "",
+ "value" : null
+ }
+}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/direction-v2.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/out-direction-v4.json
similarity index 100%
rename from gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/direction-v2.json
rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/out-direction-v4.json
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pos-bigdecimal-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pos-bigdecimal-v4.json
new file mode 100644
index 0000000..d95c364
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pos-bigdecimal-v4.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:BigDecimal",
+ "@value" : 123.456789987654321123456789987654321
+}
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pos-biginteger-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pos-biginteger-v4.json
new file mode 100644
index 0000000..5483f8b
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pos-biginteger-v4.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:BigInteger",
+ "@value" : 123456789987654321123456789987654321
+}
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pos-inf-double-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pos-inf-double-v4.json
new file mode 100644
index 0000000..7c02511
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pos-inf-double-v4.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Double",
+ "@value" : "Infinity"
+}
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pos-inf-float-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pos-inf-float-v4.json
new file mode 100644
index 0000000..61923d9
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pos-inf-float-v4.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Float",
+ "@value" : "Infinity"
+}
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/prop-path-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/prop-path-v4.json
new file mode 100644
index 0000000..a1c4227
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/prop-path-v4.json
@@ -0,0 +1,165 @@
+{
+ "@type" : "g:Path",
+ "@value" : {
+ "labels" : {
+ "@type" : "g:List",
+ "@value" : [ {
+ "@type" : "g:Set",
+ "@value" : [ ]
+ }, {
+ "@type" : "g:Set",
+ "@value" : [ ]
+ }, {
+ "@type" : "g:Set",
+ "@value" : [ ]
+ } ]
+ },
+ "objects" : {
+ "@type" : "g:List",
+ "@value" : [ {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "label" : [ "person" ],
+ "properties" : {
+ "name" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 0
+ },
+ "value" : "marko",
+ "label" : [ "name" ]
+ }
+ } ],
+ "location" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 6
+ },
+ "value" : "san diego",
+ "label" : [ "location" ],
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 1997
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2001
+ }
+ }
+ }
+ }, {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 7
+ },
+ "value" : "santa cruz",
+ "label" : [ "location" ],
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2001
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2004
+ }
+ }
+ }
+ }, {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 8
+ },
+ "value" : "brussels",
+ "label" : [ "location" ],
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2004
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2005
+ }
+ }
+ }
+ }, {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 9
+ },
+ "value" : "santa fe",
+ "label" : [ "location" ],
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2005
+ }
+ }
+ }
+ } ]
+ }
+ }
+ }, {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "label" : [ "software" ],
+ "properties" : {
+ "name" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 4
+ },
+ "value" : "gremlin",
+ "label" : [ "name" ]
+ }
+ } ]
+ }
+ }
+ }, {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "label" : [ "software" ],
+ "properties" : {
+ "name" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 5
+ },
+ "value" : "tinkergraph",
+ "label" : [ "name" ]
+ }
+ } ]
+ }
+ }
+ } ]
+ }
+ }
+}
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/set-cardinality-vertexproperty-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/set-cardinality-vertexproperty-v4.json
new file mode 100644
index 0000000..712358b
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/set-cardinality-vertexproperty-v4.json
@@ -0,0 +1,17 @@
+{
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "value" : {
+ "@type" : "g:Set",
+ "@value" : [ "stephen", "marko" ]
+ },
+ "label" : [ "person" ],
+ "properties" : {
+ "a" : "b"
+ }
+ }
+}
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/single-byte-char-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/single-byte-char-v4.json
new file mode 100644
index 0000000..e066b3d
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/single-byte-char-v4.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Char",
+ "@value" : "a"
+}
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/single-byte-string-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/single-byte-string-v4.json
new file mode 100644
index 0000000..4f44a21
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/single-byte-string-v4.json
@@ -0,0 +1 @@
+"abc"
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/uuid-v2.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/specified-uuid-v4.json
similarity index 100%
rename from gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/uuid-v2.json
rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/specified-uuid-v4.json
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/str-binary-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/str-binary-v4.json
new file mode 100644
index 0000000..a0fc26a
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/str-binary-v4.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Binary",
+ "@value" : "c29tZSBieXRlcyBmb3IgeW91"
+}
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinker-graph-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinker-graph-v4.json
new file mode 100644
index 0000000..8d51265
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinker-graph-v4.json
@@ -0,0 +1,885 @@
+{
+ "@type" : "g:graph",
+ "@value" : {
+ "vertices" : [ {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "label" : [ "person" ],
+ "properties" : {
+ "name" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 0
+ },
+ "value" : "marko",
+ "label" : [ "name" ]
+ }
+ } ],
+ "location" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 6
+ },
+ "value" : "san diego",
+ "label" : [ "location" ],
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 1997
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2001
+ }
+ }
+ }
+ }, {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 7
+ },
+ "value" : "santa cruz",
+ "label" : [ "location" ],
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2001
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2004
+ }
+ }
+ }
+ }, {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 8
+ },
+ "value" : "brussels",
+ "label" : [ "location" ],
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2004
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2005
+ }
+ }
+ }
+ }, {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 9
+ },
+ "value" : "santa fe",
+ "label" : [ "location" ],
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2005
+ }
+ }
+ }
+ } ]
+ }
+ }
+ }, {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 7
+ },
+ "label" : [ "person" ],
+ "properties" : {
+ "name" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 1
+ },
+ "value" : "stephen",
+ "label" : [ "name" ]
+ }
+ } ],
+ "location" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 10
+ },
+ "value" : "centreville",
+ "label" : [ "location" ],
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 1990
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2000
+ }
+ }
+ }
+ }, {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 11
+ },
+ "value" : "dulles",
+ "label" : [ "location" ],
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2000
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2006
+ }
+ }
+ }
+ }, {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 12
+ },
+ "value" : "purcellville",
+ "label" : [ "location" ],
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2006
+ }
+ }
+ }
+ } ]
+ }
+ }
+ }, {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 8
+ },
+ "label" : [ "person" ],
+ "properties" : {
+ "name" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 2
+ },
+ "value" : "matthias",
+ "label" : [ "name" ]
+ }
+ } ],
+ "location" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 13
+ },
+ "value" : "bremen",
+ "label" : [ "location" ],
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2004
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2007
+ }
+ }
+ }
+ }, {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 14
+ },
+ "value" : "baltimore",
+ "label" : [ "location" ],
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2007
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2011
+ }
+ }
+ }
+ }, {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 15
+ },
+ "value" : "oakland",
+ "label" : [ "location" ],
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2011
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2014
+ }
+ }
+ }
+ }, {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 16
+ },
+ "value" : "seattle",
+ "label" : [ "location" ],
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2014
+ }
+ }
+ }
+ } ]
+ }
+ }
+ }, {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 9
+ },
+ "label" : [ "person" ],
+ "properties" : {
+ "name" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 3
+ },
+ "value" : "daniel",
+ "label" : [ "name" ]
+ }
+ } ],
+ "location" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 17
+ },
+ "value" : "spremberg",
+ "label" : [ "location" ],
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 1982
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2005
+ }
+ }
+ }
+ }, {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 18
+ },
+ "value" : "kaiserslautern",
+ "label" : [ "location" ],
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2005
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2009
+ }
+ }
+ }
+ }, {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 19
+ },
+ "value" : "aachen",
+ "label" : [ "location" ],
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2009
+ }
+ }
+ }
+ } ]
+ }
+ }
+ }, {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "label" : [ "software" ],
+ "properties" : {
+ "name" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 4
+ },
+ "value" : "gremlin",
+ "label" : [ "name" ]
+ }
+ } ]
+ }
+ }
+ }, {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "label" : [ "software" ],
+ "properties" : {
+ "name" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 5
+ },
+ "value" : "tinkergraph",
+ "label" : [ "name" ]
+ }
+ } ]
+ }
+ }
+ } ],
+ "edges" : [ {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 13
+ },
+ "label" : [ "develops" ],
+ "inV" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "label" : [ "software" ]
+ },
+ "outV" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "label" : [ "person" ]
+ },
+ "properties" : {
+ "since" : [ {
+ "@type" : "g:Property",
+ "@value" : {
+ "key" : "since",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 2009
+ }
+ }
+ } ]
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 14
+ },
+ "label" : [ "develops" ],
+ "inV" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "label" : [ "software" ]
+ },
+ "outV" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "label" : [ "person" ]
+ },
+ "properties" : {
+ "since" : [ {
+ "@type" : "g:Property",
+ "@value" : {
+ "key" : "since",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 2010
+ }
+ }
+ } ]
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 15
+ },
+ "label" : [ "uses" ],
+ "inV" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "label" : [ "software" ]
+ },
+ "outV" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "label" : [ "person" ]
+ },
+ "properties" : {
+ "skill" : [ {
+ "@type" : "g:Property",
+ "@value" : {
+ "key" : "skill",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 4
+ }
+ }
+ } ]
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 16
+ },
+ "label" : [ "uses" ],
+ "inV" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "label" : [ "software" ]
+ },
+ "outV" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "label" : [ "person" ]
+ },
+ "properties" : {
+ "skill" : [ {
+ "@type" : "g:Property",
+ "@value" : {
+ "key" : "skill",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 5
+ }
+ }
+ } ]
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 17
+ },
+ "label" : [ "develops" ],
+ "inV" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "label" : [ "software" ]
+ },
+ "outV" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 7
+ },
+ "label" : [ "person" ]
+ },
+ "properties" : {
+ "since" : [ {
+ "@type" : "g:Property",
+ "@value" : {
+ "key" : "since",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 2010
+ }
+ }
+ } ]
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 18
+ },
+ "label" : [ "develops" ],
+ "inV" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "label" : [ "software" ]
+ },
+ "outV" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 7
+ },
+ "label" : [ "person" ]
+ },
+ "properties" : {
+ "since" : [ {
+ "@type" : "g:Property",
+ "@value" : {
+ "key" : "since",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 2011
+ }
+ }
+ } ]
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 19
+ },
+ "label" : [ "uses" ],
+ "inV" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "label" : [ "software" ]
+ },
+ "outV" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 7
+ },
+ "label" : [ "person" ]
+ },
+ "properties" : {
+ "skill" : [ {
+ "@type" : "g:Property",
+ "@value" : {
+ "key" : "skill",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 5
+ }
+ }
+ } ]
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 20
+ },
+ "label" : [ "uses" ],
+ "inV" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "label" : [ "software" ]
+ },
+ "outV" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 7
+ },
+ "label" : [ "person" ]
+ },
+ "properties" : {
+ "skill" : [ {
+ "@type" : "g:Property",
+ "@value" : {
+ "key" : "skill",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 4
+ }
+ }
+ } ]
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 21
+ },
+ "label" : [ "develops" ],
+ "inV" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "label" : [ "software" ]
+ },
+ "outV" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 8
+ },
+ "label" : [ "person" ]
+ },
+ "properties" : {
+ "since" : [ {
+ "@type" : "g:Property",
+ "@value" : {
+ "key" : "since",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 2012
+ }
+ }
+ } ]
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 22
+ },
+ "label" : [ "uses" ],
+ "inV" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "label" : [ "software" ]
+ },
+ "outV" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 8
+ },
+ "label" : [ "person" ]
+ },
+ "properties" : {
+ "skill" : [ {
+ "@type" : "g:Property",
+ "@value" : {
+ "key" : "skill",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 3
+ }
+ }
+ } ]
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 23
+ },
+ "label" : [ "uses" ],
+ "inV" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "label" : [ "software" ]
+ },
+ "outV" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 8
+ },
+ "label" : [ "person" ]
+ },
+ "properties" : {
+ "skill" : [ {
+ "@type" : "g:Property",
+ "@value" : {
+ "key" : "skill",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 3
+ }
+ }
+ } ]
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 24
+ },
+ "label" : [ "uses" ],
+ "inV" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "label" : [ "software" ]
+ },
+ "outV" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 9
+ },
+ "label" : [ "person" ]
+ },
+ "properties" : {
+ "skill" : [ {
+ "@type" : "g:Property",
+ "@value" : {
+ "key" : "skill",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 5
+ }
+ }
+ } ]
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 25
+ },
+ "label" : [ "uses" ],
+ "inV" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "label" : [ "software" ]
+ },
+ "outV" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 9
+ },
+ "label" : [ "person" ]
+ },
+ "properties" : {
+ "skill" : [ {
+ "@type" : "g:Property",
+ "@value" : {
+ "key" : "skill",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 3
+ }
+ }
+ } ]
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 26
+ },
+ "label" : [ "traverses" ],
+ "inV" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "label" : [ "software" ]
+ },
+ "outV" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "label" : [ "software" ]
+ }
+ }
+ } ]
+ }
+}
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traversal-edge-v4-no-types.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traversal-edge-v4-no-types.json
new file mode 100644
index 0000000..9cdac5b
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traversal-edge-v4-no-types.json
@@ -0,0 +1,16 @@
+{
+ "id" : 13,
+ "label" : [ "develops" ],
+ "type" : "edge",
+ "inV" : {
+ "id" : 10,
+ "label" : [ "software" ]
+ },
+ "outV" : {
+ "id" : 1,
+ "label" : [ "person" ]
+ },
+ "properties" : {
+ "since" : [ 2009 ]
+ }
+}
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traversal-edge-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traversal-edge-v4.json
new file mode 100644
index 0000000..0510745
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traversal-edge-v4.json
@@ -0,0 +1,36 @@
+{
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 13
+ },
+ "label" : [ "develops" ],
+ "inV" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "label" : [ "software" ]
+ },
+ "outV" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "label" : [ "person" ]
+ },
+ "properties" : {
+ "since" : [ {
+ "@type" : "g:Property",
+ "@value" : {
+ "key" : "since",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 2009
+ }
+ }
+ } ]
+ }
+ }
+}
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traversal-path-v4-no-types.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traversal-path-v4-no-types.json
new file mode 100644
index 0000000..b151aed
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traversal-path-v4-no-types.json
@@ -0,0 +1,16 @@
+{
+ "labels" : [ [ ], [ ], [ ] ],
+ "objects" : [ {
+ "id" : 1,
+ "label" : [ "person" ],
+ "type" : "vertex"
+ }, {
+ "id" : 10,
+ "label" : [ "software" ],
+ "type" : "vertex"
+ }, {
+ "id" : 11,
+ "label" : [ "software" ],
+ "type" : "vertex"
+ } ]
+}
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traversal-path-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traversal-path-v4.json
new file mode 100644
index 0000000..046bb5b
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traversal-path-v4.json
@@ -0,0 +1,49 @@
+{
+ "@type" : "g:Path",
+ "@value" : {
+ "labels" : {
+ "@type" : "g:List",
+ "@value" : [ {
+ "@type" : "g:Set",
+ "@value" : [ ]
+ }, {
+ "@type" : "g:Set",
+ "@value" : [ ]
+ }, {
+ "@type" : "g:Set",
+ "@value" : [ ]
+ } ]
+ },
+ "objects" : {
+ "@type" : "g:List",
+ "@value" : [ {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "label" : [ "person" ]
+ }
+ }, {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "label" : [ "software" ]
+ }
+ }, {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "label" : [ "software" ]
+ }
+ } ]
+ }
+ }
+}
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traversal-tree-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traversal-tree-v4.json
new file mode 100644
index 0000000..b6acb56
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traversal-tree-v4.json
@@ -0,0 +1,60 @@
+{
+ "@type" : "g:Tree",
+ "@value" : [ {
+ "key" : {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "label" : [ "software" ],
+ "properties" : {
+ "name" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 4
+ },
+ "value" : "gremlin",
+ "label" : [ "name" ]
+ }
+ } ]
+ }
+ }
+ },
+ "value" : {
+ "@type" : "g:Tree",
+ "@value" : [ {
+ "key" : {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "label" : [ "software" ],
+ "properties" : {
+ "name" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 5
+ },
+ "value" : "tinkergraph",
+ "label" : [ "name" ]
+ }
+ } ]
+ }
+ }
+ },
+ "value" : {
+ "@type" : "g:Tree",
+ "@value" : [ ]
+ }
+ } ]
+ }
+ } ]
+}
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traversal-vertex-v4-no-types.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traversal-vertex-v4-no-types.json
new file mode 100644
index 0000000..49b4270
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traversal-vertex-v4-no-types.json
@@ -0,0 +1,39 @@
+{
+ "id" : 1,
+ "label" : [ "person" ],
+ "type" : "vertex",
+ "properties" : {
+ "name" : [ {
+ "id" : 0,
+ "value" : "marko"
+ } ],
+ "location" : [ {
+ "id" : 6,
+ "value" : "san diego",
+ "properties" : {
+ "startTime" : 1997,
+ "endTime" : 2001
+ }
+ }, {
+ "id" : 7,
+ "value" : "santa cruz",
+ "properties" : {
+ "startTime" : 2001,
+ "endTime" : 2004
+ }
+ }, {
+ "id" : 8,
+ "value" : "brussels",
+ "properties" : {
+ "startTime" : 2004,
+ "endTime" : 2005
+ }
+ }, {
+ "id" : 9,
+ "value" : "santa fe",
+ "properties" : {
+ "startTime" : 2005
+ }
+ } ]
+ }
+}
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traversal-vertex-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traversal-vertex-v4.json
new file mode 100644
index 0000000..14d4232
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traversal-vertex-v4.json
@@ -0,0 +1,100 @@
+{
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "label" : [ "person" ],
+ "properties" : {
+ "name" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 0
+ },
+ "value" : "marko",
+ "label" : [ "name" ]
+ }
+ } ],
+ "location" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 6
+ },
+ "value" : "san diego",
+ "label" : [ "location" ],
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 1997
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2001
+ }
+ }
+ }
+ }, {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 7
+ },
+ "value" : "santa cruz",
+ "label" : [ "location" ],
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2001
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2004
+ }
+ }
+ }
+ }, {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 8
+ },
+ "value" : "brussels",
+ "label" : [ "location" ],
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2004
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2005
+ }
+ }
+ }
+ }, {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 9
+ },
+ "value" : "santa fe",
+ "label" : [ "location" ],
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2005
+ }
+ }
+ }
+ } ]
+ }
+ }
+}
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traversal-vertexproperty-v4-no-types.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traversal-vertexproperty-v4-no-types.json
new file mode 100644
index 0000000..666b12c
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traversal-vertexproperty-v4-no-types.json
@@ -0,0 +1,5 @@
+{
+ "id" : 0,
+ "value" : "marko",
+ "label" : [ "name" ]
+}
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traversal-vertexproperty-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traversal-vertexproperty-v4.json
new file mode 100644
index 0000000..81fed51
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traversal-vertexproperty-v4.json
@@ -0,0 +1,11 @@
+{
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 0
+ },
+ "value" : "marko",
+ "label" : [ "name" ]
+ }
+}
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/true-boolean-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/true-boolean-v4.json
new file mode 100644
index 0000000..f32a580
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/true-boolean-v4.json
@@ -0,0 +1 @@
+true
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/unspecified-null-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/unspecified-null-v4.json
new file mode 100644
index 0000000..ec747fa
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/unspecified-null-v4.json
@@ -0,0 +1 @@
+null
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/var-bulklist-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/var-bulklist-v4.json
new file mode 100644
index 0000000..ac76348
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/var-bulklist-v4.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:List",
+ "@value" : [ "marko", "josh", "josh" ]
+}
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/var-type-list-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/var-type-list-v4.json
new file mode 100644
index 0000000..a940634
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/var-type-list-v4.json
@@ -0,0 +1,7 @@
+{
+ "@type" : "g:List",
+ "@value" : [ {
+ "@type" : "g:Int32",
+ "@value" : 1
+ }, "person", true, null ]
+}
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/var-type-map-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/var-type-map-v4.json
new file mode 100644
index 0000000..e920264
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/var-type-map-v4.json
@@ -0,0 +1,25 @@
+{
+ "@type" : "g:Map",
+ "@value" : [ null, null, {
+ "@type" : "g:List",
+ "@value" : [ {
+ "@type" : "g:Int32",
+ "@value" : 1
+ }, {
+ "@type" : "g:Int32",
+ "@value" : 2
+ }, {
+ "@type" : "g:Int32",
+ "@value" : 3
+ } ]
+ }, {
+ "@type" : "g:DateTime",
+ "@value" : "1970-01-01T00:24:41.295Z"
+ }, "test", {
+ "@type" : "g:Int32",
+ "@value" : 123
+ }, {
+ "@type" : "g:DateTime",
+ "@value" : "1970-01-01T00:24:41.295Z"
+ }, "red" ]
+}
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/var-type-set-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/var-type-set-v4.json
new file mode 100644
index 0000000..afb8f93
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/var-type-set-v4.json
@@ -0,0 +1,7 @@
+{
+ "@type" : "g:Set",
+ "@value" : [ null, {
+ "@type" : "g:Int32",
+ "@value" : 2
+ }, "person", true ]
+}
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/zero-duration-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/zero-duration-v4.json
new file mode 100644
index 0000000..146966f
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/zero-duration-v4.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Duration",
+ "@value" : "PT0S"
+}
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/filter/Discard.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/filter/Discard.feature
index 9854378..348ee8a 100644
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/filter/Discard.feature
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/filter/Discard.feature
@@ -27,7 +27,7 @@
When iterated to list
Then the result should be empty
- Scenario: g_V_hasLabelXpersonX_discard
+ Scenario: g_V_hasLabelXpersonX_discard
Given the modern graph
And the traversal of
"""
@@ -106,4 +106,4 @@
Then the result should be unordered
| result |
| d[32].i |
- | d[35].i |
\ No newline at end of file
+ | d[35].i |
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 9326313..0fd1de7 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
@@ -107,6 +107,21 @@
| v[marko] |
| v[vadas] |
+ Scenario: g_V_hasIdXmarkovar_vadasvar_petervarX
+ Given the modern graph
+ And using the parameter vid1 defined as "v[marko].id"
+ And using the parameter vid2 defined as "l[v[vadas].id,v[peter].id]"
+ And the traversal of
+ """
+ g.V().hasId(vid1, vid2)
+ """
+ When iterated to list
+ Then the result should be unordered
+ | result |
+ | v[marko] |
+ | v[vadas] |
+ | v[peter] |
+
Scenario: g_V_hasIdX2AsString_nullX
Given the modern graph
And using the parameter vid2 defined as "v[vadas].sid"
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/AsDate.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/AsDate.feature
index 0e01fb9..3cefc6a 100644
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/AsDate.feature
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/AsDate.feature
@@ -15,6 +15,7 @@
# specific language governing permissions and limitations
# under the License.
+# todo: re-enable after datetime is implemented
@StepClassMap @StepAsDate
Feature: Step - asDate()
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 f985d85..8dddec5 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 @@
| 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
"""
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/DateAdd.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/DateAdd.feature
index 67c8e24..ba55e73 100644
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/DateAdd.feature
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/DateAdd.feature
@@ -15,6 +15,7 @@
# specific language governing permissions and limitations
# under the License.
+# todo: re-enable after datetime is implemented
@StepClassMap @StepDateAdd
Feature: Step - dateAdd()
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 74748bb..3bab88c 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
@@ -361,4 +361,17 @@
| marko |
| marko |
| josh |
- | vadas |
\ No newline at end of file
+ | vadas |
+
+ Scenario: g_V_toEXout_knowsvarX_valuesXweightX
+ Given the modern graph
+ And using the parameter xx1 defined as "knows"
+ And the traversal of
+ """
+ g.V().toE(Direction.OUT, xx1).values("weight")
+ """
+ When iterated to list
+ Then the result should be unordered
+ | result |
+ | d[0.5].d |
+ | d[1.0].d |
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/MergeEdge.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/MergeEdge.feature
index e472a1b..b2bed1c 100644
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/MergeEdge.feature
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/MergeEdge.feature
@@ -147,7 +147,6 @@
And the graph should return 2 for count of "g.E()"
And the graph should return 2 for count of "g.V()"
- # null same as empty
Scenario: g_mergeEXnullX
Given the empty graph
And the graph initializer of
@@ -280,7 +279,7 @@
g.mergeE(xx1)
"""
When iterated to list
- Then the traversal will raise an error with message containing text of "Vertex id could not be resolved from mergeE"
+ Then the traversal will raise an error with message containing text of "Vertex does not exist for mergeE"
@UserSuppliedVertexIds
Scenario: g_mergeEXlabel_knows_out_marko_in_vadasX_optionXonCreate_created_YX_optionXonMatch_created_NX
@@ -293,7 +292,7 @@
g.mergeE(xx1).option(Merge.onCreate,xx2).option(Merge.onMatch,xx3)
"""
When iterated to list
- Then the traversal will raise an error with message containing text of "Vertex id could not be resolved from mergeE"
+ Then the traversal will raise an error with message containing text of "Vertex does not exist for mergeE"
Scenario: g_mergeEXlabel_knows_out_marko_in_vadasX_optionXonCreate_created_YX_optionXonMatch_created_NX_exists
Given the empty graph
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Select.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Select.feature
index 3109a9f..1922e31 100644
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Select.feature
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Select.feature
@@ -896,11 +896,12 @@
| m[{"a":["a1","a1","b1"]}] |
| m[{"a":["b1","a1","a1"]}] |
- Scenario: g_V_asXlabelX_aggregateXlocal_xX_selectXxX_selectXlabelX
+ @StepClassIntegrated
+ Scenario: g_withoutStrategiesXLazyBarrierStrategyX_V_asXlabelX_aggregateXlocal_xX_selectXxX_selectXlabelX
Given the modern graph
And the traversal of
"""
- g.V().as("label").aggregate(local,"x").barrier().select("x").select("label")
+ g.withoutStrategies(LazyBarrierStrategy).V().as("label").aggregate(local,"x").select("x").select("label")
"""
When iterated to list
Then the result should be unordered
diff --git a/gremlin-tools/gremlin-benchmark/pom.xml b/gremlin-tools/gremlin-benchmark/pom.xml
index 5ce641d..c2537a8 100644
--- a/gremlin-tools/gremlin-benchmark/pom.xml
+++ b/gremlin-tools/gremlin-benchmark/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>gremlin-tools</artifactId>
<groupId>org.apache.tinkerpop</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>gremlin-benchmark</artifactId>
diff --git a/gremlin-tools/gremlin-benchmark/src/main/java/org/apache/tinkerpop/gremlin/driver/GraphBinaryReaderWriterBenchmark.java b/gremlin-tools/gremlin-benchmark/src/main/java/org/apache/tinkerpop/gremlin/driver/GraphBinaryReaderWriterBenchmark.java
index e091087..cc75b1f 100644
--- a/gremlin-tools/gremlin-benchmark/src/main/java/org/apache/tinkerpop/gremlin/driver/GraphBinaryReaderWriterBenchmark.java
+++ b/gremlin-tools/gremlin-benchmark/src/main/java/org/apache/tinkerpop/gremlin/driver/GraphBinaryReaderWriterBenchmark.java
@@ -20,8 +20,8 @@
import io.netty.buffer.UnpooledByteBufAllocator;
import org.apache.tinkerpop.benchmark.util.AbstractBenchmarkBase;
+import org.apache.tinkerpop.gremlin.process.traversal.GremlinLang;
import org.apache.tinkerpop.gremlin.util.ser.NettyBufferFactory;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
import org.apache.tinkerpop.gremlin.process.traversal.P;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.io.Buffer;
@@ -56,21 +56,21 @@
public Buffer bytecodeBuffer1 = bufferFactory.create(allocator.buffer(2048));
public Buffer bytecodeBuffer2 = bufferFactory.create(allocator.buffer(2048));
public Buffer pBuffer1 = bufferFactory.create(allocator.buffer(2048));
- public final Bytecode bytecode1 = new Bytecode();
+ public final GremlinLang gremlinLang1 = new GremlinLang();
public Buffer bufferWrite = bufferFactory.create(allocator.buffer(2048));
- public Bytecode bytecode2;
+ public GremlinLang gremlinLang2;
@Setup(Level.Trial)
public void doSetup() throws IOException {
- bytecode1.addStep("V");
- bytecode1.addStep("values", "name");
- bytecode1.addStep("tail", 5);
+ gremlinLang1.addStep("V");
+ gremlinLang1.addStep("values", "name");
+ gremlinLang1.addStep("tail", 5);
Graph g = TinkerGraph.open();
- bytecode2 = g.traversal()
+ gremlinLang2 = g.traversal()
.addV("person")
.property("name1", 1)
.property("name2", UUID.randomUUID())
@@ -78,10 +78,10 @@
.property("name4", BigInteger.valueOf(33343455342245L))
.property("name5", "kjlkdnvlkdrnvldnvndlrkvnlhkjdkgkrtnlkndblknlknonboirnlkbnrtbonrobinokbnrklnbkrnblktengotrngotkrnglkt")
.property("name6", Instant.now())
- .asAdmin().getBytecode();
+ .asAdmin().getGremlinLang();
- writer.writeValue(bytecode1, bytecodeBuffer1, false);
- writer.writeValue(bytecode2, bytecodeBuffer2, false);
+ writer.writeValue(gremlinLang1, bytecodeBuffer1, false);
+ writer.writeValue(gremlinLang2, bytecodeBuffer2, false);
writer.writeValue(P.between(1, 2), pBuffer1, false);
}
@@ -104,22 +104,22 @@
@Benchmark
public void writeBytecode1(BenchmarkState state) throws IOException {
- writer.writeValue(state.bytecode1, state.bufferWrite, false);
+ writer.writeValue(state.gremlinLang1, state.bufferWrite, false);
}
@Benchmark
public void writeBytecode2(BenchmarkState state) throws IOException {
- writer.writeValue(state.bytecode2, state.bufferWrite, false);
+ writer.writeValue(state.gremlinLang2, state.bufferWrite, false);
}
@Benchmark
public void readBytecode1(BenchmarkState state) throws IOException {
- reader.readValue(state.bytecodeBuffer1, Bytecode.class, false);
+ reader.readValue(state.bytecodeBuffer1, GremlinLang.class, false);
}
@Benchmark
public void readBytecode2(BenchmarkState state) throws IOException {
- reader.readValue(state.bytecodeBuffer2, Bytecode.class, false);
+ reader.readValue(state.bytecodeBuffer2, GremlinLang.class, false);
}
@Benchmark
diff --git a/gremlin-tools/gremlin-benchmark/src/main/java/org/apache/tinkerpop/gremlin/driver/GraphSONMapperBenchmark.java b/gremlin-tools/gremlin-benchmark/src/main/java/org/apache/tinkerpop/gremlin/driver/GraphSONMapperBenchmark.java
index 4974e9f..715ea1c 100644
--- a/gremlin-tools/gremlin-benchmark/src/main/java/org/apache/tinkerpop/gremlin/driver/GraphSONMapperBenchmark.java
+++ b/gremlin-tools/gremlin-benchmark/src/main/java/org/apache/tinkerpop/gremlin/driver/GraphSONMapperBenchmark.java
@@ -19,7 +19,7 @@
package org.apache.tinkerpop.gremlin.driver;
import org.apache.tinkerpop.benchmark.util.AbstractBenchmarkBase;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
+import org.apache.tinkerpop.gremlin.process.traversal.GremlinLang;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONVersion;
@@ -51,20 +51,20 @@
@State(Scope.Thread)
public static class BenchmarkState {
- public byte[] bytecodeBytes1;
- private byte[] bytecodeBytes2;
- private final Bytecode bytecode1 = new Bytecode();
- private Bytecode bytecode2;
+ public byte[] gremlinBytes1;
+ private byte[] gremlinBytes2;
+ private final GremlinLang gremlinLang1 = new GremlinLang();
+ private GremlinLang gremlinLang2;
@Setup(Level.Trial)
public void doSetup() throws IOException {
- bytecode1.addStep("V");
- bytecode1.addStep("values", "name");
- bytecode1.addStep("tail", 5);
+ gremlinLang1.addStep("V");
+ gremlinLang1.addStep("values", "name");
+ gremlinLang1.addStep("tail", 5);
Graph g = TinkerGraph.open();
- bytecode2 = g.traversal()
+ gremlinLang2 = g.traversal()
.addV("person")
.property("name1", 1)
.property("name2", UUID.randomUUID())
@@ -72,11 +72,11 @@
.property("name4", BigInteger.valueOf(33343455342245L))
.property("name5", "kjlkdnvlkdrnvldnvndlrkvnlhkjdkgkrtnlkndblknlknonboirnlkbnrtbonrobinokbnrklnbkrnblktengotrngotkrnglkt")
.property("name6", Instant.now())
- .asAdmin().getBytecode();
+ .asAdmin().getGremlinLang();
- bytecodeBytes1 = mapper.writeValueAsBytes(bytecode1);
- bytecodeBytes2 = mapper.writeValueAsBytes(bytecode2);
+ gremlinBytes1 = mapper.writeValueAsBytes(gremlinLang1);
+ gremlinBytes2 = mapper.writeValueAsBytes(gremlinLang2);
}
@TearDown(Level.Trial)
@@ -86,21 +86,21 @@
@Benchmark
public void readBytecode1(BenchmarkState state) throws IOException {
- mapper.readValue(state.bytecodeBytes1, Bytecode.class);
+ mapper.readValue(state.gremlinBytes1, GremlinLang.class);
}
@Benchmark
public void readBytecode2(BenchmarkState state) throws IOException {
- mapper.readValue(state.bytecodeBytes2, Bytecode.class);
+ mapper.readValue(state.gremlinBytes2, GremlinLang.class);
}
@Benchmark
public void writeBytecode1(BenchmarkState state) throws IOException {
- mapper.writeValueAsString(state.bytecode1);
+ mapper.writeValueAsString(state.gremlinLang1);
}
@Benchmark
public void writeBytecode2(BenchmarkState state) throws IOException {
- mapper.writeValueAsBytes(state.bytecode2);
+ mapper.writeValueAsBytes(state.gremlinLang2);
}
}
diff --git a/gremlin-tools/gremlin-benchmark/src/main/java/org/apache/tinkerpop/gremlin/driver/SerializationBenchmark.java b/gremlin-tools/gremlin-benchmark/src/main/java/org/apache/tinkerpop/gremlin/driver/SerializationBenchmark.java
index 4385abb..ad3711b 100644
--- a/gremlin-tools/gremlin-benchmark/src/main/java/org/apache/tinkerpop/gremlin/driver/SerializationBenchmark.java
+++ b/gremlin-tools/gremlin-benchmark/src/main/java/org/apache/tinkerpop/gremlin/driver/SerializationBenchmark.java
@@ -21,21 +21,21 @@
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import io.netty.buffer.UnpooledByteBufAllocator;
+import io.netty.handler.codec.http.HttpResponseStatus;
import org.apache.tinkerpop.benchmark.util.AbstractBenchmarkBase;
-import org.apache.tinkerpop.gremlin.util.Tokens;
-import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1;
-import org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3;
-import org.apache.tinkerpop.gremlin.util.ser.SerializationException;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
+import org.apache.tinkerpop.gremlin.process.traversal.GremlinLang;
import org.apache.tinkerpop.gremlin.structure.io.binary.DataType;
import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceVertex;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV4;
+import org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV4;
+import org.apache.tinkerpop.gremlin.util.ser.SerializationException;
import org.openjdk.jmh.annotations.Benchmark;
import org.openjdk.jmh.annotations.Warmup;
import java.nio.charset.StandardCharsets;
+import java.util.Collections;
import java.util.UUID;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
@@ -90,8 +90,6 @@
DataType.STRING.getCodeByte(), 0, 0, 0, 0, 0x01, 0x67,
// "gremlin"
DataType.STRING.getCodeByte(), 0, 0, 0, 0, 0x07, 0x67, 0x72, 0x65, 0x6d, 0x6c, 0x69, 0x6e,
- // Bytecode for ['V', 'tail']
- DataType.BYTECODE.getCodeByte(), 0, 0, 0, 0, 0x02,
// "V" (no values)
0, 0, 0, 0x1, 0x56, 0, 0, 0, 0,
// tail (no values)
@@ -103,48 +101,47 @@
private static final UUID id = UUID.randomUUID();
private static final ResponseMessage response = ResponseMessage
- .build(UUID.randomUUID()).code(ResponseStatusCode.SUCCESS).result(new ReferenceVertex(1, "person"))
+ .build().code(HttpResponseStatus.OK).result(Collections.singletonList(new ReferenceVertex(1, "person")))
.create();
- private static final Bytecode bytecode = new Bytecode();
+ private static final GremlinLang gremlinLang = new GremlinLang();
private static final RequestMessage request = RequestMessage
- .build(Tokens.OPS_BYTECODE).processor("traversal").overrideRequestId(UUID.randomUUID())
- .add(Tokens.ARGS_GREMLIN, bytecode)
+ .build(gremlinLang.getGremlin())
.create();
- private static final GraphBinaryMessageSerializerV1 binarySerializer = new GraphBinaryMessageSerializerV1();
- private static final GraphSONMessageSerializerV3 graphsonSerializer = new GraphSONMessageSerializerV3();
+ private static final GraphBinaryMessageSerializerV4 binarySerializer = new GraphBinaryMessageSerializerV4();
+ private static final GraphSONMessageSerializerV4 graphsonSerializer = new GraphSONMessageSerializerV4();
static {
- bytecode.addStep("V");
- bytecode.addStep("values", "name");
- bytecode.addStep("order");
- bytecode.addStep("tail", 5);
+ gremlinLang.addStep("V");
+ gremlinLang.addStep("values", "name");
+ gremlinLang.addStep("order");
+ gremlinLang.addStep("tail", 5);
}
@Benchmark
public RequestMessage testReadMessage1Binary() throws SerializationException {
RequestMessageBinaryBuffer1.readerIndex(0);
- return binarySerializer.deserializeRequest(RequestMessageBinaryBuffer1);
+ return binarySerializer.deserializeBinaryRequest(RequestMessageBinaryBuffer1);
}
@Benchmark
public RequestMessage testReadMessage2Binary() throws SerializationException {
RequestMessageBinaryBuffer2.readerIndex(0);
- return binarySerializer.deserializeRequest(RequestMessageBinaryBuffer2);
+ return binarySerializer.deserializeBinaryRequest(RequestMessageBinaryBuffer2);
}
@Benchmark
public RequestMessage testReadMessage1GraphSON() throws SerializationException {
RequestMessageGraphSONBuffer1.readerIndex(0);
- return graphsonSerializer.deserializeRequest(RequestMessageGraphSONBuffer1);
+ return graphsonSerializer.deserializeBinaryRequest(RequestMessageGraphSONBuffer1);
}
@Benchmark
public RequestMessage testReadMessage2GraphSON() throws SerializationException {
RequestMessageGraphSONBuffer2.readerIndex(0);
- return graphsonSerializer.deserializeRequest(RequestMessageGraphSONBuffer2);
+ return graphsonSerializer.deserializeBinaryRequest(RequestMessageGraphSONBuffer2);
}
@Benchmark
@@ -173,6 +170,6 @@
@Benchmark
public RequestMessage testInstanceCreation() {
- return RequestMessage.build("a").overrideRequestId(id).processor("b").create();
+ return RequestMessage.build("a").addLanguage("gremlin-groovy").addG("g").create();
}
}
diff --git a/gremlin-tools/gremlin-benchmark/src/main/java/org/apache/tinkerpop/gremlin/process/TraversalConstructionBenchmark.java b/gremlin-tools/gremlin-benchmark/src/main/java/org/apache/tinkerpop/gremlin/process/TraversalConstructionBenchmark.java
index c6fb8f7..14b638d 100644
--- a/gremlin-tools/gremlin-benchmark/src/main/java/org/apache/tinkerpop/gremlin/process/TraversalConstructionBenchmark.java
+++ b/gremlin-tools/gremlin-benchmark/src/main/java/org/apache/tinkerpop/gremlin/process/TraversalConstructionBenchmark.java
@@ -19,9 +19,9 @@
package org.apache.tinkerpop.gremlin.process;
import org.apache.tinkerpop.benchmark.util.AbstractGraphBenchmark;
-import org.apache.tinkerpop.gremlin.process.traversal.Bindings;
import org.apache.tinkerpop.gremlin.process.traversal.P;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
+import org.apache.tinkerpop.gremlin.process.traversal.step.GValue;
import org.openjdk.jmh.annotations.Benchmark;
import java.util.HashMap;
@@ -52,8 +52,6 @@
put("k9", "v9");
}};
- private static final Bindings b = Bindings.instance();
-
@Benchmark
public GraphTraversal constructShort() throws Exception {
return g.V().out("knows");
@@ -74,8 +72,8 @@
}
@Benchmark
- public GraphTraversal constructMediumWithBindings() throws Exception {
- return g.V().has("person","name",b.of("x","marko")).
+ public GraphTraversal constructMediumWithBindings() {
+ return g.V().has("person","name", GValue.of("x","marko")).
project("user","knows","created").
by(project("name","age").by("name").by("age")).
by(out("knows").project("name","age").by("name").by("age")).
diff --git a/gremlin-tools/gremlin-benchmark/src/main/java/org/apache/tinkerpop/jsr223/JavaTranslatorBenchmark.java b/gremlin-tools/gremlin-benchmark/src/main/java/org/apache/tinkerpop/jsr223/JavaTranslatorBenchmark.java
deleted file mode 100644
index d33b574..0000000
--- a/gremlin-tools/gremlin-benchmark/src/main/java/org/apache/tinkerpop/jsr223/JavaTranslatorBenchmark.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.jsr223;
-
-import org.apache.tinkerpop.benchmark.util.AbstractBenchmarkBase;
-import org.apache.tinkerpop.gremlin.jsr223.JavaTranslator;
-import org.apache.tinkerpop.gremlin.process.traversal.P;
-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.strategy.decoration.SubgraphStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ReadOnlyStrategy;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
-import org.openjdk.jmh.annotations.Benchmark;
-import org.openjdk.jmh.annotations.Scope;
-import org.openjdk.jmh.annotations.State;
-
-import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.as;
-import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.hasLabel;
-import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.inE;
-import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.values;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-@State(Scope.Thread)
-public class JavaTranslatorBenchmark extends AbstractBenchmarkBase {
-
- private final Graph graph = EmptyGraph.instance();
- private final GraphTraversalSource g = graph.traversal();
- private final JavaTranslator<GraphTraversalSource, GraphTraversal.Admin<Vertex,Vertex>> translator = JavaTranslator.of(g);
-
- @Benchmark
- public GraphTraversal.Admin<Vertex,Vertex> testTranslationShort() {
- return translator.translate(g.V().asAdmin().getBytecode());
- }
-
- @Benchmark
- public GraphTraversal.Admin<Vertex,Vertex> testTranslationMedium() {
- return translator.translate(g.V().out().in("link").out().in("link").asAdmin().getBytecode());
- }
-
- @Benchmark
- public GraphTraversal.Admin<Vertex,Vertex> testTranslationLong() {
- return translator.translate(g.V().match(
- as("a").has("song", "name", "HERE COMES SUNSHINE"),
- as("a").map(inE("followedBy").values("weight").mean()).as("b"),
- as("a").inE("followedBy").as("c"),
- as("c").filter(values("weight").where(P.gte("b"))).outV().as("d")).
- <String>select("d").by("name").asAdmin().getBytecode());
- }
-
- @Benchmark
- public GraphTraversal.Admin<Vertex,Vertex> testTranslationWithStrategy() {
- return translator.translate(g.withStrategies(ReadOnlyStrategy.instance())
- .withStrategies(SubgraphStrategy.build().vertices(hasLabel("person")).create())
- .V().out().in("link").out().in("link").asAdmin().getBytecode());
- }
-}
diff --git a/gremlin-tools/gremlin-coverage/pom.xml b/gremlin-tools/gremlin-coverage/pom.xml
index 74949eb..f69756f 100644
--- a/gremlin-tools/gremlin-coverage/pom.xml
+++ b/gremlin-tools/gremlin-coverage/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>gremlin-tools</artifactId>
<groupId>org.apache.tinkerpop</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>gremlin-coverage</artifactId>
<name>Apache TinkerPop :: Gremlin Coverage</name>
diff --git a/gremlin-tools/gremlin-socket-server/conf/test-ws-gremlin.yaml b/gremlin-tools/gremlin-socket-server/conf/test-ws-gremlin.yaml
index 560e40e..a358d4c 100644
--- a/gremlin-tools/gremlin-socket-server/conf/test-ws-gremlin.yaml
+++ b/gremlin-tools/gremlin-socket-server/conf/test-ws-gremlin.yaml
@@ -50,10 +50,6 @@
# that was captured during the web socket handshake.
USER_AGENT_REQUEST_ID: 20ad7bfb-4abf-d7f4-f9d3-9f1d55bee4ad
-# If a request with this ID comes to the server, the server responds with the sec-websocket-extensions header
-# included in the handshake request.
-SEC_WEBSOCKET_EXTENSIONS: 7480d3ec-e24a-424a-8148-6527378e9b35
-
# If a request with this ID comes to the server, the server responds with a string containing all overridden
# per request settings from the request message. String will be of the form
# "requestId=19436d9e-f8fc-4b67-8a76-deec60918424 evaluationTimeout=1234, batchSize=12, userAgent=testUserAgent"
diff --git a/gremlin-tools/gremlin-socket-server/pom.xml b/gremlin-tools/gremlin-socket-server/pom.xml
index 7959d48..5d25aae 100644
--- a/gremlin-tools/gremlin-socket-server/pom.xml
+++ b/gremlin-tools/gremlin-socket-server/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>gremlin-tools</artifactId>
<groupId>org.apache.tinkerpop</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -33,21 +33,11 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
<version>${groovy.version}</version>
<optional>true</optional>
</dependency>
- <dependency>
- <groupId>org.apache.groovy</groupId>
- <artifactId>groovy-json</artifactId>
- <version>${groovy.version}</version>
- <optional>true</optional>
- </dependency>
</dependencies>
<properties>
diff --git a/gremlin-tools/gremlin-socket-server/src/main/java/org/apache/tinkerpop/gremlin/socket/server/SocketServerRunner.java b/gremlin-tools/gremlin-socket-server/src/main/java/org/apache/tinkerpop/gremlin/socket/server/SocketServerRunner.java
index 9886569..8d31e99 100644
--- a/gremlin-tools/gremlin-socket-server/src/main/java/org/apache/tinkerpop/gremlin/socket/server/SocketServerRunner.java
+++ b/gremlin-tools/gremlin-socket-server/src/main/java/org/apache/tinkerpop/gremlin/socket/server/SocketServerRunner.java
@@ -31,10 +31,11 @@
public static void main(final String[] args) throws InterruptedException, IOException {
final SocketServerSettings settings = SocketServerSettings.read(FileSystems.getDefault().getPath("conf", "test-ws-gremlin.yaml"));
final SimpleSocketServer server = new SimpleSocketServer(settings);
- final Channel channel = server.start(new TestWSGremlinInitializer(settings));
- while(channel.isOpen()) {
- Thread.sleep(1000);
- }
+ // TODO: add HTTP version of socketserver
+// final Channel channel = server.start(new TestWSGremlinInitializer(settings));
+// while(channel.isOpen()) {
+// Thread.sleep(1000);
+// }
}
}
diff --git a/gremlin-tools/gremlin-socket-server/src/main/java/org/apache/tinkerpop/gremlin/socket/server/SocketServerSettings.java b/gremlin-tools/gremlin-socket-server/src/main/java/org/apache/tinkerpop/gremlin/socket/server/SocketServerSettings.java
index 87a7f04..08a418d 100644
--- a/gremlin-tools/gremlin-socket-server/src/main/java/org/apache/tinkerpop/gremlin/socket/server/SocketServerSettings.java
+++ b/gremlin-tools/gremlin-socket-server/src/main/java/org/apache/tinkerpop/gremlin/socket/server/SocketServerSettings.java
@@ -74,12 +74,6 @@
public UUID USER_AGENT_REQUEST_ID = null;
/**
- * If a request with this ID comes to the server, the server responds with the sec-websocket-extensions header
- * included in the handshake request.
- */
- public UUID SEC_WEBSOCKET_EXTENSIONS = null;
-
- /**
* If a request with this ID comes to the server, the server responds with a string containing all overridden
* per request settings from the request message. String will be of the form
* "requestId=19436d9e-f8fc-4b67-8a76-deec60918424 evaluationTimeout=1234, batchSize=12, userAgent=testUserAgent"
diff --git a/gremlin-tools/gremlin-socket-server/src/main/java/org/apache/tinkerpop/gremlin/socket/server/TestChannelizers.java b/gremlin-tools/gremlin-socket-server/src/main/java/org/apache/tinkerpop/gremlin/socket/server/TestChannelizers.java
deleted file mode 100644
index 8639f7a..0000000
--- a/gremlin-tools/gremlin-socket-server/src/main/java/org/apache/tinkerpop/gremlin/socket/server/TestChannelizers.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.socket.server;
-
-import io.netty.channel.ChannelInitializer;
-import io.netty.channel.ChannelPipeline;
-import io.netty.channel.socket.SocketChannel;
-import io.netty.handler.codec.http.HttpObjectAggregator;
-import io.netty.handler.codec.http.HttpServerCodec;
-import io.netty.handler.codec.http.websocketx.WebSocketServerProtocolHandler;
-import io.netty.handler.codec.http.websocketx.extensions.compression.WebSocketServerCompressionHandler;
-
-/**
- * Class that holds the channelizers that can used for testing with the SimpleSocketServer.
- */
-public class TestChannelizers {
-
- /**
- * A base ChannelInitializer that setups the pipeline for HTTP handling. This class should be sub-classed by a
- * handler that handles the actual data being received.
- */
- public static abstract class TestHttpServerInitializer extends ChannelInitializer<SocketChannel> {
- protected static final String WEBSOCKET_PATH = "/gremlin";
-
- @Override
- public void initChannel(SocketChannel ch) {
- final ChannelPipeline pipeline = ch.pipeline();
- pipeline.addLast(new HttpServerCodec());
- pipeline.addLast(new HttpObjectAggregator(65536));
- }
- }
-
- /**
- * A vanilla WebSocket server Initializer implementation using Netty. This initializer would configure the server
- * for WebSocket handshake and decoding incoming WebSocket frames.
- */
- public static abstract class TestWebSocketServerInitializer extends TestChannelizers.TestHttpServerInitializer {
-
- @Override
- public void initChannel(SocketChannel ch) {
- super.initChannel(ch);
-
- final ChannelPipeline pipeline = ch.pipeline();
- pipeline.addLast(new WebSocketServerCompressionHandler());
- pipeline.addLast(new WebSocketServerProtocolHandler(WEBSOCKET_PATH, null, true));
- this.postInit(ch.pipeline());
- }
-
- public abstract void postInit(final ChannelPipeline ch);
- }
-
- /**
- * An initializer that adds a handler that will drop WebSocket frames.
- */
- public static class TestWSNoOpInitializer extends TestHttpServerInitializer {
-
- @Override
- public void initChannel(SocketChannel ch) {
- super.initChannel(ch);
- ch.pipeline().addLast(new TestHandlers.NoOpWebSocketServerHandler(WEBSOCKET_PATH));
- }
- }
-
- /**
- * An initializer that adds a handler to mimics a server that is throttling connections.
- */
- public static class TestConnectionThrottlingInitializer extends TestHttpServerInitializer {
- int connectionCount = 0;
- private SocketServerSettings settings;
-
- public TestConnectionThrottlingInitializer(SocketServerSettings settings) { this.settings = settings; }
-
- @Override
- public void initChannel(SocketChannel ch) {
- super.initChannel(ch);
-
- final ChannelPipeline pipeline = ch.pipeline();
- if (connectionCount < 1) {
- pipeline.addLast(new WebSocketServerCompressionHandler());
- pipeline.addLast(new WebSocketServerProtocolHandler(WEBSOCKET_PATH, null, true));
- pipeline.addLast(new TestWSGremlinInitializer.ClientTestConfigurableHandler(settings));
- } else {
- pipeline.addLast(new TestHandlers.NoOpWebSocketServerHandler(WEBSOCKET_PATH));
- }
-
- connectionCount++;
- }
- }
-}
diff --git a/gremlin-tools/gremlin-socket-server/src/main/java/org/apache/tinkerpop/gremlin/socket/server/TestWSGremlinInitializer.java b/gremlin-tools/gremlin-socket-server/src/main/java/org/apache/tinkerpop/gremlin/socket/server/TestWSGremlinInitializer.java
deleted file mode 100644
index 8f5a920..0000000
--- a/gremlin-tools/gremlin-socket-server/src/main/java/org/apache/tinkerpop/gremlin/socket/server/TestWSGremlinInitializer.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.socket.server;
-
-import io.netty.buffer.ByteBufAllocator;
-import io.netty.buffer.UnpooledByteBufAllocator;
-import io.netty.handler.codec.http.HttpHeaders;
-import io.netty.handler.codec.http.websocketx.WebSocketServerProtocolHandler;
-import org.apache.tinkerpop.gremlin.util.ser.AbstractMessageSerializer;
-import org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1;
-import org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV2;
-import org.apache.tinkerpop.gremlin.util.ser.SerializationException;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
-import io.netty.buffer.ByteBuf;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelPipeline;
-import io.netty.handler.codec.MessageToMessageDecoder;
-import io.netty.handler.codec.http.websocketx.BinaryWebSocketFrame;
-import io.netty.handler.codec.http.websocketx.CloseWebSocketFrame;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-
-
-/**
- * Initializer which partially mimics the Gremlin Server. This initializer injects a handler in the
- * server pipeline that can be modified to send the desired response for a test case.
- * This handler identifies incoming requests with ids matching those in {@link SocketServerSettings}
- * and delivers the response which corresponds to the request id.
- */
-public class TestWSGremlinInitializer extends TestChannelizers.TestWebSocketServerInitializer {
- private static final Logger logger = LoggerFactory.getLogger(TestWSGremlinInitializer.class);
- private static final String USER_AGENT_HEADER = "User-Agent";
-
- private final SocketServerSettings settings;
-
- /**
- * Gremlin serializer used for serializing/deserializing the request/response. This should be same as client.
- */
- private static AbstractMessageSerializer SERIALIZER;
- private final static ByteBufAllocator allocator = UnpooledByteBufAllocator.DEFAULT;
-
- public TestWSGremlinInitializer(final SocketServerSettings settings) {
- this.settings = settings;
- switch(settings.SERIALIZER) {
- case "GraphSONV2":
- SERIALIZER = new GraphSONMessageSerializerV2();
- break;
- case "GraphSONV3":
- SERIALIZER = new GraphSONMessageSerializerV3();
- break;
- case "GraphBinaryV1":
- SERIALIZER = new GraphBinaryMessageSerializerV1();
- break;
- default:
- logger.warn("Could not recognize serializer [%s], defaulting to GraphBinaryV1", settings.SERIALIZER);
- SERIALIZER = new GraphBinaryMessageSerializerV1();
- break;
- }
- }
-
- @Override
- public void postInit(ChannelPipeline pipeline) {
- pipeline.addLast(new ClientTestConfigurableHandler(settings));
- }
-
- /**
- * Handler introduced in the server pipeline to configure expected response for test cases.
- */
- static class ClientTestConfigurableHandler extends MessageToMessageDecoder<BinaryWebSocketFrame> {
- private SocketServerSettings settings;
- private String userAgent = "";
- private String secWebsocketExtensions = "";
-
- public ClientTestConfigurableHandler(SocketServerSettings settings) { this.settings = settings; }
-
- @Override
- protected void decode(final ChannelHandlerContext ctx, final BinaryWebSocketFrame frame, final List<Object> objects)
- throws Exception {
- final ByteBuf messageBytes = frame.content();
- final byte len = messageBytes.readByte();
- if (len <= 0) {
- objects.add(RequestMessage.INVALID);
- return;
- }
-
- final ByteBuf contentTypeBytes = ctx.alloc().buffer(len);
- try {
- messageBytes.readBytes(contentTypeBytes);
- } finally {
- contentTypeBytes.release();
- }
- final RequestMessage msg = SERIALIZER.deserializeRequest(messageBytes.discardReadBytes());
- if (msg.getRequestId().equals(settings.SINGLE_VERTEX_DELAYED_CLOSE_CONNECTION_REQUEST_ID)) {
- logger.info("sending vertex result frame");
- ctx.channel().writeAndFlush(new BinaryWebSocketFrame(returnSingleVertexResponse(
- settings.SINGLE_VERTEX_DELAYED_CLOSE_CONNECTION_REQUEST_ID)));
- logger.info("waiting for 2 sec");
- Thread.sleep(2000);
- logger.info("sending close frame");
- ctx.channel().writeAndFlush(new CloseWebSocketFrame());
- } else if (msg.getRequestId().equals(settings.SINGLE_VERTEX_REQUEST_ID)) {
- logger.info("sending vertex result frame");
- ctx.channel().writeAndFlush(new BinaryWebSocketFrame(returnSingleVertexResponse(settings.SINGLE_VERTEX_REQUEST_ID)));
- } else if (msg.getRequestId().equals(settings.FAILED_AFTER_DELAY_REQUEST_ID)) {
- logger.info("waiting for 1 sec");
- Thread.sleep(1000);
- final ResponseMessage responseMessage = ResponseMessage.build(msg)
- .code(ResponseStatusCode.SERVER_ERROR)
- .statusAttributeException(new RuntimeException()).create();
- ctx.channel().writeAndFlush(new BinaryWebSocketFrame(SERIALIZER.serializeResponseAsBinary(responseMessage, allocator)));
- } else if (msg.getRequestId().equals(settings.CLOSE_CONNECTION_REQUEST_ID) || msg.getRequestId().equals(settings.CLOSE_CONNECTION_REQUEST_ID_2)) {
- Thread.sleep(1000);
- ctx.channel().writeAndFlush(new CloseWebSocketFrame());
- } else if (msg.getRequestId().equals(settings.USER_AGENT_REQUEST_ID)) {
- ctx.channel().writeAndFlush(new BinaryWebSocketFrame(returnSimpleBinaryResponse(settings.USER_AGENT_REQUEST_ID, userAgent)));
- } else if (msg.getRequestId().equals(settings.SEC_WEBSOCKET_EXTENSIONS)) {
- ctx.channel().writeAndFlush(new BinaryWebSocketFrame(returnSimpleBinaryResponse(settings.SEC_WEBSOCKET_EXTENSIONS, secWebsocketExtensions)));
- } else if (msg.getRequestId().equals(settings.PER_REQUEST_SETTINGS_REQUEST_ID)) {
- String response = String.format("requestId=%s evaluationTimeout=%d, batchSize=%d, userAgent=%s, materializeProperties=%s",
- msg.getRequestId(), msg.getArgs().get("evaluationTimeout"),
- msg.getArgs().get("batchSize"), msg.getArgs().get("userAgent"), msg.getArgs().get("materializeProperties"));
- ctx.channel().writeAndFlush(new BinaryWebSocketFrame(returnSimpleBinaryResponse(settings.PER_REQUEST_SETTINGS_REQUEST_ID, response)));
- } else {
- try {
- Thread.sleep(Long.parseLong((String) msg.getArgs().get("gremlin")));
- ctx.channel().writeAndFlush(new BinaryWebSocketFrame(returnSingleVertexResponse(msg.getRequestId())));
- } catch (NumberFormatException nfe) {
- // Ignore. Only return a vertex if the query was a long value.
- logger.warn("Request unknown request with RequestId: %s", msg.getRequestId());
- }
- }
- }
-
- private ByteBuf returnSingleVertexResponse(final UUID requestID) throws SerializationException {
- final TinkerGraph graph = TinkerFactory.createClassic();
- final GraphTraversalSource g = graph.traversal();
- final List<Vertex> t = new ArrayList<>(1);
- t.add(g.V().limit(1).next());
-
- return SERIALIZER.serializeResponseAsBinary(ResponseMessage.build(requestID).result(t).create(), allocator);
- }
-
- /**
- * Packages a string message into a ResponseMessage and serializes it into a ByteBuf
- * @throws SerializationException
- */
- private ByteBuf returnSimpleBinaryResponse(final UUID requestID, String message) throws SerializationException {
- //Need to package message in a list of size 1 as some GLV's serializers require all messages to be in a list
- final List<String> messageList = new ArrayList<>(1);
- messageList.add(message);
- return SERIALIZER.serializeResponseAsBinary(ResponseMessage.build(requestID).result(messageList).create(), allocator);
- }
-
- /**
- * Captures and stores User-Agent if included in header
- */
- @Override
- public void userEventTriggered(final ChannelHandlerContext ctx, final Object evt) {
- if(evt instanceof WebSocketServerProtocolHandler.HandshakeComplete) {
- WebSocketServerProtocolHandler.HandshakeComplete handshake = (WebSocketServerProtocolHandler.HandshakeComplete) evt;
- HttpHeaders requestHeaders = handshake.requestHeaders();
- if(requestHeaders.contains(USER_AGENT_HEADER)) {
- userAgent = requestHeaders.get(USER_AGENT_HEADER);
- }
- if(requestHeaders.contains("sec-websocket-extensions")) {
- secWebsocketExtensions = requestHeaders.get("sec-websocket-extensions");
- }
- else {
- ctx.fireUserEventTriggered(evt);
- }
- }
- }
- }
-}
diff --git a/gremlin-tools/pom.xml b/gremlin-tools/pom.xml
index 6aebca2..569fe97 100644
--- a/gremlin-tools/pom.xml
+++ b/gremlin-tools/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>tinkerpop</artifactId>
<groupId>org.apache.tinkerpop</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>gremlin-tools</artifactId>
diff --git a/gremlin-util/pom.xml b/gremlin-util/pom.xml
index 14f3a02..12141fb 100644
--- a/gremlin-util/pom.xml
+++ b/gremlin-util/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>tinkerpop</artifactId>
<groupId>org.apache.tinkerpop</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -28,10 +28,6 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- </dependency>
<!-- TEST -->
<dependency>
<groupId>org.apache.tinkerpop</groupId>
diff --git a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/MessageSerializer.java b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/MessageSerializer.java
index a46cad1..522858e 100644
--- a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/MessageSerializer.java
+++ b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/MessageSerializer.java
@@ -27,6 +27,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.EnumSet;
import java.util.Iterator;
import java.util.Map;
import java.util.ServiceLoader;
@@ -70,12 +71,12 @@
/**
* Deserialize a Netty {@code ByteBuf} into a {@link RequestMessage}.
*/
- public RequestMessage deserializeRequest(final ByteBuf msg) throws SerializationException;
+ public RequestMessage deserializeBinaryRequest(final ByteBuf msg) throws SerializationException;
/**
- * Deserialize a Netty {@code ByteBuf} into a {@link ResponseMessage}.
+ * Deserialize a Netty {@code ByteBuf} into a {@link RequestMessage}.
*/
- public ResponseMessage deserializeResponse(final ByteBuf msg) throws SerializationException;
+ public ResponseMessage deserializeBinaryResponse(final ByteBuf msg) throws SerializationException;
/**
* The list of mime types that the serializer supports. They should be ordered in preferred ordered where the
@@ -92,4 +93,25 @@
*/
public default void configure(final Map<String, Object> config, final Map<String, Graph> graphs) {
}
+
+ public ByteBuf writeHeader(final ResponseMessage responseMessage, final ByteBufAllocator allocator) throws SerializationException;
+
+ public ByteBuf writeChunk(final Object aggregate, final ByteBufAllocator allocator) throws SerializationException;
+
+ public ByteBuf writeFooter(final ResponseMessage responseMessage, final ByteBufAllocator allocator) throws SerializationException;
+
+ public ByteBuf writeErrorFooter(final ResponseMessage responseMessage, final ByteBufAllocator allocator) throws SerializationException;
+
+ public ResponseMessage readChunk(final ByteBuf byteBuf, final boolean isFirstChunk) throws SerializationException;
+
+ public enum MessageParts {
+ HEADER, DATA, FOOTER;
+
+ public static final EnumSet<MessageParts> ALL = EnumSet.of(HEADER, DATA, FOOTER);
+ public static final EnumSet<MessageParts> START = EnumSet.of(HEADER, DATA);
+ public static final EnumSet<MessageParts> CHUNK = EnumSet.of(DATA);
+ public static final EnumSet<MessageParts> END = EnumSet.of(DATA, FOOTER);
+ public static final EnumSet<MessageParts> ERROR = EnumSet.of(FOOTER);
+ }
+
}
diff --git a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/Tokens.java b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/Tokens.java
index eaa3308..5174631 100644
--- a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/Tokens.java
+++ b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/Tokens.java
@@ -18,8 +18,6 @@
*/
package org.apache.tinkerpop.gremlin.util;
-import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.process.traversal.Failure;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
import org.apache.tinkerpop.gremlin.structure.Graph;
@@ -31,19 +29,8 @@
public final class Tokens {
private Tokens() {}
- public static final String OPS_AUTHENTICATION = "authentication";
- public static final String OPS_BYTECODE = "bytecode";
- public static final String OPS_EVAL = "eval";
- public static final String OPS_INVALID = "invalid";
- public static final String OPS_CLOSE = "close";
-
/**
- * The key for the unique identifier of the request.
- */
- public static final String REQUEST_ID = "requestId";
-
- /**
- * Argument name that allows definition of the number of iterations each {@link ResponseMessage} should contain -
+ * Argument name that allows definition of the number of iterations each HTTP chunk should contain -
* overrides the @{code resultIterationBatchSize} server setting.
*/
public static final String ARGS_BATCH_SIZE = "batchSize";
@@ -58,8 +45,7 @@
* Argument name that allows definition of alias names for {@link Graph} and {@link TraversalSource} objects on
* the remote system.
*/
- public static final String ARGS_ALIASES = "aliases";
- public static final String ARGS_FORCE = "force";
+ public static final String ARGS_G = "g";
/**
* Argument name that corresponds to the Gremlin to evaluate.
@@ -76,9 +62,6 @@
* request to execute on the server.
*/
public static final String ARGS_EVAL_TIMEOUT = "evaluationTimeout";
- public static final String ARGS_HOST = "host";
- public static final String ARGS_SESSION = "session";
- public static final String ARGS_MANAGE_TRANSACTION = "manageTransaction";
/**
* The name of the argument that allows to control the serialization of properties on the server.
@@ -98,51 +81,18 @@
public static final String MATERIALIZE_PROPERTIES_TOKENS = "tokens";
/**
- * Argument name that is intended to be used with a session which when its value is {@code true} makes it so
- * that a processing error or request timeout will not close the session, but leave it to continue processing in
- * whatever state it may hold. This argument only applies to the {@code UnifiedChannelizer}.
+ * The key for the per request server-side timeout in milliseconds.
*/
- public static final String ARGS_MAINTAIN_STATE_AFTER_EXCEPTION = "maintainStateAfterException";
- public static final String ARGS_SASL = "sasl";
- public static final String ARGS_SASL_MECHANISM = "saslMechanism";
+ public static final String TIMEOUT_MS = "timeoutMs";
+
+ /**
+ * The key for server to bulk result as a form of optimization for driver requests.
+ */
+ public static final String BULK_RESULTS = "bulkResults";
/**
* A value that is a custom string that the user can pass to a server that might accept it for purpose of
* identifying the kind of client it came from.
*/
public static final String ARGS_USER_AGENT = "userAgent";
-
- public static final String VAL_TRAVERSAL_SOURCE_ALIAS = "g";
-
- /**
- * The value of this key holds a string representation of the data held by a {@link Failure} as produced by
- * {@link Failure#format()}.
- */
- public static final String STATUS_ATTRIBUTE_FAIL_STEP_MESSAGE = "failStepMessage";
-
- /**
- * Refers to the hierarchy of exception names for a particular exception thrown on the server.
- */
- public static final String STATUS_ATTRIBUTE_EXCEPTIONS = "exceptions";
-
- /**
- * Refers to the stacktrace for an exception thrown on the server
- */
- public static final String STATUS_ATTRIBUTE_STACK_TRACE = "stackTrace";
-
- /**
- * A {@code ResultSet#statusAttributes()} key for user-facing warnings.
- * <p>
- * Implementations that set this key should consider using one of
- * these two recommended value types:
- * <ul>
- * <li>A {@code List} implementation containing
- * references for which {@code String#valueOf(Object)} produces
- * a meaningful return value. For example, a list of strings.</li>
- * <li>Otherwise, any single non-list object for which
- * {@code String#valueOf(Object)} produces a meaningful return value.
- * For example, a string.</li>
- * </ul>
- */
- public static final String STATUS_ATTRIBUTE_WARNINGS = "warnings";
}
diff --git a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/message/RequestMessage.java b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/message/RequestMessage.java
index bea8fc6..9d965b1 100644
--- a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/message/RequestMessage.java
+++ b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/message/RequestMessage.java
@@ -19,144 +19,149 @@
package org.apache.tinkerpop.gremlin.util.message;
import org.apache.tinkerpop.gremlin.util.Tokens;
-import org.apache.tinkerpop.gremlin.structure.util.ElementHelper;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import java.util.Objects;
import java.util.Optional;
-import java.util.UUID;
/**
- * The model for a request message sent to the server.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
+ * The model for a request message in the HTTP body that is sent to the server beginning in 4.0.0.
*/
public final class RequestMessage {
- /**
- * An "invalid" message. Used internally only.
- */
- public static final RequestMessage INVALID = new RequestMessage(Tokens.OPS_INVALID);
+ private String gremlin;
+ private Map<String, Object> fields;
- private final UUID requestId;
- private final String op;
- private final String processor;
- private final Map<String, Object> args;
+ private RequestMessage(final String gremlin, final Map<String, Object> fields) {
+ if (null == gremlin) throw new IllegalArgumentException("RequestMessage requires gremlin argument");
- private RequestMessage(final UUID requestId, final String op, final String processor, final Map<String, Object> args) {
- this.requestId = requestId;
- this.op = op;
- this.processor = processor;
- this.args = Optional.ofNullable(args).orElse(new HashMap<>());
+ this.gremlin = gremlin;
+ this.fields = fields;
+
+ this.fields.putIfAbsent(Tokens.ARGS_LANGUAGE, "gremlin-lang");
}
/**
* Empty constructor for serialization.
*/
- private RequestMessage() {
- this(null);
- }
+ private RequestMessage() { }
- private RequestMessage(final String op) {
- this(null, op, null, null);
- }
-
- /**
- * The id of the current request and is used to track the message within Gremlin Server and in its response. This
- * value should be unique per request made.
- */
- public UUID getRequestId() {
- return requestId;
- }
-
- /**
- * The operation or command to perform as defined by a particular Processor.
- */
- public String getOp() {
- return op;
- }
-
- /**
- * The name of the Processor that should handle the {@link #op}. Defaults to the standard processor if
- * not specified.
- */
- public String getProcessor() {
- return processor;
- }
-
- /**
- * A {@link Map} of arguments that are supplied to the {@link #op}. Each {@link #op} accepts different argument,
- * so consult the documentation for a particular one to understand what is expected.
- */
- public Map<String, Object> getArgs() {
- return args;
- }
-
- public <T> Optional<T> optionalArgs(final String key) {
- final Object o = args.get(key);
+ public <T> Optional<T> optionalField(final String key) {
+ final Object o = fields.get(key);
return o == null ? Optional.empty() : Optional.of((T) o);
}
- public <T> T getArg(final String key) {
- return (T) args.get(key);
+ public <T> T getField(final String key) {
+ return (T) fields.get(key);
}
- public <T> T getArgOrDefault(final String key, final T def) {
- return (T) optionalArgs(key).orElse(def);
+ public <T> T getFieldOrDefault(final String key, final T def) {
+ return (T) optionalField(key).orElse(def);
+ }
+
+ public String getGremlin() {
+ return gremlin;
+ }
+
+ public Map<String, Object> getFields() {
+ return Collections.unmodifiableMap(fields);
+ }
+
+ public RequestMessage trimMessage(int size) {
+ gremlin = gremlin.substring(0, size) + "...";
+ return this;
}
public static Builder from(final RequestMessage msg) {
- final Builder builder = build(msg.op)
- .overrideRequestId(msg.requestId)
- .processor(msg.processor);
- msg.args.forEach(builder::addArg);
+ final Builder builder = build(msg.gremlin);
+ builder.fields.putAll(msg.getFields());
+ if (msg.getFields().containsKey(Tokens.ARGS_BINDINGS)) {
+ builder.addBindings((Map<String, Object>) msg.getFields().get(Tokens.ARGS_BINDINGS));
+ }
return builder;
}
- public static Builder build(final String op) {
- return new Builder(op);
+ public static Builder from(final RequestMessage msg, final String gremlin) {
+ final Builder builder = build(gremlin);
+ builder.fields.putAll(msg.getFields());
+ if (msg.getFields().containsKey(Tokens.ARGS_BINDINGS)) {
+ builder.addBindings((Map<String, Object>) msg.getFields().get(Tokens.ARGS_BINDINGS));
+ }
+ return builder;
+ }
+
+ @Override
+ public String toString() {
+ return "RequestMessage{" +
+ ", fields=" + fields +
+ ", gremlin=" + gremlin +
+ '}';
+ }
+
+ public static Builder build(final String gremlin) {
+ return new Builder(gremlin);
}
/**
* Builder class for {@link RequestMessage}.
*/
public static final class Builder {
- public static final String OP_PROCESSOR_NAME = "";
- private UUID requestId;
- private String op;
- private String processor = OP_PROCESSOR_NAME;
- private Map<String, Object> args = new HashMap<>();
+ private final String gremlin;
+ private final Map<String, Object> bindings = new HashMap<>();
+ private final Map<String, Object> fields = new HashMap<>(); // Only allow certain items to be added to prevent breaking changes.
- private Builder(final String op) {
- this.op = op;
+ private Builder(final String gremlin) {
+ this.gremlin = gremlin;
}
- /**
- * If this value is not set in the builder then the {@link RequestMessage#processor} defaults to
- * the standard op processor (empty string).
- *
- * @param processor the name of the processor
- */
- public Builder processor(final String processor) {
- this.processor = processor;
+ public Builder addLanguage(final String language) {
+ Objects.requireNonNull(language, "language argument cannot be null.");
+ this.fields.put(Tokens.ARGS_LANGUAGE, language);
return this;
}
- /**
- * Override the request identifier with a specified one, otherwise the {@link Builder} will randomly generate
- * a {@link UUID}.
- */
- public Builder overrideRequestId(final UUID requestId) {
- this.requestId = requestId;
+ public Builder addBinding(final String key, final Object val) {
+ bindings.put(key, val);
return this;
}
- public Builder addArg(final String key, final Object val) {
- args.put(key, val);
+ public Builder addBindings(final Map<String, Object> otherBindings) {
+ Objects.requireNonNull(otherBindings, "bindings argument cannot be null.");
+ this.bindings.putAll(otherBindings);
return this;
}
- public Builder add(final Object... keyValues) {
- args.putAll(ElementHelper.asMap(keyValues));
+ public Builder addG(final String g) {
+ Objects.requireNonNull(g, "g argument cannot be null.");
+ this.fields.put(Tokens.ARGS_G, g);
+ return this;
+ }
+
+ public Builder addChunkSize(final int chunkSize) {
+ this.fields.put(Tokens.ARGS_BATCH_SIZE, chunkSize);
+ return this;
+ }
+
+ public Builder addMaterializeProperties(final String materializeProps) {
+ Objects.requireNonNull(materializeProps, "materializeProps argument cannot be null.");
+ if (!materializeProps.equals(Tokens.MATERIALIZE_PROPERTIES_TOKENS) && !materializeProps.equals(Tokens.MATERIALIZE_PROPERTIES_ALL)) {
+ throw new IllegalArgumentException("materializeProperties argument must be either token or all.");
+ }
+
+ this.fields.put(Tokens.ARGS_MATERIALIZE_PROPERTIES, materializeProps);
+ return this;
+ }
+
+ public Builder addTimeoutMillis(final long timeout) {
+ if (timeout < 0) throw new IllegalArgumentException("timeout argument cannot be negative.");
+
+ this.fields.put(Tokens.TIMEOUT_MS, timeout);
+ return this;
+ }
+
+ public Builder addBulkResults(final boolean bulking) {
+ this.fields.put(Tokens.BULK_RESULTS, String.valueOf(bulking));
return this;
}
@@ -164,17 +169,8 @@
* Create the request message given the settings provided to the {@link Builder}.
*/
public RequestMessage create() {
- return new RequestMessage(null == requestId ? UUID.randomUUID() : requestId, op, processor, args);
+ this.fields.put(Tokens.ARGS_BINDINGS, bindings);
+ return new RequestMessage(gremlin, fields);
}
}
-
- @Override
- public String toString() {
- return "RequestMessage{" +
- ", requestId=" + requestId +
- ", op='" + op + '\'' +
- ", processor='" + processor + '\'' +
- ", args=" + args +
- '}';
- }
}
diff --git a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/message/ResponseMessage.java b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/message/ResponseMessage.java
index b0dbf0b..6251f6d 100644
--- a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/message/ResponseMessage.java
+++ b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/message/ResponseMessage.java
@@ -18,38 +18,28 @@
*/
package org.apache.tinkerpop.gremlin.util.message;
-import org.apache.commons.lang3.exception.ExceptionUtils;
-import org.apache.tinkerpop.gremlin.util.Tokens;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+import io.netty.handler.codec.http.HttpResponseStatus;
import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
+import java.util.List;
/**
+ * The model for a response message that is sent to the server beginning in 4.0.0. ResponseMessage is designed to be
+ * streamed back the client in parts so depending on the state of the transfer, certain parts may be null at different
+ * times.
+ *
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
public final class ResponseMessage {
-
- /**
- * The current request that generated this response.
- */
- private final UUID requestId;
private final ResponseStatus responseStatus;
private final ResponseResult responseResult;
- private ResponseMessage(final UUID requestId, final ResponseStatus responseStatus,
+ private ResponseMessage(final ResponseStatus responseStatus,
final ResponseResult responseResult) {
- this.requestId = requestId;
this.responseResult = responseResult;
this.responseStatus = responseStatus;
}
- public UUID getRequestId() {
- return requestId;
- }
-
public ResponseStatus getStatus() {
return responseStatus;
}
@@ -61,38 +51,61 @@
@Override
public String toString() {
return "ResponseMessage{" +
- "requestId=" + requestId +
", status=" + responseStatus +
", result=" + responseResult +
'}';
}
- public static Builder build(final RequestMessage requestMessage) {
- return new Builder(requestMessage);
+ public static class ResponseMessageHeader {
+ private final ResponseMessage responseMessage;
+ private final boolean typed;
+
+ public ResponseMessageHeader(final ResponseMessage responseMessage, final boolean typed) {
+ this.responseMessage = responseMessage;
+ this.typed = typed;
+ }
+
+ public ResponseMessage getResponseMessage() {
+ return responseMessage;
+ }
+
+ public boolean getTyped() {
+ return typed;
+ }
}
- public static Builder build(final UUID requestId) {
- return new Builder(requestId);
+ public static class ResponseMessageFooter {
+ private final ResponseMessage responseMessage;
+ private final boolean typed;
+
+ public ResponseMessageFooter(final ResponseMessage responseMessage, final boolean typed) {
+ this.responseMessage = responseMessage;
+ this.typed = typed;
+ }
+
+ public ResponseMessage getResponseMessage() {
+ return responseMessage;
+ }
+
+ public boolean getTyped() {
+ return typed;
+ }
+ }
+
+ public static Builder build() {
+ return new Builder();
}
public final static class Builder {
+ private HttpResponseStatus code = null;
+ private List<Object> result = Collections.emptyList();
+ private boolean bulked = false;
+ private String statusMessage = null;
+ private String exception = null;
- private final UUID requestId;
- private ResponseStatusCode code = ResponseStatusCode.SUCCESS;
- private Object result = null;
- private String statusMessage = "";
- private Map<String, Object> attributes = Collections.emptyMap();
- private Map<String, Object> metaData = Collections.emptyMap();
+ private Builder() { }
- private Builder(final RequestMessage requestMessage) {
- this.requestId = requestMessage.getRequestId();
- }
-
- private Builder(final UUID requestId) {
- this.requestId = requestId;
- }
-
- public Builder code(final ResponseStatusCode code) {
+ public Builder code(final HttpResponseStatus code) {
this.code = code;
return this;
}
@@ -102,39 +115,29 @@
return this;
}
- public Builder statusAttributes(final Map<String, Object> attributes) {
- this.attributes = attributes;
+ public Builder exception(final String exception) {
+ this.exception = exception;
return this;
}
- public Builder statusAttributeException(final Throwable ex) {
- statusAttribute(Tokens.STATUS_ATTRIBUTE_EXCEPTIONS, IteratorUtils.asList(
- IteratorUtils.map(ExceptionUtils.getThrowableList(ex), t -> t.getClass().getName())));
- statusAttribute(Tokens.STATUS_ATTRIBUTE_STACK_TRACE, ExceptionUtils.getStackTrace(ex));
- return this;
- }
-
- public Builder statusAttribute(final String key, final Object value) {
- if (this.attributes == Collections.EMPTY_MAP)
- attributes = new HashMap<>();
- attributes.put(key, value);
- return this;
- }
-
- public Builder result(final Object result) {
+ public Builder result(final List<Object> result) {
this.result = result;
return this;
}
- public Builder responseMetaData(final Map<String, Object> metaData) {
- this.metaData = metaData;
+ public Builder bulked(final boolean bulked) {
+ this.bulked = bulked;
return this;
}
public ResponseMessage create() {
- final ResponseResult responseResult = new ResponseResult(result, metaData);
- final ResponseStatus responseStatus = new ResponseStatus(code, statusMessage, attributes);
- return new ResponseMessage(requestId, responseStatus, responseResult);
+ final ResponseResult responseResult = new ResponseResult(result, bulked);
+ // skip null values
+ if (code == null && statusMessage == null) {
+ return new ResponseMessage(null, responseResult);
+ }
+ final ResponseStatus responseStatus = new ResponseStatus(code, statusMessage, exception);
+ return new ResponseMessage(responseStatus, responseResult);
}
}
}
diff --git a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/message/ResponseResult.java b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/message/ResponseResult.java
index 9cf5a6c..3d8ec51 100644
--- a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/message/ResponseResult.java
+++ b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/message/ResponseResult.java
@@ -18,33 +18,32 @@
*/
package org.apache.tinkerpop.gremlin.util.message;
-import java.util.Map;
+import java.util.List;
/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
+ * Data model for the "result" portion of a {@link ResponseMessage}.
*/
public final class ResponseResult {
- private final Object data;
- private final Map<String, Object> meta;
+ private final List<Object> data;
+ private final boolean bulked;
- public ResponseResult(final Object data, final Map<String, Object> meta) {
+ public ResponseResult(final List<Object> data, final boolean bulked) {
+ this.bulked = bulked;
this.data = data;
- this.meta = meta;
}
- public Object getData() {
+ public List<Object> getData() {
return data;
}
- public Map<String, Object> getMeta() {
- return meta;
+ public boolean isBulked() {
+ return bulked;
}
@Override
public String toString() {
return "ResponseResult{" +
"data=" + data +
- ", meta=" + meta +
'}';
}
}
diff --git a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/message/ResponseStatus.java b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/message/ResponseStatus.java
index dbc2995..71ceb48 100644
--- a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/message/ResponseStatus.java
+++ b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/message/ResponseStatus.java
@@ -18,26 +18,26 @@
*/
package org.apache.tinkerpop.gremlin.util.message;
-import java.util.Map;
+import io.netty.handler.codec.http.HttpResponseStatus;
/**
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
public final class ResponseStatus {
- private final ResponseStatusCode code;
+ private final HttpResponseStatus code;
private final String message;
- private final Map<String, Object> attributes;
+ private final String exception;
- public ResponseStatus(final ResponseStatusCode code, final String message, final Map<String, Object> attributes) {
+ public ResponseStatus(final HttpResponseStatus code, final String message, final String exception) {
this.code = code;
this.message = message;
- this.attributes = attributes;
+ this.exception = exception;
}
/**
- * Gets the {@link ResponseStatusCode} that describes how the server responded to the request.
+ * Gets the {@link HttpResponseStatus} that describes how the server responded to the request.
*/
- public ResponseStatusCode getCode() {
+ public HttpResponseStatus getCode() {
return code;
}
@@ -49,11 +49,10 @@
}
/**
- * Gets the meta-data related to the response. If meta-data is returned it is to be considered specific to the
- * "op" that is executed. Not all "op" implementations will return meta-data.
+ * Gets the exception in case of error.
*/
- public Map<String, Object> getAttributes() {
- return attributes;
+ public String getException() {
+ return exception;
}
@Override
@@ -61,7 +60,7 @@
return "ResponseStatus{" +
"code=" + code +
", message='" + message + '\'' +
- ", attributes=" + attributes +
+ ", exception=" + exception +
'}';
}
}
diff --git a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/message/ResponseStatusCode.java b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/message/ResponseStatusCode.java
deleted file mode 100644
index 98c727e..0000000
--- a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/message/ResponseStatusCode.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.util.message;
-
-import org.apache.tinkerpop.gremlin.process.traversal.Failure;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.stream.Stream;
-
-/**
- * Response status codes for Gremlin Server responses. Result codes tend to map to
- * <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html">HTTP status codes</a>. It is not a one-to-one
- * mapping and there are mapper status codes to be considered.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public enum ResponseStatusCode {
-
- /**
- * Code 200: The server successfully processed a request to completion - there are no messages remaining in this
- * stream.
- *
- * @since 3.0.0-incubating
- */
- SUCCESS(200),
-
- /**
- * Code 204: The server processed the request but there is no result to return (e.g. an {@link Iterator} with no
- * elements).
- *
- * @since 3.0.0-incubating
- */
- NO_CONTENT(204),
-
- /**
- * Code 206: The server successfully returned some content, but there is more in the stream to arrive - wait for a
- * {@link #SUCCESS} to signify the end of the stream.
- *
- * @since 3.0.0-incubating
- */
- PARTIAL_CONTENT(206),
-
- /**
- * Code 401: The server could not authenticate the request or the client requested a resource it did not have
- * access to.
- *
- * @since 3.0.0-incubating
- */
- UNAUTHORIZED(401),
-
- /**
- * Code 403: The server could authenticate the request, but will not fulfill it. This is a general purpose code
- * that would typically be returned if the request is authenticated but not authorized to do what it is doing.
- *
- * @since 3.0.1-incubating
- */
- FORBIDDEN(403),
-
- /**
- * Code 407: A challenge from the server for the client to authenticate its request.
- *
- * @since 3.0.1-incubating
- */
- AUTHENTICATE(407),
-
- /**
- * Code 429: Indicates that too many requests have been sent in a given amount of time.
- *
- * @since 3.5.0
- */
- TOO_MANY_REQUESTS(429),
-
- /**
- * Code 497: The request message contains objects that were not serializable on the client side.
- *
- * @since 3.3.6
- */
- REQUEST_ERROR_SERIALIZATION(497),
-
- /**
- * Code 498: The request message was not properly formatted which means it could not be parsed at all or the "op"
- * code was not recognized such that Gremlin Server could properly route it for processing. Check the message
- * format and retry the request.
- *
- * @since 3.0.0-incubating
- */
- REQUEST_ERROR_MALFORMED_REQUEST(498),
-
- /**
- * Code 499: The request message was parseable, but the arguments supplied in the message were in conflict or
- * incomplete. Check the message format and retry the request.
- *
- * @since 3.0.0-incubating
- */
- REQUEST_ERROR_INVALID_REQUEST_ARGUMENTS(499),
-
- /**
- * Code 500: A general server error occurred that prevented the request from being processed.
- *
- * @since 3.0.0-incubating
- */
- SERVER_ERROR(500),
-
- /**
- * Code 595: A server error that is produced when the {@link GraphTraversal#fail()} step is triggered. The
- * returned exception will include information consistent with the {@link Failure} interface.
- *
- * @since 3.6.0
- */
- SERVER_ERROR_FAIL_STEP(595),
-
- /**
- * Code 596: A server error that indicates that the client should retry the request. A graph will typically return
- * this error when a transaction fails due to a locking exception or some other sort of concurrent modification.
- * In other words, the request was likely valid but the state of the server at the particular time the request
- * arrived could not be processed to success, but could be at a later moment.
- *
- * @since 3.4.11
- */
- SERVER_ERROR_TEMPORARY(596),
-
- /**
- * Code 597: The request submitted for processing evaluated by the server with errors and could not be processed.
- * Check the script or remote traversal submitted for errors or other problems and then resubmit.
- *
- * @since 3.0.0-incubating
- */
- SERVER_ERROR_EVALUATION(597),
-
- /**
- * Code 598: The server exceeded one of the timeout settings for the request and could therefore only partially
- * responded or did not respond at all.
- *
- * @since 3.0.0-incubating
- */
- SERVER_ERROR_TIMEOUT(598),
-
- /**
- * Code 599: The server was not capable of serializing an object that was returned from the script supplied on the
- * request. Either transform the object into something Gremlin Server can process within the script or install
- * mapper serialization classes to Gremlin Server.
- *
- * @since 3.0.0-incubating
- */
- SERVER_ERROR_SERIALIZATION(599);
-
- private final int value;
- private final static Map<Integer, ResponseStatusCode> codeValueMap = new HashMap<>();
-
- static {
- Stream.of(ResponseStatusCode.values()).forEach(code -> codeValueMap.put(code.getValue(), code));
- }
-
- public static ResponseStatusCode getFromValue(final int codeValue) {
- return codeValueMap.get(codeValue);
- }
-
- ResponseStatusCode(final int value) {
- this.value = value;
- }
-
- public int getValue() {
- return value;
- }
-
- public boolean isSuccess() {
- return String.valueOf(this.value).startsWith("2");
- }
-
- /**
- * Indicates whether the status code can only be used in the last response for a particular request.
- */
- public boolean isFinalResponse() {
- return this != PARTIAL_CONTENT && this != AUTHENTICATE;
- }
-}
diff --git a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/AbstractGraphSONMessageSerializerV1.java b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/AbstractGraphSONMessageSerializerV1.java
deleted file mode 100644
index 66fe869..0000000
--- a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/AbstractGraphSONMessageSerializerV1.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.util.ser;
-
-import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufAllocator;
-import io.netty.util.ReferenceCountUtil;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONUtil;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONVersion;
-import org.apache.tinkerpop.shaded.jackson.core.JsonGenerationException;
-import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
-import org.apache.tinkerpop.shaded.jackson.core.JsonProcessingException;
-import org.apache.tinkerpop.shaded.jackson.core.type.TypeReference;
-import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
-import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
-import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
-import org.apache.tinkerpop.shaded.jackson.databind.module.SimpleModule;
-import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public abstract class AbstractGraphSONMessageSerializerV1 extends AbstractMessageSerializer<ObjectMapper> {
- private static final Logger logger = LoggerFactory.getLogger(AbstractGraphSONMessageSerializerV1.class);
-
- protected ObjectMapper mapper;
-
- protected final TypeReference<Map<String, Object>> mapTypeReference = new TypeReference<Map<String, Object>>() {
- };
-
- public AbstractGraphSONMessageSerializerV1() {
- final GraphSONMapper.Builder builder = configureBuilder(initBuilder(null));
- mapper = builder.create().createMapper();
- }
-
- public AbstractGraphSONMessageSerializerV1(final GraphSONMapper mapper) {
- this.mapper = mapper.createMapper();
- }
-
- abstract byte[] obtainHeader();
-
- abstract GraphSONMapper.Builder configureBuilder(final GraphSONMapper.Builder builder);
-
- @Override
- public void configure(final Map<String, Object> config, final Map<String, Graph> graphs) {
- final GraphSONMapper.Builder initialBuilder = initBuilder(null);
- addIoRegistries(config, initialBuilder);
- applyMaxTokenLimits(initialBuilder, config);
- mapper = configureBuilder(initialBuilder).create().createMapper();
- }
-
- @Override
- public ByteBuf serializeResponseAsBinary(final ResponseMessage responseMessage, final ByteBufAllocator allocator) throws SerializationException {
- ByteBuf encodedMessage = null;
- try {
- final byte[] payload = mapper.writeValueAsBytes(responseMessage);
- encodedMessage = allocator.buffer(payload.length);
- encodedMessage.writeBytes(payload);
-
- return encodedMessage;
- } catch (Exception ex) {
- if (encodedMessage != null) ReferenceCountUtil.release(encodedMessage);
-
- logger.warn("Response [{}] could not be serialized by {}.", responseMessage.toString(), AbstractGraphSONMessageSerializerV1.class.getName());
- throw new SerializationException(ex);
- }
- }
-
- @Override
- public ByteBuf serializeRequestAsBinary(final RequestMessage requestMessage, final ByteBufAllocator allocator) throws SerializationException {
- ByteBuf encodedMessage = null;
- try {
- final byte[] header = obtainHeader();
- final byte[] payload = mapper.writeValueAsBytes(requestMessage);
-
- encodedMessage = allocator.buffer(header.length + payload.length);
- encodedMessage.writeBytes(header);
- encodedMessage.writeBytes(payload);
-
- return encodedMessage;
- } catch (Exception ex) {
- if (encodedMessage != null) ReferenceCountUtil.release(encodedMessage);
-
- logger.warn("Request [{}] could not be serialized by {}.", requestMessage.toString(), AbstractGraphSONMessageSerializerV1.class.getName());
- throw new SerializationException(ex);
- }
- }
-
- @Override
- public RequestMessage deserializeRequest(final ByteBuf msg) throws SerializationException {
- try {
- final byte[] payload = new byte[msg.readableBytes()];
- msg.readBytes(payload);
- return mapper.readValue(payload, RequestMessage.class);
- } catch (Exception ex) {
- logger.warn("Request [{}] could not be deserialized by {}.", msg, AbstractGraphSONMessageSerializerV1.class.getName());
- throw new SerializationException(ex);
- }
- }
-
- @Override
- public ResponseMessage deserializeResponse(final ByteBuf msg) throws SerializationException {
- try {
- final byte[] payload = new byte[msg.readableBytes()];
- msg.readBytes(payload);
- final Map<String, Object> responseData = mapper.readValue(payload, mapTypeReference);
- final Map<String, Object> status = (Map<String, Object>) responseData.get(SerTokens.TOKEN_STATUS);
- final Map<String, Object> result = (Map<String, Object>) responseData.get(SerTokens.TOKEN_RESULT);
- return ResponseMessage.build(UUID.fromString(responseData.get(SerTokens.TOKEN_REQUEST).toString()))
- .code(ResponseStatusCode.getFromValue((Integer) status.get(SerTokens.TOKEN_CODE)))
- .statusMessage(String.valueOf(status.get(SerTokens.TOKEN_MESSAGE)))
- .statusAttributes((Map<String, Object>) status.get(SerTokens.TOKEN_ATTRIBUTES))
- .result(result.get(SerTokens.TOKEN_DATA))
- .responseMetaData((Map<String, Object>) result.get(SerTokens.TOKEN_META))
- .create();
- } catch (Exception ex) {
- logger.warn("Response [{}] could not be deserialized by {}.", msg, AbstractGraphSONMessageSerializerV1.class.getName());
- throw new SerializationException(ex);
- }
- }
-
- private GraphSONMapper.Builder initBuilder(final GraphSONMapper.Builder builder) {
- final GraphSONMapper.Builder b = null == builder ? GraphSONMapper.build() : builder;
- return b.addCustomModule(new AbstractGraphSONMessageSerializerV1.GremlinServerModule())
- .version(GraphSONVersion.V1_0);
- }
-
- private GraphSONMapper.Builder applyMaxTokenLimits(final GraphSONMapper.Builder builder, final Map<String, Object> config) {
- if(config != null) {
- if(config.containsKey("maxNumberLength")) {
- builder.maxNumberLength((int)config.get("maxNumberLength"));
- }
- if(config.containsKey("maxStringLength")) {
- builder.maxStringLength((int)config.get("maxStringLength"));
- }
- if(config.containsKey("maxNestingDepth")) {
- builder.maxNestingDepth((int)config.get("maxNestingDepth"));
- }
- }
- return builder;
- }
-
- @Override
- public ObjectMapper getMapper() {
- return this.mapper;
- }
-
- public final static class GremlinServerModule extends SimpleModule {
- public GremlinServerModule() {
- super("graphson-gremlin-server");
- addSerializer(ResponseMessage.class, new ResponseMessageSerializer());
- }
- }
-
- public final static class ResponseMessageSerializer extends StdSerializer<ResponseMessage> {
- public ResponseMessageSerializer() {
- super(ResponseMessage.class);
- }
-
- @Override
- public void serialize(final ResponseMessage responseMessage, final JsonGenerator jsonGenerator,
- final SerializerProvider serializerProvider) throws IOException, JsonGenerationException {
- ser(responseMessage, jsonGenerator, serializerProvider, null);
- }
-
- @Override
- public void serializeWithType(final ResponseMessage responseMessage, final JsonGenerator jsonGenerator,
- final SerializerProvider serializerProvider,
- final TypeSerializer typeSerializer) throws IOException, JsonProcessingException {
- ser(responseMessage, jsonGenerator, serializerProvider, typeSerializer);
- }
-
- public void ser(final ResponseMessage responseMessage, final JsonGenerator jsonGenerator,
- final SerializerProvider serializerProvider,
- final TypeSerializer typeSerializer) throws IOException, JsonProcessingException {
- jsonGenerator.writeStartObject();
- if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
-
- jsonGenerator.writeStringField(SerTokens.TOKEN_REQUEST, responseMessage.getRequestId() != null ? responseMessage.getRequestId().toString() : null);
- jsonGenerator.writeObjectFieldStart(SerTokens.TOKEN_STATUS);
-
- if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
- jsonGenerator.writeStringField(SerTokens.TOKEN_MESSAGE, responseMessage.getStatus().getMessage());
- jsonGenerator.writeNumberField(SerTokens.TOKEN_CODE, responseMessage.getStatus().getCode().getValue());
- jsonGenerator.writeObjectField(SerTokens.TOKEN_ATTRIBUTES, responseMessage.getStatus().getAttributes());
- jsonGenerator.writeEndObject();
-
- jsonGenerator.writeObjectFieldStart(SerTokens.TOKEN_RESULT);
- if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
- if (null == responseMessage.getResult().getData())
- jsonGenerator.writeNullField(SerTokens.TOKEN_DATA);
- else
- GraphSONUtil.writeWithType(SerTokens.TOKEN_DATA, responseMessage.getResult().getData(), jsonGenerator, serializerProvider, typeSerializer);
- jsonGenerator.writeObjectField(SerTokens.TOKEN_META, responseMessage.getResult().getMeta());
- jsonGenerator.writeEndObject();
-
- jsonGenerator.writeEndObject();
- }
- }
-}
diff --git a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/AbstractGraphSONMessageSerializerV2.java b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/AbstractGraphSONMessageSerializerV2.java
deleted file mode 100644
index 87f8230..0000000
--- a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/AbstractGraphSONMessageSerializerV2.java
+++ /dev/null
@@ -1,306 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.util.ser;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufAllocator;
-import io.netty.util.ReferenceCountUtil;
-import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.AbstractObjectDeserializer;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONUtil;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONVersion;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONXModuleV2;
-import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
-import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
-import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
-import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
-import org.apache.tinkerpop.shaded.jackson.databind.module.SimpleModule;
-import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.util.Map;
-import java.util.UUID;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public abstract class AbstractGraphSONMessageSerializerV2 extends AbstractMessageSerializer<ObjectMapper> {
- private static final Logger logger = LoggerFactory.getLogger(AbstractGraphSONMessageSerializerV2.class);
-
- protected ObjectMapper mapper;
-
- public AbstractGraphSONMessageSerializerV2() {
- final GraphSONMapper.Builder builder = configureBuilder(initBuilder(null));
- mapper = builder.create().createMapper();
- }
-
- @Deprecated
- public AbstractGraphSONMessageSerializerV2(final GraphSONMapper mapper) {
- this.mapper = mapper.createMapper();
- }
-
- public AbstractGraphSONMessageSerializerV2(final GraphSONMapper.Builder mapperBuilder) {
- this.mapper = configureBuilder(mapperBuilder).create().createMapper();
- }
-
- abstract byte[] obtainHeader();
-
- abstract GraphSONMapper.Builder configureBuilder(final GraphSONMapper.Builder builder);
-
- @Override
- public void configure(final Map<String, Object> config, final Map<String, Graph> graphs) {
- final GraphSONMapper.Builder initialBuilder = initBuilder(null);
- addIoRegistries(config, initialBuilder);
- applyMaxTokenLimits(initialBuilder, config);
- mapper = configureBuilder(initialBuilder).create().createMapper();
- }
-
- @Override
- public ByteBuf serializeResponseAsBinary(final ResponseMessage responseMessage, final ByteBufAllocator allocator) throws SerializationException {
- ByteBuf encodedMessage = null;
- try {
- final byte[] payload = mapper.writeValueAsBytes(responseMessage);
- encodedMessage = allocator.buffer(payload.length);
- encodedMessage.writeBytes(payload);
-
- return encodedMessage;
- } catch (Exception ex) {
- if (encodedMessage != null) ReferenceCountUtil.release(encodedMessage);
-
- logger.warn(String.format("Response [%s] could not be serialized by %s.", responseMessage, AbstractGraphSONMessageSerializerV2.class.getName()), ex);
- throw new SerializationException(ex);
- }
- }
-
- @Override
- public ByteBuf serializeRequestAsBinary(final RequestMessage requestMessage, final ByteBufAllocator allocator) throws SerializationException {
- ByteBuf encodedMessage = null;
- try {
- final byte[] header = obtainHeader();
- final byte[] payload = mapper.writeValueAsBytes(requestMessage);
-
- encodedMessage = allocator.buffer(header.length + payload.length);
- encodedMessage.writeBytes(header);
- encodedMessage.writeBytes(payload);
-
- return encodedMessage;
- } catch (Exception ex) {
- if (encodedMessage != null) ReferenceCountUtil.release(encodedMessage);
-
- logger.warn(String.format("Request [%s] could not be serialized by %s.", requestMessage, AbstractGraphSONMessageSerializerV2.class.getName()), ex);
- throw new SerializationException(ex);
- }
- }
-
- @Override
- public RequestMessage deserializeRequest(final ByteBuf msg) throws SerializationException {
- try {
- final byte[] payload = new byte[msg.readableBytes()];
- msg.readBytes(payload);
- return mapper.readValue(payload, RequestMessage.class);
- } catch (Exception ex) {
- logger.warn(String.format("Request [%s] could not be deserialized by %s.", msg, AbstractGraphSONMessageSerializerV2.class.getName()), ex);
- throw new SerializationException(ex);
- }
- }
-
- @Override
- public ResponseMessage deserializeResponse(final ByteBuf msg) throws SerializationException {
- try {
- final byte[] payload = new byte[msg.readableBytes()];
- msg.readBytes(payload);
- return mapper.readValue(payload, ResponseMessage.class);
- } catch (Exception ex) {
- logger.warn(String.format("Response [%s] could not be deserialized by %s.", msg, AbstractGraphSONMessageSerializerV2.class.getName()), ex);
- throw new SerializationException(ex);
- }
- }
-
- private GraphSONMapper.Builder initBuilder(final GraphSONMapper.Builder builder) {
- final GraphSONMapper.Builder b = null == builder ? GraphSONMapper.build() : builder;
- return b.addCustomModule(GraphSONXModuleV2.build())
- .version(GraphSONVersion.V2_0);
- }
-
- private GraphSONMapper.Builder applyMaxTokenLimits(final GraphSONMapper.Builder builder, final Map<String, Object> config) {
- if(config != null) {
- if(config.containsKey("maxNumberLength")) {
- builder.maxNumberLength((int)config.get("maxNumberLength"));
- }
- if(config.containsKey("maxStringLength")) {
- builder.maxStringLength((int)config.get("maxStringLength"));
- }
- if(config.containsKey("maxNestingDepth")) {
- builder.maxNestingDepth((int)config.get("maxNestingDepth"));
- }
- }
- return builder;
- }
-
- @Override
- public ObjectMapper getMapper() {
- return this.mapper;
- }
-
- public final static class GremlinServerModule extends SimpleModule {
- public GremlinServerModule() {
- super("graphson-gremlin-server");
-
- // SERIALIZERS
- addSerializer(ResponseMessage.class, new ResponseMessageSerializer());
- addSerializer(RequestMessage.class, new RequestMessageSerializer());
-
- //DESERIALIZERS
- addDeserializer(ResponseMessage.class, new ResponseMessageDeserializer());
- addDeserializer(RequestMessage.class, new RequestMessageDeserializer());
- }
- }
-
- public final static class RequestMessageSerializer extends StdSerializer<RequestMessage> {
- public RequestMessageSerializer() {
- super(RequestMessage.class);
- }
-
- @Override
- public void serialize(final RequestMessage requestMessage, final JsonGenerator jsonGenerator,
- final SerializerProvider serializerProvider) throws IOException {
- ser(requestMessage, jsonGenerator, serializerProvider, null);
- }
-
- @Override
- public void serializeWithType(final RequestMessage requestMessage, final JsonGenerator jsonGenerator,
- final SerializerProvider serializerProvider,
- final TypeSerializer typeSerializer) throws IOException {
- ser(requestMessage, jsonGenerator, serializerProvider, typeSerializer);
- }
-
- public void ser(final RequestMessage requestMessage, final JsonGenerator jsonGenerator,
- final SerializerProvider serializerProvider,
- final TypeSerializer typeSerializer) throws IOException {
- GraphSONUtil.writeStartObject(requestMessage, jsonGenerator, typeSerializer);
-
- jsonGenerator.writeStringField(SerTokens.TOKEN_REQUEST, requestMessage.getRequestId().toString());
- jsonGenerator.writeStringField(SerTokens.TOKEN_OP, requestMessage.getOp());
- jsonGenerator.writeStringField(SerTokens.TOKEN_PROCESSOR, requestMessage.getProcessor());
- jsonGenerator.writeObjectField(SerTokens.TOKEN_ARGS, requestMessage.getArgs());
-
- GraphSONUtil.writeEndObject(requestMessage, jsonGenerator, typeSerializer);
- }
- }
-
- public final static class RequestMessageDeserializer extends AbstractObjectDeserializer<RequestMessage> {
- protected RequestMessageDeserializer() {
- super(RequestMessage.class);
- }
-
- @Override
- public RequestMessage createObject(final Map<String, Object> data) {
- final Map<String, Object> args = (Map<String, Object>) data.get(SerTokens.TOKEN_ARGS);
- RequestMessage.Builder builder = RequestMessage.build(data.get(SerTokens.TOKEN_OP).toString())
- .overrideRequestId(UUID.fromString(data.get(SerTokens.TOKEN_REQUEST).toString()));
-
- if (data.containsKey(SerTokens.TOKEN_PROCESSOR))
- builder = builder.processor(data.get(SerTokens.TOKEN_PROCESSOR).toString());
-
- if (args != null) {
- for (Map.Entry<String, Object> kv : args.entrySet()) {
- builder = builder.addArg(kv.getKey(), kv.getValue());
- }
- }
-
- return builder.create();
- }
- }
-
- public final static class ResponseMessageSerializer extends StdSerializer<ResponseMessage> {
- public ResponseMessageSerializer() {
- super(ResponseMessage.class);
- }
-
- @Override
- public void serialize(final ResponseMessage responseMessage, final JsonGenerator jsonGenerator,
- final SerializerProvider serializerProvider) throws IOException {
- ser(responseMessage, jsonGenerator, serializerProvider, null);
- }
-
- @Override
- public void serializeWithType(final ResponseMessage responseMessage, final JsonGenerator jsonGenerator,
- final SerializerProvider serializerProvider,
- final TypeSerializer typeSerializer) throws IOException {
- ser(responseMessage, jsonGenerator, serializerProvider, typeSerializer);
- }
-
- public void ser(final ResponseMessage responseMessage, final JsonGenerator jsonGenerator,
- final SerializerProvider serializerProvider,
- final TypeSerializer typeSerializer) throws IOException {
- GraphSONUtil.writeStartObject(responseMessage, jsonGenerator, typeSerializer);
-
- jsonGenerator.writeStringField(SerTokens.TOKEN_REQUEST, responseMessage.getRequestId() != null ? responseMessage.getRequestId().toString() : null);
- jsonGenerator.writeFieldName(SerTokens.TOKEN_STATUS);
-
- GraphSONUtil.writeStartObject(responseMessage, jsonGenerator, typeSerializer);
- jsonGenerator.writeStringField(SerTokens.TOKEN_MESSAGE, responseMessage.getStatus().getMessage());
- jsonGenerator.writeNumberField(SerTokens.TOKEN_CODE, responseMessage.getStatus().getCode().getValue());
- jsonGenerator.writeObjectField(SerTokens.TOKEN_ATTRIBUTES, responseMessage.getStatus().getAttributes());
- GraphSONUtil.writeEndObject(responseMessage, jsonGenerator, typeSerializer);
-
- jsonGenerator.writeFieldName(SerTokens.TOKEN_RESULT);
-
- GraphSONUtil.writeStartObject(responseMessage, jsonGenerator, typeSerializer);
-
- if (null == responseMessage.getResult().getData()){
- jsonGenerator.writeNullField(SerTokens.TOKEN_DATA);
- } else {
- jsonGenerator.writeFieldName(SerTokens.TOKEN_DATA);
- final Object result = responseMessage.getResult().getData();
- serializerProvider.findTypedValueSerializer(result.getClass(), true, null).serialize(result, jsonGenerator, serializerProvider);
- }
-
- jsonGenerator.writeObjectField(SerTokens.TOKEN_META, responseMessage.getResult().getMeta());
- GraphSONUtil.writeEndObject(responseMessage, jsonGenerator, typeSerializer);
-
- GraphSONUtil.writeEndObject(responseMessage, jsonGenerator, typeSerializer);
- }
- }
-
- public final static class ResponseMessageDeserializer extends AbstractObjectDeserializer<ResponseMessage> {
- protected ResponseMessageDeserializer() {
- super(ResponseMessage.class);
- }
-
- @Override
- public ResponseMessage createObject(final Map<String, Object> data) {
- final Map<String, Object> status = (Map<String, Object>) data.get(SerTokens.TOKEN_STATUS);
- final Map<String, Object> result = (Map<String, Object>) data.get(SerTokens.TOKEN_RESULT);
- return ResponseMessage.build(UUID.fromString(data.get(SerTokens.TOKEN_REQUEST).toString()))
- .code(ResponseStatusCode.getFromValue((Integer) status.get(SerTokens.TOKEN_CODE)))
- .statusMessage(String.valueOf(status.get(SerTokens.TOKEN_MESSAGE)))
- .statusAttributes((Map<String, Object>) status.get(SerTokens.TOKEN_ATTRIBUTES))
- .result(result.get(SerTokens.TOKEN_DATA))
- .responseMetaData((Map<String, Object>) result.get(SerTokens.TOKEN_META))
- .create();
- }
- }
-}
diff --git a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/AbstractGraphSONMessageSerializerV4.java b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/AbstractGraphSONMessageSerializerV4.java
new file mode 100644
index 0000000..1fc564b
--- /dev/null
+++ b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/AbstractGraphSONMessageSerializerV4.java
@@ -0,0 +1,502 @@
+/*
+ * 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.util.ser;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.util.ReferenceCountUtil;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.AbstractObjectDeserializer;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONUtil;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONVersion;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONXModuleV4;
+import org.apache.tinkerpop.gremlin.util.Tokens;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
+import org.apache.tinkerpop.shaded.jackson.core.JsonProcessingException;
+import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
+import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
+import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
+import org.apache.tinkerpop.shaded.jackson.databind.module.SimpleModule;
+import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+public abstract class AbstractGraphSONMessageSerializerV4 extends AbstractMessageSerializer<ObjectMapper> {
+ private static final Logger logger = LoggerFactory.getLogger(AbstractGraphSONMessageSerializerV4.class);
+
+ protected ObjectMapper mapper;
+
+ public AbstractGraphSONMessageSerializerV4() {
+ final GraphSONMapper.Builder builder = configureBuilder(initBuilder());
+ mapper = builder.create().createMapper();
+ }
+
+ public AbstractGraphSONMessageSerializerV4(GraphSONMapper.Builder mapperBuilder) {
+ this.mapper = configureBuilder(mapperBuilder).create().createMapper();
+ }
+
+ abstract GraphSONMapper.Builder configureBuilder(final GraphSONMapper.Builder builder);
+
+ @Override
+ public ObjectMapper getMapper() {
+ return this.mapper;
+ }
+
+ @Override
+ public void configure(final Map<String, Object> config, final Map<String, Graph> graphs) {
+ final GraphSONMapper.Builder initialBuilder = initBuilder();
+ addIoRegistries(config, initialBuilder);
+ applyMaxTokenLimits(initialBuilder, config);
+ mapper = configureBuilder(initialBuilder).create().createMapper();
+ }
+
+ private GraphSONMapper.Builder initBuilder() {
+ final GraphSONMapper.Builder b = GraphSONMapper.build();
+ return b.addCustomModule(GraphSONXModuleV4.build()).version(GraphSONVersion.V4_0);
+ }
+
+ private GraphSONMapper.Builder applyMaxTokenLimits(final GraphSONMapper.Builder builder, final Map<String, Object> config) {
+ if (config != null) {
+ if (config.containsKey("maxNumberLength")) {
+ builder.maxNumberLength((int) config.get("maxNumberLength"));
+ }
+ if (config.containsKey("maxStringLength")) {
+ builder.maxStringLength((int) config.get("maxStringLength"));
+ }
+ if (config.containsKey("maxNestingDepth")) {
+ builder.maxNestingDepth((int) config.get("maxNestingDepth"));
+ }
+ }
+ return builder;
+ }
+
+ @Override
+ public ByteBuf serializeResponseAsBinary(final ResponseMessage responseMessage, final ByteBufAllocator allocator) throws SerializationException {
+ if (null == responseMessage.getStatus()) {
+ throw new SerializationException("ResponseStatus can't be null when serializing a full ResponseMessage.");
+ }
+
+ return writeHeader(responseMessage, allocator);
+ }
+
+ @Override
+ public ResponseMessage deserializeBinaryResponse(final ByteBuf msg) throws SerializationException {
+ try {
+ final byte[] payload = new byte[msg.readableBytes()];
+ msg.readBytes(payload);
+ return mapper.readValue(payload, ResponseMessage.class);
+ } catch (Exception ex) {
+ logger.warn(String.format("Response [%s] could not be deserialized by %s.", msg, AbstractGraphSONMessageSerializerV4.class.getName()), ex);
+ throw new SerializationException(ex);
+ }
+ }
+
+ protected boolean isTyped() { return true; }
+ @Override
+ public ByteBuf writeHeader(final ResponseMessage responseMessage, final ByteBufAllocator allocator) throws SerializationException {
+ ByteBuf encodedMessage = null;
+ try {
+ boolean writeFullMessage = responseMessage.getStatus() != null;
+
+ final byte[] header = mapper.writeValueAsBytes(new ResponseMessage.ResponseMessageHeader(responseMessage, isTyped()));
+ final byte[] data = getChunk(true, responseMessage.getResult().getData());
+
+ final byte[] footer = writeFullMessage
+ ? mapper.writeValueAsBytes(new ResponseMessage.ResponseMessageFooter(responseMessage, isTyped()))
+ : new byte[0];
+ // skip closing }
+ final int headerLen = header.length - (isTyped() ? 4 : 3);
+ final int bufSize = headerLen + data.length + (writeFullMessage ? footer.length - 1 : 0);
+
+ encodedMessage = allocator.buffer(bufSize).writeBytes(header, 0, headerLen).writeBytes(data);
+
+ if (writeFullMessage) {
+ encodedMessage.writeBytes(footer, 1, footer.length - 1);
+ }
+
+ return encodedMessage;
+ } catch (Exception ex) {
+ if (encodedMessage != null) ReferenceCountUtil.release(encodedMessage);
+
+ logger.warn(String.format("Response [%s] could not be serialized by %s.", responseMessage, AbstractGraphSONMessageSerializerV4.class.getName()), ex);
+ throw new SerializationException(ex);
+ }
+ }
+
+ private byte[] getChunk(final boolean isFirst, final Object aggregate) throws JsonProcessingException {
+ if (aggregate == null) {
+ return new byte[0];
+ }
+
+ // Gremlin server always produce List
+ final List asList = (List) aggregate;
+ if (asList.isEmpty()) {
+ return new byte[0];
+ }
+
+ final Object[] array = new Object[asList.size()];
+ asList.toArray(array);
+ // List serialization adds extra data, so array used
+ String str = mapper.writeValueAsString(array);
+ // skip opening `[` and closing `]`
+ str = str.substring(1, str.length() - 1);
+ if (!isFirst) {
+ str = "," + str;
+ }
+ return str.getBytes();
+ }
+
+ @Override
+ public ByteBuf writeChunk(final Object aggregate, final ByteBufAllocator allocator) throws SerializationException {
+ ByteBuf encodedMessage = null;
+ try {
+ final byte[] payload = getChunk(false, aggregate);
+ encodedMessage = allocator.buffer(payload.length).writeBytes(payload);
+
+ return encodedMessage;
+ } catch (Exception ex) {
+ if (encodedMessage != null) ReferenceCountUtil.release(encodedMessage);
+
+ logger.warn(String.format("Response [%s] could not be serialized by %s.", aggregate, GraphSONMessageSerializerV4.class.getName()), ex);
+ throw new SerializationException(ex);
+ }
+ }
+
+ @Override
+ public ByteBuf writeFooter(final ResponseMessage responseMessage, final ByteBufAllocator allocator) throws SerializationException {
+ ByteBuf encodedMessage = null;
+ try {
+ final byte[] footer = mapper.writeValueAsBytes(new ResponseMessage.ResponseMessageFooter(responseMessage, isTyped()));
+ final byte[] data = getChunk(false, responseMessage.getResult().getData());
+ // skip opening {
+ encodedMessage = allocator.buffer(footer.length - 2 + data.length).
+ writeBytes(data).writeBytes(footer, 1, footer.length - 1);
+
+ return encodedMessage;
+ } catch (Exception ex) {
+ if (encodedMessage != null) ReferenceCountUtil.release(encodedMessage);
+
+ logger.warn(String.format("Response [%s] could not be serialized by %s.", responseMessage, GraphSONMessageSerializerV4.class.getName()), ex);
+ throw new SerializationException(ex);
+ }
+ }
+
+ @Override
+ public ByteBuf writeErrorFooter(final ResponseMessage responseMessage, final ByteBufAllocator allocator) throws SerializationException {
+ ByteBuf encodedMessage = null;
+ try {
+ final byte[] footer = mapper.writeValueAsBytes(new ResponseMessage.ResponseMessageFooter(responseMessage, isTyped()));
+ // skip opening {
+ encodedMessage = allocator.buffer(footer.length - 2).
+ writeBytes(footer, 1, footer.length - 1);
+
+ return encodedMessage;
+ } catch (Exception ex) {
+ if (encodedMessage != null) ReferenceCountUtil.release(encodedMessage);
+
+ logger.warn(String.format("Response [%s] could not be serialized by %s.", responseMessage, GraphSONMessageSerializerV4.class.getName()), ex);
+ throw new SerializationException(ex);
+ }
+ }
+
+ @Override
+ public ResponseMessage readChunk(final ByteBuf byteBuf, final boolean isFirstChunk) {
+ throw new UnsupportedOperationException("Reading for streaming GraphSON is not supported");
+ }
+
+ @Override
+ public ByteBuf serializeRequestAsBinary(RequestMessage requestMessage, ByteBufAllocator allocator) throws SerializationException {
+ ByteBuf encodedMessage = null;
+ try {
+ final byte[] payload = mapper.writeValueAsBytes(requestMessage);
+
+ encodedMessage = allocator.buffer(payload.length);
+ encodedMessage.writeBytes(payload);
+
+ return encodedMessage;
+ } catch (Exception ex) {
+ if (encodedMessage != null) ReferenceCountUtil.release(encodedMessage);
+
+ logger.warn(String.format("Request [%s] could not be serialized by %s.", requestMessage, AbstractGraphSONMessageSerializerV4.class.getName()), ex);
+ throw new SerializationException(ex);
+ }
+ }
+
+ @Override
+ public RequestMessage deserializeBinaryRequest(ByteBuf msg) throws SerializationException {
+ try {
+ final byte[] payload = new byte[msg.readableBytes()];
+ msg.readBytes(payload);
+ return mapper.readValue(payload, RequestMessage.class);
+ } catch (Exception ex) {
+ logger.warn(String.format("Request [%s] could not be deserialized by %s.", msg, AbstractGraphSONMessageSerializerV4.class.getName()), ex);
+ throw new SerializationException(ex);
+ }
+ }
+
+ public final static class GremlinServerModuleV4 extends SimpleModule {
+ public GremlinServerModuleV4() {
+ super("graphsonV4-gremlin-server");
+
+ // SERIALIZERS
+ addSerializer(ResponseMessage.class, new ResponseMessageSerializer());
+ addSerializer(ResponseMessage.ResponseMessageHeader.class, new ResponseMessageHeaderSerializer());
+ addSerializer(ResponseMessage.ResponseMessageFooter.class, new ResponseMessageFooterSerializer());
+ addSerializer(RequestMessage.class, new RequestMessageSerializer());
+
+ // DESERIALIZERS
+ addDeserializer(ResponseMessage.class, new ResponseMessageDeserializer());
+ addDeserializer(RequestMessage.class, new RequestMessageDeserializer());
+ }
+ }
+
+ public final static class RequestMessageSerializer extends StdSerializer<RequestMessage> {
+ public RequestMessageSerializer() {
+ super(RequestMessage.class);
+ }
+
+ @Override
+ public void serialize(final RequestMessage requestMessage, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider) throws IOException {
+ ser(requestMessage, jsonGenerator, serializerProvider, null);
+ }
+
+ @Override
+ public void serializeWithType(final RequestMessage requestMessage, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider,
+ final TypeSerializer typeSerializer) throws IOException {
+ ser(requestMessage, jsonGenerator, serializerProvider, typeSerializer);
+ }
+
+ public void ser(final RequestMessage requestMessage, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider,
+ final TypeSerializer typeSerializer) throws IOException {
+ GraphSONUtil.writeStartObject(requestMessage, jsonGenerator, typeSerializer);
+
+ jsonGenerator.writeObjectField(SerTokens.TOKEN_GREMLIN, requestMessage.getGremlin());
+ for (Map.Entry<String, Object> kv : requestMessage.getFields().entrySet()) {
+ jsonGenerator.writeObjectField(kv.getKey(), kv.getValue());
+ }
+
+ GraphSONUtil.writeEndObject(requestMessage, jsonGenerator, typeSerializer);
+ }
+ }
+
+ public final static class RequestMessageDeserializer extends AbstractObjectDeserializer<RequestMessage> {
+ private RequestMessageDeserializer() {
+ super(RequestMessage.class);
+ }
+
+ @Override
+ public RequestMessage createObject(final Map<String, Object> data) {
+ final RequestMessage.Builder builder = RequestMessage.build(data.get(SerTokens.TOKEN_GREMLIN).toString());
+
+ if (data.containsKey(SerTokens.TOKEN_LANGUAGE)) {
+ builder.addLanguage(data.get(SerTokens.TOKEN_LANGUAGE).toString());
+ }
+ if (data.containsKey(SerTokens.TOKEN_G)) {
+ builder.addG(data.get(SerTokens.TOKEN_G).toString());
+ }
+ if (data.containsKey(SerTokens.TOKEN_BINDINGS)) {
+ builder.addBindings((Map<String, Object>) data.get(SerTokens.TOKEN_BINDINGS));
+ }
+ if (data.containsKey(Tokens.TIMEOUT_MS)) {
+ // Can be int for untyped JSON and long for typed GraphSON.
+ builder.addTimeoutMillis(Long.parseLong(data.get(Tokens.TIMEOUT_MS).toString()));
+ }
+ if (data.containsKey(Tokens.ARGS_MATERIALIZE_PROPERTIES)) {
+ builder.addMaterializeProperties(data.get(Tokens.ARGS_MATERIALIZE_PROPERTIES).toString());
+ }
+ if (data.containsKey(Tokens.ARGS_BATCH_SIZE)) {
+ builder.addChunkSize((int) data.get(Tokens.ARGS_BATCH_SIZE));
+ }
+ if (data.containsKey(Tokens.BULK_RESULTS)) {
+ builder.addBulkResults(Boolean.parseBoolean(data.get(Tokens.BULK_RESULTS).toString()));
+ }
+
+ return builder.create();
+ }
+ }
+
+ public final static class ResponseMessageSerializer extends StdSerializer<ResponseMessage> {
+ public ResponseMessageSerializer() {
+ super(ResponseMessage.class);
+ }
+
+ @Override
+ public void serialize(final ResponseMessage responseMessage, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider) throws IOException {
+ ser(responseMessage, jsonGenerator, serializerProvider, null);
+ }
+
+ @Override
+ public void serializeWithType(final ResponseMessage responseMessage, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider,
+ final TypeSerializer typeSerializer) throws IOException {
+ ser(responseMessage, jsonGenerator, serializerProvider, typeSerializer);
+ }
+
+ public void ser(final ResponseMessage responseMessage, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider,
+ final TypeSerializer typeSerializer) throws IOException {
+ GraphSONUtil.writeStartObject(responseMessage, jsonGenerator, typeSerializer);
+
+ jsonGenerator.writeFieldName(SerTokens.TOKEN_STATUS);
+
+ GraphSONUtil.writeStartObject(responseMessage, jsonGenerator, typeSerializer);
+ jsonGenerator.writeNumberField(SerTokens.TOKEN_CODE, responseMessage.getStatus().getCode().code());
+ final String message = responseMessage.getStatus().getMessage();
+ if (message != null && !message.isEmpty()) {
+ jsonGenerator.writeStringField(SerTokens.TOKEN_MESSAGE, responseMessage.getStatus().getMessage());
+ }
+ final String exception = responseMessage.getStatus().getException();
+ if (exception != null && !exception.isEmpty()) {
+ jsonGenerator.writeStringField(SerTokens.TOKEN_EXCEPTION, responseMessage.getStatus().getException());
+ }
+ GraphSONUtil.writeEndObject(responseMessage, jsonGenerator, typeSerializer);
+
+ jsonGenerator.writeFieldName(SerTokens.TOKEN_RESULT);
+
+ GraphSONUtil.writeStartObject(responseMessage, jsonGenerator, typeSerializer);
+ jsonGenerator.writeFieldName(SerTokens.TOKEN_DATA);
+
+ final List<Object> result = responseMessage.getResult().getData();
+ if (result != null) {
+ serializerProvider.findTypedValueSerializer(result.getClass(), true, null).serialize(result, jsonGenerator, serializerProvider);
+ } else {
+ serializerProvider.findTypedValueSerializer(List.class, true, null).serialize(Collections.emptyList(), jsonGenerator, serializerProvider);
+ }
+
+ GraphSONUtil.writeEndObject(responseMessage, jsonGenerator, typeSerializer);
+ GraphSONUtil.writeEndObject(responseMessage, jsonGenerator, typeSerializer);
+ }
+ }
+
+ public final static class ResponseMessageHeaderSerializer extends StdSerializer<ResponseMessage.ResponseMessageHeader> {
+ public ResponseMessageHeaderSerializer() {
+ super(ResponseMessage.ResponseMessageHeader.class);
+ }
+
+ @Override
+ public void serialize(final ResponseMessage.ResponseMessageHeader responseMessage, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider) throws IOException {
+ ser(responseMessage, jsonGenerator, serializerProvider, null);
+ }
+
+ @Override
+ public void serializeWithType(final ResponseMessage.ResponseMessageHeader responseMessage, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider,
+ final TypeSerializer typeSerializer) throws IOException {
+ ser(responseMessage, jsonGenerator, serializerProvider, typeSerializer);
+ }
+
+ public void ser(final ResponseMessage.ResponseMessageHeader responseMessageHeader, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider,
+ final TypeSerializer typeSerializer) throws IOException {
+ final ResponseMessage responseMessage = responseMessageHeader.getResponseMessage();
+
+ GraphSONUtil.writeStartObject(responseMessage, jsonGenerator, typeSerializer);
+ jsonGenerator.writeFieldName(SerTokens.TOKEN_RESULT);
+
+ GraphSONUtil.writeStartObject(responseMessage, jsonGenerator, typeSerializer);
+ jsonGenerator.writeFieldName(SerTokens.TOKEN_DATA);
+
+ jsonGenerator.writeObject(Collections.emptyList());
+
+ // jsonGenerator will add 2 closing }
+ // jsonGenerator.configure(JsonGenerator.Feature.AUTO_CLOSE_JSON_CONTENT, false);
+ }
+ }
+
+ public final static class ResponseMessageFooterSerializer extends StdSerializer<ResponseMessage.ResponseMessageFooter> {
+ public ResponseMessageFooterSerializer() {
+ super(ResponseMessage.ResponseMessageFooter.class);
+ }
+
+ @Override
+ public void serialize(final ResponseMessage.ResponseMessageFooter responseMessage, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider) throws IOException {
+ ser(responseMessage, jsonGenerator, serializerProvider, null);
+ }
+
+ @Override
+ public void serializeWithType(final ResponseMessage.ResponseMessageFooter responseMessage, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider,
+ final TypeSerializer typeSerializer) throws IOException {
+ ser(responseMessage, jsonGenerator, serializerProvider, typeSerializer);
+ }
+
+ public void ser(final ResponseMessage.ResponseMessageFooter responseMessageFooter, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider,
+ final TypeSerializer typeSerializer) throws IOException {
+ final ResponseMessage responseMessage = responseMessageFooter.getResponseMessage();
+
+ // todo: find a way to get rid off
+ GraphSONUtil.writeStartObject(responseMessage, jsonGenerator, typeSerializer);
+
+ // close result field. array inside object for types, just array for untyped
+ jsonGenerator.writeRaw(responseMessageFooter.getTyped() ? "]}}," : "]},");
+
+ jsonGenerator.writeFieldName(SerTokens.TOKEN_STATUS);
+ GraphSONUtil.writeStartObject(responseMessage, jsonGenerator, typeSerializer);
+ jsonGenerator.writeNumberField(SerTokens.TOKEN_CODE, responseMessage.getStatus().getCode().code());
+ if (responseMessage.getStatus().getMessage() != null) {
+ jsonGenerator.writeStringField(SerTokens.TOKEN_MESSAGE, responseMessage.getStatus().getMessage());
+ }
+ if (responseMessage.getStatus().getException() != null) {
+ jsonGenerator.writeStringField(SerTokens.TOKEN_EXCEPTION, responseMessage.getStatus().getException());
+ }
+ GraphSONUtil.writeEndObject(responseMessage, jsonGenerator, typeSerializer);
+
+ GraphSONUtil.writeEndObject(responseMessage, jsonGenerator, typeSerializer);
+ }
+ }
+
+ public final static class ResponseMessageDeserializer extends AbstractObjectDeserializer<ResponseMessage> {
+ public ResponseMessageDeserializer() {
+ super(ResponseMessage.class);
+ }
+
+ @Override
+ public ResponseMessage createObject(final Map<String, Object> data) {
+ final Map<String, Object> status = (Map<String, Object>) data.get(SerTokens.TOKEN_STATUS);
+ ResponseMessage.Builder response = ResponseMessage.build()
+ .code(HttpResponseStatus.valueOf((Integer) status.get(SerTokens.TOKEN_CODE)))
+ .result((List) ((Map) data.get(SerTokens.TOKEN_RESULT)).get(SerTokens.TOKEN_DATA));
+
+ if (null != status.get(SerTokens.TOKEN_EXCEPTION)) {
+ response.exception(String.valueOf(status.get(SerTokens.TOKEN_EXCEPTION)));
+ }
+ if (null != status.get(SerTokens.TOKEN_MESSAGE)) {
+ response.statusMessage(String.valueOf(status.get(SerTokens.TOKEN_MESSAGE)));
+ }
+
+ return response.create();
+ }
+ }
+}
diff --git a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/AbstractMessageSerializer.java b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/AbstractMessageSerializer.java
index 74ecc18..3004fdb 100644
--- a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/AbstractMessageSerializer.java
+++ b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/AbstractMessageSerializer.java
@@ -18,9 +18,9 @@
*/
package org.apache.tinkerpop.gremlin.util.ser;
-import org.apache.tinkerpop.gremlin.util.MessageSerializer;
import org.apache.tinkerpop.gremlin.structure.io.IoRegistry;
import org.apache.tinkerpop.gremlin.structure.io.Mapper;
+import org.apache.tinkerpop.gremlin.util.MessageSerializer;
import java.lang.reflect.Method;
import java.util.Collections;
diff --git a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphBinaryMessageSerializerV1.java b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphBinaryMessageSerializerV1.java
deleted file mode 100644
index fe4b051..0000000
--- a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphBinaryMessageSerializerV1.java
+++ /dev/null
@@ -1,276 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.util.ser;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufAllocator;
-import io.netty.buffer.Unpooled;
-import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryIo;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryMapper;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryReader;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryWriter;
-import org.apache.tinkerpop.gremlin.util.ser.binary.RequestMessageSerializer;
-import org.apache.tinkerpop.gremlin.util.ser.binary.ResponseMessageSerializer;
-import org.apache.tinkerpop.gremlin.structure.io.binary.TypeSerializerRegistry;
-import org.apache.tinkerpop.gremlin.structure.io.binary.types.CustomTypeSerializer;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.io.IoRegistry;
-import org.javatuples.Pair;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.util.Base64;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-
-public class GraphBinaryMessageSerializerV1 extends AbstractMessageSerializer<GraphBinaryMapper> implements MessageTextSerializer<GraphBinaryMapper> {
-
- public static final String TOKEN_CUSTOM = "custom";
- public static final String TOKEN_BUILDER = "builder";
- public static final String TOKEN_SERIALIZE_RESULT_TO_STRING = "serializeResultToString";
-
- private static final String MIME_TYPE = SerTokens.MIME_GRAPHBINARY_V1;
- private static final String MIME_TYPE_STRINGD = SerTokens.MIME_GRAPHBINARY_V1 + "-stringd";
-
- private static final Base64.Encoder base64Encoder = Base64.getEncoder();
- private static final Base64.Decoder base64Decoder = Base64.getDecoder();
-
- private byte[] header = MIME_TYPE.getBytes(UTF_8);
- private boolean serializeToString = false;
- private GraphBinaryReader reader;
- private GraphBinaryWriter writer;
- private RequestMessageSerializer requestSerializer;
- private ResponseMessageSerializer responseSerializer;
- private GraphBinaryMapper mapper;
-
- /**
- * Creates a new instance of the message serializer using the default type serializers.
- */
- public GraphBinaryMessageSerializerV1() {
- this(TypeSerializerRegistry.INSTANCE);
- }
-
- public GraphBinaryMessageSerializerV1(final TypeSerializerRegistry registry) {
- reader = new GraphBinaryReader(registry);
- writer = new GraphBinaryWriter(registry);
- mapper = new GraphBinaryMapper(writer, reader);
-
- requestSerializer = new RequestMessageSerializer();
- responseSerializer = new ResponseMessageSerializer();
- }
-
- public GraphBinaryMessageSerializerV1(final TypeSerializerRegistry.Builder builder) {
- this(builder.create());
- }
-
- @Override
- public GraphBinaryMapper getMapper() {
- return mapper;
- }
-
- @Override
- public void configure(final Map<String, Object> config, final Map<String, Graph> graphs) {
- final String builderClassName = (String) config.get(TOKEN_BUILDER);
- final TypeSerializerRegistry.Builder builder;
-
- if (builderClassName != null) {
- try {
- final Class<?> clazz = Class.forName(builderClassName);
- final Constructor<?> ctor = clazz.getConstructor();
- builder = (TypeSerializerRegistry.Builder) ctor.newInstance();
- } catch (Exception ex) {
- throw new IllegalStateException(ex);
- }
- } else {
- builder = TypeSerializerRegistry.build();
- }
-
- final List<String> classNameList = getListStringFromConfig(TOKEN_IO_REGISTRIES, config);
- classNameList.forEach(className -> {
- try {
- final Class<?> clazz = Class.forName(className);
- try {
- final Method instanceMethod = tryInstanceMethod(clazz);
- final IoRegistry ioreg = (IoRegistry) instanceMethod.invoke(null);
- final List<Pair<Class, CustomTypeSerializer>> classSerializers = ioreg.find(GraphBinaryIo.class, CustomTypeSerializer.class);
- for (Pair<Class,CustomTypeSerializer> cs : classSerializers) {
- builder.addCustomType(cs.getValue0(), cs.getValue1());
- }
- } catch (Exception methodex) {
- throw new IllegalStateException(String.format("Could not instantiate IoRegistry from an instance() method on %s", className), methodex);
- }
- } catch (Exception ex) {
- throw new IllegalStateException(ex);
- }
- });
-
- addCustomClasses(config, builder);
-
- this.serializeToString = Boolean.parseBoolean(config.getOrDefault(TOKEN_SERIALIZE_RESULT_TO_STRING, "false").toString());
- this.header = this.serializeToString ? MIME_TYPE_STRINGD.getBytes(UTF_8) : MIME_TYPE.getBytes(UTF_8);
-
- final TypeSerializerRegistry registry = builder.create();
- reader = new GraphBinaryReader(registry);
- writer = new GraphBinaryWriter(registry);
-
- requestSerializer = new RequestMessageSerializer();
- responseSerializer = new ResponseMessageSerializer();
- }
-
- @Override
- public ByteBuf serializeResponseAsBinary(final ResponseMessage responseMessage, final ByteBufAllocator allocator) throws SerializationException {
- final ByteBuf buffer = allocator.buffer();
-
- try {
- final ResponseMessage msgToWrite = !serializeToString ? responseMessage :
- ResponseMessage.build(responseMessage.getRequestId())
- .code(responseMessage.getStatus().getCode())
- .statusAttributes(responseMessage.getStatus().getAttributes())
- .responseMetaData(responseMessage.getResult().getMeta())
- .result(serializeResultToString(responseMessage))
- .statusMessage(responseMessage.getStatus().getMessage()).create();
-
- responseSerializer.writeValue(msgToWrite, buffer, writer);
- } catch (Exception ex) {
- buffer.release();
- throw ex;
- }
-
- return buffer;
- }
-
- @Override
- public ByteBuf serializeRequestAsBinary(final RequestMessage requestMessage, final ByteBufAllocator allocator) throws SerializationException {
- final ByteBuf buffer = allocator.buffer().writeByte(header.length).writeBytes(header);
-
- try {
- requestSerializer.writeValue(requestMessage, buffer, writer);
- } catch (Exception ex) {
- buffer.release();
- throw ex;
- }
-
- return buffer;
- }
-
- @Override
- public RequestMessage deserializeRequest(final ByteBuf msg) throws SerializationException {
- return requestSerializer.readValue(msg, reader);
- }
-
- @Override
- public ResponseMessage deserializeResponse(final ByteBuf msg) throws SerializationException {
- return responseSerializer.readValue(msg, reader);
- }
-
- @Override
- public String[] mimeTypesSupported() {
- return new String[]{serializeToString ? MIME_TYPE_STRINGD : MIME_TYPE};
- }
-
- @Override
- public String serializeResponseAsString(final ResponseMessage responseMessage, final ByteBufAllocator allocator) throws SerializationException {
- final ByteBuf bb = serializeResponseAsBinary(responseMessage, allocator);
- return base64Encoder.encodeToString(convertToBytes(bb));
- }
-
- @Override
- public String serializeRequestAsString(final RequestMessage requestMessage, final ByteBufAllocator allocator) throws SerializationException {
- final ByteBuf bb = allocator.buffer();
-
- try {
- requestSerializer.writeValue(requestMessage, bb, writer);
- } catch (Exception ex) {
- bb.release();
- throw ex;
- }
-
- return base64Encoder.encodeToString(convertToBytes(bb));
- }
-
- @Override
- public RequestMessage deserializeRequest(final String msg) throws SerializationException {
- return deserializeRequest(convertToByteBuf(msg));
- }
-
- @Override
- public ResponseMessage deserializeResponse(final String msg) throws SerializationException {
- return deserializeResponse(convertToByteBuf(msg));
- }
-
- private byte[] convertToBytes(final ByteBuf bb) {
- byte[] bytes = new byte[bb.readableBytes()];
- bb.getBytes(bb.readerIndex(), bytes);
- return bytes;
- }
-
- private ByteBuf convertToByteBuf(final String msg) {
- final byte[] b = base64Decoder.decode(msg);
- final ByteBuf bb = Unpooled.buffer(b.length);
- bb.writeBytes(b);
- return bb;
- }
-
- private void addCustomClasses(final Map<String, Object> config, final TypeSerializerRegistry.Builder builder) {
- final List<String> classNameList = getListStringFromConfig(TOKEN_CUSTOM, config);
-
- classNameList.forEach(serializerDefinition -> {
- final String className;
- final String serializerName;
- if (serializerDefinition.contains(";")) {
- final String[] split = serializerDefinition.split(";");
- if (split.length != 2)
- throw new IllegalStateException(String.format("Invalid format for serializer definition [%s] - expected <class>;<serializer-class>", serializerDefinition));
-
- className = split[0];
- serializerName = split[1];
- } else {
- throw new IllegalStateException(String.format("Invalid format for serializer definition [%s] - expected <class>;<serializer-class>", serializerDefinition));
- }
-
- try {
- final Class clazz = Class.forName(className);
- final Class serializerClazz = Class.forName(serializerName);
- final CustomTypeSerializer serializer = (CustomTypeSerializer) serializerClazz.newInstance();
- builder.addCustomType(clazz, serializer);
- } catch (Exception ex) {
- throw new IllegalStateException("CustomTypeSerializer could not be instantiated", ex);
- }
- });
- }
-
- private Object serializeResultToString(final ResponseMessage msg) {
- if (msg.getResult() == null) return "null";
- if (msg.getResult().getData() == null) return "null";
-
- // the IteratorHandler should return a collection so keep it as such
- final Object o = msg.getResult().getData();
- if (o instanceof Collection) {
- return ((Collection) o).stream().map(d -> null == d ? "null" : d.toString()).collect(Collectors.toList());
- } else {
- return o.toString();
- }
- }
-}
diff --git a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphBinaryMessageSerializerV4.java b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphBinaryMessageSerializerV4.java
new file mode 100644
index 0000000..e26d02a
--- /dev/null
+++ b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphBinaryMessageSerializerV4.java
@@ -0,0 +1,332 @@
+/*
+ * 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.util.ser;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.io.Buffer;
+import org.apache.tinkerpop.gremlin.structure.io.IoRegistry;
+import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryIo;
+import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryMapper;
+import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryReader;
+import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryWriter;
+import org.apache.tinkerpop.gremlin.structure.io.binary.Marker;
+import org.apache.tinkerpop.gremlin.structure.io.binary.TypeSerializerRegistry;
+import org.apache.tinkerpop.gremlin.structure.io.binary.types.CustomTypeSerializer;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseStatus;
+import org.apache.tinkerpop.gremlin.util.ser.binary.RequestMessageSerializer;
+import org.javatuples.Pair;
+import org.javatuples.Triplet;
+
+import java.io.IOException;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Map;
+
+public class GraphBinaryMessageSerializerV4 extends AbstractMessageSerializer<GraphBinaryMapper> {
+ public static final String TOKEN_CUSTOM = "custom";
+ public static final String TOKEN_BUILDER = "builder";
+
+ private GraphBinaryReader reader;
+ private GraphBinaryWriter writer;
+ private RequestMessageSerializer requestSerializer;
+ private final GraphBinaryMapper mapper;
+
+ private static final NettyBufferFactory bufferFactory = new NettyBufferFactory();
+ private static final String MIME_TYPE = SerTokens.MIME_GRAPHBINARY_V4;
+
+ /**
+ * Creates a new instance of the message serializer using the default type serializers.
+ */
+ public GraphBinaryMessageSerializerV4() {
+ this(TypeSerializerRegistry.INSTANCE);
+ }
+
+ public GraphBinaryMessageSerializerV4(final TypeSerializerRegistry registry) {
+ reader = new GraphBinaryReader(registry);
+ writer = new GraphBinaryWriter(registry);
+ mapper = new GraphBinaryMapper(writer, reader);
+
+ requestSerializer = new RequestMessageSerializer();
+ }
+
+ public GraphBinaryMessageSerializerV4(final TypeSerializerRegistry.Builder builder) {
+ this(builder.create());
+ }
+
+ @Override
+ public GraphBinaryMapper getMapper() {
+ return mapper;
+ }
+
+ @Override
+ public void configure(final Map<String, Object> config, final Map<String, Graph> graphs) {
+ final String builderClassName = (String) config.get(TOKEN_BUILDER);
+ final TypeSerializerRegistry.Builder builder;
+
+ if (builderClassName != null) {
+ try {
+ final Class<?> clazz = Class.forName(builderClassName);
+ final Constructor<?> ctor = clazz.getConstructor();
+ builder = (TypeSerializerRegistry.Builder) ctor.newInstance();
+ } catch (Exception ex) {
+ throw new IllegalStateException(ex);
+ }
+ } else {
+ builder = TypeSerializerRegistry.build();
+ }
+
+ final List<String> classNameList = getListStringFromConfig(TOKEN_IO_REGISTRIES, config);
+ classNameList.forEach(className -> {
+ try {
+ final Class<?> clazz = Class.forName(className);
+ try {
+ final Method instanceMethod = tryInstanceMethod(clazz);
+ final IoRegistry ioreg = (IoRegistry) instanceMethod.invoke(null);
+ final List<Pair<Class, CustomTypeSerializer>> classSerializers = ioreg.find(GraphBinaryIo.class, CustomTypeSerializer.class);
+ for (Pair<Class,CustomTypeSerializer> cs : classSerializers) {
+ builder.addCustomType(cs.getValue0(), cs.getValue1());
+ }
+ } catch (Exception methodex) {
+ throw new IllegalStateException(String.format("Could not instantiate IoRegistry from an instance() method on %s", className), methodex);
+ }
+ } catch (Exception ex) {
+ throw new IllegalStateException(ex);
+ }
+ });
+
+ addCustomClasses(config, builder);
+
+ final TypeSerializerRegistry registry = builder.create();
+ reader = new GraphBinaryReader(registry);
+ writer = new GraphBinaryWriter(registry);
+
+ requestSerializer = new RequestMessageSerializer();
+ }
+
+ @Override
+ public String[] mimeTypesSupported() {
+ return new String[] {MIME_TYPE};
+ }
+
+ private void addCustomClasses(final Map<String, Object> config, final TypeSerializerRegistry.Builder builder) {
+ final List<String> classNameList = getListStringFromConfig(TOKEN_CUSTOM, config);
+
+ classNameList.forEach(serializerDefinition -> {
+ final String className;
+ final String serializerName;
+ if (serializerDefinition.contains(";")) {
+ final String[] split = serializerDefinition.split(";");
+ if (split.length != 2)
+ throw new IllegalStateException(String.format("Invalid format for serializer definition [%s] - expected <class>;<serializer-class>", serializerDefinition));
+
+ className = split[0];
+ serializerName = split[1];
+ } else {
+ throw new IllegalStateException(String.format("Invalid format for serializer definition [%s] - expected <class>;<serializer-class>", serializerDefinition));
+ }
+
+ try {
+ final Class clazz = Class.forName(className);
+ final Class serializerClazz = Class.forName(serializerName);
+ final CustomTypeSerializer serializer = (CustomTypeSerializer) serializerClazz.newInstance();
+ builder.addCustomType(clazz, serializer);
+ } catch (Exception ex) {
+ throw new IllegalStateException("CustomTypeSerializer could not be instantiated", ex);
+ }
+ });
+ }
+
+ @Override
+ public ByteBuf serializeRequestAsBinary(RequestMessage requestMessage, ByteBufAllocator allocator) throws SerializationException {
+ final ByteBuf buffer = allocator.buffer();
+
+ try {
+ requestSerializer.writeValue(requestMessage, buffer, writer);
+ } catch (Exception ex) {
+ buffer.release();
+ throw ex;
+ }
+
+ return buffer;
+ }
+
+ @Override
+ public RequestMessage deserializeBinaryRequest(ByteBuf msg) throws SerializationException {
+ return requestSerializer.readValue(msg, reader);
+ }
+
+ @Override
+ public ByteBuf serializeResponseAsBinary(final ResponseMessage responseMessage, final ByteBufAllocator allocator) throws SerializationException {
+ if (null == responseMessage.getStatus()) {
+ throw new SerializationException("ResponseStatus can't be null when serializing a full ResponseMessage.");
+ }
+
+ return writeHeader(responseMessage, allocator);
+ }
+
+ //////////////// chunked write
+ @Override
+ public ByteBuf writeHeader(final ResponseMessage responseMessage, final ByteBufAllocator allocator) throws SerializationException {
+ final EnumSet<MessageParts> parts = responseMessage.getStatus() != null ? MessageParts.ALL : MessageParts.START;
+
+ return write(responseMessage, null, allocator, parts);
+ }
+
+ @Override
+ public ByteBuf writeChunk(final Object aggregate, final ByteBufAllocator allocator) throws SerializationException {
+ return write(null, aggregate, allocator, MessageParts.CHUNK);
+ }
+
+ @Override
+ public ByteBuf writeFooter(final ResponseMessage responseMessage, final ByteBufAllocator allocator) throws SerializationException {
+ return write(responseMessage, null, allocator, MessageParts.END);
+ }
+
+ @Override
+ public ByteBuf writeErrorFooter(final ResponseMessage responseMessage, final ByteBufAllocator allocator) throws SerializationException {
+ return write(responseMessage, null, allocator, MessageParts.ERROR);
+ }
+
+ private ByteBuf write(final ResponseMessage responseMessage, final Object aggregate,
+ final ByteBufAllocator allocator, final EnumSet<MessageParts> parts) throws SerializationException {
+ final ByteBuf byteBuf = allocator.buffer();
+ final Buffer buffer = bufferFactory.create(byteBuf);
+
+ try {
+ if (parts.contains(MessageParts.HEADER)) {
+ // Version
+ buffer.writeByte(GraphBinaryWriter.VERSION_BYTE);
+ if (responseMessage.getResult().isBulked()) {
+ buffer.writeByte(GraphBinaryWriter.BULKED_BYTE);
+ } else {
+ buffer.writeByte((byte) 0);
+ }
+ }
+
+ if (parts.contains(MessageParts.DATA)) {
+ final Object data = aggregate == null && responseMessage.getResult() != null
+ ? responseMessage.getResult().getData()
+ : aggregate;
+ if (data != null) {
+ for (final Object item : (List) data) {
+ writer.write(item, buffer);
+ }
+ }
+ }
+
+ if (parts.contains(MessageParts.FOOTER)) {
+ final ResponseStatus status = responseMessage.getStatus();
+
+ // we don't know how much data we have, so need a special object
+ writer.write(Marker.END_OF_STREAM, buffer);
+ // Status code
+ writer.writeValue(status.getCode().code(), buffer, false);
+ // Nullable status message
+ writer.writeValue(status.getMessage(), buffer, true);
+ // Nullable exception
+ writer.writeValue(status.getException(), buffer, true);
+ }
+ } catch (IOException e) {
+ throw new SerializationException(e);
+ }
+ return byteBuf;
+ }
+
+ //////////////// read message methods
+
+ @Override
+ public ResponseMessage deserializeBinaryResponse(final ByteBuf msg) throws SerializationException {
+ return readChunk(msg, true);
+ }
+
+ private List<Object> readPayload(final Buffer buffer) throws IOException {
+ final List<Object> result = new ArrayList<>();
+ while (buffer.readableBytes() != 0) {
+ final Object obj = reader.read(buffer);
+ if (Marker.END_OF_STREAM.equals(obj)) {
+ break;
+ }
+ result.add(obj);
+ }
+ return result;
+ }
+
+ private Triplet<HttpResponseStatus, String, String> readFooter(final Buffer buffer) throws IOException {
+ final HttpResponseStatus statusCode = HttpResponseStatus.valueOf(reader.readValue(buffer, Integer.class, false));
+ final String message = reader.readValue(buffer, String.class, true);
+ final String exception = reader.readValue(buffer, String.class, true);
+
+ return Triplet.with(statusCode, message, exception);
+ }
+
+ @Override
+ public ResponseMessage readChunk(final ByteBuf byteBuf, final boolean isFirstChunk) throws SerializationException {
+ final Buffer buffer = bufferFactory.create(byteBuf);
+ boolean bulking = false;
+
+ try {
+ // empty input buffer
+ if (buffer.readableBytes() == 0) {
+ return ResponseMessage.build().result(Collections.emptyList()).create();
+ }
+
+ if (isFirstChunk) {
+ final int version = buffer.readByte() & 0xff;
+
+ if (version >>> 7 != 1) {
+ // This is an indication that the response buffer was incorrectly built
+ // Or the buffer offsets are wrong
+ throw new SerializationException("The most significant bit should be set according to the format");
+ }
+ bulking = (buffer.readByte() & 1) == 1;
+ }
+
+ final List<Object> result = readPayload(buffer);
+
+ // no footer
+ if (buffer.readableBytes() == 0) {
+ return ResponseMessage.build()
+ .result(result)
+ .bulked(bulking)
+ .create();
+ }
+
+ final Triplet<HttpResponseStatus, String, String> footer = readFooter(buffer);
+ return ResponseMessage.build()
+ .result(result)
+ .bulked(bulking)
+ .code(footer.getValue0())
+ .statusMessage(footer.getValue1())
+ .exception(footer.getValue2())
+ .create();
+
+ } catch (IOException | IndexOutOfBoundsException ex) {
+ throw new SerializationException(ex);
+ }
+ }
+}
diff --git a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONMessageSerializerV1.java b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONMessageSerializerV1.java
deleted file mode 100644
index 8b2b781..0000000
--- a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONMessageSerializerV1.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.util.ser;
-
-import io.netty.buffer.ByteBufAllocator;
-import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.TypeInfo;
-import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.nio.ByteBuffer;
-import java.util.Map;
-import java.util.UUID;
-
-/**
- * Serialize results to JSON with version 1.0.x schema.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public final class GraphSONMessageSerializerV1 extends AbstractGraphSONMessageSerializerV1 implements MessageTextSerializer<ObjectMapper> {
- private static final Logger logger = LoggerFactory.getLogger(GraphSONMessageSerializerV1.class);
- private static final String MIME_TYPE = SerTokens.MIME_GRAPHSON_V1;
-
- private static byte[] header;
-
- static {
- final ByteBuffer buffer = ByteBuffer.allocate(MIME_TYPE.length() + 1);
- buffer.put((byte) MIME_TYPE.length());
- buffer.put(MIME_TYPE.getBytes());
- header = buffer.array();
- }
-
- public GraphSONMessageSerializerV1() {
- super();
- }
-
- public GraphSONMessageSerializerV1(final GraphSONMapper mapper) {
- super(mapper);
- }
-
- @Override
- public String[] mimeTypesSupported() {
- return new String[]{MIME_TYPE, SerTokens.MIME_JSON};
- }
-
- @Override
- GraphSONMapper.Builder configureBuilder(final GraphSONMapper.Builder builder) {
- return builder.addCustomModule(new GremlinServerModule())
- .typeInfo(TypeInfo.PARTIAL_TYPES);
- }
-
- @Override
- byte[] obtainHeader() {
- return header;
- }
-
- @Override
- public ResponseMessage deserializeResponse(final String msg) throws SerializationException {
- try {
- final Map<String, Object> responseData = mapper.readValue(msg, mapTypeReference);
- final Map<String, Object> status = (Map<String, Object>) responseData.get(SerTokens.TOKEN_STATUS);
- final Map<String, Object> result = (Map<String, Object>) responseData.get(SerTokens.TOKEN_RESULT);
- return ResponseMessage.build(UUID.fromString(responseData.get(SerTokens.TOKEN_REQUEST).toString()))
- .code(ResponseStatusCode.getFromValue((Integer) status.get(SerTokens.TOKEN_CODE)))
- .statusMessage(String.valueOf(status.get(SerTokens.TOKEN_MESSAGE)))
- .statusAttributes((Map<String, Object>) status.get(SerTokens.TOKEN_ATTRIBUTES))
- .result(result.get(SerTokens.TOKEN_DATA))
- .responseMetaData((Map<String, Object>) result.get(SerTokens.TOKEN_META))
- .create();
- } catch (Exception ex) {
- logger.warn("Response [{}] could not be deserialized by {}.", msg, AbstractGraphSONMessageSerializerV1.class.getName());
- throw new SerializationException(ex);
- }
- }
-
- @Override
- public String serializeResponseAsString(final ResponseMessage responseMessage, final ByteBufAllocator allocator) throws SerializationException {
- try {
- return mapper.writeValueAsString(responseMessage);
- } catch (Exception ex) {
- logger.warn("Response [{}] could not be serialized by {}.", responseMessage.toString(), AbstractGraphSONMessageSerializerV1.class.getName());
- throw new SerializationException(ex);
- }
- }
-
- @Override
- public RequestMessage deserializeRequest(final String msg) throws SerializationException {
- try {
- return mapper.readValue(msg, RequestMessage.class);
- } catch (Exception ex) {
- logger.warn("Request [{}] could not be deserialized by {}.", msg, AbstractGraphSONMessageSerializerV1.class.getName());
- throw new SerializationException(ex);
- }
- }
-
- @Override
- public String serializeRequestAsString(final RequestMessage requestMessage, final ByteBufAllocator allocator) throws SerializationException {
- try {
- return mapper.writeValueAsString(requestMessage);
- } catch (Exception ex) {
- logger.warn("Request [{}] could not be serialized by {}.", requestMessage.toString(), AbstractGraphSONMessageSerializerV1.class.getName());
- throw new SerializationException(ex);
- }
- }
-}
diff --git a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONMessageSerializerV2.java b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONMessageSerializerV2.java
deleted file mode 100644
index fadd112..0000000
--- a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONMessageSerializerV2.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.util.ser;
-
-import io.netty.buffer.ByteBufAllocator;
-import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONXModuleV2;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.TypeInfo;
-import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.nio.ByteBuffer;
-
-/**
- * Serialize results to JSON with version 2.0.x schema and the extended module.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public final class GraphSONMessageSerializerV2 extends AbstractGraphSONMessageSerializerV2 implements MessageTextSerializer<ObjectMapper> {
- private static final Logger logger = LoggerFactory.getLogger(GraphSONMessageSerializerV2.class);
- private static final String MIME_TYPE = SerTokens.MIME_GRAPHSON_V2;
-
- private static byte[] header;
-
- static {
- final ByteBuffer buffer = ByteBuffer.allocate(MIME_TYPE.length() + 1);
- buffer.put((byte) MIME_TYPE.length());
- buffer.put(MIME_TYPE.getBytes());
- header = buffer.array();
- }
-
- /**
- * Creates a default GraphSONMessageSerializer. By default this will internally instantiate a {@link GraphSONMapper}
- * and register a {@link GremlinServerModule} and {@link GraphSONXModuleV2} to the mapper.
- *
- * @see #GraphSONMessageSerializerV2(GraphSONMapper.Builder)
- */
- public GraphSONMessageSerializerV2() {
- super();
- }
-
- /**
- * Create a GraphSONMessageSerializer from a {@link GraphSONMapper}. Deprecated, use
- * {@link #GraphSONMessageSerializerV2(GraphSONMapper.Builder)} instead.
- */
- @Deprecated
- public GraphSONMessageSerializerV2(final GraphSONMapper mapper) {
- super(mapper);
- }
-
- /**
- * Create a GraphSONMessageSerializer with a provided {@link GraphSONMapper.Builder}.
- *
- * Note that to make this mapper usable in the context of request messages and responses,
- * this method will automatically register a {@link GremlinServerModule} to the provided
- * mapper.
- */
- public GraphSONMessageSerializerV2(final GraphSONMapper.Builder mapperBuilder) {
- super(mapperBuilder);
- }
-
- @Override
- public String[] mimeTypesSupported() {
- return new String[]{MIME_TYPE, SerTokens.MIME_JSON};
- }
-
- @Override
- GraphSONMapper.Builder configureBuilder(final GraphSONMapper.Builder builder) {
- // already set to 2.0 in AbstractGraphSONMessageSerializerV2
- return builder.typeInfo(TypeInfo.PARTIAL_TYPES).addCustomModule(new GremlinServerModule());
- }
-
- @Override
- byte[] obtainHeader() {
- return header;
- }
-
- @Override
- public ResponseMessage deserializeResponse(final String msg) throws SerializationException {
- try {
- return mapper.readValue(msg, ResponseMessage.class);
- } catch (Exception ex) {
- logger.warn("Response [{}] could not be deserialized by {}.", msg, AbstractGraphSONMessageSerializerV2.class.getName());
- throw new SerializationException(ex);
- }
- }
-
- @Override
- public String serializeResponseAsString(final ResponseMessage responseMessage, final ByteBufAllocator allocator) throws SerializationException {
- try {
- return mapper.writeValueAsString(responseMessage);
- } catch (Exception ex) {
- logger.warn("Response [{}] could not be serialized by {}.", responseMessage.toString(), AbstractGraphSONMessageSerializerV2.class.getName());
- throw new SerializationException(ex);
- }
- }
-
- @Override
- public RequestMessage deserializeRequest(final String msg) throws SerializationException {
- try {
- return mapper.readValue(msg, RequestMessage.class);
- } catch (Exception ex) {
- logger.warn("Request [{}] could not be deserialized by {}.", msg, AbstractGraphSONMessageSerializerV2.class.getName());
- throw new SerializationException(ex);
- }
- }
-
- @Override
- public String serializeRequestAsString(final RequestMessage requestMessage, final ByteBufAllocator allocator) throws SerializationException {
- try {
- return mapper.writeValueAsString(requestMessage);
- } catch (Exception ex) {
- logger.warn("Request [{}] could not be serialized by {}.", requestMessage.toString(), AbstractGraphSONMessageSerializerV2.class.getName());
- throw new SerializationException(ex);
- }
- }
-}
diff --git a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONMessageSerializerV3.java b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONMessageSerializerV3.java
deleted file mode 100644
index e4d2380..0000000
--- a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONMessageSerializerV3.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.util.ser;
-
-import io.netty.buffer.ByteBufAllocator;
-import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONVersion;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONXModuleV3;
-import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.nio.ByteBuffer;
-
-/**
- * Serialize results to JSON with version 3.0.x schema and the extended module.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public final class GraphSONMessageSerializerV3 extends AbstractGraphSONMessageSerializerV2 implements MessageTextSerializer<ObjectMapper> {
- private static final Logger logger = LoggerFactory.getLogger(GraphSONMessageSerializerV3.class);
- private static final String MIME_TYPE = SerTokens.MIME_GRAPHSON_V3;
-
- private static byte[] header;
-
- static {
- final ByteBuffer buffer = ByteBuffer.allocate(MIME_TYPE.length() + 1);
- buffer.put((byte) MIME_TYPE.length());
- buffer.put(MIME_TYPE.getBytes());
- header = buffer.array();
- }
-
- /**
- * Creates a default GraphSONMessageSerializer.
- * <p>
- * By default this will internally instantiate a {@link GraphSONMapper} and register
- * a {@link GremlinServerModule} and {@link GraphSONXModuleV3} to the mapper.
- *
- * @see #GraphSONMessageSerializerV3(GraphSONMapper.Builder)
- */
- public GraphSONMessageSerializerV3() {
- super();
- }
-
- /**
- * Create a GraphSONMessageSerializer from a {@link GraphSONMapper}. Deprecated, use
- * {@link #GraphSONMessageSerializerV3(GraphSONMapper.Builder)} instead.
- */
- @Deprecated
- public GraphSONMessageSerializerV3(final GraphSONMapper mapper) {
- super(mapper);
- }
-
- /**
- * Create a GraphSONMessageSerializer with a provided {@link GraphSONMapper.Builder}.
- *
- * Note that to make this mapper usable in the context of request messages and responses,
- * this method will automatically register a {@link GremlinServerModule} to the provided
- * mapper.
- */
- public GraphSONMessageSerializerV3(final GraphSONMapper.Builder mapperBuilder) {
- super(mapperBuilder);
- }
-
- @Override
- public String[] mimeTypesSupported() {
- return new String[]{MIME_TYPE, SerTokens.MIME_JSON};
- }
-
- @Override
- GraphSONMapper.Builder configureBuilder(final GraphSONMapper.Builder builder) {
- // override the 2.0 in AbstractGraphSONMessageSerializerV2
- return builder.version(GraphSONVersion.V3_0).addCustomModule(new GremlinServerModule());
- }
-
- @Override
- byte[] obtainHeader() {
- return header;
- }
-
- @Override
- public ResponseMessage deserializeResponse(final String msg) throws SerializationException {
- try {
- return mapper.readValue(msg, ResponseMessage.class);
- } catch (Exception ex) {
- logger.warn(String.format("Response [%s] could not be deserialized by %s.", msg, GraphSONMessageSerializerV3.class.getName()), ex);
- throw new SerializationException(ex);
- }
- }
-
- @Override
- public String serializeResponseAsString(final ResponseMessage responseMessage, final ByteBufAllocator allocator) throws SerializationException {
- try {
- return mapper.writeValueAsString(responseMessage);
- } catch (Exception ex) {
- logger.warn(String.format("Response [%s] could not be serialized by %s.", responseMessage.toString(), GraphSONMessageSerializerV3.class.getName()), ex);
- throw new SerializationException(ex);
- }
- }
-
- @Override
- public RequestMessage deserializeRequest(final String msg) throws SerializationException {
- try {
- return mapper.readValue(msg, RequestMessage.class);
- } catch (Exception ex) {
- logger.warn(String.format("Request [%s] could not be deserialized by %s.", msg, GraphSONMessageSerializerV3.class.getName()), ex);
- throw new SerializationException(ex);
- }
- }
-
- @Override
- public String serializeRequestAsString(final RequestMessage requestMessage, final ByteBufAllocator allocator) throws SerializationException {
- try {
- return mapper.writeValueAsString(requestMessage);
- } catch (Exception ex) {
- logger.warn(String.format("Request [%s] could not be serialized by %s.", requestMessage.toString(), GraphSONMessageSerializerV3.class.getName()), ex);
- throw new SerializationException(ex);
- }
- }
-}
diff --git a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONMessageSerializerV4.java b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONMessageSerializerV4.java
new file mode 100644
index 0000000..0e47551
--- /dev/null
+++ b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONMessageSerializerV4.java
@@ -0,0 +1,63 @@
+/*
+ * 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.util.ser;
+
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONVersion;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONXModuleV4;
+
+/**
+ * Serialize results to JSON with version 4.0.x schema and the extended module.
+ */
+public final class GraphSONMessageSerializerV4 extends AbstractGraphSONMessageSerializerV4 {
+ private static final String MIME_TYPE = SerTokens.MIME_GRAPHSON_V4;
+
+ /**
+ * Creates a default GraphSONMessageSerializer.
+ * <p>
+ * By default this will internally instantiate a {@link GraphSONMapper} and register
+ * a {@link GremlinServerModuleV4} and {@link GraphSONXModuleV4} to the mapper.
+ *
+ * @see #GraphSONMessageSerializerV4(GraphSONMapper.Builder)
+ */
+ public GraphSONMessageSerializerV4() {
+ super();
+ }
+
+ /**
+ * Create a GraphSONMessageSerializer with a provided {@link GraphSONMapper.Builder}.
+ *
+ * Note that to make this mapper usable in the context of request messages and responses,
+ * this method will automatically register a {@link GremlinServerModuleV4} to the provided
+ * mapper.
+ */
+ public GraphSONMessageSerializerV4(final GraphSONMapper.Builder mapperBuilder) {
+ super(mapperBuilder);
+ }
+
+ @Override
+ public String[] mimeTypesSupported() {
+ return new String[]{MIME_TYPE, SerTokens.MIME_JSON};
+ }
+
+ @Override
+ GraphSONMapper.Builder configureBuilder(final GraphSONMapper.Builder builder) {
+ return builder.version(GraphSONVersion.V4_0).addCustomModule(new GremlinServerModuleV4());
+ }
+}
diff --git a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONUntypedMessageSerializerV1.java b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONUntypedMessageSerializerV1.java
deleted file mode 100644
index 520111b..0000000
--- a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONUntypedMessageSerializerV1.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.util.ser;
-
-import io.netty.buffer.ByteBufAllocator;
-import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.TypeInfo;
-import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.nio.ByteBuffer;
-import java.util.Map;
-import java.util.UUID;
-
-/**
- * Serialize results to JSON with version 1.0.x schema and serialization which does not embed types.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public final class GraphSONUntypedMessageSerializerV1 extends AbstractGraphSONMessageSerializerV1 implements MessageTextSerializer<ObjectMapper> {
- private static final Logger logger = LoggerFactory.getLogger(GraphSONUntypedMessageSerializerV1.class);
- private static final String MIME_TYPE = SerTokens.MIME_GRAPHSON_V1_UNTYPED;
-
- private static byte[] header;
-
- static {
- final ByteBuffer buffer = ByteBuffer.allocate(MIME_TYPE.length() + 1);
- buffer.put((byte) MIME_TYPE.length());
- buffer.put(MIME_TYPE.getBytes());
- header = buffer.array();
- }
-
- public GraphSONUntypedMessageSerializerV1() {
- super();
- }
-
- public GraphSONUntypedMessageSerializerV1(final GraphSONMapper mapper) {
- super(mapper);
- }
-
- @Override
- public String[] mimeTypesSupported() {
- return new String[]{MIME_TYPE, SerTokens.MIME_JSON};
- }
-
- @Override
- GraphSONMapper.Builder configureBuilder(final GraphSONMapper.Builder builder) {
- // already set to 1.0 in AbstractGraphSONMessageSerializerV1
- return builder.addCustomModule(new GremlinServerModule())
- .typeInfo(TypeInfo.NO_TYPES);
- }
-
- @Override
- byte[] obtainHeader() {
- return header;
- }
-
- @Override
- public ResponseMessage deserializeResponse(final String msg) throws SerializationException {
- try {
- final Map<String, Object> responseData = mapper.readValue(msg, mapTypeReference);
- final Map<String, Object> status = (Map<String, Object>) responseData.get(SerTokens.TOKEN_STATUS);
- final Map<String, Object> result = (Map<String, Object>) responseData.get(SerTokens.TOKEN_RESULT);
- return ResponseMessage.build(UUID.fromString(responseData.get(SerTokens.TOKEN_REQUEST).toString()))
- .code(ResponseStatusCode.getFromValue((Integer) status.get(SerTokens.TOKEN_CODE)))
- .statusMessage(String.valueOf(status.get(SerTokens.TOKEN_MESSAGE)))
- .statusAttributes((Map<String, Object>) status.get(SerTokens.TOKEN_ATTRIBUTES))
- .result(result.get(SerTokens.TOKEN_DATA))
- .responseMetaData((Map<String, Object>) result.get(SerTokens.TOKEN_META))
- .create();
- } catch (Exception ex) {
- logger.warn("Response [{}] could not be deserialized by {}.", msg, AbstractGraphSONMessageSerializerV1.class.getName());
- throw new SerializationException(ex);
- }
- }
-
- @Override
- public String serializeResponseAsString(final ResponseMessage responseMessage, final ByteBufAllocator allocator) throws SerializationException {
- try {
- return mapper.writeValueAsString(responseMessage);
- } catch (Exception ex) {
- logger.warn("Response [{}] could not be serialized by {}.", responseMessage.toString(), AbstractGraphSONMessageSerializerV1.class.getName());
- throw new SerializationException(ex);
- }
- }
-
- @Override
- public RequestMessage deserializeRequest(final String msg) throws SerializationException {
- try {
- return mapper.readValue(msg, RequestMessage.class);
- } catch (Exception ex) {
- logger.warn("Request [{}] could not be deserialized by {}.", msg, AbstractGraphSONMessageSerializerV1.class.getName());
- throw new SerializationException(ex);
- }
- }
-
- @Override
- public String serializeRequestAsString(final RequestMessage requestMessage, final ByteBufAllocator allocator) throws SerializationException {
- try {
- return mapper.writeValueAsString(requestMessage);
- } catch (Exception ex) {
- logger.warn("Request [{}] could not be serialized by {}.", requestMessage.toString(), AbstractGraphSONMessageSerializerV1.class.getName());
- throw new SerializationException(ex);
- }
- }
-}
diff --git a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONUntypedMessageSerializerV2.java b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONUntypedMessageSerializerV2.java
deleted file mode 100644
index eae64c4..0000000
--- a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONUntypedMessageSerializerV2.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.util.ser;
-
-import io.netty.buffer.ByteBufAllocator;
-import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONXModuleV2;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.TypeInfo;
-import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.nio.ByteBuffer;
-
-/**
- * Serialize results to JSON with version 2.0.x schema and the extended module without embedded types.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public final class GraphSONUntypedMessageSerializerV2 extends AbstractGraphSONMessageSerializerV2 implements MessageTextSerializer<ObjectMapper> {
- private static final Logger logger = LoggerFactory.getLogger(GraphSONUntypedMessageSerializerV2.class);
- private static final String MIME_TYPE = SerTokens.MIME_GRAPHSON_V2_UNTYPED;
-
- private static byte[] header;
-
- static {
- final ByteBuffer buffer = ByteBuffer.allocate(MIME_TYPE.length() + 1);
- buffer.put((byte) MIME_TYPE.length());
- buffer.put(MIME_TYPE.getBytes());
- header = buffer.array();
- }
-
- /**
- * Creates a default GraphSONMessageSerializer.
- *
- * By default this will internally instantiate a {@link GraphSONMapper} and register
- * a {@link GremlinServerModule} and {@link GraphSONXModuleV2} to the mapper.
- *
- * @see #GraphSONUntypedMessageSerializerV2(GraphSONMapper.Builder)
- */
- public GraphSONUntypedMessageSerializerV2() {
- super();
- }
-
- /**
- * Create a GraphSONMessageSerializer with a provided {@link GraphSONMapper.Builder}.
- *
- * Note that to make this mapper usable in the context of request messages and responses,
- * this method will automatically register a {@link GremlinServerModule} to the provided
- * mapper.
- */
- public GraphSONUntypedMessageSerializerV2(final GraphSONMapper.Builder mapperBuilder) {
- super(mapperBuilder);
- }
-
- @Override
- public String[] mimeTypesSupported() {
- return new String[]{MIME_TYPE, SerTokens.MIME_JSON};
- }
-
- @Override
- GraphSONMapper.Builder configureBuilder(final GraphSONMapper.Builder builder) {
- // already set to 2.0 in AbstractGraphSONMessageSerializerV2
- return builder.typeInfo(TypeInfo.NO_TYPES).addCustomModule(new GremlinServerModule());
- }
-
- @Override
- byte[] obtainHeader() {
- return header;
- }
-
- @Override
- public ResponseMessage deserializeResponse(final String msg) throws SerializationException {
- try {
- return mapper.readValue(msg, ResponseMessage.class);
- } catch (Exception ex) {
- logger.warn("Response [{}] could not be deserialized by {}.", msg, AbstractGraphSONMessageSerializerV2.class.getName());
- throw new SerializationException(ex);
- }
- }
-
- @Override
- public String serializeResponseAsString(final ResponseMessage responseMessage, final ByteBufAllocator allocator) throws SerializationException {
- try {
- return mapper.writeValueAsString(responseMessage);
- } catch (Exception ex) {
- logger.warn("Response [{}] could not be serialized by {}.", responseMessage.toString(), AbstractGraphSONMessageSerializerV2.class.getName());
- throw new SerializationException(ex);
- }
- }
-
- @Override
- public RequestMessage deserializeRequest(final String msg) throws SerializationException {
- try {
- return mapper.readValue(msg, RequestMessage.class);
- } catch (Exception ex) {
- logger.warn("Request [{}] could not be deserialized by {}.", msg, AbstractGraphSONMessageSerializerV2.class.getName());
- throw new SerializationException(ex);
- }
- }
-
- @Override
- public String serializeRequestAsString(final RequestMessage requestMessage, final ByteBufAllocator allocator) throws SerializationException {
- try {
- return mapper.writeValueAsString(requestMessage);
- } catch (Exception ex) {
- logger.warn("Request [{}] could not be serialized by {}.", requestMessage.toString(), AbstractGraphSONMessageSerializerV2.class.getName());
- throw new SerializationException(ex);
- }
- }
-}
diff --git a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONUntypedMessageSerializerV3.java b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONUntypedMessageSerializerV3.java
deleted file mode 100644
index 9dffa21..0000000
--- a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONUntypedMessageSerializerV3.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.util.ser;
-
-import io.netty.buffer.ByteBufAllocator;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONXModuleV2;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.TypeInfo;
-import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
-import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.nio.ByteBuffer;
-
-/**
- * Serialize results to JSON with version 3.0.x schema and the extended module without embedded types.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public final class GraphSONUntypedMessageSerializerV3 extends AbstractGraphSONMessageSerializerV2 implements MessageTextSerializer<ObjectMapper> {
- private static final Logger logger = LoggerFactory.getLogger(GraphSONUntypedMessageSerializerV3.class);
- private static final String MIME_TYPE = SerTokens.MIME_GRAPHSON_V3_UNTYPED;
-
- private static byte[] header;
-
- static {
- final ByteBuffer buffer = ByteBuffer.allocate(MIME_TYPE.length() + 1);
- buffer.put((byte) MIME_TYPE.length());
- buffer.put(MIME_TYPE.getBytes());
- header = buffer.array();
- }
-
- /**
- * Creates a default GraphSONMessageSerializer.
- *
- * By default this will internally instantiate a {@link GraphSONMapper} and register
- * a {@link GremlinServerModule} and {@link GraphSONXModuleV2} to the mapper.
- *
- * @see #GraphSONUntypedMessageSerializerV3(GraphSONMapper.Builder)
- */
- public GraphSONUntypedMessageSerializerV3() {
- super();
- }
-
- /**
- * Create a GraphSONMessageSerializer with a provided {@link GraphSONMapper.Builder}.
- *
- * Note that to make this mapper usable in the context of request messages and responses,
- * this method will automatically register a {@link GremlinServerModule} to the provided
- * mapper.
- */
- public GraphSONUntypedMessageSerializerV3(final GraphSONMapper.Builder mapperBuilder) {
- super(mapperBuilder);
- }
-
- @Override
- public String[] mimeTypesSupported() {
- return new String[]{MIME_TYPE, SerTokens.MIME_JSON};
- }
-
- @Override
- GraphSONMapper.Builder configureBuilder(final GraphSONMapper.Builder builder) {
- return builder.typeInfo(TypeInfo.NO_TYPES).addCustomModule(new GremlinServerModule());
- }
-
- @Override
- byte[] obtainHeader() {
- return header;
- }
-
- @Override
- public ResponseMessage deserializeResponse(final String msg) throws SerializationException {
- try {
- return mapper.readValue(msg, ResponseMessage.class);
- } catch (Exception ex) {
- logger.warn("Response [{}] could not be deserialized by {}.", msg, AbstractGraphSONMessageSerializerV2.class.getName());
- throw new SerializationException(ex);
- }
- }
-
- @Override
- public String serializeResponseAsString(final ResponseMessage responseMessage, final ByteBufAllocator allocator) throws SerializationException {
- try {
- return mapper.writeValueAsString(responseMessage);
- } catch (Exception ex) {
- logger.warn("Response [{}] could not be serialized by {}.", responseMessage.toString(), AbstractGraphSONMessageSerializerV2.class.getName());
- throw new SerializationException(ex);
- }
- }
-
- @Override
- public RequestMessage deserializeRequest(final String msg) throws SerializationException {
- try {
- return mapper.readValue(msg, RequestMessage.class);
- } catch (Exception ex) {
- logger.warn("Request [{}] could not be deserialized by {}.", msg, AbstractGraphSONMessageSerializerV2.class.getName());
- throw new SerializationException(ex);
- }
- }
-
- @Override
- public String serializeRequestAsString(final RequestMessage requestMessage, final ByteBufAllocator allocator) throws SerializationException {
- try {
- return mapper.writeValueAsString(requestMessage);
- } catch (Exception ex) {
- logger.warn("Request [{}] could not be serialized by {}.", requestMessage.toString(), AbstractGraphSONMessageSerializerV2.class.getName());
- throw new SerializationException(ex);
- }
- }
-}
diff --git a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONUntypedMessageSerializerV4.java b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONUntypedMessageSerializerV4.java
new file mode 100644
index 0000000..5161d7b
--- /dev/null
+++ b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONUntypedMessageSerializerV4.java
@@ -0,0 +1,66 @@
+/*
+ * 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.util.ser;
+
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONXModuleV4;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.TypeInfo;
+
+/**
+ * Serialize results to JSON with version 4 schema and the extended module without embedded types.
+ */
+public final class GraphSONUntypedMessageSerializerV4 extends AbstractGraphSONMessageSerializerV4 {
+ private static final String MIME_TYPE = SerTokens.MIME_GRAPHSON_V4_UNTYPED;
+
+ /**
+ * Creates a default GraphSONMessageSerializer.
+ *
+ * By default this will internally instantiate a {@link GraphSONMapper} and register
+ * a {@link GremlinServerModuleV4} and {@link GraphSONXModuleV4} to the mapper.
+ *
+ * @see #GraphSONUntypedMessageSerializerV4(GraphSONMapper.Builder)
+ */
+ public GraphSONUntypedMessageSerializerV4() {
+ super();
+ }
+
+ /**
+ * Create a GraphSONMessageSerializer with a provided {@link GraphSONMapper.Builder}.
+ *
+ * Note that to make this mapper usable in the context of request messages and responses,
+ * this method will automatically register a {@link GremlinServerModuleV4} to the provided
+ * mapper.
+ */
+ public GraphSONUntypedMessageSerializerV4(final GraphSONMapper.Builder mapperBuilder) {
+ super(mapperBuilder);
+ }
+
+ @Override
+ public String[] mimeTypesSupported() {
+ return new String[]{MIME_TYPE, SerTokens.MIME_JSON};
+ }
+
+ @Override
+ GraphSONMapper.Builder configureBuilder(final GraphSONMapper.Builder builder) {
+ return builder.typeInfo(TypeInfo.NO_TYPES).addCustomModule(new GremlinServerModuleV4());
+ }
+
+ @Override
+ protected boolean isTyped() { return false; }
+}
diff --git a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/MessageTextSerializer.java b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/MessageTextSerializer.java
deleted file mode 100644
index 7d46aab..0000000
--- a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/MessageTextSerializer.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.util.ser;
-
-import io.netty.buffer.ByteBufAllocator;
-import org.apache.tinkerpop.gremlin.util.MessageSerializer;
-import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
-
-/**
- * An extension to the MessageSerializer interface that allows a format to be compatible with text-based
- * websocket messages. This interface is for internal purposes only. Implementers who have mapper serialization
- * needs should NOT implement this interface as it will not be used. Gremlin Server only supports plain JSON
- * for text-based requests.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public interface MessageTextSerializer<M> extends MessageSerializer<M> {
- public String serializeResponseAsString(final ResponseMessage responseMessage, final ByteBufAllocator allocator) throws SerializationException;
-
- public String serializeRequestAsString(final RequestMessage requestMessage, final ByteBufAllocator allocator) throws SerializationException;
-
- public RequestMessage deserializeRequest(final String msg) throws SerializationException;
-
- public ResponseMessage deserializeResponse(final String msg) throws SerializationException;
-}
diff --git a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/RequestMessageGryoSerializer.java b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/RequestMessageGryoSerializer.java
deleted file mode 100644
index 8b0c30b..0000000
--- a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/RequestMessageGryoSerializer.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.util.ser;
-
-import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.InputShim;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.KryoShim;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.OutputShim;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.SerializerShim;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class RequestMessageGryoSerializer implements SerializerShim<RequestMessage> {
- @Override
- public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final RequestMessage requestMessage) {
- kryo.writeObject(output, requestMessage.getRequestId());
- output.writeString(requestMessage.getProcessor());
- output.writeString(requestMessage.getOp());
- kryo.writeObject(output, requestMessage.getArgs());
- }
-
- @Override
- public <I extends InputShim> RequestMessage read(final KryoShim<I, ?> kryo, final I input, final Class<RequestMessage> aClass) {
- final UUID id = kryo.readObject(input, UUID.class);
- final String processor = input.readString();
- final String op = input.readString();
-
- final RequestMessage.Builder builder = RequestMessage.build(op)
- .overrideRequestId(id)
- .processor(processor);
-
- final Map<String, Object> args = kryo.readObject(input, HashMap.class);
- args.forEach(builder::addArg);
- return builder.create();
- }
-}
diff --git a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/ResponseMessageGryoSerializer.java b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/ResponseMessageGryoSerializer.java
deleted file mode 100644
index 84392a9..0000000
--- a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/ResponseMessageGryoSerializer.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.util.ser;
-
-import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.InputShim;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.KryoShim;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.OutputShim;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.SerializerShim;
-
-import java.util.Map;
-import java.util.UUID;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class ResponseMessageGryoSerializer implements SerializerShim<ResponseMessage> {
- @Override
- public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final ResponseMessage responseMessage) {
- kryo.writeObjectOrNull(output, responseMessage.getRequestId() != null ? responseMessage.getRequestId() : null, UUID.class);
-
- // status
- output.writeShort((short) responseMessage.getStatus().getCode().getValue());
- output.writeString(responseMessage.getStatus().getMessage());
- kryo.writeClassAndObject(output, responseMessage.getStatus().getAttributes());
-
- // result
- kryo.writeClassAndObject(output, responseMessage.getResult().getData());
- kryo.writeClassAndObject(output, responseMessage.getResult().getMeta());
-
- }
-
- @Override
- public <I extends InputShim> ResponseMessage read(final KryoShim<I, ?> kryo, final I input, final Class<ResponseMessage> clazz) {
- final UUID requestId = kryo.readObjectOrNull(input, UUID.class);
- final int status = input.readShort();
- final String statusMsg = input.readString();
- final Map<String,Object> statusAttributes = (Map<String,Object>) kryo.readClassAndObject(input);
- final Object result = kryo.readClassAndObject(input);
- final Map<String,Object> metaAttributes = (Map<String,Object>) kryo.readClassAndObject(input);
-
- return ResponseMessage.build(requestId)
- .code(ResponseStatusCode.getFromValue(status))
- .statusMessage(statusMsg)
- .statusAttributes(statusAttributes)
- .result(result)
- .responseMetaData(metaAttributes)
- .create();
- }
-}
\ No newline at end of file
diff --git a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/SerTokens.java b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/SerTokens.java
index 8be6d74..5354082 100644
--- a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/SerTokens.java
+++ b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/SerTokens.java
@@ -24,24 +24,21 @@
public final class SerTokens {
private SerTokens() {}
- public static final String TOKEN_ATTRIBUTES = "attributes";
public static final String TOKEN_RESULT = "result";
public static final String TOKEN_STATUS = "status";
- public static final String TOKEN_DATA = "data";
- public static final String TOKEN_META = "meta";
public static final String TOKEN_CODE = "code";
- public static final String TOKEN_REQUEST = "requestId";
+ public static final String TOKEN_DATA = "data";
+ public static final String TOKEN_EXCEPTION = "exception";
public static final String TOKEN_MESSAGE = "message";
- public static final String TOKEN_PROCESSOR = "processor";
- public static final String TOKEN_OP = "op";
- public static final String TOKEN_ARGS = "args";
+ public static final String TOKEN_GREMLIN = "gremlin";
+ public static final String TOKEN_LANGUAGE = "language";
+ public static final String TOKEN_BINDINGS = "bindings";
+ public static final String TOKEN_G = "g";
+ public static final String TOKEN_TIMEOUT_MS = "timeoutMs";
+ public static final String TOKEN_MATERIALIZE_PROPERTIES = "materializeProperties";
public static final String MIME_JSON = "application/json";
- public static final String MIME_GRAPHSON_V1 = "application/vnd.gremlin-v1.0+json";
- public static final String MIME_GRAPHSON_V1_UNTYPED = "application/vnd.gremlin-v1.0+json;types=false";
- public static final String MIME_GRAPHSON_V2 = "application/vnd.gremlin-v2.0+json";
- public static final String MIME_GRAPHSON_V2_UNTYPED = "application/vnd.gremlin-v2.0+json;types=false";
- public static final String MIME_GRAPHSON_V3 = "application/vnd.gremlin-v3.0+json";
- public static final String MIME_GRAPHSON_V3_UNTYPED = "application/vnd.gremlin-v3.0+json;types=false";
- public static final String MIME_GRAPHBINARY_V1 = "application/vnd.graphbinary-v1.0";
+ public static final String MIME_GRAPHSON_V4 = "application/vnd.gremlin-v4.0+json";
+ public static final String MIME_GRAPHSON_V4_UNTYPED = "application/vnd.gremlin-v4.0+json;types=false";
+ public static final String MIME_GRAPHBINARY_V4 = "application/vnd.graphbinary-v4.0";
}
diff --git a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/Serializers.java b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/Serializers.java
index 3aad5e3..b579c2f 100644
--- a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/Serializers.java
+++ b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/Serializers.java
@@ -21,51 +21,31 @@
import org.apache.tinkerpop.gremlin.util.MessageSerializer;
/**
- * An enum of the default serializers.
+ * An enum of the default serializers available starting in v4.0.
*
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
public enum Serializers {
/**
- * GraphSON 3.0.
+ * GraphSON 4.0.
*/
GRAPHSON(SerTokens.MIME_JSON),
/**
- * GraphSON 1.0 with types.
+ * GraphSON 4.0 with types.
*/
- GRAPHSON_V1(SerTokens.MIME_GRAPHSON_V1),
+ GRAPHSON_V4(SerTokens.MIME_GRAPHSON_V4),
/**
- * GraphSON 1.0 without types.
+ * GraphSON 4.0 without types.
*/
- GRAPHSON_V1_UNTYPED(SerTokens.MIME_GRAPHSON_V1_UNTYPED),
+ GRAPHSON_V4_UNTYPED(SerTokens.MIME_GRAPHSON_V4_UNTYPED),
/**
- * GraphSON 2.0 with types.
+ * GraphBinary 4.0.
*/
- GRAPHSON_V2(SerTokens.MIME_GRAPHSON_V2),
-
- /**
- * GraphSON 2.0 without types.
- */
- GRAPHSON_V2_UNTYPED(SerTokens.MIME_GRAPHSON_V2_UNTYPED),
-
- /**
- * GraphSON 3.0 with types.
- */
- GRAPHSON_V3(SerTokens.MIME_GRAPHSON_V3),
-
- /**
- * GraphSON 3.0 without types.
- */
- GRAPHSON_V3_UNTYPED(SerTokens.MIME_GRAPHSON_V3_UNTYPED),
-
- /**
- * GraphBinary 1.0.
- */
- GRAPHBINARY_V1(SerTokens.MIME_GRAPHBINARY_V1);
+ GRAPHBINARY_V4(SerTokens.MIME_GRAPHBINARY_V4);
private String value;
@@ -80,20 +60,12 @@
public MessageSerializer<?> simpleInstance() {
switch (value) {
case SerTokens.MIME_JSON:
- case SerTokens.MIME_GRAPHSON_V3:
- return new GraphSONMessageSerializerV3();
- case SerTokens.MIME_GRAPHSON_V1:
- return new GraphSONMessageSerializerV1();
- case SerTokens.MIME_GRAPHSON_V1_UNTYPED:
- return new GraphSONUntypedMessageSerializerV1();
- case SerTokens.MIME_GRAPHSON_V2:
- return new GraphSONMessageSerializerV2();
- case SerTokens.MIME_GRAPHSON_V2_UNTYPED:
- return new GraphSONUntypedMessageSerializerV2();
- case SerTokens.MIME_GRAPHSON_V3_UNTYPED:
- return new GraphSONUntypedMessageSerializerV3();
- case SerTokens.MIME_GRAPHBINARY_V1:
- return new GraphBinaryMessageSerializerV1();
+ case SerTokens.MIME_GRAPHSON_V4:
+ return new GraphSONMessageSerializerV4();
+ case SerTokens.MIME_GRAPHSON_V4_UNTYPED:
+ return new GraphSONUntypedMessageSerializerV4();
+ case SerTokens.MIME_GRAPHBINARY_V4:
+ return new GraphBinaryMessageSerializerV4();
default:
throw new RuntimeException("Could not create a simple MessageSerializer instance of " + value);
}
diff --git a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/binary/RequestMessageSerializer.java b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/binary/RequestMessageSerializer.java
index 9fecfc3..5b2ead6 100644
--- a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/binary/RequestMessageSerializer.java
+++ b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/binary/RequestMessageSerializer.java
@@ -19,16 +19,17 @@
package org.apache.tinkerpop.gremlin.util.ser.binary;
import io.netty.buffer.ByteBuf;
-import org.apache.tinkerpop.gremlin.util.ser.NettyBufferFactory;
-import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.util.ser.SerializationException;
import org.apache.tinkerpop.gremlin.structure.io.Buffer;
import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryReader;
import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryWriter;
+import org.apache.tinkerpop.gremlin.util.Tokens;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.ser.NettyBufferFactory;
+import org.apache.tinkerpop.gremlin.util.ser.SerTokens;
+import org.apache.tinkerpop.gremlin.util.ser.SerializationException;
import java.io.IOException;
import java.util.Map;
-import java.util.UUID;
public class RequestMessageSerializer {
private static NettyBufferFactory bufferFactory = new NettyBufferFactory();
@@ -46,14 +47,32 @@
}
try {
- final UUID id = context.readValue(buffer, UUID.class, false);
- final String op = context.readValue(buffer, String.class, false);
- final String processor = context.readValue(buffer, String.class, false);
+ final Map<String, Object> fields = context.readValue(buffer, Map.class, false);
- final RequestMessage.Builder builder = RequestMessage.build(op).overrideRequestId(id).processor(processor);
+ final String gremlin = context.readValue(buffer, String.class, false);
- final Map<String, Object> args = context.readValue(buffer, Map.class, false);
- args.forEach(builder::addArg);
+ final RequestMessage.Builder builder = RequestMessage.build(gremlin);
+ if (fields.containsKey(SerTokens.TOKEN_LANGUAGE)) {
+ builder.addLanguage(fields.get(SerTokens.TOKEN_LANGUAGE).toString());
+ }
+ if (fields.containsKey(SerTokens.TOKEN_G)) {
+ builder.addG(fields.get(SerTokens.TOKEN_G).toString());
+ }
+ if (fields.containsKey(SerTokens.TOKEN_BINDINGS)) {
+ builder.addBindings((Map<String, Object>) fields.get(SerTokens.TOKEN_BINDINGS));
+ }
+ if (fields.containsKey(Tokens.TIMEOUT_MS)) {
+ builder.addTimeoutMillis((long) fields.get(Tokens.TIMEOUT_MS));
+ }
+ if (fields.containsKey(Tokens.ARGS_MATERIALIZE_PROPERTIES)) {
+ builder.addMaterializeProperties(fields.get(Tokens.ARGS_MATERIALIZE_PROPERTIES).toString());
+ }
+ if (fields.containsKey(Tokens.ARGS_BATCH_SIZE)) {
+ builder.addChunkSize((int) fields.get(Tokens.ARGS_BATCH_SIZE));
+ }
+ if (fields.containsKey(Tokens.BULK_RESULTS)) {
+ builder.addBulkResults(Boolean.parseBoolean(fields.get(Tokens.BULK_RESULTS).toString()));
+ }
return builder.create();
} catch (IOException ex) {
@@ -68,14 +87,11 @@
try {
// Version
buffer.writeByte(GraphBinaryWriter.VERSION_BYTE);
- // RequestId
- context.writeValue(value.getRequestId(), buffer, false);
- // Op
- context.writeValue(value.getOp(), buffer, false);
- // Processor
- context.writeValue(value.getProcessor(), buffer, false);
- // Args
- context.writeValue(value.getArgs(), buffer, false);
+ // Fields
+ context.writeValue(value.getFields(), buffer, false);
+ // Gremlin
+ context.writeValue(value.getGremlin(), buffer, false);
+
} catch (IOException ex) {
throw new SerializationException(ex);
}
diff --git a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/binary/ResponseMessageSerializer.java b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/binary/ResponseMessageSerializer.java
deleted file mode 100644
index f6cc304..0000000
--- a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/binary/ResponseMessageSerializer.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.util.ser.binary;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.tinkerpop.gremlin.util.ser.NettyBufferFactory;
-import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseResult;
-import org.apache.tinkerpop.gremlin.util.message.ResponseStatus;
-import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.util.ser.SerializationException;
-import org.apache.tinkerpop.gremlin.structure.io.Buffer;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryReader;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryWriter;
-
-import java.io.IOException;
-import java.util.Map;
-import java.util.UUID;
-
-public class ResponseMessageSerializer {
- private static final NettyBufferFactory bufferFactory = new NettyBufferFactory();
-
- public ResponseMessage readValue(final ByteBuf byteBuf, final GraphBinaryReader context) throws SerializationException {
- // Wrap netty's buffer
- final Buffer buffer = bufferFactory.create(byteBuf);
- final int version = buffer.readByte() & 0xff;
-
- if (version >>> 7 != 1) {
- // This is an indication that the response buffer was incorrectly built
- // Or the buffer offsets are wrong
- throw new SerializationException("The most significant bit should be set according to the format");
- }
-
- try {
- return ResponseMessage.build(context.readValue(buffer, UUID.class, true))
- .code(ResponseStatusCode.getFromValue(context.readValue(buffer, Integer.class, false)))
- .statusMessage(context.readValue(buffer, String.class, true))
- .statusAttributes(context.readValue(buffer, Map.class, false))
- .responseMetaData(context.readValue(buffer, Map.class, false))
- .result(context.read(buffer))
- .create();
- } catch (IOException ex) {
- throw new SerializationException(ex);
- }
- }
-
- public void writeValue(final ResponseMessage value, final ByteBuf byteBuf, final GraphBinaryWriter context) throws SerializationException {
- // Wrap netty's buffer
- final Buffer buffer = bufferFactory.create(byteBuf);
-
- final ResponseResult result = value.getResult();
- final ResponseStatus status = value.getStatus();
-
- try {
- // Version
- buffer.writeByte(GraphBinaryWriter.VERSION_BYTE);
- // Nullable request id
- context.writeValue(value.getRequestId(), buffer, true);
- // Status code
- context.writeValue(status.getCode().getValue(), buffer, false);
- // Nullable status message
- context.writeValue(status.getMessage(), buffer, true);
- // Status attributes
- context.writeValue(status.getAttributes(), buffer, false);
- // Result meta
- context.writeValue(result.getMeta(), buffer, false);
- // Fully-qualified value
- context.write(result.getData(), buffer);
- } catch (IOException ex) {
- throw new SerializationException(ex);
- }
- }
-}
diff --git a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractCompatibilityTest.java b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractCompatibilityTest.java
index f080d6b..b713336 100644
--- a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractCompatibilityTest.java
+++ b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractCompatibilityTest.java
@@ -25,12 +25,15 @@
import org.apache.tinkerpop.gremlin.structure.VertexProperty;
import org.apache.tinkerpop.gremlin.util.TestSupport;
import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.util.ser.SerTokens;
import java.io.File;
-import java.io.FileOutputStream;
import java.io.IOException;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import static org.hamcrest.core.Is.is;
import static org.junit.Assert.assertEquals;
@@ -117,4 +120,35 @@
assertEquals(expected.key(), actual.key());
assertEquals(expected.value(), actual.value());
}
+
+ protected static void assertResponseMessage(final ResponseMessage resource, final ResponseMessage fromStatic,
+ final ResponseMessage recycled) {
+ assertEquals(resource.getStatus().getCode().code(), recycled.getStatus().getCode().code());
+ assertEquals(resource.getStatus().getMessage(), recycled.getStatus().getMessage());
+ assertEquals(resource.getStatus().getException(), recycled.getStatus().getException());
+ assertEquals(resource.getResult().getData(), recycled.getResult().getData());
+
+ assertEquals(resource.getStatus().getCode().code(), fromStatic.getStatus().getCode().code());
+ assertEquals(resource.getStatus().getMessage(), fromStatic.getStatus().getMessage());
+ assertEquals(resource.getStatus().getException(), fromStatic.getStatus().getException());
+ assertEquals(resource.getResult().getData(), fromStatic.getResult().getData());
+ }
+
+ protected static void assertRequestMessage(final RequestMessage resource, final RequestMessage fromStatic,
+ final RequestMessage recycled) {
+ // Check per field rather than map equals since a new field may get added later.
+ assertEquals(resource.getGremlin(), recycled.getGremlin());
+ assertEquals(resource.<Map>getField(SerTokens.TOKEN_BINDINGS), recycled.getField(SerTokens.TOKEN_BINDINGS));
+ assertEquals(resource.<String>getField(SerTokens.TOKEN_LANGUAGE), recycled.getField(SerTokens.TOKEN_LANGUAGE));
+ assertEquals(resource.<String>getField(SerTokens.TOKEN_G), recycled.getField(SerTokens.TOKEN_G));
+ assertEquals(resource.<Long>getField(SerTokens.TOKEN_TIMEOUT_MS), recycled.getField(SerTokens.TOKEN_TIMEOUT_MS));
+ assertEquals(resource.<String>getField(SerTokens.TOKEN_MATERIALIZE_PROPERTIES), recycled.getField(SerTokens.TOKEN_MATERIALIZE_PROPERTIES));
+
+ assertEquals(resource.getGremlin(), fromStatic.getGremlin());
+ assertEquals(resource.<Map>getField(SerTokens.TOKEN_BINDINGS), fromStatic.getField(SerTokens.TOKEN_BINDINGS));
+ assertEquals(resource.<String>getField(SerTokens.TOKEN_LANGUAGE), fromStatic.getField(SerTokens.TOKEN_LANGUAGE));
+ assertEquals(resource.<String>getField(SerTokens.TOKEN_G), fromStatic.getField(SerTokens.TOKEN_G));
+ assertEquals(resource.<Long>getField(SerTokens.TOKEN_TIMEOUT_MS), fromStatic.getField(SerTokens.TOKEN_TIMEOUT_MS));
+ assertEquals(resource.<String>getField(SerTokens.TOKEN_MATERIALIZE_PROPERTIES), fromStatic.getField(SerTokens.TOKEN_MATERIALIZE_PROPERTIES));
+ }
}
diff --git a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractTypedCompatibilityTest.java b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractTypedCompatibilityTest.java
index d0264c4..5aff82e 100644
--- a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractTypedCompatibilityTest.java
+++ b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractTypedCompatibilityTest.java
@@ -18,7 +18,8 @@
*/
package org.apache.tinkerpop.gremlin.structure.io;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.UnpooledByteBufAllocator;
import org.apache.tinkerpop.gremlin.process.traversal.Operator;
import org.apache.tinkerpop.gremlin.process.traversal.Order;
import org.apache.tinkerpop.gremlin.process.traversal.P;
@@ -28,6 +29,8 @@
import org.apache.tinkerpop.gremlin.process.traversal.Scope;
import org.apache.tinkerpop.gremlin.process.traversal.TextP;
import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.BulkSet;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
import org.apache.tinkerpop.gremlin.process.traversal.util.Metrics;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics;
import org.apache.tinkerpop.gremlin.structure.Column;
@@ -43,6 +46,8 @@
import org.apache.tinkerpop.gremlin.util.function.Lambda;
import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV4;
+import org.junit.Ignore;
import org.junit.Test;
import java.math.BigDecimal;
@@ -64,6 +69,7 @@
import java.time.ZoneOffset;
import java.time.ZonedDateTime;
import java.util.Arrays;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
import java.util.HashMap;
@@ -85,52 +91,8 @@
public abstract class AbstractTypedCompatibilityTest extends AbstractCompatibilityTest {
@Test
- public void shouldReadWriteAuthenticationChallenge() throws Exception {
- final String resourceName = "authenticationchallenge";
-
- assumeThat("GraphBinary does not test this because Request/ResponseMessage are not actual GraphBinary types",
- is(this.getClass().equals(GraphBinaryCompatibilityTest.class)));
-
- final ResponseMessage resource = findModelEntryObject(resourceName);
- final ResponseMessage fromStatic = read(readFromResource(resourceName), ResponseMessage.class);
- final ResponseMessage recycled = read(write(fromStatic, ResponseMessage.class, resourceName), ResponseMessage.class);
- assertNotSame(fromStatic, recycled);
- assertResponseMessage(resource, fromStatic, recycled);
- }
-
- @Test
- public void shouldReadWriteAuthenticationResponse() throws Exception {
- final String resourceName = "authenticationresponse";
-
- assumeThat("GraphBinary does not test this because Request/ResponseMessage are not actual GraphBinary types",
- is(this.getClass().equals(GraphBinaryCompatibilityTest.class)));
-
- final RequestMessage resource = findModelEntryObject(resourceName);
- final RequestMessage fromStatic = read(readFromResource(resourceName), RequestMessage.class);
- final RequestMessage recycled = read(write(fromStatic, RequestMessage.class, resourceName), RequestMessage.class);
- assertNotSame(fromStatic, recycled);
- assertRequestMessage(resource, fromStatic, recycled);
- assertEquals(resource.getArgs().get("saslMechanism"), recycled.getArgs().get("saslMechanism"));
- assertEquals(resource.getArgs().get("sasl"), recycled.getArgs().get("sasl"));
- assertEquals(resource.getArgs().get("saslMechanism"), fromStatic.getArgs().get("saslMechanism"));
- assertEquals(resource.getArgs().get("sasl"), fromStatic.getArgs().get("sasl"));
- }
-
- @Test
- public void shouldReadWriteBarrier() throws Exception {
- final String resourceName = "barrier";
-
- final SackFunctions.Barrier resource = findModelEntryObject(resourceName);
- final SackFunctions.Barrier fromStatic = read(readFromResource(resourceName), SackFunctions.Barrier.class);
- final SackFunctions.Barrier recycled = read(write(fromStatic, SackFunctions.Barrier.class, resourceName), SackFunctions.Barrier.class);
- assertEquals(fromStatic, recycled);
- assertEquals(resource, fromStatic);
- assertEquals(resource, recycled);
- }
-
- @Test
- public void shouldReadWriteBigDecimal() throws Exception {
- final String resourceName = "bigdecimal";
+ public void shouldReadWritePositiveBigDecimal() throws Exception {
+ final String resourceName = "pos-bigdecimal";
final BigDecimal resource = findModelEntryObject(resourceName);
final BigDecimal fromStatic = read(readFromResource(resourceName), BigDecimal.class);
@@ -142,8 +104,21 @@
}
@Test
- public void shouldReadWriteBigInteger() throws Exception {
- final String resourceName = "biginteger";
+ public void shouldReadWriteNegativeBigDecimal() throws Exception {
+ final String resourceName = "neg-bigdecimal";
+
+ final BigDecimal resource = findModelEntryObject(resourceName);
+ final BigDecimal fromStatic = read(readFromResource(resourceName), BigDecimal.class);
+ final BigDecimal recycled = read(write(fromStatic, BigDecimal.class, resourceName), BigDecimal.class);
+ assertNotSame(fromStatic, recycled);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+
+ @Test
+ public void shouldReadWritePositiveBigInteger() throws Exception {
+ final String resourceName = "pos-biginteger";
final BigInteger resource = findModelEntryObject(resourceName);
final BigInteger fromStatic = read(readFromResource(resourceName), BigInteger.class);
@@ -155,12 +130,12 @@
}
@Test
- public void shouldReadWriteBinding() throws Exception {
- final String resourceName = "binding";
+ public void shouldReadWriteNegativeBigInteger() throws Exception {
+ final String resourceName = "neg-biginteger";
- final Bytecode.Binding resource = findModelEntryObject(resourceName);
- final Bytecode.Binding fromStatic = read(readFromResource(resourceName), Bytecode.Binding.class);
- final Bytecode.Binding recycled = read(write(fromStatic, Bytecode.Binding.class, resourceName), Bytecode.Binding.class);
+ final BigInteger resource = findModelEntryObject(resourceName);
+ final BigInteger fromStatic = read(readFromResource(resourceName), BigInteger.class);
+ final BigInteger recycled = read(write(fromStatic, BigInteger.class, resourceName), BigInteger.class);
assertNotSame(fromStatic, recycled);
assertEquals(fromStatic, recycled);
assertEquals(resource, fromStatic);
@@ -168,8 +143,8 @@
}
@Test
- public void shouldReadWriteByte() throws Exception {
- final String resourceName = "byte";
+ public void shouldReadWriteMinByte() throws Exception {
+ final String resourceName = "min-byte";
final Byte resource = findModelEntryObject(resourceName);
final Byte fromStatic = read(readFromResource(resourceName), Byte.class);
@@ -180,8 +155,20 @@
}
@Test
- public void shouldReadWriteByteBuffer() throws Exception {
- final String resourceName = "bytebuffer";
+ public void shouldReadWriteMaxByte() throws Exception {
+ final String resourceName = "max-byte";
+
+ final Byte resource = findModelEntryObject(resourceName);
+ final Byte fromStatic = read(readFromResource(resourceName), Byte.class);
+ final Byte recycled = read(write(fromStatic, Byte.class, resourceName), Byte.class);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+
+ @Test
+ public void shouldReadWriteEmptyByteBuffer() throws Exception {
+ final String resourceName = "empty-binary";
final ByteBuffer resource = findModelEntryObject(resourceName);
final ByteBuffer fromStatic = read(readFromResource(resourceName), ByteBuffer.class);
@@ -197,96 +184,25 @@
}
@Test
- public void shouldReadWriteBytecode() throws Exception {
- final String resourceName = "bytecode";
+ public void shouldReadWriteStringByteBuffer() throws Exception {
+ final String resourceName = "str-binary";
- final Bytecode fromStatic = read(readFromResource(resourceName), Bytecode.class);
- final Bytecode recycled = read(write(fromStatic, Bytecode.class, resourceName), Bytecode.class);
+ final ByteBuffer resource = findModelEntryObject(resourceName);
+ final ByteBuffer fromStatic = read(readFromResource(resourceName), ByteBuffer.class);
+ // have to re-read because once the bytebuffer is flushed to array it will be emptied
+ final ByteBuffer recycled = read(write(read(readFromResource(resourceName), ByteBuffer.class), ByteBuffer.class, resourceName), ByteBuffer.class);
assertNotSame(fromStatic, recycled);
- assertEquals(fromStatic, recycled);
- // can't reasonably assert the bytecode against the original model as changes to strategies over time might
- // alter the bytecode form and then break the test. the assertions as they are ensure that the core of
- // serialization is correct by ensuring the contents of bytecode (whether they are valid for a specific version
- // or not). it seems beyond the scope of these tests to validate that bytecode itself is unchanging and fully
- // backward compatible (at least for now).
+ final byte[] resourceArray = resource.array();
+ final byte[] fromStaticArray = fromStatic.array();
+ final byte[] recycledArray = recycled.array();
+ assertThat(Arrays.equals(fromStaticArray, recycledArray), is(true));
+ assertThat(Arrays.equals(resourceArray, fromStaticArray), is(true));
+ assertThat(Arrays.equals(resourceArray, recycledArray), is(true));
}
@Test
- public void shouldReadWriteCardinality() throws Exception {
- final String resourceName = "cardinality";
-
- final VertexProperty.Cardinality resource = findModelEntryObject(resourceName);
- final VertexProperty.Cardinality fromStatic = read(readFromResource(resourceName), VertexProperty.Cardinality.class);
- final VertexProperty.Cardinality recycled = read(write(fromStatic, VertexProperty.Cardinality.class, resourceName), VertexProperty.Cardinality.class);
- assertEquals(fromStatic, recycled);
- assertEquals(resource, fromStatic);
- assertEquals(resource, recycled);
- }
-
- @Test
- public void shouldReadWriteChar() throws Exception {
- final String resourceName = "char";
-
- final Character resource = findModelEntryObject(resourceName);
- final Character fromStatic = read(readFromResource(resourceName), Character.class);
- final Character recycled = read(write(fromStatic, Character.class, resourceName), Character.class);
- assertEquals(fromStatic, recycled);
- assertEquals(resource, fromStatic);
- assertEquals(resource, recycled);
- }
-
- @Test
- public void shouldReadWriteClass() throws Exception {
- final String resourceName = "class";
-
- final Class resource = findModelEntryObject(resourceName);
- final Class fromStatic = read(readFromResource(resourceName), Class.class);
- final Class recycled = read(write(fromStatic, Class.class, resourceName), Class.class);
- assertEquals(fromStatic, recycled);
- assertEquals(resource, fromStatic);
- assertEquals(resource, recycled);
- }
-
- @Test
- public void shouldReadWriteColumn() throws Exception {
- final String resourceName = "column";
-
- final Column resource = findModelEntryObject(resourceName);
- final Column fromStatic = read(readFromResource(resourceName), Column.class);
- final Column recycled = read(write(fromStatic, Column.class, resourceName), Column.class);
- assertEquals(fromStatic, recycled);
- assertEquals(resource, fromStatic);
- assertEquals(resource, recycled);
- }
-
- @Test
- public void shouldReadWriteDate() throws Exception {
- final String resourceName = "date";
-
- final Date resource = findModelEntryObject(resourceName);
- final Date fromStatic = read(readFromResource(resourceName), Date.class);
- final Date recycled = read(write(fromStatic, Date.class, resourceName), Date.class);
- assertNotSame(fromStatic, recycled);
- assertEquals(fromStatic, recycled);
- assertEquals(resource, fromStatic);
- assertEquals(resource, recycled);
- }
-
- @Test
- public void shouldReadWriteDirection() throws Exception {
- final String resourceName = "direction";
-
- final Direction resource = findModelEntryObject(resourceName);
- final Direction fromStatic = read(readFromResource(resourceName), Direction.class);
- final Direction recycled = read(write(fromStatic, Direction.class, resourceName), Direction.class);
- assertEquals(fromStatic, recycled);
- assertEquals(resource, fromStatic);
- assertEquals(resource, recycled);
- }
-
- @Test
- public void shouldReadWriteDouble() throws Exception {
- final String resourceName = "double";
+ public void shouldReadWriteMaxDouble() throws Exception {
+ final String resourceName = "max-double";
final Double resource = findModelEntryObject(resourceName);
final Double fromStatic = read(readFromResource(resourceName), Double.class);
@@ -298,8 +214,111 @@
}
@Test
- public void shouldReadWriteDuration() throws Exception {
- final String resourceName = "duration";
+ public void shouldReadWriteMinDouble() throws Exception {
+ final String resourceName = "min-double";
+
+ final Double resource = findModelEntryObject(resourceName);
+ final Double fromStatic = read(readFromResource(resourceName), Double.class);
+ final Double recycled = read(write(fromStatic, Double.class, resourceName), Double.class);
+ assertNotSame(fromStatic, recycled);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+
+ @Test
+ public void shouldReadWriteMaxNegativeDouble() throws Exception {
+ final String resourceName = "neg-max-double";
+
+ final Double resource = findModelEntryObject(resourceName);
+ final Double fromStatic = read(readFromResource(resourceName), Double.class);
+ final Double recycled = read(write(fromStatic, Double.class, resourceName), Double.class);
+ assertNotSame(fromStatic, recycled);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+
+ @Test
+ public void shouldReadWriteMinNegativeDouble() throws Exception {
+ final String resourceName = "neg-min-double";
+
+ final Double resource = findModelEntryObject(resourceName);
+ final Double fromStatic = read(readFromResource(resourceName), Double.class);
+ final Double recycled = read(write(fromStatic, Double.class, resourceName), Double.class);
+ assertNotSame(fromStatic, recycled);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+
+ @Test
+ public void shouldReadWriteNanDouble() throws Exception {
+ final String resourceName = "nan-double";
+
+ final Double resource = findModelEntryObject(resourceName);
+ final Double fromStatic = read(readFromResource(resourceName), Double.class);
+ final Double recycled = read(write(fromStatic, Double.class, resourceName), Double.class);
+ assertNotSame(fromStatic, recycled);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+
+ @Test
+ public void shouldReadWritePositiveInfinityDouble() throws Exception {
+ final String resourceName = "pos-inf-double";
+
+ final Double resource = findModelEntryObject(resourceName);
+ final Double fromStatic = read(readFromResource(resourceName), Double.class);
+ final Double recycled = read(write(fromStatic, Double.class, resourceName), Double.class);
+ assertNotSame(fromStatic, recycled);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+
+ @Test
+ public void shouldReadWriteNegativeInfinityDouble() throws Exception {
+ final String resourceName = "neg-inf-double";
+
+ final Double resource = findModelEntryObject(resourceName);
+ final Double fromStatic = read(readFromResource(resourceName), Double.class);
+ final Double recycled = read(write(fromStatic, Double.class, resourceName), Double.class);
+ assertNotSame(fromStatic, recycled);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+
+ @Test
+ public void shouldReadWriteNegativeZeroDouble() throws Exception {
+ final String resourceName = "neg-zero-double";
+
+ final Double resource = findModelEntryObject(resourceName);
+ final Double fromStatic = read(readFromResource(resourceName), Double.class);
+ final Double recycled = read(write(fromStatic, Double.class, resourceName), Double.class);
+ assertNotSame(fromStatic, recycled);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+
+ @Test
+ public void shouldReadWriteZeroDuration() throws Exception {
+ final String resourceName = "zero-duration";
+
+ final Duration resource = findModelEntryObject(resourceName);
+ final Duration fromStatic = read(readFromResource(resourceName), Duration.class);
+ final Duration recycled = read(write(fromStatic, Duration.class, resourceName), Duration.class);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+
+ @Test
+ public void shouldReadWriteForeverDuration() throws Exception {
+ final String resourceName = "forever-duration";
final Duration resource = findModelEntryObject(resourceName);
final Duration fromStatic = read(readFromResource(resourceName), Duration.class);
@@ -312,7 +331,7 @@
@Test
public void shouldReadWriteEdge() throws Exception {
- final String resourceName = "edge";
+ final String resourceName = "traversal-edge";
final Edge resource = findModelEntryObject(resourceName);
final Edge fromStatic = read(readFromResource(resourceName), Edge.class);
@@ -326,8 +345,23 @@
}
@Test
- public void shouldReadWriteFloat() throws Exception {
- final String resourceName = "float";
+ public void shouldReadWriteNoPropertyEdge() throws Exception {
+ final String resourceName = "no-prop-edge";
+
+ final Edge resource = findModelEntryObject(resourceName);
+ final Edge fromStatic = read(readFromResource(resourceName), Edge.class);
+ final Edge recycled = read(write(fromStatic, Edge.class, resourceName), Edge.class);
+ assertNotSame(fromStatic, recycled);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ assertEdge(resource, fromStatic);
+ assertEdge(resource, recycled);
+ }
+
+ @Test
+ public void shouldReadWriteMaxFloat() throws Exception {
+ final String resourceName = "max-float";
final Float resource = findModelEntryObject(resourceName);
final Float fromStatic = read(readFromResource(resourceName), Float.class);
@@ -339,24 +373,12 @@
}
@Test
- public void shouldReadWriteINetAddress() throws Exception {
- final String resourceName = "inetaddress";
+ public void shouldReadWriteMinFloat() throws Exception {
+ final String resourceName = "min-float";
- final InetAddress resource = findModelEntryObject(resourceName);
- final InetAddress fromStatic = read(readFromResource(resourceName), InetAddress.class);
- final InetAddress recycled = read(write(fromStatic, Float.class, resourceName), InetAddress.class);
- assertEquals(fromStatic, recycled);
- assertEquals(resource, fromStatic);
- assertEquals(resource, recycled);
- }
-
- @Test
- public void shouldReadWriteInstant() throws Exception {
- final String resourceName = "instant";
-
- final Instant resource = findModelEntryObject(resourceName);
- final Instant fromStatic = read(readFromResource(resourceName), Instant.class);
- final Instant recycled = read(write(fromStatic, Instant.class, resourceName), Instant.class);
+ final Float resource = findModelEntryObject(resourceName);
+ final Float fromStatic = read(readFromResource(resourceName), Float.class);
+ final Float recycled = read(write(fromStatic, Float.class, resourceName), Float.class);
assertNotSame(fromStatic, recycled);
assertEquals(fromStatic, recycled);
assertEquals(resource, fromStatic);
@@ -364,8 +386,86 @@
}
@Test
- public void shouldReadWriteInteger() throws Exception {
- final String resourceName = "integer";
+ public void shouldReadWriteMaxNegativeFloat() throws Exception {
+ final String resourceName = "neg-max-float";
+
+ final Float resource = findModelEntryObject(resourceName);
+ final Float fromStatic = read(readFromResource(resourceName), Float.class);
+ final Float recycled = read(write(fromStatic, Float.class, resourceName), Float.class);
+ assertNotSame(fromStatic, recycled);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+
+ @Test
+ public void shouldReadWriteMinNegativeFloat() throws Exception {
+ final String resourceName = "neg-min-float";
+
+ final Float resource = findModelEntryObject(resourceName);
+ final Float fromStatic = read(readFromResource(resourceName), Float.class);
+ final Float recycled = read(write(fromStatic, Float.class, resourceName), Float.class);
+ assertNotSame(fromStatic, recycled);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+
+ @Test
+ public void shouldReadWriteNanFloat() throws Exception {
+ final String resourceName = "nan-float";
+
+ final Float resource = findModelEntryObject(resourceName);
+ final Float fromStatic = read(readFromResource(resourceName), Float.class);
+ final Float recycled = read(write(fromStatic, Float.class, resourceName), Float.class);
+ assertNotSame(fromStatic, recycled);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+
+ @Test
+ public void shouldReadWritePositiveInfinityFloat() throws Exception {
+ final String resourceName = "pos-inf-float";
+
+ final Float resource = findModelEntryObject(resourceName);
+ final Float fromStatic = read(readFromResource(resourceName), Float.class);
+ final Float recycled = read(write(fromStatic, Float.class, resourceName), Float.class);
+ assertNotSame(fromStatic, recycled);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+
+ @Test
+ public void shouldReadWriteNegativeInfinityFloat() throws Exception {
+ final String resourceName = "neg-inf-float";
+
+ final Float resource = findModelEntryObject(resourceName);
+ final Float fromStatic = read(readFromResource(resourceName), Float.class);
+ final Float recycled = read(write(fromStatic, Float.class, resourceName), Float.class);
+ assertNotSame(fromStatic, recycled);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+
+ @Test
+ public void shouldReadWriteNegativeZeroFloat() throws Exception {
+ final String resourceName = "neg-zero-float";
+
+ final Float resource = findModelEntryObject(resourceName);
+ final Float fromStatic = read(readFromResource(resourceName), Float.class);
+ final Float recycled = read(write(fromStatic, Float.class, resourceName), Float.class);
+ assertNotSame(fromStatic, recycled);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+
+ @Test
+ public void shouldReadWriteMaxInteger() throws Exception {
+ final String resourceName = "max-int";
final Integer resource = findModelEntryObject(resourceName);
final Integer fromStatic = read(readFromResource(resourceName), Integer.class);
@@ -376,60 +476,20 @@
}
@Test
- public void shouldReadWriteLambda() throws Exception {
- final String resourceName = "lambda";
+ public void shouldReadWriteMinInteger() throws Exception {
+ final String resourceName = "min-int";
- final Lambda resource = findModelEntryObject(resourceName);
- final Lambda fromStatic = read(readFromResource(resourceName), Lambda.class);
- final Lambda recycled = read(write(fromStatic, Lambda.class, resourceName), Lambda.class);
- assertNotSame(fromStatic, recycled);
+ final Integer resource = findModelEntryObject(resourceName);
+ final Integer fromStatic = read(readFromResource(resourceName), Integer.class);
+ final Integer recycled = read(write(fromStatic, Integer.class, resourceName), Integer.class);
assertEquals(fromStatic, recycled);
assertEquals(resource, fromStatic);
assertEquals(resource, recycled);
}
@Test
- public void shouldReadWriteLocalDate() throws Exception {
- final String resourceName = "localdate";
-
- final LocalDate resource = findModelEntryObject(resourceName);
- final LocalDate fromStatic = read(readFromResource(resourceName), LocalDate.class);
- final LocalDate recycled = read(write(fromStatic, LocalDate.class, resourceName), LocalDate.class);
- assertNotSame(fromStatic, recycled);
- assertEquals(fromStatic, recycled);
- assertEquals(resource, fromStatic);
- assertEquals(resource, recycled);
- }
-
- @Test
- public void shouldReadWriteLocalDateTime() throws Exception {
- final String resourceName = "localdatetime";
-
- final LocalDateTime resource = findModelEntryObject(resourceName);
- final LocalDateTime fromStatic = read(readFromResource(resourceName), LocalDateTime.class);
- final LocalDateTime recycled = read(write(fromStatic, LocalDateTime.class, resourceName), LocalDateTime.class);
- assertNotSame(fromStatic, recycled);
- assertEquals(fromStatic, recycled);
- assertEquals(resource, fromStatic);
- assertEquals(resource, recycled);
- }
-
- @Test
- public void shouldReadWriteLocalTime() throws Exception {
- final String resourceName = "localtime";
-
- final LocalTime resource = findModelEntryObject(resourceName);
- final LocalTime fromStatic = read(readFromResource(resourceName), LocalTime.class);
- final LocalTime recycled = read(write(fromStatic, LocalTime.class, resourceName), LocalTime.class);
- assertNotSame(fromStatic, recycled);
- assertEquals(fromStatic, recycled);
- assertEquals(resource, fromStatic);
- assertEquals(resource, recycled);
- }
-
- @Test
- public void shouldReadWriteLong() throws Exception {
- final String resourceName = "long";
+ public void shouldReadWriteMaxLong() throws Exception {
+ final String resourceName = "max-long";
final Long resource = findModelEntryObject(resourceName);
final Long fromStatic = read(readFromResource(resourceName), Long.class);
@@ -440,11 +500,20 @@
}
@Test
- public void shouldReadWriteList() throws Exception {
- final String resourceName = "list";
+ public void shouldReadWriteMinLong() throws Exception {
+ final String resourceName = "min-long";
- assumeThat("GraphSON v2 didn't explicitly have List as a type",
- is(this.getClass().equals(GraphSONTypedCompatibilityTest.class) && getCompatibility().equals("v2")));
+ final Long resource = findModelEntryObject(resourceName);
+ final Long fromStatic = read(readFromResource(resourceName), Long.class);
+ final Long recycled = read(write(fromStatic, Long.class, resourceName), Long.class);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+
+ @Test
+ public void shouldReadWriteMultiTypeList() throws Exception {
+ final String resourceName = "var-type-list";
final List resource = findModelEntryObject(resourceName);
final List fromStatic = read(readFromResource(resourceName), List.class);
@@ -455,11 +524,20 @@
}
@Test
- public void shouldReadWriteMap() throws Exception {
- final String resourceName = "map";
+ public void shouldReadWriteEmptyList() throws Exception {
+ final String resourceName = "empty-list";
- assumeThat("GraphSON v2 didn't explicitly have Map as a type",
- is(this.getClass().equals(GraphSONTypedCompatibilityTest.class) && getCompatibility().equals("v2")));
+ final List resource = findModelEntryObject(resourceName);
+ final List fromStatic = read(readFromResource(resourceName), List.class);
+ final List recycled = read(write(fromStatic, List.class, resourceName), List.class);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+
+ @Test
+ public void shouldReadWriteMultiTypeMap() throws Exception {
+ final String resourceName = "var-type-map";
final Map resource = findModelEntryObject(resourceName);
final Map fromStatic = read(readFromResource(resourceName), Map.class);
@@ -470,36 +548,20 @@
}
@Test
- public void shouldReadWriteMetrics() throws Exception {
- final String resourceName = "metrics";
+ public void shouldReadWriteEmptyMap() throws Exception {
+ final String resourceName = "empty-map";
- final Metrics fromStatic = read(readFromResource(resourceName), Metrics.class);
- final Metrics recycled = read(write(fromStatic, Metrics.class, resourceName), Metrics.class);
- assertNotSame(fromStatic, recycled);
- // have to do compares on the object read from resources because it has statically calculated values. the
- // "new" one from Model is generated dynamically from a traversal and thus has variations in properties that
- // are based on time
- assertEquals(fromStatic.getAnnotations(), recycled.getAnnotations());
- assertEquals(fromStatic.getCounts(), recycled.getCounts());
- assertEquals(fromStatic.getDuration(TimeUnit.MILLISECONDS), recycled.getDuration(TimeUnit.MILLISECONDS));
- }
-
- @Test
- public void shouldReadWriteMonthDay() throws Exception {
- final String resourceName = "monthday";
-
- final MonthDay resource = findModelEntryObject(resourceName);
- final MonthDay fromStatic = read(readFromResource(resourceName), MonthDay.class);
- final MonthDay recycled = read(write(fromStatic, MonthDay.class, resourceName), MonthDay.class);
- assertNotSame(fromStatic, recycled);
+ final Map resource = findModelEntryObject(resourceName);
+ final Map fromStatic = read(readFromResource(resourceName), Map.class);
+ final Map recycled = read(write(fromStatic, Map.class, resourceName), Map.class);
assertEquals(fromStatic, recycled);
assertEquals(resource, fromStatic);
assertEquals(resource, recycled);
}
@Test
- public void shouldReadWriteOffsetDateTime() throws Exception {
- final String resourceName = "offsetdatetime";
+ public void shouldReadWriteMaxOffsetDateTime() throws Exception {
+ final String resourceName = "max-offsetdatetime";
final OffsetDateTime resource = findModelEntryObject(resourceName);
final OffsetDateTime fromStatic = read(readFromResource(resourceName), OffsetDateTime.class);
@@ -511,12 +573,12 @@
}
@Test
- public void shouldReadWriteOffsetTime() throws Exception {
- final String resourceName = "offsettime";
+ public void shouldReadWriteMinOffsetDateTime() throws Exception {
+ final String resourceName = "min-offsetdatetime";
- final OffsetTime resource = findModelEntryObject(resourceName);
- final OffsetTime fromStatic = read(readFromResource(resourceName), OffsetTime.class);
- final OffsetTime recycled = read(write(fromStatic, OffsetTime.class, resourceName), OffsetTime.class);
+ final OffsetDateTime resource = findModelEntryObject(resourceName);
+ final OffsetDateTime fromStatic = read(readFromResource(resourceName), OffsetDateTime.class);
+ final OffsetDateTime recycled = read(write(fromStatic, OffsetDateTime.class, resourceName), OffsetDateTime.class);
assertNotSame(fromStatic, recycled);
assertEquals(fromStatic, recycled);
assertEquals(resource, fromStatic);
@@ -524,56 +586,8 @@
}
@Test
- public void shouldReadWriteOperator() throws Exception {
- final String resourceName = "operator";
-
- final Operator resource = findModelEntryObject(resourceName);
- final Operator fromStatic = read(readFromResource(resourceName), Operator.class);
- final Operator recycled = read(write(fromStatic, Operator.class, resourceName), Operator.class);
- assertEquals(fromStatic, recycled);
- assertEquals(resource, fromStatic);
- assertEquals(resource, recycled);
- }
-
- @Test
- public void shouldReadWriteOrder() throws Exception {
- final String resourceName = "order";
-
- final Order resource = findModelEntryObject(resourceName);
- final Order fromStatic = read(readFromResource(resourceName), Order.class);
- final Order recycled = read(write(fromStatic, Order.class, resourceName), Order.class);
- assertEquals(fromStatic, recycled);
- assertEquals(resource, fromStatic);
- assertEquals(resource, recycled);
- }
-
- @Test
- public void shouldReadWriteP() throws Exception {
- final String resourceName = "p";
-
- final P resource = findModelEntryObject(resourceName);
- final P fromStatic = read(readFromResource(resourceName), P.class);
- final P recycled = read(write(fromStatic, P.class, resourceName), P.class);
- assertEquals(fromStatic, recycled);
- assertEquals(resource, fromStatic);
- assertEquals(resource, recycled);
- }
-
- @Test
- public void shouldReadWritePAnd() throws Exception {
- final String resourceName = "pand";
-
- final P resource = findModelEntryObject(resourceName);
- final P fromStatic = read(readFromResource(resourceName), P.class);
- final P recycled = read(write(fromStatic, P.class, resourceName), P.class);
- assertEquals(fromStatic, recycled);
- assertEquals(resource, fromStatic);
- assertEquals(resource, recycled);
- }
-
- @Test
public void shouldReadWritePath() throws Exception {
- final String resourceName = "path";
+ final String resourceName = "traversal-path";
final Path resource = findModelEntryObject(resourceName);
final Path fromStatic = read(readFromResource(resourceName), Path.class);
@@ -585,12 +599,25 @@
}
@Test
- public void shouldReadWritePeriod() throws Exception {
- final String resourceName = "period";
+ public void shouldReadWriteEmptyPath() throws Exception {
+ final String resourceName = "empty-path";
- final Period resource = findModelEntryObject(resourceName);
- final Period fromStatic = read(readFromResource(resourceName), Period.class);
- final Period recycled = read(write(fromStatic, Period.class, resourceName), Period.class);
+ final Path resource = findModelEntryObject(resourceName);
+ final Path fromStatic = read(readFromResource(resourceName), Path.class);
+ final Path recycled = read(write(fromStatic, Path.class, resourceName), Path.class);
+ assertNotSame(fromStatic, recycled);
+ assertEquals(fromStatic, recycled);
+ assertEquals(fromStatic, resource);
+ assertEquals(recycled, resource);
+ }
+
+ @Test
+ public void shouldReadWritePathWithProperties() throws Exception {
+ final String resourceName = "prop-path";
+
+ final Path resource = findModelEntryObject(resourceName);
+ final Path fromStatic = read(readFromResource(resourceName), Path.class);
+ final Path recycled = read(write(fromStatic, Path.class, resourceName), Path.class);
assertNotSame(fromStatic, recycled);
assertEquals(fromStatic, recycled);
assertEquals(resource, fromStatic);
@@ -598,32 +625,8 @@
}
@Test
- public void shouldReadWritePop() throws Exception {
- final String resourceName = "pop";
-
- final Pop resource = findModelEntryObject(resourceName);
- final Pop fromStatic = read(readFromResource(resourceName), Pop.class);
- final Pop recycled = read(write(fromStatic, Pop.class, resourceName), Pop.class);
- assertEquals(fromStatic, recycled);
- assertEquals(resource, fromStatic);
- assertEquals(resource, recycled);
- }
-
- @Test
- public void shouldReadWritePOr() throws Exception {
- final String resourceName = "por";
-
- final P resource = findModelEntryObject(resourceName);
- final P fromStatic = read(readFromResource(resourceName), P.class);
- final P recycled = read(write(fromStatic, P.class, resourceName), P.class);
- assertEquals(fromStatic, recycled);
- assertEquals(resource, fromStatic);
- assertEquals(resource, recycled);
- }
-
- @Test
- public void shouldReadWriteProperty() throws Exception {
- final String resourceName = "property";
+ public void shouldReadWriteEdgeProperty() throws Exception {
+ final String resourceName = "edge-property";
final Property resource = findModelEntryObject(resourceName);
final Property fromStatic = read(readFromResource(resourceName), Property.class);
@@ -634,127 +637,20 @@
}
@Test
- public void shouldReadWriteScope() throws Exception {
- final String resourceName = "scope";
+ public void shouldReadWriteNullProperty() throws Exception {
+ final String resourceName = "null-property";
- final Scope resource = findModelEntryObject(resourceName);
- final Scope fromStatic = read(readFromResource(resourceName), Scope.class);
- final Scope recycled = read(write(fromStatic, Scope.class, resourceName), Scope.class);
- assertEquals(fromStatic, recycled);
- assertEquals(resource, fromStatic);
- assertEquals(resource, recycled);
- }
-
- @Test
- public void shouldReadWriteSessionClose() throws Exception {
- final String resourceName = "sessionclose";
-
- assumeThat("GraphBinary does not test this because Request/ResponseMessage are not actual GraphBinary types",
- is(this.getClass().equals(GraphBinaryCompatibilityTest.class)));
-
- final RequestMessage resource = findModelEntryObject(resourceName);
- final RequestMessage fromStatic = read(readFromResource(resourceName), RequestMessage.class);
- final RequestMessage recycled = read(write(fromStatic, RequestMessage.class, resourceName), RequestMessage.class);
+ final Property resource = findModelEntryObject(resourceName);
+ final Property fromStatic = read(readFromResource(resourceName), Property.class);
+ final Property recycled = read(write(fromStatic, Property.class, resourceName), Property.class);
assertNotSame(fromStatic, recycled);
- assertRequestMessage(resource, fromStatic, recycled);
- assertEquals(resource.getArgs().get("session"), recycled.getArgs().get("session"));
- assertEquals(resource.getArgs().get("session"), fromStatic.getArgs().get("session"));
+ assertProperty(resource, fromStatic);
+ assertProperty(resource, recycled);
}
@Test
- public void shouldReadWriteSessionEval() throws Exception {
- final String resourceName = "sessioneval";
-
- assumeThat("GraphBinary does not test this because Request/ResponseMessage are not actual GraphBinary types",
- is(this.getClass().equals(GraphBinaryCompatibilityTest.class)));
-
- final RequestMessage resource = findModelEntryObject(resourceName);
- final RequestMessage fromStatic = read(readFromResource(resourceName), RequestMessage.class);
- final RequestMessage recycled = read(write(fromStatic, RequestMessage.class, resourceName), RequestMessage.class);
- assertNotSame(fromStatic, recycled);
- assertRequestMessage(resource, fromStatic, recycled);
- assertEquals(resource.getArgs().get("session"), recycled.getArgs().get("session"));
- assertEquals(resource.getArgs().get("language"), recycled.getArgs().get("language"));
- assertEquals(resource.getArgs().get("gremlin"), recycled.getArgs().get("gremlin"));
- assertEquals(((Map) resource.getArgs().get("bindings")).get("x"), ((Map) recycled.getArgs().get("bindings")).get("x"));
- assertEquals(resource.getArgs().get("session"), fromStatic.getArgs().get("session"));
- assertEquals(resource.getArgs().get("language"), fromStatic.getArgs().get("language"));
- assertEquals(resource.getArgs().get("gremlin"), fromStatic.getArgs().get("gremlin"));
- assertEquals(((Map) resource.getArgs().get("bindings")).get("x"), ((Map) fromStatic.getArgs().get("bindings")).get("x"));
- }
-
- @Test
- public void shouldReadWriteSessionEvalAliased() throws Exception {
- final String resourceName = "sessionevalaliased";
-
- assumeThat("GraphBinary does not test this because Request/ResponseMessage are not actual GraphBinary types",
- is(this.getClass().equals(GraphBinaryCompatibilityTest.class)));
-
- final RequestMessage resource = findModelEntryObject(resourceName);
- final RequestMessage fromStatic = read(readFromResource(resourceName), RequestMessage.class);
- final RequestMessage recycled = read(write(fromStatic, RequestMessage.class, resourceName), RequestMessage.class);
- assertNotSame(fromStatic, recycled);
- assertRequestMessage(resource, fromStatic, recycled);
- assertEquals(resource.getArgs().get("session"), recycled.getArgs().get("session"));
- assertEquals(resource.getArgs().get("language"), recycled.getArgs().get("language"));
- assertEquals(resource.getArgs().get("gremlin"), recycled.getArgs().get("gremlin"));
- assertEquals(((Map) resource.getArgs().get("aliases")).get("g"), ((Map) recycled.getArgs().get("aliases")).get("g"));
- assertEquals(((Map) resource.getArgs().get("bindings")).get("x"), ((Map) recycled.getArgs().get("bindings")).get("x"));
- assertEquals(resource.getArgs().get("session"), fromStatic.getArgs().get("session"));
- assertEquals(resource.getArgs().get("language"), fromStatic.getArgs().get("language"));
- assertEquals(resource.getArgs().get("gremlin"), fromStatic.getArgs().get("gremlin"));
- assertEquals(((Map) resource.getArgs().get("aliases")).get("g"), ((Map) fromStatic.getArgs().get("aliases")).get("g"));
- assertEquals(((Map) resource.getArgs().get("bindings")).get("x"), ((Map) fromStatic.getArgs().get("bindings")).get("x"));
- }
-
- @Test
- public void shouldReadWriteSessionlessEval() throws Exception {
- final String resourceName = "sessionlesseval";
-
- assumeThat("GraphBinary does not test this because Request/ResponseMessage are not actual GraphBinary types",
- is(this.getClass().equals(GraphBinaryCompatibilityTest.class)));
-
- final RequestMessage resource = findModelEntryObject(resourceName);
- final RequestMessage fromStatic = read(readFromResource(resourceName), RequestMessage.class);
- final RequestMessage recycled = read(write(fromStatic, RequestMessage.class, resourceName), RequestMessage.class);
- assertNotSame(fromStatic, recycled);
- assertRequestMessage(resource, fromStatic, recycled);
- assertEquals(resource.getArgs().get("language"), recycled.getArgs().get("language"));
- assertEquals(resource.getArgs().get("gremlin"), recycled.getArgs().get("gremlin"));
- assertEquals(((Map) resource.getArgs().get("bindings")).get("x"), ((Map) recycled.getArgs().get("bindings")).get("x"));
- assertEquals(resource.getArgs().get("language"), fromStatic.getArgs().get("language"));
- assertEquals(resource.getArgs().get("gremlin"), fromStatic.getArgs().get("gremlin"));
- assertEquals(((Map) resource.getArgs().get("bindings")).get("x"), ((Map) fromStatic.getArgs().get("bindings")).get("x"));
- }
-
- @Test
- public void shouldReadWriteSessionlessEvalAliased() throws Exception {
- final String resourceName = "sessionlessevalaliased";
-
- assumeThat("GraphBinary does not test this because Request/ResponseMessage are not actual GraphBinary types",
- is(this.getClass().equals(GraphBinaryCompatibilityTest.class)));
-
- final RequestMessage resource = findModelEntryObject(resourceName);
- final RequestMessage fromStatic = read(readFromResource(resourceName), RequestMessage.class);
- final RequestMessage recycled = read(write(fromStatic, RequestMessage.class, resourceName), RequestMessage.class);
- assertNotSame(fromStatic, recycled);
- assertRequestMessage(resource, fromStatic, recycled);
- assertEquals(resource.getArgs().get("language"), recycled.getArgs().get("language"));
- assertEquals(resource.getArgs().get("gremlin"), recycled.getArgs().get("gremlin"));
- assertEquals(((Map) resource.getArgs().get("aliases")).get("g"), ((Map) recycled.getArgs().get("aliases")).get("g"));
- assertEquals(((Map) resource.getArgs().get("bindings")).get("x"), ((Map) recycled.getArgs().get("bindings")).get("x"));
- assertEquals(resource.getArgs().get("language"), fromStatic.getArgs().get("language"));
- assertEquals(resource.getArgs().get("gremlin"), fromStatic.getArgs().get("gremlin"));
- assertEquals(((Map) resource.getArgs().get("aliases")).get("g"), ((Map) fromStatic.getArgs().get("aliases")).get("g"));
- assertEquals(((Map) resource.getArgs().get("bindings")).get("x"), ((Map) fromStatic.getArgs().get("bindings")).get("x"));
- }
-
- @Test
- public void shouldReadWriteSet() throws Exception {
- final String resourceName = "set";
-
- assumeThat("GraphSON v2 didn't explicitly have Set as a type",
- is(this.getClass().equals(GraphSONTypedCompatibilityTest.class) && getCompatibility().equals("v2")));
+ public void shouldReadWriteMultiTypeSet() throws Exception {
+ final String resourceName = "var-type-set";
final Set resource = findModelEntryObject(resourceName);
final Set fromStatic = read(readFromResource(resourceName), Set.class);
@@ -765,8 +661,20 @@
}
@Test
- public void shouldReadWriteShort() throws Exception {
- final String resourceName = "short";
+ public void shouldReadWriteEmptySet() throws Exception {
+ final String resourceName = "empty-set";
+
+ final Set resource = findModelEntryObject(resourceName);
+ final Set fromStatic = read(readFromResource(resourceName), Set.class);
+ final Set recycled = read(write(fromStatic, Set.class, resourceName), Set.class);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+
+ @Test
+ public void shouldReadWriteMaxShort() throws Exception {
+ final String resourceName = "max-short";
final Short resource = findModelEntryObject(resourceName);
final Short fromStatic = read(readFromResource(resourceName), Short.class);
@@ -777,51 +685,12 @@
}
@Test
- public void shouldReadWriteStandardResult() throws Exception {
- final String resourceName = "standardresult";
+ public void shouldReadWriteMinShort() throws Exception {
+ final String resourceName = "min-short";
- assumeThat("GraphBinary does not test this because Request/ResponseMessage are not actual GraphBinary types",
- is(this.getClass().equals(GraphBinaryCompatibilityTest.class)));
-
- final ResponseMessage resource = findModelEntryObject(resourceName);
- final ResponseMessage fromStatic = read(readFromResource(resourceName), ResponseMessage.class);
- final ResponseMessage recycled = read(write(fromStatic, HashMap.class, resourceName), ResponseMessage.class);
- assertNotSame(fromStatic, recycled);
- assertResponseMessage(resource, fromStatic, recycled);
- }
-
- @Test
- public void shouldReadWriteT() throws Exception {
- final String resourceName = "t";
-
- final T resource = findModelEntryObject(resourceName);
- final T fromStatic = read(readFromResource(resourceName), T.class);
- final T recycled = read(write(fromStatic, T.class, resourceName), T.class);
- assertEquals(fromStatic, recycled);
- assertEquals(resource, fromStatic);
- assertEquals(resource, recycled);
- }
-
- @Test
- public void shouldReadWriteTextP() throws Exception {
- final String resourceName = "textp";
-
- final TextP resource = findModelEntryObject(resourceName);
- final TextP fromStatic = read(readFromResource(resourceName), TextP.class);
- final TextP recycled = read(write(fromStatic, TextP.class, resourceName), TextP.class);
- assertEquals(fromStatic, recycled);
- assertEquals(resource, fromStatic);
- assertEquals(resource, recycled);
- }
-
- @Test
- public void shouldReadWriteTimestamp() throws Exception {
- final String resourceName = "timestamp";
-
- final Timestamp resource = findModelEntryObject(resourceName);
- final Timestamp fromStatic = read(readFromResource(resourceName), Timestamp.class);
- final Timestamp recycled = read(write(fromStatic, Timestamp.class, resourceName), Timestamp.class);
- assertNotSame(fromStatic, recycled);
+ final Short resource = findModelEntryObject(resourceName);
+ final Short fromStatic = read(readFromResource(resourceName), Short.class);
+ final Short recycled = read(write(fromStatic, Short.class, resourceName), Short.class);
assertEquals(fromStatic, recycled);
assertEquals(resource, fromStatic);
assertEquals(resource, recycled);
@@ -829,7 +698,7 @@
@Test
public void shouldReadWriteTinkerGraph() throws Exception {
- final String resourceName = "tinkergraph";
+ final String resourceName = "tinker-graph";
final TinkerGraph fromStatic = read(readFromResource(resourceName), TinkerGraph.class);
final TinkerGraph recycled = read(write(fromStatic, TinkerGraph.class, resourceName), TinkerGraph.class);
@@ -840,44 +709,21 @@
}
@Test
- public void shouldReadWriteTraversalMetrics() throws Exception {
- final String resourceName = "traversalmetrics";
-
- final TraversalMetrics resource = findModelEntryObject(resourceName);
- final TraversalMetrics fromStatic = read(readFromResource(resourceName), TraversalMetrics.class);
- final TraversalMetrics recycled = read(write(fromStatic, TraversalMetrics.class, resourceName), TraversalMetrics.class);
- assertNotSame(fromStatic, recycled);
-
- // need to assert against each other since the model version can change between test runs as it is dynamically
- // generated
- assertEquals(recycled.getDuration(TimeUnit.MILLISECONDS), fromStatic.getDuration(TimeUnit.MILLISECONDS));
- final Collection<? extends Metrics> resourceMetrics = resource.getMetrics();
- resourceMetrics.forEach(m -> {
- assertEquals(recycled.getMetrics(m.getId()).getAnnotations(), fromStatic.getMetrics(m.getId()).getAnnotations());
- assertEquals(recycled.getMetrics(m.getId()).getName(), fromStatic.getMetrics(m.getId()).getName());
- assertEquals(recycled.getMetrics(m.getId()).getCounts(), fromStatic.getMetrics(m.getId()).getCounts());
- });
- }
-
- @Test
- public void shouldReadWriteTraverser() throws Exception {
- final String resourceName = "traverser";
-
- final Traverser resource = findModelEntryObject(resourceName);
- final Traverser fromStatic = read(readFromResource(resourceName), Traverser.class);
- final Traverser recycled = read(write(fromStatic, Traverser.class, resourceName), Traverser.class);
- assertNotSame(fromStatic, recycled);
- assertEquals(resource.bulk(), recycled.bulk());
- assertEquals(resource.bulk(), fromStatic.bulk());
- assertEquals(resource.get(), recycled.get());
- assertEquals(resource.get(), fromStatic.get());
- assertVertex((Vertex) resource.get(), (Vertex) recycled.get());
- assertVertex((Vertex) resource.get(), (Vertex) fromStatic.get());
- }
-
- @Test
public void shouldReadWriteUUID() throws Exception {
- final String resourceName = "uuid";
+ final String resourceName = "specified-uuid";
+
+ final UUID resource = findModelEntryObject(resourceName);
+ final UUID fromStatic = read(readFromResource(resourceName), UUID.class);
+ final UUID recycled = read(write(fromStatic, UUID.class, resourceName), UUID.class);
+ assertNotSame(fromStatic, recycled);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+
+ @Test
+ public void shouldReadWriteNilUUID() throws Exception {
+ final String resourceName = "nil-uuid";
final UUID resource = findModelEntryObject(resourceName);
final UUID fromStatic = read(readFromResource(resourceName), UUID.class);
@@ -890,7 +736,22 @@
@Test
public void shouldReadWriteVertex() throws Exception {
- final String resourceName = "vertex";
+ final String resourceName = "traversal-vertex";
+
+ final Vertex resource = findModelEntryObject(resourceName);
+ final Vertex fromStatic = read(readFromResource(resourceName), Vertex.class);
+ final Vertex recycled = read(write(fromStatic, Vertex.class, resourceName), Vertex.class);
+ assertNotSame(fromStatic, recycled);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ assertVertex(resource, fromStatic);
+ assertVertex(resource, recycled);
+ }
+
+ @Test
+ public void shouldReadWriteNoPropertyVertex() throws Exception {
+ final String resourceName = "no-prop-vertex";
final Vertex resource = findModelEntryObject(resourceName);
final Vertex fromStatic = read(readFromResource(resourceName), Vertex.class);
@@ -905,7 +766,7 @@
@Test
public void shouldReadWriteVertexProperty() throws Exception {
- final String resourceName = "vertexproperty";
+ final String resourceName = "traversal-vertexproperty";
final VertexProperty resource = findModelEntryObject(resourceName);
final VertexProperty fromStatic = read(readFromResource(resourceName), VertexProperty.class);
@@ -919,89 +780,182 @@
}
@Test
- public void shouldReadWriteYear() throws Exception {
- final String resourceName = "year";
+ public void shouldReadWriteMetapropertyVertexProperty() throws Exception {
+ final String resourceName = "meta-vertexproperty";
- final Year resource = findModelEntryObject(resourceName);
- final Year fromStatic = read(readFromResource(resourceName), Year.class);
- final Year recycled = read(write(fromStatic, Year.class, resourceName), Year.class);
+ final VertexProperty resource = findModelEntryObject(resourceName);
+ final VertexProperty fromStatic = read(readFromResource(resourceName), VertexProperty.class);
+ final VertexProperty recycled = read(write(fromStatic, VertexProperty.class, resourceName), VertexProperty.class);
assertNotSame(fromStatic, recycled);
assertEquals(fromStatic, recycled);
assertEquals(resource, fromStatic);
assertEquals(resource, recycled);
+ assertVertexProperty(resource, recycled);
+ assertVertexProperty(resource, fromStatic);
+ }
+
+ @Test
+ public void shouldReadWriteSetVertexProperty() throws Exception {
+ final String resourceName = "set-cardinality-vertexproperty";
+
+ final VertexProperty resource = findModelEntryObject(resourceName);
+ final VertexProperty fromStatic = read(readFromResource(resourceName), VertexProperty.class);
+ final VertexProperty recycled = read(write(fromStatic, VertexProperty.class, resourceName), VertexProperty.class);
+ assertNotSame(fromStatic, recycled);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ assertVertexProperty(resource, recycled);
+ assertVertexProperty(resource, fromStatic);
+ }
+
+ @Test
+ public void shouldReadWriteIdT() throws Exception {
+ final String resourceName = "id-t";
+
+ final T resource = findModelEntryObject(resourceName);
+ final T fromStatic = read(readFromResource(resourceName), T.class);
+ final T recycled = read(write(fromStatic, T.class, resourceName), T.class);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
}
@Test
- public void shouldReadWriteYearMonth() throws Exception {
- final String resourceName = "yearmonth";
+ public void shouldReadWriteOutDirection() throws Exception {
+ final String resourceName = "out-direction";
- final YearMonth resource = findModelEntryObject(resourceName);
- final YearMonth fromStatic = read(readFromResource(resourceName), YearMonth.class);
- final YearMonth recycled = read(write(fromStatic, YearMonth.class, resourceName), YearMonth.class);
- assertNotSame(fromStatic, recycled);
+ final Direction resource = findModelEntryObject(resourceName);
+ final Direction fromStatic = read(readFromResource(resourceName), Direction.class);
+ final Direction recycled = read(write(fromStatic, Direction.class, resourceName), Direction.class);
assertEquals(fromStatic, recycled);
assertEquals(resource, fromStatic);
assertEquals(resource, recycled);
}
@Test
- public void shouldReadWriteZoneDateTime() throws Exception {
- final String resourceName = "zoneddatetime";
+ public void shouldReadWriteVarBulkList() throws Exception {
+ final String resourceName = "var-bulklist";
- // seem to recall this was a known issue for GraphBinary. not going to fuss with it though since the
- // longer term plan is to likely drop these jvm only types.
- assumeThat("GraphBinary doesn't quite serialize ZoneDateTime for a perfect round trip",
- is(getClass().equals(GraphBinaryCompatibilityTest.class)));
+ final BulkSet resource = findModelEntryObject(resourceName);
+ final List fromStatic = read(readFromResource(resourceName), List.class);
+ final List recycled = read(write(fromStatic, BulkSet.class, resourceName), List.class);
+ assertEquals(fromStatic, recycled);
+ // we no longer deserialize into BulkSets, needs the expanded list
+ List expandedResource = new ArrayList<>();
+ resource.spliterator().forEachRemaining(expandedResource::add);
+ assertEquals(expandedResource, fromStatic);
+ assertEquals(expandedResource, recycled);
+ }
- final ZonedDateTime resource = findModelEntryObject(resourceName);
- final ZonedDateTime fromStatic = read(readFromResource(resourceName), ZonedDateTime.class);
- final ZonedDateTime recycled = read(write(fromStatic, ZonedDateTime.class, resourceName), ZonedDateTime.class);
- assertNotSame(fromStatic, recycled);
+ @Test
+ public void shouldReadWriteEmptyBulkList() throws Exception {
+ final String resourceName = "empty-bulklist";
+
+ final BulkSet resource = findModelEntryObject(resourceName);
+ final List fromStatic = read(readFromResource(resourceName), List.class);
+ final List recycled = read(write(fromStatic, BulkSet.class, resourceName), List.class);
+ assertEquals(fromStatic, recycled);
+ // we no longer deserialize into BulkSets, needs the expanded list
+ List expandedResource = new ArrayList<>();
+ resource.spliterator().forEachRemaining(expandedResource::add);
+ assertEquals(expandedResource, fromStatic);
+ assertEquals(expandedResource, recycled);
+ }
+
+ @Test
+ public void shouldReadWriteSingleByteChar() throws Exception {
+ final String resourceName = "single-byte-char";
+
+ final Character resource = findModelEntryObject(resourceName);
+ final Character fromStatic = read(readFromResource(resourceName), Character.class);
+ final Character recycled = read(write(fromStatic, Character.class, resourceName), Character.class);
assertEquals(fromStatic, recycled);
assertEquals(resource, fromStatic);
assertEquals(resource, recycled);
}
@Test
- public void shouldReadWriteZoneOffset() throws Exception {
- final String resourceName = "zoneoffset";
+ public void shouldReadWriteMultiByteChar() throws Exception {
+ final String resourceName = "multi-byte-char";
- final ZoneOffset resource = findModelEntryObject(resourceName);
- final ZoneOffset fromStatic = read(readFromResource(resourceName), ZoneOffset.class);
- final ZoneOffset recycled = read(write(fromStatic, ZoneOffset.class, resourceName), ZoneOffset.class);
- assertNotSame(fromStatic, recycled);
+ final Character resource = findModelEntryObject(resourceName);
+ final Character fromStatic = read(readFromResource(resourceName), Character.class);
+ final Character recycled = read(write(fromStatic, Character.class, resourceName), Character.class);
assertEquals(fromStatic, recycled);
assertEquals(resource, fromStatic);
assertEquals(resource, recycled);
}
- private static void assertResponseMessage(final ResponseMessage resource, final ResponseMessage fromStatic,
- final ResponseMessage recycled) {
- assertEquals(resource.getRequestId(), recycled.getRequestId());
- assertEquals(resource.getStatus().getCode().getValue(), recycled.getStatus().getCode().getValue());
- assertEquals(resource.getStatus().getMessage(), recycled.getStatus().getMessage());
- assertEquals(resource.getStatus().getAttributes(), recycled.getStatus().getAttributes());
- assertEquals(resource.getResult().getData(), recycled.getResult().getData());
- assertEquals(resource.getResult().getMeta(), recycled.getResult().getMeta());
- assertEquals(resource.getStatus().getMessage(), recycled.getStatus().getMessage());
- assertEquals(resource.getRequestId(), fromStatic.getRequestId());
- assertEquals(resource.getStatus().getCode().getValue(), fromStatic.getStatus().getCode().getValue());
- assertEquals(resource.getStatus().getMessage(), fromStatic.getStatus().getMessage());
- assertEquals(resource.getStatus().getAttributes(), fromStatic.getStatus().getAttributes());
- assertEquals(resource.getResult().getData(), fromStatic.getResult().getData());
- assertEquals(resource.getResult().getMeta(), fromStatic.getResult().getMeta());
- assertEquals(resource.getStatus().getMessage(), fromStatic.getStatus().getMessage());
+ @Test
+ public void shouldReadWriteNull() throws Exception {
+ final String resourceName = "unspecified-null";
+
+ final Character resource = findModelEntryObject(resourceName);
+ final Character fromStatic = read(readFromResource(resourceName), Character.class);
+ final Character recycled = read(write(fromStatic, Character.class, resourceName), Character.class);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
}
- private static void assertRequestMessage(final RequestMessage resource, final RequestMessage fromStatic,
- final RequestMessage recycled) {
- assertEquals(resource.getRequestId(), recycled.getRequestId());
- assertEquals(resource.getOp(), recycled.getOp());
- assertEquals(resource.getProcessor(), recycled.getProcessor());
- assertEquals(resource.getArgs(), recycled.getArgs());
- assertEquals(resource.getRequestId(), fromStatic.getRequestId());
- assertEquals(resource.getOp(), fromStatic.getOp());
- assertEquals(resource.getProcessor(), fromStatic.getProcessor());
- assertEquals(resource.getArgs(), fromStatic.getArgs());
+ @Test
+ public void shouldReadWriteTrueBoolean() throws Exception {
+ final String resourceName = "true-boolean";
+
+ final Boolean resource = findModelEntryObject(resourceName);
+ final Boolean fromStatic = read(readFromResource(resourceName), Boolean.class);
+ final Boolean recycled = read(write(fromStatic, Boolean.class, resourceName), Boolean.class);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+
+ @Test
+ public void shouldReadWriteFalseBoolean() throws Exception {
+ final String resourceName = "false-boolean";
+
+ final Boolean resource = findModelEntryObject(resourceName);
+ final Boolean fromStatic = read(readFromResource(resourceName), Boolean.class);
+ final Boolean recycled = read(write(fromStatic, Boolean.class, resourceName), Boolean.class);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+
+ @Test
+ public void shouldReadWriteSingleByteString() throws Exception {
+ final String resourceName = "single-byte-string";
+
+ final String resource = findModelEntryObject(resourceName);
+ final String fromStatic = read(readFromResource(resourceName), String.class);
+ final String recycled = read(write(fromStatic, String.class, resourceName), String.class);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+
+ @Test
+ public void shouldReadWriteMixedString() throws Exception {
+ final String resourceName = "mixed-string";
+
+ final String resource = findModelEntryObject(resourceName);
+ final String fromStatic = read(readFromResource(resourceName), String.class);
+ final String recycled = read(write(fromStatic, String.class, resourceName), String.class);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+
+ @Test
+ public void shouldReadWriteTraversalTree() throws Exception {
+ final String resourceName = "traversal-tree";
+
+ final Tree resource = findModelEntryObject(resourceName);
+ final Tree fromStatic = read(readFromResource(resourceName), Tree.class);
+ final Tree recycled = read(write(fromStatic, Tree.class, resourceName), Tree.class);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
}
}
diff --git a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractUntypedCompatibilityTest.java b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractUntypedCompatibilityTest.java
index a607d2a..11f312d 100644
--- a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractUntypedCompatibilityTest.java
+++ b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractUntypedCompatibilityTest.java
@@ -18,23 +18,29 @@
*/
package org.apache.tinkerpop.gremlin.structure.io;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.UnpooledByteBufAllocator;
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.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.structure.io.graphbinary.GraphBinaryCompatibilityTest;
import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
+import org.apache.tinkerpop.gremlin.util.ser.GraphSONUntypedMessageSerializerV4;
import org.junit.Test;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import static org.hamcrest.core.Is.is;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotSame;
+import static org.junit.Assume.assumeThat;
/**
* @author Stephen Mallette (http://stephen.genoprime.com)
@@ -42,46 +48,8 @@
public abstract class AbstractUntypedCompatibilityTest extends AbstractCompatibilityTest {
@Test
- public void shouldReadWriteAuthenticationChallenge() throws Exception {
- final String resourceName = "authenticationchallenge";
-
- final ResponseMessage resource = findModelEntryObject(resourceName);
- final byte[] bytes = write(resource, ResponseMessage.class, resourceName);
- final HashMap fromStatic = read(readFromResource(resourceName), HashMap.class);
- final HashMap recycled = read(bytes, HashMap.class);
- assertNotSame(fromStatic, recycled);
- assertEquals(fromStatic, recycled);
- assertEquals(resource.getRequestId().toString(), fromStatic.get("requestId"));
- assertEquals(ResponseStatusCode.AUTHENTICATE.getValue(), ((Map) fromStatic.get("status")).get("code"));
- assertEquals(resource.getRequestId().toString(), recycled.get("requestId"));
- assertEquals(ResponseStatusCode.AUTHENTICATE.getValue(), ((Map) recycled.get("status")).get("code"));
- }
-
- @Test
- public void shouldReadWriteAuthenticationResponse() throws Exception {
- final String resourceName = "authenticationresponse";
-
- final RequestMessage resource = findModelEntryObject(resourceName);
- final byte[] bytes = write(resource, RequestMessage.class, resourceName);
- final HashMap fromStatic = read(readFromResource(resourceName), HashMap.class);
- final HashMap recycled = read(bytes, HashMap.class);
- assertNotSame(fromStatic, recycled);
- assertEquals(fromStatic, recycled);
- assertEquals(resource.getRequestId().toString(), fromStatic.get("requestId"));
- assertEquals(resource.getOp(), fromStatic.get("op"));
- assertEquals(resource.getProcessor(), fromStatic.get("processor"));
- assertEquals(resource.getArgs().get("saslMechanism"), ((Map) fromStatic.get("args")).get("saslMechanism"));
- assertEquals(resource.getArgs().get("sasl"), ((Map) fromStatic.get("args")).get("sasl"));
- assertEquals(resource.getRequestId().toString(), recycled.get("requestId"));
- assertEquals(resource.getOp(), recycled.get("op"));
- assertEquals(resource.getProcessor(), recycled.get("processor"));
- assertEquals(resource.getArgs().get("saslMechanism"), ((Map) recycled.get("args")).get("saslMechanism"));
- assertEquals(resource.getArgs().get("sasl"), ((Map) recycled.get("args")).get("sasl"));
- }
-
- @Test
public void shouldReadWriteEdge() throws Exception {
- final String resourceName = "edge";
+ final String resourceName = "traversal-edge";
final Edge resource = findModelEntryObject(resourceName);
final byte[] bytes = write(resource, Edge.class, resourceName);
@@ -89,19 +57,19 @@
final HashMap recycled = read(bytes, HashMap.class);
assertNotSame(fromStatic, recycled);
assertEquals(resource.id(), fromStatic.get("id"));
- assertEquals(resource.label(), fromStatic.get("label"));
+ assertEquals(Collections.singletonList(resource.label()), fromStatic.get("label"));
assertEquals(resource.id(), fromStatic.get("id"));
- assertEquals(resource.inVertex().label(), fromStatic.get("inVLabel"));
- assertEquals(resource.outVertex().label(), fromStatic.get("outVLabel"));
- assertEquals(resource.inVertex().id(), fromStatic.get("inV"));
- assertEquals(resource.outVertex().id(), fromStatic.get("outV"));
+ assertEquals(Collections.singletonList(resource.inVertex().label()), ((Map) fromStatic.get("inV")).get("label"));
+ assertEquals(Collections.singletonList(resource.outVertex().label()), ((Map) fromStatic.get("outV")).get("label"));
+ assertEquals(resource.inVertex().id(), ((Map) fromStatic.get("inV")).get("id"));
+ assertEquals(resource.outVertex().id(), ((Map) fromStatic.get("outV")).get("id"));
assertEquals(resource.id(), recycled.get("id"));
- assertEquals(resource.label(), recycled.get("label"));
+ assertEquals(Collections.singletonList(resource.label()), recycled.get("label"));
assertEquals(resource.id(), recycled.get("id"));
- assertEquals(resource.inVertex().label(), recycled.get("inVLabel"));
- assertEquals(resource.outVertex().label(), recycled.get("outVLabel"));
- assertEquals(resource.inVertex().id(), recycled.get("inV"));
- assertEquals(resource.outVertex().id(), recycled.get("outV"));
+ assertEquals(Collections.singletonList(resource.inVertex().label()), ((Map) recycled.get("inV")).get("label"));
+ assertEquals(Collections.singletonList(resource.outVertex().label()), ((Map) recycled.get("outV")).get("label"));
+ assertEquals(resource.inVertex().id(), ((Map) recycled.get("inV")).get("id"));
+ assertEquals(resource.outVertex().id(), ((Map) recycled.get("outV")).get("id"));
// deal with incompatibilities
if (getCompatibility().equals("v1-no-types") || getCompatibility().equals("v3-no-types")) {
@@ -123,7 +91,7 @@
@Test
public void shouldReadWritePath() throws Exception {
- final String resourceName = "path";
+ final String resourceName = "traversal-path";
final Path resource = findModelEntryObject(resourceName);
final byte[] bytes = write(resource, Path.class, resourceName);
@@ -136,27 +104,27 @@
assertEquals(resource.labels().get(2).size(), ((List) ((List) fromStatic.get("labels")).get(2)).size());
assertEquals(resource.objects().size(), ((List) fromStatic.get("objects")).size());
assertEquals(((Vertex) resource.objects().get(0)).id(), ((Map) ((List) fromStatic.get("objects")).get(0)).get("id"));
- assertEquals(((Vertex) resource.objects().get(0)).label(), ((Map) ((List) fromStatic.get("objects")).get(0)).get("label"));
+ assertEquals(Collections.singletonList(((Vertex) resource.objects().get(0)).label()), ((Map) ((List) fromStatic.get("objects")).get(0)).get("label"));
assertEquals(((Vertex) resource.objects().get(1)).id(), ((Map) ((List) fromStatic.get("objects")).get(1)).get("id"));
- assertEquals(((Vertex) resource.objects().get(1)).label(), ((Map) ((List) fromStatic.get("objects")).get(1)).get("label"));
+ assertEquals(Collections.singletonList(((Vertex) resource.objects().get(1)).label()), ((Map) ((List) fromStatic.get("objects")).get(1)).get("label"));
assertEquals(((Vertex) resource.objects().get(2)).id(), ((Map) ((List) fromStatic.get("objects")).get(2)).get("id"));
- assertEquals(((Vertex) resource.objects().get(2)).label(), ((Map) ((List) fromStatic.get("objects")).get(2)).get("label"));
+ assertEquals(Collections.singletonList(((Vertex) resource.objects().get(2)).label()), ((Map) ((List) fromStatic.get("objects")).get(2)).get("label"));
assertEquals(resource.labels().size(), ((List) recycled.get("labels")).size());
assertEquals(resource.labels().get(0).size(), ((List) ((List) recycled.get("labels")).get(0)).size());
assertEquals(resource.labels().get(1).size(), ((List) ((List) recycled.get("labels")).get(1)).size());
assertEquals(resource.labels().get(2).size(), ((List) ((List) recycled.get("labels")).get(2)).size());
assertEquals(resource.objects().size(), ((List) recycled.get("objects")).size());
assertEquals(((Vertex) resource.objects().get(0)).id(), ((Map) ((List) recycled.get("objects")).get(0)).get("id"));
- assertEquals(((Vertex) resource.objects().get(0)).label(), ((Map) ((List) recycled.get("objects")).get(0)).get("label"));
+ assertEquals(Collections.singletonList(((Vertex) resource.objects().get(0)).label()), ((Map) ((List) recycled.get("objects")).get(0)).get("label"));
assertEquals(((Vertex) resource.objects().get(1)).id(), ((Map) ((List) recycled.get("objects")).get(1)).get("id"));
- assertEquals(((Vertex) resource.objects().get(1)).label(), ((Map) ((List) recycled.get("objects")).get(1)).get("label"));
+ assertEquals(Collections.singletonList(((Vertex) resource.objects().get(1)).label()), ((Map) ((List) recycled.get("objects")).get(1)).get("label"));
assertEquals(((Vertex) resource.objects().get(2)).id(), ((Map) ((List) recycled.get("objects")).get(2)).get("id"));
- assertEquals(((Vertex) resource.objects().get(2)).label(), ((Map) ((List) recycled.get("objects")).get(2)).get("label"));
+ assertEquals(Collections.singletonList(((Vertex) resource.objects().get(2)).label()), ((Map) ((List) recycled.get("objects")).get(2)).get("label"));
}
@Test
public void shouldReadWriteProperty() throws Exception {
- final String resourceName = "property";
+ final String resourceName = "edge-property";
final Property resource = findModelEntryObject(resourceName);
final byte[] bytes = write(resource, Property.class, resourceName);
@@ -172,160 +140,8 @@
}
@Test
- public void shouldReadWriteSessionClose() throws Exception {
- final String resourceName = "sessionclose";
-
- final RequestMessage resource = findModelEntryObject(resourceName);
- final byte[] bytes = write(resource, RequestMessage.class, resourceName);
- final HashMap fromStatic = read(readFromResource(resourceName), HashMap.class);
- final HashMap recycled = read(bytes, HashMap.class);
- assertNotSame(fromStatic, recycled);
- assertEquals(fromStatic, recycled);
- assertEquals(resource.getRequestId().toString(), fromStatic.get("requestId"));
- assertEquals(resource.getOp(), fromStatic.get("op"));
- assertEquals(resource.getProcessor(), fromStatic.get("processor"));
- assertEquals(resource.getArgs().size(), ((Map) fromStatic.get("args")).size());
- assertEquals(resource.getArgs().get("session").toString(), ((Map) fromStatic.get("args")).get("session"));
- assertEquals(resource.getRequestId().toString(), recycled.get("requestId"));
- assertEquals(resource.getOp(), recycled.get("op"));
- assertEquals(resource.getProcessor(), recycled.get("processor"));
- assertEquals(resource.getArgs().size(), ((Map) recycled.get("args")).size());
- assertEquals(resource.getArgs().get("session").toString(), ((Map) recycled.get("args")).get("session"));
- }
-
- @Test
- public void shouldReadWriteSessionEval() throws Exception {
- final String resourceName = "sessioneval";
-
- final RequestMessage resource = findModelEntryObject(resourceName);
- final byte[] bytes = write(resource, RequestMessage.class, resourceName);
- final HashMap fromStatic = read(readFromResource(resourceName), HashMap.class);
- final HashMap recycled = read(bytes, HashMap.class);
- assertNotSame(fromStatic, recycled);
- assertEquals(fromStatic, recycled);
- assertEquals(resource.getRequestId().toString(), fromStatic.get("requestId"));
- assertEquals(resource.getOp(), fromStatic.get("op"));
- assertEquals(resource.getProcessor(), fromStatic.get("processor"));
- assertEquals(resource.getArgs().size(), ((Map) fromStatic.get("args")).size());
- assertEquals(resource.getArgs().get("gremlin"), ((Map) fromStatic.get("args")).get("gremlin"));
- assertEquals(resource.getArgs().get("language"), ((Map) fromStatic.get("args")).get("language"));
- assertEquals(resource.getArgs().get("session").toString(), ((Map) fromStatic.get("args")).get("session"));
- assertEquals(resource.getArgs().get("bindings"), ((Map) fromStatic.get("args")).get("bindings"));
- assertEquals(resource.getRequestId().toString(), recycled.get("requestId"));
- assertEquals(resource.getOp(), recycled.get("op"));
- assertEquals(resource.getProcessor(), recycled.get("processor"));
- assertEquals(resource.getArgs().size(), ((Map) recycled.get("args")).size());
- assertEquals(resource.getArgs().get("gremlin"), ((Map) recycled.get("args")).get("gremlin"));
- assertEquals(resource.getArgs().get("language"), ((Map) recycled.get("args")).get("language"));
- assertEquals(resource.getArgs().get("session").toString(), ((Map) recycled.get("args")).get("session"));
- assertEquals(resource.getArgs().get("bindings"), ((Map) recycled.get("args")).get("bindings"));
- }
-
- @Test
- public void shouldReadWriteSessionEvalAliased() throws Exception {
- final String resourceName = "sessionevalaliased";
-
- final RequestMessage resource = findModelEntryObject(resourceName);
- final byte[] bytes = write(resource, RequestMessage.class, resourceName);
- final HashMap fromStatic = read(readFromResource(resourceName), HashMap.class);
- final HashMap recycled = read(bytes, HashMap.class);
- assertNotSame(fromStatic, recycled);
- assertEquals(fromStatic, recycled);
- assertEquals(resource.getRequestId().toString(), fromStatic.get("requestId"));
- assertEquals(resource.getOp(), fromStatic.get("op"));
- assertEquals(resource.getProcessor(), fromStatic.get("processor"));
- assertEquals(resource.getArgs().size(), ((Map) fromStatic.get("args")).size());
- assertEquals(resource.getArgs().get("gremlin"), ((Map) fromStatic.get("args")).get("gremlin"));
- assertEquals(resource.getArgs().get("language"), ((Map) fromStatic.get("args")).get("language"));
- assertEquals(resource.getArgs().get("session").toString(), ((Map) fromStatic.get("args")).get("session"));
- assertEquals(resource.getArgs().get("bindings"), ((Map) fromStatic.get("args")).get("bindings"));
- assertEquals(resource.getArgs().get("aliased"), ((Map) fromStatic.get("args")).get("aliased"));
- assertEquals(resource.getRequestId().toString(), recycled.get("requestId"));
- assertEquals(resource.getOp(), recycled.get("op"));
- assertEquals(resource.getProcessor(), recycled.get("processor"));
- assertEquals(resource.getArgs().size(), ((Map) recycled.get("args")).size());
- assertEquals(resource.getArgs().get("gremlin"), ((Map) recycled.get("args")).get("gremlin"));
- assertEquals(resource.getArgs().get("language"), ((Map) recycled.get("args")).get("language"));
- assertEquals(resource.getArgs().get("session").toString(), ((Map) recycled.get("args")).get("session"));
- assertEquals(resource.getArgs().get("bindings"), ((Map) recycled.get("args")).get("bindings"));
- assertEquals(resource.getArgs().get("aliased"), ((Map) recycled.get("args")).get("aliased"));
- }
-
- @Test
- public void shouldReadWriteSessionlessEval() throws Exception {
- final String resourceName = "sessionlesseval";
-
- final RequestMessage resource = findModelEntryObject(resourceName);
- final byte[] bytes = write(resource, RequestMessage.class, resourceName);
- final HashMap fromStatic = read(readFromResource(resourceName), HashMap.class);
- final HashMap recycled = read(bytes, HashMap.class);
- assertNotSame(fromStatic, recycled);
- assertEquals(fromStatic, recycled);
- assertEquals(resource.getRequestId().toString(), fromStatic.get("requestId"));
- assertEquals(resource.getOp(), fromStatic.get("op"));
- assertEquals(resource.getProcessor(), fromStatic.get("processor"));
- assertEquals(resource.getArgs().size(), ((Map) fromStatic.get("args")).size());
- assertEquals(resource.getArgs().get("gremlin"), ((Map) fromStatic.get("args")).get("gremlin"));
- assertEquals(resource.getArgs().get("language"), ((Map) fromStatic.get("args")).get("language"));
- assertEquals(resource.getArgs().get("bindings"), ((Map) fromStatic.get("args")).get("bindings"));
- assertEquals(resource.getRequestId().toString(), recycled.get("requestId"));
- assertEquals(resource.getOp(), recycled.get("op"));
- assertEquals(resource.getProcessor(), recycled.get("processor"));
- assertEquals(resource.getArgs().size(), ((Map) recycled.get("args")).size());
- assertEquals(resource.getArgs().get("gremlin"), ((Map) recycled.get("args")).get("gremlin"));
- assertEquals(resource.getArgs().get("language"), ((Map) recycled.get("args")).get("language"));
- assertEquals(resource.getArgs().get("bindings"), ((Map) recycled.get("args")).get("bindings"));
- }
-
- @Test
- public void shouldReadWriteSessionlessEvalAliased() throws Exception {
- final String resourceName = "sessionlessevalaliased";
-
- final RequestMessage resource = findModelEntryObject(resourceName);
- final byte[] bytes = write(resource, RequestMessage.class, resourceName);
- final HashMap fromStatic = read(readFromResource(resourceName), HashMap.class);
- final HashMap recycled = read(bytes, HashMap.class);
- assertNotSame(fromStatic, recycled);
- assertEquals(fromStatic, recycled);
- assertEquals(resource.getRequestId().toString(), fromStatic.get("requestId"));
- assertEquals(resource.getOp(), fromStatic.get("op"));
- assertEquals(resource.getProcessor(), fromStatic.get("processor"));
- assertEquals(resource.getArgs().size(), ((Map) fromStatic.get("args")).size());
- assertEquals(resource.getArgs().get("gremlin"), ((Map) fromStatic.get("args")).get("gremlin"));
- assertEquals(resource.getArgs().get("language"), ((Map) fromStatic.get("args")).get("language"));
- assertEquals(resource.getArgs().get("bindings"), ((Map) fromStatic.get("args")).get("bindings"));
- assertEquals(resource.getArgs().get("aliased"), ((Map) fromStatic.get("args")).get("aliased"));
- assertEquals(resource.getRequestId().toString(), recycled.get("requestId"));
- assertEquals(resource.getOp(), recycled.get("op"));
- assertEquals(resource.getProcessor(), recycled.get("processor"));
- assertEquals(resource.getArgs().size(), ((Map) recycled.get("args")).size());
- assertEquals(resource.getArgs().get("gremlin"), ((Map) recycled.get("args")).get("gremlin"));
- assertEquals(resource.getArgs().get("language"), ((Map) recycled.get("args")).get("language"));
- assertEquals(resource.getArgs().get("bindings"), ((Map) recycled.get("args")).get("bindings"));
- assertEquals(resource.getArgs().get("aliased"), ((Map) recycled.get("args")).get("aliased"));
- }
-
- @Test
- public void shouldReadWriteStandardResult() throws Exception {
- final String resourceName = "standardresult";
-
- final ResponseMessage resource = findModelEntryObject(resourceName);
- final byte[] bytes = write(resource, ResponseMessage.class, resourceName);
- final HashMap fromStatic = read(readFromResource(resourceName), HashMap.class);
- final HashMap recycled = read(bytes, HashMap.class);
- assertNotSame(fromStatic, recycled);
- assertEquals(fromStatic, recycled);
- assertEquals(resource.getRequestId().toString(), fromStatic.get("requestId"));
- assertEquals(resource.getStatus().getCode().getValue(), ((Map) fromStatic.get("status")).get("code"));
- assertEquals(resource.getStatus().getMessage(), ((Map) fromStatic.get("status")).get("message"));
- assertEquals(resource.getStatus().getAttributes(), ((Map) fromStatic.get("status")).get("attributes"));
- assertEquals(resource.getResult().getMeta(), ((Map) fromStatic.get("result")).get("meta"));
- assertEquals(((List) resource.getResult().getData()).size(), ((List) ((Map) fromStatic.get("result")).get("data")).size());
- }
-
- @Test
public void shouldReadWriteVertex() throws Exception {
- final String resourceName = "vertex";
+ final String resourceName = "traversal-vertex";
final Vertex resource = findModelEntryObject(resourceName);
final byte[] bytes = write(resource, Vertex.class, resourceName);
@@ -333,10 +149,10 @@
final HashMap recycled = read(bytes, HashMap.class);
assertNotSame(fromStatic, recycled);
assertEquals(resource.id(), fromStatic.get("id"));
- assertEquals(resource.label(), fromStatic.get("label"));
+ assertEquals(Collections.singletonList(resource.label()), fromStatic.get("label"));
assertEquals(resource.id(), fromStatic.get("id"));
assertEquals(resource.id(), recycled.get("id"));
- assertEquals(resource.label(), recycled.get("label"));
+ assertEquals(Collections.singletonList(resource.label()), recycled.get("label"));
assertEquals(resource.id(), recycled.get("id"));
assertEquals(IteratorUtils.count(resource.keys()), ((Map) fromStatic.get("properties")).size());
assertEquals(resource.value("name"), ((Map) ((List) ((Map) fromStatic.get("properties")).get("name")).get(0)).get("value"));
@@ -371,7 +187,7 @@
@Test
public void shouldReadWriteVertexProperty() throws Exception {
- final String resourceName = "vertexproperty";
+ final String resourceName = "traversal-vertexproperty";
final VertexProperty resource = findModelEntryObject(resourceName);
final byte[] bytes = write(resource, VertexProperty.class, resourceName);
@@ -380,11 +196,11 @@
assertNotSame(fromStatic, recycled);
assertEquals(3, fromStatic.size());
assertEquals(resource.id().toString(), fromStatic.get("id").toString());
- assertEquals(resource.key(), fromStatic.get("label"));
+ assertEquals(Collections.singletonList(resource.key()), fromStatic.get("label"));
assertEquals(resource.value(), fromStatic.get("value"));
assertEquals(3, recycled.size());
assertEquals(resource.id().toString(), fromStatic.get("id").toString());
- assertEquals(resource.key(), recycled.get("label"));
+ assertEquals(Collections.singletonList(resource.key()), recycled.get("label"));
assertEquals(resource.value(), recycled.get("value"));
}
}
diff --git a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/structure/io/Model.java b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/structure/io/Model.java
index 19969f2..aa28eba 100644
--- a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/structure/io/Model.java
+++ b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/structure/io/Model.java
@@ -20,47 +20,28 @@
import org.apache.commons.configuration2.BaseConfiguration;
import org.apache.commons.configuration2.Configuration;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
-import org.apache.tinkerpop.gremlin.process.traversal.Operator;
-import org.apache.tinkerpop.gremlin.process.traversal.Order;
-import org.apache.tinkerpop.gremlin.process.traversal.P;
-import org.apache.tinkerpop.gremlin.process.traversal.Pick;
-import org.apache.tinkerpop.gremlin.process.traversal.Pop;
-import org.apache.tinkerpop.gremlin.process.traversal.SackFunctions;
-import org.apache.tinkerpop.gremlin.process.traversal.Scope;
-import org.apache.tinkerpop.gremlin.process.traversal.TextP;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.BulkSet;
-import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalMetrics;
-import org.apache.tinkerpop.gremlin.process.traversal.util.MutableMetrics;
-import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics;
-import org.apache.tinkerpop.gremlin.structure.Column;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.EmptyPath;
+import org.apache.tinkerpop.gremlin.process.traversal.traverser.util.EmptyTraverser;
import org.apache.tinkerpop.gremlin.structure.Direction;
import org.apache.tinkerpop.gremlin.structure.T;
import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedFactory;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedProperty;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertexProperty;
import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
-import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
-import java.io.File;
import java.math.BigDecimal;
import java.math.BigInteger;
-import java.net.InetAddress;
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
import java.time.Duration;
import java.time.Instant;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.MonthDay;
import java.time.OffsetDateTime;
-import java.time.OffsetTime;
-import java.time.Period;
-import java.time.Year;
-import java.time.YearMonth;
-import java.time.ZoneId;
import java.time.ZoneOffset;
-import java.time.ZonedDateTime;
+import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -73,10 +54,11 @@
import java.util.Optional;
import java.util.Set;
import java.util.UUID;
-import java.util.concurrent.TimeUnit;
import java.util.function.Supplier;
import java.util.stream.Collectors;
+import static org.apache.tinkerpop.gremlin.structure.util.detached.DetachedFactory.detach;
+
/**
* Defines the supported types for IO and the versions (and configurations) to which they apply and are tested.
*
@@ -96,163 +78,117 @@
final GraphTraversalSource g = graph.traversal();
// IMPORTANT - the "title" or name of the Entry needs to be unique
+ addCoreEntry(Double.MAX_VALUE, "max-double");
+ addCoreEntry(Double.MIN_VALUE, "min-double");
+ addCoreEntry(-Double.MAX_VALUE, "neg-max-double");
+ addCoreEntry(-Double.MIN_VALUE, "neg-min-double");
+ addCoreEntry(Double.NaN, "nan-double");
+ addCoreEntry(Double.POSITIVE_INFINITY, "pos-inf-double");
+ addCoreEntry(Double.NEGATIVE_INFINITY, "neg-inf-double");
+ addCoreEntry(-0.0, "neg-zero-double");
- addCoreEntry(File.class, "Class", "");
- addCoreEntry(new Date(1481750076295L), "Date");
- addCoreEntry(100.00d, "Double");
- addCoreEntry(100.00f, "Float", "");
- addCoreEntry(100, "Integer");
- addCoreEntry(Arrays.asList(1,"person", true), "List", "List is used to distinguish between different collection types as JSON is not explicit enough for all of Gremlin's requirements.");
- addCoreEntry(100L, "Long", "");
+ addCoreEntry(Float.MAX_VALUE, "max-float");
+ addCoreEntry(Float.MIN_VALUE, "min-float");
+ addCoreEntry(-Float.MAX_VALUE, "neg-max-float");
+ addCoreEntry(-Float.MIN_VALUE, "neg-min-float");
+ addCoreEntry(Float.NaN, "nan-float");
+ addCoreEntry(Float.POSITIVE_INFINITY, "pos-inf-float");
+ addCoreEntry(Float.NEGATIVE_INFINITY, "neg-inf-float");
+ addCoreEntry(-0.0f, "neg-zero-float");
+
+ addCoreEntry(Integer.MAX_VALUE, "max-int");
+ addCoreEntry(Integer.MIN_VALUE, "min-int");
+
+ addCoreEntry(Long.MAX_VALUE, "max-long");
+ addCoreEntry(Long.MIN_VALUE, "min-long");
+
+ addCoreEntry(Arrays.asList(1, "person", true, null), "var-type-list", "List is used to distinguish between different collection types as JSON is not explicit enough for all of Gremlin's requirements.");
+ addCoreEntry(Collections.EMPTY_LIST, "empty-list");
final Map<Object,Object> map = new HashMap<>();
map.put("test", 123);
- map.put(new Date(1481750076295L), "red");
- map.put(Arrays.asList(1,2,3), new Date(1481750076295L));
- addCoreEntry(map, "Map", "Map is redefined so that to provide the ability to allow for non-String keys, which is not possible in JSON.");
+ map.put(OffsetDateTime.ofInstant(Instant.ofEpochMilli(1481295L), ZoneOffset.UTC), "red");
+ map.put(Arrays.asList(1,2,3), OffsetDateTime.ofInstant(Instant.ofEpochMilli(1481295L), ZoneOffset.UTC));
+ map.put(null, null);
+ addCoreEntry(map, "var-type-map", "Map is redefined so that to provide the ability to allow for non-String keys, which is not possible in JSON.");
+ addCoreEntry(Collections.EMPTY_MAP, "empty-map");
- addCoreEntry(new HashSet<>(Arrays.asList(1,"person", true)), "Set", "Allows a JSON collection to behave as a Set.");
- addCoreEntry(new java.sql.Timestamp(1481750076295L), "Timestamp", "");
- addCoreEntry(UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786"), "UUID");
+ addCoreEntry(new HashSet<>(Arrays.asList(2, "person", true, null)), "var-type-set", "Allows a JSON collection to behave as a Set.");
+ addCoreEntry(Collections.EMPTY_SET, "empty-set");
- addGraphStructureEntry(graph.edges().next(), "Edge", "");
- addGraphStructureEntry(g.V().out().out().path().next(), "Path", "");
- addGraphStructureEntry(graph.edges().next().properties().next(), "Property", "");
- addGraphStructureEntry(graph, "TinkerGraph", "`TinkerGraph` has a custom serializer that is registered as part of the `TinkerIoRegistry`.");
- addGraphStructureEntry(graph.vertices().next(), "Vertex", "");
- addGraphStructureEntry(graph.vertices().next().properties().next(), "VertexProperty", "");
+ addCoreEntry(UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786"), "specified-uuid");
+ addCoreEntry(new UUID(0, 0), "nil-uuid");
- addGraphProcessEntry(SackFunctions.Barrier.normSack, "Barrier", "");
- addGraphProcessEntry(new Bytecode.Binding("x", 1), "Binding", "A \"Binding\" refers to a `Bytecode.Binding`.");
+ addCoreEntry(Direction.OUT, "out-direction", "");
+ addCoreEntry(T.id, "id-t", "");
+
+ addCoreEntry('a', "single-byte-char", "");
+ addCoreEntry('\u03A9', "multi-byte-char", "");
+
+ addEntry("Core", () -> null, "unspecified-null", "");
+
+ addCoreEntry(true, "true-boolean", "");
+ addCoreEntry(false, "false-boolean", "");
+
+ addCoreEntry("abc", "single-byte-string", "");
+ addCoreEntry("abc\u0391\u0392\u0393", "mixed-string", "");
+
+ addCoreEntry(g.V(10).out().tree().next(), "traversal-tree", "");
+
+ addGraphStructureEntry(graph.edges().next(), "traversal-edge", "");
+ addGraphStructureEntry(DetachedFactory.detach(graph.edges().next(), false), "no-prop-edge", "");
+
+ addGraphStructureEntry(detach(g.V().out().out().path().next(), false), "traversal-path", "");
+ addGraphStructureEntry(EmptyPath.instance(), "empty-path", "");
+ addGraphStructureEntry(detach(g.V().out().out().path().next(), true), "prop-path", "");
+
+ addGraphStructureEntry(graph.edges().next().properties().next(), "edge-property", "");
+ addGraphStructureEntry(new DetachedProperty<>("", null), "null-property", "");
+
+ addGraphStructureEntry(graph, "tinker-graph", "`TinkerGraph` has a custom serializer that is registered as part of the `TinkerIoRegistry`.");
+
+ addGraphStructureEntry(graph.vertices().next(), "traversal-vertex", "");
+ addGraphStructureEntry(DetachedFactory.detach(graph.vertices().next(), false), "no-prop-vertex", "");
+
+ addGraphStructureEntry(graph.vertices().next().properties().next(), "traversal-vertexproperty", "");
+ final Map<String,Object> metaProperties = new HashMap<>();
+ metaProperties.put("a", "b");
+ addGraphStructureEntry(new DetachedVertexProperty<>(1, "person", "stephen", metaProperties), "meta-vertexproperty", "");
+ final Set<Object> setProperty = new HashSet<>();
+ setProperty.add("stephen");
+ setProperty.add("marko");
+ addGraphStructureEntry(new DetachedVertexProperty<>(1, "person", setProperty, metaProperties), "set-cardinality-vertexproperty", "");
final BulkSet<String> bulkSet = new BulkSet<>();
bulkSet.add("marko", 1);
bulkSet.add("josh", 2);
- addGraphProcessEntry(bulkSet, "BulkSet", "");
+ addGraphProcessEntry(bulkSet, "var-bulklist", "");
+ addGraphProcessEntry(new BulkSet(), "empty-bulklist", "");
- addGraphProcessEntry(g.V().hasLabel("person").out().in().tree().asAdmin().getBytecode(), "Bytecode", "The following `Bytecode` example represents the traversal of `g.V().hasLabel('person').out().in().tree()`. Obviously the serialized `Bytecode` woudl be quite different for the endless variations of commands that could be used together in the Gremlin language.");
- addGraphProcessEntry(VertexProperty.Cardinality.list, "Cardinality", "");
- addGraphProcessEntry(Column.keys, "Column", "");
- addGraphProcessEntry(Direction.OUT, "Direction", "");
- addGraphProcessEntry(Operator.sum, "Operator", "");
- addGraphProcessEntry(Order.shuffle, "Order", "");
- addGraphProcessEntry(Pick.any, "Pick", "");
- addGraphProcessEntry(Pop.all, "Pop", "");
- addGraphProcessEntry(org.apache.tinkerpop.gremlin.util.function.Lambda.function("{ it.get() }"), "Lambda", "");
- final TraversalMetrics tm = createStaticTraversalMetrics();
- final MutableMetrics metrics = new MutableMetrics(tm.getMetrics("7.0.0()"));
- metrics.addNested(new MutableMetrics(tm.getMetrics("3.0.0()")));
- addGraphProcessEntry(metrics, "Metrics", "");
- addGraphProcessEntry(P.gt(0), "P", "");
- addGraphProcessEntry(P.within(1), "P within", "");
- addGraphProcessEntry(P.without(1,2), "P without", "");
- addGraphProcessEntry(P.gt(0).and(P.lt(10)), "P and", "");
- addGraphProcessEntry(P.gt(0).or(P.within(-1, -10, -100)), "P or", "");
- addGraphProcessEntry(Scope.local, "Scope", "");
- addGraphProcessEntry(T.label, "T", "");
- // TextP was only added at 3.4.0 and is not supported with untyped GraphSON of any sort
- addGraphProcessEntry(TextP.containing("ark"), "TextP", "");
- addGraphProcessEntry(createStaticTraversalMetrics(), "TraversalMetrics", "");
- addGraphProcessEntry(g.V().hasLabel("person").asAdmin().nextTraverser(), "Traverser", "");
+ addGraphProcessEntry(g.V().hasLabel("person").asAdmin().nextTraverser(), "vertex-traverser", "");
+ addGraphProcessEntry(g.V().both().barrier().asAdmin().nextTraverser(), "bulked-traverser", "");
+ addGraphProcessEntry(EmptyTraverser.instance(), "empty-traverser", "");
- final Map<String,Object> requestBindings = new HashMap<>();
- requestBindings.put("x", 1);
+ addExtendedEntry(new BigDecimal("123.456789987654321123456789987654321"), "pos-bigdecimal", "");
+ addExtendedEntry(new BigDecimal("-123.456789987654321123456789987654321"), "neg-bigdecimal", "");
- final Map<String,Object> requestAliases = new HashMap<>();
- requestAliases.put("g", "social");
+ addExtendedEntry(new BigInteger("123456789987654321123456789987654321"), "pos-biginteger", "");
+ addExtendedEntry(new BigInteger("-123456789987654321123456789987654321"), "neg-biginteger", "");
- RequestMessage requestMessage;
- requestMessage = RequestMessage.build("authentication").
- overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
- add("saslMechanism", "PLAIN", "sasl", "AHN0ZXBocGhlbgBwYXNzd29yZA==").create();
- addRequestMessageEntry(requestMessage, "Authentication Response", "The following `RequestMessage` is an example of the response that should be made to a SASL-based authentication challenge.");
- requestMessage = RequestMessage.build("eval").processor("session").
- overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
- add("gremlin", "g.V(x)", "bindings", requestBindings, "language", "gremlin-groovy", "session", "unique-session-identifier").create();
- addRequestMessageEntry(requestMessage, "Session Eval", "The following `RequestMessage` is an example of a simple session request for a script evaluation with parameters.");
- requestMessage = RequestMessage.build("eval").processor("session").
- overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
- add("gremlin", "social.V(x)", "bindings", requestBindings, "language", "gremlin-groovy", "aliases", requestAliases, "session","unique-session-identifier").create();
- addRequestMessageEntry(requestMessage, "Session Eval Aliased", "The following `RequestMessage` is an example of a session request for a script evaluation with an alias that binds the `TraversalSource` of \"g\" to \"social\".");
- requestMessage = RequestMessage.build("close").processor("session").
- overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
- add("session", "unique-session-identifier").create();
- addRequestMessageEntry(requestMessage, "Session Close", "The following `RequestMessage` is an example of a request to close a session.");
- requestMessage = RequestMessage.build("eval").
- overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
- add("gremlin", "g.V(x)", "bindings", requestBindings, "language", "gremlin-groovy").create();
- addRequestMessageEntry(requestMessage, "Sessionless Eval", "The following `RequestMessage` is an example of a simple sessionless request for a script evaluation with parameters.");
- requestMessage = RequestMessage.build("eval").
- overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
- add("gremlin", "social.V(x)", "bindings", requestBindings, "language", "gremlin-groovy", "aliases", requestAliases).create();
- addRequestMessageEntry(requestMessage, "Sessionless Eval Aliased", "The following `RequestMessage` is an example of a sessionless request for a script evaluation with an alias that binds the `TraversalSource` of \"g\" to \"social\".");
+ addExtendedEntry(Byte.MAX_VALUE, "max-byte", "");
+ addExtendedEntry(Byte.MIN_VALUE, "min-byte", "");
- ResponseMessage responseMessage = ResponseMessage.build(UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).
- code(org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode.AUTHENTICATE).create();
- addResponseMessageEntry(responseMessage, "Authentication Challenge", "When authentication is enabled, an initial request to the server will result in an authentication challenge. The typical response message will appear as follows, but handling it could be different depending on the SASL implementation (e.g. multiple challenges maybe requested in some cases, but not in the default provided by Gremlin Server).");
- responseMessage = ResponseMessage.build(UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).
- code(org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode.SUCCESS).
- result(Collections.singletonList(graph.vertices().next())).create();
- addResponseMessageEntry(responseMessage, "Standard Result", "The following `ResponseMessage` is a typical example of the typical successful response Gremlin Server will return when returning results from a script.");
-
- addExtendedEntry(new BigDecimal(new BigInteger("123456789987654321123456789987654321")), "BigDecimal", "");
- addExtendedEntry(new BigInteger("123456789987654321123456789987654321"), "BigInteger", "");
- addExtendedEntry(new Byte("1"), "Byte", "");
- addEntry("Extended", () -> java.nio.ByteBuffer.wrap("some bytes for you".getBytes()), "ByteBuffer", "");
- addExtendedEntry("x".charAt(0), "Char", "");
- addExtendedEntry(Duration.ofDays(5), "Duration","The following example is a `Duration` of five days.");
- try {
- addEntry("Extended", InetAddress.getByName("localhost"), "InetAddress", "");
- } catch (Exception ex) {
- throw new RuntimeException(ex);
- }
- addExtendedEntry(Instant.parse("2016-12-14T16:39:19.349Z"), "Instant", "");
- addExtendedEntry(LocalDate.of(2016, 1, 1), "LocalDate", "");
- addExtendedEntry(LocalDateTime.of(2016, 1, 1, 12, 30), "LocalDateTime", "");
- addExtendedEntry(LocalTime.of(12, 30, 45), "LocalTime", "");
- addExtendedEntry(MonthDay.of(1, 1), "MonthDay", "");
- addExtendedEntry(OffsetDateTime.parse("2007-12-03T10:15:30+01:00"), "OffsetDateTime", "");
- addExtendedEntry(OffsetTime.parse("10:15:30+01:00"), "OffsetTime", "");
- addExtendedEntry(Period.of(1, 6, 15), "Period", "The following example is a `Period` of one year, six months and fifteen days.");
- addExtendedEntry(new Short("100"), "Short", "");
- addExtendedEntry(Year.of(2016), "Year", "The following example is of the `Year` \"2016\".");
- addExtendedEntry(YearMonth.of(2016, 6), "YearMonth", "The following example is a `YearMonth` of \"June 2016\"");
- addExtendedEntry(ZonedDateTime.of(2016, 12, 23, 12, 12, 24, 36, ZoneId.of("GMT+2")), "ZonedDateTime", "");
- addExtendedEntry(ZoneOffset.ofHoursMinutesSeconds(3, 6, 9), "ZoneOffset", "The following example is a `ZoneOffset` of three hours, six minutes, and nine seconds.");
- }
+ addExtendedEntry(ByteBuffer.wrap(new byte[0]), "empty-binary", "");
+ addEntry("Extended", () -> java.nio.ByteBuffer.wrap("some bytes for you".getBytes(StandardCharsets.UTF_8)), "str-binary", "");
- private static DefaultTraversalMetrics createStaticTraversalMetrics() {
- // based on g.V().hasLabel("person").out().out().tree().profile().next()
- final List<MutableMetrics> traversalMutableMetrics = new ArrayList<>();
- final MutableMetrics m7 = new MutableMetrics("7.0.0()", "TinkerGraphStep(vertex,[~label.eq(person)])");
- m7.setDuration(100, TimeUnit.MILLISECONDS);
- m7.setCount("traverserCount", 4);
- m7.setCount("elementCount", 4);
- m7.setAnnotation("percentDur", 25.0d);
- traversalMutableMetrics.add(m7);
+ addExtendedEntry(Duration.ZERO, "zero-duration","The following example is a zero `Duration`");
+ addExtendedEntry(ChronoUnit.FOREVER.getDuration(), "forever-duration","");
- final MutableMetrics m2 = new MutableMetrics("2.0.0()", "VertexStep(OUT,vertex)");
- m2.setDuration(100, TimeUnit.MILLISECONDS);
- m2.setCount("traverserCount", 13);
- m2.setCount("elementCount", 13);
- m2.setAnnotation("percentDur", 25.0d);
- traversalMutableMetrics.add(m2);
+ addExtendedEntry(OffsetDateTime.MAX, "max-offsetdatetime", "");
+ addExtendedEntry(OffsetDateTime.MIN, "min-offsetdatetime", "");
- final MutableMetrics m3 = new MutableMetrics("3.0.0()", "VertexStep(OUT,vertex)");
- m3.setDuration(100, TimeUnit.MILLISECONDS);
- m3.setCount("traverserCount", 7);
- m3.setCount("elementCount", 7);
- m3.setAnnotation("percentDur", 25.0d);
- traversalMutableMetrics.add(m3);
-
- final MutableMetrics m4 = new MutableMetrics("4.0.0()", "TreeStep");
- m4.setDuration(100, TimeUnit.MILLISECONDS);
- m4.setCount("traverserCount", 1);
- m4.setCount("elementCount", 1);
- m4.setAnnotation("percentDur", 25.0d);
- traversalMutableMetrics.add(m4);
-
- return new DefaultTraversalMetrics(4000, traversalMutableMetrics);
+ addExtendedEntry(Short.MIN_VALUE, "min-short", "");
+ addExtendedEntry(Short.MAX_VALUE, "max-short", "");
}
public static Model instance() {
diff --git a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphbinary/GraphBinaryCompatibilityTest.java b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphbinary/GraphBinaryCompatibilityTest.java
index 3943846..77b92cf 100644
--- a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphbinary/GraphBinaryCompatibilityTest.java
+++ b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphbinary/GraphBinaryCompatibilityTest.java
@@ -19,7 +19,6 @@
package org.apache.tinkerpop.gremlin.structure.io.graphbinary;
import io.netty.buffer.ByteBufAllocator;
-import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import org.apache.commons.io.output.ByteArrayOutputStream;
import org.apache.tinkerpop.gremlin.structure.io.AbstractTypedCompatibilityTest;
@@ -42,8 +41,8 @@
public class GraphBinaryCompatibilityTest extends AbstractTypedCompatibilityTest {
private static final ByteBufAllocator allocator = ByteBufAllocator.DEFAULT;
- private static final GraphBinaryWriter writerV1 = new GraphBinaryWriter();
- private static final GraphBinaryReader readerV1 = new GraphBinaryReader();
+ private static final GraphBinaryWriter writerV4 = new GraphBinaryWriter();
+ private static final GraphBinaryReader readerV4 = new GraphBinaryReader();
private static final NettyBufferFactory bufferFactory = new NettyBufferFactory();
private static final String testCaseDataPath = root.getPath() + File.separator + "test-case-data" + File.separator
@@ -56,7 +55,7 @@
@Parameterized.Parameters(name = "expect({0})")
public static Iterable<Object[]> data() {
return Arrays.asList(new Object[][]{
- {"v1", readerV1, writerV1 },
+ {"v4", readerV4, writerV4 },
});
}
@@ -77,7 +76,7 @@
@Override
protected byte[] readFromResource(final String resource) throws IOException {
final String testResource = resource + "-" + compatibility + ".gbin";
- return IOUtils.toByteArray(getClass().getResourceAsStream(testResource));
+ return IOUtils.toByteArray(GraphBinaryResourceAccess.class.getResourceAsStream(testResource));
}
@Override
@@ -108,8 +107,9 @@
}
}
- @Override
- public void shouldReadWriteAuthenticationChallenge() throws Exception {
- super.shouldReadWriteAuthenticationChallenge();
- }
+// TODO: revisit
+// @Override
+// public void shouldReadWriteAuthenticationChallenge() throws Exception {
+// super.shouldReadWriteAuthenticationChallenge();
+// }
}
diff --git a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypedCompatibilityTest.java b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypedCompatibilityTest.java
index 15a0e68..2d7d8fd 100644
--- a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypedCompatibilityTest.java
+++ b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypedCompatibilityTest.java
@@ -20,12 +20,8 @@
import org.apache.commons.io.IOUtils;
import org.apache.tinkerpop.gremlin.structure.io.AbstractTypedCompatibilityTest;
-import org.apache.tinkerpop.gremlin.structure.io.Model;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3;
-import org.apache.tinkerpop.gremlin.util.TestSupport;
-import org.apache.tinkerpop.gremlin.util.ser.AbstractGraphSONMessageSerializerV2;
-import org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV4;
+import org.apache.tinkerpop.gremlin.util.ser.AbstractGraphSONMessageSerializerV4;
import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -41,18 +37,11 @@
@RunWith(Parameterized.class)
public class GraphSONTypedCompatibilityTest extends AbstractTypedCompatibilityTest {
- private static ObjectMapper mapperV2 = GraphSONMapper.build().
- addRegistry(TinkerIoRegistryV2.instance()).
- typeInfo(TypeInfo.PARTIAL_TYPES).
- addCustomModule(GraphSONXModuleV2.build()).
- addCustomModule(new AbstractGraphSONMessageSerializerV2.GremlinServerModule()).
- version(GraphSONVersion.V2_0).create().createMapper();
-
- private static ObjectMapper mapperV3 = GraphSONMapper.build().
- addRegistry(TinkerIoRegistryV3.instance()).
- addCustomModule(GraphSONXModuleV3.build()).
- addCustomModule(new GraphSONMessageSerializerV3.GremlinServerModule()).
- version(GraphSONVersion.V3_0).create().createMapper();
+ private static ObjectMapper mapperV4 = GraphSONMapper.build().
+ addRegistry(TinkerIoRegistryV4.instance()).
+ addCustomModule(GraphSONXModuleV4.build()).
+ addCustomModule(new AbstractGraphSONMessageSerializerV4.GremlinServerModuleV4()).
+ version(GraphSONVersion.V4_0).create().createMapper();
private static final String testCaseDataPath = root.getPath() + File.separator + "test-case-data" + File.separator
+ "io" + File.separator + "graphson";
@@ -64,8 +53,7 @@
@Parameterized.Parameters(name = "expect({0})")
public static Iterable<Object[]> data() {
return Arrays.asList(new Object[][]{
- {"v2", mapperV2 },
- {"v3", mapperV3 },
+ {"v4", mapperV4 },
});
}
@@ -83,7 +71,7 @@
@Override
protected byte[] readFromResource(final String resource) throws IOException {
final String testResource = resource + "-" + compatibility + ".json";
- return IOUtils.toByteArray(getClass().getResourceAsStream(testResource));
+ return IOUtils.toByteArray(GraphSONResourceAccess.class.getResourceAsStream(testResource));
}
@Override
@@ -104,4 +92,10 @@
return bytes;
}
+
+ @Override
+ public void shouldReadWriteTraversalTree() throws Exception {
+ // Tree deserialization from GraphSON doesn't seem to work.
+ return;
+ }
}
diff --git a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONUntypedCompatibilityTest.java b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONUntypedCompatibilityTest.java
index fa02c89..a68393c 100644
--- a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONUntypedCompatibilityTest.java
+++ b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONUntypedCompatibilityTest.java
@@ -20,11 +20,8 @@
import org.apache.commons.io.IOUtils;
import org.apache.tinkerpop.gremlin.structure.io.AbstractUntypedCompatibilityTest;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3;
-import org.apache.tinkerpop.gremlin.util.ser.AbstractGraphSONMessageSerializerV1;
-import org.apache.tinkerpop.gremlin.util.ser.AbstractGraphSONMessageSerializerV2;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV4;
+import org.apache.tinkerpop.gremlin.util.ser.AbstractGraphSONMessageSerializerV4;
import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -40,25 +37,12 @@
@RunWith(Parameterized.class)
public class GraphSONUntypedCompatibilityTest extends AbstractUntypedCompatibilityTest {
- private static final ObjectMapper mapperV1 = GraphSONMapper.build().
- addRegistry(TinkerIoRegistryV1.instance()).
+ private static final ObjectMapper mapperV4 = GraphSONMapper.build().
+ addRegistry(TinkerIoRegistryV4.instance()).
typeInfo(TypeInfo.NO_TYPES).
- addCustomModule(new AbstractGraphSONMessageSerializerV1.GremlinServerModule()).
- version(GraphSONVersion.V1_0).create().createMapper();
-
- private static final ObjectMapper mapperV2 = GraphSONMapper.build().
- addRegistry(TinkerIoRegistryV2.instance()).
- typeInfo(TypeInfo.NO_TYPES).
- addCustomModule(GraphSONXModuleV2.build()).
- addCustomModule(new AbstractGraphSONMessageSerializerV2.GremlinServerModule()).
- version(GraphSONVersion.V2_0).create().createMapper();
-
- private static final ObjectMapper mapperV3 = GraphSONMapper.build().
- addRegistry(TinkerIoRegistryV3.instance()).
- typeInfo(TypeInfo.NO_TYPES).
- addCustomModule(GraphSONXModuleV3.build()).
- addCustomModule(new AbstractGraphSONMessageSerializerV2.GremlinServerModule()).
- version(GraphSONVersion.V3_0).create().createMapper();
+ addCustomModule(GraphSONXModuleV4.build()).
+ addCustomModule(new AbstractGraphSONMessageSerializerV4.GremlinServerModuleV4()).
+ version(GraphSONVersion.V4_0).create().createMapper();
private static final String testCaseDataPath = root.getPath() + File.separator + "test-case-data" + File.separator
+ "io" + File.separator + "graphson";
@@ -70,9 +54,7 @@
@Parameterized.Parameters(name = "expect({0})")
public static Iterable<Object[]> data() {
return Arrays.asList(new Object[][]{
- {"v1-no-types", mapperV1 },
- {"v2-no-types", mapperV2 },
- {"v3-no-types", mapperV3 },
+ {"v4-no-types", mapperV4 },
});
}
@@ -90,7 +72,7 @@
@Override
protected byte[] readFromResource(final String resource) throws IOException {
final String testResource = resource + "-" + compatibility + ".json";
- return IOUtils.toByteArray(getClass().getResourceAsStream(testResource));
+ return IOUtils.toByteArray(GraphSONResourceAccess.class.getResourceAsStream(testResource));
}
@Override
diff --git a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/message/RequestMessageTest.java b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/message/RequestMessageTest.java
new file mode 100644
index 0000000..4af4e14
--- /dev/null
+++ b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/message/RequestMessageTest.java
@@ -0,0 +1,150 @@
+/*
+ * 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.util.message;
+
+import org.apache.tinkerpop.gremlin.util.Tokens;
+import org.junit.Test;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+public class RequestMessageTest {
+ @Test
+ public void shouldSetScriptGremlin() {
+ final String script = "g.V().both()";
+ final RequestMessage msg = RequestMessage.build(script).create();
+ assertEquals(script, msg.getGremlin());
+ }
+
+ @Test
+ public void shouldSetBindingsWithMap() {
+ final Map<String, Object> bindings = new HashMap<>();
+ bindings.put("a", "b");
+ bindings.put("g", "gmodern");
+ final RequestMessage msg = RequestMessage.build("gremlin").addBindings(bindings).create();
+ assertEquals(bindings, msg.getField(Tokens.ARGS_BINDINGS));
+ }
+
+ @Test
+ public void shouldSetBindingsWithKeyValue() {
+ final Map<String, Object> bindings = new HashMap<>();
+ bindings.put("a", "b");
+ bindings.put("g", "gmodern");
+ final RequestMessage msg = RequestMessage.build("gremlin")
+ .addBinding("a", "b")
+ .addBinding("g", "gmodern")
+ .create();
+ assertEquals(bindings, msg.getField(Tokens.ARGS_BINDINGS));
+ }
+
+ @Test
+ public void shouldSetLanguage() {
+ final String language = "fake-lang";
+ final RequestMessage msg = RequestMessage.build("g").addLanguage(language).create();
+ assertEquals(language, msg.getField(Tokens.ARGS_LANGUAGE));
+ }
+
+ @Test
+ public void shouldSetG() {
+ final String g = "gmodern";
+ final RequestMessage msg = RequestMessage.build("g").addG(g).create();
+ assertEquals(g, msg.getField(Tokens.ARGS_G));
+ }
+
+ @Test
+ public void shouldSetTimeout() {
+ final long timeout = 101L;
+ final RequestMessage msg = RequestMessage.build("g").addTimeoutMillis(timeout).create();
+ assertEquals(timeout, (long) msg.getField(Tokens.TIMEOUT_MS));
+ }
+
+ @Test
+ public void shouldSetMaterializeProperties() {
+ final RequestMessage msgWithAll = RequestMessage.build("g").addMaterializeProperties(Tokens.MATERIALIZE_PROPERTIES_ALL).create();
+ assertEquals(Tokens.MATERIALIZE_PROPERTIES_ALL, msgWithAll.getField(Tokens.ARGS_MATERIALIZE_PROPERTIES));
+
+ final RequestMessage msgWithTokens = RequestMessage.build("g").addMaterializeProperties(Tokens.MATERIALIZE_PROPERTIES_TOKENS).create();
+ assertEquals(Tokens.MATERIALIZE_PROPERTIES_TOKENS, msgWithTokens.getField(Tokens.ARGS_MATERIALIZE_PROPERTIES));
+ }
+
+ @Test
+ public void shouldErrorSettingMaterializePropertiesWithInvalidValue() {
+ try {
+ final RequestMessage msgWithTokens = RequestMessage.build("g").addMaterializeProperties("notToken").create();
+ fail("RequestMessage shouldn't accept notToken for materializeProperties.");
+ } catch (Exception e) {
+ assertTrue(e.getMessage().contains("materializeProperties argument must be either token or all"));
+ }
+ }
+
+ @Test
+ public void shouldGetFields() {
+ final String g = "gmodern";
+ final String lang = "lang";
+ final String query = "g.V()";
+ final Map<String, Object> bindings = new HashMap<>();
+ bindings.put("b", "c");
+ bindings.put("g", "gmodern");
+
+ final RequestMessage msg = RequestMessage.build(query).addG(g).addBindings(bindings).addLanguage(lang).create();
+ final Map<String, Object> fields = msg.getFields();
+ assertEquals(g, fields.get(Tokens.ARGS_G));
+ assertEquals(lang, fields.get(Tokens.ARGS_LANGUAGE));
+ assertEquals(bindings, fields.get(Tokens.ARGS_BINDINGS));
+ assertEquals(query, msg.getGremlin());
+ }
+
+ @Test
+ public void shouldGetGAsArg() {
+ final String g = "gmodern";
+ final RequestMessage msg = RequestMessage.build("g").addG(g).create();
+ assertEquals(g, msg.getField(Tokens.ARGS_G));
+ }
+
+ @Test
+ public void shouldGetGAsArgOrDefault() {
+ final RequestMessage msg = RequestMessage.build("g").create();
+ assertEquals("b", msg.getFieldOrDefault(Tokens.ARGS_G, "b"));
+ }
+
+ @Test
+ public void shouldGetGAsArgAsOptional() {
+ final String g = "gmodern";
+ final RequestMessage msg = RequestMessage.build("g").addG(g).create();
+ assertEquals(g, msg.optionalField(Tokens.ARGS_G).get());
+ }
+
+ @Test
+ public void shouldNotBeAbleToGetGremlinQueryFromArgs() {
+ final String query = "gmodern";
+ final RequestMessage msg = RequestMessage.build(query).create();
+ assertTrue(null == msg.getField(Tokens.ARGS_GREMLIN));
+ }
+
+ @Test
+ public void shouldNotContainRequestId() {
+ final RequestMessage msg = RequestMessage.build("g.V()").create();
+ assertNull(msg.getField("requestId"));
+ }
+}
diff --git a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/message/ResponseStatusCodeTest.java b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/message/ResponseStatusCodeTest.java
deleted file mode 100644
index 235eddd..0000000
--- a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/message/ResponseStatusCodeTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tinkerpop.gremlin.util.message;
-
-import org.junit.Test;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-public class ResponseStatusCodeTest {
-
- @Test
- public void shouldIndicateFinalMessagesStatusCodes() {
- assertFalse(ResponseStatusCode.AUTHENTICATE.isFinalResponse());
- assertFalse(ResponseStatusCode.PARTIAL_CONTENT.isFinalResponse());
- assertTrue(ResponseStatusCode.SUCCESS.isFinalResponse());
- assertTrue(ResponseStatusCode.SERVER_ERROR_TIMEOUT.isFinalResponse());
- }
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/AbstractGraphSONMessageSerializerV1Test.java b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/AbstractGraphSONMessageSerializerV1Test.java
deleted file mode 100644
index b62909a..0000000
--- a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/AbstractGraphSONMessageSerializerV1Test.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.util.ser;
-
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
-import org.apache.tinkerpop.shaded.jackson.core.StreamReadConstraints;
-import org.junit.Test;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.junit.Assert.assertEquals;
-
-public class AbstractGraphSONMessageSerializerV1Test {
- @Test
- public void shouldApplyMaxTokenLengthsOnConfigure() {
- // Initialize bare-bones AbstractGraphSONMessageSerializerV1
- final AbstractGraphSONMessageSerializerV1 serializer = new AbstractGraphSONMessageSerializerV1() {
- @Override byte[] obtainHeader() { return new byte[0]; }
- @Override GraphSONMapper.Builder configureBuilder(GraphSONMapper.Builder builder) { return builder;}
- @Override public String[] mimeTypesSupported() {return new String[0]; }
- };
-
- final Map<String, Object> config = new HashMap<>();
- config.put("maxNumberLength", 999);
- config.put("maxStringLength", 12345);
- config.put("maxNestingDepth", 55);
-
- serializer.configure(config, null);
-
- final StreamReadConstraints constraints = serializer.getMapper().getFactory().streamReadConstraints();
-
- assertEquals(999, constraints.getMaxNumberLength());
- assertEquals(12345, constraints.getMaxStringLength());
- assertEquals(55, constraints.getMaxNestingDepth());
- }
-}
diff --git a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/AbstractGraphSONMessageSerializerV2Test.java b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/AbstractGraphSONMessageSerializerV2Test.java
deleted file mode 100644
index 14232c5..0000000
--- a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/AbstractGraphSONMessageSerializerV2Test.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.util.ser;
-
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
-import org.apache.tinkerpop.shaded.jackson.core.StreamReadConstraints;
-import org.junit.Test;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.junit.Assert.assertEquals;
-
-public class AbstractGraphSONMessageSerializerV2Test {
- @Test
- public void shouldApplyMaxTokenLengthsOnConfigure() {
- // Initialize bare-bones AbstractGraphSONMessageSerializerV2
- final AbstractGraphSONMessageSerializerV2 serializer = new AbstractGraphSONMessageSerializerV2() {
- @Override byte[] obtainHeader() { return new byte[0]; }
- @Override GraphSONMapper.Builder configureBuilder(GraphSONMapper.Builder builder) { return builder;}
- @Override public String[] mimeTypesSupported() {return new String[0]; }
- };
-
- final Map<String, Object> config = new HashMap<>();
- config.put("maxNumberLength", 999);
- config.put("maxStringLength", 12345);
- config.put("maxNestingDepth", 55);
-
- serializer.configure(config, null);
-
- final StreamReadConstraints constraints = serializer.getMapper().getFactory().streamReadConstraints();
-
- assertEquals(999, constraints.getMaxNumberLength());
- assertEquals(12345, constraints.getMaxStringLength());
- assertEquals(55, constraints.getMaxNestingDepth());
- }
-}
diff --git a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/AbstractGraphSONMessageSerializerV4Test.java b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/AbstractGraphSONMessageSerializerV4Test.java
new file mode 100644
index 0000000..3b89688
--- /dev/null
+++ b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/AbstractGraphSONMessageSerializerV4Test.java
@@ -0,0 +1,52 @@
+/*
+ * 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.util.ser;
+
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
+import org.apache.tinkerpop.shaded.jackson.core.StreamReadConstraints;
+import org.junit.Test;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
+
+public class AbstractGraphSONMessageSerializerV4Test {
+ @Test
+ public void shouldApplyMaxTokenLengthsOnConfigure() {
+ // Initialize bare-bones AbstractGraphSONMessageSerializerV2
+ final AbstractGraphSONMessageSerializerV4 serializer = new AbstractGraphSONMessageSerializerV4() {
+ @Override GraphSONMapper.Builder configureBuilder(GraphSONMapper.Builder builder) { return builder;}
+ @Override public String[] mimeTypesSupported() {return new String[0]; }
+ };
+
+ final Map<String, Object> config = new HashMap<>();
+ config.put("maxNumberLength", 999);
+ config.put("maxStringLength", 12345);
+ config.put("maxNestingDepth", 55);
+
+ serializer.configure(config, null);
+
+ final StreamReadConstraints constraints = serializer.getMapper().getFactory().streamReadConstraints();
+
+ assertEquals(999, constraints.getMaxNumberLength());
+ assertEquals(12345, constraints.getMaxStringLength());
+ assertEquals(55, constraints.getMaxNestingDepth());
+ }
+}
diff --git a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/AbstractRoundTripTest.java b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/AbstractRoundTripTest.java
index 3f620f0..cfa1009 100644
--- a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/AbstractRoundTripTest.java
+++ b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/AbstractRoundTripTest.java
@@ -18,71 +18,36 @@
*/
package org.apache.tinkerpop.gremlin.util.ser;
-import org.apache.tinkerpop.gremlin.process.computer.Computer;
-import org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.decoration.VertexProgramStrategy;
-import org.apache.tinkerpop.gremlin.process.remote.traversal.DefaultRemoteTraverser;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
-import org.apache.tinkerpop.gremlin.process.traversal.Operator;
-import org.apache.tinkerpop.gremlin.process.traversal.Order;
-import org.apache.tinkerpop.gremlin.process.traversal.P;
-import org.apache.tinkerpop.gremlin.process.traversal.Pick;
-import org.apache.tinkerpop.gremlin.process.traversal.Pop;
-import org.apache.tinkerpop.gremlin.process.traversal.SackFunctions;
-import org.apache.tinkerpop.gremlin.process.traversal.Scope;
-import org.apache.tinkerpop.gremlin.process.traversal.TextP;
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.BulkSet;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.TraversalStrategyProxy;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SubgraphStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalMetrics;
-import org.apache.tinkerpop.gremlin.process.traversal.util.Metrics;
import org.apache.tinkerpop.gremlin.process.traversal.util.MutableMetrics;
-import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics;
-import org.apache.tinkerpop.gremlin.structure.Column;
import org.apache.tinkerpop.gremlin.structure.Direction;
import org.apache.tinkerpop.gremlin.structure.Graph;
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.structure.io.IoTest;
import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceEdge;
import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceProperty;
import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceVertex;
import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceVertexProperty;
import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
-import org.apache.tinkerpop.gremlin.util.function.Lambda;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import java.math.BigDecimal;
import java.math.BigInteger;
-import java.net.InetAddress;
import java.nio.ByteBuffer;
-import java.sql.Timestamp;
-import java.text.DateFormat;
import java.time.Duration;
-import java.time.Instant;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.MonthDay;
-import java.time.OffsetDateTime;
-import java.time.OffsetTime;
-import java.time.Period;
-import java.time.Year;
-import java.time.YearMonth;
-import java.time.ZoneOffset;
-import java.time.ZonedDateTime;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.LinkedHashMap;
import java.util.List;
-import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
@@ -90,7 +55,6 @@
import java.util.function.Consumer;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.hasLabel;
-import static org.apache.tinkerpop.gremlin.util.MockitoHamcrestMatcherAdapter.reflectionEquals;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertEquals;
@@ -100,11 +64,6 @@
protected static final GraphTraversalSource g = TinkerFactory.createModern().traversal();
@Parameterized.Parameters(name = "Type{0}")
public static Collection input() throws Exception {
- final Bytecode bytecode = new Bytecode();
- bytecode.addStep("V");
- bytecode.addStep("tail", 3);
- bytecode.addSource(TraversalSource.Symbols.withComputer, "myComputer");
-
final Map<String, Integer> map = new HashMap<>();
map.put("one", 1);
map.put("two", 2);
@@ -112,6 +71,10 @@
final Map<String, Map<String, Integer>> nestedMap = new HashMap<>();
nestedMap.put("first", map);
+ final Map<String, Integer> orderedMap = new LinkedHashMap<>();
+ map.put("one", 1);
+ map.put("two", 2);
+
final List<Object> list = new ArrayList<>();
list.add("string 1");
list.add("string 1");
@@ -161,7 +124,8 @@
return Arrays.asList(
new Object[] {"String", "ABC", null},
- new Object[] {"Char", '£', null},
+ // todo: add tests for non-ASCII chars
+ new Object[] {"Char", '$', null},
// numerics
new Object[] {"Byte", 1, null},
@@ -183,58 +147,14 @@
new Object[] {"BigDecimalNeg", new BigDecimal("-1234567890987654321.1232132"), null},
// date+time
- new Object[] {"Date", DateFormat.getDateInstance(DateFormat.MEDIUM, Locale.US).parse("Jan 12, 1952"), null},
- new Object[] {"Timestamp", Timestamp.valueOf("2016-01-15 12:01:02"), null},
new Object[] {"Duration", Duration.ofSeconds(213123213, 400), null},
- new Object[] {"Instant", Instant.ofEpochSecond(213123213, 400), null},
- new Object[] {"LocalDate", LocalDate.of(2016, 10, 21), null},
- new Object[] {"LocalTime", LocalTime.of(12, 20, 30, 300), null},
- new Object[] {"LocalDateTime", LocalDateTime.of(2016, 10, 21, 12, 20, 30, 300), null},
- new Object[] {"MonthDay", MonthDay.of(12, 28), null},
- new Object[] {"OffsetDateTime", OffsetDateTime.of(2017, 11, 15, 12, 30, 45, 300, ZoneOffset.ofTotalSeconds(400)), null},
- new Object[] {"OffsetTime", OffsetTime.of(12, 30, 45, 300, ZoneOffset.ofTotalSeconds(400)), null},
- new Object[] {"Period", Period.of(1, 6, 15), null},
- new Object[] {"Year", Year.of(1996), null},
- new Object[] {"YearMonth", YearMonth.of(2016, 11), null},
- new Object[] {"ZonedDateTime", ZonedDateTime.of(2016, 11, 15, 12, 30, 45, 300, ZoneOffset.ofTotalSeconds(200)), null},
- new Object[] {"ZoneOffset", ZoneOffset.ofTotalSeconds(100), null},
new Object[] {"UUID", UUID.randomUUID(), null},
- new Object[] {"Bytecode", bytecode, null},
- new Object[] {"Binding", new Bytecode.Binding<>("x", 123), null},
- new Object[] {"Traverser", new DefaultRemoteTraverser<>("marko", 100), null},
- new Object[] {"Class", Bytecode.class, null},
new Object[] {"ByteBuffer", ByteBuffer.wrap(new byte[]{ 1, 2, 3 }), null},
- new Object[] {"InetAddressV4", InetAddress.getByName("localhost"), null},
- new Object[] {"InetAddressV6", InetAddress.getByName("::1"), null},
- new Object[] {"Lambda0", Lambda.supplier("return 1"), null},
- new Object[] {"Lambda1", Lambda.consumer("it"), null},
- new Object[] {"Lambda2", Lambda.biFunction("x,y -> x + y"), null},
- new Object[] {"LambdaN", new Lambda.UnknownArgLambda("x,y,z -> x + y + z", "gremlin-groovy", 3), null},
// enums
- new Object[] {"Barrier", SackFunctions.Barrier.normSack, null},
- new Object[] {"Cardinality", VertexProperty.Cardinality.list, null},
- new Object[] {"Columns", Column.values, null},
new Object[] {"Direction", Direction.BOTH, null},
- new Object[] {"Operator", Operator.sum, null},
- new Object[] {"Operator", Operator.div, null},
- new Object[] {"Order", Order.desc, null},
- new Object[] {"Pick", Pick.any, null},
- new Object[] {"Pop", Pop.mixed, null},
- new Object[] {"Scope", Scope.global, null},
new Object[] {"T", T.label, null},
- new Object[] {"Pgt", P.gt(0), null},
- new Object[] {"Pgte", P.gte(0), null},
- new Object[] {"Pbetween", P.between(0,1), null},
- new Object[] {"Pand", P.gt(1).and(P.lt(2)), null},
- new Object[] {"Por", P.gt(1).or(P.lt(2)), null},
- new Object[] {"Pnot", P.not(P.lte(1)), null},
- new Object[] {"Pwithout", P.without(1,2,3,4,null), null},
- new Object[] {"Pinside", P.inside(0.0d, 0.6d), null},
- new Object[] {"TextPstartingWith", TextP.startingWith("mark"), null},
- new Object[] {"TextPregex", TextP.regex("^meh"), null},
- new Object[] {"TextPnotRegex", TextP.notRegex("^meh"), null},
// graph
new Object[] {"ReferenceEdge", new ReferenceEdge(123, "person", new ReferenceVertex(123, "person"), new ReferenceVertex(321, "person")), null},
@@ -255,37 +175,19 @@
new Object[] {"Graph", g.E().subgraph("k").cap("k").next(), (Consumer<Graph>) graph -> {
IoTest.assertModernGraph(graph, true, false);
}},
- new Object[] {"TraversalStrategyVertexProgram", new VertexProgramStrategy(Computer.compute()), (Consumer<TraversalStrategyProxy>) strategy -> {
- assertEquals(VertexProgramStrategy.class, strategy.getStrategyClass());
- assertEquals("org.apache.tinkerpop.gremlin.process.computer.GraphComputer", strategy.getConfiguration().getProperty(VertexProgramStrategy.GRAPH_COMPUTER));
+ new Object[] {"BulkList", bulkSet, (Consumer<List>) bulklist -> {
+ List bulkSetExpanded = new ArrayList<>();
+ bulkSet.spliterator().forEachRemaining(bulkSetExpanded::add);
+ assertEquals(bulkSetExpanded, bulklist);
}},
- new Object[] {"TraversalStrategySubgraph", SubgraphStrategy.build().vertices(hasLabel("person")).create(), (Consumer<TraversalStrategyProxy>) strategy -> {
- assertEquals(SubgraphStrategy.class, strategy.getStrategyClass());
- assertEquals(hasLabel("person").asAdmin().getBytecode(), strategy.getConfiguration().getProperty(SubgraphStrategy.VERTICES));
- }},
- new Object[] {"BulkSet", bulkSet, null},
new Object[] {"Tree", tree, null},
- new Object[] {"EmptyMetrics", new MutableMetrics("idEmpty", "nameEmpty"), (Consumer<Metrics>) m -> {
- assertThat(m, reflectionEquals(new MutableMetrics("idEmpty", "nameEmpty")));
- }},
- new Object[] {"Metrics", metrics, (Consumer<Metrics>) m -> {
- assertThat(m, reflectionEquals(metrics, "nested", "counts"));
- assertEquals(new ArrayList(metrics.getCounts().values()), new ArrayList(m.getCounts().values()));
- assertThat(m.getNested(), reflectionEquals(metrics.getNested()));
- }},
- new Object[] {"EmptyTraversalMetrics", emptyTraversalMetrics, (Consumer<TraversalMetrics>) m -> {
- assertThat(m, reflectionEquals(emptyTraversalMetrics));
- }},
- new Object[] {"TraversalMetrics", traversalMetrics, (Consumer<TraversalMetrics>) m -> {
- assertEquals(m.toString(), traversalMetrics.toString());
- assertThat(m, reflectionEquals(traversalMetrics, "stepIndexedMetrics", "positionIndexedMetrics"));
- }},
// collections
new Object[] {"ListSingle", list, null},
new Object[] {"ListNested", nestedList, null},
new Object[] {"Map", map, null},
- new Object[] {"Map", nestedMap, null},
+ new Object[] {"MapNested", nestedMap, null},
+ new Object[] {"OrderedMap", orderedMap, null},
new Object[] {"Set", set, null},
new Object[] {"SetNested", nestedSet, null});
}
diff --git a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONMessageSerializerV1Test.java b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONMessageSerializerV1Test.java
deleted file mode 100644
index c43ba24..0000000
--- a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONMessageSerializerV1Test.java
+++ /dev/null
@@ -1,335 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.util.ser;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufAllocator;
-import io.netty.buffer.UnpooledByteBufAllocator;
-import org.apache.tinkerpop.gremlin.util.MessageSerializer;
-import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.Property;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
-import org.apache.tinkerpop.shaded.jackson.databind.util.StdDateFormat;
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
-
-/**
- * Serializer tests that cover lossy serialization/deserialization methods.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class GraphSONMessageSerializerV1Test {
-
- private UUID requestId = UUID.fromString("6457272A-4018-4538-B9AE-08DD5DDC0AA1");
- private ResponseMessage.Builder responseMessageBuilder = ResponseMessage.build(requestId);
- private static ByteBufAllocator allocator = UnpooledByteBufAllocator.DEFAULT;
-
- public MessageSerializer<ObjectMapper> serializer = new GraphSONMessageSerializerV1();
-
- @Test
- public void shouldSerializeIterable() throws Exception {
- final ArrayList<Integer> list = new ArrayList<>();
- list.add(1);
- list.add(100);
-
- final ResponseMessage response = convert(list);
- assertCommon(response);
-
- final List<Integer> deserializedFunList = (List<Integer>) response.getResult().getData();
- assertEquals(2, deserializedFunList.size());
- assertEquals(new Integer(1), deserializedFunList.get(0));
- assertEquals(new Integer(100), deserializedFunList.get(1));
- }
-
- @Test
- public void shouldSerializeIterableWithNull() throws Exception {
- final ArrayList<Integer> list = new ArrayList<>();
- list.add(1);
- list.add(null);
- list.add(100);
-
- final ResponseMessage response = convert(list);
- assertCommon(response);
-
- final List<Integer> deserializedFunList = (List<Integer>) response.getResult().getData();
- assertEquals(3, deserializedFunList.size());
- assertEquals(new Integer(1), deserializedFunList.get(0));
- assertNull(deserializedFunList.get(1));
- assertEquals(new Integer(100), deserializedFunList.get(2));
- }
-
- @Test
- public void shouldSerializeMap() throws Exception {
- final Map<String, Object> map = new HashMap<>();
- final Map<String, String> innerMap = new HashMap<>();
- innerMap.put("a", "b");
-
- map.put("x", 1);
- map.put("y", "some");
- map.put("z", innerMap);
-
- final ResponseMessage response = convert(map);
- assertCommon(response);
-
- final Map<String, Object> deserializedMap = (Map<String, Object>) response.getResult().getData();
- assertEquals(3, deserializedMap.size());
- assertEquals(1, deserializedMap.get("x"));
- assertEquals("some", deserializedMap.get("y"));
-
- final Map<String, String> deserializedInnerMap = (Map<String, String>) deserializedMap.get("z");
- assertEquals(1, deserializedInnerMap.size());
- assertEquals("b", deserializedInnerMap.get("a"));
- }
-
- @Test
- public void shouldSerializeMapEntries() throws Exception {
- final Graph graph = TinkerGraph.open();
- final Vertex v1 = graph.addVertex();
- final Date d = new Date();
-
- final Map<Object, Object> map = new HashMap<>();
- map.put("x", 1);
- map.put(v1, 100);
- map.put(d, "test");
-
- final ResponseMessage response = convert(IteratorUtils.asList(map.entrySet()));
- assertCommon(response);
-
- final List<Map<String, Object>> deserializedEntries = (List<Map<String, Object>>) response.getResult().getData();
- assertEquals(3, deserializedEntries.size());
- deserializedEntries.forEach(e -> {
- if (e.containsKey("x"))
- assertEquals(1, e.get("x"));
- else if (e.containsKey(v1.id().toString()))
- assertEquals(100, e.get(v1.id().toString()));
- else if (e.containsKey(StdDateFormat.instance.format(d)))
- assertEquals("test", e.get(StdDateFormat.instance.format(d)));
- else
- fail("Map entries contains a key that is not part of what was serialized");
- });
- }
-
- @Test
- public void shouldSerializeEdge() throws Exception {
- final Graph graph = TinkerGraph.open();
- final Vertex v1 = graph.addVertex();
- final Vertex v2 = graph.addVertex();
- final Edge e = v1.addEdge("test", v2);
- e.property("abc", 123);
-
- final Iterable<Edge> iterable = IteratorUtils.list(graph.edges());
-
- final ResponseMessage response = convert(iterable);
- assertCommon(response);
-
- final List<Map<String, Object>> edgeList = (List<Map<String, Object>>) response.getResult().getData();
- assertEquals(1, edgeList.size());
-
- final Map<String, Object> deserializedEdge = edgeList.get(0);
- assertEquals(e.id(), deserializedEdge.get(GraphSONTokens.ID));
- assertEquals(v1.id(), deserializedEdge.get(GraphSONTokens.OUT));
- assertEquals(v2.id(), deserializedEdge.get(GraphSONTokens.IN));
- assertEquals(v1.label(), deserializedEdge.get(GraphSONTokens.OUT_LABEL));
- assertEquals(v2.label(), deserializedEdge.get(GraphSONTokens.IN_LABEL));
- assertEquals(e.label(), deserializedEdge.get(GraphSONTokens.LABEL));
- assertEquals(GraphSONTokens.EDGE, deserializedEdge.get(GraphSONTokens.TYPE));
-
- final Map<String, Object> properties = (Map<String, Object>) deserializedEdge.get(GraphSONTokens.PROPERTIES);
- assertNotNull(properties);
- assertEquals(123, properties.get("abc"));
-
- }
-
- @Test
- public void shouldSerializeEdgeProperty() throws Exception {
- final Graph graph = TinkerGraph.open();
- final Vertex v1 = graph.addVertex();
- final Vertex v2 = graph.addVertex();
- final Edge e = v1.addEdge("test", v2);
- e.property("abc", 123);
-
- final Iterable<Property<Object>> iterable = IteratorUtils.list(e.properties("abc"));
- final ResponseMessage response = convert(iterable);
- assertCommon(response);
-
- final List<Map<String, Object>> propertyList = (List<Map<String, Object>>) response.getResult().getData();
- assertEquals(1, propertyList.size());
- assertEquals(123, propertyList.get(0).get("value"));
- }
-
- @Test
- public void shouldSerializeVertexWithEmbeddedMap() throws Exception {
- final Graph graph = TinkerGraph.open();
- final Vertex v = graph.addVertex();
- final Map<String, Object> map = new HashMap<>();
- map.put("x", 500);
- map.put("y", "some");
-
- final ArrayList<Object> friends = new ArrayList<>();
- friends.add("x");
- friends.add(5);
- friends.add(map);
-
- v.property(VertexProperty.Cardinality.single, "friends", friends);
-
- final List list = IteratorUtils.list(graph.vertices());
-
- final ResponseMessage response = convert(list);
- assertCommon(response);
-
- final List<Map<String, Object>> vertexList = (List<Map<String, Object>>) response.getResult().getData();
- assertEquals(1, vertexList.size());
-
- final Map<String, Object> deserializedVertex = vertexList.get(0);
- assertEquals(v.id(), deserializedVertex.get(GraphSONTokens.ID));
- assertEquals(Vertex.DEFAULT_LABEL, deserializedVertex.get(GraphSONTokens.LABEL));
-
- final Map<String, Object> properties = ((Map<String, Object>) deserializedVertex.get(GraphSONTokens.PROPERTIES));
- assertEquals(1, properties.size());
-
- final List<Map<String,Object>> friendsProperties = (List<Map<String,Object>>) properties.get("friends");
- assertEquals(1, friendsProperties.size());
-
- final List<Object> deserializedInnerList = (List<Object>) friendsProperties.get(0).get(GraphSONTokens.VALUE);
- assertEquals(3, deserializedInnerList.size());
- assertEquals("x", deserializedInnerList.get(0));
- assertEquals(5, deserializedInnerList.get(1));
-
- final Map<String, Object> deserializedInnerInnerMap = (Map<String, Object>) deserializedInnerList.get(2);
- assertEquals(2, deserializedInnerInnerMap.size());
- assertEquals(500, deserializedInnerInnerMap.get("x"));
- assertEquals("some", deserializedInnerInnerMap.get("y"));
- }
-
- @Test
- public void shouldSerializeToJsonMapWithElementForKey() throws Exception {
- final TinkerGraph graph = TinkerFactory.createClassic();
- final GraphTraversalSource g = graph.traversal();
- final Map<Vertex, Integer> map = new HashMap<>();
- map.put(g.V().has("name", "marko").next(), 1000);
-
- final ResponseMessage response = convert(map);
- assertCommon(response);
-
- final Map<String, Integer> deserializedMap = (Map<String, Integer>) response.getResult().getData();
- assertEquals(1, deserializedMap.size());
-
- // with no embedded types the key (which is a vertex) simply serializes out to an id
- // {"result":{"1":1000},"code":200,"requestId":"2d62161b-9544-4f39-af44-62ec49f9a595","type":0}
- assertEquals(new Integer(1000), deserializedMap.get("1"));
- }
-
- @Test
- public void shouldSerializeToTreeJson() throws Exception {
- final TinkerGraph graph = TinkerFactory.createClassic();
- final GraphTraversalSource g = graph.traversal();
- final Map t = g.V(1).out().properties("name").tree().next();
-
- final ResponseMessage response = convert(t);
- assertCommon(response);
-
- final Map<String, Map<String, Map>> deserializedMap = (Map<String, Map<String, Map>>) response.getResult().getData();
-
- assertEquals(1, deserializedMap.size());
-
- //check the first object and it's properties
- final Map<String,Object> vertex = deserializedMap.get("1").get("key");
- final Map<String,List<Map>> vertexProperties = (Map<String, List<Map>>)vertex.get("properties");
- assertEquals(1, (int)vertex.get("id"));
- assertEquals("marko", vertexProperties.get("name").get(0).get("value"));
-
- //check objects tree structure
- //check Vertex property
- final Map<String, Map<String, Map>> subTreeMap = deserializedMap.get("1").get("value");
- final Map<String, Map<String, Map>> subTreeMap2 = subTreeMap.get("2").get("value");
- final Map<String, String> vertexPropertiesDeep = subTreeMap2.get("2").get("key");
- assertEquals("vadas", vertexPropertiesDeep.get("value"));
- assertEquals("name", vertexPropertiesDeep.get("label"));
-
- // check subitem
- final Map<String,Object> vertex2 = subTreeMap.get("3").get("key");
- final Map<String,List<Map>> vertexProperties2 = (Map<String, List<Map>>)vertex2.get("properties");
-
- assertEquals("lop", vertexProperties2.get("name").get(0).get("value"));
- }
-
- @Test
- public void shouldSerializeFullResponseMessage() throws Exception {
- final UUID id = UUID.randomUUID();
-
- final Map<String, Object> metaData = new HashMap<>();
- metaData.put("test", "this");
- metaData.put("one", 1);
-
- final Map<String, Object> attributes = new HashMap<>();
- attributes.put("test", "that");
- attributes.put("two", 2);
-
- final ResponseMessage response = ResponseMessage.build(id)
- .responseMetaData(metaData)
- .code(ResponseStatusCode.SUCCESS)
- .result("some-result")
- .statusAttributes(attributes)
- .statusMessage("worked")
- .create();
-
- final ByteBuf bb = serializer.serializeResponseAsBinary(response, allocator);
- final ResponseMessage deserialized = serializer.deserializeResponse(bb);
-
- assertEquals(id, deserialized.getRequestId());
- assertEquals("this", deserialized.getResult().getMeta().get("test"));
- assertEquals(1, deserialized.getResult().getMeta().get("one"));
- assertEquals("some-result", deserialized.getResult().getData());
- assertEquals("that", deserialized.getStatus().getAttributes().get("test"));
- assertEquals(2, deserialized.getStatus().getAttributes().get("two"));
- assertEquals(ResponseStatusCode.SUCCESS.getValue(), deserialized.getStatus().getCode().getValue());
- assertEquals("worked", deserialized.getStatus().getMessage());
- }
-
- private void assertCommon(final ResponseMessage response) {
- assertEquals(requestId, response.getRequestId());
- assertEquals(ResponseStatusCode.SUCCESS, response.getStatus().getCode());
- }
-
- private ResponseMessage convert(final Object toSerialize) throws SerializationException {
- final ByteBuf bb = serializer.serializeResponseAsBinary(responseMessageBuilder.result(toSerialize).create(), allocator);
- return serializer.deserializeResponse(bb);
- }
-}
diff --git a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONMessageSerializerV2Test.java b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONMessageSerializerV2Test.java
deleted file mode 100644
index 54ce7cd..0000000
--- a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONMessageSerializerV2Test.java
+++ /dev/null
@@ -1,628 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.util.ser;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufAllocator;
-import io.netty.buffer.UnpooledByteBufAllocator;
-import org.apache.tinkerpop.gremlin.util.MessageSerializer;
-import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.Property;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.apache.tinkerpop.gremlin.structure.io.AbstractIoRegistry;
-import org.apache.tinkerpop.gremlin.structure.io.GraphWriter;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONIo;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONVersion;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONWriter;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONXModuleV2;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.TinkerPopJacksonModule;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.apache.tinkerpop.shaded.jackson.core.JsonGenerationException;
-import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
-import org.apache.tinkerpop.shaded.jackson.databind.JsonMappingException;
-import org.apache.tinkerpop.shaded.jackson.databind.JsonNode;
-import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
-import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
-import org.apache.tinkerpop.shaded.jackson.databind.node.NullNode;
-import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdScalarSerializer;
-import org.apache.tinkerpop.shaded.jackson.databind.util.StdDateFormat;
-import org.junit.Test;
-
-import java.awt.Color;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-/**
- * These tests focus on message serialization and not "result" serialization as test specific to results (e.g.
- * vertices, edges, annotated values, etc.) are handled in the IO packages.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-@SuppressWarnings("unchecked")
-public class GraphSONMessageSerializerV2Test {
-
- public static final GraphSONMessageSerializerV2 SERIALIZER = new GraphSONMessageSerializerV2();
- private static final RequestMessage msg = RequestMessage.build("op")
- .overrideRequestId(UUID.fromString("2D62161B-9544-4F39-AF44-62EC49F9A595")).create();
- private static final ObjectMapper mapper = new ObjectMapper();
-
- private final UUID requestId = UUID.fromString("6457272A-4018-4538-B9AE-08DD5DDC0AA1");
- private final ResponseMessage.Builder responseMessageBuilder = ResponseMessage.build(requestId);
- private final static ByteBufAllocator allocator = UnpooledByteBufAllocator.DEFAULT;
-
- @Test
- public void shouldConfigureIoRegistry() throws Exception {
- final GraphSONMessageSerializerV2 serializer = new GraphSONMessageSerializerV2();
- final Map<String, Object> config = new HashMap<String, Object>() {{
- put(AbstractMessageSerializer.TOKEN_IO_REGISTRIES, Arrays.asList(ColorIoRegistry.class.getName()));
- }};
-
- serializer.configure(config, null);
-
- final ResponseMessage toSerialize = ResponseMessage.build(UUID.fromString("2D62161B-9544-4F39-AF44-62EC49F9A595"))
- .result(Color.RED).create();
- final String results = serializer.serializeResponseAsString(toSerialize, allocator);
- final JsonNode json = mapper.readTree(results);
- assertNotNull(json);
- assertThat(json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA).get(GraphSONTokens.VALUEPROP).booleanValue(), is(true));
- assertEquals("java:color", json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA).get(GraphSONTokens.VALUETYPE).textValue());
- }
-
- @Test
- public void shouldSerializeToJsonNullResultReturnsNull() throws Exception {
- final ResponseMessage message = ResponseMessage.build(msg).create();
- final String results = SERIALIZER.serializeResponseAsString(message, allocator);
- final JsonNode json = mapper.readTree(results);
- assertNotNull(json);
- assertEquals(msg.getRequestId().toString(), json.path(SerTokens.TOKEN_REQUEST).asText());
- assertEquals(NullNode.getInstance(), json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA));
- }
-
- @Test
- public void shouldSerializeToJsonIterable() throws Exception {
- final ArrayList<FunObject> funList = new ArrayList<>();
- funList.add(new FunObject("x"));
- funList.add(new FunObject("y"));
-
- final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(funList).create(), allocator);
- final JsonNode json = mapper.readTree(results);
-
- assertNotNull(json);
- assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
- final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
-
- assertEquals(2, converted.size());
-
- assertEquals("x", converted.get(0).asText());
- assertEquals("y", converted.get(1).asText());
- }
-
- @Test
- public void shouldSerializeToJsonIterator() throws Exception {
- final ArrayList<FunObject> funList = new ArrayList<>();
- funList.add(new FunObject("x"));
- funList.add(new FunObject("y"));
-
- final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(funList).create(), allocator);
- final JsonNode json = mapper.readTree(results);
-
- assertNotNull(json);
- assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
- final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
-
- assertEquals(2, converted.size());
-
- assertEquals("x", converted.get(0).asText());
- assertEquals("y", converted.get(1).asText());
- }
-
- @Test
- public void shouldSerializeToJsonIteratorNullElement() throws Exception {
-
- final ArrayList<FunObject> funList = new ArrayList<>();
- funList.add(new FunObject("x"));
- funList.add(null);
- funList.add(new FunObject("y"));
-
- final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(funList.iterator()).create(), allocator);
- final JsonNode json = mapper.readTree(results);
-
- assertNotNull(json);
- assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
- final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
-
- assertEquals(3, converted.size());
-
- assertEquals("x", converted.get(0).asText());
- assertEquals(NullNode.getInstance(), converted.get(1));
- assertEquals("y", converted.get(2).asText());
- }
-
- @Test
- public void shouldSerializeToJsonMap() throws Exception {
- final Map<String, Object> map = new HashMap<>();
- final Map<String, String> innerMap = new HashMap<>();
- innerMap.put("a", "b");
-
- map.put("x", new FunObject("x"));
- map.put("y", "some");
- map.put("z", innerMap);
-
- final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(map).create(), allocator);
- final JsonNode json = mapper.readTree(results);
-
- assertNotNull(json);
- assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
- final JsonNode jsonObject = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
-
- assertNotNull(jsonObject);
- assertEquals("some", jsonObject.get("y").asText());
- assertEquals("x", jsonObject.get("x").asText());
-
- final JsonNode innerJsonObject = jsonObject.get("z");
- assertNotNull(innerJsonObject);
- assertEquals("b", innerJsonObject.get("a").asText());
- }
-
- @Test
- public void shouldShouldSerializeMapEntries() throws Exception {
- final Graph graph = TinkerGraph.open();
- final Vertex v1 = graph.addVertex();
- final Date d = new Date();
-
- final Map<Object, Object> map = new HashMap<>();
- map.put("x", 1);
- map.put(v1, 100);
- map.put(d, "test");
-
- final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(IteratorUtils.asList(map)).create(), allocator);
- final JsonNode json = mapper.readTree(results);
-
- assertNotNull(json);
- assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
- final JsonNode jsonObject = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
- jsonObject.elements().forEachRemaining(e -> {
- if (e.has("x"))
- assertEquals(1, e.get("x").get(GraphSONTokens.VALUEPROP).asInt());
- else if (e.has(v1.id().toString()))
- assertEquals(100, e.get(v1.id().toString()).get(GraphSONTokens.VALUEPROP).asInt());
- else if (e.has(StdDateFormat.instance.format(d)))
- assertEquals("test", e.get(StdDateFormat.instance.format(d)).asText());
- else
- fail("Map entries contains a key that is not part of what was serialized");
- });
- }
-
- @Test
- public void shouldSerializeEdge() throws Exception {
- final Graph g = TinkerGraph.open();
- final Vertex v1 = g.addVertex();
- final Vertex v2 = g.addVertex();
- final Edge e = v1.addEdge("test", v2);
- e.property("abc", 123);
-
- final Iterable<Edge> iterable = IteratorUtils.list(g.edges());
- final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(iterable).create(), allocator);
-
- final JsonNode json = mapper.readTree(results);
-
- assertNotNull(json);
- assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
- final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
-
- assertNotNull(converted);
- assertEquals(1, converted.size());
-
- final JsonNode edgeAsJson = converted.get(0).get(GraphSONTokens.VALUEPROP);
- assertNotNull(edgeAsJson);
-
- assertEquals(((Long) e.id()).longValue(), edgeAsJson.get(GraphSONTokens.ID).get(GraphSONTokens.VALUEPROP).asLong());
- assertEquals(((Long) v1.id()).longValue(), edgeAsJson.get(GraphSONTokens.OUT).get(GraphSONTokens.VALUEPROP).asLong());
- assertEquals(((Long) v2.id()).longValue(), edgeAsJson.get(GraphSONTokens.IN).get(GraphSONTokens.VALUEPROP).asLong());
- assertEquals(e.label(), edgeAsJson.get(GraphSONTokens.LABEL).asText());
-
- final JsonNode properties = edgeAsJson.get(GraphSONTokens.PROPERTIES);
- assertNotNull(properties);
- assertEquals(123, properties.get("abc").get(GraphSONTokens.VALUEPROP).get("value").get(GraphSONTokens.VALUEPROP).asInt());
- }
-
- @Test
- public void shouldSerializeEdgeProperty() throws Exception {
- final Graph g = TinkerGraph.open();
- final Vertex v1 = g.addVertex();
- final Vertex v2 = g.addVertex();
- final Edge e = v1.addEdge("test", v2);
- e.property("abc", 123);
-
- final Iterable<Property<Object>> iterable = IteratorUtils.list(e.properties("abc"));
- final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(iterable).create(), allocator);
-
- final JsonNode json = mapper.readTree(results);
-
- assertNotNull(json);
- assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
- final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
-
- assertNotNull(converted);
- assertEquals(1, converted.size());
-
- final JsonNode propertyAsJson = converted.get(0);
- assertNotNull(propertyAsJson);
-
- assertEquals(123, propertyAsJson.get(GraphSONTokens.VALUEPROP).get("value").get(GraphSONTokens.VALUEPROP).asInt());
- }
-
- @Test
- public void shouldSerializeToJsonIteratorWithEmbeddedMap() throws Exception {
- final Graph g = TinkerGraph.open();
- final Vertex v = g.addVertex();
- final Map<String, Object> map = new HashMap<>();
- map.put("x", 500);
- map.put("y", "some");
-
- final ArrayList<Object> friends = new ArrayList<>();
- friends.add("x");
- friends.add(5);
- friends.add(map);
-
- v.property(VertexProperty.Cardinality.single, "friends", friends);
-
- final Iterable iterable = IteratorUtils.list(g.vertices());
- final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(iterable).create(), allocator);
- final JsonNode json = mapper.readTree(results);
-
- assertNotNull(json);
- assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
- final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
-
- assertNotNull(converted);
- assertEquals(1, converted.size());
-
- final JsonNode vertexAsJson = converted.get(0).get(GraphSONTokens.VALUEPROP);
- assertNotNull(vertexAsJson);
-
- final JsonNode properties = vertexAsJson.get(GraphSONTokens.PROPERTIES);
- assertNotNull(properties);
- assertEquals(1, properties.size());
-
- final JsonNode friendProperties = properties.get("friends");
- assertEquals(1, friendProperties.size());
- final JsonNode friendsProperty = friendProperties.get(0).get(GraphSONTokens.VALUEPROP).get(GraphSONTokens.VALUE);
- assertNotNull(friendsProperty);
- assertEquals(3, friendsProperty.size());
-
- final String object1 = friendsProperty.get(0).asText();
- assertEquals("x", object1);
-
- final int object2 = friendsProperty.get(1).get(GraphSONTokens.VALUEPROP).asInt();
- assertEquals(5, object2);
-
- final JsonNode object3 = friendsProperty.get(2);
- assertEquals(500, object3.get("x").get(GraphSONTokens.VALUEPROP).asInt());
- assertEquals("some", object3.get("y").asText());
- }
-
- @Test
- public void shouldSerializeToJsonMapWithElementForKey() throws Exception {
- final TinkerGraph graph = TinkerFactory.createClassic();
- final GraphTraversalSource g = graph.traversal();
- final Map<Vertex, Integer> map = new HashMap<>();
- map.put(g.V().has("name", "marko").next(), 1000);
-
- final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(map).create(), allocator);
- final JsonNode json = mapper.readTree(results);
-
- assertNotNull(json);
- assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
- final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
-
- assertNotNull(converted);
-
- // with no embedded types the key (which is a vertex) simply serializes out to an id
- // {"result":{"1":1000},"code":200,"requestId":"2d62161b-9544-4f39-af44-62ec49f9a595","type":0}
- assertEquals(1000, converted.get("1").get(GraphSONTokens.VALUEPROP).asInt());
- }
-
- @Test
- public void shouldDeserializeRequestNicelyWithNoArgs() throws Exception {
- final UUID request = UUID.fromString("011CFEE9-F640-4844-AC93-034448AC0E80");
- final RequestMessage m = SERIALIZER.deserializeRequest(String.format("{\"requestId\":\"%s\",\"op\":\"eval\"}", request));
- assertEquals(request, m.getRequestId());
- assertEquals("eval", m.getOp());
- assertNotNull(m.getArgs());
- assertEquals(0, m.getArgs().size());
- }
-
- @Test
- public void shouldDeserializeRequestNicelyWithArgs() throws Exception {
- final UUID request = UUID.fromString("011CFEE9-F640-4844-AC93-034448AC0E80");
- final RequestMessage m = SERIALIZER.deserializeRequest(String.format("{\"requestId\":\"%s\",\"op\":\"eval\",\"args\":{\"x\":\"y\"}}", request));
- assertEquals(request, m.getRequestId());
- assertEquals("eval", m.getOp());
- assertNotNull(m.getArgs());
- assertEquals("y", m.getArgs().get("x"));
- }
-
- @Test(expected = SerializationException.class)
- public void shouldDeserializeRequestParseMessage() throws Exception {
- SERIALIZER.deserializeRequest("{\"requestId\":\"%s\",\"op\":\"eval\",\"args\":{\"x\":\"y\"}}");
- }
-
- @Test
- public void shouldSerializeFullResponseMessage() throws Exception {
- final UUID id = UUID.randomUUID();
-
- final Map<String, Object> metaData = new HashMap<>();
- metaData.put("test", "this");
- metaData.put("one", 1);
-
- final Map<String, Object> attributes = new HashMap<>();
- attributes.put("test", "that");
- attributes.put("two", 2);
-
- final ResponseMessage response = ResponseMessage.build(id)
- .responseMetaData(metaData)
- .code(ResponseStatusCode.SUCCESS)
- .result("some-result")
- .statusAttributes(attributes)
- .statusMessage("worked")
- .create();
-
- final String results = SERIALIZER.serializeResponseAsString(response, allocator);
- final ResponseMessage deserialized = SERIALIZER.deserializeResponse(results);
-
- assertEquals(id, deserialized.getRequestId());
- assertEquals("this", deserialized.getResult().getMeta().get("test"));
- assertEquals(1, deserialized.getResult().getMeta().get("one"));
- assertEquals("some-result", deserialized.getResult().getData());
- assertEquals("that", deserialized.getStatus().getAttributes().get("test"));
- assertEquals(2, deserialized.getStatus().getAttributes().get("two"));
- assertEquals(ResponseStatusCode.SUCCESS.getValue(), deserialized.getStatus().getCode().getValue());
- assertEquals("worked", deserialized.getStatus().getMessage());
- }
-
- @Test
- public void shouldSerializeToTreeJson() throws Exception {
- final TinkerGraph graph = TinkerFactory.createClassic();
- final GraphTraversalSource g = graph.traversal();
- final Tree t = g.V(1).out().properties("name").tree().next();
-
- final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(t).create(), allocator);
-
- final JsonNode json = mapper.readTree(results);
-
- assertNotNull(json);
- assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
- final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
- assertNotNull(converted);
-
- //result is: tree{v1=>tree{vp['name'->'vadas']=>null, vp['name'->'lop']=>null, vp['name'->'josh']=>null}}
-
- //check the first object and it's properties
- assertEquals(1, converted.get(GraphSONTokens.VALUEPROP)
- .get(0)
- .get(GraphSONTokens.KEY).get(GraphSONTokens.VALUEPROP)
- .get(GraphSONTokens.ID).get(GraphSONTokens.VALUEPROP).asInt());
-
- assertEquals("marko", converted.get(GraphSONTokens.VALUEPROP)
- .get(0)
- .get(GraphSONTokens.KEY).get(GraphSONTokens.VALUEPROP)
- .get(GraphSONTokens.PROPERTIES)
- .get("name")
- .get(0)
- .get(GraphSONTokens.VALUEPROP).get(GraphSONTokens.VALUE).asText());
-
- //check the leafs
- Set expectedValues = new HashSet<String>() {{
- add("vadas");
- add("lop");
- add("josh");
- }};
-
- Set actualValues = new HashSet<String>();
- for (int i = 0; i < 3; i++) {
- actualValues.add(converted.get(GraphSONTokens.VALUEPROP)
- .get(0)
- .get(GraphSONTokens.VALUE).get(GraphSONTokens.VALUEPROP)
- .get(i)
- .get(GraphSONTokens.KEY).get(GraphSONTokens.VALUEPROP)
- .get(GraphSONTokens.PROPERTIES)
- .get("name")
- .get(0)
- .get(GraphSONTokens.VALUEPROP).get(GraphSONTokens.VALUE).asText());
- }
-
- assertEquals(expectedValues, actualValues);
- }
-
- @Test
- public void shouldToStringUnknownObjects() {
- GraphSONMapper gm20 = GraphSONMapper.build().version(GraphSONVersion.V2_0).create();
- GraphSONMapper gm10 = GraphSONMapper.build().version(GraphSONVersion.V1_0).create();
-
- GraphWriter writer = GraphSONWriter.build().mapper(gm20).create();
- // subsequent creations of GraphWriters and GraphSONMappers should not affect
- // each other.
- GraphWriter writer2 = GraphSONWriter.build().mapper(gm10).create();
-
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- try {
- writer.writeObject(baos, new FunObject("value"));
- assertEquals(baos.toString(), "\"value\"");
- } catch (Exception e) {
- fail("should have succeeded serializing the unknown object to a string");
- }
- }
-
- @Test
- public void shouldSerializeAndDeserializeRequestMessageFromObjectMapper() throws IOException {
- final ObjectMapper om = GraphSONMapper.build().version(GraphSONVersion.V2_0)
- .addCustomModule(new GraphSONMessageSerializerV2.GremlinServerModule())
- .create().createMapper();
-
- final Map<String, Object> requestBindings = new HashMap<>();
- requestBindings.put("x", 1);
-
- final Map<String, Object> requestAliases = new HashMap<>();
- requestAliases.put("g", "social");
-
- final RequestMessage requestMessage = RequestMessage.build("eval").processor("session").
- overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
- add("gremlin", "social.V(x)", "bindings", requestBindings, "language", "gremlin-groovy", "aliases", requestAliases, "session", UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).create();
-
- final String json = om.writeValueAsString(requestMessage);
- final RequestMessage readRequestMessage = om.readValue(json, RequestMessage.class);
-
- assertEquals(requestMessage.getOp(), readRequestMessage.getOp());
- assertEquals(requestMessage.getProcessor(), readRequestMessage.getProcessor());
- assertEquals(requestMessage.getRequestId(), readRequestMessage.getRequestId());
- assertEquals(requestMessage.getArgs(), readRequestMessage.getArgs());
- }
-
- @Test
- public void shouldSerializeAndDeserializeResponseMessageFromObjectMapper() throws IOException {
- final ObjectMapper om = GraphSONMapper.build().version(GraphSONVersion.V2_0)
- .addCustomModule(new GraphSONMessageSerializerV2.GremlinServerModule())
- .create().createMapper();
- final Graph graph = TinkerFactory.createModern();
-
- final ResponseMessage responseMessage = ResponseMessage.build(UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).
- code(org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode.SUCCESS).
- result(Collections.singletonList(graph.vertices().next())).create();
-
- final String respJson = om.writeValueAsString(responseMessage);
- final ResponseMessage responseMessageRead = om.readValue(respJson, ResponseMessage.class);
-
- assertEquals(responseMessage.getRequestId(), responseMessageRead.getRequestId());
- assertEquals(responseMessage.getResult().getMeta(), responseMessageRead.getResult().getMeta());
- assertEquals(responseMessage.getResult().getData(), responseMessageRead.getResult().getData());
- assertEquals(responseMessage.getStatus().getAttributes(), responseMessageRead.getStatus().getAttributes());
- assertEquals(responseMessage.getStatus().getCode().getValue(), responseMessageRead.getStatus().getCode().getValue());
- assertEquals(responseMessage.getStatus().getCode().isSuccess(), responseMessageRead.getStatus().getCode().isSuccess());
- assertEquals(responseMessage.getStatus().getMessage(), responseMessageRead.getStatus().getMessage());
- }
-
- @Test
- public void shouldRegisterGremlinServerModuleAutomaticallyWithMapper() throws SerializationException {
- GraphSONMapper.Builder builder = GraphSONMapper.build().addCustomModule(GraphSONXModuleV2.build());
- GraphSONMessageSerializerV2 graphSONMessageSerializerV2 = new GraphSONMessageSerializerV2(builder);
-
- ResponseMessage rm = convert("hello", graphSONMessageSerializerV2);
- assertEquals(rm.getRequestId(), requestId);
- assertEquals(rm.getResult().getData(), "hello");
- }
-
-
- @Test
- @SuppressWarnings("deprecation")
- public void shouldFailOnMessageSerializerWithMapperIfNoGremlinServerModule() {
- final GraphSONMapper.Builder builder = GraphSONMapper.build().addCustomModule(GraphSONXModuleV2.build());
- final GraphSONMessageSerializerV2 graphSONMessageSerializerV2 = new GraphSONMessageSerializerV2(builder.create());
-
- try {
- convert("hello", graphSONMessageSerializerV2);
- fail("Serialization should have failed since no GremlinServerModule registered.");
- } catch (SerializationException e) {
- assertTrue(e.getMessage().contains("Could not find a type identifier for the class"));
- assertTrue(e.getCause() instanceof JsonMappingException);
- assertTrue(e.getCause().getCause() instanceof IllegalArgumentException);
- }
- }
-
- private ResponseMessage convert(final Object toSerialize, MessageSerializer<?> serializer) throws SerializationException {
- final ByteBuf bb = serializer.serializeResponseAsBinary(responseMessageBuilder.result(toSerialize).create(), allocator);
- return serializer.deserializeResponse(bb);
- }
-
- private class FunObject {
- private String val;
-
- public FunObject(String val) {
- this.val = val;
- }
-
- public String toString() {
- return this.val;
- }
- }
-
- public static class ColorIoRegistry extends AbstractIoRegistry {
- public ColorIoRegistry() {
- register(GraphSONIo.class, null, new ColorSimpleModule());
- }
- }
-
- public static class ColorSimpleModule extends TinkerPopJacksonModule {
- public ColorSimpleModule() {
- super("color-fun");
- addSerializer(Color.class, new ColorSerializer());
- }
-
- @Override
- public Map<Class, String> getTypeDefinitions() {
- return new HashMap<Class, String>(){{
- put(Color.class, "color");
- }};
- }
-
- @Override
- public String getTypeNamespace() {
- return "java";
- }
- }
-
- public static class ColorSerializer extends StdScalarSerializer<Color> {
- public ColorSerializer() {
- super(Color.class);
- }
-
- @Override
- public void serialize(final Color color, final JsonGenerator jsonGenerator,
- final SerializerProvider serializerProvider) throws IOException, JsonGenerationException {
- jsonGenerator.writeBoolean(color.equals(Color.RED));
- }
- }
-}
diff --git a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONMessageSerializerV3RoundTripTest.java b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONMessageSerializerV3RoundTripTest.java
deleted file mode 100644
index 3d8cadb..0000000
--- a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONMessageSerializerV3RoundTripTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.util.ser;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufAllocator;
-import io.netty.buffer.UnpooledByteBufAllocator;
-import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
-import org.junit.Test;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
-import java.util.UUID;
-import java.util.function.Consumer;
-
-import static org.junit.Assert.assertEquals;
-
-public class GraphSONMessageSerializerV3RoundTripTest extends AbstractRoundTripTest {
-
- private final UUID requestId = UUID.fromString("6457272A-4018-4538-B9AE-08DD5DDC0AA1");
- private final ResponseMessage.Builder responseMessageBuilder = ResponseMessage.build(requestId);
- private final static ByteBufAllocator allocator = UnpooledByteBufAllocator.DEFAULT;
-
- public final GraphSONMessageSerializerV3 serializer = new GraphSONMessageSerializerV3();
-
- private static final List<String> skippedTests
- = Arrays.asList("ReferenceVertex", "ReferenceVertexProperty", "ReferenceProperty", "Graph");
-
- @Test
- public void shouldWriteAndRead() throws Exception {
- // some tests are not valid for json
- if (skippedTests.contains(name)) return;
-
- for (int i = 0; i < 5; i++) {
-
- final ByteBuf bb = serializer.serializeResponseAsBinary(responseMessageBuilder.result(value).create(), allocator);
- final Object result = serializer.deserializeResponse(bb).getResult().getData();
-
- Optional.ofNullable(assertion).orElse((Consumer) r -> assertEquals(value, r)).accept(result);
- }
- }
-}
diff --git a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONMessageSerializerV3Test.java b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONMessageSerializerV3Test.java
deleted file mode 100644
index 584af06..0000000
--- a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONMessageSerializerV3Test.java
+++ /dev/null
@@ -1,419 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.util.ser;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufAllocator;
-import io.netty.buffer.UnpooledByteBufAllocator;
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
-import org.apache.tinkerpop.gremlin.util.MessageSerializer;
-import org.apache.tinkerpop.gremlin.util.Tokens;
-import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.Property;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONXModuleV3;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.apache.tinkerpop.shaded.jackson.databind.JsonMappingException;
-import org.junit.Test;
-
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import static org.apache.tinkerpop.gremlin.util.MockitoHamcrestMatcherAdapter.reflectionEquals;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.hasItemInArray;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-/**
- * Serializer tests that cover non-lossy serialization/deserialization methods.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-@SuppressWarnings("unchecked")
-public class GraphSONMessageSerializerV3Test {
-
- private final UUID requestId = UUID.fromString("6457272A-4018-4538-B9AE-08DD5DDC0AA1");
- private final ResponseMessage.Builder responseMessageBuilder = ResponseMessage.build(requestId);
- private final static ByteBufAllocator allocator = UnpooledByteBufAllocator.DEFAULT;
-
- public final GraphSONMessageSerializerV3 serializer = new GraphSONMessageSerializerV3();
-
- @Test
- public void shouldSerializeIterable() throws Exception {
- final ArrayList<Integer> list = new ArrayList<>();
- list.add(1);
- list.add(100);
-
- final ResponseMessage response = convert(list);
- assertCommon(response);
-
- final List<Integer> deserializedFunList = (List<Integer>) response.getResult().getData();
- assertEquals(2, deserializedFunList.size());
- assertEquals(Integer.valueOf(1), deserializedFunList.get(0));
- assertEquals(Integer.valueOf(100), deserializedFunList.get(1));
- }
-
- @Test
- public void shouldSerializeIterableWithNull() throws Exception {
- final ArrayList<Integer> list = new ArrayList<>();
- list.add(1);
- list.add(null);
- list.add(100);
-
- final ResponseMessage response = convert(list);
- assertCommon(response);
-
- final List<Integer> deserializedFunList = (List<Integer>) response.getResult().getData();
- assertEquals(3, deserializedFunList.size());
- assertEquals(Integer.valueOf(1), deserializedFunList.get(0));
- assertNull(deserializedFunList.get(1));
- assertEquals(Integer.valueOf(100), deserializedFunList.get(2));
- }
-
- @Test
- public void shouldSerializeMap() throws Exception {
- final Map<String, Object> map = new HashMap<>();
- final Map<String, String> innerMap = new HashMap<>();
- innerMap.put("a", "b");
-
- map.put("w", true);
- map.put("x", 1);
- map.put("y", "some");
- map.put("z", innerMap);
-
- final ResponseMessage response = convert(map);
- assertCommon(response);
-
- final Map<String, Object> deserializedMap = (Map<String, Object>) response.getResult().getData();
- assertEquals(4, deserializedMap.size());
- assertEquals(true, deserializedMap.get("w"));
- assertEquals(1, deserializedMap.get("x"));
- assertEquals("some", deserializedMap.get("y"));
-
- final Map<String, String> deserializedInnerMap = (Map<String, String>) deserializedMap.get("z");
- assertEquals(1, deserializedInnerMap.size());
- assertEquals("b", deserializedInnerMap.get("a"));
- }
-
- @Test
- public void shouldSerializeMapEntries() throws Exception {
- final Graph graph = TinkerGraph.open();
- final Vertex v1 = graph.addVertex();
- final Date d = new Date();
-
- final Map<Object, Object> map = new HashMap<>();
- map.put("x", 1);
- map.put(v1, 100);
- map.put(d, "test");
-
- final ResponseMessage response = convert(IteratorUtils.asList(map.entrySet()));
- assertCommon(response);
-
- final List<Map<Object, Object>> deserializedEntries = (List<Map<Object, Object>>) response.getResult().getData();
- assertEquals(3, deserializedEntries.size());
- deserializedEntries.forEach(m -> {
- final Map.Entry<Object,Object> e = m.entrySet().iterator().next();
- if (e.getKey().equals("x"))
- assertEquals(1, e.getValue());
- else if (e.getKey() instanceof Vertex && e.getKey().equals(v1))
- assertEquals(100, e.getValue());
- else if (e.getKey() instanceof Date)
- assertEquals("test", e.getValue());
- else
- fail("Map entries contains a key that is not part of what was serialized");
- });
- }
-
- @Test
- public void shouldSerializeEdge() throws Exception {
- final Graph graph = TinkerGraph.open();
- final Vertex v1 = graph.addVertex();
- final Vertex v2 = graph.addVertex();
- final Edge e = v1.addEdge("test", v2);
- e.property("abc", 123);
-
- final Iterable<Edge> iterable = IteratorUtils.list(graph.edges());
-
- final ResponseMessage response = convert(iterable);
- assertCommon(response);
-
- final List<Edge> edgeList = (List<Edge>) response.getResult().getData();
- assertEquals(1, edgeList.size());
-
- final Edge deserializedEdge = edgeList.get(0);
- assertEquals(e.id(), deserializedEdge.id());
- assertEquals(v1.id(), deserializedEdge.outVertex().id());
- assertEquals(v2.id(), deserializedEdge.inVertex().id());
- assertEquals(v1.label(), deserializedEdge.outVertex().label());
- assertEquals(v2.label(), deserializedEdge.inVertex().label());
- assertEquals(e.label(), deserializedEdge.label());
-
- final List<Property> properties = new ArrayList<>();
- deserializedEdge.properties().forEachRemaining(properties::add);
- assertEquals(1, properties.size());
-
- assertNotNull(properties);
- assertEquals("abc", properties.get(0).key());
- assertEquals(123, properties.get(0).value());
-
- }
-
- @Test
- public void shouldSerializeEdgeProperty() throws Exception {
- final Graph graph = TinkerGraph.open();
- final Vertex v1 = graph.addVertex();
- final Vertex v2 = graph.addVertex();
- final Edge e = v1.addEdge("test", v2);
- e.property("abc", 123);
-
- final Iterable<Property<Object>> iterable = IteratorUtils.list(e.properties("abc"));
- final ResponseMessage response = convert(iterable);
- assertCommon(response);
-
- final List<Property> propertyList = (List<Property>) response.getResult().getData();
- assertEquals(1, propertyList.size());
- assertEquals(123, propertyList.get(0).value());
- }
-
- @Test
- public void shouldSerializeVertexWithEmbeddedMap() throws Exception {
- final Graph graph = TinkerGraph.open();
- final Vertex v = graph.addVertex();
- final Map<String, Object> map = new HashMap<>();
- map.put("x", 500);
- map.put("y", "some");
-
- final ArrayList<Object> friends = new ArrayList<>();
- friends.add("x");
- friends.add(5);
- friends.add(map);
-
- v.property(VertexProperty.Cardinality.single, "friends", friends);
-
- final List<Vertex> list = IteratorUtils.list(graph.vertices());
-
- final ResponseMessage response = convert(list);
- assertCommon(response);
-
- final List<Vertex> vertexList = (List<Vertex>) response.getResult().getData();
- assertEquals(1, vertexList.size());
-
- final Vertex deserializedVertex = vertexList.get(0);
- assertEquals(v.id(), deserializedVertex.id());
- assertEquals(Vertex.DEFAULT_LABEL, deserializedVertex.label());
-
- final List<VertexProperty> properties = new ArrayList<>();
- deserializedVertex.properties().forEachRemaining(properties::add);
- assertEquals(1, properties.size());
-
- final VertexProperty friendsProperty = properties.get(0);
- final List<Object> deserializedInnerList = (List<Object>) friendsProperty.value();
-
- assertEquals(3, deserializedInnerList.size());
- assertEquals("x", deserializedInnerList.get(0));
- assertEquals(5, deserializedInnerList.get(1));
-
- final Map<String, Object> deserializedInnerInnerMap = (Map<String, Object>) deserializedInnerList.get(2);
- assertEquals(2, deserializedInnerInnerMap.size());
- assertEquals(500, deserializedInnerInnerMap.get("x"));
- assertEquals("some", deserializedInnerInnerMap.get("y"));
- }
-
- @Test
- public void shouldSerializeToJsonMapWithElementForKey() throws Exception {
- final TinkerGraph graph = TinkerFactory.createClassic();
- final GraphTraversalSource g = graph.traversal();
- final Map<Vertex, Integer> map = new HashMap<>();
- final Vertex v1 = g.V().has("name", "marko").next();
- map.put(v1, 1000);
-
- final ResponseMessage response = convert(map);
- assertCommon(response);
-
- final Map<Vertex, Integer> deserializedMap = (Map<Vertex, Integer>) response.getResult().getData();
- assertEquals(1, deserializedMap.size());
- assertEquals(Integer.valueOf(1000), deserializedMap.get(v1));
- }
-
- @Test
- public void shouldSerializeToTreeJson() throws Exception {
- final TinkerGraph graph = TinkerFactory.createClassic();
- final GraphTraversalSource g = graph.traversal();
- final Tree t = g.V(1).out().properties("name").tree().next();
-
- final ResponseMessage response = convert(t);
- assertCommon(response);
-
- final Tree deserializedTree = (Tree)response.getResult().getData();
-
- //check the first object and its key's properties
- assertEquals(1, deserializedTree.size());
- final Vertex v = ((Vertex) deserializedTree.keySet().iterator().next());
- assertEquals(1, v.id());
- assertEquals("marko", v.property("name").value());
-
- final Tree firstTree = (Tree)deserializedTree.get(v);
- assertEquals(3, firstTree.size());
- Iterator<Vertex> vertexKeys = firstTree.keySet().iterator();
-
- Map expectedValues = new HashMap<Integer, String>() {{
- put(2, "vadas");
- put(4, "lop");
- put(6, "josh");
- }};
-
- Map actualValues = new HashMap<Integer, String>();
- for (int i = 0; i < 3; i++) {
- Tree t2 = (Tree)firstTree.get(vertexKeys.next());
- VertexProperty vp = (VertexProperty)t2.keySet().iterator().next();
- actualValues.put(vp.id(), vp.value());
- }
-
- assertEquals(expectedValues, actualValues);
- }
-
- @Test
- public void shouldSerializeFullResponseMessage() throws Exception {
- final UUID id = UUID.randomUUID();
-
- final Map<String, Object> metaData = new HashMap<>();
- metaData.put("test", "this");
- metaData.put("one", 1);
-
- final Map<String, Object> attributes = new HashMap<>();
- attributes.put("test", "that");
- attributes.put("two", 2);
-
- final ResponseMessage response = ResponseMessage.build(id)
- .responseMetaData(metaData)
- .code(ResponseStatusCode.SUCCESS)
- .result("some-result")
- .statusAttributes(attributes)
- .statusMessage("worked")
- .create();
-
- final ByteBuf bb = serializer.serializeResponseAsBinary(response, allocator);
- final ResponseMessage deserialized = serializer.deserializeResponse(bb);
-
- assertEquals(id, deserialized.getRequestId());
- assertEquals("this", deserialized.getResult().getMeta().get("test"));
- assertEquals(1, deserialized.getResult().getMeta().get("one"));
- assertEquals("some-result", deserialized.getResult().getData());
- assertEquals("that", deserialized.getStatus().getAttributes().get("test"));
- assertEquals(2, deserialized.getStatus().getAttributes().get("two"));
- assertEquals(ResponseStatusCode.SUCCESS.getValue(), deserialized.getStatus().getCode().getValue());
- assertEquals("worked", deserialized.getStatus().getMessage());
- }
-
- @Test
- public void shouldDeserializeNotPredicate() throws Exception {
- final String requestMessageWithP = "{\"requestId\":{\"@type\":\"g:UUID\",\"@value\":\"0397b9c0-ffab-470e-a6a8-644fc80c01d6\"},\"op\":\"bytecode\",\"processor\":\"traversal\",\"args\":{\"gremlin\":{\"@type\":\"g:Bytecode\",\"@value\":{\"step\":[[\"V\"],[\"hasLabel\",\"person\"],[\"has\",\"age\",{\"@type\":\"g:P\",\"@value\":{\"predicate\":\"not\",\"value\":{\"@type\":\"g:P\",\"@value\":{\"predicate\":\"lte\",\"value\":{\"@type\":\"g:Int32\",\"@value\":10}}}}}]]}},\"aliases\":{\"g\":\"gmodern\"}}}";
- final ByteBuf bb = allocator.buffer(requestMessageWithP.length());
- bb.writeBytes(requestMessageWithP.getBytes());
- final RequestMessage m = serializer.deserializeRequest(bb);
- assertEquals("bytecode", m.getOp());
- assertNotNull(m.getArgs());
- }
-
- @Test
- public void shouldSerializeAndDeserializeRequest() throws Exception {
- final GraphTraversalSource g = EmptyGraph.instance().traversal();
- final Traversal.Admin t = g.V().hasLabel("person").out().asAdmin();
-
- final Map<String, String> aliases = new HashMap<>();
- aliases.put("g","g");
-
- final RequestMessage request = RequestMessage.build(Tokens.OPS_BYTECODE)
- .processor("traversal")
- .overrideRequestId(UUID.randomUUID())
- .addArg(Tokens.ARGS_GREMLIN, t.getBytecode())
- .addArg(Tokens.ARGS_ALIASES, aliases)
- .create();
-
- final ByteBuf buffer = serializer.serializeRequestAsBinary(request, allocator);
- final int mimeLen = buffer.readByte();
- final byte[] bytes = new byte[mimeLen];
- buffer.readBytes(bytes);
- final String mimeType = new String(bytes, StandardCharsets.UTF_8);
-
- final RequestMessage deserialized = serializer.deserializeRequest(buffer);
- assertThat(request, reflectionEquals(deserialized));
- assertThat(serializer.mimeTypesSupported(), hasItemInArray(mimeType));
- }
-
- @Test
- public void shouldRegisterGremlinServerModuleAutomaticallyWithMapper() throws SerializationException {
- GraphSONMapper.Builder builder = GraphSONMapper.build().addCustomModule(GraphSONXModuleV3.build());
- GraphSONMessageSerializerV3 graphSONMessageSerializerV3 = new GraphSONMessageSerializerV3(builder);
-
- ResponseMessage rm = convert("hello", graphSONMessageSerializerV3);
- assertEquals(rm.getRequestId(), requestId);
- assertEquals(rm.getResult().getData(), "hello");
- }
-
- @Test
- public void shouldFailOnMessageSerializerWithMapperIfNoGremlinServerModule() {
- final GraphSONMapper.Builder builder = GraphSONMapper.build().addCustomModule(GraphSONXModuleV3.build());
- final GraphSONMessageSerializerV3 graphSONMessageSerializerV3 = new GraphSONMessageSerializerV3(builder.create());
-
- try {
- convert("hello", graphSONMessageSerializerV3);
- fail("Serialization should have failed since no GremlinServerModule registered.");
- } catch (SerializationException e) {
- assertTrue(e.getMessage().contains("Could not find a type identifier for the class"));
- assertTrue(e.getCause() instanceof JsonMappingException);
- assertTrue(e.getCause().getCause() instanceof IllegalArgumentException);
- }
- }
-
- private void assertCommon(final ResponseMessage response) {
- assertEquals(requestId, response.getRequestId());
- assertEquals(ResponseStatusCode.SUCCESS, response.getStatus().getCode());
- }
-
- private ResponseMessage convert(final Object toSerialize, MessageSerializer<?> serializer) throws SerializationException {
- final ByteBuf bb = serializer.serializeResponseAsBinary(responseMessageBuilder.result(toSerialize).create(), allocator);
- return serializer.deserializeResponse(bb);
- }
-
- private ResponseMessage convert(final Object toSerialize) throws SerializationException {
- return convert(toSerialize, this.serializer);
- }
-}
diff --git a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONMessageSerializerV4RoundTripTest.java b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONMessageSerializerV4RoundTripTest.java
new file mode 100644
index 0000000..09e4457
--- /dev/null
+++ b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONMessageSerializerV4RoundTripTest.java
@@ -0,0 +1,59 @@
+/*
+ * 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.util.ser;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.buffer.UnpooledByteBufAllocator;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Consumer;
+
+import static org.junit.Assert.assertEquals;
+
+public class GraphSONMessageSerializerV4RoundTripTest extends AbstractRoundTripTest {
+ private final ResponseMessage.Builder responseMessageBuilder = ResponseMessage.build();
+ private final static ByteBufAllocator allocator = UnpooledByteBufAllocator.DEFAULT;
+
+ public final GraphSONMessageSerializerV4 serializer = new GraphSONMessageSerializerV4();
+
+ private static final List<String> skippedTests
+ = Arrays.asList("ReferenceVertex", "ReferenceVertexProperty", "ReferenceProperty", "Graph", "BulkList"); // enable BulkList after implemented
+
+ @Test
+ public void shouldWriteAndRead() throws Exception {
+ // some tests are not valid for json
+ if (skippedTests.contains(name)) return;
+
+ for (int i = 0; i < 5; i++) {
+ // GraphSONv4 assumes that results are always in a list.
+ final ByteBuf bb = serializer.serializeResponseAsBinary(
+ responseMessageBuilder.result(Collections.singletonList(value)).code(HttpResponseStatus.OK).create(), allocator);
+ final Object result = serializer.deserializeBinaryResponse(bb).getResult().getData().get(0);
+
+ Optional.ofNullable(assertion).orElse((Consumer) r -> assertEquals(value, r)).accept(result);
+ }
+ }
+}
diff --git a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONMessageSerializerV4Test.java b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONMessageSerializerV4Test.java
new file mode 100644
index 0000000..81138b8
--- /dev/null
+++ b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONMessageSerializerV4Test.java
@@ -0,0 +1,278 @@
+/*
+ * 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.util.ser;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.buffer.UnpooledByteBufAllocator;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.util.CharsetUtil;
+import org.apache.tinkerpop.gremlin.structure.io.AbstractIoRegistry;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONIo;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONVersion;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONXModuleV4;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.TinkerPopJacksonModule;
+import org.apache.tinkerpop.gremlin.util.MessageSerializer;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseResult;
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
+import org.apache.tinkerpop.shaded.jackson.core.JsonParser;
+import org.apache.tinkerpop.shaded.jackson.core.JsonProcessingException;
+import org.apache.tinkerpop.shaded.jackson.databind.DeserializationContext;
+import org.apache.tinkerpop.shaded.jackson.databind.JsonNode;
+import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
+import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
+import org.apache.tinkerpop.shaded.jackson.databind.deser.std.StdDeserializer;
+import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
+import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
+import org.junit.Test;
+
+import java.awt.*;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.apache.tinkerpop.gremlin.util.ser.SerTokens.TOKEN_DATA;
+import static org.junit.Assert.assertEquals;
+
+@SuppressWarnings("unchecked")
+public class GraphSONMessageSerializerV4Test {
+
+ private final static ByteBufAllocator allocator = UnpooledByteBufAllocator.DEFAULT;
+ private final ResponseMessage.Builder responseMessageBuilder = ResponseMessage.build();
+ private final GraphSONMessageSerializerV4 serializer = new GraphSONMessageSerializerV4();
+
+ private final ObjectMapper mapper = new ObjectMapper();
+
+ @Test
+ public void shouldSerializeChunkedResponseMessage() throws SerializationException, JsonProcessingException {
+ final ResponseMessage header = ResponseMessage.build()
+ .result(Arrays.asList("header", 0))
+ .create();
+
+ final ResponseMessage footer = ResponseMessage.build()
+ .result(Arrays.asList("footer", 3))
+ .code(HttpResponseStatus.OK)
+ .statusMessage("OK")
+ .create();
+
+ final ByteBuf bb0 = serializer.writeHeader(header, allocator);
+ final ByteBuf bb1 = serializer.writeChunk(Arrays.asList("chunk", 1), allocator);
+ final ByteBuf bb2 = serializer.writeChunk(Arrays.asList("chunk", 2), allocator);
+ final ByteBuf bb3 = serializer.writeFooter(footer, allocator);
+
+ final ByteBuf bbCombined = allocator.buffer().writeBytes(bb0).writeBytes(bb1).writeBytes(bb2).writeBytes(bb3);
+
+ final String json = bbCombined.readCharSequence(bbCombined.readableBytes(), CharsetUtil.UTF_8).toString();
+
+ final JsonNode node = mapper.readTree(json);
+
+ assertEquals("header", node.get("result").get(TOKEN_DATA).get("@value").get(0).textValue());
+ assertEquals("footer", node.get("result").get(TOKEN_DATA).get("@value").get(6).textValue());
+ assertEquals(8, node.get("result").get(TOKEN_DATA).get("@value").size());
+ assertEquals("OK", node.get("status").get("message").asText());
+ assertEquals(200, node.get("status").get("code").asInt());
+
+ // a message composed of all chunks must be deserialized
+ bbCombined.resetReaderIndex();
+ final ResponseMessage deserialized = serializer.deserializeBinaryResponse(bbCombined);
+ assertEquals(200, deserialized.getStatus().getCode().code());
+ assertEquals("OK", deserialized.getStatus().getMessage());
+ assertEquals(8, ((List)deserialized.getResult().getData()).size());
+ }
+
+ @Test
+ public void shouldSerializeResponseMessageWithoutData() throws SerializationException, JsonProcessingException {
+ final ResponseMessage header = ResponseMessage.build()
+ .code(HttpResponseStatus.OK)
+ .statusMessage("OK")
+ .create();
+
+ final ByteBuf bb0 = serializer.writeHeader(header, allocator);
+
+ final String json = bb0.readCharSequence(bb0.readableBytes(), CharsetUtil.UTF_8).toString();
+
+ final JsonNode node = mapper.readTree(json);
+
+ assertEquals(0, node.get("result").get(TOKEN_DATA).get("@value").size());
+ assertEquals("OK", node.get("status").get("message").asText());
+ assertEquals(200, node.get("status").get("code").asInt());
+
+ bb0.resetReaderIndex();
+ final ResponseMessage deserialized = serializer.deserializeBinaryResponse(bb0);
+ assertEquals(200, deserialized.getStatus().getCode().code());
+ assertEquals("OK", deserialized.getStatus().getMessage());
+ assertEquals(0, ((List)deserialized.getResult().getData()).size());
+ }
+
+ @Test
+ public void shouldSerializeChunkedResponseMessageWithEmptyData() throws SerializationException, JsonProcessingException {
+ final ResponseMessage header = ResponseMessage.build()
+ .result(new ArrayList<>())
+ .code(HttpResponseStatus.OK)
+ .statusMessage("OK")
+ .create();
+
+ final ByteBuf bb0 = serializer.writeHeader(header, allocator);
+
+ final String json = bb0.readCharSequence(bb0.readableBytes(), CharsetUtil.UTF_8).toString();
+
+ final JsonNode node = mapper.readTree(json);
+
+ assertEquals(0, node.get("result").get(TOKEN_DATA).get("@value").size());
+ assertEquals("OK", node.get("status").get("message").asText());
+ assertEquals(200, node.get("status").get("code").asInt());
+
+ bb0.resetReaderIndex();
+ final ResponseMessage deserialized = serializer.deserializeBinaryResponse(bb0);
+ assertEquals(200, deserialized.getStatus().getCode().code());
+ assertEquals("OK", deserialized.getStatus().getMessage());
+ assertEquals(0, ((List)deserialized.getResult().getData()).size());
+ }
+
+ @Test
+ public void shouldSerializeChunkedResponseMessageWithError() throws SerializationException, JsonProcessingException {
+ final ResponseMessage header = ResponseMessage.build()
+ .result(Arrays.asList("header", 0))
+ .create();
+
+ final ResponseMessage footer = ResponseMessage.build()
+ .result(Arrays.asList("footer", 3))
+ .code(HttpResponseStatus.INTERNAL_SERVER_ERROR)
+ .statusMessage("SERVER_ERROR")
+ .create();
+
+ final ByteBuf bb0 = serializer.writeHeader(header, allocator);
+ final ByteBuf bb1 = serializer.writeChunk(Arrays.asList("chunk", 1), allocator);
+ final ByteBuf bb2 = serializer.writeChunk(Arrays.asList("chunk", 2), allocator);
+ final ByteBuf bb3 = serializer.writeErrorFooter(footer, allocator);
+
+ final ByteBuf bbCombined = allocator.buffer().writeBytes(bb0).writeBytes(bb1).writeBytes(bb2).writeBytes(bb3);
+
+ final String json = bbCombined.readCharSequence(bbCombined.readableBytes(), CharsetUtil.UTF_8).toString();
+
+ final JsonNode node = mapper.readTree(json);
+
+ assertEquals("header", node.get("result").get(TOKEN_DATA).get("@value").get(0).textValue());
+ // 6 items in first 3 chunks
+ assertEquals(6, node.get("result").get(TOKEN_DATA).get("@value").size());
+ assertEquals("SERVER_ERROR", node.get("status").get("message").asText());
+ assertEquals(500, node.get("status").get("code").asInt());
+
+ bbCombined.resetReaderIndex();
+ final ResponseMessage deserialized = serializer.deserializeBinaryResponse(bbCombined);
+ assertEquals(500, deserialized.getStatus().getCode().code());
+ assertEquals("SERVER_ERROR", deserialized.getStatus().getMessage());
+ assertEquals(6, ((List)deserialized.getResult().getData()).size());
+ }
+
+ @Test
+ public void shouldConfigureIoRegistry() throws Exception {
+ final GraphSONMessageSerializerV4 serializer = new GraphSONMessageSerializerV4();
+ final Map<String, Object> config = new HashMap<String, Object>() {{
+ put(AbstractMessageSerializer.TOKEN_IO_REGISTRIES, Arrays.asList(ColorIoRegistry.class.getName()));
+ }};
+
+ serializer.configure(config, null);
+
+ final ResponseMessage toSerialize = ResponseMessage.build().result(Collections.singletonList(Color.RED)).code(HttpResponseStatus.OK).create();
+ final ByteBuf buffer = serializer.serializeResponseAsBinary(toSerialize, allocator);
+ ResponseResult results = serializer.deserializeBinaryResponse(buffer).getResult();
+
+ assertEquals(Color.RED, results.getData().get(0));
+ }
+
+ public static class ColorIoRegistry extends AbstractIoRegistry {
+ public ColorIoRegistry() {
+ register(GraphSONIo.class, null, new ColorSimpleModule());
+ }
+ }
+
+ public static class ColorSimpleModule extends TinkerPopJacksonModule {
+ public ColorSimpleModule() {
+ super("color-fun");
+ addSerializer(Color.class, new ColorSerializer());
+ addDeserializer(Color.class, new ColorDeserializer());
+ }
+
+ @Override
+ public Map<Class, String> getTypeDefinitions() {
+ return new HashMap<Class, String>(){{
+ put(Color.class, "color");
+ }};
+ }
+
+ @Override
+ public String getTypeNamespace() {
+ return "java";
+ }
+ }
+
+ public static class ColorSerializer extends StdSerializer<Color> {
+ public ColorSerializer() {
+ super(Color.class);
+ }
+
+ @Override
+ public void serialize(final Color value, final JsonGenerator gen,
+ final SerializerProvider serializerProvider) throws IOException {
+ gen.writeString(value.toString());
+ }
+
+ @Override
+ public void serializeWithType(final Color value, final JsonGenerator gen,
+ final SerializerProvider serializers, final TypeSerializer typeSer) throws IOException {
+ typeSer.writeTypePrefixForScalar(value, gen);
+ gen.writeString(value.toString());
+ typeSer.writeTypeSuffixForScalar(value, gen);
+ }
+ }
+
+ public static class ColorDeserializer extends StdDeserializer<Color> {
+ public ColorDeserializer() {
+ super(Color.class);
+ }
+
+ @Override
+ public Color deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+ final String colorString = jsonParser.getText();
+ return colorString.contains("r=255") ? Color.RED : null;
+ }
+ }
+
+ @Test
+ public void shouldRegisterGremlinServerModuleAutomaticallyWithMapper() throws SerializationException {
+ GraphSONMapper.Builder builder = GraphSONMapper.build().version(GraphSONVersion.V4_0).addCustomModule(GraphSONXModuleV4.build());
+ GraphSONMessageSerializerV4 graphSONMessageSerializerV4 = new GraphSONMessageSerializerV4(builder);
+
+ ResponseMessage rm = convert("hello", graphSONMessageSerializerV4);
+ assertEquals(rm.getResult().getData().get(0), "hello");
+ }
+
+ private ResponseMessage convert(final Object toSerialize, MessageSerializer<?> serializer) throws SerializationException {
+ final ByteBuf bb = serializer.serializeResponseAsBinary(
+ responseMessageBuilder.result(Collections.singletonList(toSerialize)).code(HttpResponseStatus.OK).create(), allocator);
+ return serializer.deserializeBinaryResponse(bb);
+ }
+}
diff --git a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONUntypedMessageSerializerV1Test.java b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONUntypedMessageSerializerV1Test.java
deleted file mode 100644
index 023b471..0000000
--- a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONUntypedMessageSerializerV1Test.java
+++ /dev/null
@@ -1,512 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.util.ser;
-
-import io.netty.buffer.ByteBufAllocator;
-import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.Property;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.apache.tinkerpop.gremlin.structure.io.AbstractIoRegistry;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONIo;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.apache.tinkerpop.shaded.jackson.core.JsonGenerationException;
-import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
-import org.apache.tinkerpop.shaded.jackson.databind.JsonNode;
-import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
-import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
-import org.apache.tinkerpop.shaded.jackson.databind.module.SimpleModule;
-import org.apache.tinkerpop.shaded.jackson.databind.node.NullNode;
-import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
-import org.apache.tinkerpop.shaded.jackson.databind.util.StdDateFormat;
-import org.junit.Assert;
-import org.junit.Test;
-
-import java.awt.*;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-
-/**
- * These tests focus on message serialization and not "result" serialization as test specific to results (e.g.
- * vertices, edges, annotated values, etc.) are handled in the IO packages.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class GraphSONUntypedMessageSerializerV1Test {
-
- public static final GraphSONUntypedMessageSerializerV1 SERIALIZER = new GraphSONUntypedMessageSerializerV1();
- private static final RequestMessage msg = RequestMessage.build("op")
- .overrideRequestId(UUID.fromString("2D62161B-9544-4F39-AF44-62EC49F9A595")).create();
- private static final ObjectMapper mapper = new ObjectMapper();
- private static final ByteBufAllocator allocator = ByteBufAllocator.DEFAULT;
-
- @Test
- public void shouldConfigureIoRegistry() throws Exception {
- final GraphSONUntypedMessageSerializerV1 serializer = new GraphSONUntypedMessageSerializerV1();
- final Map<String, Object> config = new HashMap<String, Object>() {{
- put(AbstractMessageSerializer.TOKEN_IO_REGISTRIES, Arrays.asList(ColorIoRegistry.class.getName()));
- }};
-
- serializer.configure(config, null);
-
- final ResponseMessage toSerialize = ResponseMessage.build(UUID.fromString("2D62161B-9544-4F39-AF44-62EC49F9A595"))
- .result(Color.RED).create();
- final String results = serializer.serializeResponseAsString(toSerialize, allocator);
- final JsonNode json = mapper.readTree(results);
- assertNotNull(json);
- assertThat(json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA).booleanValue(), is(true));
- }
-
- @Test
- public void shouldSerializeToJsonNullResultReturnsNull() throws Exception {
- final ResponseMessage message = ResponseMessage.build(msg).create();
- final String results = SERIALIZER.serializeResponseAsString(message, allocator);
- final JsonNode json = mapper.readTree(results);
- assertNotNull(json);
- assertEquals(msg.getRequestId().toString(), json.path(SerTokens.TOKEN_REQUEST).asText());
- assertEquals(NullNode.getInstance(), json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA));
- }
-
- @Test
- public void shouldSerializeToJsonIterable() throws Exception {
- final ArrayList<FunObject> funList = new ArrayList<>();
- funList.add(new FunObject("x"));
- funList.add(new FunObject("y"));
-
- final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(funList).create(), allocator);
- final JsonNode json = mapper.readTree(results);
-
- assertNotNull(json);
- assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
- final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
-
- assertEquals(2, converted.size());
-
- assertEquals("x", converted.get(0).asText());
- assertEquals("y", converted.get(1).asText());
- }
-
- @Test
- public void shouldSerializeToJsonIterator() throws Exception {
- final ArrayList<FunObject> funList = new ArrayList<>();
- funList.add(new FunObject("x"));
- funList.add(new FunObject("y"));
-
- final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(funList.iterator()).create(), allocator);
- final JsonNode json = mapper.readTree(results);
-
- assertNotNull(json);
- assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
- final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
-
- assertEquals(2, converted.size());
-
- assertEquals("x", converted.get(0).asText());
- assertEquals("y", converted.get(1).asText());
- }
-
- @Test
- public void shouldSerializeToJsonIteratorNullElement() throws Exception {
-
- final ArrayList<FunObject> funList = new ArrayList<>();
- funList.add(new FunObject("x"));
- funList.add(null);
- funList.add(new FunObject("y"));
-
- final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(funList.iterator()).create(), allocator);
- final JsonNode json = mapper.readTree(results);
-
- assertNotNull(json);
- assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
- final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
-
- assertEquals(3, converted.size());
-
- assertEquals("x", converted.get(0).asText());
- assertEquals(NullNode.getInstance(), converted.get(1));
- assertEquals("y", converted.get(2).asText());
- }
-
- @Test
- public void shouldSerializeToJsonMap() throws Exception {
- final Map<String, Object> map = new HashMap<>();
- final Map<String, String> innerMap = new HashMap<>();
- innerMap.put("a", "b");
-
- map.put("x", new FunObject("x"));
- map.put("y", "some");
- map.put("z", innerMap);
-
- final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(map).create(), allocator);
- final JsonNode json = mapper.readTree(results);
-
- assertNotNull(json);
- assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
- final JsonNode jsonObject = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
-
- assertNotNull(jsonObject);
- assertEquals("some", jsonObject.get("y").asText());
- assertEquals("x", jsonObject.get("x").asText());
-
- final JsonNode innerJsonObject = jsonObject.get("z");
- assertNotNull(innerJsonObject);
- assertEquals("b", innerJsonObject.get("a").asText());
- }
-
- @Test
- public void shouldShouldSerializeMapEntries() throws Exception {
- final Graph graph = TinkerGraph.open();
- final Vertex v1 = graph.addVertex();
- final Date d = new Date();
-
- final Map<Object, Object> map = new HashMap<>();
- map.put("x", 1);
- map.put(v1, 100);
- map.put(d, "test");
-
- final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(IteratorUtils.asList(map)).create(), allocator);
- final JsonNode json = mapper.readTree(results);
-
- assertNotNull(json);
- assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
- final JsonNode jsonObject = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
- jsonObject.elements().forEachRemaining(e -> {
- if (e.has("x"))
- assertEquals(1, e.get("x").asInt());
- else if (e.has(v1.id().toString()))
- assertEquals(100, e.get(v1.id().toString()).asInt());
- else if (e.has(StdDateFormat.instance.format(d)))
- assertEquals("test", e.get(StdDateFormat.instance.format(d)).asText());
- else
- fail("Map entries contains a key that is not part of what was serialized");
- });
- }
-
- @Test
- public void shouldSerializeEdge() throws Exception {
- final Graph g = TinkerGraph.open();
- final Vertex v1 = g.addVertex();
- final Vertex v2 = g.addVertex();
- final Edge e = v1.addEdge("test", v2);
- e.property("abc", 123);
-
- final Iterable<Edge> iterable = IteratorUtils.list(g.edges());
- final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(iterable).create(), allocator);
-
- final JsonNode json = mapper.readTree(results);
-
- assertNotNull(json);
- assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
- final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
-
- assertNotNull(converted);
- assertEquals(1, converted.size());
-
- final JsonNode edgeAsJson = converted.get(0);
- assertNotNull(edgeAsJson);
-
- assertEquals(((Long) e.id()).intValue(), edgeAsJson.get(GraphSONTokens.ID).asLong()); // lossy
- assertEquals(((Long) v1.id()).intValue(), edgeAsJson.get(GraphSONTokens.OUT).asLong());// lossy
- assertEquals(((Long) v2.id()).intValue(), edgeAsJson.get(GraphSONTokens.IN).asLong()); // lossy
- assertEquals(e.label(), edgeAsJson.get(GraphSONTokens.LABEL).asText());
- assertEquals(GraphSONTokens.EDGE, edgeAsJson.get(GraphSONTokens.TYPE).asText());
-
- final JsonNode properties = edgeAsJson.get(GraphSONTokens.PROPERTIES);
- assertNotNull(properties);
- assertEquals(123, properties.get("abc").asInt());
- }
-
- @Test
- public void shouldSerializeEdgeProperty() throws Exception {
- final Graph g = TinkerGraph.open();
- final Vertex v1 = g.addVertex();
- final Vertex v2 = g.addVertex();
- final Edge e = v1.addEdge("test", v2);
- e.property("abc", 123);
-
- final Iterable<Property<Object>> iterable = IteratorUtils.list(e.properties("abc"));
- final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(iterable).create(), allocator);
-
- final JsonNode json = mapper.readTree(results);
-
- assertNotNull(json);
- assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
- final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
-
- assertNotNull(converted);
- assertEquals(1, converted.size());
-
- final JsonNode propertyAsJson = converted.get(0);
- assertNotNull(propertyAsJson);
-
- assertEquals(123, propertyAsJson.get("value").asInt());
- }
-
- @Test
- public void shouldSerializeToJsonIteratorWithEmbeddedMap() throws Exception {
- final Graph g = TinkerGraph.open();
- final Vertex v = g.addVertex();
- final Map<String, Object> map = new HashMap<>();
- map.put("x", 500);
- map.put("y", "some");
-
- final ArrayList<Object> friends = new ArrayList<>();
- friends.add("x");
- friends.add(5);
- friends.add(map);
-
- v.property(VertexProperty.Cardinality.single, "friends", friends);
-
- final Iterable iterable = IteratorUtils.list(g.vertices());
- final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(iterable).create(), allocator);
- final JsonNode json = mapper.readTree(results);
-
- assertNotNull(json);
- assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
- final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
-
- assertNotNull(converted);
- assertEquals(1, converted.size());
-
- final JsonNode vertexAsJson = converted.get(0);
- assertNotNull(vertexAsJson);
-
- final JsonNode properties = vertexAsJson.get(GraphSONTokens.PROPERTIES);
- assertNotNull(properties);
- assertEquals(1, properties.size());
-
- final JsonNode friendProperties = properties.get("friends");
- assertEquals(1, friendProperties.size());
- final JsonNode friendsProperty = friendProperties.get(0);
- assertNotNull(friendsProperty);
- assertEquals(3, friends.size());
-
- final String object1 = friendsProperty.get(GraphSONTokens.VALUE).get(0).asText();
- assertEquals("x", object1);
-
- final int object2 = friendsProperty.get(GraphSONTokens.VALUE).get(1).asInt();
- assertEquals(5, object2);
-
- final JsonNode object3 = friendsProperty.get(GraphSONTokens.VALUE).get(2);
- assertEquals(500, object3.get("x").asInt());
- assertEquals("some", object3.get("y").asText());
- }
-
- @Test
- public void shouldSerializeToJsonMapWithElementForKey() throws Exception {
- final TinkerGraph graph = TinkerFactory.createClassic();
- final GraphTraversalSource g = graph.traversal();
- final Map<Vertex, Integer> map = new HashMap<>();
- map.put(g.V().has("name", "marko").next(), 1000);
-
- final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(map).create(), allocator);
- final JsonNode json = mapper.readTree(results);
-
- assertNotNull(json);
- assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
- final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
-
- assertNotNull(converted);
-
- // with no embedded types the key (which is a vertex) simply serializes out to an id
- // {"result":{"1":1000},"code":200,"requestId":"2d62161b-9544-4f39-af44-62ec49f9a595","type":0}
- assertEquals(1000, converted.get("1").asInt());
- }
-
- @Test
- public void shouldDeserializeRequestNicelyWithNoArgs() throws Exception {
- final UUID request = UUID.fromString("011CFEE9-F640-4844-AC93-034448AC0E80");
- final RequestMessage m = SERIALIZER.deserializeRequest(String.format("{\"requestId\":\"%s\",\"op\":\"eval\"}", request));
- assertEquals(request, m.getRequestId());
- assertEquals("eval", m.getOp());
- assertNotNull(m.getArgs());
- assertEquals(0, m.getArgs().size());
- }
-
- @Test
- public void shouldDeserializeRequestNicelyWithArgs() throws Exception {
- final UUID request = UUID.fromString("011CFEE9-F640-4844-AC93-034448AC0E80");
- final RequestMessage m = SERIALIZER.deserializeRequest(String.format("{\"requestId\":\"%s\",\"op\":\"eval\",\"args\":{\"x\":\"y\"}}", request));
- assertEquals(request, m.getRequestId());
- assertEquals("eval", m.getOp());
- assertNotNull(m.getArgs());
- assertEquals("y", m.getArgs().get("x"));
- }
-
- @Test(expected = SerializationException.class)
- public void shouldDeserializeRequestParseMessage() throws Exception {
- SERIALIZER.deserializeRequest("{\"requestId\":\"%s\",\"op\":\"eval\",\"args\":{\"x\":\"y\"}}");
- }
-
- @Test
- public void shouldSerializeFullResponseMessage() throws Exception {
- final UUID id = UUID.randomUUID();
-
- final Map<String, Object> metaData = new HashMap<>();
- metaData.put("test", "this");
- metaData.put("one", 1);
-
- final Map<String, Object> attributes = new HashMap<>();
- attributes.put("test", "that");
- attributes.put("two", 2);
-
- final ResponseMessage response = ResponseMessage.build(id)
- .responseMetaData(metaData)
- .code(ResponseStatusCode.SUCCESS)
- .result("some-result")
- .statusAttributes(attributes)
- .statusMessage("worked")
- .create();
-
- final String results = SERIALIZER.serializeResponseAsString(response, allocator);
- final ResponseMessage deserialized = SERIALIZER.deserializeResponse(results);
-
- assertEquals(id, deserialized.getRequestId());
- assertEquals("this", deserialized.getResult().getMeta().get("test"));
- assertEquals(1, deserialized.getResult().getMeta().get("one"));
- assertEquals("some-result", deserialized.getResult().getData());
- assertEquals("that", deserialized.getStatus().getAttributes().get("test"));
- assertEquals(2, deserialized.getStatus().getAttributes().get("two"));
- assertEquals(ResponseStatusCode.SUCCESS.getValue(), deserialized.getStatus().getCode().getValue());
- assertEquals("worked", deserialized.getStatus().getMessage());
- }
-
- @Test
- public void shouldDeserializeResponseMessageWithNullMessage() throws Exception {
- final UUID id = UUID.randomUUID();
-
- final Map<String, Object> metaData = new HashMap<>();
- metaData.put("test", UUID.randomUUID().toString());
- final Map<String, Object> attributes = Collections.emptyMap();
-
- final ResponseMessage response = ResponseMessage.build(id)
- .responseMetaData(metaData)
- .code(ResponseStatusCode.SERVER_ERROR)
- .result("some-result")
- .statusAttributes(attributes)
- // explicitly pass the null value
- .statusMessage(null)
- .create();
-
- final String results = SERIALIZER.serializeResponseAsString(response, allocator);
- final ResponseMessage deserialized = SERIALIZER.deserializeResponse(results);
- Assert.assertNotNull(SERIALIZER.getClass().getSimpleName() + " should be able to deserialize ResponseMessage "
- + "with null message field", deserialized);
- }
-
- @Test
- public void shouldSerializeToJsonTree() throws Exception {
- final TinkerGraph graph = TinkerFactory.createClassic();
- final GraphTraversalSource g = graph.traversal();
- final Tree t = g.V(1).out().properties("name").tree().next();
-
-
- final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(t).create(), allocator);
-
- final JsonNode json = mapper.readTree(results);
-
- assertNotNull(json);
- assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
- final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
- assertNotNull(converted);
-
- //check the first object and it's properties
- assertEquals(1, converted.get("1").get("key").get("id").asInt());
- assertEquals("marko", converted.get("1").get("key").get("properties").get("name").get(0).get("value").asText());
-
- //check objects tree structure
- //check Vertex property
- assertEquals("vadas", converted.get("1")
- .get("value")
- .get("2")
- .get("value")
- .get("2").get("key").get("value").asText());
- assertEquals("name", converted.get("1")
- .get("value")
- .get("2")
- .get("value")
- .get("2").get("key").get("label").asText());
-
- // check subitem
- assertEquals("lop", converted.get("1")
- .get("value")
- .get("3")
- .get("key")
- .get("properties").get("name").get(0).get("value").asText());
- }
-
- private class FunObject {
- private String val;
-
- public FunObject(String val) {
- this.val = val;
- }
-
- public String toString() {
- return this.val;
- }
- }
-
- public static class ColorIoRegistry extends AbstractIoRegistry {
- public ColorIoRegistry() {
- register(GraphSONIo.class, null, new ColorSimpleModule());
- }
- }
-
- public static class ColorSimpleModule extends SimpleModule {
- public ColorSimpleModule() {
- super("color-fun");
- addSerializer(Color.class, new ColorSerializer());
-
- }
- }
-
- public static class ColorSerializer extends StdSerializer<Color> {
- public ColorSerializer() {
- super(Color.class);
- }
-
- @Override
- public void serialize(final Color color, final JsonGenerator jsonGenerator,
- final SerializerProvider serializerProvider) throws IOException, JsonGenerationException {
- jsonGenerator.writeBoolean(color.equals(Color.RED));
- }
- }
-}
diff --git a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONUntypedMessageSerializerV2Test.java b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONUntypedMessageSerializerV2Test.java
deleted file mode 100644
index 4eae80b..0000000
--- a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONUntypedMessageSerializerV2Test.java
+++ /dev/null
@@ -1,479 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.util.ser;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufAllocator;
-import io.netty.buffer.UnpooledByteBufAllocator;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.AbstractObjectDeserializer;
-import org.apache.tinkerpop.gremlin.util.MessageSerializer;
-import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.Property;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.apache.tinkerpop.gremlin.structure.io.AbstractIoRegistry;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONIo;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.apache.tinkerpop.shaded.jackson.core.JsonGenerationException;
-import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
-import org.apache.tinkerpop.shaded.jackson.databind.JsonNode;
-import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
-import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
-import org.apache.tinkerpop.shaded.jackson.databind.module.SimpleModule;
-import org.apache.tinkerpop.shaded.jackson.databind.node.NullNode;
-import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
-import org.apache.tinkerpop.shaded.jackson.databind.util.StdDateFormat;
-import org.junit.Assert;
-import org.junit.Test;
-
-import java.awt.Color;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
-
-/**
- * These tests focus on message serialization and not "result" serialization as test specific to results (e.g.
- * vertices, edges, annotated values, etc.) are handled in the IO packages.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class GraphSONUntypedMessageSerializerV2Test {
- public static final GraphSONUntypedMessageSerializerV2 SERIALIZER = new GraphSONUntypedMessageSerializerV2();
- private static final RequestMessage msg = RequestMessage.build("op")
- .overrideRequestId(UUID.fromString("2D62161B-9544-4F39-AF44-62EC49F9A595")).create();
- private static final ObjectMapper mapper = new ObjectMapper();
- private static final ByteBufAllocator allocator = ByteBufAllocator.DEFAULT;
-
- @Test
- public void shouldConfigureIoRegistry() throws Exception {
- final GraphSONUntypedMessageSerializerV2 serializer = new GraphSONUntypedMessageSerializerV2();
- final Map<String, Object> config = new HashMap<String, Object>() {{
- put(AbstractMessageSerializer.TOKEN_IO_REGISTRIES, Arrays.asList(ColorIoRegistry.class.getName()));
- }};
-
- serializer.configure(config, null);
-
- final ResponseMessage toSerialize = ResponseMessage.build(UUID.fromString("2D62161B-9544-4F39-AF44-62EC49F9A595"))
- .result(Color.RED).create();
- final String results = serializer.serializeResponseAsString(toSerialize, allocator);
- final JsonNode json = mapper.readTree(results);
- assertNotNull(json);
- assertThat(json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA).booleanValue(), is(true));
- }
-
- @Test
- public void shouldSerializeToJsonNullResultReturnsNull() throws Exception {
- final ResponseMessage message = ResponseMessage.build(msg).create();
- final String results = SERIALIZER.serializeResponseAsString(message, allocator);
- final JsonNode json = mapper.readTree(results);
- assertNotNull(json);
- assertEquals(msg.getRequestId().toString(), json.path(SerTokens.TOKEN_REQUEST).asText());
- assertEquals(NullNode.getInstance(), json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA));
- }
-
- @Test
- public void shouldSerializeToJsonIterable() throws Exception {
- final ArrayList<FunObject> funList = new ArrayList<>();
- funList.add(new FunObject("x"));
- funList.add(new FunObject("y"));
-
- final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(funList).create(), allocator);
- final JsonNode json = mapper.readTree(results);
-
- assertNotNull(json);
- assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
- final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
-
- assertEquals(2, converted.size());
-
- assertEquals("x", converted.get(0).asText());
- assertEquals("y", converted.get(1).asText());
- }
-
- @Test
- public void shouldSerializeToJsonIterator() throws Exception {
- final ArrayList<FunObject> funList = new ArrayList<>();
- funList.add(new FunObject("x"));
- funList.add(new FunObject("y"));
-
- final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(funList.iterator()).create(), allocator);
- final JsonNode json = mapper.readTree(results);
-
- assertNotNull(json);
- assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
- final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
-
- assertEquals(2, converted.size());
-
- assertEquals("x", converted.get(0).asText());
- assertEquals("y", converted.get(1).asText());
- }
-
- @Test
- public void shouldSerializeToJsonIteratorNullElement() throws Exception {
-
- final ArrayList<FunObject> funList = new ArrayList<>();
- funList.add(new FunObject("x"));
- funList.add(null);
- funList.add(new FunObject("y"));
-
- final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(funList.iterator()).create(), allocator);
- final JsonNode json = mapper.readTree(results);
-
- assertNotNull(json);
- assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
- final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
-
- assertEquals(3, converted.size());
-
- assertEquals("x", converted.get(0).asText());
- assertEquals(NullNode.getInstance(), converted.get(1));
- assertEquals("y", converted.get(2).asText());
- }
-
- @Test
- public void shouldSerializeToJsonMap() throws Exception {
- final Map<String, Object> map = new HashMap<>();
- final Map<String, String> innerMap = new HashMap<>();
- innerMap.put("a", "b");
-
- map.put("x", new FunObject("x"));
- map.put("y", "some");
- map.put("z", innerMap);
-
- final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(map).create(), allocator);
- final JsonNode json = mapper.readTree(results);
-
- assertNotNull(json);
- assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
- final JsonNode jsonObject = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
-
- assertNotNull(jsonObject);
- assertEquals("some", jsonObject.get("y").asText());
- assertEquals("x", jsonObject.get("x").asText());
-
- final JsonNode innerJsonObject = jsonObject.get("z");
- assertNotNull(innerJsonObject);
- assertEquals("b", innerJsonObject.get("a").asText());
- }
-
- @Test
- public void shouldShouldSerializeMapEntries() throws Exception {
- final Graph graph = TinkerGraph.open();
- final Vertex v1 = graph.addVertex();
- final Date d = new Date();
-
- final Map<Object, Object> map = new HashMap<>();
- map.put("x", 1);
- map.put(v1, 100);
- map.put(d, "test");
-
- final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(IteratorUtils.asList(map)).create(), allocator);
- final JsonNode json = mapper.readTree(results);
-
- assertNotNull(json);
- assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
- final JsonNode jsonObject = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
- jsonObject.elements().forEachRemaining(e -> {
- if (e.has("x"))
- assertEquals(1, e.get("x").asInt());
- else if (e.has(v1.id().toString()))
- assertEquals(100, e.get(v1.id().toString()).asInt());
- else if (e.has(StdDateFormat.instance.format(d)))
- assertEquals("test", e.get(StdDateFormat.instance.format(d)).asText());
- else
- fail("Map entries contains a key that is not part of what was serialized");
- });
- }
-
- @Test
- public void shouldSerializeEdge() throws Exception {
- final Graph g = TinkerGraph.open();
- final Vertex v1 = g.addVertex();
- final Vertex v2 = g.addVertex();
- final Edge e = v1.addEdge("test", v2);
- e.property("abc", 123);
-
- final Iterable<Edge> iterable = IteratorUtils.list(g.edges());
- final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(iterable).create(), allocator);
-
- final JsonNode json = mapper.readTree(results);
-
- assertNotNull(json);
- assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
- final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
-
- assertNotNull(converted);
- assertEquals(1, converted.size());
-
- final JsonNode edgeAsJson = converted.get(0);
- assertNotNull(edgeAsJson);
-
- assertEquals(((Long) e.id()).intValue(), edgeAsJson.get(GraphSONTokens.ID).asLong()); // lossy
- assertEquals(((Long) v1.id()).intValue(), edgeAsJson.get(GraphSONTokens.OUT).asLong());// lossy
- assertEquals(((Long) v2.id()).intValue(), edgeAsJson.get(GraphSONTokens.IN).asLong()); // lossy
- assertEquals(e.label(), edgeAsJson.get(GraphSONTokens.LABEL).asText());
- assertEquals(e.inVertex().label(), edgeAsJson.get(GraphSONTokens.IN_LABEL).asText());
- assertEquals(e.outVertex().label(), edgeAsJson.get(GraphSONTokens.OUT_LABEL).asText());
-
- final JsonNode properties = edgeAsJson.get(GraphSONTokens.PROPERTIES);
- assertNotNull(properties);
- assertEquals("abc", properties.get("abc").get(GraphSONTokens.KEY).textValue());
- assertEquals(123, properties.get("abc").get(GraphSONTokens.VALUE).intValue());
- }
-
- @Test
- public void shouldSerializeEdgeProperty() throws Exception {
- final Graph g = TinkerGraph.open();
- final Vertex v1 = g.addVertex();
- final Vertex v2 = g.addVertex();
- final Edge e = v1.addEdge("test", v2);
- e.property("abc", 123);
-
- final Iterable<Property<Object>> iterable = IteratorUtils.list(e.properties("abc"));
- final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(iterable).create(), allocator);
-
- final JsonNode json = mapper.readTree(results);
-
- assertNotNull(json);
- assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
- final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
-
- assertNotNull(converted);
- assertEquals(1, converted.size());
-
- final JsonNode propertyAsJson = converted.get(0);
- assertNotNull(propertyAsJson);
-
- assertEquals(123, propertyAsJson.get("value").asInt());
- }
-
- @Test
- public void shouldSerializeToJsonIteratorWithEmbeddedMap() throws Exception {
- final Graph g = TinkerGraph.open();
- final Vertex v = g.addVertex();
- final Map<String, Object> map = new HashMap<>();
- map.put("x", 500);
- map.put("y", "some");
-
- final ArrayList<Object> friends = new ArrayList<>();
- friends.add("x");
- friends.add(5);
- friends.add(map);
-
- v.property(VertexProperty.Cardinality.single, "friends", friends);
-
- final Iterable iterable = IteratorUtils.list(g.vertices());
- final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(iterable).create(), allocator);
- final JsonNode json = mapper.readTree(results);
-
- assertNotNull(json);
- assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
- final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
-
- assertNotNull(converted);
- assertEquals(1, converted.size());
-
- final JsonNode vertexAsJson = converted.get(0);
- assertNotNull(vertexAsJson);
-
- final JsonNode properties = vertexAsJson.get(GraphSONTokens.PROPERTIES);
- assertNotNull(properties);
- assertEquals(1, properties.size());
-
- final JsonNode friendProperties = properties.get("friends");
- assertEquals(1, friendProperties.size());
- final JsonNode friendsProperty = friendProperties.get(0);
- assertNotNull(friendsProperty);
- assertEquals(3, friends.size());
-
- final String object1 = friendsProperty.get(GraphSONTokens.VALUE).get(0).asText();
- assertEquals("x", object1);
-
- final int object2 = friendsProperty.get(GraphSONTokens.VALUE).get(1).asInt();
- assertEquals(5, object2);
-
- final JsonNode object3 = friendsProperty.get(GraphSONTokens.VALUE).get(2);
- assertEquals(500, object3.get("x").asInt());
- assertEquals("some", object3.get("y").asText());
- }
-
- @Test
- public void shouldSerializeToJsonMapWithElementForKey() throws Exception {
- final TinkerGraph graph = TinkerFactory.createClassic();
- final GraphTraversalSource g = graph.traversal();
- final Map<Vertex, Integer> map = new HashMap<>();
- map.put(g.V().has("name", "marko").next(), 1000);
-
- final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(map).create(), allocator);
- final JsonNode json = mapper.readTree(results);
-
- assertNotNull(json);
- assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
- final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
-
- assertNotNull(converted);
-
- // with no embedded types the key (which is a vertex) simply serializes out to an id
- // {"result":{"1":1000},"code":200,"requestId":"2d62161b-9544-4f39-af44-62ec49f9a595","type":0}
- assertEquals(1000, converted.get("1").asInt());
- }
-
- @Test
- public void shouldDeserializeRequestNicelyWithNoArgs() throws Exception {
- final UUID request = UUID.fromString("011CFEE9-F640-4844-AC93-034448AC0E80");
- final RequestMessage m = SERIALIZER.deserializeRequest(String.format("{\"requestId\":\"%s\",\"op\":\"eval\"}", request));
- assertEquals(request, m.getRequestId());
- assertEquals("eval", m.getOp());
- assertNotNull(m.getArgs());
- assertEquals(0, m.getArgs().size());
- }
-
- @Test
- public void shouldDeserializeRequestNicelyWithArgs() throws Exception {
- final UUID request = UUID.fromString("011CFEE9-F640-4844-AC93-034448AC0E80");
- final RequestMessage m = SERIALIZER.deserializeRequest(String.format("{\"requestId\":\"%s\",\"op\":\"eval\",\"args\":{\"x\":\"y\"}}", request));
- assertEquals(request, m.getRequestId());
- assertEquals("eval", m.getOp());
- assertNotNull(m.getArgs());
- assertEquals("y", m.getArgs().get("x"));
- }
-
- @Test(expected = SerializationException.class)
- public void shouldDeserializeRequestParseMessage() throws Exception {
- SERIALIZER.deserializeRequest("{\"requestId\":\"%s\",\"op\":\"eval\",\"args\":{\"x\":\"y\"}}");
- }
-
- @Test
- public void shouldSerializeFullResponseMessage() throws Exception {
- final UUID id = UUID.randomUUID();
-
- final Map<String, Object> metaData = new HashMap<>();
- metaData.put("test", "this");
- metaData.put("one", 1);
-
- final Map<String, Object> attributes = new HashMap<>();
- attributes.put("test", "that");
- attributes.put("two", 2);
-
- final ResponseMessage response = ResponseMessage.build(id)
- .responseMetaData(metaData)
- .code(ResponseStatusCode.SUCCESS)
- .result("some-result")
- .statusAttributes(attributes)
- .statusMessage("worked")
- .create();
-
- final String results = SERIALIZER.serializeResponseAsString(response, allocator);
- final ResponseMessage deserialized = SERIALIZER.deserializeResponse(results);
-
- assertEquals(id, deserialized.getRequestId());
- assertEquals("this", deserialized.getResult().getMeta().get("test"));
- assertEquals(1, deserialized.getResult().getMeta().get("one"));
- assertEquals("some-result", deserialized.getResult().getData());
- assertEquals("that", deserialized.getStatus().getAttributes().get("test"));
- assertEquals(2, deserialized.getStatus().getAttributes().get("two"));
- assertEquals(ResponseStatusCode.SUCCESS.getValue(), deserialized.getStatus().getCode().getValue());
- assertEquals("worked", deserialized.getStatus().getMessage());
- }
-
- @Test
- public void shouldDeserializeResponseMessageWithNullMessage() throws Exception {
- final UUID id = UUID.randomUUID();
-
- final Map<String, Object> metaData = new HashMap<>();
- metaData.put("test", UUID.randomUUID().toString());
- final Map<String, Object> attributes = Collections.emptyMap();
-
- final ResponseMessage response = ResponseMessage.build(id)
- .responseMetaData(metaData)
- .code(ResponseStatusCode.SERVER_ERROR)
- .result("some-result")
- .statusAttributes(attributes)
- // explicitly pass the null value
- .statusMessage(null)
- .create();
-
- final String results = SERIALIZER.serializeResponseAsString(response, allocator);
- final ResponseMessage deserialized = SERIALIZER.deserializeResponse(results);
- Assert.assertNotNull(SERIALIZER.getClass().getSimpleName() + " should be able to deserialize ResponseMessage "
- + "with null message field", deserialized);
- }
-
- private class FunObject {
- private String val;
-
- public FunObject(String val) {
- this.val = val;
- }
-
- public String toString() {
- return this.val;
- }
- }
-
- public static class ColorIoRegistry extends AbstractIoRegistry {
- public ColorIoRegistry() {
- register(GraphSONIo.class, null, new GraphSONUntypedMessageSerializerV1Test.ColorSimpleModule());
- }
- }
-
- public static class ColorSimpleModule extends SimpleModule {
- public ColorSimpleModule() {
- super("color-fun");
- addSerializer(Color.class, new GraphSONUntypedMessageSerializerV1Test.ColorSerializer());
-
- }
- }
-
- public static class ColorSerializer extends StdSerializer<Color> {
- public ColorSerializer() {
- super(Color.class);
- }
-
- @Override
- public void serialize(final Color color, final JsonGenerator jsonGenerator,
- final SerializerProvider serializerProvider) throws IOException, JsonGenerationException {
- jsonGenerator.writeBoolean(color.equals(Color.RED));
- }
- }
-}
diff --git a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONUntypedMessageSerializerV3Test.java b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONUntypedMessageSerializerV3Test.java
deleted file mode 100644
index 6534062..0000000
--- a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONUntypedMessageSerializerV3Test.java
+++ /dev/null
@@ -1,471 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.util.ser;
-
-import io.netty.buffer.ByteBufAllocator;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.Property;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.apache.tinkerpop.gremlin.structure.io.AbstractIoRegistry;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONIo;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
-import org.apache.tinkerpop.shaded.jackson.core.JsonGenerationException;
-import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
-import org.apache.tinkerpop.shaded.jackson.databind.JsonNode;
-import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
-import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
-import org.apache.tinkerpop.shaded.jackson.databind.module.SimpleModule;
-import org.apache.tinkerpop.shaded.jackson.databind.node.NullNode;
-import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
-import org.apache.tinkerpop.shaded.jackson.databind.util.StdDateFormat;
-import org.junit.Assert;
-import org.junit.Test;
-
-import java.awt.*;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-
-/**
- * These tests focus on message serialization and not "result" serialization as test specific to results (e.g.
- * vertices, edges, annotated values, etc.) are handled in the IO packages.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class GraphSONUntypedMessageSerializerV3Test {
- public static final GraphSONUntypedMessageSerializerV3 SERIALIZER = new GraphSONUntypedMessageSerializerV3();
- private static final RequestMessage msg = RequestMessage.build("op")
- .overrideRequestId(UUID.fromString("2D62161B-9544-4F39-AF44-62EC49F9A595")).create();
- private static final ObjectMapper mapper = new ObjectMapper();
- private static final ByteBufAllocator allocator = ByteBufAllocator.DEFAULT;
-
- @Test
- public void shouldConfigureIoRegistry() throws Exception {
- final GraphSONUntypedMessageSerializerV3 serializer = new GraphSONUntypedMessageSerializerV3();
- final Map<String, Object> config = new HashMap<String, Object>() {{
- put(AbstractMessageSerializer.TOKEN_IO_REGISTRIES, Arrays.asList(ColorIoRegistry.class.getName()));
- }};
-
- serializer.configure(config, null);
-
- final ResponseMessage toSerialize = ResponseMessage.build(UUID.fromString("2D62161B-9544-4F39-AF44-62EC49F9A595"))
- .result(Color.RED).create();
- final String results = serializer.serializeResponseAsString(toSerialize, allocator);
- final JsonNode json = mapper.readTree(results);
- assertNotNull(json);
- assertThat(json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA).booleanValue(), is(true));
- }
-
- @Test
- public void shouldSerializeToJsonNullResultReturnsNull() throws Exception {
- final ResponseMessage message = ResponseMessage.build(msg).create();
- final String results = SERIALIZER.serializeResponseAsString(message, allocator);
- final JsonNode json = mapper.readTree(results);
- assertNotNull(json);
- assertEquals(msg.getRequestId().toString(), json.path(SerTokens.TOKEN_REQUEST).asText());
- assertEquals(NullNode.getInstance(), json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA));
- }
-
- @Test
- public void shouldSerializeToJsonIterable() throws Exception {
- final ArrayList<FunObject> funList = new ArrayList<>();
- funList.add(new FunObject("x"));
- funList.add(new FunObject("y"));
-
- final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(funList).create(), allocator);
- final JsonNode json = mapper.readTree(results);
-
- assertNotNull(json);
- assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
- final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
-
- assertEquals(2, converted.size());
-
- assertEquals("x", converted.get(0).asText());
- assertEquals("y", converted.get(1).asText());
- }
-
- @Test
- public void shouldSerializeToJsonIterator() throws Exception {
- final ArrayList<FunObject> funList = new ArrayList<>();
- funList.add(new FunObject("x"));
- funList.add(new FunObject("y"));
-
- final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(funList.iterator()).create(), allocator);
- final JsonNode json = mapper.readTree(results);
-
- assertNotNull(json);
- assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
- final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
-
- assertEquals(2, converted.size());
-
- assertEquals("x", converted.get(0).asText());
- assertEquals("y", converted.get(1).asText());
- }
-
- @Test
- public void shouldSerializeToJsonIteratorNullElement() throws Exception {
-
- final ArrayList<FunObject> funList = new ArrayList<>();
- funList.add(new FunObject("x"));
- funList.add(null);
- funList.add(new FunObject("y"));
-
- final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(funList.iterator()).create(), allocator);
- final JsonNode json = mapper.readTree(results);
-
- assertNotNull(json);
- assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
- final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
-
- assertEquals(3, converted.size());
-
- assertEquals("x", converted.get(0).asText());
- assertEquals(NullNode.getInstance(), converted.get(1));
- assertEquals("y", converted.get(2).asText());
- }
-
- @Test
- public void shouldSerializeToJsonMap() throws Exception {
- final Map<String, Object> map = new HashMap<>();
- final Map<String, String> innerMap = new HashMap<>();
- innerMap.put("a", "b");
-
- map.put("x", new FunObject("x"));
- map.put("y", "some");
- map.put("z", innerMap);
-
- final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(map).create(), allocator);
- final JsonNode json = mapper.readTree(results);
-
- assertNotNull(json);
- assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
- final JsonNode jsonObject = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
-
- assertNotNull(jsonObject);
- assertEquals("some", jsonObject.get("y").asText());
- assertEquals("x", jsonObject.get("x").asText());
-
- final JsonNode innerJsonObject = jsonObject.get("z");
- assertNotNull(innerJsonObject);
- assertEquals("b", innerJsonObject.get("a").asText());
- }
-
- @Test
- public void shouldShouldSerializeMapEntries() throws Exception {
- final Graph graph = TinkerGraph.open();
- final Vertex v1 = graph.addVertex();
- final Date d = new Date();
-
- final Map<Object, Object> map = new HashMap<>();
- map.put("x", 1);
- map.put(v1, 100);
- map.put(d, "test");
-
- final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(IteratorUtils.asList(map)).create(), allocator);
- final JsonNode json = mapper.readTree(results);
-
- assertNotNull(json);
- assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
- final JsonNode jsonObject = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
- jsonObject.elements().forEachRemaining(e -> {
- if (e.has("x"))
- assertEquals(1, e.get("x").asInt());
- else if (e.has(v1.id().toString()))
- assertEquals(100, e.get(v1.id().toString()).asInt());
- else if (e.has(StdDateFormat.instance.format(d)))
- assertEquals("test", e.get(StdDateFormat.instance.format(d)).asText());
- else
- fail("Map entries contains a key that is not part of what was serialized");
- });
- }
-
- @Test
- public void shouldSerializeEdge() throws Exception {
- final Graph g = TinkerGraph.open();
- final Vertex v1 = g.addVertex();
- final Vertex v2 = g.addVertex();
- final Edge e = v1.addEdge("test", v2);
- e.property("abc", 123);
-
- final Iterable<Edge> iterable = IteratorUtils.list(g.edges());
- final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(iterable).create(), allocator);
-
- final JsonNode json = mapper.readTree(results);
-
- assertNotNull(json);
- assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
- final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
-
- assertNotNull(converted);
- assertEquals(1, converted.size());
-
- final JsonNode edgeAsJson = converted.get(0);
- assertNotNull(edgeAsJson);
-
- assertEquals(((Long) e.id()).intValue(), edgeAsJson.get(GraphSONTokens.ID).asLong()); // lossy
- assertEquals(((Long) v1.id()).intValue(), edgeAsJson.get(GraphSONTokens.OUT).asLong());// lossy
- assertEquals(((Long) v2.id()).intValue(), edgeAsJson.get(GraphSONTokens.IN).asLong()); // lossy
- assertEquals(e.label(), edgeAsJson.get(GraphSONTokens.LABEL).asText());
- assertEquals(e.inVertex().label(), edgeAsJson.get(GraphSONTokens.IN_LABEL).asText());
- assertEquals(e.outVertex().label(), edgeAsJson.get(GraphSONTokens.OUT_LABEL).asText());
-
- final JsonNode properties = edgeAsJson.get(GraphSONTokens.PROPERTIES);
- assertNotNull(properties);
- assertEquals("abc", properties.get("abc").get(GraphSONTokens.KEY).textValue());
- assertEquals(123, properties.get("abc").get(GraphSONTokens.VALUE).intValue());
- }
-
- @Test
- public void shouldSerializeEdgeProperty() throws Exception {
- final Graph g = TinkerGraph.open();
- final Vertex v1 = g.addVertex();
- final Vertex v2 = g.addVertex();
- final Edge e = v1.addEdge("test", v2);
- e.property("abc", 123);
-
- final Iterable<Property<Object>> iterable = IteratorUtils.list(e.properties("abc"));
- final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(iterable).create(), allocator);
-
- final JsonNode json = mapper.readTree(results);
-
- assertNotNull(json);
- assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
- final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
-
- assertNotNull(converted);
- assertEquals(1, converted.size());
-
- final JsonNode propertyAsJson = converted.get(0);
- assertNotNull(propertyAsJson);
-
- assertEquals(123, propertyAsJson.get("value").asInt());
- }
-
- @Test
- public void shouldSerializeToJsonIteratorWithEmbeddedMap() throws Exception {
- final Graph g = TinkerGraph.open();
- final Vertex v = g.addVertex();
- final Map<String, Object> map = new HashMap<>();
- map.put("x", 500);
- map.put("y", "some");
-
- final ArrayList<Object> friends = new ArrayList<>();
- friends.add("x");
- friends.add(5);
- friends.add(map);
-
- v.property(VertexProperty.Cardinality.single, "friends", friends);
-
- final Iterable iterable = IteratorUtils.list(g.vertices());
- final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(iterable).create(), allocator);
- final JsonNode json = mapper.readTree(results);
-
- assertNotNull(json);
- assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
- final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
-
- assertNotNull(converted);
- assertEquals(1, converted.size());
-
- final JsonNode vertexAsJson = converted.get(0);
- assertNotNull(vertexAsJson);
-
- final JsonNode properties = vertexAsJson.get(GraphSONTokens.PROPERTIES);
- assertNotNull(properties);
- assertEquals(1, properties.size());
-
- final JsonNode friendProperties = properties.get("friends");
- assertEquals(1, friendProperties.size());
- final JsonNode friendsProperty = friendProperties.get(0);
- assertNotNull(friendsProperty);
- assertEquals(3, friends.size());
-
- final String object1 = friendsProperty.get(GraphSONTokens.VALUE).get(0).asText();
- assertEquals("x", object1);
-
- final int object2 = friendsProperty.get(GraphSONTokens.VALUE).get(1).asInt();
- assertEquals(5, object2);
-
- final JsonNode object3 = friendsProperty.get(GraphSONTokens.VALUE).get(2);
- assertEquals(500, object3.get("x").asInt());
- assertEquals("some", object3.get("y").asText());
- }
-
- @Test
- public void shouldSerializeToJsonMapWithElementForKey() throws Exception {
- final TinkerGraph graph = TinkerFactory.createClassic();
- final GraphTraversalSource g = graph.traversal();
- final Map<Vertex, Integer> map = new HashMap<>();
- map.put(g.V().has("name", "marko").next(), 1000);
-
- final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(map).create(), allocator);
- final JsonNode json = mapper.readTree(results);
-
- assertNotNull(json);
- assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
- final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
-
- assertNotNull(converted);
-
- // with no embedded types the key (which is a vertex) simply serializes out to an id
- // {"result":{"1":1000},"code":200,"requestId":"2d62161b-9544-4f39-af44-62ec49f9a595","type":0}
- assertEquals(1000, converted.get("1").asInt());
- }
-
- @Test
- public void shouldDeserializeRequestNicelyWithNoArgs() throws Exception {
- final UUID request = UUID.fromString("011CFEE9-F640-4844-AC93-034448AC0E80");
- final RequestMessage m = SERIALIZER.deserializeRequest(String.format("{\"requestId\":\"%s\",\"op\":\"eval\"}", request));
- assertEquals(request, m.getRequestId());
- assertEquals("eval", m.getOp());
- assertNotNull(m.getArgs());
- assertEquals(0, m.getArgs().size());
- }
-
- @Test
- public void shouldDeserializeRequestNicelyWithArgs() throws Exception {
- final UUID request = UUID.fromString("011CFEE9-F640-4844-AC93-034448AC0E80");
- final RequestMessage m = SERIALIZER.deserializeRequest(String.format("{\"requestId\":\"%s\",\"op\":\"eval\",\"args\":{\"x\":\"y\"}}", request));
- assertEquals(request, m.getRequestId());
- assertEquals("eval", m.getOp());
- assertNotNull(m.getArgs());
- assertEquals("y", m.getArgs().get("x"));
- }
-
- @Test(expected = SerializationException.class)
- public void shouldDeserializeRequestParseMessage() throws Exception {
- SERIALIZER.deserializeRequest("{\"requestId\":\"%s\",\"op\":\"eval\",\"args\":{\"x\":\"y\"}}");
- }
-
- @Test
- public void shouldSerializeFullResponseMessage() throws Exception {
- final UUID id = UUID.randomUUID();
-
- final Map<String, Object> metaData = new HashMap<>();
- metaData.put("test", "this");
- metaData.put("one", 1);
-
- final Map<String, Object> attributes = new HashMap<>();
- attributes.put("test", "that");
- attributes.put("two", 2);
-
- final ResponseMessage response = ResponseMessage.build(id)
- .responseMetaData(metaData)
- .code(ResponseStatusCode.SUCCESS)
- .result("some-result")
- .statusAttributes(attributes)
- .statusMessage("worked")
- .create();
-
- final String results = SERIALIZER.serializeResponseAsString(response, allocator);
- final ResponseMessage deserialized = SERIALIZER.deserializeResponse(results);
-
- assertEquals(id, deserialized.getRequestId());
- assertEquals("this", deserialized.getResult().getMeta().get("test"));
- assertEquals(1, deserialized.getResult().getMeta().get("one"));
- assertEquals("some-result", deserialized.getResult().getData());
- assertEquals("that", deserialized.getStatus().getAttributes().get("test"));
- assertEquals(2, deserialized.getStatus().getAttributes().get("two"));
- assertEquals(ResponseStatusCode.SUCCESS.getValue(), deserialized.getStatus().getCode().getValue());
- assertEquals("worked", deserialized.getStatus().getMessage());
- }
-
- @Test
- public void shouldDeserializeResponseMessageWithNullMessage() throws Exception {
- final UUID id = UUID.randomUUID();
-
- final Map<String, Object> metaData = new HashMap<>();
- metaData.put("test", UUID.randomUUID().toString());
- final Map<String, Object> attributes = Collections.emptyMap();
-
- final ResponseMessage response = ResponseMessage.build(id)
- .responseMetaData(metaData)
- .code(ResponseStatusCode.SERVER_ERROR)
- .result("some-result")
- .statusAttributes(attributes)
- // explicitly pass the null value
- .statusMessage(null)
- .create();
-
- final String results = SERIALIZER.serializeResponseAsString(response, allocator);
- final ResponseMessage deserialized = SERIALIZER.deserializeResponse(results);
- Assert.assertNotNull(SERIALIZER.getClass().getSimpleName() + " should be able to deserialize ResponseMessage "
- + "with null message field", deserialized);
- }
-
- private class FunObject {
- private String val;
-
- public FunObject(String val) {
- this.val = val;
- }
-
- public String toString() {
- return this.val;
- }
- }
-
- public static class ColorIoRegistry extends AbstractIoRegistry {
- public ColorIoRegistry() {
- register(GraphSONIo.class, null, new GraphSONUntypedMessageSerializerV1Test.ColorSimpleModule());
- }
- }
-
- public static class ColorSimpleModule extends SimpleModule {
- public ColorSimpleModule() {
- super("color-fun");
- addSerializer(Color.class, new GraphSONUntypedMessageSerializerV1Test.ColorSerializer());
-
- }
- }
-
- public static class ColorSerializer extends StdSerializer<Color> {
- public ColorSerializer() {
- super(Color.class);
- }
-
- @Override
- public void serialize(final Color color, final JsonGenerator jsonGenerator,
- final SerializerProvider serializerProvider) throws IOException, JsonGenerationException {
- jsonGenerator.writeBoolean(color.equals(Color.RED));
- }
- }
-}
diff --git a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONUntypedMessageSerializerV4Test.java b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONUntypedMessageSerializerV4Test.java
new file mode 100644
index 0000000..50eabe2
--- /dev/null
+++ b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONUntypedMessageSerializerV4Test.java
@@ -0,0 +1,166 @@
+/*
+ * 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.util.ser;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.buffer.UnpooledByteBufAllocator;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.util.CharsetUtil;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.shaded.jackson.core.JsonProcessingException;
+import org.apache.tinkerpop.shaded.jackson.databind.JsonNode;
+import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import static org.apache.tinkerpop.gremlin.util.ser.SerTokens.TOKEN_DATA;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+public class GraphSONUntypedMessageSerializerV4Test {
+
+ private final ResponseMessage.Builder responseMessageBuilder = ResponseMessage.build();
+ private final GraphSONUntypedMessageSerializerV4 serializer = new GraphSONUntypedMessageSerializerV4();
+ private final static ByteBufAllocator allocator = UnpooledByteBufAllocator.DEFAULT;
+ private final ObjectMapper mapper = new ObjectMapper();
+
+ @Test
+ public void shouldSerializeChunkedResponseMessage() throws SerializationException, JsonProcessingException {
+ final ResponseMessage header = ResponseMessage.build()
+ .result(Arrays.asList("header", 0))
+ .create();
+
+ final ResponseMessage footer = ResponseMessage.build()
+ .result(Arrays.asList("footer", 3))
+ .code(HttpResponseStatus.OK)
+ .create();
+
+ final ByteBuf bb0 = serializer.writeHeader(header, allocator);
+ final ByteBuf bb1 = serializer.writeChunk(Arrays.asList("chunk", 1), allocator);
+ final ByteBuf bb2 = serializer.writeChunk(Arrays.asList("chunk", 2), allocator);
+ final ByteBuf bb3 = serializer.writeFooter(footer, allocator);
+
+ final ByteBuf bbCombined = allocator.buffer().writeBytes(bb0).writeBytes(bb1).writeBytes(bb2).writeBytes(bb3);
+
+ final String json = bbCombined.readCharSequence(bbCombined.readableBytes(), CharsetUtil.UTF_8).toString();
+
+ final JsonNode node = mapper.readTree(json);
+
+ assertEquals("header", node.get("result").get(TOKEN_DATA).get(0).textValue());
+ assertEquals("footer", node.get("result").get(TOKEN_DATA).get(6).textValue());
+ assertEquals(8, node.get("result").get(TOKEN_DATA).size());
+ assertNull(node.get("status").get("message"));
+ assertEquals(200, node.get("status").get("code").asInt());
+
+ // a message composed of all chunks must be deserialized
+ bbCombined.resetReaderIndex();
+ final ResponseMessage deserialized = serializer.deserializeBinaryResponse(bbCombined);
+ assertEquals(200, deserialized.getStatus().getCode().code());
+ assertEquals(null, deserialized.getStatus().getMessage());
+ assertEquals(8, ((List)deserialized.getResult().getData()).size());
+ }
+
+ @Test
+ public void shouldSerializeResponseMessageWithoutData() throws SerializationException, JsonProcessingException {
+ final ResponseMessage header = ResponseMessage.build()
+ .code(HttpResponseStatus.OK)
+ .create();
+
+ final ByteBuf bb0 = serializer.writeHeader(header, allocator);
+
+ final String json = bb0.readCharSequence(bb0.readableBytes(), CharsetUtil.UTF_8).toString();
+
+ final JsonNode node = mapper.readTree(json);
+
+ assertEquals(0, node.get("result").get(TOKEN_DATA).size());
+ assertNull(node.get("status").get("message"));
+ assertEquals(200, node.get("status").get("code").asInt());
+
+ bb0.resetReaderIndex();
+ final ResponseMessage deserialized = serializer.deserializeBinaryResponse(bb0);
+ assertEquals(200, deserialized.getStatus().getCode().code());
+ assertEquals(null, deserialized.getStatus().getMessage());
+ assertEquals(0, ((List)deserialized.getResult().getData()).size());
+ }
+
+ @Test
+ public void shouldSerializeChunkedResponseMessageWithEmptyData() throws SerializationException, JsonProcessingException {
+ final ResponseMessage header = ResponseMessage.build()
+ .result(new ArrayList<>())
+ .code(HttpResponseStatus.OK)
+ .statusMessage("OK")
+ .create();
+
+ final ByteBuf bb0 = serializer.writeHeader(header, allocator);
+
+ final String json = bb0.readCharSequence(bb0.readableBytes(), CharsetUtil.UTF_8).toString();
+
+ final JsonNode node = mapper.readTree(json);
+
+ assertEquals(0, node.get("result").get(TOKEN_DATA).size());
+ assertEquals("OK", node.get("status").get("message").asText());
+ assertEquals(200, node.get("status").get("code").asInt());
+
+ bb0.resetReaderIndex();
+ final ResponseMessage deserialized = serializer.deserializeBinaryResponse(bb0);
+ assertEquals(200, deserialized.getStatus().getCode().code());
+ assertEquals("OK", deserialized.getStatus().getMessage());
+ assertEquals(0, ((List)deserialized.getResult().getData()).size());
+ }
+
+ @Test
+ public void shouldSerializeChunkedResponseMessageWithError() throws SerializationException, JsonProcessingException {
+ final ResponseMessage header = ResponseMessage.build()
+ .result(Arrays.asList("header", 0))
+ .create();
+
+ final ResponseMessage footer = ResponseMessage.build()
+ .result(Arrays.asList("footer", 3))
+ .code(HttpResponseStatus.INTERNAL_SERVER_ERROR)
+ .statusMessage("SERVER_ERROR")
+ .create();
+
+ final ByteBuf bb0 = serializer.writeHeader(header, allocator);
+ final ByteBuf bb1 = serializer.writeChunk(Arrays.asList("chunk", 1), allocator);
+ final ByteBuf bb2 = serializer.writeChunk(Arrays.asList("chunk", 2), allocator);
+ final ByteBuf bb3 = serializer.writeErrorFooter(footer, allocator);
+
+ final ByteBuf bbCombined = allocator.buffer().writeBytes(bb0).writeBytes(bb1).writeBytes(bb2).writeBytes(bb3);
+
+ final String json = bbCombined.readCharSequence(bbCombined.readableBytes(), CharsetUtil.UTF_8).toString();
+
+ final JsonNode node = mapper.readTree(json);
+
+ assertEquals("header", node.get("result").get(TOKEN_DATA).get(0).textValue());
+ // 6 items in first 3 chunks
+ assertEquals(6, node.get("result").get(TOKEN_DATA).size());
+ assertEquals("SERVER_ERROR", node.get("status").get("message").asText());
+ assertEquals(500, node.get("status").get("code").asInt());
+
+ bbCombined.resetReaderIndex();
+ final ResponseMessage deserialized = serializer.deserializeBinaryResponse(bbCombined);
+ assertEquals(500, deserialized.getStatus().getCode().code());
+ assertEquals("SERVER_ERROR", deserialized.getStatus().getMessage());
+ assertEquals(6, ((List)deserialized.getResult().getData()).size());
+ }
+}
diff --git a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/binary/GraphBinaryMessageSerializerV1Test.java b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/binary/GraphBinaryMessageSerializerV1Test.java
deleted file mode 100644
index 09bc419..0000000
--- a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/binary/GraphBinaryMessageSerializerV1Test.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.util.ser.binary;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufAllocator;
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-import org.apache.tinkerpop.gremlin.util.Tokens;
-import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1;
-import org.apache.tinkerpop.gremlin.util.ser.SerializationException;
-import org.apache.tinkerpop.gremlin.structure.io.binary.TypeSerializerRegistry;
-import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
-import org.junit.Test;
-
-import java.nio.charset.StandardCharsets;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import static org.apache.tinkerpop.gremlin.util.MockitoHamcrestMatcherAdapter.reflectionEquals;
-import static org.junit.Assert.assertEquals;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.hasItemInArray;
-
-public class GraphBinaryMessageSerializerV1Test {
- private final ByteBufAllocator allocator = ByteBufAllocator.DEFAULT;
- private final GraphBinaryMessageSerializerV1 serializer = new GraphBinaryMessageSerializerV1();
-
- @Test
- public void shouldSerializeAndDeserializeRequest() throws SerializationException {
- final GraphTraversalSource g = EmptyGraph.instance().traversal();
- final Traversal.Admin t = g.V().hasLabel("person").out().asAdmin();
-
- final Map<String, String> aliases = new HashMap<>();
- aliases.put("g","g");
-
- final RequestMessage request = RequestMessage.build(Tokens.OPS_BYTECODE)
- .processor("traversal")
- .overrideRequestId(UUID.randomUUID())
- .addArg(Tokens.ARGS_GREMLIN, t.getBytecode())
- .addArg(Tokens.ARGS_ALIASES, aliases)
- .create();
-
- final ByteBuf buffer = serializer.serializeRequestAsBinary(request, allocator);
- final int mimeLen = buffer.readByte();
- final byte[] bytes = new byte[mimeLen];
- buffer.readBytes(bytes);
- final String mimeType = new String(bytes, StandardCharsets.UTF_8);
-
- final RequestMessage deserialized = serializer.deserializeRequest(buffer);
- assertThat(request, reflectionEquals(deserialized));
- assertThat(serializer.mimeTypesSupported(), hasItemInArray(mimeType));
- }
-
- @Test
- public void shouldSerializeAndDeserializeRequestOverText() throws SerializationException {
- final RequestMessage request = RequestMessage.build("op1")
- .processor("proc1")
- .overrideRequestId(UUID.randomUUID())
- .addArg("arg1", "value1")
- .create();
-
- final String base64 = serializer.serializeRequestAsString(request, allocator);
- final RequestMessage deserialized = serializer.deserializeRequest(base64);
- assertThat(request, reflectionEquals(deserialized));
- }
-
- @Test
- public void shouldSerializeAndDeserializeRequestWithoutArgs() throws SerializationException {
- final RequestMessage request = RequestMessage.build("op1")
- .processor("proc1")
- .overrideRequestId(UUID.randomUUID())
- .create();
-
- final ByteBuf buffer = serializer.serializeRequestAsBinary(request, allocator);
- final int mimeLen = buffer.readByte();
- buffer.readBytes(new byte[mimeLen]);
- final RequestMessage deserialized = serializer.deserializeRequest(buffer);
- assertThat(request, reflectionEquals(deserialized));
- }
-
- @Test
- public void shouldSerializeAndDeserializeRequestWithUnsetProcessor() throws SerializationException {
- final RequestMessage request = RequestMessage.build("op1")
- .overrideRequestId(UUID.randomUUID())
- .addArg("k", 1)
- .create();
-
- final ByteBuf buffer = serializer.serializeRequestAsBinary(request, allocator);
- final int mimeLen = buffer.readByte();
- buffer.readBytes(new byte[mimeLen]);
- final RequestMessage deserialized = serializer.deserializeRequest(buffer);
- assertThat(request, reflectionEquals(deserialized));
- }
-
- @Test
- public void shouldSerializeAndDeserializeResponse() throws SerializationException {
- final ResponseMessage response = ResponseMessage.build(UUID.randomUUID())
- .code(ResponseStatusCode.SUCCESS)
- .statusMessage("Found")
- .statusAttribute("k1", 1)
- .result("This is a fine message with a string")
- .create();
-
- final ByteBuf buffer = serializer.serializeResponseAsBinary(response, allocator);
- final ResponseMessage deserialized = serializer.deserializeResponse(buffer);
- assertResponseEquals(response, deserialized);
- }
-
- @Test
- public void shouldSerializeAndDeserializeResponseOverText() throws SerializationException {
- final ResponseMessage response = ResponseMessage.build(UUID.randomUUID())
- .code(ResponseStatusCode.SUCCESS)
- .statusMessage("Found")
- .statusAttribute("k1", 1)
- .result("This is a fine message with a string")
- .create();
-
- final String base64 = serializer.serializeResponseAsString(response, allocator);
- final ResponseMessage deserialized = serializer.deserializeResponse(base64);
- assertResponseEquals(response, deserialized);
- }
-
- @Test
- public void shouldSerializeAndDeserializeResponseWithoutStatusMessage() throws SerializationException {
- final ResponseMessage response = ResponseMessage.build(UUID.randomUUID())
- .code(ResponseStatusCode.SUCCESS)
- .statusAttribute("k1", 1)
- .result(123.3)
- .create();
-
- final ByteBuf buffer = serializer.serializeResponseAsBinary(response, allocator);
- final ResponseMessage deserialized = serializer.deserializeResponse(buffer);
- assertResponseEquals(response, deserialized);
- }
-
- @Test
- public void shouldSerializeAndDeserializeResponseWithoutStatusAttributes() throws SerializationException {
- final ResponseMessage response = ResponseMessage.build(UUID.randomUUID())
- .code(ResponseStatusCode.SUCCESS)
- .result(123.3)
- .create();
-
- final ByteBuf buffer = serializer.serializeResponseAsBinary(response, allocator);
- final ResponseMessage deserialized = serializer.deserializeResponse(buffer);
- assertResponseEquals(response, deserialized);
- }
-
- @Test
- public void shouldSerializeAndDeserializeResponseWithoutResult() throws SerializationException {
- final ResponseMessage response = ResponseMessage.build(UUID.randomUUID())
- .code(ResponseStatusCode.SERVER_ERROR)
- .statusMessage("Something happened on the server")
- .create();
-
- final ByteBuf buffer = serializer.serializeResponseAsBinary(response, allocator);
- final ResponseMessage deserialized = serializer.deserializeResponse(buffer);
- assertResponseEquals(response, deserialized);
- }
-
- @Test
- public void shouldSupportConfigurationOfRegistryBuilder() {
- final GraphBinaryMessageSerializerV1 serializer = new GraphBinaryMessageSerializerV1();
- final Map<String, Object> config = new HashMap<>();
- int counter = SampleTypeSerializerRegistryBuilder.createCounter.get();
-
- config.put(GraphBinaryMessageSerializerV1.TOKEN_BUILDER, "org.apache.tinkerpop.gremlin.util.ser.binary.GraphBinaryMessageSerializerV1Test$SampleTypeSerializerRegistryBuilder");
- serializer.configure(config, null);
-
- counter = SampleTypeSerializerRegistryBuilder.createCounter.get() - counter;
- // There should be a call to `create()`
- assertEquals(1, counter);
- }
-
- @Test(expected = IllegalStateException.class)
- public void shouldThrowWhenConfigurationOfRegistryBuilderFails() {
- final GraphBinaryMessageSerializerV1 serializer = new GraphBinaryMessageSerializerV1();
- final Map<String, Object> config = new HashMap<>();
- config.put(GraphBinaryMessageSerializerV1.TOKEN_BUILDER, "org.apache.tinkerpop.gremlin.util.ser.binary.NonExistentClass");
-
- serializer.configure(config, null);
- }
-
- @Test
- public void shouldToStringSerialize() throws SerializationException {
- final GraphBinaryMessageSerializerV1 serializer = new GraphBinaryMessageSerializerV1();
- final Map<String,Object> conf = new HashMap<String,Object>() {{
- put(GraphBinaryMessageSerializerV1.TOKEN_SERIALIZE_RESULT_TO_STRING, true);
- }};
- serializer.configure(conf, Collections.emptyMap());
-
- final ResponseMessage messageWithUnexpectedType = ResponseMessage.build(UUID.randomUUID()).
- result(java.awt.Color.RED).create();
- final ByteBuf buffer = serializer.serializeResponseAsBinary(messageWithUnexpectedType, allocator);
- final ResponseMessage deserialized = serializer.deserializeResponse(buffer);
-
- assertEquals(java.awt.Color.RED.toString(), deserialized.getResult().getData());
- }
-
- @Test
- public void shouldToStringSerializeAsText() throws SerializationException {
- final GraphBinaryMessageSerializerV1 serializer = new GraphBinaryMessageSerializerV1();
- final Map<String,Object> conf = new HashMap<String,Object>() {{
- put(GraphBinaryMessageSerializerV1.TOKEN_SERIALIZE_RESULT_TO_STRING, true);
- }};
- serializer.configure(conf, Collections.emptyMap());
-
- final ResponseMessage messageWithUnexpectedType = ResponseMessage.build(UUID.randomUUID()).
- result(java.awt.Color.RED).create();
- final String base64 = serializer.serializeResponseAsString(messageWithUnexpectedType, allocator);
- final ResponseMessage deserialized = serializer.deserializeResponse(base64);
-
- assertEquals(java.awt.Color.RED.toString(), deserialized.getResult().getData());
- }
-
- @Test
- public void shouldSerializeAndDeserializeRequestAsText() throws SerializationException {
- final GraphBinaryMessageSerializerV1 serializer = new GraphBinaryMessageSerializerV1();
- final Map<String,Object> conf = new HashMap<String,Object>() {{
- put(GraphBinaryMessageSerializerV1.TOKEN_SERIALIZE_RESULT_TO_STRING, true);
- }};
- serializer.configure(conf, Collections.emptyMap());
-
- final RequestMessage request = RequestMessage.build("op1")
- .processor("proc1")
- .overrideRequestId(UUID.randomUUID())
- .addArg("arg1", "value1")
- .create();
-
- final ByteBuf buffer = serializer.serializeRequestAsBinary(request, allocator);
- final int mimeLen = buffer.readByte();
- buffer.readBytes(new byte[mimeLen]);
- final RequestMessage deserialized = serializer.deserializeRequest(buffer);
- assertThat(request, reflectionEquals(deserialized));
- }
-
- private static void assertResponseEquals(ResponseMessage expected, ResponseMessage actual) {
- assertEquals(expected.getRequestId(), actual.getRequestId());
- // Status
- assertEquals(expected.getStatus().getCode(), actual.getStatus().getCode());
- assertEquals(expected.getStatus().getMessage(), actual.getStatus().getMessage());
- assertEquals(expected.getStatus().getAttributes(), actual.getStatus().getAttributes());
- // Result
- assertEquals(expected.getResult().getData(), actual.getResult().getData());
- assertEquals(expected.getResult().getMeta(), actual.getResult().getMeta());
- }
-
- public static class SampleTypeSerializerRegistryBuilder extends TypeSerializerRegistry.Builder {
- public static AtomicInteger createCounter = new AtomicInteger();
-
- @Override
- public TypeSerializerRegistry create() {
- createCounter.incrementAndGet();
- return super.create();
- }
- }
-}
diff --git a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/binary/GraphBinaryMessageSerializerV4Test.java b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/binary/GraphBinaryMessageSerializerV4Test.java
new file mode 100644
index 0000000..a12c1ba
--- /dev/null
+++ b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/binary/GraphBinaryMessageSerializerV4Test.java
@@ -0,0 +1,223 @@
+/*
+ * 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.util.ser.binary;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import org.apache.tinkerpop.gremlin.structure.io.binary.TypeSerializerRegistry;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV4;
+import org.apache.tinkerpop.gremlin.util.ser.SerializationException;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Stream;
+
+import static org.junit.Assert.assertEquals;
+
+public class GraphBinaryMessageSerializerV4Test {
+
+ private final ByteBufAllocator allocator = ByteBufAllocator.DEFAULT;
+ private final GraphBinaryMessageSerializerV4 serializer = new GraphBinaryMessageSerializerV4();
+
+ public static class SampleTypeSerializerRegistryBuilder extends TypeSerializerRegistry.Builder {
+ public static AtomicInteger createCounter = new AtomicInteger();
+
+ @Override
+ public TypeSerializerRegistry create() {
+ createCounter.incrementAndGet();
+ return super.create();
+ }
+ }
+
+ @Test
+ public void shouldSerializeAndDeserializeResponseInSingleChunk() throws SerializationException {
+ final ResponseMessage response = ResponseMessage.build()
+ .code(HttpResponseStatus.OK)
+ .result(Arrays.asList(1, "test"))
+ .create();
+
+ final ByteBuf buffer = serializer.writeHeader(response, allocator);
+ final ResponseMessage deserialized = serializer.readChunk(buffer, true);
+ assertResponseEquals(response, deserialized);
+ }
+
+ @Test
+ public void shouldSerializeAndDeserializeResponseInHeaderChunk() throws SerializationException {
+ final ResponseMessage response = ResponseMessage.build()
+ .result(Arrays.asList(1, "test"))
+ .create();
+
+ final ByteBuf buffer = serializer.writeHeader(response, allocator);
+ final ResponseMessage deserialized = serializer.readChunk(buffer, true);
+ assertResponseEquals(response, deserialized);
+ }
+
+ @Test
+ public void shouldSerializeAndDeserializeResponseInDataChunk() throws SerializationException {
+ final List data = Arrays.asList(1, "test");
+ final ByteBuf buffer = serializer.writeChunk(data, allocator);
+ final ResponseMessage deserialized = serializer.readChunk(buffer, false);
+
+ assertEquals(data, deserialized.getResult().getData());
+ }
+
+ @Test
+ public void shouldSerializeAndDeserializeResponseInFooterChunk() throws SerializationException {
+ final ResponseMessage response = ResponseMessage.build()
+ .result(Arrays.asList(1, "test"))
+ .code(HttpResponseStatus.OK)
+ .statusMessage("OK")
+ .create();
+
+ final ByteBuf buffer = serializer.writeFooter(response, allocator);
+ final ResponseMessage deserialized = serializer.readChunk(buffer, false);
+ assertResponseEquals(response, deserialized);
+ }
+
+ @Test
+ public void shouldSerializeAndDeserializeErrorResponseWithEmptyData() throws SerializationException {
+ final ResponseMessage response = ResponseMessage.build()
+ .code(HttpResponseStatus.FORBIDDEN)
+ .statusMessage("FORBIDDEN")
+ .create();
+
+ final ByteBuf buffer = serializer.writeHeader(response, allocator);
+ final ResponseMessage deserialized = serializer.readChunk(buffer, true);
+ assertResponseEquals(response, deserialized);
+ }
+
+ @Test
+ public void shouldSerializeAndDeserializeCompositeResponse() throws SerializationException {
+ final List headerData = Arrays.asList(0, "header");
+ final ResponseMessage header = ResponseMessage.build()
+ .result(headerData)
+ .create();
+
+ final List chunkData1 = Arrays.asList(1, "data1");
+ final List chunkData2 = Arrays.asList(2, "data2");
+
+ final List footerData = Arrays.asList(0xFF, "footer");
+ final ResponseMessage footer = ResponseMessage.build()
+ .result(footerData)
+ .code(HttpResponseStatus.OK)
+ .statusMessage("OK")
+ .create();
+
+ final ByteBuf bb0 = serializer.writeHeader(header, allocator);
+ final ByteBuf bb1 = serializer.writeChunk(chunkData1, allocator);
+ final ByteBuf bb2 = serializer.writeChunk(chunkData2, allocator);
+ final ByteBuf bb3 = serializer.writeFooter(footer, allocator);
+
+ final ByteBuf bbCombined = allocator.buffer().writeBytes(bb0).writeBytes(bb1).writeBytes(bb2).writeBytes(bb3);
+
+ final ResponseMessage deserialized = serializer.readChunk(bbCombined, true);
+
+ // Status
+ assertEquals(footer.getStatus().getCode(), deserialized.getStatus().getCode());
+ assertEquals(footer.getStatus().getMessage(), deserialized.getStatus().getMessage());
+ // Result
+ List<Integer> combinedData = new ArrayList<>();
+ Stream.of(headerData, chunkData1, chunkData2, footerData).forEach(combinedData::addAll);
+ assertEquals(combinedData, deserialized.getResult().getData());
+ }
+
+ @Test
+ public void shouldSerializeAndDeserializeCompositeResponseWithError() throws SerializationException {
+ final List headerData = Arrays.asList(0, "header");
+ final ResponseMessage header = ResponseMessage.build()
+ .result(headerData)
+ .create();
+
+ final List chunkData1 = Arrays.asList(1, "data1");
+ final List chunkData2 = Arrays.asList(2, "data2");
+
+ final List footerData = Arrays.asList(0xFF, "footer");
+ final ResponseMessage footer = ResponseMessage.build()
+ .result(footerData)
+ .code(HttpResponseStatus.INTERNAL_SERVER_ERROR)
+ .statusMessage("SERVER_ERROR")
+ .exception("fire in data center")
+ .create();
+
+ final ByteBuf bb0 = serializer.writeHeader(header, allocator);
+ final ByteBuf bb1 = serializer.writeChunk(chunkData1, allocator);
+ final ByteBuf bb2 = serializer.writeChunk(chunkData2, allocator);
+ final ByteBuf bb3 = serializer.writeErrorFooter(footer, allocator);
+
+ final ByteBuf bbCombined = allocator.buffer().writeBytes(bb0).writeBytes(bb1).writeBytes(bb2).writeBytes(bb3);
+
+ final ResponseMessage deserialized = serializer.readChunk(bbCombined, true);
+
+ // Status
+ assertEquals(footer.getStatus().getCode(), deserialized.getStatus().getCode());
+ assertEquals(footer.getStatus().getMessage(), deserialized.getStatus().getMessage());
+ assertEquals(footer.getStatus().getException(), deserialized.getStatus().getException());
+ // Result
+ List<Integer> combinedData = new ArrayList<>();
+ Stream.of(headerData, chunkData1, chunkData2).forEach(combinedData::addAll);
+ assertEquals(combinedData, deserialized.getResult().getData());
+ }
+
+ @Test
+ public void shouldSupportConfigurationOfRegistryBuilder() {
+ final Map<String, Object> config = new HashMap<>();
+ int counter = SampleTypeSerializerRegistryBuilder.createCounter.get();
+
+ config.put(GraphBinaryMessageSerializerV4.TOKEN_BUILDER, "org.apache.tinkerpop.gremlin.util.ser.binary.GraphBinaryMessageSerializerV4Test$SampleTypeSerializerRegistryBuilder");
+ serializer.configure(config, null);
+
+ counter = SampleTypeSerializerRegistryBuilder.createCounter.get() - counter;
+ // There should be a call to `create()`
+ assertEquals(1, counter);
+ }
+
+ @Test(expected = IllegalStateException.class)
+ public void shouldThrowWhenConfigurationOfRegistryBuilderFails() {
+ final Map<String, Object> config = new HashMap<>();
+ config.put(GraphBinaryMessageSerializerV4.TOKEN_BUILDER, "org.apache.tinkerpop.gremlin.util.ser.binary.NonExistentClass");
+
+ serializer.configure(config, null);
+ }
+
+ // copy-paste because response format will be different
+ private static void assertResponseEquals(final ResponseMessage expected, final ResponseMessage actual) {
+ // Status
+ if (expected.getStatus() != null && actual.getStatus() != null) {
+ assertEquals(expected.getStatus().getCode(), actual.getStatus().getCode());
+ assertEquals(expected.getStatus().getMessage(), actual.getStatus().getMessage());
+ }
+ // Result
+ // null == empty List
+ if (!isEmptyData(expected) && !isEmptyData(actual)) {
+ assertEquals(expected.getResult().getData(), actual.getResult().getData());
+ }
+ }
+
+ private static boolean isEmptyData(final ResponseMessage responseMessage) {
+ return responseMessage.getResult() == null || responseMessage.getResult().getData() == null ||
+ responseMessage.getResult().getData().isEmpty();
+ }
+}
diff --git a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/binary/MessageSerializerTest.java b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/binary/MessageSerializerTest.java
new file mode 100644
index 0000000..251cc8d
--- /dev/null
+++ b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/binary/MessageSerializerTest.java
@@ -0,0 +1,153 @@
+/*
+ * 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.util.ser.binary;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
+import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
+import org.apache.tinkerpop.gremlin.util.MessageSerializer;
+import org.apache.tinkerpop.gremlin.util.Tokens;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV4;
+import org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV4;
+import org.apache.tinkerpop.gremlin.util.ser.SerializationException;
+import org.apache.tinkerpop.gremlin.util.ser.Serializers;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.apache.tinkerpop.gremlin.util.MockitoHamcrestMatcherAdapter.reflectionEquals;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertEquals;
+
+@RunWith(Parameterized.class)
+public class MessageSerializerTest {
+ private final ByteBufAllocator allocator = ByteBufAllocator.DEFAULT;
+
+ @Parameterized.Parameters(name = "{0}")
+ public static Iterable<Object[]> data() {
+ return Arrays.asList(new Object[][]{
+ {Serializers.GRAPHBINARY_V4, new GraphBinaryMessageSerializerV4()},
+ {Serializers.GRAPHSON_V4, new GraphSONMessageSerializerV4()}
+ });
+ }
+
+ @Parameterized.Parameter(0)
+ public Serializers serializerType;
+
+ @Parameterized.Parameter(1)
+ public MessageSerializer serializer;
+
+ @Test
+ public void shouldSerializeAndDeserializeRequest() throws SerializationException {
+ final GraphTraversalSource g = EmptyGraph.instance().traversal();
+ final Traversal.Admin t = g.V().hasLabel("person").out().asAdmin();
+
+ final Map<String, String> aliases = new HashMap<>();
+ aliases.put("g","g");
+
+ final RequestMessage request = RequestMessage.build(t.getGremlinLang().getGremlin())
+ .addMaterializeProperties(Tokens.MATERIALIZE_PROPERTIES_TOKENS)
+ .addTimeoutMillis(500)
+ .addG("g1")
+ .addLanguage("some-lang")
+ .addBinding("k", "v")
+ .create();
+
+ final ByteBuf buffer = serializer.serializeRequestAsBinary(request, allocator);
+ final RequestMessage deserialized = serializer.deserializeBinaryRequest(buffer);
+ assertThat(request, reflectionEquals(deserialized));
+ }
+
+ @Test
+ public void shouldSerializeAndDeserializeRequestWithoutArgs() throws SerializationException {
+ final RequestMessage request = RequestMessage.build("query").create();
+
+ final ByteBuf buffer = serializer.serializeRequestAsBinary(request, allocator);
+ final RequestMessage deserialized = serializer.deserializeBinaryRequest(buffer);
+ assertThat(request, reflectionEquals(deserialized));
+ }
+
+ @Test
+ public void shouldSerializeAndDeserializeResponse() throws SerializationException {
+ final ResponseMessage response = ResponseMessage.build()
+ .code(HttpResponseStatus.OK)
+ .statusMessage("Found")
+ .result(Collections.singletonList("This is a fine message with a string"))
+ .create();
+
+ final ByteBuf buffer = serializer.serializeResponseAsBinary(response, allocator);
+ final ResponseMessage deserialized = serializer.deserializeBinaryResponse(buffer);
+ assertResponseEquals(response, deserialized);
+ }
+
+ @Test
+ public void shouldSerializeAndDeserializeResponseWithoutStatusMessage() throws SerializationException {
+ final ResponseMessage response = ResponseMessage.build()
+ .code(HttpResponseStatus.OK)
+ .result(Collections.singletonList(123.3))
+ .create();
+
+ final ByteBuf buffer = serializer.serializeResponseAsBinary(response, allocator);
+ final ResponseMessage deserialized = serializer.deserializeBinaryResponse(buffer);
+ assertResponseEquals(response, deserialized);
+ }
+
+ @Test
+ public void shouldSerializeAndDeserializeResponseWithoutStatusAttributes() throws SerializationException {
+ final ResponseMessage response = ResponseMessage.build()
+ .code(HttpResponseStatus.OK)
+ .result(Collections.singletonList(123.3))
+ .create();
+
+ final ByteBuf buffer = serializer.serializeResponseAsBinary(response, allocator);
+ final ResponseMessage deserialized = serializer.deserializeBinaryResponse(buffer);
+ assertResponseEquals(response, deserialized);
+ }
+
+ @Test
+ public void shouldSerializeAndDeserializeResponseWithoutResult() throws SerializationException {
+ final ResponseMessage response = ResponseMessage.build()
+ .code(HttpResponseStatus.INTERNAL_SERVER_ERROR)
+ .statusMessage("Something happened on the server")
+ .create();
+
+ final ByteBuf buffer = serializer.serializeResponseAsBinary(response, allocator);
+ final ResponseMessage deserialized = serializer.deserializeBinaryResponse(buffer);
+ assertResponseEquals(response, deserialized);
+ }
+
+ private static void assertResponseEquals(ResponseMessage expected, ResponseMessage actual) {
+ // Status
+ assertEquals(expected.getStatus().getCode(), actual.getStatus().getCode());
+ assertEquals(expected.getStatus().getMessage(), actual.getStatus().getMessage());
+ assertEquals(expected.getStatus().getException(), actual.getStatus().getException());
+ // Result
+ assertEquals(expected.getResult().getData(), actual.getResult().getData());
+ }
+}
diff --git a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/binary/TypeSerializerFailureTests.java b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/binary/TypeSerializerFailureTests.java
index d41074e..e4afbbe 100644
--- a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/binary/TypeSerializerFailureTests.java
+++ b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/binary/TypeSerializerFailureTests.java
@@ -20,9 +20,7 @@
package org.apache.tinkerpop.gremlin.util.ser.binary;
import io.netty.buffer.UnpooledByteBufAllocator;
-import org.apache.tinkerpop.gremlin.util.ser.NettyBufferFactory;
import org.apache.tinkerpop.gremlin.process.remote.traversal.DefaultRemoteTraverser;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.BulkSet;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.EmptyPath;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
@@ -36,6 +34,7 @@
import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceVertex;
import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceVertexProperty;
import org.apache.tinkerpop.gremlin.util.function.Lambda;
+import org.apache.tinkerpop.gremlin.util.ser.NettyBufferFactory;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -58,13 +57,8 @@
@Parameterized.Parameters(name = "Value={0}")
public static Collection input() {
- final Bytecode.Binding b = new Bytecode.Binding(null, "b");
-
final ReferenceVertex vertex = new ReferenceVertex("a vertex", null);
- final Bytecode bytecode = new Bytecode();
- bytecode.addStep(null);
-
final BulkSet<Object> bulkSet = new BulkSet<>();
bulkSet.add(vertex, 1L);
@@ -75,11 +69,8 @@
// Provide instances that are malformed for serialization to fail
return Arrays.asList(
- b,
vertex,
- Collections.singletonMap("one", b),
bulkSet,
- bytecode,
Collections.singletonList(vertex),
new ReferenceEdge("an edge", null, vertex, vertex),
Lambda.supplier(null),
diff --git a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/binary/types/sample/SamplePersonSerializerTest.java b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/binary/types/sample/SamplePersonSerializerTest.java
index 0d4caaf..d8b9d02 100644
--- a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/binary/types/sample/SamplePersonSerializerTest.java
+++ b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/binary/types/sample/SamplePersonSerializerTest.java
@@ -20,15 +20,17 @@
import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufAllocator;
+import io.netty.handler.codec.http.HttpResponseStatus;
import org.apache.tinkerpop.gremlin.util.ser.NettyBufferFactory;
import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1;
+import org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV4;
import org.apache.tinkerpop.gremlin.structure.io.AbstractIoRegistry;
import org.apache.tinkerpop.gremlin.structure.io.Buffer;
import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryIo;
import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryReader;
import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryWriter;
import org.apache.tinkerpop.gremlin.structure.io.binary.TypeSerializerRegistry;
+import org.junit.Ignore;
import org.junit.Test;
import java.io.IOException;
@@ -36,14 +38,12 @@
import java.time.OffsetDateTime;
import java.time.ZoneOffset;
import java.util.Collections;
-import java.util.Date;
import java.util.HashMap;
import java.util.Map;
-import java.util.UUID;
import static org.apache.tinkerpop.gremlin.util.MockitoHamcrestMatcherAdapter.reflectionEquals;
import static org.apache.tinkerpop.gremlin.util.ser.AbstractMessageSerializer.TOKEN_IO_REGISTRIES;
-import static org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1.TOKEN_CUSTOM;
+import static org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV4.TOKEN_CUSTOM;
import static org.hamcrest.MatcherAssert.assertThat;
public class SamplePersonSerializerTest {
@@ -53,14 +53,14 @@
@Test
public void shouldCustomSerializationWithPerson() throws IOException {
- final GraphBinaryMessageSerializerV1 serializer = new GraphBinaryMessageSerializerV1(
+ final GraphBinaryMessageSerializerV4 serializer = new GraphBinaryMessageSerializerV4(
TypeSerializerRegistry.build().addCustomType(SamplePerson.class, new SamplePersonSerializer()).create());
assertPerson(serializer);
}
@Test
public void shouldSerializePersonViaIoRegistry() throws IOException {
- final GraphBinaryMessageSerializerV1 serializer = new GraphBinaryMessageSerializerV1();
+ final GraphBinaryMessageSerializerV4 serializer = new GraphBinaryMessageSerializerV4();
final Map<String,Object> config = new HashMap<>();
config.put(TOKEN_IO_REGISTRIES, Collections.singletonList(CustomIoRegistry.class.getName()));
serializer.configure(config, Collections.emptyMap());
@@ -70,7 +70,7 @@
@Test
public void shouldSerializePersonViaCustom() throws IOException {
- final GraphBinaryMessageSerializerV1 serializer = new GraphBinaryMessageSerializerV1();
+ final GraphBinaryMessageSerializerV4 serializer = new GraphBinaryMessageSerializerV4();
final Map<String,Object> config = new HashMap<>();
config.put(TOKEN_CUSTOM, Collections.singletonList(String.format("%s;%s",
SamplePerson.class.getCanonicalName(), SamplePersonSerializer.class.getCanonicalName())));
@@ -99,16 +99,16 @@
}
}
- private void assertPerson(final GraphBinaryMessageSerializerV1 serializer) throws IOException {
+ private void assertPerson(final GraphBinaryMessageSerializerV4 serializer) throws IOException {
final OffsetDateTime birthDate = OffsetDateTime.of(LocalDateTime.of(2010, 4, 29, 5, 30), ZoneOffset.UTC);
final SamplePerson person = new SamplePerson("Olivia", birthDate);
final ByteBuf serialized = serializer.serializeResponseAsBinary(
- ResponseMessage.build(UUID.randomUUID()).result(person).create(), allocator);
+ ResponseMessage.build().result(Collections.singletonList(person)).code(HttpResponseStatus.OK).create(), allocator);
- final ResponseMessage deserialized = serializer.deserializeResponse(serialized);
+ final ResponseMessage deserialized = serializer.deserializeBinaryResponse(serialized);
- final SamplePerson actual = (SamplePerson) deserialized.getResult().getData();
+ final SamplePerson actual = (SamplePerson) deserialized.getResult().getData().get(0);
assertThat(actual, reflectionEquals(person));
}
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/barrier-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/barrier-v1.gbin
deleted file mode 100644
index f905861..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/barrier-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/bigdecimal-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/bigdecimal-v1.gbin
deleted file mode 100644
index 921d957..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/bigdecimal-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/binding-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/binding-v1.gbin
deleted file mode 100644
index 79620eb..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/binding-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/bulkset-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/bulkset-v1.gbin
deleted file mode 100644
index 4542906..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/bulkset-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/byte-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/byte-v1.gbin
deleted file mode 100644
index af9544f..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/byte-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/bytecode-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/bytecode-v1.gbin
deleted file mode 100644
index bc76c2e..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/bytecode-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/cardinality-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/cardinality-v1.gbin
deleted file mode 100644
index 3c875a5..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/cardinality-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/char-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/char-v1.gbin
deleted file mode 100644
index b9d97e6..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/char-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/class-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/class-v1.gbin
deleted file mode 100644
index 6be272d..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/class-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/column-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/column-v1.gbin
deleted file mode 100644
index c6805c8..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/column-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/date-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/date-v1.gbin
deleted file mode 100644
index e68e17a..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/date-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/double-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/double-v1.gbin
deleted file mode 100644
index e538a62..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/double-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/duration-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/duration-v1.gbin
deleted file mode 100644
index 7ffa3ad..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/duration-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/edge-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/edge-v1.gbin
deleted file mode 100644
index f540442..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/edge-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/float-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/float-v1.gbin
deleted file mode 100644
index 322772c..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/float-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/inetaddress-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/inetaddress-v1.gbin
deleted file mode 100644
index b613ddb..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/inetaddress-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/instant-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/instant-v1.gbin
deleted file mode 100644
index 3335532..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/instant-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/integer-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/integer-v1.gbin
deleted file mode 100644
index 7dc246a..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/integer-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/lambda-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/lambda-v1.gbin
deleted file mode 100644
index b0e98f9..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/lambda-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/list-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/list-v1.gbin
deleted file mode 100644
index 1aa405d..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/list-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/localdate-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/localdate-v1.gbin
deleted file mode 100644
index 2c9e211..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/localdate-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/localdatetime-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/localdatetime-v1.gbin
deleted file mode 100644
index 2e0c83c..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/localdatetime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/localtime-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/localtime-v1.gbin
deleted file mode 100644
index 05785c6..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/localtime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/long-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/long-v1.gbin
deleted file mode 100644
index cee0083..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/long-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/map-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/map-v1.gbin
deleted file mode 100644
index 46cd9e2..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/map-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/metrics-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/metrics-v1.gbin
deleted file mode 100644
index dea77a5..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/metrics-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/monthday-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/monthday-v1.gbin
deleted file mode 100644
index c128263..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/monthday-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/offsetdatetime-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/offsetdatetime-v1.gbin
deleted file mode 100644
index 4b2aabb..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/offsetdatetime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/offsettime-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/offsettime-v1.gbin
deleted file mode 100644
index a4c8c5b..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/offsettime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/operator-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/operator-v1.gbin
deleted file mode 100644
index 84717cc..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/operator-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/order-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/order-v1.gbin
deleted file mode 100644
index 311b6ad..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/order-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/p-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/p-v1.gbin
deleted file mode 100644
index ac60799..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/p-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/pand-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/pand-v1.gbin
deleted file mode 100644
index 3237c94..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/pand-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/path-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/path-v1.gbin
deleted file mode 100644
index ba075ac..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/path-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/period-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/period-v1.gbin
deleted file mode 100644
index f7dab35..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/period-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/pick-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/pick-v1.gbin
deleted file mode 100644
index 77aca2f..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/pick-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/pop-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/pop-v1.gbin
deleted file mode 100644
index f698c94..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/pop-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/por-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/por-v1.gbin
deleted file mode 100644
index 7c0b3ab..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/por-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/pwithin-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/pwithin-v1.gbin
deleted file mode 100644
index 5ad30a9..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/pwithin-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/pwithout-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/pwithout-v1.gbin
deleted file mode 100644
index 5b195db..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/pwithout-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/scope-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/scope-v1.gbin
deleted file mode 100644
index 534b956..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/scope-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/set-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/set-v1.gbin
deleted file mode 100644
index 02df059..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/set-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/short-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/short-v1.gbin
deleted file mode 100644
index e1d2d7d..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/short-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/t-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/t-v1.gbin
deleted file mode 100644
index a6376db..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/t-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/textp-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/textp-v1.gbin
deleted file mode 100644
index c796468..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/textp-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/timestamp-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/timestamp-v1.gbin
deleted file mode 100644
index 4fc4e5e..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/timestamp-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/tinkergraph-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/tinkergraph-v1.gbin
deleted file mode 100644
index a0a76d1..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/tinkergraph-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/traversalmetrics-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/traversalmetrics-v1.gbin
deleted file mode 100644
index c947e62..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/traversalmetrics-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/traverser-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/traverser-v1.gbin
deleted file mode 100644
index 2448b5c..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/traverser-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/vertex-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/vertex-v1.gbin
deleted file mode 100644
index 4347734..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/vertex-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/vertexproperty-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/vertexproperty-v1.gbin
deleted file mode 100644
index 89f0329..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/vertexproperty-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/year-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/year-v1.gbin
deleted file mode 100644
index 1fe0c74..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/year-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/yearmonth-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/yearmonth-v1.gbin
deleted file mode 100644
index 481a121..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/yearmonth-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/zoneddatetime-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/zoneddatetime-v1.gbin
deleted file mode 100644
index 32e2e8b..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/zoneddatetime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/zoneoffset-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/zoneoffset-v1.gbin
deleted file mode 100644
index 2867c97..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/zoneoffset-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationchallenge-v1-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationchallenge-v1-no-types.json
deleted file mode 100644
index dd75823..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationchallenge-v1-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-{"requestId":"41d2e28a-20a4-4ab0-b379-d810dede3786","status":{"message":"","code":407,"attributes":{}},"result":{"data":null,"meta":{}}}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationchallenge-v2-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationchallenge-v2-no-types.json
deleted file mode 100644
index dd75823..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationchallenge-v2-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-{"requestId":"41d2e28a-20a4-4ab0-b379-d810dede3786","status":{"message":"","code":407,"attributes":{}},"result":{"data":null,"meta":{}}}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationchallenge-v2.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationchallenge-v2.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationchallenge-v2.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
- "status" : {
- "message" : "",
- "code" : 407,
- "attributes" : { }
- },
- "result" : {
- "data" : null,
- "meta" : { }
- }
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationchallenge-v3-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationchallenge-v3-no-types.json
deleted file mode 100644
index dd75823..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationchallenge-v3-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-{"requestId":"41d2e28a-20a4-4ab0-b379-d810dede3786","status":{"message":"","code":407,"attributes":{}},"result":{"data":null,"meta":{}}}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationchallenge-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationchallenge-v3.json
deleted file mode 100644
index d1734c6..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationchallenge-v3.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
- "status" : {
- "message" : "",
- "code" : 407,
- "attributes" : {
- "@type" : "g:Map",
- "@value" : [ ]
- }
- },
- "result" : {
- "data" : null,
- "meta" : {
- "@type" : "g:Map",
- "@value" : [ ]
- }
- }
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationresponse-v1-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationresponse-v1-no-types.json
deleted file mode 100644
index 35d5260..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationresponse-v1-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-{"requestId":"cb682578-9d92-4499-9ebc-5c6aa73c5397","op":"authentication","processor":"","args":{"saslMechanism":"PLAIN","sasl":"AHN0ZXBocGhlbgBwYXNzd29yZA=="}}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationresponse-v2-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationresponse-v2-no-types.json
deleted file mode 100644
index 35d5260..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationresponse-v2-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-{"requestId":"cb682578-9d92-4499-9ebc-5c6aa73c5397","op":"authentication","processor":"","args":{"saslMechanism":"PLAIN","sasl":"AHN0ZXBocGhlbgBwYXNzd29yZA=="}}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationresponse-v2.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationresponse-v2.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationresponse-v2.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
- "op" : "authentication",
- "processor" : "",
- "args" : {
- "saslMechanism" : "PLAIN",
- "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
- }
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationresponse-v3-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationresponse-v3-no-types.json
deleted file mode 100644
index 35d5260..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationresponse-v3-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-{"requestId":"cb682578-9d92-4499-9ebc-5c6aa73c5397","op":"authentication","processor":"","args":{"saslMechanism":"PLAIN","sasl":"AHN0ZXBocGhlbgBwYXNzd29yZA=="}}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationresponse-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationresponse-v3.json
deleted file mode 100644
index daceca2..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationresponse-v3.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
- "op" : "authentication",
- "processor" : "",
- "args" : {
- "@type" : "g:Map",
- "@value" : [ "saslMechanism", "PLAIN", "sasl", "AHN0ZXBocGhlbgBwYXNzd29yZA==" ]
- }
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/barrier-v2.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/barrier-v2.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/barrier-v2.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "g:Barrier",
- "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/barrier-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/barrier-v3.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/barrier-v3.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "g:Barrier",
- "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/bigdecimal-v2.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/bigdecimal-v2.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/bigdecimal-v2.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "gx:BigDecimal",
- "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/bigdecimal-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/bigdecimal-v3.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/bigdecimal-v3.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "gx:BigDecimal",
- "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/biginteger-v2.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/biginteger-v2.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/biginteger-v2.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "gx:BigInteger",
- "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/biginteger-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/biginteger-v3.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/biginteger-v3.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "gx:BigInteger",
- "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/binding-v2.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/binding-v2.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/binding-v2.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "@type" : "g:Binding",
- "@value" : {
- "key" : "x",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 1
- }
- }
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/binding-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/binding-v3.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/binding-v3.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "@type" : "g:Binding",
- "@value" : {
- "key" : "x",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 1
- }
- }
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/bulkset-v2.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/bulkset-v2.json
deleted file mode 100644
index c844975..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/bulkset-v2.json
+++ /dev/null
@@ -1 +0,0 @@
-[ "marko", "josh", "josh" ]
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/bulkset-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/bulkset-v3.json
deleted file mode 100644
index c216a36..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/bulkset-v3.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "@type" : "g:BulkSet",
- "@value" : [ "marko", {
- "@type" : "g:Int64",
- "@value" : 1
- }, "josh", {
- "@type" : "g:Int64",
- "@value" : 2
- } ]
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/byte-v2.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/byte-v2.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/byte-v2.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "gx:Byte",
- "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/byte-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/byte-v3.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/byte-v3.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "gx:Byte",
- "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/bytebuffer-v2.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/bytebuffer-v2.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/bytebuffer-v2.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "gx:ByteBuffer",
- "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/bytebuffer-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/bytebuffer-v3.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/bytebuffer-v3.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "gx:ByteBuffer",
- "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/bytecode-v2.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/bytecode-v2.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/bytecode-v2.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "@type" : "g:Bytecode",
- "@value" : {
- "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
- }
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/bytecode-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/bytecode-v3.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/bytecode-v3.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "@type" : "g:Bytecode",
- "@value" : {
- "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
- }
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/cardinality-v2.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/cardinality-v2.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/cardinality-v2.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "g:Cardinality",
- "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/cardinality-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/cardinality-v3.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/cardinality-v3.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "g:Cardinality",
- "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/char-v2.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/char-v2.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/char-v2.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "gx:Char",
- "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/char-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/char-v3.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/char-v3.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "gx:Char",
- "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/class-v2.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/class-v2.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/class-v2.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "g:Class",
- "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/class-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/class-v3.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/class-v3.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "g:Class",
- "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/column-v2.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/column-v2.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/column-v2.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "g:Column",
- "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/column-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/column-v3.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/column-v3.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "g:Column",
- "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/date-v2.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/date-v2.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/date-v2.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "g:Date",
- "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/date-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/date-v3.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/date-v3.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "g:Date",
- "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/direction-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/direction-v3.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/direction-v3.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "g:Direction",
- "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/double-v2.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/double-v2.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/double-v2.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "g:Double",
- "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/double-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/double-v3.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/double-v3.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "g:Double",
- "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/duration-v2.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/duration-v2.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/duration-v2.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "gx:Duration",
- "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/duration-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/duration-v3.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/duration-v3.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "gx:Duration",
- "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/edge-v1-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/edge-v1-no-types.json
deleted file mode 100644
index ef37fc7..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/edge-v1-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id":13,"label":"develops","type":"edge","inVLabel":"software","outVLabel":"person","inV":10,"outV":1,"properties":{"since":2009}}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/edge-v2-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/edge-v2-no-types.json
deleted file mode 100644
index 2902a41..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/edge-v2-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id":13,"label":"develops","inVLabel":"software","outVLabel":"person","inV":10,"outV":1,"properties":{"since":{"key":"since","value":2009}}}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/edge-v2.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/edge-v2.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/edge-v2.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
- "@type" : "g:Edge",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 13
- },
- "label" : "develops",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : {
- "@type" : "g:Int32",
- "@value" : 10
- },
- "outV" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "properties" : {
- "since" : {
- "@type" : "g:Property",
- "@value" : {
- "key" : "since",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 2009
- }
- }
- }
- }
- }
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/edge-v3-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/edge-v3-no-types.json
deleted file mode 100644
index ef37fc7..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/edge-v3-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id":13,"label":"develops","type":"edge","inVLabel":"software","outVLabel":"person","inV":10,"outV":1,"properties":{"since":2009}}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/edge-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/edge-v3.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/edge-v3.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
- "@type" : "g:Edge",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 13
- },
- "label" : "develops",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : {
- "@type" : "g:Int32",
- "@value" : 10
- },
- "outV" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "properties" : {
- "since" : {
- "@type" : "g:Property",
- "@value" : {
- "key" : "since",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 2009
- }
- }
- }
- }
- }
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/float-v2.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/float-v2.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/float-v2.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "g:Float",
- "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/float-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/float-v3.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/float-v3.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "g:Float",
- "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/inetaddress-v2.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/inetaddress-v2.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/inetaddress-v2.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "gx:InetAddress",
- "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/inetaddress-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/inetaddress-v3.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/inetaddress-v3.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "gx:InetAddress",
- "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/instant-v2.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/instant-v2.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/instant-v2.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "gx:Instant",
- "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/instant-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/instant-v3.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/instant-v3.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "gx:Instant",
- "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/integer-v2.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/integer-v2.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/integer-v2.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "g:Int32",
- "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/integer-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/integer-v3.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/integer-v3.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "g:Int32",
- "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/lambda-v2.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/lambda-v2.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/lambda-v2.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "@type" : "g:Lambda",
- "@value" : {
- "script" : "{ it.get() }",
- "language" : "gremlin-groovy",
- "arguments" : 1
- }
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/lambda-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/lambda-v3.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/lambda-v3.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "@type" : "g:Lambda",
- "@value" : {
- "script" : "{ it.get() }",
- "language" : "gremlin-groovy",
- "arguments" : 1
- }
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/list-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/list-v3.json
deleted file mode 100644
index b714e2d..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/list-v3.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "@type" : "g:List",
- "@value" : [ {
- "@type" : "g:Int32",
- "@value" : 1
- }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/localdate-v2.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/localdate-v2.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/localdate-v2.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "gx:LocalDate",
- "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/localdate-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/localdate-v3.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/localdate-v3.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "gx:LocalDate",
- "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/localdatetime-v2.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/localdatetime-v2.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/localdatetime-v2.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "gx:LocalDateTime",
- "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/localdatetime-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/localdatetime-v3.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/localdatetime-v3.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "gx:LocalDateTime",
- "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/localtime-v2.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/localtime-v2.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/localtime-v2.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "gx:LocalTime",
- "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/localtime-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/localtime-v3.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/localtime-v3.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "gx:LocalTime",
- "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/long-v2.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/long-v2.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/long-v2.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "g:Int64",
- "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/long-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/long-v3.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/long-v3.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "g:Int64",
- "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/map-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/map-v3.json
deleted file mode 100644
index 7ad59c9..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/map-v3.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
- "@type" : "g:Map",
- "@value" : [ {
- "@type" : "g:Date",
- "@value" : 1481750076295
- }, "red", {
- "@type" : "g:List",
- "@value" : [ {
- "@type" : "g:Int32",
- "@value" : 1
- }, {
- "@type" : "g:Int32",
- "@value" : 2
- }, {
- "@type" : "g:Int32",
- "@value" : 3
- } ]
- }, {
- "@type" : "g:Date",
- "@value" : 1481750076295
- }, "test", {
- "@type" : "g:Int32",
- "@value" : 123
- } ]
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/metrics-v2.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/metrics-v2.json
deleted file mode 100644
index 7b1e964..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/metrics-v2.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
- "@type" : "g:Metrics",
- "@value" : {
- "dur" : {
- "@type" : "g:Double",
- "@value" : 100.0
- },
- "counts" : {
- "traverserCount" : {
- "@type" : "g:Int64",
- "@value" : 4
- },
- "elementCount" : {
- "@type" : "g:Int64",
- "@value" : 4
- }
- },
- "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
- "annotations" : {
- "percentDur" : {
- "@type" : "g:Double",
- "@value" : 25.0
- }
- },
- "id" : "7.0.0()",
- "metrics" : [ {
- "@type" : "g:Metrics",
- "@value" : {
- "dur" : {
- "@type" : "g:Double",
- "@value" : 100.0
- },
- "counts" : {
- "traverserCount" : {
- "@type" : "g:Int64",
- "@value" : 7
- },
- "elementCount" : {
- "@type" : "g:Int64",
- "@value" : 7
- }
- },
- "name" : "VertexStep(OUT,vertex)",
- "annotations" : {
- "percentDur" : {
- "@type" : "g:Double",
- "@value" : 25.0
- }
- },
- "id" : "3.0.0()"
- }
- } ]
- }
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/metrics-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/metrics-v3.json
deleted file mode 100644
index f6e678b..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/metrics-v3.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
- "@type" : "g:Metrics",
- "@value" : {
- "@type" : "g:Map",
- "@value" : [ "dur", {
- "@type" : "g:Double",
- "@value" : 100.0
- }, "counts", {
- "@type" : "g:Map",
- "@value" : [ "traverserCount", {
- "@type" : "g:Int64",
- "@value" : 4
- }, "elementCount", {
- "@type" : "g:Int64",
- "@value" : 4
- } ]
- }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
- "@type" : "g:Map",
- "@value" : [ "percentDur", {
- "@type" : "g:Double",
- "@value" : 25.0
- } ]
- }, "id", "7.0.0()", "metrics", {
- "@type" : "g:List",
- "@value" : [ {
- "@type" : "g:Metrics",
- "@value" : {
- "@type" : "g:Map",
- "@value" : [ "dur", {
- "@type" : "g:Double",
- "@value" : 100.0
- }, "counts", {
- "@type" : "g:Map",
- "@value" : [ "traverserCount", {
- "@type" : "g:Int64",
- "@value" : 7
- }, "elementCount", {
- "@type" : "g:Int64",
- "@value" : 7
- } ]
- }, "name", "VertexStep(OUT,vertex)", "annotations", {
- "@type" : "g:Map",
- "@value" : [ "percentDur", {
- "@type" : "g:Double",
- "@value" : 25.0
- } ]
- }, "id", "3.0.0()" ]
- }
- } ]
- } ]
- }
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/monthday-v2.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/monthday-v2.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/monthday-v2.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "gx:MonthDay",
- "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/monthday-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/monthday-v3.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/monthday-v3.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "gx:MonthDay",
- "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/offsetdatetime-v2.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/offsetdatetime-v2.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/offsetdatetime-v2.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "gx:OffsetDateTime",
- "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/offsetdatetime-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/offsetdatetime-v3.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/offsetdatetime-v3.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "gx:OffsetDateTime",
- "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/offsettime-v2.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/offsettime-v2.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/offsettime-v2.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "gx:OffsetTime",
- "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/offsettime-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/offsettime-v3.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/offsettime-v3.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "gx:OffsetTime",
- "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/operator-v2.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/operator-v2.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/operator-v2.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "g:Operator",
- "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/operator-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/operator-v3.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/operator-v3.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "g:Operator",
- "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/order-v2.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/order-v2.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/order-v2.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "g:Order",
- "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/order-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/order-v3.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/order-v3.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "g:Order",
- "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/p-v2.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/p-v2.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/p-v2.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "@type" : "g:P",
- "@value" : {
- "predicate" : "gt",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 0
- }
- }
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/p-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/p-v3.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/p-v3.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "@type" : "g:P",
- "@value" : {
- "predicate" : "gt",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 0
- }
- }
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pand-v2.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pand-v2.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pand-v2.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
- "@type" : "g:P",
- "@value" : {
- "predicate" : "and",
- "value" : [ {
- "@type" : "g:P",
- "@value" : {
- "predicate" : "gt",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 0
- }
- }
- }, {
- "@type" : "g:P",
- "@value" : {
- "predicate" : "lt",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 10
- }
- }
- } ]
- }
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pand-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pand-v3.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pand-v3.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
- "@type" : "g:P",
- "@value" : {
- "predicate" : "and",
- "value" : [ {
- "@type" : "g:P",
- "@value" : {
- "predicate" : "gt",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 0
- }
- }
- }, {
- "@type" : "g:P",
- "@value" : {
- "predicate" : "lt",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 10
- }
- }
- } ]
- }
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/path-v1-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/path-v1-no-types.json
deleted file mode 100644
index bb7d52b..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/path-v1-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-{"labels":[[],[],[]],"objects":[{"id":1,"label":"person","type":"vertex","properties":{"name":[{"id":0,"value":"marko"}],"location":[{"id":6,"value":"san diego","properties":{"startTime":1997,"endTime":2001}},{"id":7,"value":"santa cruz","properties":{"startTime":2001,"endTime":2004}},{"id":8,"value":"brussels","properties":{"startTime":2004,"endTime":2005}},{"id":9,"value":"santa fe","properties":{"startTime":2005}}]}},{"id":10,"label":"software","type":"vertex","properties":{"name":[{"id":4,"value":"gremlin"}]}},{"id":11,"label":"software","type":"vertex","properties":{"name":[{"id":5,"value":"tinkergraph"}]}}]}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/path-v2-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/path-v2-no-types.json
deleted file mode 100644
index ca9e8a0..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/path-v2-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-{"labels":[[],[],[]],"objects":[{"id":1,"label":"person"},{"id":10,"label":"software"},{"id":11,"label":"software"}]}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/path-v2.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/path-v2.json
deleted file mode 100644
index 9ccaa00..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/path-v2.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
- "@type" : "g:Path",
- "@value" : {
- "labels" : [ [ ], [ ], [ ] ],
- "objects" : [ {
- "@type" : "g:Vertex",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "label" : "person"
- }
- }, {
- "@type" : "g:Vertex",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 10
- },
- "label" : "software"
- }
- }, {
- "@type" : "g:Vertex",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 11
- },
- "label" : "software"
- }
- } ]
- }
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/path-v3-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/path-v3-no-types.json
deleted file mode 100644
index 499fe4c..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/path-v3-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-{"labels":[[],[],[]],"objects":[{"id":1,"label":"person","type":"vertex"},{"id":10,"label":"software","type":"vertex"},{"id":11,"label":"software","type":"vertex"}]}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/path-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/path-v3.json
deleted file mode 100644
index 216b393..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/path-v3.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
- "@type" : "g:Path",
- "@value" : {
- "labels" : {
- "@type" : "g:List",
- "@value" : [ {
- "@type" : "g:Set",
- "@value" : [ ]
- }, {
- "@type" : "g:Set",
- "@value" : [ ]
- }, {
- "@type" : "g:Set",
- "@value" : [ ]
- } ]
- },
- "objects" : {
- "@type" : "g:List",
- "@value" : [ {
- "@type" : "g:Vertex",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "label" : "person"
- }
- }, {
- "@type" : "g:Vertex",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 10
- },
- "label" : "software"
- }
- }, {
- "@type" : "g:Vertex",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 11
- },
- "label" : "software"
- }
- } ]
- }
- }
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/period-v2.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/period-v2.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/period-v2.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "gx:Period",
- "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/period-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/period-v3.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/period-v3.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "gx:Period",
- "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pick-v2.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pick-v2.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pick-v2.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "g:Pick",
- "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pick-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pick-v3.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pick-v3.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "g:Pick",
- "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pop-v2.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pop-v2.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pop-v2.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "g:Pop",
- "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pop-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pop-v3.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pop-v3.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "g:Pop",
- "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/por-v2.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/por-v2.json
deleted file mode 100644
index 71fcb7d..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/por-v2.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
- "@type" : "g:P",
- "@value" : {
- "predicate" : "or",
- "value" : [ {
- "@type" : "g:P",
- "@value" : {
- "predicate" : "gt",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 0
- }
- }
- }, {
- "@type" : "g:P",
- "@value" : {
- "predicate" : "within",
- "value" : [ {
- "@type" : "g:Int32",
- "@value" : -1
- }, {
- "@type" : "g:Int32",
- "@value" : -10
- }, {
- "@type" : "g:Int32",
- "@value" : -100
- } ]
- }
- } ]
- }
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/por-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/por-v3.json
deleted file mode 100644
index a71b1cf..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/por-v3.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
- "@type" : "g:P",
- "@value" : {
- "predicate" : "or",
- "value" : [ {
- "@type" : "g:P",
- "@value" : {
- "predicate" : "gt",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 0
- }
- }
- }, {
- "@type" : "g:P",
- "@value" : {
- "predicate" : "within",
- "value" : {
- "@type" : "g:List",
- "@value" : [ {
- "@type" : "g:Int32",
- "@value" : -1
- }, {
- "@type" : "g:Int32",
- "@value" : -10
- }, {
- "@type" : "g:Int32",
- "@value" : -100
- } ]
- }
- }
- } ]
- }
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/property-v1-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/property-v1-no-types.json
deleted file mode 100644
index 5d77645..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/property-v1-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-{"key":"since","value":2009}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/property-v2-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/property-v2-no-types.json
deleted file mode 100644
index 5d77645..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/property-v2-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-{"key":"since","value":2009}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/property-v3-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/property-v3-no-types.json
deleted file mode 100644
index 5d77645..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/property-v3-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-{"key":"since","value":2009}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/property-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/property-v3.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/property-v3.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "@type" : "g:Property",
- "@value" : {
- "key" : "since",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 2009
- }
- }
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pwithin-v2.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pwithin-v2.json
deleted file mode 100644
index afa3826..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pwithin-v2.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "@type" : "g:P",
- "@value" : {
- "predicate" : "within",
- "value" : [ {
- "@type" : "g:Int32",
- "@value" : 1
- } ]
- }
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pwithin-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pwithin-v3.json
deleted file mode 100644
index 83f99cc..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pwithin-v3.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "@type" : "g:P",
- "@value" : {
- "predicate" : "within",
- "value" : {
- "@type" : "g:List",
- "@value" : [ {
- "@type" : "g:Int32",
- "@value" : 1
- } ]
- }
- }
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pwithout-v2.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pwithout-v2.json
deleted file mode 100644
index 8c2291b..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pwithout-v2.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "@type" : "g:P",
- "@value" : {
- "predicate" : "without",
- "value" : [ {
- "@type" : "g:Int32",
- "@value" : 1
- }, {
- "@type" : "g:Int32",
- "@value" : 2
- } ]
- }
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pwithout-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pwithout-v3.json
deleted file mode 100644
index 9a16890..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pwithout-v3.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "@type" : "g:P",
- "@value" : {
- "predicate" : "without",
- "value" : {
- "@type" : "g:List",
- "@value" : [ {
- "@type" : "g:Int32",
- "@value" : 1
- }, {
- "@type" : "g:Int32",
- "@value" : 2
- } ]
- }
- }
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/scope-v2.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/scope-v2.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/scope-v2.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "g:Scope",
- "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/scope-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/scope-v3.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/scope-v3.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "g:Scope",
- "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionclose-v1-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionclose-v1-no-types.json
deleted file mode 100644
index c8444e9..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionclose-v1-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-{"requestId":"cb682578-9d92-4499-9ebc-5c6aa73c5397","op":"close","processor":"session","args":{"session":"unique-session-identifier"}}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionclose-v2-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionclose-v2-no-types.json
deleted file mode 100644
index c8444e9..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionclose-v2-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-{"requestId":"cb682578-9d92-4499-9ebc-5c6aa73c5397","op":"close","processor":"session","args":{"session":"unique-session-identifier"}}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionclose-v2.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionclose-v2.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionclose-v2.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
- "op" : "close",
- "processor" : "session",
- "args" : {
- "session" : "unique-session-identifier"
- }
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionclose-v3-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionclose-v3-no-types.json
deleted file mode 100644
index c8444e9..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionclose-v3-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-{"requestId":"cb682578-9d92-4499-9ebc-5c6aa73c5397","op":"close","processor":"session","args":{"session":"unique-session-identifier"}}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionclose-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionclose-v3.json
deleted file mode 100644
index 4be1ccd..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionclose-v3.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
- "op" : "close",
- "processor" : "session",
- "args" : {
- "@type" : "g:Map",
- "@value" : [ "session", "unique-session-identifier" ]
- }
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessioneval-v1-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessioneval-v1-no-types.json
deleted file mode 100644
index 3ffc988..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessioneval-v1-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-{"requestId":"cb682578-9d92-4499-9ebc-5c6aa73c5397","op":"eval","processor":"session","args":{"gremlin":"g.V(x)","language":"gremlin-groovy","session":"unique-session-identifier","bindings":{"x":1}}}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessioneval-v2-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessioneval-v2-no-types.json
deleted file mode 100644
index 3ffc988..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessioneval-v2-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-{"requestId":"cb682578-9d92-4499-9ebc-5c6aa73c5397","op":"eval","processor":"session","args":{"gremlin":"g.V(x)","language":"gremlin-groovy","session":"unique-session-identifier","bindings":{"x":1}}}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessioneval-v2.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessioneval-v2.json
deleted file mode 100644
index 8ff8b96..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessioneval-v2.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
- "op" : "eval",
- "processor" : "session",
- "args" : {
- "gremlin" : "g.V(x)",
- "language" : "gremlin-groovy",
- "session" : "unique-session-identifier",
- "bindings" : {
- "x" : {
- "@type" : "g:Int32",
- "@value" : 1
- }
- }
- }
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessioneval-v3-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessioneval-v3-no-types.json
deleted file mode 100644
index 3ffc988..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessioneval-v3-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-{"requestId":"cb682578-9d92-4499-9ebc-5c6aa73c5397","op":"eval","processor":"session","args":{"gremlin":"g.V(x)","language":"gremlin-groovy","session":"unique-session-identifier","bindings":{"x":1}}}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessioneval-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessioneval-v3.json
deleted file mode 100644
index 301c393..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessioneval-v3.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
- "op" : "eval",
- "processor" : "session",
- "args" : {
- "@type" : "g:Map",
- "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "session", "unique-session-identifier", "bindings", {
- "@type" : "g:Map",
- "@value" : [ "x", {
- "@type" : "g:Int32",
- "@value" : 1
- } ]
- } ]
- }
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionevalaliased-v1-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionevalaliased-v1-no-types.json
deleted file mode 100644
index 0a90cab..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionevalaliased-v1-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-{"requestId":"cb682578-9d92-4499-9ebc-5c6aa73c5397","op":"eval","processor":"session","args":{"gremlin":"social.V(x)","language":"gremlin-groovy","aliases":{"g":"social"},"session":"unique-session-identifier","bindings":{"x":1}}}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionevalaliased-v2-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionevalaliased-v2-no-types.json
deleted file mode 100644
index 0a90cab..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionevalaliased-v2-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-{"requestId":"cb682578-9d92-4499-9ebc-5c6aa73c5397","op":"eval","processor":"session","args":{"gremlin":"social.V(x)","language":"gremlin-groovy","aliases":{"g":"social"},"session":"unique-session-identifier","bindings":{"x":1}}}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionevalaliased-v2.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionevalaliased-v2.json
deleted file mode 100644
index 394e5d3..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionevalaliased-v2.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
- "op" : "eval",
- "processor" : "session",
- "args" : {
- "gremlin" : "social.V(x)",
- "language" : "gremlin-groovy",
- "aliases" : {
- "g" : "social"
- },
- "session" : "unique-session-identifier",
- "bindings" : {
- "x" : {
- "@type" : "g:Int32",
- "@value" : 1
- }
- }
- }
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionevalaliased-v3-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionevalaliased-v3-no-types.json
deleted file mode 100644
index 0a90cab..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionevalaliased-v3-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-{"requestId":"cb682578-9d92-4499-9ebc-5c6aa73c5397","op":"eval","processor":"session","args":{"gremlin":"social.V(x)","language":"gremlin-groovy","aliases":{"g":"social"},"session":"unique-session-identifier","bindings":{"x":1}}}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionevalaliased-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionevalaliased-v3.json
deleted file mode 100644
index 7448160..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionevalaliased-v3.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
- "op" : "eval",
- "processor" : "session",
- "args" : {
- "@type" : "g:Map",
- "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
- "@type" : "g:Map",
- "@value" : [ "g", "social" ]
- }, "session", "unique-session-identifier", "bindings", {
- "@type" : "g:Map",
- "@value" : [ "x", {
- "@type" : "g:Int32",
- "@value" : 1
- } ]
- } ]
- }
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlesseval-v1-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlesseval-v1-no-types.json
deleted file mode 100644
index 84517c4..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlesseval-v1-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-{"requestId":"cb682578-9d92-4499-9ebc-5c6aa73c5397","op":"eval","processor":"","args":{"gremlin":"g.V(x)","language":"gremlin-groovy","bindings":{"x":1}}}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlesseval-v2-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlesseval-v2-no-types.json
deleted file mode 100644
index 84517c4..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlesseval-v2-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-{"requestId":"cb682578-9d92-4499-9ebc-5c6aa73c5397","op":"eval","processor":"","args":{"gremlin":"g.V(x)","language":"gremlin-groovy","bindings":{"x":1}}}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlesseval-v2.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlesseval-v2.json
deleted file mode 100644
index 81e2f6c..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlesseval-v2.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
- "op" : "eval",
- "processor" : "",
- "args" : {
- "gremlin" : "g.V(x)",
- "language" : "gremlin-groovy",
- "bindings" : {
- "x" : {
- "@type" : "g:Int32",
- "@value" : 1
- }
- }
- }
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlesseval-v3-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlesseval-v3-no-types.json
deleted file mode 100644
index 84517c4..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlesseval-v3-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-{"requestId":"cb682578-9d92-4499-9ebc-5c6aa73c5397","op":"eval","processor":"","args":{"gremlin":"g.V(x)","language":"gremlin-groovy","bindings":{"x":1}}}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlesseval-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlesseval-v3.json
deleted file mode 100644
index dc8c8e6..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlesseval-v3.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
- "op" : "eval",
- "processor" : "",
- "args" : {
- "@type" : "g:Map",
- "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "bindings", {
- "@type" : "g:Map",
- "@value" : [ "x", {
- "@type" : "g:Int32",
- "@value" : 1
- } ]
- } ]
- }
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlessevalaliased-v1-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlessevalaliased-v1-no-types.json
deleted file mode 100644
index 44c113d..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlessevalaliased-v1-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-{"requestId":"cb682578-9d92-4499-9ebc-5c6aa73c5397","op":"eval","processor":"","args":{"gremlin":"social.V(x)","language":"gremlin-groovy","aliases":{"g":"social"},"bindings":{"x":1}}}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlessevalaliased-v2-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlessevalaliased-v2-no-types.json
deleted file mode 100644
index 44c113d..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlessevalaliased-v2-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-{"requestId":"cb682578-9d92-4499-9ebc-5c6aa73c5397","op":"eval","processor":"","args":{"gremlin":"social.V(x)","language":"gremlin-groovy","aliases":{"g":"social"},"bindings":{"x":1}}}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlessevalaliased-v2.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlessevalaliased-v2.json
deleted file mode 100644
index 0f6a54e..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlessevalaliased-v2.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
- "op" : "eval",
- "processor" : "",
- "args" : {
- "gremlin" : "social.V(x)",
- "language" : "gremlin-groovy",
- "aliases" : {
- "g" : "social"
- },
- "bindings" : {
- "x" : {
- "@type" : "g:Int32",
- "@value" : 1
- }
- }
- }
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlessevalaliased-v3-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlessevalaliased-v3-no-types.json
deleted file mode 100644
index 44c113d..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlessevalaliased-v3-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-{"requestId":"cb682578-9d92-4499-9ebc-5c6aa73c5397","op":"eval","processor":"","args":{"gremlin":"social.V(x)","language":"gremlin-groovy","aliases":{"g":"social"},"bindings":{"x":1}}}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlessevalaliased-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlessevalaliased-v3.json
deleted file mode 100644
index fc03a37..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlessevalaliased-v3.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
- "op" : "eval",
- "processor" : "",
- "args" : {
- "@type" : "g:Map",
- "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
- "@type" : "g:Map",
- "@value" : [ "g", "social" ]
- }, "bindings", {
- "@type" : "g:Map",
- "@value" : [ "x", {
- "@type" : "g:Int32",
- "@value" : 1
- } ]
- } ]
- }
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/set-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/set-v3.json
deleted file mode 100644
index 32deea2..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/set-v3.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "@type" : "g:Set",
- "@value" : [ {
- "@type" : "g:Int32",
- "@value" : 1
- }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/short-v2.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/short-v2.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/short-v2.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "gx:Int16",
- "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/short-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/short-v3.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/short-v3.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "gx:Int16",
- "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/standardresult-v1-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/standardresult-v1-no-types.json
deleted file mode 100644
index 3faf642..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/standardresult-v1-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-{"requestId":"41d2e28a-20a4-4ab0-b379-d810dede3786","status":{"message":"","code":200,"attributes":{}},"result":{"data":[{"id":1,"label":"person","type":"vertex","properties":{"name":[{"id":0,"value":"marko"}],"location":[{"id":6,"value":"san diego","properties":{"startTime":1997,"endTime":2001}},{"id":7,"value":"santa cruz","properties":{"startTime":2001,"endTime":2004}},{"id":8,"value":"brussels","properties":{"startTime":2004,"endTime":2005}},{"id":9,"value":"santa fe","properties":{"startTime":2005}}]}}],"meta":{}}}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/standardresult-v2-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/standardresult-v2-no-types.json
deleted file mode 100644
index 9933ebb..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/standardresult-v2-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-{"requestId":"41d2e28a-20a4-4ab0-b379-d810dede3786","status":{"message":"","code":200,"attributes":{}},"result":{"data":[{"id":1,"label":"person","properties":{"name":[{"id":0,"value":"marko","label":"name"}],"location":[{"id":6,"value":"san diego","label":"location","properties":{"startTime":1997,"endTime":2001}},{"id":7,"value":"santa cruz","label":"location","properties":{"startTime":2001,"endTime":2004}},{"id":8,"value":"brussels","label":"location","properties":{"startTime":2004,"endTime":2005}},{"id":9,"value":"santa fe","label":"location","properties":{"startTime":2005}}]}}],"meta":{}}}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/standardresult-v2.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/standardresult-v2.json
deleted file mode 100644
index 857c6db..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/standardresult-v2.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
- "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
- "status" : {
- "message" : "",
- "code" : 200,
- "attributes" : { }
- },
- "result" : {
- "data" : [ {
- "@type" : "g:Vertex",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "label" : "person",
- "properties" : {
- "name" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 0
- },
- "value" : "marko",
- "label" : "name"
- }
- } ],
- "location" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 6
- },
- "value" : "san diego",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 1997
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2001
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 7
- },
- "value" : "santa cruz",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2001
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2004
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 8
- },
- "value" : "brussels",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2004
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2005
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 9
- },
- "value" : "santa fe",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2005
- }
- }
- }
- } ]
- }
- }
- } ],
- "meta" : { }
- }
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/standardresult-v3-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/standardresult-v3-no-types.json
deleted file mode 100644
index 3faf642..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/standardresult-v3-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-{"requestId":"41d2e28a-20a4-4ab0-b379-d810dede3786","status":{"message":"","code":200,"attributes":{}},"result":{"data":[{"id":1,"label":"person","type":"vertex","properties":{"name":[{"id":0,"value":"marko"}],"location":[{"id":6,"value":"san diego","properties":{"startTime":1997,"endTime":2001}},{"id":7,"value":"santa cruz","properties":{"startTime":2001,"endTime":2004}},{"id":8,"value":"brussels","properties":{"startTime":2004,"endTime":2005}},{"id":9,"value":"santa fe","properties":{"startTime":2005}}]}}],"meta":{}}}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/standardresult-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/standardresult-v3.json
deleted file mode 100644
index dfca400..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/standardresult-v3.json
+++ /dev/null
@@ -1,120 +0,0 @@
-{
- "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
- "status" : {
- "message" : "",
- "code" : 200,
- "attributes" : {
- "@type" : "g:Map",
- "@value" : [ ]
- }
- },
- "result" : {
- "data" : {
- "@type" : "g:List",
- "@value" : [ {
- "@type" : "g:Vertex",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "label" : "person",
- "properties" : {
- "name" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 0
- },
- "value" : "marko",
- "label" : "name"
- }
- } ],
- "location" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 6
- },
- "value" : "san diego",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 1997
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2001
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 7
- },
- "value" : "santa cruz",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2001
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2004
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 8
- },
- "value" : "brussels",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2004
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2005
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 9
- },
- "value" : "santa fe",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2005
- }
- }
- }
- } ]
- }
- }
- } ]
- },
- "meta" : {
- "@type" : "g:Map",
- "@value" : [ ]
- }
- }
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/t-v2.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/t-v2.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/t-v2.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "g:T",
- "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/t-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/t-v3.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/t-v3.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "g:T",
- "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/textp-v2.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/textp-v2.json
deleted file mode 100644
index 2820989..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/textp-v2.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "@type" : "g:TextP",
- "@value" : {
- "predicate" : "containing",
- "value" : "ark"
- }
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/textp-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/textp-v3.json
deleted file mode 100644
index 2820989..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/textp-v3.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "@type" : "g:TextP",
- "@value" : {
- "predicate" : "containing",
- "value" : "ark"
- }
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/timestamp-v2.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/timestamp-v2.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/timestamp-v2.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "g:Timestamp",
- "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/timestamp-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/timestamp-v3.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/timestamp-v3.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "g:Timestamp",
- "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkergraph-v2.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkergraph-v2.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkergraph-v2.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
- "@type" : "tinker:graph",
- "@value" : {
- "vertices" : [ {
- "@type" : "g:Vertex",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "label" : "person",
- "properties" : {
- "name" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 0
- },
- "value" : "marko",
- "label" : "name"
- }
- } ],
- "location" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 6
- },
- "value" : "san diego",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 1997
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2001
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 7
- },
- "value" : "santa cruz",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2001
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2004
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 8
- },
- "value" : "brussels",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2004
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2005
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 9
- },
- "value" : "santa fe",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2005
- }
- }
- }
- } ]
- }
- }
- }, {
- "@type" : "g:Vertex",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 7
- },
- "label" : "person",
- "properties" : {
- "name" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 1
- },
- "value" : "stephen",
- "label" : "name"
- }
- } ],
- "location" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 10
- },
- "value" : "centreville",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 1990
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2000
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 11
- },
- "value" : "dulles",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2000
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2006
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 12
- },
- "value" : "purcellville",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2006
- }
- }
- }
- } ]
- }
- }
- }, {
- "@type" : "g:Vertex",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 8
- },
- "label" : "person",
- "properties" : {
- "name" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 2
- },
- "value" : "matthias",
- "label" : "name"
- }
- } ],
- "location" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 13
- },
- "value" : "bremen",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2004
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2007
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 14
- },
- "value" : "baltimore",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2007
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2011
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 15
- },
- "value" : "oakland",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2011
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2014
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 16
- },
- "value" : "seattle",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2014
- }
- }
- }
- } ]
- }
- }
- }, {
- "@type" : "g:Vertex",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 9
- },
- "label" : "person",
- "properties" : {
- "name" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 3
- },
- "value" : "daniel",
- "label" : "name"
- }
- } ],
- "location" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 17
- },
- "value" : "spremberg",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 1982
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2005
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 18
- },
- "value" : "kaiserslautern",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2005
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2009
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 19
- },
- "value" : "aachen",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2009
- }
- }
- }
- } ]
- }
- }
- }, {
- "@type" : "g:Vertex",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 10
- },
- "label" : "software",
- "properties" : {
- "name" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 4
- },
- "value" : "gremlin",
- "label" : "name"
- }
- } ]
- }
- }
- }, {
- "@type" : "g:Vertex",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 11
- },
- "label" : "software",
- "properties" : {
- "name" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 5
- },
- "value" : "tinkergraph",
- "label" : "name"
- }
- } ]
- }
- }
- } ],
- "edges" : [ {
- "@type" : "g:Edge",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 13
- },
- "label" : "develops",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : {
- "@type" : "g:Int32",
- "@value" : 10
- },
- "outV" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "properties" : {
- "since" : {
- "@type" : "g:Property",
- "@value" : {
- "key" : "since",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 2009
- }
- }
- }
- }
- }
- }, {
- "@type" : "g:Edge",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 14
- },
- "label" : "develops",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : {
- "@type" : "g:Int32",
- "@value" : 11
- },
- "outV" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "properties" : {
- "since" : {
- "@type" : "g:Property",
- "@value" : {
- "key" : "since",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 2010
- }
- }
- }
- }
- }
- }, {
- "@type" : "g:Edge",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 15
- },
- "label" : "uses",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : {
- "@type" : "g:Int32",
- "@value" : 10
- },
- "outV" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "properties" : {
- "skill" : {
- "@type" : "g:Property",
- "@value" : {
- "key" : "skill",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 4
- }
- }
- }
- }
- }
- }, {
- "@type" : "g:Edge",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 16
- },
- "label" : "uses",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : {
- "@type" : "g:Int32",
- "@value" : 11
- },
- "outV" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "properties" : {
- "skill" : {
- "@type" : "g:Property",
- "@value" : {
- "key" : "skill",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 5
- }
- }
- }
- }
- }
- }, {
- "@type" : "g:Edge",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 17
- },
- "label" : "develops",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : {
- "@type" : "g:Int32",
- "@value" : 10
- },
- "outV" : {
- "@type" : "g:Int32",
- "@value" : 7
- },
- "properties" : {
- "since" : {
- "@type" : "g:Property",
- "@value" : {
- "key" : "since",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 2010
- }
- }
- }
- }
- }
- }, {
- "@type" : "g:Edge",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 18
- },
- "label" : "develops",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : {
- "@type" : "g:Int32",
- "@value" : 11
- },
- "outV" : {
- "@type" : "g:Int32",
- "@value" : 7
- },
- "properties" : {
- "since" : {
- "@type" : "g:Property",
- "@value" : {
- "key" : "since",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 2011
- }
- }
- }
- }
- }
- }, {
- "@type" : "g:Edge",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 19
- },
- "label" : "uses",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : {
- "@type" : "g:Int32",
- "@value" : 10
- },
- "outV" : {
- "@type" : "g:Int32",
- "@value" : 7
- },
- "properties" : {
- "skill" : {
- "@type" : "g:Property",
- "@value" : {
- "key" : "skill",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 5
- }
- }
- }
- }
- }
- }, {
- "@type" : "g:Edge",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 20
- },
- "label" : "uses",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : {
- "@type" : "g:Int32",
- "@value" : 11
- },
- "outV" : {
- "@type" : "g:Int32",
- "@value" : 7
- },
- "properties" : {
- "skill" : {
- "@type" : "g:Property",
- "@value" : {
- "key" : "skill",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 4
- }
- }
- }
- }
- }
- }, {
- "@type" : "g:Edge",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 21
- },
- "label" : "develops",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : {
- "@type" : "g:Int32",
- "@value" : 10
- },
- "outV" : {
- "@type" : "g:Int32",
- "@value" : 8
- },
- "properties" : {
- "since" : {
- "@type" : "g:Property",
- "@value" : {
- "key" : "since",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 2012
- }
- }
- }
- }
- }
- }, {
- "@type" : "g:Edge",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 22
- },
- "label" : "uses",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : {
- "@type" : "g:Int32",
- "@value" : 10
- },
- "outV" : {
- "@type" : "g:Int32",
- "@value" : 8
- },
- "properties" : {
- "skill" : {
- "@type" : "g:Property",
- "@value" : {
- "key" : "skill",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 3
- }
- }
- }
- }
- }
- }, {
- "@type" : "g:Edge",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 23
- },
- "label" : "uses",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : {
- "@type" : "g:Int32",
- "@value" : 11
- },
- "outV" : {
- "@type" : "g:Int32",
- "@value" : 8
- },
- "properties" : {
- "skill" : {
- "@type" : "g:Property",
- "@value" : {
- "key" : "skill",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 3
- }
- }
- }
- }
- }
- }, {
- "@type" : "g:Edge",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 24
- },
- "label" : "uses",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : {
- "@type" : "g:Int32",
- "@value" : 10
- },
- "outV" : {
- "@type" : "g:Int32",
- "@value" : 9
- },
- "properties" : {
- "skill" : {
- "@type" : "g:Property",
- "@value" : {
- "key" : "skill",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 5
- }
- }
- }
- }
- }
- }, {
- "@type" : "g:Edge",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 25
- },
- "label" : "uses",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : {
- "@type" : "g:Int32",
- "@value" : 11
- },
- "outV" : {
- "@type" : "g:Int32",
- "@value" : 9
- },
- "properties" : {
- "skill" : {
- "@type" : "g:Property",
- "@value" : {
- "key" : "skill",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 3
- }
- }
- }
- }
- }
- }, {
- "@type" : "g:Edge",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 26
- },
- "label" : "traverses",
- "inVLabel" : "software",
- "outVLabel" : "software",
- "inV" : {
- "@type" : "g:Int32",
- "@value" : 11
- },
- "outV" : {
- "@type" : "g:Int32",
- "@value" : 10
- }
- }
- } ]
- }
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkergraph-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkergraph-v3.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkergraph-v3.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
- "@type" : "tinker:graph",
- "@value" : {
- "vertices" : [ {
- "@type" : "g:Vertex",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "label" : "person",
- "properties" : {
- "name" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 0
- },
- "value" : "marko",
- "label" : "name"
- }
- } ],
- "location" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 6
- },
- "value" : "san diego",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 1997
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2001
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 7
- },
- "value" : "santa cruz",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2001
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2004
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 8
- },
- "value" : "brussels",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2004
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2005
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 9
- },
- "value" : "santa fe",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2005
- }
- }
- }
- } ]
- }
- }
- }, {
- "@type" : "g:Vertex",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 7
- },
- "label" : "person",
- "properties" : {
- "name" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 1
- },
- "value" : "stephen",
- "label" : "name"
- }
- } ],
- "location" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 10
- },
- "value" : "centreville",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 1990
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2000
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 11
- },
- "value" : "dulles",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2000
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2006
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 12
- },
- "value" : "purcellville",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2006
- }
- }
- }
- } ]
- }
- }
- }, {
- "@type" : "g:Vertex",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 8
- },
- "label" : "person",
- "properties" : {
- "name" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 2
- },
- "value" : "matthias",
- "label" : "name"
- }
- } ],
- "location" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 13
- },
- "value" : "bremen",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2004
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2007
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 14
- },
- "value" : "baltimore",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2007
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2011
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 15
- },
- "value" : "oakland",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2011
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2014
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 16
- },
- "value" : "seattle",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2014
- }
- }
- }
- } ]
- }
- }
- }, {
- "@type" : "g:Vertex",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 9
- },
- "label" : "person",
- "properties" : {
- "name" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 3
- },
- "value" : "daniel",
- "label" : "name"
- }
- } ],
- "location" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 17
- },
- "value" : "spremberg",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 1982
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2005
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 18
- },
- "value" : "kaiserslautern",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2005
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2009
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 19
- },
- "value" : "aachen",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2009
- }
- }
- }
- } ]
- }
- }
- }, {
- "@type" : "g:Vertex",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 10
- },
- "label" : "software",
- "properties" : {
- "name" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 4
- },
- "value" : "gremlin",
- "label" : "name"
- }
- } ]
- }
- }
- }, {
- "@type" : "g:Vertex",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 11
- },
- "label" : "software",
- "properties" : {
- "name" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 5
- },
- "value" : "tinkergraph",
- "label" : "name"
- }
- } ]
- }
- }
- } ],
- "edges" : [ {
- "@type" : "g:Edge",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 13
- },
- "label" : "develops",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : {
- "@type" : "g:Int32",
- "@value" : 10
- },
- "outV" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "properties" : {
- "since" : {
- "@type" : "g:Property",
- "@value" : {
- "key" : "since",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 2009
- }
- }
- }
- }
- }
- }, {
- "@type" : "g:Edge",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 14
- },
- "label" : "develops",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : {
- "@type" : "g:Int32",
- "@value" : 11
- },
- "outV" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "properties" : {
- "since" : {
- "@type" : "g:Property",
- "@value" : {
- "key" : "since",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 2010
- }
- }
- }
- }
- }
- }, {
- "@type" : "g:Edge",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 15
- },
- "label" : "uses",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : {
- "@type" : "g:Int32",
- "@value" : 10
- },
- "outV" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "properties" : {
- "skill" : {
- "@type" : "g:Property",
- "@value" : {
- "key" : "skill",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 4
- }
- }
- }
- }
- }
- }, {
- "@type" : "g:Edge",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 16
- },
- "label" : "uses",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : {
- "@type" : "g:Int32",
- "@value" : 11
- },
- "outV" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "properties" : {
- "skill" : {
- "@type" : "g:Property",
- "@value" : {
- "key" : "skill",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 5
- }
- }
- }
- }
- }
- }, {
- "@type" : "g:Edge",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 17
- },
- "label" : "develops",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : {
- "@type" : "g:Int32",
- "@value" : 10
- },
- "outV" : {
- "@type" : "g:Int32",
- "@value" : 7
- },
- "properties" : {
- "since" : {
- "@type" : "g:Property",
- "@value" : {
- "key" : "since",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 2010
- }
- }
- }
- }
- }
- }, {
- "@type" : "g:Edge",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 18
- },
- "label" : "develops",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : {
- "@type" : "g:Int32",
- "@value" : 11
- },
- "outV" : {
- "@type" : "g:Int32",
- "@value" : 7
- },
- "properties" : {
- "since" : {
- "@type" : "g:Property",
- "@value" : {
- "key" : "since",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 2011
- }
- }
- }
- }
- }
- }, {
- "@type" : "g:Edge",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 19
- },
- "label" : "uses",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : {
- "@type" : "g:Int32",
- "@value" : 10
- },
- "outV" : {
- "@type" : "g:Int32",
- "@value" : 7
- },
- "properties" : {
- "skill" : {
- "@type" : "g:Property",
- "@value" : {
- "key" : "skill",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 5
- }
- }
- }
- }
- }
- }, {
- "@type" : "g:Edge",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 20
- },
- "label" : "uses",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : {
- "@type" : "g:Int32",
- "@value" : 11
- },
- "outV" : {
- "@type" : "g:Int32",
- "@value" : 7
- },
- "properties" : {
- "skill" : {
- "@type" : "g:Property",
- "@value" : {
- "key" : "skill",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 4
- }
- }
- }
- }
- }
- }, {
- "@type" : "g:Edge",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 21
- },
- "label" : "develops",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : {
- "@type" : "g:Int32",
- "@value" : 10
- },
- "outV" : {
- "@type" : "g:Int32",
- "@value" : 8
- },
- "properties" : {
- "since" : {
- "@type" : "g:Property",
- "@value" : {
- "key" : "since",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 2012
- }
- }
- }
- }
- }
- }, {
- "@type" : "g:Edge",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 22
- },
- "label" : "uses",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : {
- "@type" : "g:Int32",
- "@value" : 10
- },
- "outV" : {
- "@type" : "g:Int32",
- "@value" : 8
- },
- "properties" : {
- "skill" : {
- "@type" : "g:Property",
- "@value" : {
- "key" : "skill",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 3
- }
- }
- }
- }
- }
- }, {
- "@type" : "g:Edge",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 23
- },
- "label" : "uses",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : {
- "@type" : "g:Int32",
- "@value" : 11
- },
- "outV" : {
- "@type" : "g:Int32",
- "@value" : 8
- },
- "properties" : {
- "skill" : {
- "@type" : "g:Property",
- "@value" : {
- "key" : "skill",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 3
- }
- }
- }
- }
- }
- }, {
- "@type" : "g:Edge",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 24
- },
- "label" : "uses",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : {
- "@type" : "g:Int32",
- "@value" : 10
- },
- "outV" : {
- "@type" : "g:Int32",
- "@value" : 9
- },
- "properties" : {
- "skill" : {
- "@type" : "g:Property",
- "@value" : {
- "key" : "skill",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 5
- }
- }
- }
- }
- }
- }, {
- "@type" : "g:Edge",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 25
- },
- "label" : "uses",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : {
- "@type" : "g:Int32",
- "@value" : 11
- },
- "outV" : {
- "@type" : "g:Int32",
- "@value" : 9
- },
- "properties" : {
- "skill" : {
- "@type" : "g:Property",
- "@value" : {
- "key" : "skill",
- "value" : {
- "@type" : "g:Int32",
- "@value" : 3
- }
- }
- }
- }
- }
- }, {
- "@type" : "g:Edge",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 26
- },
- "label" : "traverses",
- "inVLabel" : "software",
- "outVLabel" : "software",
- "inV" : {
- "@type" : "g:Int32",
- "@value" : 11
- },
- "outV" : {
- "@type" : "g:Int32",
- "@value" : 10
- }
- }
- } ]
- }
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traversalmetrics-v2.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traversalmetrics-v2.json
deleted file mode 100644
index fdd18a4..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traversalmetrics-v2.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
- "@type" : "g:TraversalMetrics",
- "@value" : {
- "dur" : {
- "@type" : "g:Double",
- "@value" : 0.004
- },
- "metrics" : [ {
- "@type" : "g:Metrics",
- "@value" : {
- "dur" : {
- "@type" : "g:Double",
- "@value" : 100.0
- },
- "counts" : {
- "traverserCount" : {
- "@type" : "g:Int64",
- "@value" : 4
- },
- "elementCount" : {
- "@type" : "g:Int64",
- "@value" : 4
- }
- },
- "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
- "annotations" : {
- "percentDur" : {
- "@type" : "g:Double",
- "@value" : 25.0
- }
- },
- "id" : "7.0.0()"
- }
- }, {
- "@type" : "g:Metrics",
- "@value" : {
- "dur" : {
- "@type" : "g:Double",
- "@value" : 100.0
- },
- "counts" : {
- "traverserCount" : {
- "@type" : "g:Int64",
- "@value" : 13
- },
- "elementCount" : {
- "@type" : "g:Int64",
- "@value" : 13
- }
- },
- "name" : "VertexStep(OUT,vertex)",
- "annotations" : {
- "percentDur" : {
- "@type" : "g:Double",
- "@value" : 25.0
- }
- },
- "id" : "2.0.0()"
- }
- }, {
- "@type" : "g:Metrics",
- "@value" : {
- "dur" : {
- "@type" : "g:Double",
- "@value" : 100.0
- },
- "counts" : {
- "traverserCount" : {
- "@type" : "g:Int64",
- "@value" : 7
- },
- "elementCount" : {
- "@type" : "g:Int64",
- "@value" : 7
- }
- },
- "name" : "VertexStep(OUT,vertex)",
- "annotations" : {
- "percentDur" : {
- "@type" : "g:Double",
- "@value" : 25.0
- }
- },
- "id" : "3.0.0()"
- }
- }, {
- "@type" : "g:Metrics",
- "@value" : {
- "dur" : {
- "@type" : "g:Double",
- "@value" : 100.0
- },
- "counts" : {
- "traverserCount" : {
- "@type" : "g:Int64",
- "@value" : 1
- },
- "elementCount" : {
- "@type" : "g:Int64",
- "@value" : 1
- }
- },
- "name" : "TreeStep",
- "annotations" : {
- "percentDur" : {
- "@type" : "g:Double",
- "@value" : 25.0
- }
- },
- "id" : "4.0.0()"
- }
- } ]
- }
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traversalmetrics-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traversalmetrics-v3.json
deleted file mode 100644
index 46f7636..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traversalmetrics-v3.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
- "@type" : "g:TraversalMetrics",
- "@value" : {
- "@type" : "g:Map",
- "@value" : [ "dur", {
- "@type" : "g:Double",
- "@value" : 0.004
- }, "metrics", {
- "@type" : "g:List",
- "@value" : [ {
- "@type" : "g:Metrics",
- "@value" : {
- "@type" : "g:Map",
- "@value" : [ "dur", {
- "@type" : "g:Double",
- "@value" : 100.0
- }, "counts", {
- "@type" : "g:Map",
- "@value" : [ "traverserCount", {
- "@type" : "g:Int64",
- "@value" : 4
- }, "elementCount", {
- "@type" : "g:Int64",
- "@value" : 4
- } ]
- }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
- "@type" : "g:Map",
- "@value" : [ "percentDur", {
- "@type" : "g:Double",
- "@value" : 25.0
- } ]
- }, "id", "7.0.0()" ]
- }
- }, {
- "@type" : "g:Metrics",
- "@value" : {
- "@type" : "g:Map",
- "@value" : [ "dur", {
- "@type" : "g:Double",
- "@value" : 100.0
- }, "counts", {
- "@type" : "g:Map",
- "@value" : [ "traverserCount", {
- "@type" : "g:Int64",
- "@value" : 13
- }, "elementCount", {
- "@type" : "g:Int64",
- "@value" : 13
- } ]
- }, "name", "VertexStep(OUT,vertex)", "annotations", {
- "@type" : "g:Map",
- "@value" : [ "percentDur", {
- "@type" : "g:Double",
- "@value" : 25.0
- } ]
- }, "id", "2.0.0()" ]
- }
- }, {
- "@type" : "g:Metrics",
- "@value" : {
- "@type" : "g:Map",
- "@value" : [ "dur", {
- "@type" : "g:Double",
- "@value" : 100.0
- }, "counts", {
- "@type" : "g:Map",
- "@value" : [ "traverserCount", {
- "@type" : "g:Int64",
- "@value" : 7
- }, "elementCount", {
- "@type" : "g:Int64",
- "@value" : 7
- } ]
- }, "name", "VertexStep(OUT,vertex)", "annotations", {
- "@type" : "g:Map",
- "@value" : [ "percentDur", {
- "@type" : "g:Double",
- "@value" : 25.0
- } ]
- }, "id", "3.0.0()" ]
- }
- }, {
- "@type" : "g:Metrics",
- "@value" : {
- "@type" : "g:Map",
- "@value" : [ "dur", {
- "@type" : "g:Double",
- "@value" : 100.0
- }, "counts", {
- "@type" : "g:Map",
- "@value" : [ "traverserCount", {
- "@type" : "g:Int64",
- "@value" : 1
- }, "elementCount", {
- "@type" : "g:Int64",
- "@value" : 1
- } ]
- }, "name", "TreeStep", "annotations", {
- "@type" : "g:Map",
- "@value" : [ "percentDur", {
- "@type" : "g:Double",
- "@value" : 25.0
- } ]
- }, "id", "4.0.0()" ]
- }
- } ]
- } ]
- }
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traverser-v2.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traverser-v2.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traverser-v2.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
- "@type" : "g:Traverser",
- "@value" : {
- "bulk" : {
- "@type" : "g:Int64",
- "@value" : 1
- },
- "value" : {
- "@type" : "g:Vertex",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "label" : "person",
- "properties" : {
- "name" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 0
- },
- "value" : "marko",
- "label" : "name"
- }
- } ],
- "location" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 6
- },
- "value" : "san diego",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 1997
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2001
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 7
- },
- "value" : "santa cruz",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2001
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2004
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 8
- },
- "value" : "brussels",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2004
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2005
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 9
- },
- "value" : "santa fe",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2005
- }
- }
- }
- } ]
- }
- }
- }
- }
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traverser-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traverser-v3.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traverser-v3.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
- "@type" : "g:Traverser",
- "@value" : {
- "bulk" : {
- "@type" : "g:Int64",
- "@value" : 1
- },
- "value" : {
- "@type" : "g:Vertex",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "label" : "person",
- "properties" : {
- "name" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 0
- },
- "value" : "marko",
- "label" : "name"
- }
- } ],
- "location" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 6
- },
- "value" : "san diego",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 1997
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2001
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 7
- },
- "value" : "santa cruz",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2001
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2004
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 8
- },
- "value" : "brussels",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2004
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2005
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 9
- },
- "value" : "santa fe",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2005
- }
- }
- }
- } ]
- }
- }
- }
- }
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/uuid-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/uuid-v3.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/uuid-v3.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "g:UUID",
- "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertex-v1-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertex-v1-no-types.json
deleted file mode 100644
index dadbbf0..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertex-v1-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id":1,"label":"person","type":"vertex","properties":{"name":[{"id":0,"value":"marko"}],"location":[{"id":6,"value":"san diego","properties":{"startTime":1997,"endTime":2001}},{"id":7,"value":"santa cruz","properties":{"startTime":2001,"endTime":2004}},{"id":8,"value":"brussels","properties":{"startTime":2004,"endTime":2005}},{"id":9,"value":"santa fe","properties":{"startTime":2005}}]}}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertex-v2-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertex-v2-no-types.json
deleted file mode 100644
index c4a4dfd..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertex-v2-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id":1,"label":"person","properties":{"name":[{"id":0,"value":"marko","label":"name"}],"location":[{"id":6,"value":"san diego","label":"location","properties":{"startTime":1997,"endTime":2001}},{"id":7,"value":"santa cruz","label":"location","properties":{"startTime":2001,"endTime":2004}},{"id":8,"value":"brussels","label":"location","properties":{"startTime":2004,"endTime":2005}},{"id":9,"value":"santa fe","label":"location","properties":{"startTime":2005}}]}}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertex-v2.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertex-v2.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertex-v2.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
- "@type" : "g:Vertex",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "label" : "person",
- "properties" : {
- "name" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 0
- },
- "value" : "marko",
- "label" : "name"
- }
- } ],
- "location" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 6
- },
- "value" : "san diego",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 1997
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2001
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 7
- },
- "value" : "santa cruz",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2001
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2004
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 8
- },
- "value" : "brussels",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2004
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2005
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 9
- },
- "value" : "santa fe",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2005
- }
- }
- }
- } ]
- }
- }
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertex-v3-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertex-v3-no-types.json
deleted file mode 100644
index dadbbf0..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertex-v3-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id":1,"label":"person","type":"vertex","properties":{"name":[{"id":0,"value":"marko"}],"location":[{"id":6,"value":"san diego","properties":{"startTime":1997,"endTime":2001}},{"id":7,"value":"santa cruz","properties":{"startTime":2001,"endTime":2004}},{"id":8,"value":"brussels","properties":{"startTime":2004,"endTime":2005}},{"id":9,"value":"santa fe","properties":{"startTime":2005}}]}}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertex-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertex-v3.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertex-v3.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
- "@type" : "g:Vertex",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "label" : "person",
- "properties" : {
- "name" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 0
- },
- "value" : "marko",
- "label" : "name"
- }
- } ],
- "location" : [ {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 6
- },
- "value" : "san diego",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 1997
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2001
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 7
- },
- "value" : "santa cruz",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2001
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2004
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 8
- },
- "value" : "brussels",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2004
- },
- "endTime" : {
- "@type" : "g:Int32",
- "@value" : 2005
- }
- }
- }
- }, {
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 9
- },
- "value" : "santa fe",
- "label" : "location",
- "properties" : {
- "startTime" : {
- "@type" : "g:Int32",
- "@value" : 2005
- }
- }
- }
- } ]
- }
- }
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertexproperty-v1-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertexproperty-v1-no-types.json
deleted file mode 100644
index 5336b0f..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertexproperty-v1-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id":0,"value":"marko","label":"name"}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertexproperty-v2-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertexproperty-v2-no-types.json
deleted file mode 100644
index 5336b0f..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertexproperty-v2-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id":0,"value":"marko","label":"name"}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertexproperty-v2.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertexproperty-v2.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertexproperty-v2.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 0
- },
- "value" : "marko",
- "label" : "name"
- }
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertexproperty-v3-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertexproperty-v3-no-types.json
deleted file mode 100644
index 5336b0f..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertexproperty-v3-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id":0,"value":"marko","label":"name"}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertexproperty-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertexproperty-v3.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertexproperty-v3.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "@type" : "g:VertexProperty",
- "@value" : {
- "id" : {
- "@type" : "g:Int64",
- "@value" : 0
- },
- "value" : "marko",
- "label" : "name"
- }
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/year-v2.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/year-v2.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/year-v2.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "gx:Year",
- "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/year-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/year-v3.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/year-v3.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "gx:Year",
- "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/yearmonth-v2.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/yearmonth-v2.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/yearmonth-v2.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "gx:YearMonth",
- "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/yearmonth-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/yearmonth-v3.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/yearmonth-v3.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "gx:YearMonth",
- "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/zoneddatetime-v2.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/zoneddatetime-v2.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/zoneddatetime-v2.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "gx:ZonedDateTime",
- "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/zoneddatetime-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/zoneddatetime-v3.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/zoneddatetime-v3.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "gx:ZonedDateTime",
- "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/zoneoffset-v2.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/zoneoffset-v2.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/zoneoffset-v2.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "gx:ZoneOffset",
- "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/zoneoffset-v3.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/zoneoffset-v3.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/zoneoffset-v3.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@type" : "gx:ZoneOffset",
- "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlint/package-lock.json b/gremlint/package-lock.json
index db0bd85..e366d57 100644
--- a/gremlint/package-lock.json
+++ b/gremlint/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "gremlint",
- "version": "3.8.0-alpha1",
+ "version": "4.0.0-alpha1",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "gremlint",
- "version": "3.8.0-alpha1",
+ "version": "4.0.0-alpha1",
"license": "Apache-2.0",
"devDependencies": {
"@types/jest": "^27.5.0",
diff --git a/gremlint/package.json b/gremlint/package.json
index 0b1b5d1..d4a0543 100644
--- a/gremlint/package.json
+++ b/gremlint/package.json
@@ -1,6 +1,6 @@
{
"name": "gremlint",
- "version": "3.8.0-alpha1",
+ "version": "4.0.0-alpha1",
"description": "Linter/code formatter for Gremlin",
"main": "lib/index.js",
"types": "lib/index.d.ts",
diff --git a/gremlint/pom.xml b/gremlint/pom.xml
index dc42127..3a5805a 100644
--- a/gremlint/pom.xml
+++ b/gremlint/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>gremlint</artifactId>
<name>Apache TinkerPop :: Gremlint</name>
diff --git a/hadoop-gremlin/pom.xml b/hadoop-gremlin/pom.xml
index feee38e..e03d5c4 100644
--- a/hadoop-gremlin/pom.xml
+++ b/hadoop-gremlin/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>hadoop-gremlin</artifactId>
<name>Apache TinkerPop :: Hadoop Gremlin</name>
@@ -52,6 +52,10 @@
<version>${hadoop.version}</version>
<exclusions>
<exclusion>
+ <groupId>org.jline</groupId>
+ <artifactId>jline</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>ch.qos.reload4j</groupId>
<artifactId>reload4j</artifactId>
</exclusion>
@@ -60,6 +64,10 @@
<artifactId>guava</artifactId>
</exclusion>
<exclusion>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
@@ -101,6 +109,11 @@
</dependency>
<!-- hadoop-client conflict resolution -->
<dependency>
+ <groupId>org.jline</groupId>
+ <artifactId>jline</artifactId>
+ <version>3.22.0</version>
+ </dependency>
+ <dependency>
<groupId>ch.qos.reload4j</groupId>
<artifactId>reload4j</artifactId>
<version>1.2.19</version>
@@ -128,7 +141,7 @@
<dependency>
<groupId>com.nimbusds</groupId>
<artifactId>nimbus-jose-jwt</artifactId>
- <version>9.8.1</version>
+ <version>9.30.1</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
@@ -138,7 +151,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.2</version>
+ <version>1.3.4</version>
</dependency>
<!-- use jackson 2.13.5 to fit better with spark where Scala module 2.13.4 requires Jackson Databind version >= 2.13.0 and < 2.14.0 -->
<dependency>
diff --git a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/jsr223/HadoopGremlinPlugin.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/jsr223/HadoopGremlinPlugin.java
index 403dd6e..2b846de 100644
--- a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/jsr223/HadoopGremlinPlugin.java
+++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/jsr223/HadoopGremlinPlugin.java
@@ -55,14 +55,10 @@
import org.apache.tinkerpop.gremlin.jsr223.DefaultImportCustomizer;
import org.apache.tinkerpop.gremlin.jsr223.ImportCustomizer;
import org.apache.tinkerpop.gremlin.jsr223.LazyBindingsCustomizer;
-import org.apache.tinkerpop.gremlin.jsr223.console.ConsoleCustomizer;
-import org.apache.tinkerpop.gremlin.jsr223.console.GremlinShellEnvironment;
-import org.apache.tinkerpop.gremlin.jsr223.console.RemoteAcceptor;
import javax.script.Bindings;
import javax.script.SimpleBindings;
import java.util.Collections;
-import java.util.HashSet;
import java.util.Optional;
import java.util.Set;
@@ -133,7 +129,7 @@
private static final HadoopGremlinPlugin plugin = new HadoopGremlinPlugin();
public HadoopGremlinPlugin() {
- super(NAME, appliesTo, imports, bindings, new HadoopConsoleCustomizer());
+ super(NAME, appliesTo, imports, bindings);
}
@Override
@@ -154,11 +150,4 @@
public static HadoopGremlinPlugin instance() {
return plugin;
}
-
- private static class HadoopConsoleCustomizer implements ConsoleCustomizer {
- @Override
- public RemoteAcceptor getRemoteAcceptor(final GremlinShellEnvironment environment) {
- return new HadoopRemoteAcceptor(environment);
- }
- }
}
\ No newline at end of file
diff --git a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/jsr223/HadoopRemoteAcceptor.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/jsr223/HadoopRemoteAcceptor.java
deleted file mode 100644
index 9b0abf2..0000000
--- a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/jsr223/HadoopRemoteAcceptor.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.hadoop.jsr223;
-
-import org.apache.tinkerpop.gremlin.groovy.loaders.SugarLoader;
-import org.apache.tinkerpop.gremlin.hadoop.structure.HadoopGraph;
-import org.apache.tinkerpop.gremlin.jsr223.console.GremlinShellEnvironment;
-import org.apache.tinkerpop.gremlin.jsr223.console.RemoteAcceptor;
-import org.apache.tinkerpop.gremlin.jsr223.console.RemoteException;
-import org.apache.tinkerpop.gremlin.process.computer.ComputerResult;
-import org.apache.tinkerpop.gremlin.process.computer.traversal.TraversalVertexProgram;
-import org.apache.tinkerpop.gremlin.process.computer.traversal.step.map.ComputerResultStep;
-import org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.decoration.VertexProgramStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.EmptyStep;
-import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversal;
-
-import java.io.IOException;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- */
-public final class HadoopRemoteAcceptor implements RemoteAcceptor {
-
- private static final String USE_SUGAR = "useSugar";
- private static final String USE_TRAVERSAL_SOURCE = "useTraversalSource";
- private static final String HELP = "help";
- private static final String SPACE = " ";
-
- private HadoopGraph hadoopGraph;
- private GremlinShellEnvironment shellEnvironment;
- private boolean useSugar = false;
- private TraversalSource traversalSource;
-
- public HadoopRemoteAcceptor(final GremlinShellEnvironment shellEnvironment) {
- this.shellEnvironment = shellEnvironment;
- }
-
- @Override
- public Object connect(final List<String> args) throws RemoteException {
- if (args.size() != 1 && args.size() != 2) {
- throw new IllegalArgumentException("Usage: :remote connect " + HadoopGremlinPlugin.NAME + " <variable name of graph> <optional variable name of traversal source>");
- }
- this.hadoopGraph = this.shellEnvironment.getVariable(args.get(0));
- if (args.size() == 2)
- this.traversalSource = this.shellEnvironment.getVariable(args.get(1));
- else
- this.traversalSource = this.hadoopGraph.traversal();
- ///
- final HashMap<String, Object> configuration = new HashMap<>();
- configuration.put(USE_SUGAR, this.useSugar);
- configuration.put(USE_TRAVERSAL_SOURCE, this.traversalSource);
- return Collections.unmodifiableMap(configuration);
- }
-
- @Override
- public Object configure(final List<String> args) throws RemoteException {
- if (args.size() == 1 && args.get(0).equals(HELP))
- return ":remote config [useSugar [true|false]|useTraversalSource <traversalSourceName>|help]";
-
- for (int i = 0; i < args.size(); i = i + 2) {
- if (args.get(i).equals(USE_SUGAR))
- this.useSugar = Boolean.valueOf(args.get(i + 1));
- else if (args.get(i).equals(USE_TRAVERSAL_SOURCE)) {
- this.traversalSource = this.shellEnvironment.getVariable(args.get(i + 1));
- } else
- throw new IllegalArgumentException("The provided configuration is unknown: " + args.get(i) + ":" + args.get(i + 1));
- }
- ///
- final HashMap<String, Object> configuration = new HashMap<>();
- configuration.put(USE_SUGAR, this.useSugar);
- configuration.put(USE_TRAVERSAL_SOURCE, this.traversalSource);
- return Collections.unmodifiableMap(configuration);
- }
-
- @Override
- public Object submit(final List<String> args) throws RemoteException {
- try {
- String script = getScript(String.join(SPACE, args), this.shellEnvironment);
- if (this.useSugar)
- script = SugarLoader.class.getCanonicalName() + ".load()\n" + script;
- final TraversalVertexProgram program = TraversalVertexProgram.build().traversal(this.traversalSource, "gremlin-groovy", script).create(this.hadoopGraph);
- final ComputerResult computerResult = VertexProgramStrategy.getComputer(this.traversalSource.getStrategies()).get().apply(this.hadoopGraph).program(program).submit().get();
- this.shellEnvironment.setVariable(RESULT, computerResult);
- ///
- final Traversal.Admin<ComputerResult, ?> traversal = new DefaultTraversal<>(computerResult.graph());
- traversal.addStep(new ComputerResultStep<>(traversal));
- traversal.addStart(traversal.getTraverserGenerator().generate(computerResult, EmptyStep.instance(), 1l));
- return traversal;
- } catch (final Exception e) {
- throw new RemoteException(e);
- }
- }
-
- @Override
- public boolean allowRemoteConsole() {
- return true;
- }
-
- @Override
- public void close() throws IOException {
- this.hadoopGraph.close();
- }
-
- /**
- * Retrieve a script as defined in the shell context. This allows for multi-line scripts to be submitted.
- */
- public static String getScript(final String submittedScript, final GremlinShellEnvironment shell) {
- return submittedScript.startsWith("@") ? shell.getVariable(submittedScript.substring(1)).toString() : submittedScript;
- }
-}
diff --git a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopConfiguration.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopConfiguration.java
index 610f073..c252a1a 100644
--- a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopConfiguration.java
+++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopConfiguration.java
@@ -46,6 +46,11 @@
}
@Override
+ protected boolean containsValueInternal(final Object o) {
+ return properties.containsValue(o);
+ }
+
+ @Override
protected Iterator<String> getKeysInternal() {
return properties.keySet().iterator();
}
diff --git a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopGraph.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopGraph.java
index 8725fd0..991514e 100644
--- a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopGraph.java
+++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopGraph.java
@@ -42,13 +42,10 @@
import org.slf4j.LoggerFactory;
import java.io.IOException;
-import java.util.ArrayList;
import java.util.Iterator;
-import java.util.List;
import java.util.Optional;
import java.util.Spliterator;
import java.util.Spliterators;
-import java.util.stream.Collectors;
import java.util.stream.Stream;
import java.util.stream.StreamSupport;
@@ -61,26 +58,6 @@
@Graph.OptIn(Graph.OptIn.SUITE_PROCESS_LIMITED_STANDARD)
@Graph.OptIn(Graph.OptIn.SUITE_PROCESS_LIMITED_COMPUTER)
@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.MatchTest$Traversals",
- method = "g_V_matchXa_hasXname_GarciaX__a_0writtenBy_b__a_0sungBy_bX",
- reason = "Hadoop-Gremlin is OLAP-oriented and for OLTP operations, linear-scan joins are required. This particular tests takes many minutes to execute.",
- computers = {"ALL"})
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.MatchTest$Traversals",
- method = "g_V_matchXa_0sungBy_b__a_0sungBy_c__b_writtenBy_d__c_writtenBy_e__d_hasXname_George_HarisonX__e_hasXname_Bob_MarleyXX",
- reason = "Hadoop-Gremlin is OLAP-oriented and for OLTP operations, linear-scan joins are required. This particular tests takes many minutes to execute.",
- computers = {"ALL"})
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.MatchTest$Traversals",
- method = "g_V_matchXa_0sungBy_b__a_0writtenBy_c__b_writtenBy_d__c_sungBy_d__d_hasXname_GarciaXX",
- reason = "Hadoop-Gremlin is OLAP-oriented and for OLTP operations, linear-scan joins are required. This particular tests takes many minutes to execute.",
- computers = {"ALL"})
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.MatchTest$Traversals",
- method = "g_V_matchXa_0sungBy_b__a_0writtenBy_c__b_writtenBy_dX_whereXc_sungBy_dX_whereXd_hasXname_GarciaXX",
- reason = "Hadoop-Gremlin is OLAP-oriented and for OLTP operations, linear-scan joins are required. This particular tests takes many minutes to execute.",
- computers = {"ALL"})
-@Graph.OptOut(
test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.CountTest$Traversals",
method = "g_V_both_both_count",
reason = "Hadoop-Gremlin is OLAP-oriented and for OLTP operations, linear-scan joins are required. This particular tests takes many minutes to execute.",
@@ -143,11 +120,6 @@
reason = "This test makes use of a sideEffect to enforce when a thread interruption is triggered and thus isn't applicable to HadoopGraph",
computers = {"org.apache.tinkerpop.gremlin.spark.process.computer.SparkGraphComputer"})
@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.MatchTest$CountMatchTraversals",
- method = "g_V_matchXa_followedBy_count_isXgtX10XX_b__a_0followedBy_count_isXgtX10XX_bX_count",
- reason = "Hadoop-Gremlin is OLAP-oriented and for OLTP operations, linear-scan joins are required. This particular tests takes many minutes to execute.",
- computers = {"ALL"})
-@Graph.OptOut(
test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.ReadTest$Traversals",
method = "g_io_readXxmlX",
reason = "Hadoop-Gremlin does not support reads/writes with GraphML.")
diff --git a/neo4j-gremlin/pom.xml b/neo4j-gremlin/pom.xml
index bc0e002..1d682c8 100644
--- a/neo4j-gremlin/pom.xml
+++ b/neo4j-gremlin/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>neo4j-gremlin</artifactId>
<name>Apache TinkerPop :: Neo4j Gremlin</name>
@@ -148,6 +148,10 @@
<artifactId>commons-lang3</artifactId>
</exclusion>
<exclusion>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
</exclusion>
diff --git a/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/jsr223/Neo4jGremlinPlugin.java b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/jsr223/Neo4jGremlinPlugin.java
deleted file mode 100644
index 536b18c..0000000
--- a/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/jsr223/Neo4jGremlinPlugin.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.neo4j.jsr223;
-
-import org.apache.tinkerpop.gremlin.jsr223.AbstractGremlinPlugin;
-import org.apache.tinkerpop.gremlin.jsr223.DefaultImportCustomizer;
-import org.apache.tinkerpop.gremlin.jsr223.ImportCustomizer;
-import org.apache.tinkerpop.gremlin.neo4j.process.traversal.LabelP;
-import org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jEdge;
-import org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jElement;
-import org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jGraph;
-import org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jGraphVariables;
-import org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jHelper;
-import org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jProperty;
-import org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jVertex;
-import org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jVertexProperty;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- * @deprecated See: https://tinkerpop.apache.org/docs/3.5.7/reference/#neo4j-gremlin
- */
-@Deprecated
-public final class Neo4jGremlinPlugin extends AbstractGremlinPlugin {
-
- private static final String NAME = "tinkerpop.neo4j";
-
- private static final ImportCustomizer imports;
-
- static {
- try {
- imports = DefaultImportCustomizer.build()
- .addClassImports(Neo4jEdge.class,
- Neo4jElement.class,
- Neo4jGraph.class,
- Neo4jGraphVariables.class,
- Neo4jHelper.class,
- Neo4jProperty.class,
- Neo4jVertex.class,
- Neo4jVertexProperty.class,
- LabelP.class)
- .addMethodImports(LabelP.class.getMethod("of", String.class)).create();
- } catch (Exception ex) {
- throw new RuntimeException(ex);
- }
- }
-
- private static final Neo4jGremlinPlugin instance = new Neo4jGremlinPlugin();
-
- public Neo4jGremlinPlugin() {
- super(NAME, imports);
- }
-
- public static Neo4jGremlinPlugin instance() {
- return instance;
- }
-
- @Override
- public boolean requireRestart() {
- return true;
- }
-}
\ No newline at end of file
diff --git a/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/Neo4jGraphFeatureTest.java b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/Neo4jGraphFeatureTest.java
index 9109814..e03987a 100644
--- a/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/Neo4jGraphFeatureTest.java
+++ b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/Neo4jGraphFeatureTest.java
@@ -50,7 +50,7 @@
@RunWith(Cucumber.class)
@CucumberOptions(
- tags = "not @MultiProperties and not @MetaProperties and not @GraphComputerOnly and " +
+ tags = "not @MultiProperties and not @MetaProperties and not @GraphComputerOnly and not @StepHasId and " +
"not @AllowNullPropertyValues and not @UserSuppliedVertexPropertyIds and not @UserSuppliedEdgeIds and " +
"not @UserSuppliedVertexIds and not @TinkerServiceRegistry and not @InsertionOrderingRequired and not @StepHasId", //TODO:: can we include hasId?
glue = { "org.apache.tinkerpop.gremlin.features" },
diff --git a/pom.xml b/pom.xml
index 2e06601..e389c3c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
</parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache TinkerPop</name>
<description>A Graph Computing Framework</description>
@@ -140,7 +140,6 @@
<module>gremlin-driver</module>
<module>gremlin-console</module>
<module>gremlin-server</module>
- <module>gremlin-archetype</module>
<module>gremlin-tools</module>
<module>gremlint</module>
<module>gremlin-util</module>
@@ -153,31 +152,32 @@
<properties>
<antlr4.version>4.9.1</antlr4.version>
<caffeine.version>2.3.1</caffeine.version>
- <commons.collections.version>3.2.2</commons.collections.version>
- <commons.configuration.version>2.9.0</commons.configuration.version>
+ <commons.collections.version>4.4</commons.collections.version>
+ <commons.configuration.version>2.11.0</commons.configuration.version>
<commons.lang.version>2.6</commons.lang.version>
<commons.io.version>2.8.0</commons.io.version>
- <commons.lang3.version>3.12.0</commons.lang3.version>
+ <commons.lang3.version>3.17.0</commons.lang3.version>
<commons.text.version>1.10.0</commons.text.version>
<cucumber.version>7.21.1</cucumber.version>
<exp4j.version>0.4.8</exp4j.version>
<groovy.version>4.0.25</groovy.version>
<guice.version>4.2.3</guice.version>
- <hadoop.version>3.3.3</hadoop.version>
+ <hadoop.version>3.4.1</hadoop.version>
<hamcrest.version>3.0</hamcrest.version>
<java.tuples.version>1.2</java.tuples.version>
<javadoc-plugin.version>3.3.1</javadoc-plugin.version>
<javapoet.version>1.13.0</javapoet.version>
<jbcrypt.version>0.4</jbcrypt.version>
<junit.version>4.13.1</junit.version>
- <kerby.version>2.0.1</kerby.version>
- <logback.version>1.2.13</logback.version>
+ <kerby.version>2.0.3</kerby.version>
+ <logback.version>1.3.15</logback.version>
<metrics.version>3.0.2</metrics.version>
<mockito.version>5.19.0</mockito.version>
<netty.version>4.1.101.Final</netty.version>
- <slf4j.version>1.7.25</slf4j.version>
+ <slf4j.version>2.0.16</slf4j.version>
<snakeyaml.version>2.0</snakeyaml.version>
- <spark.version>3.3.2</spark.version>
+ <spark.version>3.5.4</spark.version>
+ <awssdk.version>2.29.3</awssdk.version>
<ayza.version>10.0.0</ayza.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -478,6 +478,8 @@
<exclude>docs/original/**</exclude>
<exclude>docs/site/home/css/**</exclude>
<exclude>docs/site/home/js/**</exclude>
+ <exclude>docs/site/home/robots.txt</exclude>
+ <exclude>docs/site/home/sitemap.xml</exclude>
<exclude>docs/gremlint/build/**</exclude>
<exclude>docs/gremlint/public/CNAME</exclude>
<exclude>gremlin-console/bin/gremlin.sh</exclude>
@@ -627,6 +629,7 @@
<argLine>
-Dlogback.configuration=${logback-test.properties}
-Dlog4j.configuration=${log4j-test.properties}
+ -Dslf4j.provider=ch.qos.logback.classic.spi.LogbackServiceProvider
-Dbuild.dir=${project.build.directory}
-Dis.testing=true -Djava.net.preferIPv4Stack=true ${suresafeArgs}
${jdk17JvmArgs}
@@ -655,6 +658,7 @@
<argLine>
-Dlogback.configuration=${logback-test.properties}
-Dlog4j.configuration=${log4j-test.properties}
+ -Dslf4j.provider=ch.qos.logback.classic.spi.LogbackServiceProvider
-Dhost=localhost -Dport=8182
-Dbuild.dir=${project.build.directory} -Dis.testing=true
-Djava.net.preferIPv4Stack=true ${suresafeArgs}
@@ -704,7 +708,7 @@
<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId>
- <version>2.1.0</version>
+ <version>4.1.1</version>
<configuration>
<targetBytecode>11</targetBytecode>
</configuration>
@@ -712,7 +716,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>3.4.1</version>
+ <version>3.6.0</version>
<configuration>
<createDependencyReducedPom>false</createDependencyReducedPom>
</configuration>
@@ -768,15 +772,9 @@
<artifactId>commons-text</artifactId>
<version>${commons.text.version}</version>
</dependency>
- <!-- commons-configuration2 requires beanutils because we rely on file loaders -->
<dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.9.4</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
<version>${commons.collections.version}</version>
</dependency>
<dependency>
@@ -904,11 +902,6 @@
<version>${slf4j.version}</version>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
- <dependency>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.8</version>
@@ -1476,8 +1469,8 @@
<version>${commons.configuration.version}</version>
</additionalDependency>
<additionalDependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
<version>${commons.collections.version}</version>
</additionalDependency>
<additionalDependency>
@@ -1592,11 +1585,6 @@
<version>${groovy.version}</version>
</additionalDependency>
<additionalDependency>
- <groupId>org.apache.groovy</groupId>
- <artifactId>groovy-json</artifactId>
- <version>${groovy.version}</version>
- </additionalDependency>
- <additionalDependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons.lang3.version}</version>
@@ -1627,6 +1615,41 @@
<version>${snakeyaml.version}</version>
</additionalDependency>
<additionalDependency>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>http-auth-aws</artifactId>
+ <version>${awssdk.version}</version>
+ </additionalDependency>
+ <additionalDependency>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>http-auth-spi</artifactId>
+ <version>${awssdk.version}</version>
+ </additionalDependency>
+ <additionalDependency>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>http-client-spi</artifactId>
+ <version>${awssdk.version}</version>
+ </additionalDependency>
+ <additionalDependency>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>auth</artifactId>
+ <version>${awssdk.version}</version>
+ </additionalDependency>
+ <additionalDependency>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>utils</artifactId>
+ <version>${awssdk.version}</version>
+ </additionalDependency>
+ <additionalDependency>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>protocol-core</artifactId>
+ <version>${awssdk.version}</version>
+ </additionalDependency>
+ <additionalDependency>
+ <groupId>org.apiguardian</groupId>
+ <artifactId>apiguardian-api</artifactId>
+ <version>1.1.2</version>
+ </additionalDependency>
+ <additionalDependency>
<groupId>io.github.hakky54</groupId>
<artifactId>ayza-for-netty</artifactId>
<version>${ayza.version}</version>
@@ -1784,8 +1807,8 @@
<version>${netty.version}</version>
</additionalDependency>
<additionalDependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
<version>${commons.collections.version}</version>
</additionalDependency>
<additionalDependency>
@@ -1809,11 +1832,6 @@
<version>${groovy.version}</version>
</additionalDependency>
<additionalDependency>
- <groupId>org.apache.groovy</groupId>
- <artifactId>groovy-json</artifactId>
- <version>${groovy.version}</version>
- </additionalDependency>
- <additionalDependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons.lang3.version}</version>
@@ -1858,6 +1876,36 @@
<artifactId>ayza</artifactId>
<version>${ayza.version}</version>
</additionalDependency>
+ <additionalDependency>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>http-auth-aws</artifactId>
+ <version>${awssdk.version}</version>
+ </additionalDependency>
+ <additionalDependency>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>http-auth-spi</artifactId>
+ <version>${awssdk.version}</version>
+ </additionalDependency>
+ <additionalDependency>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>http-client-spi</artifactId>
+ <version>${awssdk.version}</version>
+ </additionalDependency>
+ <additionalDependency>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>auth</artifactId>
+ <version>${awssdk.version}</version>
+ </additionalDependency>
+ <additionalDependency>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>utils</artifactId>
+ <version>${awssdk.version}</version>
+ </additionalDependency>
+ <additionalDependency>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>protocol-core</artifactId>
+ <version>${awssdk.version}</version>
+ </additionalDependency>
</additionalDependencies>
</configuration>
</execution>
@@ -1930,6 +1978,7 @@
<argLine>
-Dlogback.configuration=${logback-silent.properties}
-Dlog4j.configuration=${log4j-silent.properties}
+ -Dslf4j.provider=ch.qos.logback.classic.spi.LogbackServiceProvider
-Dbuild.dir=${project.build.directory} -Dis.testing=true
-Djava.net.preferIPv4Stack=true ${suresafeArgs}
${jdk17JvmArgs}
@@ -2038,6 +2087,7 @@
<configuration>
<argLine>@{surefireArgLine} -Dlogback.configuration=${logback-test.properties}
-Dlog4j.configuration=${log4j-test.properties}
+ -Dslf4j.provider=ch.qos.logback.classic.spi.LogbackServiceProvider
-Dbuild.dir=${project.build.directory} -Dis.testing=true ${suresafeArgs}
-Djava.net.preferIPv4Stack=true
</argLine>
@@ -2049,6 +2099,7 @@
<configuration>
<argLine>@{failsafeArgLine} -Dlogback.configuration=${logback-test.properties}
-Dlog4j.configuration=${log4j-test.properties} -Dhost=localhost -Dport=8182
+ -Dslf4j.provider=ch.qos.logback.classic.spi.LogbackServiceProvider
-Dbuild.dir=${project.build.directory} -Dis.testing=true ${suresafeArgs}
-Djava.net.preferIPv4Stack=true
</argLine>
diff --git a/spark-gremlin/pom.xml b/spark-gremlin/pom.xml
index b758fc7..aceb066 100644
--- a/spark-gremlin/pom.xml
+++ b/spark-gremlin/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>spark-gremlin</artifactId>
<name>Apache TinkerPop :: Spark Gremlin</name>
@@ -47,6 +47,11 @@
<artifactId>hadoop-gremlin</artifactId>
<version>${project.version}</version>
<exclusions>
+ <!-- prefer gremlin-test/spark meterics -->
+ <exclusion>
+ <groupId>io.dropwizard.metrics</groupId>
+ <artifactId>metrics-core</artifactId>
+ </exclusion>
<!-- prefer gremlin-test/spark kerby -->
<exclusion>
<groupId>org.apache.kerby</groupId>
@@ -91,6 +96,26 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-reload4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-all</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport-native-epoll</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport-native-kqueue</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-handler</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<!-- SPARK -->
@@ -127,10 +152,6 @@
<artifactId>jackson-databind</artifactId>
</exclusion>
<exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- <exclusion>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
</exclusion>
@@ -166,18 +187,36 @@
<groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId>
</exclusion>
- <!-- Excluding this log4j binding as it leads to NoSuchMethodErrors -->
+ <!-- prefer TinkerPop's netty -->
<exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-all</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport-native-epoll</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport-native-kqueue</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- resolve spark-gremlin conflicts -->
<dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-all</artifactId>
+ <version>${netty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.dropwizard.metrics</groupId>
+ <artifactId>metrics-core</artifactId>
+ <version>4.2.19</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-recipes</artifactId>
- <version>4.2.0</version>
+ <version>5.2.0</version>
<exclusions>
<exclusion>
<groupId>org.apache.zookeeper</groupId>
@@ -227,17 +266,17 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
- <version>2.13.5</version>
+ <version>2.15.4</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <version>2.13.5</version>
+ <version>2.15.4</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.13.5</version>
+ <version>2.15.4</version>
</dependency>
<!-- TEST -->
<dependency>
diff --git a/sparql-gremlin/pom.xml b/sparql-gremlin/pom.xml
index 23b709e..02e6e6f 100644
--- a/sparql-gremlin/pom.xml
+++ b/sparql-gremlin/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>tinkerpop</artifactId>
<groupId>org.apache.tinkerpop</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>sparql-gremlin</artifactId>
<name>Apache TinkerPop :: SPARQL Gremlin</name>
@@ -32,6 +32,12 @@
<artifactId>apache-jena-libs</artifactId>
<type>pom</type>
<version>3.12.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.tinkerpop</groupId>
diff --git a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSource.java b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSource.java
index bb8d70b..410e3b4 100644
--- a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSource.java
+++ b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSource.java
@@ -175,7 +175,7 @@
final SparqlTraversalSource clone = this.withStrategies(SparqlStrategy.instance()).clone();
// the inject() holds the sparql which the SparqlStrategy then detects and converts to a traversal
- clone.bytecode.addStep(GraphTraversal.Symbols.inject, query);
+ clone.gremlinLang.addStep(GraphTraversal.Symbols.inject, query);
final GraphTraversal.Admin<S, S> traversal = new DefaultGraphTraversal(clone);
return traversal.addStep(new InjectStep<>(traversal, query));
}
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 a4a95cc..5f791b4 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.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;
diff --git a/tinkergraph-gremlin/pom.xml b/tinkergraph-gremlin/pom.xml
index adcc7a9..f41fecc 100644
--- a/tinkergraph-gremlin/pom.xml
+++ b/tinkergraph-gremlin/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>tinkergraph-gremlin</artifactId>
<name>Apache TinkerPop :: TinkerGraph Gremlin</name>
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/jsr223/TinkerGraphGremlinPlugin.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/jsr223/TinkerGraphGremlinPlugin.java
index 8ff1707..e7d8673 100644
--- a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/jsr223/TinkerGraphGremlinPlugin.java
+++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/jsr223/TinkerGraphGremlinPlugin.java
@@ -37,6 +37,7 @@
import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1;
import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2;
import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV4;
import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerProperty;
import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerVertex;
import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerVertexProperty;
@@ -57,6 +58,7 @@
TinkerIoRegistryV1.class,
TinkerIoRegistryV2.class,
TinkerIoRegistryV3.class,
+ TinkerIoRegistryV4.class,
TinkerProperty.class,
TinkerVertex.class,
TinkerVertexProperty.class,
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/AbstractTinkerGraph.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/AbstractTinkerGraph.java
index bd37985..9a36179 100644
--- a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/AbstractTinkerGraph.java
+++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/AbstractTinkerGraph.java
@@ -224,8 +224,10 @@
return (I) builder.graph(this).onMapper(mapper -> mapper.addRegistry(TinkerIoRegistryV1.instance())).create();
else if (builder.requiresVersion(GraphSONVersion.V2_0)) // there is no gryo v2
return (I) builder.graph(this).onMapper(mapper -> mapper.addRegistry(TinkerIoRegistryV2.instance())).create();
- else
+ else if (builder.requiresVersion(GraphSONVersion.V3_0))
return (I) builder.graph(this).onMapper(mapper -> mapper.addRegistry(TinkerIoRegistryV3.instance())).create();
+ else
+ return (I) builder.graph(this).onMapper(mapper -> mapper.addRegistry(TinkerIoRegistryV4.instance())).create();
}
////////////// STRUCTURE API METHODS //////////////////
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIoRegistryV4.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIoRegistryV4.java
new file mode 100644
index 0000000..8ae666c
--- /dev/null
+++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIoRegistryV4.java
@@ -0,0 +1,216 @@
+/*
+ * 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.tinkergraph.structure;
+
+import org.apache.commons.configuration2.BaseConfiguration;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.io.AbstractIoRegistry;
+import org.apache.tinkerpop.gremlin.structure.io.GraphReader;
+import org.apache.tinkerpop.gremlin.structure.io.GraphWriter;
+import org.apache.tinkerpop.gremlin.structure.io.IoRegistry;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONIo;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.TinkerPopJacksonModule;
+import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoIo;
+import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoReader;
+import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoWriter;
+import org.apache.tinkerpop.gremlin.structure.util.Attachable;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdge;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex;
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
+import org.apache.tinkerpop.shaded.jackson.core.JsonParser;
+import org.apache.tinkerpop.shaded.jackson.core.JsonProcessingException;
+import org.apache.tinkerpop.shaded.jackson.core.JsonToken;
+import org.apache.tinkerpop.shaded.jackson.databind.DeserializationContext;
+import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
+import org.apache.tinkerpop.shaded.jackson.databind.deser.std.StdDeserializer;
+import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdScalarSerializer;
+import org.apache.tinkerpop.shaded.kryo.Kryo;
+import org.apache.tinkerpop.shaded.kryo.Serializer;
+import org.apache.tinkerpop.shaded.kryo.io.Input;
+import org.apache.tinkerpop.shaded.kryo.io.Output;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+/**
+ * An implementation of the {@link IoRegistry} interface that provides serializers with custom configurations for
+ * implementation specific classes that might need to be serialized. This registry allows a {@link TinkerGraph} to
+ * be serialized directly which is useful for moving small graphs around on the network.
+ * <p/>
+ * Most providers need not implement this kind of custom serializer as they will deal with much larger graphs that
+ * wouldn't be practical to serialize in this fashion. This is a bit of a special case for TinkerGraph given its
+ * in-memory status. Typical implementations would create serializers for a complex vertex identifier or a
+ * custom data class like a "geographic point".
+ *
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public final class TinkerIoRegistryV4 extends AbstractIoRegistry {
+
+ private static final TinkerIoRegistryV4 INSTANCE = new TinkerIoRegistryV4();
+
+ private TinkerIoRegistryV4() {
+ register(GryoIo.class, TinkerGraph.class, new TinkerGraphGryoSerializer());
+ register(GraphSONIo.class, null, new TinkerModuleV2());
+ }
+
+ public static TinkerIoRegistryV4 instance() {
+ return INSTANCE;
+ }
+
+ /**
+ * Provides a method to serialize an entire {@link TinkerGraph} into itself for Gryo. This is useful when
+ * shipping small graphs around through Gremlin Server. Reuses the existing Kryo instance for serialization.
+ */
+ final static class TinkerGraphGryoSerializer extends Serializer<TinkerGraph> {
+ @Override
+ public void write(final Kryo kryo, final Output output, final TinkerGraph graph) {
+ try (final ByteArrayOutputStream stream = new ByteArrayOutputStream()) {
+ GryoWriter.build().mapper(() -> kryo).create().writeGraph(stream, graph);
+ final byte[] bytes = stream.toByteArray();
+ output.writeInt(bytes.length);
+ output.write(bytes);
+ } catch (Exception io) {
+ throw new RuntimeException(io);
+ }
+ }
+
+ @Override
+ public TinkerGraph read(final Kryo kryo, final Input input, final Class<TinkerGraph> tinkerGraphClass) {
+ final Configuration conf = new BaseConfiguration();
+ conf.setProperty("gremlin.tinkergraph.defaultVertexPropertyCardinality", "list");
+ final TinkerGraph graph = TinkerGraph.open(conf);
+ final int len = input.readInt();
+ final byte[] bytes = input.readBytes(len);
+ try (final ByteArrayInputStream stream = new ByteArrayInputStream(bytes)) {
+ GryoReader.build().mapper(() -> kryo).create().readGraph(stream, graph);
+ } catch (Exception io) {
+ throw new RuntimeException(io);
+ }
+
+ return graph;
+ }
+ }
+
+ /**
+ * Provides a method to serialize an entire {@link TinkerGraph} into itself for GraphSON. This is useful when
+ * shipping small graphs around through Gremlin Server.
+ */
+ final static class TinkerModuleV2 extends TinkerPopJacksonModule {
+ public TinkerModuleV2() {
+ super("tinkergraph-2.0");
+ addSerializer(TinkerGraph.class, new TinkerGraphJacksonSerializer());
+ addDeserializer(TinkerGraph.class, new TinkerGraphJacksonDeserializer());
+ }
+
+ @Override
+ public Map<Class, String> getTypeDefinitions() {
+ return new HashMap<Class, String>(){{
+ put(TinkerGraph.class, "graph");
+ }};
+ }
+
+ @Override
+ public String getTypeNamespace() {
+ return GraphSONTokens.GREMLIN_TYPE_NAMESPACE;
+ }
+ }
+
+ /**
+ * Serializes the graph into an edge list format. Edge list is a better choices than adjacency list (which is
+ * typically standard from the {@link GraphReader} and {@link GraphWriter} perspective) in this case because
+ * the use case for this isn't around massive graphs. The use case is for "small" subgraphs that are being
+ * shipped over the wire from Gremlin Server. Edge list format is a bit easier for non-JVM languages to work
+ * with as a format and doesn't require a cache for loading (as vertex labels are not serialized in adjacency
+ * list).
+ */
+ final static class TinkerGraphJacksonSerializer extends StdScalarSerializer<TinkerGraph> {
+
+ public TinkerGraphJacksonSerializer() {
+ super(TinkerGraph.class);
+ }
+
+ @Override
+ public void serialize(final TinkerGraph graph, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+ throws IOException {
+ jsonGenerator.writeStartObject();
+ jsonGenerator.writeFieldName(GraphSONTokens.VERTICES);
+ jsonGenerator.writeStartArray();
+
+ final Iterator<Vertex> vertices = graph.vertices();
+ while (vertices.hasNext()) {
+ serializerProvider.defaultSerializeValue(vertices.next(), jsonGenerator);
+ }
+
+ jsonGenerator.writeEndArray();
+ jsonGenerator.writeFieldName(GraphSONTokens.EDGES);
+ jsonGenerator.writeStartArray();
+
+ final Iterator<Edge> edges = graph.edges();
+ while (edges.hasNext()) {
+ serializerProvider.defaultSerializeValue(edges.next(), jsonGenerator);
+ }
+
+ jsonGenerator.writeEndArray();
+ jsonGenerator.writeEndObject();
+ }
+ }
+
+ /**
+ * Deserializes the edge list format.
+ */
+ static class TinkerGraphJacksonDeserializer extends StdDeserializer<TinkerGraph> {
+ public TinkerGraphJacksonDeserializer() {
+ super(TinkerGraph.class);
+ }
+
+ @Override
+ public TinkerGraph deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+ final Configuration conf = new BaseConfiguration();
+ conf.setProperty("gremlin.tinkergraph.defaultVertexPropertyCardinality", "list");
+ final TinkerGraph graph = TinkerGraph.open(conf);
+
+ while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
+ if (jsonParser.getCurrentName().equals("vertices")) {
+ while (jsonParser.nextToken() != JsonToken.END_ARRAY) {
+ if (jsonParser.currentToken() == JsonToken.START_OBJECT) {
+ final DetachedVertex v = (DetachedVertex) deserializationContext.readValue(jsonParser, Vertex.class);
+ v.attach(Attachable.Method.getOrCreate(graph));
+ }
+ }
+ } else if (jsonParser.getCurrentName().equals("edges")) {
+ while (jsonParser.nextToken() != JsonToken.END_ARRAY) {
+ if (jsonParser.currentToken() == JsonToken.START_OBJECT) {
+ final DetachedEdge e = (DetachedEdge) deserializationContext.readValue(jsonParser, Edge.class);
+ e.attach(Attachable.Method.getOrCreate(graph));
+ }
+ }
+ }
+ }
+
+ return graph;
+ }
+ }
+}
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 c490301..c086813 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,13 +18,16 @@
*/
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;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.WithOptions;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.event.ConsoleMutationListener;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.EventStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.PathRetractionStrategy;
@@ -39,6 +42,7 @@
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;
@@ -46,7 +50,6 @@
import static org.apache.tinkerpop.gremlin.process.traversal.Operator.sum;
import static org.apache.tinkerpop.gremlin.process.traversal.P.neq;
-import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal.Symbols.values;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.as;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.both;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.choose;
@@ -58,7 +61,6 @@
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.select;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.union;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.valueMap;
-import static org.apache.tinkerpop.gremlin.structure.Column.keys;
/**
* @author Stephen Mallette (http://stephen.genoprime.com)
@@ -272,17 +274,25 @@
}
@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());
+ final GremlinLangScriptEngine se = new GremlinLangScriptEngine(
+ new VariableResolverCustomizer(VariableResolver.DefaultVariableResolver::new));
- Traversal<?,?> t =
- g.V("3").
- union(__.repeat(out().simplePath()).times(2).count(),
- __.repeat(in().simplePath()).times(2).count());
+ final Bindings b = se.createBindings();
+ b.put("g", g);
+ System.out.println(((GraphTraversal) se.eval("g.V(1).count()", b)).toList());
+
+ b.clear();
+ b.put("g", g);
+ b.put("x", 1);
+ System.out.println(((GraphTraversal) se.eval("g.V(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
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/io/graphson/AbstractTinkerGraphGraphSONTranslatorProvider.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/io/graphson/AbstractTinkerGraphGraphSONTranslatorProvider.java
deleted file mode 100644
index ab30411..0000000
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/io/graphson/AbstractTinkerGraphGraphSONTranslatorProvider.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.tinkergraph.structure.io.graphson;
-
-import org.apache.tinkerpop.gremlin.GraphProvider;
-import org.apache.tinkerpop.gremlin.jsr223.JavaTranslator;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.TranslationStrategy;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONVersion;
-import org.apache.tinkerpop.gremlin.tinkergraph.TinkerGraphProvider;
-import org.apache.tinkerpop.gremlin.tinkergraph.process.computer.TinkerGraphComputer;
-
-/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.ProfileTest",
- method = "*",
- reason = "Tests for profile() are not supported for remotes")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.LambdaStepTest",
- method = "*",
- reason = "Tests that include lambdas are not supported by the test suite for remotes")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.filter.DedupTest",
- method = "g_V_both_name_order_byXa_bX_dedup_value",
- reason = "Tests that include lambdas are not supported by the test suite for remotes")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.OrderTest",
- method = "g_V_name_order_byXa1_b1X_byXb2_a2X",
- reason = "Tests that include lambdas are not supported by the test suite for remotes")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.OrderTest",
- method = "g_V_order_byXname_a1_b1X_byXname_b2_a2X_name",
- reason = "Tests that include lambdas are not supported by the test suite for remotes")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.SackTest",
- method = "g_withSackXmap__map_cloneX_V_out_out_sackXmap_a_nameX_sack",
- reason = "Tests that include lambdas are not supported by the test suite for remotes")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.SubgraphTest",
- method = "g_V_withSideEffectXsgX_outEXknowsX_subgraphXsgX_name_capXsgX",
- reason = "Tests that include lambdas are not supported by the test suite for remotes")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.SubgraphTest",
- method = "g_V_withSideEffectXsgX_repeatXbothEXcreatedX_subgraphXsgX_outVX_timesX5X_name_dedup",
- reason = "Tests that include lambdas are not supported by the test suite for remotes")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.SubgraphTest",
- method = "g_withSideEffectXsgX_V_hasXname_danielXout_capXsgX",
- reason = "Tests that include lambdas are not supported by the test suite for remotes")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.ProgramTest",
- method = "*",
- reason = "Reason requires investigation")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.TraversalInterruptionTest",
- method = "*",
- reason = "Reason requires investigation")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.TraversalInterruptionComputerTest",
- method = "*",
- reason = "Reason requires investigation")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.EventStrategyProcessTest",
- method = "*",
- reason = "Strategy not properly supported by Bytecode based traversals")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.ElementIdStrategyProcessTest",
- method = "*",
- reason = "Strategy not properly supported by Bytecode based traversals")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.CoreTraversalTest",
- method = "shouldNeverPropagateANoBulkTraverser",
- reason = "Reason requires investigation")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.ReadTest",
- method = "*",
- reason = "read and write tests don't translate locally well because of calling iterate() inside read()/write() add a none()")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.WriteTest",
- method = "*",
- reason = "read and write tests don't translate locally well because of calling iterate() inside read()/write() add a none()")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.OrderabilityTest",
- method = "g_inject_order_with_unknown_type",
- reason = "Remoting serializers only support known Gremlin types")
-public abstract class AbstractTinkerGraphGraphSONTranslatorProvider extends TinkerGraphProvider {
-
- private final GraphSONVersion version;
-
- AbstractTinkerGraphGraphSONTranslatorProvider(final GraphSONVersion version) {
- this.version = version;
- }
-
- @Override
- public GraphTraversalSource traversal(final Graph graph) {
- final GraphTraversalSource g = graph.traversal();
- return g.withStrategies(new TranslationStrategy(g, new GraphSONTranslator<>(JavaTranslator.of(g), version), true));
- }
-
- @Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.OrderabilityTest",
- method = "g_inject_order",
- reason = "GraphSONv2 does not properly round trip Maps and Sets")
- @Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.OrderabilityTest",
- method = "g_inject_order_with_unknown_type",
- reason = "Remoting serializers only support known Gremlin types")
- @Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.StoreTest",
- method = "g_withSideEffectXa_setX_V_both_name_storeXaX_capXaX",
- reason = "GraphSONv2 does not properly round trip Maps and Sets")
- @Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.SideEffectTest",
- method = "g_withSideEffectXx_setX_V_both_both_sideEffectXstoreXxX_byXnameXX_capXxX_unfold",
- reason = "GraphSONv2 does not properly round trip Maps and Sets")
- @Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.AggregateTest",
- method = "g_withSideEffectXa_setX_V_both_name_aggregateXlocal_aX_capXaX",
- reason = "GraphSONv2 does not properly round trip Maps and Sets")
- @Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.MergeEdgeTest",
- method = "*",
- reason = "Remoting serializers only support known Gremlin types")
- @Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.MergeVertexTest",
- method = "*",
- reason = "Remoting serializers only support known Gremlin types")
- public static class TinkerGraphGraphSONv2TranslatorProvider extends AbstractTinkerGraphGraphSONTranslatorProvider {
- public TinkerGraphGraphSONv2TranslatorProvider() {
- super(GraphSONVersion.V2_0);
- }
- }
-
- @Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.OrderabilityTest",
- method = "g_inject_order_with_unknown_type",
- reason = "Remoting serializers only support known Gremlin types")
- public static class TinkerGraphGraphSONv3TranslatorProvider extends AbstractTinkerGraphGraphSONTranslatorProvider {
- public TinkerGraphGraphSONv3TranslatorProvider() {
- super(GraphSONVersion.V3_0);
- }
- }
-
- @GraphProvider.Descriptor(computer = TinkerGraphComputer.class)
- @Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.computer.GraphComputerTest",
- method = "shouldSucceedWithProperTraverserRequirements",
- reason = "Reason requires investigation")
- public static class TinkerGraphGraphSONv2TranslatorComputerProvider extends TinkerGraphGraphSONv2TranslatorProvider {
-
- @Override
- public GraphTraversalSource traversal(final Graph graph) {
- return super.traversal(graph).withComputer();
- }
- }
-
- @GraphProvider.Descriptor(computer = TinkerGraphComputer.class)
- @Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.computer.GraphComputerTest",
- method = "shouldSucceedWithProperTraverserRequirements",
- reason = "Reason requires investigation")
- public static class TinkerGraphGraphSONv3TranslatorComputerProvider extends TinkerGraphGraphSONv3TranslatorProvider {
-
- @Override
- public GraphTraversalSource traversal(final Graph graph) {
- return super.traversal(graph).withComputer();
- }
- }
-}
\ No newline at end of file
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/io/graphson/GraphSONTranslator.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/io/graphson/GraphSONTranslator.java
deleted file mode 100644
index c86ba01..0000000
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/io/graphson/GraphSONTranslator.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tinkerpop.gremlin.tinkergraph.structure.io.graphson;
-
-import org.apache.tinkerpop.gremlin.jsr223.JavaTranslator;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
-import org.apache.tinkerpop.gremlin.process.traversal.Translator;
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONReader;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONVersion;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONWriter;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONXModuleV2;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONXModuleV3;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.TypeInfo;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-
-/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-final class GraphSONTranslator<S extends TraversalSource, T extends Traversal.Admin<?, ?>> implements Translator.StepTranslator<S, T> {
-
- private final JavaTranslator<S, T> wrappedTranslator;
- private final GraphSONWriter writer;
- private final GraphSONReader reader;
-
- public GraphSONTranslator(final JavaTranslator<S, T> wrappedTranslator) {
- this(wrappedTranslator, GraphSONVersion.V2_0);
- }
-
- public GraphSONTranslator(final JavaTranslator<S, T> wrappedTranslator, final GraphSONVersion version) {
- this.wrappedTranslator = wrappedTranslator;
- final GraphSONMapper mapper;
- if (version == GraphSONVersion.V2_0) {
- mapper = GraphSONMapper.build()
- .addCustomModule(GraphSONXModuleV2.build()).version(GraphSONVersion.V2_0).create();
- } else if (version == GraphSONVersion.V3_0) {
- mapper = GraphSONMapper.build()
- .addCustomModule(GraphSONXModuleV3.build()).version(GraphSONVersion.V3_0).create();
- } else {
- throw new IllegalArgumentException("GraphSONVersion." + version.name() + " is not supported for testing");
- }
-
- writer = GraphSONWriter.build().mapper(mapper).create();
- reader = GraphSONReader.build().mapper(mapper).create();
- }
-
- @Override
- public S getTraversalSource() {
- return this.wrappedTranslator.getTraversalSource();
- }
-
- @Override
- public T translate(final Bytecode bytecode) {
- try {
- final ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
- this.writer.writeObject(outputStream, bytecode);
- return this.wrappedTranslator.translate(this.reader.readObject(new ByteArrayInputStream(outputStream.toByteArray()), Bytecode.class));
- } catch (final Exception e) {
- throw new IllegalStateException(e.getMessage(), e);
- }
- }
-
- @Override
- public String getTargetLanguage() {
- return this.wrappedTranslator.getTargetLanguage();
- }
-}
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/io/graphson/TinkerGraphGraphSONv2TranslatorProcessComputerTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/io/graphson/TinkerGraphGraphSONv2TranslatorProcessComputerTest.java
deleted file mode 100644
index 7cb4a14..0000000
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/io/graphson/TinkerGraphGraphSONv2TranslatorProcessComputerTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tinkerpop.gremlin.tinkergraph.structure.io.graphson;
-
-import org.apache.tinkerpop.gremlin.GraphProviderClass;
-import org.apache.tinkerpop.gremlin.process.ProcessComputerSuite;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
-import org.junit.runner.RunWith;
-
-/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-@RunWith(ProcessComputerSuite.class)
-@GraphProviderClass(provider = AbstractTinkerGraphGraphSONTranslatorProvider.TinkerGraphGraphSONv2TranslatorComputerProvider.class, graph = TinkerGraph.class)
-public class TinkerGraphGraphSONv2TranslatorProcessComputerTest {
-}
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/io/graphson/TinkerGraphGraphSONv2TranslatorProcessStandardTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/io/graphson/TinkerGraphGraphSONv2TranslatorProcessStandardTest.java
deleted file mode 100644
index 7c368cb..0000000
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/io/graphson/TinkerGraphGraphSONv2TranslatorProcessStandardTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tinkerpop.gremlin.tinkergraph.structure.io.graphson;
-
-import org.apache.tinkerpop.gremlin.GraphProviderClass;
-import org.apache.tinkerpop.gremlin.process.ProcessStandardSuite;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
-import org.junit.runner.RunWith;
-
-/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-@RunWith(ProcessStandardSuite.class)
-@GraphProviderClass(provider = AbstractTinkerGraphGraphSONTranslatorProvider.TinkerGraphGraphSONv2TranslatorProvider.class, graph = TinkerGraph.class)
-public class TinkerGraphGraphSONv2TranslatorProcessStandardTest {
-}
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/io/graphson/TinkerGraphGraphSONv3TranslatorProcessComputerTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/io/graphson/TinkerGraphGraphSONv3TranslatorProcessComputerTest.java
deleted file mode 100644
index d5af274..0000000
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/io/graphson/TinkerGraphGraphSONv3TranslatorProcessComputerTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tinkerpop.gremlin.tinkergraph.structure.io.graphson;
-
-import org.apache.tinkerpop.gremlin.GraphProviderClass;
-import org.apache.tinkerpop.gremlin.process.ProcessComputerSuite;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
-import org.junit.runner.RunWith;
-
-/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-@RunWith(ProcessComputerSuite.class)
-@GraphProviderClass(provider = AbstractTinkerGraphGraphSONTranslatorProvider.TinkerGraphGraphSONv3TranslatorComputerProvider.class, graph = TinkerGraph.class)
-public class TinkerGraphGraphSONv3TranslatorProcessComputerTest {
-}
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/io/graphson/TinkerGraphGraphSONv3TranslatorProcessStandardTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/io/graphson/TinkerGraphGraphSONv3TranslatorProcessStandardTest.java
deleted file mode 100644
index 4fba4e3..0000000
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/io/graphson/TinkerGraphGraphSONv3TranslatorProcessStandardTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tinkerpop.gremlin.tinkergraph.structure.io.graphson;
-
-import org.apache.tinkerpop.gremlin.GraphProviderClass;
-import org.apache.tinkerpop.gremlin.process.ProcessStandardSuite;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
-import org.junit.runner.RunWith;
-
-/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-@RunWith(ProcessStandardSuite.class)
-@GraphProviderClass(provider = AbstractTinkerGraphGraphSONTranslatorProvider.TinkerGraphGraphSONv3TranslatorProvider.class, graph = TinkerGraph.class)
-public class TinkerGraphGraphSONv3TranslatorProcessStandardTest {
-}
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/io/gryo/GryoTranslator.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/io/gryo/GryoTranslator.java
deleted file mode 100644
index 90e9eba..0000000
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/io/gryo/GryoTranslator.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tinkerpop.gremlin.tinkergraph.structure.io.gryo;
-
-import org.apache.tinkerpop.gremlin.jsr223.JavaTranslator;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
-import org.apache.tinkerpop.gremlin.process.traversal.Translator;
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoMapper;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoReader;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoWriter;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-
-/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- */
-final class GryoTranslator<S extends TraversalSource, T extends Traversal.Admin<?, ?>> implements Translator.StepTranslator<S, T> {
-
- private final JavaTranslator<S, T> wrappedTranslator;
- private final GryoMapper mapper = GryoMapper.build().create();
- private final GryoWriter writer = GryoWriter.build().mapper(mapper).create();
- private final GryoReader reader = GryoReader.build().mapper(mapper).create();
-
- public GryoTranslator(final JavaTranslator<S, T> wrappedTranslator) {
- this.wrappedTranslator = wrappedTranslator;
- }
-
- @Override
- public S getTraversalSource() {
- return this.wrappedTranslator.getTraversalSource();
- }
-
- @Override
- public T translate(final Bytecode bytecode) {
- try {
- final ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
- this.writer.writeObject(outputStream, bytecode);
- return this.wrappedTranslator.translate(this.reader.readObject(new ByteArrayInputStream(outputStream.toByteArray()), Bytecode.class));
- } catch (final Exception e) {
- throw new IllegalStateException(e.getMessage(), e);
- }
- }
-
- @Override
- public String getTargetLanguage() {
- return this.wrappedTranslator.getTargetLanguage();
- }
-}
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/io/gryo/TinkerGraphGryoTranslatorComputerProvider.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/io/gryo/TinkerGraphGryoTranslatorComputerProvider.java
deleted file mode 100644
index 13afe2c..0000000
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/io/gryo/TinkerGraphGryoTranslatorComputerProvider.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tinkerpop.gremlin.tinkergraph.structure.io.gryo;
-
-import org.apache.tinkerpop.gremlin.GraphProvider;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.tinkergraph.process.computer.TinkerGraphComputer;
-
-/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- */
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.computer.GraphComputerTest",
- method = "shouldSucceedWithProperTraverserRequirements",
- reason = "Reason requires investigation")
-@GraphProvider.Descriptor(computer = TinkerGraphComputer.class)
-public class TinkerGraphGryoTranslatorComputerProvider extends TinkerGraphGryoTranslatorProvider {
-
- @Override
- public GraphTraversalSource traversal(final Graph graph) {
- return super.traversal(graph).withComputer();
- }
-}
-
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/io/gryo/TinkerGraphGryoTranslatorProcessComputerTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/io/gryo/TinkerGraphGryoTranslatorProcessComputerTest.java
deleted file mode 100644
index 328a932..0000000
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/io/gryo/TinkerGraphGryoTranslatorProcessComputerTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tinkerpop.gremlin.tinkergraph.structure.io.gryo;
-
-import org.apache.tinkerpop.gremlin.GraphProviderClass;
-import org.apache.tinkerpop.gremlin.process.ProcessComputerSuite;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
-import org.junit.runner.RunWith;
-
-/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- */
-@RunWith(ProcessComputerSuite.class)
-@GraphProviderClass(provider = TinkerGraphGryoTranslatorComputerProvider.class, graph = TinkerGraph.class)
-public class TinkerGraphGryoTranslatorProcessComputerTest {
-}
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/io/gryo/TinkerGraphGryoTranslatorProcessStandardTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/io/gryo/TinkerGraphGryoTranslatorProcessStandardTest.java
deleted file mode 100644
index 1bb2452..0000000
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/io/gryo/TinkerGraphGryoTranslatorProcessStandardTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tinkerpop.gremlin.tinkergraph.structure.io.gryo;
-
-import org.apache.tinkerpop.gremlin.GraphProviderClass;
-import org.apache.tinkerpop.gremlin.process.ProcessStandardSuite;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
-import org.junit.runner.RunWith;
-
-/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- */
-@RunWith(ProcessStandardSuite.class)
-@GraphProviderClass(provider = TinkerGraphGryoTranslatorProvider.class, graph = TinkerGraph.class)
-public class TinkerGraphGryoTranslatorProcessStandardTest {
-}
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/io/gryo/TinkerGraphGryoTranslatorProvider.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/io/gryo/TinkerGraphGryoTranslatorProvider.java
deleted file mode 100644
index e1b4922..0000000
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/io/gryo/TinkerGraphGryoTranslatorProvider.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.tinkergraph.structure.io.gryo;
-
-import org.apache.tinkerpop.gremlin.jsr223.JavaTranslator;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.TranslationStrategy;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.tinkergraph.TinkerGraphProvider;
-
-/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- */
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.ProfileTest",
- method = "*",
- reason = "Tests for profile() are not supported for remotes")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.LambdaStepTest",
- method = "*",
- reason = "Tests that include lambdas are not supported by the test suite for remotes")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.filter.DedupTest",
- method = "g_V_both_name_order_byXa_bX_dedup_value",
- reason = "Tests that include lambdas are not supported by the test suite for remotes")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.OrderTest",
- method = "g_V_name_order_byXa1_b1X_byXb2_a2X",
- reason = "Tests that include lambdas are not supported by the test suite for remotes")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.OrderTest",
- method = "g_V_order_byXname_a1_b1X_byXname_b2_a2X_name",
- reason = "Tests that include lambdas are not supported by the test suite for remotes")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.SackTest",
- method = "g_withSackXmap__map_cloneX_V_out_out_sackXmap_a_nameX_sack",
- reason = "Tests that include lambdas are not supported by the test suite for remotes")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.SubgraphTest",
- method = "g_V_withSideEffectXsgX_outEXknowsX_subgraphXsgX_name_capXsgX",
- reason = "Tests that include lambdas are not supported by the test suite for remotes")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.SubgraphTest",
- method = "g_V_withSideEffectXsgX_repeatXbothEXcreatedX_subgraphXsgX_outVX_timesX5X_name_dedup",
- reason = "Tests that include lambdas are not supported by the test suite for remotes")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.SubgraphTest",
- method = "g_withSideEffectXsgX_V_hasXname_danielXout_capXsgX",
- reason = "Tests that include lambdas are not supported by the test suite for remotes")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.ProgramTest",
- method = "*",
- reason = "Reason requires investigation")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.TraversalInterruptionTest",
- method = "*",
- reason = "Reason requires investigation")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.TraversalInterruptionComputerTest",
- method = "*",
- reason = "Reason requires investigation")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.EventStrategyProcessTest",
- method = "*",
- reason = "Strategy not properly supported by Bytecode based traversals")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.ElementIdStrategyProcessTest",
- method = "*",
- reason = "Strategy not properly supported by Bytecode based traversals")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.CoreTraversalTest",
- method = "shouldNeverPropagateANoBulkTraverser",
- reason = "Reason requires investigation")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.ReadTest",
- method = "*",
- reason = "read and write tests don't translate locally well because of calling iterate() inside read()/write() add a none()")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.WriteTest",
- method = "*",
- reason = "read and write tests don't translate locally well because of calling iterate() inside read()/write() add a none()")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.OrderabilityTest",
- method = "g_inject_order_with_unknown_type",
- reason = "Remoting serializers only support known Gremlin types")
-public class TinkerGraphGryoTranslatorProvider extends TinkerGraphProvider {
-
- @Override
- public GraphTraversalSource traversal(final Graph graph) {
- final GraphTraversalSource g = graph.traversal();
- return g.withStrategies(new TranslationStrategy(g, new GryoTranslator<>(JavaTranslator.of(g)), true));
- }
-}
\ No newline at end of file
