IGNITE-4622 Fixed generation in domain model for cache store. (cherry picked from commit 43007d5)
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/898fa150 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/898fa150 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/898fa150 Branch: refs/heads/ignite-1.9 Commit: 898fa150c7e2a663685abf37c6d1bcd547910f0e Parents: f5e601e Author: Andrey Novikov <[email protected]> Authored: Fri Jan 27 11:30:49 2017 +0700 Committer: Andrey Novikov <[email protected]> Committed: Fri Jan 27 11:32:48 2017 +0700 ---------------------------------------------------------------------- .../configuration/generator/ConfigurationGenerator.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/898fa150/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js b/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js index 8770bf6..abe361c 100644 --- a/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js +++ b/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js @@ -48,6 +48,10 @@ export default class IgniteConfigurationGenerator { return new Bean('org.apache.ignite.cache.QueryEntity', 'qryEntity', domain, cacheDflts); } + static domainJdbcTypeBean(domain) { + return new Bean('org.apache.ignite.cache.store.jdbc.JdbcType', 'type', domain); + } + static discoveryConfigurationBean(discovery) { return new Bean('org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi', 'discovery', discovery, clusterDflts.discovery); } @@ -1383,7 +1387,7 @@ export default class IgniteConfigurationGenerator { } // Generate domain model for store group. - static domainStore(domain, cfg = this.domainConfigurationBean(domain)) { + static domainStore(domain, cfg = this.domainJdbcTypeBean(domain)) { cfg.stringProperty('databaseSchema') .stringProperty('databaseTable'); @@ -1527,8 +1531,7 @@ export default class IgniteConfigurationGenerator { if (_.isNil(domain.databaseTable)) return acc; - const typeBean = new Bean('org.apache.ignite.cache.store.jdbc.JdbcType', 'type', - _.merge({}, domain, {cacheName: cache.name})) + const typeBean = this.domainJdbcTypeBean(_.merge({}, domain, {cacheName: cache.name})) .stringProperty('cacheName'); setType(typeBean, 'keyType');
