http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java index cafff4e..700f1fe 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java @@ -234,7 +234,7 @@ public class GridCacheCommandHandlerSelfTest extends GridCommonAbstractTest { new InvocationHandler() { @Override public Object invoke(Object proxy, Method mtd, Object[] args) throws Throwable { if (failMtd.equals(mtd.getName())) { - IgniteFuture<Object> fut = new GridFinishedFuture<>(ctx, + InternalFuture<Object> fut = new GridFinishedFuture<>(ctx, new IgniteCheckedException("Operation failed")); fut.syncNotify(sync);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessorAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessorAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessorAbstractSelfTest.java index 835bb26..72a1889 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessorAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessorAbstractSelfTest.java @@ -15,7 +15,6 @@ import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; import org.apache.ignite.managed.*; import org.apache.ignite.resources.*; -import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.processors.affinity.*; import org.apache.ignite.spi.discovery.tcp.*; @@ -139,11 +138,11 @@ public abstract class GridServiceProcessorAbstractSelfTest extends GridCommonAbs svcs1.deployClusterSingleton(name, new DummyService()); - IgniteFuture<?> fut1 = svcs1.future(); + InternalFuture<?> fut1 = svcs1.future(); svcs2.deployClusterSingleton(name, new DummyService()); - IgniteFuture<?> fut2 = svcs2.future(); + InternalFuture<?> fut2 = svcs2.future(); info("Deployed service: " + name); @@ -168,11 +167,11 @@ public abstract class GridServiceProcessorAbstractSelfTest extends GridCommonAbs svcs1.deployClusterSingleton(name, new DummyService()); - IgniteFuture<?> fut1 = svcs1.future(); + InternalFuture<?> fut1 = svcs1.future(); svcs2.deployNodeSingleton(name, new DummyService()); - IgniteFuture<?> fut2 = svcs2.future(); + InternalFuture<?> fut2 = svcs2.future(); info("Deployed service: " + name); @@ -252,7 +251,7 @@ public abstract class GridServiceProcessorAbstractSelfTest extends GridCommonAbs svcs.deployNodeSingleton(name, new DummyService()); - IgniteFuture<?> fut = svcs.future(); + InternalFuture<?> fut = svcs.future(); info("Deployed service: " + name); @@ -284,7 +283,7 @@ public abstract class GridServiceProcessorAbstractSelfTest extends GridCommonAbs svcs.deployClusterSingleton(name, new DummyService()); - IgniteFuture<?> fut = svcs.future(); + InternalFuture<?> fut = svcs.future(); info("Deployed service: " + name); @@ -318,7 +317,7 @@ public abstract class GridServiceProcessorAbstractSelfTest extends GridCommonAbs svcs.deployKeyAffinitySingleton(name, new AffinityService(affKey), CACHE_NAME, affKey); - IgniteFuture<?> fut = svcs.future(); + InternalFuture<?> fut = svcs.future(); info("Deployed service: " + name); @@ -345,7 +344,7 @@ public abstract class GridServiceProcessorAbstractSelfTest extends GridCommonAbs svcs.deployMultiple(name, new DummyService(), nodeCount() * 2, 3); - IgniteFuture<?> fut = svcs.future(); + InternalFuture<?> fut = svcs.future(); info("Deployed service: " + name); @@ -379,7 +378,7 @@ public abstract class GridServiceProcessorAbstractSelfTest extends GridCommonAbs svcs.deployMultiple(name, new DummyService(), cnt, 3); - IgniteFuture<?> fut = svcs.future(); + InternalFuture<?> fut = svcs.future(); info("Deployed service: " + name); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessorMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessorMultiNodeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessorMultiNodeSelfTest.java index e682fc8..f0316d2 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessorMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessorMultiNodeSelfTest.java @@ -40,7 +40,7 @@ public class GridServiceProcessorMultiNodeSelfTest extends GridServiceProcessorA svcs.deployClusterSingleton(name, new DummyService()); - IgniteFuture<?> fut = svcs.future(); + InternalFuture<?> fut = svcs.future(); info("Deployed service: " + name); @@ -88,7 +88,7 @@ public class GridServiceProcessorMultiNodeSelfTest extends GridServiceProcessorA svcs.deployKeyAffinitySingleton(name, new AffinityService(affKey), CACHE_NAME, affKey); - IgniteFuture<?> fut = svcs.future(); + InternalFuture<?> fut = svcs.future(); info("Deployed service: " + name); @@ -126,7 +126,7 @@ public class GridServiceProcessorMultiNodeSelfTest extends GridServiceProcessorA svcs.deployNodeSingleton(name, new DummyService()); - IgniteFuture<?> fut = svcs.future(); + InternalFuture<?> fut = svcs.future(); info("Deployed service: " + name); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerFailoverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerFailoverSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerFailoverSelfTest.java index a9953ec..1e5b563 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerFailoverSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerFailoverSelfTest.java @@ -131,7 +131,7 @@ public class GridStreamerFailoverSelfTest extends GridCommonAbstractTest { final AtomicBoolean done = new AtomicBoolean(false); - IgniteFuture<?> fut = multithreadedAsync(new Callable<Object>() { + InternalFuture<?> fut = multithreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { Random rnd = new Random(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerSelfTest.java index 11bcf55..c664246 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerSelfTest.java @@ -229,7 +229,7 @@ public class GridStreamerSelfTest extends GridCommonAbstractTest { try { U.sleep(1000); } - catch (GridInterruptedException ignore) { + catch (InternalInterruptedException ignore) { // No-op. } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/kernal/processors/timeout/GridTimeoutProcessorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/timeout/GridTimeoutProcessorSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/timeout/GridTimeoutProcessorSelfTest.java index 429b1a7..b61ac11 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/timeout/GridTimeoutProcessorSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/timeout/GridTimeoutProcessorSelfTest.java @@ -374,7 +374,7 @@ public class GridTimeoutProcessorSelfTest extends GridCommonAbstractTest { public void testAddRemoveInterleaving() throws Exception { final AtomicInteger callCnt = new AtomicInteger(0); - IgniteFuture<?> rmv = GridTestUtils.runMultiThreadedAsync(new Runnable() { + InternalFuture<?> rmv = GridTestUtils.runMultiThreadedAsync(new Runnable() { /** {@inheritDoc} */ @SuppressWarnings("CallToThreadYield") @Override public void run() { @@ -432,7 +432,7 @@ public class GridTimeoutProcessorSelfTest extends GridCommonAbstractTest { final CountDownLatch latch = new CountDownLatch(max * threads); - IgniteFuture<?> called = GridTestUtils.runMultiThreadedAsync(new Runnable() { + InternalFuture<?> called = GridTestUtils.runMultiThreadedAsync(new Runnable() { /** {@inheritDoc} */ @SuppressWarnings("CallToThreadYield") @Override public void run() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/lang/GridBasicPerformanceTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/lang/GridBasicPerformanceTest.java b/modules/core/src/test/java/org/gridgain/grid/lang/GridBasicPerformanceTest.java index 11792c3..5a9e906 100644 --- a/modules/core/src/test/java/org/gridgain/grid/lang/GridBasicPerformanceTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/lang/GridBasicPerformanceTest.java @@ -814,7 +814,7 @@ public class GridBasicPerformanceTest { final CountDownLatch latch1 = new CountDownLatch(1); - IgniteFuture<?> fut1 = GridTestUtils.runMultiThreadedAsync( + InternalFuture<?> fut1 = GridTestUtils.runMultiThreadedAsync( new Callable<Object>() { @Nullable @Override public Object call() throws Exception { latch1.await(); @@ -847,7 +847,7 @@ public class GridBasicPerformanceTest { final CountDownLatch latch2 = new CountDownLatch(1); - IgniteFuture<?> fut2 = GridTestUtils.runMultiThreadedAsync( + InternalFuture<?> fut2 = GridTestUtils.runMultiThreadedAsync( new Callable<Object>() { @SuppressWarnings("StatementWithEmptyBody") @Nullable @Override public Object call() throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/lang/GridFuncSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/lang/GridFuncSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/lang/GridFuncSelfTest.java index a285ef7..cab5c67 100644 --- a/modules/core/src/test/java/org/gridgain/grid/lang/GridFuncSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/lang/GridFuncSelfTest.java @@ -15,7 +15,6 @@ import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; @@ -3181,7 +3180,7 @@ public class GridFuncSelfTest extends GridCommonAbstractTest { new GridFutureAdapter<>(), new GridFutureAdapter<>(), new GridFutureAdapter<>() }; - for (IgniteFuture fut : futs) { + for (InternalFuture fut : futs) { assert !fut.isDone(); } @@ -3202,7 +3201,7 @@ public class GridFuncSelfTest extends GridCommonAbstractTest { F.<Object>awaitAll(futs); - for (IgniteFuture fut : futs) { + for (InternalFuture fut : futs) { assert fut.isDone(); } } @@ -3214,7 +3213,7 @@ public class GridFuncSelfTest extends GridCommonAbstractTest { public void testAwaitOne() throws Exception { final GridFutureAdapter<?>[] futs = {new GridFutureAdapter(), new GridFutureAdapter(), new GridFutureAdapter()}; - for (IgniteFuture fut : futs) { + for (InternalFuture fut : futs) { assert !fut.isDone(); } @@ -3231,16 +3230,16 @@ public class GridFuncSelfTest extends GridCommonAbstractTest { } }.start(); - IgniteFuture doneFut = F.awaitOne((IgniteFuture[])futs); + InternalFuture doneFut = F.awaitOne((InternalFuture[])futs); assert doneFut.isDone(); - for (IgniteFuture fut : futs) { + for (InternalFuture fut : futs) { assert doneFut == fut ? fut.isDone() : !fut.isDone(); } // Check only NULLs. - IgniteFuture<Object> fut = F.awaitOne(Arrays.asList((IgniteFuture<Object>)null, null, null)); + InternalFuture<Object> fut = F.awaitOne(Arrays.asList((InternalFuture<Object>)null, null, null)); assert fut.isDone(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/lang/GridFutureListenPerformanceTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/lang/GridFutureListenPerformanceTest.java b/modules/core/src/test/java/org/gridgain/grid/lang/GridFutureListenPerformanceTest.java index 871a25a..7e99953 100644 --- a/modules/core/src/test/java/org/gridgain/grid/lang/GridFutureListenPerformanceTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/lang/GridFutureListenPerformanceTest.java @@ -67,8 +67,8 @@ public class GridFutureListenPerformanceTest { futs.add(fut); for (int k = 1; k < rnd.nextInt(3); k++) { - fut.listenAsync(new IgniteInClosure<IgniteFuture<Object>>() { - @Override public void apply(IgniteFuture<Object> t) { + fut.listenAsync(new IgniteInClosure<InternalFuture<Object>>() { + @Override public void apply(InternalFuture<Object> t) { try { t.get(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/loadtest/GridLoadTestStatistics.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/loadtest/GridLoadTestStatistics.java b/modules/core/src/test/java/org/gridgain/grid/loadtest/GridLoadTestStatistics.java index 7b5000e..56862ca 100644 --- a/modules/core/src/test/java/org/gridgain/grid/loadtest/GridLoadTestStatistics.java +++ b/modules/core/src/test/java/org/gridgain/grid/loadtest/GridLoadTestStatistics.java @@ -65,7 +65,7 @@ public class GridLoadTestStatistics { * @return Task count. */ @SuppressWarnings("unchecked") - public synchronized long onTaskCompleted(@Nullable ComputeTaskFuture<?> fut, int jobNum, long taskTime) { + public synchronized long onTaskCompleted(@Nullable InternalComputeTaskFuture<?> fut, int jobNum, long taskTime) { taskCnt++; jobCnt += jobNum; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/loadtest/GridSingleExecutionTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/loadtest/GridSingleExecutionTest.java b/modules/core/src/test/java/org/gridgain/grid/loadtest/GridSingleExecutionTest.java index 4ab1cd4..3f27ae7 100644 --- a/modules/core/src/test/java/org/gridgain/grid/loadtest/GridSingleExecutionTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/loadtest/GridSingleExecutionTest.java @@ -15,7 +15,6 @@ import org.apache.ignite.configuration.*; import org.apache.ignite.resources.*; import org.apache.log4j.*; import org.apache.log4j.varia.*; -import org.gridgain.grid.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.testframework.*; @@ -79,7 +78,7 @@ public final class GridSingleExecutionTest { // Execute Hello World task. comp.execute(!useSes ? TestTask.class : TestSessionTask.class, null); - ComputeTaskFuture<Object> fut = comp.future(); + InternalComputeTaskFuture<Object> fut = comp.future(); if (useSes) { fut.getTaskSession().setAttribute("attr1", 1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/loadtest/swapspace/GridFileSwapSpaceSpiMultithreadedLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/loadtest/swapspace/GridFileSwapSpaceSpiMultithreadedLoadTest.java b/modules/core/src/test/java/org/gridgain/grid/loadtest/swapspace/GridFileSwapSpaceSpiMultithreadedLoadTest.java index 4f3e036..8a5b1b6 100644 --- a/modules/core/src/test/java/org/gridgain/grid/loadtest/swapspace/GridFileSwapSpaceSpiMultithreadedLoadTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/loadtest/swapspace/GridFileSwapSpaceSpiMultithreadedLoadTest.java @@ -139,7 +139,7 @@ public class GridFileSwapSpaceSpiMultithreadedLoadTest extends GridCommonAbstrac } }); - IgniteFuture<?> evictFut = GridTestUtils.runMultiThreadedAsync(new Runnable() { + InternalFuture<?> evictFut = GridTestUtils.runMultiThreadedAsync(new Runnable() { @Override public void run() { try { ThreadLocalRandom8 rnd = ThreadLocalRandom8.current(); @@ -201,7 +201,7 @@ public class GridFileSwapSpaceSpiMultithreadedLoadTest extends GridCommonAbstrac } }); - IgniteFuture<?> unswapFut = GridTestUtils.runMultiThreadedAsync(new Runnable() { + InternalFuture<?> unswapFut = GridTestUtils.runMultiThreadedAsync(new Runnable() { @Override public void run() { try { ThreadLocalRandom8 rnd = ThreadLocalRandom8.current(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerAbstractTest.java index 26e9436..27e0b30 100644 --- a/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerAbstractTest.java @@ -20,7 +20,6 @@ import org.apache.ignite.marshaller.optimized.*; import org.apache.ignite.product.*; import org.apache.ignite.streamer.*; import org.apache.ignite.streamer.window.*; -import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.affinity.*; import org.gridgain.grid.cache.datastructures.*; @@ -612,7 +611,7 @@ public abstract class GridMarshallerAbstractTest extends GridCommonAbstractTest public void testScheduler() throws Exception { IgniteScheduler scheduler = grid().scheduler(); - IgniteFuture<?> fut = scheduler.runLocal(new Runnable() { + InternalFuture<?> fut = scheduler.runLocal(new Runnable() { @Override public void run() { // No-op. } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/messaging/GridMessagingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/messaging/GridMessagingSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/messaging/GridMessagingSelfTest.java index f7034b6..3574aea 100644 --- a/modules/core/src/test/java/org/gridgain/grid/messaging/GridMessagingSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/messaging/GridMessagingSelfTest.java @@ -1020,7 +1020,7 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest { Assert.assertNull(id); - IgniteFuture<UUID> fut = msg.future(); + InternalFuture<UUID> fut = msg.future(); Assert.assertNotNull(fut); @@ -1048,7 +1048,7 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest { msg.stopRemoteListen(id); - IgniteFuture<?> stopFut = msg.future(); + InternalFuture<?> stopFut = msg.future(); Assert.assertNotNull(stopFut); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/p2p/GridAbstractMultinodeRedeployTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/p2p/GridAbstractMultinodeRedeployTest.java b/modules/core/src/test/java/org/gridgain/grid/p2p/GridAbstractMultinodeRedeployTest.java index b6c6a28..cf56830 100644 --- a/modules/core/src/test/java/org/gridgain/grid/p2p/GridAbstractMultinodeRedeployTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/p2p/GridAbstractMultinodeRedeployTest.java @@ -12,7 +12,6 @@ package org.gridgain.grid.p2p; import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; -import org.gridgain.grid.*; import org.apache.ignite.spi.failover.never.*; import org.gridgain.testframework.*; import org.gridgain.testframework.config.*; @@ -82,12 +81,12 @@ abstract class GridAbstractMultinodeRedeployTest extends GridCommonAbstractTest ignite1.compute().localDeployTask(loadTaskClass(), loadTaskClass().getClassLoader()); ignite2.compute().localDeployTask(loadTaskClass(), loadTaskClass().getClassLoader()); - ComputeTaskFuture<int[]> fut1 = executeAsync(ignite1.compute(), TASK_NAME, Arrays.<UUID>asList( + InternalComputeTaskFuture<int[]> fut1 = executeAsync(ignite1.compute(), TASK_NAME, Arrays.<UUID>asList( ignite1.cluster().localNode().id(), ignite2.cluster().localNode().id(), ignite3.cluster().localNode().id())); - ComputeTaskFuture<int[]> fut2 = executeAsync(ignite2.compute(), TASK_NAME, Arrays.<UUID>asList( + InternalComputeTaskFuture<int[]> fut2 = executeAsync(ignite2.compute(), TASK_NAME, Arrays.<UUID>asList( ignite1.cluster().localNode().id(), ignite2.cluster().localNode().id(), ignite3.cluster().localNode().id())); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PTestTaskExecutionTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PTestTaskExecutionTest.java b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PTestTaskExecutionTest.java index ab7330f..978caa5 100644 --- a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PTestTaskExecutionTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PTestTaskExecutionTest.java @@ -2,7 +2,6 @@ package org.gridgain.grid.p2p; import org.apache.ignite.*; import org.apache.ignite.compute.*; -import org.gridgain.grid.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.testframework.junits.common.*; /** @@ -21,7 +20,7 @@ public final class GridP2PTestTaskExecutionTest extends GridCommonAbstractTest { assert !g.cluster().forRemotes().nodes().isEmpty() : "Test requires at least 1 remote node."; /* Execute GridP2PTestTask. */ - ComputeTaskFuture<Integer> fut = executeAsync(g.compute(), GridP2PTestTask.class, 1); + InternalComputeTaskFuture<Integer> fut = executeAsync(g.compute(), GridP2PTestTask.class, 1); /* Wait for task completion. */ Integer res = fut.get(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromFutureSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromFutureSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromFutureSelfTest.java index 859d690..2c635f8 100644 --- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromFutureSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromFutureSelfTest.java @@ -13,7 +13,6 @@ import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; import org.apache.ignite.resources.*; -import org.gridgain.grid.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.gridgain.grid.util.typedef.*; @@ -125,7 +124,7 @@ public class GridSessionCancelSiblingsFromFutureSelfTest extends GridCommonAbstr private void checkTask(int num) throws InterruptedException, IgniteCheckedException { Ignite ignite = G.ignite(getTestGridName()); - ComputeTaskFuture<?> fut = executeAsync(ignite.compute(), GridTaskSessionTestTask.class, num); + InternalComputeTaskFuture<?> fut = executeAsync(ignite.compute(), GridTaskSessionTestTask.class, num); assert fut != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromJobSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromJobSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromJobSelfTest.java index 56d1b49..d932e71 100644 --- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromJobSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromJobSelfTest.java @@ -14,7 +14,6 @@ import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; -import org.gridgain.grid.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.gridgain.grid.util.typedef.*; @@ -124,7 +123,7 @@ public class GridSessionCancelSiblingsFromJobSelfTest extends GridCommonAbstract private void checkTask(int num) throws InterruptedException, IgniteCheckedException { Ignite ignite = G.ignite(getTestGridName()); - ComputeTaskFuture<?> fut = executeAsync(ignite.compute(), GridTaskSessionTestTask.class, num); + InternalComputeTaskFuture<?> fut = executeAsync(ignite.compute(), GridTaskSessionTestTask.class, num); boolean await = startSignal[num].await(WAIT_TIME, TimeUnit.MILLISECONDS); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromTaskSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromTaskSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromTaskSelfTest.java index 3e7c8a8..52b583b 100644 --- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromTaskSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromTaskSelfTest.java @@ -14,7 +14,6 @@ import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; -import org.gridgain.grid.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.gridgain.grid.util.typedef.*; @@ -124,7 +123,7 @@ public class GridSessionCancelSiblingsFromTaskSelfTest extends GridCommonAbstrac private void checkTask(int num) throws InterruptedException, IgniteCheckedException { Ignite ignite = G.ignite(getTestGridName()); - ComputeTaskFuture<?> fut = executeAsync(ignite.compute(), GridTaskSessionTestTask.class, num); + InternalComputeTaskFuture<?> fut = executeAsync(ignite.compute(), GridTaskSessionTestTask.class, num); assert fut != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCheckpointAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCheckpointAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCheckpointAbstractSelfTest.java index f98e038..0215142 100644 --- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCheckpointAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCheckpointAbstractSelfTest.java @@ -14,7 +14,6 @@ import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; import org.apache.ignite.marshaller.*; import org.apache.ignite.resources.*; -import org.gridgain.grid.*; import org.apache.ignite.spi.checkpoint.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.testframework.junits.common.*; @@ -106,7 +105,7 @@ public abstract class GridSessionCheckpointAbstractSelfTest extends GridCommonAb try { ignite.compute().localDeployTask(GridCheckpointTestTask.class, GridCheckpointTestTask.class.getClassLoader()); - ComputeTaskFuture<?> fut = executeAsync(ignite.compute(), "GridCheckpointTestTask", null); + InternalComputeTaskFuture<?> fut = executeAsync(ignite.compute(), "GridCheckpointTestTask", null); fut.getTaskSession().saveCheckpoint("future:session:key", "future:session:testval"); fut.getTaskSession().saveCheckpoint("future:global:key", "future:global:testval", http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/session/GridSessionFutureWaitJobAttributeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionFutureWaitJobAttributeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionFutureWaitJobAttributeSelfTest.java index 9860c30..450b20f 100644 --- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionFutureWaitJobAttributeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionFutureWaitJobAttributeSelfTest.java @@ -12,7 +12,6 @@ package org.gridgain.grid.session; import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.apache.ignite.resources.*; -import org.gridgain.grid.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.testframework.*; import org.gridgain.testframework.junits.common.*; @@ -107,7 +106,7 @@ public class GridSessionFutureWaitJobAttributeSelfTest extends GridCommonAbstrac comp.execute(GridTaskSessionTestTask.class.getName(), num); - ComputeTaskFuture<?> fut = comp.future(); + InternalComputeTaskFuture<?> fut = comp.future(); assert fut != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/session/GridSessionFutureWaitTaskAttributeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionFutureWaitTaskAttributeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionFutureWaitTaskAttributeSelfTest.java index a46e37b..d7700f2 100644 --- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionFutureWaitTaskAttributeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionFutureWaitTaskAttributeSelfTest.java @@ -12,7 +12,6 @@ package org.gridgain.grid.session; import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.apache.ignite.resources.*; -import org.gridgain.grid.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.testframework.*; import org.gridgain.testframework.junits.common.*; @@ -103,7 +102,7 @@ public class GridSessionFutureWaitTaskAttributeSelfTest extends GridCommonAbstra private void checkTask(int num) throws InterruptedException, IgniteCheckedException { Ignite ignite = G.ignite(getTestGridName()); - ComputeTaskFuture<?> fut = executeAsync(ignite.compute(), GridTaskSessionTestTask.class.getName(), num); + InternalComputeTaskFuture<?> fut = executeAsync(ignite.compute(), GridTaskSessionTestTask.class.getName(), num); assert fut != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/session/GridSessionJobWaitTaskAttributeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionJobWaitTaskAttributeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionJobWaitTaskAttributeSelfTest.java index 729f7ef..5c4e4e5 100644 --- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionJobWaitTaskAttributeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionJobWaitTaskAttributeSelfTest.java @@ -13,7 +13,6 @@ import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; import org.apache.ignite.resources.*; -import org.gridgain.grid.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.gridgain.grid.util.typedef.*; @@ -105,7 +104,7 @@ public class GridSessionJobWaitTaskAttributeSelfTest extends GridCommonAbstractT private void checkTask(int num) throws IgniteCheckedException { Ignite ignite = G.ignite(getTestGridName()); - ComputeTaskFuture<?> fut = executeAsync(ignite.compute(), GridTaskSessionTestTask.class.getName(), null); + InternalComputeTaskFuture<?> fut = executeAsync(ignite.compute(), GridTaskSessionTestTask.class.getName(), null); int exp = SPLIT_COUNT - 1; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetFutureAttributeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetFutureAttributeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetFutureAttributeSelfTest.java index 27906d0..52184dd 100644 --- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetFutureAttributeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetFutureAttributeSelfTest.java @@ -13,7 +13,6 @@ import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; import org.apache.ignite.resources.*; -import org.gridgain.grid.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.gridgain.grid.util.typedef.*; @@ -118,7 +117,7 @@ public class GridSessionSetFutureAttributeSelfTest extends GridCommonAbstractTes private void checkTask(int num) throws InterruptedException, IgniteCheckedException { Ignite ignite = G.ignite(getTestGridName()); - ComputeTaskFuture<?> fut = executeAsync(ignite.compute(), GridTaskSessionTestTask.class, num); + InternalComputeTaskFuture<?> fut = executeAsync(ignite.compute(), GridTaskSessionTestTask.class, num); assert fut != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java index 9c780fb..029684b 100644 --- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java @@ -13,7 +13,6 @@ import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; import org.apache.ignite.resources.*; -import org.gridgain.grid.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.gridgain.grid.util.typedef.*; @@ -81,7 +80,7 @@ public class GridSessionSetFutureAttributeWaitListenerSelfTest extends GridCommo for (int i = 0; i < 1; i++) { refreshInitialData(); - ComputeTaskFuture<?> fut = executeAsync(ignite.compute(), GridTaskSessionTestTask.class.getName(), null); + InternalComputeTaskFuture<?> fut = executeAsync(ignite.compute(), GridTaskSessionTestTask.class.getName(), null); assert fut != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttribute2SelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttribute2SelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttribute2SelfTest.java index db09475..f04a980 100644 --- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttribute2SelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttribute2SelfTest.java @@ -13,7 +13,6 @@ import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; import org.apache.ignite.resources.*; -import org.gridgain.grid.*; import org.gridgain.testframework.junits.common.*; import java.io.*; @@ -42,7 +41,7 @@ public class GridSessionSetJobAttribute2SelfTest extends GridCommonAbstractTest ignite1.compute().localDeployTask(SessionTestTask.class, SessionTestTask.class.getClassLoader()); - ComputeTaskFuture<?> fut = + InternalComputeTaskFuture<?> fut = executeAsync(ignite1.compute(), SessionTestTask.class.getName(), ignite2.cluster().localNode().id()); fut.get(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeOrderSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeOrderSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeOrderSelfTest.java index e84d8f3..da26bf2 100644 --- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeOrderSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeOrderSelfTest.java @@ -13,7 +13,6 @@ import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; import org.apache.ignite.resources.*; -import org.gridgain.grid.*; import org.gridgain.testframework.junits.common.*; import java.io.*; @@ -48,7 +47,7 @@ public class GridSessionSetJobAttributeOrderSelfTest extends GridCommonAbstractT for (int i = 0; i < TESTS_COUNT; i++) { comp.withTimeout(100000).execute(SessionTestTask.class.getName(), ignite2.cluster().localNode().id()); - ComputeTaskFuture<?> fut = comp.future(); + InternalComputeTaskFuture<?> fut = comp.future(); fut.getTaskSession().setAttribute(TEST_ATTR_KEY, SETS_ATTR_COUNT); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeSelfTest.java index 165cc9d..d67a274 100644 --- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeSelfTest.java @@ -13,7 +13,6 @@ import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; import org.apache.ignite.resources.*; -import org.gridgain.grid.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.gridgain.grid.util.typedef.*; @@ -106,7 +105,7 @@ public class GridSessionSetJobAttributeSelfTest extends GridCommonAbstractTest { private void checkTask(int num) throws IgniteCheckedException { Ignite ignite = G.ignite(getTestGridName()); - ComputeTaskFuture<?> fut = executeAsync(ignite.compute(), GridTaskSessionTestTask.class, num); + InternalComputeTaskFuture<?> fut = executeAsync(ignite.compute(), GridTaskSessionTestTask.class, num); Object res = fut.get(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeWaitListenerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeWaitListenerSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeWaitListenerSelfTest.java index 7a9fe4b..0a9b4a4 100644 --- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeWaitListenerSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeWaitListenerSelfTest.java @@ -13,7 +13,6 @@ import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; import org.apache.ignite.resources.*; -import org.gridgain.grid.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.gridgain.grid.util.typedef.*; @@ -79,7 +78,7 @@ public class GridSessionSetJobAttributeWaitListenerSelfTest extends GridCommonAb comp.execute(GridTaskSessionTestTask.class.getName(), null); - ComputeTaskFuture<?> fut = comp.future(); + InternalComputeTaskFuture<?> fut = comp.future(); assert fut != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetTaskAttributeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetTaskAttributeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetTaskAttributeSelfTest.java index 56c9328..d758714 100644 --- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetTaskAttributeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetTaskAttributeSelfTest.java @@ -12,7 +12,6 @@ package org.gridgain.grid.session; import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.apache.ignite.resources.*; -import org.gridgain.grid.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.testframework.*; import org.gridgain.testframework.junits.common.*; @@ -92,7 +91,7 @@ public class GridSessionSetTaskAttributeSelfTest extends GridCommonAbstractTest comp.execute(GridTaskSessionTestTask.class.getName(), num); - ComputeTaskFuture<?> fut = comp.future(); + InternalComputeTaskFuture<?> fut = comp.future(); Object res = fut.get(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/session/GridSessionTaskWaitJobAttributeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionTaskWaitJobAttributeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionTaskWaitJobAttributeSelfTest.java index b97d2f6..23cd3f5 100644 --- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionTaskWaitJobAttributeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionTaskWaitJobAttributeSelfTest.java @@ -12,7 +12,6 @@ package org.gridgain.grid.session; import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.apache.ignite.resources.*; -import org.gridgain.grid.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.testframework.*; import org.gridgain.testframework.junits.common.*; @@ -92,7 +91,7 @@ public class GridSessionTaskWaitJobAttributeSelfTest extends GridCommonAbstractT comp.execute(GridTaskSessionTestTask.class.getName(), num); - ComputeTaskFuture<?> fut = comp.future(); + InternalComputeTaskFuture<?> fut = comp.future(); Object res = fut.get(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/session/GridSessionWaitAttributeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionWaitAttributeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionWaitAttributeSelfTest.java index e03e4b0..c4204c2 100644 --- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionWaitAttributeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionWaitAttributeSelfTest.java @@ -14,7 +14,6 @@ import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; -import org.gridgain.grid.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.gridgain.grid.util.typedef.*; @@ -203,7 +202,7 @@ public class GridSessionWaitAttributeSelfTest extends GridCommonAbstractTest { comp.execute(TestSessionTask.class.getName(), type); - ComputeTaskFuture<?> fut = comp.future(); + InternalComputeTaskFuture<?> fut = comp.future(); fut.getTaskSession().mapFuture().get(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/util/GridConcurrentLinkedDequeMultiThreadedTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/util/GridConcurrentLinkedDequeMultiThreadedTest.java b/modules/core/src/test/java/org/gridgain/grid/util/GridConcurrentLinkedDequeMultiThreadedTest.java index 5845926..9595ad7 100644 --- a/modules/core/src/test/java/org/gridgain/grid/util/GridConcurrentLinkedDequeMultiThreadedTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/util/GridConcurrentLinkedDequeMultiThreadedTest.java @@ -36,7 +36,7 @@ public class GridConcurrentLinkedDequeMultiThreadedTest extends GridCommonAbstra final ConcurrentLinkedDeque8<Byte> queue = new ConcurrentLinkedDeque8<>(); // Poll thread. - IgniteFuture<?> pollFut = multithreadedAsync( + InternalFuture<?> pollFut = multithreadedAsync( new Callable<Object>() { @Nullable @Override public Object call() throws Exception { info("Thread started."); @@ -61,7 +61,7 @@ public class GridConcurrentLinkedDequeMultiThreadedTest extends GridCommonAbstra ); // Producer thread. - IgniteFuture<?> prodFut = multithreadedAsync( + InternalFuture<?> prodFut = multithreadedAsync( new Callable<Object>() { @Nullable @Override public Object call() throws Exception { info("Thread started."); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/util/GridConcurrentLinkedHashMapMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/util/GridConcurrentLinkedHashMapMultiThreadedSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/util/GridConcurrentLinkedHashMapMultiThreadedSelfTest.java index 3b1c24e..67efbde 100644 --- a/modules/core/src/test/java/org/gridgain/grid/util/GridConcurrentLinkedHashMapMultiThreadedSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/util/GridConcurrentLinkedHashMapMultiThreadedSelfTest.java @@ -261,7 +261,7 @@ public class GridConcurrentLinkedHashMapMultiThreadedSelfTest extends GridCommon final ConcurrentHashMap<String, LinkedList<Integer>> res = new ConcurrentHashMap<>(); // Producer thread. - IgniteFuture<?> fut = multithreadedAsync( + InternalFuture<?> fut = multithreadedAsync( new Callable<Object>() { @Nullable @Override public Object call() throws Exception { String thNm = Thread.currentThread().getName(); @@ -323,7 +323,7 @@ public class GridConcurrentLinkedHashMapMultiThreadedSelfTest extends GridCommon long start = System.currentTimeMillis(); // Updater threads. - IgniteFuture<?> fut = multithreadedAsync( + InternalFuture<?> fut = multithreadedAsync( new Callable<Object>() { @Nullable @Override public Object call() throws Exception { Random rnd = new Random(); @@ -408,7 +408,7 @@ public class GridConcurrentLinkedHashMapMultiThreadedSelfTest extends GridCommon long start = System.currentTimeMillis(); // Updater threads. - IgniteFuture<?> fut = multithreadedAsync( + InternalFuture<?> fut = multithreadedAsync( new Callable<Object>() { @Nullable @Override public Object call() throws Exception { Random rnd = new Random(); @@ -482,7 +482,7 @@ public class GridConcurrentLinkedHashMapMultiThreadedSelfTest extends GridCommon long start = System.currentTimeMillis(); // Updater threads. - IgniteFuture<?> fut = multithreadedAsync( + InternalFuture<?> fut = multithreadedAsync( new Callable<Object>() { @Nullable @Override public Object call() throws Exception { Random rnd = new Random(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/util/GridIndexFillTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/util/GridIndexFillTest.java b/modules/core/src/test/java/org/gridgain/grid/util/GridIndexFillTest.java index d44285b..da48111 100644 --- a/modules/core/src/test/java/org/gridgain/grid/util/GridIndexFillTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/util/GridIndexFillTest.java @@ -107,7 +107,7 @@ public class GridIndexFillTest extends GridCommonAbstractTest { public void testSnaptreeParallelBuild() throws Exception { final AtomicBoolean stop = new AtomicBoolean(); - IgniteFuture<?> fut = multithreadedAsync(new Callable<Object>() { + InternalFuture<?> fut = multithreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { ThreadLocalRandom rnd = ThreadLocalRandom.current(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/util/GridSnapshotLockSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/util/GridSnapshotLockSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/util/GridSnapshotLockSelfTest.java index 7561fbe..fe0ba16 100644 --- a/modules/core/src/test/java/org/gridgain/grid/util/GridSnapshotLockSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/util/GridSnapshotLockSelfTest.java @@ -45,7 +45,7 @@ public class GridSnapshotLockSelfTest extends GridCommonAbstractTest { } }; - IgniteFuture<?> fut1 = multithreadedAsync(new Callable<Object>() { + InternalFuture<?> fut1 = multithreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { Random rnd = new Random(); @@ -73,7 +73,7 @@ public class GridSnapshotLockSelfTest extends GridCommonAbstractTest { } }, 15, "update"); - IgniteFuture<?> fut2 = multithreadedAsync(new Callable<Object>() { + InternalFuture<?> fut2 = multithreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { while(!stop.get()) { T3<Long, Long, Long> t; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/util/GridSpinReadWriteLockSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/util/GridSpinReadWriteLockSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/util/GridSpinReadWriteLockSelfTest.java index d19af29..fc5b461 100644 --- a/modules/core/src/test/java/org/gridgain/grid/util/GridSpinReadWriteLockSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/util/GridSpinReadWriteLockSelfTest.java @@ -49,7 +49,7 @@ public class GridSpinReadWriteLockSelfTest extends GridCommonAbstractTest { final CountDownLatch latch = new CountDownLatch(1); - IgniteFuture<?> f = multithreadedAsync( + InternalFuture<?> f = multithreadedAsync( new Callable<Object>() { @Override public Object call() throws Exception { assert !lock.tryWriteLock(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/util/future/GridCompoundFutureSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/util/future/GridCompoundFutureSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/util/future/GridCompoundFutureSelfTest.java index 7ed0296..b8f90f4 100644 --- a/modules/core/src/test/java/org/gridgain/grid/util/future/GridCompoundFutureSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/util/future/GridCompoundFutureSelfTest.java @@ -31,7 +31,7 @@ public class GridCompoundFutureSelfTest extends GridCommonAbstractTest { GridCompoundFuture<Boolean, Boolean> fut = new GridCompoundFuture<>(); for (int i = 0; i < 5; i++) { - IgniteFuture<Boolean> part = new GridFinishedFuture<>(ctx, true); + InternalFuture<Boolean> part = new GridFinishedFuture<>(ctx, true); part.syncNotify(true); @@ -135,7 +135,7 @@ public class GridCompoundFutureSelfTest extends GridCommonAbstractTest { fut.markInitialized(); - IgniteFuture<?> complete = multithreadedAsync(new Runnable() { + InternalFuture<?> complete = multithreadedAsync(new Runnable() { @Override public void run() { GridFutureAdapter<Boolean> part; @@ -170,7 +170,7 @@ public class GridCompoundFutureSelfTest extends GridCommonAbstractTest { fut.markInitialized(); - IgniteFuture<?> complete = multithreadedAsync(new Runnable() { + InternalFuture<?> complete = multithreadedAsync(new Runnable() { @Override public void run() { GridFutureAdapter<Boolean> part; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/util/future/GridEmbeddedFutureSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/util/future/GridEmbeddedFutureSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/util/future/GridEmbeddedFutureSelfTest.java index c3ade47..4b0275a 100644 --- a/modules/core/src/test/java/org/gridgain/grid/util/future/GridEmbeddedFutureSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/util/future/GridEmbeddedFutureSelfTest.java @@ -40,12 +40,12 @@ public class GridEmbeddedFutureSelfTest extends GridCommonAbstractTest { public void testFutureChain() throws Exception { GridFutureAdapter<Integer> fut = new GridFutureAdapter<>(ctx); - IgniteFuture<Integer> cur = fut; + InternalFuture<Integer> cur = fut; for (int i = 0; i < DFLT_MAX_CONCURRENT_ASYNC_OPS; i++) { cur = new GridEmbeddedFuture<>(cur, - new IgniteBiClosure<Integer, Exception, IgniteFuture<Integer>>() { - @Override public IgniteFuture<Integer> apply(Integer o, Exception e) { + new IgniteBiClosure<Integer, Exception, InternalFuture<Integer>>() { + @Override public InternalFuture<Integer> apply(Integer o, Exception e) { return new GridFinishedFuture<>(ctx, o); } }, ctx); @@ -111,7 +111,7 @@ public class GridEmbeddedFutureSelfTest extends GridCommonAbstractTest { try { embFut.get(1, SECONDS); } - catch (IgniteFutureTimeoutException e) { + catch (InternalFutureTimeoutException e) { fail("Failed with timeout exception: " + e); } catch (IgniteCheckedException e) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/util/future/GridFinishedFutureSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/util/future/GridFinishedFutureSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/util/future/GridFinishedFutureSelfTest.java index 9a009de..b9f1e14 100644 --- a/modules/core/src/test/java/org/gridgain/grid/util/future/GridFinishedFutureSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/util/future/GridFinishedFutureSelfTest.java @@ -61,7 +61,7 @@ public class GridFinishedFutureSelfTest extends GridCommonAbstractTest { IgniteMarshaller m = new IgniteOptimizedMarshaller(); ClassLoader clsLdr = getClass().getClassLoader(); - IgniteFuture<Object> orig = t == null ? new GridFinishedFuture<>(ctx, ex) : + InternalFuture<Object> orig = t == null ? new GridFinishedFuture<>(ctx, ex) : new GridFinishedFuture<>(ctx, t); orig.syncNotify(syncNotify); @@ -82,8 +82,8 @@ public class GridFinishedFutureSelfTest extends GridCommonAbstractTest { final CountDownLatch done = new CountDownLatch(1); - fut.listenAsync(new CI1<IgniteFuture<Object>>() { - @Override public void apply(IgniteFuture<Object> t) { + fut.listenAsync(new CI1<InternalFuture<Object>>() { + @Override public void apply(InternalFuture<Object> t) { done.countDown(); } }); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/util/future/GridFutureAdapterSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/util/future/GridFutureAdapterSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/util/future/GridFutureAdapterSelfTest.java index d93f098..d4d40c5 100644 --- a/modules/core/src/test/java/org/gridgain/grid/util/future/GridFutureAdapterSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/util/future/GridFutureAdapterSelfTest.java @@ -88,7 +88,7 @@ public class GridFutureAdapterSelfTest extends GridCommonAbstractTest { return fut.get(); } - }, IgniteFutureCancelledException.class, null); + }, InternalFutureCancelledException.class, null); GridTestUtils.assertThrows(log, new Callable<Object>() { @Override public Object call() throws Exception { @@ -100,7 +100,7 @@ public class GridFutureAdapterSelfTest extends GridCommonAbstractTest { return fut.get(); } - }, IgniteFutureCancelledException.class, null); + }, InternalFutureCancelledException.class, null); } /** @@ -118,8 +118,8 @@ public class GridFutureAdapterSelfTest extends GridCommonAbstractTest { final AtomicReference<Exception> err = new AtomicReference<>(); for (int i = 0; i < lsnrCnt; i++) { - fut.listenAsync(new CI1<IgniteFuture<String>>() { - @Override public void apply(IgniteFuture<String> t) { + fut.listenAsync(new CI1<InternalFuture<String>>() { + @Override public void apply(InternalFuture<String> t) { if (Thread.currentThread() != runThread) err.compareAndSet(null, new Exception("Wrong notification thread: " + Thread.currentThread())); @@ -139,8 +139,8 @@ public class GridFutureAdapterSelfTest extends GridCommonAbstractTest { err.set(null); - fut.listenAsync(new CI1<IgniteFuture<String>>() { - @Override public void apply(IgniteFuture<String> t) { + fut.listenAsync(new CI1<InternalFuture<String>>() { + @Override public void apply(InternalFuture<String> t) { if (Thread.currentThread() != runThread) err.compareAndSet(null, new Exception("Wrong notification thread: " + Thread.currentThread())); @@ -179,8 +179,8 @@ public class GridFutureAdapterSelfTest extends GridCommonAbstractTest { final AtomicReference<Exception> err = new AtomicReference<>(); for (int i = 0; i < lsnrCnt; i++) { - fut.listenAsync(new CI1<IgniteFuture<String>>() { - @Override public void apply(IgniteFuture<String> t) { + fut.listenAsync(new CI1<InternalFuture<String>>() { + @Override public void apply(InternalFuture<String> t) { if (Thread.currentThread() == runThread) err.compareAndSet(null, new Exception("Wrong notification thread: " + Thread.currentThread())); @@ -201,8 +201,8 @@ public class GridFutureAdapterSelfTest extends GridCommonAbstractTest { err.set(null); - fut.listenAsync(new CI1<IgniteFuture<String>>() { - @Override public void apply(IgniteFuture<String> t) { + fut.listenAsync(new CI1<InternalFuture<String>>() { + @Override public void apply(InternalFuture<String> t) { if (Thread.currentThread() == runThread) err.compareAndSet(null, new Exception("Wrong notification thread: " + Thread.currentThread())); @@ -227,8 +227,8 @@ public class GridFutureAdapterSelfTest extends GridCommonAbstractTest { */ @SuppressWarnings("ErrorNotRethrown") public void testChaining() throws Exception { - final CX1<IgniteFuture<Object>, Object> passThrough = new CX1<IgniteFuture<Object>, Object>() { - @Override public Object applyx(IgniteFuture<Object> f) throws IgniteCheckedException { + final CX1<InternalFuture<Object>, Object> passThrough = new CX1<InternalFuture<Object>, Object>() { + @Override public Object applyx(InternalFuture<Object> f) throws IgniteCheckedException { return f.get(); } }; @@ -246,7 +246,7 @@ public class GridFutureAdapterSelfTest extends GridCommonAbstractTest { // Test result returned. GridFutureAdapter<Object> fut = new GridFutureAdapter<>(ctx); - IgniteFuture<Object> chain = fut.chain(passThrough); + InternalFuture<Object> chain = fut.chain(passThrough); assertFalse(fut.isDone()); assertFalse(chain.isDone()); @@ -256,7 +256,7 @@ public class GridFutureAdapterSelfTest extends GridCommonAbstractTest { fail("Expects timeout exception."); } - catch (IgniteFutureTimeoutException e) { + catch (InternalFutureTimeoutException e) { info("Expected timeout exception: " + e.getMessage()); } @@ -325,7 +325,7 @@ public class GridFutureAdapterSelfTest extends GridCommonAbstractTest { assert false; } - catch (IgniteFutureTimeoutException e) { + catch (InternalFutureTimeoutException e) { info("Caught expected exception: " + e); } @@ -342,7 +342,7 @@ public class GridFutureAdapterSelfTest extends GridCommonAbstractTest { assert false; } - catch (IgniteFutureCancelledException e) { + catch (InternalFutureCancelledException e) { info("Caught expected exception: " + e); } @@ -351,7 +351,7 @@ public class GridFutureAdapterSelfTest extends GridCommonAbstractTest { assert false; } - catch (IgniteFutureCancelledException e) { + catch (InternalFutureCancelledException e) { info("Caught expected exception: " + e); } @@ -417,7 +417,7 @@ public class GridFutureAdapterSelfTest extends GridCommonAbstractTest { assert false; } - catch (IgniteFutureCancelledException e) { + catch (InternalFutureCancelledException e) { info("Caught expected exception: " + e); } @@ -426,7 +426,7 @@ public class GridFutureAdapterSelfTest extends GridCommonAbstractTest { assert false; } - catch (IgniteFutureCancelledException e) { + catch (InternalFutureCancelledException e) { info("Caught expected exception: " + e); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/util/future/GridFutureListenPerformanceTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/util/future/GridFutureListenPerformanceTest.java b/modules/core/src/test/java/org/gridgain/grid/util/future/GridFutureListenPerformanceTest.java index f97de41..d88d37c 100644 --- a/modules/core/src/test/java/org/gridgain/grid/util/future/GridFutureListenPerformanceTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/util/future/GridFutureListenPerformanceTest.java @@ -66,8 +66,8 @@ public class GridFutureListenPerformanceTest { futs.add(fut); for (int k = 1; k < rnd.nextInt(3); k++) { - fut.listenAsync(new IgniteInClosure<IgniteFuture<Object>>() { - @Override public void apply(IgniteFuture<Object> t) { + fut.listenAsync(new IgniteInClosure<InternalFuture<Object>>() { + @Override public void apply(InternalFuture<Object> t) { try { t.get(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/util/future/nio/GridNioFutureSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/util/future/nio/GridNioFutureSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/util/future/nio/GridNioFutureSelfTest.java index d5e9e5d..77b9ece 100644 --- a/modules/core/src/test/java/org/gridgain/grid/util/future/nio/GridNioFutureSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/util/future/nio/GridNioFutureSelfTest.java @@ -85,7 +85,7 @@ public class GridNioFutureSelfTest extends GridCommonAbstractTest { return fut.get(); } - }, IgniteFutureCancelledException.class, null); + }, InternalFutureCancelledException.class, null); GridTestUtils.assertThrows(log, new Callable<Object>() { @Override public Object call() throws Exception { @@ -97,7 +97,7 @@ public class GridNioFutureSelfTest extends GridCommonAbstractTest { return fut.get(); } - }, IgniteFutureCancelledException.class, null); + }, InternalFutureCancelledException.class, null); } /** @@ -168,7 +168,7 @@ public class GridNioFutureSelfTest extends GridCommonAbstractTest { assert false; } - catch (IgniteFutureTimeoutException e) { + catch (InternalFutureTimeoutException e) { info("Caught expected exception: " + e); } @@ -185,7 +185,7 @@ public class GridNioFutureSelfTest extends GridCommonAbstractTest { assert false; } - catch (IgniteFutureCancelledException e) { + catch (InternalFutureCancelledException e) { info("Caught expected exception: " + e); } @@ -194,7 +194,7 @@ public class GridNioFutureSelfTest extends GridCommonAbstractTest { assert false; } - catch (IgniteFutureCancelledException e) { + catch (InternalFutureCancelledException e) { info("Caught expected exception: " + e); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemorySpaceSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemorySpaceSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemorySpaceSelfTest.java index cccf7a5..157cec4 100644 --- a/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemorySpaceSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemorySpaceSelfTest.java @@ -11,7 +11,6 @@ package org.gridgain.grid.util.ipc.shmem; import org.apache.ignite.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; import org.gridgain.testframework.junits.common.*; import org.jdk8.backport.*; @@ -59,7 +58,7 @@ public class GridIpcSharedMemorySpaceSelfTest extends GridCommonAbstractTest { final AtomicReference<GridIpcSharedMemorySpace> spaceRef = new AtomicReference<>(); - IgniteFuture<?> fut1 = multithreadedAsync( + InternalFuture<?> fut1 = multithreadedAsync( new Callable<Object>() { @SuppressWarnings("TooBroadScope") @Override public Object call() throws Exception { @@ -90,7 +89,7 @@ public class GridIpcSharedMemorySpaceSelfTest extends GridCommonAbstractTest { 1, "writer"); - IgniteFuture<?> fut2 = multithreadedAsync( + InternalFuture<?> fut2 = multithreadedAsync( new Callable<Object>() { @SuppressWarnings({"TooBroadScope", "StatementWithEmptyBody"}) @Override public Object call() throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/util/nio/GridNioSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/util/nio/GridNioSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/util/nio/GridNioSelfTest.java index 14ee90d..7fd5664 100644 --- a/modules/core/src/test/java/org/gridgain/grid/util/nio/GridNioSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/util/nio/GridNioSelfTest.java @@ -93,7 +93,7 @@ public class GridNioSelfTest extends GridCommonAbstractTest { GridNioServer<?> srvr = startServer(PORT, new GridPlainParser(), lsnr); try { - IgniteFuture<?> fut = multithreadedAsync(new Runnable() { + InternalFuture<?> fut = multithreadedAsync(new Runnable() { @Override public void run() { byte[] msg = new byte[MSG_SIZE]; @@ -247,7 +247,7 @@ public class GridNioSelfTest extends GridCommonAbstractTest { final AtomicBoolean running = new AtomicBoolean(true); try { - IgniteFuture<?> fut = multithreadedAsync(new Runnable() { + InternalFuture<?> fut = multithreadedAsync(new Runnable() { @Override public void run() { try { @@ -619,7 +619,7 @@ public class GridNioSelfTest extends GridCommonAbstractTest { new EchoListener()); try { - IgniteFuture<?> fut = multithreadedAsync(new Runnable() { + InternalFuture<?> fut = multithreadedAsync(new Runnable() { @SuppressWarnings("BusyWait") @Override public void run() { try { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/util/offheap/GridOffHeapMapAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/util/offheap/GridOffHeapMapAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/util/offheap/GridOffHeapMapAbstractSelfTest.java index 1833414..217f53e 100644 --- a/modules/core/src/test/java/org/gridgain/grid/util/offheap/GridOffHeapMapAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/util/offheap/GridOffHeapMapAbstractSelfTest.java @@ -654,7 +654,7 @@ public abstract class GridOffHeapMapAbstractSelfTest extends GridCommonAbstractT final AtomicBoolean run = new AtomicBoolean(true); - IgniteFuture<?> itFut = multithreadedAsync(new Runnable() { + InternalFuture<?> itFut = multithreadedAsync(new Runnable() { @Override public void run() { try { startLatch.await(); @@ -679,7 +679,7 @@ public abstract class GridOffHeapMapAbstractSelfTest extends GridCommonAbstractT } }, 1); - IgniteFuture<?> putFut = multithreadedAsync(new Runnable() { + InternalFuture<?> putFut = multithreadedAsync(new Runnable() { @Override public void run() { try { startLatch.await(); @@ -738,7 +738,7 @@ public abstract class GridOffHeapMapAbstractSelfTest extends GridCommonAbstractT keys[i][0] = (byte)i; // hash } - IgniteFuture<?> fut = multithreadedAsync(new Callable<Void>() { + InternalFuture<?> fut = multithreadedAsync(new Callable<Void>() { @Override public Void call() throws IgniteCheckedException { Random rnd = new Random(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/util/offheap/GridOffHeapPartitionedMapAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/util/offheap/GridOffHeapPartitionedMapAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/util/offheap/GridOffHeapPartitionedMapAbstractSelfTest.java index 6f8e63c..28c6fb5 100644 --- a/modules/core/src/test/java/org/gridgain/grid/util/offheap/GridOffHeapPartitionedMapAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/util/offheap/GridOffHeapPartitionedMapAbstractSelfTest.java @@ -587,7 +587,7 @@ public abstract class GridOffHeapPartitionedMapAbstractSelfTest extends GridComm final AtomicBoolean running = new AtomicBoolean(true); - IgniteFuture<?> iterFut = multithreadedAsync(new Runnable() { + InternalFuture<?> iterFut = multithreadedAsync(new Runnable() { @Override public void run() { try { while (running.get()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/util/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/util/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/util/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java index 8dbf32d..77e66ad 100644 --- a/modules/core/src/test/java/org/gridgain/grid/util/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/util/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java @@ -159,7 +159,7 @@ public abstract class GridOffHeapPartitionedMapPerformanceAbstractTest extends G long start = System.currentTimeMillis(); - IgniteFuture<?> fut = multithreadedAsync(new Callable<Object>() { + InternalFuture<?> fut = multithreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { Random rnd = new Random(); @@ -214,7 +214,7 @@ public abstract class GridOffHeapPartitionedMapPerformanceAbstractTest extends G long start = System.currentTimeMillis(); - IgniteFuture<?> fut = multithreadedAsync(new Callable<Object>() { + InternalFuture<?> fut = multithreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { Random rnd = new Random(); @@ -285,7 +285,7 @@ public abstract class GridOffHeapPartitionedMapPerformanceAbstractTest extends G long start = System.currentTimeMillis(); - IgniteFuture<?> fut = multithreadedAsync(new Callable<Object>() { + InternalFuture<?> fut = multithreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { Random rnd = new Random(); @@ -340,7 +340,7 @@ public abstract class GridOffHeapPartitionedMapPerformanceAbstractTest extends G long start = System.currentTimeMillis(); - IgniteFuture<?> fut = multithreadedAsync(new Callable<Object>() { + InternalFuture<?> fut = multithreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { Random rnd = new Random(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/util/offheap/unsafe/GridUnsafeMemorySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/util/offheap/unsafe/GridUnsafeMemorySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/util/offheap/unsafe/GridUnsafeMemorySelfTest.java index c41e103..b779830 100644 --- a/modules/core/src/test/java/org/gridgain/grid/util/offheap/unsafe/GridUnsafeMemorySelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/util/offheap/unsafe/GridUnsafeMemorySelfTest.java @@ -9,7 +9,7 @@ package org.gridgain.grid.util.offheap.unsafe; -import org.apache.ignite.lang.IgniteFuture; +import org.apache.ignite.lang.InternalFuture; import org.gridgain.grid.util.*; import org.gridgain.grid.util.typedef.X; import org.gridgain.testframework.junits.common.*; @@ -256,7 +256,7 @@ public class GridUnsafeMemorySelfTest extends GridCommonAbstractTest { final AtomicBoolean run = new AtomicBoolean(true); - IgniteFuture<?> fut = multithreadedAsync(new Runnable() { + InternalFuture<?> fut = multithreadedAsync(new Runnable() { @Override public void run() { int x = 0; @@ -309,7 +309,7 @@ public class GridUnsafeMemorySelfTest extends GridCommonAbstractTest { final LongAdder locAdder = new LongAdder(); - IgniteFuture<?> fut = multithreadedAsync(new Callable<Object>() { + InternalFuture<?> fut = multithreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { Random rnd = new GridRandom(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/jvmtest/ConcurrentMapTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/jvmtest/ConcurrentMapTest.java b/modules/core/src/test/java/org/gridgain/jvmtest/ConcurrentMapTest.java index 5beba7e..3ed4350 100644 --- a/modules/core/src/test/java/org/gridgain/jvmtest/ConcurrentMapTest.java +++ b/modules/core/src/test/java/org/gridgain/jvmtest/ConcurrentMapTest.java @@ -76,7 +76,7 @@ public class ConcurrentMapTest { final AtomicInteger writes = new AtomicInteger(); - IgniteFuture fut1 = GridTestUtils.runMultiThreadedAsync( + InternalFuture fut1 = GridTestUtils.runMultiThreadedAsync( new Runnable() { @Override public void run() { while (!done.get()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/jvmtest/NetworkFailureTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/jvmtest/NetworkFailureTest.java b/modules/core/src/test/java/org/gridgain/jvmtest/NetworkFailureTest.java index 0534754..7717cba 100644 --- a/modules/core/src/test/java/org/gridgain/jvmtest/NetworkFailureTest.java +++ b/modules/core/src/test/java/org/gridgain/jvmtest/NetworkFailureTest.java @@ -34,7 +34,7 @@ public class NetworkFailureTest extends TestCase { final InetAddress addr = InetAddress.getByName("192.168.0.100"); - IgniteFuture<?> fut1 = GridTestUtils.runMultiThreadedAsync( + InternalFuture<?> fut1 = GridTestUtils.runMultiThreadedAsync( new Callable<Object>() { @Nullable @Override public Object call() throws Exception { ServerSocket srvSock = null; @@ -72,7 +72,7 @@ public class NetworkFailureTest extends TestCase { "server" ); - IgniteFuture<?> fut2 = GridTestUtils.runMultiThreadedAsync( + InternalFuture<?> fut2 = GridTestUtils.runMultiThreadedAsync( new Callable<Object>() { @Nullable @Override public Object call() throws Exception { Socket sock = null; @@ -133,7 +133,7 @@ public class NetworkFailureTest extends TestCase { public void testReadTimeout() throws Exception { final InetAddress addr = InetAddress.getByName("192.168.3.10"); - IgniteFuture<?> fut1 = GridTestUtils.runMultiThreadedAsync( + InternalFuture<?> fut1 = GridTestUtils.runMultiThreadedAsync( new Callable<Object>() { @Nullable @Override public Object call() throws Exception { ServerSocket srvSock = null; @@ -174,7 +174,7 @@ public class NetworkFailureTest extends TestCase { "server" ); - IgniteFuture<?> fut2 = GridTestUtils.runMultiThreadedAsync( + InternalFuture<?> fut2 = GridTestUtils.runMultiThreadedAsync( new Callable<Object>() { @Nullable @Override public Object call() throws Exception { Socket sock = null; @@ -217,7 +217,7 @@ public class NetworkFailureTest extends TestCase { final InetAddress addr = InetAddress.getByName("192.168.0.100"); - IgniteFuture<?> fut1 = GridTestUtils.runMultiThreadedAsync( + InternalFuture<?> fut1 = GridTestUtils.runMultiThreadedAsync( new Callable<Object>() { @Nullable @Override public Object call() throws Exception { ServerSocket srvSock = null; @@ -245,7 +245,7 @@ public class NetworkFailureTest extends TestCase { final AtomicReference<Socket> sockRef = new AtomicReference<>(); - IgniteFuture<?> fut2 = GridTestUtils.runMultiThreadedAsync( + InternalFuture<?> fut2 = GridTestUtils.runMultiThreadedAsync( new Callable<Object>() { @Nullable @Override public Object call() throws Exception { Socket sock = null; @@ -279,7 +279,7 @@ public class NetworkFailureTest extends TestCase { "client" ); - IgniteFuture<?> fut3 = GridTestUtils.runMultiThreadedAsync( + InternalFuture<?> fut3 = GridTestUtils.runMultiThreadedAsync( new Callable<Object>() { @Nullable @Override public Object call() throws Exception { while (true) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/jvmtest/QueueSizeCounterMultiThreadedTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/jvmtest/QueueSizeCounterMultiThreadedTest.java b/modules/core/src/test/java/org/gridgain/jvmtest/QueueSizeCounterMultiThreadedTest.java index e443836..cb39da2 100644 --- a/modules/core/src/test/java/org/gridgain/jvmtest/QueueSizeCounterMultiThreadedTest.java +++ b/modules/core/src/test/java/org/gridgain/jvmtest/QueueSizeCounterMultiThreadedTest.java @@ -38,7 +38,7 @@ public class QueueSizeCounterMultiThreadedTest extends TestCase { final ReadWriteLock lock = new ReentrantReadWriteLock(); - IgniteFuture fut1 = GridTestUtils.runMultiThreadedAsync( + InternalFuture fut1 = GridTestUtils.runMultiThreadedAsync( new Callable<Object>() { @SuppressWarnings( {"BusyWait"}) @Nullable @Override public Object call() throws Exception {
