Skip to content

Commit 7a6485f

Browse files
committed
[VET-5931] whitespace changes
1 parent 8c049ed commit 7a6485f

32 files changed

Lines changed: 132 additions & 93 deletions

.circleci/docker-compose.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: '3'
22
services:
33
stardog1:
4-
command: ["--port", "5821", "--home", "/var/opt/stardog"]
4+
command: ['--port', '5821', '--home', '/var/opt/stardog']
55
depends_on:
66
- zoo1
77
environment:
@@ -18,7 +18,7 @@ services:
1818
- ../stardog-license-key.bin:/var/opt/stardog/stardog-license-key.bin
1919
- ./cluster.properties:/var/opt/stardog/stardog.properties
2020
stardog2:
21-
command: ["--port", "5822", "--home", "/var/opt/stardog"]
21+
command: ['--port', '5822', '--home', '/var/opt/stardog']
2222
depends_on:
2323
- zoo1
2424
environment:
@@ -71,7 +71,6 @@ services:
7171
working_dir: /app
7272
environment:
7373
- HOST=stardog1
74-
- CIRCLECI=true
7574
volumes:
7675
- ../:/app/
7776
depends_on:

.circleci/jwt.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
---
2-
confVersion: "1.0"
2+
confVersion: '1.0'
33
deploymentName: stardog-server
44
issuers:
55
http://stardog.com:
66
algorithms:
77
HS256:
8-
secret: "some-kind-of-secret-key-here"
8+
secret: 'some-kind-of-secret-key-here'
99

1010
signer:
1111
algorithm: HS256
12-
secret: "some-kind-of-secret-key-here"
12+
secret: 'some-kind-of-secret-key-here'
1313
issuer: http://stardog.com

.eslintrc.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,5 @@ module.exports = {
3131

3232
// TODO remove these:
3333
'no-unused-vars': 'off',
34-
'prefer-object-spread': 'warn',
3534
},
3635
};

.vscode/settings.json

Lines changed: 0 additions & 3 deletions
This file was deleted.

lib/Connection.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class Connection {
1010
// request creation can be overriden by providing a `createRequest` method on
1111
// `meta`, and header creation can be overriden with `createHeaders`.
1212
config(options, meta) {
13-
const config = Object.assign({}, this, options, { meta });
13+
const config = { ...this, ...options, meta };
1414

1515
// If it ends with / slice it off
1616
if (

lib/catalog.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ const addCredential = (conn, credentials, label) => {
2424
const headers = conn.headers();
2525
headers.set('Content-Type', 'application/json');
2626

27-
const body = Object.assign({}, credentials, { label });
27+
const body = { ...credentials, label };
2828

2929
return fetch(conn.request('admin', 'catalog', 'credentials'), {
3030
method: 'POST',

lib/db/index.js

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,13 @@ const reasoning = require('./reasoning');
77
const docs = require('./docs');
88
const namespaces = require('./namespaces');
99

10-
module.exports = Object.assign(
11-
{},
12-
db,
13-
{ icv },
14-
{ transaction },
15-
{ options },
16-
{ docs },
17-
{ graph },
18-
{ reasoning },
19-
{ namespaces }
20-
);
10+
module.exports = {
11+
...db,
12+
icv,
13+
transaction,
14+
options,
15+
docs,
16+
graph,
17+
reasoning,
18+
namespaces,
19+
};

lib/db/main.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@ const dispatchChange = (conn, config, content, params = {}) => {
2828
}
2929
)
3030
.then(httpBody)
31-
.then(res =>
32-
Object.assign({}, res, { transactionId: config.transactionId })
33-
);
31+
.then(res => ({ ...res, transactionId: config.transactionId }));
3432
};
3533

3634
const create = (conn, database, databaseOptions = {}, options = {}, params) => {

lib/db/namespaces.js

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const backwardsCompatGetNamespaces = (conn, database) =>
1010
const n = lodashGet(res, 'body.database.namespaces', []);
1111
const names = n.reduce((memo, keyValString) => {
1212
const [key, value] = keyValString.split('=');
13-
return Object.assign({}, memo, { [key]: value });
13+
return { ...memo, [key]: value };
1414
}, {});
1515
res.body = names;
1616
}
@@ -29,15 +29,13 @@ const get = (conn, database) => {
2929
return backwardsCompatGetNamespaces(conn, database);
3030
}
3131

32-
return httpBody(res).then(bodyRes =>
33-
Object.assign({}, bodyRes, {
32+
return httpBody(res).then(bodyRes => ({
33+
...bodyRes,
3434
body: lodashGet(bodyRes, 'body.namespaces', []).reduce(
35-
(memo, { prefix, name }) =>
36-
Object.assign({}, memo, { [prefix]: name }),
35+
(memo, { prefix, name }) => ({ ...memo, [prefix]: name }),
3736
{}
3837
),
39-
})
40-
);
38+
}));
4139
});
4240
};
4341

lib/db/transaction.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
const { httpBody } = require('../response-transforms');
22

3-
const attachTransactionId = transactionId => res =>
4-
Object.assign({}, res, { transactionId });
3+
const attachTransactionId = transactionId => res => ({ ...res, transactionId });
54

65
const begin = (conn, database, params = {}) => {
76
const headers = conn.headers();
@@ -12,7 +11,7 @@ const begin = (conn, database, params = {}) => {
1211
headers,
1312
})
1413
.then(httpBody)
15-
.then(res => Object.assign({}, res, { transactionId: res.body }));
14+
.then(res => ({ ...res, transactionId: res.body }));
1615
};
1716

1817
const rollback = (conn, database, transactionId, params = {}) => {

0 commit comments

Comments
 (0)