Merge pull request #460 from ali-ince/1.7-add-neo4j-scheme

Add neo4j scheme as a direct alias for bolt+routing

Author: ali-ince

src/v1/index.js

@@ -227,7 +227,7 @@ const logging = {
 function driver(url, authToken, config = {}) {
   assertString(url, 'Bolt URL');
   const parsedUrl = urlUtil.parseDatabaseUrl(url);
-  if (parsedUrl.scheme === 'bolt+routing') {
+  if (['bolt+routing', 'neo4j'].indexOf(parsedUrl.scheme) !== -1) {
     return new RoutingDriver(ServerAddress.fromUrl(parsedUrl.hostAndPort), parsedUrl.query, USER_AGENT, authToken, config);
   } else if (parsedUrl.scheme === 'bolt') {
     if (!isEmptyObjectOrNull(parsedUrl.query)) {

test/internal/node/routing.driver.boltkit.test.js

@@ -39,36 +39,14 @@ describe('routing driver with stub server', () => {
     jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
   });
 
-  it('should discover servers', done => {
-    if (!boltStub.supported) {
-      done();
-      return;
-    }
-    // Given
-    const server = boltStub.start('./test/resources/boltstub/discover_servers_and_read.script', 9001);
-
-    boltStub.run(() => {
-      const driver = boltStub.newDriver('bolt+routing://127.0.0.1:9001');
-      // When
-      const session = driver.session();
-      session.run("MATCH (n) RETURN n.name").then(() => {
-
-        session.close();
-        // Then
-        expect(hasAddressInConnectionPool(driver, '127.0.0.1:9001')).toBeTruthy();
-        assertHasRouters(driver, ["127.0.0.1:9001", "127.0.0.1:9002", "127.0.0.1:9003"]);
-        assertHasReaders(driver, ["127.0.0.1:9002", "127.0.0.1:9003"]);
-        assertHasWriters(driver, ["127.0.0.1:9001"]);
-
-        driver.close();
-        server.exit(code => {
-          expect(code).toEqual(0);
-          done();
-        });
-      });
-    });
+  it('should discover servers with bolt+routing scheme', done => {
+    testDiscovery('bolt+routing', done)
   });
 
+  it('should discover servers with neo4j scheme', done => {
+    testDiscovery('neo4j', done)
+  })
+
   it('should discover IPv6 servers', done => {
     if (!boltStub.supported) {
       done();
@@ -2168,6 +2146,36 @@ describe('routing driver with stub server', () => {
     });
   });
 
+  function testDiscovery(scheme, done) {
+    if (!boltStub.supported) {
+      done()
+      return
+    }
+    // Given
+    const server = boltStub.start('./test/resources/boltstub/discover_servers_and_read.script', 9001)
+
+    boltStub.run(() => {
+      const driver = boltStub.newDriver(`${scheme}://127.0.0.1:9001`)
+      // When
+      const session = driver.session()
+      session.run('MATCH (n) RETURN n.name').then(() => {
+
+        session.close()
+        // Then
+        expect(hasAddressInConnectionPool(driver, '127.0.0.1:9001')).toBeTruthy()
+        assertHasRouters(driver, ['127.0.0.1:9001', '127.0.0.1:9002', '127.0.0.1:9003'])
+        assertHasReaders(driver, ['127.0.0.1:9002', '127.0.0.1:9003'])
+        assertHasWriters(driver, ['127.0.0.1:9001'])
+
+        driver.close()
+        server.exit(code => {
+          expect(code).toEqual(0)
+          done()
+        })
+      })
+    })
+  }
+
   function testAddressPurgeOnDatabaseError(query, accessMode, done) {
     if (!boltStub.supported) {
       done();

test/internal/url-util.test.js

@@ -724,7 +724,7 @@ describe('url-util', () => {
   });
 
   it('should parse URLs with port 80', () => {
-    ['http', 'https', 'ws', 'wss', 'bolt', 'bolt+routing'].forEach(scheme => {
+    ['http', 'https', 'ws', 'wss', 'bolt', 'bolt+routing', 'neo4j'].forEach(scheme => {
       verifyUrl(`${scheme}://localhost:80`, {
         scheme: scheme,
         host: 'localhost',

test/v1/stress.test.js

@@ -299,7 +299,7 @@ describe('stress tests', () => {
   }
 
   function verifyServers(context) {
-    const routing = DATABASE_URI.indexOf('bolt+routing') === 0;
+    const routing = DATABASE_URI.indexOf('bolt+routing') === 0 || DATABASE_URI.indexOf('neo4j') === 0
 
     if (routing) {
       return verifyCausalClusterMembers(context);