Merge pull request #451 from zhenlineo/2.0-routing-scheme

Changed `bolt+routing` scheme to `neo4j`

Author: ali-ince

README.md

@@ -148,7 +148,7 @@ neo4j.driver('bolt://localhost', neo4j.auth.basic('neo4j', 'neo4j'), {
 
 // It is possible to execute read transactions that will benefit from automatic
 // retries on both single instance ('bolt' URI scheme) and Causal Cluster
-// ('bolt+routing' URI scheme) and will get automatic load balancing in cluster deployments
+// ('neo4j' URI scheme) and will get automatic load balancing in cluster deployments
 var readTxResultPromise = session.readTransaction(function(transaction) {
   // used transaction will be committed automatically, no need for explicit commit/rollback
 
@@ -171,7 +171,7 @@ readTxResultPromise
   })
 
 // It is possible to execute write transactions that will benefit from automatic retries
-// on both single instance ('bolt' URI scheme) and Causal Cluster ('bolt+routing' URI scheme)
+// on both single instance ('bolt' URI scheme) and Causal Cluster ('neo4j' URI scheme)
 var writeTxResultPromise = session.writeTransaction(function(transaction) {
   // used transaction will be committed automatically, no need for explicit commit/rollback
 

src/index.js

@@ -239,7 +239,7 @@ const logging = {
 function driver (url, authToken, config = {}) {
   assertString(url, 'Bolt URL')
   const parsedUrl = urlUtil.parseDatabaseUrl(url)
-  if (parsedUrl.scheme === 'bolt+routing') {
+  if (parsedUrl.scheme === 'neo4j') {
     return new RoutingDriver(
       parsedUrl.hostAndPort,
       parsedUrl.query,

src/internal/url-util.js

@@ -28,7 +28,7 @@ class Url {
   constructor (scheme, host, port, hostAndPort, query) {
     /**
      * Nullable scheme (protocol) of the URL.
-     * Example: 'bolt', 'bolt+routing', 'http', 'https', etc.
+     * Example: 'bolt', 'neo4j', 'http', 'https', etc.
      * @type {string}
      */
     this.scheme = scheme

test/bolt-v4.test.js

@@ -161,6 +161,30 @@ describe('Bolt V4 API', () => {
           })
           .finally(() => neoSession.close())
       })
+
+      it('should be able to connect single instance using neo4j scheme', done => {
+        if (!databaseSupportsBoltV4()) {
+          done()
+          return
+        }
+
+        const neoDriver = neo4j.driver('neo4j://localhost', sharedNeo4j.authToken)
+        const neoSession = driver.session({ db: 'neo4j' })
+
+        neoSession
+          .run('CREATE (n { db: $db }) RETURN n.db', { db: 'neo4j' })
+          .then(result => {
+            expect(result.records.length).toBe(1)
+            expect(result.records[0].get('n.db')).toBe('neo4j')
+            done()
+          })
+          .catch(error => {
+            done.fail(error)
+          })
+          .finally(() => neoSession.close())
+
+        neoDriver.close()
+      })
     })
   })
 

test/driver.test.js

@@ -231,7 +231,7 @@ describe('driver', () => {
     }
 
     // Given
-    driver = neo4j.driver('bolt+routing://localhost', sharedNeo4j.authToken)
+    driver = neo4j.driver('neo4j://localhost', sharedNeo4j.authToken)
 
     // Expect
     driver.onError = error => {
@@ -251,7 +251,7 @@ describe('driver', () => {
     expect(directDriver._userAgent).toBe('neo4j-javascript/0.0.0-dev')
     directDriver.close()
 
-    const routingDriver = neo4j.driver('bolt+routing://localhost')
+    const routingDriver = neo4j.driver('neo4j://localhost')
     expect(routingDriver._userAgent).toBe('neo4j-javascript/0.0.0-dev')
     routingDriver.close()
   })

test/examples.test.js

@@ -188,7 +188,7 @@ describe('examples', () => {
     }
 
     function addPerson (name) {
-      const driver = createDriver('bolt+routing://x.acme.com', user, password, [
+      const driver = createDriver('neo4j://x.acme.com', user, password, [
         'a.acme.com:7575',
         'b.acme.com:7676',
         'c.acme.com:8787'