ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [50/55] [abbrv] incubator-ignite git commit: # ignite-63
Date Fri, 23 Jan 2015 14:48:53 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/main/java/org/apache/ignite/cache/GridCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/GridCache.java b/modules/core/src/main/java/org/apache/ignite/cache/GridCache.java
new file mode 100644
index 0000000..d86b221
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/cache/GridCache.java
@@ -0,0 +1,278 @@
+/*
+ * 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.cache;
+
+import org.apache.ignite.*;
+import org.apache.ignite.cache.affinity.*;
+import org.apache.ignite.cache.datastructures.*;
+import org.apache.ignite.cache.store.CacheStore;
+import org.apache.ignite.lang.*;
+import org.apache.ignite.transactions.*;
+import org.jetbrains.annotations.*;
+
+import java.util.*;
+
+/**
+ * Main entry point for all <b>Data Grid APIs.</b> You can get a named cache by calling {@link org.apache.ignite.Ignite#cache(String)}
+ * method.
+ * <h1 class="header">Functionality</h1>
+ * This API extends {@link CacheProjection} API which contains vast majority of cache functionality
+ * and documentation. In addition to {@link CacheProjection} functionality this API provides:
+ * <ul>
+ * <li>
+ *  Various {@code 'loadCache(..)'} methods to load cache either synchronously or asynchronously.
+ *  These methods don't specify any keys to load, and leave it to the underlying storage to load cache
+ *  data based on the optionally passed in arguments.
+ * </li>
+ * <li>
+ *     Method {@link #affinity()} provides {@link org.apache.ignite.cache.affinity.CacheAffinityFunction} service for information on
+ *     data partitioning and mapping keys to grid nodes responsible for caching those keys.
+ * </li>
+ * <li>
+ *     Method {@link #dataStructures()} provides {@link org.apache.ignite.cache.datastructures.CacheDataStructures} service for
+ *     creating and working with distributed concurrent data structures, such as
+ *     {@link org.apache.ignite.cache.datastructures.CacheAtomicLong}, {@link org.apache.ignite.cache.datastructures.CacheAtomicReference}, {@link org.apache.ignite.cache.datastructures.CacheQueue}, etc.
+ * </li>
+ * <li>
+ *  Methods like {@code 'tx{Un}Synchronize(..)'} witch allow to get notifications for transaction state changes.
+ *  This feature is very useful when integrating cache transactions with some other in-house transactions.
+ * </li>
+ * <li>Method {@link #metrics()} to provide metrics for the whole cache.</li>
+ * <li>Method {@link #configuration()} to provide cache configuration bean.</li>
+ * </ul>
+ *
+ * @param <K> Cache key type.
+ * @param <V> Cache value type.
+ */
+public interface GridCache<K, V> extends CacheProjection<K, V> {
+    /**
+     * Gets configuration bean for this cache.
+     *
+     * @return Configuration bean for this cache.
+     */
+    public CacheConfiguration configuration();
+
+    /**
+     * Registers transactions synchronizations for all transactions started by this cache.
+     * Use it whenever you need to get notifications on transaction lifecycle and possibly change
+     * its course. It is also particularly useful when integrating cache transactions
+     * with some other in-house transactions.
+     *
+     * @param syncs Transaction synchronizations to register.
+     */
+    public void txSynchronize(@Nullable IgniteTxSynchronization syncs);
+
+    /**
+     * Removes transaction synchronizations.
+     *
+     * @param syncs Transactions synchronizations to remove.
+     * @see #txSynchronize(IgniteTxSynchronization)
+     */
+    public void txUnsynchronize(@Nullable IgniteTxSynchronization syncs);
+
+    /**
+     * Gets registered transaction synchronizations.
+     *
+     * @return Registered transaction synchronizations.
+     * @see #txSynchronize(IgniteTxSynchronization)
+     */
+    public Collection<IgniteTxSynchronization> txSynchronizations();
+
+    /**
+     * Gets affinity service to provide information about data partitioning
+     * and distribution.
+     *
+     * @return Cache data affinity service.
+     */
+    public CacheAffinity<K> affinity();
+
+    /**
+     * Gets data structures service to provide a gateway for creating various
+     * distributed data structures similar in APIs to {@code java.util.concurrent} package.
+     *
+     * @return Cache data structures service.
+     */
+    public CacheDataStructures dataStructures();
+
+    /**
+     * Gets metrics (statistics) for this cache.
+     *
+     * @return Cache metrics.
+     */
+    public CacheMetrics metrics();
+
+    /**
+     * Gets size (in bytes) of all entries swapped to disk.
+     *
+     * @return Size (in bytes) of all entries swapped to disk.
+     * @throws IgniteCheckedException In case of error.
+     */
+    public long overflowSize() throws IgniteCheckedException;
+
+    /**
+     * Gets number of cache entries stored in off-heap memory.
+     *
+     * @return Number of cache entries stored in off-heap memory.
+     */
+    public long offHeapEntriesCount();
+
+    /**
+     * Gets memory size allocated in off-heap.
+     *
+     * @return Allocated memory size.
+     */
+    public long offHeapAllocatedSize();
+
+    /**
+     * Gets size in bytes for swap space.
+     *
+     * @return Size in bytes.
+     * @throws IgniteCheckedException If failed.
+     */
+    public long swapSize() throws IgniteCheckedException;
+
+    /**
+     * Gets number of swap entries (keys).
+     *
+     * @return Number of entries stored in swap.
+     * @throws IgniteCheckedException If failed.
+     */
+    public long swapKeys() throws IgniteCheckedException;
+
+    /**
+     * Gets iterator over keys and values belonging to this cache swap space on local node. This
+     * iterator is thread-safe, which means that cache (and therefore its swap space)
+     * may be modified concurrently with iteration over swap.
+     * <p>
+     * Returned iterator supports {@code remove} operation which delegates to
+     * {@link #removex(Object, org.apache.ignite.lang.IgnitePredicate[])} method.
+     * <h2 class="header">Cache Flags</h2>
+     * This method is not available if any of the following flags are set on projection:
+     * {@link CacheFlag#SKIP_SWAP}.
+     *
+     * @return Iterator over keys.
+     * @throws IgniteCheckedException If failed.
+     * @see #promote(Object)
+     */
+    public Iterator<Map.Entry<K, V>> swapIterator() throws IgniteCheckedException;
+
+    /**
+     * Gets iterator over keys and values belonging to this cache off-heap memory on local node. This
+     * iterator is thread-safe, which means that cache (and therefore its off-heap memory)
+     * may be modified concurrently with iteration over off-heap. To achieve better performance
+     * the keys and values deserialized on demand, whenever accessed.
+     * <p>
+     * Returned iterator supports {@code remove} operation which delegates to
+     * {@link #removex(Object, org.apache.ignite.lang.IgnitePredicate[])} method.
+     *
+     * @return Iterator over keys.
+     * @throws IgniteCheckedException If failed.
+     */
+    public Iterator<Map.Entry<K, V>> offHeapIterator() throws IgniteCheckedException;
+
+    /**
+     * Delegates to {@link CacheStore#loadCache(org.apache.ignite.lang.IgniteBiInClosure,Object...)} method
+     * to load state from the underlying persistent storage. The loaded values
+     * will then be given to the optionally passed in predicate, and, if the predicate returns
+     * {@code true}, will be stored in cache. If predicate is {@code null}, then
+     * all loaded values will be stored in cache.
+     * <p>
+     * Note that this method does not receive keys as a parameter, so it is up to
+     * {@link CacheStore} implementation to provide all the data to be loaded.
+     * <p>
+     * This method is not transactional and may end up loading a stale value into
+     * cache if another thread has updated the value immediately after it has been
+     * loaded. It is mostly useful when pre-loading the cache from underlying
+     * data store before start, or for read-only caches.
+     *
+     * @param p Optional predicate (may be {@code null}). If provided, will be used to
+     *      filter values to be put into cache.
+     * @param ttl Time to live for loaded entries ({@code 0} for infinity).
+     * @param args Optional user arguments to be passed into
+     *      {@link CacheStore#loadCache(org.apache.ignite.lang.IgniteBiInClosure, Object...)} method.
+     * @throws IgniteCheckedException If loading failed.
+     */
+    public void loadCache(@Nullable IgniteBiPredicate<K, V> p, long ttl, @Nullable Object... args) throws IgniteCheckedException;
+
+    /**
+     * Asynchronously delegates to {@link CacheStore#loadCache(org.apache.ignite.lang.IgniteBiInClosure, Object...)} method
+     * to reload state from the underlying persistent storage. The reloaded values
+     * will then be given to the optionally passed in predicate, and if the predicate returns
+     * {@code true}, will be stored in cache. If predicate is {@code null}, then
+     * all reloaded values will be stored in cache.
+     * <p>
+     * Note that this method does not receive keys as a parameter, so it is up to
+     * {@link CacheStore} implementation to provide all the data to be loaded.
+     * <p>
+     * This method is not transactional and may end up loading a stale value into
+     * cache if another thread has updated the value immediately after it has been
+     * loaded. It is mostly useful when pre-loading the cache from underlying
+     * data store before start, or for read-only caches.
+     *
+     * @param p Optional predicate (may be {@code null}). If provided, will be used to
+     *      filter values to be put into cache.
+     * @param ttl Time to live for loaded entries ({@code 0} for infinity).
+     * @param args Optional user arguments to be passed into
+     *      {@link CacheStore#loadCache(org.apache.ignite.lang.IgniteBiInClosure,Object...)} method.
+     * @return Future to be completed whenever loading completes.
+     */
+    public IgniteFuture<?> loadCacheAsync(@Nullable IgniteBiPredicate<K, V> p, long ttl, @Nullable Object... args);
+
+    /**
+     * Gets a random entry out of cache. In the worst cache scenario this method
+     * has complexity of <pre>O(S * N/64)</pre> where {@code N} is the size of internal hash
+     * table and {@code S} is the number of hash table buckets to sample, which is {@code 5}
+     * by default. However, if the table is pretty dense, with density factor of {@code N/64},
+     * which is true for near fully populated caches, this method will generally perform significantly
+     * faster with complexity of O(S) where {@code S = 5}.
+     * <p>
+     * Note that this method is not available on {@link CacheProjection} API since it is
+     * impossible (or very hard) to deterministically return a number value when pre-filtering
+     * and post-filtering is involved (e.g. projection level predicate filters).
+     *
+     * @return Random entry, or {@code null} if cache is empty.
+     */
+    @Nullable public CacheEntry<K, V> randomEntry();
+
+    /**
+     * Forces this cache node to re-balance its partitions. This method is usually used when
+     * {@link CacheConfiguration#getPreloadPartitionedDelay()} configuration parameter has non-zero value.
+     * When many nodes are started or stopped almost concurrently, it is more efficient to delay
+     * preloading until the node topology is stable to make sure that no redundant re-partitioning
+     * happens.
+     * <p>
+     * In case of{@link CacheMode#PARTITIONED} caches, for better efficiency user should
+     * usually make sure that new nodes get placed on the same place of consistent hash ring as
+     * the left nodes, and that nodes are restarted before
+     * {@link CacheConfiguration#getPreloadPartitionedDelay() preloadDelay} expires. To place nodes
+     * on the same place in consistent hash ring, use
+     * {@link org.apache.ignite.cache.affinity.consistenthash.CacheConsistentHashAffinityFunction#setHashIdResolver(org.apache.ignite.cache.affinity.CacheAffinityNodeHashResolver)} to make sure that
+     * a node maps to the same hash ID if re-started.
+     * <p>
+     * See {@link CacheConfiguration#getPreloadPartitionedDelay()} for more information on how to configure
+     * preload re-partition delay.
+     * <p>
+     * @return Future that will be completed when preloading is finished.
+     */
+    public IgniteFuture<?> forceRepartition();
+
+    /**
+     * Resets metrics for current cache.
+     */
+    public void resetMetrics();
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/main/java/org/apache/ignite/cache/datastructures/CacheDataStructures.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/datastructures/CacheDataStructures.java b/modules/core/src/main/java/org/apache/ignite/cache/datastructures/CacheDataStructures.java
index fd2df8a..8a37203 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/datastructures/CacheDataStructures.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/datastructures/CacheDataStructures.java
@@ -27,7 +27,7 @@ import org.jetbrains.annotations.*;
  * know about the change. Or if you add an element to {@link CacheQueue} on one node,
  * you can poll it on another node.
  * <p>
- * You can get data structures facade by calling {@link org.apache.ignite.cache.Cache#dataStructures()} method.
+ * You can get data structures facade by calling {@link org.apache.ignite.cache.GridCache#dataStructures()} method.
  */
 public interface CacheDataStructures {
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/main/java/org/apache/ignite/cache/eviction/random/CacheRandomEvictionPolicy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/eviction/random/CacheRandomEvictionPolicy.java b/modules/core/src/main/java/org/apache/ignite/cache/eviction/random/CacheRandomEvictionPolicy.java
index 4b57f9e..afb582c 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/eviction/random/CacheRandomEvictionPolicy.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/eviction/random/CacheRandomEvictionPolicy.java
@@ -80,7 +80,7 @@ public class CacheRandomEvictionPolicy<K, V> implements CacheEvictionPolicy<K, V
         if (!entry.isCached())
             return;
 
-        Cache<K, V> cache = entry.projection().cache();
+        GridCache<K, V> cache = entry.projection().cache();
 
         int size = cache.size();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/main/java/org/apache/ignite/cache/store/CacheLoadOnlyStoreAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheLoadOnlyStoreAdapter.java b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheLoadOnlyStoreAdapter.java
index 8ab3964..cd4c7c6 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheLoadOnlyStoreAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheLoadOnlyStoreAdapter.java
@@ -100,7 +100,7 @@ public abstract class CacheLoadOnlyStoreAdapter<K, V, I> extends CacheStore<K, V
      * Note that returned iterator doesn't have to be thread-safe. Thus it could
      * operate on raw streams, DB connections, etc. without additional synchronization.
      *
-     * @param args Arguments passes into {@link org.apache.ignite.cache.Cache#loadCache(IgniteBiPredicate, long, Object...)} method.
+     * @param args Arguments passes into {@link org.apache.ignite.cache.GridCache#loadCache(IgniteBiPredicate, long, Object...)} method.
      * @return Iterator over input records.
      * @throws CacheLoaderException If iterator can't be created with the given arguments.
      */
@@ -113,7 +113,7 @@ public abstract class CacheLoadOnlyStoreAdapter<K, V, I> extends CacheStore<K, V
      * If {@code null} is returned then this record will be just skipped.
      *
      * @param rec A raw data record.
-     * @param args Arguments passed into {@link org.apache.ignite.cache.Cache#loadCache(IgniteBiPredicate, long, Object...)} method.
+     * @param args Arguments passed into {@link org.apache.ignite.cache.GridCache#loadCache(IgniteBiPredicate, long, Object...)} method.
      * @return Cache entry to be saved in cache or {@code null} if no entry could be produced from this record.
      */
     @Nullable protected abstract IgniteBiTuple<K, V> parse(I rec, @Nullable Object... args);
@@ -275,7 +275,7 @@ public abstract class CacheLoadOnlyStoreAdapter<K, V, I> extends CacheStore<K, V
         /**
          * @param c Closure for loaded entries.
          * @param buf Set of input records to process.
-         * @param args Arguments passed into {@link org.apache.ignite.cache.Cache#loadCache(IgniteBiPredicate, long, Object...)} method.
+         * @param args Arguments passed into {@link org.apache.ignite.cache.GridCache#loadCache(IgniteBiPredicate, long, Object...)} method.
          */
         Worker(IgniteBiInClosure<K, V> c, Collection<I> buf, Object[] args) {
             this.c = c;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStore.java b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStore.java
index c07124c..a07af51 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStore.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStore.java
@@ -131,7 +131,7 @@ public abstract class CacheStore<K, V> implements CacheLoader<K, V>, CacheWriter
     /**
      * Loads all values from underlying persistent storage. Note that keys are not
      * passed, so it is up to implementation to figure out what to load. This method
-     * is called whenever {@link org.apache.ignite.cache.Cache#loadCache(org.apache.ignite.lang.IgniteBiPredicate, long, Object...)}
+     * is called whenever {@link org.apache.ignite.cache.GridCache#loadCache(org.apache.ignite.lang.IgniteBiPredicate, long, Object...)}
      * method is invoked which is usually to preload the cache from persistent storage.
      * <p>
      * This method is optional, and cache implementation does not depend on this
@@ -144,7 +144,7 @@ public abstract class CacheStore<K, V> implements CacheLoader<K, V>, CacheWriter
      *
      * @param clo Closure for loaded values.
      * @param args Arguments passes into
-     *      {@link org.apache.ignite.cache.Cache#loadCache(org.apache.ignite.lang.IgniteBiPredicate, long, Object...)} method.
+     *      {@link org.apache.ignite.cache.GridCache#loadCache(org.apache.ignite.lang.IgniteBiPredicate, long, Object...)} method.
      * @throws CacheLoaderException If loading failed.
      */
     public abstract void loadCache(IgniteBiInClosure<K, V> clo, @Nullable Object... args) throws CacheLoaderException;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreAdapter.java b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreAdapter.java
index 883de61..c166480 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreAdapter.java
@@ -39,7 +39,7 @@ import java.util.*;
 public abstract class CacheStoreAdapter<K, V> extends CacheStore<K, V> {
     /**
      * Default empty implementation. This method needs to be overridden only if
-     * {@link org.apache.ignite.cache.Cache#loadCache(IgniteBiPredicate, long, Object...)} method
+     * {@link org.apache.ignite.cache.GridCache#loadCache(IgniteBiPredicate, long, Object...)} method
      * is explicitly called.
      *
      * @param clo {@inheritDoc}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/main/java/org/apache/ignite/internal/GridEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridEx.java b/modules/core/src/main/java/org/apache/ignite/internal/GridEx.java
index 0ec3aab..1eea09a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridEx.java
@@ -48,17 +48,17 @@ public interface GridEx extends Ignite, ClusterGroupEx, IgniteCluster {
      * @param name Cache name.
      * @return Cache instance for given name or <tt>null</tt> if one does not exist.
      */
-    @Nullable public <K, V> Cache<K, V> cachex(@Nullable String name);
+    @Nullable public <K, V> GridCache<K, V> cachex(@Nullable String name);
 
     /**
      * Gets default cache instance if one is configured or <tt>null</tt> otherwise returning even non-public caches.
-     * The {@link org.apache.ignite.cache.Cache#name()} method on default instance returns <tt>null</tt>.
+     * The {@link org.apache.ignite.cache.GridCache#name()} method on default instance returns <tt>null</tt>.
      *
      * @param <K> Key type.
      * @param <V> Value type.
      * @return Default cache instance.
      */
-    @Nullable public <K, V> Cache<K, V> cachex();
+    @Nullable public <K, V> GridCache<K, V> cachex();
 
     /**
      * Gets configured cache instance that satisfy all provided predicates including non-public caches. If no
@@ -67,7 +67,7 @@ public interface GridEx extends Ignite, ClusterGroupEx, IgniteCluster {
      * @param p Predicates. If none provided - all configured caches will be returned.
      * @return Configured cache instances that satisfy all provided predicates.
      */
-    public Collection<Cache<?, ?>> cachesx(@Nullable IgnitePredicate<? super Cache<?, ?>>... p);
+    public Collection<GridCache<?, ?>> cachesx(@Nullable IgnitePredicate<? super GridCache<?, ?>>... p);
 
     /**
      * Checks if the event type is user-recordable.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/main/java/org/apache/ignite/internal/GridKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernal.java
index 00e82cf..681009d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernal.java
@@ -2914,7 +2914,7 @@ public class GridKernal extends ClusterGroupAdapter implements GridEx, IgniteMBe
     }
 
     /** {@inheritDoc} */
-    @Override public <K, V> Cache<K, V> cache(@Nullable String name) {
+    @Override public <K, V> GridCache<K, V> cache(@Nullable String name) {
         guard();
 
         try {
@@ -2950,7 +2950,7 @@ public class GridKernal extends ClusterGroupAdapter implements GridEx, IgniteMBe
     }
 
     /** {@inheritDoc} */
-    @Override public Collection<Cache<?, ?>> caches() {
+    @Override public Collection<GridCache<?, ?>> caches() {
         guard();
 
         try {
@@ -2981,7 +2981,7 @@ public class GridKernal extends ClusterGroupAdapter implements GridEx, IgniteMBe
     }
 
     /** {@inheritDoc} */
-    @Override public <K, V> Cache<K, V> cachex(@Nullable String name) {
+    @Override public <K, V> GridCache<K, V> cachex(@Nullable String name) {
         guard();
 
         try {
@@ -2993,7 +2993,7 @@ public class GridKernal extends ClusterGroupAdapter implements GridEx, IgniteMBe
     }
 
     /** {@inheritDoc} */
-    @Override public <K, V> Cache<K, V> cachex() {
+    @Override public <K, V> GridCache<K, V> cachex() {
         guard();
 
         try {
@@ -3005,7 +3005,7 @@ public class GridKernal extends ClusterGroupAdapter implements GridEx, IgniteMBe
     }
 
     /** {@inheritDoc} */
-    @Override public Collection<Cache<?, ?>> cachesx(IgnitePredicate<? super Cache<?, ?>>[] p) {
+    @Override public Collection<GridCache<?, ?>> cachesx(IgnitePredicate<? super GridCache<?, ?>>[] p) {
         guard();
 
         try {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
index 133ddc6..c7e7e81 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
@@ -504,7 +504,7 @@ public abstract class GridManagerAdapter<T extends IgniteSpi> implements GridMan
                     @SuppressWarnings("unchecked")
                     @Nullable @Override public <V> V readValueFromOffheapAndSwap(@Nullable String spaceName,
                         Object key, @Nullable ClassLoader ldr) throws IgniteCheckedException {
-                        Cache<Object, V> cache = ctx.cache().cache(spaceName);
+                        GridCache<Object, V> cache = ctx.cache().cache(spaceName);
 
                         GridCacheContext cctx = ((GridCacheProxyImpl)cache).context();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/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 ccc8af7..a6f8301 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
@@ -71,7 +71,7 @@ import static org.apache.ignite.internal.processors.task.GridTaskThreadContextKe
  * Adapter for different cache implementations.
  */
 @SuppressWarnings("unchecked")
-public abstract class GridCacheAdapter<K, V> implements Cache<K, V>,
+public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
     GridCacheProjectionEx<K, V>, Externalizable {
     /** */
     private static final long serialVersionUID = 0L;
@@ -360,8 +360,8 @@ public abstract class GridCacheAdapter<K, V> implements Cache<K, V>,
 
     /** {@inheritDoc} */
     @SuppressWarnings({"unchecked", "RedundantCast"})
-    @Override public <K1, V1> Cache<K1, V1> cache() {
-        return (Cache<K1, V1>)this;
+    @Override public <K1, V1> GridCache<K1, V1> cache() {
+        return (GridCache<K1, V1>)this;
     }
 
     /** {@inheritDoc} */
@@ -5004,7 +5004,7 @@ public abstract class GridCacheAdapter<K, V> implements Cache<K, V>,
 
         /** {@inheritDoc} */
         @Override public Integer apply(Object o) {
-            Cache<Object, Object> cache = ((GridEx) ignite).cachex(cacheName);
+            GridCache<Object, Object> cache = ((GridEx) ignite).cachex(cacheName);
 
             return primaryOnly ? cache.primarySize() : cache.size();
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryImpl.java
index 51e702e..6d59e26 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryImpl.java
@@ -629,7 +629,7 @@ public class GridCacheEntryImpl<K, V> implements CacheEntry<K, V>, Externalizabl
 
                 // Delegate to near if dht.
                 if (e.isDht() && isNearEnabled(ctx)) {
-                    Cache<K, V> near = ctx.isDht() ? ctx.dht().near() : ctx.near();
+                    GridCache<K, V> near = ctx.isDht() ? ctx.dht().near() : ctx.near();
 
                     return near.isLockedByThread(key) || e.lockedByThread();
                 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMBeanAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMBeanAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMBeanAdapter.java
index c237bc7..9b8df4a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMBeanAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMBeanAdapter.java
@@ -21,7 +21,7 @@ import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
 
 /**
- * Management bean that provides access to {@link org.apache.ignite.cache.Cache}.
+ * Management bean that provides access to {@link org.apache.ignite.cache.GridCache}.
  */
 class GridCacheMBeanAdapter implements CacheMBean {
     /** Cache context. */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index 9b88422..a893ef3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -79,13 +79,13 @@ public class GridCacheProcessor extends GridProcessorAdapter {
     private final Map<String, GridCacheAdapter<?, ?>> caches;
 
     /** Map of proxies. */
-    private final Map<String, Cache<?, ?>> proxies;
+    private final Map<String, GridCache<?, ?>> proxies;
 
     /** Map of proxies. */
     private final Map<String, IgniteCacheProxy<?, ?>> jCacheProxies;
 
     /** Map of public proxies, i.e. proxies which could be returned to the user. */
-    private final Map<String, Cache<?, ?>> publicProxies;
+    private final Map<String, GridCache<?, ?>> publicProxies;
 
     /** Map of preload finish futures grouped by preload order. */
     private final NavigableMap<Integer, IgniteFuture<?>> preloadFuts;
@@ -1592,7 +1592,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
      * @param <V> type of values.
      * @return Default cache.
      */
-    public <K, V> Cache<K, V> cache() {
+    public <K, V> GridCache<K, V> cache() {
         return cache(null);
     }
 
@@ -1603,17 +1603,17 @@ public class GridCacheProcessor extends GridProcessorAdapter {
      * @return Cache instance for given name.
      */
     @SuppressWarnings("unchecked")
-    public <K, V> Cache<K, V> cache(@Nullable String name) {
+    public <K, V> GridCache<K, V> cache(@Nullable String name) {
         if (log.isDebugEnabled())
             log.debug("Getting cache for name: " + name);
 
-        return (Cache<K, V>)proxies.get(name);
+        return (GridCache<K, V>)proxies.get(name);
     }
 
     /**
      * @return All configured cache instances.
      */
-    public Collection<Cache<?, ?>> caches() {
+    public Collection<GridCache<?, ?>> caches() {
         return proxies.values();
     }
 
@@ -1622,7 +1622,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
      * @param <V> type of values.
      * @return Default cache.
      */
-    public <K, V> Cache<K, V> publicCache() {
+    public <K, V> GridCache<K, V> publicCache() {
         return publicCache(null);
     }
 
@@ -1642,7 +1642,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
      *
      * @return Utility cache.
      */
-    public <K, V> Cache<K, V> utilityCache() {
+    public <K, V> GridCache<K, V> utilityCache() {
         return cache(CU.UTILITY_CACHE_NAME);
     }
 
@@ -1653,14 +1653,14 @@ public class GridCacheProcessor extends GridProcessorAdapter {
      * @return Cache instance for given name.
      */
     @SuppressWarnings("unchecked")
-    public <K, V> Cache<K, V> publicCache(@Nullable String name) {
+    public <K, V> GridCache<K, V> publicCache(@Nullable String name) {
         if (log.isDebugEnabled())
             log.debug("Getting public cache for name: " + name);
 
         if (sysCaches.contains(name))
             throw new IllegalStateException("Failed to get cache because it is system cache: " + name);
 
-        Cache<K, V> cache = (Cache<K, V>)publicProxies.get(name);
+        GridCache<K, V> cache = (GridCache<K, V>)publicProxies.get(name);
 
         if (cache == null)
             throw new IllegalArgumentException("Cache is not configured: " + name);
@@ -1707,7 +1707,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
     /**
      * @return All configured public cache instances.
      */
-    public Collection<Cache<?, ?>> publicCaches() {
+    public Collection<GridCache<?, ?>> publicCaches() {
         return publicProxies.values();
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
index c5b1a46..6e7ce4c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
@@ -371,8 +371,8 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V
 
     /** {@inheritDoc} */
     @SuppressWarnings( {"unchecked", "RedundantCast"})
-    @Override public <K1, V1> Cache<K1, V1> cache() {
-        return (Cache<K1, V1>)cctx.cache();
+    @Override public <K1, V1> GridCache<K1, V1> cache() {
+        return (GridCache<K1, V1>)cctx.cache();
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxy.java
index 386542d..41d8656 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxy.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxy.java
@@ -22,6 +22,6 @@ import org.apache.ignite.cache.*;
 /**
  * Cache proxy marker interface.
  */
-public interface GridCacheProxy<K, V> extends Cache<K, V>, GridCacheProjectionEx<K, V> {
+public interface GridCacheProxy<K, V> extends GridCache<K, V>, GridCacheProjectionEx<K, V> {
     // No-op.
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
index 0483c61..44bdc3f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
@@ -134,7 +134,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali
     }
 
     /** {@inheritDoc} */
-    @Override public <K1, V1> Cache<K1, V1> cache() {
+    @Override public <K1, V1> GridCache<K1, V1> cache() {
         return cache.cache();
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStore.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStore.java
index 655f61a..a31d3b5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStore.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStore.java
@@ -373,7 +373,7 @@ public class GridCacheWriteBehindStore<K, V> extends CacheStore<K, V> implements
 
     /**
      * Default empty implementation. This method needs to be overridden only if
-     * {@link org.apache.ignite.cache.Cache#loadCache(org.apache.ignite.lang.IgniteBiPredicate, long, Object...)} method
+     * {@link org.apache.ignite.cache.GridCache#loadCache(org.apache.ignite.lang.IgniteBiPredicate, long, Object...)} method
      * is explicitly called.
      *
      * @param clo {@inheritDoc}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheDataStructuresManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheDataStructuresManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheDataStructuresManager.java
index c556a3e..c0fa767 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheDataStructuresManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheDataStructuresManager.java
@@ -1206,7 +1206,7 @@ public final class GridCacheDataStructuresManager<K, V> extends GridCacheManager
     private boolean removeSet0(String name) throws IgniteCheckedException {
         GridCacheSetHeaderKey key = new GridCacheSetHeaderKey(name);
 
-        Cache cache = cctx.cache();
+        GridCache cache = cctx.cache();
 
         GridCacheSetHeader hdr = retryRemove(cache, key);
 
@@ -1291,7 +1291,7 @@ public final class GridCacheDataStructuresManager<K, V> extends GridCacheManager
         if (set == null)
             return;
 
-        Cache cache = cctx.cache();
+        GridCache cache = cctx.cache();
 
         final int BATCH_SIZE = 100;
 
@@ -1358,7 +1358,7 @@ public final class GridCacheDataStructuresManager<K, V> extends GridCacheManager
      * @return Removed value.
      */
     @SuppressWarnings("unchecked")
-    @Nullable private <T> T retryRemove(final Cache cache, final Object key) throws IgniteCheckedException {
+    @Nullable private <T> T retryRemove(final GridCache cache, final Object key) throws IgniteCheckedException {
         return retry(new Callable<T>() {
             @Nullable @Override public T call() throws Exception {
                 return (T)cache.remove(key);
@@ -1372,7 +1372,7 @@ public final class GridCacheDataStructuresManager<K, V> extends GridCacheManager
      * @throws IgniteCheckedException If failed.
      */
     @SuppressWarnings("unchecked")
-    private void retryRemoveAll(final Cache cache, final Collection<GridCacheSetItemKey> keys)
+    private void retryRemoveAll(final GridCache cache, final Collection<GridCacheSetItemKey> keys)
         throws IgniteCheckedException {
         retry(new Callable<Void>() {
             @Override public Void call() throws Exception {
@@ -1391,7 +1391,7 @@ public final class GridCacheDataStructuresManager<K, V> extends GridCacheManager
      * @return Previous value.
      */
     @SuppressWarnings("unchecked")
-    @Nullable private <T> T retryPutIfAbsent(final Cache cache, final Object key, final T val)
+    @Nullable private <T> T retryPutIfAbsent(final GridCache cache, final Object key, final T val)
         throws IgniteCheckedException {
         return retry(new Callable<T>() {
             @Nullable @Override public T call() throws Exception {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetImpl.java
index b6f5723..80151ec 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetImpl.java
@@ -51,7 +51,7 @@ public class GridCacheSetImpl<T> extends AbstractCollection<T> implements CacheS
     private final GridCacheContext ctx;
 
     /** Cache. */
-    private final Cache<GridCacheSetItemKey, Boolean> cache;
+    private final GridCache<GridCacheSetItemKey, Boolean> cache;
 
     /** Logger. */
     private final IgniteLogger log;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/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 dd94a4e..5a0df9b 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
@@ -1883,13 +1883,13 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
             final GridKernalContext ctx = ((GridKernal) ignite).context();
 
             Collection<String> cacheNames = F.viewReadOnly(ctx.cache().caches(),
-                new C1<Cache<?, ?>, String>() {
-                    @Override public String apply(Cache<?, ?> c) {
+                new C1<GridCache<?, ?>, String>() {
+                    @Override public String apply(GridCache<?, ?> c) {
                         return c.name();
                     }
                 },
-                new P1<Cache<?, ?>>() {
-                    @Override public boolean apply(Cache<?, ?> c) {
+                new P1<GridCache<?, ?>>() {
+                    @Override public boolean apply(GridCache<?, ?> c) {
                         return !CU.UTILITY_CACHE_NAME.equals(c.name());
                     }
                 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java
index 38df988..64fc88e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java
@@ -104,7 +104,7 @@ public class GridCacheQueryJdbcMetadataTask extends ComputeTaskAdapter<String, b
             byte[] data;
 
             try {
-                Cache<?, ?> cache = ((GridEx) ignite).cachex(cacheName);
+                GridCache<?, ?> cache = ((GridEx) ignite).cachex(cacheName);
 
                 assert cache != null;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java
index 40cd03e..5371504 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java
@@ -192,7 +192,7 @@ public class GridCacheQueryJdbcTask extends ComputeTaskAdapter<byte[], byte[]> {
                 assert args != null;
                 assert futId == null;
 
-                Cache<?, ?> cache = ((GridEx) ignite).cachex(cacheName);
+                GridCache<?, ?> cache = ((GridEx) ignite).cachex(cacheName);
 
                 CacheQuery<List<?>> qry =
                     ((GridCacheQueriesEx<?, ?>)cache.queries()).createSqlFieldsQuery(sql, true);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoadCacheUpdaters.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoadCacheUpdaters.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoadCacheUpdaters.java
index 8217e8d..34f0b88 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoadCacheUpdaters.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoadCacheUpdaters.java
@@ -49,8 +49,8 @@ public class GridDataLoadCacheUpdaters {
     private static final IgniteDataLoadCacheUpdater GROUP_LOCKED = new GroupLocked();
 
     /**
-     * Updates cache using independent {@link org.apache.ignite.cache.Cache#put(Object, Object, org.apache.ignite.lang.IgnitePredicate[])} and
-     * {@link org.apache.ignite.cache.Cache#remove(Object, org.apache.ignite.lang.IgnitePredicate[])} operations. Thus it is safe from deadlocks but performance
+     * Updates cache using independent {@link org.apache.ignite.cache.GridCache#put(Object, Object, org.apache.ignite.lang.IgnitePredicate[])} and
+     * {@link org.apache.ignite.cache.GridCache#remove(Object, org.apache.ignite.lang.IgnitePredicate[])} operations. Thus it is safe from deadlocks but performance
      * is not the best.
      *
      * @return Single updater.
@@ -60,8 +60,8 @@ public class GridDataLoadCacheUpdaters {
     }
 
     /**
-     * Updates cache using batched methods {@link org.apache.ignite.cache.Cache#putAll(Map, org.apache.ignite.lang.IgnitePredicate[])} and
-     * {@link org.apache.ignite.cache.Cache#removeAll(Collection, org.apache.ignite.lang.IgnitePredicate[])}. Can cause deadlocks if the same keys are getting
+     * Updates cache using batched methods {@link org.apache.ignite.cache.GridCache#putAll(Map, org.apache.ignite.lang.IgnitePredicate[])} and
+     * {@link org.apache.ignite.cache.GridCache#removeAll(Collection, org.apache.ignite.lang.IgnitePredicate[])}. Can cause deadlocks if the same keys are getting
      * updated concurrently. Performance is generally better than in {@link #individual()}.
      *
      * @return Batched updater.
@@ -71,8 +71,8 @@ public class GridDataLoadCacheUpdaters {
     }
 
     /**
-     * Updates cache using batched methods {@link org.apache.ignite.cache.Cache#putAll(Map, org.apache.ignite.lang.IgnitePredicate[])} and
-     * {@link org.apache.ignite.cache.Cache#removeAll(Collection, org.apache.ignite.lang.IgnitePredicate[])}. Keys are sorted in natural order and if all updates
+     * Updates cache using batched methods {@link org.apache.ignite.cache.GridCache#putAll(Map, org.apache.ignite.lang.IgnitePredicate[])} and
+     * {@link org.apache.ignite.cache.GridCache#removeAll(Collection, org.apache.ignite.lang.IgnitePredicate[])}. Keys are sorted in natural order and if all updates
      * use the same rule deadlock can not happen. Performance is generally better than in {@link #individual()}.
      *
      * @return Batched sorted updater.
@@ -82,8 +82,8 @@ public class GridDataLoadCacheUpdaters {
     }
 
     /**
-     * Updates cache using batched methods {@link org.apache.ignite.cache.Cache#putAll(Map, org.apache.ignite.lang.IgnitePredicate[])} and
-     * {@link org.apache.ignite.cache.Cache#removeAll(Collection, org.apache.ignite.lang.IgnitePredicate[])} in group lock transaction. Requires that there are no
+     * Updates cache using batched methods {@link org.apache.ignite.cache.GridCache#putAll(Map, org.apache.ignite.lang.IgnitePredicate[])} and
+     * {@link org.apache.ignite.cache.GridCache#removeAll(Collection, org.apache.ignite.lang.IgnitePredicate[])} in group lock transaction. Requires that there are no
      * concurrent updates other than in group lock.
      *
      * @return Updater with group lock.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManager.java
index ce7b3fc..44623fb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManager.java
@@ -68,7 +68,7 @@ public class GridGgfsDataManager extends GridGgfsManager {
     private GridCacheProjectionEx<GridGgfsBlockKey, byte[]> dataCachePrj;
 
     /** Data cache. */
-    private Cache<Object, Object> dataCache;
+    private GridCache<Object, Object> dataCache;
 
     /** */
     private IgniteFuture<?> dataCacheStartFut;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsMetaManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsMetaManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsMetaManager.java
index 868eb95..feb86a0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsMetaManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsMetaManager.java
@@ -52,7 +52,7 @@ public class GridGgfsMetaManager extends GridGgfsManager {
     private IgniteFsConfiguration cfg;
 
     /** Metadata cache. */
-    private Cache<Object, Object> metaCache;
+    private GridCache<Object, Object> metaCache;
 
     /** */
     private IgniteFuture<?> metaCacheStartFut;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgniteFsProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgniteFsProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgniteFsProcessor.java
index 3ed8569..cc21789 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgniteFsProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgniteFsProcessor.java
@@ -319,7 +319,7 @@ public class IgniteFsProcessor extends IgniteFsProcessorAdapter {
             if (dataCache.configuration().isQueryIndexEnabled())
                 throw new IgniteCheckedException("GGFS data cache cannot start with enabled query indexing.");
 
-            Cache<Object, Object> metaCache = ctx.cache().cache(cfg.getMetaCacheName());
+            GridCache<Object, Object> metaCache = ctx.cache().cache(cfg.getMetaCacheName());
 
             if (metaCache == null)
                 throw new IgniteCheckedException("Metadata cache is not configured locally for GGFS: " + cfg);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
index 6929833..8a69d1b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
@@ -605,7 +605,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
      * @throws IgniteCheckedException If cache not found.
      */
     private static GridCacheProjectionEx<Object, Object> cache(Ignite ignite, String cacheName) throws IgniteCheckedException {
-        Cache<Object, Object> cache = ignite.cache(cacheName);
+        GridCache<Object, Object> cache = ignite.cache(cacheName);
 
         if (cache == null)
             throw new IgniteCheckedException(

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
index 9ecc329..3e4fd5c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
@@ -82,7 +82,7 @@ public class GridTaskProcessor extends GridProcessorAdapter {
     private final GridSpinReadWriteLock lock = new GridSpinReadWriteLock();
 
     /** Internal metadata cache. */
-    private Cache<GridTaskNameHashKey, String> tasksMetaCache;
+    private GridCache<GridTaskNameHashKey, String> tasksMetaCache;
 
     /**
      * @param ctx Kernal context.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java
index 98a039f..f49ab87 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java
@@ -33,7 +33,7 @@ import java.io.*;
 import java.util.*;
 
 /**
- * Data transfer object for {@link org.apache.ignite.cache.Cache}.
+ * Data transfer object for {@link org.apache.ignite.cache.GridCache}.
  */
 public class VisorCache implements Serializable {
     /** */
@@ -97,7 +97,7 @@ public class VisorCache implements Serializable {
      * @return Data transfer object for given cache.
      * @throws IgniteCheckedException
      */
-    public static VisorCache from(Ignite g, Cache c, int sample) throws IgniteCheckedException {
+    public static VisorCache from(Ignite g, GridCache c, int sample) throws IgniteCheckedException {
         assert g != null;
         assert c != null;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheClearTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheClearTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheClearTask.java
index 4753cb7..b59a3ff 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheClearTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheClearTask.java
@@ -60,7 +60,7 @@ public class VisorCacheClearTask extends VisorOneNodeTask<Set<String>, Map<Strin
         @Override protected Map<String, IgniteBiTuple<Integer, Integer>> run(Set<String> arg) throws IgniteCheckedException {
             Map<String, IgniteBiTuple<Integer, Integer>> res = new HashMap<>();
 
-            for(Cache cache : g.cachesx()) {
+            for(GridCache cache : g.cachesx()) {
                 String cacheName = cache.name();
 
                 if (arg.contains(cacheName)) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheCompactTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheCompactTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheCompactTask.java
index 70216b2..6a28a73 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheCompactTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheCompactTask.java
@@ -58,7 +58,7 @@ public class VisorCacheCompactTask extends VisorOneNodeTask<Set<String>, Map<Str
         @Override protected Map<String, IgniteBiTuple<Integer, Integer>> run(Set<String> names) throws IgniteCheckedException {
             final Map<String, IgniteBiTuple<Integer, Integer>> res = new HashMap<>();
 
-            for(Cache cache : g.cachesx()) {
+            for(GridCache cache : g.cachesx()) {
                 String cacheName = cache.name();
 
                 if (names.contains(cacheName)) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheLoadTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheLoadTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheLoadTask.java
index 37adb5d..e946d06 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheLoadTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheLoadTask.java
@@ -63,7 +63,7 @@ public class VisorCacheLoadTask extends
 
             Map<String, Integer> res = new HashMap<>();
 
-            for (Cache c: g.cachesx()) {
+            for (GridCache c: g.cachesx()) {
                 String cacheName = c.name();
 
                 if (cacheNames.contains(cacheName)) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetadataTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetadataTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetadataTask.java
index 9abb55d..489e225 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetadataTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetadataTask.java
@@ -57,7 +57,7 @@ public class VisorCacheMetadataTask extends VisorOneNodeTask<String, GridCacheSq
 
         /** {@inheritDoc} */
         @Override protected GridCacheSqlMetadata run(String cacheName) throws IgniteCheckedException {
-            Cache<Object, Object> cache = g.cachex(cacheName);
+            GridCache<Object, Object> cache = g.cachex(cacheName);
 
             if (cache != null) {
                 GridCacheQueriesEx<Object, Object> queries = (GridCacheQueriesEx<Object, Object>) cache.queries();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetrics.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetrics.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetrics.java
index fdf7826..f8c76c3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetrics.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetrics.java
@@ -97,7 +97,7 @@ public class VisorCacheMetrics implements Serializable {
      * @param c Cache.
      * @return Data transfer object for given cache metrics.
      */
-    public static VisorCacheMetrics from(Cache c) {
+    public static VisorCacheMetrics from(GridCache c) {
         VisorCacheMetrics cm = new VisorCacheMetrics();
 
         CacheMetrics m = c.metrics();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java
index 63270d4..273a61c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java
@@ -90,12 +90,12 @@ public class VisorCacheMetricsCollectorTask extends VisorMultiNodeTask<IgniteBiT
         /** {@inheritDoc} */
         @Override protected Map<String, VisorCacheMetrics>
             run(IgniteBiTuple<Boolean, String> arg) throws IgniteCheckedException {
-            Collection<? extends Cache<?, ?>> caches = arg.get1() ? g.cachesx() : F.asList(g.cachex(arg.get2()));
+            Collection<? extends GridCache<?, ?>> caches = arg.get1() ? g.cachesx() : F.asList(g.cachex(arg.get2()));
 
             if (caches != null) {
                 Map<String, VisorCacheMetrics> res = U.newHashMap(caches.size());
 
-                for (Cache<?, ?> c : caches)
+                for (GridCache<?, ?> c : caches)
                     res.put(c.name(), VisorCacheMetrics.from(c));
 
                 return res;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCachePreloadTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCachePreloadTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCachePreloadTask.java
index 9de92fc..4d4b8ce 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCachePreloadTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCachePreloadTask.java
@@ -58,7 +58,7 @@ public class VisorCachePreloadTask extends VisorOneNodeTask<Set<String>, Void> {
         @Override protected Void run(Set<String> cacheNames) throws IgniteCheckedException {
             Collection<IgniteFuture<?>> futs = new ArrayList<>();
 
-            for(Cache c : g.cachesx()) {
+            for(GridCache c : g.cachesx()) {
                 if (cacheNames.contains(c.name()))
                     futs.add(c.forceRepartition());
             }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheResetMetricsTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheResetMetricsTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheResetMetricsTask.java
index 7cfd085..3b0a695 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheResetMetricsTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheResetMetricsTask.java
@@ -53,7 +53,7 @@ public class VisorCacheResetMetricsTask extends VisorOneNodeTask<String, Void> {
 
         /** {@inheritDoc} */
         @Override protected Void run(String cacheName) throws IgniteCheckedException {
-            Cache cache = g.cachex(cacheName);
+            GridCache cache = g.cachex(cacheName);
 
             if (cache != null)
                 cache.resetMetrics();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheSwapBackupsTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheSwapBackupsTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheSwapBackupsTask.java
index 39877e0..23ba94f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheSwapBackupsTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheSwapBackupsTask.java
@@ -62,7 +62,7 @@ public class VisorCacheSwapBackupsTask extends VisorOneNodeTask<Set<String>, Map
         @Override protected Map<String, IgniteBiTuple<Integer, Integer>> run(Set<String> names) throws IgniteCheckedException {
             Map<String, IgniteBiTuple<Integer, Integer>> total = new HashMap<>();
 
-            for (Cache c: g.cachesx()) {
+            for (GridCache c: g.cachesx()) {
                 String cacheName = c.name();
 
                 if (names.contains(cacheName)) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
index 639f201..f00f47b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
@@ -99,7 +99,7 @@ public class VisorNodeDataCollectorJob extends VisorJob<VisorNodeDataCollectorTa
         try {
             IgniteConfiguration cfg = g.configuration();
 
-            for (Cache cache : g.cachesx()) {
+            for (GridCache cache : g.cachesx()) {
                 String cacheName = cache.name();
 
                 if (arg.systemCaches() || !(isSystemCache(cacheName) || isGgfsCache(cfg, cacheName))) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java
index d0deaea..3925dd0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java
@@ -196,7 +196,7 @@ public class VisorQueryTask extends VisorOneNodeTask<VisorQueryTask.VisorQueryAr
                 String qryId = (scan ? VisorQueryUtils.SCAN_QRY_NAME : VisorQueryUtils.SQL_QRY_NAME) + "-" +
                     UUID.randomUUID();
 
-                Cache<Object, Object> c = g.cachex(arg.cacheName());
+                GridCache<Object, Object> c = g.cachex(arg.cacheName());
 
                 if (c == null)
                     return new IgniteBiTuple<>(new IgniteCheckedException("Cache not found: " +

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/main/java/org/apache/ignite/lang/IgnitePredicate.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgnitePredicate.java b/modules/core/src/main/java/org/apache/ignite/lang/IgnitePredicate.java
index ac4dd49..929d335 100644
--- a/modules/core/src/main/java/org/apache/ignite/lang/IgnitePredicate.java
+++ b/modules/core/src/main/java/org/apache/ignite/lang/IgnitePredicate.java
@@ -23,7 +23,7 @@ import java.io.*;
  * Defines a predicate which accepts a parameter and returns {@code true} or {@code false}. In
  * GridGain, predicates are generally used for filtering nodes within grid projections, or for
  * providing atomic filters when performing cache operation, like in
- * {@link org.apache.ignite.cache.Cache#put(Object, Object, IgnitePredicate[])} method.
+ * {@link org.apache.ignite.cache.GridCache#put(Object, Object, IgnitePredicate[])} method.
  *
  * @param <E> Type of predicate parameter.
  */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/main/java/org/apache/ignite/streamer/router/StreamerCacheAffinityEventRouter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/streamer/router/StreamerCacheAffinityEventRouter.java b/modules/core/src/main/java/org/apache/ignite/streamer/router/StreamerCacheAffinityEventRouter.java
index 28579ff..e0bd722 100644
--- a/modules/core/src/main/java/org/apache/ignite/streamer/router/StreamerCacheAffinityEventRouter.java
+++ b/modules/core/src/main/java/org/apache/ignite/streamer/router/StreamerCacheAffinityEventRouter.java
@@ -58,7 +58,7 @@ public class StreamerCacheAffinityEventRouter extends StreamerEventRouterAdapter
         if (evt instanceof CacheAffinityEvent) {
             CacheAffinityEvent e = (CacheAffinityEvent)evt;
 
-            Cache<Object, Object> c = ((GridEx) ignite).cachex(e.cacheName());
+            GridCache<Object, Object> c = ((GridEx) ignite).cachex(e.cacheName());
 
             assert c != null;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxSynchronization.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxSynchronization.java b/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxSynchronization.java
index 8553d02..756e23e 100644
--- a/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxSynchronization.java
+++ b/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxSynchronization.java
@@ -22,7 +22,7 @@ import org.jetbrains.annotations.*;
 /**
  * Synchronization callback for transaction. You can subscribe to receive transaction
  * state change callbacks by registering transaction synchronization via
- * {@link org.apache.ignite.cache.Cache#txSynchronize(IgniteTxSynchronization)} method.
+ * {@link org.apache.ignite.cache.GridCache#txSynchronize(IgniteTxSynchronization)} method.
  */
 public interface IgniteTxSynchronization {
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/GridCacheAffinityBackupsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/GridCacheAffinityBackupsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/GridCacheAffinityBackupsSelfTest.java
index 0a4729c..1c40c71 100644
--- a/modules/core/src/test/java/org/apache/ignite/GridCacheAffinityBackupsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/GridCacheAffinityBackupsSelfTest.java
@@ -90,7 +90,7 @@ public class GridCacheAffinityBackupsSelfTest extends GridCommonAbstractTest {
         startGrids(nodesCnt);
 
         try {
-            Cache<Object, Object> cache = grid(0).cache(null);
+            GridCache<Object, Object> cache = grid(0).cache(null);
 
             Collection<UUID> members = new HashSet<>();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/GridCacheJdbcBlobStoreMultithreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/GridCacheJdbcBlobStoreMultithreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/GridCacheJdbcBlobStoreMultithreadedSelfTest.java
index 8337f7c..38a87e4 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/GridCacheJdbcBlobStoreMultithreadedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/GridCacheJdbcBlobStoreMultithreadedSelfTest.java
@@ -118,7 +118,7 @@ public class GridCacheJdbcBlobStoreMultithreadedSelfTest extends GridCommonAbstr
 
             @Override public Object call() throws Exception {
                 for (int i = 0; i < TX_CNT; i++) {
-                    Cache<Integer, String> cache = cache(rnd.nextInt(GRID_CNT));
+                    GridCache<Integer, String> cache = cache(rnd.nextInt(GRID_CNT));
 
                     cache.put(rnd.nextInt(1000), "value");
                 }
@@ -132,7 +132,7 @@ public class GridCacheJdbcBlobStoreMultithreadedSelfTest extends GridCommonAbstr
 
             @Override public Object call() throws Exception {
                 for (int i = 0; i < TX_CNT; i++) {
-                    Cache<Integer, String> cache = cache(rnd.nextInt(GRID_CNT));
+                    GridCache<Integer, String> cache = cache(rnd.nextInt(GRID_CNT));
 
                     cache.putIfAbsent(rnd.nextInt(1000), "value");
                 }
@@ -161,7 +161,7 @@ public class GridCacheJdbcBlobStoreMultithreadedSelfTest extends GridCommonAbstr
                     for (int j = 0; j < 10; j++)
                         map.put(rnd.nextInt(1000), "value");
 
-                    Cache<Integer, String> cache = cache(rnd.nextInt(GRID_CNT));
+                    GridCache<Integer, String> cache = cache(rnd.nextInt(GRID_CNT));
 
                     cache.putAll(map);
                 }
@@ -182,7 +182,7 @@ public class GridCacheJdbcBlobStoreMultithreadedSelfTest extends GridCommonAbstr
 
             @Override public Object call() throws Exception {
                 for (int i = 0; i < TX_CNT; i++) {
-                    Cache<Integer, String> cache = cache(rnd.nextInt(GRID_CNT));
+                    GridCache<Integer, String> cache = cache(rnd.nextInt(GRID_CNT));
 
                     try (IgniteTx tx = cache.txStart()) {
                         cache.put(1, "value");

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/fs/GridGgfsFragmentizerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/fs/GridGgfsFragmentizerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/fs/GridGgfsFragmentizerSelfTest.java
index e6b6c0b..dacb3c8 100644
--- a/modules/core/src/test/java/org/apache/ignite/fs/GridGgfsFragmentizerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/fs/GridGgfsFragmentizerSelfTest.java
@@ -245,7 +245,7 @@ public class GridGgfsFragmentizerSelfTest extends GridGgfsFragmentizerAbstractSe
                 for (int i = 0; i < NODE_CNT; i++) {
                     GridEx g = grid(i);
 
-                    Cache<Object, Object> cache = g.cachex(DATA_CACHE_NAME);
+                    GridCache<Object, Object> cache = g.cachex(DATA_CACHE_NAME);
 
                     assertTrue("Data cache is not empty [keys=" + cache.keySet() +
                         ", node=" + g.localNode().id() + ']', cache.isEmpty());

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentMessageCountSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentMessageCountSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentMessageCountSelfTest.java
index 9a20c2a..a5b3100 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentMessageCountSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentMessageCountSelfTest.java
@@ -130,7 +130,7 @@ public class GridDeploymentMessageCountSelfTest extends GridCommonAbstractTest {
         try {
             startGrids(2);
 
-            Cache<Object, Object> cache = grid(0).cache(null);
+            GridCache<Object, Object> cache = grid(0).cache(null);
 
             cache.put("key", valCls.newInstance());
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java
index 5e17965..e4de7c1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java
@@ -125,7 +125,7 @@ public abstract class GridAffinityProcessorAbstractSelfTest extends GridCommonAb
             }
         }, IllegalArgumentException.class, null);
 
-        Cache<Integer, Integer> cache = grid2.cache(CACHE_NAME);
+        GridCache<Integer, Integer> cache = grid2.cache(CACHE_NAME);
 
         assertNotNull(cache);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFlagsTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFlagsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFlagsTest.java
index 9a396f7..2ec9e7c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFlagsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFlagsTest.java
@@ -78,7 +78,7 @@ public abstract class GridCacheAbstractFlagsTest extends GridCacheAbstractSelfTe
                 @Override public Object call() throws Exception {
                     int idx = cntr.getAndIncrement() % gridCount();
 
-                    Cache<String, Integer> c = cache(idx);
+                    GridCache<String, Integer> c = cache(idx);
 
                     l.await();
 


Mime
View raw message