You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2016/03/28 10:48:15 UTC
[35/50] [abbrv] ignite git commit: IGNITE-843 Fixed lodash
"_.contains()" to "_.includes()"
IGNITE-843 Fixed lodash "_.contains()" to "_.includes()"
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/efe43956
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/efe43956
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/efe43956
Branch: refs/heads/ignite-2875
Commit: efe43956a0f5667fa371ac59784f7f744a87a718
Parents: 6cd972a
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Thu Mar 24 18:56:24 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Thu Mar 24 18:56:24 2016 +0700
----------------------------------------------------------------------
.../src/main/js/helpers/generator/generator-java.js | 6 +++---
.../src/main/js/helpers/generator/generator-properties.js | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/efe43956/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/helpers/generator/generator-java.js b/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
index fe65b45..bcf12ce 100644
--- a/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
+++ b/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
@@ -1235,7 +1235,7 @@ $generatorJava.clusterDataSources = function (caches, res) {
if (storeFactory) {
var beanClassName = $generatorJava.dataSourceClassName(res, storeFactory);
- if (beanClassName && !_.contains(datasources, beanClassName)) {
+ if (beanClassName && !_.includes(datasources, beanClassName)) {
datasources.push(beanClassName);
if (factoryKind === 'CacheJdbcPojoStoreFactory' || factoryKind === 'CacheJdbcBlobStoreFactory') {
@@ -2902,7 +2902,7 @@ $generatorJava.generateExample = function (cluster, res, factoryCls) {
}
_.forEach(desc.insertCntConsts, function (cnt) {
- if (!_.contains(generatedConsts, cnt.name)) {
+ if (!_.includes(generatedConsts, cnt.name)) {
res.line('/** ' + cnt.comment + ' */');
res.line('private static final int ' + cnt.name + ' = ' + cnt.val + ';');
res.needEmptyLine = true;
@@ -3012,7 +3012,7 @@ $generatorJava.generateExample = function (cluster, res, factoryCls) {
_.forEach(desc.selectQuery, function (query) {
var cacheName = type.cache.name;
- if (!_.contains(cacheLoaded, cacheName)) {
+ if (!_.includes(cacheLoaded, cacheName)) {
res.line('ignite.cache("' + cacheName + '").loadCache(null);');
cacheLoaded.push(cacheName);
http://git-wip-us.apache.org/repos/asf/ignite/blob/efe43956/modules/control-center-web/src/main/js/helpers/generator/generator-properties.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/helpers/generator/generator-properties.js b/modules/control-center-web/src/main/js/helpers/generator/generator-properties.js
index 9bb68eb..cf971da 100644
--- a/modules/control-center-web/src/main/js/helpers/generator/generator-properties.js
+++ b/modules/control-center-web/src/main/js/helpers/generator/generator-properties.js
@@ -71,7 +71,7 @@ $generatorProperties.dataSourcesProperties = function (cluster, res) {
var beanClassName = $commonUtils.toJavaName(varType, storeFactory.dataSourceBean);
- if (!_.contains(datasources, beanClassName)) {
+ if (!_.includes(datasources, beanClassName)) {
datasources.push(beanClassName);
res.needEmptyLine = true;