IGNITE-1026 - Dynamic cache start fixes
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8ff3619b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8ff3619b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8ff3619b Branch: refs/heads/ignite-1056 Commit: 8ff3619bae65018958c61a3299a415e595dd16c4 Parents: 378e344 Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Wed Jul 1 18:51:51 2015 -0700 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Wed Jul 1 18:51:51 2015 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/ignite/Ignite.java | 2 +- .../IgniteCacheConfigurationTemplateTest.java | 26 +++----------------- .../cache/IgniteDynamicCacheStartSelfTest.java | 12 ++------- .../IgniteDynamicClientCacheStartSelfTest.java | 5 ++-- 4 files changed, 9 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8ff3619b/modules/core/src/main/java/org/apache/ignite/Ignite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/Ignite.java b/modules/core/src/main/java/org/apache/ignite/Ignite.java index 209946b..7103b1b 100644 --- a/modules/core/src/main/java/org/apache/ignite/Ignite.java +++ b/modules/core/src/main/java/org/apache/ignite/Ignite.java @@ -308,7 +308,7 @@ public interface Ignite extends AutoCloseable { * @param name Cache name. * @return Instance of the cache for the specified name. */ - public <K, V> IgniteCache<K, V> cache(@Nullable String name); + @Nullable public <K, V> IgniteCache<K, V> cache(@Nullable String name); /** * Gets grid transactions facade. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8ff3619b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationTemplateTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationTemplateTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationTemplateTest.java index 937a3b4..1085411 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationTemplateTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationTemplateTest.java @@ -420,29 +420,9 @@ public class IgniteCacheConfigurationTemplateTest extends GridCommonAbstractTest } }, IllegalStateException.class, null); - GridTestUtils.assertThrows(log, new Callable<Void>() { - @Override public Void call() throws Exception { - ignite.cache(TEMPLATE1); - - return null; - } - }, IllegalArgumentException.class, null); - - GridTestUtils.assertThrows(log, new Callable<Void>() { - @Override public Void call() throws Exception { - ignite.cache(TEMPLATE2); - - return null; - } - }, IllegalArgumentException.class, null); - - GridTestUtils.assertThrows(log, new Callable<Void>() { - @Override public Void call() throws Exception { - ignite.cache(TEMPLATE3); - - return null; - } - }, IllegalArgumentException.class, null); + assertNull(ignite.cache(TEMPLATE1)); + assertNull(ignite.cache(TEMPLATE2)); + assertNull(ignite.cache(TEMPLATE3)); } } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8ff3619b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java index e7b0ba5..cd19703 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java @@ -310,11 +310,7 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest { for (IgniteInternalFuture f : kernal0.context().cache().context().exchange().exchangeFutures()) f.get(); - GridTestUtils.assertThrows(log, new Callable<Object>() { - @Override public Object call() throws Exception { - return kernal0.cache(DYNAMIC_CACHE_NAME); - } - }, IllegalArgumentException.class, null); + assertNull(kernal0.cache(DYNAMIC_CACHE_NAME)); GridTestUtils.assertThrows(log, new Callable<Object>() { @Override public Object call() throws Exception { @@ -368,11 +364,7 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest { for (IgniteInternalFuture f : kernal0.context().cache().context().exchange().exchangeFutures()) f.get(); - GridTestUtils.assertThrows(log, new Callable<Object>() { - @Override public Object call() throws Exception { - return kernal0.cache(DYNAMIC_CACHE_NAME); - } - }, IllegalArgumentException.class, null); + assertNull(kernal0.cache(DYNAMIC_CACHE_NAME)); } } finally { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8ff3619b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicClientCacheStartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicClientCacheStartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicClientCacheStartSelfTest.java index 24935c7..abada13 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicClientCacheStartSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicClientCacheStartSelfTest.java @@ -30,6 +30,7 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.testframework.*; import org.apache.ignite.testframework.junits.common.*; +import javax.cache.*; import java.util.concurrent.*; import static org.apache.ignite.cache.CacheMode.*; @@ -139,7 +140,7 @@ public class IgniteDynamicClientCacheStartSelfTest extends GridCommonAbstractTes return null; } - }, IgniteException.class, null); + }, CacheException.class, null); checkCache(ignite1, cacheName, false, false); @@ -149,7 +150,7 @@ public class IgniteDynamicClientCacheStartSelfTest extends GridCommonAbstractTes return null; } - }, IgniteException.class, null); + }, CacheException.class, null); checkCache(ignite1, cacheName, false, false); }
