[8/9] tinkerpop git commit: Merge branch 'tp32' into tp33
Merge branch 'tp32' into tp33
Conflicts:
gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperEmbeddedTypeTest.java
gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphSON/GraphSONReaderTests.cs
gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphSON/GraphSONWriterTests.cs
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/28bf3046
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/28bf3046
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/28bf3046
Branch: refs/heads/tp33
Commit: 28bf30468cca9bbd5c95b3814619801348cfad96
Parents: 650d1e8 80fa89b
Author: Stephen Mallette
Authored: Thu Oct 4 14:10:54 2018 -0400
Committer: Stephen Mallette
Committed: Thu Oct 4 14:10:54 2018 -0400
--
CHANGELOG.asciidoc | 1 +
docs/src/dev/io/graphson.asciidoc | 2 +
.../io/graphson/GraphSONSerializersV2d0.java| 19 ++--
.../GraphSONMapperEmbeddedTypeTest.java | 14 ++
.../IO/GraphSON/GraphSONReaderTests.cs | 49 +---
.../IO/GraphSON/GraphSONWriterTests.cs | 32 -
.../lib/structure/io/type-serializers.js| 30 +++-
.../test/unit/graphson-test.js | 39
.../gremlin_python/structure/io/graphsonV2d0.py | 26 +++
.../tests/structure/io/test_graphsonV2d0.py | 25 ++
10 files changed, 224 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/28bf3046/CHANGELOG.asciidoc
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/28bf3046/docs/src/dev/io/graphson.asciidoc
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/28bf3046/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV2d0.java
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/28bf3046/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperEmbeddedTypeTest.java
--
diff --cc
gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperEmbeddedTypeTest.java
index a375e3b,e5f2693..c9400cd
---
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
@@@ -44,16 -44,8 +44,17 @@@ import java.time.ZoneOffset
import java.time.ZonedDateTime;
import java.util.ArrayList;
import java.util.Arrays;
+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.Set;
+import static org.hamcrest.CoreMatchers.any;
+import static org.hamcrest.Matchers.either;
++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;
@@@ -85,58 -74,21 +86,71 @@@ public class GraphSONMapperEmbeddedType
public String version;
@Test
+ public void shouldHandleNumberConstants() throws Exception {
-assumeThat(version, startsWith("v2"));
++assumeThat(version, not(startsWith("v1")));
+
+ final List o = new ArrayList<>();
+ o.add(123.321d);
+ o.add(Double.NaN);
+ o.add(Double.NEGATIVE_INFINITY);
+ o.add(Double.POSITIVE_INFINITY);
+
+ assertEquals(o, serializeDeserialize(mapper, o, List.class));
+ }
+
+ @Test
+public void shouldHandleMap() throws Exception {
+assumeThat(version, startsWith("v3"));
+
+final Map o = new LinkedHashMap<>();
+o.put("string key", "string value");
+o.put(1, 1);
+o.put(1L, 1L);
+
+final List l = Arrays.asList("test", 1, 5L);
+o.put(l, "crazy");
+
+assertEquals(o, serializeDeserialize(mapper, o, Map.class));
+}
+
+@Test
+public void shouldHandleList() throws Exception {
+assumeThat(version, startsWith("v3"));
+
+final List o = new ArrayList<>();
+o.add("test");
+o.add(1);
+o.add(1);
+o.add(1L);
+o.add(1L);
+
+final List l = Arrays.asList("test", 1, 5L);
+o.add(l);
+
+assertEquals(o, serializeDeserialize(mapper, o, List.class));
+}
+
+@T
[8/9] tinkerpop git commit: Merge branch 'tp32' into tp33
Merge branch 'tp32' into tp33
Conflicts:
gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngine.java
gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GroovyTranslatorTest.java
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/2b4c993d
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/2b4c993d
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/2b4c993d
Branch: refs/heads/master
Commit: 2b4c993ddd16a4554858d480103952374897
Parents: 1faf762 88d6f77
Author: Stephen Mallette
Authored: Wed Oct 3 16:09:06 2018 -0400
Committer: Stephen Mallette
Committed: Wed Oct 3 16:09:06 2018 -0400
--
CHANGELOG.asciidoc | 2 +
.../gremlin/jsr223/TranslatorCustomizer.java| 38
.../gremlin/process/traversal/Translator.java | 34 +++
.../jsr223/GremlinGroovyScriptEngine.java | 11 +-
.../gremlin/groovy/jsr223/GroovyTranslator.java | 34 ++-
.../groovy/jsr223/GroovyTranslatorTest.java | 215 +--
6 files changed, 309 insertions(+), 25 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2b4c993d/CHANGELOG.asciidoc
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2b4c993d/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngine.java
--
diff --cc
gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngine.java
index 03ea883,b96b8b9..7785da6
---
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
@@@ -222,19 -236,27 +224,20 @@@ public class GremlinGroovyScriptEngine
private final ImportGroovyCustomizer importGroovyCustomizer;
private final List groovyCustomizers;
-private final Set artifactsToUse = new HashSet<>();
private final boolean interpreterModeEnabled;
private final long expectedCompilationTime;
+ private final Translator.ScriptTranslator.TypeTranslator typeTranslator;
/**
- * Creates a new instance using the {@link
DefaultImportCustomizerProvider}.
+ * There is no need to require type checking infrastructure if type
checking is not enabled.
*/
-public GremlinGroovyScriptEngine() {
-this(new Customizer[0]);
-}
+private final boolean typeCheckingEnabled;
/**
- * @deprecated As of release 3.0.1, replaced by {@link
#GremlinGroovyScriptEngine(CompilerCustomizerProvider...)}
+ * Creates a new instance using no {@link Customizer}.
*/
-@Deprecated
-public GremlinGroovyScriptEngine(final ImportCustomizerProvider
importCustomizerProvider) {
-this((CompilerCustomizerProvider) importCustomizerProvider);
+public GremlinGroovyScriptEngine() {
+this(new Customizer[0]);
}
public GremlinGroovyScriptEngine(final Customizer... customizers) {
@@@ -273,6 -289,58 +276,12 @@@
interpreterModeEnabled = groovyCustomizers.stream()
.anyMatch(p ->
p.getClass().equals(InterpreterModeGroovyCustomizer.class));
+ final Optional translatorCustomizer =
listOfCustomizers.stream().
+ filter(p -> p instanceof TranslatorCustomizer).
+ map(p -> (TranslatorCustomizer) p).findFirst();
+ typeTranslator = translatorCustomizer.isPresent() ?
translatorCustomizer.get().createTypeTranslator() :
+ Translator.ScriptTranslator.TypeTranslator.identity();
+
-// not using the old provider model so set that to empty list so that
when createClassLoader is called
-// it knows to use groovyCustomizers instead
-customizerProviders = Collections.emptyList();
-
-createClassLoader();
-}
-
-/**
- * Creates a new instance with the specified {@link
CompilerCustomizerProvider} objects.
- *
- * @deprecated As of release 3.2.4, replaced by {@link
#GremlinGroovyScriptEngine(Customizer...)}.
- */
-@Deprecated
-public GremlinGroovyScriptEngine(final CompilerCustomizerProvider...
compilerCustomizerProviders) {
-final List providers =
Arrays.asList(compilerCustomizerProviders);
-
-GremlinLoader.load();
-
-importCustomizerProvider = providers.stream()
-.filter(p -> p instanceof ImportCustomizerProvider)
-.map(p -> (ImportCustomizerProvider) p)
-.findFirst().orElse(NoImportCustomizerProvid
[8/9] tinkerpop git commit: Merge branch 'tp32' into tp33
Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0bf76acd Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0bf76acd Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0bf76acd Branch: refs/heads/tp33 Commit: 0bf76acd551fd900e7869e9e5aada8aaeaa34b56 Parents: a050b6e 1b99323 Author: Florian Hockmann Authored: Sat Aug 11 13:40:16 2018 +0200 Committer: Florian Hockmann Committed: Sat Aug 11 13:40:16 2018 +0200 -- gremlin-dotnet/glv/Gremlin.Net.csproj.template| 7 +-- gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj | 7 +-- 2 files changed, 10 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0bf76acd/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj --
[8/9] tinkerpop git commit: Merge branch 'tp32' into tp33
Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/4f462c53 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4f462c53 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/4f462c53 Branch: refs/heads/tp33 Commit: 4f462c5327e04c475db6c9b6af38e36587610480 Parents: 84c3ff4 c02b993 Author: Florian Hockmann Authored: Wed Jun 27 19:20:37 2018 +0200 Committer: Florian Hockmann Committed: Wed Jun 27 19:20:37 2018 +0200 -- .../src/Gremlin.Net/Driver/ConnectionPool.cs| 26 +--- 1 file changed, 17 insertions(+), 9 deletions(-) --
[8/9] tinkerpop git commit: Merge branch 'tp32' into tp33
Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/cf6f9746 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/cf6f9746 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/cf6f9746 Branch: refs/heads/TINKERPOP-1912-tp33 Commit: cf6f9746e3427f6c9cbc5c48d1153b2b523f5880 Parents: 0c9afb6 35bf95a Author: Stephen Mallette Authored: Wed Apr 11 09:14:00 2018 -0400 Committer: Stephen Mallette Committed: Wed Apr 11 09:14:00 2018 -0400 -- docs/src/recipes/collections.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[8/9] tinkerpop git commit: Merge branch 'tp32' into tp33
Merge branch 'tp32' into tp33
Conflicts:
gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/46be1351
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/46be1351
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/46be1351
Branch: refs/heads/TINKERPOP-1927
Commit: 46be13518fd32a58118f1fa09a52e794114fb765
Parents: 39c3365 df7870a
Author: Stephen Mallette
Authored: Mon Apr 9 11:31:25 2018 -0400
Committer: Stephen Mallette
Committed: Mon Apr 9 11:31:25 2018 -0400
--
docs/src/dev/developer/release.asciidoc | 5 +
gremlin-javascript/glv/PackageJson.template | 2 +-
gremlin-javascript/pom.xml| 10 +-
.../src/main/javascript/gremlin-javascript/README.md | 2 +-
.../src/main/javascript/gremlin-javascript/package.json | 2 +-
5 files changed, 17 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/46be1351/docs/src/dev/developer/release.asciidoc
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/46be1351/gremlin-javascript/pom.xml
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/46be1351/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
--
diff --cc gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
index 004f307,9a6197c..76a2dd6
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
@@@ -1,6 -1,6 +1,6 @@@
{
- "name": "gremlin-javascript",
+ "name": "gremlin",
- "version": "3.2.9-alpha1",
+ "version": "3.3.3-alpha1",
"description": "JavaScript Gremlin Language Variant",
"author": "Apache TinkerPop team",
"keywords": [
