You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2015/02/02 11:28:57 UTC
[21/50] [abbrv] incubator-ignite git commit: # sprint-1 moved
existing IgniteFuture to internal package
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopMapReduceTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopMapReduceTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopMapReduceTest.java
index 6215dd5..5a3e536 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopMapReduceTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopMapReduceTest.java
@@ -25,7 +25,7 @@ import org.apache.hadoop.mapreduce.lib.input.FileInputFormat;
import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat;
import org.apache.ignite.*;
import org.apache.ignite.fs.*;
-import org.apache.ignite.lang.*;
+import org.apache.ignite.internal.*;
import org.apache.ignite.hadoop.*;
import org.apache.ignite.internal.processors.hadoop.counter.*;
import org.apache.ignite.internal.processors.hadoop.examples.*;
@@ -98,7 +98,7 @@ public class GridHadoopMapReduceTest extends GridHadoopAbstractWordCountTest {
GridHadoopJobId jobId = new GridHadoopJobId(UUID.randomUUID(), 1);
- IgniteFuture<?> fut = grid(0).hadoop().submit(jobId, createJobInfo(job.getConfiguration()));
+ IgniteInternalFuture<?> fut = grid(0).hadoop().submit(jobId, createJobInfo(job.getConfiguration()));
fut.get();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopTaskExecutionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopTaskExecutionSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopTaskExecutionSelfTest.java
index 98367ee..b6e8f41 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopTaskExecutionSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopTaskExecutionSelfTest.java
@@ -25,7 +25,7 @@ import org.apache.hadoop.mapreduce.lib.input.*;
import org.apache.hadoop.mapreduce.lib.output.*;
import org.apache.ignite.*;
import org.apache.ignite.fs.*;
-import org.apache.ignite.lang.*;
+import org.apache.ignite.internal.*;
import org.apache.ignite.fs.hadoop.v1.*;
import org.apache.ignite.hadoop.*;
import org.apache.ignite.internal.util.lang.*;
@@ -144,7 +144,7 @@ public class GridHadoopTaskExecutionSelfTest extends GridHadoopAbstractSelfTest
job.setJarByClass(getClass());
- IgniteFuture<?> fut = grid(0).hadoop().submit(new GridHadoopJobId(UUID.randomUUID(), 1),
+ IgniteInternalFuture<?> fut = grid(0).hadoop().submit(new GridHadoopJobId(UUID.randomUUID(), 1),
createJobInfo(job.getConfiguration()));
fut.get();
@@ -190,7 +190,7 @@ public class GridHadoopTaskExecutionSelfTest extends GridHadoopAbstractSelfTest
GridHadoopJobId jobId = new GridHadoopJobId(UUID.randomUUID(), 2);
- IgniteFuture<?> fut = grid(0).hadoop().submit(jobId, createJobInfo(job.getConfiguration()));
+ IgniteInternalFuture<?> fut = grid(0).hadoop().submit(jobId, createJobInfo(job.getConfiguration()));
fut.get();
@@ -227,7 +227,7 @@ public class GridHadoopTaskExecutionSelfTest extends GridHadoopAbstractSelfTest
job.setJarByClass(getClass());
- final IgniteFuture<?> fut = grid(0).hadoop().submit(new GridHadoopJobId(UUID.randomUUID(), 3),
+ final IgniteInternalFuture<?> fut = grid(0).hadoop().submit(new GridHadoopJobId(UUID.randomUUID(), 3),
createJobInfo(job.getConfiguration()));
GridTestUtils.assertThrows(log, new Callable<Object>() {
@@ -315,7 +315,7 @@ public class GridHadoopTaskExecutionSelfTest extends GridHadoopAbstractSelfTest
GridHadoopJobId jobId = new GridHadoopJobId(UUID.randomUUID(), 1);
- final IgniteFuture<?> fut = grid(0).hadoop().submit(jobId, createJobInfo(cfg));
+ final IgniteInternalFuture<?> fut = grid(0).hadoop().submit(jobId, createJobInfo(cfg));
if (!GridTestUtils.waitForCondition(new GridAbsPredicate() {
@Override public boolean apply() {
@@ -366,7 +366,7 @@ public class GridHadoopTaskExecutionSelfTest extends GridHadoopAbstractSelfTest
assertFalse(killRes);
- final IgniteFuture<?> fut = hadoop.submit(jobId, createJobInfo(cfg));
+ final IgniteInternalFuture<?> fut = hadoop.submit(jobId, createJobInfo(cfg));
if (!GridTestUtils.waitForCondition(new GridAbsPredicate() {
@Override public boolean apply() {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/GridHadoopExecutorServiceTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/GridHadoopExecutorServiceTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/GridHadoopExecutorServiceTest.java
index a9e2251..66def30 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/GridHadoopExecutorServiceTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/GridHadoopExecutorServiceTest.java
@@ -17,7 +17,7 @@
package org.apache.ignite.internal.processors.hadoop.taskexecutor;
-import org.apache.ignite.lang.IgniteFuture;
+import org.apache.ignite.internal.IgniteInternalFuture;
import org.apache.ignite.internal.util.typedef.X;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.jdk8.backport.LongAdder;
@@ -83,7 +83,7 @@ public class GridHadoopExecutorServiceTest extends GridCommonAbstractTest {
final AtomicBoolean finish = new AtomicBoolean();
- IgniteFuture<?> fut = multithreadedAsync(new Callable<Object>() {
+ IgniteInternalFuture<?> fut = multithreadedAsync(new Callable<Object>() {
@Override public Object call() throws Exception {
while (!finish.get()) {
exec.submit(new Callable<Void>() {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutionSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutionSelfTest.java
index 5641735..7a8f8bf 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutionSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutionSelfTest.java
@@ -25,7 +25,7 @@ import org.apache.hadoop.mapreduce.lib.input.FileInputFormat;
import org.apache.hadoop.mapreduce.lib.output.*;
import org.apache.ignite.*;
import org.apache.ignite.fs.*;
-import org.apache.ignite.lang.*;
+import org.apache.ignite.internal.*;
import org.apache.ignite.hadoop.*;
import org.apache.ignite.internal.processors.hadoop.*;
import org.apache.ignite.internal.util.typedef.*;
@@ -93,7 +93,7 @@ public class GridHadoopExternalTaskExecutionSelfTest extends GridHadoopAbstractS
job.setJarByClass(getClass());
- IgniteFuture<?> fut = grid(0).hadoop().submit(new GridHadoopJobId(UUID.randomUUID(), 1),
+ IgniteInternalFuture<?> fut = grid(0).hadoop().submit(new GridHadoopJobId(UUID.randomUUID(), 1),
createJobInfo(job.getConfiguration()));
fut.get();
@@ -129,7 +129,7 @@ public class GridHadoopExternalTaskExecutionSelfTest extends GridHadoopAbstractS
job.setJarByClass(getClass());
- IgniteFuture<?> fut = grid(0).hadoop().submit(new GridHadoopJobId(UUID.randomUUID(), 1),
+ IgniteInternalFuture<?> fut = grid(0).hadoop().submit(new GridHadoopJobId(UUID.randomUUID(), 1),
createJobInfo(job.getConfiguration()));
try {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/hadoop/src/test/java/org/apache/ignite/loadtests/ggfs/GridGgfsPerformanceBenchmark.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/loadtests/ggfs/GridGgfsPerformanceBenchmark.java b/modules/hadoop/src/test/java/org/apache/ignite/loadtests/ggfs/GridGgfsPerformanceBenchmark.java
index b85df20..d6f3130 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/loadtests/ggfs/GridGgfsPerformanceBenchmark.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/loadtests/ggfs/GridGgfsPerformanceBenchmark.java
@@ -19,7 +19,7 @@ package org.apache.ignite.loadtests.ggfs;
import org.apache.hadoop.conf.*;
import org.apache.hadoop.fs.*;
-import org.apache.ignite.lang.*;
+import org.apache.ignite.internal.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.testframework.*;
import org.jetbrains.annotations.*;
@@ -86,7 +86,7 @@ public class GridGgfsPerformanceBenchmark {
long start = System.currentTimeMillis();
- IgniteFuture<Long> fut = GridTestUtils.runMultiThreadedAsync(new Runnable() {
+ IgniteInternalFuture<Long> fut = GridTestUtils.runMultiThreadedAsync(new Runnable() {
@Override public void run() {
String fileIdx = op == OP_READ ? String.valueOf(idx.getAndIncrement()) : UUID.randomUUID().toString();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
index 2d105d2..c7ca6dc 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
@@ -753,12 +753,12 @@ public class IgniteH2Indexing implements GridQueryIndexing {
}
/** {@inheritDoc} */
- @Override public IgniteFuture<GridCacheSqlResult> queryTwoStep(String space, GridCacheTwoStepQuery qry) {
+ @Override public IgniteInternalFuture<GridCacheSqlResult> queryTwoStep(String space, GridCacheTwoStepQuery qry) {
return rdcQryExec.query(space, qry);
}
/** {@inheritDoc} */
- @Override public IgniteFuture<GridCacheSqlResult> queryTwoStep(String space, String sqlQry, Object[] params) {
+ @Override public IgniteInternalFuture<GridCacheSqlResult> queryTwoStep(String space, String sqlQry, Object[] params) {
Connection c;
try {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
index 9b9463d..7278eb8 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
@@ -110,7 +110,7 @@ public class GridReduceQueryExecutor {
* @param qry Query.
* @return Future.
*/
- public IgniteFuture<GridCacheSqlResult> query(String space, GridCacheTwoStepQuery qry) {
+ public IgniteInternalFuture<GridCacheSqlResult> query(String space, GridCacheTwoStepQuery qry) {
long qryReqId = reqIdGen.incrementAndGet();
QueryRun r = new QueryRun();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java
index 7c79018..d490b79 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java
@@ -512,7 +512,7 @@ public class GridCacheOffHeapAndSwapSelfTest extends GridCommonAbstractTest {
public void testIteratorsCleanup() throws Exception {
final GridCache<Long, Long> cache = populate();
- IgniteFuture<?> offHeapFut = multithreadedAsync(new Runnable() {
+ IgniteInternalFuture<?> offHeapFut = multithreadedAsync(new Runnable() {
@Override public void run() {
try {
Iterator<Map.Entry<Long, Long>> ohIt = cache.offHeapIterator();
@@ -535,7 +535,7 @@ public class GridCacheOffHeapAndSwapSelfTest extends GridCommonAbstractTest {
}
}, 20);
- IgniteFuture<?> swapFut = multithreadedAsync(new Runnable() {
+ IgniteInternalFuture<?> swapFut = multithreadedAsync(new Runnable() {
@Override public void run() {
try {
Iterator<Map.Entry<Long, Long>> ohIt = cache.swapIterator();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java
index 096bb2e..6f28208 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java
@@ -259,7 +259,7 @@ public class GridCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTest
final AtomicBoolean done = new AtomicBoolean();
- IgniteFuture<?> fut = multithreadedAsync(new CAX() {
+ IgniteInternalFuture<?> fut = multithreadedAsync(new CAX() {
@Override public void applyx() throws IgniteCheckedException {
Random rnd = new Random();
@@ -339,7 +339,7 @@ public class GridCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTest
final AtomicBoolean done = new AtomicBoolean();
- IgniteFuture<?> fut = multithreadedAsync(new CAX() {
+ IgniteInternalFuture<?> fut = multithreadedAsync(new CAX() {
@Override public void applyx() throws IgniteCheckedException {
Random rnd = new Random();
@@ -423,7 +423,7 @@ public class GridCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTest
final AtomicBoolean done = new AtomicBoolean();
- IgniteFuture<?> fut = multithreadedAsync(new CAX() {
+ IgniteInternalFuture<?> fut = multithreadedAsync(new CAX() {
@Override public void applyx() throws IgniteCheckedException {
Random rnd = new Random();
@@ -504,7 +504,7 @@ public class GridCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTest
final AtomicBoolean done = new AtomicBoolean();
- IgniteFuture<?> fut = multithreadedAsync(new CAX() {
+ IgniteInternalFuture<?> fut = multithreadedAsync(new CAX() {
@Override public void applyx() throws IgniteCheckedException {
Random rnd = new Random();
@@ -584,7 +584,7 @@ public class GridCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTest
final CacheQuery<Map.Entry<Integer, Integer>> qry = c.queries().createSqlQuery(Integer.class, "_val >= 0");
- IgniteFuture<?> fut = multithreadedAsync(
+ IgniteInternalFuture<?> fut = multithreadedAsync(
new CAX() {
@Override public void applyx() throws IgniteCheckedException {
int iter = 0;
@@ -648,7 +648,7 @@ public class GridCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTest
final AtomicBoolean done = new AtomicBoolean();
- IgniteFuture<?> fut = multithreadedAsync(new CAX() {
+ IgniteInternalFuture<?> fut = multithreadedAsync(new CAX() {
@Override public void applyx() throws IgniteCheckedException {
int iter = 0;
@@ -730,7 +730,7 @@ public class GridCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTest
final AtomicBoolean stop = new AtomicBoolean();
- IgniteFuture<?> fut = multithreadedAsync(new CAX() {
+ IgniteInternalFuture<?> fut = multithreadedAsync(new CAX() {
@Override public void applyx() throws IgniteCheckedException {
while (!stop.get()) {
Collection<Integer> rmtVals = rdcQry.execute(rmtRdc).get();
@@ -799,7 +799,7 @@ public class GridCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTest
final CacheQuery<Map.Entry<Integer, Integer>> qry = c.queries().createScanQuery(null);
- IgniteFuture<?> fut = multithreadedAsync(
+ IgniteInternalFuture<?> fut = multithreadedAsync(
new CAX() {
@Override public void applyx() throws IgniteCheckedException {
int iter = 0;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java
index 07e0d32..6fcd412 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java
@@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache;
import org.apache.ignite.cache.*;
import org.apache.ignite.cache.query.*;
import org.apache.ignite.configuration.*;
-import org.apache.ignite.lang.*;
+import org.apache.ignite.internal.*;
import org.apache.ignite.marshaller.optimized.*;
import org.apache.ignite.internal.util.typedef.*;
@@ -88,7 +88,7 @@ public class GridCacheReduceQueryMultithreadedSelfTest extends GridCacheAbstract
final CountDownLatch startLatch = new CountDownLatch(1);
- IgniteFuture<?> fut1 = multithreadedAsync(new Callable() {
+ IgniteInternalFuture<?> fut1 = multithreadedAsync(new Callable() {
@Override public Object call() throws Exception {
for (int i = 1; i < keyCnt; i++) {
assertTrue(c.putx(String.valueOf(i), i));
@@ -126,7 +126,7 @@ public class GridCacheReduceQueryMultithreadedSelfTest extends GridCacheAbstract
startLatch.await();
- IgniteFuture<?> fut2 = multithreadedAsync(new Callable() {
+ IgniteInternalFuture<?> fut2 = multithreadedAsync(new Callable() {
@Override public Object call() throws Exception {
int cnt = 0;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java
index 33a5001..eb6f1c9 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java
@@ -22,6 +22,7 @@ import org.apache.ignite.cache.*;
import org.apache.ignite.cache.query.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.events.*;
+import org.apache.ignite.internal.*;
import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.spi.discovery.tcp.*;
@@ -115,7 +116,7 @@ public class GridCacheQueryNodeRestartSelfTest extends GridCacheAbstractSelfTest
final AtomicBoolean done = new AtomicBoolean();
- IgniteFuture<?> fut1 = multithreadedAsync(new CAX() {
+ IgniteInternalFuture<?> fut1 = multithreadedAsync(new CAX() {
@Override public void applyx() throws IgniteCheckedException {
while (!done.get()) {
CacheQuery<Map.Entry<Integer, Integer>> qry =
@@ -141,7 +142,7 @@ public class GridCacheQueryNodeRestartSelfTest extends GridCacheAbstractSelfTest
for (int i = 0; i < GRID_CNT; i++)
grid(i).events().localListen(lsnr, IgniteEventType.EVT_CACHE_PRELOAD_STOPPED);
- IgniteFuture<?> fut2 = multithreadedAsync(new Callable<Object>() {
+ IgniteInternalFuture<?> fut2 = multithreadedAsync(new Callable<Object>() {
@SuppressWarnings({"BusyWait"})
@Override public Object call() throws Exception {
while (!done.get()) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java
index 4feb06a..6eda993 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java
@@ -458,7 +458,7 @@ public class GridCacheReplicatedQuerySelfTest extends GridCacheAbstractQuerySelf
assertEquals(1, futs.size());
GridCloseableIterator<IgniteBiTuple<Integer, Integer>> iter =
- (GridCloseableIterator<IgniteBiTuple<Integer, Integer>>)((IgniteFuture)F.first(futs.values()).get()).get();
+ (GridCloseableIterator<IgniteBiTuple<Integer, Integer>>)((IgniteInternalFuture)F.first(futs.values()).get()).get();
ResultSet rs = U.field(iter, "data");
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexRebuildTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexRebuildTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexRebuildTest.java
index a56a44f..e305482 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexRebuildTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexRebuildTest.java
@@ -21,6 +21,7 @@ import org.apache.ignite.*;
import org.apache.ignite.cache.*;
import org.apache.ignite.cache.query.*;
import org.apache.ignite.configuration.*;
+import org.apache.ignite.internal.*;
import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.internal.processors.query.*;
@@ -207,13 +208,13 @@ public class GridH2IndexRebuildTest extends GridCacheAbstractSelfTest {
spi.sleepInRebuild = false;
- final IgniteFuture<?> fut1 = grid(0).cache(null).queries().rebuildIndexes(TestValue1.class);
+ final IgniteInternalFuture<?> fut1 = grid(0).cache(null).queries().rebuildIndexes(TestValue1.class);
assertFalse(fut1.isCancelled());
fut1.get();
- final IgniteFuture<?> fut2 = grid(0).cache(null).queries().rebuildAllIndexes();
+ final IgniteInternalFuture<?> fut2 = grid(0).cache(null).queries().rebuildAllIndexes();
assertFalse(fut2.isCancelled());
@@ -223,7 +224,7 @@ public class GridH2IndexRebuildTest extends GridCacheAbstractSelfTest {
/**
* @throws Exception if failed.
*/
- private void checkCancel(final IgniteFuture<?> fut) throws Exception {
+ private void checkCancel(final IgniteInternalFuture<?> fut) throws Exception {
assertTrue(fut.cancel());
GridTestUtils.assertThrows(log, new Callable<Void>() {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexingGeoSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexingGeoSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexingGeoSelfTest.java
index a878ffa..71705d9 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexingGeoSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexingGeoSelfTest.java
@@ -21,8 +21,8 @@ import com.vividsolutions.jts.geom.*;
import com.vividsolutions.jts.io.*;
import org.apache.ignite.cache.*;
import org.apache.ignite.cache.query.*;
+import org.apache.ignite.internal.*;
import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.lang.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.testframework.*;
@@ -137,7 +137,7 @@ public class GridH2IndexingGeoSelfTest extends GridCacheAbstractSelfTest {
final AtomicBoolean stop = new AtomicBoolean();
final AtomicReference<Exception> err = new AtomicReference<>();
- IgniteFuture<?> putFut = GridTestUtils.runMultiThreadedAsync(new Callable<Void>() {
+ IgniteInternalFuture<?> putFut = GridTestUtils.runMultiThreadedAsync(new Callable<Void>() {
@Override public Void call() throws Exception {
WKTReader r = new WKTReader();
@@ -161,7 +161,7 @@ public class GridH2IndexingGeoSelfTest extends GridCacheAbstractSelfTest {
}
}, Runtime.getRuntime().availableProcessors(), "put-thread");
- IgniteFuture<?> qryFut = GridTestUtils.runMultiThreadedAsync(new Callable<Void>() {
+ IgniteInternalFuture<?> qryFut = GridTestUtils.runMultiThreadedAsync(new Callable<Void>() {
@Override public Void call() throws Exception {
WKTReader r = new WKTReader();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java
index f76ae6f..47f5b70 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java
@@ -125,7 +125,7 @@ public class GridOrderedMessageCancelSelfTest extends GridCommonAbstractTest {
* @param fut Future to cancel.
* @throws Exception If failed.
*/
- private void testMessageSet(IgniteFuture<?> fut) throws Exception {
+ private void testMessageSet(IgniteInternalFuture<?> fut) throws Exception {
cancelLatch.await();
assertTrue(fut.cancel());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarProjectionPimp.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarProjectionPimp.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarProjectionPimp.scala
index 5634ab3..e9e9f1d 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarProjectionPimp.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarProjectionPimp.scala
@@ -19,7 +19,8 @@ package org.apache.ignite.scalar.pimps
import org.apache.ignite._
import org.apache.ignite.cluster.{ClusterGroup, ClusterGroupEmptyException, ClusterNode}
-import org.apache.ignite.lang.{IgniteFuture, IgniteFutureCancelledException, IgnitePredicate}
+import org.apache.ignite.internal.IgniteInternalFuture
+import org.apache.ignite.lang.{IgniteFutureCancelledException, IgnitePredicate}
import org.jetbrains.annotations._
/**
@@ -375,7 +376,7 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A] with Iterabl
* @see `org.apache.ignite.cluster.ClusterGroup.call(...)`
*/
def callAsync$[R](@Nullable s: Seq[Call[R]], @Nullable p: NF):
- IgniteFuture[java.util.Collection[R]] = {
+ IgniteInternalFuture[java.util.Collection[R]] = {
val comp = value.ignite().compute(forPredicate(p)).withAsync()
comp.call[R](toJavaCollection(s, (f: Call[R]) => toCallable(f)))
@@ -393,7 +394,7 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A] with Iterabl
* closures were executed or `null` (see above).
* @see `org.apache.ignite.cluster.ClusterGroup.call(...)`
*/
- def #?[R](@Nullable s: Seq[Call[R]], @Nullable p: NF): IgniteFuture[java.util.Collection[R]] = {
+ def #?[R](@Nullable s: Seq[Call[R]], @Nullable p: NF): IgniteInternalFuture[java.util.Collection[R]] = {
callAsync$(s, p)
}
@@ -408,7 +409,7 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A] with Iterabl
* closures were executed or `null` (see above).
* @see `org.apache.ignite.cluster.ClusterGroup.call(...)`
*/
- def callAsync$[R](@Nullable s: Call[R], @Nullable p: NF): IgniteFuture[java.util.Collection[R]] = {
+ def callAsync$[R](@Nullable s: Call[R], @Nullable p: NF): IgniteInternalFuture[java.util.Collection[R]] = {
callAsync$(Seq(s), p)
}
@@ -422,7 +423,7 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A] with Iterabl
* closures were executed or `null` (see above).
* @see `org.apache.ignite.cluster.ClusterGroup.call(...)`
*/
- def #?[R](@Nullable s: Call[R], @Nullable p: NF): IgniteFuture[java.util.Collection[R]] = {
+ def #?[R](@Nullable s: Call[R], @Nullable p: NF): IgniteInternalFuture[java.util.Collection[R]] = {
callAsync$(s, p)
}
@@ -435,7 +436,7 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A] with Iterabl
* @param p Optional node filter predicate. If `null` provided - all nodes in projection will be used.
* @see `org.apache.ignite.cluster.ClusterGroup.call(...)`
*/
- def runAsync$(@Nullable s: Seq[Run], @Nullable p: NF): IgniteFuture[_] = {
+ def runAsync$(@Nullable s: Seq[Run], @Nullable p: NF): IgniteInternalFuture[_] = {
val comp = value.ignite().compute(forPredicate(p)).withAsync()
comp.run(toJavaCollection(s, (f: Run) => toRunnable(f)))
@@ -451,7 +452,7 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A] with Iterabl
* @param p Optional node filter predicate. If `null` provided - all nodes in projection will be used.
* @see `org.apache.ignite.cluster.ClusterGroup.call(...)`
*/
- def *?(@Nullable s: Seq[Run], @Nullable p: NF): IgniteFuture[_] = {
+ def *?(@Nullable s: Seq[Run], @Nullable p: NF): IgniteInternalFuture[_] = {
runAsync$(s, p)
}
@@ -464,7 +465,7 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A] with Iterabl
* @param p Optional node filter predicate. If `null` provided - all nodes in projection will be used.
* @see `org.apache.ignite.cluster.ClusterGroup.run(...)`
*/
- def runAsync$(@Nullable s: Run, @Nullable p: NF): IgniteFuture[_] = {
+ def runAsync$(@Nullable s: Run, @Nullable p: NF): IgniteInternalFuture[_] = {
runAsync$(Seq(s), p)
}
@@ -476,7 +477,7 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A] with Iterabl
* @param p Optional node filter predicate. If `null` provided - all nodes in projection will be used.
* @see `org.apache.ignite.cluster.ClusterGroup.run(...)`
*/
- def *?(@Nullable s: Run, @Nullable p: NF): IgniteFuture[_] = {
+ def *?(@Nullable s: Run, @Nullable p: NF): IgniteInternalFuture[_] = {
runAsync$(s, p)
}
@@ -492,7 +493,7 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A] with Iterabl
* @return Future over the reduced result or `null` (see above).
* @see `org.apache.ignite.cluster.ClusterGroup.reduce(...)`
*/
- def reduceAsync$[R1, R2](s: Seq[Call[R1]], r: Seq[R1] => R2, @Nullable p: NF): IgniteFuture[R2] = {
+ def reduceAsync$[R1, R2](s: Seq[Call[R1]], r: Seq[R1] => R2, @Nullable p: NF): IgniteInternalFuture[R2] = {
assert(s != null && r != null)
val comp = value.ignite().compute(forPredicate(p)).withAsync()
@@ -513,7 +514,7 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A] with Iterabl
* @return Future over the reduced result or `null` (see above).
* @see `org.apache.ignite.cluster.ClusterGroup.reduce(...)`
*/
- def @?[R1, R2](s: Seq[Call[R1]], r: Seq[R1] => R2, @Nullable p: NF): IgniteFuture[R2] = {
+ def @?[R1, R2](s: Seq[Call[R1]], r: Seq[R1] => R2, @Nullable p: NF): IgniteInternalFuture[R2] = {
reduceAsync$(s, r, p)
}
@@ -648,7 +649,7 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A] with Iterabl
* @throws IgniteFutureCancelledException Subclass of `IgniteCheckedException` thrown if computation was cancelled.
*/
def affinityRunAsync$(cacheName: String, @Nullable affKey: Any, @Nullable r: Run,
- @Nullable p: NF): IgniteFuture[_] = {
+ @Nullable p: NF): IgniteInternalFuture[_] = {
val comp = value.ignite().compute(forPredicate(p)).withAsync()
comp.affinityRun(cacheName, affKey, toRunnable(r))
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/schedule/src/main/java/org/apache/ignite/internal/processors/schedule/ScheduleFutureImpl.java
----------------------------------------------------------------------
diff --git a/modules/schedule/src/main/java/org/apache/ignite/internal/processors/schedule/ScheduleFutureImpl.java b/modules/schedule/src/main/java/org/apache/ignite/internal/processors/schedule/ScheduleFutureImpl.java
index 076ec1a..a4c91ca 100644
--- a/modules/schedule/src/main/java/org/apache/ignite/internal/processors/schedule/ScheduleFutureImpl.java
+++ b/modules/schedule/src/main/java/org/apache/ignite/internal/processors/schedule/ScheduleFutureImpl.java
@@ -76,7 +76,7 @@ class ScheduleFutureImpl<R> implements SchedulerFuture<R>, Externalizable {
private final AtomicBoolean descheduled = new AtomicBoolean(false);
/** Listeners. */
- private Collection<IgniteInClosure<? super IgniteFuture<R>>> lsnrs =
+ private Collection<IgniteInClosure<? super IgniteInternalFuture<R>>> lsnrs =
new ArrayList<>(1);
/** Statistics. */
@@ -575,7 +575,7 @@ class ScheduleFutureImpl<R> implements SchedulerFuture<R>, Externalizable {
}
/** {@inheritDoc} */
- @Override public void listenAsync(@Nullable IgniteInClosure<? super IgniteFuture<R>> lsnr) {
+ @Override public void listenAsync(@Nullable IgniteInClosure<? super IgniteInternalFuture<R>> lsnr) {
if (lsnr != null) {
Throwable err;
R res;
@@ -605,7 +605,7 @@ class ScheduleFutureImpl<R> implements SchedulerFuture<R>, Externalizable {
}
/** {@inheritDoc} */
- @Override public void stopListenAsync(@Nullable IgniteInClosure<? super IgniteFuture<R>>... lsnr) {
+ @Override public void stopListenAsync(@Nullable IgniteInClosure<? super IgniteInternalFuture<R>>... lsnr) {
if (!F.isEmpty(lsnr))
synchronized (mux) {
lsnrs.removeAll(F.asList(lsnr));
@@ -614,7 +614,7 @@ class ScheduleFutureImpl<R> implements SchedulerFuture<R>, Externalizable {
/** {@inheritDoc} */
@SuppressWarnings("ExternalizableWithoutPublicNoArgConstructor")
- @Override public <T> IgniteFuture<T> chain(final IgniteClosure<? super IgniteFuture<R>, T> doneCb) {
+ @Override public <T> IgniteInternalFuture<T> chain(final IgniteClosure<? super IgniteInternalFuture<R>, T> doneCb) {
final GridFutureAdapter<T> fut = new GridFutureAdapter<T>(ctx, syncNotify) {
@Override public String toString() {
return "ChainFuture[orig=" + ScheduleFutureImpl.this + ", doneCb=" + doneCb + ']';
@@ -632,7 +632,7 @@ class ScheduleFutureImpl<R> implements SchedulerFuture<R>, Externalizable {
* @param err Last execution error.
* @param syncNotify Synchronous notification flag.
*/
- private void notifyListener(final IgniteInClosure<? super IgniteFuture<R>> lsnr, R res, Throwable err,
+ private void notifyListener(final IgniteInClosure<? super IgniteInternalFuture<R>> lsnr, R res, Throwable err,
boolean syncNotify) {
assert lsnr != null;
assert !Thread.holdsLock(mux);
@@ -661,7 +661,7 @@ class ScheduleFutureImpl<R> implements SchedulerFuture<R>, Externalizable {
* @param err Last execution error.
*/
private void notifyListeners(R res, Throwable err) {
- final Collection<IgniteInClosure<? super IgniteFuture<R>>> tmp;
+ final Collection<IgniteInClosure<? super IgniteInternalFuture<R>>> tmp;
synchronized (mux) {
tmp = new ArrayList<>(lsnrs);
@@ -670,7 +670,7 @@ class ScheduleFutureImpl<R> implements SchedulerFuture<R>, Externalizable {
final SchedulerFuture<R> snapshot = snapshot(res, err);
if (concurNotify) {
- for (final IgniteInClosure<? super IgniteFuture<R>> lsnr : tmp)
+ for (final IgniteInClosure<? super IgniteInternalFuture<R>> lsnr : tmp)
ctx.closure().runLocalSafe(new GPR() {
@Override public void run() {
lsnr.apply(snapshot);
@@ -680,7 +680,7 @@ class ScheduleFutureImpl<R> implements SchedulerFuture<R>, Externalizable {
else {
ctx.closure().runLocalSafe(new GPR() {
@Override public void run() {
- for (IgniteInClosure<? super IgniteFuture<R>> lsnr : tmp)
+ for (IgniteInClosure<? super IgniteInternalFuture<R>> lsnr : tmp)
lsnr.apply(snapshot);
}
}, true);
@@ -934,17 +934,17 @@ class ScheduleFutureImpl<R> implements SchedulerFuture<R>, Externalizable {
}
/** {@inheritDoc} */
- @Override public void listenAsync(@Nullable IgniteInClosure<? super IgniteFuture<R>> lsnr) {
+ @Override public void listenAsync(@Nullable IgniteInClosure<? super IgniteInternalFuture<R>> lsnr) {
ref.listenAsync(lsnr);
}
/** {@inheritDoc} */
- @Override public void stopListenAsync(@Nullable IgniteInClosure<? super IgniteFuture<R>>... lsnr) {
+ @Override public void stopListenAsync(@Nullable IgniteInClosure<? super IgniteInternalFuture<R>>... lsnr) {
ref.stopListenAsync(lsnr);
}
/** {@inheritDoc} */
- @Override public <T> IgniteFuture<T> chain(IgniteClosure<? super IgniteFuture<R>, T> doneCb) {
+ @Override public <T> IgniteInternalFuture<T> chain(IgniteClosure<? super IgniteInternalFuture<R>, T> doneCb) {
return ref.chain(doneCb);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/schedule/src/test/java/org/apache/ignite/internal/processors/schedule/GridScheduleSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/schedule/src/test/java/org/apache/ignite/internal/processors/schedule/GridScheduleSelfTest.java b/modules/schedule/src/test/java/org/apache/ignite/internal/processors/schedule/GridScheduleSelfTest.java
index a7121b2..c9f45a8 100644
--- a/modules/schedule/src/test/java/org/apache/ignite/internal/processors/schedule/GridScheduleSelfTest.java
+++ b/modules/schedule/src/test/java/org/apache/ignite/internal/processors/schedule/GridScheduleSelfTest.java
@@ -18,6 +18,7 @@
package org.apache.ignite.internal.processors.schedule;
import org.apache.ignite.*;
+import org.apache.ignite.internal.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.resources.*;
import org.apache.ignite.scheduler.*;
@@ -62,7 +63,7 @@ public class GridScheduleSelfTest extends GridCommonAbstractTest {
*/
public void testRunLocal() throws Exception {
for (int i = 0; i < NODES_CNT; i++) {
- IgniteFuture<?> fut = grid(i).scheduler().runLocal(new TestRunnable());
+ IgniteInternalFuture<?> fut = grid(i).scheduler().runLocal(new TestRunnable());
assert fut.get() == null;
@@ -75,7 +76,7 @@ public class GridScheduleSelfTest extends GridCommonAbstractTest {
*/
public void testCallLocal() throws Exception {
for (int i = 0; i < NODES_CNT; i++) {
- IgniteFuture<?> fut = grid(i).scheduler().callLocal(new TestCallable());
+ IgniteInternalFuture<?> fut = grid(i).scheduler().callLocal(new TestCallable());
assertEquals(1, fut.get());
@@ -112,8 +113,8 @@ public class GridScheduleSelfTest extends GridCommonAbstractTest {
final AtomicInteger notifyCnt = new AtomicInteger();
- fut.listenAsync(new CI1<IgniteFuture<?>>() {
- @Override public void apply(IgniteFuture<?> e) {
+ fut.listenAsync(new CI1<IgniteInternalFuture<?>>() {
+ @Override public void apply(IgniteInternalFuture<?> e) {
notifyCnt.incrementAndGet();
}
});
@@ -170,8 +171,8 @@ public class GridScheduleSelfTest extends GridCommonAbstractTest {
final AtomicInteger notifyCnt = new AtomicInteger();
- fut.listenAsync(new CI1<IgniteFuture<?>>() {
- @Override public void apply(IgniteFuture<?> e) {
+ fut.listenAsync(new CI1<IgniteInternalFuture<?>>() {
+ @Override public void apply(IgniteInternalFuture<?> e) {
notifyCnt.incrementAndGet();
}
});
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/urideploy/src/test/java/org/apache/ignite/internal/GridTaskUriDeploymentDeadlockSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/urideploy/src/test/java/org/apache/ignite/internal/GridTaskUriDeploymentDeadlockSelfTest.java b/modules/urideploy/src/test/java/org/apache/ignite/internal/GridTaskUriDeploymentDeadlockSelfTest.java
index 35bd477..dce45ae 100644
--- a/modules/urideploy/src/test/java/org/apache/ignite/internal/GridTaskUriDeploymentDeadlockSelfTest.java
+++ b/modules/urideploy/src/test/java/org/apache/ignite/internal/GridTaskUriDeploymentDeadlockSelfTest.java
@@ -79,7 +79,7 @@ public class GridTaskUriDeploymentDeadlockSelfTest extends GridCommonAbstractTes
}
}, EVT_NODE_JOINED);
- IgniteFuture<?> f = multithreadedAsync(new Callable<Object>() {
+ IgniteInternalFuture<?> f = multithreadedAsync(new Callable<Object>() {
@Override public Object call() throws Exception {
startGrid(2);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java b/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java
index 7b99774..acf62a5 100644
--- a/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java
+++ b/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java
@@ -18,7 +18,7 @@
package org.apache.ignite.internal.websession;
import org.apache.ignite.cache.*;
-import org.apache.ignite.lang.*;
+import org.apache.ignite.internal.*;
import org.eclipse.jetty.server.*;
import org.eclipse.jetty.servlet.*;
import org.eclipse.jetty.webapp.*;
@@ -118,7 +118,7 @@ public class WebSessionSelfTest extends GridCommonAbstractTest {
final AtomicBoolean stop = new AtomicBoolean();
- IgniteFuture<?> restarterFut = GridTestUtils.runMultiThreadedAsync(new Callable<Object>() {
+ IgniteInternalFuture<?> restarterFut = GridTestUtils.runMultiThreadedAsync(new Callable<Object>() {
@SuppressWarnings("BusyWait")
@Override public Object call() throws Exception {
Random rnd = new Random();