ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [49/61] [abbrv] incubator-ignite git commit: # ignite-63
Date Fri, 23 Jan 2015 16:06:51 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java
index 3ff7c94..1efc144 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java
@@ -71,7 +71,7 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid
      * @param c Test closure.
      * @throws Exception In case of error.
      */
-    private void runTest(final IgniteInClosure<Cache<String, Integer>> c) throws Exception {
+    private void runTest(final IgniteInClosure<GridCache<String, Integer>> c) throws Exception {
         final IgniteFuture<?> fut1 = GridTestUtils.runMultiThreadedAsync(new CAX() {
             @Override public void applyx() throws IgniteCheckedException {
                 while (true) {
@@ -92,7 +92,7 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid
 
         IgniteFuture<?> fut2 = GridTestUtils.runMultiThreadedAsync(new CA() {
             @Override public void apply() {
-                Cache<String, Integer> cache = cache();
+                GridCache<String, Integer> cache = cache();
 
                 while (!fut1.isDone())
                     if (guard.get())
@@ -151,8 +151,8 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid
      * @throws Exception In case of error.
      */
     public void testContainsKey() throws Exception {
-        runTest(new CI1<Cache<String,Integer>>() {
-            @Override public void apply(Cache<String, Integer> cache) {
+        runTest(new CI1<GridCache<String,Integer>>() {
+            @Override public void apply(GridCache<String, Integer> cache) {
                 assert cache.containsKey("key" + random());
                 assert !cache.containsKey("wrongKey");
             }
@@ -163,8 +163,8 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid
      * @throws Exception In case of error.
      */
     public void testContainsKeyFiltered() throws Exception {
-        runTest(new CI1<Cache<String,Integer>>() {
-            @Override public void apply(Cache<String, Integer> cache) {
+        runTest(new CI1<GridCache<String,Integer>>() {
+            @Override public void apply(GridCache<String, Integer> cache) {
                 assert cache.projection(F.<String, Integer>cacheHasPeekValue()).containsKey("key");
                 assert !cache.projection(F.<String, Integer>cacheNoPeekValue()).containsKey("key" + random());
             }
@@ -175,8 +175,8 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid
      * @throws Exception In case of error.
      */
     public void testContainsValue() throws Exception {
-        runTest(new CI1<Cache<String,Integer>>() {
-            @Override public void apply(Cache<String, Integer> cache) {
+        runTest(new CI1<GridCache<String,Integer>>() {
+            @Override public void apply(GridCache<String, Integer> cache) {
                 assert cache.containsValue(random());
                 assert !cache.containsValue(-1);
             }
@@ -187,8 +187,8 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid
      * @throws Exception In case of error.
      */
     public void testContainsValueFiltered() throws Exception {
-        runTest(new CI1<Cache<String,Integer>>() {
-            @Override public void apply(Cache<String, Integer> cache) {
+        runTest(new CI1<GridCache<String,Integer>>() {
+            @Override public void apply(GridCache<String, Integer> cache) {
                 assert cache.projection(F.<String, Integer>cacheHasPeekValue()).containsValue(random());
                 assert !cache.projection(F.<String, Integer>cacheNoPeekValue()).containsValue(random());
             }
@@ -199,8 +199,8 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid
      * @throws Exception In case of error.
      */
     public void testForAll() throws Exception {
-        runTest(new CI1<Cache<String,Integer>>() {
-            @Override public void apply(Cache<String, Integer> cache) {
+        runTest(new CI1<GridCache<String,Integer>>() {
+            @Override public void apply(GridCache<String, Integer> cache) {
                 assert cache.forAll(new P1<CacheEntry<String, Integer>>() {
                     @Override public boolean apply(CacheEntry<String, Integer> e) {
                         Integer val = e.peek();
@@ -216,8 +216,8 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid
      * @throws Exception In case of error.
      */
     public void testGet() throws Exception {
-        runTest(new CIX1<Cache<String,Integer>>() {
-            @Override public void applyx(Cache<String, Integer> cache) throws IgniteCheckedException {
+        runTest(new CIX1<GridCache<String,Integer>>() {
+            @Override public void applyx(GridCache<String, Integer> cache) throws IgniteCheckedException {
                 int rnd = random();
 
                 assert cache.get("key" + rnd) == rnd;
@@ -230,8 +230,8 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid
      * @throws Exception In case of error.
      */
     public void testGetAsync() throws Exception {
-        runTest(new CIX1<Cache<String,Integer>>() {
-            @Override public void applyx(Cache<String, Integer> cache) throws IgniteCheckedException {
+        runTest(new CIX1<GridCache<String,Integer>>() {
+            @Override public void applyx(GridCache<String, Integer> cache) throws IgniteCheckedException {
                 int rnd = random();
 
                 assert cache.getAsync("key" + rnd).get() == rnd;
@@ -244,8 +244,8 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid
      * @throws Exception In case of error.
      */
     public void testGetAll() throws Exception {
-        runTest(new CIX1<Cache<String,Integer>>() {
-            @Override public void applyx(Cache<String, Integer> cache) throws IgniteCheckedException {
+        runTest(new CIX1<GridCache<String,Integer>>() {
+            @Override public void applyx(GridCache<String, Integer> cache) throws IgniteCheckedException {
                 int rnd1 = random();
                 int rnd2 = random();
 
@@ -262,8 +262,8 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid
      * @throws Exception In case of error.
      */
     public void testGetAllAsync() throws Exception {
-        runTest(new CIX1<Cache<String,Integer>>() {
-            @Override public void applyx(Cache<String, Integer> cache) throws IgniteCheckedException {
+        runTest(new CIX1<GridCache<String,Integer>>() {
+            @Override public void applyx(GridCache<String, Integer> cache) throws IgniteCheckedException {
                 int rnd1 = random();
                 int rnd2 = random();
 
@@ -280,8 +280,8 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid
      * @throws Exception In case of error.
      */
     public void testRemove() throws Exception {
-        runTest(new CIX1<Cache<String,Integer>>() {
-            @Override public void applyx(Cache<String, Integer> cache) throws IgniteCheckedException {
+        runTest(new CIX1<GridCache<String,Integer>>() {
+            @Override public void applyx(GridCache<String, Integer> cache) throws IgniteCheckedException {
                 int rnd1 = random();
                 int rnd2 = random();
 
@@ -304,8 +304,8 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid
      * @throws Exception In case of error.
      */
     public void testRemoveAsync() throws Exception {
-        runTest(new CIX1<Cache<String,Integer>>() {
-            @Override public void applyx(Cache<String, Integer> cache) throws IgniteCheckedException {
+        runTest(new CIX1<GridCache<String,Integer>>() {
+            @Override public void applyx(GridCache<String, Integer> cache) throws IgniteCheckedException {
                 int rnd1 = random();
                 int rnd2 = random();
 
@@ -328,8 +328,8 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid
      * @throws Exception In case of error.
      */
     public void testRemoveAll() throws Exception {
-        runTest(new CIX1<Cache<String,Integer>>() {
-            @Override public void applyx(Cache<String, Integer> cache) throws IgniteCheckedException {
+        runTest(new CIX1<GridCache<String,Integer>>() {
+            @Override public void applyx(GridCache<String, Integer> cache) throws IgniteCheckedException {
                 int rnd = random();
 
                 cache.removeAll(rangeKeys(0, rnd));
@@ -344,8 +344,8 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid
      * @throws Exception In case of error.
      */
     public void testRemoveAllFiltered() throws Exception {
-        runTest(new CIX1<Cache<String,Integer>>() {
-            @Override public void applyx(Cache<String, Integer> cache) throws IgniteCheckedException {
+        runTest(new CIX1<GridCache<String,Integer>>() {
+            @Override public void applyx(GridCache<String, Integer> cache) throws IgniteCheckedException {
                 final int rnd = random();
 
                 cache.removeAll(new P1<CacheEntry<String, Integer>>() {
@@ -366,8 +366,8 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid
      * @throws Exception In case of error.
      */
     public void testRemoveAllAsync() throws Exception {
-        runTest(new CIX1<Cache<String,Integer>>() {
-            @Override public void applyx(Cache<String, Integer> cache) throws IgniteCheckedException {
+        runTest(new CIX1<GridCache<String,Integer>>() {
+            @Override public void applyx(GridCache<String, Integer> cache) throws IgniteCheckedException {
                 int rnd = random();
 
                 cache.removeAllAsync(rangeKeys(0, rnd)).get();
@@ -382,8 +382,8 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid
      * @throws Exception In case of error.
      */
     public void testRemoveAllAsyncFiltered() throws Exception {
-        runTest(new CIX1<Cache<String,Integer>>() {
-            @Override public void applyx(Cache<String, Integer> cache) throws IgniteCheckedException {
+        runTest(new CIX1<GridCache<String,Integer>>() {
+            @Override public void applyx(GridCache<String, Integer> cache) throws IgniteCheckedException {
                 final int rnd = random();
 
                 cache.removeAllAsync(new P1<CacheEntry<String, Integer>>() {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
index f98e5f3..7c6af95 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
@@ -522,7 +522,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
      * @throws Exception In case of error.
      */
     public void testGetAllWithNulls() throws Exception {
-        Cache<String, Integer> cache = cache();
+        GridCache<String, Integer> cache = cache();
 
         Collection<String> c = new LinkedList<>();
 
@@ -1687,7 +1687,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
      * @throws Exception In case of error.
      */
     public void testPutAllWithNulls() throws Exception {
-        final Cache<String, Integer> cache = cache();
+        final GridCache<String, Integer> cache = cache();
 
         {
             Map<String, Integer> m = new HashMap<>(2);
@@ -2489,7 +2489,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
      * @throws Exception In case of error.
      */
     public void testRemoveAllWithNulls() throws Exception {
-        Cache<String, Integer> cache = cache();
+        GridCache<String, Integer> cache = cache();
 
         Collection<String> c = new LinkedList<>();
 
@@ -2705,7 +2705,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
     public void testReload() throws Exception {
         String key = "testReload";
 
-        Cache<String, Integer> cache = primaryCache(key);
+        GridCache<String, Integer> cache = primaryCache(key);
 
         assertNull(cache.peek(key));
 
@@ -2728,7 +2728,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
     public void testReloadAsync() throws Exception {
         String key = "testReloadAsync";
 
-        Cache<String, Integer> cache = primaryCache(key);
+        GridCache<String, Integer> cache = primaryCache(key);
 
         assertNull(cache.get(key));
 
@@ -2749,7 +2749,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
      * @throws Exception In case of error.
      */
     public void testReloadFiltered() throws Exception {
-        Cache<String, Integer> cache = primaryCache("key");
+        GridCache<String, Integer> cache = primaryCache("key");
 
         assertNull(cache.get("key"));
 
@@ -2769,7 +2769,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
      * @throws Exception In case of error.
      */
     public void testReloadAsyncFiltered() throws Exception {
-        Cache<String, Integer> cache = primaryCache("key");
+        GridCache<String, Integer> cache = primaryCache("key");
 
         assertNull(cache.get("key"));
 
@@ -2789,7 +2789,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
      * @throws Exception In case of error.
      */
     public void testReloadAll() throws Exception {
-        Cache<String, Integer> cache = cache();
+        GridCache<String, Integer> cache = cache();
 
         Collection<String> keys = primaryKeysForCache(cache, 2);
 
@@ -2847,7 +2847,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
      * @throws Exception In case of error.
      */
     public void testReloadAllAsync() throws Exception {
-        Cache<String, Integer> cache = cache();
+        GridCache<String, Integer> cache = cache();
 
         Collection<String> keys = primaryKeysForCache(cache, 2);
 
@@ -2908,7 +2908,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
      * @throws Exception In case of error.
      */
     public void testReloadAllFiltered() throws Exception {
-        Cache<String, Integer> cache = cache();
+        GridCache<String, Integer> cache = cache();
 
         Collection<String> keys = primaryKeysForCache(cache, 3);
 
@@ -2955,7 +2955,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
      * @throws Exception In case of error.
      */
     public void testReloadAllAsyncFiltered() throws Exception {
-        Cache<String, Integer> cache = cache();
+        GridCache<String, Integer> cache = cache();
 
         Collection<String> keys = primaryKeysForCache(cache, 3);
 
@@ -3103,7 +3103,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
      * @throws Exception In case of error.
      */
     public void testClear() throws Exception {
-        Cache<String, Integer> cache = cache();
+        GridCache<String, Integer> cache = cache();
 
         Collection<String> keys = primaryKeysForCache(cache, 3);
 
@@ -3201,7 +3201,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
      * @throws Exception In case of error.
      */
     public void testClearKeys() throws Exception {
-        Cache<String, Integer> cache = cache();
+        GridCache<String, Integer> cache = cache();
 
         Collection<String> keys = primaryKeysForCache(cache, 3);
 
@@ -3529,7 +3529,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
             if (node == null)
                 throw new IgniteCheckedException("Failed to map key.");
 
-            Cache<String, Integer> cache = G.ignite(node.id()).cache(null);
+            GridCache<String, Integer> cache = G.ignite(node.id()).cache(null);
 
             final CacheEntry<String, Integer> e = cache.entry("key");
 
@@ -3744,7 +3744,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
      * @throws Exception In case of error.
      */
     public void testPeek() throws Exception {
-        Cache<String, Integer> cache = primaryCache("key");
+        GridCache<String, Integer> cache = primaryCache("key");
 
         assert cache.peek("key") == null;
 
@@ -3783,7 +3783,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
      */
     private void checkPeekTxRemove(IgniteTxConcurrency concurrency) throws Exception {
         if (txEnabled()) {
-            Cache<String, Integer> cache = primaryCache("key");
+            GridCache<String, Integer> cache = primaryCache("key");
 
             cache.put("key", 1);
 
@@ -3801,7 +3801,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
      * @throws Exception If failed.
      */
     public void testPeekRemove() throws Exception {
-        Cache<String, Integer> cache = primaryCache("key");
+        GridCache<String, Integer> cache = primaryCache("key");
 
         cache.put("key", 1);
         cache.remove("key");
@@ -3814,7 +3814,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
      */
     public void testPeekMode() throws Exception {
         String key = "testPeekMode";
-        Cache<String, Integer> cache = primaryCache(key);
+        GridCache<String, Integer> cache = primaryCache(key);
 
         cache.put(key, 1);
 
@@ -3950,8 +3950,8 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
      * @throws Exception In case of error.
      */
     public void testPeekFiltered() throws Exception {
-        Cache<String, Integer> cache1 = primaryCache("key1");
-        Cache<String, Integer> cache2 = primaryCache("key2");
+        GridCache<String, Integer> cache1 = primaryCache("key1");
+        GridCache<String, Integer> cache2 = primaryCache("key2");
 
         cache1.put("key1", 1);
         cache2.put("key2", 100);
@@ -3976,7 +3976,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
      * @throws Exception In case of error.
      */
     public void testEvict() throws Exception {
-        Cache<String, Integer> cache = cache();
+        GridCache<String, Integer> cache = cache();
 
         List<String> keys = primaryKeysForCache(cache, 2);
 
@@ -4017,7 +4017,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
      * @throws Exception In case of error.
      */
     public void testEvictExpired() throws Exception {
-        Cache<String, Integer> cache = cache();
+        GridCache<String, Integer> cache = cache();
 
         String key = primaryKeysForCache(cache, 1).get(0);
 
@@ -4066,7 +4066,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
      * @throws Exception If failed.
      */
     public void testPeekExpired() throws Exception {
-        Cache<String, Integer> c = cache();
+        GridCache<String, Integer> c = cache();
 
         String key = primaryKeysForCache(c, 1).get(0);
 
@@ -4096,7 +4096,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
      */
     public void testPeekExpiredTx() throws Exception {
         if (txEnabled()) {
-            Cache<String, Integer> c = cache();
+            GridCache<String, Integer> c = cache();
 
             String key = "1";
             int ttl = 500;
@@ -4149,7 +4149,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
 
         final ExpiryPolicy expiry = new TouchedExpiryPolicy(new Duration(MILLISECONDS, ttl));
 
-        final Cache<String, Integer> c = cache();
+        final GridCache<String, Integer> c = cache();
 
         final String key = primaryKeysForCache(c, 1).get(0);
 
@@ -4534,7 +4534,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
      * JUnit.
      */
     public void testCacheProxy() {
-        Cache<String, Integer> cache = cache();
+        GridCache<String, Integer> cache = cache();
 
         assert cache instanceof GridCacheProxy;
     }
@@ -4545,7 +4545,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
      * @throws Exception If failed.
      */
     public void testCompactExpired() throws Exception {
-        Cache<String, Integer> cache = cache();
+        GridCache<String, Integer> cache = cache();
 
         String key = F.first(primaryKeysForCache(cache, 1));
 
@@ -5016,7 +5016,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
      * @return Cache.
      * @throws Exception If failed.
      */
-    protected Cache<String, Integer> primaryCache(String key) throws Exception {
+    protected GridCache<String, Integer> primaryCache(String key) throws Exception {
         ClusterNode node = cache().affinity().mapKeyToNode(key);
 
         if (node == null)
@@ -5024,7 +5024,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
 
         UUID nodeId = node.id();
 
-        Cache<String, Integer> cache = null;
+        GridCache<String, Integer> cache = null;
 
         for (int i = 0; i < gridCount(); i++) {
             if (context(i).localNodeId().equals(nodeId)) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java
index fb7c7c4..0e7c732 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java
@@ -80,7 +80,7 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract
      * @throws Exception If failed.
      */
     public void testWritesReads() throws Exception {
-        Cache<Integer, Integer> cache0 = grid(0).cache(null);
+        GridCache<Integer, Integer> cache0 = grid(0).cache(null);
 
         int keyCnt = keyCount();
 
@@ -99,7 +99,7 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract
             info("Writes: " + cache0.metrics().writes());
 
             for (int j = 0; j < gridCount(); j++) {
-                Cache<Integer, Integer> cache = grid(j).cache(null);
+                GridCache<Integer, Integer> cache = grid(j).cache(null);
 
                 int cacheWrites = cache.metrics().writes();
 
@@ -138,7 +138,7 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract
      * @throws Exception If failed.
      */
     public void testMisses() throws Exception {
-        Cache<Integer, Integer> cache = grid(0).cache(null);
+        GridCache<Integer, Integer> cache = grid(0).cache(null);
 
         // TODO: GG-7578.
         if (cache.configuration().getCacheMode() == CacheMode.REPLICATED)
@@ -183,7 +183,7 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract
      * @throws Exception If failed.
      */
     public void testMissesOnEmptyCache() throws Exception {
-        Cache<Integer, Integer> cache = grid(0).cache(null);
+        GridCache<Integer, Integer> cache = grid(0).cache(null);
 
         // TODO: GG-7578.
         if (cache.configuration().getCacheMode() == CacheMode.REPLICATED)

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractProjectionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractProjectionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractProjectionSelfTest.java
index d7bb208..74dc817 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractProjectionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractProjectionSelfTest.java
@@ -72,7 +72,7 @@ public abstract class GridCacheAbstractProjectionSelfTest extends GridCacheAbstr
      * @return Cache instance.
      */
     @SuppressWarnings({"TypeMayBeWeakened"})
-    private Cache<String, TestCloneable> cacheCloneable() {
+    private GridCache<String, TestCloneable> cacheCloneable() {
         return grid(0).cache(null);
     }
 
@@ -164,11 +164,11 @@ public abstract class GridCacheAbstractProjectionSelfTest extends GridCacheAbstr
      * @throws Exception In case of error.
      */
     public void testTypeProjection() throws Exception {
-        Cache<String, Integer> cache = cache();
+        GridCache<String, Integer> cache = cache();
 
         cache.putAll(F.asMap("k1", 1 , "k2", 2, "k3", 3));
 
-        Cache<Double, Boolean> anotherCache = grid(0).cache(null);
+        GridCache<Double, Boolean> anotherCache = grid(0).cache(null);
 
         assert anotherCache != null;
 
@@ -809,7 +809,7 @@ public abstract class GridCacheAbstractProjectionSelfTest extends GridCacheAbstr
      * @throws IgniteCheckedException In case of error.
      */
     public void testTypedProjection() throws Exception {
-        Cache<Object, Object> cache = grid(0).cache(null);
+        GridCache<Object, Object> cache = grid(0).cache(null);
 
         cache.putx("1", "test string");
         cache.putx("2", 0);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java
index 2f14c32..8992d33 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java
@@ -109,7 +109,7 @@ public abstract class GridCacheAbstractRemoveFailureTest extends GridCacheAbstra
      * @throws Exception If failed.
      */
     public void testPutAndRemove() throws Exception {
-        final Cache<Integer, Integer> sndCache0 = grid(0).cache(null);
+        final GridCache<Integer, Integer> sndCache0 = grid(0).cache(null);
 
         final AtomicBoolean stop = new AtomicBoolean();
 
@@ -288,7 +288,7 @@ public abstract class GridCacheAbstractRemoveFailureTest extends GridCacheAbstra
         for (int i = 0; i < GRID_CNT; i++) {
             Ignite ignite = grid(i);
 
-            Cache<Integer, Integer> cache = ignite.cache(null);
+            GridCache<Integer, Integer> cache = ignite.cache(null);
 
             for (Map.Entry<Integer, GridTuple<Integer>> expVal : expVals.entrySet()) {
                 Integer val = cache.get(expVal.getKey());

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java
index fe2ddc2..a18bb9a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.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.store.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.configuration.*;
@@ -115,7 +115,7 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest {
                             // Preloading may happen as nodes leave, so we need to wait.
                             new GridAbsPredicateX() {
                                 @Override public boolean applyx() throws IgniteCheckedException {
-                                    Cache<String, Integer> cache = cache(fi);
+                                    GridCache<String, Integer> cache = cache(fi);
 
                                     cache.removeAll();
 
@@ -354,7 +354,7 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest {
      * @return Cache instance casted to work with string and integer types for convenience.
      */
     @SuppressWarnings({"unchecked"})
-    @Override protected Cache<String, Integer> cache(int idx) {
+    @Override protected GridCache<String, Integer> cache(int idx) {
         return grid(idx).cache(null);
     }
 
@@ -362,7 +362,7 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest {
      * @return Default cache instance casted to work with string and integer types for convenience.
      */
     @SuppressWarnings({"unchecked"})
-    @Override protected Cache<String, Integer> cache() {
+    @Override protected GridCache<String, Integer> cache() {
         return cache(0);
     }
 
@@ -404,7 +404,7 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest {
      * @param cache Cache.
      * @return {@code True} if cache has OFFHEAP_TIERED memory mode.
      */
-    protected boolean offheapTiered(Cache cache) {
+    protected boolean offheapTiered(GridCache cache) {
         return cache.configuration().getMemoryMode() == OFFHEAP_TIERED;
     }
 
@@ -427,7 +427,7 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     @SuppressWarnings("unchecked")
-    protected boolean containsKey(Cache cache, Object key) throws Exception {
+    protected boolean containsKey(GridCache cache, Object key) throws Exception {
         return offheapTiered(cache) ? containsOffheapKey(cache, key) : cache.containsKey(key);
     }
 
@@ -438,7 +438,7 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     @SuppressWarnings("unchecked")
-    protected boolean containsValue(Cache cache, Object val) throws Exception {
+    protected boolean containsValue(GridCache cache, Object val) throws Exception {
         return offheapTiered(cache) ? containsOffheapValue(cache, val) : cache.containsValue(val);
     }
 
@@ -449,7 +449,7 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     @SuppressWarnings("unchecked")
-    protected boolean containsOffheapKey(Cache cache, Object key) throws Exception {
+    protected boolean containsOffheapKey(GridCache cache, Object key) throws Exception {
         for (Iterator<Map.Entry> it = cache.offHeapIterator(); it.hasNext();) {
             Map.Entry e = it.next();
 
@@ -467,7 +467,7 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     @SuppressWarnings("unchecked")
-    protected boolean containsOffheapValue(Cache cache, Object val) throws Exception {
+    protected boolean containsOffheapValue(GridCache cache, Object val) throws Exception {
         for (Iterator<Map.Entry> it = cache.offHeapIterator(); it.hasNext();) {
             Map.Entry e = it.next();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractTxReadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractTxReadTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractTxReadTest.java
index e222d0b..235f2ce 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractTxReadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractTxReadTest.java
@@ -99,7 +99,7 @@ public abstract class GridCacheAbstractTxReadTest extends GridCacheAbstractSelfT
      */
     protected void checkTransactionalRead(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation)
         throws IgniteCheckedException {
-        Cache<String, Integer> cache = cache(0);
+        GridCache<String, Integer> cache = cache(0);
 
         cache.clearAll();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicApiAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicApiAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicApiAbstractTest.java
index 077d427..b892230 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicApiAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicApiAbstractTest.java
@@ -400,7 +400,7 @@ public abstract class GridCacheBasicApiAbstractTest extends GridCommonAbstractTe
      * @throws Exception If error occur.
      */
     public void testBasicOps() throws Exception {
-        Cache<Integer, String> cache = ignite.cache(null);
+        GridCache<Integer, String> cache = ignite.cache(null);
 
         CountDownLatch latch = new CountDownLatch(1);
 
@@ -562,7 +562,7 @@ public abstract class GridCacheBasicApiAbstractTest extends GridCommonAbstractTe
      * @throws IgniteCheckedException If test failed.
      */
     public void testGetPutRemove() throws IgniteCheckedException {
-        Cache<Integer, String> cache = ignite.cache(null);
+        GridCache<Integer, String> cache = ignite.cache(null);
 
         int key = (int)System.currentTimeMillis();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreAbstractTest.java
index 26350bd..912f424 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreAbstractTest.java
@@ -118,7 +118,7 @@ public abstract class GridCacheBasicStoreAbstractTest extends GridCommonAbstract
      * @throws IgniteCheckedException If failed.
      */
     public void testNotExistingKeys() throws IgniteCheckedException {
-        Cache<Integer, String> cache = cache();
+        GridCache<Integer, String> cache = cache();
         Map<Integer, String> map = store.getMap();
 
         cache.put(100, "hacuna matata");
@@ -142,7 +142,7 @@ public abstract class GridCacheBasicStoreAbstractTest extends GridCommonAbstract
 
     /** @throws Exception If test fails. */
     public void testWriteThrough() throws Exception {
-        Cache<Integer, String> cache = cache();
+        GridCache<Integer, String> cache = cache();
 
         Map<Integer, String> map = store.getMap();
 
@@ -213,7 +213,7 @@ public abstract class GridCacheBasicStoreAbstractTest extends GridCommonAbstract
 
     /** @throws Exception If test failed. */
     public void testReadThrough() throws Exception {
-        Cache<Integer, String> cache = cache();
+        GridCache<Integer, String> cache = cache();
 
         Map<Integer, String> map = store.getMap();
 
@@ -306,7 +306,7 @@ public abstract class GridCacheBasicStoreAbstractTest extends GridCommonAbstract
 
     /** @throws Exception If test failed. */
     public void testLoadCache() throws Exception {
-        Cache<Integer, String> cache = cache();
+        GridCache<Integer, String> cache = cache();
 
         int cnt = 1;
 
@@ -336,7 +336,7 @@ public abstract class GridCacheBasicStoreAbstractTest extends GridCommonAbstract
 
     /** @throws Exception If test failed. */
     public void testLoadCacheWithPredicate() throws Exception {
-        Cache<Integer, String> cache = cache();
+        GridCache<Integer, String> cache = cache();
 
         int cnt = 10;
 
@@ -373,7 +373,7 @@ public abstract class GridCacheBasicStoreAbstractTest extends GridCommonAbstract
 
     /** @throws Exception If test failed. */
     public void testReloadCache() throws Exception {
-        Cache<Integer, String> cache = cache();
+        GridCache<Integer, String> cache = cache();
 
         cache.loadCache(null, 0, 0);
 
@@ -441,7 +441,7 @@ public abstract class GridCacheBasicStoreAbstractTest extends GridCommonAbstract
 
     /** @throws Exception If test failed. */
     public void testReloadAll() throws Exception {
-        Cache<Integer, String> cache = cache();
+        GridCache<Integer, String> cache = cache();
 
         assert cache.isEmpty();
 
@@ -505,7 +505,7 @@ public abstract class GridCacheBasicStoreAbstractTest extends GridCommonAbstract
     /** @throws Exception If test failed. */
     @SuppressWarnings("StringEquality")
     public void testReload() throws Exception {
-        Cache<Integer, String> cache = cache();
+        GridCache<Integer, String> cache = cache();
 
         assert cache.isEmpty();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreMultithreadedAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreMultithreadedAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreMultithreadedAbstractTest.java
index 954a29a..e832d59 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreMultithreadedAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreMultithreadedAbstractTest.java
@@ -18,7 +18,7 @@
 package org.apache.ignite.internal.processors.cache;
 
 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.spi.discovery.tcp.*;
@@ -47,7 +47,7 @@ public abstract class GridCacheBasicStoreMultithreadedAbstractTest extends GridC
 
     /** {@inheritDoc} */
     @Override protected void afterTest() throws Exception {
-        Cache<?, ?> cache = cache();
+        GridCache<?, ?> cache = cache();
 
         if (cache != null)
             cache.clearAll();
@@ -111,7 +111,7 @@ public abstract class GridCacheBasicStoreMultithreadedAbstractTest extends GridC
 
         startGrid();
 
-        final Cache<Integer, Integer> cache = cache();
+        final GridCache<Integer, Integer> cache = cache();
 
         int threads = 2;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearAllSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearAllSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearAllSelfTest.java
index c794e09..baf71cb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearAllSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearAllSelfTest.java
@@ -35,7 +35,7 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*;
 import static org.apache.ignite.internal.processors.cache.GridCacheAdapter.*;
 
 /**
- * Test {@link org.apache.ignite.cache.Cache#clearAll()} operations in multinode environment with nodes having caches with different names.
+ * Test {@link org.apache.ignite.cache.GridCache#clearAll()} operations in multinode environment with nodes having caches with different names.
  */
 public class GridCacheClearAllSelfTest extends GridCommonAbstractTest {
     /** Local cache. */
@@ -57,16 +57,16 @@ public class GridCacheClearAllSelfTest extends GridCommonAbstractTest {
     private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
 
     /** Local caches. */
-    private Cache<Integer, Integer>[] cachesLoc;
+    private GridCache<Integer, Integer>[] cachesLoc;
 
     /** Partitioned caches. */
-    private Cache<Integer, Integer>[] cachesPartitioned;
+    private GridCache<Integer, Integer>[] cachesPartitioned;
 
     /** Colocated caches. */
-    private Cache<Integer, Integer>[] cachesColocated;
+    private GridCache<Integer, Integer>[] cachesColocated;
 
     /** Replicated caches. */
-    private Cache<Integer, Integer>[] cachesReplicated;
+    private GridCache<Integer, Integer>[] cachesReplicated;
 
     /** {@inheritDoc} */
     @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
@@ -132,10 +132,10 @@ public class GridCacheClearAllSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     private void startUp() throws Exception {
-        cachesLoc = (Cache<Integer, Integer>[])Array.newInstance(Cache.class, GRID_CNT);
-        cachesPartitioned = (Cache<Integer, Integer>[])Array.newInstance(Cache.class, GRID_CNT);
-        cachesColocated = (Cache<Integer, Integer>[])Array.newInstance(Cache.class, GRID_CNT);
-        cachesReplicated = (Cache<Integer, Integer>[])Array.newInstance(Cache.class, GRID_CNT);
+        cachesLoc = (GridCache<Integer, Integer>[])Array.newInstance(GridCache.class, GRID_CNT);
+        cachesPartitioned = (GridCache<Integer, Integer>[])Array.newInstance(GridCache.class, GRID_CNT);
+        cachesColocated = (GridCache<Integer, Integer>[])Array.newInstance(GridCache.class, GRID_CNT);
+        cachesReplicated = (GridCache<Integer, Integer>[])Array.newInstance(GridCache.class, GRID_CNT);
 
         for (int i = 0; i < GRID_CNT; i++) {
             Ignite ignite = startGrid(i);
@@ -148,7 +148,7 @@ public class GridCacheClearAllSelfTest extends GridCommonAbstractTest {
     }
 
     /**
-     * Test {@link org.apache.ignite.cache.Cache#clearAll()} on LOCAL cache with no split.
+     * Test {@link org.apache.ignite.cache.GridCache#clearAll()} on LOCAL cache with no split.
      *
      * @throws Exception If failed.
      */
@@ -157,7 +157,7 @@ public class GridCacheClearAllSelfTest extends GridCommonAbstractTest {
     }
 
     /**
-     * Test {@link org.apache.ignite.cache.Cache#clearAll()} on LOCAL cache with split.
+     * Test {@link org.apache.ignite.cache.GridCache#clearAll()} on LOCAL cache with split.
      *
      * @throws Exception If failed.
      */
@@ -166,7 +166,7 @@ public class GridCacheClearAllSelfTest extends GridCommonAbstractTest {
     }
 
     /**
-     * Test {@link org.apache.ignite.cache.Cache#clearAll()} on PARTITIONED cache with no split.
+     * Test {@link org.apache.ignite.cache.GridCache#clearAll()} on PARTITIONED cache with no split.
      *
      * @throws Exception If failed.
      */
@@ -175,7 +175,7 @@ public class GridCacheClearAllSelfTest extends GridCommonAbstractTest {
     }
 
     /**
-     * Test {@link org.apache.ignite.cache.Cache#clearAll()} on PARTITIONED cache with split.
+     * Test {@link org.apache.ignite.cache.GridCache#clearAll()} on PARTITIONED cache with split.
      *
      * @throws Exception If failed.
      */
@@ -184,7 +184,7 @@ public class GridCacheClearAllSelfTest extends GridCommonAbstractTest {
     }
 
     /**
-     * Test {@link org.apache.ignite.cache.Cache#clearAll()} on co-located cache with no split.
+     * Test {@link org.apache.ignite.cache.GridCache#clearAll()} on co-located cache with no split.
      *
      * @throws Exception If failed.
      */
@@ -193,7 +193,7 @@ public class GridCacheClearAllSelfTest extends GridCommonAbstractTest {
     }
 
     /**
-     * Test {@link org.apache.ignite.cache.Cache#clearAll()} on co-located cache with split.
+     * Test {@link org.apache.ignite.cache.GridCache#clearAll()} on co-located cache with split.
      *
      * @throws Exception If failed.
      */
@@ -202,7 +202,7 @@ public class GridCacheClearAllSelfTest extends GridCommonAbstractTest {
     }
 
     /**
-     * Test {@link org.apache.ignite.cache.Cache#clearAll()} on REPLICATED cache with no split.
+     * Test {@link org.apache.ignite.cache.GridCache#clearAll()} on REPLICATED cache with no split.
      *
      * @throws Exception If failed.
      */
@@ -211,7 +211,7 @@ public class GridCacheClearAllSelfTest extends GridCommonAbstractTest {
     }
 
     /**
-     * Test {@link org.apache.ignite.cache.Cache#clearAll()} on REPLICATED cache with split.
+     * Test {@link org.apache.ignite.cache.GridCache#clearAll()} on REPLICATED cache with split.
      *
      * @throws Exception If failed.
      */
@@ -232,7 +232,7 @@ public class GridCacheClearAllSelfTest extends GridCommonAbstractTest {
         switch (mode) {
             case TEST_LOCAL: {
                 // Check on only one node.
-                Cache<Integer, Integer> cache = cachesLoc[0];
+                GridCache<Integer, Integer> cache = cachesLoc[0];
 
                 fillCache(cache, keysCnt);
 
@@ -273,11 +273,11 @@ public class GridCacheClearAllSelfTest extends GridCommonAbstractTest {
             default: {
                 assert mode == Mode.TEST_COLOCATED || mode == Mode.TEST_REPLICATED;
 
-                Cache<Integer, Integer>[] caches = mode == Mode.TEST_COLOCATED ? cachesColocated : cachesReplicated;
+                GridCache<Integer, Integer>[] caches = mode == Mode.TEST_COLOCATED ? cachesColocated : cachesReplicated;
 
                 fillCache(caches[0], keysCnt);
 
-                for (Cache<Integer, Integer> cache : caches) {
+                for (GridCache<Integer, Integer> cache : caches) {
                     assert !cache.isEmpty();
 
                     cache.clearAll();
@@ -295,7 +295,7 @@ public class GridCacheClearAllSelfTest extends GridCommonAbstractTest {
      * @param keysCnt Amount of keys to put.
      * @throws Exception If failed.
      */
-    private void fillCache(Cache<Integer, Integer> cache, int keysCnt) throws Exception {
+    private void fillCache(GridCache<Integer, Integer> cache, int keysCnt) throws Exception {
         try (IgniteTx tx = cache.txStart()) {
             for (int i = 0; i < keysCnt; i++)
                 cache.put(i, i);
@@ -311,7 +311,7 @@ public class GridCacheClearAllSelfTest extends GridCommonAbstractTest {
      * @param keysCnt Amount of keys to get.
      * @throws Exception If failed.
      */
-    private void warmCache(Cache<Integer, Integer> cache, int keysCnt) throws Exception {
+    private void warmCache(GridCache<Integer, Integer> cache, int keysCnt) throws Exception {
         for (int i = 0; i < keysCnt; i++)
             cache.get(i);
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java
index 79ccac1..e2c14e8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java
@@ -74,7 +74,7 @@ public class GridCacheConcurrentMapSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testRehash() throws Exception {
-        Cache<Integer, String> c = grid().cache(null);
+        GridCache<Integer, String> c = grid().cache(null);
 
         int cnt = 100 * 1024;
 
@@ -105,7 +105,7 @@ public class GridCacheConcurrentMapSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testRehashRandom() throws Exception {
-        Cache<Integer, String> c = grid().cache(null);
+        GridCache<Integer, String> c = grid().cache(null);
 
         int cnt = 100 * 1024;
 
@@ -153,7 +153,7 @@ public class GridCacheConcurrentMapSelfTest extends GridCommonAbstractTest {
         multithreaded(new Callable<Object>() {
             @SuppressWarnings("UnusedAssignment")
             @Override public Object call() throws Exception {
-                Cache<Integer, String> c = grid().cache(null);
+                GridCache<Integer, String> c = grid().cache(null);
 
                 int tid = tidGen.getAndIncrement();
 
@@ -249,7 +249,7 @@ public class GridCacheConcurrentMapSelfTest extends GridCommonAbstractTest {
         multithreaded(new Callable<Object>() {
             @SuppressWarnings("UnusedAssignment")
             @Override public Object call() throws Exception {
-                Cache<Integer, String> c = grid().cache(null);
+                GridCache<Integer, String> c = grid().cache(null);
 
                 int tid = tidGen.getAndIncrement();
 
@@ -336,7 +336,7 @@ public class GridCacheConcurrentMapSelfTest extends GridCommonAbstractTest {
      */
     @SuppressWarnings("ResultOfObjectAllocationIgnored")
     public void testEmptyWeakIterator() throws Exception {
-        final Cache<Integer, String> c = grid().cache(null);
+        final GridCache<Integer, String> c = grid().cache(null);
 
         for (int i = 0; i < 100; i++) {
             multithreaded(new Callable<Object>() {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapTest.java
index e85c0f3..15fb311 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapTest.java
@@ -70,7 +70,7 @@ public class GridCacheConcurrentMapTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testRandomEntry() throws Exception {
-        Cache<String, String> cache = grid(0).cache(null);
+        GridCache<String, String> cache = grid(0).cache(null);
 
         for (int i = 0; i < 500; i++)
             cache.put("key" + i, "val" + i);
@@ -88,7 +88,7 @@ public class GridCacheConcurrentMapTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testRandomEntryMultiThreaded() throws Exception {
-        final Cache<String, String> cache = grid(0).cache(null);
+        final GridCache<String, String> cache = grid(0).cache(null);
 
         final AtomicBoolean done = new AtomicBoolean();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
index 9871ffa..56ce912 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
@@ -611,7 +611,7 @@ public class GridCacheConcurrentTxMultiNodeTest extends GridCommonAbstractTest {
          *
          */
         private void doWork()  {
-            Cache cache = ignite.cache(null);
+            GridCache cache = ignite.cache(null);
 
             Session ses = new Session(terminalId());
 
@@ -703,7 +703,7 @@ public class GridCacheConcurrentTxMultiNodeTest extends GridCommonAbstractTest {
          * @throws IgniteCheckedException If failed.
          */
         private void put(Object o, String cacheKey, String terminalId) throws IgniteCheckedException {
-            Cache<CacheAffinityKey<String>, Object> cache = ignite.cache(null);
+            GridCache<CacheAffinityKey<String>, Object> cache = ignite.cache(null);
 
             CacheAffinityKey<String> affinityKey = new CacheAffinityKey<>(cacheKey, terminalId);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java
index c0e06b6..de58e56 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java
@@ -40,6 +40,7 @@ import org.apache.ignite.testframework.*;
 import org.apache.ignite.testframework.junits.common.*;
 import org.jetbrains.annotations.*;
 
+import javax.cache.*;
 import javax.cache.configuration.*;
 import javax.cache.integration.*;
 import java.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDaemonNodeAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDaemonNodeAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDaemonNodeAbstractSelfTest.java
index 8a0cb47..af91565 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDaemonNodeAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDaemonNodeAbstractSelfTest.java
@@ -95,7 +95,7 @@ public abstract class GridCacheDaemonNodeAbstractSelfTest extends GridCommonAbst
 
             startGrid(4);
 
-            Cache<Integer, Integer> cache = grid(0).cache(null);
+            GridCache<Integer, Integer> cache = grid(0).cache(null);
 
             for (int i = 0; i < 30; i++)
                 cache.put(i, i);
@@ -126,7 +126,7 @@ public abstract class GridCacheDaemonNodeAbstractSelfTest extends GridCommonAbst
 
             startGrid(4);
 
-            Cache<Integer, Integer> cache = grid(0).cache(null);
+            GridCache<Integer, Integer> cache = grid(0).cache(null);
 
             for (int i = 0; i < 30; i++) {
                 try (IgniteTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ)) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
index a7aa340..e6c3e43 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
@@ -294,7 +294,7 @@ public class GridCacheDeploymentSelfTest extends GridCommonAbstractTest {
 
             info("Key: " + key);
 
-            Cache<Object, Object> cache = g0.cache(null);
+            GridCache<Object, Object> cache = g0.cache(null);
 
             assert cache != null;
 
@@ -438,7 +438,7 @@ public class GridCacheDeploymentSelfTest extends GridCommonAbstractTest {
             }
             while (!g1.cluster().mapKeyToNode(null, affKey).id().equals(g1.cluster().localNode().id()));
 
-            Cache<Object, Object> cache = g1.cache(null);
+            GridCache<Object, Object> cache = g1.cache(null);
 
             try (IgniteTx tx = cache.txStartAffinity(affKey, PESSIMISTIC, REPEATABLE_READ, 0, 1)) {
                 cache.put(new CacheAffinityKey<>("key1", affKey), "val1");

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java
index d56ca44..528036f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java
@@ -129,7 +129,7 @@ public class GridCacheEntryMemorySizeSelfTest extends GridCommonAbstractTest {
         mode = LOCAL;
 
         try {
-            Cache<Integer, Value> cache = startGrid().cache(null);
+            GridCache<Integer, Value> cache = startGrid().cache(null);
 
             assertTrue(cache.putx(1, new Value(new byte[1024])));
             assertTrue(cache.putx(2, new Value(new byte[2048])));
@@ -151,7 +151,7 @@ public class GridCacheEntryMemorySizeSelfTest extends GridCommonAbstractTest {
         mode = REPLICATED;
 
         try {
-            Cache<Integer, Value> cache = startGrid().cache(null);
+            GridCache<Integer, Value> cache = startGrid().cache(null);
 
             assertTrue(cache.putx(1, new Value(new byte[1024])));
             assertTrue(cache.putx(2, new Value(new byte[2048])));

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEventAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEventAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEventAbstractTest.java
index d3cd01d..517ffd2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEventAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEventAbstractTest.java
@@ -108,7 +108,7 @@ public abstract class GridCacheEvictionEventAbstractTest extends GridCommonAbstr
             }
         }, IgniteEventType.EVT_CACHE_ENTRY_EVICTED);
 
-        Cache<String, String> c = g.cache(null);
+        GridCache<String, String> c = g.cache(null);
 
         c.put("1", "val1");
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheExAbstractFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheExAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheExAbstractFullApiSelfTest.java
index 22c5431..d952183 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheExAbstractFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheExAbstractFullApiSelfTest.java
@@ -62,7 +62,7 @@ public abstract class GridCacheExAbstractFullApiSelfTest extends GridCacheAbstra
         try {
             grid(0).events().localListen(lsnr, EVT_CACHE_OBJECT_LOCKED, EVT_CACHE_OBJECT_UNLOCKED);
 
-            Cache<String, Integer> cache = cache();
+            GridCache<String, Integer> cache = cache();
 
             try (IgniteTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ)) {
                 int key = 0;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFinishPartitionsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFinishPartitionsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFinishPartitionsSelfTest.java
index 8e9218e..87be338 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFinishPartitionsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFinishPartitionsSelfTest.java
@@ -84,7 +84,7 @@ public class GridCacheFinishPartitionsSelfTest extends GridCacheAbstractSelfTest
         String key = "key";
         String val = "value";
 
-        Cache<String, String> cache = grid.cache(null);
+        GridCache<String, String> cache = grid.cache(null);
 
         int keyPart = grid.<String, String>internalCache().context().affinity().partition(key);
 
@@ -127,7 +127,7 @@ public class GridCacheFinishPartitionsSelfTest extends GridCacheAbstractSelfTest
                 if (barrier.await() == 0)
                     start.set(System.currentTimeMillis());
 
-                Cache<String, String> cache = grid(0).cache(null);
+                GridCache<String, String> cache = grid(0).cache(null);
 
                 IgniteTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ);
 
@@ -187,7 +187,7 @@ public class GridCacheFinishPartitionsSelfTest extends GridCacheAbstractSelfTest
      * @throws Exception If failed.
      */
     public void testMvccFinishKeys() throws Exception {
-        Cache<String, Integer> cache = grid(0).cache(null);
+        GridCache<String, Integer> cache = grid(0).cache(null);
 
         try (IgniteTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ)) {
             final String key = "key";

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFullTextQueryMultithreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFullTextQueryMultithreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFullTextQueryMultithreadedSelfTest.java
index a2307c7..65cb986 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFullTextQueryMultithreadedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFullTextQueryMultithreadedSelfTest.java
@@ -73,7 +73,7 @@ public class GridCacheFullTextQueryMultithreadedSelfTest extends GridCacheAbstra
         final int logFreq = 50;
         final String txt = "Value";
 
-        final Cache<Integer, H2TextValue> c = grid(0).cache(null);
+        final GridCache<Integer, H2TextValue> c = grid(0).cache(null);
 
         IgniteFuture<?> fut1 = multithreadedAsync(new Callable() {
                 @Override public Object call() throws Exception {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGlobalClearAllSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGlobalClearAllSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGlobalClearAllSelfTest.java
index 9fd3039..b72fb80 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGlobalClearAllSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGlobalClearAllSelfTest.java
@@ -29,7 +29,7 @@ import static org.apache.ignite.cache.CacheDistributionMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
 
 /**
- * Test {@link org.apache.ignite.cache.Cache#globalClearAll()} operation in multinode environment with nodes
+ * Test {@link org.apache.ignite.cache.GridCache#globalClearAll()} operation in multinode environment with nodes
  * having caches with different names.
  */
 public class GridCacheGlobalClearAllSelfTest extends GridCommonAbstractTest {
@@ -147,7 +147,7 @@ public class GridCacheGlobalClearAllSelfTest extends GridCommonAbstractTest {
 
         // Check cache sizes.
         for (int i = 0; i < GRID_CNT - 1; i++) {
-            Cache<Object, Object> cache = grid(i).cache(CACHE_NAME);
+            GridCache<Object, Object> cache = grid(i).cache(CACHE_NAME);
 
             assertEquals("Key set [i=" + i + ", keys=" + cache.keySet() + ']', KEY_CNT, cache.size());
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGroupLockAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGroupLockAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGroupLockAbstractSelfTest.java
index a4b2845..49a3da0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGroupLockAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGroupLockAbstractSelfTest.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.affinity.*;
 import org.apache.ignite.cache.store.*;
 import org.apache.ignite.configuration.*;
@@ -158,7 +158,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr
 
         UUID affinityKey = primaryKeyForCache(grid(0));
 
-        Cache<CacheAffinityKey<String>, String> cache = grid(0).cache(null);
+        GridCache<CacheAffinityKey<String>, String> cache = grid(0).cache(null);
 
         CacheAffinityKey<String> key1;
         CacheAffinityKey<String> key2;
@@ -189,7 +189,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr
         for (int i = 0; i < gridCount(); i++) {
             Ignite g = grid(i);
 
-            Cache<Object, Object> gCache = g.cache(null);
+            GridCache<Object, Object> gCache = g.cache(null);
 
             if (gCache.affinity().isPrimaryOrBackup(g.cluster().localNode(), key1))
                 assertEquals("For index: " + i, "val1", gCache.peek(key1));
@@ -226,7 +226,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr
         CacheAffinityKey<String> key1 = new CacheAffinityKey<>("key1", affinityKey);
         CacheAffinityKey<String> key2 = new CacheAffinityKey<>("key2", affinityKey);
 
-        Cache<CacheAffinityKey<String>, String> cache = grid(0).cache(null);
+        GridCache<CacheAffinityKey<String>, String> cache = grid(0).cache(null);
 
         // Populate cache.
         cache.putAll(F.asMap(
@@ -237,7 +237,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr
         for (int i = 0; i < gridCount(); i++) {
             Ignite g = grid(i);
 
-            Cache<Object, Object> gCache = g.cache(null);
+            GridCache<Object, Object> gCache = g.cache(null);
 
             if (gCache.affinity().isPrimaryOrBackup(g.cluster().localNode(), key1))
                 assertEquals("For index: " + i, "val1", gCache.peek(key1));
@@ -270,7 +270,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr
         for (int i = 0; i < gridCount(); i++) {
             Ignite g = grid(i);
 
-            Cache<Object, Object> gCache = g.cache(null);
+            GridCache<Object, Object> gCache = g.cache(null);
 
             if (gCache.affinity().isPrimaryOrBackup(g.cluster().localNode(), key1))
                 assertNull("For index: " + i, gCache.peek(key1));
@@ -307,7 +307,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr
         CacheAffinityKey<String> key1 = new CacheAffinityKey<>("key1", affinityKey);
         CacheAffinityKey<String> key2 = new CacheAffinityKey<>("key2", affinityKey);
 
-        Cache<CacheAffinityKey<String>, String> cache = grid(0).cache(null);
+        GridCache<CacheAffinityKey<String>, String> cache = grid(0).cache(null);
 
         // Populate cache.
         cache.putAll(F.asMap(
@@ -318,7 +318,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr
         for (int i = 0; i < gridCount(); i++) {
             Ignite g = grid(i);
 
-            Cache<Object, Object> gCache = g.cache(null);
+            GridCache<Object, Object> gCache = g.cache(null);
 
             if (gCache.affinity().isPrimaryOrBackup(g.cluster().localNode(), key1))
                 assertEquals("For index: " + i, "val1", gCache.peek(key1));
@@ -383,7 +383,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr
         for (int i = 0; i < gridCount(); i++) {
             Ignite g = grid(i);
 
-            Cache<Object, Object> gCache = g.cache(null);
+            GridCache<Object, Object> gCache = g.cache(null);
 
             if (gCache.affinity().isPrimaryOrBackup(g.cluster().localNode(), key1))
                 assertEquals("For index: " + i, "val1", gCache.peek(key1));
@@ -472,7 +472,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr
         for (int i = 0; i < gridCount(); i++) {
             Ignite g = grid(i);
 
-            Cache<Object, Object> gCache = g.cache(null);
+            GridCache<Object, Object> gCache = g.cache(null);
 
             if (gCache.affinity().isPrimaryOrBackup(g.cluster().localNode(), key1))
                 assertEquals("For index: " + i, "val1", gCache.peek(key1));
@@ -490,7 +490,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr
             for (int i = 0; i < gridCount(); i++) {
                 Ignite g = grid(i);
 
-                Cache<Object, Object> gCache = g.cache(null);
+                GridCache<Object, Object> gCache = g.cache(null);
 
                 if (gCache.affinity().isPrimaryOrBackup(g.cluster().localNode(), key1))
                     assertEquals("For index: " + i, "val01", gCache.peek(key1));
@@ -528,7 +528,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr
 
         UUID affinityKey = primaryKeyForCache(grid(0));
 
-        Cache<UUID, String> cache = grid(0).cache(null);
+        GridCache<UUID, String> cache = grid(0).cache(null);
 
         UUID key1;
         UUID key2;
@@ -574,7 +574,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr
         for (int i = 0; i < gridCount(); i++) {
             Ignite g = grid(i);
 
-            Cache<Object, Object> gCache = g.cache(null);
+            GridCache<Object, Object> gCache = g.cache(null);
 
             if (gCache.affinity().isPrimaryOrBackup(g.cluster().localNode(), key1))
                 assertEquals("For index: " + i, "val1", gCache.peek(key1));
@@ -654,7 +654,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr
         CacheAffinityKey<String> key1 = new CacheAffinityKey<>("key1", affinityKey);
         CacheAffinityKey<String> key2 = new CacheAffinityKey<>("key2", affinityKey);
 
-        Cache<CacheAffinityKey<String>, String> cache = grid(0).cache(null);
+        GridCache<CacheAffinityKey<String>, String> cache = grid(0).cache(null);
 
         // Populate cache.
         cache.putAll(F.asMap(
@@ -665,7 +665,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr
         for (int i = 0; i < gridCount(); i++) {
             Ignite g = grid(i);
 
-            Cache<Object, Object> gCache = g.cache(null);
+            GridCache<Object, Object> gCache = g.cache(null);
 
             if (gCache.affinity().isPrimaryOrBackup(g.cluster().localNode(), key1))
                 assertEquals("For index: " + i, "val1", gCache.peek(key1));
@@ -715,7 +715,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr
         CacheAffinityKey<String> key1 = new CacheAffinityKey<>("key1", affinityKey);
         CacheAffinityKey<String> key2 = new CacheAffinityKey<>("key2", affinityKey);
 
-        Cache<CacheAffinityKey<String>, String> cache = grid(0).cache(null);
+        GridCache<CacheAffinityKey<String>, String> cache = grid(0).cache(null);
 
         grid(0).events().localListen(locks, EVT_CACHE_OBJECT_LOCKED);
         grid(0).events().localListen(unlocks, EVT_CACHE_OBJECT_UNLOCKED);
@@ -746,7 +746,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr
         for (int i = 0; i < gridCount(); i++) {
             Ignite g = grid(i);
 
-            Cache<Object, Object> gCache = g.cache(null);
+            GridCache<Object, Object> gCache = g.cache(null);
 
             if (gCache.affinity().isPrimaryOrBackup(g.cluster().localNode(), key1))
                 assertEquals("For index: " + i, "val01", gCache.peek(key1));
@@ -798,7 +798,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr
         CacheAffinityKey<String> key1 = new CacheAffinityKey<>("key1", affinityKey);
         CacheAffinityKey<String> key2 = new CacheAffinityKey<>("key2", affinityKey);
 
-        Cache<CacheAffinityKey<String>, String> cache = grid(0).cache(null);
+        GridCache<CacheAffinityKey<String>, String> cache = grid(0).cache(null);
 
         // Populate cache.
         cache.putAll(F.asMap(
@@ -809,7 +809,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr
         for (int i = 0; i < gridCount(); i++) {
             Ignite g = grid(i);
 
-            Cache<Object, Object> gCache = g.cache(null);
+            GridCache<Object, Object> gCache = g.cache(null);
 
             if (gCache.affinity().isPrimaryOrBackup(g.cluster().localNode(), key1))
                 assertEquals("For index: " + i, "val1", gCache.peek(key1));
@@ -879,7 +879,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr
         CacheAffinityKey<String> key1 = new CacheAffinityKey<>("key1", affinityKey);
         CacheAffinityKey<String> key2 = new CacheAffinityKey<>("key2", affinityKey);
 
-        Cache<CacheAffinityKey<String>, String> cache = grid(0).cache(null);
+        GridCache<CacheAffinityKey<String>, String> cache = grid(0).cache(null);
 
         // Populate cache.
         cache.putAll(F.asMap(
@@ -890,7 +890,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr
         for (int i = 0; i < gridCount(); i++) {
             Ignite g = grid(i);
 
-            Cache<Object, Object> gCache = g.cache(null);
+            GridCache<Object, Object> gCache = g.cache(null);
 
             if (gCache.affinity().isPrimaryOrBackup(g.cluster().localNode(), key1))
                 assertEquals("For index: " + i, "val1", gCache.peek(key1));
@@ -984,7 +984,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr
     private void checkGroupLockPutWrongKey(IgniteTxConcurrency concurrency) throws Exception {
         UUID affinityKey = primaryKeyForCache(grid(0));
 
-        final Cache<CacheAffinityKey<String>, String> cache = grid(0).cache(null);
+        final GridCache<CacheAffinityKey<String>, String> cache = grid(0).cache(null);
 
         try (IgniteTx ignored = cache.txStartAffinity(affinityKey, concurrency, READ_COMMITTED, 0, 1)) {
             // Key with affinity key different from enlisted on tx start should raise exception.
@@ -1020,7 +1020,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr
     private void checkGroupLockRemoveWrongKey(IgniteTxConcurrency concurrency) throws Exception {
         UUID affinityKey = primaryKeyForCache(grid(0));
 
-        final Cache<CacheAffinityKey<String>, String> cache = grid(0).cache(null);
+        final GridCache<CacheAffinityKey<String>, String> cache = grid(0).cache(null);
 
         final CacheAffinityKey<String> key = new CacheAffinityKey<>("key1", UUID.randomUUID());
 
@@ -1076,7 +1076,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr
         throws Exception {
         UUID affinityKey = primaryKeyForCache(grid(0));
 
-        final Cache<Object, String> cache = grid(0).cache(null);
+        final GridCache<Object, String> cache = grid(0).cache(null);
 
         final CacheAffinityKey<String> key1 = new CacheAffinityKey<>("key1", affinityKey);
         final CacheAffinityKey<String> key2 = new CacheAffinityKey<>("key2", affinityKey);
@@ -1127,7 +1127,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr
     private void checkGroupLockWriteThrough(IgniteTxConcurrency concurrency) throws Exception {
         UUID affinityKey = primaryKeyForCache(grid(0));
 
-        Cache<CacheAffinityKey<String>, String> cache = grid(0).cache(null);
+        GridCache<CacheAffinityKey<String>, String> cache = grid(0).cache(null);
 
         CacheAffinityKey<String> key1 = new CacheAffinityKey<>("key1", affinityKey);
         CacheAffinityKey<String> key2 = new CacheAffinityKey<>("key2", affinityKey);
@@ -1152,7 +1152,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr
         for (int i = 0; i < gridCount(); i++) {
             Ignite g = grid(i);
 
-            Cache<Object, Object> gCache = g.cache(null);
+            GridCache<Object, Object> gCache = g.cache(null);
 
             if (gCache.affinity().isPrimaryOrBackup(g.cluster().localNode(), key1))
                 assertEquals("For index: " + i, "val1", gCache.peek(key1));

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGroupLockFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGroupLockFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGroupLockFailoverSelfTest.java
index 9461a70..534daf0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGroupLockFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGroupLockFailoverSelfTest.java
@@ -381,7 +381,7 @@ public class GridCacheGroupLockFailoverSelfTest extends GridCommonAbstractTest {
 
         Collection<Integer> ret = new ArrayList<>(keys.size());
 
-        Cache<Object, Object> cache = workerNode.cache(CACHE_NAME);
+        GridCache<Object, Object> cache = workerNode.cache(CACHE_NAME);
 
         for (Integer key : keys) {
             if (cache.get(key) == null) // Key is absent.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGroupLockPutTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGroupLockPutTask.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGroupLockPutTask.java
index 861e3bf..4fa788b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGroupLockPutTask.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGroupLockPutTask.java
@@ -93,7 +93,7 @@ class GridCacheGroupLockPutTask extends ComputeTaskAdapter<Collection<Integer>,
                 @Override public Object execute() throws IgniteCheckedException {
                     log.info("Going to put data: " + data.size());
 
-                    Cache<Object, Object> cache = ignite.cache(cacheName);
+                    GridCache<Object, Object> cache = ignite.cache(cacheName);
 
                     assert cache != null;
 
@@ -126,7 +126,7 @@ class GridCacheGroupLockPutTask extends ComputeTaskAdapter<Collection<Integer>,
                  * @return Grouped map.
                  */
                 private Map<Integer, T2<Integer, Collection<Integer>>> groupData(Iterable<Integer> data) {
-                    Cache<Object, Object> cache = ignite.cache(cacheName);
+                    GridCache<Object, Object> cache = ignite.cache(cacheName);
 
                     Map<Integer, T2<Integer, Collection<Integer>>> res = new HashMap<>();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIteratorPerformanceTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIteratorPerformanceTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIteratorPerformanceTest.java
index ad61448..7704f4c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIteratorPerformanceTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIteratorPerformanceTest.java
@@ -161,7 +161,7 @@ public class GridCacheIteratorPerformanceTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testProjectionFiltered() throws Exception {
-        Cache<Integer, Integer> cache = grid().cache(null);
+        GridCache<Integer, Integer> cache = grid().cache(null);
 
         for (int i = 0; i < LARGE_ENTRY_CNT; i++)
             assert cache.putx(i, i);
@@ -199,7 +199,7 @@ public class GridCacheIteratorPerformanceTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testFiltered() throws Exception {
-        Cache<Integer, Integer> cache = grid().cache(null);
+        GridCache<Integer, Integer> cache = grid().cache(null);
 
         for (int i = 0; i < LARGE_ENTRY_CNT; i++)
             assert cache.putx(i, i);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheKeyCheckSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheKeyCheckSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheKeyCheckSelfTest.java
index 58f2aa6..d44c603 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheKeyCheckSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheKeyCheckSelfTest.java
@@ -128,7 +128,7 @@ public class GridCacheKeyCheckSelfTest extends GridCacheAbstractSelfTest {
         this.atomicityMode = atomicityMode;
 
         try {
-            Cache<IncorrectCacheKey, String> cache = grid(0).cache(null);
+            GridCache<IncorrectCacheKey, String> cache = grid(0).cache(null);
 
             cache.get(new IncorrectCacheKey(0));
 
@@ -148,7 +148,7 @@ public class GridCacheKeyCheckSelfTest extends GridCacheAbstractSelfTest {
         this.atomicityMode = atomicityMode;
 
         try {
-            Cache<IncorrectCacheKey, String> cache = grid(0).cache(null);
+            GridCache<IncorrectCacheKey, String> cache = grid(0).cache(null);
 
             cache.put(new IncorrectCacheKey(0), "test_value");
 
@@ -168,7 +168,7 @@ public class GridCacheKeyCheckSelfTest extends GridCacheAbstractSelfTest {
         this.atomicityMode = atomicityMode;
 
         try {
-            Cache<IncorrectCacheKey, String> cache = grid(0).cache(null);
+            GridCache<IncorrectCacheKey, String> cache = grid(0).cache(null);
 
             cache.remove(new IncorrectCacheKey(0));
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLeakTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLeakTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLeakTest.java
index 4c52f46..1d9c1f6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLeakTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLeakTest.java
@@ -108,7 +108,7 @@ public class GridCacheLeakTest extends GridCommonAbstractTest {
         try {
             int i = 0;
 
-            Cache<Object, Object> cache = grid(0).cache(CACHE_NAME);
+            GridCache<Object, Object> cache = grid(0).cache(CACHE_NAME);
 
             while (!Thread.currentThread().isInterrupted()) {
                 UUID key = UUID.randomUUID();


Mime
View raw message