You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by se...@apache.org on 2015/07/15 21:16:58 UTC
[10/45] incubator-ignite git commit: IGNITE-843 Code format.
IGNITE-843 Code format.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8424670b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8424670b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8424670b
Branch: refs/heads/ignite-1121
Commit: 8424670b3d6579df2f5d2480a9adbf9ff73b14c4
Parents: f7d1aa8
Author: AKuznetsov <ak...@gridgain.com>
Authored: Tue Jul 14 11:56:28 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Tue Jul 14 11:56:28 2015 +0700
----------------------------------------------------------------------
.../web-control-center/nodejs/routes/admin.js | 16 +-
.../web-control-center/nodejs/routes/caches.js | 14 +-
.../nodejs/routes/clusters.js | 16 +-
.../nodejs/routes/metadata.js | 14 +-
.../nodejs/routes/persistence.js | 147 ++++++++++---------
.../web-control-center/nodejs/routes/public.js | 26 ++--
modules/web-control-center/nodejs/routes/sql.js | 2 +-
.../web-control-center/nodejs/routes/summary.js | 12 +-
8 files changed, 125 insertions(+), 122 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8424670b/modules/web-control-center/nodejs/routes/admin.js
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/routes/admin.js b/modules/web-control-center/nodejs/routes/admin.js
index f1625e3..ba6bf94 100644
--- a/modules/web-control-center/nodejs/routes/admin.js
+++ b/modules/web-control-center/nodejs/routes/admin.js
@@ -18,14 +18,14 @@
var router = require('express').Router();
var db = require('../db');
-router.get('/', function(req, res) {
+router.get('/', function (req, res) {
res.render('settings/admin');
});
/**
* Get list of user accounts.
*/
-router.post('/list', function(req, res) {
+router.post('/list', function (req, res) {
db.Account.find({}).select('_id username email lastLogin admin').exec(function (err, users) {
if (err)
return res.status(500).send(err.message);
@@ -34,10 +34,10 @@ router.post('/list', function(req, res) {
});
});
-router.post('/remove', function(req, res) {
+router.post('/remove', function (req, res) {
var userId = req.body.userId;
- db.Account.findByIdAndRemove(userId, function(err) {
+ db.Account.findByIdAndRemove(userId, function (err) {
if (err)
return res.status(500).send(err);
@@ -45,11 +45,11 @@ router.post('/remove', function(req, res) {
});
});
-router.post('/save', function(req, res) {
+router.post('/save', function (req, res) {
var userId = req.body.userId;
var adminFlag = req.body.adminFlag;
- db.Account.findByIdAndUpdate(userId, {admin: adminFlag}, function(err) {
+ db.Account.findByIdAndUpdate(userId, {admin: adminFlag}, function (err) {
if (err)
return res.status(500).send(err.message);
@@ -57,7 +57,7 @@ router.post('/save', function(req, res) {
});
});
-router.get('/become', function(req, res) {
+router.get('/become', function (req, res) {
var viewedUserId = req.query.viewedUserId;
if (!viewedUserId) {
@@ -66,7 +66,7 @@ router.get('/become', function(req, res) {
return res.redirect('/admin');
}
- db.Account.findById(viewedUserId, function(err, viewedUser) {
+ db.Account.findById(viewedUserId, function (err, viewedUser) {
if (err)
return res.sendStatus(404);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8424670b/modules/web-control-center/nodejs/routes/caches.js
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/routes/caches.js b/modules/web-control-center/nodejs/routes/caches.js
index 6a90ebe..3a20303 100644
--- a/modules/web-control-center/nodejs/routes/caches.js
+++ b/modules/web-control-center/nodejs/routes/caches.js
@@ -19,7 +19,7 @@ var router = require('express').Router();
var db = require('../db');
/* GET caches page. */
-router.get('/', function(req, res) {
+router.get('/', function (req, res) {
res.render('configuration/caches');
});
@@ -29,7 +29,7 @@ router.get('/', function(req, res) {
* @param req Request.
* @param res Response.
*/
-router.post('/list', function(req, res) {
+router.post('/list', function (req, res) {
var user_id = req.currentUserId();
// Get owned space and all accessed space.
@@ -37,7 +37,7 @@ router.post('/list', function(req, res) {
if (err)
return res.status(500).send(err.message);
- var space_ids = spaces.map(function(value) {
+ var space_ids = spaces.map(function (value) {
return value._id;
});
@@ -54,9 +54,9 @@ router.post('/list', function(req, res) {
/**
* Save cache.
*/
-router.post('/save', function(req, res) {
+router.post('/save', function (req, res) {
if (req.body._id)
- db.Cache.update({_id: req.body._id}, req.body, {upsert: true}, function(err) {
+ db.Cache.update({_id: req.body._id}, req.body, {upsert: true}, function (err) {
if (err)
return res.status(500).send(err.message);
@@ -65,7 +65,7 @@ router.post('/save', function(req, res) {
else {
var cache = new db.Cache(req.body);
- cache.save(function(err, cache) {
+ cache.save(function (err, cache) {
if (err)
return res.status(500).send(err.message);
@@ -77,7 +77,7 @@ router.post('/save', function(req, res) {
/**
* Remove cache by ._id.
*/
-router.post('/remove', function(req, res) {
+router.post('/remove', function (req, res) {
db.Cache.remove(req.body, function (err) {
if (err)
return res.status(500).send(err.message);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8424670b/modules/web-control-center/nodejs/routes/clusters.js
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/routes/clusters.js b/modules/web-control-center/nodejs/routes/clusters.js
index fa3abf2..5088156 100644
--- a/modules/web-control-center/nodejs/routes/clusters.js
+++ b/modules/web-control-center/nodejs/routes/clusters.js
@@ -19,7 +19,7 @@ var router = require('express').Router();
var db = require('../db');
/* GET clusters page. */
-router.get('/', function(req, res) {
+router.get('/', function (req, res) {
res.render('configuration/clusters');
});
@@ -29,7 +29,7 @@ router.get('/', function(req, res) {
* @param req Request.
* @param res Response.
*/
-router.post('/list', function(req, res) {
+router.post('/list', function (req, res) {
var user_id = req.currentUserId();
// Get owned space and all accessed space.
@@ -37,7 +37,7 @@ router.post('/list', function(req, res) {
if (err)
return res.status(500).send(err.message);
- var space_ids = spaces.map(function(value) {
+ var space_ids = spaces.map(function (value) {
return value._id;
});
@@ -50,7 +50,7 @@ router.post('/list', function(req, res) {
if (err)
return res.status(500).send(err.message);
- var cachesJson = caches.map(function(cache) {
+ var cachesJson = caches.map(function (cache) {
return {value: cache._id, label: cache.name, swapEnabled: cache.swapEnabled};
});
@@ -63,9 +63,9 @@ router.post('/list', function(req, res) {
/**
* Save cluster.
*/
-router.post('/save', function(req, res) {
+router.post('/save', function (req, res) {
if (req.body._id)
- db.Cluster.update({_id: req.body._id}, req.body, {upsert: true}, function(err) {
+ db.Cluster.update({_id: req.body._id}, req.body, {upsert: true}, function (err) {
if (err)
return res.status(500).send(err.message);
@@ -74,7 +74,7 @@ router.post('/save', function(req, res) {
else {
var cluster = new db.Cluster(req.body);
- cluster.save(function(err, cluster) {
+ cluster.save(function (err, cluster) {
if (err)
return res.status(500).send(err.message);
@@ -86,7 +86,7 @@ router.post('/save', function(req, res) {
/**
* Remove cluster by ._id.
*/
-router.post('/remove', function(req, res) {
+router.post('/remove', function (req, res) {
db.Cluster.remove(req.body, function (err) {
if (err)
return res.status(500).send(err.message);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8424670b/modules/web-control-center/nodejs/routes/metadata.js
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/routes/metadata.js b/modules/web-control-center/nodejs/routes/metadata.js
index fbafbfa..f1b7e83 100644
--- a/modules/web-control-center/nodejs/routes/metadata.js
+++ b/modules/web-control-center/nodejs/routes/metadata.js
@@ -19,7 +19,7 @@ var router = require('express').Router();
var db = require('../db');
/* GET metadata page. */
-router.get('/', function(req, res) {
+router.get('/', function (req, res) {
res.render('configuration/metadata');
});
@@ -29,7 +29,7 @@ router.get('/', function(req, res) {
* @param req Request.
* @param res Response.
*/
-router.post('/list', function(req, res) {
+router.post('/list', function (req, res) {
var user_id = req.currentUserId();
// Get owned space and all accessed space.
@@ -37,7 +37,7 @@ router.post('/list', function(req, res) {
if (err)
return res.status(500).send(err.message);
- var space_ids = spaces.map(function(value) {
+ var space_ids = spaces.map(function (value) {
return value._id;
});
@@ -54,9 +54,9 @@ router.post('/list', function(req, res) {
/**
* Save metadata.
*/
-router.post('/save', function(req, res) {
+router.post('/save', function (req, res) {
if (req.body._id)
- db.CacheTypeMetadata.update({_id: req.body._id}, req.body, {upsert: true}, function(err) {
+ db.CacheTypeMetadata.update({_id: req.body._id}, req.body, {upsert: true}, function (err) {
if (err)
return res.status(500).send(err.message);
@@ -65,7 +65,7 @@ router.post('/save', function(req, res) {
else {
var metadata = new db.CacheTypeMetadata(req.body);
- metadata.save(function(err, metadata) {
+ metadata.save(function (err, metadata) {
if (err)
return res.status(500).send(err.message);
@@ -77,7 +77,7 @@ router.post('/save', function(req, res) {
/**
* Remove metadata by ._id.
*/
-router.post('/remove', function(req, res) {
+router.post('/remove', function (req, res) {
db.CacheTypeMetadata.remove(req.body, function (err) {
if (err)
return res.status(500).send(err.message);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8424670b/modules/web-control-center/nodejs/routes/persistence.js
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/routes/persistence.js b/modules/web-control-center/nodejs/routes/persistence.js
index 5b33f9b..3e188bb 100644
--- a/modules/web-control-center/nodejs/routes/persistence.js
+++ b/modules/web-control-center/nodejs/routes/persistence.js
@@ -20,7 +20,7 @@ var db = require('../db');
var ds = require('../helpers/data-structures.js'), jdbcTypes = ds.jdbcTypes, javaTypes = ds.javaTypes;
/* GET persistence page. */
-router.get('/', function(req, res) {
+router.get('/', function (req, res) {
res.render('configuration/persistence');
});
@@ -30,7 +30,7 @@ router.get('/', function(req, res) {
* @param req Request.
* @param res Response.
*/
-router.post('/list', function(req, res) {
+router.post('/list', function (req, res) {
var user_id = req.currentUserId();
// Get owned space and all accessed space.
@@ -38,7 +38,7 @@ router.post('/list', function(req, res) {
if (err)
return res.status(500).send(err.message);
- var space_ids = spaces.map(function(value) {
+ var space_ids = spaces.map(function (value) {
return value._id;
});
@@ -55,9 +55,9 @@ router.post('/list', function(req, res) {
/**
* Save persistence.
*/
-router.post('/save', function(req, res) {
+router.post('/save', function (req, res) {
if (req.body._id)
- db.Persistence.update({_id: req.body._id}, req.body, {upsert: true}, function(err) {
+ db.Persistence.update({_id: req.body._id}, req.body, {upsert: true}, function (err) {
if (err)
return res.status(500).send(err.message);
@@ -66,7 +66,7 @@ router.post('/save', function(req, res) {
else {
var persistence = new db.Persistence(req.body);
- persistence.save(function(err, persistence) {
+ persistence.save(function (err, persistence) {
if (err)
return res.status(500).send(err.message);
@@ -78,7 +78,7 @@ router.post('/save', function(req, res) {
/**
* Remove persistence by ._id.
*/
-router.post('/remove', function(req, res) {
+router.post('/remove', function (req, res) {
db.Persistence.remove(req.body, function (err) {
if (err)
return res.status(500).send(err.message);
@@ -89,8 +89,8 @@ router.post('/remove', function(req, res) {
// simple countdown latch
function CDL(countdown, completion) {
- this.countDown = function() {
- if(--countdown < 1) completion();
+ this.countDown = function () {
+ if (--countdown < 1) completion();
};
}
@@ -134,7 +134,7 @@ function toJavaFieldName(name) {
//
-router.post('/pg', function(req, res) {
+router.post('/pg', function (req, res) {
var pg = require('pg');
var util = require('util');
@@ -148,14 +148,14 @@ router.post('/pg', function(req, res) {
var connectionString = util.format('postgres://%s:%s@%s:%d/%s', username, password, host, port, dbName);
- pg.connect(connectionString, function(err, client, done) {
+ pg.connect(connectionString, function (err, client, done) {
var sendError = function (err) {
done();
res.status(500).send(err.message);
};
- if(err)
+ if (err)
return sendError(err);
var sendResponse = function () {
@@ -244,67 +244,70 @@ router.post('/pg', function(req, res) {
'SELECT table_schema, table_name ' +
'FROM information_schema.tables ' +
'WHERE table_schema = ANY (current_schemas(false)) ' +
- 'ORDER BY table_schema, table_name', function(err, result) {
-
- if(err)
- return sendError(err);
-
- if (result.rows.length > 0) {
- // usage
- var latch = new CDL(result.rows.length, sendResponse);
-
- result.rows.forEach(function (table) {
-
- var indisprimary = client.query(
- "SELECT a.attname " +
- "FROM pg_index i " +
- "JOIN pg_attribute a " +
- " ON a.attrelid = i.indrelid AND a.attnum = ANY(i.indkey) " +
- "WHERE i.indrelid = $1::regclass AND i.indisprimary", [table.table_schema + '.' + table.table_name],
- function (err, result) {
- if (err)
- return sendError(err);
-
- var pks = result.rows.map(function(row) {
- return row.attname;
+ 'ORDER BY table_schema, table_name', function (err, result) {
+
+ if (err)
+ return sendError(err);
+
+ if (result.rows.length > 0) {
+ // usage
+ var latch = new CDL(result.rows.length, sendResponse);
+
+ result.rows.forEach(function (table) {
+
+ var indisprimary = client.query(
+ "SELECT a.attname " +
+ "FROM pg_index i " +
+ "JOIN pg_attribute a " +
+ " ON a.attrelid = i.indrelid AND a.attnum = ANY(i.indkey) " +
+ "WHERE i.indrelid = $1::regclass AND i.indisprimary", [table.table_schema + '.' + table.table_name],
+ function (err, result) {
+ if (err)
+ return sendError(err);
+
+ var pks = result.rows.map(function (row) {
+ return row.attname;
+ });
+
+ client.query(
+ 'SELECT column_name, udt_name, is_nullable ' +
+ 'FROM information_schema.columns ' +
+ 'WHERE table_schema = $1 AND table_name = $2', [table.table_schema, table.table_name],
+ function (err, result) {
+ if (err)
+ return sendError(err);
+
+ var cols = [];
+
+ result.rows.forEach(function (column) {
+ var dataType = jdbcType(column.udt_name);
+
+ cols.push({
+ pk: pks.indexOf(column.column_name) >= 0,
+ use: true,
+ notNull: column.is_nullable == 'NO',
+ dbName: column.column_name,
+ dbType: dataType,
+ javaName: toJavaFieldName(column.column_name),
+ javaType: javaType(dataType)
+ });
+ });
+
+ var valClsName = toJavaClassName(table.table_name);
+
+ tables.push({
+ use: pks.length > 0,
+ schemaName: table.table_schema, tableName: table.table_name,
+ keyClass: valClsName + 'Key', valueClass: valClsName,
+ columns: cols
+ });
+
+ latch.countDown();
+ })
});
-
- client.query(
- 'SELECT column_name, udt_name, is_nullable ' +
- 'FROM information_schema.columns ' +
- 'WHERE table_schema = $1 AND table_name = $2', [table.table_schema, table.table_name],
- function (err, result) {
- if (err)
- return sendError(err);
-
- var cols = [];
-
- result.rows.forEach(function (column) {
- var dataType = jdbcType(column.udt_name);
-
- cols.push({
- pk: pks.indexOf(column.column_name) >= 0,
- use: true,
- notNull: column.is_nullable == 'NO',
- dbName: column.column_name, dbType: dataType,
- javaName: toJavaFieldName(column.column_name), javaType: javaType(dataType) });
- });
-
- var valClsName = toJavaClassName(table.table_name);
-
- tables.push({
- use: pks.length > 0,
- schemaName: table.table_schema, tableName: table.table_name,
- keyClass: valClsName + 'Key', valueClass: valClsName,
- columns: cols
- });
-
- latch.countDown();
- })
- });
- });
- }
- });
+ });
+ }
+ });
});
});
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8424670b/modules/web-control-center/nodejs/routes/public.js
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/routes/public.js b/modules/web-control-center/nodejs/routes/public.js
index e7f342b..fd25aed 100644
--- a/modules/web-control-center/nodejs/routes/public.js
+++ b/modules/web-control-center/nodejs/routes/public.js
@@ -20,31 +20,31 @@ var passport = require('passport');
var db = require('../db');
// GET dropdown-menu template.
-router.get('/select', function(req, res) {
- res.render('templates/select', { });
+router.get('/select', function (req, res) {
+ res.render('templates/select', {});
});
// GET dropdown-menu template.
-router.get('/confirm', function(req, res) {
- res.render('templates/confirm', { });
+router.get('/confirm', function (req, res) {
+ res.render('templates/confirm', {});
});
/* GET login page. */
-router.get('/login', function(req, res) {
+router.get('/login', function (req, res) {
res.render('login');
});
/**
* Register new account.
*/
-router.post('/register', function(req, res, next) {
+router.post('/register', function (req, res, next) {
db.Account.count(function (err, cnt) {
if (err)
return res.status(401).send(err.message);
req.body.admin = cnt == 0;
- db.Account.register(new db.Account(req.body), req.body.password, function(err, account) {
+ db.Account.register(new db.Account(req.body), req.body.password, function (err, account) {
if (err)
return res.status(401).send(err.message);
@@ -53,7 +53,7 @@ router.post('/register', function(req, res, next) {
new db.Space({name: 'Personal space', owner: account._id}).save();
- req.logIn(account, {}, function(err) {
+ req.logIn(account, {}, function (err) {
if (err)
return res.status(401).send(err.message);
@@ -66,15 +66,15 @@ router.post('/register', function(req, res, next) {
/**
* Login in exist account.
*/
-router.post('/login', function(req, res, next) {
- passport.authenticate('local', function(err, user) {
+router.post('/login', function (req, res, next) {
+ passport.authenticate('local', function (err, user) {
if (err)
return res.status(401).send(err.message);
if (!user)
return res.status(401).send('Invalid email or password');
- req.logIn(user, {}, function(err) {
+ req.logIn(user, {}, function (err) {
if (err)
return res.status(401).send(err.message);
@@ -86,14 +86,14 @@ router.post('/login', function(req, res, next) {
/**
* Logout.
*/
-router.get('/logout', function(req, res) {
+router.get('/logout', function (req, res) {
req.logout();
res.redirect('/');
});
/* GET home page. */
-router.get('/', function(req, res) {
+router.get('/', function (req, res) {
if (req.isAuthenticated())
res.redirect('/configuration/clusters');
else
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8424670b/modules/web-control-center/nodejs/routes/sql.js
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/routes/sql.js b/modules/web-control-center/nodejs/routes/sql.js
index ea3465c..f6017ba 100644
--- a/modules/web-control-center/nodejs/routes/sql.js
+++ b/modules/web-control-center/nodejs/routes/sql.js
@@ -19,7 +19,7 @@ var router = require('express').Router();
var db = require('../db');
var uiUtils = require('../helpers/ui-utils');
-router.get('/', function(req, res) {
+router.get('/', function (req, res) {
res.render('sql/sql');
});
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8424670b/modules/web-control-center/nodejs/routes/summary.js
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/routes/summary.js b/modules/web-control-center/nodejs/routes/summary.js
index 0578f45..a4554f0 100644
--- a/modules/web-control-center/nodejs/routes/summary.js
+++ b/modules/web-control-center/nodejs/routes/summary.js
@@ -24,11 +24,11 @@ var generatorJava = require('./generator/java');
var generatorDocker = require('./generator/docker');
/* GET summary page. */
-router.get('/', function(req, res) {
+router.get('/', function (req, res) {
res.render('configuration/summary');
});
-router.post('/generator', function(req, res) {
+router.post('/generator', function (req, res) {
// Get cluster.
db.Cluster.findById(req.body._id).populate('caches').exec(function (err, cluster) {
if (err)
@@ -46,7 +46,7 @@ router.post('/generator', function(req, res) {
});
});
-router.post('/download', function(req, res) {
+router.post('/download', function (req, res) {
// Get cluster.
db.Cluster.findById(req.body._id).populate('caches').exec(function (err, cluster) {
if (err)
@@ -60,12 +60,12 @@ router.post('/download', function(req, res) {
// creating archives
var zip = archiver('zip');
- zip.on('error', function(err) {
+ zip.on('error', function (err) {
res.status(500).send({error: err.message});
});
//on stream closed we can end the request
- res.on('close', function() {
+ res.on('close', function () {
console.log('Archive wrote %d bytes', archive.pointer());
return res.status(200).send('OK').end();
@@ -88,7 +88,7 @@ router.post('/download', function(req, res) {
zip.append(generatorXml.generateClusterConfiguration(cluster), {name: cluster.name + ".xml"})
.append(generatorJava.generateClusterConfiguration(cluster, req.body.javaClass),
- {name: javaClass ? 'ConfigurationFactory.java' : cluster.name + '.snipplet.java'})
+ {name: javaClass ? 'ConfigurationFactory.java' : cluster.name + '.snipplet.java'})
.append(generatorDocker.generateClusterConfiguration(cluster, req.body.os), {name: "Dockerfile"})
.finalize();
});