ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject incubator-ignite git commit: ignite-598: rename CacheConfiguration # cachePluginConfigurations property to pluginConfiguration
Date Tue, 31 Mar 2015 16:16:42 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-598 62134cf93 -> 065cb898f


ignite-598: rename CacheConfiguration # cachePluginConfigurations property to pluginConfiguration


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/065cb898
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/065cb898
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/065cb898

Branch: refs/heads/ignite-598
Commit: 065cb898f3deb0988dee4e782899aa3bf23b0216
Parents: 62134cf
Author: Artem Shutak <ashutak@gridgain.com>
Authored: Tue Mar 31 19:16:40 2015 +0300
Committer: Artem Shutak <ashutak@gridgain.com>
Committed: Tue Mar 31 19:16:40 2015 +0300

----------------------------------------------------------------------
 .../ignite/configuration/CacheConfiguration.java      | 14 +++++++-------
 .../internal/processors/cache/GridCacheProcessor.java |  2 +-
 .../processors/plugin/CachePluginManager.java         | 10 +++++-----
 3 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/065cb898/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
index 8cc1102..6a52844 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
@@ -328,7 +328,7 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K,
V> {
     private boolean cpOnRead = DFLT_COPY_ON_READ;
 
     /** Cache plugin configurations. */
-    private CachePluginConfiguration[] cachePluginCfgs;
+    private CachePluginConfiguration[] pluginCfgs;
 
     /** Empty constructor (all values are initialized to their defaults). */
     public CacheConfiguration() {
@@ -413,7 +413,7 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K,
V> {
         writeBehindFlushSize = cc.getWriteBehindFlushSize();
         writeBehindFlushThreadCnt = cc.getWriteBehindFlushThreadCount();
         writeSync = cc.getWriteSynchronizationMode();
-        cachePluginCfgs = cc.getCachePluginConfigurations();
+        pluginCfgs = cc.getPluginConfiguration();
     }
 
     /**
@@ -1585,17 +1585,17 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K,
V> {
      *
      * @return Cache plugin configurations.
      */
-    public CachePluginConfiguration[] getCachePluginConfigurations() {
-        return cachePluginCfgs != null ? cachePluginCfgs : new CachePluginConfiguration[0];
+    public CachePluginConfiguration[] getPluginConfiguration() {
+        return pluginCfgs != null ? pluginCfgs : new CachePluginConfiguration[0];
     }
 
     /**
      * Sets cache plugin configurations.
      *
-     * @param cachePluginCfgs Cache plugin configurations.
+     * @param pluginCfgs Cache plugin configurations.
      */
-    public void setCachePluginConfigurations(CachePluginConfiguration... cachePluginCfgs)
{
-        this.cachePluginCfgs = cachePluginCfgs;
+    public void setCachePluginConfigurations(CachePluginConfiguration... pluginCfgs) {
+        this.pluginCfgs = pluginCfgs;
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/065cb898/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 eeecdf7..63d82ce 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
@@ -2027,7 +2027,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
         
         // TODO: implement remote configs valiudation.
         // Check plugin configurations.
-//        for (CachePluginConfiguration locPluginCcfg : locCfg.getCachePluginConfigurations())
{
+//        for (CachePluginConfiguration locPluginCcfg : locCfg.getPluginConfiguration())
{
 //            CachePluginProvider provider = ...;
 //
 //            provider.validateRemote(locCfg, locPluginCcfg, rmtCfg, rmtNode);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/065cb898/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 b8038f7..b8b3d47 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,8 +38,8 @@ public class CachePluginManager extends GridCacheManagerAdapter {
      * @param cfg Cache config.
      */
     public CachePluginManager(GridKernalContext ctx, CacheConfiguration cfg) {
-        if (cfg.getCachePluginConfigurations() != null) {
-            for (CachePluginConfiguration cachePluginCfg : cfg.getCachePluginConfigurations())
{
+        if (cfg.getPluginConfiguration() != null) {
+            for (CachePluginConfiguration cachePluginCfg : cfg.getPluginConfiguration())
{
                 CachePluginContext pluginCtx = new GridCachePluginContext(ctx, cfg, cachePluginCfg);
 
                 CachePluginProvider provider = cachePluginCfg.createProvider(pluginCtx);
@@ -80,8 +80,8 @@ public class CachePluginManager extends GridCacheManagerAdapter {
      */
     public static <C extends CachePluginConfiguration> C cachePluginConfiguration(
         CacheConfiguration cfg, Class<C> cl) {
-        if (cfg.getCachePluginConfigurations() != null) {
-            for (CachePluginConfiguration pluginCfg : cfg.getCachePluginConfigurations())
{
+        if (cfg.getPluginConfiguration() != null) {
+            for (CachePluginConfiguration pluginCfg : cfg.getPluginConfiguration()) {
                 if (pluginCfg.getClass() == cl)
                     return (C)pluginCfg;
             }
@@ -101,7 +101,7 @@ public class CachePluginManager extends GridCacheManagerAdapter {
 
         if (cfg.getCacheConfiguration() != null) {
             for (CacheConfiguration ccfg : cfg.getCacheConfiguration()) {
-                for (CachePluginConfiguration pluginCcfg : ccfg.getCachePluginConfigurations())
{
+                for (CachePluginConfiguration pluginCcfg : ccfg.getPluginConfiguration())
{
                     if (cls == pluginCcfg.getClass())
                         res.add((T)pluginCcfg);
                 }


Mime
View raw message