You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2017/07/13 17:48:39 UTC
[51/52] [abbrv] tinkerpop git commit: TINKERPOP-1552 Fixed templates
for 3.3.0 and got tests running
TINKERPOP-1552 Fixed templates for 3.3.0 and got tests running
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/02327f58
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/02327f58
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/02327f58
Branch: refs/heads/TINKERPOP-1552-master
Commit: 02327f58afb1f4e2e7eec3476e44e8627aedf035
Parents: 62554a8
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Jul 12 09:46:20 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Jul 13 13:47:20 2017 -0400
----------------------------------------------------------------------
gremlin-dotnet/pom.xml | 3 +++
.../src/Gremlin.Net/Process/Traversal/GraphTraversal.cs | 4 ++--
gremlin-dotnet/src/Gremlin.Net/Process/Traversal/__.cs | 8 ++++----
.../Traversal/DriverRemoteConnection/GraphTraversalTests.cs | 4 ++--
gremlin-dotnet/test/pom.xml | 4 ++--
gremlin-python/pom.xml | 2 --
6 files changed, 13 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/02327f58/gremlin-dotnet/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/pom.xml b/gremlin-dotnet/pom.xml
index 206f454..2ba30ec 100644
--- a/gremlin-dotnet/pom.xml
+++ b/gremlin-dotnet/pom.xml
@@ -88,6 +88,8 @@ def toCSharpTypeMap = ["Long": "long",
"Object": "object",
"java.util.Map<java.lang.String, E2>": "IDictionary<string, E2>",
"java.util.Map<java.lang.String, B>": "IDictionary<string, E2>",
+ "java.util.Map<java.lang.Object, E2>": "IDictionary<object, E2>",
+ "java.util.Map<java.lang.Object, B>": "IDictionary<object, E2>",
"java.util.List<E>": "IList<E>",
"java.util.Map<K, V>": "IDictionary<K, V>",
"java.util.Collection<E2>": "ICollection<E2>",
@@ -102,6 +104,7 @@ def methodsWithSpecificTypes = ["constant": useE2,
"optional": useE2,
"range": useE2,
"select": ["IDictionary<string, E2>", "E2"],
+ "skip": useE2,
"sum": useE2,
"tail": useE2,
"tree": ["object"],
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/02327f58/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs
index 07173e8..8f5b48c 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs
@@ -938,10 +938,10 @@ namespace Gremlin.Net.Process.Traversal
/// <summary>
/// Adds the valueMap step to this <see cref="GraphTraversal{SType, EType}" />.
/// </summary>
- public GraphTraversal< S , java.util.Map<java.lang.Object, E2> > ValueMap<E2> (params object[] args)
+ public GraphTraversal< S , IDictionary<object, E2> > ValueMap<E2> (params object[] args)
{
Bytecode.AddStep("valueMap", args);
- return Wrap< S , java.util.Map<java.lang.Object, E2> >(this);
+ return Wrap< S , IDictionary<object, E2> >(this);
}
/// <summary>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/02327f58/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/__.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/__.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/__.cs
index 2080bed..e0e6e42 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/__.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/__.cs
@@ -643,9 +643,9 @@ namespace Gremlin.Net.Process.Traversal
/// <summary>
/// Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the skip step to that traversal.
/// </summary>
- public static GraphTraversal<object, object> Skip(params object[] args)
+ public static GraphTraversal<object, E2> Skip<E2>(params object[] args)
{
- return new GraphTraversal<object, object>().Skip(args);
+ return new GraphTraversal<object, object>().Skip<E2>(args);
}
/// <summary>
@@ -763,9 +763,9 @@ namespace Gremlin.Net.Process.Traversal
/// <summary>
/// Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the valueMap step to that traversal.
/// </summary>
- public static GraphTraversal<object, java.util.Map<java.lang.Object, B>> ValueMap(params object[] args)
+ public static GraphTraversal<object, IDictionary<object, E2>> ValueMap<E2>(params object[] args)
{
- return new GraphTraversal<object, object>().ValueMap(args);
+ return new GraphTraversal<object, object>().ValueMap<E2>(args);
}
/// <summary>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/02327f58/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/DriverRemoteConnection/GraphTraversalTests.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/DriverRemoteConnection/GraphTraversalTests.cs b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/DriverRemoteConnection/GraphTraversalTests.cs
index 2156ff3..24c75b0 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/DriverRemoteConnection/GraphTraversalTests.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/DriverRemoteConnection/GraphTraversalTests.cs
@@ -104,7 +104,7 @@ namespace Gremlin.Net.IntegrationTest.Process.Traversal.DriverRemoteConnection
var receivedValueMap = g.V().Has("name", "marko").ValueMap<object>().Next();
- var expectedValueMap = new Dictionary<string, object>
+ var expectedValueMap = new Dictionary<object, object>
{
{"age", new List<object> {29}},
{"name", new List<object> {"marko"}}
@@ -166,4 +166,4 @@ namespace Gremlin.Net.IntegrationTest.Process.Traversal.DriverRemoteConnection
Assert.Equal(6, count);
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/02327f58/gremlin-dotnet/test/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/test/pom.xml b/gremlin-dotnet/test/pom.xml
index 34f4cda..2b09d26 100644
--- a/gremlin-dotnet/test/pom.xml
+++ b/gremlin-dotnet/test/pom.xml
@@ -140,7 +140,7 @@ if (${skipTests}) return
log.info("Starting Gremlin Server instances for native testing of gremlin-dotnet")
def settings = Settings.read("${gremlin.server.dir}/conf/gremlin-server-modern.yaml")
settings.graphs.graph = "${gremlin.server.dir}/conf/tinkergraph-empty.properties"
-settings.scriptEngines["gremlin-groovy"].scripts = ["${gremlin.server.dir}/scripts/generate-modern.groovy"]
+settings.scriptEngines["gremlin-groovy"].plugins["org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin"].files = ["${gremlin.server.dir}/scripts/generate-modern.groovy"]
settings.port = 45950
def server = new GremlinServer(settings)
@@ -151,7 +151,7 @@ log.info("Gremlin Server with no authentication started on port 45950")
def settingsSecure = Settings.read("${gremlin.server.dir}/conf/gremlin-server-modern.yaml")
settingsSecure.graphs.graph = "${gremlin.server.dir}/conf/tinkergraph-empty.properties"
-settingsSecure.scriptEngines["gremlin-groovy"].scripts = ["${gremlin.server.dir}/scripts/generate-modern.groovy"]
+settingsSecure.scriptEngines["gremlin-groovy"].plugins["org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin"].files = ["${gremlin.server.dir}/scripts/generate-modern.groovy"]
settingsSecure.port = 45951
settingsSecure.authentication.className = "org.apache.tinkerpop.gremlin.server.auth.SimpleAuthenticator"
settingsSecure.authentication.config = [credentialsDb: "${gremlin.server.dir}/conf/tinkergraph-credentials.properties", credentialsDbLocation: "${gremlin.server.dir}/data/credentials.kryo"]
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/02327f58/gremlin-python/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-python/pom.xml b/gremlin-python/pom.xml
index 7f2a19b..ebc75fd 100644
--- a/gremlin-python/pom.xml
+++ b/gremlin-python/pom.xml
@@ -589,8 +589,6 @@ settings.scriptEngines["gremlin-groovy"].plugins["org.apache.tinkerpop.gremlin.j
settings.serializers << new SerializerSettings("org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0", [:])
settings.port = 45940
-println settings.scriptEngines["gremlin-groovy"].plugins["org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin"].files
-
def server = new GremlinServer(settings)
server.start().join()