Repository: ignite Updated Branches: refs/heads/ignite-843-rc2 32b97b25d -> d74c2f46a
IGNITE-843 Minor. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d74c2f46 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d74c2f46 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d74c2f46 Branch: refs/heads/ignite-843-rc2 Commit: d74c2f46aa3e08dff25eafedd455ca87adbbe090 Parents: 32b97b2 Author: vsisko <[email protected]> Authored: Wed Feb 3 13:33:09 2016 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Wed Feb 3 13:33:09 2016 +0700 ---------------------------------------------------------------------- .../main/js/helpers/generator/generator-java.js | 51 +++++++++++++++----- .../src/main/js/routes/caches.js | 12 +++++ .../src/main/js/routes/clusters.js | 18 +++++-- .../src/main/js/routes/domains.js | 10 ++-- 4 files changed, 74 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/d74c2f46/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 2076b37..4f4a1be 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 @@ -190,6 +190,35 @@ $generatorJava.property = function (res, varName, obj, propName, dataType, sette // Add to result if no default provided or value not equals to default. if (!hasDflt || (hasDflt && val !== dflt)) { res.line(varName + '.' + $generatorJava.setterName(propName, setterName) + + '(' + $generatorJava.toJavaCode(val, dataType) + ');'); + + return true; + } + } + + return false; +}; + +/** + * Add enum property via setter / property name. + * + * @param res Resulting output with generated code. + * @param varName Variable name. + * @param obj Source object with data. + * @param propName Property name to take from source object. + * @param dataType Name of enum class + * @param setterName Optional special setter name. + * @param dflt Optional default value. + */ +$generatorJava.enumProperty = function (res, varName, obj, propName, dataType, setterName, dflt) { + var val = obj[propName]; + + if ($commonUtils.isDefinedAndNotEmpty(val)) { + var hasDflt = $commonUtils.isDefined(dflt); + + // Add to result if no default provided or value not equals to default. + if (!hasDflt || (hasDflt && val !== dflt)) { + res.line(varName + '.' + $generatorJava.setterName(propName, setterName) + '(' + $generatorJava.toJavaCode(val, dataType ? res.importClass(dataType) : null) + ');'); return true; @@ -320,7 +349,7 @@ $generatorJava.beanProperty = function (res, varName, bean, beanPropName, beanVa break; case 'enum': - $generatorJava.property(res, beanVarName, bean, propName, descr.enumClass, descr.setterName, descr.dflt); + $generatorJava.enumProperty(res, beanVarName, bean, propName, descr.enumClass, descr.setterName, descr.dflt); break; case 'float': @@ -526,7 +555,7 @@ $generatorJava.clusterAtomics = function (cluster, res) { $generatorJava.declareVariable(res, 'atomicCfg', 'org.apache.ignite.configuration.AtomicConfiguration'); - $generatorJava.property(res, 'atomicCfg', atomics, 'cacheMode', 'org.apache.ignite.cache.CacheMode'); + $generatorJava.enumProperty(res, 'atomicCfg', atomics, 'cacheMode', 'org.apache.ignite.cache.CacheMode'); var cacheMode = atomics.cacheMode ? atomics.cacheMode : 'PARTITIONED'; @@ -712,7 +741,7 @@ $generatorJava.clusterDeployment = function (cluster, res) { if (!res) res = $generatorCommon.builder(); - $generatorJava.property(res, 'cfg', cluster, 'deploymentMode', null, null, 'SHARED'); + $generatorJava.enumProperty(res, 'cfg', cluster, 'deploymentMode', 'org.apache.ignite.configuration.DeploymentMode', null, 'SHARED'); res.needEmptyLine = true; @@ -953,8 +982,8 @@ $generatorJava.cacheGeneral = function (cache, varName, res) { $generatorJava.property(res, varName, cache, 'name'); - $generatorJava.property(res, varName, cache, 'cacheMode', 'org.apache.ignite.cache.CacheMode'); - $generatorJava.property(res, varName, cache, 'atomicityMode', 'org.apache.ignite.cache.CacheAtomicityMode'); + $generatorJava.enumProperty(res, varName, cache, 'cacheMode', 'org.apache.ignite.cache.CacheMode'); + $generatorJava.enumProperty(res, varName, cache, 'atomicityMode', 'org.apache.ignite.cache.CacheAtomicityMode'); if (cache.cacheMode === 'PARTITIONED') $generatorJava.property(res, varName, cache, 'backups'); @@ -973,7 +1002,7 @@ $generatorJava.cacheMemory = function (cache, varName, res) { if (!res) res = $generatorCommon.builder(); - $generatorJava.property(res, varName, cache, 'memoryMode', 'org.apache.ignite.cache.CacheMemoryMode'); + $generatorJava.enumProperty(res, varName, cache, 'memoryMode', 'org.apache.ignite.cache.CacheMemoryMode'); $generatorJava.property(res, varName, cache, 'offHeapMaxMemory'); res.needEmptyLine = true; @@ -1290,8 +1319,8 @@ $generatorJava.cacheConcurrency = function (cache, varName, res) { $generatorJava.property(res, varName, cache, 'maxConcurrentAsyncOperations'); $generatorJava.property(res, varName, cache, 'defaultLockTimeout'); - $generatorJava.property(res, varName, cache, 'atomicWriteOrderMode', 'org.apache.ignite.cache.CacheAtomicWriteOrderMode'); - $generatorJava.property(res, varName, cache, 'writeSynchronizationMode', 'org.apache.ignite.cache.CacheWriteSynchronizationMode'); + $generatorJava.enumProperty(res, varName, cache, 'atomicWriteOrderMode', 'org.apache.ignite.cache.CacheAtomicWriteOrderMode'); + $generatorJava.enumProperty(res, varName, cache, 'writeSynchronizationMode', 'org.apache.ignite.cache.CacheWriteSynchronizationMode'); res.needEmptyLine = true; @@ -1304,7 +1333,7 @@ $generatorJava.cacheRebalance = function (cache, varName, res) { res = $generatorCommon.builder(); if (cache.cacheMode !== 'LOCAL') { - $generatorJava.property(res, varName, cache, 'rebalanceMode', 'org.apache.ignite.cache.CacheRebalanceMode', null, 'ASYNC'); + $generatorJava.enumProperty(res, varName, cache, 'rebalanceMode', 'org.apache.ignite.cache.CacheRebalanceMode', null, 'ASYNC'); $generatorJava.property(res, varName, cache, 'rebalanceThreadPoolSize', null, null, 1); $generatorJava.property(res, varName, cache, 'rebalanceBatchSize', null, null, 524288); $generatorJava.property(res, varName, cache, 'rebalanceBatchesPrefetchCount', null, null, 2); @@ -1437,7 +1466,7 @@ $generatorJava.domainModelQueryIndexes = function (res, domain) { $generatorJava.declareVariable(res, 'index', 'org.apache.ignite.cache.QueryIndex'); $generatorJava.property(res, 'index', index, 'name'); - $generatorJava.property(res, 'index', index, 'indexType', 'org.apache.ignite.cache.QueryIndexType'); + $generatorJava.enumProperty(res, 'index', index, 'indexType', 'org.apache.ignite.cache.QueryIndexType'); if (fields && fields.length > 0) { $generatorJava.declareVariable(res, 'indFlds', 'java.util.LinkedHashMap', 'java.util.LinkedHashMap', 'String', 'Boolean'); @@ -2297,7 +2326,7 @@ $generatorJava.igfsGeneral = function(igfs, varName, res) { $generatorJava.property(res, varName, igfs, 'name'); $generatorJava.property(res, varName, igfs, 'dataCacheName'); $generatorJava.property(res, varName, igfs, 'metaCacheName'); - $generatorJava.property(res, varName, igfs, 'defaultMode', 'org.apache.ignite.igfs.IgfsMode', undefined, "DUAL_ASYNC"); + $generatorJava.enumProperty(res, varName, igfs, 'defaultMode', 'org.apache.ignite.igfs.IgfsMode', undefined, "DUAL_ASYNC"); res.needEmptyLine = true; } http://git-wip-us.apache.org/repos/asf/ignite/blob/d74c2f46/modules/control-center-web/src/main/js/routes/caches.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/routes/caches.js b/modules/control-center-web/src/main/js/routes/caches.js index fa52bd5..e49a07f 100644 --- a/modules/control-center-web/src/main/js/routes/caches.js +++ b/modules/control-center-web/src/main/js/routes/caches.js @@ -44,6 +44,18 @@ router.post('/list', function (req, res) { // Get all caches for spaces. db.Cache.find({space: {$in: space_ids}}).sort('name').exec(function (err, caches) { if (db.processed(err, res)) { + _.forEach(clusters, function (cluster) { + cluster.caches = _.filter(cluster.caches, function (cacheId) { + return _.find(caches, {_id: cacheId}); + }); + }); + + _.forEach(domains, function (domain) { + domain.caches = _.filter(domain.caches, function (cacheId) { + return _.find(caches, {_id: cacheId}); + }); + }); + _.forEach(caches, function (cache) { // Remove deleted clusters. cache.clusters = _.filter(cache.clusters, function (clusterId) { http://git-wip-us.apache.org/repos/asf/ignite/blob/d74c2f46/modules/control-center-web/src/main/js/routes/clusters.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/routes/clusters.js b/modules/control-center-web/src/main/js/routes/clusters.js index cf56c49..ebb89bf 100644 --- a/modules/control-center-web/src/main/js/routes/clusters.js +++ b/modules/control-center-web/src/main/js/routes/clusters.js @@ -44,12 +44,24 @@ router.post('/list', function (req, res) { // Get all clusters for spaces. db.Cluster.find({space: {$in: space_ids}}).sort('name').deepPopulate(db.ClusterDefaultPopulate).exec(function (err, clusters) { if (db.processed(err, res)) { + _.forEach(caches, function (cache) { + // Remove deleted caches. + cache.clusters = _.filter(cache.clusters, function (clusterId) { + return _.find(clusters, {_id: clusterId}); + }); + }); + + _.forEach(igfss, function (igfs) { + // Remove deleted caches. + igfs.clusters = _.filter(igfs.clusters, function (clusterId) { + return _.find(clusters, {_id: clusterId}); + }); + }); + _.forEach(clusters, function (cluster) { // Remove deleted caches. cluster.caches = _.filter(cluster.caches, function (cacheId) { - return _.findIndex(caches, function (cache) { - return cache._id.equals(cacheId); - }) >= 0; + return _.find(caches, {_id: cacheId}); }); // Remove deleted IGFS. http://git-wip-us.apache.org/repos/asf/ignite/blob/d74c2f46/modules/control-center-web/src/main/js/routes/domains.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/routes/domains.js b/modules/control-center-web/src/main/js/routes/domains.js index 8de7bc8..b709c2d 100644 --- a/modules/control-center-web/src/main/js/routes/domains.js +++ b/modules/control-center-web/src/main/js/routes/domains.js @@ -45,12 +45,16 @@ router.post('/list', function (req, res) { // Get all domain models for spaces. db.DomainModel.find({space: {$in: space_ids}}).sort('valueType').exec(function (err, domains) { if (db.processed(err, res)) { + _.forEach(caches, function (cache) { + cache.domains = _.filter(cache.domains, function (metaId) { + return _.find(domains, {_id: metaId}); + }); + }); + // Remove deleted caches. _.forEach(domains, function (domain) { domain.caches = _.filter(domain.caches, function (cacheId) { - return _.findIndex(caches, function (cache) { - return cache._id.equals(cacheId); - }) >= 0; + return _.find(caches, {_id: cacheId}); }); });
