Skip to content

Commit 5f52ccd

Browse files
pontusmelkepontusmelke
committed
Refactor: moved constants and codes to namespaces
1 parent 2277afb commit 5f52ccd

File tree

4 files changed

+41
-35
lines changed

4 files changed

+41
-35
lines changed

‎src/v1/index.js

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -130,17 +130,24 @@ const types ={
130130
Record
131131
};
132132

133+
const session = {
134+
READ,
135+
WRITE
136+
};
137+
const error = {
138+
SERVICE_UNAVAILABLE,
139+
SESSION_EXPIRED
140+
};
141+
133142
const forExport = {
134143
driver,
135144
int,
136145
isInt,
137146
Neo4jError,
138147
auth,
139148
types,
140-
READ,
141-
WRITE,
142-
SERVICE_UNAVAILABLE,
143-
SESSION_EXPIRED
149+
session,
150+
error
144151
};
145152

146153
export {
@@ -150,9 +157,7 @@ export {
150157
Neo4jError,
151158
auth,
152159
types,
153-
READ,
154-
WRITE,
155-
SERVICE_UNAVAILABLE,
156-
SESSION_EXPIRED
160+
session,
161+
error
157162
}
158163
export default forExport

‎src/v1/internal/stream-observer.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,16 @@ import Record from "../record";
3232
class StreamObserver {
3333
/**
3434
* @constructor
35-
* @param errorCallback optional callback to be used for adding additional logic on error
35+
* @param errorTransformer optional callback to be used for adding additional logic on error
3636
*/
37-
constructor(errorCallback = (err) => {return err}) {
37+
constructor(errorTransformer = (err) => {return err}) {
3838
this._fieldKeys = null;
3939
this._fieldLookup = null;
4040
this._queuedRecords = [];
4141
this._tail = null;
4242
this._error = null;
4343
this._hasFailed = false;
44-
this._errorCallback = errorCallback;
44+
this._errorTransformer = errorTransformer;
4545
}
4646

4747
/**
@@ -94,7 +94,7 @@ class StreamObserver {
9494
* @param {Object} error - An error object
9595
*/
9696
onError(error) {
97-
let transformedError = this._errorCallback(error, this._conn);
97+
let transformedError = this._errorTransformer(error, this._conn);
9898
if(this._hasFailed) {
9999
return;
100100
}

‎src/v1/transaction.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ class Transaction {
2929
* @constructor
3030
* @param {Promise} connectionPromise - A connection to use
3131
* @param {function()} onClose - Function to be called when transaction is committed or rolled back.
32+
* @param errorTransformer callback use to transform error
3233
*/
3334
constructor(connectionPromise, onClose, errorTransformer) {
3435
this._connectionPromise = connectionPromise;

‎test/v1/routing.driver.test.js

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
var neo4j = require("../../lib/v1");
2121
var boltkit = require('./boltkit');
22-
describe('routing driver ', function() {
22+
fdescribe('routing driver ', function() {
2323

2424
it('should discover server', function (done) {
2525
if (!boltkit.BoltKitSupport) {
@@ -95,7 +95,7 @@ describe('routing driver ', function() {
9595
// When
9696
var session = driver.session(neo4j.READ);
9797
session.run("MATCH (n) RETURN n.name").catch(function (err) {
98-
expect(err.code).toEqual(neo4j.SERVICE_UNAVAILABLE);
98+
expect(err.code).toEqual(neo4j.error.SERVICE_UNAVAILABLE);
9999
driver.close();
100100
server.exit(function (code) {
101101
expect(code).toEqual(0);
@@ -118,7 +118,7 @@ describe('routing driver ', function() {
118118
kit.run(function () {
119119
var driver = neo4j.driver("bolt+routing://127.0.0.1:9001", neo4j.auth.basic("neo4j", "neo4j"));
120120
// When
121-
var session = driver.session(neo4j.READ);
121+
var session = driver.session(neo4j.session.READ);
122122
session.run("MATCH (n) RETURN n.name").then(function(res) {
123123

124124
session.close();
@@ -155,14 +155,14 @@ describe('routing driver ', function() {
155155
kit.run(function () {
156156
var driver = neo4j.driver("bolt+routing://127.0.0.1:9001", neo4j.auth.basic("neo4j", "neo4j"));
157157
// When
158-
var session = driver.session(neo4j.READ);
158+
var session = driver.session(neo4j.session.READ);
159159
session.run("MATCH (n) RETURN n.name").then(function (res) {
160160
// Then
161161
expect(res.records[0].get('n.name')).toEqual('Bob');
162162
expect(res.records[1].get('n.name')).toEqual('Alice');
163163
expect(res.records[2].get('n.name')).toEqual('Tina');
164164
session.close();
165-
session = driver.session(neo4j.READ);
165+
session = driver.session(neo4j.session.READ);
166166
session.run("MATCH (n) RETURN n.name").then(function (res) {
167167
// Then
168168
expect(res.records[0].get('n.name')).toEqual('Bob');
@@ -199,9 +199,9 @@ describe('routing driver ', function() {
199199
kit.run(function () {
200200
var driver = neo4j.driver("bolt+routing://127.0.0.1:9001", neo4j.auth.basic("neo4j", "neo4j"));
201201
// When
202-
var session = driver.session(neo4j.READ);
202+
var session = driver.session(neo4j.session.READ);
203203
session.run("MATCH (n) RETURN n.name").catch(function (err) {
204-
expect(err.code).toEqual(neo4j.SESSION_EXPIRED);
204+
expect(err.code).toEqual(neo4j.error.SESSION_EXPIRED);
205205
driver.close();
206206
seedServer.exit(function (code1) {
207207
readServer.exit(function (code2) {
@@ -227,7 +227,7 @@ describe('routing driver ', function() {
227227
kit.run(function () {
228228
var driver = neo4j.driver("bolt+routing://127.0.0.1:9001", neo4j.auth.basic("neo4j", "neo4j"));
229229
// When
230-
var session = driver.session(neo4j.WRITE);
230+
var session = driver.session(neo4j.session.WRITE);
231231
session.run("CREATE (n {name:'Bob'})").then(function() {
232232

233233
// Then
@@ -257,9 +257,9 @@ describe('routing driver ', function() {
257257
kit.run(function () {
258258
var driver = neo4j.driver("bolt+routing://127.0.0.1:9001", neo4j.auth.basic("neo4j", "neo4j"));
259259
// When
260-
var session = driver.session(neo4j.WRITE);
260+
var session = driver.session(neo4j.session.WRITE);
261261
session.run("CREATE (n {name:'Bob'})").then(function () {
262-
session = driver.session(neo4j.WRITE);
262+
session = driver.session(neo4j.session.WRITE);
263263
session.run("CREATE (n {name:'Bob'})").then(function () {
264264
// Then
265265
driver.close();
@@ -291,9 +291,9 @@ describe('routing driver ', function() {
291291
kit.run(function () {
292292
var driver = neo4j.driver("bolt+routing://127.0.0.1:9001", neo4j.auth.basic("neo4j", "neo4j"));
293293
// When
294-
var session = driver.session(neo4j.WRITE);
294+
var session = driver.session(neo4j.session.WRITE);
295295
session.run("MATCH (n) RETURN n.name").catch(function (err) {
296-
expect(err.code).toEqual(neo4j.SESSION_EXPIRED);
296+
expect(err.code).toEqual(neo4j.error.SESSION_EXPIRED);
297297
driver.close();
298298
seedServer.exit(function (code1) {
299299
readServer.exit(function (code2) {
@@ -319,7 +319,7 @@ describe('routing driver ', function() {
319319
kit.run(function () {
320320
var driver = neo4j.driver("bolt+routing://127.0.0.1:9001", neo4j.auth.basic("neo4j", "neo4j"));
321321
// When
322-
var session = driver.session(neo4j.READ);
322+
var session = driver.session(neo4j.session.READ);
323323
session.run("MATCH (n) RETURN n.name").then(function() {
324324

325325
// Then
@@ -351,7 +351,7 @@ describe('routing driver ', function() {
351351
kit.run(function () {
352352
var driver = neo4j.driver("bolt+routing://127.0.0.1:9001", neo4j.auth.basic("neo4j", "neo4j"));
353353
// When
354-
var session = driver.session(neo4j.READ);
354+
var session = driver.session(neo4j.session.READ);
355355
session.run("MATCH (n) RETURN n.name").catch(function() {
356356
session.close();
357357
// Then
@@ -384,7 +384,7 @@ describe('routing driver ', function() {
384384
kit.run(function () {
385385
var driver = neo4j.driver("bolt+routing://127.0.0.1:9001", neo4j.auth.basic("neo4j", "neo4j"));
386386
// When
387-
var session = driver.session(neo4j.READ);
387+
var session = driver.session(neo4j.session.READ);
388388
session.run("MATCH (n) RETURN n.name").catch(function(err) {
389389
session.close();
390390
// Then
@@ -415,9 +415,9 @@ describe('routing driver ', function() {
415415
kit.run(function () {
416416
var driver = neo4j.driver("bolt+routing://127.0.0.1:9001", neo4j.auth.basic("neo4j", "neo4j"));
417417
// When
418-
var session = driver.session(neo4j.READ);
418+
var session = driver.session(neo4j.session.READ);
419419
session.run("MATCH (n) RETURN n.name").catch(function (err) {
420-
session = driver.session(neo4j.READ);
420+
session = driver.session(neo4j.session.READ);
421421
session.run("MATCH (n) RETURN n.name").then(function (res) {
422422
driver.close();
423423
seedServer.exit(function (code1) {
@@ -438,15 +438,15 @@ describe('routing driver ', function() {
438438
return;
439439
}
440440
// Given
441-
var kit = new boltkit.BoltKit(true);
441+
var kit = new boltkit.BoltKit();
442442
var server = kit.start('./test/resources/boltkit/non_discovery.script', 9001);
443443

444444
kit.run(function () {
445445
var driver = neo4j.driver("bolt+routing://127.0.0.1:9001", neo4j.auth.basic("neo4j", "neo4j"));
446446
// When
447447
var session = driver.session();
448448
session.run("MATCH (n) RETURN n.name").catch(function (err) {
449-
expect(err.code).toEqual(neo4j.SERVICE_UNAVAILABLE);
449+
expect(err.code).toEqual(neo4j.error.SERVICE_UNAVAILABLE);
450450
session.close();
451451
driver.close();
452452
server.exit(function(code) {
@@ -463,7 +463,7 @@ describe('routing driver ', function() {
463463
return;
464464
}
465465
// Given
466-
var kit = new boltkit.BoltKit(true);
466+
var kit = new boltkit.BoltKit();
467467
var seedServer = kit.start('./test/resources/boltkit/acquire_endpoints.script', 9001);
468468
var readServer = kit.start('./test/resources/boltkit/not_able_to_write.script', 9007);
469469

@@ -474,7 +474,7 @@ describe('routing driver ', function() {
474474
session.run("CREATE ()").catch(function (err) {
475475
//the server at 9007 should have been removed
476476
expect(driver._clusterView.writers.toArray()).toEqual([ '127.0.0.1:9008']);
477-
expect(err.code).toEqual(neo4j.SESSION_EXPIRED);
477+
expect(err.code).toEqual(neo4j.error.SESSION_EXPIRED);
478478
session.close();
479479
driver.close();
480480
seedServer.exit(function (code1) {
@@ -494,7 +494,7 @@ describe('routing driver ', function() {
494494
return;
495495
}
496496
// Given
497-
var kit = new boltkit.BoltKit(true);
497+
var kit = new boltkit.BoltKit();
498498
var seedServer = kit.start('./test/resources/boltkit/acquire_endpoints.script', 9001);
499499
var readServer = kit.start('./test/resources/boltkit/not_able_to_write_in_transaction.script', 9007);
500500

@@ -508,7 +508,7 @@ describe('routing driver ', function() {
508508
tx.commit().catch(function (err) {
509509
//the server at 9007 should have been removed
510510
expect(driver._clusterView.writers.toArray()).toEqual([ '127.0.0.1:9008']);
511-
expect(err.code).toEqual(neo4j.SESSION_EXPIRED);
511+
expect(err.code).toEqual(neo4j.error.SESSION_EXPIRED);
512512
session.close();
513513
driver.close();
514514
seedServer.exit(function (code1) {

0 commit comments

Comments
 (0)