ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [01/49] incubator-ignite git commit: sprint-1 - moved IgniteCompute to IgniteRunnable and IgniteCallable.
Date Fri, 06 Feb 2015 13:17:28 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-164v2stable 9ef202aeb -> 501f62288


sprint-1 - moved IgniteCompute to IgniteRunnable and IgniteCallable.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a82c8ea6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a82c8ea6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a82c8ea6

Branch: refs/heads/ignite-164v2stable
Commit: a82c8ea6cf88776e5d3c41f7ee89e6d7b73b7a05
Parents: cbdbb8e
Author: Dmitiry Setrakyan <dsetrakyan@gridgain.com>
Authored: Wed Feb 4 22:56:52 2015 -0800
Committer: Dmitiry Setrakyan <dsetrakyan@gridgain.com>
Committed: Wed Feb 4 22:56:52 2015 -0800

----------------------------------------------------------------------
 .../CacheAtomicReferenceExample.java            |  2 +-
 .../CacheAtomicStampedExample.java              |  2 +-
 .../streaming/StreamingCheckInExample.java      |  2 +-
 .../StreamingPopularNumbersExample.java         |  2 +-
 .../streaming/StreamingPriceBarsExample.java    |  2 +-
 .../apache/ignite/examples/ComputeExample.java  |  6 +++---
 .../examples/ScalarCacheAffinityExample1.scala  |  3 ++-
 .../java/org/apache/ignite/IgniteCompute.java   | 18 ++++++++---------
 .../ignite/internal/IgniteComputeImpl.java      | 21 ++++++++++----------
 .../internal/util/lang/GridAbsClosure.java      |  4 +++-
 .../apache/ignite/internal/util/typedef/CA.java |  3 ++-
 .../ignite/internal/util/typedef/CAX.java       |  2 +-
 .../org/apache/ignite/lang/IgniteRunnable.java  |  2 +-
 .../GridJobMasterLeaveAwareSelfTest.java        |  4 ++--
 .../internal/GridManagementJobSelfTest.java     |  7 ++++---
 .../internal/GridProjectionAbstractTest.java    | 18 ++++++++---------
 .../GridTaskExecutionContextSelfTest.java       |  4 ++--
 .../IgniteComputeEmptyClusterGroupTest.java     |  4 ++--
 .../cache/GridCacheAbstractFullApiSelfTest.java |  8 ++++----
 ...eAbstractDataStructuresFailoverSelfTest.java |  2 +-
 ...GridCacheQueueMultiNodeAbstractSelfTest.java |  2 +-
 .../GridCacheSetAbstractSelfTest.java           |  3 ++-
 ...xOriginatingNodeFailureAbstractSelfTest.java |  3 ++-
 ...cOriginatingNodeFailureAbstractSelfTest.java |  4 ++--
 .../near/GridCacheNearEvictionSelfTest.java     |  5 +++--
 .../GridCachePartitionedAffinitySelfTest.java   |  2 +-
 .../GridCachePartitionedEntryLockSelfTest.java  |  3 ++-
 ...achePartitionedMultiNodeFullApiSelfTest.java |  2 +-
 .../closure/GridClosureProcessorSelfTest.java   | 14 ++++++-------
 .../loadtests/colocation/GridTestMain.java      |  2 +-
 .../marshaller/GridMarshallerAbstractTest.java  |  2 +-
 .../spi/GridTcpSpiForwardingSelfTest.java       |  3 ++-
 .../GridHibernateAccessStrategyAdapter.java     |  3 ++-
 .../ignite/scalar/ScalarConversions.scala       |  8 ++++----
 .../ignite/scalar/lang/ScalarOutClosure.scala   |  4 ++--
 .../scalar/lang/ScalarOutClosureFunction.scala  |  4 +++-
 .../yardstick/compute/IgniteRunBenchmark.java   |  5 +++--
 .../yardstick/compute/model/NoopCallable.java   |  4 +++-
 38 files changed, 103 insertions(+), 86 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a82c8ea6/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicReferenceExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicReferenceExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicReferenceExample.java
index 4ce2e7a..c13d8db 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicReferenceExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicReferenceExample.java
@@ -61,7 +61,7 @@ public final class CacheAtomicReferenceExample {
             System.out.println("Atomic reference initial value : " + ref.get() + '.');
 
             // Make closure for checking atomic reference value on cluster.
-            Runnable c = new ReferenceClosure(CACHE_NAME, refName);
+            IgniteRunnable c = new ReferenceClosure(CACHE_NAME, refName);
 
             // Check atomic reference on all cluster nodes.
             ignite.compute().run(c);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a82c8ea6/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicStampedExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicStampedExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicStampedExample.java
index dd54374..8f55e63 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicStampedExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicStampedExample.java
@@ -64,7 +64,7 @@ public final class CacheAtomicStampedExample {
             System.out.println("Atomic stamped initial [value=" + stamped.value() + ", stamp=" + stamped.stamp() + ']');
 
             // Make closure for checking atomic stamped on ignite.
-            Runnable c = new StampedUpdateClosure(CACHE_NAME, stampedName);
+            IgniteRunnable c = new StampedUpdateClosure(CACHE_NAME, stampedName);
 
             // Check atomic stamped on all cluster nodes.
             ignite.compute().run(c);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a82c8ea6/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingCheckInExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingCheckInExample.java b/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingCheckInExample.java
index d6fa8a8..b3f1948 100644
--- a/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingCheckInExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingCheckInExample.java
@@ -135,7 +135,7 @@ public class StreamingCheckInExample {
 
             // Reset all streamers on all nodes to make sure that
             // consecutive executions start from scratch.
-            ignite.compute().broadcast(new Runnable() {
+            ignite.compute().broadcast(new IgniteRunnable() {
                 @Override public void run() {
                     if (!ExamplesUtils.hasStreamer(ignite, STREAMER_NAME))
                         System.err.println("Default streamer not found (is example-streamer.xml " +

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a82c8ea6/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingPopularNumbersExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingPopularNumbersExample.java b/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingPopularNumbersExample.java
index ebb4b36..95a7272 100644
--- a/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingPopularNumbersExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingPopularNumbersExample.java
@@ -115,7 +115,7 @@ public class StreamingPopularNumbersExample {
 
             // Reset all streamers on all nodes to make sure that
             // consecutive executions start from scratch.
-            ignite.compute().broadcast(new Runnable() {
+            ignite.compute().broadcast(new IgniteRunnable() {
                 @Override public void run() {
                     if (!ExamplesUtils.hasStreamer(ignite, "popular-numbers"))
                         System.err.println("Default streamer not found (is example-streamer.xml " +

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a82c8ea6/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingPriceBarsExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingPriceBarsExample.java b/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingPriceBarsExample.java
index 4fb6f3a..6098ffd 100644
--- a/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingPriceBarsExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingPriceBarsExample.java
@@ -96,7 +96,7 @@ public class StreamingPriceBarsExample {
 
             // Reset all streamers on all nodes to make sure that
             // consecutive executions start from scratch.
-            ignite.compute().broadcast(new Runnable() {
+            ignite.compute().broadcast(new IgniteRunnable() {
                 @Override public void run() {
                     if (!ExamplesUtils.hasStreamer(ignite, "priceBars"))
                         System.err.println("Default streamer not found (is example-streamer.xml " +

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a82c8ea6/examples/src/main/java8/org/apache/ignite/examples/ComputeExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java8/org/apache/ignite/examples/ComputeExample.java b/examples/src/main/java8/org/apache/ignite/examples/ComputeExample.java
index a85c22b..a1d2031 100644
--- a/examples/src/main/java8/org/apache/ignite/examples/ComputeExample.java
+++ b/examples/src/main/java8/org/apache/ignite/examples/ComputeExample.java
@@ -39,13 +39,13 @@ public class ComputeExample {
             System.out.println(">>> Compute broadcast example started.");
 
             // Broadcast closure to all cluster nodes.
-            ignite.compute().broadcast((IgniteRunnable)() -> System.out.println("Hello World"));
+            ignite.compute().broadcast(() -> System.out.println("Hello World"));
 
             // Unicast closure to some cluster node picked by load balancer.
-            ignite.compute().run((IgniteRunnable)() -> System.out.println("Hello World"));
+            ignite.compute().run(() -> System.out.println("Hello World"));
 
             // Unicast closure to some cluster node picked by load balancer and return result.
-            int length = ignite.compute().call((IgniteCallable<Integer>)"Hello World"::length);
+            int length = ignite.compute().call("Hello World"::length);
 
             System.out.println();
             System.out.println(">>> Computed length: " + length);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a82c8ea6/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinityExample1.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinityExample1.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinityExample1.scala
index cf6fca1..52888ed 100644
--- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinityExample1.scala
+++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinityExample1.scala
@@ -22,6 +22,7 @@ import java.util.concurrent.Callable
 import org.apache.ignite._
 import org.apache.ignite.cache.CacheName
 import org.apache.ignite.cache.affinity.CacheAffinityKeyMapped
+import org.apache.ignite.lang.IgniteCallable
 import org.apache.ignite.scalar.scalar
 import org.apache.ignite.scalar.scalar._
 import org.jetbrains.annotations.Nullable
@@ -65,7 +66,7 @@ object ScalarCacheAffinityExample1 {
 
             keys.foreach(key => {
                 val res = ignite$.call$(
-                    new Callable[String] {
+                    new IgniteCallable[String] {
                         @CacheAffinityKeyMapped
                         def affinityKey(): String = key
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a82c8ea6/modules/core/src/main/java/org/apache/ignite/IgniteCompute.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCompute.java b/modules/core/src/main/java/org/apache/ignite/IgniteCompute.java
index ecb542a..15c7c1f 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCompute.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCompute.java
@@ -123,7 +123,7 @@ public interface IgniteCompute extends IgniteAsyncSupport {
      * @throws IgniteException If job failed.
      */
     @IgniteAsyncSupported
-    public void affinityRun(@Nullable String cacheName, Object affKey, Runnable job) throws IgniteException;
+    public void affinityRun(@Nullable String cacheName, Object affKey, IgniteRunnable job) throws IgniteException;
 
     /**
      * Executes given job on the node where data for provided affinity key is located
@@ -140,7 +140,7 @@ public interface IgniteCompute extends IgniteAsyncSupport {
      * @see ComputeJobContext#affinityKey()
      */
     @IgniteAsyncSupported
-    public <R> R affinityCall(@Nullable String cacheName, Object affKey, Callable<R> job) throws IgniteException;
+    public <R> R affinityCall(@Nullable String cacheName, Object affKey, IgniteCallable<R> job) throws IgniteException;
 
     /**
      * Executes given task on the grid projection. For step-by-step explanation of task execution process
@@ -201,7 +201,7 @@ public interface IgniteCompute extends IgniteAsyncSupport {
      * @throws IgniteException If job failed.
      */
     @IgniteAsyncSupported
-    public void broadcast(Runnable job) throws IgniteException;
+    public void broadcast(IgniteRunnable job) throws IgniteException;
 
     /**
      * Broadcasts given job to all nodes in grid projection. Every participating node will return a
@@ -214,7 +214,7 @@ public interface IgniteCompute extends IgniteAsyncSupport {
      * @throws IgniteException If execution failed.
      */
     @IgniteAsyncSupported
-    public <R> Collection<R> broadcast(Callable<R> job) throws IgniteException;
+    public <R> Collection<R> broadcast(IgniteCallable<R> job) throws IgniteException;
 
     /**
      * Broadcasts given closure job with passed in argument to all nodes in grid projection.
@@ -240,7 +240,7 @@ public interface IgniteCompute extends IgniteAsyncSupport {
      * @throws IgniteException If execution failed.
      */
     @IgniteAsyncSupported
-    public void run(Runnable job) throws IgniteException;
+    public void run(IgniteRunnable job) throws IgniteException;
 
     /**
      * Executes collection of jobs on grid nodes within this grid projection.
@@ -251,7 +251,7 @@ public interface IgniteCompute extends IgniteAsyncSupport {
      * @throws IgniteException If execution failed.
      */
     @IgniteAsyncSupported
-    public void run(Collection<? extends Runnable> jobs) throws IgniteException;
+    public void run(Collection<? extends IgniteRunnable> jobs) throws IgniteException;
 
     /**
      * Executes provided job on a node in this grid projection. The result of the
@@ -264,7 +264,7 @@ public interface IgniteCompute extends IgniteAsyncSupport {
      * @throws IgniteException If execution failed.
      */
     @IgniteAsyncSupported
-    public <R> R call(Callable<R> job) throws IgniteException;
+    public <R> R call(IgniteCallable<R> job) throws IgniteException;
 
     /**
      * Executes collection of jobs on nodes within this grid projection.
@@ -277,7 +277,7 @@ public interface IgniteCompute extends IgniteAsyncSupport {
      * @throws IgniteException If execution failed.
      */
     @IgniteAsyncSupported
-    public <R> Collection<R> call(Collection<? extends Callable<R>> jobs) throws IgniteException;
+    public <R> Collection<R> call(Collection<? extends IgniteCallable<R>> jobs) throws IgniteException;
 
     /**
      * Executes collection of jobs on nodes within this grid projection. The returned
@@ -291,7 +291,7 @@ public interface IgniteCompute extends IgniteAsyncSupport {
      * @throws IgniteException If execution failed.
      */
     @IgniteAsyncSupported
-    public <R1, R2> R2 call(Collection<? extends Callable<R1>> jobs, IgniteReducer<R1, R2> rdc) throws IgniteException;
+    public <R1, R2> R2 call(Collection<? extends IgniteCallable<R1>> jobs, IgniteReducer<R1, R2> rdc) throws IgniteException;
 
     /**
      * Executes provided closure job on a node in this grid projection. This method is different

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a82c8ea6/modules/core/src/main/java/org/apache/ignite/internal/IgniteComputeImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteComputeImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteComputeImpl.java
index 8e79005..c6b964a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteComputeImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteComputeImpl.java
@@ -81,7 +81,7 @@ public class IgniteComputeImpl extends IgniteAsyncSupportAdapter<IgniteCompute>
     }
 
     /** {@inheritDoc} */
-    @Override public void affinityRun(@Nullable String cacheName, Object affKey, Runnable job) {
+    @Override public void affinityRun(@Nullable String cacheName, Object affKey, IgniteRunnable job) {
         A.notNull(affKey, "affKey");
         A.notNull(job, "job");
 
@@ -99,7 +99,7 @@ public class IgniteComputeImpl extends IgniteAsyncSupportAdapter<IgniteCompute>
     }
 
     /** {@inheritDoc} */
-    @Override public <R> R affinityCall(@Nullable String cacheName, Object affKey, Callable<R> job) {
+    @Override public <R> R affinityCall(@Nullable String cacheName, Object affKey, IgniteCallable<R> job) {
         A.notNull(affKey, "affKey");
         A.notNull(job, "job");
 
@@ -117,6 +117,7 @@ public class IgniteComputeImpl extends IgniteAsyncSupportAdapter<IgniteCompute>
     }
 
     /** {@inheritDoc} */
+    @SuppressWarnings("unchecked")
     @Override public <T, R> R execute(String taskName, @Nullable T arg) {
         A.notNull(taskName, "taskName");
 
@@ -219,7 +220,7 @@ public class IgniteComputeImpl extends IgniteAsyncSupportAdapter<IgniteCompute>
     }
 
     /** {@inheritDoc} */
-    @Override public void broadcast(Runnable job) {
+    @Override public void broadcast(IgniteRunnable job) {
         A.notNull(job, "job");
 
         guard();
@@ -236,7 +237,7 @@ public class IgniteComputeImpl extends IgniteAsyncSupportAdapter<IgniteCompute>
     }
 
     /** {@inheritDoc} */
-    @Override public <R> Collection<R> broadcast(Callable<R> job) {
+    @Override public <R> Collection<R> broadcast(IgniteCallable<R> job) {
         A.notNull(job, "job");
 
         guard();
@@ -270,7 +271,7 @@ public class IgniteComputeImpl extends IgniteAsyncSupportAdapter<IgniteCompute>
     }
 
     /** {@inheritDoc} */
-    @Override public void run(Runnable job) {
+    @Override public void run(IgniteRunnable job) {
         A.notNull(job, "job");
 
         guard();
@@ -287,7 +288,7 @@ public class IgniteComputeImpl extends IgniteAsyncSupportAdapter<IgniteCompute>
     }
 
     /** {@inheritDoc} */
-    @Override public void run(Collection<? extends Runnable> jobs) {
+    @Override public void run(Collection<? extends IgniteRunnable> jobs) {
         A.notEmpty(jobs, "jobs");
 
         guard();
@@ -321,7 +322,7 @@ public class IgniteComputeImpl extends IgniteAsyncSupportAdapter<IgniteCompute>
     }
 
     /** {@inheritDoc} */
-    @Override public <R> R call(Callable<R> job) {
+    @Override public <R> R call(IgniteCallable<R> job) {
         A.notNull(job, "job");
 
         guard();
@@ -338,13 +339,13 @@ public class IgniteComputeImpl extends IgniteAsyncSupportAdapter<IgniteCompute>
     }
 
     /** {@inheritDoc} */
-    @Override public <R> Collection<R> call(Collection<? extends Callable<R>> jobs) {
+    @Override public <R> Collection<R> call(Collection<? extends IgniteCallable<R>> jobs) {
         A.notEmpty(jobs, "jobs");
 
         guard();
 
         try {
-            return saveOrGet(ctx.closure().callAsync(BALANCE, jobs, prj.nodes()));
+            return saveOrGet(ctx.closure().callAsync(BALANCE, (Collection<? extends Callable<R>>)jobs, prj.nodes()));
         }
         catch (IgniteCheckedException e) {
             throw U.convertException(e);
@@ -373,7 +374,7 @@ public class IgniteComputeImpl extends IgniteAsyncSupportAdapter<IgniteCompute>
     }
 
     /** {@inheritDoc} */
-    @Override public <R1, R2> R2 call(Collection<? extends Callable<R1>> jobs, IgniteReducer<R1, R2> rdc) {
+    @Override public <R1, R2> R2 call(Collection<? extends IgniteCallable<R1>> jobs, IgniteReducer<R1, R2> rdc) {
         A.notEmpty(jobs, "jobs");
         A.notNull(rdc, "rdc");
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a82c8ea6/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridAbsClosure.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridAbsClosure.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridAbsClosure.java
index 5928cee..ef4f1b0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridAbsClosure.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridAbsClosure.java
@@ -17,6 +17,8 @@
 
 package org.apache.ignite.internal.util.lang;
 
+import org.apache.ignite.lang.*;
+
 import java.io.*;
 
 /**
@@ -32,7 +34,7 @@ import java.io.*;
  * {@link org.apache.ignite.compute.ComputeJobAdapter}.
  * @see GridFunc
  */
-public abstract class GridAbsClosure implements Runnable, Serializable {
+public abstract class GridAbsClosure implements IgniteRunnable {
     /** */
     private static final long serialVersionUID = 0L;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a82c8ea6/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CA.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CA.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CA.java
index 14cc939..720427a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CA.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CA.java
@@ -29,4 +29,5 @@ import org.apache.ignite.internal.util.lang.*;
 public abstract class CA extends GridAbsClosure {
     /** */
     private static final long serialVersionUID = 0L;
- /* No-op. */ }
+ /* No-op. */
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a82c8ea6/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CAX.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CAX.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CAX.java
index fa4533f..6668ea6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CAX.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/CAX.java
@@ -29,4 +29,4 @@ import org.apache.ignite.internal.util.lang.*;
 public abstract class CAX extends GridAbsClosureX {
     /** */
     private static final long serialVersionUID = 0L;
- /* No-op. */ }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a82c8ea6/modules/core/src/main/java/org/apache/ignite/lang/IgniteRunnable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgniteRunnable.java b/modules/core/src/main/java/org/apache/ignite/lang/IgniteRunnable.java
index 59bd023..5cae9e6 100644
--- a/modules/core/src/main/java/org/apache/ignite/lang/IgniteRunnable.java
+++ b/modules/core/src/main/java/org/apache/ignite/lang/IgniteRunnable.java
@@ -22,7 +22,7 @@ import java.io.*;
 /**
  * Grid-aware adapter for {@link Runnable} implementations. It adds {@link Serializable} interface
  * to {@link Runnable} object. Use this class for executing distributed computations on the grid,
- * like in {@link org.apache.ignite.IgniteCompute#run(Runnable)} method.
+ * like in {@link org.apache.ignite.IgniteCompute#run(IgniteRunnable)} method.
  */
 public interface IgniteRunnable extends Runnable, Serializable {
     // No-op.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a82c8ea6/modules/core/src/test/java/org/apache/ignite/internal/GridJobMasterLeaveAwareSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridJobMasterLeaveAwareSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridJobMasterLeaveAwareSelfTest.java
index 08380ac..69f6c3e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridJobMasterLeaveAwareSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridJobMasterLeaveAwareSelfTest.java
@@ -582,7 +582,7 @@ public class GridJobMasterLeaveAwareSelfTest extends GridCommonAbstractTest {
     /**
      * Master leave aware callable.
      */
-    private static class TestCallable implements Callable<Void>, ComputeJobMasterLeaveAware {
+    private static class TestCallable implements IgniteCallable<Void>, ComputeJobMasterLeaveAware {
         /** Task session. */
         @IgniteLoggerResource
         private IgniteLogger log;
@@ -606,7 +606,7 @@ public class GridJobMasterLeaveAwareSelfTest extends GridCommonAbstractTest {
     /**
      * Master leave aware runnable.
      */
-    private static class TestRunnable implements Runnable, ComputeJobMasterLeaveAware {
+    private static class TestRunnable implements IgniteRunnable, ComputeJobMasterLeaveAware {
         /** Task session. */
         @IgniteLoggerResource
         private IgniteLogger log;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a82c8ea6/modules/core/src/test/java/org/apache/ignite/internal/GridManagementJobSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridManagementJobSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridManagementJobSelfTest.java
index b8c16db..7ca423b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridManagementJobSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridManagementJobSelfTest.java
@@ -21,6 +21,7 @@ import org.apache.ignite.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.internal.processors.task.*;
+import org.apache.ignite.lang.*;
 import org.apache.ignite.resources.*;
 import org.apache.ignite.spi.discovery.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
@@ -125,7 +126,7 @@ public class GridManagementJobSelfTest extends GridCommonAbstractTest {
      * @param job Job.
      * @throws Exception If failed.
      */
-    private void runJob(String taskName, Callable<Object> job) throws Exception {
+    private void runJob(String taskName, IgniteCallable<Object> job) throws Exception {
         // We run a task on remote nodes because on local node jobs will be executed in system pool anyway.
         compute(grid(0).forRemotes()).withName(taskName).call(job);
     }
@@ -134,7 +135,7 @@ public class GridManagementJobSelfTest extends GridCommonAbstractTest {
      *  Test job which ensures that its executor thread is from management pool in case
      *  task name corresponds to either internal or Visor task.
      */
-    private static class TestJob implements Callable<Object>, Serializable {
+    private static class TestJob implements IgniteCallable<Object> {
         /** Task session. */
         @IgniteTaskSessionResource
         protected ComputeTaskSession ses;
@@ -154,7 +155,7 @@ public class GridManagementJobSelfTest extends GridCommonAbstractTest {
      * of task name due to presence of {@link GridInternal} annotation.
      */
     @GridInternal
-    private static class TestJobInternal implements Callable<Object>, Serializable {
+    private static class TestJobInternal implements IgniteCallable<Object> {
         /** {@inheritDoc} */
         @Nullable @Override public Object call() throws IgniteCheckedException {
             String threadName = Thread.currentThread().getName();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a82c8ea6/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionAbstractTest.java
index 54b1f47..60c6d0a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionAbstractTest.java
@@ -51,10 +51,10 @@ public abstract class GridProjectionAbstractTest extends GridCommonAbstractTest
     private ClusterGroup prj;
 
     /** Runnable job. */
-    private Runnable runJob = new TestRunnable();
+    private IgniteRunnable runJob = new TestRunnable();
 
     /** Callable job. */
-    private Callable<String> calJob = new TestCallable<>();
+    private IgniteCallable<String> calJob = new TestCallable<>();
 
     /** Closure job. */
     private IgniteClosure<String, String> clrJob = new IgniteClosure<String, String>() {
@@ -343,7 +343,7 @@ public abstract class GridProjectionAbstractTest extends GridCommonAbstractTest
      * @throws Exception If failed.
      */
     private void run2(AtomicInteger cnt) throws Exception {
-        Collection<Runnable> jobs = F.asList(runJob);
+        Collection<IgniteRunnable> jobs = F.asList(runJob);
 
         IgniteCompute comp = compute(prj).withAsync();
 
@@ -387,7 +387,7 @@ public abstract class GridProjectionAbstractTest extends GridCommonAbstractTest
     private void call2(AtomicInteger cnt) throws Exception {
         IgniteCompute comp = compute(prj).withAsync();
 
-        Collection<Callable<String>> jobs = F.asList(calJob);
+        Collection<IgniteCallable<String>> jobs = F.asList(calJob);
 
         comp.call(jobs);
 
@@ -496,7 +496,7 @@ public abstract class GridProjectionAbstractTest extends GridCommonAbstractTest
      * @throws Exception If failed.
      */
     private void forkjoin2(AtomicInteger cnt) throws Exception {
-        Collection<Callable<String>> jobs = F.asList(calJob);
+        Collection<IgniteCallable<String>> jobs = F.asList(calJob);
 
         IgniteCompute comp = compute(prj).withAsync();
 
@@ -652,7 +652,7 @@ public abstract class GridProjectionAbstractTest extends GridCommonAbstractTest
         Collection<ComputeTaskFuture<Object>> futsList = new ArrayList<>();
 
         for (int i = 0; i < 10; i++) {
-            comp.call(new TestWaitCallable<Object>());
+            comp.call(new TestWaitCallable<>());
 
             ComputeTaskFuture<Object> fut = comp.future();
 
@@ -692,7 +692,7 @@ public abstract class GridProjectionAbstractTest extends GridCommonAbstractTest
     /**
      * Test runnable.
      */
-    private static class TestRunnable implements Runnable, Serializable {
+    private static class TestRunnable implements IgniteRunnable {
         /** {@inheritDoc} */
         @Override public void run() {
             // No-op.
@@ -702,7 +702,7 @@ public abstract class GridProjectionAbstractTest extends GridCommonAbstractTest
     /**
      * Test callable.
      */
-    private static class TestCallable<T> implements Callable<T>, Serializable {
+    private static class TestCallable<T> implements IgniteCallable<T> {
         /** {@inheritDoc} */
         @Nullable @Override public T call() throws Exception {
             return null;
@@ -712,7 +712,7 @@ public abstract class GridProjectionAbstractTest extends GridCommonAbstractTest
     /**
      * Test callable.
      */
-    private static class TestWaitCallable<T> implements Callable<T>, Serializable {
+    private static class TestWaitCallable<T> implements IgniteCallable<T> {
         /** {@inheritDoc} */
         @Nullable @Override public T call() throws Exception {
             synchronized (mux) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a82c8ea6/modules/core/src/test/java/org/apache/ignite/internal/GridTaskExecutionContextSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskExecutionContextSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskExecutionContextSelfTest.java
index 1706a16..408cd25 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskExecutionContextSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskExecutionContextSelfTest.java
@@ -67,7 +67,7 @@ public class GridTaskExecutionContextSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testWithName() throws Exception {
-        Callable<String> f = new IgniteCallable<String>() {
+        IgniteCallable<String> f = new IgniteCallable<String>() {
             @IgniteTaskSessionResource
             private ComputeTaskSession ses;
 
@@ -91,7 +91,7 @@ public class GridTaskExecutionContextSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testWithNoFailoverClosure() throws Exception {
-        final Runnable r = new GridAbsClosureX() {
+        final IgniteRunnable r = new GridAbsClosureX() {
             @Override public void applyx() throws IgniteCheckedException {
                 CNT.incrementAndGet();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a82c8ea6/modules/core/src/test/java/org/apache/ignite/internal/IgniteComputeEmptyClusterGroupTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteComputeEmptyClusterGroupTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteComputeEmptyClusterGroupTest.java
index bdbdd86..e3de95a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteComputeEmptyClusterGroupTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteComputeEmptyClusterGroupTest.java
@@ -177,7 +177,7 @@ public class IgniteComputeEmptyClusterGroupTest extends GridCommonAbstractTest {
     /**
      *
      */
-    private static class FailRunnable implements Runnable {
+    private static class FailRunnable implements IgniteRunnable {
         /** {@inheritDoc} */
         @Override public void run() {
             fail();
@@ -187,7 +187,7 @@ public class IgniteComputeEmptyClusterGroupTest extends GridCommonAbstractTest {
     /**
      *
      */
-    private static class FailCallable implements Callable<Object> {
+    private static class FailCallable implements IgniteCallable<Object> {
         /** {@inheritDoc} */
         @Override public Object call() throws Exception {
             fail();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a82c8ea6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
index a4d7c3a..0419ce9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
@@ -3658,7 +3658,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
             assert jcache().isLocalLocked("key", false);
             assert jcache().isLocalLocked("key", true);
 
-            assert !forLocal(dfltIgnite).call(new Callable<Boolean>() {
+            assert !forLocal(dfltIgnite).call(new IgniteCallable<Boolean>() {
                 @Override public Boolean call() throws InterruptedException {
                     return lock.tryLock(100, MILLISECONDS);
                 }
@@ -3686,7 +3686,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
 
             assert e.isLocked();
 
-            assert !forLocal(dfltIgnite).call(new Callable<Boolean>() {
+            assert !forLocal(dfltIgnite).call(new IgniteCallable<Boolean>() {
                 @Override public Boolean call() throws IgniteCheckedException {
                     return e.lock(100);
                 }
@@ -3719,7 +3719,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
 
             IgniteCompute comp = forLocal(dfltIgnite).withAsync();
 
-            comp.call(new Callable<Boolean>() {
+            comp.call(new IgniteCallable<Boolean>() {
                 @Override public Boolean call() throws Exception {
                     assert !lock.tryLock();
 
@@ -3789,7 +3789,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
 
             IgniteCompute comp = forLocal(dfltIgnite).withAsync();
 
-            comp.call(new Callable<Boolean>() {
+            comp.call(new IgniteCallable<Boolean>() {
                 @Override public Boolean call() throws Exception {
                     syncLatch.countDown();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a82c8ea6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java
index bf25087..18a5be6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java
@@ -883,7 +883,7 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest extends Gr
         }, threadCnt, "test-thread");
 
         while (!fut.isDone()) {
-            grid(0).compute().call(new Callable<Object>() {
+            grid(0).compute().call(new IgniteCallable<Object>() {
                     /** */
                     @IgniteInstanceResource
                     private Ignite g;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a82c8ea6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java
index 84eee83..2488a6e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java
@@ -606,7 +606,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon
     /**
      * Tests queue serialization.
      */
-    private static class QueueJob implements Callable<Integer>, Serializable {
+    private static class QueueJob implements IgniteCallable<Integer> {
         /** */
         private CacheQueue<Integer> queue;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a82c8ea6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java
index 723a7ab..8e5c694 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java
@@ -26,6 +26,7 @@ import org.apache.ignite.internal.*;
 import org.apache.ignite.internal.processors.cache.*;
 import org.apache.ignite.internal.processors.cache.query.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.lang.*;
 import org.apache.ignite.testframework.*;
 
 import java.util.*;
@@ -842,7 +843,7 @@ public abstract class GridCacheSetAbstractSelfTest extends GridCacheAbstractSelf
         for (int i = 0; i < 10; i++)
             set.add(i);
 
-        Collection<Integer> c = grid(0).compute().broadcast(new Callable<Integer>() {
+        Collection<Integer> c = grid(0).compute().broadcast(new IgniteCallable<Integer>() {
             @Override public Integer call() throws Exception {
                 assertEquals(SET_NAME, set.name());
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a82c8ea6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java
index 6947926..40e959c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java
@@ -28,6 +28,7 @@ import org.apache.ignite.internal.processors.cache.transactions.*;
 import org.apache.ignite.internal.util.direct.*;
 import org.apache.ignite.internal.util.lang.*;
 import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.lang.*;
 import org.apache.ignite.resources.*;
 import org.apache.ignite.spi.*;
 import org.apache.ignite.spi.communication.tcp.*;
@@ -205,7 +206,7 @@ public abstract class IgniteTxOriginatingNodeFailureAbstractSelfTest extends Gri
             assertFalse(e.getValue().isEmpty());
 
             for (ClusterNode node : e.getValue()) {
-                compute(G.ignite(node.id()).cluster().forNode(node)).call(new Callable<Void>() {
+                compute(G.ignite(node.id()).cluster().forNode(node)).call(new IgniteCallable<Void>() {
                     /** */
                     @IgniteInstanceResource
                     private Ignite ignite;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a82c8ea6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java
index a937d09..128c1e7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java
@@ -245,7 +245,7 @@ public abstract class IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest
             for (ClusterNode node : e.getValue()) {
                 final UUID checkNodeId = node.id();
 
-                compute(G.ignite(checkNodeId).cluster().forNode(node)).call(new Callable<Void>() {
+                compute(G.ignite(checkNodeId).cluster().forNode(node)).call(new IgniteCallable<Void>() {
                     /** */
                     @IgniteInstanceResource
                     private Ignite ignite;
@@ -376,7 +376,7 @@ public abstract class IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest
             for (ClusterNode node : e.getValue()) {
                 final UUID checkNodeId = node.id();
 
-                compute(G.ignite(checkNodeId).cluster().forNode(node)).call(new Callable<Void>() {
+                compute(G.ignite(checkNodeId).cluster().forNode(node)).call(new IgniteCallable<Void>() {
                     /** */
                     @IgniteInstanceResource
                     private Ignite ignite;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a82c8ea6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java
index 7c5d965..e5fa575 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java
@@ -21,6 +21,7 @@ import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.lang.*;
 import org.apache.ignite.marshaller.optimized.*;
 import org.apache.ignite.resources.*;
 import org.apache.ignite.spi.discovery.tcp.*;
@@ -115,7 +116,7 @@ public class GridCacheNearEvictionSelfTest extends GridCommonAbstractTest {
         try {
             final int cnt = 100;
 
-            grid(0).compute().broadcast(new Callable<Object>() {
+            grid(0).compute().broadcast(new IgniteCallable<Object>() {
                 @IgniteInstanceResource
                 private Ignite ignite;
 
@@ -149,7 +150,7 @@ public class GridCacheNearEvictionSelfTest extends GridCommonAbstractTest {
         try {
             final int cnt = 100;
 
-            grid(0).compute().broadcast(new Callable<Object>() {
+            grid(0).compute().broadcast(new IgniteCallable<Object>() {
                 @IgniteInstanceResource
                 private Ignite ignite;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a82c8ea6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java
index 185f51e..697da93 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java
@@ -426,7 +426,7 @@ public class GridCachePartitionedAffinitySelfTest extends GridCommonAbstractTest
     /**
      *
      */
-    private static class ListenerJob implements Runnable, Serializable {
+    private static class ListenerJob implements IgniteRunnable {
         /** Grid. */
         @IgniteInstanceResource
         private Ignite ignite;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a82c8ea6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEntryLockSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEntryLockSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEntryLockSelfTest.java
index 03a8e2f..515335c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEntryLockSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEntryLockSelfTest.java
@@ -22,6 +22,7 @@ import org.apache.ignite.cache.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.internal.*;
 import org.apache.ignite.internal.processors.cache.*;
+import org.apache.ignite.lang.*;
 
 import java.util.concurrent.*;
 
@@ -60,7 +61,7 @@ public class GridCachePartitionedEntryLockSelfTest extends GridCacheAbstractSelf
 
                 IgniteCompute comp = compute(grid(i).forLocal()).withAsync();
 
-                comp.call(new Callable<Boolean>() {
+                comp.call(new IgniteCallable<Boolean>() {
                     @Override public Boolean call() throws Exception {
                         IgniteInternalFuture<Boolean> f = e.lockAsync(1000);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a82c8ea6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java
index 6b6e1bb..504dae9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java
@@ -450,7 +450,7 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti
 
             IgniteCompute comp = compute(dfltIgnite.cluster().forLocal()).withAsync();
 
-            comp.call(new Callable<Boolean>() {
+            comp.call(new IgniteCallable<Boolean>() {
                     @Override public Boolean call() throws Exception {
                         syncLatch.countDown();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a82c8ea6/modules/core/src/test/java/org/apache/ignite/internal/processors/closure/GridClosureProcessorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/closure/GridClosureProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/closure/GridClosureProcessorSelfTest.java
index d9de1f4..d6fcfed 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/closure/GridClosureProcessorSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/closure/GridClosureProcessorSelfTest.java
@@ -189,7 +189,7 @@ public class GridClosureProcessorSelfTest extends GridCommonAbstractTest {
      * @return Future object.
      * @throws IgniteCheckedException If failed.
      */
-    private ComputeTaskFuture<?> runAsync(int idx, Runnable job, @Nullable IgnitePredicate<ClusterNode> p)
+    private ComputeTaskFuture<?> runAsync(int idx, IgniteRunnable job, @Nullable IgnitePredicate<ClusterNode> p)
         throws IgniteCheckedException {
         assert idx >= 0 && idx < NODES_CNT;
         assert job != null;
@@ -212,7 +212,7 @@ public class GridClosureProcessorSelfTest extends GridCommonAbstractTest {
      * @return Future object.
      * @throws IgniteCheckedException If failed.
      */
-    private ComputeTaskFuture<?> broadcast(int idx, Runnable job, @Nullable IgnitePredicate<ClusterNode> p)
+    private ComputeTaskFuture<?> broadcast(int idx, IgniteRunnable job, @Nullable IgnitePredicate<ClusterNode> p)
         throws IgniteCheckedException {
         assert idx >= 0 && idx < NODES_CNT;
         assert job != null;
@@ -262,7 +262,7 @@ public class GridClosureProcessorSelfTest extends GridCommonAbstractTest {
      * @return Future object.
      */
     private ComputeTaskFuture<Integer> callAsync(int idx,
-        Callable<Integer> job, @Nullable
+        IgniteCallable<Integer> job, @Nullable
         IgnitePredicate<ClusterNode> p) {
         assert idx >= 0 && idx < NODES_CNT;
         assert job != null;
@@ -285,7 +285,7 @@ public class GridClosureProcessorSelfTest extends GridCommonAbstractTest {
      * @return Future object.
      * @throws IgniteCheckedException If failed.
      */
-    private ComputeTaskFuture<Collection<Integer>> broadcast(int idx, Callable<Integer> job,
+    private ComputeTaskFuture<Collection<Integer>> broadcast(int idx, IgniteCallable<Integer> job,
         @Nullable IgnitePredicate<ClusterNode> p) throws IgniteCheckedException {
         assert idx >= 0 && idx < NODES_CNT;
         assert job != null;
@@ -340,7 +340,7 @@ public class GridClosureProcessorSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testRunAsyncSingle() throws Exception {
-        Runnable job = new TestRunnable();
+        IgniteRunnable job = new TestRunnable();
 
         ComputeTaskFuture<?> fut = broadcast(0, job, null);
 
@@ -380,7 +380,7 @@ public class GridClosureProcessorSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testCallAsyncSingle() throws Exception {
-        Callable<Integer> job = new TestCallable();
+        IgniteCallable<Integer> job = new TestCallable();
 
         ComputeTaskFuture<Collection<Integer>> fut1 = broadcast(0, job, null);
 
@@ -511,7 +511,7 @@ public class GridClosureProcessorSelfTest extends GridCommonAbstractTest {
     public void testReducerError() throws Exception {
         final Ignite g = grid(0);
 
-        final Collection<Callable<Integer>> jobs = new ArrayList<>();
+        final Collection<IgniteCallable<Integer>> jobs = new ArrayList<>();
 
         for (int i = 0; i < g.cluster().nodes().size(); i++) {
             jobs.add(new IgniteCallable<Integer>() {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a82c8ea6/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestMain.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestMain.java b/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestMain.java
index 17c5619..e845d23 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestMain.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestMain.java
@@ -83,7 +83,7 @@ public class GridTestMain {
         for (long i = 0; i < GridTestConstants.ENTRY_COUNT; i++) {
             final long key = i;
 
-            comp.affinityRun("partitioned", GridTestKey.affinityKey(key), new Runnable() {
+            comp.affinityRun("partitioned", GridTestKey.affinityKey(key), new IgniteRunnable() {
                 // This code will execute on remote nodes by collocating keys with cached data.
                 @Override public void run() {
                     Long val = cache.peek(new GridTestKey(key));

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a82c8ea6/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java
index 3f42a0c..1c551e3 100644
--- a/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java
@@ -657,7 +657,7 @@ public abstract class GridMarshallerAbstractTest extends GridCommonAbstractTest
         try (Ignite g1 = G.start(cfg)) {
             IgniteCompute compute = compute(grid().forNode(g1.cluster().localNode()));
 
-            compute.run(new Runnable() {
+            compute.run(new IgniteRunnable() {
                 @Override
                 public void run() {
                     // No-op.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a82c8ea6/modules/core/src/test/java/org/apache/ignite/spi/GridTcpSpiForwardingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/GridTcpSpiForwardingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/GridTcpSpiForwardingSelfTest.java
index 07449bb..5da6f5a 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/GridTcpSpiForwardingSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/GridTcpSpiForwardingSelfTest.java
@@ -22,6 +22,7 @@ import org.apache.ignite.cluster.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.internal.util.nio.*;
 import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.lang.*;
 import org.apache.ignite.marshaller.optimized.*;
 import org.apache.ignite.spi.communication.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.*;
@@ -151,7 +152,7 @@ public class GridTcpSpiForwardingSelfTest extends GridCommonAbstractTest {
             assertEquals(2, grid(0).nodes().size());
             assertEquals(2, grid(1).nodes().size());
 
-            Collection<Integer> t = g1.compute().broadcast(new Callable<Integer>() {
+            Collection<Integer> t = g1.compute().broadcast(new IgniteCallable<Integer>() {
                 @Override public Integer call() throws Exception {
                     return 13;
                 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a82c8ea6/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateAccessStrategyAdapter.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateAccessStrategyAdapter.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateAccessStrategyAdapter.java
index 2c8ff3c..8c07570 100644
--- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateAccessStrategyAdapter.java
+++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateAccessStrategyAdapter.java
@@ -20,6 +20,7 @@ package org.apache.ignite.cache.hibernate;
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.lang.*;
 import org.apache.ignite.resources.*;
 import org.hibernate.cache.*;
 import org.hibernate.cache.spi.access.*;
@@ -309,7 +310,7 @@ public abstract class GridHibernateAccessStrategyAdapter {
     /**
      * Callable invalidates given key.
      */
-    private static class ClearKeyCallable implements Callable<Void>, Externalizable {
+    private static class ClearKeyCallable implements IgniteCallable<Void>, Externalizable {
         /** */
         private static final long serialVersionUID = 0L;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a82c8ea6/modules/scalar/src/main/scala/org/apache/ignite/scalar/ScalarConversions.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/ScalarConversions.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/ScalarConversions.scala
index 0a6f06b..4ddd12d 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/ScalarConversions.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/ScalarConversions.scala
@@ -700,7 +700,7 @@ trait ScalarConversions {
      *
      * @param f Scala function to convert.
      */
-    implicit def toCallable[R](f: () => R): Callable[R] =
+    implicit def toCallable[R](f: () => R): IgniteCallable[R] =
         f match {
             case p: ScalarOutClosureFunction[R] => p.inner
             case _ => new ScalarOutClosure[R](f)
@@ -722,7 +722,7 @@ trait ScalarConversions {
      *
      * @param f Grid closure to convert.
      */
-    implicit def fromOutClosure[R](f: Callable[R]): () => R =
+    implicit def fromOutClosure[R](f: IgniteCallable[R]): () => R =
         new ScalarOutClosureFunction[R](f)
 
     /**
@@ -738,7 +738,7 @@ trait ScalarConversions {
       *
       * @param f Java-side closure to pimp.
       */
-    implicit def outClosureDotScala[R](f: Callable[R]) = new {
+    implicit def outClosureDotScala[R](f: IgniteCallable[R]) = new {
         def scala: () => R =
             fromOutClosure(f)
     }
@@ -758,7 +758,7 @@ trait ScalarConversions {
      *
      * @param f Scala function to convert.
      */
-    implicit def toRunnable(f: () => Unit): Runnable =
+    implicit def toRunnable(f: () => Unit): IgniteRunnable =
         f match {
             case (f: ScalarAbsClosureFunction) => f.inner
             case _ => new ScalarAbsClosure(f)

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a82c8ea6/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarOutClosure.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarOutClosure.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarOutClosure.scala
index b2bd1b0..6c816d9 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarOutClosure.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarOutClosure.scala
@@ -18,7 +18,7 @@
 package org.apache.ignite.scalar.lang
 
 import org.apache.ignite.internal.util.lang.GridPeerDeployAwareAdapter
-import org.apache.ignite.lang.IgniteOutClosure
+import org.apache.ignite.lang.{IgniteCallable, IgniteOutClosure}
 
 import java.util.concurrent.Callable
 
@@ -26,7 +26,7 @@ import java.util.concurrent.Callable
  * Peer deploy aware adapter for Java's `GridOutClosure`.
  */
 class ScalarOutClosure[R](private val f: () => R) extends GridPeerDeployAwareAdapter
-    with IgniteOutClosure[R] with Callable[R] {
+    with IgniteOutClosure[R] with IgniteCallable[R] {
     assert(f != null)
 
     peerDeployLike(f)

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a82c8ea6/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarOutClosureFunction.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarOutClosureFunction.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarOutClosureFunction.scala
index 9216bbd..5795bf3 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarOutClosureFunction.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarOutClosureFunction.scala
@@ -19,10 +19,12 @@ package org.apache.ignite.scalar.lang
 
 import java.util.concurrent.Callable
 
+import org.apache.ignite.lang.IgniteCallable
+
 /**
  * Wrapping Scala function for `Callable` and specifically for `GridOutClosure`.
  */
-class ScalarOutClosureFunction[R](val inner: Callable[R]) extends (() => R) {
+class ScalarOutClosureFunction[R](val inner: IgniteCallable[R]) extends (() => R) {
     assert(inner != null)
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a82c8ea6/modules/yardstick/src/main/java/org/apache/ignite/yardstick/compute/IgniteRunBenchmark.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/compute/IgniteRunBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/compute/IgniteRunBenchmark.java
index 0da0670..347d3b2 100644
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/compute/IgniteRunBenchmark.java
+++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/compute/IgniteRunBenchmark.java
@@ -17,6 +17,7 @@
 
 package org.apache.ignite.yardstick.compute;
 
+import org.apache.ignite.lang.*;
 import org.apache.ignite.yardstick.*;
 import org.yardstickframework.*;
 
@@ -28,7 +29,7 @@ import java.util.*;
  */
 public class IgniteRunBenchmark extends IgniteAbstractBenchmark {
     /** Jobs for run */
-    private List<Runnable> jobs;
+    private List<IgniteRunnable> jobs;
 
     /** {@inheritDoc} */
     @Override public void setUp(BenchmarkConfiguration cfg) throws Exception {
@@ -52,7 +53,7 @@ public class IgniteRunBenchmark extends IgniteAbstractBenchmark {
     /**
      *
      */
-    public static class NoopRunnable implements Runnable, Externalizable {
+    public static class NoopRunnable implements IgniteRunnable, Externalizable {
         /** {@inheritDoc} */
         @Override public void run() {
             //No-op

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a82c8ea6/modules/yardstick/src/main/java/org/apache/ignite/yardstick/compute/model/NoopCallable.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/compute/model/NoopCallable.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/compute/model/NoopCallable.java
index 5a32618..839af38 100644
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/compute/model/NoopCallable.java
+++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/compute/model/NoopCallable.java
@@ -17,13 +17,15 @@
 
 package org.apache.ignite.yardstick.compute.model;
 
+import org.apache.ignite.lang.*;
+
 import java.io.*;
 import java.util.concurrent.*;
 
 /**
  *
  */
-public class NoopCallable implements Callable<Object>, Externalizable {
+public class NoopCallable implements IgniteCallable<Object>, Externalizable {
     /** {@inheritDoc} */
     @Override public Object call() {
         return null;


Mime
View raw message