ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [44/61] [abbrv] incubator-ignite git commit: # ignite-63
Date Fri, 23 Jan 2015 16:12:09 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/lang/GridFuncSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/lang/GridFuncSelfTest.java b/modules/core/src/test/java/org/apache/ignite/lang/GridFuncSelfTest.java
index ebbf30f..fe3f031 100644
--- a/modules/core/src/test/java/org/apache/ignite/lang/GridFuncSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/lang/GridFuncSelfTest.java
@@ -2719,7 +2719,7 @@ public class GridFuncSelfTest extends GridCommonAbstractTest {
         Ignite g = startGrid(1);
 
         try {
-            Cache<String, String> cache = g.cache(null);
+            GridCache<String, String> cache = g.cache(null);
 
             cache.put("k1", "v1");
             cache.put("k2", "v2");
@@ -2741,7 +2741,7 @@ public class GridFuncSelfTest extends GridCommonAbstractTest {
         Ignite g = startGrid(1);
 
         try {
-            Cache<String, String> cache = g.cache(null);
+            GridCache<String, String> cache = g.cache(null);
 
             cache.put("k1", "v1");
 
@@ -2778,7 +2778,7 @@ public class GridFuncSelfTest extends GridCommonAbstractTest {
         Ignite g = startGrid(1);
 
         try {
-            Cache<String, String> cache = g.cache(null);
+            GridCache<String, String> cache = g.cache(null);
 
             cache.put("k1", "v1");
             cache.put("k2", "v2");
@@ -2809,7 +2809,7 @@ public class GridFuncSelfTest extends GridCommonAbstractTest {
         Ignite g = startGrid(1);
 
         try {
-            Cache<String, String> cache = g.cache(null);
+            GridCache<String, String> cache = g.cache(null);
 
             cache.put("k1", "v1");
             cache.put("k2", "v2");

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheAbstractLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheAbstractLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheAbstractLoadTest.java
index 037f50e..f6b5904 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheAbstractLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheAbstractLoadTest.java
@@ -131,7 +131,7 @@ abstract class GridCacheAbstractLoadTest {
 
         Ignite ignite = G.ignite();
 
-        final Cache<Integer, Integer> cache = ignite.cache(null);
+        final GridCache<Integer, Integer> cache = ignite.cache(null);
 
         assert cache != null;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheAffinityTransactionsOffHeapTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheAffinityTransactionsOffHeapTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheAffinityTransactionsOffHeapTest.java
index efe0eb3..5b4f6a0 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheAffinityTransactionsOffHeapTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheAffinityTransactionsOffHeapTest.java
@@ -59,7 +59,7 @@ public class GridCacheAffinityTransactionsOffHeapTest {
         startNodes();
 
         for (int i = 0; i < KEY_CNT; i++) {
-            Cache<Object, Integer> c = cache(i);
+            GridCache<Object, Integer> c = cache(i);
 
             c.putx((long)i, 0);
             c.putx(new UserKey(i, 0), 0);
@@ -71,7 +71,7 @@ public class GridCacheAffinityTransactionsOffHeapTest {
 
         long key = 5;
 
-        Cache<Object, Integer> c = cache(key);
+        GridCache<Object, Integer> c = cache(key);
 
         try (IgniteTx tx = c.txStartAffinity(key, PESSIMISTIC, REPEATABLE_READ, 0, 0)) {
             Integer val = c.get(key);
@@ -153,7 +153,7 @@ public class GridCacheAffinityTransactionsOffHeapTest {
      * @param key Key.
      * @return Cache.
      */
-    private static Cache<Object, Integer> cache(long key) {
+    private static GridCache<Object, Integer> cache(long key) {
         UUID id = Ignition.ignite("grid-0").cache(null).affinity().mapKeyToNode(key).id();
 
         return Ignition.ignite(id).cache(null);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheBenchmark.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheBenchmark.java b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheBenchmark.java
index 9598902..b781f59 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheBenchmark.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheBenchmark.java
@@ -72,7 +72,7 @@ public class GridCacheBenchmark {
                 X.println("threadCnt=" + THREADS);
                 X.println("testWrite=" + testWrite);
 
-                final Cache<Long, Long> cache = g.cache(CACHE);
+                final GridCache<Long, Long> cache = g.cache(CACHE);
 
                 assert cache != null;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheGroupLockComparisonTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheGroupLockComparisonTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheGroupLockComparisonTest.java
index e22d09e..fcd2704 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheGroupLockComparisonTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheGroupLockComparisonTest.java
@@ -83,7 +83,7 @@ public class GridCacheGroupLockComparisonTest {
         X.println(">>> Testing putAll");
         X.println(">>>");
 
-        final Cache<CacheAffinityKey<Long>, Long> cache = ignite.cache(CACHE);
+        final GridCache<CacheAffinityKey<Long>, Long> cache = ignite.cache(CACHE);
 
         assert cache != null;
 
@@ -138,7 +138,7 @@ public class GridCacheGroupLockComparisonTest {
         X.println(">>> Testing group lock");
         X.println(">>>");
 
-        final Cache<CacheAffinityKey<Long>, Long> cache = ignite.cache(CACHE);
+        final GridCache<CacheAffinityKey<Long>, Long> cache = ignite.cache(CACHE);
 
         assert cache != null;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheLoadTest.java
index e754e64..75e032b 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheLoadTest.java
@@ -102,7 +102,7 @@ public final class GridCacheLoadTest extends GridCacheAbstractLoadTest {
     private void memoryTest() {
         Ignite ignite = G.ignite();
 
-        final Cache<Integer, byte[]> cache = ignite.cache(null);
+        final GridCache<Integer, byte[]> cache = ignite.cache(null);
 
         assert cache != null;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCachePutRemoveLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCachePutRemoveLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCachePutRemoveLoadTest.java
index 4dd6c73..e11963d 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCachePutRemoveLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCachePutRemoveLoadTest.java
@@ -45,7 +45,7 @@ public class GridCachePutRemoveLoadTest {
     private final Arguments args;
 
     /** */
-    private Cache<Object, Object> cache;
+    private GridCache<Object, Object> cache;
 
     /**
      * @param args Arguments.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheSingleNodeLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheSingleNodeLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheSingleNodeLoadTest.java
index 3dad229..33ea602 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheSingleNodeLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheSingleNodeLoadTest.java
@@ -77,7 +77,7 @@ public class GridCacheSingleNodeLoadTest {
 
         GridTestUtils.runMultiThreaded(new Callable<Object>() {
             @Nullable @Override public Object call() throws Exception {
-                Cache<Integer, Student> cache = G.ignite().cache(null);
+                GridCache<Integer, Student> cache = G.ignite().cache(null);
 
                 assert cache != null;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheSwapLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheSwapLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheSwapLoadTest.java
index acd20c2..66e99f8 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheSwapLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheSwapLoadTest.java
@@ -202,7 +202,7 @@ public class GridCacheSwapLoadTest {
 
         return GridTestUtils.runMultiThreadedAsync(new CAX() {
             @Override public void applyx() throws IgniteCheckedException {
-                Cache<Integer, Integer> cache = g.cache(null);
+                GridCache<Integer, Integer> cache = g.cache(null);
 
                 assert cache != null;
 
@@ -234,7 +234,7 @@ public class GridCacheSwapLoadTest {
                 @Nullable @Override public Object call() throws Exception {
                     getRemoveStartedLatch.await();
 
-                    Cache<Integer, Integer> cache = g.cache(null);
+                    GridCache<Integer, Integer> cache = g.cache(null);
 
                     assert cache != null;
 
@@ -268,7 +268,7 @@ public class GridCacheSwapLoadTest {
                 @Nullable @Override public Object call() throws Exception {
                     getRemoveStartedLatch.await();
 
-                    Cache<Integer, Integer> cache = g.cache(null);
+                    GridCache<Integer, Integer> cache = g.cache(null);
 
                     assert cache != null;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java
index 6ac745e..213b634 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java
@@ -19,7 +19,7 @@ package org.apache.ignite.loadtests.cache;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.Cache;
+import org.apache.ignite.cache.GridCache;
 import org.apache.ignite.cache.store.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.lang.*;
@@ -80,7 +80,7 @@ public class GridCacheWriteBehindStoreLoadTest extends GridCommonAbstractTest {
 
     /** {@inheritDoc} */
     @Override protected void afterTest() throws Exception {
-        Cache<?, ?> cache = cache();
+        GridCache<?, ?> cache = cache();
 
         if (cache != null)
             cache.clearAll();
@@ -151,7 +151,7 @@ public class GridCacheWriteBehindStoreLoadTest extends GridCommonAbstractTest {
     private void loadCache() throws Exception {
         final AtomicBoolean running = new AtomicBoolean(true);
 
-        final Cache<Long, String> cache = cache();
+        final GridCache<Long, String> cache = cache();
 
         final AtomicLong keyCntr = new AtomicLong();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/loadtests/capacity/GridCapacityLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/capacity/GridCapacityLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/capacity/GridCapacityLoadTest.java
index 4de249d..da78a2d 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/capacity/GridCapacityLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/capacity/GridCapacityLoadTest.java
@@ -46,7 +46,7 @@ public class GridCapacityLoadTest {
         IgniteConfiguration cfg = (IgniteConfiguration)ctx.getBean("grid.cfg");
 
         try (Ignite g = G.start(cfg)) {
-            Cache<Integer, Integer> c = g.cache(null);
+            GridCache<Integer, Integer> c = g.cache(null);
 
             long init = mem.getHeapMemoryUsage().getUsed();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestCacheStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestCacheStore.java b/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestCacheStore.java
index cdbdd97..be6b4d9 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestCacheStore.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestCacheStore.java
@@ -19,7 +19,7 @@ package org.apache.ignite.loadtests.colocation;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.Cache;
+import org.apache.ignite.cache.GridCache;
 import org.apache.ignite.cache.store.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.resources.*;
@@ -59,7 +59,7 @@ public class GridTestCacheStore extends CacheStoreAdapter<GridTestKey, Long> {
         try {
             ExecutorCompletionService<Object> completeSvc = new ExecutorCompletionService<>(execSvc);
 
-            Cache<GridTestKey, Long> cache = ignite.cache("partitioned");
+            GridCache<GridTestKey, Long> cache = ignite.cache("partitioned");
 
             assert cache != null;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestLifecycleBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestLifecycleBean.java b/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestLifecycleBean.java
index 2be57fe..bd011f4 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestLifecycleBean.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestLifecycleBean.java
@@ -31,7 +31,7 @@ public class GridTestLifecycleBean implements LifecycleBean {
 
     @Override public void onLifecycleEvent(LifecycleEventType type) throws IgniteCheckedException {
         if (type == LifecycleEventType.AFTER_GRID_START) {
-            Cache<GridTestKey, Long> cache = g.cache("partitioned");
+            GridCache<GridTestKey, Long> cache = g.cache("partitioned");
 
             assert cache != null;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestMain.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestMain.java b/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestMain.java
index 0a8c6e9..4d8539c 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestMain.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestMain.java
@@ -43,7 +43,7 @@ public class GridTestMain {
 
         // Initialize Spring factory.
         try (Ignite g = G.start((IgniteConfiguration)ctx.getBean("grid.cfg"))) {
-            final Cache<GridTestKey, Long> cache = g.cache("partitioned");
+            final GridCache<GridTestKey, Long> cache = g.cache("partitioned");
 
             assert cache != null;
 
@@ -71,7 +71,7 @@ public class GridTestMain {
 
         Ignite g = G.ignite();
 
-        final Cache<GridTestKey, Long> cache = g.cache("partitioned");
+        final GridCache<GridTestKey, Long> cache = g.cache("partitioned");
 
         final BlockingQueue<IgniteFuture> q = new ArrayBlockingQueue<>(400);
 
@@ -133,7 +133,7 @@ public class GridTestMain {
 
         long start = System.currentTimeMillis();
 
-        final Cache<GridTestKey, Long> cache = G.ignite().cache("partitioned");
+        final GridCache<GridTestKey, Long> cache = G.ignite().cache("partitioned");
 
         // Collocate computations and data.
         for (long i = 0; i < GridTestConstants.ENTRY_COUNT; i++) {
@@ -164,7 +164,7 @@ public class GridTestMain {
      * @param cache Cache to load.
      * @throws IgniteCheckedException If failed.
      */
-    private static void loadFromStore(Cache<GridTestKey, Long> cache) throws IgniteCheckedException {
+    private static void loadFromStore(GridCache<GridTestKey, Long> cache) throws IgniteCheckedException {
         cache.loadCache(null, 0, GridTestConstants.LOAD_THREADS, GridTestConstants.ENTRY_COUNT);
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java
index 9e39b77..7b86298 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java
@@ -78,7 +78,7 @@ public class GridContinuousOperationsLoadTest {
         dumpProperties(System.out);
 
         try (Ignite ignite = Ignition.start(cfgPath)) {
-            final Cache<Object, Object> cache = ignite.cache(cacheName);
+            final GridCache<Object, Object> cache = ignite.cache(cacheName);
 
             if (cache == null)
                 throw new IgniteCheckedException("Cache is not configured: " + cacheName);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java
index 46e537b..0418a9d 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java
@@ -102,7 +102,7 @@ public class GridCachePartitionedAtomicLongLoadTest extends GridCommonAbstractTe
         @Override public Boolean call() throws Exception {
             Ignite ignite = grid();
 
-            Cache cache = ignite.cache(null);
+            GridCache cache = ignite.cache(null);
 
             assert cache != null;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiPerfJob.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiPerfJob.java b/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiPerfJob.java
index b0c75b1..483cbb5 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiPerfJob.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiPerfJob.java
@@ -224,7 +224,7 @@ public class GridDsiPerfJob extends ComputeJobAdapter {
      *
      */
     private void doWork() {
-        Cache cache = ignite.cache(cacheName);
+        GridCache cache = ignite.cache(cacheName);
 
         assert cache != null;
 
@@ -304,7 +304,7 @@ public class GridDsiPerfJob extends ComputeJobAdapter {
      * @throws IgniteCheckedException If failed.
      */
     private long getId() throws IgniteCheckedException {
-        Cache<Object, Object> cache = ignite.cache(cacheName);
+        GridCache<Object, Object> cache = ignite.cache(cacheName);
 
         assert cache != null;
 
@@ -319,7 +319,7 @@ public class GridDsiPerfJob extends ComputeJobAdapter {
      * @throws IgniteCheckedException If failed.
      */
     private void put(Object o, Object cacheKey) throws IgniteCheckedException {
-        Cache<Object, Object> cache = ignite.cache(cacheName);
+        GridCache<Object, Object> cache = ignite.cache(cacheName);
 
         assert cache != null;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/cacheget/GridBenchmarkCacheGetLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/cacheget/GridBenchmarkCacheGetLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/cacheget/GridBenchmarkCacheGetLoadTest.java
index f2568ca..a05b23b 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/cacheget/GridBenchmarkCacheGetLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/cacheget/GridBenchmarkCacheGetLoadTest.java
@@ -51,7 +51,7 @@ public class GridBenchmarkCacheGetLoadTest {
     public static void main(String[] args) throws Exception {
         Ignition.start("modules/core/src/test/config/load/dsi-49-server-production.xml");
 
-        Cache<Long, Long> cache = Ignition.ignite("dsi").cache("PARTITIONED_CACHE");
+        GridCache<Long, Long> cache = Ignition.ignite("dsi").cache("PARTITIONED_CACHE");
 
         stats();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/loadtests/swap/GridSwapEvictAllBenchmark.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/swap/GridSwapEvictAllBenchmark.java b/modules/core/src/test/java/org/apache/ignite/loadtests/swap/GridSwapEvictAllBenchmark.java
index 9557bf6..b3fc240 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/swap/GridSwapEvictAllBenchmark.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/swap/GridSwapEvictAllBenchmark.java
@@ -19,7 +19,7 @@ package org.apache.ignite.loadtests.swap;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.Cache;
+import org.apache.ignite.cache.GridCache;
 import org.apache.ignite.cache.eviction.fifo.*;
 import org.apache.ignite.cache.store.*;
 import org.apache.ignite.configuration.*;
@@ -84,7 +84,7 @@ public class GridSwapEvictAllBenchmark {
             });
 
             try {
-                Cache<Object, Object> cache = g.cache(null);
+                GridCache<Object, Object> cache = g.cache(null);
 
                 assert cache != null;
 
@@ -153,7 +153,7 @@ public class GridSwapEvictAllBenchmark {
 
         long start = System.currentTimeMillis();
 
-        Cache<Object, Object> cache = G.ignite().cache(null);
+        GridCache<Object, Object> cache = G.ignite().cache(null);
 
         assert cache != null;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java
index 8948948..dbb2d2d 100644
--- a/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java
@@ -152,7 +152,7 @@ public abstract class GridMarshallerAbstractTest extends GridCommonAbstractTest
      * @throws Exception If failed.
      */
     public void testDefaultCache() throws Exception {
-        Cache<String, String> cache = grid().cache(null);
+        GridCache<String, String> cache = grid().cache(null);
 
         cache.putx("key", "val");
 
@@ -170,7 +170,7 @@ public abstract class GridMarshallerAbstractTest extends GridCommonAbstractTest
 
         assert inBean != outBean;
 
-        Cache<String, String> cache0 = (Cache<String, String>)outBean.getObjectField();
+        GridCache<String, String> cache0 = (GridCache<String, String>)outBean.getObjectField();
 
         assertNull(cache0.name());
         assertEquals("val", cache0.get("key"));
@@ -182,7 +182,7 @@ public abstract class GridMarshallerAbstractTest extends GridCommonAbstractTest
      * @throws Exception If failed.
      */
     public void testNamedCache() throws Exception {
-        Cache<String, String> cache = grid().cache(CACHE_NAME);
+        GridCache<String, String> cache = grid().cache(CACHE_NAME);
 
         cache.putx("key", "val");
 
@@ -200,7 +200,7 @@ public abstract class GridMarshallerAbstractTest extends GridCommonAbstractTest
 
         assert inBean != outBean;
 
-        Cache<String, String> cache0 = (Cache<String, String>)outBean.getObjectField();
+        GridCache<String, String> cache0 = (GridCache<String, String>)outBean.getObjectField();
 
         assertEquals(CACHE_NAME, cache0.name());
         assertEquals("val", cache0.get("key"));
@@ -833,7 +833,7 @@ public abstract class GridMarshallerAbstractTest extends GridCommonAbstractTest
      * @throws Exception If failed.
      */
     public void testAffinity() throws Exception {
-        Cache<String, String> cache = grid().cache(CACHE_NAME);
+        GridCache<String, String> cache = grid().cache(CACHE_NAME);
 
         CacheAffinity<String> affinity = cache.affinity();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/GridCacheCheckpointSpiSecondCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/GridCacheCheckpointSpiSecondCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/GridCacheCheckpointSpiSecondCacheSelfTest.java
index 13c7ef9..8bf28ca 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/GridCacheCheckpointSpiSecondCacheSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/GridCacheCheckpointSpiSecondCacheSelfTest.java
@@ -82,8 +82,8 @@ public class GridCacheCheckpointSpiSecondCacheSelfTest extends GridCommonAbstrac
      * @throws Exception If failed.
      */
     public void testSecondCachePutRemove() throws Exception {
-        Cache<Integer, Integer> data = grid().cache(DATA_CACHE);
-        Cache<Integer, String> cp = grid().cache(CP_CACHE);
+        GridCache<Integer, Integer> data = grid().cache(DATA_CACHE);
+        GridCache<Integer, String> cp = grid().cache(CP_CACHE);
 
         assertTrue(data.putx(1, 1));
         assertTrue(cp.putx(1, "1"));

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/storevalbytes/GridCacheStoreValueBytesTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/storevalbytes/GridCacheStoreValueBytesTest.java b/modules/core/src/test/java/org/apache/ignite/storevalbytes/GridCacheStoreValueBytesTest.java
index f74f760..f70ea1b 100644
--- a/modules/core/src/test/java/org/apache/ignite/storevalbytes/GridCacheStoreValueBytesTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/storevalbytes/GridCacheStoreValueBytesTest.java
@@ -164,7 +164,7 @@ public class GridCacheStoreValueBytesTest {
 
             int sizeRange = maxSize - minSize;
 
-            Cache<Integer, String> cache = ignite.cache(null);
+            GridCache<Integer, String> cache = ignite.cache(null);
 
             if (sizeRange == 0) {
                 for (Integer key : KEYS)
@@ -216,7 +216,7 @@ public class GridCacheStoreValueBytesTest {
         for (int i = 0; i < threadsNum; i++) {
             futs.add(exec.submit(new Callable<Void>() {
                 @Override public Void call() throws Exception {
-                    Cache<Integer, String> cache = ignite.cache(null);
+                    GridCache<Integer, String> cache = ignite.cache(null);
 
                     Random random = new Random();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
index 3c2bb37..2bce759 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
@@ -880,7 +880,7 @@ public final class GridTestUtils {
     public static <K, V> void waitTopologyUpdate(@Nullable String cacheName, int backups, IgniteLogger log)
         throws Exception {
         for (Ignite g : Ignition.allGrids()) {
-            Cache<K, V> cache = ((GridEx)g).cachex(cacheName);
+            GridCache<K, V> cache = ((GridEx)g).cachex(cacheName);
 
             GridDhtPartitionTopology<?, ?> top = dht(cache).topology();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestIgnite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestIgnite.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestIgnite.java
index 7ee4b26..8f36350 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestIgnite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestIgnite.java
@@ -165,12 +165,12 @@ public class GridTestIgnite implements Ignite {
     }
 
     /** {@inheritDoc} */
-    @Override public <K, V> Cache<K, V> cache(@Nullable String name) {
+    @Override public <K, V> GridCache<K, V> cache(@Nullable String name) {
         return null;
     }
 
     /** {@inheritDoc} */
-    @Override public Collection<Cache<?, ?>> caches() {
+    @Override public Collection<GridCache<?, ?>> caches() {
         return null;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
index a4bb24a..b5e15be 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
@@ -63,7 +63,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest {
      * @param idx Grid index.
      * @return Cache.
      */
-    protected <K, V> Cache<K, V> cache(int idx) {
+    protected <K, V> GridCache<K, V> cache(int idx) {
         return grid(idx).cachex();
     }
 
@@ -80,14 +80,14 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest {
      * @param name Cache name.
      * @return Cache.
      */
-    protected <K, V> Cache<K, V> cache(int idx, String name) {
+    protected <K, V> GridCache<K, V> cache(int idx, String name) {
         return grid(idx).cachex(name);
     }
 
     /**
      * @return Cache.
      */
-    protected <K, V> Cache<K, V> cache() {
+    protected <K, V> GridCache<K, V> cache() {
         return grid().cachex();
     }
 
@@ -247,7 +247,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest {
     @SuppressWarnings("BusyWait")
     protected void awaitPartitionMapExchange() throws InterruptedException {
         for (Ignite g : G.allGrids()) {
-            for (Cache<?, ?> c : ((GridEx)g).cachesx()) {
+            for (GridCache<?, ?> c : ((GridEx)g).cachesx()) {
                 CacheConfiguration cfg = c.configuration();
 
                 if (cfg.getCacheMode() == PARTITIONED && cfg.getPreloadMode() != NONE && g.cluster().nodes().size() > 1) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridCacheDeploymentTestTask1.java
----------------------------------------------------------------------
diff --git a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridCacheDeploymentTestTask1.java b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridCacheDeploymentTestTask1.java
index fca9b72..4be4c9c 100644
--- a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridCacheDeploymentTestTask1.java
+++ b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridCacheDeploymentTestTask1.java
@@ -46,7 +46,7 @@ public class GridCacheDeploymentTestTask1 extends ComputeTaskAdapter<ClusterNode
                     X.println("Executing GridCacheDeploymentTestTask1 job on node " +
                         ignite.cluster().localNode().id());
 
-                    Cache<String, GridCacheDeploymentTestValue> cache = ignite.cache(null);
+                    GridCache<String, GridCacheDeploymentTestValue> cache = ignite.cache(null);
 
                     for (int i = 0; i < PUT_CNT; i++)
                         cache.putx("1" + i, new GridCacheDeploymentTestValue());

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopDualAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopDualAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopDualAbstractSelfTest.java
index 3fb01be..8965640 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopDualAbstractSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopDualAbstractSelfTest.java
@@ -266,7 +266,7 @@ public abstract class GridGgfsHadoopDualAbstractSelfTest extends GridGgfsCommonA
 
         GridGgfsBlockKey key = new GridGgfsBlockKey(info.id(), info.affinityKey(), info.evictExclude(), 2);
 
-        Cache<GridGgfsBlockKey, byte[]> dataCache = ggfs.context().kernalContext().cache().cache(
+        GridCache<GridGgfsBlockKey, byte[]> dataCache = ggfs.context().kernalContext().cache().cache(
             ggfs.configuration().getDataCacheName());
 
         for (int i = 0; i < 10; i++) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java
index 3e09e56..d1932d8 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java
@@ -950,18 +950,18 @@ public class GridHadoopDefaultMapReducePlannerSelfTest extends GridHadoopAbstrac
         }
 
         /** {@inheritDoc} */
-        @Nullable @Override public <K, V> Cache<K, V> cachex(@Nullable String name) {
+        @Nullable @Override public <K, V> GridCache<K, V> cachex(@Nullable String name) {
             return null;
         }
 
         /** {@inheritDoc} */
-        @Nullable @Override public <K, V> Cache<K, V> cachex() {
+        @Nullable @Override public <K, V> GridCache<K, V> cachex() {
             return null;
         }
 
         /** {@inheritDoc} */
         @SuppressWarnings("unchecked")
-        @Override public Collection<Cache<?, ?>> cachesx(@Nullable IgnitePredicate<? super Cache<?, ?>>... p) {
+        @Override public Collection<GridCache<?, ?>> cachesx(@Nullable IgnitePredicate<? super GridCache<?, ?>>... p) {
             return null;
         }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateAccessStrategyAdapter.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateAccessStrategyAdapter.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateAccessStrategyAdapter.java
index 4e99947..bb69773 100644
--- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateAccessStrategyAdapter.java
+++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateAccessStrategyAdapter.java
@@ -82,7 +82,7 @@ import java.util.concurrent.*;
  */
 public abstract class GridHibernateAccessStrategyAdapter {
     /** */
-    protected final Cache<Object, Object> cache;
+    protected final GridCache<Object, Object> cache;
 
     /** Grid. */
     protected final Ignite ignite;
@@ -94,7 +94,7 @@ public abstract class GridHibernateAccessStrategyAdapter {
      * @param ignite Grid.
      * @param cache Cache.
      */
-    protected GridHibernateAccessStrategyAdapter(Ignite ignite, Cache<Object, Object> cache) {
+    protected GridHibernateAccessStrategyAdapter(Ignite ignite, GridCache<Object, Object> cache) {
         this.cache = cache;
         this.ignite = ignite;
 
@@ -341,7 +341,7 @@ public abstract class GridHibernateAccessStrategyAdapter {
 
         /** {@inheritDoc} */
         @Override public Void call() throws IgniteCheckedException {
-            Cache<Object, Object> cache = ignite.cache(cacheName);
+            GridCache<Object, Object> cache = ignite.cache(cacheName);
 
             assert cache != null;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateCollectionRegion.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateCollectionRegion.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateCollectionRegion.java
index 37f7ac2..6935f45 100644
--- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateCollectionRegion.java
+++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateCollectionRegion.java
@@ -70,7 +70,7 @@ public class GridHibernateCollectionRegion extends GridHibernateTransactionalDat
      * @param dataDesc Region data description.
      */
     public GridHibernateCollectionRegion(GridHibernateRegionFactory factory, String name,
-        Ignite ignite, Cache<Object, Object> cache, CacheDataDescription dataDesc) {
+        Ignite ignite, GridCache<Object, Object> cache, CacheDataDescription dataDesc) {
         super(factory, name, ignite, cache, dataDesc);
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateEntityRegion.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateEntityRegion.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateEntityRegion.java
index 18123eb..1892931 100644
--- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateEntityRegion.java
+++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateEntityRegion.java
@@ -59,7 +59,7 @@ public class GridHibernateEntityRegion extends GridHibernateTransactionalDataReg
      * @param dataDesc Region data description.
      */
     public GridHibernateEntityRegion(GridHibernateRegionFactory factory, String name, Ignite ignite,
-        Cache<Object, Object> cache, CacheDataDescription dataDesc) {
+        GridCache<Object, Object> cache, CacheDataDescription dataDesc) {
         super(factory, name, ignite, cache, dataDesc);
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateGeneralDataRegion.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateGeneralDataRegion.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateGeneralDataRegion.java
index 7cc2b9f..c1ec886 100644
--- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateGeneralDataRegion.java
+++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateGeneralDataRegion.java
@@ -35,7 +35,7 @@ public class GridHibernateGeneralDataRegion extends GridHibernateRegion implemen
      * @param cache Region cache.
      */
     public GridHibernateGeneralDataRegion(GridHibernateRegionFactory factory, String name,
-        Ignite ignite, Cache<Object, Object> cache) {
+        Ignite ignite, GridCache<Object, Object> cache) {
         super(factory, name, ignite, cache);
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateNaturalIdRegion.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateNaturalIdRegion.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateNaturalIdRegion.java
index f3a8866..2edcee8 100644
--- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateNaturalIdRegion.java
+++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateNaturalIdRegion.java
@@ -49,7 +49,7 @@ public class GridHibernateNaturalIdRegion extends GridHibernateTransactionalData
      * @param dataDesc Region data description.
      */
     public GridHibernateNaturalIdRegion(GridHibernateRegionFactory factory, String name,
-        Ignite ignite, Cache<Object, Object> cache, CacheDataDescription dataDesc) {
+        Ignite ignite, GridCache<Object, Object> cache, CacheDataDescription dataDesc) {
         super(factory, name, ignite, cache, dataDesc);
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateNonStrictAccessStrategy.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateNonStrictAccessStrategy.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateNonStrictAccessStrategy.java
index 8f48897..1ae2555 100644
--- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateNonStrictAccessStrategy.java
+++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateNonStrictAccessStrategy.java
@@ -64,7 +64,7 @@ public class GridHibernateNonStrictAccessStrategy extends GridHibernateAccessStr
      * @param cache Cache.
      * @param writeCtx Thread local instance used to track updates done during one Hibernate transaction.
      */
-    protected GridHibernateNonStrictAccessStrategy(Ignite ignite, Cache<Object, Object> cache, ThreadLocal writeCtx) {
+    protected GridHibernateNonStrictAccessStrategy(Ignite ignite, GridCache<Object, Object> cache, ThreadLocal writeCtx) {
         super(ignite, cache);
 
         this.writeCtx = (ThreadLocal<WriteContext>)writeCtx;
@@ -209,7 +209,7 @@ public class GridHibernateNonStrictAccessStrategy extends GridHibernateAccessStr
          * @param cache Cache.
          * @throws IgniteCheckedException If failed.
          */
-        void updateCache(Cache<Object, Object> cache) throws IgniteCheckedException {
+        void updateCache(GridCache<Object, Object> cache) throws IgniteCheckedException {
             if (!F.isEmpty(rmvs))
                 cache.removeAll(rmvs);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateQueryResultsRegion.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateQueryResultsRegion.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateQueryResultsRegion.java
index 22e1d84..f361f70 100644
--- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateQueryResultsRegion.java
+++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateQueryResultsRegion.java
@@ -18,7 +18,7 @@
 package org.apache.ignite.cache.hibernate;
 
 import org.apache.ignite.*;
-import org.apache.ignite.cache.Cache;
+import org.apache.ignite.cache.GridCache;
 import org.hibernate.*;
 import org.hibernate.cache.spi.*;
 
@@ -65,7 +65,7 @@ public class GridHibernateQueryResultsRegion extends GridHibernateGeneralDataReg
      * @param cache Region cache.
      */
     public GridHibernateQueryResultsRegion(GridHibernateRegionFactory factory, String name,
-        Ignite ignite, Cache<Object, Object> cache) {
+        Ignite ignite, GridCache<Object, Object> cache) {
         super(factory, name, ignite, cache);
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateReadOnlyAccessStrategy.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateReadOnlyAccessStrategy.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateReadOnlyAccessStrategy.java
index f778e4f..930bd7c 100644
--- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateReadOnlyAccessStrategy.java
+++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateReadOnlyAccessStrategy.java
@@ -58,7 +58,7 @@ public class GridHibernateReadOnlyAccessStrategy extends GridHibernateAccessStra
      * @param ignite Grid.
      * @param cache Cache.
      */
-    public GridHibernateReadOnlyAccessStrategy(Ignite ignite, Cache<Object, Object> cache) {
+    public GridHibernateReadOnlyAccessStrategy(Ignite ignite, GridCache<Object, Object> cache) {
         super(ignite, cache);
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateReadWriteAccessStrategy.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateReadWriteAccessStrategy.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateReadWriteAccessStrategy.java
index 89f0a81..848dac4 100644
--- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateReadWriteAccessStrategy.java
+++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateReadWriteAccessStrategy.java
@@ -66,7 +66,7 @@ public class GridHibernateReadWriteAccessStrategy extends GridHibernateAccessStr
      * @param cache Cache.
      * @param txCtx Thread local instance used to track updates done during one Hibernate transaction.
      */
-    protected GridHibernateReadWriteAccessStrategy(Ignite ignite, Cache<Object, Object> cache, ThreadLocal txCtx) {
+    protected GridHibernateReadWriteAccessStrategy(Ignite ignite, GridCache<Object, Object> cache, ThreadLocal txCtx) {
         super(ignite, cache);
 
         this.txCtx = (ThreadLocal<TxContext>)txCtx;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateRegion.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateRegion.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateRegion.java
index 1038758..b30799f 100644
--- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateRegion.java
+++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateRegion.java
@@ -35,7 +35,7 @@ public class GridHibernateRegion implements Region {
     private final String name;
 
     /** Cache instance. */
-    protected final Cache<Object, Object> cache;
+    protected final GridCache<Object, Object> cache;
 
     /** Grid instance. */
     protected Ignite ignite;
@@ -47,7 +47,7 @@ public class GridHibernateRegion implements Region {
      * @param cache Region cache.
      */
     public GridHibernateRegion(GridHibernateRegionFactory factory, String name, Ignite ignite,
-        Cache<Object, Object> cache) {
+        GridCache<Object, Object> cache) {
         this.factory = factory;
         this.name = name;
         this.ignite = ignite;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateRegionFactory.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateRegionFactory.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateRegionFactory.java
index 30a2a43..751785d 100644
--- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateRegionFactory.java
+++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateRegionFactory.java
@@ -46,8 +46,8 @@ import static org.hibernate.cache.spi.access.AccessType.*;
  * <pre name="code" class="brush: xml; gutter: false;">
  * org.gridgain.hibernate.grid_name=&lt;grid name&gt;
  * </pre>
- * Each Hibernate cache region must be associated with some {@link org.apache.ignite.cache.Cache}, by default it is assumed that
- * for each cache region there is a {@link org.apache.ignite.cache.Cache} with the same name. Also it is possible to define
+ * Each Hibernate cache region must be associated with some {@link org.apache.ignite.cache.GridCache}, by default it is assumed that
+ * for each cache region there is a {@link org.apache.ignite.cache.GridCache} with the same name. Also it is possible to define
  * region to cache mapping using properties with prefix {@code org.gridgain.hibernate.region_cache}.
  * For example if for region with name "region1" cache with name "cache1" should be used then following
  * Hibernate property should be specified:
@@ -78,7 +78,7 @@ public class GridHibernateRegionFactory implements RegionFactory {
     private Ignite ignite;
 
     /** Default cache. */
-    private Cache<Object, Object> dfltCache;
+    private GridCache<Object, Object> dfltCache;
 
     /** Default region access type. */
     private AccessType dfltAccessType;
@@ -210,7 +210,7 @@ public class GridHibernateRegionFactory implements RegionFactory {
      * @return Cache for given region.
      * @throws CacheException If cache for given region is not configured.
      */
-    private Cache<Object, Object> regionCache(String regionName) throws CacheException {
+    private GridCache<Object, Object> regionCache(String regionName) throws CacheException {
         String cacheName = regionCaches.get(regionName);
 
         if (cacheName == null) {
@@ -220,7 +220,7 @@ public class GridHibernateRegionFactory implements RegionFactory {
             cacheName = regionName;
         }
 
-        Cache<Object, Object> cache = ignite.cache(cacheName);
+        GridCache<Object, Object> cache = ignite.cache(cacheName);
 
         if (cache == null)
             throw new CacheException("Cache '" + cacheName + "' for region '" + regionName + "' is not configured.");

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateTimestampsRegion.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateTimestampsRegion.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateTimestampsRegion.java
index 1658d40..5f7a9cb 100644
--- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateTimestampsRegion.java
+++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateTimestampsRegion.java
@@ -34,7 +34,7 @@ public class GridHibernateTimestampsRegion extends GridHibernateGeneralDataRegio
      * @param cache Region cache.
      */
     public GridHibernateTimestampsRegion(GridHibernateRegionFactory factory, String name,
-        Ignite ignite, Cache<Object, Object> cache) {
+        Ignite ignite, GridCache<Object, Object> cache) {
         super(factory, name, ignite, cache);
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateTransactionalAccessStrategy.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateTransactionalAccessStrategy.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateTransactionalAccessStrategy.java
index bce4ab6..a498db9 100644
--- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateTransactionalAccessStrategy.java
+++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateTransactionalAccessStrategy.java
@@ -27,7 +27,7 @@ import org.jetbrains.annotations.*;
  * Implementation of {@link AccessType#TRANSACTIONAL} cache access strategy.
  * <p>
  * It is supposed that this strategy is used in JTA environment and Hibernate and
- * {@link org.apache.ignite.cache.Cache} corresponding to the L2 cache region are configured to use the same transaction manager.
+ * {@link org.apache.ignite.cache.GridCache} corresponding to the L2 cache region are configured to use the same transaction manager.
  * <p>
  * Configuration of L2 cache and per-entity cache access strategy can be set in the
  * Hibernate configuration file:
@@ -59,7 +59,7 @@ public class GridHibernateTransactionalAccessStrategy extends GridHibernateAcces
      * @param ignite Grid.
      * @param cache Cache.
      */
-    public GridHibernateTransactionalAccessStrategy(Ignite ignite, Cache<Object, Object> cache) {
+    public GridHibernateTransactionalAccessStrategy(Ignite ignite, GridCache<Object, Object> cache) {
         super(ignite, cache);
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateTransactionalDataRegion.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateTransactionalDataRegion.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateTransactionalDataRegion.java
index b1b0531..04fd877 100644
--- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateTransactionalDataRegion.java
+++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateTransactionalDataRegion.java
@@ -43,7 +43,7 @@ public class GridHibernateTransactionalDataRegion extends GridHibernateRegion im
      * @param dataDesc Region data description.
      */
     public GridHibernateTransactionalDataRegion(GridHibernateRegionFactory factory, String name,
-        Ignite ignite, Cache<Object, Object> cache, CacheDataDescription dataDesc) {
+        Ignite ignite, GridCache<Object, Object> cache, CacheDataDescription dataDesc) {
         super(factory, name, ignite, cache);
 
         this.dataDesc = dataDesc;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/GridHibernateL2CacheConfigurationSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/GridHibernateL2CacheConfigurationSelfTest.java b/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/GridHibernateL2CacheConfigurationSelfTest.java
index 6557393..8c886ae 100644
--- a/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/GridHibernateL2CacheConfigurationSelfTest.java
+++ b/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/GridHibernateL2CacheConfigurationSelfTest.java
@@ -18,7 +18,7 @@
 package org.apache.ignite.cache.hibernate;
 
 import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.Cache;
+import org.apache.ignite.cache.GridCache;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.spi.discovery.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
@@ -78,7 +78,7 @@ public class GridHibernateL2CacheConfigurationSelfTest extends GridCommonAbstrac
 
     /** {@inheritDoc} */
     @Override protected void afterTest() throws Exception {
-        for (Cache<?, ?> cache : grid(0).caches())
+        for (GridCache<?, ?> cache : grid(0).caches())
             cache.clearAll();
     }
 
@@ -234,11 +234,11 @@ public class GridHibernateL2CacheConfigurationSelfTest extends GridCommonAbstrac
                 ses.close();
             }
 
-            Cache<Object, Object> cache1 = grid(0).cache("cache1");
-            Cache<Object, Object> cache2 = grid(0).cache("cache2");
-            Cache<Object, Object> cache3 = grid(0).cache("cache3");
-            Cache<Object, Object> cacheE3 = grid(0).cache(ENTITY3_NAME);
-            Cache<Object, Object> cacheE4 = grid(0).cache(ENTITY4_NAME);
+            GridCache<Object, Object> cache1 = grid(0).cache("cache1");
+            GridCache<Object, Object> cache2 = grid(0).cache("cache2");
+            GridCache<Object, Object> cache3 = grid(0).cache("cache3");
+            GridCache<Object, Object> cacheE3 = grid(0).cache(ENTITY3_NAME);
+            GridCache<Object, Object> cacheE4 = grid(0).cache(ENTITY4_NAME);
 
             assertEquals("Unexpected entries: " + cache1.entrySet(), expCache1, cache1.size());
             assertEquals("Unexpected entries: " + cache2.entrySet(), expCache2, cache2.size());

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/GridHibernateL2CacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/GridHibernateL2CacheSelfTest.java b/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/GridHibernateL2CacheSelfTest.java
index 16e7df3..3aab215 100644
--- a/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/GridHibernateL2CacheSelfTest.java
+++ b/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/GridHibernateL2CacheSelfTest.java
@@ -18,7 +18,7 @@
 package org.apache.ignite.cache.hibernate;
 
 import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.Cache;
+import org.apache.ignite.cache.GridCache;
 import org.apache.ignite.cache.affinity.consistenthash.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.spi.discovery.tcp.*;
@@ -1917,7 +1917,7 @@ public class GridHibernateL2CacheSelfTest extends GridCommonAbstractTest {
 
         sesFactory2 = null;
 
-        for (Cache<?, ?> cache : grid(0).caches())
+        for (GridCache<?, ?> cache : grid(0).caches())
             cache.globalClearAll();
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/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 5772f74..188af98 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
@@ -19,7 +19,7 @@ package org.apache.ignite.internal.processors.query.h2;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.Cache;
+import org.apache.ignite.cache.GridCache;
 import org.apache.ignite.cache.query.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.internal.*;
@@ -1941,7 +1941,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
         /** {@inheritDoc} */
         @SuppressWarnings("unchecked")
         @Override public Object readFromSwap(Object key) throws IgniteCheckedException {
-            Cache<Object, ?> cache = ctx.cache().cache(schema.spaceName);
+            GridCache<Object, ?> cache = ctx.cache().cache(schema.spaceName);
 
             GridCacheContext cctx = ((GridCacheProxyImpl)cache).context();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java
index 85cde58..0364cab 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java
@@ -126,14 +126,14 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs
 
         startGrid(gridCount());
 
-        Cache<String, Organization> orgCache = grid(0).cache(null);
+        GridCache<String, Organization> orgCache = grid(0).cache(null);
 
         assert orgCache != null;
 
         assert orgCache.putx("o1", new Organization(1, "A"));
         assert orgCache.putx("o2", new Organization(2, "B"));
 
-        Cache<CacheAffinityKey<String>, Person> personCache = grid(0).cache(null);
+        GridCache<CacheAffinityKey<String>, Person> personCache = grid(0).cache(null);
 
         assert personCache != null;
 
@@ -141,20 +141,20 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs
         assert personCache.putx(new CacheAffinityKey<>("p2", "o1"), new Person("Joe Black", 35, 1));
         assert personCache.putx(new CacheAffinityKey<>("p3", "o2"), new Person("Mike Green", 40, 2));
 
-        Cache<String, String> strCache = grid(0).cache(null);
+        GridCache<String, String> strCache = grid(0).cache(null);
 
         assert strCache != null;
 
         assert strCache.putx("key", "val");
 
-        Cache<Integer, Integer> intCache = grid(0).cache(null);
+        GridCache<Integer, Integer> intCache = grid(0).cache(null);
 
         assert intCache != null;
 
         for (int i = 0; i < 200; i++)
             assert intCache.putx(i, i);
 
-        Cache<Integer, Integer> namedCache = grid(0).cache(CACHE);
+        GridCache<Integer, Integer> namedCache = grid(0).cache(CACHE);
 
         for (int i = 0; i < 200; i++)
             assert namedCache.putx(i, i);
@@ -761,7 +761,7 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs
 
     /** @throws Exception If failed. */
     public void testNamedCache() throws Exception {
-        Cache<Integer, Integer> cache = grid(0).cache(CACHE);
+        GridCache<Integer, Integer> cache = grid(0).cache(CACHE);
 
         for (int i = 0; i < 200; i++)
             assert cache.putx(i, i);
@@ -776,7 +776,7 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs
 
     /** @throws Exception If failed. */
     public void _testNoPrimitives() throws Exception { // TODO
-        Cache<Object, Object> cache = grid(0).cache(CACHE_NO_PRIMITIVES);
+        GridCache<Object, Object> cache = grid(0).cache(CACHE_NO_PRIMITIVES);
 
         assert cache.putx("key", "val");
 
@@ -795,7 +795,7 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs
 
     /** @throws Exception If failed. */
     public void _testComplexKeys() throws Exception { // TODO
-        Cache<PersonKey, Person> cache = grid(0).cache(CACHE_COMPLEX_KEYS);
+        GridCache<PersonKey, Person> cache = grid(0).cache(CACHE_COMPLEX_KEYS);
 
         UUID id = UUID.randomUUID();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java
index 54a7629..53b9607 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java
@@ -19,7 +19,7 @@ package org.apache.ignite.internal.processors.cache;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.Cache;
+import org.apache.ignite.cache.GridCache;
 import org.apache.ignite.cache.query.*;
 import org.apache.ignite.cache.store.*;
 import org.apache.ignite.configuration.*;
@@ -177,7 +177,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      * @throws Exception In case of error.
      */
     public void testDifferentKeyTypes() throws Exception {
-        Cache<Object, Object> cache = ignite.cache(null);
+        GridCache<Object, Object> cache = ignite.cache(null);
 
         cache.putx("key", "value");
 
@@ -192,7 +192,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      * @throws Exception In case of error.
      */
     public void testDifferentValueTypes() throws Exception {
-        Cache<Object, Object> cache = ignite.cache(null);
+        GridCache<Object, Object> cache = ignite.cache(null);
 
         cache.putx("key", "value");
 
@@ -207,7 +207,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      * @throws Exception In case of error.
      */
     public void testStringType() throws Exception {
-        Cache<String, String> cache = ignite.cache(null);
+        GridCache<String, String> cache = ignite.cache(null);
 
         cache.putx("tst", "test");
 
@@ -224,7 +224,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      * @throws Exception In case of error.
      */
     public void testIntegerType() throws Exception {
-        Cache<String, Integer> cache = ignite.cache(null);
+        GridCache<String, Integer> cache = ignite.cache(null);
 
         String key = "k";
 
@@ -303,7 +303,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
         ignite.jcache(null).
             withExpiryPolicy(new TouchedExpiryPolicy(new Duration(MILLISECONDS, 1000))).put("key1", 1);
 
-        Cache<String, Integer> cache = ignite.cache(null);
+        GridCache<String, Integer> cache = ignite.cache(null);
 
         CacheQuery<Map.Entry<String, Integer>> qry = cache.queries().createSqlQuery(Integer.class, "1=1");
 
@@ -322,7 +322,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      * @throws Exception If failed.
      */
     public void testIllegalBounds() throws Exception {
-        Cache<Integer, Integer> cache = ignite.cache(null);
+        GridCache<Integer, Integer> cache = ignite.cache(null);
 
         cache.put(1, 1);
         cache.put(2, 2);
@@ -339,7 +339,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      * @throws Exception In case of error.
      */
     public void testComplexType() throws Exception {
-        Cache<Key, GridCacheQueryTestValue> cache = ignite.cache(null);
+        GridCache<Key, GridCacheQueryTestValue> cache = ignite.cache(null);
 
         GridCacheQueryTestValue val1 = new GridCacheQueryTestValue();
 
@@ -409,7 +409,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      * @throws Exception In case of error.
      */
     public void testSelectQuery() throws Exception {
-        Cache<String, String> cache = ignite.cache(null);
+        GridCache<String, String> cache = ignite.cache(null);
 
         cache.putx("key", "value");
 
@@ -428,7 +428,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      * @throws Exception In case of error.
      */
     public void testObjectQuery() throws Exception {
-        Cache<Integer, ObjectValue> cache = ignite.cache(null);
+        GridCache<Integer, ObjectValue> cache = ignite.cache(null);
 
         ObjectValue val = new ObjectValue("test", 0);
 
@@ -466,7 +466,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      * @throws Exception In case of error.
      */
     public void testTextQueryOnProjection() throws Exception {
-        Cache<Integer, ObjectValue> cache = ignite.cache(null);
+        GridCache<Integer, ObjectValue> cache = ignite.cache(null);
 
         cache.putx(1, new ObjectValue("test", 1));
         cache.putx(2, new ObjectValue("test", 2));
@@ -500,7 +500,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      * @throws Exception In case of error.
      */
     public void testObjectQueryWithSwap() throws Exception {
-        Cache<Integer, ObjectValue> cache = ignite.cache(null);
+        GridCache<Integer, ObjectValue> cache = ignite.cache(null);
 
         boolean partitioned = cache.configuration().getCacheMode() == PARTITIONED;
 
@@ -510,7 +510,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
             cache.putx(i, new ObjectValue("test" + i, i));
 
         for (Ignite g : G.allGrids()) {
-            Cache<Integer, ObjectValue> c = g.cache(null);
+            GridCache<Integer, ObjectValue> c = g.cache(null);
 
             for (int i = 0; i < cnt; i++) {
                 if (i % 2 == 0) {
@@ -590,7 +590,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      * @throws Exception In case of error.
      */
     public void testFullTextSearch() throws Exception {
-        Cache<Integer, ObjectValue> cache = ignite.cache(null);
+        GridCache<Integer, ObjectValue> cache = ignite.cache(null);
 
         // Try to execute on empty cache first.
         CacheQuery<Map.Entry<Integer, ObjectValue>> qry = cache.queries().createFullTextQuery(ObjectValue.class,
@@ -637,8 +637,8 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      * @throws Exception In case of error.
      */
     public void testRemoveIndex() throws Exception {
-        Cache<Integer, ObjectValue> cache = ignite.cache(null);
-        Cache<Integer, ObjectValue> cache1 = ignite.cache("c1");
+        GridCache<Integer, ObjectValue> cache = ignite.cache(null);
+        GridCache<Integer, ObjectValue> cache1 = ignite.cache("c1");
 
         ObjectValue val = new ObjectValue("test full text", 0);
 
@@ -673,7 +673,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      * @throws Exception In case of error.
      */
     public void testScanQuery() throws Exception {
-        Cache<String, String> c1 = ignite.cache(null);
+        GridCache<String, String> c1 = ignite.cache(null);
 
         c1.putx("key", "value");
 
@@ -701,7 +701,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      * @throws Exception In case of error.
      */
     public void testTwoObjectsTextSearch() throws Exception {
-        Cache<Object, Object> c = ignite.cache(null);
+        GridCache<Object, Object> c = ignite.cache(null);
 
         c.put(1, new ObjectValue("ObjectValue str", 1));
         c.put("key", new ObjectValueOther("ObjectValueOther str"));
@@ -738,7 +738,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      * @throws Exception In case of error.
      */
     public void testTransformQuery() throws Exception {
-        Cache<UUID, Person> c = ignite.cache(null);
+        GridCache<UUID, Person> c = ignite.cache(null);
 
         final Person p1 = new Person("Bob", 100);
         final Person p2 = new Person("Tom", 200);
@@ -828,7 +828,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      * @throws Exception If failed.
      */
     public void testReduceQuery() throws Exception {
-        Cache<String, Integer> c = ignite.cache(null);
+        GridCache<String, Integer> c = ignite.cache(null);
 
         assert c.putx("key1", 1);
         assert c.putx("key2", 2);
@@ -877,7 +877,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      * @throws Exception If failed.
      */
     public void testEmptyObject() throws Exception {
-        Cache<EmptyObject, EmptyObject> cache = ignite.cache(null);
+        GridCache<EmptyObject, EmptyObject> cache = ignite.cache(null);
 
         cache.putx(new EmptyObject(1), new EmptyObject(2));
 
@@ -893,7 +893,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      * @throws Exception If failed.
      */
     public void testPrimitiveType() throws Exception {
-        Cache<Integer, Integer> cache = ignite.cache(null);
+        GridCache<Integer, Integer> cache = ignite.cache(null);
 
         assert cache.putx(1, 1);
         assert cache.putx(2, 2);
@@ -929,7 +929,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      * @throws Exception If failed.
      */
     private void testPaginationIterator(@Nullable String cacheName) throws Exception {
-        Cache<Integer, Integer> cache = ignite.cache(cacheName);
+        GridCache<Integer, Integer> cache = ignite.cache(cacheName);
 
         for (int i = 0; i < 50; i++)
             assertTrue(cache.putx(i, i));
@@ -966,7 +966,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      * @throws Exception If failed.
      */
     public void testPaginationIteratorKeepAll() throws Exception {
-        Cache<Integer, Integer> cache = ignite.cache(null);
+        GridCache<Integer, Integer> cache = ignite.cache(null);
 
         for (int i = 0; i < 50; i++)
             assertTrue(cache.putx(i, i));
@@ -1029,7 +1029,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      * @throws Exception If failed.
      */
     private void testPaginationGet(@Nullable String cacheName) throws Exception {
-        Cache<Integer, Integer> cache = ignite.cache(cacheName);
+        GridCache<Integer, Integer> cache = ignite.cache(cacheName);
 
         for (int i = 0; i < 50; i++)
             assertTrue(cache.putx(i, i));
@@ -1059,7 +1059,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      * @throws Exception If failed.
      */
     public void testScanFilters() throws Exception {
-        Cache<Integer, Integer> cache = ignite.cache(null);
+        GridCache<Integer, Integer> cache = ignite.cache(null);
 
         for (int i = 0; i < 50; i++)
             assertTrue(cache.putx(i, i));
@@ -1098,7 +1098,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      * @throws Exception If failed.
      */
     public void testEmptyGrid() throws Exception {
-        Cache<String, Integer> cache = ignite.cache(null);
+        GridCache<String, Integer> cache = ignite.cache(null);
 
         String key = "k";
 
@@ -1120,7 +1120,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      * @throws IgniteCheckedException if failed.
      */
     public void testBadHashObjectKey() throws IgniteCheckedException {
-        Cache<BadHashKeyObject, Integer> cache = ignite.cache(null);
+        GridCache<BadHashKeyObject, Integer> cache = ignite.cache(null);
 
         cache.put(new BadHashKeyObject("test_key1"), 9);
         cache.put(new BadHashKeyObject("test_key0"), 1005001);
@@ -1134,7 +1134,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      * @throws IgniteCheckedException if failed.
      */
     public void testTextIndexedKey() throws IgniteCheckedException {
-        Cache<ObjectValue, Integer> cache = ignite.cache(null);
+        GridCache<ObjectValue, Integer> cache = ignite.cache(null);
 
         cache.put(new ObjectValue("test_key1", 10), 19);
         cache.put(new ObjectValue("test_key0", 11), 11005);
@@ -1149,7 +1149,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      * @throws Exception If failed.
      */
     public void testAnonymousClasses() throws Exception {
-        Cache<Integer, Object> cache = ignite.cache(null);
+        GridCache<Integer, Object> cache = ignite.cache(null);
 
         Object val = new Object() {
             @CacheQuerySqlField
@@ -1191,7 +1191,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      * @throws Exception If failed.
      */
     public void testTwoAnonymousClasses() throws Exception {
-        Cache<Integer, Object> cache = ignite.cache(null);
+        GridCache<Integer, Object> cache = ignite.cache(null);
 
         Object val1 = new Object() {
             @Override public String toString() {
@@ -1221,7 +1221,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      * @throws Exception If failed.
      */
     public void testOrderByOnly() throws Exception {
-        Cache<Integer, Integer> cache = ignite.cache(null);
+        GridCache<Integer, Integer> cache = ignite.cache(null);
 
         for (int i = 0; i < 10; i++)
             assertTrue(cache.putx(i, i));
@@ -1252,7 +1252,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      * @throws Exception If failed.
      */
     public void testLimitOnly() throws Exception {
-        Cache<Integer, Integer> cache = ignite.cache(null);
+        GridCache<Integer, Integer> cache = ignite.cache(null);
 
         for (int i = 0; i < 10; i++)
             assertTrue(cache.putx(i, i));
@@ -1283,7 +1283,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      * @throws Exception If failed.
      */
     public void testArray() throws Exception {
-        Cache<Integer, ArrayObject> cache = ignite.cache(null);
+        GridCache<Integer, ArrayObject> cache = ignite.cache(null);
 
         assertTrue(cache.putx(1, new ArrayObject(new Long[] {1L, null, 3L})));
         assertTrue(cache.putx(2, new ArrayObject(new Long[] {4L, 5L, 6L})));
@@ -1376,7 +1376,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
             }, EVT_CACHE_QUERY_EXECUTED);
         }
 
-        Cache<Integer, Integer> cache = ignite.cache(null);
+        GridCache<Integer, Integer> cache = ignite.cache(null);
 
         for (int i = 0; i < 20; i++)
             assertTrue(cache.putx(i, i));
@@ -1470,7 +1470,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
             }, EVT_CACHE_QUERY_EXECUTED);
         }
 
-        Cache<Integer, Integer> cache = ignite.cache(null);
+        GridCache<Integer, Integer> cache = ignite.cache(null);
 
         for (int i = 0; i < 20; i++)
             assertTrue(cache.putx(i, i));
@@ -1568,7 +1568,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
             }, EVT_CACHE_QUERY_EXECUTED);
         }
 
-        Cache<Integer, Person> cache = ignite.cache(null);
+        GridCache<Integer, Person> cache = ignite.cache(null);
 
         assertTrue(cache.putx(1, new Person("Bob White", 1000)));
         assertTrue(cache.putx(2, new Person("Tom White", 1000)));
@@ -1664,7 +1664,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
             }, EVT_CACHE_QUERY_EXECUTED);
         }
 
-        Cache<Integer, Person> cache = ignite.cache(null);
+        GridCache<Integer, Person> cache = ignite.cache(null);
 
         for (int i = 1; i <= 20; i++)
             assertTrue(cache.putx(i, new Person("Person " + i, i)));

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java
index 23effe7..553cbe1 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java
@@ -121,7 +121,7 @@ public class GridCacheCrossCacheQuerySelfTest extends GridCommonAbstractTest {
         throws Exception {
         int idGen = 0;
 
-        Cache<Integer, Object> dimCache = ignite.cache("replicated");
+        GridCache<Integer, Object> dimCache = ignite.cache("replicated");
 
         for (int i = 0; i < 2; i++) {
             int id = idGen++;
@@ -138,7 +138,7 @@ public class GridCacheCrossCacheQuerySelfTest extends GridCommonAbstractTest {
         CacheProjection<Integer, DimStore> stores = dimCache.projection(Integer.class, DimStore.class);
         CacheProjection<Integer, DimProduct> prods = dimCache.projection(Integer.class, DimProduct.class);
 
-        Cache<Integer, FactPurchase> factCache = ignite.cache("partitioned");
+        GridCache<Integer, FactPurchase> factCache = ignite.cache("partitioned");
 
         List<DimStore> dimStores = new ArrayList<>(stores.values());
         Collections.sort(dimStores, new Comparator<DimStore>() {


Mime
View raw message