IGNITE-5683 Fixed missing fully qualified class names for generated indexed types on Models screen.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d8461977 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d8461977 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d8461977 Branch: refs/heads/ignite-2.1.2-exchange Commit: d84619775e3960f30890a467b897315deed20ab7 Parents: 211caf1 Author: Alexey Kuznetsov <[email protected]> Authored: Tue Jul 4 15:44:27 2017 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Tue Jul 4 15:44:27 2017 +0700 ---------------------------------------------------------------------- .../configuration/generator/ConfigurationGenerator.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/d8461977/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 a903ec4..f850dce 100644 --- a/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js +++ b/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js @@ -1653,8 +1653,11 @@ export default class IgniteConfigurationGenerator { static domainModelGeneral(domain, cfg = this.domainConfigurationBean(domain)) { switch (cfg.valueOf('queryMetadata')) { case 'Annotations': - if (_.nonNil(domain.keyType) && _.nonNil(domain.valueType)) - cfg.varArgProperty('indexedTypes', 'indexedTypes', [domain.keyType, domain.valueType], 'java.lang.Class'); + if (_.nonNil(domain.keyType) && _.nonNil(domain.valueType)) { + cfg.varArgProperty('indexedTypes', 'indexedTypes', + [javaTypes.fullClassName(domain.keyType), javaTypes.fullClassName(domain.valueType)], + 'java.lang.Class'); + } break; case 'Configuration': @@ -1864,7 +1867,7 @@ export default class IgniteConfigurationGenerator { static cacheQuery(cache, domains, available, ccfg = this.cacheConfigurationBean(cache)) { const indexedTypes = _.reduce(domains, (acc, domain) => { if (domain.queryMetadata === 'Annotations') - acc.push(domain.keyType, domain.valueType); + acc.push(javaTypes.fullClassName(domain.keyType), javaTypes.fullClassName(domain.valueType)); return acc; }, []);
