Cleanup code around getRoutingTable invocation

 * Use new query parameter syntax `$param` instead of deprecated `{param}`
 * Do not use ES6 dynamic object key syntax

Author: lutovich

src/v1/internal/routing-util.js

@@ -22,8 +22,7 @@ import Integer, {int} from '../integer';
 import {ServerVersion, VERSION_3_2_0} from './server-version';
 
 const CALL_GET_SERVERS = 'CALL dbms.cluster.routing.getServers';
-const GET_ROUTING_TABLE_PARAM = 'context';
-const CALL_GET_ROUTING_TABLE = 'CALL dbms.cluster.routing.getRoutingTable({' + GET_ROUTING_TABLE_PARAM + '})';
+const CALL_GET_ROUTING_TABLE = 'CALL dbms.cluster.routing.getRoutingTable($context)';
 const PROCEDURE_NOT_FOUND_CODE = 'Neo.ClientError.Procedure.ProcedureNotFound';
 const UNAUTHORIZED_CODE = 'Neo.ClientError.Security.Unauthorized';
 
@@ -122,7 +121,7 @@ export default class RoutingUtil {
 
       if (serverVersion.compareTo(VERSION_3_2_0) >= 0) {
         query = CALL_GET_ROUTING_TABLE;
-        params = {[GET_ROUTING_TABLE_PARAM]: this._routingContext};
+        params = {context: this._routingContext};
       } else {
         query = CALL_GET_SERVERS;
         params = {};

test/internal/routing-util.test.js

@@ -100,7 +100,7 @@ describe('RoutingUtil', () => {
     const session = FakeSession.withFakeConnection(connection);
 
     callRoutingProcedure(session, {}).then(() => {
-      expect(connection.seenStatements).toEqual(['CALL dbms.cluster.routing.getRoutingTable({context})']);
+      expect(connection.seenStatements).toEqual(['CALL dbms.cluster.routing.getRoutingTable($context)']);
       expect(connection.seenParameters).toEqual([{context: {}}]);
       done();
     });
@@ -111,7 +111,7 @@ describe('RoutingUtil', () => {
     const session = FakeSession.withFakeConnection(connection);
 
     callRoutingProcedure(session, {key1: 'value1', key2: 'value2'}).then(() => {
-      expect(connection.seenStatements).toEqual(['CALL dbms.cluster.routing.getRoutingTable({context})']);
+      expect(connection.seenStatements).toEqual(['CALL dbms.cluster.routing.getRoutingTable($context)']);
       expect(connection.seenParameters).toEqual([{context: {key1: 'value1', key2: 'value2'}}]);
       done();
     });
@@ -122,7 +122,7 @@ describe('RoutingUtil', () => {
     const session = FakeSession.withFakeConnection(connection);
 
     callRoutingProcedure(session, {}).then(() => {
-      expect(connection.seenStatements).toEqual(['CALL dbms.cluster.routing.getRoutingTable({context})']);
+      expect(connection.seenStatements).toEqual(['CALL dbms.cluster.routing.getRoutingTable($context)']);
       expect(connection.seenParameters).toEqual([{context: {}}]);
       done();
     });
@@ -133,7 +133,7 @@ describe('RoutingUtil', () => {
     const session = FakeSession.withFakeConnection(connection);
 
     callRoutingProcedure(session, {key1: 'foo', key2: 'bar'}).then(() => {
-      expect(connection.seenStatements).toEqual(['CALL dbms.cluster.routing.getRoutingTable({context})']);
+      expect(connection.seenStatements).toEqual(['CALL dbms.cluster.routing.getRoutingTable($context)']);
       expect(connection.seenParameters).toEqual([{context: {key1: 'foo', key2: 'bar'}}]);
       done();
     });

test/resources/boltstub/get_routing_table.script

@@ -3,7 +3,7 @@
 !: AUTO PULL_ALL
 
 S: SUCCESS {"server": "Neo4j/3.2.2"}
-C: RUN "CALL dbms.cluster.routing.getRoutingTable({context})" {"context": {}}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}}
    PULL_ALL
 S: SUCCESS {"fields": ["ttl", "servers"]}
    RECORD [9223372036854775807, [{"addresses": ["127.0.0.1:9001", "127.0.0.1:9002"],"role": "WRITE"}, {"addresses": ["127.0.0.1:9001", "127.0.0.1:9002"], "role": "READ"},{"addresses": ["127.0.0.1:9001", "127.0.0.1:9002"], "role": "ROUTE"}]]

test/resources/boltstub/get_routing_table_with_context.script

@@ -3,7 +3,7 @@
 !: AUTO PULL_ALL
 
 S: SUCCESS {"server": "Neo4j/3.2.3"}
-C: RUN "CALL dbms.cluster.routing.getRoutingTable({context})" {"context": {"policy": "my_policy", "region": "china"}}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {"policy": "my_policy", "region": "china"}}
    PULL_ALL
 S: SUCCESS {"fields": ["ttl", "servers"]}
    RECORD [9223372036854775807, [{"addresses": ["127.0.0.1:9001", "127.0.0.1:9002"],"role": "WRITE"}, {"addresses": ["127.0.0.1:9001", "127.0.0.1:9002"], "role": "READ"},{"addresses": ["127.0.0.1:9001", "127.0.0.1:9002"], "role": "ROUTE"}]]