Changed the way the template code is handled

jexp · jexp · commit cafeca2155e0 · 2020-08-21T01:44:25.000+02:00
- have now "runnable" code as templates, so it can be tested directly
- replace the "fixed" string fragments with whatever the target repo needs
- tried to update / improve the code for Neo4j 4.x
- added run instructions for dotnet core
- simplified java run instructions
- Go code is still overly verbose
diff --git a/code/csharp/Example.cs b/code/csharp/Example.cs
@@ -1,6 +1,8 @@
-// dotnet create neo4j-test
-// dotnet add Neo4j.Driver
-// paste in this code
+// install dotnet core on your system
+// dotnet new console -o .
+// dotnet add package Neo4j.Driver
+// paste in this code into Program.cs
+// dotnet run
 
 using System;
 using System.Collections.Generic;
@@ -11,24 +13,24 @@
 namespace dotnet {
     class Example {
 	static async Task Main() {
-		var driver = GraphDatabase.Driver("<URL>", 
-						AuthTokens.Basic("<USERNAME>", "<PASSWORD>"));
+		var driver = GraphDatabase.Driver("neo4j+s://demo.neo4jlabs.com:7687", 
+						AuthTokens.Basic("mUser", "s3cr3t"));
 
 		var cypherQuery =
-				@$"
-				<QUERY>
+				@"
+				MATCH (m:Movie {title:$movieTitle})<-[:ACTED_IN]-(a:Person) RETURN a.name as actorName
 				";
 
-		var session = driver.AsyncSession();
+		var session = driver.AsyncSession(o => o.WithDatabase("movies"));
 		var result = await session.ReadTransactionAsync(async tx =>
 		{
 			var r = await tx.RunAsync(cypherQuery, 
-			                new { <PARAM-NAME>=new[] {"<PARAM-VALUE>"}});
+			                new { movieTitle="The Matrix"});
 			return await r.ToListAsync();
 		});
 		await session?.CloseAsync();
 		foreach (var row in result)
-			Console.WriteLine(row["<RESULT-COLUMN>"].As<string>());
+			Console.WriteLine(row["actorName"].As<string>());
 		}
 	}
 }
diff --git a/code/go/example.go b/code/go/example.go
@@ -1,12 +1,12 @@
-// go mode init main
+// go mod init main
 // go run example.go
 package main
 import (
 	"fmt"
 	"github.com/neo4j/neo4j-go-driver/neo4j" //Go 1.8
 )
 func main() {
-	s, err := runQuery("bolt://<HOST>:<BOLTPORT>", "<USERNAME>", "<PASSWORD>")
+	s, err := runQuery("bolt://demo.neo4jlabs.com:7687", "mUser", "s3cr3t")
 	if err != nil {
 		panic(err)
 	}
@@ -19,23 +19,25 @@ func runQuery(uri, username, password string) ([]string, error) {
 		return nil, err
 	}
 	defer driver.Close()
-	sessionConfig := neo4j.SessionConfig{AccessMode: neo4j.AccessModeRead}
+	sessionConfig := neo4j.SessionConfig{AccessMode: neo4j.AccessModeRead, DatabaseName: "movies"}
 	session, err := driver.NewSession(sessionConfig)
 	if err != nil {
 		return nil, err
 	}
 	defer session.Close()
 	results, err := session.ReadTransaction(func(transaction neo4j.Transaction) (interface{}, error) {
 		result, err := transaction.Run(
-			"<QUERY>", map[string]interface{}{
-				"<PARAM-NAME>": "<PARAM-VALUE>",
+			`
+			MATCH (m:Movie {title:$movieTitle})<-[:ACTED_IN]-(a:Person) RETURN a.name as actorName
+			`, map[string]interface{}{
+				"movieTitle": "The Matrix",
 			})
 		if err != nil {
 			return nil, err
 		}
 		arr := make([]string, 0)
 		for result.Next() {
-			value, found := result.Record().Get("<RESULT-COLUMN>")
+			value, found := result.Record().Get("actorName")
 			if found {
 			  arr = append(arr, value.(string))
 			}
diff --git a/code/java/Example.java b/code/java/Example.java
@@ -1,32 +1,29 @@
-// todo add minimal maven/gradle file
+// Add your the driver dependency to your pom.xml build.gradle etc.
 // Java Driver Dependency: http://search.maven.org/#artifactdetails|org.neo4j.driver|neo4j-java-driver|4.0.1|jar
 // Reactive Streams http://search.maven.org/#artifactdetails|org.reactivestreams|reactive-streams|1.0.3|jar
-// javac -cp neo4j-java-driver-*.jar Example.java && java -cp neo4j-java-driver-*.jar:reactive-streams-*.jar:. Example
+// download jars into current directory
+// java -cp "*" Example.java
 
 import org.neo4j.driver.*;
 import static org.neo4j.driver.Values.parameters;
 
-import static java.util.Arrays.asList;
-import static java.util.Collections.singletonMap;
-
 public class Example {
 
     public static void main(String...args) {
-        Driver driver = GraphDatabase.driver("bolt://<HOST>:<BOLTPORT>",
-                           AuthTokens.basic("<USERNAME>","<PASSWORD>"));
-        try (Session session = driver.session()) {
+        Driver driver = GraphDatabase.driver("neo4j+s://demo.neo4jlabs.com:7687",
+                           AuthTokens.basic("mUser","s3cr3t"));
+        try (Session session = driver.session(SessionConfig.forDatabase("movies"))) {
 
             String cypherQuery =
-                """
-                <QUERY>
-                """;
+                "MATCH (m:Movie {title:$movieTitle})<-[:ACTED_IN]-(a:Person) RETURN a.name as actorName";
 
-            Result result = session.readTransaction(
+            var result = session.readTransaction(
                 tx -> tx.run(cypherQuery, 
-                             parameters("<PARAM-NAME>",asList("<PARAM-VALUE>"))));
+                             parameters("movieTitle","The Matrix"))
+                        .list());
 
-            while (result.hasNext()) {
-                System.out.println(result.next().get("<RESULT-COLUMN>").asString());
+            for (Record record : result) {
+                System.out.println(record.get("actorName").asString());
             }
         }
         driver.close();
diff --git a/code/javascript/example.js b/code/javascript/example.js
@@ -1,21 +1,23 @@
 // npm install --save neo4j-driver
 // node example.js
 var neo4j = require('neo4j-driver');
-var driver = neo4j.driver('bolt://<HOST>:<BOLTPORT>', 
-                  neo4j.auth.basic('<USERNAME>', '<PASSWORD>'), 
-                  {encrypted: 'ENCRYPTION_OFF'});
+var driver = neo4j.driver('neo4j+s://demo.neo4jlabs.com:7687', 
+                  neo4j.auth.basic('mUser', 's3cr3t'), 
+                  {/* encrypted: 'ENCRYPTION_OFF' */});
 
 var query = 
-  `<QUERY>`;
+  `
+  MATCH (m:Movie {title:$movieTitle})<-[:ACTED_IN]-(a:Person) RETURN a.name as actorName
+  `;
 
-var params = {"<PARAM-NAME>": ["<PARAM-VALUE>"]};
+var params = {"movieTitle": "The Matrix"};
 
-var session = driver.session();
+var session = driver.session({database:"movies"});
 
 session.run(query, params)
   .then(function(result) {
     result.records.forEach(function(record) {
-        console.log(record.get('<RESULT-COLUMN>'));
+        console.log(record.get('actorName'));
     })
 	session.close();
     driver.close();
diff --git a/code/python/example.py b/code/python/example.py
@@ -1,22 +1,22 @@
-# pip install neo4j-driver
-# python example.py
+# pip3 install neo4j-driver
+# python3 example.py
 
 from neo4j import GraphDatabase, basic_auth
 
 driver = GraphDatabase.driver(
-  "bolt://<HOST>:<BOLTPORT>", 
-  auth=basic_auth("<USERNAME>", "<PASSWORD>"))
+  "neo4j+s://demo.neo4jlabs.com:7687", 
+  auth=basic_auth("mUser", "s3cr3t"))
 
 cypher_query = '''
-<QUERY>
+MATCH (m:Movie {title:$movieTitle})<-[:ACTED_IN]-(a:Person) RETURN a.name as actorName
 '''
 
-with driver.session() as session:
+with driver.session(database="movies") as session:
   results = session.read_transaction(
     lambda tx: tx.run(cypher_query,
-      <PARAM-NAME>=["<PARAM-VALUE>"]))
+      movieTitle="The Matrix").data())
 
   for record in results:
-    print(record['<RESULT-COLUMN>'])
+    print(record['actorName'])
 
 driver.close()
diff --git a/code/render-code.sh b/code/render-code.sh
@@ -25,12 +25,42 @@ echo "Adding language examples to $TARGET, Hit ctrl-c to abort"
 read
 
 mkdir -p $TARGET/code
+#cp -r code $TARGET
 
 Q=`/bin/echo -n "$QUERY" | tr '\n' '§'`
 
+echo $QUERY
+lines=`echo $QUERY | wc -l`
+echo Lines $lines
+echo $Q
+
+URL="neo4j+s:\/\/demo.neo4jlabs.com:7687"
+BOLTURL="bolt:\/\/<HOST>:<BOLTPORT>"
+
 for file in */?xample.*; do
     LANG=${file%%/*}
-    echo $LANG $file
+    echo "Updating $LANG $file"
     mkdir -p $TARGET/code/$LANG
-    sed -e "s/<PARAM-NAME>/$PARAMNAME/g" -e "s/<PARAM-VALUE>/$PARAMVALUE/g" -e "s/<QUERY>/$Q/g" -e "s/<RESULT-COLUMN>/$RESULTCOLUMN/g" -e $'s/§/\\\n/g' $file > $TARGET/code/$file
+    cp $file $TARGET/code/$file
+    indent=`grep 'MATCH (m:Movie' $TARGET/code/$file | cut -d'M' -f1 | cut -d'"' -f1`
+    echo "Indent #$indent#"
+    if [ $LANG == "java" ]; then
+      Q2=`/bin/echo -n "$QUERY" | sed -e "s/\(.*\)/$indent\"\1\" +/g" | tr '\n' '§' | sed -e 's/\+$/;/g'`
+    else
+      Q2=`/bin/echo -n "$QUERY" | sed -e "s/\(.*\)/$indent\1/g" | tr '\n' '§'`
+    fi
+    echo "$Q2"
+    sed -i -e "s/^.*MATCH (m:Movie.*$/$Q2/g" $TARGET/code/$file
+    mv $TARGET/code/$file $TARGET/code/$file.tmp
+    tr '§' '\n' < $TARGET/code/$file.tmp > $TARGET/code/$file
+    rm $TARGET/code/$file.tmp
+
+    sed -i -e "s/$URL/$BOLTURL/g" $TARGET/code/$file
+    sed -i -e "s/movieTitle/$PARAMNAME/g" $TARGET/code/$file
+    sed -i -e "s/The Matrix/$PARAMVALUE/g" $TARGET/code/$file
+    sed -i -e "s/actorName/$RESULTCOLUMN/g" $TARGET/code/$file
+    # database
+    sed -i -e "s/movies/neo4j/g" $TARGET/code/$file
+    sed -i -e "s/mUser/<USERNAME>/g" $TARGET/code/$file
+    sed -i -e "s/s3cr3t/<PASSWORD>/g" $TARGET/code/$file
 done
diff --git a/code/test-code.sh b/code/test-code.sh
@@ -46,22 +46,22 @@ mkdir -p $CODE
 pushd $CODE
 
 npm install --save neo4j-driver 
-sed -e "s/<BOLTPORT>/$BOLTPORT/g" -e "s/<HOST>/$HOST/g" -e "s/<USERNAME>/$USERNAME/g" -e "s/<PASSWORD>/$PASSWORD/g" $TARGET/code/javascript/example.js > example.js
+sed -e "s/<BOLTPORT>/$BOLTPORT/g" -e "s/<HOST>/$HOST/g" -e "s/mUser/$USERNAME/g" -e "s/s3cr3t/$PASSWORD/g" $TARGET/code/javascript/example.js > example.js
 node example.js | grep "$EXPECT" || echo "JAVASCRIPT FAIL"
 
 pip install neo4j-driver
-sed -e "s/<BOLTPORT>/$BOLTPORT/g" -e "s/<HOST>/$HOST/g" -e "s/<USERNAME>/$USERNAME/g" -e "s/<PASSWORD>/$PASSWORD/g" $TARGET/code/python/example.py > example.py
+sed -e "s/<BOLTPORT>/$BOLTPORT/g" -e "s/<HOST>/$HOST/g" -e "s/mUser/$USERNAME/g" -e "s/s3cr3t/$PASSWORD/g" $TARGET/code/python/example.py > example.py
 python example.py | grep "$EXPECT" || echo "PYTHON FAIL"
 
 curl -sOL https://repo1.maven.org/maven2/org/reactivestreams/reactive-streams/${RX_VERSION}/reactive-streams-${RX_VERSION}.jar
 curl -sOL https://repo1.maven.org/maven2/org/neo4j/driver/neo4j-java-driver/${JAVA_DRIVER_VERSION}/neo4j-java-driver-${JAVA_DRIVER_VERSION}.jar
 
-sed -e "s/<BOLTPORT>/$BOLTPORT/g" -e "s/<HOST>/$HOST/g" -e "s/<USERNAME>/$USERNAME/g" -e "s/<PASSWORD>/$PASSWORD/g" $TARGET/code/java/Example.java > Example.java
+sed -e "s/<BOLTPORT>/$BOLTPORT/g" -e "s/<HOST>/$HOST/g" -e "s/mUser/$USERNAME/g" -e "s/s3cr3t/$PASSWORD/g" $TARGET/code/java/Example.java > Example.java
 
 javac -cp neo4j-java-driver-${JAVA_DRIVER_VERSION}.jar Example.java
 java -cp neo4j-java-driver-${JAVA_DRIVER_VERSION}.jar:reactive-streams-${RX_VERSION}.jar:. Example  | grep "$EXPECT" || echo "JAVA FAIL"
 
-sed -e "s/<BOLTPORT>/$BOLTPORT/g" -e "s/<HOST>/$HOST/g" -e "s/<USERNAME>/$USERNAME/g" -e "s/<PASSWORD>/$PASSWORD/g" $TARGET/code/go/example.go > example.go
+sed -e "s/<BOLTPORT>/$BOLTPORT/g" -e "s/<HOST>/$HOST/g" -e "s/mUser/$USERNAME/g" -e "s/s3cr3t/$PASSWORD/g" $TARGET/code/go/example.go > example.go
 go mod init main
 go run example.go | grep "$EXPECT" || echo "GO FAIL"
 
