Merge branch '3.7-dev' into 3.8-dev

Author: Cole-Greer

gremlin-dotnet/Examples/BasicGremlin/BasicGremlin.cs

@@ -23,28 +23,32 @@ under the License.
 
 public class BasicGremlinExample
 {
+    static readonly string ServerHost = Environment.GetEnvironmentVariable("GREMLIN_SERVER_HOST") ?? "localhost";
+    static readonly int ServerPort = int.Parse(Environment.GetEnvironmentVariable("GREMLIN_SERVER_PORT") ?? "8182");
+    static readonly string VertexLabel = Environment.GetEnvironmentVariable("VERTEX_LABEL") ?? "person";
+
     static async Task Main()
     {
-        var server = new GremlinServer("localhost", 8182);
+        var server = new GremlinServer(ServerHost, ServerPort);
         using var remoteConnection = new DriverRemoteConnection(new GremlinClient(server), "g");
         var g = Traversal().WithRemote(remoteConnection);
 
         // Basic Gremlin: adding and retrieving data
-        var v1 = g.AddV("person").Property("name", "marko").Next();
-        var v2 = g.AddV("person").Property("name", "stephen").Next();
-        var v3 = g.AddV("person").Property("name", "vadas").Next();
+        var v1 = g.AddV(VertexLabel).Property("name", "marko").Next();
+        var v2 = g.AddV(VertexLabel).Property("name", "stephen").Next();
+        var v3 = g.AddV(VertexLabel).Property("name", "vadas").Next();
 
         // Be sure to use a terminating step like Next() or Iterate() so that the traversal "executes"
         // Iterate() does not return any data and is used to just generate side-effects (i.e. write data to the database)
         g.V(v1).AddE("knows").To(v2).Property("weight", 0.75).Iterate();
         g.V(v1).AddE("knows").To(v3).Property("weight", 0.75).Iterate();
 
         // Retrieve the data from the "marko" vertex
-        var marko = await g.V().Has("person", "name", "marko").Values<string>("name").Promise(t => t.Next());
+        var marko = await g.V().Has(VertexLabel, "name", "marko").Values<string>("name").Promise(t => t.Next());
         Console.WriteLine("name: " + marko);
 
         // Find the "marko" vertex and then traverse to the people he "knows" and return their data
-        var peopleMarkoKnows = await g.V().Has("person", "name", "marko").Out("knows").Values<string>("name").Promise(t => t.ToList());
+        var peopleMarkoKnows = await g.V().Has(VertexLabel, "name", "marko").Out("knows").Values<string>("name").Promise(t => t.ToList());
         foreach (var person in peopleMarkoKnows)
         {
             Console.WriteLine("marko knows " + person);

gremlin-dotnet/Examples/Connections/Connections.cs

@@ -24,6 +24,10 @@ under the License.
 
 public class ConnectionExample
 {
+    static readonly string ServerHost = Environment.GetEnvironmentVariable("GREMLIN_SERVER_HOST") ?? "localhost";
+    static readonly int ServerPort = int.Parse(Environment.GetEnvironmentVariable("GREMLIN_SERVER_PORT") ?? "8182");
+    static readonly string VertexLabel = Environment.GetEnvironmentVariable("VERTEX_LABEL") ?? "connection";
+
     static void Main()
     {
         WithRemote();
@@ -34,41 +38,38 @@ static void Main()
     // Connecting to the server
     static void WithRemote()
     {
-        var server = new GremlinServer("localhost", 8182);
+        var server = new GremlinServer(ServerHost, ServerPort);
         using var remoteConnection = new DriverRemoteConnection(new GremlinClient(server), "g");
         var g = Traversal().WithRemote(remoteConnection);
 
-        // Drop existing vertices
-        g.V().Drop().Iterate();
-
         // Simple query to verify connection
-        var v = g.AddV().Iterate();
-        var count = g.V().Count().Next();
+        var v = g.AddV(VertexLabel).Iterate();
+        var count = g.V().HasLabel(VertexLabel).Count().Next();
         Console.WriteLine("Vertex count: " + count);
     }
 
     // Connecting to the server with customized configurations
     static void WithConf()
     {
         using var remoteConnection = new DriverRemoteConnection(new GremlinClient(
-        new GremlinServer(hostname: "localhost", port: 8182, enableSsl: false, username: "", password: "")), "g");
+        new GremlinServer(hostname: ServerHost, port: ServerPort, enableSsl: false, username: "", password: "")), "g");
         var g = Traversal().WithRemote(remoteConnection);
 
-        var v = g.AddV().Iterate();
-        var count = g.V().Count().Next();
+        var v = g.AddV(VertexLabel).Iterate();
+        var count = g.V().HasLabel(VertexLabel).Count().Next();
         Console.WriteLine("Vertex count: " + count);
     }
 
     // Specifying a serializer
     static void WithSerializer()
     {
-        var server = new GremlinServer("localhost", 8182);
+        var server = new GremlinServer(ServerHost, ServerPort);
         var client = new GremlinClient(server, new GraphSON3MessageSerializer());
         using var remoteConnection = new DriverRemoteConnection(client, "g");
         var g = Traversal().WithRemote(remoteConnection);
 
-        var v = g.AddV().Iterate();
-        var count = g.V().Count().Next();
+        var v = g.AddV(VertexLabel).Iterate();
+        var count = g.V().HasLabel(VertexLabel).Count().Next();
         Console.WriteLine("Vertex count: " + count);
     }
 }

gremlin-dotnet/Examples/ModernTraversals/ModernTraversals.cs

@@ -26,10 +26,16 @@ under the License.
 
 public class ModernTraversalExample
 {
+    static readonly string ServerHost = Environment.GetEnvironmentVariable("GREMLIN_SERVER_HOST") ?? "localhost";
+    static readonly int ServerPort = int.Parse(Environment.GetEnvironmentVariable("GREMLIN_SERVER_PORT") ?? "8182");
+    static readonly bool IsDocker = Environment.GetEnvironmentVariable("DOCKER_ENVIRONMENT") == "true";
+
     static void Main()
     {
-        var server = new GremlinServer("localhost", 8182);
-        using var remoteConnection = new DriverRemoteConnection(new GremlinClient(server), "g");
+        var server = new GremlinServer(ServerHost, ServerPort);
+        // Use gmodern in CI environment, default connection locally
+        var traversalSource = IsDocker ? "gmodern" : "g";
+        using var remoteConnection = new DriverRemoteConnection(new GremlinClient(server), traversalSource);
         var g = Traversal().WithRemote(remoteConnection);
 
         /*

gremlin-dotnet/docker-compose.yml

@@ -53,10 +53,19 @@ services:
       - ../gremlin-tools/gremlin-socket-server/conf:/gremlin-dotnet/gremlin-socket-server/conf/
     environment:
       - DOCKER_ENVIRONMENT=true
+      - GREMLIN_SERVER_HOST=gremlin-server-test-dotnet
+      - GREMLIN_SERVER_PORT=45940
+      - VERTEX_LABEL=dotnet-example
     working_dir: /gremlin-dotnet
     command: >
       bash -c "dotnet tool update -g dotnet-trx; dotnet test ./Gremlin.Net.sln -c Release --logger trx; /root/.dotnet/tools/trx;
-      EXIT_CODE=$$?; chown -R `stat -c "%u:%g" .` .; exit $$EXIT_CODE"
+      EXIT_CODE=$$?;
+      echo 'Running examples...';
+      dotnet run --project Examples/BasicGremlin/BasicGremlin.csproj;
+      dotnet run --project Examples/Connections/Connections.csproj;
+      dotnet run --project Examples/ModernTraversals/ModernTraversals.csproj;
+      echo 'All examples completed successfully';
+      chown -R `stat -c \"%u:%g\" .` .; exit $$EXIT_CODE"
     depends_on:
       gremlin-server-test-dotnet:
         condition: service_healthy

gremlin-driver/src/main/java/examples/BasicGremlin.java

@@ -19,38 +19,46 @@ Licensed to the Apache Software Foundation (ASF) under one
 
 package examples;
 
+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.structure.Graph;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
 
 import java.util.List;
 
 import static org.apache.tinkerpop.gremlin.process.traversal.AnonymousTraversalSource.traversal;
 
 public class BasicGremlin {
-    public static void main(String[] args) {
-        Graph graph = TinkerGraph.open();
-        GraphTraversalSource g = traversal().withEmbedded(graph);
+    static final String SERVER_HOST = System.getenv().getOrDefault("GREMLIN_SERVER_HOST", "localhost");
+    static final int SERVER_PORT = Integer.parseInt(System.getenv().getOrDefault("GREMLIN_SERVER_PORT", "8182"));
+    static final String VERTEX_LABEL = System.getenv().getOrDefault("VERTEX_LABEL", "person");
+
+    public static void main(String[] args) throws Exception {
+        Cluster cluster = Cluster.build(SERVER_HOST).port(SERVER_PORT).create();
+        GraphTraversalSource g = traversal().withRemote(DriverRemoteConnection.using(cluster, "g"));
 
         // Basic Gremlin: adding and retrieving data
-        Vertex v1 = g.addV("person").property("name","marko").next();
-        Vertex v2 = g.addV("person").property("name","stephen").next();
-        Vertex v3 = g.addV("person").property("name","vadas").next();
+        Vertex v1 = g.addV(VERTEX_LABEL).property("name","marko").next();
+        Vertex v2 = g.addV(VERTEX_LABEL).property("name","stephen").next();
+        Vertex v3 = g.addV(VERTEX_LABEL).property("name","vadas").next();
 
         // Be sure to use a terminating step like next() or iterate() so that the traversal "executes"
         // Iterate() does not return any data and is used to just generate side-effects (i.e. write data to the database)
         g.V(v1).addE("knows").to(v2).property("weight",0.75).iterate();
         g.V(v1).addE("knows").to(v3).property("weight",0.75).iterate();
 
         // Retrieve the data from the "marko" vertex
-        Object marko = g.V().has("person","name","marko").values("name").next();
+        Object marko = g.V().has(VERTEX_LABEL,"name","marko").values("name").next();
         System.out.println("name: " + marko);
 
         // Find the "marko" vertex and then traverse to the people he "knows" and return their data
-        List<Object> peopleMarkoKnows = g.V().has("person","name","marko").out("knows").values("name").toList();
+        List<Object> peopleMarkoKnows = g.V().has(VERTEX_LABEL,"name","marko").out("knows").values("name").toList();
         for (Object person : peopleMarkoKnows) {
             System.out.println("marko knows " + person);
         }
+
+        // Cleanup
+        cluster.close();
+        g.close();
     }
 }

gremlin-driver/src/main/java/examples/Connections.java

@@ -35,6 +35,10 @@ Licensed to the Apache Software Foundation (ASF) under one
 import static org.apache.tinkerpop.gremlin.process.traversal.AnonymousTraversalSource.traversal;
 
 public class Connections {
+    static final String SERVER_HOST = System.getenv().getOrDefault("GREMLIN_SERVER_HOST", "localhost");
+    static final int SERVER_PORT = Integer.parseInt(System.getenv().getOrDefault("GREMLIN_SERVER_PORT", "8182"));
+    static final String VERTEX_LABEL = System.getenv().getOrDefault("VERTEX_LABEL", "connection");
+
     public static void main(String[] args) throws Exception {
         withEmbedded();
         withRemote();
@@ -56,15 +60,12 @@ private static void withEmbedded() throws Exception {
 
     // Connecting to the server
     private static void withRemote() throws Exception {
-        Cluster cluster = Cluster.build("localhost").port(8182).create();
+        Cluster cluster = Cluster.build(SERVER_HOST).port(SERVER_PORT).create();
         GraphTraversalSource g = traversal().withRemote(DriverRemoteConnection.using(cluster, "g"));
 
-        // Drop existing vertices
-        g.V().drop().iterate();
-
         // Simple query to verify connection
-        g.addV().iterate();
-        long count = g.V().count().next();
+        g.addV(VERTEX_LABEL).iterate();
+        long count = g.V().hasLabel(VERTEX_LABEL).count().next();
         System.out.println("Vertex count: " + count);
 
         // Cleanup
@@ -75,12 +76,12 @@ private static void withRemote() throws Exception {
     // Connecting and customizing configurations with a cluster
     // See reference/#gremlin-java-configuration for full list of configurations
     private static void withCluster() throws Exception {
-        Cluster cluster = Cluster.build("localhost").
+        Cluster cluster = Cluster.build(SERVER_HOST).
             channelizer(Channelizer.WebSocketChannelizer.class).
             keepAliveInterval(180000).
             maxConnectionPoolSize(8).
             path("/gremlin").
-            port(8182).
+            port(SERVER_PORT).
             serializer(new GraphBinaryMessageSerializerV1()).
             create();
         GraphTraversalSource g = traversal().withRemote(DriverRemoteConnection.using(cluster, "g"));
@@ -98,7 +99,8 @@ 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);
-        Cluster cluster = Cluster.build("localhost").
+        Cluster cluster = Cluster.build(SERVER_HOST).
+            port(SERVER_PORT).
             serializer(serializer).
             create();
         Client client = cluster.connect();

gremlin-driver/src/main/java/examples/ModernTraversals.java

@@ -19,11 +19,11 @@ Licensed to the Apache Software Foundation (ASF) under one
 
 package examples;
 
+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.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Graph;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
 
 import java.util.List;
 
@@ -33,10 +33,13 @@ Licensed to the Apache Software Foundation (ASF) under one
 import static org.apache.tinkerpop.gremlin.structure.T.id;
 
 public class ModernTraversals {
-    public static void main(String[] args) {
-        // Performs basic traversals on the Modern toy graph which can be created using TinkerFactory
-        Graph modern = TinkerFactory.createModern();
-        GraphTraversalSource g = traversal().withEmbedded(modern);
+    static final String SERVER_HOST = System.getenv().getOrDefault("GREMLIN_SERVER_HOST", "localhost");
+    static final int SERVER_PORT = Integer.parseInt(System.getenv().getOrDefault("GREMLIN_SERVER_PORT", "8182"));
+
+    public static void main(String[] args) throws Exception {
+        // Performs basic traversals on the Modern toy graph loaded on the server
+        Cluster cluster = Cluster.build(SERVER_HOST).port(SERVER_PORT).create();
+        GraphTraversalSource g = traversal().withRemote(DriverRemoteConnection.using(cluster, "g"));
 
         List<Edge> e1 = g.V(1).bothE().toList(); // (1)
         List<Edge> e2 = g.V(1).bothE().where(otherV().hasId(2)).toList(); // (2)
@@ -54,6 +57,10 @@ public static void main(String[] args) {
         System.out.println("5: " + e5.toString());
         System.out.println("6: " + e6.toString());
 
+        // Cleanup
+        cluster.close();
+        g.close();
+
         /*
         1. There are three edges from the vertex with the identifier of "1".
         2. Filter those three edges using the where()-step using the identifier of the vertex returned by otherV() to
@@ -69,3 +76,5 @@ steps of outE() and inV() since the schema allows it.
         */
     }
 }
+
+

gremlin-examples/gremlin-dotnet/BasicGremlin/BasicGremlin.cs

@@ -23,28 +23,32 @@ under the License.
 
 public class BasicGremlinExample
 {
+    static readonly string ServerHost = "localhost";
+    static readonly int ServerPort = 8182;
+    static readonly string VertexLabel = "person";
+
     static async Task Main()
     {
-        var server = new GremlinServer("localhost", 8182);
+        var server = new GremlinServer(ServerHost, ServerPort);
         using var remoteConnection = new DriverRemoteConnection(new GremlinClient(server), "g");
         var g = Traversal().WithRemote(remoteConnection);
 
         // Basic Gremlin: adding and retrieving data
-        var v1 = g.AddV("person").Property("name", "marko").Next();
-        var v2 = g.AddV("person").Property("name", "stephen").Next();
-        var v3 = g.AddV("person").Property("name", "vadas").Next();
+        var v1 = g.AddV(VertexLabel).Property("name", "marko").Next();
+        var v2 = g.AddV(VertexLabel).Property("name", "stephen").Next();
+        var v3 = g.AddV(VertexLabel).Property("name", "vadas").Next();
 
         // Be sure to use a terminating step like Next() or Iterate() so that the traversal "executes"
         // Iterate() does not return any data and is used to just generate side-effects (i.e. write data to the database)
         g.V(v1).AddE("knows").To(v2).Property("weight", 0.75).Iterate();
         g.V(v1).AddE("knows").To(v3).Property("weight", 0.75).Iterate();
 
         // Retrieve the data from the "marko" vertex
-        var marko = await g.V().Has("person", "name", "marko").Values<string>("name").Promise(t => t.Next());
+        var marko = await g.V().Has(VertexLabel, "name", "marko").Values<string>("name").Promise(t => t.Next());
         Console.WriteLine("name: " + marko);
 
         // Find the "marko" vertex and then traverse to the people he "knows" and return their data
-        var peopleMarkoKnows = await g.V().Has("person", "name", "marko").Out("knows").Values<string>("name").Promise(t => t.ToList());
+        var peopleMarkoKnows = await g.V().Has(VertexLabel, "name", "marko").Out("knows").Values<string>("name").Promise(t => t.ToList());
         foreach (var person in peopleMarkoKnows)
         {
             Console.WriteLine("marko knows " + person);