ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [1/2] ignite git commit: Removed some unused code.
Date Thu, 18 May 2017 12:45:45 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-5075 3e4654c68 -> 9f2313ecb


Removed some unused code.


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

Branch: refs/heads/ignite-5075
Commit: 6be8d97d6574c0727ad4f3e13e474156731f1fe2
Parents: ac85a7a
Author: sboikov <sboikov@gridgain.com>
Authored: Thu May 18 15:28:44 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Thu May 18 15:28:44 2017 +0300

----------------------------------------------------------------------
 .../internal/ComputeTaskInternalFuture.java     |   3 -
 .../discovery/GridDiscoveryManager.java         |   3 -
 .../affinity/GridAffinityAssignmentCache.java   |   3 -
 .../cache/CacheStoreBalancingWrapper.java       |   3 -
 .../processors/cache/GridCacheAdapter.java      |   8 +-
 .../cache/GridCacheAffinityManager.java         |   2 +-
 .../processors/cache/GridCacheContext.java      |  22 +--
 .../cache/GridCacheDeploymentManager.java       |   2 +-
 .../cache/GridCacheFutureAdapter.java           |   1 +
 .../processors/cache/GridCacheLogger.java       |   2 +-
 .../cache/GridCacheMultiTxFuture.java           |   3 -
 .../processors/cache/GridCacheMvccManager.java  |   3 -
 .../GridCachePartitionExchangeManager.java      |   3 -
 .../processors/cache/GridCacheUtils.java        | 146 +------------------
 .../distributed/dht/GridDhtCacheAdapter.java    |   3 -
 .../distributed/dht/GridDhtEmbeddedFuture.java  |   3 -
 .../distributed/dht/GridDhtGetSingleFuture.java |   3 -
 .../distributed/dht/GridDhtTxFinishFuture.java  |   3 -
 .../dht/preloader/GridDhtForceKeysFuture.java   |   7 +-
 .../dht/preloader/GridDhtPartitionDemander.java |  13 +-
 .../distributed/near/GridNearGetFuture.java     |   3 -
 .../distributed/near/GridNearLockFuture.java    |   3 -
 .../cache/query/GridCacheQueryManager.java      |  18 +--
 .../store/GridCacheStoreManagerAdapter.java     |   4 +-
 .../continuous/GridContinuousProcessor.java     |   3 -
 .../datastreamer/DataStreamerFuture.java        |   3 -
 .../processors/igfs/IgfsDataManager.java        |   3 -
 .../marshaller/MarshallerMappingTransport.java  |   3 -
 .../service/GridServiceDeploymentFuture.java    |   3 -
 .../util/future/GridEmbeddedFuture.java         |   3 -
 .../util/nio/GridNioEmbeddedFuture.java         |   3 -
 .../internal/util/nio/GridNioFutureImpl.java    |   3 -
 .../ignite/internal/util/nio/GridNioServer.java |   3 -
 .../internal/util/worker/GridWorkerFuture.java  |   3 -
 .../communication/tcp/TcpCommunicationSpi.java  |   3 -
 .../cache/GridCacheP2PUndeploySelfTest.java     |  12 --
 .../hadoop/impl/igfs/HadoopIgfsFuture.java      |   3 -
 .../external/HadoopExternalTaskExecutor.java    |   3 -
 .../query/h2/DmlStatementsProcessor.java        |   2 +-
 .../processors/query/h2/IgniteH2Indexing.java   |   2 +-
 .../query/h2/twostep/GridMapQueryExecutor.java  |   4 +-
 .../processors/schedule/ScheduleFutureImpl.java |   2 +-
 42 files changed, 32 insertions(+), 293 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/6be8d97d/modules/core/src/main/java/org/apache/ignite/internal/ComputeTaskInternalFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/ComputeTaskInternalFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/ComputeTaskInternalFuture.java
index d6c54d7..2cb3dfa 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/ComputeTaskInternalFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/ComputeTaskInternalFuture.java
@@ -48,9 +48,6 @@ import org.jetbrains.annotations.Nullable;
  */
 public class ComputeTaskInternalFuture<R> extends GridFutureAdapter<R> {
     /** */
-    private static final long serialVersionUID = 0L;
-
-    /** */
     private ComputeTaskSession ses;
 
     /** */

http://git-wip-us.apache.org/repos/asf/ignite/blob/6be8d97d/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
index 656b04a..7b066e8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
@@ -2603,9 +2603,6 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
     /** Discovery topology future. */
     private static class DiscoTopologyFuture extends GridFutureAdapter<Long> implements GridLocalEventListener {
         /** */
-        private static final long serialVersionUID = 0L;
-
-        /** */
         private GridKernalContext ctx;
 
         /** Topology await version. */

http://git-wip-us.apache.org/repos/asf/ignite/blob/6be8d97d/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
index 2399493..4830f06 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
@@ -590,9 +590,6 @@ public class GridAffinityAssignmentCache {
      */
     private class AffinityReadyFuture extends GridFutureAdapter<AffinityTopologyVersion> {
         /** */
-        private static final long serialVersionUID = 0L;
-
-        /** */
         private AffinityTopologyVersion reqTopVer;
 
         /**

http://git-wip-us.apache.org/repos/asf/ignite/blob/6be8d97d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheStoreBalancingWrapper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheStoreBalancingWrapper.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheStoreBalancingWrapper.java
index ce2330c..5cc4ded 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheStoreBalancingWrapper.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheStoreBalancingWrapper.java
@@ -237,9 +237,6 @@ public class CacheStoreBalancingWrapper<K, V> implements CacheStore<K, V> {
      *
      */
     private class LoadFuture extends GridFutureAdapter<Map<K, V>> {
-        /** */
-        private static final long serialVersionUID = 0L;
-
         /** Collection of keys for pending cleanup. */
         private volatile Collection<K> keys;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/6be8d97d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index ee7af80..2820bb7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -3378,7 +3378,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
 
         try {
             if (ctx.store().isLocal()) {
-                DataStreamerImpl ldr = ctx.kernalContext().dataStream().dataStreamer(ctx.namex());
+                DataStreamerImpl ldr = ctx.kernalContext().dataStream().dataStreamer(ctx.name());
 
                 try {
                     ldr.skipStore(true);
@@ -3550,7 +3550,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
      */
     private void localLoadAndUpdate(final Collection<? extends K> keys) throws IgniteCheckedException {
         try (final DataStreamerImpl<KeyCacheObject, CacheObject> ldr =
-                 ctx.kernalContext().<KeyCacheObject, CacheObject>dataStream().dataStreamer(ctx.namex())) {
+                 ctx.kernalContext().<KeyCacheObject, CacheObject>dataStream().dataStreamer(ctx.name())) {
             ldr.allowOverwrite(true);
             ldr.skipStore(true);
 
@@ -3590,7 +3590,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
         Collection<KeyCacheObject> keys0 = ctx.cacheKeysView(keys);
 
         if (ctx.store().isLocal()) {
-            DataStreamerImpl ldr = ctx.kernalContext().dataStream().dataStreamer(ctx.namex());
+            DataStreamerImpl ldr = ctx.kernalContext().dataStream().dataStreamer(ctx.name());
 
             try {
                 ldr.skipStore(true);
@@ -4289,7 +4289,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
     /** {@inheritDoc} */
     @Override public void writeExternal(ObjectOutput out) throws IOException {
         U.writeString(out, ctx.igniteInstanceName());
-        U.writeString(out, ctx.namex());
+        U.writeString(out, ctx.name());
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/ignite/blob/6be8d97d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java
index 571efc3..2bb6f6c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java
@@ -64,7 +64,7 @@ public class GridCacheAffinityManager extends GridCacheManagerAdapter {
         affMapper = cctx.config().getAffinityMapper();
 
         aff = new GridAffinityAssignmentCache(cctx.kernalContext(),
-            cctx.namex(),
+            cctx.name(),
             affFunction,
             cctx.config().getNodeFilter(),
             cctx.config().getBackups(),

http://git-wip-us.apache.org/repos/asf/ignite/blob/6be8d97d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
index aa503b1..a3e70dd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
@@ -739,26 +739,6 @@ public class GridCacheContext<K, V> implements Externalizable {
     }
 
     /**
-     * Gets public name for cache.
-     *
-     * @return Public name of the cache.
-     */
-    public String namex() {
-        return isDht() ? dht().near().name() : name();
-    }
-
-    /**
-     * Gets public cache name substituting null name by {@code 'default'}.
-     *
-     * @return Public cache name substituting null name by {@code 'default'}.
-     */
-    public String namexx() {
-        String name = namex();
-
-        return name == null ? "default" : name;
-    }
-
-    /**
      * @param key Key to construct tx key for.
      * @return Transaction key.
      */
@@ -2088,7 +2068,7 @@ public class GridCacheContext<K, V> implements Externalizable {
     /** {@inheritDoc} */
     @Override public void writeExternal(ObjectOutput out) throws IOException {
         U.writeString(out, igniteInstanceName());
-        U.writeString(out, namex());
+        U.writeString(out, name());
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/ignite/blob/6be8d97d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java
index 9e5620c..55e8669 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java
@@ -274,7 +274,7 @@ public class GridCacheDeploymentManager<K, V> extends GridCacheSharedManagerAdap
             U.quietAndWarn(log, "");
             U.quietAndWarn(
                 log,
-                "Cleared all cache entries for undeployed class loader [cacheName=" + cacheCtx.namexx() +
+                "Cleared all cache entries for undeployed class loader [cacheName=" + cacheCtx.name() +
                     ", undeployCnt=" + keys.size() + ", swapUndeployCnt=" + swapUndeployCnt +
                     ", clsLdr=" + ldr.getClass().getName() + ']');
             U.quietAndWarn(

http://git-wip-us.apache.org/repos/asf/ignite/blob/6be8d97d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheFutureAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheFutureAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheFutureAdapter.java
index babd707..d3e03dd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheFutureAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheFutureAdapter.java
@@ -35,6 +35,7 @@ public abstract class GridCacheFutureAdapter<R> extends GridFutureAdapter<R> imp
      * Default constructor.
      */
     public GridCacheFutureAdapter() {
+        // No-op.
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/ignite/blob/6be8d97d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheLogger.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheLogger.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheLogger.java
index 7348c67..960fb55 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheLogger.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheLogger.java
@@ -69,7 +69,7 @@ class GridCacheLogger implements IgniteLogger, Externalizable {
         this.cctx = cctx;
         this.ctgr = ctgr;
 
-        cacheName = '<' + cctx.namexx() + "> ";
+        cacheName = '<' + cctx.name() + "> ";
 
         log = cctx.kernalContext().log(ctgr);
     }

http://git-wip-us.apache.org/repos/asf/ignite/blob/6be8d97d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMultiTxFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMultiTxFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMultiTxFuture.java
index c63b6f7..f1338d0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMultiTxFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMultiTxFuture.java
@@ -35,9 +35,6 @@ import org.apache.ignite.internal.util.typedef.internal.U;
  * Future which waits for completion of one or more transactions.
  */
 public final class GridCacheMultiTxFuture<K, V> extends GridFutureAdapter<Boolean> {
-    /** */
-    private static final long serialVersionUID = 0L;
-
     /** Logger reference. */
     private static final AtomicReference<IgniteLogger> logRef = new AtomicReference<>();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/6be8d97d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
index 3ae9f92..24433de 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
@@ -1361,9 +1361,6 @@ public class GridCacheMvccManager extends GridCacheSharedManagerAdapter {
      *
      */
     private class DataStreamerFuture extends GridFutureAdapter<Void> {
-        /** */
-        private static final long serialVersionUID = 0L;
-
         /** Topology version. Instance field for toString method only. */
         @GridToStringInclude
         private final AffinityTopologyVersion topVer;

http://git-wip-us.apache.org/repos/asf/ignite/blob/6be8d97d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
index 04c647f..5314088 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
@@ -2136,9 +2136,6 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana
      */
     private class AffinityReadyFuture extends GridFutureAdapter<AffinityTopologyVersion> {
         /** */
-        private static final long serialVersionUID = 0L;
-
-        /** */
         @GridToStringInclude
         private AffinityTopologyVersion topVer;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/6be8d97d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
index 2260a99..4dc5f8e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
@@ -17,8 +17,6 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import java.io.IOException;
-import java.io.ObjectInput;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -47,7 +45,6 @@ import org.apache.ignite.IgniteLogger;
 import org.apache.ignite.cache.CacheAtomicUpdateTimeoutException;
 import org.apache.ignite.cache.CachePartialUpdateException;
 import org.apache.ignite.cache.CacheServerNotFoundException;
-import org.apache.ignite.cache.affinity.Affinity;
 import org.apache.ignite.cache.store.CacheStoreSessionListener;
 import org.apache.ignite.cluster.ClusterNode;
 import org.apache.ignite.configuration.CacheConfiguration;
@@ -217,15 +214,6 @@ public class GridCacheUtils {
     );
 
     /** */
-    private static final CacheEntryPredicate ALWAYS_TRUE0 = new CacheEntrySerializablePredicate(
-        new CacheEntryPredicateAdapter() {
-            @Override public boolean apply(GridCacheEntryEx e) {
-                return true;
-            }
-        }
-    );
-
-    /** */
     private static final CacheEntryPredicate[] ALWAYS_FALSE0_ARR = new CacheEntryPredicate[] {ALWAYS_FALSE0};
 
     /** Read filter. */
@@ -376,21 +364,6 @@ public class GridCacheUtils {
     }
 
     /**
-     * @param ctx Cache context.
-     * @param meta Meta name.
-     * @return Filter for entries with meta.
-     */
-    public static IgnitePredicate<KeyCacheObject> keyHasMeta(final GridCacheContext ctx, final int meta) {
-        return new P1<KeyCacheObject>() {
-            @Override public boolean apply(KeyCacheObject k) {
-                GridCacheEntryEx e = ctx.cache().peekEx(k);
-
-                return e != null && e.hasMeta(meta);
-            }
-        };
-    }
-
-    /**
      * @param err If {@code true}, then throw {@link GridCacheFilterFailedException},
      *      otherwise return {@code val} passed in.
      * @return Always return {@code null}.
@@ -453,28 +426,6 @@ public class GridCacheUtils {
     }
 
     /**
-     * @param ctx Cache registry.
-     * @return Space name.
-     */
-    public static String swapSpaceName(GridCacheContext<?, ?> ctx) {
-        String name = ctx.namex();
-
-        name = name == null ? "gg-swap-cache-dflt" : "gg-swap-cache-" + name;
-
-        return name;
-    }
-
-    /**
-     * @param swapSpaceName Swap space name.
-     * @return Cache name.
-     */
-    public static String cacheNameForSwapSpaceName(String swapSpaceName) {
-        assert swapSpaceName != null;
-
-        return "gg-swap-cache-dflt".equals(swapSpaceName) ? null : swapSpaceName.substring("gg-swap-cache-".length());
-    }
-
-    /**
      * Gets all nodes on which cache with the same name is started.
      *
      * @param ctx Cache context.
@@ -588,45 +539,15 @@ public class GridCacheUtils {
     /**
      * @return Always false filter.
      */
-    public static CacheEntryPredicate alwaysFalse0() {
-        return ALWAYS_FALSE0;
-    }
-
-    /**
-     * @return Always false filter.
-     */
-    public static CacheEntryPredicate alwaysTrue0() {
-        return ALWAYS_TRUE0;
-    }
-
-    /**
-     * @return Always false filter.
-     */
     public static CacheEntryPredicate[] alwaysFalse0Arr() {
         return ALWAYS_FALSE0_ARR;
     }
 
     /**
-     * @param p Predicate.
-     * @return {@code True} if always false filter.
-     */
-    public static boolean isAlwaysFalse0(@Nullable CacheEntryPredicate[] p) {
-        return p != null && p.length == 1 && p[0]  == ALWAYS_FALSE0;
-    }
-
-    /**
-     * @param p Predicate.
-     * @return {@code True} if always false filter.
-     */
-    public static boolean isAlwaysTrue0(@Nullable CacheEntryPredicate[] p) {
-        return p != null && p.length == 1 && p[0]  == ALWAYS_TRUE0;
-    }
-
-    /**
      * @return Closure which converts transaction entry xid to XID version.
      */
     @SuppressWarnings( {"unchecked"})
-    public static <K, V> IgniteClosure<IgniteInternalTx, GridCacheVersion> tx2xidVersion() {
+    public static IgniteClosure<IgniteInternalTx, GridCacheVersion> tx2xidVersion() {
         return (IgniteClosure<IgniteInternalTx, GridCacheVersion>)tx2xidVer;
     }
 
@@ -965,24 +886,6 @@ public class GridCacheUtils {
     }
 
     /**
-     * Converts cache version to byte array.
-     *
-     * @param ver Version.
-     * @return Byte array.
-     */
-    public static byte[] versionToBytes(GridCacheVersion ver) {
-        assert ver != null;
-
-        byte[] bytes = new byte[20];
-
-        U.intToBytes(ver.topologyVersion(), bytes, 0);
-        U.longToBytes(ver.order(), bytes, 4);
-        U.intToBytes(ver.nodeOrderAndDrIdRaw(), bytes, 12);
-
-        return bytes;
-    }
-
-    /**
      * Mask cache name in case it is null.
      *
      * @param cacheName Cache name.
@@ -1346,47 +1249,6 @@ public class GridCacheUtils {
     }
 
     /**
-     * Reads array from input stream.
-     *
-     * @param in Input stream.
-     * @return Deserialized array.
-     * @throws IOException If failed.
-     * @throws ClassNotFoundException If class not found.
-     */
-    @SuppressWarnings("unchecked")
-    @Nullable public static <K, V> CacheEntryPredicate[] readEntryFilterArray(ObjectInput in)
-        throws IOException, ClassNotFoundException {
-        int len = in.readInt();
-
-        CacheEntryPredicate[] arr = null;
-
-        if (len > 0) {
-            arr = new CacheEntryPredicate[len];
-
-            for (int i = 0; i < len; i++)
-                arr[i] = (CacheEntryPredicate)in.readObject();
-        }
-
-        return arr;
-    }
-
-    /**
-     * @param aff Affinity.
-     * @param n Node.
-     * @return Predicate that evaluates to {@code true} if entry is primary for node.
-     */
-    public static CacheEntryPredicate cachePrimary(
-        final Affinity aff,
-        final ClusterNode n
-    ) {
-        return new CacheEntryPredicateAdapter() {
-            @Override public boolean apply(GridCacheEntryEx e) {
-                return aff.isPrimary(n, e.key());
-            }
-        };
-    }
-
-    /**
      * @param e Ignite checked exception.
      * @return CacheException runtime exception, never null.
      */
@@ -1543,14 +1405,14 @@ public class GridCacheUtils {
         for (Map.Entry<Integer, Set<Integer>> entry : partsMap.entrySet()) {
             Set<Integer> parts = entry.getValue();
 
-            int[] partsArray = new int[parts.size()];
+            int[] partsArr = new int[parts.size()];
 
             int idx = 0;
 
             for (Integer part : parts)
-                partsArray[idx++] = part;
+                partsArr[idx++] = part;
 
-            res.put(entry.getKey(), partsArray);
+            res.put(entry.getKey(), partsArr);
         }
 
         return res;

http://git-wip-us.apache.org/repos/asf/ignite/blob/6be8d97d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
index 02badc1..10caf07 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
@@ -1236,9 +1236,6 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap
      */
     @SuppressWarnings("TypeMayBeWeakened")
     private static class MultiUpdateFuture extends GridFutureAdapter<IgniteUuid> {
-        /** */
-        private static final long serialVersionUID = 0L;
-
         /** Topology version. */
         private AffinityTopologyVersion topVer;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/6be8d97d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtEmbeddedFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtEmbeddedFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtEmbeddedFuture.java
index 1b9f743..3cd819a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtEmbeddedFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtEmbeddedFuture.java
@@ -28,9 +28,6 @@ import org.apache.ignite.lang.IgniteBiClosure;
  * Embedded DHT future.
  */
 public class GridDhtEmbeddedFuture<A, B> extends GridEmbeddedFuture<A, B> implements GridDhtFuture<A> {
-    /** */
-    private static final long serialVersionUID = 0L;
-
     /**
      * @param c Closure.
      * @param embedded Embedded.

http://git-wip-us.apache.org/repos/asf/ignite/blob/6be8d97d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetSingleFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetSingleFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetSingleFuture.java
index 9cc69b5..2da26ac 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetSingleFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetSingleFuture.java
@@ -51,9 +51,6 @@ import org.jetbrains.annotations.Nullable;
  */
 public final class GridDhtGetSingleFuture<K, V> extends GridFutureAdapter<GridCacheEntryInfo>
     implements GridDhtFuture<GridCacheEntryInfo> {
-    /** */
-    private static final long serialVersionUID = 0L;
-
     /** Logger reference. */
     private static final AtomicReference<IgniteLogger> logRef = new AtomicReference<>();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/6be8d97d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
index 4faa475..8a31bac 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
@@ -576,9 +576,6 @@ public final class GridDhtTxFinishFuture<K, V> extends GridCacheCompoundIdentity
      */
     private class MiniFuture extends GridFutureAdapter<IgniteInternalTx> {
         /** */
-        private static final long serialVersionUID = 0L;
-
-        /** */
         private final int futId;
 
         /** DHT mapping. */

http://git-wip-us.apache.org/repos/asf/ignite/blob/6be8d97d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java
index 0f39081..562a165 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java
@@ -382,7 +382,7 @@ public final class GridDhtForceKeysFuture<K, V> extends GridCompoundFuture<Objec
             mappedKeys.add(key);
 
             if (log.isDebugEnabled())
-                log.debug("Will rebalance key from node [cacheName=" + cctx.namex() + ", key=" + key + ", part=" +
+                log.debug("Will rebalance key from node [cacheName=" + cctx.name() + ", key=" + key + ", part=" +
                     part + ", node=" + pick.id() + ", locId=" + cctx.nodeId() + ']');
         }
         else if (locPart.state() != OWNING)
@@ -414,9 +414,6 @@ public final class GridDhtForceKeysFuture<K, V> extends GridCompoundFuture<Objec
      * node as opposed to multiple nodes.
      */
     private class MiniFuture extends GridFutureAdapter<Object> {
-        /** */
-        private static final long serialVersionUID = 0L;
-
         /** Mini-future ID. */
         private IgniteUuid miniId = IgniteUuid.randomUuid();
 
@@ -565,7 +562,7 @@ public final class GridDhtForceKeysFuture<K, V> extends GridCompoundFuture<Objec
                     catch (GridCacheEntryRemovedException ignore) {
                         if (log.isDebugEnabled())
                             log.debug("Trying to rebalance removed entry (will ignore) [cacheName=" +
-                                cctx.namex() + ", entry=" + entry + ']');
+                                cctx.name() + ", entry=" + entry + ']');
                     }
                     finally {
                         locPart.release();

http://git-wip-us.apache.org/repos/asf/ignite/blob/6be8d97d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
index 75cbd00..838ccc8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
@@ -242,17 +242,6 @@ public class GridDhtPartitionDemander {
     }
 
     /**
-     * @param part Partition.
-     * @param type Type.
-     * @param discoEvt Discovery event.
-     */
-    private void preloadEvent(int part, int type, DiscoveryEvent discoEvt) {
-        assert discoEvt != null;
-
-        cctx.events().addPreloadEvent(part, type, discoEvt.eventNode(), discoEvt.type(), discoEvt.timestamp());
-    }
-
-    /**
      * Sets last exchange future.
      *
      * @param lastFut Last future to set.
@@ -627,7 +616,7 @@ public class GridDhtPartitionDemander {
                         boolean reserved = part.reserve();
 
                         assert reserved : "Failed to reserve partition [igniteInstanceName=" +
-                            cctx.igniteInstanceName() + ", cacheName=" + cctx.namex() + ", part=" + part + ']';
+                            cctx.igniteInstanceName() + ", cacheName=" + cctx.name() + ", part=" + part + ']';
 
                         part.lock();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/6be8d97d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
index 7cabbd4..c7c6e9e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
@@ -820,9 +820,6 @@ public final class GridNearGetFuture<K, V> extends CacheDistributedGetFutureAdap
      */
     private class MiniFuture extends GridFutureAdapter<Map<K, V>> {
         /** */
-        private static final long serialVersionUID = 0L;
-
-        /** */
         private final IgniteUuid futId = IgniteUuid.randomUuid();
 
         /** Node ID. */

http://git-wip-us.apache.org/repos/asf/ignite/blob/6be8d97d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
index b94c014..0786f29 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
@@ -1493,9 +1493,6 @@ public final class GridNearLockFuture extends GridCacheCompoundIdentityFuture<Bo
      */
     private class MiniFuture extends GridFutureAdapter<Boolean> {
         /** */
-        private static final long serialVersionUID = 0L;
-
-        /** */
         private final int futId;
 
         /** Node ID. */

http://git-wip-us.apache.org/repos/asf/ignite/blob/6be8d97d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
index fcf534c..0a789ae 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
@@ -597,7 +597,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
                             "Scan query executed.",
                             EVT_CACHE_QUERY_EXECUTED,
                             CacheQueryType.SCAN.name(),
-                            cctx.namex(),
+                            cctx.name(),
                             null,
                             null,
                             qry.scanFilter(),
@@ -618,7 +618,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
                             "Full text query executed.",
                             EVT_CACHE_QUERY_EXECUTED,
                             CacheQueryType.FULL_TEXT.name(),
-                            cctx.namex(),
+                            cctx.name(),
                             qry.queryClassName(),
                             qry.clause(),
                             null,
@@ -692,7 +692,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
                     "SQL fields query executed.",
                     EVT_CACHE_QUERY_EXECUTED,
                     CacheQueryType.SQL_FIELDS.name(),
-                    cctx.namex(),
+                    cctx.name(),
                     null,
                     qry.clause(),
                     null,
@@ -724,7 +724,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
                     "SPI query executed.",
                     EVT_CACHE_QUERY_EXECUTED,
                     CacheQueryType.SPI.name(),
-                    cctx.namex(),
+                    cctx.name(),
                     null,
                     null,
                     null,
@@ -1020,7 +1020,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
                             "SQL fields query result set row read.",
                             EVT_CACHE_QUERY_OBJECT_READ,
                             CacheQueryType.SQL_FIELDS.name(),
-                            cctx.namex(),
+                            cctx.name(),
                             null,
                             qry.clause(),
                             null,
@@ -1255,7 +1255,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
                                     "SQL query entry read.",
                                     EVT_CACHE_QUERY_OBJECT_READ,
                                     CacheQueryType.SQL.name(),
-                                    cctx.namex(),
+                                    cctx.name(),
                                     qry.queryClassName(),
                                     qry.clause(),
                                     null,
@@ -1276,7 +1276,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
                                     "Full text query entry read.",
                                     EVT_CACHE_QUERY_OBJECT_READ,
                                     CacheQueryType.FULL_TEXT.name(),
-                                    cctx.namex(),
+                                    cctx.name(),
                                     qry.queryClassName(),
                                     qry.clause(),
                                     null,
@@ -1297,7 +1297,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
                                     "Scan query entry read.",
                                     EVT_CACHE_QUERY_OBJECT_READ,
                                     CacheQueryType.SCAN.name(),
-                                    cctx.namex(),
+                                    cctx.name(),
                                     null,
                                     null,
                                     qry.scanFilter(),
@@ -1420,7 +1420,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
 
         long startTime = U.currentTimeMillis();
 
-        final String namex = cctx.namex();
+        final String namex = cctx.name();
 
         try {
             assert qry.type() == SCAN;

http://git-wip-us.apache.org/repos/asf/ignite/blob/6be8d97d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheStoreManagerAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheStoreManagerAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheStoreManagerAdapter.java
index ae7a3f5..cf11a28 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheStoreManagerAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheStoreManagerAdapter.java
@@ -538,7 +538,7 @@ public abstract class GridCacheStoreManagerAdapter extends GridCacheManagerAdapt
         }
 
         LT.warn(log, "Calling Cache.loadCache() method will have no effect, " +
-            "CacheConfiguration.getStore() is not defined for cache: " + cctx.namexx());
+            "CacheConfiguration.getStore() is not defined for cache: " + cctx.name());
 
         return false;
     }
@@ -804,7 +804,7 @@ public abstract class GridCacheStoreManagerAdapter extends GridCacheManagerAdapt
 
         if (e.getMessage() != null) {
             throw new IgniteCheckedException("Cache store must work with binary objects if binary are " +
-                "enabled for cache [cacheName=" + cctx.namex() + ']', e);
+                "enabled for cache [cacheName=" + cctx.name() + ']', e);
         }
         else
             throw e;

http://git-wip-us.apache.org/repos/asf/ignite/blob/6be8d97d/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
index f1170cb..abcd8ea 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
@@ -1821,9 +1821,6 @@ public class GridContinuousProcessor extends GridProcessorAdapter {
      */
     private static class StartFuture extends GridFutureAdapter<UUID> {
         /** */
-        private static final long serialVersionUID = 0L;
-
-        /** */
         private GridKernalContext ctx;
 
         /** Consume ID. */

http://git-wip-us.apache.org/repos/asf/ignite/blob/6be8d97d/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerFuture.java
index ebd5247..ae829db 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerFuture.java
@@ -26,9 +26,6 @@ import org.apache.ignite.internal.util.typedef.internal.S;
  * Data streamer future.
  */
 class DataStreamerFuture extends GridFutureAdapter<Object> {
-    /** */
-    private static final long serialVersionUID = 0L;
-
     /** Data loader. */
     @GridToStringExclude
     private DataStreamerImpl dataLdr;

http://git-wip-us.apache.org/repos/asf/ignite/blob/6be8d97d/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java
index 621b833..8ae6db8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java
@@ -1593,9 +1593,6 @@ public class IgfsDataManager extends IgfsManager {
      * Future that is completed when all participating
      */
     private class WriteCompletionFuture extends GridFutureAdapter<Boolean> {
-        /** */
-        private static final long serialVersionUID = 0L;
-
         /** File id to remove future from map. */
         private final IgniteUuid fileId;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/6be8d97d/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MarshallerMappingTransport.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MarshallerMappingTransport.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MarshallerMappingTransport.java
index 0db2b22..b80ae36 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MarshallerMappingTransport.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MarshallerMappingTransport.java
@@ -185,9 +185,6 @@ public final class MarshallerMappingTransport {
      */
     private class MappingExchangeResultFuture extends GridFutureAdapter<MappingExchangeResult> {
         /** */
-        private static final long serialVersionUID = 0L;
-
-        /** */
         private final MarshallerMappingItem mappingItem;
 
         /**

http://git-wip-us.apache.org/repos/asf/ignite/blob/6be8d97d/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentFuture.java
index c7d28fb..c87cc6e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentFuture.java
@@ -26,9 +26,6 @@ import org.apache.ignite.services.ServiceConfiguration;
  */
 public class GridServiceDeploymentFuture extends GridFutureAdapter<Object> {
     /** */
-    private static final long serialVersionUID = 0L;
-
-    /** */
     private final ServiceConfiguration cfg;
 
     /**

http://git-wip-us.apache.org/repos/asf/ignite/blob/6be8d97d/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridEmbeddedFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridEmbeddedFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridEmbeddedFuture.java
index 4a802cb..fa4e3bd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridEmbeddedFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridEmbeddedFuture.java
@@ -33,9 +33,6 @@ import org.apache.ignite.lang.IgniteOutClosure;
  */
 @SuppressWarnings({"NullableProblems"})
 public class GridEmbeddedFuture<A, B> extends GridFutureAdapter<A> {
-    /** */
-    private static final long serialVersionUID = 0L;
-
     /** Embedded future to wait for. */
     private IgniteInternalFuture<B> embedded;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/6be8d97d/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioEmbeddedFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioEmbeddedFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioEmbeddedFuture.java
index eab4909..dcb11b2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioEmbeddedFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioEmbeddedFuture.java
@@ -27,9 +27,6 @@ import org.jetbrains.annotations.Nullable;
  * Future that delegates to some other future.
  */
 public class GridNioEmbeddedFuture<R> extends GridNioFutureImpl<R> {
-    /** */
-    private static final long serialVersionUID = 0L;
-
     /**
      *
      */

http://git-wip-us.apache.org/repos/asf/ignite/blob/6be8d97d/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFutureImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFutureImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFutureImpl.java
index 6a94a54..3dadf10 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFutureImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFutureImpl.java
@@ -27,9 +27,6 @@ import org.apache.ignite.lang.IgniteInClosure;
  */
 public class GridNioFutureImpl<R> extends GridFutureAdapter<R> implements GridNioFuture<R> {
     /** */
-    private static final long serialVersionUID = 0L;
-
-    /** */
     private boolean msgThread;
 
     /** */

http://git-wip-us.apache.org/repos/asf/ignite/blob/6be8d97d/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
index 7f25e40..66993ea 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
@@ -2750,9 +2750,6 @@ public class GridNioServer<T> {
      */
     private static class NioOperationFuture<R> extends GridNioFutureImpl<R> implements SessionWriteRequest,
         SessionChangeRequest {
-        /** */
-        private static final long serialVersionUID = 0L;
-
         /** Socket channel in register request. */
         @GridToStringExclude
         private SocketChannel sockCh;

http://git-wip-us.apache.org/repos/asf/ignite/blob/6be8d97d/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 75323a2..d959dc6 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
@@ -25,9 +25,6 @@ import org.apache.ignite.internal.util.future.GridFutureAdapter;
  */
 public class GridWorkerFuture<T> extends GridFutureAdapter<T> {
     /** */
-    private static final long serialVersionUID = 0L;
-
-    /** */
     private GridWorker w;
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/ignite/blob/6be8d97d/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 769a02e..5ec9a6e 100755
--- 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
@@ -4021,9 +4021,6 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter implements Communicati
      *
      */
     private static class ConnectFuture extends GridFutureAdapter<GridCommunicationClient> {
-        /** */
-        private static final long serialVersionUID = 0L;
-
         // No-op.
     }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/6be8d97d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheP2PUndeploySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheP2PUndeploySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheP2PUndeploySelfTest.java
index b771bd3..8de8e04 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheP2PUndeploySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheP2PUndeploySelfTest.java
@@ -30,7 +30,6 @@ import org.apache.ignite.internal.IgniteKernal;
 import org.apache.ignite.internal.processors.cache.distributed.GridCacheModuloAffinityFunction;
 import org.apache.ignite.internal.util.lang.GridAbsPredicate;
 import org.apache.ignite.internal.util.typedef.F;
-import org.apache.ignite.internal.util.typedef.internal.CU;
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.marshaller.jdk.JdkMarshaller;
 import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
@@ -278,17 +277,6 @@ public class GridCacheP2PUndeploySelfTest extends GridCommonAbstractTest {
     }
 
     /**
-     * @param cacheName Cache name.
-     * @param grid Kernal.
-     * @return Name for swap space.
-     */
-    private String swapSpaceName(String cacheName, IgniteKernal grid) {
-        GridCacheContext<Object, Object> cctx = grid.internalCache(cacheName).context();
-
-        return CU.swapSpaceName(cctx.isNear() ? cctx.near().dht().context() : cctx);
-    }
-
-    /**
      * @param cache Cache.
      * @param timeout Timeout.
      * @return {@code True} if success.

http://git-wip-us.apache.org/repos/asf/ignite/blob/6be8d97d/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsFuture.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsFuture.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsFuture.java
index cfdd792..09947c7 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsFuture.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsFuture.java
@@ -24,9 +24,6 @@ import org.jetbrains.annotations.Nullable;
  * IGFS client future that holds response parse closure.
  */
 public class HadoopIgfsFuture<T> extends GridFutureAdapter<T> {
-    /** */
-    private static final long serialVersionUID = 0L;
-
     /** Output buffer. */
     private byte[] outBuf;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/6be8d97d/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/HadoopExternalTaskExecutor.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/HadoopExternalTaskExecutor.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/HadoopExternalTaskExecutor.java
index 6c338c8..a0c4cf7 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/HadoopExternalTaskExecutor.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/HadoopExternalTaskExecutor.java
@@ -882,9 +882,6 @@ public class HadoopExternalTaskExecutor extends HadoopTaskExecutorAdapter {
      *
      */
     private class HadoopProcessFuture extends GridFutureAdapter<IgniteBiTuple<Process, HadoopProcessDescriptor>> {
-        /** */
-        private static final long serialVersionUID = 0L;
-
         /** Child process ID. */
         private UUID childProcId;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/6be8d97d/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/DmlStatementsProcessor.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/DmlStatementsProcessor.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/DmlStatementsProcessor.java
index 5fee5ed..2a3d77c 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/DmlStatementsProcessor.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/DmlStatementsProcessor.java
@@ -253,7 +253,7 @@ public class DmlStatementsProcessor {
 
         UpdatePlan plan = UpdatePlanBuilder.planForStatement(p, null);
 
-        if (!F.eq(streamer.cacheName(), plan.tbl.rowDescriptor().context().namex()))
+        if (!F.eq(streamer.cacheName(), plan.tbl.rowDescriptor().context().name()))
             throw new IgniteSQLException("Cross cache streaming is not supported, please specify cache explicitly" +
                 " in connection options", IgniteQueryErrorCode.UNSUPPORTED_OPERATION);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/6be8d97d/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 1c49fc7..599baa1 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
@@ -1654,7 +1654,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
                 if (twoStepQry == null) {
                     if (DmlStatementsProcessor.isDmlStatement(prepared)) {
                         try {
-                            return dmlProc.updateSqlFieldsTwoStep(cctx.namexx(), stmt, qry, cancel);
+                            return dmlProc.updateSqlFieldsTwoStep(cctx.name(), stmt, qry, cancel);
                         }
                         catch (IgniteCheckedException e) {
                             throw new IgniteSQLException("Failed to execute DML statement [stmt=" + sqlQry +

http://git-wip-us.apache.org/repos/asf/ignite/blob/6be8d97d/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java
index 45d8f50..1444209 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java
@@ -618,7 +618,7 @@ public class GridMapQueryExecutor {
                                 "SQL query executed.",
                                 EVT_CACHE_QUERY_EXECUTED,
                                 CacheQueryType.SQL.name(),
-                                mainCctx.namex(),
+                                mainCctx.name(),
                                 null,
                                 qry.query(),
                                 null,
@@ -1169,7 +1169,7 @@ public class GridMapQueryExecutor {
                         "SQL fields query result set row read.",
                         EVT_CACHE_QUERY_OBJECT_READ,
                         CacheQueryType.SQL.name(),
-                        cctx.namex(),
+                        cctx.name(),
                         null,
                         qry.query(),
                         null,

http://git-wip-us.apache.org/repos/asf/ignite/blob/6be8d97d/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 bc3d40d..63a6164 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
@@ -581,7 +581,7 @@ class ScheduleFutureImpl<R> implements SchedulerFuture<R> {
     /** {@inheritDoc} */
     @SuppressWarnings("ExternalizableWithoutPublicNoArgConstructor")
     @Override public <T> IgniteFuture<T> chain(final IgniteClosure<? super IgniteFuture<R>, T> doneCb) {
-        final GridFutureAdapter<T> fut = new GridFutureAdapter<T>() {
+        final GridFutureAdapter<T> fut = new GridFutureAdapter() {
             @Override public String toString() {
                 return "ChainFuture[orig=" + ScheduleFutureImpl.this + ", doneCb=" + doneCb + ']';
             }


Mime
View raw message