refactor CachePluginManager
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/be31dc22 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/be31dc22 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/be31dc22 Branch: refs/heads/ignite-cacheplug-rmtvalid Commit: be31dc22a74ad2144432f2efc50c46b933677e46 Parents: a4ba0ad Author: Artem Shutak <[email protected]> Authored: Fri Apr 3 12:12:47 2015 +0300 Committer: Artem Shutak <[email protected]> Committed: Fri Apr 3 12:12:47 2015 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/GridCacheProcessor.java | 9 ++++----- .../internal/processors/plugin/CachePluginManager.java | 13 ++++++++++--- 2 files changed, 14 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/be31dc22/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index f1581be..2619156 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java @@ -1050,12 +1050,11 @@ public class GridCacheProcessor extends GridProcessorAdapter { pluginMgr.validate(); - CacheConflictResolutionManager rslvrMgr = pluginMgr.createComponent(ctx, cfg, - CacheConflictResolutionManager.class); + CacheConflictResolutionManager rslvrMgr = pluginMgr.createComponent(CacheConflictResolutionManager.class); - GridCacheDrManager drMgr = pluginMgr.createComponent(ctx, cfg,GridCacheDrManager.class); + GridCacheDrManager drMgr = pluginMgr.createComponent(GridCacheDrManager.class); - CacheStoreManager storeMgr = pluginMgr.createComponent(ctx, cfg, CacheStoreManager.class); + CacheStoreManager storeMgr = pluginMgr.createComponent(CacheStoreManager.class); storeMgr.initialize(cfgStore, sesHolders); @@ -1185,7 +1184,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { evictMgr = new GridCacheEvictionManager(); evtMgr = new GridCacheEventManager(); pluginMgr = new CachePluginManager(ctx, cfg); - drMgr = pluginMgr.createComponent(ctx, cfg, GridCacheDrManager.class); + drMgr = pluginMgr.createComponent(GridCacheDrManager.class); cacheCtx = new GridCacheContext( ctx, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/be31dc22/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/CachePluginManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/CachePluginManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/CachePluginManager.java index ab1ad1c..640271a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/CachePluginManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/CachePluginManager.java @@ -38,11 +38,20 @@ public class CachePluginManager extends GridCacheManagerAdapter { /** */ private final Map<CachePluginContext, CachePluginProvider> providersMap = new HashMap<>(); + /** */ + private final GridKernalContext ctx; + + /** */ + private final CacheConfiguration cfg; + /** * @param ctx Context. * @param cfg Cache config. */ public CachePluginManager(GridKernalContext ctx, CacheConfiguration cfg) { + this.ctx = ctx; + this.cfg = cfg; + if (cfg.getPluginConfigurations() != null) { for (CachePluginConfiguration cachePluginCfg : cfg.getPluginConfigurations()) { CachePluginContext pluginCtx = new GridCachePluginContext(ctx, cfg, cachePluginCfg); @@ -82,13 +91,11 @@ public class CachePluginManager extends GridCacheManagerAdapter { /** * Creates optional component. * - * @param ctx Kernal context. - * @param cfg Cache configuration. * @param cls Component class. * @return Created component. */ @SuppressWarnings("unchecked") - public <T> T createComponent(GridKernalContext ctx, CacheConfiguration cfg, Class<T> cls) { + public <T> T createComponent(Class<T> cls) { for (CachePluginProvider provider : providersList) { T res = (T)provider.createComponent(cls);
