diff --git a/lib/models/actions.js b/lib/models/actions.js index ebad85fd..e504d210 100644 --- a/lib/models/actions.js +++ b/lib/models/actions.js @@ -51,7 +51,7 @@ function errorsAction(event) { function validateAction(axn) { var axnArr, axnElem, i; - if (util.isArray(axn)) { + if (Array.isArray(axn)) { axnArr = axn; } else { axnArr = [axn]; @@ -241,7 +241,7 @@ function DoAction(event, callback) { if (err) { return callback(err, null); } - if (!util.isArray(actions)) { + if (!Array.isArray(actions)) { actions = [actions]; } // check all axns are right diff --git a/lib/models/notices.js b/lib/models/notices.js index ea306c40..86c7de62 100644 --- a/lib/models/notices.js +++ b/lib/models/notices.js @@ -158,7 +158,7 @@ function DoNotice(orionN, callback) { orionResponse = orionN.contextResponses; } - if (!util.isArray(orionResponse)) { + if (!Array.isArray(orionResponse)) { if (orionN.version === 2) { return callback(new errors.InvalidV2Notice('data must be an array, not a ' + typeof orionResponse)); } diff --git a/lib/models/rulesStore.js b/lib/models/rulesStore.js index c64c5482..d8a2c26d 100644 --- a/lib/models/rulesStore.js +++ b/lib/models/rulesStore.js @@ -107,7 +107,7 @@ function findAll(service, subservice, callback) { } const col = db.collection(rulesCollectionName); col.find(criterion).toArray(function(err, rules) { - if (rules && util.isArray(rules)) { + if (rules && Array.isArray(rules)) { rules.forEach(function(r) { parsePostAxnParams(r); }); diff --git a/lib/myutils.js b/lib/myutils.js index 1b98917b..3ad0da3e 100644 --- a/lib/myutils.js +++ b/lib/myutils.js @@ -262,7 +262,7 @@ function respondAux(resp, err, data, withCount, raw, withMetrics) { } else { // non-raw respObj = { error: errMsg, data: data }; - if (withCount === true && data && util.isArray(data)) { + if (withCount === true && data && Array.isArray(data)) { respObj.count = data.length; } } diff --git a/lib/routes/actionsController.js b/lib/routes/actionsController.js index 6f764b2e..c26c5750 100644 --- a/lib/routes/actionsController.js +++ b/lib/routes/actionsController.js @@ -60,7 +60,7 @@ function PostAction(req, resp) { //There is no array yet for this correlator rulesWithCorr = recentAxn[correlator] = []; } - if (util.isArray(rulesWithCorr)) { + if (Array.isArray(rulesWithCorr)) { if (rulesWithCorr.length > config.maxRulesByCorr) { errMsg = util.format( 'maximun number of rules executed with the same correlator (%s) reached with these rules [%j]' + diff --git a/lib/routes/rulesController.js b/lib/routes/rulesController.js index e54df19a..d669324d 100644 --- a/lib/routes/rulesController.js +++ b/lib/routes/rulesController.js @@ -27,7 +27,6 @@ var rules = require('../models/rules'), constants = require('../constants'), config = require('../../config'), logger = require('logops'), - util = require('util'), myutils = require('../myutils'); function GetAllRules(req, resp) { @@ -36,7 +35,7 @@ function GetAllRules(req, resp) { var count = req.query && req.query.options ? req.query.options === 'count' : true; logger.debug({}, 'getting all rules'); rules.FindAll(req.service, req.subservice, function(err, data) { - if (util.isArray(data)) { + if (Array.isArray(data)) { resp.set(constants.TOTAL_COUNT_HEADER, data.length); data = data.splice(offset, limit); var dataPurged = []; diff --git a/lib/routes/visualRulesController.js b/lib/routes/visualRulesController.js index 4134b178..baf96a39 100644 --- a/lib/routes/visualRulesController.js +++ b/lib/routes/visualRulesController.js @@ -22,8 +22,7 @@ */ 'use strict'; -var util = require('util'), - visualRules = require('../models/visualRules'), +var visualRules = require('../models/visualRules'), metrics = require('../models/metrics'), config = require('../../config'), constants = require('../constants'), @@ -36,7 +35,7 @@ function GetAllVR(req, resp) { var count = req.query && req.query.options ? req.query.options === 'count' : true; logger.debug({}, 'getting all Vrules '); visualRules.FindAll(req.service, req.subservice, function(err, data) { - if (!err && util.isArray(data)) { + if (!err && Array.isArray(data)) { data = data.map(function(e) { delete e.subservice; delete e.service;