# ignite-556 minor
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5f5d8b09 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5f5d8b09 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5f5d8b09 Branch: refs/heads/ignite-45-gridcache Commit: 5f5d8b0936517d981599a9b924be1e32da51de2a Parents: f2ae2e7 Author: sboikov <sboi...@gridgain.com> Authored: Mon Mar 23 14:53:14 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Mon Mar 23 14:53:14 2015 +0300 ---------------------------------------------------------------------- .../internal/processors/spring/IgniteSpringProcessor.java | 7 +------ .../jdbc/GridCacheJdbcBlobStoreMultithreadedSelfTest.java | 2 +- .../managers/discovery/GridDiscoveryManagerSelfTest.java | 2 +- .../distributed/GridCacheClientModesAbstractSelfTest.java | 6 +++--- .../near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java | 2 +- .../distributed/near/GridCacheNearOnlyTopologySelfTest.java | 8 ++++---- .../lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java | 2 +- .../processors/spring/IgniteSpringProcessorImpl.java | 3 ++- 8 files changed, 14 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5f5d8b09/modules/core/src/main/java/org/apache/ignite/internal/processors/spring/IgniteSpringProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/spring/IgniteSpringProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/spring/IgniteSpringProcessor.java index 82ec0ac..6f607ad 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/spring/IgniteSpringProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/spring/IgniteSpringProcessor.java @@ -49,16 +49,11 @@ public interface IgniteSpringProcessor { /** * Loads all configurations with given type specified within given configuration file. - * <p> - * Usually Spring XML configuration file will contain only one Cache definition. Note that - * Cache configuration bean(s) is retrieved form configuration file by type, so the name of - * the Cache configuration bean is ignored. * * @param cfgUrl Configuration file path or URL. This cannot be {@code null}. * @param cl Required type of configuration. * @return Tuple containing all loaded configurations and Spring context used to load them. - * @throws IgniteCheckedException If configuration could not be - * read. + * @throws IgniteCheckedException If configuration could not be read. */ public <T> IgniteBiTuple<Collection<T>, ? extends GridSpringResourceContext> loadConfigurations( URL cfgUrl, Class<T> cl) throws IgniteCheckedException; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5f5d8b09/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/GridCacheJdbcBlobStoreMultithreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/GridCacheJdbcBlobStoreMultithreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/GridCacheJdbcBlobStoreMultithreadedSelfTest.java index d3bfb8d..22dd642 100644 --- a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/GridCacheJdbcBlobStoreMultithreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/GridCacheJdbcBlobStoreMultithreadedSelfTest.java @@ -64,7 +64,7 @@ public class GridCacheJdbcBlobStoreMultithreadedSelfTest extends GridCommonAbstr Ignite grid = startGrid(GRID_CNT - 2); - grid.createNearCache((String) null, new NearCacheConfiguration()); + grid.createNearCache(null, new NearCacheConfiguration()); grid = startGrid(GRID_CNT - 1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5f5d8b09/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerSelfTest.java index 4a6a4eb..6f7c935 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerSelfTest.java @@ -99,7 +99,7 @@ public class GridDiscoveryManagerSelfTest extends GridCommonAbstractTest { IgniteKernal g1 = (IgniteKernal)startGrid(1); // NEAR_ONLY cache. - grid(1).createNearCache((String) null, new NearCacheConfiguration()); + grid(1).createNearCache(null, new NearCacheConfiguration()); grid(1).createNearCache(CACHE_NAME, new NearCacheConfiguration()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5f5d8b09/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java index 8e16231..923eb22 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java @@ -50,11 +50,11 @@ public abstract class GridCacheClientModesAbstractSelfTest extends GridCacheAbst super.beforeTestsStarted(); - if (!clientOnly()) { - grid(nearOnlyGridName).createNearCache((String) null, new NearCacheConfiguration()); - } + if (!clientOnly()) + grid(nearOnlyGridName).createNearCache(null, new NearCacheConfiguration()); } + /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5f5d8b09/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java index c22692f..8923865 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java @@ -59,7 +59,7 @@ public class GridCacheNearOnlyMultiNodeFullApiSelfTest extends GridCachePartitio for (int i = 0; i < gridCount(); i++) { if (ignite(i).configuration().isClientMode()) { if (clientHasNearCache()) - ignite(i).createNearCache((String) null, new NearCacheConfiguration<>()); + ignite(i).createNearCache(null, new NearCacheConfiguration<>()); else ignite(i).jcache(null); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5f5d8b09/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java index 95442f4..30bba62 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java @@ -113,7 +113,7 @@ public class GridCacheNearOnlyTopologySelfTest extends GridCommonAbstractTest { Ignite ignite = startGrid(i); if (cilent) - ignite.createNearCache((String) null, new NearCacheConfiguration()); + ignite.createNearCache(null, new NearCacheConfiguration()); } for (int i = 0; i < 100; i++) @@ -135,7 +135,7 @@ public class GridCacheNearOnlyTopologySelfTest extends GridCommonAbstractTest { Ignite ignite = startGrid(i); if (cilent) - ignite.createNearCache((String) null, new NearCacheConfiguration()); + ignite.createNearCache(null, new NearCacheConfiguration()); } cache = false; @@ -166,7 +166,7 @@ public class GridCacheNearOnlyTopologySelfTest extends GridCommonAbstractTest { Ignite ignite = startGrid(i); if (cilent) - ignite.createNearCache((String) null, new NearCacheConfiguration()); + ignite.createNearCache(null, new NearCacheConfiguration()); } for (int i = 0; i < 10; i++) @@ -239,7 +239,7 @@ public class GridCacheNearOnlyTopologySelfTest extends GridCommonAbstractTest { Ignite ignite = startGrid(i); if (cilent) - ignite.createNearCache((String) null, new NearCacheConfiguration()); + ignite.createNearCache(null, new NearCacheConfiguration()); } } finally { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5f5d8b09/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java index b7704f3..205cac2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java @@ -139,7 +139,7 @@ public class GridCacheNearOnlyLruNearEvictionPolicySelfTest extends GridCommonAb NearCacheConfiguration nearCfg = new NearCacheConfiguration(); nearCfg.setNearEvictionPolicy(new CacheLruEvictionPolicy(EVICTION_MAX_SIZE)); - grid(0).createNearCache((String) null, nearCfg); + grid(0).createNearCache(null, nearCfg); int cnt = 1000; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5f5d8b09/modules/spring/src/main/java/org/apache/ignite/internal/processors/spring/IgniteSpringProcessorImpl.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/main/java/org/apache/ignite/internal/processors/spring/IgniteSpringProcessorImpl.java b/modules/spring/src/main/java/org/apache/ignite/internal/processors/spring/IgniteSpringProcessorImpl.java index 263ae17..0a2521a 100644 --- a/modules/spring/src/main/java/org/apache/ignite/internal/processors/spring/IgniteSpringProcessorImpl.java +++ b/modules/spring/src/main/java/org/apache/ignite/internal/processors/spring/IgniteSpringProcessorImpl.java @@ -96,7 +96,7 @@ public class IgniteSpringProcessorImpl implements IgniteSpringProcessor { } if (cfgMap == null || cfgMap.isEmpty()) - throw new IgniteCheckedException("Failed to find cache configuration in: " + cfgUrl); + throw new IgniteCheckedException("Failed to find configuration in: " + cfgUrl); return F.t(cfgMap.values(), new GridSpringResourceContextImpl(springCtx)); } @@ -216,6 +216,7 @@ public class IgniteSpringProcessorImpl implements IgniteSpringProcessor { * @param cfgUrl Resource where config file is located. * @param excludedProps Properties to be excluded. * @return Spring application context. + * @throws IgniteCheckedException If configuration could not be read. */ public static ApplicationContext applicationContext(URL cfgUrl, final String... excludedProps) throws IgniteCheckedException { try {
