http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java index b5ccfe0..a1d6922 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java @@ -256,7 +256,7 @@ public class GridCacheDhtPreloadUnloadSelfTest extends GridCommonAbstractTest { @IgniteInstanceResource private Ignite ignite; - @Override public void onLifecycleEvent(LifecycleEventType evt) throws GridException { + @Override public void onLifecycleEvent(LifecycleEventType evt) throws IgniteCheckedException { if (evt == LifecycleEventType.AFTER_GRID_START) { GridCache<Integer, String> c = ignite.cache(null); @@ -292,9 +292,9 @@ public class GridCacheDhtPreloadUnloadSelfTest extends GridCommonAbstractTest { /** * @param c Cache. * @param cnt Key count. - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ - private void populate(GridCache<Integer, String> c, int cnt) throws GridException { + private void populate(GridCache<Integer, String> c, int cnt) throws IgniteCheckedException { for (int i = 0; i < cnt; i++) c.put(i, value(1024)); }
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtTestUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtTestUtils.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtTestUtils.java index a54920b..1931faf 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtTestUtils.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtTestUtils.java @@ -48,10 +48,10 @@ public class GridCacheDhtTestUtils { /** * @param dht Cache. * @param keyCnt Number of test keys to put into cache. - * @throws GridException If failed to prepare. + * @throws IgniteCheckedException If failed to prepare. */ @SuppressWarnings({"UnusedAssignment", "unchecked"}) - static void prepareKeys(GridDhtCache<Integer, String> dht, int keyCnt) throws GridException { + static void prepareKeys(GridDhtCache<Integer, String> dht, int keyCnt) throws IgniteCheckedException { GridCacheAffinityFunction aff = dht.context().config().getAffinity(); GridCacheConcurrentMap<Integer, String> cacheMap; @@ -64,7 +64,7 @@ public class GridCacheDhtTestUtils { cacheMap = (GridCacheConcurrentMap<Integer, String>)field.get(dht); } catch (Exception e) { - throw new GridException("Failed to get cache map.", e); + throw new IgniteCheckedException("Failed to get cache map.", e); } GridDhtPartitionTopology<Integer,String> top = dht.topology(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheGroupLockPartitionedAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheGroupLockPartitionedAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheGroupLockPartitionedAbstractSelfTest.java index 0a60caf..00d2a00 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheGroupLockPartitionedAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheGroupLockPartitionedAbstractSelfTest.java @@ -9,7 +9,7 @@ package org.gridgain.grid.kernal.processors.cache.distributed.dht; -import org.gridgain.grid.*; +import org.apache.ignite.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.affinity.*; import org.gridgain.grid.kernal.processors.cache.*; @@ -121,7 +121,7 @@ public abstract class GridCacheGroupLockPartitionedAbstractSelfTest extends Grid return null; } - }, GridException.class, null); + }, IgniteCheckedException.class, null); } } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheGroupLockPartitionedMultiNodeAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheGroupLockPartitionedMultiNodeAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheGroupLockPartitionedMultiNodeAbstractSelfTest.java index e8c1af0..12a7cbd 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheGroupLockPartitionedMultiNodeAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheGroupLockPartitionedMultiNodeAbstractSelfTest.java @@ -62,7 +62,7 @@ public abstract class GridCacheGroupLockPartitionedMultiNodeAbstractSelfTest ext fail("Exception should be thrown."); } - catch (GridException ignored) { + catch (IgniteCheckedException ignored) { // Expected exception. } finally { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java index 81aa4a3..f5de2a3 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java @@ -163,7 +163,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra node.cache(null).unlock(key); } } - catch (GridException e) { + catch (IgniteCheckedException e) { info(">>> Failed to perform lock [key=" + key + ", e=" + e + ']'); } catch (InterruptedException ignored) { @@ -257,7 +257,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra tx.commit(); } } - catch (GridException e) { + catch (IgniteCheckedException e) { info("Failed to run tx for key [key=" + key + ", e=" + e + ']'); } catch (InterruptedException ignored) { @@ -327,7 +327,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra tx.commit(); } } - catch (GridException e) { + catch (IgniteCheckedException e) { info(">>> Failed to execute tx on new topology [key=" + key + ", e=" + e + ']'); } } @@ -409,7 +409,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra tx.commit(); } } - catch (GridException e) { + catch (IgniteCheckedException e) { info("Failed to run tx for key [key=" + key + ", e=" + e + ']'); } catch (InterruptedException ignored) { @@ -461,7 +461,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra tx.commit(); } } - catch (GridException e) { + catch (IgniteCheckedException e) { info(">>> Failed to execute tx on new topology [key=" + key + ", e=" + e + ']'); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicSelfTest.java index e992938..252ac3a 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicSelfTest.java @@ -9,8 +9,8 @@ package org.gridgain.grid.kernal.processors.cache.distributed.dht.atomic; +import org.apache.ignite.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.util.typedef.internal.*; @@ -69,8 +69,8 @@ public class GridCacheValueConsistencyAtomicSelfTest extends GridCacheValueConsi cache.transform(i, new Transformer(i)); } } - catch (GridException e) { - throw new GridRuntimeException(e); + catch (IgniteCheckedException e) { + throw new IgniteException(e); } } }, threadCnt, "runner"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheGetStoreErrorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheGetStoreErrorSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheGetStoreErrorSelfTest.java index a452a4d..e7aa359 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheGetStoreErrorSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheGetStoreErrorSelfTest.java @@ -9,13 +9,13 @@ package org.gridgain.grid.kernal.processors.cache.distributed.near; +import org.apache.ignite.*; import org.apache.ignite.configuration.*; -import org.gridgain.grid.*; -import org.gridgain.grid.cache.*; -import org.gridgain.grid.cache.store.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; +import org.gridgain.grid.cache.*; +import org.gridgain.grid.cache.store.*; import org.gridgain.testframework.*; import org.gridgain.testframework.junits.common.*; import org.jetbrains.annotations.*; @@ -24,8 +24,8 @@ import java.util.concurrent.*; import static org.apache.ignite.events.IgniteEventType.*; import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; -import static org.gridgain.grid.cache.GridCacheMode.*; import static org.gridgain.grid.cache.GridCacheDistributionMode.*; +import static org.gridgain.grid.cache.GridCacheMode.*; /** * Checks that exception is propagated to user when cache store throws an exception. @@ -58,8 +58,8 @@ public class GridCacheGetStoreErrorSelfTest extends GridCommonAbstractTest { cc.setStore(new GridCacheStoreAdapter<Object, Object>() { @Override public Object load(@Nullable GridCacheTx tx, Object key) - throws GridException { - throw new GridException("Failed to get key from store: " + key); + throws IgniteCheckedException { + throw new IgniteCheckedException("Failed to get key from store: " + key); } @Override public void put(@Nullable GridCacheTx tx, Object key, @@ -113,7 +113,7 @@ public class GridCacheGetStoreErrorSelfTest extends GridCommonAbstractTest { return null; } - }, GridException.class, null); + }, IgniteCheckedException.class, null); } finally { stopAllGrids(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java index e552d88..cc37f13 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java @@ -270,7 +270,7 @@ public class GridCacheNearMultiGetSelfTest extends GridCommonAbstractTest { try { tx.rollback(); } - catch (GridException ex) { + catch (IgniteCheckedException ex) { error("Failed to rollback optimistic failure: " + tx, ex); throw ex; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java index 6573322..4a53985 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java @@ -927,7 +927,7 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ - @Override public String load(GridCacheTx tx, Integer key) throws GridException { + @Override public String load(GridCacheTx tx, Integer key) throws IgniteCheckedException { if (!create) return map.get(key); @@ -938,12 +938,12 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest { /** {@inheritDoc} */ @Override public void put(GridCacheTx tx, Integer key, @Nullable String val) - throws GridException { + throws IgniteCheckedException { map.put(key, val); } /** {@inheritDoc} */ - @Override public void remove(GridCacheTx tx, Integer key) throws GridException { + @Override public void remove(GridCacheTx tx, Integer key) throws IgniteCheckedException { map.remove(key); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java index 4379eb1..10d438d 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java @@ -9,20 +9,20 @@ package org.gridgain.grid.kernal.processors.cache.distributed.near; +import org.apache.ignite.*; import org.apache.ignite.configuration.*; -import org.gridgain.grid.*; -import org.gridgain.grid.cache.*; -import org.gridgain.grid.cache.store.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; +import org.gridgain.grid.cache.*; +import org.gridgain.grid.cache.store.*; import org.gridgain.testframework.junits.common.*; import org.jetbrains.annotations.*; import java.util.concurrent.*; import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; -import static org.gridgain.grid.cache.GridCacheMode.*; import static org.gridgain.grid.cache.GridCacheDistributionMode.*; +import static org.gridgain.grid.cache.GridCacheMode.*; import static org.gridgain.grid.cache.GridCacheTxConcurrency.*; import static org.gridgain.grid.cache.GridCacheTxIsolation.*; @@ -347,7 +347,7 @@ public class GridCacheNearOneNodeSelfTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ - @Override public String load(GridCacheTx tx, Integer key) throws GridException { + @Override public String load(GridCacheTx tx, Integer key) throws IgniteCheckedException { if (!create) return map.get(key); @@ -358,12 +358,12 @@ public class GridCacheNearOneNodeSelfTest extends GridCommonAbstractTest { /** {@inheritDoc} */ @Override public void put(GridCacheTx tx, Integer key, @Nullable String val) - throws GridException { + throws IgniteCheckedException { map.put(key, val); } /** {@inheritDoc} */ - @Override public void remove(GridCacheTx tx, Integer key) throws GridException { + @Override public void remove(GridCacheTx tx, Integer key) throws IgniteCheckedException { map.remove(key); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java index df7856d..3324838 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java @@ -9,10 +9,10 @@ package org.gridgain.grid.kernal.processors.cache.distributed.near; +import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.cache.*; @@ -23,10 +23,10 @@ import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; +import static org.apache.ignite.events.IgniteEventType.*; import static org.gridgain.grid.cache.GridCacheAtomicWriteOrderMode.*; import static org.gridgain.grid.cache.GridCacheDistributionMode.*; import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; -import static org.apache.ignite.events.IgniteEventType.*; import static org.gridgain.grid.kernal.processors.cache.GridCacheUtils.*; /** @@ -120,7 +120,7 @@ public class GridCacheNearOnlyMultiNodeFullApiSelfTest extends GridCachePartitio * {@inheritDoc} */ @Override protected List<String> primaryKeysForCache(GridCacheProjection<String, Integer> cache, int cnt) - throws GridException { + throws IgniteCheckedException { return cache.equals(cache()) ? super.primaryKeysForCache(fullCache(), cnt) : super.primaryKeysForCache(cache, cnt); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearReaderPreloadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearReaderPreloadSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearReaderPreloadSelfTest.java index 96f2c6f..17a6c36 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearReaderPreloadSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearReaderPreloadSelfTest.java @@ -109,7 +109,7 @@ public class GridCacheNearReaderPreloadSelfTest extends GridCommonAbstractTest { * @param ipFinder IP finder. * @param gridName Grid name. * @return Configuration for data node. - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ private IgniteConfiguration dataNode(TcpDiscoveryIpFinder ipFinder, String gridName) throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedAffinityHashIdResolverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedAffinityHashIdResolverSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedAffinityHashIdResolverSelfTest.java index 5ff02e2..2a3a5a2 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedAffinityHashIdResolverSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedAffinityHashIdResolverSelfTest.java @@ -9,15 +9,15 @@ package org.gridgain.grid.kernal.processors.cache.distributed.near; +import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; -import org.gridgain.grid.*; -import org.gridgain.grid.cache.*; -import org.gridgain.grid.cache.affinity.*; -import org.gridgain.grid.cache.affinity.consistenthash.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; +import org.gridgain.grid.cache.*; +import org.gridgain.grid.cache.affinity.*; +import org.gridgain.grid.cache.affinity.consistenthash.*; import org.gridgain.testframework.*; import org.gridgain.testframework.junits.common.*; @@ -83,7 +83,7 @@ public class GridCachePartitionedAffinityHashIdResolverSelfTest extends GridComm return null; } - }, GridException.class, "Failed to start manager: GridManagerAdapter [enabled=true, name=" + + }, IgniteCheckedException.class, "Failed to start manager: GridManagerAdapter [enabled=true, name=" + "org.gridgain.grid.kernal.managers.discovery.GridDiscoveryManager]"); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java index 0d7b927..0365878 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java @@ -107,7 +107,7 @@ public class GridCachePartitionedAffinitySelfTest extends GridCommonAbstractTest /** Test predefined affinity - must be ported to all clients. */ @SuppressWarnings("UnaryPlus") - public void testPredefined() throws GridException { + public void testPredefined() throws IgniteCheckedException { GridCacheConsistentHashAffinityFunction aff = new GridCacheConsistentHashAffinityFunction(); getTestResources().inject(aff); @@ -209,7 +209,7 @@ public class GridCachePartitionedAffinitySelfTest extends GridCommonAbstractTest /** Test predefined affinity - must be ported to other clients. */ @SuppressWarnings("UnaryPlus") - public void testPredefinedHashIdResolver() throws GridException { + public void testPredefinedHashIdResolver() throws IgniteCheckedException { // Use Md5 hasher for this test. GridCacheConsistentHashAffinityFunction aff = new GridCacheConsistentHashAffinityFunction(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedClientOnlyNoPrimaryFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedClientOnlyNoPrimaryFullApiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedClientOnlyNoPrimaryFullApiSelfTest.java index 7851577..e99ec37 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedClientOnlyNoPrimaryFullApiSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedClientOnlyNoPrimaryFullApiSelfTest.java @@ -9,9 +9,9 @@ package org.gridgain.grid.kernal.processors.cache.distributed.near; +import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.util.typedef.*; @@ -46,7 +46,7 @@ public class GridCachePartitionedClientOnlyNoPrimaryFullApiSelfTest extends Grid @Override protected IgniteClosure<Throwable, Throwable> errorHandler() { return new IgniteClosure<Throwable, Throwable>() { @Override public Throwable apply(Throwable e) { - if (e instanceof GridException || X.hasCause(e, ClusterTopologyException.class)) { + if (e instanceof IgniteCheckedException || X.hasCause(e, ClusterTopologyException.class)) { info("Discarding exception: " + e); return null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedLoadCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedLoadCacheSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedLoadCacheSelfTest.java index 5e0b1ba..a4c1b1d 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedLoadCacheSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedLoadCacheSelfTest.java @@ -9,14 +9,14 @@ package org.gridgain.grid.kernal.processors.cache.distributed.near; +import org.apache.ignite.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; -import org.gridgain.grid.cache.*; -import org.gridgain.grid.cache.store.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; +import org.gridgain.grid.cache.*; +import org.gridgain.grid.cache.store.*; import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.testframework.junits.common.*; import org.jetbrains.annotations.*; @@ -103,7 +103,7 @@ public class GridCachePartitionedLoadCacheSelfTest extends GridCommonAbstractTes private static class TestStore extends GridCacheStoreAdapter<Integer, String> { /** {@inheritDoc} */ @Override public void loadCache(IgniteBiInClosure<Integer, String> clo, - @Nullable Object... args) throws GridException { + @Nullable Object... args) throws IgniteCheckedException { assert clo != null; assert args != null; @@ -116,19 +116,19 @@ public class GridCachePartitionedLoadCacheSelfTest extends GridCommonAbstractTes } /** {@inheritDoc} */ - @Override public String load(GridCacheTx tx, Integer key) throws GridException { + @Override public String load(GridCacheTx tx, Integer key) throws IgniteCheckedException { // No-op. return null; } /** {@inheritDoc} */ - @Override public void put(GridCacheTx tx, Integer key, String val) throws GridException { + @Override public void put(GridCacheTx tx, Integer key, String val) throws IgniteCheckedException { // No-op. } /** {@inheritDoc} */ - @Override public void remove(GridCacheTx tx, Integer key) throws GridException { + @Override public void remove(GridCacheTx tx, Integer key) throws IgniteCheckedException { // No-op. } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedLockSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedLockSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedLockSelfTest.java index 90adb65..a50239d 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedLockSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedLockSelfTest.java @@ -51,9 +51,9 @@ public class GridCachePartitionedLockSelfTest extends GridCacheLockAbstractTest } /** - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ - public void testLockAtomicCache() throws GridException { + public void testLockAtomicCache() throws IgniteCheckedException { IgniteConfiguration cfg = new IgniteConfiguration(); cfg.setGridName(getTestGridName(0)); @@ -66,13 +66,13 @@ public class GridCachePartitionedLockSelfTest extends GridCacheLockAbstractTest @Override public Object call() throws Exception { return g0.cache(null).lock(1, Long.MAX_VALUE); } - }, GridException.class, "Locks are not supported"); + }, IgniteCheckedException.class, "Locks are not supported"); GridTestUtils.assertThrows(log, new Callable<Object>() { @Override public Object call() throws Exception { return g0.cache(null).lockAll(Arrays.asList(1), Long.MAX_VALUE); } - }, GridException.class, "Locks are not supported"); + }, IgniteCheckedException.class, "Locks are not supported"); final IgniteFuture<Boolean> lockFut1 = g0.cache(null).lockAsync(1, Long.MAX_VALUE); @@ -80,7 +80,7 @@ public class GridCachePartitionedLockSelfTest extends GridCacheLockAbstractTest @Override public Object call() throws Exception { return lockFut1.get(); } - }, GridException.class, "Locks are not supported"); + }, IgniteCheckedException.class, "Locks are not supported"); final IgniteFuture<Boolean> lockFut2 = g0.cache(null).lockAllAsync(Arrays.asList(1), Long.MAX_VALUE); @@ -88,7 +88,7 @@ public class GridCachePartitionedLockSelfTest extends GridCacheLockAbstractTest @Override public Object call() throws Exception { return lockFut2.get(); } - }, GridException.class, "Locks are not supported"); + }, IgniteCheckedException.class, "Locks are not supported"); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java index 6676c57..2379063 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java @@ -599,7 +599,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst } /** {@inheritDoc} */ - @Override public Boolean call() throws GridException, InterruptedException { + @Override public Boolean call() throws IgniteCheckedException, InterruptedException { assertNotNull(ignite); startLatchMultiNode.countDown(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiNodeLockSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiNodeLockSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiNodeLockSelfTest.java index e26cce2..ba4e427 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiNodeLockSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiNodeLockSelfTest.java @@ -9,14 +9,14 @@ package org.gridgain.grid.kernal.processors.cache.distributed.near; +import org.apache.ignite.*; import org.apache.ignite.configuration.*; -import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.processors.cache.distributed.*; import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; -import static org.gridgain.grid.cache.GridCacheMode.*; import static org.gridgain.grid.cache.GridCacheDistributionMode.*; +import static org.gridgain.grid.cache.GridCacheMode.*; /** * Test cases for multi-threaded tests. @@ -55,7 +55,7 @@ public class GridCachePartitionedMultiNodeLockSelfTest extends GridCacheMultiNod } /** {@inheritDoc} */ - @Override public void testLockReentry() throws GridException { + @Override public void testLockReentry() throws IgniteCheckedException { super.testLockReentry(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java index 3279e38..be8a6bb 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java @@ -9,22 +9,22 @@ package org.gridgain.grid.kernal.processors.cache.distributed.near; +import org.apache.ignite.*; import org.apache.ignite.configuration.*; -import org.gridgain.grid.*; -import org.gridgain.grid.cache.*; -import org.gridgain.grid.cache.eviction.fifo.*; -import org.gridgain.grid.kernal.processors.cache.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; +import org.gridgain.grid.cache.*; +import org.gridgain.grid.cache.eviction.fifo.*; +import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.testframework.junits.common.*; import java.util.concurrent.atomic.*; import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; -import static org.gridgain.grid.cache.GridCacheMode.*; import static org.gridgain.grid.cache.GridCacheDistributionMode.*; +import static org.gridgain.grid.cache.GridCacheMode.*; import static org.gridgain.grid.cache.GridCacheTxConcurrency.*; import static org.gridgain.grid.cache.GridCacheTxIsolation.*; @@ -165,7 +165,7 @@ public class GridCachePartitionedMultiThreadedPutGetSelfTest extends GridCommonA multithreaded(new CAX() { @SuppressWarnings({"BusyWait"}) - @Override public void applyx() throws GridException { + @Override public void applyx() throws IgniteCheckedException { GridCache<Integer, Integer> c = grid(0).cache(null); for (int i = 0; i < TX_CNT; i++) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java index 50f9c6b..e963d72 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java @@ -73,7 +73,7 @@ public class GridCachePartitionedPreloadLifecycleSelfTest extends GridCachePrelo @IgniteInstanceResource private Ignite ignite; - @Override public void onLifecycleEvent(LifecycleEventType evt) throws GridException { + @Override public void onLifecycleEvent(LifecycleEventType evt) throws IgniteCheckedException { switch (evt) { case AFTER_GRID_START: { GridCache<Object, MyValue> c1 = ignite.cache("one"); @@ -189,7 +189,7 @@ public class GridCachePartitionedPreloadLifecycleSelfTest extends GridCachePrelo assertNotNull(v2); assertEquals(v1, v2); } - catch (GridException e1) { + catch (IgniteCheckedException e1) { e1.printStackTrace(); assert false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedQueryMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedQueryMultiThreadedSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedQueryMultiThreadedSelfTest.java index 8b0fb53..79e5467 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedQueryMultiThreadedSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedQueryMultiThreadedSelfTest.java @@ -9,14 +9,14 @@ package org.gridgain.grid.kernal.processors.cache.distributed.near; +import org.apache.ignite.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; -import org.gridgain.grid.cache.*; -import org.gridgain.grid.cache.query.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; +import org.gridgain.grid.cache.*; +import org.gridgain.grid.cache.query.*; import org.gridgain.grid.util.tostring.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; @@ -28,8 +28,8 @@ import java.util.*; import java.util.concurrent.atomic.*; import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; -import static org.gridgain.grid.cache.GridCacheMode.*; import static org.gridgain.grid.cache.GridCacheDistributionMode.*; +import static org.gridgain.grid.cache.GridCacheMode.*; /** * Tests for partitioned cache queries. @@ -137,7 +137,7 @@ public class GridCachePartitionedQueryMultiThreadedSelfTest extends GridCommonAb // Start lucene query threads. IgniteFuture<?> futLucene = GridTestUtils.runMultiThreadedAsync(new CAX() { - @Override public void applyx() throws GridException { + @Override public void applyx() throws IgniteCheckedException { while (!done.get()) { GridCacheQuery<Map.Entry<UUID, Person>> masters = cache0.queries().createFullTextQuery( Person.class, "Master"); @@ -158,7 +158,7 @@ public class GridCachePartitionedQueryMultiThreadedSelfTest extends GridCommonAb // Start sql query threads. IgniteFuture<?> futSql = GridTestUtils.runMultiThreadedAsync(new CAX() { - @Override public void applyx() throws GridException { + @Override public void applyx() throws IgniteCheckedException { while (!done.get()) { GridCacheQuery<Map.Entry<UUID, Person>> bachelors = cache0.queries().createSqlQuery(Person.class, "degree = 'Bachelor'"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedStorePutSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedStorePutSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedStorePutSelfTest.java index 0ba769b..9e9acc6 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedStorePutSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedStorePutSelfTest.java @@ -9,15 +9,15 @@ package org.gridgain.grid.kernal.processors.cache.distributed.near; +import org.apache.ignite.*; import org.apache.ignite.configuration.*; -import org.gridgain.grid.*; -import org.gridgain.grid.cache.*; -import org.gridgain.grid.cache.store.*; -import org.gridgain.grid.kernal.processors.cache.distributed.*; import org.apache.ignite.spi.discovery.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; +import org.gridgain.grid.cache.*; +import org.gridgain.grid.cache.store.*; +import org.gridgain.grid.kernal.processors.cache.distributed.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.testframework.junits.common.*; import org.jetbrains.annotations.*; @@ -118,7 +118,7 @@ public class GridCachePartitionedStorePutSelfTest extends GridCommonAbstractTest private static class TestStore extends GridCacheStoreAdapter<Object, Object> { /** {@inheritDoc} */ @Override public Object load(@Nullable GridCacheTx tx, Object key) - throws GridException { + throws IgniteCheckedException { assert false; return null; @@ -126,12 +126,12 @@ public class GridCachePartitionedStorePutSelfTest extends GridCommonAbstractTest /** {@inheritDoc} */ @Override public void put(GridCacheTx tx, Object key, @Nullable Object val) - throws GridException { + throws IgniteCheckedException { // No-op } /** {@inheritDoc} */ - @Override public void remove(GridCacheTx tx, Object key) throws GridException { + @Override public void remove(GridCacheTx tx, Object key) throws IgniteCheckedException { // No-op } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java index 73f231b..3ba8a10 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java @@ -202,7 +202,7 @@ public class GridCachePartitionedTxSalvageSelfTest extends GridCommonAbstractTes if (prepare) U.<GridCacheTxEx>field(tx, "tx").prepare(); } - catch (GridException e) { + catch (IgniteCheckedException e) { info("Failed to put keys to cache: " + e.getMessage()); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridPartitionedBackupLoadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridPartitionedBackupLoadSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridPartitionedBackupLoadSelfTest.java index 74b44b7..9050c7d 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridPartitionedBackupLoadSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridPartitionedBackupLoadSelfTest.java @@ -9,14 +9,14 @@ package org.gridgain.grid.kernal.processors.cache.distributed.near; +import org.apache.ignite.*; import org.apache.ignite.configuration.*; -import org.gridgain.grid.*; -import org.gridgain.grid.cache.*; -import org.gridgain.grid.cache.store.*; import org.apache.ignite.spi.discovery.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; +import org.gridgain.grid.cache.*; +import org.gridgain.grid.cache.store.*; import org.gridgain.testframework.junits.common.*; import org.jetbrains.annotations.*; @@ -127,7 +127,7 @@ public class GridPartitionedBackupLoadSelfTest extends GridCommonAbstractTest { /** {@inheritDoc} */ @Override public Integer load(@Nullable GridCacheTx tx, Integer key) - throws GridException { + throws IgniteCheckedException { cnt.incrementAndGet(); return null; @@ -135,12 +135,12 @@ public class GridPartitionedBackupLoadSelfTest extends GridCommonAbstractTest { /** {@inheritDoc} */ @Override public void put(GridCacheTx tx, Integer key, @Nullable Integer val) - throws GridException { + throws IgniteCheckedException { map.put(key, val); } /** {@inheritDoc} */ - @Override public void remove(GridCacheTx tx, Integer key) throws GridException { + @Override public void remove(GridCacheTx tx, Integer key) throws IgniteCheckedException { // No-op } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java index 41c58ff..6904163 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java @@ -115,21 +115,21 @@ public class GridCacheReplicatedInvalidateSelfTest extends GridCommonAbstractTes } /** - * @throws GridException If test failed. + * @throws IgniteCheckedException If test failed. */ public void testOptimisticReadCommitted() throws Throwable { checkCommit(OPTIMISTIC, READ_COMMITTED); } /** - * @throws GridException If test failed. + * @throws IgniteCheckedException If test failed. */ public void testOptimisticRepeatableRead() throws Throwable { checkCommit(OPTIMISTIC, REPEATABLE_READ); } /** - * @throws GridException If test failed. + * @throws IgniteCheckedException If test failed. */ public void testOptimisticSerializable() throws Throwable { checkCommit(OPTIMISTIC, SERIALIZABLE); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java index e5b768f..696e47f 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java @@ -75,7 +75,7 @@ public class GridCacheReplicatedPreloadLifecycleSelfTest extends GridCachePreloa @IgniteInstanceResource private Ignite ignite; - @Override public void onLifecycleEvent(LifecycleEventType evt) throws GridException { + @Override public void onLifecycleEvent(LifecycleEventType evt) throws IgniteCheckedException { switch (evt) { case AFTER_GRID_START: { GridCache<Object, MyValue> c1 = ignite.cache("one"); @@ -205,7 +205,7 @@ public class GridCacheReplicatedPreloadLifecycleSelfTest extends GridCachePreloa ", missedKey=" + key + ", cache=" + grid.cache("one").values() + ']', v2); assertEquals(v1, v2); } - catch (GridException e1) { + catch (IgniteCheckedException e1) { e1.printStackTrace(); assert false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java index 5628d11..29e0044 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java @@ -128,7 +128,7 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest { assert false : "Grid should have been failed to start."; } - catch (GridException e) { + catch (IgniteCheckedException e) { info("Caught expected exception: " + e); } finally { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheBatchEvictUnswapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheBatchEvictUnswapSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheBatchEvictUnswapSelfTest.java index 3497a7e..98d1b64 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheBatchEvictUnswapSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheBatchEvictUnswapSelfTest.java @@ -149,7 +149,7 @@ public class GridCacheBatchEvictUnswapSelfTest extends GridCacheAbstractSelfTest } } } - catch (GridException e) { + catch (IgniteCheckedException e) { e.printStackTrace(); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java index 458b9a2..0489e36 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java @@ -141,7 +141,7 @@ public class GridCacheDistributedEvictionsSelfTest extends GridCommonAbstractTes assert false : "Grid was started with illegal configuration."; } - catch (GridException e) { + catch (IgniteCheckedException e) { info("Caught expected exception: " + e); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheMockEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheMockEntry.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheMockEntry.java index 4d01ddc..6519617 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheMockEntry.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheMockEntry.java @@ -9,13 +9,13 @@ package org.gridgain.grid.kernal.processors.cache.eviction; +import org.apache.ignite.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; import org.gridgain.grid.cache.*; -import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.grid.util.future.*; import org.gridgain.grid.util.lang.*; import org.gridgain.grid.util.tostring.*; +import org.gridgain.grid.util.typedef.internal.*; import org.jetbrains.annotations.*; import java.util.*; @@ -150,7 +150,7 @@ public class GridCacheMockEntry<K, V> extends GridMetadataAwareAdapter implement /** {@inheritDoc} */ @Nullable @Override public V set(V val, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws GridException { + @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException { // No-op. return null; } @@ -163,7 +163,7 @@ public class GridCacheMockEntry<K, V> extends GridMetadataAwareAdapter implement } /** {@inheritDoc} */ - @Nullable @Override public V setIfAbsent(V val) throws GridException { + @Nullable @Override public V setIfAbsent(V val) throws IgniteCheckedException { // No-op. return null; } @@ -176,7 +176,7 @@ public class GridCacheMockEntry<K, V> extends GridMetadataAwareAdapter implement /** {@inheritDoc} */ @Override public boolean setx(V val, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws GridException { + @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException { // No-op. return false; } @@ -189,7 +189,7 @@ public class GridCacheMockEntry<K, V> extends GridMetadataAwareAdapter implement } /** {@inheritDoc} */ - @Override public boolean setxIfAbsent(@Nullable V val) throws GridException { + @Override public boolean setxIfAbsent(@Nullable V val) throws IgniteCheckedException { // No-op. return false; } @@ -201,7 +201,7 @@ public class GridCacheMockEntry<K, V> extends GridMetadataAwareAdapter implement } /** {@inheritDoc} */ - @Override public void transform(IgniteClosure<V, V> transformer) throws GridException { + @Override public void transform(IgniteClosure<V, V> transformer) throws IgniteCheckedException { // No-op. } @@ -212,7 +212,7 @@ public class GridCacheMockEntry<K, V> extends GridMetadataAwareAdapter implement } /** {@inheritDoc} */ - @Nullable @Override public V replace(V val) throws GridException { + @Nullable @Override public V replace(V val) throws IgniteCheckedException { // No-op. return null; } @@ -224,7 +224,7 @@ public class GridCacheMockEntry<K, V> extends GridMetadataAwareAdapter implement } /** {@inheritDoc} */ - @Override public boolean replacex(V val) throws GridException { + @Override public boolean replacex(V val) throws IgniteCheckedException { // No-op. return false; } @@ -236,7 +236,7 @@ public class GridCacheMockEntry<K, V> extends GridMetadataAwareAdapter implement } /** {@inheritDoc} */ - @Override public boolean replace(V oldVal, V newVal) throws GridException { + @Override public boolean replace(V oldVal, V newVal) throws IgniteCheckedException { // No-op. return false; } @@ -249,7 +249,7 @@ public class GridCacheMockEntry<K, V> extends GridMetadataAwareAdapter implement /** {@inheritDoc} */ @Nullable @Override public V remove( - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws GridException { + @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException { // No-op. return null; } @@ -262,7 +262,7 @@ public class GridCacheMockEntry<K, V> extends GridMetadataAwareAdapter implement } /** {@inheritDoc} */ - @Override public boolean removex(@Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws GridException { + @Override public boolean removex(@Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException { // No-op. return false; } @@ -275,7 +275,7 @@ public class GridCacheMockEntry<K, V> extends GridMetadataAwareAdapter implement } /** {@inheritDoc} */ - @Override public boolean remove(V val) throws GridException { + @Override public boolean remove(V val) throws IgniteCheckedException { // No-op. return false; } @@ -293,7 +293,7 @@ public class GridCacheMockEntry<K, V> extends GridMetadataAwareAdapter implement /** {@inheritDoc} */ @Override public boolean lock(long timeout, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws GridException { + @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException { return false; } @@ -304,7 +304,7 @@ public class GridCacheMockEntry<K, V> extends GridMetadataAwareAdapter implement } /** {@inheritDoc} */ - @Override public void unlock(IgnitePredicate<GridCacheEntry<K, V>>... filter) throws GridException { + @Override public void unlock(IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException { // No-op. } @@ -324,7 +324,7 @@ public class GridCacheMockEntry<K, V> extends GridMetadataAwareAdapter implement } /** {@inheritDoc} */ - @Nullable @Override public V reload() throws GridException { + @Nullable @Override public V reload() throws IgniteCheckedException { return null; } @@ -334,7 +334,7 @@ public class GridCacheMockEntry<K, V> extends GridMetadataAwareAdapter implement } /** {@inheritDoc} */ - @Nullable @Override public V get() throws GridException { + @Nullable @Override public V get() throws IgniteCheckedException { return null; } @@ -349,7 +349,7 @@ public class GridCacheMockEntry<K, V> extends GridMetadataAwareAdapter implement } /** {@inheritDoc} */ - @Override public boolean compact() throws GridException { + @Override public boolean compact() throws IgniteCheckedException { return false; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheSynchronousEvictionsFailoverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheSynchronousEvictionsFailoverSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheSynchronousEvictionsFailoverSelfTest.java index abdde24..e554949 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheSynchronousEvictionsFailoverSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheSynchronousEvictionsFailoverSelfTest.java @@ -9,9 +9,9 @@ package org.gridgain.grid.kernal.processors.cache.eviction; +import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.affinity.*; import org.gridgain.grid.cache.affinity.consistenthash.*; @@ -110,7 +110,7 @@ public class GridCacheSynchronousEvictionsFailoverSelfTest extends GridCacheAbst try { cache.putAll(data); } - catch (GridException ignore) { + catch (IgniteCheckedException ignore) { continue; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/random/GridCacheRandomEvictionPolicySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/random/GridCacheRandomEvictionPolicySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/random/GridCacheRandomEvictionPolicySelfTest.java index 51d81ef..a90fb8e 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/random/GridCacheRandomEvictionPolicySelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/random/GridCacheRandomEvictionPolicySelfTest.java @@ -176,7 +176,7 @@ public class GridCacheRandomEvictionPolicySelfTest extends t[i] = Integer.toString(i); multithreaded(new Callable() { - @Nullable @Override public Object call() throws GridException { + @Nullable @Override public Object call() throws IgniteCheckedException { int runs = 3000; for (int i = 0; i < runs; i++) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheDaemonNodeLocalSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheDaemonNodeLocalSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheDaemonNodeLocalSelfTest.java index 01ab0a0..8040b8f 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheDaemonNodeLocalSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheDaemonNodeLocalSelfTest.java @@ -45,7 +45,7 @@ public class GridCacheDaemonNodeLocalSelfTest extends GridCacheDaemonNodeAbstrac assert false; } - catch (GridException e) { + catch (IgniteCheckedException e) { info("Caught expected exception: " + e); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalLoadAllSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalLoadAllSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalLoadAllSelfTest.java index 099d0fb..af2b3d5 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalLoadAllSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalLoadAllSelfTest.java @@ -74,7 +74,7 @@ public class GridCacheLocalLoadAllSelfTest extends GridCommonAbstractTest { /** {@inheritDoc} */ @SuppressWarnings({"TypeParameterExtendsFinalClass"}) @Override public void loadAll(GridCacheTx tx, Collection<? extends Integer> keys, - IgniteBiInClosure<Integer, Integer> c) throws GridException { + IgniteBiInClosure<Integer, Integer> c) throws IgniteCheckedException { assert keys != null; c.apply(1, 1); @@ -83,19 +83,19 @@ public class GridCacheLocalLoadAllSelfTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ - @Override public Integer load(GridCacheTx tx, Integer key) throws GridException { + @Override public Integer load(GridCacheTx tx, Integer key) throws IgniteCheckedException { // No-op. return null; } /** {@inheritDoc} */ - @Override public void put(GridCacheTx tx, Integer key, Integer val) throws GridException { + @Override public void put(GridCacheTx tx, Integer key, Integer val) throws IgniteCheckedException { // No-op. } /** {@inheritDoc} */ - @Override public void remove(GridCacheTx tx, Integer key) throws GridException { + @Override public void remove(GridCacheTx tx, Integer key) throws IgniteCheckedException { // No-op. } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalLockSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalLockSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalLockSelfTest.java index ee1f291..b658787 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalLockSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalLockSelfTest.java @@ -68,9 +68,9 @@ public class GridCacheLocalLockSelfTest extends GridCommonAbstractTest { } /** - * @throws GridException If test failed. + * @throws IgniteCheckedException If test failed. */ - public void testLockReentry() throws GridException { + public void testLockReentry() throws IgniteCheckedException { GridCache<Integer, String> cache = ignite.cache(null); assert !cache.isLocked(1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalTxTimeoutSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalTxTimeoutSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalTxTimeoutSelfTest.java index c918005..5f2409b 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalTxTimeoutSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalTxTimeoutSelfTest.java @@ -70,42 +70,42 @@ public class GridCacheLocalTxTimeoutSelfTest extends GridCommonAbstractTest { } /** - * @throws GridException If test failed. + * @throws IgniteCheckedException If test failed. */ public void testPessimisticReadCommitted() throws Exception { checkTransactionTimeout(PESSIMISTIC, READ_COMMITTED); } /** - * @throws GridException If test failed. + * @throws IgniteCheckedException If test failed. */ public void testPessimisticRepeatableRead() throws Exception { checkTransactionTimeout(PESSIMISTIC, REPEATABLE_READ); } /** - * @throws GridException If test failed. + * @throws IgniteCheckedException If test failed. */ public void testPessimisticSerializable() throws Exception { checkTransactionTimeout(PESSIMISTIC, SERIALIZABLE); } /** - * @throws GridException If test failed. + * @throws IgniteCheckedException If test failed. */ public void testOptimisticReadCommitted() throws Exception { checkTransactionTimeout(OPTIMISTIC, READ_COMMITTED); } /** - * @throws GridException If test failed. + * @throws IgniteCheckedException If test failed. */ public void testOptimisticRepeatableRead() throws Exception { checkTransactionTimeout(OPTIMISTIC, REPEATABLE_READ); } /** - * @throws GridException If test failed. + * @throws IgniteCheckedException If test failed. */ public void testOptimisticSerializable() throws Exception { checkTransactionTimeout(OPTIMISTIC, SERIALIZABLE); @@ -114,7 +114,7 @@ public class GridCacheLocalTxTimeoutSelfTest extends GridCommonAbstractTest { /** * @param concurrency Concurrency. * @param isolation Isolation. - * @throws GridException If test failed. + * @throws IgniteCheckedException If test failed. */ private void checkTransactionTimeout(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation) throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java index f199b37..2984da1 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java @@ -1501,26 +1501,26 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo private static class TestStore extends GridCacheStoreAdapter<Object, Object> { /** {@inheritDoc} */ @Override public void loadCache(IgniteBiInClosure<Object, Object> clo, - Object... args) throws GridException { + Object... args) throws IgniteCheckedException { for (int i = 0; i < 10; i++) clo.apply(i, i); } /** {@inheritDoc} */ @Nullable @Override public Object load(@Nullable GridCacheTx tx, Object key) - throws GridException { + throws IgniteCheckedException { return null; } /** {@inheritDoc} */ @Override public void put(@Nullable GridCacheTx tx, Object key, - @Nullable Object val) throws GridException { + @Nullable Object val) throws IgniteCheckedException { // No-op. } /** {@inheritDoc} */ @Override public void remove(@Nullable GridCacheTx tx, Object key) - throws GridException { + throws IgniteCheckedException { // No-op. } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/clock/GridTimeSyncProcessorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/clock/GridTimeSyncProcessorSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/clock/GridTimeSyncProcessorSelfTest.java index c25d897..4792bd6 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/clock/GridTimeSyncProcessorSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/clock/GridTimeSyncProcessorSelfTest.java @@ -188,7 +188,7 @@ public class GridTimeSyncProcessorSelfTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ - @Override public void onLifecycleEvent(LifecycleEventType evt) throws GridException { + @Override public void onLifecycleEvent(LifecycleEventType evt) throws IgniteCheckedException { if (evt == LifecycleEventType.BEFORE_GRID_START) ((GridKernalContextImpl)((GridKernal)g).context()).timeSource(new TimeShiftClockSource(delta)); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/closure/GridClosureProcessorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/closure/GridClosureProcessorSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/closure/GridClosureProcessorSelfTest.java index aad7b50..cc4278a 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/closure/GridClosureProcessorSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/closure/GridClosureProcessorSelfTest.java @@ -180,10 +180,10 @@ public class GridClosureProcessorSelfTest extends GridCommonAbstractTest { * @param job Runnable job. * @param p Optional node predicate. * @return Future object. - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ private IgniteFuture<?> runAsync(int idx, Runnable job, @Nullable IgnitePredicate<ClusterNode> p) - throws GridException { + throws IgniteCheckedException { assert idx >= 0 && idx < NODES_CNT; assert job != null; @@ -203,10 +203,10 @@ public class GridClosureProcessorSelfTest extends GridCommonAbstractTest { * @param job Runnable job. * @param p Optional node predicate. * @return Future object. - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ private IgniteFuture<?> broadcast(int idx, Runnable job, @Nullable IgnitePredicate<ClusterNode> p) - throws GridException { + throws IgniteCheckedException { assert idx >= 0 && idx < NODES_CNT; assert job != null; @@ -229,10 +229,10 @@ public class GridClosureProcessorSelfTest extends GridCommonAbstractTest { * @param jobs Runnable jobs. * @param p Optional node predicate. * @return Future object. - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ private IgniteFuture<?> runAsync(int idx, Collection<TestRunnable> jobs, @Nullable IgnitePredicate<ClusterNode> p) - throws GridException { + throws IgniteCheckedException { assert idx >= 0 && idx < NODES_CNT; assert !F.isEmpty(jobs); @@ -252,10 +252,10 @@ public class GridClosureProcessorSelfTest extends GridCommonAbstractTest { * @param job Callable job. * @param p Optional node predicate. * @return Future object. - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ private IgniteFuture<Integer> callAsync(int idx, Callable<Integer> job, @Nullable IgnitePredicate<ClusterNode> p) - throws GridException { + throws IgniteCheckedException { assert idx >= 0 && idx < NODES_CNT; assert job != null; @@ -275,10 +275,10 @@ public class GridClosureProcessorSelfTest extends GridCommonAbstractTest { * @param job Callable job. * @param p Optional node predicate. * @return Future object. - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ private IgniteFuture<Collection<Integer>> broadcast(int idx, Callable<Integer> job, - @Nullable IgnitePredicate<ClusterNode> p) throws GridException { + @Nullable IgnitePredicate<ClusterNode> p) throws IgniteCheckedException { assert idx >= 0 && idx < NODES_CNT; assert job != null; @@ -298,10 +298,10 @@ public class GridClosureProcessorSelfTest extends GridCommonAbstractTest { * @param jobs Callable job. * @param p Optional node predicate. * @return Future object. - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ private IgniteFuture<Collection<Integer>> callAsync(int idx, Collection<TestCallable> jobs, - @Nullable IgnitePredicate<ClusterNode> p) throws GridException { + @Nullable IgnitePredicate<ClusterNode> p) throws IgniteCheckedException { assert idx >= 0 && idx < NODES_CNT; assert !F.isEmpty(jobs); @@ -411,7 +411,7 @@ public class GridClosureProcessorSelfTest extends GridCommonAbstractTest { assert false : "Exception should have been thrown."; } - catch (GridException e) { + catch (IgniteCheckedException e) { info("Caught expected exception: " + e); } } @@ -529,6 +529,6 @@ public class GridClosureProcessorSelfTest extends GridCommonAbstractTest { return null; } - }, GridException.class, null); + }, IgniteCheckedException.class, null); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/continuous/GridEventConsumeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/continuous/GridEventConsumeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/continuous/GridEventConsumeSelfTest.java index 5b2c9cd..c42022a 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/continuous/GridEventConsumeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/continuous/GridEventConsumeSelfTest.java @@ -516,7 +516,7 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { assert false : "Exception was not thrown."; } - catch (GridException e) { + catch (IgniteCheckedException e) { assertTrue(e.getMessage().startsWith( "Failed to register remote continuous listener (projection is empty).")); } @@ -1036,7 +1036,7 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { comp.future().get(3000); } - catch (GridException ignored) { + catch (IgniteCheckedException ignored) { // Ignore all job execution related errors. } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderProcessorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderProcessorSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderProcessorSelfTest.java index 2c169e5..c1ceb68 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderProcessorSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderProcessorSelfTest.java @@ -156,7 +156,7 @@ public class GridDataLoaderProcessorSelfTest extends GridCommonAbstractTest { assert false; } - catch (GridException e) { + catch (IgniteCheckedException e) { // Cannot load local cache configured remotely. info("Caught expected exception: " + e); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java index 5417ece..2544402 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java @@ -459,7 +459,7 @@ public class GridCacheGgfsPerBlockLruEvictionPolicySelfTest extends GridGgfsComm return metrics.blocksReadTotal() == blocksRead && metrics.blocksReadRemote() == blocksReadRmt; } - catch (GridException e) { + catch (IgniteCheckedException e) { throw new RuntimeException(e); } }
