Repository: ignite Updated Branches: refs/heads/ignite-843-rc2 8b4175dda -> 38c17d6b6
IGNITE-2214 Fixed java code generation. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/38c17d6b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/38c17d6b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/38c17d6b Branch: refs/heads/ignite-843-rc2 Commit: 38c17d6b6d6a1602d73333d6658a588cafc1cf90 Parents: 8b4175d Author: Alexey Kuznetsov <[email protected]> Authored: Mon Dec 21 19:26:27 2015 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Mon Dec 21 19:26:27 2015 +0700 ---------------------------------------------------------------------- .../main/js/helpers/generator/generator-java.js | 21 +++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/38c17d6b/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 4ec98c1..ef43466 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 @@ -1087,16 +1087,23 @@ $generatorJava.cacheServerNearCache = function (cache, varName, res) { if (cache.cacheMode === 'PARTITIONED' && cache.nearCacheEnabled) { res.needEmptyLine = true; - res.importClass('org.apache.ignite.configuration.NearCacheConfiguration'); + if (cache.nearConfiguration) { + $generatorJava.declareVariable(res, 'nearCfg', 'org.apache.ignite.configuration.NearCacheConfiguration'); - $generatorJava.beanProperty(res, varName, cache.nearConfiguration, 'nearConfiguration', 'nearConfiguration', - 'NearCacheConfiguration', {nearStartSize: null}, true); + res.needEmptyLine = true; - if (cache.nearConfiguration && cache.nearConfiguration.nearEvictionPolicy && cache.nearConfiguration.nearEvictionPolicy.kind) { - $generatorJava.evictionPolicy(res, 'nearConfiguration', cache.nearConfiguration.nearEvictionPolicy, 'nearEvictionPolicy'); - } + if (cache.nearConfiguration.nearStartSize) { + $generatorJava.property(res, 'nearCfg', cache.nearConfiguration, 'nearStartSize'); - res.needEmptyLine = true; + res.needEmptyLine = true; + } + + if (cache.nearConfiguration.nearEvictionPolicy && cache.nearConfiguration.nearEvictionPolicy.kind) { + $generatorJava.evictionPolicy(res, 'nearCfg', cache.nearConfiguration.nearEvictionPolicy, 'nearEvictionPolicy'); + + res.needEmptyLine = true; + } + } } return res;
