improve consistency between root-level and glv-level examples

Author: kirill-stepanishin

glv-examples/gremlin-go/basic_gremlin.go

@@ -25,8 +25,11 @@ import (
 	"github.com/apache/tinkerpop/gremlin-go/v3/driver"
 )
 
+var serverURL = "ws://localhost:8182/gremlin"
+var vertexLabel = "person"
+
 func main() {
-	driverRemoteConnection, err := gremlingo.NewDriverRemoteConnection("ws://localhost:8182/gremlin")
+	driverRemoteConnection, err := gremlingo.NewDriverRemoteConnection(serverURL)
 	if err != nil {
 		fmt.Println(err)
 		return
@@ -35,9 +38,9 @@ func main() {
 	g := gremlingo.Traversal_().WithRemote(driverRemoteConnection)
 
 	// Basic Gremlin: adding and retrieving data
-	v1, err := g.AddV("person").Property("name", "marko").Next()
-	v2, err := g.AddV("person").Property("name", "stephen").Next()
-	v3, err := g.AddV("person").Property("name", "vadas").Next()
+	v1, err := g.AddV(vertexLabel).Property("name", "marko").Next()
+	v2, err := g.AddV(vertexLabel).Property("name", "stephen").Next()
+	v3, err := g.AddV(vertexLabel).Property("name", "vadas").Next()
 	v1Vertex, err := v1.GetVertex()
 	v2Vertex, err := v2.GetVertex()
 	v3Vertex, err := v3.GetVertex()
@@ -58,11 +61,11 @@ func main() {
 	}
 
 	// Retrieve the data from the "marko" vertex
-	marko, err := g.V().Has("person", "name", "marko").Values("name").Next()
+	marko, err := g.V().Has(vertexLabel, "name", "marko").Values("name").Next()
 	fmt.Println("name:", marko.GetString())
 
 	// Find the "marko" vertex and then traverse to the people he "knows" and return their data
-	peopleMarkoKnows, err := g.V().Has("person", "name", "marko").Out("knows").Values("name").ToList()
+	peopleMarkoKnows, err := g.V().Has(vertexLabel, "name", "marko").Out("knows").Values("name").ToList()
 	for _, person := range peopleMarkoKnows {
 		fmt.Println("marko knows", person.GetString())
 	}

glv-examples/gremlin-go/connections.go

@@ -25,14 +25,17 @@ import (
 	"github.com/apache/tinkerpop/gremlin-go/v3/driver"
 )
 
+var serverURL = "ws://localhost:8182/gremlin"
+var vertexLabel = "connection"
+
 func main() {
 	withRemote()
 	withConfigs()
 }
 
 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(serverURL)
 
 	// Error handling
 	if err != nil {
@@ -43,22 +46,18 @@ func withRemote() {
 	// Cleanup
 	defer driverRemoteConnection.Close()
 
-    // Creating the graph traversal
+	// Creating the graph traversal
 	g := gremlingo.Traversal_().WithRemote(driverRemoteConnection)
 
-    // Drop existing vertices
-    prom := g.V().Drop().Iterate()
-    <-prom
-
-    // Simple query to verify connection
-    g.AddV("connection").Iterate()
-    count, _ := g.V().HasLabel("connection").Count().Next()
-    fmt.Println("Vertex count:", *count)
+	// Simple query to verify connection
+	g.AddV(vertexLabel).Iterate()
+	count, _ := g.V().HasLabel(vertexLabel).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(serverURL,
 		func(settings *gremlingo.DriverRemoteConnectionSettings) {
 			settings.TraversalSource = "g"
 			settings.NewConnectionThreshold = 4
@@ -75,7 +74,7 @@ func withConfigs() {
 	defer driverRemoteConnection.Close()
 	g := gremlingo.Traversal_().WithRemote(driverRemoteConnection)
 
-    g.AddV("connection").Iterate()
-    count, _ := g.V().HasLabel("connection").Count().Next()
-    fmt.Println("Vertex count:", *count)
-}
+	g.AddV(vertexLabel).Iterate()
+	count, _ := g.V().HasLabel(vertexLabel).Count().Next()
+	fmt.Println("Vertex count:", *count)
+}

glv-examples/gremlin-go/modern_traversals.go

@@ -28,9 +28,10 @@ import (
 var __ = gremlingo.T__
 var T = gremlingo.T
 var P = gremlingo.P
+var serverURL = "ws://localhost:8182/gremlin"
 
 func main() {
-	driverRemoteConnection, err := gremlingo.NewDriverRemoteConnection("ws://localhost:8182/gremlin")
+	driverRemoteConnection, err := gremlingo.NewDriverRemoteConnection(serverURL)
 	if err != nil {
 		fmt.Println(err)
 		return

gremlin-go/examples/basic_gremlin.go

@@ -26,17 +26,17 @@ import (
 	"github.com/apache/tinkerpop/gremlin-go/v3/driver"
 )
 
-func getEnvOrDefaultString(key string, defaultValue string) string {
-	value := os.Getenv(key)
-	if len(value) != 0 {
+var serverURL = getEnv("GREMLIN_SERVER_URL", "ws://localhost:8182/gremlin")
+var vertexLabel = getEnv("VERTEX_LABEL", "person")
+
+func getEnv(key, defaultValue string) string {
+	if value := os.Getenv(key); value != "" {
 		return value
 	}
 	return defaultValue
 }
 
 func main() {
-	serverURL := getEnvOrDefaultString("GREMLIN_SERVER_URL", "ws://localhost:8182/gremlin")
-	vertexLabel := getEnvOrDefaultString("VERTEX_LABEL", "person")
 	driverRemoteConnection, err := gremlingo.NewDriverRemoteConnection(serverURL)
 	if err != nil {
 		fmt.Println(err)

gremlin-go/examples/connections.go

@@ -26,9 +26,11 @@ import (
 	"github.com/apache/tinkerpop/gremlin-go/v3/driver"
 )
 
-func getEnvOrDefaultString(key string, defaultValue string) string {
-	value := os.Getenv(key)
-	if len(value) != 0 {
+var serverURL = getEnv("GREMLIN_SERVER_URL", "ws://localhost:8182/gremlin")
+var vertexLabel = getEnv("VERTEX_LABEL", "connection")
+
+func getEnv(key, defaultValue string) string {
+	if value := os.Getenv(key); value != "" {
 		return value
 	}
 	return defaultValue
@@ -40,9 +42,6 @@ func main() {
 }
 
 func withRemote() {
-	serverURL := getEnvOrDefaultString("GREMLIN_SERVER_URL", "ws://localhost:8182/gremlin")
-	vertexLabel := getEnvOrDefaultString("VERTEX_LABEL", "connection")
-
 	// Creating the connection to the server
 	driverRemoteConnection, err := gremlingo.NewDriverRemoteConnection(serverURL)
 
@@ -60,17 +59,11 @@ func withRemote() {
 
 	// Simple query to verify connection
 	g.AddV(vertexLabel).Iterate()
-	count, _ := g.V().Count().Next()
+	count, _ := g.V().HasLabel(vertexLabel).Count().Next()
 	fmt.Println("Vertex count:", *count)
-
-	// clean added data
-	g.V().HasLabel(vertexLabel).Drop().Iterate()
 }
 
 func withConfigs() {
-	serverURL := getEnvOrDefaultString("GREMLIN_SERVER_URL", "ws://localhost:8182/gremlin")
-	vertexLabel := getEnvOrDefaultString("VERTEX_LABEL", "connection")
-
 	// Connecting to the server with customized configurations
 	driverRemoteConnection, err := gremlingo.NewDriverRemoteConnection(serverURL,
 		func(settings *gremlingo.DriverRemoteConnectionSettings) {
@@ -90,6 +83,6 @@ func withConfigs() {
 	g := gremlingo.Traversal_().WithRemote(driverRemoteConnection)
 
 	g.AddV(vertexLabel).Iterate()
-	count, _ := g.V().Count().Next()
+	count, _ := g.V().HasLabel(vertexLabel).Count().Next()
 	fmt.Println("Vertex count:", *count)
 }

gremlin-go/examples/modern_traversals.go

@@ -29,17 +29,16 @@ import (
 var __ = gremlingo.T__
 var T = gremlingo.T
 var P = gremlingo.P
+var serverURL = getEnv("GREMLIN_SERVER_URL", "ws://localhost:8182/gremlin")
 
-func getEnvOrDefaultString(key string, defaultValue string) string {
-	value := os.Getenv(key)
-	if len(value) != 0 {
+func getEnv(key, defaultValue string) string {
+	if value := os.Getenv(key); value != "" {
 		return value
 	}
 	return defaultValue
 }
 
 func main() {
-	serverURL := getEnvOrDefaultString("GREMLIN_SERVER_URL", "ws://localhost:8182/gremlin")
 	driverRemoteConnection, err := gremlingo.NewDriverRemoteConnection(serverURL)
 	if err != nil {
 		fmt.Println(err)