ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [14/67] [abbrv] [partial] incubator-ignite git commit: Rename GridException to IgniteCheckedException, GridRuntimeException to IgniteException.
Date Fri, 12 Dec 2014 09:29:15 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingSelfTest.java
index 89ec9d7..60b3458 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingSelfTest.java
@@ -71,9 +71,9 @@ public class GridJobStealingSelfTest extends GridCommonAbstractTest {
     /**
      * Test 2 jobs on 1 node.
      *
-     * @throws GridException If test failed.
+     * @throws IgniteCheckedException If test failed.
      */
-    public void testTwoJobs() throws GridException {
+    public void testTwoJobs() throws IgniteCheckedException {
         executeAsync(ignite1.compute(), new JobStealingSingleNodeTask(2), null).get(TASK_EXEC_TIMEOUT_MS);
 
         // Verify that 1 job was stolen by second node.
@@ -85,10 +85,10 @@ public class GridJobStealingSelfTest extends GridCommonAbstractTest {
     /**
      * Test 2 jobs on 1 node with null predicate.
      *
-     * @throws GridException If test failed.
+     * @throws IgniteCheckedException If test failed.
      */
     @SuppressWarnings("NullArgumentToVariableArgMethod")
-    public void testTwoJobsNullPredicate() throws GridException {
+    public void testTwoJobsNullPredicate() throws IgniteCheckedException {
         executeAsync(ignite1.compute(), new JobStealingSingleNodeTask(2), null).get(TASK_EXEC_TIMEOUT_MS);
 
         // Verify that 1 job was stolen by second node.
@@ -100,10 +100,10 @@ public class GridJobStealingSelfTest extends GridCommonAbstractTest {
     /**
      * Test 2 jobs on 1 node with null predicate using string task name.
      *
-     * @throws GridException If test failed.
+     * @throws IgniteCheckedException If test failed.
      */
     @SuppressWarnings("NullArgumentToVariableArgMethod")
-    public void testTwoJobsTaskNameNullPredicate() throws GridException {
+    public void testTwoJobsTaskNameNullPredicate() throws IgniteCheckedException {
         executeAsync(ignite1.compute(), JobStealingSingleNodeTask.class.getName(), null).get(TASK_EXEC_TIMEOUT_MS);
 
         // Verify that 1 job was stolen by second node.
@@ -115,10 +115,10 @@ public class GridJobStealingSelfTest extends GridCommonAbstractTest {
     /**
      * Test 2 jobs on 1 node when one of the predicates is null.
      *
-     * @throws GridException If test failed.
+     * @throws IgniteCheckedException If test failed.
      */
     @SuppressWarnings("unchecked")
-    public void testTwoJobsPartiallyNullPredicate() throws GridException {
+    public void testTwoJobsPartiallyNullPredicate() throws IgniteCheckedException {
         IgnitePredicate<ClusterNode> topPred =  new IgnitePredicate<ClusterNode>() {
                 @Override public boolean apply(ClusterNode e) {
                     return ignite2.cluster().localNode().id().equals(e.id()); // Limit projection with only grid2.
@@ -315,7 +315,7 @@ public class GridJobStealingSelfTest extends GridCommonAbstractTest {
         /** {@inheritDoc} */
         @SuppressWarnings("ForLoopReplaceableByForEach")
         @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid,
-            @Nullable Object arg) throws GridException {
+            @Nullable Object arg) throws IgniteCheckedException {
             //assert subgrid.size() == 2 : "Invalid subgrid size: " + subgrid.size();
 
             Map<ComputeJobAdapter, ClusterNode> map = new HashMap<>(subgrid.size());
@@ -335,7 +335,7 @@ public class GridJobStealingSelfTest extends GridCommonAbstractTest {
 
         /** {@inheritDoc} */
         @SuppressWarnings("SuspiciousMethodCalls")
-        @Override public Object reduce(List<ComputeJobResult> results) throws GridException {
+        @Override public Object reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
             for (ComputeJobResult res : results) {
                 log.info("Job result: " + res.getData());
             }
@@ -365,7 +365,7 @@ public class GridJobStealingSelfTest extends GridCommonAbstractTest {
         /** {@inheritDoc} */
         @SuppressWarnings("ForLoopReplaceableByForEach")
         @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid,
-            @Nullable Object arg) throws GridException {
+            @Nullable Object arg) throws IgniteCheckedException {
             assert subgrid.size() > 1 : "Invalid subgrid size: " + subgrid.size();
 
             Map<ComputeJobAdapter, ClusterNode> map = new HashMap<>(subgrid.size());
@@ -398,7 +398,7 @@ public class GridJobStealingSelfTest extends GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override public Serializable execute() throws GridException {
+        @Override public Serializable execute() throws IgniteCheckedException {
             log.info("Started job on node: " + ignite.cluster().localNode().id());
 
             if (!jobDistrMap.containsKey(ignite.cluster().localNode().id())) {
@@ -420,7 +420,7 @@ public class GridJobStealingSelfTest extends GridCommonAbstractTest {
             catch (InterruptedException e) {
                 log.info("Job got interrupted on node: " + ignite.cluster().localNode().id());
 
-                throw new GridException("Job got interrupted.", e);
+                throw new IgniteCheckedException("Job got interrupted.", e);
             }
             finally {
                 log.info("Job finished on node: " + ignite.cluster().localNode().id());

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingZeroActiveJobsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingZeroActiveJobsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingZeroActiveJobsSelfTest.java
index 11f4f04..8641fc9 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingZeroActiveJobsSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingZeroActiveJobsSelfTest.java
@@ -56,9 +56,9 @@ public class GridJobStealingZeroActiveJobsSelfTest extends GridCommonAbstractTes
     /**
      * Test 2 jobs on 2 nodes.
      *
-     * @throws GridException If test failed.
+     * @throws IgniteCheckedException If test failed.
      */
-    public void testTwoJobs() throws GridException {
+    public void testTwoJobs() throws IgniteCheckedException {
         ignite1.compute().execute(JobStealingTask.class, null);
     }
 
@@ -95,7 +95,7 @@ public class GridJobStealingZeroActiveJobsSelfTest extends GridCommonAbstractTes
         private IgniteLogger log;
 
         /** {@inheritDoc} */
-        @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, @Nullable Object arg) throws GridException {
+        @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, @Nullable Object arg) throws IgniteCheckedException {
             assert subgrid.size() == 2 : "Invalid subgrid size: " + subgrid.size();
 
             Map<ComputeJobAdapter, ClusterNode> map = new HashMap<>(subgrid.size());
@@ -108,7 +108,7 @@ public class GridJobStealingZeroActiveJobsSelfTest extends GridCommonAbstractTes
         }
 
         /** {@inheritDoc} */
-        @Override public Object reduce(List<ComputeJobResult> results) throws GridException {
+        @Override public Object reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
             assert results.size() == 2;
 
             for (ComputeJobResult res : results) {
@@ -144,7 +144,7 @@ public class GridJobStealingZeroActiveJobsSelfTest extends GridCommonAbstractTes
         }
 
         /** {@inheritDoc} */
-        @Override public Serializable execute() throws GridException {
+        @Override public Serializable execute() throws IgniteCheckedException {
             try {
                 Long sleep = argument(0);
 
@@ -153,7 +153,7 @@ public class GridJobStealingZeroActiveJobsSelfTest extends GridCommonAbstractTes
                 Thread.sleep(sleep);
             }
             catch (InterruptedException e) {
-                throw new GridException("Job got interrupted.", e);
+                throw new IgniteCheckedException("Job got interrupted.", e);
             }
 
             return ignite.name();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobSubjectIdSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobSubjectIdSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobSubjectIdSelfTest.java
index 0fb07c2..7d3bc4e 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobSubjectIdSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobSubjectIdSelfTest.java
@@ -102,7 +102,7 @@ public class GridJobSubjectIdSelfTest extends GridCommonAbstractTest {
 
         /** {@inheritDoc} */
         @Nullable @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid,
-            @Nullable Object arg) throws GridException {
+            @Nullable Object arg) throws IgniteCheckedException {
             taskSubjId = ((GridTaskSessionInternal)ses).subjectId();
 
             ClusterNode node = null;
@@ -121,7 +121,7 @@ public class GridJobSubjectIdSelfTest extends GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Nullable @Override public Object reduce(List<ComputeJobResult> results) throws GridException {
+        @Nullable @Override public Object reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
             return null;
         }
     }
@@ -136,7 +136,7 @@ public class GridJobSubjectIdSelfTest extends GridCommonAbstractTest {
         private ComputeTaskSession ses;
 
         /** {@inheritDoc} */
-        @Nullable @Override public Object execute() throws GridException {
+        @Nullable @Override public Object execute() throws IgniteCheckedException {
             jobSubjId = ((GridTaskSessionInternal)ses).subjectId();
 
             return null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleAwareSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleAwareSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleAwareSelfTest.java
index 72aee8d..372d74c 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleAwareSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleAwareSelfTest.java
@@ -9,13 +9,13 @@
 
 package org.gridgain.grid.kernal;
 
+import org.apache.ignite.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.lifecycle.*;
 import org.apache.ignite.logger.java.*;
 import org.apache.ignite.marshaller.optimized.*;
-import org.gridgain.client.ssl.*;
-import org.gridgain.grid.*;
 import org.apache.ignite.plugin.segmentation.*;
+import org.gridgain.client.ssl.*;
 import org.gridgain.testframework.junits.common.*;
 import org.jetbrains.annotations.*;
 
@@ -56,7 +56,7 @@ public class GridLifecycleAwareSelfTest extends GridAbstractLifecycleAwareSelfTe
         }
 
         /** {@inheritDoc} */
-        @Override public boolean isValidSegment() throws GridException {
+        @Override public boolean isValidSegment() throws IgniteCheckedException {
             return true;
         }
     }
@@ -86,7 +86,7 @@ public class GridLifecycleAwareSelfTest extends GridAbstractLifecycleAwareSelfTe
         }
 
         /** {@inheritDoc} */
-        @Override public void onLifecycleEvent(LifecycleEventType evt) throws GridException {
+        @Override public void onLifecycleEvent(LifecycleEventType evt) throws IgniteCheckedException {
             // No-op.
         }
     }
@@ -98,12 +98,12 @@ public class GridLifecycleAwareSelfTest extends GridAbstractLifecycleAwareSelfTe
         private final TestLifecycleAware lifecycleAware = new TestLifecycleAware(null);
 
         /** {@inheritDoc} */
-        @Override public void start() throws GridException {
+        @Override public void start() throws IgniteCheckedException {
             lifecycleAware.start();
         }
 
         /** {@inheritDoc} */
-        @Override public void stop() throws GridException {
+        @Override public void stop() throws IgniteCheckedException {
             lifecycleAware.stop();
         }
 
@@ -122,12 +122,12 @@ public class GridLifecycleAwareSelfTest extends GridAbstractLifecycleAwareSelfTe
         private final TestLifecycleAware lifecycleAware = new TestLifecycleAware(null);
 
         /** {@inheritDoc} */
-        @Override public void start() throws GridException {
+        @Override public void start() throws IgniteCheckedException {
             lifecycleAware.start();
         }
 
         /** {@inheritDoc} */
-        @Override public void stop() throws GridException {
+        @Override public void stop() throws IgniteCheckedException {
             lifecycleAware.stop();
         }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleBeanSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleBeanSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleBeanSelfTest.java
index 53e7f02..152cde3 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleBeanSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleBeanSelfTest.java
@@ -108,7 +108,7 @@ public class GridLifecycleBeanSelfTest extends GridCommonAbstractTest {
 
             assertTrue(false); // Should never get here.
         }
-        catch (GridException expected) {
+        catch (IgniteCheckedException expected) {
             info("Got expected exception: " + expected);
 
             assertEquals(IgniteState.STOPPED, G.state(getTestGridName()));
@@ -135,7 +135,7 @@ public class GridLifecycleBeanSelfTest extends GridCommonAbstractTest {
 
             assertTrue(false); // Should never get here.
         }
-        catch (GridException expected) {
+        catch (IgniteCheckedException expected) {
             info("Got expected exception: " + expected);
 
             assertEquals(IgniteState.STOPPED, G.state(getTestGridName()));
@@ -211,7 +211,7 @@ public class GridLifecycleBeanSelfTest extends GridCommonAbstractTest {
 
             assertEquals(IgniteState.STARTED, G.state(getTestGridName()));
         }
-        catch (GridException ignore) {
+        catch (IgniteCheckedException ignore) {
             assertTrue(false);
         }
         finally {
@@ -243,7 +243,7 @@ public class GridLifecycleBeanSelfTest extends GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override public void onLifecycleEvent(LifecycleEventType evt) throws GridException {
+        @Override public void onLifecycleEvent(LifecycleEventType evt) throws IgniteCheckedException {
             callsCntr.get(evt).incrementAndGet();
         }
 
@@ -267,7 +267,7 @@ public class GridLifecycleBeanSelfTest extends GridCommonAbstractTest {
 
         /**
          * @param errType type of event to throw error.
-         * @param gridErr {@code True} if {@link GridException}.
+         * @param gridErr {@code True} if {@link IgniteCheckedException}.
          */
         private LifeCycleExceptionBean(LifecycleEventType errType, boolean gridErr) {
             this.errType = errType;
@@ -275,10 +275,10 @@ public class GridLifecycleBeanSelfTest extends GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override public void onLifecycleEvent(LifecycleEventType evt) throws GridException {
+        @Override public void onLifecycleEvent(LifecycleEventType evt) throws IgniteCheckedException {
             if (evt == errType) {
                 if (gridErr)
-                    throw new GridException("Expected exception for event: " + evt) {
+                    throw new IgniteCheckedException("Expected exception for event: " + evt) {
                         @Override public void printStackTrace(PrintStream s) {
                             // No-op.
                         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/GridListenActorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridListenActorSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridListenActorSelfTest.java
index 11ff281..e31ade4 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridListenActorSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridListenActorSelfTest.java
@@ -9,9 +9,9 @@
 
 package org.gridgain.grid.kernal;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.messaging.*;
-import org.gridgain.grid.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.testframework.*;
 import org.gridgain.testframework.junits.common.*;
@@ -108,7 +108,7 @@ public class GridListenActorSelfTest extends GridCommonAbstractTest {
             final ClusterNode rmt = grid(1).localNode();
 
             grid().message().localListen(null, new MessagingListenActor<String>() {
-                @Override protected void receive(UUID nodeId, String rcvMsg) throws GridException {
+                @Override protected void receive(UUID nodeId, String rcvMsg) throws IgniteCheckedException {
                     System.out.println("Local node received message: '" + rcvMsg + "'");
 
                     respond(rmt.id(), "RESPONSE");
@@ -152,7 +152,7 @@ public class GridListenActorSelfTest extends GridCommonAbstractTest {
 
         grid().message().localListen(null, new MessagingListenActor<String>() {
             @Override
-            protected void receive(UUID nodeId, String rcvMsg) throws GridException {
+            protected void receive(UUID nodeId, String rcvMsg) throws IgniteCheckedException {
                 System.out.println("Received message: '" + rcvMsg + "'");
 
                 if ("PING".equals(rcvMsg)) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/GridManagementJobSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridManagementJobSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridManagementJobSelfTest.java
index b5a589e..c8d2d7b 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridManagementJobSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridManagementJobSelfTest.java
@@ -1,13 +1,13 @@
 package org.gridgain.grid.kernal;
 
+import org.apache.ignite.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.resources.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.kernal.processors.task.*;
 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.kernal.processors.task.*;
 import org.gridgain.testframework.junits.common.*;
 import org.jetbrains.annotations.*;
 
@@ -123,7 +123,7 @@ public class GridManagementJobSelfTest extends GridCommonAbstractTest {
         protected ComputeTaskSession ses;
 
         /** {@inheritDoc} */
-        @Nullable @Override public Object call() throws GridException {
+        @Nullable @Override public Object call() throws IgniteCheckedException {
             String threadName = Thread.currentThread().getName();
 
             assertFalse(threadName.startsWith(MGMT_THREAD_PREFIX));
@@ -139,7 +139,7 @@ public class GridManagementJobSelfTest extends GridCommonAbstractTest {
     @GridInternal
     private static class TestJobInternal implements Callable<Object>, Serializable {
         /** {@inheritDoc} */
-        @Nullable @Override public Object call() throws GridException {
+        @Nullable @Override public Object call() throws IgniteCheckedException {
             String threadName = Thread.currentThread().getName();
 
             assertTrue(threadName.startsWith(MGMT_THREAD_PREFIX));

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultipleJobsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultipleJobsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultipleJobsSelfTest.java
index 3143ca2..186c9e5 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultipleJobsSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultipleJobsSelfTest.java
@@ -125,7 +125,7 @@ public class GridMultipleJobsSelfTest extends GridCommonAbstractTest {
         final AtomicInteger resCnt = new AtomicInteger();
 
         GridTestUtils.runMultiThreaded(new CAX() {
-            @Override public void applyx() throws GridException {
+            @Override public void applyx() throws IgniteCheckedException {
                 while (true) {
                     int cnt = jobsCnt.incrementAndGet();
 
@@ -138,7 +138,7 @@ public class GridMultipleJobsSelfTest extends GridCommonAbstractTest {
                         job = jobCls.newInstance();
                     }
                     catch (Exception e) {
-                        throw new GridException("Could not instantiate a job.", e);
+                        throw new IgniteCheckedException("Could not instantiate a job.", e);
                     }
 
                     IgniteCompute comp = ignite1.compute().enableAsync();
@@ -151,7 +151,7 @@ public class GridMultipleJobsSelfTest extends GridCommonAbstractTest {
                         X.println("Submitted jobs: " + cnt);
 
                     fut.listenAsync(new CIX1<IgniteFuture<Boolean>>() {
-                        @Override public void applyx(IgniteFuture<Boolean> f) throws GridException {
+                        @Override public void applyx(IgniteFuture<Boolean> f) throws IgniteCheckedException {
                             try {
                                 assert f.get();
                             }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultipleSpisSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultipleSpisSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultipleSpisSelfTest.java
index 3585fc5..c7fde8e 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultipleSpisSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultipleSpisSelfTest.java
@@ -104,7 +104,7 @@ public class GridMultipleSpisSelfTest extends GridCommonAbstractTest {
             try {
                 ignite1.compute().execute(GridTestMultipleSpisTask.class.getName(), ignite1.cluster().localNode().id());
             }
-            catch (GridException e) {
+            catch (IgniteCheckedException e) {
                 e.printStackTrace();
 
                 assert false : "Unexpected exception.";
@@ -168,7 +168,7 @@ public class GridMultipleSpisSelfTest extends GridCommonAbstractTest {
 
         /** {@inheritDoc} */
         @Override public ClusterNode getBalancedNode(ComputeTaskSession ses, List<ClusterNode> top,
-            ComputeJob job) throws GridException {
+            ComputeJob job) throws IgniteCheckedException {
             if (getName().equals(expName))
                 isTaskLoadBalancingCalled = true;
             else
@@ -230,7 +230,7 @@ public class GridMultipleSpisSelfTest extends GridCommonAbstractTest {
         private Ignite ignite;
 
         /** {@inheritDoc} */
-        @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, UUID arg) throws GridException {
+        @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, UUID arg) throws IgniteCheckedException {
             assert subgrid.size() == 2;
             assert taskSes != null;
             assert ignite != null;
@@ -244,7 +244,7 @@ public class GridMultipleSpisSelfTest extends GridCommonAbstractTest {
 
         /** {@inheritDoc} */
         @Override public ComputeJobResultPolicy result(ComputeJobResult res,
-            List<ComputeJobResult> received) throws GridException {
+            List<ComputeJobResult> received) throws IgniteCheckedException {
             if (res.getException() != null)
                 return ComputeJobResultPolicy.FAILOVER;
 
@@ -277,14 +277,14 @@ public class GridMultipleSpisSelfTest extends GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override public UUID execute() throws GridException {
+        @Override public UUID execute() throws IgniteCheckedException {
             assert locId != null;
             assert jobSes != null;
             assert argument(0) != null;
 
             // Should always fail on task originating node and work on another one.
             if (locId.equals(argument(0)))
-                throw new GridException("Expected exception to failover job.");
+                throw new IgniteCheckedException("Expected exception to failover job.");
 
             // Use checkpoint on job side. This will happen on remote node.
             jobSes.loadCheckpoint("test");

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultipleVersionsDeploymentSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultipleVersionsDeploymentSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultipleVersionsDeploymentSelfTest.java
index ac7b3ef..3753614 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultipleVersionsDeploymentSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultipleVersionsDeploymentSelfTest.java
@@ -231,7 +231,7 @@ public class GridMultipleVersionsDeploymentSelfTest extends GridCommonAbstractTe
         private UUID locNodeId;
 
         /** {@inheritDoc} */
-        @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, Object arg) throws GridException {
+        @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, Object arg) throws IgniteCheckedException {
             Map<ComputeJobAdapter, ClusterNode> map = new HashMap<>(subgrid.size());
 
             boolean ignoreLocNode = false;
@@ -253,7 +253,7 @@ public class GridMultipleVersionsDeploymentSelfTest extends GridCommonAbstractTe
         }
 
         /** {@inheritDoc} */
-        @Override public Integer reduce(List<ComputeJobResult> results) throws GridException {
+        @Override public Integer reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
             return results.get(0).getData();
         }
     }
@@ -269,7 +269,7 @@ public class GridMultipleVersionsDeploymentSelfTest extends GridCommonAbstractTe
         private IgniteLogger log;
 
         /** {@inheritDoc} */
-        @Override public Integer execute() throws GridException {
+        @Override public Integer execute() throws IgniteCheckedException {
             try {
                 if (log.isInfoEnabled())
                     log.info("GridDeploymentTestJob job started");
@@ -286,7 +286,7 @@ public class GridMultipleVersionsDeploymentSelfTest extends GridCommonAbstractTe
                 return res - 48;
             }
             catch (IOException | InterruptedException e) {
-                throw new GridException("Failed to execute job.", e);
+                throw new IgniteCheckedException("Failed to execute job.", e);
             }
         }
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultithreadedJobStealingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultithreadedJobStealingSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultithreadedJobStealingSelfTest.java
index aa11dce..6335dda 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultithreadedJobStealingSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultithreadedJobStealingSelfTest.java
@@ -91,7 +91,7 @@ public class GridMultithreadedJobStealingSelfTest extends GridCommonAbstractTest
                         }
                     }
                 }
-                catch (GridException e) {
+                catch (IgniteCheckedException e) {
                     log.error("Failed to execute task.", e);
 
                     fail.getAndSet(e);
@@ -152,7 +152,7 @@ public class GridMultithreadedJobStealingSelfTest extends GridCommonAbstractTest
         /** {@inheritDoc} */
         @SuppressWarnings("ForLoopReplaceableByForEach")
             @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid,
-            @Nullable Object arg) throws GridException {
+            @Nullable Object arg) throws IgniteCheckedException {
             assert subgrid.size() == 2 : "Invalid subgrid size: " + subgrid.size();
 
             Map<ComputeJobAdapter, ClusterNode> map = new HashMap<>(subgrid.size());
@@ -165,7 +165,7 @@ public class GridMultithreadedJobStealingSelfTest extends GridCommonAbstractTest
         }
 
         /** {@inheritDoc} */
-        @Override public JobStealingResult reduce(List<ComputeJobResult> results) throws GridException {
+        @Override public JobStealingResult reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
             assert results.size() == 2;
 
             for (ComputeJobResult res : results) {
@@ -201,7 +201,7 @@ public class GridMultithreadedJobStealingSelfTest extends GridCommonAbstractTest
         }
 
         /** {@inheritDoc} */
-        @Override public Serializable execute() throws GridException {
+        @Override public Serializable execute() throws IgniteCheckedException {
             try {
                 Long sleep = argument(0);
 
@@ -210,7 +210,7 @@ public class GridMultithreadedJobStealingSelfTest extends GridCommonAbstractTest
                 Thread.sleep(sleep);
             }
             catch (InterruptedException e) {
-                throw new GridException("Job got interrupted.", e);
+                throw new IgniteCheckedException("Job got interrupted.", e);
             }
 
             return ignite.name();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/GridNonHistoryMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridNonHistoryMetricsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridNonHistoryMetricsSelfTest.java
index 93f06d7..821a7f7 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridNonHistoryMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridNonHistoryMetricsSelfTest.java
@@ -110,7 +110,7 @@ public class GridNonHistoryMetricsSelfTest extends GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override public Object reduce(List<ComputeJobResult> results) throws GridException {
+        @Override public Object reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
             return results;
         }
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/GridProjectionAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridProjectionAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridProjectionAbstractTest.java
index cb2b54b..d375fd8 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridProjectionAbstractTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridProjectionAbstractTest.java
@@ -723,7 +723,7 @@ public abstract class GridProjectionAbstractTest extends GridCommonAbstractTest
     @SuppressWarnings({"PublicInnerClass"})
     public static class TestTask extends ComputeTaskSplitAdapter<String, Void> {
         /** {@inheritDoc} */
-        @Override protected Collection<? extends ComputeJob> split(int gridSize, String arg) throws GridException {
+        @Override protected Collection<? extends ComputeJob> split(int gridSize, String arg) throws IgniteCheckedException {
             Collection<ComputeJob> jobs = new HashSet<>();
 
             for (int i = 0; i < gridSize; i++)
@@ -733,7 +733,7 @@ public abstract class GridProjectionAbstractTest extends GridCommonAbstractTest
         }
 
         /** {@inheritDoc} */
-        @Nullable @Override public Void reduce(List<ComputeJobResult> results) throws GridException {
+        @Nullable @Override public Void reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
             return null;
         }
     }
@@ -744,7 +744,7 @@ public abstract class GridProjectionAbstractTest extends GridCommonAbstractTest
     @SuppressWarnings({"PublicInnerClass"})
     public static class TestJob extends ComputeJobAdapter {
         /** {@inheritDoc} */
-        @Nullable @Override public Object execute() throws GridException {
+        @Nullable @Override public Object execute() throws IgniteCheckedException {
             return null;
         }
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/GridReleaseTypeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridReleaseTypeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridReleaseTypeSelfTest.java
index c95306e..733dc68 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridReleaseTypeSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridReleaseTypeSelfTest.java
@@ -9,9 +9,9 @@
 
 package org.gridgain.grid.kernal;
 
+import org.apache.ignite.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.product.*;
-import org.gridgain.grid.*;
 import org.apache.ignite.spi.discovery.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
@@ -72,7 +72,7 @@ public class GridReleaseTypeSelfTest extends GridCommonAbstractTest {
         try {
             startGrids(2);
         }
-        catch (GridException e) {
+        catch (IgniteCheckedException e) {
             StringWriter errors = new StringWriter();
 
             e.printStackTrace(new PrintWriter(errors));
@@ -103,7 +103,7 @@ public class GridReleaseTypeSelfTest extends GridCommonAbstractTest {
         try {
             startGrids(2);
         }
-        catch (GridException e) {
+        catch (IgniteCheckedException e) {
             StringWriter errors = new StringWriter();
 
             e.printStackTrace(new PrintWriter(errors));

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/GridRuntimeExceptionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridRuntimeExceptionSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridRuntimeExceptionSelfTest.java
index ca9dec2..967ffd3 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridRuntimeExceptionSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridRuntimeExceptionSelfTest.java
@@ -76,7 +76,7 @@ public class GridRuntimeExceptionSelfTest extends GridCommonAbstractTest {
 
             assert false;
         }
-        catch (GridException e) {
+        catch (IgniteCheckedException e) {
             info("Got expected grid exception: " + e);
         }
 
@@ -106,7 +106,7 @@ public class GridRuntimeExceptionSelfTest extends GridCommonAbstractTest {
 
             assert false;
         }
-        catch (GridException e) {
+        catch (IgniteCheckedException e) {
             info("Got expected grid exception: " + e);
         }
 
@@ -136,7 +136,7 @@ public class GridRuntimeExceptionSelfTest extends GridCommonAbstractTest {
 
             assert false;
         }
-        catch (GridException e) {
+        catch (IgniteCheckedException e) {
             info("Got expected grid exception: " + e);
         }
 
@@ -166,7 +166,7 @@ public class GridRuntimeExceptionSelfTest extends GridCommonAbstractTest {
 
             assert false;
         }
-        catch (GridException e) {
+        catch (IgniteCheckedException e) {
             info("Got expected grid exception: " + e);
         }
 
@@ -217,7 +217,7 @@ public class GridRuntimeExceptionSelfTest extends GridCommonAbstractTest {
         /** {@inheritDoc} */
         @SuppressWarnings({"ProhibitedExceptionThrown"})
         @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, Serializable arg)
-            throws GridException {
+            throws IgniteCheckedException {
             if (log.isInfoEnabled())
                 log.info("Mapping job [job=" + this + ", grid=" + subgrid + ", arg=" + arg + ']');
 
@@ -239,7 +239,7 @@ public class GridRuntimeExceptionSelfTest extends GridCommonAbstractTest {
 
         /** {@inheritDoc} */
         @SuppressWarnings({"ProhibitedExceptionThrown"})
-        @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> received) throws GridException {
+        @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> received) throws IgniteCheckedException {
             if (failType == FailType.RESULT)
                 throw new RuntimeException("Failing out of result method.");
 
@@ -251,7 +251,7 @@ public class GridRuntimeExceptionSelfTest extends GridCommonAbstractTest {
 
         /** {@inheritDoc} */
         @SuppressWarnings({"ProhibitedExceptionThrown"})
-        @Override public Serializable reduce(List<ComputeJobResult> results) throws GridException {
+        @Override public Serializable reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
             assert results != null;
 
             if (failType == FailType.REDUCE)

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/GridSpiExceptionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridSpiExceptionSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridSpiExceptionSelfTest.java
index ca2905a..815e59c 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridSpiExceptionSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridSpiExceptionSelfTest.java
@@ -61,7 +61,7 @@ public class GridSpiExceptionSelfTest extends GridCommonAbstractTest {
 
                 assert false : "Exception should be thrown";
             }
-            catch (GridRuntimeException e) {
+            catch (IgniteException e) {
                 assert e.getMessage().startsWith(TEST_MSG) : "Wrong exception message." + e.getMessage();
             }
 
@@ -70,7 +70,7 @@ public class GridSpiExceptionSelfTest extends GridCommonAbstractTest {
 
                 assert false : "Exception should be thrown";
             }
-            catch (GridException e) {
+            catch (IgniteCheckedException e) {
                 assert e.getCause() instanceof GridTestSpiException : "Wrong cause exception type. " + e;
 
                 assert e.getCause().getMessage().startsWith(TEST_MSG) : "Wrong exception message." + e.getMessage();
@@ -98,7 +98,7 @@ public class GridSpiExceptionSelfTest extends GridCommonAbstractTest {
 
         /** {@inheritDoc} */
         @Override public <T extends IgniteEvent> Collection<T> localEvents(IgnitePredicate<T> p) {
-            throw new GridRuntimeException(TEST_MSG);
+            throw new IgniteException(TEST_MSG);
         }
 
         /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/GridStopWithCancelSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridStopWithCancelSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridStopWithCancelSelfTest.java
index 81405ee..89f6ee2 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridStopWithCancelSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridStopWithCancelSelfTest.java
@@ -77,7 +77,7 @@ public class GridStopWithCancelSelfTest extends GridCommonAbstractTest {
 
         /** {@inheritDoc} */
         @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid,
-            @Nullable String arg) throws GridException {
+            @Nullable String arg) throws IgniteCheckedException {
             for (ClusterNode node : subgrid) {
                 if (node.id().equals(locId)) {
                     return Collections.singletonMap(new ComputeJobAdapter() {
@@ -88,14 +88,14 @@ public class GridStopWithCancelSelfTest extends GridCommonAbstractTest {
                             cancelCorrect = true;
                         }
 
-                        @Override public Serializable execute() throws GridException {
+                        @Override public Serializable execute() throws IgniteCheckedException {
                             cnt.countDown();
 
                             try {
                                 Thread.sleep(Long.MAX_VALUE);
                             }
                             catch (InterruptedException e) {
-                                throw new GridException(e);
+                                throw new IgniteCheckedException(e);
                             }
 
                             return null;
@@ -104,7 +104,7 @@ public class GridStopWithCancelSelfTest extends GridCommonAbstractTest {
                 }
             }
 
-            throw new GridException("Local node not found");
+            throw new IgniteCheckedException("Local node not found");
         }
 
         /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/GridStopWithWaitSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridStopWithWaitSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridStopWithWaitSelfTest.java
index 5fac96b..c7b0f2a 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridStopWithWaitSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridStopWithWaitSelfTest.java
@@ -125,7 +125,7 @@ public class GridStopWithWaitSelfTest extends GridCommonAbstractTest {
     @ComputeTaskSessionFullSupport
     private static class GridWaitTask extends ComputeTaskAdapter<UUID, Integer> {
         /** {@inheritDoc} */
-        @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, UUID arg) throws GridException {
+        @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, UUID arg) throws IgniteCheckedException {
             ClusterNode mappedNode = null;
 
             for (ClusterNode node : subgrid) {
@@ -148,7 +148,7 @@ public class GridStopWithWaitSelfTest extends GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override public Integer reduce(List<ComputeJobResult> results) throws GridException {
+        @Override public Integer reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
             return results.get(0).getData();
         }
     }
@@ -167,7 +167,7 @@ public class GridStopWithWaitSelfTest extends GridCommonAbstractTest {
         private UUID locId;
 
         /** {@inheritDoc} */
-        @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, String arg) throws GridException {
+        @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, String arg) throws IgniteCheckedException {
             ses.setAttribute("fail", true);
 
             ClusterNode node = F.view(subgrid, F.<ClusterNode>remoteNodes(locId)).iterator().next();
@@ -183,7 +183,7 @@ public class GridStopWithWaitSelfTest extends GridCommonAbstractTest {
                 @IgniteLoggerResource
                 private IgniteLogger log;
 
-                @Override public Serializable execute() throws GridException {
+                @Override public Serializable execute() throws IgniteCheckedException {
                     jobStarted.countDown();
 
                     log.info("Starting to execute job with fail attribute: " + ses.getAttribute("fail"));
@@ -194,7 +194,7 @@ public class GridStopWithWaitSelfTest extends GridCommonAbstractTest {
                         fail = ses.waitForAttribute("fail", 0);
                     }
                     catch (InterruptedException e) {
-                        throw new GridException("Got interrupted while waiting for attribute to be set.", e);
+                        throw new IgniteCheckedException("Got interrupted while waiting for attribute to be set.", e);
                     }
 
                     log.info("Failed attribute: " + fail);
@@ -207,7 +207,7 @@ public class GridStopWithWaitSelfTest extends GridCommonAbstractTest {
 
                         log.info("Throwing grid exception from job.");
 
-                        throw new GridException("Job exception.");
+                        throw new IgniteCheckedException("Job exception.");
                     }
 
                     assert !nodeRef.get().id().equals(locId);
@@ -223,7 +223,7 @@ public class GridStopWithWaitSelfTest extends GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd) throws GridException {
+        @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd) throws IgniteCheckedException {
             if (res.getException() != null && !(res.getException() instanceof ComputeUserUndeclaredException)) {
                 assert res.getNode().id().equals(nodeRef.get().id());
 
@@ -236,7 +236,7 @@ public class GridStopWithWaitSelfTest extends GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override public Object reduce(List<ComputeJobResult> res) throws GridException {
+        @Override public Object reduce(List<ComputeJobResult> res) throws IgniteCheckedException {
             assert res.size() == 1;
 
             assert nodeRef.get() != null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskCancelSingleNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskCancelSingleNodeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskCancelSingleNodeSelfTest.java
index 11b2a3a..604dd62 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskCancelSingleNodeSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskCancelSingleNodeSelfTest.java
@@ -171,7 +171,7 @@ public class GridTaskCancelSingleNodeSelfTest extends GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Nullable @Override public Void reduce(List<ComputeJobResult> results) throws GridException {
+        @Nullable @Override public Void reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
             return null;
         }
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskContinuousMapperSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskContinuousMapperSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskContinuousMapperSelfTest.java
index cc4b34f..526e74d 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskContinuousMapperSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskContinuousMapperSelfTest.java
@@ -80,7 +80,7 @@ public class GridTaskContinuousMapperSelfTest extends GridCommonAbstractTest {
         private int cnt;
 
         /** {@inheritDoc} */
-        @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, Object arg) throws GridException {
+        @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, Object arg) throws IgniteCheckedException {
             assert subgrid.size() == 2;
 
             mapper.send(new TestJob(cnt++), subgrid.get(0));
@@ -107,7 +107,7 @@ public class GridTaskContinuousMapperSelfTest extends GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override public Object reduce(List<ComputeJobResult> results) throws GridException {
+        @Override public Object reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
             assert results.size() == cnt : "Unexpected result count: " + results.size();
 
             return null;
@@ -126,25 +126,25 @@ public class GridTaskContinuousMapperSelfTest extends GridCommonAbstractTest {
 
         /**
          * @param mapper Continuous mapper.
-         * @throws GridException Thrown if any exception occurs.
+         * @throws IgniteCheckedException Thrown if any exception occurs.
          */
         @SuppressWarnings("unused")
         @IgniteTaskContinuousMapperResource
-        private void setMapper(ComputeTaskContinuousMapper mapper) throws GridException {
+        private void setMapper(ComputeTaskContinuousMapper mapper) throws IgniteCheckedException {
             this.mapper = mapper;
 
             mapper.send(new TestJob());
         }
 
         /** {@inheritDoc} */
-        @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, Object arg) throws GridException {
+        @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, Object arg) throws IgniteCheckedException {
             mapper.send(new TestJob());
 
             return null;
         }
 
         /** {@inheritDoc} */
-        @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> received) throws GridException {
+        @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> received) throws IgniteCheckedException {
             ComputeJobResultPolicy plc = super.result(res, received);
 
             if (received != null && received.size() == 2)
@@ -154,7 +154,7 @@ public class GridTaskContinuousMapperSelfTest extends GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override public Object reduce(List<ComputeJobResult> results) throws GridException {
+        @Override public Object reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
             assert results.size() == 3 : "Unexpected result count: " + results.size();
 
             ClusterNode node = results.get(0).getNode();
@@ -164,7 +164,7 @@ public class GridTaskContinuousMapperSelfTest extends GridCommonAbstractTest {
 
                 assert false;
             }
-            catch (GridException e) {
+            catch (IgniteCheckedException e) {
                 if (log.isInfoEnabled())
                     log.info("Expected exception: " + e);
             }
@@ -174,7 +174,7 @@ public class GridTaskContinuousMapperSelfTest extends GridCommonAbstractTest {
 
                 assert false;
             }
-            catch (GridException e) {
+            catch (IgniteCheckedException e) {
                 if (log.isInfoEnabled())
                     log.info("Expected exception: " + e);
             }
@@ -184,7 +184,7 @@ public class GridTaskContinuousMapperSelfTest extends GridCommonAbstractTest {
 
                 assert false;
             }
-            catch (GridException e) {
+            catch (IgniteCheckedException e) {
                 if (log.isInfoEnabled())
                     log.info("Expected exception: " + e);
             }
@@ -194,7 +194,7 @@ public class GridTaskContinuousMapperSelfTest extends GridCommonAbstractTest {
 
                 assert false;
             }
-            catch (GridException e) {
+            catch (IgniteCheckedException e) {
                 if (log.isInfoEnabled())
                     log.info("Expected exception: " + e);
             }
@@ -216,7 +216,7 @@ public class GridTaskContinuousMapperSelfTest extends GridCommonAbstractTest {
         private IgniteLogger log;
 
         /** {@inheritDoc} */
-        @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, Object arg) throws GridException {
+        @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, Object arg) throws IgniteCheckedException {
             try {
                 mapper.send(new TestJob(), null);
 
@@ -253,7 +253,7 @@ public class GridTaskContinuousMapperSelfTest extends GridCommonAbstractTest {
 
                 assert false;
             }
-            catch (GridException e) {
+            catch (IgniteCheckedException e) {
                 if (log.isInfoEnabled())
                     log.info("Expected exception: " + e);
             }
@@ -283,7 +283,7 @@ public class GridTaskContinuousMapperSelfTest extends GridCommonAbstractTest {
 
                 assert false;
             }
-            catch (GridException e) {
+            catch (IgniteCheckedException e) {
                 if (log.isInfoEnabled())
                     log.info("Expected exception: " + e);
             }
@@ -294,7 +294,7 @@ public class GridTaskContinuousMapperSelfTest extends GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override public Object reduce(List<ComputeJobResult> results) throws GridException {
+        @Override public Object reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
             assert results.size() == 1;
 
             return null;
@@ -317,7 +317,7 @@ public class GridTaskContinuousMapperSelfTest extends GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override public Serializable execute() throws GridException {
+        @Override public Serializable execute() throws IgniteCheckedException {
             return argument(0);
         }
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskExecutionContextSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskExecutionContextSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskExecutionContextSelfTest.java
index ee2fafa..9df7cf0 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskExecutionContextSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskExecutionContextSelfTest.java
@@ -85,7 +85,7 @@ public class GridTaskExecutionContextSelfTest extends GridCommonAbstractTest {
      */
     public void testWithNoFailoverClosure() throws Exception {
         final Runnable r = new GridAbsClosureX() {
-            @Override public void applyx() throws GridException {
+            @Override public void applyx() throws IgniteCheckedException {
                 CNT.incrementAndGet();
 
                 throw new ComputeExecutionRejectedException("Expected error.");
@@ -147,12 +147,12 @@ public class GridTaskExecutionContextSelfTest extends GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override protected Collection<? extends ComputeJob> split(int gridSize, Void arg) throws GridException {
+        @Override protected Collection<? extends ComputeJob> split(int gridSize, Void arg) throws IgniteCheckedException {
             return F.asSet(new ComputeJobAdapter() {
                 @IgniteTaskSessionResource
                 private ComputeTaskSession ses;
 
-                @Override public Object execute() throws GridException {
+                @Override public Object execute() throws IgniteCheckedException {
                     CNT.incrementAndGet();
 
                     if (fail)
@@ -164,7 +164,7 @@ public class GridTaskExecutionContextSelfTest extends GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override public String reduce(List<ComputeJobResult> results) throws GridException {
+        @Override public String reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
             return F.first(results).getData();
         }
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskFailoverSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskFailoverSelfTest.java
index f961795..247c249 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskFailoverSelfTest.java
@@ -86,7 +86,7 @@ public class GridTaskFailoverSelfTest extends GridCommonAbstractTest {
 
         /** {@inheritDoc} */
         @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> received) throws
-            GridException {
+            IgniteCheckedException {
             if (res.getException() != null)
                 throw res.getException();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskFutureImplStopGridSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskFutureImplStopGridSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskFutureImplStopGridSelfTest.java
index 9285081..955d696 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskFutureImplStopGridSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskFutureImplStopGridSelfTest.java
@@ -142,7 +142,7 @@ public class GridTaskFutureImplStopGridSelfTest extends GridCommonAbstractTest {
         private IgniteLogger log;
 
         /** {@inheritDoc} */
-        @Override public Collection<? extends ComputeJob> split(int gridSize, Object arg) throws GridException {
+        @Override public Collection<? extends ComputeJob> split(int gridSize, Object arg) throws IgniteCheckedException {
             if (log.isInfoEnabled())
                 log.info("Splitting job [job=" + this + ", gridSize=" + gridSize + ", arg=" + arg + ']');
 
@@ -155,7 +155,7 @@ public class GridTaskFutureImplStopGridSelfTest extends GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override public Serializable reduce(List<ComputeJobResult> results) throws GridException {
+        @Override public Serializable reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
             if (log.isInfoEnabled())
                 log.info("Aggregating job [job=" + this + ", results=" + results + ']');
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskInstanceExecutionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskInstanceExecutionSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskInstanceExecutionSelfTest.java
index cb4562d..cd63264 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskInstanceExecutionSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskInstanceExecutionSelfTest.java
@@ -92,7 +92,7 @@ public class GridTaskInstanceExecutionSelfTest extends GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> received) throws GridException {
+        @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> received) throws IgniteCheckedException {
             log.info("Task result state: " + state);
 
             assert state != null;
@@ -102,7 +102,7 @@ public class GridTaskInstanceExecutionSelfTest extends GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override public Object reduce(List<ComputeJobResult> results) throws GridException {
+        @Override public Object reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
             log.info("Task reduce state: " + state);
 
             assert state != null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskInstantiationSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskInstantiationSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskInstantiationSelfTest.java
index efbe06b..2ce5c70 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskInstantiationSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskInstantiationSelfTest.java
@@ -9,10 +9,10 @@
 
 package org.gridgain.grid.kernal;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.resources.*;
-import org.gridgain.grid.*;
 import org.gridgain.testframework.junits.common.*;
 import org.jetbrains.annotations.*;
 
@@ -60,7 +60,7 @@ public class GridTaskInstantiationSelfTest extends GridCommonAbstractTest {
 
         /** {@inheritDoc} */
         @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid,
-            @Nullable String arg) throws GridException {
+            @Nullable String arg) throws IgniteCheckedException {
             for (ClusterNode node : subgrid)
                 if (node.id().equals(locId))
                     return Collections.singletonMap(new ComputeJobAdapter() {
@@ -69,7 +69,7 @@ public class GridTaskInstantiationSelfTest extends GridCommonAbstractTest {
                         }
                     }, node);
 
-            throw new GridException("Local node not found.");
+            throw new IgniteCheckedException("Local node not found.");
         }
 
         /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskJobRejectSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskJobRejectSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskJobRejectSelfTest.java
index 72a5387..5e3edcf 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskJobRejectSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskJobRejectSelfTest.java
@@ -118,7 +118,7 @@ public class GridTaskJobRejectSelfTest extends GridCommonAbstractTest {
             }
 
             /** {@inheritDoc} */
-            @Nullable @Override public Void reduce(List<ComputeJobResult> results) throws GridException {
+            @Nullable @Override public Void reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
                 return null;
             }
         }, null);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskListenerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskListenerSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskListenerSelfTest.java
index d8381b5..680cfd5 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskListenerSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskListenerSelfTest.java
@@ -77,7 +77,7 @@ public class GridTaskListenerSelfTest extends GridCommonAbstractTest {
     /** Test task. */
     private static class TestTask extends ComputeTaskSplitAdapter<Serializable, Object> {
         /** {@inheritDoc} */
-        @Override protected Collection<? extends ComputeJob> split(int gridSize, Serializable arg) throws GridException {
+        @Override protected Collection<? extends ComputeJob> split(int gridSize, Serializable arg) throws IgniteCheckedException {
             Collection<ComputeJobAdapter> jobs = new ArrayList<>();
 
             for (int i = 0; i < 5; i++) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskMapAsyncSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskMapAsyncSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskMapAsyncSelfTest.java
index a5cc9ce..101e041 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskMapAsyncSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskMapAsyncSelfTest.java
@@ -69,7 +69,7 @@ public class GridTaskMapAsyncSelfTest extends GridCommonAbstractTest {
     @ComputeTaskMapAsync
     private static class AsyncMappedTask extends BaseTask {
         /** {@inheritDoc} */
-        @Override protected Collection<? extends ComputeJob> split(int gridSize, Object arg) throws GridException {
+        @Override protected Collection<? extends ComputeJob> split(int gridSize, Object arg) throws IgniteCheckedException {
             Collection<? extends ComputeJob> res = super.split(gridSize, arg);
 
             assert mainThread != mapper;
@@ -83,7 +83,7 @@ public class GridTaskMapAsyncSelfTest extends GridCommonAbstractTest {
      */
     private static class SyncMappedTask extends BaseTask {
         /** {@inheritDoc} */
-        @Override protected Collection<? extends ComputeJob> split(int gridSize, Object arg) throws GridException {
+        @Override protected Collection<? extends ComputeJob> split(int gridSize, Object arg) throws IgniteCheckedException {
             Collection<? extends ComputeJob> res = super.split(gridSize, arg);
 
             assert mainThread == mapper;
@@ -110,7 +110,7 @@ public class GridTaskMapAsyncSelfTest extends GridCommonAbstractTest {
         protected IgniteLogger log;
 
         /** {@inheritDoc} */
-        @Override protected Collection<? extends ComputeJob> split(int gridSize, Object arg) throws GridException {
+        @Override protected Collection<? extends ComputeJob> split(int gridSize, Object arg) throws IgniteCheckedException {
             mapper = Thread.currentThread();
 
             return Collections.singleton(new ComputeJobAdapter() {
@@ -127,7 +127,7 @@ public class GridTaskMapAsyncSelfTest extends GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Nullable @Override public Void reduce(List<ComputeJobResult> results) throws GridException {
+        @Nullable @Override public Void reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
             return null;
         }
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskNameAnnotationSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskNameAnnotationSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskNameAnnotationSelfTest.java
index 35a4df1..561b6a8 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskNameAnnotationSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskNameAnnotationSelfTest.java
@@ -9,10 +9,10 @@
 
 package org.gridgain.grid.kernal;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.resources.*;
-import org.gridgain.grid.*;
 import org.gridgain.grid.util.lang.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.testframework.junits.common.*;
@@ -75,7 +75,7 @@ public class GridTaskNameAnnotationSelfTest extends GridCommonAbstractTest {
     private static class TestTask implements ComputeTask<Void, String> {
         /** {@inheritDoc} */
         @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid,
-            @Nullable Void arg) throws GridException {
+            @Nullable Void arg) throws IgniteCheckedException {
             return F.asMap(new ComputeJobAdapter() {
                 @IgniteTaskSessionResource
                 private ComputeTaskSession ses;
@@ -88,12 +88,12 @@ public class GridTaskNameAnnotationSelfTest extends GridCommonAbstractTest {
 
         /** {@inheritDoc} */
         @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd)
-            throws GridException {
+            throws IgniteCheckedException {
             return WAIT;
         }
 
         /** {@inheritDoc} */
-        @Override public String reduce(List<ComputeJobResult> results) throws GridException {
+        @Override public String reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
             return F.first(results).getData();
         }
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskResultCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskResultCacheSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskResultCacheSelfTest.java
index dc939bb..ea63b8b 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskResultCacheSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskResultCacheSelfTest.java
@@ -54,7 +54,7 @@ public class GridTaskResultCacheSelfTest extends GridCommonAbstractTest {
     @ComputeTaskNoResultCache
     private static class GridResultNoCacheTestTask extends GridAbstractCacheTestTask {
         /** {@inheritDoc} */
-        @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd) throws GridException {
+        @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd) throws IgniteCheckedException {
             assert res.getData() != null;
             assert rcvd.isEmpty();
 
@@ -62,7 +62,7 @@ public class GridTaskResultCacheSelfTest extends GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override public Object reduce(List<ComputeJobResult> results) throws GridException {
+        @Override public Object reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
             assert results.isEmpty();
 
             return null;
@@ -75,7 +75,7 @@ public class GridTaskResultCacheSelfTest extends GridCommonAbstractTest {
     private static class GridResultCacheTestTask extends GridAbstractCacheTestTask {
         /** {@inheritDoc} */
         @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd)
-            throws GridException {
+            throws IgniteCheckedException {
             assert res.getData() != null;
             assert rcvd.contains(res);
 
@@ -86,7 +86,7 @@ public class GridTaskResultCacheSelfTest extends GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override public Object reduce(List<ComputeJobResult> results) throws GridException {
+        @Override public Object reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
             for (ComputeJobResult res : results) {
                 if (res.getException() != null)
                     throw res.getException();
@@ -103,7 +103,7 @@ public class GridTaskResultCacheSelfTest extends GridCommonAbstractTest {
      */
     private abstract static class GridAbstractCacheTestTask extends ComputeTaskSplitAdapter<String, Object> {
         /** {@inheritDoc} */
-        @Override protected Collection<? extends ComputeJob> split(int gridSize, String arg) throws GridException {
+        @Override protected Collection<? extends ComputeJob> split(int gridSize, String arg) throws IgniteCheckedException {
             String[] words = arg.split(" ");
 
             Collection<ComputeJobAdapter> jobs = new ArrayList<>(words.length);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskTimeoutSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskTimeoutSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskTimeoutSelfTest.java
index e1a1a93..67c4d32 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskTimeoutSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskTimeoutSelfTest.java
@@ -145,7 +145,7 @@ public class GridTaskTimeoutSelfTest extends GridCommonAbstractTest {
                     catch (ComputeTaskTimeoutException ignored) {
                         // Expected.
                     }
-                    catch (GridException e) {
+                    catch (IgniteCheckedException e) {
                         throw new IllegalStateException(e); //shouldn't happen
                     }
                     finally {
@@ -172,7 +172,7 @@ public class GridTaskTimeoutSelfTest extends GridCommonAbstractTest {
      */
     private static class GridTaskTimeoutTestTask extends ComputeTaskSplitAdapter<Serializable, Object> {
         /** {@inheritDoc} */
-        @Override protected Collection<? extends ComputeJob> split(int gridSize, Serializable arg) throws GridException {
+        @Override protected Collection<? extends ComputeJob> split(int gridSize, Serializable arg) throws IgniteCheckedException {
             Collection<GridTaskTimeoutTestJob> jobs = new ArrayList<>(SPLIT_COUNT);
 
             for (int i = 0; i < SPLIT_COUNT; i++) {
@@ -187,7 +187,7 @@ public class GridTaskTimeoutSelfTest extends GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override public Object reduce(List<ComputeJobResult> results) throws GridException {
+        @Override public Object reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
             return null;
         }
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/GridManagerStopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/GridManagerStopSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/GridManagerStopSelfTest.java
index 28863d5..efdb5eb 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/GridManagerStopSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/GridManagerStopSelfTest.java
@@ -9,20 +9,10 @@
 
 package org.gridgain.grid.kernal.managers;
 
+import org.apache.ignite.*;
 import org.apache.ignite.marshaller.optimized.*;
 import org.apache.ignite.resources.*;
 import org.apache.ignite.spi.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.kernal.managers.checkpoint.*;
-import org.gridgain.grid.kernal.managers.collision.*;
-import org.gridgain.grid.kernal.managers.communication.*;
-import org.gridgain.grid.kernal.managers.deployment.*;
-import org.gridgain.grid.kernal.managers.discovery.*;
-import org.gridgain.grid.kernal.managers.eventstorage.*;
-import org.gridgain.grid.kernal.managers.failover.*;
-import org.gridgain.grid.kernal.managers.loadbalancer.*;
-import org.gridgain.grid.kernal.managers.swapspace.*;
-import org.gridgain.grid.kernal.processors.resource.*;
 import org.apache.ignite.spi.checkpoint.sharedfs.*;
 import org.apache.ignite.spi.collision.*;
 import org.apache.ignite.spi.collision.fifoqueue.*;
@@ -38,6 +28,16 @@ import org.apache.ignite.spi.failover.always.*;
 import org.apache.ignite.spi.loadbalancing.roundrobin.*;
 import org.apache.ignite.spi.swapspace.*;
 import org.apache.ignite.spi.swapspace.file.*;
+import org.gridgain.grid.kernal.managers.checkpoint.*;
+import org.gridgain.grid.kernal.managers.collision.*;
+import org.gridgain.grid.kernal.managers.communication.*;
+import org.gridgain.grid.kernal.managers.deployment.*;
+import org.gridgain.grid.kernal.managers.discovery.*;
+import org.gridgain.grid.kernal.managers.eventstorage.*;
+import org.gridgain.grid.kernal.managers.failover.*;
+import org.gridgain.grid.kernal.managers.loadbalancer.*;
+import org.gridgain.grid.kernal.managers.swapspace.*;
+import org.gridgain.grid.kernal.processors.resource.*;
 import org.gridgain.testframework.junits.*;
 import org.gridgain.testframework.junits.common.*;
 
@@ -67,9 +67,9 @@ public class GridManagerStopSelfTest extends GridCommonAbstractTest {
 
     /**
      * @param target Target spi.
-     * @throws GridException If injection failed.
+     * @throws IgniteCheckedException If injection failed.
      */
-    private void injectLogger(IgniteSpi target) throws GridException {
+    private void injectLogger(IgniteSpi target) throws IgniteCheckedException {
         ctx.resource().injectBasicResource(
             target,
             IgniteLoggerResource.class,

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/GridNoopManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/GridNoopManagerSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/GridNoopManagerSelfTest.java
index 2cc30a2..1e6ccc6 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/GridNoopManagerSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/GridNoopManagerSelfTest.java
@@ -9,8 +9,8 @@
 
 package org.gridgain.grid.kernal.managers;
 
+import org.apache.ignite.*;
 import org.apache.ignite.spi.*;
-import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.testframework.*;
 import org.gridgain.testframework.junits.*;
@@ -46,12 +46,12 @@ public class GridNoopManagerSelfTest extends GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override public void start() throws GridException {
+        @Override public void start() throws IgniteCheckedException {
             // No-op.
         }
 
         /** {@inheritDoc} */
-        @Override public void stop(boolean cancel) throws GridException {
+        @Override public void stop(boolean cancel) throws IgniteCheckedException {
             // No-op.
         }
     }


Mime
View raw message