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/06/20 02:58:30 UTC
[07/50] [abbrv] ignite git commit: IGNITE-2047 Cleared unnecessary
check, Import of classes in specific case
IGNITE-2047 Cleared unnecessary check, Import of classes in specific case
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c3dda4c7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c3dda4c7
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c3dda4c7
Branch: refs/heads/ignite-3262
Commit: c3dda4c7e9fd11e3ae7d2506ae1d092cb793669f
Parents: 9cfc937
Author: vsisko <vs...@gridgain.com>
Authored: Thu Jun 2 17:45:18 2016 +0700
Committer: vsisko <vs...@gridgain.com>
Committed: Thu Jun 2 17:45:18 2016 +0700
----------------------------------------------------------------------
.../main/js/controllers/caches-controller.js | 30 +++-----------------
.../src/main/js/generator/generator-java.js | 2 +-
2 files changed, 5 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/c3dda4c7/modules/web-console/src/main/js/controllers/caches-controller.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/controllers/caches-controller.js b/modules/web-console/src/main/js/controllers/caches-controller.js
index 920b9f3..e8714e7 100644
--- a/modules/web-console/src/main/js/controllers/caches-controller.js
+++ b/modules/web-console/src/main/js/controllers/caches-controller.js
@@ -288,7 +288,7 @@ consoleModule.controller('cachesController', [
if (item.memoryMode === 'OFFHEAP_VALUES' && !_.isEmpty(item.domains))
return showPopoverMessage($scope.ui, 'memory', 'memoryMode', 'Query indexing could not be enabled while values are stored off-heap!');
- if (item.memoryMode === 'OFFHEAP_TIERED' && !$common.isDefined(item.offHeapMaxMemory))
+ if (item.memoryMode === 'OFFHEAP_TIERED' && (!$common.isDefined(item.offHeapMaxMemory) || item.offHeapMaxMemory < 0))
return showPopoverMessage($scope.ui, 'memory', 'offHeapMaxMemory', 'Off-heap max memory should be specified!');
const cacheStoreFactorySelected = item.cacheStoreFactory && item.cacheStoreFactory.kind;
@@ -297,37 +297,18 @@ consoleModule.controller('cachesController', [
const storeFactory = item.cacheStoreFactory[item.cacheStoreFactory.kind];
if (item.cacheStoreFactory.kind === 'CacheJdbcPojoStoreFactory') {
- if ($common.isEmptyString(storeFactory.dataSourceBean))
- return showPopoverMessage($scope.ui, 'store', 'dataSourceBean', 'Data source bean name should not be empty!');
-
- if (!$common.isValidJavaIdentifier('Data source bean', storeFactory.dataSourceBean, 'dataSourceBean', $scope.ui, 'store'))
+ if (!$common.isValidJavaIdentifier('Data source bean', storeFactory.dataSourceBean, 'pojoDataSourceBean', $scope.ui, 'store'))
return false;
- if (!storeFactory.dialect)
- return showPopoverMessage($scope.ui, 'store', 'pojoDialect', 'Dialect should not be empty!');
-
if (!checkDataSources())
return false;
}
if (item.cacheStoreFactory.kind === 'CacheJdbcBlobStoreFactory') {
- if (storeFactory.connectVia === 'URL') {
- if ($common.isEmptyString(storeFactory.connectionUrl))
- return showPopoverMessage($scope.ui, 'store', 'connectionUrl', 'Connection URL should not be empty!');
-
- if ($common.isEmptyString(storeFactory.user))
- return showPopoverMessage($scope.ui, 'store', 'user', 'User should not be empty!');
- }
- else {
- if ($common.isEmptyString(storeFactory.dataSourceBean))
- return showPopoverMessage($scope.ui, 'store', 'dataSourceBean', 'Data source bean name should not be empty!');
-
- if (!$common.isValidJavaIdentifier('Data source bean', storeFactory.dataSourceBean, 'dataSourceBean', $scope.ui, 'store'))
+ if (storeFactory.connectVia !== 'URL') {
+ if (!$common.isValidJavaIdentifier('Data source bean', storeFactory.dataSourceBean, 'blobDataSourceBean', $scope.ui, 'store'))
return false;
- if (!storeFactory.dialect)
- return showPopoverMessage($scope.ui, 'store', 'blobDialect', 'Database should not be empty!');
-
if (!checkDataSources())
return false;
}
@@ -348,9 +329,6 @@ consoleModule.controller('cachesController', [
if (item.writeBehindFlushSize === 0 && item.writeBehindFlushFrequency === 0)
return showPopoverMessage($scope.ui, 'store', 'writeBehindFlushSize', 'Both "Flush frequency" and "Flush size" are not allowed as 0!');
- if (item.cacheMode !== 'LOCAL' && item.rebalanceMode !== 'NONE' && item.rebalanceBatchSize === 0)
- return showPopoverMessage($scope.ui, 'rebalance', 'rebalanceBatchSize', 'Batch size should be more than 0 if rebalance mode is "SYNC" or "ASYNC" !', 10000);
-
return true;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/c3dda4c7/modules/web-console/src/main/js/generator/generator-java.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/generator/generator-java.js b/modules/web-console/src/main/js/generator/generator-java.js
index 6cb4e81..2df9a54 100644
--- a/modules/web-console/src/main/js/generator/generator-java.js
+++ b/modules/web-console/src/main/js/generator/generator-java.js
@@ -325,7 +325,7 @@ $generatorJava.multiparamProperty = function(res, varName, obj, propName, dataTy
res.startBlock(varName + '.' + $generatorJava.setterName(propName, setterName) + '(');
_.forEach(val, function(v, ix) {
- res.append($generatorJava.toJavaCode(v, dataType) + (ix < val.length - 1 ? ', ' : ''));
+ res.append($generatorJava.toJavaCode(dataType === 'class' ? res.importClass(v) : v, dataType) + (ix < val.length - 1 ? ', ' : ''));
});
res.endBlock(');');