ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yzhda...@apache.org
Subject [02/41] incubator-ignite git commit: futures: api cleanup
Date Mon, 09 Mar 2015 20:49:28 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/util/future/IgniteFinishedFutureImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/future/IgniteFinishedFutureImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/util/future/IgniteFinishedFutureImpl.java
index 6af2d2d..7c57978 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/future/IgniteFinishedFutureImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/future/IgniteFinishedFutureImpl.java
@@ -17,24 +17,35 @@
 
 package org.apache.ignite.internal.util.future;
 
-import org.apache.ignite.internal.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
 
 /**
  *
  */
 public class IgniteFinishedFutureImpl<V> extends IgniteFutureImpl<V> {
     /**
-     * @param ctx Context.
-     * @param err Error.
+     *
+     */
+    public IgniteFinishedFutureImpl() {
+        super(new GridFinishedFuture<>((V)null));
+    }
+
+    /**
+     * @param res Result.
      */
-    public IgniteFinishedFutureImpl(GridKernalContext ctx, Throwable err) {
-        super(new GridFinishedFuture<V>(ctx, err));
+    public IgniteFinishedFutureImpl(V res) {
+        super(new GridFinishedFuture<>(res));
     }
 
     /**
-     * @param ctx Context.
+     * @param err Error.
      */
-    public IgniteFinishedFutureImpl(GridKernalContext ctx) {
-        super(new GridFinishedFuture<>(ctx, (V)null));
+    public IgniteFinishedFutureImpl(Throwable err) {
+        super(new GridFinishedFuture<V>(err));
+    }
+
+    /** {@inheritDoc} */
+    @Override public String toString() {
+        return S.toString(IgniteFinishedFutureImpl.class, this);
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/util/future/IgniteFinishedFutureImplEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/future/IgniteFinishedFutureImplEx.java b/modules/core/src/main/java/org/apache/ignite/internal/util/future/IgniteFinishedFutureImplEx.java
deleted file mode 100644
index 6d633f5..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/future/IgniteFinishedFutureImplEx.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.util.future;
-
-/**
- *
- */
-public class IgniteFinishedFutureImplEx<V> extends IgniteFutureImpl<V> {
-    /**
-     * @param res Object res.
-     */
-    public IgniteFinishedFutureImplEx(V res) {
-        super(new GridFinishedFutureEx<>(res));
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/util/future/IgniteFutureImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/future/IgniteFutureImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/util/future/IgniteFutureImpl.java
index 028616e..d6301b8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/future/IgniteFutureImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/future/IgniteFutureImpl.java
@@ -61,26 +61,6 @@ public class IgniteFutureImpl<V> implements IgniteFuture<V> {
     }
 
     /** {@inheritDoc} */
-    @Override public void syncNotify(boolean syncNotify) {
-        fut.syncNotify(syncNotify);
-    }
-
-    /** {@inheritDoc} */
-    @Override public boolean syncNotify() {
-        return fut.syncNotify();
-    }
-
-    /** {@inheritDoc} */
-    @Override public void concurrentNotify(boolean concurNotify) {
-        fut.concurrentNotify(concurNotify);
-    }
-
-    /** {@inheritDoc} */
-    @Override public boolean concurrentNotify() {
-        return fut.concurrentNotify();
-    }
-
-    /** {@inheritDoc} */
     @Override public boolean isCancelled() {
         return fut.isCancelled();
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
index 5b99f58..9ab10cf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
@@ -8553,7 +8553,7 @@ public class GridFunc {
      * @return Completed future.
      */
     public static <T> IgniteInternalFuture<T> awaitOne(IgniteInternalFuture<T>... futs) {
-        return isEmpty(futs) ? new GridFinishedFutureEx<T>() : awaitOne(asList(futs));
+        return isEmpty(futs) ? new GridFinishedFuture<T>() : awaitOne(asList(futs));
     }
 
     /**
@@ -8565,7 +8565,7 @@ public class GridFunc {
      */
     public static <T> IgniteInternalFuture<T> awaitOne(Iterable<IgniteInternalFuture<T>> futs) {
         if (F.isEmpty(futs))
-            return new GridFinishedFutureEx<>();
+            return new GridFinishedFuture<>();
 
         final CountDownLatch latch = new CountDownLatch(1);
 
@@ -8594,7 +8594,7 @@ public class GridFunc {
 
         // Only NULLs have been passed in.
         if (c == null)
-            return new GridFinishedFutureEx<>();
+            return new GridFinishedFuture<>();
 
         boolean interrupted = false;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorkerFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorkerFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorkerFuture.java
index 1cabee3..672fe5e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorkerFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorkerFuture.java
@@ -37,7 +37,7 @@ public class GridWorkerFuture<T> extends GridFutureAdapter<T> {
      * @param ctx Context.
      */
     public GridWorkerFuture(GridKernalContext ctx) {
-        super(ctx);
+        super();
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/lang/IgniteFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgniteFuture.java b/modules/core/src/main/java/org/apache/ignite/lang/IgniteFuture.java
index 79b01e5..6941426 100644
--- a/modules/core/src/main/java/org/apache/ignite/lang/IgniteFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/lang/IgniteFuture.java
@@ -91,64 +91,6 @@ public interface IgniteFuture<V> extends Future<V> {
     public long duration();
 
     /**
-     * Flag to turn on or off synchronous listener notification. If this flag is {@code true}, then
-     * upon future completion the notification may happen in the same thread that created
-     * the future. This becomes especially important when adding listener to a future that
-     * is already {@code done} - if this flag is {@code true}, then listener will be
-     * immediately notified within the same thread.
-     * <p>
-     * Default value is {@code false}. To change the default, set
-     * {@link IgniteSystemProperties#IGNITE_FUT_SYNC_NOTIFICATION} system property to {@code true}.
-     *
-     * @param syncNotify Flag to turn on or off synchronous listener notification.
-     */
-    public void syncNotify(boolean syncNotify);
-
-    /**
-     * Gets value of synchronous listener notification flag. If this flag is {@code true}, then
-     * upon future completion the notification may happen in the same thread that created
-     * the future. This becomes especially important when adding listener to a future that
-     * is already {@code done} - if this flag is {@code true}, then listener will be
-     * immediately notified within the same thread.
-     * <p>
-     * Default value is {@code false}. To change the default, set
-     * {@link IgniteSystemProperties#IGNITE_FUT_SYNC_NOTIFICATION} system property to {@code true}.
-     *
-     * @return Synchronous listener notification flag.
-     */
-    public boolean syncNotify();
-
-    /**
-     * Flag to turn on or off concurrent listener notification. This flag comes into play only
-     * when a future has more than one listener subscribed to it. If this flag is {@code true},
-     * then all listeners will be notified concurrently by different threads; otherwise,
-     * listeners will be notified one after another within one thread (depending on
-     * {@link #syncNotify()} flag, these notifications may happen either in the same thread which
-     * started the future, or in a different thread).
-     * <p>
-     * Default value is {@code false}. To change the default, set
-     * {@link IgniteSystemProperties#IGNITE_FUT_CONCURRENT_NOTIFICATION} system property to {@code true}.
-     *
-     * @param concurNotify Flag to turn on or off concurrent listener notification.
-     */
-    public void concurrentNotify(boolean concurNotify);
-
-    /**
-     * Gets value concurrent listener notification flag. This flag comes into play only
-     * when a future has more than one listener subscribed to it. If this flag is {@code true},
-     * then all listeners will be notified concurrently by different threads; otherwise,
-     * listeners will be notified one after another within one thread (depending on
-     * {@link #syncNotify()} flag, these notifications may happen either in the same thread which
-     * started the future, or in a different thread).
-     * <p>
-     * Default value is {@code false}. To change the default, set
-     * {@link IgniteSystemProperties#IGNITE_FUT_CONCURRENT_NOTIFICATION} system property to {@code true}.
-     *
-     * @return Concurrent listener notification flag
-     */
-    public boolean concurrentNotify();
-
-    /**
      * Registers listener closure to be asynchronously notified whenever future completes.
      *
      * @param lsnr Listener closure to register. If not provided - this method is no-op.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
index 19fe5c5..493a9dc 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
@@ -354,9 +354,9 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
                         }
                     }
 
-                    GridFutureAdapterEx<GridCommunicationClient> fut = new GridFutureAdapterEx<>();
+                    GridFutureAdapter<GridCommunicationClient> fut = new GridFutureAdapter<>();
 
-                    GridFutureAdapterEx<GridCommunicationClient> oldFut = clientFuts.putIfAbsent(sndId, fut);
+                    GridFutureAdapter<GridCommunicationClient> oldFut = clientFuts.putIfAbsent(sndId, fut);
 
                     assert msg instanceof HandshakeMessage : msg;
 
@@ -545,7 +545,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
                 private final HandshakeMessage msg;
 
                 /** */
-                private final GridFutureAdapterEx<GridCommunicationClient> fut;
+                private final GridFutureAdapter<GridCommunicationClient> fut;
 
                 /** */
                 private final boolean createClient;
@@ -563,7 +563,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
                     ClusterNode rmtNode,
                     HandshakeMessage msg,
                     boolean createClient,
-                    GridFutureAdapterEx<GridCommunicationClient> fut) {
+                    GridFutureAdapter<GridCommunicationClient> fut) {
                     this.ses = ses;
                     this.recoveryDesc = recoveryDesc;
                     this.rmtNode = rmtNode;
@@ -764,7 +764,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
     };
 
     /** Client connect futures. */
-    private final ConcurrentMap<UUID, GridFutureAdapterEx<GridCommunicationClient>> clientFuts =
+    private final ConcurrentMap<UUID, GridFutureAdapter<GridCommunicationClient>> clientFuts =
         GridConcurrentFactory.newMap();
 
     /** */
@@ -1790,9 +1790,9 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
                     throw new IgniteSpiException("Grid is stopping.");
 
                 // Do not allow concurrent connects.
-                GridFutureAdapterEx<GridCommunicationClient> fut = new ConnectFuture();
+                GridFutureAdapter<GridCommunicationClient> fut = new ConnectFuture();
 
-                GridFutureAdapterEx<GridCommunicationClient> oldFut = clientFuts.putIfAbsent(nodeId, fut);
+                GridFutureAdapter<GridCommunicationClient> oldFut = clientFuts.putIfAbsent(nodeId, fut);
 
                 if (oldFut == null) {
                     try {
@@ -2862,7 +2862,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
     /**
      *
      */
-    private static class ConnectFuture extends GridFutureAdapterEx<GridCommunicationClient> {
+    private static class ConnectFuture extends GridFutureAdapter<GridCommunicationClient> {
         /** */
         private static final long serialVersionUID = 0L;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index e52fcaa..ca34f1f 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -1164,7 +1164,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
         if (F.contains(locNodeAddrs, addr))
             return F.t(ignite.configuration().getNodeId(), false);
 
-        GridFutureAdapterEx<IgniteBiTuple<UUID, Boolean>> fut = new GridFutureAdapterEx<>();
+        GridFutureAdapter<IgniteBiTuple<UUID, Boolean>> fut = new GridFutureAdapter<>();
 
         IgniteInternalFuture<IgniteBiTuple<UUID, Boolean>> oldFut = pingMap.putIfAbsent(addr, fut);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEventAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEventAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEventAbstractTest.java
index 24cd202..7cad61a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEventAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEventAbstractTest.java
@@ -894,7 +894,7 @@ public abstract class GridCacheEventAbstractTest extends GridCacheAbstractSelfTe
          * @param partitioned Partitioned flag.
          */
         EventTypeFuture(GridKernalContext ctx, int evtType, int expCnt, boolean partitioned) {
-            super(ctx);
+            super();
 
             assert expCnt > 0;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
index bf28a59..d89468b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
@@ -79,33 +79,7 @@ public class GridCacheCommandHandlerSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testCacheGetFailsSyncNotify() throws Exception {
-        GridRestCommandHandler hnd = new TestableCacheCommandHandler(((IgniteKernal)grid()).context(), "getAsync",
-            true);
-
-        GridRestCacheRequest req = new GridRestCacheRequest();
-
-        req.command(GridRestCommand.CACHE_GET);
-
-        req.key("k1");
-
-        try {
-            hnd.handleAsync(req).get();
-
-            fail("Expected exception not thrown.");
-        }
-        catch (IgniteCheckedException e) {
-            info("Got expected exception: " + e);
-        }
-    }
-
-    /**
-     * Tests the cache failure during the execution of the CACHE_GET command.
-     *
-     * @throws Exception If failed.
-     */
-    public void testCacheGetFailsAsyncNotify() throws Exception {
-        GridRestCommandHandler hnd = new TestableCacheCommandHandler(((IgniteKernal)grid()).context(), "getAsync",
-            false);
+        GridRestCommandHandler hnd = new TestableCacheCommandHandler(((IgniteKernal)grid()).context(), "getAsync");
 
         GridRestCacheRequest req = new GridRestCacheRequest();
 
@@ -215,21 +189,15 @@ public class GridCacheCommandHandlerSelfTest extends GridCommonAbstractTest {
         /** */
         private final String failMtd;
 
-        /** */
-        private final boolean sync;
-
         /**
          * Constructor.
-         *
-         * @param ctx Context.
+         *  @param ctx Context.
          * @param failMtd Method to fail.
-         * @param sync Sync notification flag.
          */
-        TestableCacheCommandHandler(final GridKernalContext ctx, final String failMtd, final boolean sync) {
+        TestableCacheCommandHandler(final GridKernalContext ctx, final String failMtd) {
             super(ctx);
 
             this.failMtd = failMtd;
-            this.sync = sync;
         }
 
         /**
@@ -245,11 +213,9 @@ public class GridCacheCommandHandlerSelfTest extends GridCommonAbstractTest {
                 new InvocationHandler() {
                     @Override public Object invoke(Object proxy, Method mtd, Object[] args) throws Throwable {
                         if (failMtd.equals(mtd.getName())) {
-                            IgniteInternalFuture<Object> fut = new GridFinishedFuture<>(ctx,
+                            IgniteInternalFuture<Object> fut = new GridFinishedFuture<>(
                                 new IgniteCheckedException("Operation failed"));
 
-                            fut.syncNotify(sync);
-
                             return fut;
                         }
                         // Rewriting flagOn result to keep intercepting invocations after it.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridCompoundFutureSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridCompoundFutureSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridCompoundFutureSelfTest.java
index 550e8ee..837d33d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridCompoundFutureSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridCompoundFutureSelfTest.java
@@ -34,14 +34,10 @@ public class GridCompoundFutureSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testMarkInitialized() throws Exception {
-        GridTestKernalContext ctx = new GridTestKernalContext(log);
-
         GridCompoundFuture<Boolean, Boolean> fut = new GridCompoundFuture<>();
 
         for (int i = 0; i < 5; i++) {
-            IgniteInternalFuture<Boolean> part = new GridFinishedFuture<>(ctx, true);
-
-            part.syncNotify(true);
+            IgniteInternalFuture<Boolean> part = new GridFinishedFuture<>(true);
 
             fut.add(part);
         }
@@ -65,7 +61,7 @@ public class GridCompoundFutureSelfTest extends GridCommonAbstractTest {
         List<GridFutureAdapter<Boolean>> futs = new ArrayList<>(5);
 
         for (int i = 0; i < 5; i++) {
-            GridFutureAdapter<Boolean> part = new GridFutureAdapter<>(ctx, true);
+            GridFutureAdapter<Boolean> part = new GridFutureAdapter<>();
 
             fut.add(part);
 
@@ -99,7 +95,7 @@ public class GridCompoundFutureSelfTest extends GridCommonAbstractTest {
         List<GridFutureAdapter<Boolean>> futs = new ArrayList<>(5);
 
         for (int i = 0; i < 5; i++) {
-            GridFutureAdapter<Boolean> part = new GridFutureAdapter<>(ctx, true);
+            GridFutureAdapter<Boolean> part = new GridFutureAdapter<>();
 
             fut.add(part);
 
@@ -134,7 +130,7 @@ public class GridCompoundFutureSelfTest extends GridCommonAbstractTest {
             new ConcurrentLinkedDeque8<>();
 
         for (int i = 0; i < 1000; i++) {
-            GridFutureAdapter<Boolean> part = new GridFutureAdapter<>(ctx, true);
+            GridFutureAdapter<Boolean> part = new GridFutureAdapter<>();
 
             fut.add(part);
 
@@ -169,7 +165,7 @@ public class GridCompoundFutureSelfTest extends GridCommonAbstractTest {
             new ConcurrentLinkedDeque8<>();
 
         for (int i = 0; i < 1000; i++) {
-            GridFutureAdapter<Boolean> part = new GridFutureAdapter<>(ctx, true);
+            GridFutureAdapter<Boolean> part = new GridFutureAdapter<>();
 
             fut.add(part);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridEmbeddedFutureSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridEmbeddedFutureSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridEmbeddedFutureSelfTest.java
index f9e2dfb..45633ae 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridEmbeddedFutureSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridEmbeddedFutureSelfTest.java
@@ -47,7 +47,7 @@ public class GridEmbeddedFutureSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testFutureChain() throws Exception {
-        GridFutureAdapter<Integer> fut = new GridFutureAdapter<>(ctx);
+        GridFutureAdapter<Integer> fut = new GridFutureAdapter<>();
 
         IgniteInternalFuture<Integer> cur = fut;
 
@@ -55,9 +55,9 @@ public class GridEmbeddedFutureSelfTest extends GridCommonAbstractTest {
             cur = new GridEmbeddedFuture<>(cur,
                 new IgniteBiClosure<Integer, Exception, IgniteInternalFuture<Integer>>() {
                     @Override public IgniteInternalFuture<Integer> apply(Integer o, Exception e) {
-                        return new GridFinishedFuture<>(ctx, o);
+                        return new GridFinishedFuture<>(o);
                     }
-                }, ctx);
+                });
         }
 
         fut.onDone(1);
@@ -82,10 +82,10 @@ public class GridEmbeddedFutureSelfTest extends GridCommonAbstractTest {
 
         for (final Throwable x : list) {
             // Original future.
-            final GridFutureAdapter<Integer> origFut = new GridFutureAdapter<>(ctx);
+            final GridFutureAdapter<Integer> origFut = new GridFutureAdapter<>();
 
             // Embedded future to test.
-            GridEmbeddedFuture<Double, Integer> embFut = new GridEmbeddedFuture<>(ctx, origFut,
+            GridEmbeddedFuture<Double, Integer> embFut = new GridEmbeddedFuture<>(origFut,
                 new C2<Integer, Exception, Double>() {
                     @Override public Double apply(Integer val, Exception e) {
                         if (x instanceof Error)
@@ -98,7 +98,8 @@ public class GridEmbeddedFutureSelfTest extends GridCommonAbstractTest {
 
                         return null;
                     }
-                });
+                },
+                false);
 
             assertFalse("Expect original future is not complete.", origFut.isDone());
             assertFalse("Expect embedded future is not complete.", embFut.isDone());

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFinishedFutureSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFinishedFutureSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFinishedFutureSelfTest.java
deleted file mode 100644
index 976f72d..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFinishedFutureSelfTest.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.util.future;
-
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.marshaller.optimized.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.jetbrains.annotations.*;
-
-import java.util.concurrent.*;
-
-import static java.util.concurrent.TimeUnit.*;
-
-/**
- * Tests finished future use cases.
- */
-public class GridFinishedFutureSelfTest extends GridCommonAbstractTest {
-    /** Create test and start grid. */
-    public GridFinishedFutureSelfTest() {
-        super(true);
-    }
-
-    /**
-     * Test finished future serialization.
-     *
-     * @throws Exception In case of any exception.
-     */
-    public void testExternalizable() throws Exception {
-        Object t = "result";
-        Throwable ex = new IgniteException("exception");
-
-        testExternalizable(t, null, true);
-        testExternalizable(t, null, false);
-        testExternalizable(null, ex, true);
-        testExternalizable(null, ex, false);
-    }
-
-    /**
-     * Test finished future serialization.
-     *
-     * @param t Future result.
-     * @param ex Future exception.
-     * @param syncNotify Synchronous notifications flag.
-     * @throws Exception In case of any exception.
-     */
-    private void testExternalizable(@Nullable Object t, @Nullable Throwable ex, boolean syncNotify) throws Exception {
-        GridKernalContext ctx = ((IgniteKernal)grid()).context();
-
-        Marshaller m = new OptimizedMarshaller();
-        ClassLoader clsLdr = getClass().getClassLoader();
-
-        IgniteInternalFuture<Object> orig = t == null ? new GridFinishedFuture<>(ctx, ex) :
-            new GridFinishedFuture<>(ctx, t);
-
-        orig.syncNotify(syncNotify);
-
-        GridFinishedFuture<Object> fut = m.unmarshal(m.marshal(orig), clsLdr);
-
-        assertEquals(t, GridTestUtils.getFieldValue(fut, "t"));
-
-        if (ex == null)
-            assertNull(GridTestUtils.<Throwable>getFieldValue(fut, "err"));
-        else {
-            assertEquals(ex.getClass(), GridTestUtils.<Throwable>getFieldValue(fut, "err").getClass());
-            assertEquals(ex.getMessage(), GridTestUtils.<Throwable>getFieldValue(fut, "err").getMessage());
-        }
-
-        assertEquals(syncNotify, GridTestUtils.<Boolean>getFieldValue(fut, "syncNotify").booleanValue());
-        assertEquals(ctx.gridName(), GridTestUtils.<GridKernalContext>getFieldValue(fut, "ctx").gridName());
-
-        final CountDownLatch done = new CountDownLatch(1);
-
-        fut.listenAsync(new CI1<IgniteInternalFuture<Object>>() {
-            @Override public void apply(IgniteInternalFuture<Object> t) {
-                done.countDown();
-            }
-        });
-
-        if (syncNotify)
-            assertEquals("Expect notification is already complete.", 0, done.getCount());
-        else
-            assertTrue("Wait until notification completes asynchronously.", done.await(100, MILLISECONDS));
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFutureAdapterSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFutureAdapterSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFutureAdapterSelfTest.java
index 2ef9f10..6ef5549 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFutureAdapterSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFutureAdapterSelfTest.java
@@ -115,7 +115,7 @@ public class GridFutureAdapterSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testListenSyncNotify() throws Exception {
-        GridFutureAdapter<String> fut = new GridFutureAdapter<>(new GridTestKernalContext(log), true);
+        GridFutureAdapter<String> fut = new GridFutureAdapter<>();
 
         int lsnrCnt = 10;
 
@@ -176,7 +176,7 @@ public class GridFutureAdapterSelfTest extends GridCommonAbstractTest {
         ctx.start();
 
         try {
-            GridFutureAdapter<String> fut = new GridFutureAdapter<>(ctx, false);
+            GridFutureAdapter<String> fut = new GridFutureAdapter<>();
 
             int lsnrCnt = 10;
 
@@ -253,7 +253,7 @@ public class GridFutureAdapterSelfTest extends GridCommonAbstractTest {
         try {
             // Test result returned.
 
-            GridFutureAdapter<Object> fut = new GridFutureAdapter<>(ctx);
+            GridFutureAdapter<Object> fut = new GridFutureAdapter<>();
             IgniteInternalFuture<Object> chain = fut.chain(passThrough);
 
             assertFalse(fut.isDone());
@@ -274,7 +274,7 @@ public class GridFutureAdapterSelfTest extends GridCommonAbstractTest {
 
             // Test exception re-thrown.
 
-            fut = new GridFutureAdapter<>(ctx);
+            fut = new GridFutureAdapter<>();
             chain = fut.chain(passThrough);
 
             fut.onDone(new ClusterGroupEmptyCheckedException("test exception"));
@@ -290,7 +290,7 @@ public class GridFutureAdapterSelfTest extends GridCommonAbstractTest {
 
             // Test error re-thrown.
 
-            fut = new GridFutureAdapter<>(ctx);
+            fut = new GridFutureAdapter<>();
             chain = fut.chain(passThrough);
 
             try {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/test/java/org/apache/ignite/internal/util/future/IgniteFutureImplTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/future/IgniteFutureImplTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/future/IgniteFutureImplTest.java
index d782d32..4835eef 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/util/future/IgniteFutureImplTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/util/future/IgniteFutureImplTest.java
@@ -22,7 +22,6 @@ import org.apache.ignite.internal.util.typedef.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.junits.*;
 import org.apache.ignite.testframework.junits.common.*;
 
 import java.util.concurrent.*;
@@ -143,30 +142,10 @@ public class IgniteFutureImplTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testListeners() throws Exception {
-        GridFutureAdapter<String> fut0 = new GridFutureAdapter<>(new GridTestKernalContext(log), true);
+        GridFutureAdapter<String> fut0 = new GridFutureAdapter<>();
 
         IgniteFutureImpl<String> fut = new IgniteFutureImpl<>(fut0);
 
-        fut.syncNotify(true);
-
-        assertTrue(fut.syncNotify());
-
-        fut.syncNotify(false);
-
-        assertFalse(fut.syncNotify());
-
-        fut.concurrentNotify(true);
-
-        assertTrue(fut.concurrentNotify());
-
-        fut.concurrentNotify(false);
-
-        assertFalse(fut.concurrentNotify());
-
-        fut.syncNotify(true);
-
-        assertTrue(fut.syncNotify());
-
         final AtomicInteger lsnr1Cnt = new AtomicInteger();
 
         IgniteInClosure<? super IgniteFuture<String>> lsnr1 = new CI1<IgniteFuture<String>>() {
@@ -208,12 +187,10 @@ public class IgniteFutureImplTest extends GridCommonAbstractTest {
      */
     public void testListenersOnError() throws Exception {
         {
-            GridFutureAdapter<String> fut0 = new GridFutureAdapter<>(new GridTestKernalContext(log), true);
+            GridFutureAdapter<String> fut0 = new GridFutureAdapter<>();
 
             IgniteFutureImpl<String> fut = new IgniteFutureImpl<>(fut0);
 
-            fut.syncNotify(true);
-
             final IgniteException err0 = new IgniteException("test error");
 
             final AtomicBoolean passed = new AtomicBoolean();
@@ -241,12 +218,10 @@ public class IgniteFutureImplTest extends GridCommonAbstractTest {
         }
 
         {
-            GridFutureAdapter<String> fut0 = new GridFutureAdapter<>(new GridTestKernalContext(log), true);
+            GridFutureAdapter<String> fut0 = new GridFutureAdapter<>();
 
             IgniteFutureImpl<String> fut = new IgniteFutureImpl<>(fut0);
 
-            fut.syncNotify(true);
-
             final IgniteCheckedException err0 = new IgniteCheckedException("test error");
 
             final AtomicBoolean passed = new AtomicBoolean();
@@ -278,7 +253,7 @@ public class IgniteFutureImplTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testChain() throws Exception {
-        GridFutureAdapter<String> fut0 = new GridFutureAdapter<>(new GridTestKernalContext(log), true);
+        GridFutureAdapter<String> fut0 = new GridFutureAdapter<>();
 
         IgniteFutureImpl<String> fut = new IgniteFutureImpl<>(fut0);
 
@@ -332,7 +307,7 @@ public class IgniteFutureImplTest extends GridCommonAbstractTest {
      */
     public void testChainError() throws Exception {
         {
-            GridFutureAdapter<String> fut0 = new GridFutureAdapter<>(new GridTestKernalContext(log), true);
+            GridFutureAdapter<String> fut0 = new GridFutureAdapter<>();
 
             IgniteFutureImpl<String> fut = new IgniteFutureImpl<>(fut0);
 
@@ -359,8 +334,6 @@ public class IgniteFutureImplTest extends GridCommonAbstractTest {
                 }
             });
 
-            assertTrue(chained.syncNotify());
-
             final AtomicBoolean lsnrPassed = new AtomicBoolean();
 
             IgniteInClosure<? super IgniteFuture<Integer>> lsnr1 = new CI1<IgniteFuture<Integer>>() {
@@ -406,7 +379,7 @@ public class IgniteFutureImplTest extends GridCommonAbstractTest {
         }
 
         {
-            GridFutureAdapter<String> fut0 = new GridFutureAdapter<>(new GridTestKernalContext(log), true);
+            GridFutureAdapter<String> fut0 = new GridFutureAdapter<>();
 
             IgniteFutureImpl<String> fut = new IgniteFutureImpl<>(fut0);
 
@@ -433,8 +406,6 @@ public class IgniteFutureImplTest extends GridCommonAbstractTest {
                 }
             });
 
-            assertTrue(chained.syncNotify());
-
             final AtomicBoolean lsnrPassed = new AtomicBoolean();
 
             IgniteInClosure<? super IgniteFuture<Integer>> lsnr1 = new CI1<IgniteFuture<Integer>>() {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteLangSelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteLangSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteLangSelfTestSuite.java
index 6b7f956..4ad8ba6 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteLangSelfTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteLangSelfTestSuite.java
@@ -55,7 +55,6 @@ public class IgniteLangSelfTestSuite extends TestSuite {
         suite.addTest(new TestSuite(GridStripedLockSelfTest.class));
 
         suite.addTest(new TestSuite(GridFutureAdapterSelfTest.class));
-        suite.addTest(new TestSuite(GridFinishedFutureSelfTest.class));
         suite.addTest(new TestSuite(GridCompoundFutureSelfTest.class));
         suite.addTest(new TestSuite(GridEmbeddedFutureSelfTest.class));
         suite.addTest(new TestSuite(GridNioFutureSelfTest.class));

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/GridHadoopJobTracker.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/GridHadoopJobTracker.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/GridHadoopJobTracker.java
index 0beaf32..1c48c09 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/GridHadoopJobTracker.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/GridHadoopJobTracker.java
@@ -66,7 +66,7 @@ public class GridHadoopJobTracker extends GridHadoopComponent {
     private GridHadoopMapReducePlanner mrPlanner;
 
     /** All the known jobs. */
-    private final ConcurrentMap<GridHadoopJobId, GridFutureAdapterEx<GridHadoopJob>> jobs = new ConcurrentHashMap8<>();
+    private final ConcurrentMap<GridHadoopJobId, GridFutureAdapter<GridHadoopJob>> jobs = new ConcurrentHashMap8<>();
 
     /** Locally active jobs. */
     private final ConcurrentMap<GridHadoopJobId, JobLocalState> activeJobs = new ConcurrentHashMap8<>();
@@ -236,7 +236,7 @@ public class GridHadoopJobTracker extends GridHadoopComponent {
     @SuppressWarnings("unchecked")
     public IgniteInternalFuture<GridHadoopJobId> submit(GridHadoopJobId jobId, GridHadoopJobInfo info) {
         if (!busyLock.tryReadLock()) {
-            return new GridFinishedFutureEx<>(new IgniteCheckedException("Failed to execute map-reduce job " +
+            return new GridFinishedFuture<>(new IgniteCheckedException("Failed to execute map-reduce job " +
                 "(grid is stopping): " + info));
         }
 
@@ -283,7 +283,7 @@ public class GridHadoopJobTracker extends GridHadoopComponent {
         catch (IgniteCheckedException e) {
             U.error(log, "Failed to submit job: " + jobId, e);
 
-            return new GridFinishedFutureEx<>(e);
+            return new GridFinishedFuture<>(e);
         }
         finally {
             busyLock.readUnlock();
@@ -358,7 +358,7 @@ public class GridHadoopJobTracker extends GridHadoopComponent {
                 if (log.isTraceEnabled())
                     log.trace("Job is complete, returning finished future: " + jobId);
 
-                return new GridFinishedFutureEx<>(jobId, meta.failCause());
+                return new GridFinishedFuture<>(jobId);
             }
 
             GridFutureAdapter<GridHadoopJobId> fut = F.addIfAbsent(activeFinishFuts, jobId,
@@ -967,9 +967,9 @@ public class GridHadoopJobTracker extends GridHadoopComponent {
      * @throws IgniteCheckedException If failed.
      */
     @Nullable public GridHadoopJob job(GridHadoopJobId jobId, @Nullable GridHadoopJobInfo jobInfo) throws IgniteCheckedException {
-        GridFutureAdapterEx<GridHadoopJob> fut = jobs.get(jobId);
+        GridFutureAdapter<GridHadoopJob> fut = jobs.get(jobId);
 
-        if (fut != null || (fut = jobs.putIfAbsent(jobId, new GridFutureAdapterEx<GridHadoopJob>())) != null)
+        if (fut != null || (fut = jobs.putIfAbsent(jobId, new GridFutureAdapter<GridHadoopJob>())) != null)
             return fut.get();
 
         fut = jobs.get(jobId);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/GridHadoopShuffle.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/GridHadoopShuffle.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/GridHadoopShuffle.java
index 396124e..25f7b85 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/GridHadoopShuffle.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/GridHadoopShuffle.java
@@ -237,13 +237,13 @@ public class GridHadoopShuffle extends GridHadoopComponent {
         GridHadoopShuffleJob job = jobs.get(jobId);
 
         if (job == null)
-            return new GridFinishedFutureEx<>();
+            return new GridFinishedFuture<>();
 
         try {
             return job.flush();
         }
         catch (IgniteCheckedException e) {
-            return new GridFinishedFutureEx<>(e);
+            return new GridFinishedFuture<>(e);
         }
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/GridHadoopShuffleJob.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/GridHadoopShuffleJob.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/GridHadoopShuffleJob.java
index 545c1b8..d307740 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/GridHadoopShuffleJob.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/GridHadoopShuffleJob.java
@@ -74,7 +74,7 @@ public class GridHadoopShuffleJob<T> implements AutoCloseable {
     private volatile IgniteInClosure2X<T, GridHadoopShuffleMessage> io;
 
     /** */
-    protected ConcurrentMap<Long, IgniteBiTuple<GridHadoopShuffleMessage, GridFutureAdapterEx<?>>> sentMsgs =
+    protected ConcurrentMap<Long, IgniteBiTuple<GridHadoopShuffleMessage, GridFutureAdapter<?>>> sentMsgs =
         new ConcurrentHashMap<>();
 
     /** */
@@ -242,7 +242,7 @@ public class GridHadoopShuffleJob<T> implements AutoCloseable {
      */
     @SuppressWarnings("ConstantConditions")
     public void onShuffleAck(GridHadoopShuffleAck ack) {
-        IgniteBiTuple<GridHadoopShuffleMessage, GridFutureAdapterEx<?>> tup = sentMsgs.get(ack.id());
+        IgniteBiTuple<GridHadoopShuffleMessage, GridFutureAdapter<?>> tup = sentMsgs.get(ack.id());
 
         if (tup != null)
             tup.get2().onDone();
@@ -365,14 +365,14 @@ public class GridHadoopShuffleJob<T> implements AutoCloseable {
      * @param newBufMinSize Min new buffer size.
      */
     private void send(final int idx, int newBufMinSize) {
-        final GridFutureAdapterEx<?> fut = new GridFutureAdapterEx<>();
+        final GridFutureAdapter<?> fut = new GridFutureAdapter<>();
 
         GridHadoopShuffleMessage msg = msgs[idx];
 
         final long msgId = msg.id();
 
-        IgniteBiTuple<GridHadoopShuffleMessage, GridFutureAdapterEx<?>> old = sentMsgs.putIfAbsent(msgId,
-            new IgniteBiTuple<GridHadoopShuffleMessage, GridFutureAdapterEx<?>>(msg, fut));
+        IgniteBiTuple<GridHadoopShuffleMessage, GridFutureAdapter<?>> old = sentMsgs.putIfAbsent(msgId,
+            new IgniteBiTuple<GridHadoopShuffleMessage, GridFutureAdapter<?>>(msg, fut));
 
         assert old == null;
 
@@ -441,7 +441,7 @@ public class GridHadoopShuffleJob<T> implements AutoCloseable {
         flushed = true;
 
         if (maps.length() == 0)
-            return new GridFinishedFutureEx<>();
+            return new GridFinishedFuture<>();
 
         U.await(ioInitLatch);
 
@@ -471,7 +471,7 @@ public class GridHadoopShuffleJob<T> implements AutoCloseable {
 
         GridCompoundFuture fut = new GridCompoundFuture<>();
 
-        for (IgniteBiTuple<GridHadoopShuffleMessage, GridFutureAdapterEx<?>> tup : sentMsgs.values())
+        for (IgniteBiTuple<GridHadoopShuffleMessage, GridFutureAdapter<?>> tup : sentMsgs.values())
             fut.add(tup.get2());
 
         fut.markInitialized();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutor.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutor.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutor.java
index 72185c0..2043648 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutor.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutor.java
@@ -888,7 +888,7 @@ public class GridHadoopExternalTaskExecutor extends GridHadoopTaskExecutorAdapte
          * @param ctx Kernal context.
          */
         private GridHadoopProcessFuture(UUID childProcId, GridHadoopJobId jobId, GridKernalContext ctx) {
-            super(ctx);
+            super();
 
             this.childProcId = childProcId;
             this.jobId = jobId;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/child/GridHadoopChildProcessRunner.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/child/GridHadoopChildProcessRunner.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/child/GridHadoopChildProcessRunner.java
index 2d00222..c422e4e 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/child/GridHadoopChildProcessRunner.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/child/GridHadoopChildProcessRunner.java
@@ -66,7 +66,7 @@ public class GridHadoopChildProcessRunner {
     private long startTime;
 
     /** Init future. */
-    private final GridFutureAdapterEx<?> initFut = new GridFutureAdapterEx<>();
+    private final GridFutureAdapter<?> initFut = new GridFutureAdapter<>();
 
     /** Job instance. */
     private GridHadoopJob job;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
index e3da0b7..2e3e113 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
@@ -765,7 +765,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
             c = connectionForSpace(space);
         }
         catch (IgniteCheckedException e) {
-            return new GridFinishedFutureEx<>(e);
+            return new GridFinishedFuture<>(e);
         }
 
         return queryTwoStep(space, GridSqlQuerySplitter.split(c, sqlQry, params));

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
index 911a2a2..618c1d1 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
@@ -129,7 +129,7 @@ public class GridReduceQueryExecutor {
             r.conn = h2.connectionForSpace(space);
         }
         catch (IgniteCheckedException e) {
-            return new GridFinishedFutureEx<>(e);
+            return new GridFinishedFuture<>(e);
         }
 
         Collection<ClusterNode> nodes = ctx.grid().cluster().nodes(); // TODO filter nodes somehow?
@@ -141,7 +141,7 @@ public class GridReduceQueryExecutor {
                 tbl = createTable(r.conn, mapQry);
             }
             catch (IgniteCheckedException e) {
-                return new GridFinishedFutureEx<>(e);
+                return new GridFinishedFuture<>(e);
             }
 
             tbl.getScanIndex(null).setNumberOfSources(nodes.size());
@@ -166,12 +166,12 @@ public class GridReduceQueryExecutor {
             for (GridMergeTable tbl : r.tbls)
                 dropTable(r.conn, tbl.getName());
 
-            return new GridFinishedFuture(ctx, new Iter(res));
+            return new GridFinishedFuture(new Iter(res));
         }
         catch (IgniteCheckedException | InterruptedException | SQLException e) {
             U.closeQuiet(r.conn);
 
-            return new GridFinishedFuture<>(ctx, e);
+            return new GridFinishedFuture<>(e);
         }
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1b46951/modules/schedule/src/main/java/org/apache/ignite/internal/processors/schedule/ScheduleFutureImpl.java
----------------------------------------------------------------------
diff --git a/modules/schedule/src/main/java/org/apache/ignite/internal/processors/schedule/ScheduleFutureImpl.java b/modules/schedule/src/main/java/org/apache/ignite/internal/processors/schedule/ScheduleFutureImpl.java
index 409915a..7f76873 100644
--- a/modules/schedule/src/main/java/org/apache/ignite/internal/processors/schedule/ScheduleFutureImpl.java
+++ b/modules/schedule/src/main/java/org/apache/ignite/internal/processors/schedule/ScheduleFutureImpl.java
@@ -37,7 +37,6 @@ import java.util.concurrent.atomic.*;
 import java.util.regex.*;
 
 import static java.util.concurrent.TimeUnit.*;
-import static org.apache.ignite.IgniteSystemProperties.*;
 
 /**
  * Implementation of {@link org.apache.ignite.scheduler.SchedulerFuture} interface.
@@ -614,7 +613,7 @@ class ScheduleFutureImpl<R> implements SchedulerFuture<R>, Externalizable {
     /** {@inheritDoc} */
     @SuppressWarnings("ExternalizableWithoutPublicNoArgConstructor")
     @Override public <T> IgniteFuture<T> chain(final IgniteClosure<? super IgniteFuture<R>, T> doneCb) {
-        final GridFutureAdapter<T> fut = new GridFutureAdapter<T>(ctx, syncNotify) {
+        final GridFutureAdapter<T> fut = new GridFutureAdapter<T>() {
             @Override public String toString() {
                 return "ChainFuture[orig=" + ScheduleFutureImpl.this + ", doneCb=" + doneCb + ']';
             }


Mime
View raw message