Repository: incubator-ignite Updated Branches: refs/heads/ignite-843 36063e133 -> e92d9cc56
IGNITE-843 Fixed marshaller XML and java generation. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e92d9cc5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e92d9cc5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e92d9cc5 Branch: refs/heads/ignite-843 Commit: e92d9cc565a18d0285b6a951b777067b605f942a Parents: 36063e1 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Thu Jul 9 13:16:06 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Thu Jul 9 13:16:06 2015 +0700 ---------------------------------------------------------------------- .../nodejs/controllers/clusters-controller.js | 4 ++-- .../nodejs/routes/generator/common.js | 9 ++++++++- .../nodejs/routes/generator/java.js | 20 ++++++++++++++------ .../nodejs/routes/generator/xml.js | 18 ++++++++++++------ 4 files changed, 36 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e92d9cc5/modules/web-control-center/nodejs/controllers/clusters-controller.js ---------------------------------------------------------------------- diff --git a/modules/web-control-center/nodejs/controllers/clusters-controller.js b/modules/web-control-center/nodejs/controllers/clusters-controller.js index c41ab9e..8f26341 100644 --- a/modules/web-control-center/nodejs/controllers/clusters-controller.js +++ b/modules/web-control-center/nodejs/controllers/clusters-controller.js @@ -82,8 +82,8 @@ controlCenterModule.controller('clustersController', ['$scope', '$alert', '$http ]; $scope.marshallers = [ - {value: 'JdkMarshaller', label: 'JdkMarshaller'}, - {value: 'OptimizedMarshaller', label: 'OptimizedMarshaller'} + {value: 'OptimizedMarshaller', label: 'OptimizedMarshaller'}, + {value: 'JdkMarshaller', label: 'JdkMarshaller'} ]; $scope.clusters = []; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e92d9cc5/modules/web-control-center/nodejs/routes/generator/common.js ---------------------------------------------------------------------- diff --git a/modules/web-control-center/nodejs/routes/generator/common.js b/modules/web-control-center/nodejs/routes/generator/common.js index 763088c..42af90d 100644 --- a/modules/web-control-center/nodejs/routes/generator/common.js +++ b/modules/web-control-center/nodejs/routes/generator/common.js @@ -147,7 +147,6 @@ exports.builder = function () { function ClassDescriptor(className, fields) { this.className = className; - this.fields = fields; } @@ -161,6 +160,14 @@ exports.evictionPolicies = { {batchSize: null, maxMemorySize: null, maxSize: null}) }; +exports.marshallers = { + OptimizedMarshaller: new ClassDescriptor('org.apache.ignite.marshaller.optimized.OptimizedMarshaller', { + poolSize: null, + requireSerializable: null + }), + JdkMarshaller: new ClassDescriptor('org.apache.ignite.marshaller.jdk.JdkMarshaller', {}) +}; + exports.knownClasses = { Oracle: new ClassDescriptor('org.apache.ignite.cache.store.jdbc.dialect.OracleDialect', {}), DB2: new ClassDescriptor('org.apache.ignite.cache.store.jdbc.dialect.DB2Dialect', {}), http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e92d9cc5/modules/web-control-center/nodejs/routes/generator/java.js ---------------------------------------------------------------------- diff --git a/modules/web-control-center/nodejs/routes/generator/java.js b/modules/web-control-center/nodejs/routes/generator/java.js index 037df10..ad0fbaf 100644 --- a/modules/web-control-center/nodejs/routes/generator/java.js +++ b/modules/web-control-center/nodejs/routes/generator/java.js @@ -228,9 +228,20 @@ exports.generateClusterConfiguration = function(cluster, generateJavaClass) { res.needEmptyLine = true; + var marshaller = cluster.marshaller; + + if (marshaller && marshaller.kind) { + var marshallerDesc = generatorUtils.marshallers[marshaller.kind]; + + addBeanWithProperties(res, marshaller[marshaller.kind], 'cfg', 'marshaller', 'marshaller', + marshallerDesc.className, marshallerDesc.fields, true); + + addBeanWithProperties(res, marshaller[marshaller.kind], 'marshaller', marshallerDesc.className, marshallerDesc.fields, true); + } + addProperty(res, cluster, 'cfg', 'marshalLocalJobs'); - addProperty(res, cluster, 'cfg', 'marshCacheKeepAliveTime'); - addProperty(res, cluster, 'cfg', 'marshCachePoolSize'); + addProperty(res, cluster, 'cfg', 'marshallerCacheKeepAliveTime'); + addProperty(res, cluster, 'cfg', 'marshallerCacheThreadPoolSize'); res.needEmptyLine = true; @@ -529,10 +540,7 @@ function addMultiparamProperty(res, obj, objVariableName, propName, type, setter } function addBeanWithProperties(res, bean, objVarName, beanPropName, beanVarName, beanClass, props, createBeanAlthoughNoProps) { - if (!bean) - return; - - if (generatorUtils.hasProperty(bean, props)) { + if (bean && generatorUtils.hasProperty(bean, props)) { if (!res.emptyLineIfNeeded()) { res.line(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e92d9cc5/modules/web-control-center/nodejs/routes/generator/xml.js ---------------------------------------------------------------------- diff --git a/modules/web-control-center/nodejs/routes/generator/xml.js b/modules/web-control-center/nodejs/routes/generator/xml.js index 500a7e7..d926adc 100644 --- a/modules/web-control-center/nodejs/routes/generator/xml.js +++ b/modules/web-control-center/nodejs/routes/generator/xml.js @@ -187,9 +187,18 @@ exports.generateClusterConfiguration = function(cluster) { } // Generate marshaller group. + var marshaller = cluster.marshaller; + + if (marshaller && marshaller.kind) { + var marshallerDesc = generatorUtils.marshallers[marshaller.kind]; + + addBeanWithProperties(res, marshaller[marshaller.kind], 'marshaller', marshallerDesc.className, marshallerDesc.fields, true); + res.needEmptyLine = true; + } + addProperty(res, cluster, 'marshalLocalJobs'); - addProperty(res, cluster, 'marshCacheKeepAliveTime'); - addProperty(res, cluster, 'marshCachePoolSize'); + addProperty(res, cluster, 'marshallerCacheKeepAliveTime'); + addProperty(res, cluster, 'marshallerCacheThreadPoolSize'); res.needEmptyLine = true; // Generate metrics group. @@ -457,10 +466,7 @@ function addProperty(res, obj, propName, setterName) { } function addBeanWithProperties(res, bean, beanPropName, beanClass, props, createBeanAlthoughNoProps) { - if (!bean) - return; - - if (generatorUtils.hasProperty(bean, props)) { + if (bean && generatorUtils.hasProperty(bean, props)) { res.emptyLineIfNeeded(); res.startBlock('<property name="' + beanPropName + '">'); res.startBlock('<bean class="' + beanClass + '">');
