You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by se...@apache.org on 2015/06/25 13:04:45 UTC
[2/3] incubator-ignite git commit: # IGNITE-843 Support 'dialect'.
# IGNITE-843 Support 'dialect'.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3bb4ca63
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3bb4ca63
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3bb4ca63
Branch: refs/heads/ignite-843
Commit: 3bb4ca63e48d08157da1926e85ff5a11aba51cca
Parents: da4bead
Author: sevdokimov <se...@jetbrains.com>
Authored: Thu Jun 25 12:45:03 2015 +0300
Committer: sevdokimov <se...@jetbrains.com>
Committed: Thu Jun 25 14:04:23 2015 +0300
----------------------------------------------------------------------
modules/webconfig/nodejs/utils/generatorJava.js | 27 +++++++++++++-------
.../webconfig/nodejs/utils/generatorUtils.js | 13 +++++++++-
modules/webconfig/nodejs/utils/generatorXml.js | 7 +++++
3 files changed, 37 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3bb4ca63/modules/webconfig/nodejs/utils/generatorJava.js
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/utils/generatorJava.js b/modules/webconfig/nodejs/utils/generatorJava.js
index c5d60d04..e534092 100644
--- a/modules/webconfig/nodejs/utils/generatorJava.js
+++ b/modules/webconfig/nodejs/utils/generatorJava.js
@@ -380,7 +380,7 @@ function toJavaCode(val, type) {
if (val == null)
return 'null';
- if (type == 'f')
+ if (type == 'float')
return val + 'f';
if (type == 'class')
@@ -462,14 +462,23 @@ function addBeanWithProperties(res, bean, objVarName, beanPropName, beanVarName,
var descr = props[propName];
if (descr) {
- if (descr.type == 'list') {
- addListProperty(res, bean, beanVarName, propName, descr.elementsType, descr.setterName);
- }
- else if (descr.type == 'enum') {
- addProperty(res, bean, beanVarName, propName, descr.enumClass, descr.setterName);
- }
- else {
- addProperty(res, bean, beanVarName, propName, null, descr.setterName);
+ switch (descr.type) {
+ case 'list':
+ addListProperty(res, bean, beanVarName, propName, descr.elementsType, descr.setterName);
+ break;
+
+ case 'enum':
+ addProperty(res, bean, beanVarName, propName, descr.enumClass, descr.setterName);
+ break;
+
+ case 'className':
+ if (bean[propName]) {
+ res.line(beanVarName + '.' + getSetterName(propName) + '(new ' + bean[propName] + '());');
+ }
+ break;
+
+ default:
+ addProperty(res, bean, beanVarName, propName, null, descr.setterName);
}
}
else {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3bb4ca63/modules/webconfig/nodejs/utils/generatorUtils.js
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/utils/generatorUtils.js b/modules/webconfig/nodejs/utils/generatorUtils.js
index 0b0fbe6..618c93b 100644
--- a/modules/webconfig/nodejs/utils/generatorUtils.js
+++ b/modules/webconfig/nodejs/utils/generatorUtils.js
@@ -122,10 +122,21 @@ exports.evictionPolicies = {
{batchSize: null, maxMemorySize: null, maxSize: null})
};
+exports.knownClasses = {
+
+
+ OracleDialect: new ClassDescriptor('org.apache.ignite.cache.store.jdbc.dialect.OracleDialect', {}),
+ BasicJdbcDialect: new ClassDescriptor('org.apache.ignite.cache.store.jdbc.dialect.BasicJdbcDialect', {}),
+ DB2Dialect: new ClassDescriptor('org.apache.ignite.cache.store.jdbc.dialect.DB2Dialect', {}),
+ SQLServerDialect: new ClassDescriptor('org.apache.ignite.cache.store.jdbc.dialect.SQLServerDialect', {}),
+ MySQLDialect: new ClassDescriptor('org.apache.ignite.cache.store.jdbc.dialect.MySQLDialect', {}),
+ H2Dialect: new ClassDescriptor('org.apache.ignite.cache.store.jdbc.dialect.H2Dialect', {})
+};
+
exports.storeFactories = {
CacheJdbcPojoStoreFactory: new ClassDescriptor('org.apache.ignite.cache.store.jdbc.CacheJdbcPojoStoreFactory', {
dataSourceBean: null,
- dialect: null
+ dialect: {type: 'className'}
}),
CacheJdbcBlobStoreFactory: new ClassDescriptor('org.apache.ignite.cache.store.jdbc.CacheJdbcBlobStoreFactory', {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3bb4ca63/modules/webconfig/nodejs/utils/generatorXml.js
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/utils/generatorXml.js b/modules/webconfig/nodejs/utils/generatorXml.js
index 52df1e8..f55d0a9 100644
--- a/modules/webconfig/nodejs/utils/generatorXml.js
+++ b/modules/webconfig/nodejs/utils/generatorXml.js
@@ -425,6 +425,13 @@ function addBeanWithProperties(res, bean, beanPropName, beanClass, props, create
if (descr.type == 'list') {
addListProperty(res, bean, propName, descr.setterName);
}
+ else if (descr.type == 'className') {
+ if (bean[propName]) {
+ res.startBlock('<property name="' + propName + '">');
+ res.line('<bean class="' + generatorUtils.knownClasses[bean[propName]].className + '"/>');
+ res.endBlock('</property>');
+ }
+ }
else {
addProperty(res, bean, propName, descr.setterName);
}