You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2014/12/12 10:29:14 UTC
[13/67] [abbrv] [partial] incubator-ignite git commit: Rename
GridException to IgniteCheckedException,
GridRuntimeException to IgniteException.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java
index 40616f6..ace207c 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java
@@ -295,7 +295,7 @@ public abstract class GridCheckpointManagerAbstractSelfTest extends GridCommonAb
/** {@inheritDoc} */
@SuppressWarnings({"TooBroadScope"})
- @Override public String execute() throws GridException {
+ @Override public String execute() throws IgniteCheckedException {
assert ignite != null;
assert taskSes != null;
@@ -312,7 +312,7 @@ public abstract class GridCheckpointManagerAbstractSelfTest extends GridCommonAb
taskSes.saveCheckpoint(key2, val2, SESSION_SCOPE, 0);
assertWithRetries(new GridAbsClosureX() {
- @Override public void applyx() throws GridException {
+ @Override public void applyx() throws IgniteCheckedException {
assert val1.equals(taskSes.loadCheckpoint(key1));
assert val2.equals(taskSes.loadCheckpoint(key2));
}
@@ -323,7 +323,7 @@ public abstract class GridCheckpointManagerAbstractSelfTest extends GridCommonAb
taskSes.saveCheckpoint(key2, val1, SESSION_SCOPE, 0, false);
assertWithRetries(new GridAbsClosureX() {
- @Override public void applyx() throws GridException {
+ @Override public void applyx() throws IgniteCheckedException {
assert val1.equals(taskSes.loadCheckpoint(key1));
assert val2.equals(taskSes.loadCheckpoint(key2));
}
@@ -333,7 +333,7 @@ public abstract class GridCheckpointManagerAbstractSelfTest extends GridCommonAb
taskSes.saveCheckpoint(key2, val1, SESSION_SCOPE, 0, true);
assertWithRetries(new GridAbsClosureX() {
- @Override public void applyx() throws GridException {
+ @Override public void applyx() throws IgniteCheckedException {
assert val2.equals(taskSes.loadCheckpoint(key1));
assert val1.equals(taskSes.loadCheckpoint(key2));
}
@@ -345,7 +345,7 @@ public abstract class GridCheckpointManagerAbstractSelfTest extends GridCommonAb
assert !taskSes.removeCheckpoint(key2);
assertWithRetries(new GridAbsClosureX() {
- @Override public void applyx() throws GridException {
+ @Override public void applyx() throws IgniteCheckedException {
assert taskSes.loadCheckpoint(key1) == null;
assert taskSes.loadCheckpoint(key2) == null;
}
@@ -365,11 +365,11 @@ public abstract class GridCheckpointManagerAbstractSelfTest extends GridCommonAb
Thread.sleep(6000);
}
catch (InterruptedException e) {
- throw new GridException(e);
+ throw new IgniteCheckedException(e);
}
assertWithRetries(new GridAbsClosureX() {
- @Override public void applyx() throws GridException {
+ @Override public void applyx() throws IgniteCheckedException {
assert taskSes.loadCheckpoint(key1) == null;
assert taskSes.loadCheckpoint(key2) == null;
}
@@ -388,12 +388,12 @@ public abstract class GridCheckpointManagerAbstractSelfTest extends GridCommonAb
@ComputeTaskSessionFullSupport
private static class GridTestCheckpointTask extends ComputeTaskSplitAdapter<Object, Object> {
/** {@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 {
return Collections.singleton(new GridTestCheckpointJob());
}
/** {@inheritDoc} */
- @Override public Serializable reduce(List<ComputeJobResult> results) throws GridException {
+ @Override public Serializable reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
return null;
}
}
@@ -411,7 +411,7 @@ public abstract class GridCheckpointManagerAbstractSelfTest extends GridCommonAb
private ComputeTaskSession taskSes;
/** {@inheritDoc} */
- @Override public String execute() throws GridException {
+ @Override public String execute() throws IgniteCheckedException {
assert ignite != null;
assert taskSes != null;
@@ -433,7 +433,7 @@ public abstract class GridCheckpointManagerAbstractSelfTest extends GridCommonAb
startLatch.await();
}
catch (InterruptedException e) {
- throw new GridException("Thread has been interrupted.", e);
+ throw new IgniteCheckedException("Thread has been interrupted.", e);
}
X.println(">>> Producer started.");
@@ -447,7 +447,7 @@ public abstract class GridCheckpointManagerAbstractSelfTest extends GridCommonAb
read1FinishedLatch.await();
}
catch (InterruptedException e) {
- throw new GridException("Thread has been interrupted.", e);
+ throw new IgniteCheckedException("Thread has been interrupted.", e);
}
// No retries here as other thread should have seen checkpoint already.
@@ -463,7 +463,7 @@ public abstract class GridCheckpointManagerAbstractSelfTest extends GridCommonAb
read2FinishedLatch.await();
}
catch (InterruptedException e) {
- throw new GridException("Thread has been interrupted.", e);
+ throw new IgniteCheckedException("Thread has been interrupted.", e);
}
assert GLOBAL_VAL.equals(taskSes.loadCheckpoint(GLOBAL_KEY));
@@ -479,7 +479,7 @@ public abstract class GridCheckpointManagerAbstractSelfTest extends GridCommonAb
read3FinishedLatch.await();
}
catch (InterruptedException e) {
- throw new GridException("Thread has been interrupted.", e);
+ throw new IgniteCheckedException("Thread has been interrupted.", e);
}
assert SES_VAL_OVERWRITTEN.equals(taskSes.loadCheckpoint(GLOBAL_KEY));
@@ -496,7 +496,7 @@ public abstract class GridCheckpointManagerAbstractSelfTest extends GridCommonAb
rmvLatch.countDown();
assertWithRetries(new GridAbsClosureX() {
- @Override public void applyx() throws GridException {
+ @Override public void applyx() throws IgniteCheckedException {
assert taskSes.loadCheckpoint(GLOBAL_KEY) == null;
assert taskSes.loadCheckpoint(SES_KEY) == null;
}
@@ -515,7 +515,7 @@ public abstract class GridCheckpointManagerAbstractSelfTest extends GridCommonAb
private ComputeTaskSession taskSes;
/** {@inheritDoc} */
- @Override public String execute() throws GridException {
+ @Override public String execute() throws IgniteCheckedException {
assert taskSes != null;
assert startLatch != null;
@@ -536,7 +536,7 @@ public abstract class GridCheckpointManagerAbstractSelfTest extends GridCommonAb
startLatch.await();
}
catch (InterruptedException e) {
- throw new GridException("Thread has been interrupted.", e);
+ throw new IgniteCheckedException("Thread has been interrupted.", e);
}
X.println(">>> Consumer started.");
@@ -545,12 +545,12 @@ public abstract class GridCheckpointManagerAbstractSelfTest extends GridCommonAb
read1Latch.await();
}
catch (InterruptedException e) {
- throw new GridException("Thread has been interrupted.", e);
+ throw new IgniteCheckedException("Thread has been interrupted.", e);
}
// Test that checkpoints were saved properly.
assertWithRetries(new GridAbsClosureX() {
- @Override public void applyx() throws GridException {
+ @Override public void applyx() throws IgniteCheckedException {
assert GLOBAL_VAL.equals(taskSes.loadCheckpoint(GLOBAL_KEY));
assert SES_VAL.equals(taskSes.loadCheckpoint(SES_KEY));
}
@@ -562,12 +562,12 @@ public abstract class GridCheckpointManagerAbstractSelfTest extends GridCommonAb
read2Latch.await();
}
catch (InterruptedException e) {
- throw new GridException("Thread has been interrupted.", e);
+ throw new IgniteCheckedException("Thread has been interrupted.", e);
}
// Test that checkpoints were not overwritten.
assertWithRetries(new GridAbsClosureX() {
- @Override public void applyx() throws GridException {
+ @Override public void applyx() throws IgniteCheckedException {
assert GLOBAL_VAL.equals(taskSes.loadCheckpoint(GLOBAL_KEY));
assert SES_VAL.equals(taskSes.loadCheckpoint(SES_KEY));
}
@@ -579,11 +579,11 @@ public abstract class GridCheckpointManagerAbstractSelfTest extends GridCommonAb
read3Latch.await();
}
catch (InterruptedException e) {
- throw new GridException("Thread has been interrupted.", e);
+ throw new IgniteCheckedException("Thread has been interrupted.", e);
}
assertWithRetries(new GridAbsClosureX() {
- @Override public void applyx() throws GridException {
+ @Override public void applyx() throws IgniteCheckedException {
assertEquals(SES_VAL_OVERWRITTEN, taskSes.loadCheckpoint(GLOBAL_KEY));
assertEquals(GLOBAL_VAL_OVERWRITTEN, taskSes.loadCheckpoint(SES_KEY));
}
@@ -595,14 +595,14 @@ public abstract class GridCheckpointManagerAbstractSelfTest extends GridCommonAb
rmvLatch.await();
}
catch (InterruptedException e) {
- throw new GridException("Thread has been interrupted.", e);
+ throw new IgniteCheckedException("Thread has been interrupted.", e);
}
// Check checkpoints are actually removed.
assert !taskSes.removeCheckpoint(GLOBAL_KEY);
assert !taskSes.removeCheckpoint(SES_KEY);
assertWithRetries(new GridAbsClosureX() {
- @Override public void applyx() throws GridException {
+ @Override public void applyx() throws IgniteCheckedException {
assert taskSes.loadCheckpoint(GLOBAL_KEY) == null;
assert taskSes.loadCheckpoint(SES_KEY) == null;
}
@@ -618,7 +618,7 @@ public abstract class GridCheckpointManagerAbstractSelfTest extends GridCommonAb
@ComputeTaskSessionFullSupport
private static class GridMultiNodeTestCheckPointTask extends ComputeTaskSplitAdapter<Object, Object> {
/** {@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 {
assert gridSize == 2;
return Arrays.asList(
@@ -628,7 +628,7 @@ public abstract class GridCheckpointManagerAbstractSelfTest extends GridCommonAb
}
/** {@inheritDoc} */
- @Override public Object reduce(List<ComputeJobResult> results) throws GridException {
+ @Override public Object reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
return null;
}
}
@@ -641,9 +641,9 @@ public abstract class GridCheckpointManagerAbstractSelfTest extends GridCommonAb
private ComputeTaskSession taskSes;
/** {@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 {
return Collections.singleton(new ComputeJobAdapter() {
- @Nullable @Override public Object execute() throws GridException {
+ @Nullable @Override public Object execute() throws IgniteCheckedException {
assert taskSes != null;
assert startLatch != null;
@@ -664,7 +664,7 @@ public abstract class GridCheckpointManagerAbstractSelfTest extends GridCommonAb
startLatch.await();
}
catch (InterruptedException e) {
- throw new GridException("Thread has been interrupted.", e);
+ throw new IgniteCheckedException("Thread has been interrupted.", e);
}
X.println(">>> Global consumer started.");
@@ -673,7 +673,7 @@ public abstract class GridCheckpointManagerAbstractSelfTest extends GridCommonAb
read1Latch.await();
}
catch (InterruptedException e) {
- throw new GridException("Thread has been interrupted.", e);
+ throw new IgniteCheckedException("Thread has been interrupted.", e);
}
// Test that checkpoints were saved properly.
@@ -686,7 +686,7 @@ public abstract class GridCheckpointManagerAbstractSelfTest extends GridCommonAb
read2Latch.await();
}
catch (InterruptedException e) {
- throw new GridException("Thread has been interrupted.", e);
+ throw new IgniteCheckedException("Thread has been interrupted.", e);
}
// Test that checkpoints were not overwritten.
@@ -699,7 +699,7 @@ public abstract class GridCheckpointManagerAbstractSelfTest extends GridCommonAb
read3Latch.await();
}
catch (InterruptedException e) {
- throw new GridException("Thread has been interrupted.", e);
+ throw new IgniteCheckedException("Thread has been interrupted.", e);
}
assert GLOBAL_VAL_OVERWRITTEN.equals(taskSes.loadCheckpoint(SES_KEY));
@@ -711,7 +711,7 @@ public abstract class GridCheckpointManagerAbstractSelfTest extends GridCommonAb
rmvLatch.await();
}
catch (InterruptedException e) {
- throw new GridException("Thread has been interrupted.", e);
+ throw new IgniteCheckedException("Thread has been interrupted.", e);
}
// Check checkpoints are actually removed.
assert !taskSes.removeCheckpoint(GLOBAL_KEY);
@@ -726,7 +726,7 @@ public abstract class GridCheckpointManagerAbstractSelfTest extends GridCommonAb
}
/** {@inheritDoc} */
- @Nullable @Override public Integer reduce(List<ComputeJobResult> results) throws GridException {
+ @Nullable @Override public Integer reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
int sum = 0;
for (ComputeJobResult res : results)
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointTaskSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointTaskSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointTaskSelfTest.java
index 04d167a..f8f8392 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointTaskSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointTaskSelfTest.java
@@ -133,7 +133,7 @@ public class GridCheckpointTaskSelfTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid,
- @Nullable Void arg) throws GridException {
+ @Nullable Void arg) throws IgniteCheckedException {
assert ignite.cluster().nodes().size() == 2;
ClusterNode rmt = F.first(ignite.cluster().forRemotes().nodes());
@@ -148,7 +148,7 @@ public class GridCheckpointTaskSelfTest extends GridCommonAbstractTest {
@IgniteTaskSessionResource
private ComputeTaskSession ses;
- @Override public Object execute() throws GridException {
+ @Override public Object execute() throws IgniteCheckedException {
X.println("Executing FailoverTestTask job on node " + nodeId);
Boolean cpVal = ses.loadCheckpoint(CP_KEY);
@@ -169,7 +169,7 @@ public class GridCheckpointTaskSelfTest 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;
}
}
@@ -189,7 +189,7 @@ public class GridCheckpointTaskSelfTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid,
- @Nullable Void arg) throws GridException {
+ @Nullable Void arg) throws IgniteCheckedException {
assert ignite.cluster().nodes().size() == 2;
ClusterNode rmt = F.first(ignite.cluster().forRemotes().nodes());
@@ -202,7 +202,7 @@ public class GridCheckpointTaskSelfTest extends GridCommonAbstractTest {
@IgniteTaskSessionResource
private ComputeTaskSession ses;
- @Override public Object execute() throws GridException {
+ @Override public Object execute() throws IgniteCheckedException {
X.println("Executing ReduceTestTask job on node " + nodeId);
ses.saveCheckpoint(CP_KEY, true);
@@ -215,7 +215,7 @@ public class GridCheckpointTaskSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override public Void reduce(List<ComputeJobResult> results) throws GridException {
+ @Override public Void reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
assert ses.loadCheckpoint(CP_KEY) != null;
return null;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/communication/GridCommunicationManagerListenersSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/communication/GridCommunicationManagerListenersSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/communication/GridCommunicationManagerListenersSelfTest.java
index 5f04c09..360e35b 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/communication/GridCommunicationManagerListenersSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/communication/GridCommunicationManagerListenersSelfTest.java
@@ -100,7 +100,7 @@ public class GridCommunicationManagerListenersSelfTest extends GridCommonAbstrac
try {
G.ignite(getTestGridName()).compute().execute(t.getClass(), null);
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
assert false : "Failed to execute task [iteration=" + i + ", err=" + e.getMessage() + ']';
}
@@ -122,7 +122,7 @@ public class GridCommunicationManagerListenersSelfTest extends GridCommonAbstrac
private AtomicBoolean stop = new AtomicBoolean();
/** {@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 {
ignite.message().localListen(null, new P2<UUID, Object>() {
@Override public boolean apply(UUID uuid, Object o) {
return stop.get();
@@ -137,7 +137,7 @@ public class GridCommunicationManagerListenersSelfTest extends GridCommonAbstrac
}
/** {@inheritDoc} */
- @Override public Object reduce(List<ComputeJobResult> results) throws GridException {
+ @Override public Object reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
stop.set(true);
return null;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/communication/GridIoManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/communication/GridIoManagerSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/communication/GridIoManagerSelfTest.java
index bf90982..c6118a0 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/communication/GridIoManagerSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/communication/GridIoManagerSelfTest.java
@@ -10,12 +10,12 @@
package org.gridgain.grid.kernal.managers.communication;
import org.apache.commons.collections.*;
+import org.apache.ignite.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.marshaller.jdk.*;
-import org.gridgain.grid.*;
+import org.apache.ignite.spi.communication.tcp.*;
import org.gridgain.grid.kernal.*;
import org.gridgain.grid.kernal.managers.discovery.*;
-import org.apache.ignite.spi.communication.tcp.*;
import org.gridgain.grid.util.direct.*;
import org.gridgain.grid.util.typedef.*;
import org.gridgain.testframework.*;
@@ -103,7 +103,7 @@ public class GridIoManagerSelfTest extends GridCommonAbstractTest {
try {
ioMgr.sendUserMessage(F.asList(locNode, rmtNode), msg);
}
- catch (GridException ignored) {
+ catch (IgniteCheckedException ignored) {
// No-op. We are using mocks so real sending is impossible.
}
@@ -127,7 +127,7 @@ public class GridIoManagerSelfTest extends GridCommonAbstractTest {
try {
ioMgr.sendUserMessage(F.asList(locNode, rmtNode), msg, GridTopic.TOPIC_GGFS, false, 123L);
}
- catch (GridException ignored) {
+ catch (IgniteCheckedException ignored) {
// No-op. We are using mocks so real sending is impossible.
}
@@ -177,7 +177,7 @@ public class GridIoManagerSelfTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override public void send(ClusterNode node, GridTopic topic, GridTcpCommunicationMessageAdapter msg,
- GridIoPolicy plc) throws GridException {
+ GridIoPolicy plc) 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/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java
index 5788d3e..c2e5481 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java
@@ -108,7 +108,7 @@ public class GridDiscoveryManagerAttributesSelfTest extends GridCommonAbstractTe
fail();
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
assertTrue(e.getCause().getMessage().startsWith("Remote node has deployment mode different from"));
}
}
@@ -131,7 +131,7 @@ public class GridDiscoveryManagerAttributesSelfTest extends GridCommonAbstractTe
fail();
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
assertTrue(e.getCause().getMessage().startsWith("Remote node has peer class loading enabled flag " +
"different from"));
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFailoverSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFailoverSelfTest.java
index e9277fc..aa0b031 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFailoverSelfTest.java
@@ -291,14 +291,14 @@ public abstract class GridCacheAbstractFailoverSelfTest extends GridCacheAbstrac
/**
* @param cache Cache.
* @param cnt Entry count.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
private void put(GridCacheProjection<String, Integer> cache, int cnt) throws Exception {
try {
for (int i = 0; i < cnt; i++)
assertTrue("Failed to put key: 'key" + i + "'", cache.putx("key" + i, i));
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
// It is ok to fail with topology exception.
if (!X.hasCause(e, ClusterTopologyException.class))
throw e;
@@ -310,7 +310,7 @@ public abstract class GridCacheAbstractFailoverSelfTest extends GridCacheAbstrac
* @param cnt Entry count.
* @param concurrency Concurrency control.
* @param isolation Isolation level.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
private void put(GridCacheProjection<String, Integer> cache, final int cnt,
GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation) throws Exception {
@@ -319,13 +319,13 @@ public abstract class GridCacheAbstractFailoverSelfTest extends GridCacheAbstrac
CU.inTx(cache, concurrency, isolation, new CIX1<GridCacheProjection<String, Integer>>() {
@Override public void applyx(GridCacheProjection<String, Integer> cache)
- throws GridException {
+ throws IgniteCheckedException {
for (int i = 0; i < cnt; i++)
assertTrue("Failed to put key: 'key" + i + "'", cache.putx("key" + i, i));
}
});
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
// It is ok to fail with topology exception.
if (!X.hasCause(e, ClusterTopologyException.class))
throw e;
@@ -337,14 +337,14 @@ public abstract class GridCacheAbstractFailoverSelfTest extends GridCacheAbstrac
/**
* @param cache Cache.
* @param cnt Entry count.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
private void remove(GridCacheProjection<String, Integer> cache, int cnt) throws Exception {
try {
for (int i = 0; i < cnt; i++)
cache.removex("key" + i);
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
// It is ok to fail with topology exception.
if (!X.hasCause(e, ClusterTopologyException.class))
throw e;
@@ -356,7 +356,7 @@ public abstract class GridCacheAbstractFailoverSelfTest extends GridCacheAbstrac
* @param cnt Entry count.
* @param concurrency Concurrency control.
* @param isolation Isolation level.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
private void remove(GridCacheProjection<String, Integer> cache, final int cnt,
GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation) throws Exception {
@@ -365,13 +365,13 @@ public abstract class GridCacheAbstractFailoverSelfTest extends GridCacheAbstrac
CU.inTx(cache, concurrency, isolation, new CIX1<GridCacheProjection<String, Integer>>() {
@Override public void applyx(GridCacheProjection<String, Integer> cache)
- throws GridException {
+ throws IgniteCheckedException {
for (int i = 0; i < cnt; i++)
cache.removex("key" + i);
}
});
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
// It is ok to fail with topology exception.
if (!X.hasCause(e, ClusterTopologyException.class))
throw e;
@@ -383,9 +383,9 @@ public abstract class GridCacheAbstractFailoverSelfTest extends GridCacheAbstrac
/**
* @param cache Cache.
* @param expSize Minimum expected cache size.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
- private void check(GridCacheProjection<String,Integer> cache, int expSize) throws GridException {
+ private void check(GridCacheProjection<String,Integer> cache, int expSize) throws IgniteCheckedException {
int size;
if (cacheMode() == PARTITIONED) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java
index 80b3d79..b24b3b2 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java
@@ -9,8 +9,8 @@
package org.gridgain.grid.kernal.processors.cache;
+import org.apache.ignite.*;
import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.util.*;
import org.gridgain.grid.util.typedef.*;
@@ -65,7 +65,7 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid
*/
private void runTest(final IgniteInClosure<GridCache<String, Integer>> c) throws Exception {
final IgniteFuture<?> fut1 = GridTestUtils.runMultiThreadedAsync(new CAX() {
- @Override public void applyx() throws GridException {
+ @Override public void applyx() throws IgniteCheckedException {
while (true) {
int i = cnt.getAndIncrement();
@@ -99,9 +99,9 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid
}
/**
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
- private void checkConsistency() throws GridException {
+ private void checkConsistency() throws IgniteCheckedException {
for (GridCacheEntry<String, Integer> e : cache())
for (int i = 1; i < gridCount(); i++) {
Integer val = cache(i).get(e.getKey());
@@ -209,7 +209,7 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid
*/
public void testGet() throws Exception {
runTest(new CIX1<GridCache<String,Integer>>() {
- @Override public void applyx(GridCache<String, Integer> cache) throws GridException {
+ @Override public void applyx(GridCache<String, Integer> cache) throws IgniteCheckedException {
int rnd = random();
assert cache.get("key" + rnd) == rnd;
@@ -223,7 +223,7 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid
*/
public void testGetAsync() throws Exception {
runTest(new CIX1<GridCache<String,Integer>>() {
- @Override public void applyx(GridCache<String, Integer> cache) throws GridException {
+ @Override public void applyx(GridCache<String, Integer> cache) throws IgniteCheckedException {
int rnd = random();
assert cache.getAsync("key" + rnd).get() == rnd;
@@ -237,7 +237,7 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid
*/
public void testGetAll() throws Exception {
runTest(new CIX1<GridCache<String,Integer>>() {
- @Override public void applyx(GridCache<String, Integer> cache) throws GridException {
+ @Override public void applyx(GridCache<String, Integer> cache) throws IgniteCheckedException {
int rnd1 = random();
int rnd2 = random();
@@ -255,7 +255,7 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid
*/
public void testGetAllAsync() throws Exception {
runTest(new CIX1<GridCache<String,Integer>>() {
- @Override public void applyx(GridCache<String, Integer> cache) throws GridException {
+ @Override public void applyx(GridCache<String, Integer> cache) throws IgniteCheckedException {
int rnd1 = random();
int rnd2 = random();
@@ -273,7 +273,7 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid
*/
public void testRemove() throws Exception {
runTest(new CIX1<GridCache<String,Integer>>() {
- @Override public void applyx(GridCache<String, Integer> cache) throws GridException {
+ @Override public void applyx(GridCache<String, Integer> cache) throws IgniteCheckedException {
int rnd1 = random();
int rnd2 = random();
@@ -297,7 +297,7 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid
*/
public void testRemoveAsync() throws Exception {
runTest(new CIX1<GridCache<String,Integer>>() {
- @Override public void applyx(GridCache<String, Integer> cache) throws GridException {
+ @Override public void applyx(GridCache<String, Integer> cache) throws IgniteCheckedException {
int rnd1 = random();
int rnd2 = random();
@@ -321,7 +321,7 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid
*/
public void testRemoveAll() throws Exception {
runTest(new CIX1<GridCache<String,Integer>>() {
- @Override public void applyx(GridCache<String, Integer> cache) throws GridException {
+ @Override public void applyx(GridCache<String, Integer> cache) throws IgniteCheckedException {
int rnd = random();
cache.removeAll(rangeKeys(0, rnd));
@@ -337,7 +337,7 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid
*/
public void testRemoveAllFiltered() throws Exception {
runTest(new CIX1<GridCache<String,Integer>>() {
- @Override public void applyx(GridCache<String, Integer> cache) throws GridException {
+ @Override public void applyx(GridCache<String, Integer> cache) throws IgniteCheckedException {
final int rnd = random();
cache.removeAll(new P1<GridCacheEntry<String, Integer>>() {
@@ -359,7 +359,7 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid
*/
public void testRemoveAllAsync() throws Exception {
runTest(new CIX1<GridCache<String,Integer>>() {
- @Override public void applyx(GridCache<String, Integer> cache) throws GridException {
+ @Override public void applyx(GridCache<String, Integer> cache) throws IgniteCheckedException {
int rnd = random();
cache.removeAllAsync(rangeKeys(0, rnd)).get();
@@ -375,7 +375,7 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid
*/
public void testRemoveAllAsyncFiltered() throws Exception {
runTest(new CIX1<GridCache<String,Integer>>() {
- @Override public void applyx(GridCache<String, Integer> cache) throws GridException {
+ @Override public void applyx(GridCache<String, Integer> cache) throws IgniteCheckedException {
final int rnd = random();
cache.removeAllAsync(new P1<GridCacheEntry<String, Integer>>() {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java
index b736135..7ac3801 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java
@@ -333,9 +333,9 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
}
/**
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
- public void testAtomicOps() throws GridException {
+ public void testAtomicOps() throws IgniteCheckedException {
GridCacheProjectionEx<String, Integer> c = (GridCacheProjectionEx<String, Integer>)cache();
final int cnt = 10;
@@ -861,7 +861,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
if (txEnabled()) {
CU.inTx(cache, concurrency, isolation, new CIX1<GridCacheProjection<String, Integer>>() {
@Override
- public void applyx(GridCacheProjection<String, Integer> c) throws GridException {
+ public void applyx(GridCacheProjection<String, Integer> c) throws IgniteCheckedException {
c.transformAll(F.asSet("key1", "key2", "key3"), INCR_CLOS);
}
});
@@ -3243,7 +3243,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
assert cache().isLockedByThread("key");
assert !forLocal(dfltIgnite).call(new Callable<Boolean>() {
- @Override public Boolean call() throws GridException {
+ @Override public Boolean call() throws IgniteCheckedException {
return cache().lock("key", 100);
}
});
@@ -3271,7 +3271,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
assert e.isLocked();
assert !forLocal(dfltIgnite).call(new Callable<Boolean>() {
- @Override public Boolean call() throws GridException {
+ @Override public Boolean call() throws IgniteCheckedException {
return e.lock(100);
}
});
@@ -3357,7 +3357,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
ClusterNode node = F.first(cache().affinity().mapKeyToPrimaryAndBackups("key"));
if (node == null)
- throw new GridException("Failed to map key.");
+ throw new IgniteCheckedException("Failed to map key.");
GridCache<String, Integer> cache = G.ignite(node.id()).cache(null);
@@ -4282,7 +4282,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
assertTrue(GridTestUtils.waitForCondition(new GridAbsPredicateX() {
@SuppressWarnings("unchecked")
- @Override public boolean applyx() throws GridException {
+ @Override public boolean applyx() throws IgniteCheckedException {
try {
if (c.get(key) != null)
return false;
@@ -4639,7 +4639,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
CU.inTx(cache(), concurrency, isolation, new CIX1<GridCacheProjection<String, Integer>>() {
@Override
- public void applyx(GridCacheProjection<String, Integer> cache) throws GridException {
+ public void applyx(GridCacheProjection<String, Integer> cache) throws IgniteCheckedException {
for (int i = 0; i < cnt; i++)
assertTrue(cache.putx("key" + i, i));
}
@@ -4647,7 +4647,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
CU.inTx(cache(), concurrency, isolation, new CIX1<GridCacheProjection<String, Integer>>() {
@Override
- public void applyx(GridCacheProjection<String, Integer> cache) throws GridException {
+ public void applyx(GridCacheProjection<String, Integer> cache) throws IgniteCheckedException {
for (int i = 0; i < cnt; i++)
assertEquals(new Integer(i), cache.get("key" + i));
}
@@ -4655,7 +4655,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
CU.inTx(cache(), concurrency, isolation, new CIX1<GridCacheProjection<String, Integer>>() {
@Override
- public void applyx(GridCacheProjection<String, Integer> cache) throws GridException {
+ public void applyx(GridCacheProjection<String, Integer> cache) throws IgniteCheckedException {
for (int i = 0; i < cnt; i++)
assertTrue(cache.removex("key" + i));
}
@@ -5021,7 +5021,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
ClusterNode node = cache().affinity().mapKeyToNode(key);
if (node == null)
- throw new GridException("Failed to find primary node.");
+ throw new IgniteCheckedException("Failed to find primary node.");
UUID nodeId = node.id();
@@ -5044,10 +5044,10 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
* @param cache Cache.
* @param cnt Keys count.
* @return Collection of keys for which given cache is primary.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
protected List<String> primaryKeysForCache(GridCacheProjection<String, Integer> cache, int cnt)
- throws GridException {
+ throws IgniteCheckedException {
return primaryKeysForCache(cache, cnt, 1);
}
@@ -5056,10 +5056,10 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
* @param cnt Keys count.
* @param startFrom Start value for keys search.
* @return Collection of keys for which given cache is primary.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
protected List<String> primaryKeysForCache(GridCacheProjection<String, Integer> cache, int cnt, int startFrom)
- throws GridException {
+ throws IgniteCheckedException {
List<String> found = new ArrayList<>(cnt);
for (int i = startFrom; i < startFrom + 100_000; i++) {
@@ -5073,6 +5073,6 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
}
}
- throw new GridException("Unable to find " + cnt + " keys as primary for cache.");
+ throw new IgniteCheckedException("Unable to find " + cnt + " keys as primary for cache.");
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractIteratorsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractIteratorsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractIteratorsSelfTest.java
index e2bf233..6982236 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractIteratorsSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractIteratorsSelfTest.java
@@ -9,8 +9,8 @@
package org.gridgain.grid.kernal.processors.cache;
+import org.apache.ignite.*;
import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.util.typedef.*;
import org.gridgain.testframework.*;
@@ -87,7 +87,7 @@ public abstract class GridCacheAbstractIteratorsSelfTest extends GridCacheAbstra
cache(i).removeAll();
final IgniteFuture<?> putFut = GridTestUtils.runMultiThreadedAsync(new CAX() {
- @Override public void applyx() throws GridException {
+ @Override public void applyx() throws IgniteCheckedException {
for (int i = 0; i < entryCount(); i++)
cache().put(KEY_PREFIX + i, i);
}
@@ -166,7 +166,7 @@ public abstract class GridCacheAbstractIteratorsSelfTest extends GridCacheAbstra
cache(i).removeAll();
final IgniteFuture<?> putFut = GridTestUtils.runMultiThreadedAsync(new CAX() {
- @Override public void applyx() throws GridException {
+ @Override public void applyx() throws IgniteCheckedException {
for (int i = 0; i < entryCount(); i++)
cache().put(KEY_PREFIX + i, i);
}
@@ -255,7 +255,7 @@ public abstract class GridCacheAbstractIteratorsSelfTest extends GridCacheAbstra
cache(i).removeAll();
final IgniteFuture<?> putFut = GridTestUtils.runMultiThreadedAsync(new CAX() {
- @Override public void applyx() throws GridException {
+ @Override public void applyx() throws IgniteCheckedException {
for (int i = 0; i < entryCount(); i++)
cache().put(KEY_PREFIX + i, i);
}
@@ -323,7 +323,7 @@ public abstract class GridCacheAbstractIteratorsSelfTest extends GridCacheAbstra
cache(i).removeAll();
final IgniteFuture<?> putFut = GridTestUtils.runMultiThreadedAsync(new CAX() {
- @Override public void applyx() throws GridException {
+ @Override public void applyx() throws IgniteCheckedException {
for (int i = 0; i < entryCount(); i++)
cache().put(KEY_PREFIX + i, i);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractProjectionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractProjectionSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractProjectionSelfTest.java
index 38dff09..890d8f7 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractProjectionSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractProjectionSelfTest.java
@@ -9,8 +9,8 @@
package org.gridgain.grid.kernal.processors.cache;
+import org.apache.ignite.*;
import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.util.typedef.*;
@@ -240,13 +240,13 @@ public abstract class GridCacheAbstractProjectionSelfTest extends GridCacheAbstr
assert !prj.containsKey("k");
assertFlagException(new CAX() {
- @Override public void applyx() throws GridException {
+ @Override public void applyx() throws IgniteCheckedException {
prj.flagsOn(LOCAL).put("key", 1);
}
});
assertFlagException(new CAX() {
- @Override public void applyx() throws GridException {
+ @Override public void applyx() throws IgniteCheckedException {
prj.flagsOn(READ).put("key", 1);
}
});
@@ -267,7 +267,7 @@ public abstract class GridCacheAbstractProjectionSelfTest extends GridCacheAbstr
assertEquals(one, prj.get("key"));
assertFlagException(new CAX() {
- @Override public void applyx() throws GridException {
+ @Override public void applyx() throws IgniteCheckedException {
locPrj.put("key", 1);
}
});
@@ -275,7 +275,7 @@ public abstract class GridCacheAbstractProjectionSelfTest extends GridCacheAbstr
prj.get("key");
assertFlagException(new CAX() {
- @Override public void applyx() throws GridException {
+ @Override public void applyx() throws IgniteCheckedException {
locPrj.get("key");
}
});
@@ -283,7 +283,7 @@ public abstract class GridCacheAbstractProjectionSelfTest extends GridCacheAbstr
prj.getAll(F.asList("key", "key1"));
assertFlagException(new CAX() {
- @Override public void applyx() throws GridException {
+ @Override public void applyx() throws IgniteCheckedException {
locPrj.getAll(F.asList("key", "key1"));
}
});
@@ -291,7 +291,7 @@ public abstract class GridCacheAbstractProjectionSelfTest extends GridCacheAbstr
prj.remove("key");
assertFlagException(new CAX() {
- @Override public void applyx() throws GridException {
+ @Override public void applyx() throws IgniteCheckedException {
locPrj.remove("key");
}
});
@@ -301,7 +301,7 @@ public abstract class GridCacheAbstractProjectionSelfTest extends GridCacheAbstr
assertEquals(one, prj.replace("key", 2));
assertFlagException(new CAX() {
- @Override public void applyx() throws GridException {
+ @Override public void applyx() throws IgniteCheckedException {
locPrj.replace("key", 3);
}
});
@@ -313,7 +313,7 @@ public abstract class GridCacheAbstractProjectionSelfTest extends GridCacheAbstr
prj.put("key", 1);
assertFlagException(new CAX() {
- @Override public void applyx() throws GridException {
+ @Override public void applyx() throws IgniteCheckedException {
locPrj.removeAll(F.asList("key"));
}
});
@@ -323,7 +323,7 @@ public abstract class GridCacheAbstractProjectionSelfTest extends GridCacheAbstr
assert locPrj.containsKey("key");
assertFlagException(new CAX() {
- @Override public void applyx() throws GridException {
+ @Override public void applyx() throws IgniteCheckedException {
locPrj.reload("key");
}
});
@@ -380,7 +380,7 @@ public abstract class GridCacheAbstractProjectionSelfTest extends GridCacheAbstr
prjEntry.remove();
assertFlagException(new CAX() {
- @Override public void applyx() throws GridException {
+ @Override public void applyx() throws IgniteCheckedException {
locEntry.remove();
}
});
@@ -390,13 +390,13 @@ public abstract class GridCacheAbstractProjectionSelfTest extends GridCacheAbstr
assertEquals(one, prjEntry.replace(2));
assertFlagException(new CAX() {
- @Override public void applyx() throws GridException {
+ @Override public void applyx() throws IgniteCheckedException {
locEntry.replace(3);
}
});
assertFlagException(new CAX() {
- @Override public void applyx() throws GridException {
+ @Override public void applyx() throws IgniteCheckedException {
locEntry.reload();
}
});
@@ -433,7 +433,7 @@ public abstract class GridCacheAbstractProjectionSelfTest extends GridCacheAbstr
assertEquals(one, prj.get("key"));
assertFlagException(new CAX() {
- @Override public void applyx() throws GridException {
+ @Override public void applyx() throws IgniteCheckedException {
readPrj.put("key", 1);
}
});
@@ -441,7 +441,7 @@ public abstract class GridCacheAbstractProjectionSelfTest extends GridCacheAbstr
prj.remove("key");
assertFlagException(new CAX() {
- @Override public void applyx() throws GridException {
+ @Override public void applyx() throws IgniteCheckedException {
readPrj.remove("key");
}
});
@@ -451,7 +451,7 @@ public abstract class GridCacheAbstractProjectionSelfTest extends GridCacheAbstr
assertEquals(one, prj.replace("key", 2));
assertFlagException(new CAX() {
- @Override public void applyx() throws GridException {
+ @Override public void applyx() throws IgniteCheckedException {
readPrj.replace("key", 3);
}
});
@@ -463,7 +463,7 @@ public abstract class GridCacheAbstractProjectionSelfTest extends GridCacheAbstr
prj.put("key", 1);
assertFlagException(new CAX() {
- @Override public void applyx() throws GridException {
+ @Override public void applyx() throws IgniteCheckedException {
readPrj.removeAll(F.asList("key"));
}
});
@@ -485,7 +485,7 @@ public abstract class GridCacheAbstractProjectionSelfTest extends GridCacheAbstr
assert prj.containsKey("key");
assertFlagException(new CAX() {
- @Override public void applyx() throws GridException {
+ @Override public void applyx() throws IgniteCheckedException {
readPrj.reload("key");
}
});
@@ -493,7 +493,7 @@ public abstract class GridCacheAbstractProjectionSelfTest extends GridCacheAbstr
assert prj.containsKey("key");
assertFlagException(new CAX() {
- @Override public void applyx() throws GridException {
+ @Override public void applyx() throws IgniteCheckedException {
readPrj.promote("key");
}
});
@@ -796,7 +796,7 @@ public abstract class GridCacheAbstractProjectionSelfTest extends GridCacheAbstr
}
/**
- * @throws GridException In case of error.
+ * @throws IgniteCheckedException In case of error.
*/
public void testTypedProjection() throws Exception {
GridCache<Object, Object> cache = grid(0).cache(null);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractRemoveFailureTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractRemoveFailureTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractRemoveFailureTest.java
index 654eafa..6686911 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractRemoveFailureTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractRemoveFailureTest.java
@@ -146,7 +146,7 @@ public abstract class GridCacheAbstractRemoveFailureTest extends GridCacheAbstra
break;
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
if (put)
log.error("Put failed [key=" + key + ", val=" + i + ']', e);
else
@@ -220,7 +220,7 @@ public abstract class GridCacheAbstractRemoveFailureTest extends GridCacheAbstra
try {
if (!assertLatch.await(60_000, TimeUnit.MILLISECONDS))
- throw new GridException("Failed to suspend thread executing updates.");
+ throw new IgniteCheckedException("Failed to suspend thread executing updates.");
log.info("Checking cache content.");
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractSelfTest.java
index f749751..75c2503 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractSelfTest.java
@@ -9,20 +9,20 @@
package org.gridgain.grid.kernal.processors.cache;
+import org.apache.ignite.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.marshaller.optimized.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.cache.*;
-import org.gridgain.grid.cache.store.*;
-import org.gridgain.grid.kernal.*;
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.*;
+import org.gridgain.grid.util.lang.*;
import org.gridgain.grid.util.typedef.*;
import org.gridgain.grid.util.typedef.internal.*;
-import org.gridgain.grid.util.lang.*;
import org.gridgain.testframework.*;
import org.gridgain.testframework.junits.common.*;
import org.jdk8.backport.*;
@@ -32,9 +32,9 @@ import java.util.*;
import java.util.concurrent.atomic.*;
import static org.gridgain.grid.cache.GridCacheAtomicityMode.*;
+import static org.gridgain.grid.cache.GridCacheDistributionMode.*;
import static org.gridgain.grid.cache.GridCacheMemoryMode.*;
import static org.gridgain.grid.cache.GridCacheMode.*;
-import static org.gridgain.grid.cache.GridCacheDistributionMode.*;
import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*;
/**
@@ -103,7 +103,7 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest {
GridTestUtils.waitForCondition(
// Preloading may happen as nodes leave, so we need to wait.
new GridAbsPredicateX() {
- @Override public boolean applyx() throws GridException {
+ @Override public boolean applyx() throws IgniteCheckedException {
GridCache<String, Integer> cache = cache(fi);
cache.removeAll();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractTtlSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractTtlSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractTtlSelfTest.java
index 812db1f..a6b3f8f 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractTtlSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractTtlSelfTest.java
@@ -9,7 +9,7 @@
package org.gridgain.grid.kernal.processors.cache;
-import org.gridgain.grid.*;
+import org.apache.ignite.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.cache.store.*;
import org.gridgain.grid.util.lang.*;
@@ -79,7 +79,7 @@ public abstract class GridCacheAbstractTtlSelfTest extends GridCacheAbstractSelf
*/
private void checkKeyIsRetired(final String key, int ttl) throws Exception {
assertTrue(GridTestUtils.waitForCondition(new GridAbsPredicateX() {
- @Override public boolean applyx() throws GridException {
+ @Override public boolean applyx() throws IgniteCheckedException {
for (int i = 0; i < gridCount(); i++) {
if (cache(i).get(key) != null) {
info("Key is still in cache of grid " + i);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractTxReadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractTxReadTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractTxReadTest.java
index 432107b..df3353d 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractTxReadTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractTxReadTest.java
@@ -8,8 +8,8 @@
*/
package org.gridgain.grid.kernal.processors.cache;
+import org.apache.ignite.*;
import org.apache.ignite.configuration.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.cache.*;
import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*;
@@ -40,44 +40,44 @@ public abstract class GridCacheAbstractTxReadTest extends GridCacheAbstractSelfT
}
/**
- * @throws GridException If failed
+ * @throws IgniteCheckedException If failed
*/
- public void testTxReadOptimisticReadCommitted() throws GridException {
+ public void testTxReadOptimisticReadCommitted() throws IgniteCheckedException {
checkTransactionalRead(GridCacheTxConcurrency.OPTIMISTIC, GridCacheTxIsolation.READ_COMMITTED);
}
/**
- * @throws GridException If failed
+ * @throws IgniteCheckedException If failed
*/
- public void testTxReadOptimisticRepeatableRead() throws GridException {
+ public void testTxReadOptimisticRepeatableRead() throws IgniteCheckedException {
checkTransactionalRead(GridCacheTxConcurrency.OPTIMISTIC, GridCacheTxIsolation.REPEATABLE_READ);
}
/**
- * @throws GridException If failed
+ * @throws IgniteCheckedException If failed
*/
- public void testTxReadOptimisticSerializable() throws GridException {
+ public void testTxReadOptimisticSerializable() throws IgniteCheckedException {
checkTransactionalRead(GridCacheTxConcurrency.OPTIMISTIC, GridCacheTxIsolation.SERIALIZABLE);
}
/**
- * @throws GridException If failed
+ * @throws IgniteCheckedException If failed
*/
- public void testTxReadPessimisticReadCommitted() throws GridException {
+ public void testTxReadPessimisticReadCommitted() throws IgniteCheckedException {
checkTransactionalRead(GridCacheTxConcurrency.PESSIMISTIC, GridCacheTxIsolation.READ_COMMITTED);
}
/**
- * @throws GridException If failed
+ * @throws IgniteCheckedException If failed
*/
- public void testTxReadPessimisticRepeatableRead() throws GridException {
+ public void testTxReadPessimisticRepeatableRead() throws IgniteCheckedException {
checkTransactionalRead(GridCacheTxConcurrency.PESSIMISTIC, GridCacheTxIsolation.REPEATABLE_READ);
}
/**
- * @throws GridException If failed
+ * @throws IgniteCheckedException If failed
*/
- public void testTxReadPessimisticSerializable() throws GridException {
+ public void testTxReadPessimisticSerializable() throws IgniteCheckedException {
checkTransactionalRead(GridCacheTxConcurrency.PESSIMISTIC, GridCacheTxIsolation.SERIALIZABLE);
}
@@ -85,10 +85,10 @@ public abstract class GridCacheAbstractTxReadTest extends GridCacheAbstractSelfT
* Tests sequential value write and read inside transaction.
* @param concurrency Transaction concurrency.
* @param isolation Transaction isolation.
- * @throws GridException If failed
+ * @throws IgniteCheckedException If failed
*/
protected void checkTransactionalRead(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation)
- throws GridException {
+ throws IgniteCheckedException {
GridCache<String, Integer> cache = cache(0);
cache.clearAll();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAffinityRoutingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAffinityRoutingSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAffinityRoutingSelfTest.java
index 48663e7..6b33771 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAffinityRoutingSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAffinityRoutingSelfTest.java
@@ -226,7 +226,7 @@ public class GridCacheAffinityRoutingSelfTest extends GridCommonAbstractTest {
fail();
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
info("Caught expected exception: " + e);
}
}
@@ -562,7 +562,7 @@ public class GridCacheAffinityRoutingSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected Collection<? extends ComputeJob> split(int gridSize, Integer arg) throws GridException {
+ @Override protected Collection<? extends ComputeJob> split(int gridSize, Integer arg) throws IgniteCheckedException {
return F.asList(new ComputeJobAdapter() {
@Override public Object execute() {
GridCacheAffinity<Object> aff = ignite.cache(null).affinity();
@@ -578,7 +578,7 @@ public class GridCacheAffinityRoutingSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override public Boolean reduce(List<ComputeJobResult> results) throws GridException {
+ @Override public Boolean reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
return results.get(0).getData();
}
}
@@ -634,7 +634,7 @@ public class GridCacheAffinityRoutingSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override public void applyx() throws GridException {
+ @Override public void applyx() throws IgniteCheckedException {
assert ignite.cluster().localNode().id().equals(ignite.cluster().mapKeyToNode(null, affKey).id());
assert ignite.cluster().localNode().id().equals(ignite.cluster().mapKeyToNode(null, key).id());
assert jobCtx.affinityKey().equals(affKey);
@@ -670,7 +670,7 @@ public class GridCacheAffinityRoutingSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override public Object call() throws GridException {
+ @Override public Object call() throws IgniteCheckedException {
assert ignite.cluster().localNode().id().equals(ignite.cluster().mapKeyToNode(null, affKey).id());
assert ignite.cluster().localNode().id().equals(ignite.cluster().mapKeyToNode(null, key).id());
assert jobCtx.affinityKey().equals(affKey);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicApiAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicApiAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicApiAbstractTest.java
index d913b8c..faa18b2 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicApiAbstractTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicApiAbstractTest.java
@@ -82,9 +82,9 @@ public abstract class GridCacheBasicApiAbstractTest extends GridCommonAbstractTe
}
/**
- * @throws GridException If test failed.
+ * @throws IgniteCheckedException If test failed.
*/
- public void testSingleLockReentry() throws GridException {
+ public void testSingleLockReentry() throws IgniteCheckedException {
GridCache<Integer, String> cache = ignite.cache(null);
assert cache.lock(1, 0);
@@ -145,9 +145,9 @@ public abstract class GridCacheBasicApiAbstractTest extends GridCommonAbstractTe
}
/**
- * @throws GridException If test failed.
+ * @throws IgniteCheckedException If test failed.
*/
- public void testManyLockReentries() throws GridException {
+ public void testManyLockReentries() throws IgniteCheckedException {
GridCache<Integer, String> cache = ignite.cache(null);
Integer key = 1;
@@ -464,9 +464,9 @@ public abstract class GridCacheBasicApiAbstractTest extends GridCommonAbstractTe
}
/**
- * @throws GridException If test failed.
+ * @throws IgniteCheckedException If test failed.
*/
- public void testGetPutRemove() throws GridException {
+ public void testGetPutRemove() throws IgniteCheckedException {
GridCache<Integer, String> cache = ignite.cache(null);
int key = (int)System.currentTimeMillis();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicStoreAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicStoreAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicStoreAbstractTest.java
index 3e969bf..0e2344e 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicStoreAbstractTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicStoreAbstractTest.java
@@ -9,12 +9,12 @@
package org.gridgain.grid.kernal.processors.cache;
+import org.apache.ignite.*;
import org.apache.ignite.configuration.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.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.util.typedef.*;
import org.gridgain.testframework.junits.common.*;
import org.jetbrains.annotations.*;
@@ -101,9 +101,9 @@ public abstract class GridCacheBasicStoreAbstractTest extends GridCommonAbstract
}
/**
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
- public void testNotExistingKeys() throws GridException {
+ public void testNotExistingKeys() throws IgniteCheckedException {
GridCache<Integer, String> cache = cache();
Map<Integer, String> map = store.getMap();
@@ -409,7 +409,7 @@ public abstract class GridCacheBasicStoreAbstractTest extends GridCommonAbstract
assertEquals(5, cache.size());
cache.forEach(new CIX1<GridCacheEntry<Integer, String>>() {
- @Override public void applyx(GridCacheEntry<Integer, String> entry) throws GridException {
+ @Override public void applyx(GridCacheEntry<Integer, String> entry) throws IgniteCheckedException {
String val = entry.get();
assert val != null;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
index fac0c2b..dcbf820 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
@@ -327,7 +327,7 @@ public class GridCacheConcurrentTxMultiNodeTest extends GridCommonAbstractTest {
latency.addAndGet(t1 - t0);
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
e.printStackTrace();
}
}
@@ -646,16 +646,16 @@ public class GridCacheConcurrentTxMultiNodeTest extends GridCommonAbstractTest {
stopTimer("commit");
}
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
e.printStackTrace();
}
}
/**
* @return New ID.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
- private long getId() throws GridException {
+ private long getId() throws IgniteCheckedException {
GridCacheAtomicSequence seq = ignite.cache(null).dataStructures().atomicSequence("ID", 0, true);
return seq.incrementAndGet();
}
@@ -681,7 +681,7 @@ public class GridCacheConcurrentTxMultiNodeTest extends GridCommonAbstractTest {
return entry.getValue();
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
e.printStackTrace();
return null;
@@ -692,9 +692,9 @@ public class GridCacheConcurrentTxMultiNodeTest extends GridCommonAbstractTest {
* @param o Object to put.
* @param cacheKey Cache key.
* @param terminalId Terminal ID.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
- private void put(Object o, String cacheKey, String terminalId) throws GridException {
+ private void put(Object o, String cacheKey, String terminalId) throws IgniteCheckedException {
GridCache<GridCacheAffinityKey<String>, Object> cache = ignite.cache(null);
GridCacheAffinityKey<String> affinityKey = new GridCacheAffinityKey<>(cacheKey, terminalId);
@@ -708,10 +708,10 @@ public class GridCacheConcurrentTxMultiNodeTest extends GridCommonAbstractTest {
* @param cacheKey Cache key.
* @param terminalId Terminal ID.
* @return Cached object.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
@SuppressWarnings({"RedundantCast"})
- private <T> Object get(String cacheKey, String terminalId) throws GridException {
+ private <T> Object get(String cacheKey, String terminalId) throws IgniteCheckedException {
Object key = new GridCacheAffinityKey<>(cacheKey, terminalId);
return (T) ignite.cache(null).get(key);
@@ -821,12 +821,12 @@ public class GridCacheConcurrentTxMultiNodeTest extends GridCommonAbstractTest {
@SuppressWarnings( {"UnusedDeclaration"})
private static class ResponseTask extends ComputeTaskSplitAdapter<Message, Void> {
/** {@inheritDoc} */
- @Override protected Collection<? extends ComputeJob> split(int arg0, Message msg) throws GridException {
+ @Override protected Collection<? extends ComputeJob> split(int arg0, Message msg) throws IgniteCheckedException {
return Collections.singletonList(new PerfJob(msg));
}
/** {@inheritDoc} */
- @Nullable @Override public Void reduce(List<ComputeJobResult> results) throws GridException {
+ @Nullable @Override public Void reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
return null;
}
}
@@ -836,12 +836,12 @@ public class GridCacheConcurrentTxMultiNodeTest extends GridCommonAbstractTest {
*/
private static class RequestTask extends ComputeTaskSplitAdapter<Message, Void> {
/** {@inheritDoc} */
- @Override protected Collection<? extends ComputeJob> split(int arg0, Message msg) throws GridException {
+ @Override protected Collection<? extends ComputeJob> split(int arg0, Message msg) throws IgniteCheckedException {
return Collections.singletonList(new PerfJob(msg));
}
/** {@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/processors/cache/GridCacheConfigurationConsistencySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConfigurationConsistencySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConfigurationConsistencySelfTest.java
index a136623..b3731be 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConfigurationConsistencySelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConfigurationConsistencySelfTest.java
@@ -142,7 +142,7 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac
CU.checkAttributeMismatch(strLog, "cache", node, "cacheMode", "Cache mode", LOCAL, PARTITIONED, true);
return null;
}
- }, GridException.class, "Cache mode mismatch");
+ }, IgniteCheckedException.class, "Cache mode mismatch");
final GridCacheConfiguration cfg1 = defaultCacheConfiguration();
@@ -163,7 +163,7 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac
CU.checkAttributeMismatch(strLog, cfg1, cfg2, node, new T2<>("cacheMode", "Cache mode"), true);
return null;
}
- }, GridException.class, "Cache mode mismatch");
+ }, IgniteCheckedException.class, "Cache mode mismatch");
}
/**
@@ -222,7 +222,7 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac
fail();
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
info("Caught expected exception: " + e);
}
}
@@ -286,7 +286,7 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac
@Override public Object call() throws Exception {
return startGrid(2);
}
- }, GridException.class, null);
+ }, IgniteCheckedException.class, null);
}
/**
@@ -576,7 +576,7 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac
@Override public Object call() throws Exception {
return startGrid(2);
}
- }, GridException.class, "Affinity include neighbors mismatch");
+ }, IgniteCheckedException.class, "Affinity include neighbors mismatch");
backups = 2;
@@ -587,7 +587,7 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac
@Override public Object call() throws Exception {
return startGrid(2);
}
- }, GridException.class, "Affinity key backups mismatch");
+ }, IgniteCheckedException.class, "Affinity key backups mismatch");
backups = 1;
@@ -598,7 +598,7 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac
@Override public Object call() throws Exception {
return startGrid(2);
}
- }, GridException.class, "Affinity partitions count mismatch");
+ }, IgniteCheckedException.class, "Affinity partitions count mismatch");
// Replicas count.
aff = new GridCacheConsistentHashAffinityFunction(false, 100);
@@ -608,7 +608,7 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac
@Override public Object call() throws Exception {
return startGrid(2);
}
- }, GridException.class, "Affinity replicas mismatch");
+ }, IgniteCheckedException.class, "Affinity replicas mismatch");
// Replicas count attribute name.
aff = new GridCacheConsistentHashAffinityFunction(false, 100);
@@ -618,7 +618,7 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac
@Override public Object call() throws Exception {
return startGrid(2);
}
- }, GridException.class, "Affinity replica count attribute name mismatch");
+ }, IgniteCheckedException.class, "Affinity replica count attribute name mismatch");
// Different hash ID resolver.
GridCacheConsistentHashAffinityFunction aff0 = new GridCacheConsistentHashAffinityFunction(false, 100);
@@ -631,7 +631,7 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac
@Override public Object call() throws Exception {
return startGrid(2);
}
- }, GridException.class, "Partitioned cache affinity hash ID resolver class mismatch");
+ }, IgniteCheckedException.class, "Partitioned cache affinity hash ID resolver class mismatch");
}
/**
@@ -818,7 +818,7 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac
return null;
}
- }, GridException.class, null);
+ }, IgniteCheckedException.class, null);
}
/**
@@ -857,7 +857,7 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac
return null;
}
- }, GridException.class, null);
+ }, IgniteCheckedException.class, null);
}
/**
@@ -896,7 +896,7 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac
return null;
}
- }, GridException.class, null);
+ }, IgniteCheckedException.class, null);
}
/**
@@ -911,7 +911,7 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac
@Override public Object call() throws Exception {
return startGrid(1);
}
- }, GridException.class, null);
+ }, IgniteCheckedException.class, null);
aff = new GridCacheConsistentHashAffinityFunction(true); // Check cannot set 'excludeNeighbors' flag.
backups = Integer.MAX_VALUE;
@@ -920,7 +920,7 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac
@Override public Object call() throws Exception {
return startGrid(1);
}
- }, GridException.class, null);
+ }, IgniteCheckedException.class, null);
aff = new GridCacheConsistentHashAffinityFunction(false, 100);
@@ -934,7 +934,7 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac
public Object call() throws Exception {
return startGrid(2);
}
- }, GridException.class, "Affinity partitions count mismatch");
+ }, IgniteCheckedException.class, "Affinity partitions count mismatch");
}
/**
@@ -979,55 +979,55 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac
@Override public Object call() throws Exception {
return startGrid(2);
}
- }, GridException.class, null);
+ }, IgniteCheckedException.class, null);
}
/** */
private static class TestStore implements GridCacheStore<Object,Object> {
/** {@inheritDoc} */
@Nullable @Override public Object load(@Nullable GridCacheTx tx, Object key)
- throws GridException {
+ throws IgniteCheckedException {
return null;
}
/** {@inheritDoc} */
@Override public void loadCache(IgniteBiInClosure<Object, Object> clo,
- @Nullable Object... args) throws GridException {
+ @Nullable Object... args) throws IgniteCheckedException {
// No-op.
}
/** {@inheritDoc} */
@Override public void loadAll(@Nullable GridCacheTx tx,
- @Nullable Collection<?> keys, IgniteBiInClosure<Object, Object> c) throws GridException {
+ @Nullable Collection<?> keys, IgniteBiInClosure<Object, Object> c) throws IgniteCheckedException {
// No-op.
}
/** {@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 putAll(@Nullable GridCacheTx tx, @Nullable Map<?, ?> map)
- throws GridException {
+ throws IgniteCheckedException {
// No-op.
}
/** {@inheritDoc} */
@Override public void remove(@Nullable GridCacheTx tx, Object key)
- throws GridException {
+ throws IgniteCheckedException {
// No-op.
}
/** {@inheritDoc} */
@Override public void removeAll(@Nullable GridCacheTx tx,
- @Nullable Collection<?> keys) throws GridException {
+ @Nullable Collection<?> keys) throws IgniteCheckedException {
// No-op.
}
/** {@inheritDoc} */
- @Override public void txEnd(GridCacheTx tx, boolean commit) throws GridException {
+ @Override public void txEnd(GridCacheTx tx, boolean commit) throws IgniteCheckedException {
// No-op.
}
}