ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [46/79] [abbrv] incubator-ignite git commit: # ignite-63
Date Fri, 23 Jan 2015 16:06:45 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java
index 9264c43..2f02c19 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java
@@ -96,7 +96,7 @@ public class GridCacheDhtPreloadMessageCountTest extends GridCommonAbstractTest
 
         int cnt = KEY_CNT;
 
-        Cache<String, Integer> c0 = g0.cache(null);
+        GridCache<String, Integer> c0 = g0.cache(null);
 
         for (int i = 0; i < cnt; i++)
             c0.put(Integer.toString(i), i);
@@ -106,8 +106,8 @@ public class GridCacheDhtPreloadMessageCountTest extends GridCommonAbstractTest
 
         U.sleep(1000);
 
-        Cache<String, Integer> c1 = g1.cache(null);
-        Cache<String, Integer> c2 = g2.cache(null);
+        GridCache<String, Integer> c1 = g1.cache(null);
+        GridCache<String, Integer> c2 = g2.cache(null);
 
         TestCommunicationSpi spi0 = (TestCommunicationSpi)g0.configuration().getCommunicationSpi();
         TestCommunicationSpi spi1 = (TestCommunicationSpi)g1.configuration().getCommunicationSpi();
@@ -126,7 +126,7 @@ public class GridCacheDhtPreloadMessageCountTest extends GridCommonAbstractTest
      * @param c Cache.
      * @param keyCnt Key count.
      */
-    private void checkCache(Cache<String, Integer> c, int keyCnt) {
+    private void checkCache(GridCache<String, Integer> c, int keyCnt) {
         Ignite g = c.gridProjection().ignite();
 
         for (int i = 0; i < keyCnt; i++) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadPutGetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadPutGetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadPutGetSelfTest.java
index 24b63df..9a0224f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadPutGetSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadPutGetSelfTest.java
@@ -194,7 +194,7 @@ public class GridCacheDhtPreloadPutGetSelfTest extends GridCommonAbstractTest {
                         for (int i = 0; i < ITER_CNT; i++) {
                             info("Iteration # " + i);
 
-                            Cache<Integer, Integer> cache = g2.cache(null);
+                            GridCache<Integer, Integer> cache = g2.cache(null);
 
                             for (int j = 0; j < KEY_CNT; j++) {
                                 CacheEntry<Integer, Integer> entry = cache.entry(j);
@@ -229,7 +229,7 @@ public class GridCacheDhtPreloadPutGetSelfTest extends GridCommonAbstractTest {
 
                         Ignite g1 = startGrid(1);
 
-                        Cache<Integer, Integer> cache = g1.cache(null);
+                        GridCache<Integer, Integer> cache = g1.cache(null);
 
                         for (int j = 0; j < KEY_CNT; j++) {
                             cache.put(j, j);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java
index e04983d..d13f647 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java
@@ -145,7 +145,7 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest {
      * @return Affinity.
      */
     @SuppressWarnings({"unchecked"})
-    private CacheAffinity<Integer> affinity(Cache<Integer, ?> cache) {
+    private CacheAffinity<Integer> affinity(GridCache<Integer, ?> cache) {
         return cache.affinity();
     }
 
@@ -153,7 +153,7 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest {
      * @param c Cache.
      * @return {@code True} if synchronous preloading.
      */
-    private boolean isSync(Cache<?, ?> c) {
+    private boolean isSync(GridCache<?, ?> c) {
         return c.configuration().getPreloadMode() == SYNC;
     }
 
@@ -223,7 +223,7 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest {
         try {
             Ignite ignite1 = startGrid(0);
 
-            Cache<Integer, String> cache1 = ignite1.cache(null);
+            GridCache<Integer, String> cache1 = ignite1.cache(null);
 
             putKeys(cache1, keyCnt);
             checkKeys(cache1, keyCnt, F.asList(ignite1));
@@ -234,7 +234,7 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest {
 
             // Check all nodes.
             for (Ignite g : ignites) {
-                Cache<Integer, String> c = g.cache(null);
+                GridCache<Integer, String> c = g.cache(null);
 
                 checkKeys(c, keyCnt, ignites);
             }
@@ -305,7 +305,7 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest {
 
             assert last != null;
 
-            Cache<Integer, String> lastCache = last.cache(null);
+            GridCache<Integer, String> lastCache = last.cache(null);
 
             GridDhtCacheAdapter<Integer, String> dht = dht(lastCache);
 
@@ -346,7 +346,7 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest {
     private void checkActiveState(Iterable<Ignite> grids) {
         // Check that nodes don't have non-active information about other nodes.
         for (Ignite g : grids) {
-            Cache<Integer, String> c = g.cache(null);
+            GridCache<Integer, String> c = g.cache(null);
 
             GridDhtCacheAdapter<Integer, String> dht = dht(c);
 
@@ -489,7 +489,7 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest {
         try {
             Ignite ignite1 = startGrid(0);
 
-            Cache<Integer, String> cache1 = ignite1.cache(null);
+            GridCache<Integer, String> cache1 = ignite1.cache(null);
 
             putKeys(cache1, keyCnt);
             checkKeys(cache1, keyCnt, F.asList(ignite1));
@@ -500,7 +500,7 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest {
 
             // Check all nodes.
             for (Ignite g : ignites) {
-                Cache<Integer, String> c = g.cache(null);
+                GridCache<Integer, String> c = g.cache(null);
 
                 checkKeys(c, keyCnt, ignites);
             }
@@ -563,7 +563,7 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest {
 
                 // Check all left nodes.
                 for (Ignite gg : ignites) {
-                    Cache<Integer, String> c = gg.cache(null);
+                    GridCache<Integer, String> c = gg.cache(null);
 
                     checkKeys(c, keyCnt, ignites);
                 }
@@ -571,7 +571,7 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest {
 
             assert last != null;
 
-            Cache<Integer, String> lastCache = last.cache(null);
+            GridCache<Integer, String> lastCache = last.cache(null);
 
             GridDhtCacheAdapter<Integer, String> dht = dht(lastCache);
 
@@ -607,7 +607,7 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest {
      * @param cnt Key count.
      * @throws IgniteCheckedException If failed.
      */
-    private void putKeys(Cache<Integer, String> c, int cnt) throws IgniteCheckedException {
+    private void putKeys(GridCache<Integer, String> c, int cnt) throws IgniteCheckedException {
         for (int i = 0; i < cnt; i++)
             c.put(i, Integer.toString(i));
     }
@@ -618,7 +618,7 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest {
      * @param grids Grids.
      * @throws IgniteCheckedException If failed.
      */
-    private void checkKeys(Cache<Integer, String> cache, int cnt, Iterable<Ignite> grids) throws IgniteCheckedException {
+    private void checkKeys(GridCache<Integer, String> cache, int cnt, Iterable<Ignite> grids) throws IgniteCheckedException {
         CacheAffinity<Integer> aff = affinity(cache);
 
         Ignite ignite = cache.gridProjection().ignite();
@@ -660,7 +660,7 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest {
         Map<String, String> map = new HashMap<>();
 
         for (Ignite g : grids) {
-            Cache<Integer, String> c = g.cache(null);
+            GridCache<Integer, String> c = g.cache(null);
 
             GridDhtCacheAdapter<Integer, String> dht = dht(c);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java
index fee1c54..bce6cf8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java
@@ -135,7 +135,7 @@ public class GridCacheDhtPreloadStartStopSelfTest extends GridCommonAbstractTest
      * @param cache Cache.
      * @return Affinity.
      */
-    private CacheAffinity<Integer> affinity(Cache<Integer, ?> cache) {
+    private CacheAffinity<Integer> affinity(GridCache<Integer, ?> cache) {
         return cache.affinity();
     }
 
@@ -143,7 +143,7 @@ public class GridCacheDhtPreloadStartStopSelfTest extends GridCommonAbstractTest
      * @param c Cache.
      * @return {@code True} if synchronoous preloading.
      */
-    private boolean isSync(Cache<?, ?> c) {
+    private boolean isSync(GridCache<?, ?> c) {
         return c.configuration().getPreloadMode() == SYNC;
     }
 
@@ -188,7 +188,7 @@ public class GridCacheDhtPreloadStartStopSelfTest extends GridCommonAbstractTest
         try {
             Ignite g1 = startGrid(0);
 
-            Cache<Integer, String> c1 = g1.cache(null);
+            GridCache<Integer, String> c1 = g1.cache(null);
 
             putKeys(c1, keyCnt);
             checkKeys(c1, keyCnt);
@@ -199,7 +199,7 @@ public class GridCacheDhtPreloadStartStopSelfTest extends GridCommonAbstractTest
 
             // Check all nodes.
             for (Ignite g : ignites) {
-                Cache<Integer, String> c = g.cache(null);
+                GridCache<Integer, String> c = g.cache(null);
 
                 checkKeys(c, keyCnt);
             }
@@ -240,7 +240,7 @@ public class GridCacheDhtPreloadStartStopSelfTest extends GridCommonAbstractTest
      * @param cnt Key count.
      * @throws IgniteCheckedException If failed.
      */
-    private void putKeys(Cache<Integer, String> c, int cnt) throws IgniteCheckedException {
+    private void putKeys(GridCache<Integer, String> c, int cnt) throws IgniteCheckedException {
         for (int i = 0; i < cnt; i++)
             c.put(i, Integer.toString(i));
     }
@@ -250,7 +250,7 @@ public class GridCacheDhtPreloadStartStopSelfTest extends GridCommonAbstractTest
      * @param cnt Key count.
      * @throws IgniteCheckedException If failed.
      */
-    private void checkKeys(Cache<Integer, String> c, int cnt) throws IgniteCheckedException {
+    private void checkKeys(GridCache<Integer, String> c, int cnt) throws IgniteCheckedException {
         CacheAffinity<Integer> aff = affinity(c);
 
         boolean sync = isSync(c);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java
index b3817e0..b8818b0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java
@@ -170,7 +170,7 @@ public class GridCacheDhtPreloadUnloadSelfTest extends GridCommonAbstractTest {
                 info("Grid size [i=" + i + ", size=" + grid(i).cache(null).size() + ']');
 
             for (int i = 0; i < gridCnt; i++) {
-                Cache<Integer, String> c = grid(i).cache(null);
+                GridCache<Integer, String> c = grid(i).cache(null);
 
                 // Nothing should be unloaded since nodes are backing up each other.
                 assert c.size() == cnt;
@@ -197,7 +197,7 @@ public class GridCacheDhtPreloadUnloadSelfTest extends GridCommonAbstractTest {
             boolean err = false;
 
             for (int i = 0; i < gridCnt; i++) {
-                Cache<Integer, String> c = grid(i).cache(null);
+                GridCache<Integer, String> c = grid(i).cache(null);
 
                 if (c.size() >= cnt)
                     err = true;
@@ -213,7 +213,7 @@ public class GridCacheDhtPreloadUnloadSelfTest extends GridCommonAbstractTest {
             info("Grid size [i=" + i + ", size=" + grid(i).cache(null).size() + ']');
 
         for (int i = 0; i < gridCnt; i++) {
-            Cache<Integer, String> c = grid(i).cache(null);
+            GridCache<Integer, String> c = grid(i).cache(null);
 
             assert c.size() < cnt;
         }
@@ -265,7 +265,7 @@ public class GridCacheDhtPreloadUnloadSelfTest extends GridCommonAbstractTest {
 
                 @Override public void onLifecycleEvent(LifecycleEventType evt) throws IgniteCheckedException {
                     if (evt == LifecycleEventType.AFTER_GRID_START) {
-                        Cache<Integer, String> c = ignite.cache(null);
+                        GridCache<Integer, String> c = ignite.cache(null);
 
                         if (c.putxIfAbsent(-1, "true")) {
                             populate(ignite.<Integer, String>cache(null), cnt);
@@ -301,7 +301,7 @@ public class GridCacheDhtPreloadUnloadSelfTest extends GridCommonAbstractTest {
      * @param cnt Key count.
      * @throws IgniteCheckedException If failed.
      */
-    private void populate(Cache<Integer, String> c, int cnt) throws IgniteCheckedException {
+    private void populate(GridCache<Integer, String> c, int cnt) throws IgniteCheckedException {
         for (int i = 0; i < cnt; i++)
             c.put(i, value(1024));
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtTestUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtTestUtils.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtTestUtils.java
index 594aa5d..cdd3ac3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtTestUtils.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtTestUtils.java
@@ -92,7 +92,7 @@ public class GridCacheDhtTestUtils {
     /**
      * @param cache Dht cache.
      */
-    static void printAffinityInfo(Cache<?, ?> cache) {
+    static void printAffinityInfo(GridCache<?, ?> cache) {
         CacheConsistentHashAffinityFunction aff =
             (CacheConsistentHashAffinityFunction)cache.configuration().getAffinity();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheGlobalLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheGlobalLoadTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheGlobalLoadTest.java
index 912abab..01eb3e7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheGlobalLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheGlobalLoadTest.java
@@ -27,6 +27,7 @@ import org.jdk8.backport.*;
 import org.jetbrains.annotations.*;
 import org.junit.*;
 
+import javax.cache.*;
 import java.util.concurrent.*;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheGroupLockPartitionedAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheGroupLockPartitionedAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheGroupLockPartitionedAbstractSelfTest.java
index bd97b6f..48b9f50 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheGroupLockPartitionedAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheGroupLockPartitionedAbstractSelfTest.java
@@ -74,7 +74,7 @@ public abstract class GridCacheGroupLockPartitionedAbstractSelfTest extends Grid
     private void checkUpdateEntry(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation) throws Exception {
         UUID affinityKey = primaryKeyForCache(grid(0));
 
-        Cache<CacheAffinityKey<Integer>, Integer> cache = cache(0);
+        GridCache<CacheAffinityKey<Integer>, Integer> cache = cache(0);
 
         assert cache.isEmpty();
 
@@ -112,7 +112,7 @@ public abstract class GridCacheGroupLockPartitionedAbstractSelfTest extends Grid
 
         final UUID affinityKey = primaryKeyForCache(grid(0));
 
-        final Cache<UUID, String> cache = grid(0).cache(null);
+        final GridCache<UUID, String> cache = grid(0).cache(null);
 
         try (IgniteTx tx = cache.txStartPartition(cache.affinity().partition(affinityKey), PESSIMISTIC, REPEATABLE_READ,
             0, 2)) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheGroupLockPartitionedMultiNodeAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheGroupLockPartitionedMultiNodeAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheGroupLockPartitionedMultiNodeAbstractSelfTest.java
index 909e134..1e581f5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheGroupLockPartitionedMultiNodeAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheGroupLockPartitionedMultiNodeAbstractSelfTest.java
@@ -58,7 +58,7 @@ public abstract class GridCacheGroupLockPartitionedMultiNodeAbstractSelfTest ext
     private void checkNonLocalKey(IgniteTxConcurrency concurrency) throws Exception {
         final UUID key = primaryKeyForCache(grid(1));
 
-        Cache<Object, Object> cache = grid(0).cache(null);
+        GridCache<Object, Object> cache = grid(0).cache(null);
 
         IgniteTx tx = null;
         try {
@@ -121,7 +121,7 @@ public abstract class GridCacheGroupLockPartitionedMultiNodeAbstractSelfTest ext
 
         grid(0).cache(null).put(affinityKey, "aff");
 
-        Cache<CacheAffinityKey<String>, String> cache = grid(0).cache(null);
+        GridCache<CacheAffinityKey<String>, String> cache = grid(0).cache(null);
 
         cache.putAll(F.asMap(
             key1, "val1",

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java
index f6f8014..1d96725 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java
@@ -76,7 +76,7 @@ public class GridCachePartitionedNearDisabledMetricsSelfTest extends GridCacheAb
      * @throws Exception If failed.
      */
     public void _testGettingRemovedKey() throws Exception {
-        Cache<Integer, Integer> cache = grid(0).cache(null);
+        GridCache<Integer, Integer> cache = grid(0).cache(null);
 
         cache.put(0, 0);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedPreloadEventsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedPreloadEventsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedPreloadEventsSelfTest.java
index 66df4d4..fdd8258 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedPreloadEventsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedPreloadEventsSelfTest.java
@@ -99,7 +99,7 @@ public class GridCachePartitionedPreloadEventsSelfTest extends GridCachePreloadE
 
         Collection<Integer> keys = new HashSet<>();
 
-        Cache<Integer, String> cache = g1.cache(null);
+        GridCache<Integer, String> cache = g1.cache(null);
 
         for (int i = 0; i < 100; i++) {
             keys.add(i);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java
index b456c18..b71c7da 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java
@@ -248,7 +248,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra
                 for (final Integer key : keysMap.values()) {
                     futs.add(multithreadedAsync(new Runnable() {
                         @Override public void run() {
-                            Cache<Integer, Integer> cache = node.cache(null);
+                            GridCache<Integer, Integer> cache = node.cache(null);
 
                             try {
                                 try (IgniteTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ)) {
@@ -317,7 +317,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra
             for (final Ignite g : nodes) {
                 txFuts.add(multithreadedAsync(new Runnable() {
                     @Override public void run() {
-                        Cache<Integer, Integer> cache = g.cache(null);
+                        GridCache<Integer, Integer> cache = g.cache(null);
 
                         int key = (int)Thread.currentThread().getId();
 
@@ -402,7 +402,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra
                 for (final Integer key : keysMap.values()) {
                     futs.add(multithreadedAsync(new Runnable() {
                         @Override public void run() {
-                            Cache<Integer, Integer> cache = node.cache(null);
+                            GridCache<Integer, Integer> cache = node.cache(null);
 
                             try {
                                 try (IgniteTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ)) {
@@ -453,7 +453,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra
             for (final Ignite g : nodes) {
                 txFuts.add(multithreadedAsync(new Runnable() {
                     @Override public void run() {
-                        Cache<Integer, Integer> cache = g.cache(null);
+                        GridCache<Integer, Integer> cache = g.cache(null);
 
                         int key = (int)Thread.currentThread().getId();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java
index 28e5c4b..04a8172 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java
@@ -75,7 +75,7 @@ public class GridCachePartitionedUnloadEventsSelfTest extends GridCommonAbstract
 
         Collection<Integer> allKeys = new ArrayList<>(100);
 
-        Cache<Integer, String> cache = g1.cache(null);
+        GridCache<Integer, String> cache = g1.cache(null);
 
         for (int i = 0; i < 100; i++) {
             cache.put(i, "val");

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteTxReentryColocatedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteTxReentryColocatedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteTxReentryColocatedSelfTest.java
index 283df90..61f8f63 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteTxReentryColocatedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteTxReentryColocatedSelfTest.java
@@ -43,7 +43,7 @@ public class IgniteTxReentryColocatedSelfTest extends IgniteTxReentryAbstractSel
     @Override protected int testKey() {
         int key = 0;
 
-        Cache<Object, Object> cache = grid(0).cache(null);
+        GridCache<Object, Object> cache = grid(0).cache(null);
 
         while (true) {
             Collection<ClusterNode> nodes = cache.affinity().mapKeyToPrimaryAndBackups(key);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
index 0dea907..a4350e8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
@@ -158,7 +158,7 @@ public class GridCacheAtomicInvalidPartitionHandlingSelfTest extends GridCommonA
         startGrids(gridCnt);
 
         try {
-            final Cache<Object, Object> cache = grid(0).cache(null);
+            final GridCache<Object, Object> cache = grid(0).cache(null);
 
             final int range = 100_000;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPreloadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPreloadSelfTest.java
index 26701c7..0a2c83e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPreloadSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPreloadSelfTest.java
@@ -97,7 +97,7 @@ public class GridCacheAtomicPreloadSelfTest extends GridCommonAbstractTest {
 
             awaitPartitionMapExchange();
 
-            Cache<Object, Object> cache = grid(0).cache(null);
+            GridCache<Object, Object> cache = grid(0).cache(null);
 
             List<Integer> keys = generateKeys(grid(0).localNode(), cache);
 
@@ -166,7 +166,7 @@ public class GridCacheAtomicPreloadSelfTest extends GridCommonAbstractTest {
 
             ClusterNode node = grid.localNode();
 
-            Cache<Object, Object> cache = grid.cache(null);
+            GridCache<Object, Object> cache = grid.cache(null);
 
             boolean primary = cache.affinity().isPrimary(node, key);
             boolean backup = cache.affinity().isBackup(node, key);
@@ -184,7 +184,7 @@ public class GridCacheAtomicPreloadSelfTest extends GridCommonAbstractTest {
      * @param cache Cache to get affinity for.
      * @return Collection of keys.
      */
-    private List<Integer> generateKeys(ClusterNode node, Cache<Object, Object> cache) {
+    private List<Integer> generateKeys(ClusterNode node, GridCache<Object, Object> cache) {
         List<Integer> keys = new ArrayList<>(3);
 
         CacheAffinity<Object> aff = cache.affinity();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicSelfTest.java
index 9cb84b4..488a3fd 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicSelfTest.java
@@ -92,7 +92,7 @@ public class GridCacheValueConsistencyAtomicSelfTest extends GridCacheValueConsi
             int total = 0;
 
             for (int idx = 0; idx < gridCount(); idx++) {
-                Cache<Integer, Integer> cache = grid(idx).cache(null);
+                GridCache<Integer, Integer> cache = grid(idx).cache(null);
 
                 for (int i = 0; i < keyCnt; i++) {
                     Integer val = cache.peek(i);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java
index ef954a6..42ee84e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java
@@ -70,7 +70,7 @@ public class GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest extends GridCache
 
     /** {@inheritDoc} */
     @Override public void testSize() throws Exception {
-        Cache<String, Integer> cache = cache();
+        GridCache<String, Integer> cache = cache();
 
         int size = 10;
 
@@ -101,8 +101,8 @@ public class GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest extends GridCache
 
     /** {@inheritDoc} */
     @Override public void testClear() throws Exception {
-        Cache<String, Integer> nearCache = cache();
-        Cache<String, Integer> primary = fullCache();
+        GridCache<String, Integer> nearCache = cache();
+        GridCache<String, Integer> primary = fullCache();
 
         Collection<String> keys = primaryKeysForCache(primary, 3);
 
@@ -174,8 +174,8 @@ public class GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest extends GridCache
 
     /** {@inheritDoc} */
     @Override public void testClearKeys() throws Exception {
-        Cache<String, Integer> nearCache = cache();
-        Cache<String, Integer> primary = fullCache();
+        GridCache<String, Integer> nearCache = cache();
+        GridCache<String, Integer> primary = fullCache();
 
         Collection<String> keys = primaryKeysForCache(primary, 3);
 
@@ -224,7 +224,7 @@ public class GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest extends GridCache
 
     /** {@inheritDoc} */
     @Override public void testEvictExpired() throws Exception {
-        Cache<String, Integer> cache = cache();
+        GridCache<String, Integer> cache = cache();
 
         String key = primaryKeysForCache(cache, 1).get(0);
 
@@ -331,7 +331,7 @@ public class GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest extends GridCache
 
     /** {@inheritDoc} */
     @Override public void testPeekExpired() throws Exception {
-        Cache<String, Integer> c = cache();
+        GridCache<String, Integer> c = cache();
 
         String key = primaryKeysForCache(c, 1).get(0);
 
@@ -355,7 +355,7 @@ public class GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest extends GridCache
 
     /** {@inheritDoc} */
     @Override public void testEvict() throws Exception {
-        Cache<String, Integer> cache = cache();
+        GridCache<String, Integer> cache = cache();
 
         List<String> keys = primaryKeysForCache(cache, 2);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest.java
index af113fc..075476b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest.java
@@ -75,8 +75,8 @@ public class GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest extends GridCacheNe
 
     /** {@inheritDoc} */
     @Override public void testClear() throws Exception {
-        Cache<String, Integer> nearCache = cache();
-        Cache<String, Integer> primary = fullCache();
+        GridCache<String, Integer> nearCache = cache();
+        GridCache<String, Integer> primary = fullCache();
 
         Collection<String> keys = primaryKeysForCache(primary, 3);
 
@@ -152,7 +152,7 @@ public class GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest extends GridCacheNe
 
     /** {@inheritDoc} */
     @Override public void testEvictExpired() throws Exception {
-        Cache<String, Integer> cache = cache();
+        GridCache<String, Integer> cache = cache();
 
         String key = primaryKeysForCache(cache, 1).get(0);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheGetStoreErrorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheGetStoreErrorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheGetStoreErrorSelfTest.java
index efef8f39..0dbd95d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheGetStoreErrorSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheGetStoreErrorSelfTest.java
@@ -27,6 +27,7 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
 import org.apache.ignite.testframework.*;
 import org.apache.ignite.testframework.junits.common.*;
 
+import javax.cache.*;
 import javax.cache.configuration.*;
 import java.util.concurrent.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java
index a90f5c9..26cab6f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java
@@ -90,7 +90,7 @@ public class GridCacheNearEvictionSelfTest extends GridCommonAbstractTest {
         startGridsMultiThreaded(gridCnt);
 
         try {
-            Cache<Integer, String> c = grid(0).cache(null);
+            GridCache<Integer, String> c = grid(0).cache(null);
 
             int cnt = 100;
 
@@ -120,7 +120,7 @@ public class GridCacheNearEvictionSelfTest extends GridCommonAbstractTest {
                 private Ignite ignite;
 
                 @Override public Object call() throws Exception {
-                    Cache<Integer, String> c = ignite.cache(null);
+                    GridCache<Integer, String> c = ignite.cache(null);
 
                     for (int i = 0; i < cnt; i++)
                         c.putx(i, Integer.toString(i));
@@ -154,7 +154,7 @@ public class GridCacheNearEvictionSelfTest extends GridCommonAbstractTest {
                 private Ignite ignite;
 
                 @Override public Object call() throws Exception {
-                    Cache<Integer, String> c = ignite.cache(null);
+                    GridCache<Integer, String> c = ignite.cache(null);
 
                     for (int i = 0; i < cnt; i++)
                         c.putx(i, Integer.toString(i));

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMetricsSelfTest.java
index 214bb84..5e142ba 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMetricsSelfTest.java
@@ -89,7 +89,7 @@ public class GridCacheNearMetricsSelfTest extends GridCacheAbstractSelfTest {
     public void testPrimaryPut() throws Exception {
         Ignite g0 = grid(0);
 
-        Cache<Integer, Integer> cache0 = g0.cache(null);
+        GridCache<Integer, Integer> cache0 = g0.cache(null);
 
         int key;
 
@@ -142,7 +142,7 @@ public class GridCacheNearMetricsSelfTest extends GridCacheAbstractSelfTest {
     public void testBackupPut() throws Exception {
         Ignite g0 = grid(0);
 
-        Cache<Integer, Integer> cache0 = g0.cache(null);
+        GridCache<Integer, Integer> cache0 = g0.cache(null);
 
         int key;
 
@@ -195,7 +195,7 @@ public class GridCacheNearMetricsSelfTest extends GridCacheAbstractSelfTest {
     public void testNearPut() throws Exception {
         Ignite g0 = grid(0);
 
-        Cache<Integer, Integer> cache0 = g0.cache(null);
+        GridCache<Integer, Integer> cache0 = g0.cache(null);
 
         int key;
 
@@ -245,7 +245,7 @@ public class GridCacheNearMetricsSelfTest extends GridCacheAbstractSelfTest {
     public void testPrimaryRead() throws Exception {
         Ignite g0 = grid(0);
 
-        Cache<Integer, Integer> cache0 = g0.cache(null);
+        GridCache<Integer, Integer> cache0 = g0.cache(null);
 
         int key;
 
@@ -299,7 +299,7 @@ public class GridCacheNearMetricsSelfTest extends GridCacheAbstractSelfTest {
     public void testBackupRead() throws Exception {
         Ignite g0 = grid(0);
 
-        Cache<Integer, Integer> cache0 = g0.cache(null);
+        GridCache<Integer, Integer> cache0 = g0.cache(null);
 
         int key;
 
@@ -348,7 +348,7 @@ public class GridCacheNearMetricsSelfTest extends GridCacheAbstractSelfTest {
     public void testNearRead() throws Exception {
         Ignite g0 = grid(0);
 
-        Cache<Integer, Integer> cache0 = g0.cache(null);
+        GridCache<Integer, Integer> cache0 = g0.cache(null);
 
         int key;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java
index f751bef..08f9339 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java
@@ -102,7 +102,7 @@ public class GridCacheNearMultiGetSelfTest extends GridCommonAbstractTest {
         for (int i = 0; i < GRID_CNT; i++) {
             Ignite g = grid(i);
 
-            Cache<Integer, String> c = g.cache(null);
+            GridCache<Integer, String> c = g.cache(null);
 
             c.removeAll();
 
@@ -220,7 +220,7 @@ public class GridCacheNearMultiGetSelfTest extends GridCommonAbstractTest {
      */
     private void checkDoubleGet(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation, boolean put)
         throws Exception {
-        Cache<Integer, String> cache = grid(0).cache(null);
+        GridCache<Integer, String> cache = grid(0).cache(null);
 
         Integer key = 1;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java
index dbdc689..bf766e3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java
@@ -19,7 +19,7 @@ package org.apache.ignite.internal.processors.cache.distributed.near;
 
 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.cluster.*;
@@ -336,7 +336,7 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest {
 
         info("Local node: " + U.toShortString(loc));
 
-        Cache<Integer, String> near = cache(0);
+        GridCache<Integer, String> near = cache(0);
 
         int cnt = 10;
 
@@ -361,7 +361,7 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest {
 
             assert ((Collection)n.meta("primary")).contains(key);
 
-            Cache<Integer, String> dhtCache = dht(G.ignite(n.id()));
+            GridCache<Integer, String> dhtCache = dht(G.ignite(n.id()));
 
             String s = dhtCache.peek(key);
 
@@ -377,7 +377,7 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest {
      */
     @SuppressWarnings({"ConstantConditions"})
     public void testOptimisticWriteThrough() throws Exception {
-        Cache<Integer, String> near = cache(0);
+        GridCache<Integer, String> near = cache(0);
 
         if (transactional()) {
             try (IgniteTx tx = near.txStart(OPTIMISTIC, REPEATABLE_READ, 0, 0)) {
@@ -422,7 +422,7 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest {
 
     /** @throws Exception If failed. */
     public void testNoTransactionSinglePutx() throws Exception {
-        Cache<Integer, String> near = cache(0);
+        GridCache<Integer, String> near = cache(0);
 
         near.putx(2, "2");
 
@@ -439,7 +439,7 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest {
 
     /** @throws Exception If failed. */
     public void testNoTransactionSinglePut() throws Exception {
-        Cache<Integer, String> near = cache(0);
+        GridCache<Integer, String> near = cache(0);
 
         // There should be a not-null previously mapped value because
         // we use a store implementation that just returns values which
@@ -481,7 +481,7 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest {
 
     /** @throws Exception If failed. */
     public void testNoTransactionWriteThrough() throws Exception {
-        Cache<Integer, String> near = cache(0);
+        GridCache<Integer, String> near = cache(0);
 
         near.putx(2, "2");
 
@@ -510,7 +510,7 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest {
      */
     @SuppressWarnings({"ConstantConditions"})
     public void testPessimisticWriteThrough() throws Exception {
-        Cache<Integer, String> near = cache(0);
+        GridCache<Integer, String> near = cache(0);
 
         if (transactional()) {
             try (IgniteTx tx = near.txStart(PESSIMISTIC, REPEATABLE_READ, 0, 0)) {
@@ -557,7 +557,7 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest {
         // Don't create missing values.
         store.create(false);
 
-        Cache<Integer, String> near = cache(0);
+        GridCache<Integer, String> near = cache(0);
 
         int key = 1;
 
@@ -598,7 +598,7 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     private void checkBackupConsistency(int key) throws Exception {
-        Cache<Integer, String> cache = cache(0);
+        GridCache<Integer, String> cache = cache(0);
 
         String val = Integer.toString(key);
 
@@ -652,7 +652,7 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest {
         if (!transactional())
             return;
 
-        Cache<Integer, String> cache = cache(0);
+        GridCache<Integer, String> cache = cache(0);
 
         String val = Integer.toString(key);
 
@@ -810,7 +810,7 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     private void checkTransactionSingleGet(int key) throws Exception {
-        Cache<Integer, String> cache = cache(0);
+        GridCache<Integer, String> cache = cache(0);
 
         String val = Integer.toString(key);
 
@@ -856,7 +856,7 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void checkTransactionSingleGetRemove(int key) throws Exception {
-        Cache<Integer, String> cache = cache(0);
+        GridCache<Integer, String> cache = cache(0);
 
         String val = Integer.toString(key);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java
index f02bee0..6f78d1e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java
@@ -19,7 +19,7 @@ package org.apache.ignite.internal.processors.cache.distributed.near;
 
 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.internal.processors.cache.*;
@@ -95,7 +95,7 @@ public class GridCacheNearOneNodeSelfTest extends GridCommonAbstractTest {
 
     /** @throws Exception If failed. */
     public void testRemove() throws Exception {
-        Cache<Integer, String> near = cache();
+        GridCache<Integer, String> near = cache();
 
         assertEquals("DHT entries: " + dht().entries(), 0, dht().size());
         assertEquals("Near entries: " + near().entries(), 0, near().size());
@@ -123,9 +123,9 @@ public class GridCacheNearOneNodeSelfTest extends GridCommonAbstractTest {
 
     /** @throws Exception If failed. */
     public void testReadThrough() throws Exception {
-        Cache<Integer, String> near = cache();
+        GridCache<Integer, String> near = cache();
 
-        Cache<Integer, String> dht = dht();
+        GridCache<Integer, String> dht = dht();
 
         String s = near.get(1);
 
@@ -153,7 +153,7 @@ public class GridCacheNearOneNodeSelfTest extends GridCommonAbstractTest {
      */
     @SuppressWarnings({"ConstantConditions"})
     public void testOptimisticTxWriteThrough() throws Exception {
-        Cache<Integer, String> near = cache();
+        GridCache<Integer, String> near = cache();
         GridCacheAdapter<Integer, String> dht = dht();
 
         try (IgniteTx tx = cache().txStart(OPTIMISTIC, REPEATABLE_READ) ) {
@@ -279,7 +279,7 @@ public class GridCacheNearOneNodeSelfTest extends GridCommonAbstractTest {
 
     /** @throws Exception If failed. */
     public void testTransactionSingleGet() throws Exception {
-        Cache<Integer, String> cache = cache();
+        GridCache<Integer, String> cache = cache();
 
         cache.put(1, "val1");
 
@@ -298,7 +298,7 @@ public class GridCacheNearOneNodeSelfTest extends GridCommonAbstractTest {
 
     /** @throws Exception If failed. */
     public void testTransactionSingleGetRemove() throws Exception {
-        Cache<Integer, String> cache = cache();
+        GridCache<Integer, String> cache = cache();
 
         cache.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/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
index 3452309..f338277 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
@@ -110,14 +110,14 @@ public class GridCacheNearOnlyMultiNodeFullApiSelfTest extends GridCachePartitio
     /**
      * @return For the purpose of this test returns the near-only instance.
      */
-    @Override protected Cache<String, Integer> cache() {
+    @Override protected GridCache<String, Integer> cache() {
         return cache(nearIdx);
     }
 
     /**
      * @return A not near-only cache.
      */
-    protected Cache<String, Integer> fullCache() {
+    protected GridCache<String, Integer> fullCache() {
         return nearIdx == 0 ? cache(1) : cache(0);
     }
 
@@ -135,7 +135,7 @@ public class GridCacheNearOnlyMultiNodeFullApiSelfTest extends GridCachePartitio
 
     /** {@inheritDoc} */
     @Override public void testSize() throws Exception {
-        Cache<String, Integer> nearCache = cache();
+        GridCache<String, Integer> nearCache = cache();
 
         int size = 10;
 
@@ -211,8 +211,8 @@ public class GridCacheNearOnlyMultiNodeFullApiSelfTest extends GridCachePartitio
 
     /** {@inheritDoc} */
     @Override public void testClear() throws Exception {
-        Cache<String, Integer> nearCache = cache();
-        Cache<String, Integer> primary = fullCache();
+        GridCache<String, Integer> nearCache = cache();
+        GridCache<String, Integer> primary = fullCache();
 
         Collection<String> keys = primaryKeysForCache(primary, 3);
 
@@ -295,8 +295,8 @@ public class GridCacheNearOnlyMultiNodeFullApiSelfTest extends GridCachePartitio
 
     /** {@inheritDoc} */
     @Override public void testClearKeys() throws Exception {
-        Cache<String, Integer> nearCache = cache();
-        Cache<String, Integer> primary = fullCache();
+        GridCache<String, Integer> nearCache = cache();
+        GridCache<String, Integer> primary = fullCache();
 
         Collection<String> keys = primaryKeysForCache(primary, 3);
 
@@ -383,8 +383,8 @@ public class GridCacheNearOnlyMultiNodeFullApiSelfTest extends GridCachePartitio
                 }
             }, EVT_CACHE_OBJECT_LOCKED, EVT_CACHE_OBJECT_UNLOCKED);
 
-            Cache<String, Integer> nearCache = cache();
-            Cache<String, Integer> cache = fullCache();
+            GridCache<String, Integer> nearCache = cache();
+            GridCache<String, Integer> cache = fullCache();
 
             String key = primaryKeysForCache(cache, 1).get(0);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlySelfTest.java
index 90f0e13..647a45b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlySelfTest.java
@@ -40,14 +40,14 @@ public class GridCacheNearOnlySelfTest extends GridCacheClientModesAbstractSelfT
      * @throws Exception If failed.
      */
     public void testUpdateNearOnlyReader() throws Exception {
-        Cache<Object, Object> dhtCache = dhtCache();
+        GridCache<Object, Object> dhtCache = dhtCache();
 
         final int keyCnt = 100;
 
         for (int i = 0; i < keyCnt; i++)
             dhtCache.put(i, i);
 
-        Cache<Object, Object> nearOnlyCache = nearOnlyCache();
+        GridCache<Object, Object> nearOnlyCache = nearOnlyCache();
 
         for (int i = 0; i < keyCnt; i++) {
             assertNull(nearOnlyCache.peek(i));

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java
index 75dfe1c..223a203 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java
@@ -160,7 +160,7 @@ public class GridCacheNearOnlyTopologySelfTest extends GridCommonAbstractTest {
             for (int i = 0; i < 10; i++)
                 grid(1).cache(null).put(i, i);
 
-            final Cache<Object, Object> nearOnly = grid(0).cache(null);
+            final GridCache<Object, Object> nearOnly = grid(0).cache(null);
 
             // Populate near cache.
             for (int i = 0; i < 10; i++) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearPartitionedClearSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearPartitionedClearSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearPartitionedClearSelfTest.java
index 5fa77d9..9180151 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearPartitionedClearSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearPartitionedClearSelfTest.java
@@ -104,7 +104,7 @@ public class GridCacheNearPartitionedClearSelfTest extends GridCommonAbstractTes
      * @throws Exception If failed.
      */
     public void testClear() throws Exception {
-        Cache cache = cacheForIndex(0);
+        GridCache cache = cacheForIndex(0);
 
         int key = primaryKey0(grid(0), cache);
 
@@ -112,7 +112,7 @@ public class GridCacheNearPartitionedClearSelfTest extends GridCommonAbstractTes
         cache.clear(key);
 
         for (int i = 0; i < GRID_CNT; i++) {
-            Cache cache0 = cacheForIndex(i);
+            GridCache cache0 = cacheForIndex(i);
 
             cache0.removeAll();
 
@@ -132,7 +132,7 @@ public class GridCacheNearPartitionedClearSelfTest extends GridCommonAbstractTes
      * @return Primary key.
      * @throws Exception If failed.
      */
-    private int primaryKey0(Ignite ignite, Cache cache) throws Exception {
+    private int primaryKey0(Ignite ignite, GridCache cache) throws Exception {
         ClusterNode locNode = ignite.cluster().localNode();
 
         for (int i = 0; i < Integer.MAX_VALUE; i++) {
@@ -149,7 +149,7 @@ public class GridCacheNearPartitionedClearSelfTest extends GridCommonAbstractTes
      * @param idx Index.
      * @return Cache.
      */
-    private Cache cacheForIndex(int idx) {
+    private GridCache cacheForIndex(int idx) {
         return grid(idx).cache(CACHE_NAME);
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReaderPreloadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReaderPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReaderPreloadSelfTest.java
index 69e681d..296f180 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReaderPreloadSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReaderPreloadSelfTest.java
@@ -51,13 +51,13 @@ public class GridCacheNearReaderPreloadSelfTest extends GridCommonAbstractTest {
     private static final String CACHE_NAME = "cache";
 
     /** Cache on primary node. */
-    private Cache<Integer, Integer> cache1;
+    private GridCache<Integer, Integer> cache1;
 
     /** Cache on near node. */
-    private Cache<Integer, Integer> cache2;
+    private GridCache<Integer, Integer> cache2;
 
     /** Cache on backup node. */
-    private Cache<Integer, Integer> cache3;
+    private GridCache<Integer, Integer> cache3;
 
     /** {@inheritDoc} */
     @Override protected void afterTest() 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/distributed/near/GridCacheNearReadersSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
index eeb1ff3..79111e9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
@@ -139,8 +139,8 @@ public class GridCacheNearReadersSelfTest extends GridCommonAbstractTest {
         Ignite g1 = grid(n1.id());
         Ignite g2 = grid(n2.id());
 
-        Cache<Integer, String> cache1 = g1.cache(null);
-        Cache<Integer, String> cache2 = g2.cache(null);
+        GridCache<Integer, String> cache1 = g1.cache(null);
+        GridCache<Integer, String> cache2 = g2.cache(null);
 
         // Store some values in cache.
         assertNull(cache1.put(1, "v1"));
@@ -217,8 +217,8 @@ public class GridCacheNearReadersSelfTest extends GridCommonAbstractTest {
         ((GridKernal)g1).internalCache(null).preloader().request(F.asList(1, 2), 2).get();
         ((GridKernal)g2).internalCache(null).preloader().request(F.asList(1, 2), 2).get();
 
-        Cache<Integer, String> cache1 = g1.cache(null);
-        Cache<Integer, String> cache2 = g2.cache(null);
+        GridCache<Integer, String> cache1 = g1.cache(null);
+        GridCache<Integer, String> cache2 = g2.cache(null);
 
         assertEquals(cache1.affinity().mapKeyToNode(1), g1.cluster().localNode());
         assertFalse(cache1.affinity().mapKeyToNode(2).equals(g1.cluster().localNode()));
@@ -296,8 +296,8 @@ public class GridCacheNearReadersSelfTest extends GridCommonAbstractTest {
         startGrids();
 
         try {
-            Cache<Object, Object> prj0 = grid(0).cache(null);
-            Cache<Object, Object> prj1 = grid(1).cache(null);
+            GridCache<Object, Object> prj0 = grid(0).cache(null);
+            GridCache<Object, Object> prj1 = grid(1).cache(null);
 
             Map<Integer, Integer> putMap = new HashMap<>();
 
@@ -332,9 +332,9 @@ public class GridCacheNearReadersSelfTest extends GridCommonAbstractTest {
         startGrids();
 
         try {
-            Cache<Object, Object> prj0 = grid(0).cache(null);
-            Cache<Object, Object> prj1 = grid(1).cache(null);
-            Cache<Object, Object> prj2 = grid(2).cache(null);
+            GridCache<Object, Object> prj0 = grid(0).cache(null);
+            GridCache<Object, Object> prj1 = grid(1).cache(null);
+            GridCache<Object, Object> prj2 = grid(2).cache(null);
 
             Map<Integer, Integer> putMap = new HashMap<>();
 
@@ -390,8 +390,8 @@ public class GridCacheNearReadersSelfTest extends GridCommonAbstractTest {
 
         assertFalse("Nodes cannot be equal: " + primary, primary.equals(backup));
 
-        Cache<Integer, String> cache1 = grid(primary.id()).cache(null);
-        Cache<Integer, String> cache2 = grid(backup.id()).cache(null);
+        GridCache<Integer, String> cache1 = grid(primary.id()).cache(null);
+        GridCache<Integer, String> cache2 = grid(backup.id()).cache(null);
 
         // Store a values in cache.
         assertNull(cache1.put(1, "v1"));
@@ -431,7 +431,7 @@ public class GridCacheNearReadersSelfTest extends GridCommonAbstractTest {
 
         assertEquals(grid(1).localNode(), F.first(aff.nodes(aff.partition(key2), grid(1).nodes())));
 
-        Cache<Integer, String> cache = cache(0);
+        GridCache<Integer, String> cache = cache(0);
 
         assertNull(cache.put(key1, val1));
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java
index 28e8620..19b947a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java
@@ -196,7 +196,7 @@ public class GridCacheNearTxMultiNodeSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     private void testReadersUpdate(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation) throws Exception {
-        Cache<Integer, Integer> cache = grid(0).cache(null);
+        GridCache<Integer, Integer> cache = grid(0).cache(null);
 
         try (IgniteTx tx = cache.txStart(concurrency, isolation)) {
             for (int i = 0; i < 100; i++)
@@ -207,7 +207,7 @@ public class GridCacheNearTxMultiNodeSelfTest extends GridCommonAbstractTest {
 
         // Create readers.
         for (int g = 0; g < GRID_CNT; g++) {
-            Cache<Integer, Integer> c = grid(g).cache(null);
+            GridCache<Integer, Integer> c = grid(g).cache(null);
 
             for (int i = 0; i < 100; i++)
                 assertEquals((Integer)1, c.get(i));
@@ -221,7 +221,7 @@ public class GridCacheNearTxMultiNodeSelfTest extends GridCommonAbstractTest {
         }
 
         for (int g = 0; g < GRID_CNT; g++) {
-            Cache<Integer, Integer> c = grid(g).cache(null);
+            GridCache<Integer, Integer> c = grid(g).cache(null);
 
             for (int i = 0; i < 100; i++)
                 assertEquals((Integer)2, c.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/distributed/near/GridCachePartitionedAffinitySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java
index f88ff90..4abbd14 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java
@@ -394,7 +394,7 @@ public class GridCachePartitionedAffinitySelfTest extends GridCommonAbstractTest
 
         Ignite mg = grid(0);
 
-        Cache<Integer, String> mc = mg.cache(null);
+        GridCache<Integer, String> mc = mg.cache(null);
 
         int keyCnt = 10;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java
index 17b45cd..a0d68f6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java
@@ -124,7 +124,7 @@ public class GridCachePartitionedBasicStoreMultiNodeSelfTest extends GridCommonA
      * @throws Exception If failed.
      */
     public void testPutFromPrimary() throws Exception {
-        Cache<Integer, String> cache = cache(0);
+        GridCache<Integer, String> cache = cache(0);
 
         int key = 0;
 
@@ -152,7 +152,7 @@ public class GridCachePartitionedBasicStoreMultiNodeSelfTest extends GridCommonA
      * @throws Exception If failed.
      */
     public void testPutFromBackup() throws Exception {
-        Cache<Integer, String> cache = cache(0);
+        GridCache<Integer, String> cache = cache(0);
 
         int key = 0;
 
@@ -180,7 +180,7 @@ public class GridCachePartitionedBasicStoreMultiNodeSelfTest extends GridCommonA
      * @throws Exception If failed.
      */
     public void testPutFromNear() throws Exception {
-        Cache<Integer, String> cache = cache(0);
+        GridCache<Integer, String> cache = cache(0);
 
         int key = 0;
 
@@ -208,7 +208,7 @@ public class GridCachePartitionedBasicStoreMultiNodeSelfTest extends GridCommonA
      * @throws Exception If failed.
      */
     public void testPutIfAbsentFromPrimary() throws Exception {
-        Cache<Integer, String> cache = cache(0);
+        GridCache<Integer, String> cache = cache(0);
 
         int key = 0;
 
@@ -236,7 +236,7 @@ public class GridCachePartitionedBasicStoreMultiNodeSelfTest extends GridCommonA
      * @throws Exception If failed.
      */
     public void testPutIfAbsentFromBackup() throws Exception {
-        Cache<Integer, String> cache = cache(0);
+        GridCache<Integer, String> cache = cache(0);
 
         int key = 0;
 
@@ -264,7 +264,7 @@ public class GridCachePartitionedBasicStoreMultiNodeSelfTest extends GridCommonA
      * @throws Exception If failed.
      */
     public void testPutIfAbsentFromNear() throws Exception {
-        Cache<Integer, String> cache = cache(0);
+        GridCache<Integer, String> cache = cache(0);
 
         int key = 0;
 
@@ -292,7 +292,7 @@ public class GridCachePartitionedBasicStoreMultiNodeSelfTest extends GridCommonA
      * @throws Exception If failed.
      */
     public void testPutAll() throws Exception {
-        Cache<Integer, String> cache = cache(0);
+        GridCache<Integer, String> cache = cache(0);
 
         Map<Integer, String> map = new HashMap<>(10);
 
@@ -308,7 +308,7 @@ public class GridCachePartitionedBasicStoreMultiNodeSelfTest extends GridCommonA
      * @throws Exception If failed.
      */
     public void testMultipleOperations() throws Exception {
-        Cache<Integer, String> cache = cache(0);
+        GridCache<Integer, String> cache = cache(0);
 
         try (IgniteTx tx = cache.txStart(OPTIMISTIC, REPEATABLE_READ)) {
             cache.put(1, "val");

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedExplicitLockNodeFailureSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedExplicitLockNodeFailureSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedExplicitLockNodeFailureSelfTest.java
index 1a00698..cbf1a7e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedExplicitLockNodeFailureSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedExplicitLockNodeFailureSelfTest.java
@@ -96,7 +96,7 @@ public class GridCachePartitionedExplicitLockNodeFailureSelfTest extends GridCom
 
         info("Primary node for key [id=" + node.id() + ", order=" + node.order() + ", key=" + key + ']');
 
-        Cache<Integer, String> cache = cache(idx);
+        GridCache<Integer, String> cache = cache(idx);
 
         cache.put(key, "val");
 
@@ -105,7 +105,7 @@ public class GridCachePartitionedExplicitLockNodeFailureSelfTest extends GridCom
         for (int checkIdx = 1; checkIdx < GRID_CNT; checkIdx++) {
             info("Check grid index: " + checkIdx);
 
-            Cache<Integer, String> checkCache = cache(checkIdx);
+            GridCache<Integer, String> checkCache = cache(checkIdx);
 
             assert !checkCache.lock(key, -1);
 
@@ -137,7 +137,7 @@ public class GridCachePartitionedExplicitLockNodeFailureSelfTest extends GridCom
                 for (int checkIdx = 1; checkIdx < GRID_CNT; checkIdx++) {
                     info("Check grid index: " + checkIdx);
 
-                    Cache<Integer, String> checkCache = cache(checkIdx);
+                    GridCache<Integer, String> checkCache = cache(checkIdx);
 
                     CacheEntry e = checkCache.entry(key);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFilteredPutSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFilteredPutSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFilteredPutSelfTest.java
index 5404d99..3dc1d7e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFilteredPutSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFilteredPutSelfTest.java
@@ -89,7 +89,7 @@ public class GridCachePartitionedFilteredPutSelfTest extends GridCommonAbstractT
     public void testFilteredPutCheckNear() throws Exception {
         doFilteredPut();
 
-        Cache<Integer, Integer> c = cache();
+        GridCache<Integer, Integer> c = cache();
 
         assert c.entrySet().isEmpty() : "Actual size: " + c.entrySet().size();
     }
@@ -100,7 +100,7 @@ public class GridCachePartitionedFilteredPutSelfTest extends GridCommonAbstractT
     public void testFilteredPutCheckDht() throws Exception {
         doFilteredPut();
 
-        Cache<Integer, Integer> c =
+        GridCache<Integer, Integer> c =
             ((GridNearCacheAdapter<Integer, Integer>)cache().<Integer, Integer>cache()).dht();
 
         assert c.entrySet().isEmpty() : "Actual size: " + c.entrySet().size();
@@ -112,7 +112,7 @@ public class GridCachePartitionedFilteredPutSelfTest extends GridCommonAbstractT
     public void testPutAndRollbackCheckNear() throws Exception {
         doPutAndRollback();
 
-        Cache<Integer, Integer> c = cache();
+        GridCache<Integer, Integer> c = cache();
 
         assert c.entrySet().isEmpty() : "Actual size: " + c.entrySet().size();
     }
@@ -123,7 +123,7 @@ public class GridCachePartitionedFilteredPutSelfTest extends GridCommonAbstractT
     public void testPutAndRollbackCheckDht() throws Exception {
         doPutAndRollback();
 
-        Cache<Integer, Integer> c =
+        GridCache<Integer, Integer> c =
             ((GridNearCacheAdapter<Integer, Integer>)cache().<Integer, Integer>cache()).dht();
 
         assert c.entrySet().isEmpty() : "Actual size: " + c.entrySet().size();
@@ -133,7 +133,7 @@ public class GridCachePartitionedFilteredPutSelfTest extends GridCommonAbstractT
      * @throws Exception If failed.
      */
     private void doFilteredPut() throws Exception {
-        Cache<Integer, Integer> c = cache();
+        GridCache<Integer, Integer> c = cache();
 
         try (IgniteTx tx = c.txStart()) {
             assert !c.putx(1, 1, F.<Integer, Integer>cacheHasPeekValue());
@@ -150,7 +150,7 @@ public class GridCachePartitionedFilteredPutSelfTest extends GridCommonAbstractT
      * @throws Exception If failed.
      */
     private void doPutAndRollback() throws Exception {
-        Cache<Integer, Integer> c = cache();
+        GridCache<Integer, Integer> c = cache();
 
         try (IgniteTx tx = c.txStart()) {
             assert c.putx(1, 1);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFullApiSelfTest.java
index 9255fea..631d0de 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFullApiSelfTest.java
@@ -114,7 +114,7 @@ public class GridCachePartitionedFullApiSelfTest extends GridCacheAbstractFullAp
                 Ignite g = grid(i);
 
                 // This node has the partition.
-                Cache<String, Integer> nodeCache = g.cache(null);
+                GridCache<String, Integer> nodeCache = g.cache(null);
 
                 if (offheapTiered(nodeCache))
                     continue;
@@ -156,7 +156,7 @@ public class GridCachePartitionedFullApiSelfTest extends GridCacheAbstractFullAp
                 Ignite g = grid(i);
 
                 // This node has the partition.
-                Cache<String, Integer> nodeCache = g.cache(null);
+                GridCache<String, Integer> nodeCache = g.cache(null);
 
                 if (offheapTiered(nodeCache))
                     continue;
@@ -190,7 +190,7 @@ public class GridCachePartitionedFullApiSelfTest extends GridCacheAbstractFullAp
      * @throws Exception If failed.
      */
     public void testPartitionEntrySetRemove() throws Exception {
-        Cache<String, Integer> cache = cache(0);
+        GridCache<String, Integer> cache = cache(0);
 
         Map<Integer, Collection<String>> partMap = new HashMap<>();
 
@@ -224,7 +224,7 @@ public class GridCachePartitionedFullApiSelfTest extends GridCacheAbstractFullAp
                 Ignite g = grid(i);
 
                 // This node has the partition.
-                Cache<String, Integer> nodeCache = g.cache(null);
+                GridCache<String, Integer> nodeCache = g.cache(null);
 
                 if (offheapTiered(nodeCache))
                     continue;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedLoadCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedLoadCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedLoadCacheSelfTest.java
index 3885b91..bf5271b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedLoadCacheSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedLoadCacheSelfTest.java
@@ -19,7 +19,7 @@ package org.apache.ignite.internal.processors.cache.distributed.near;
 
 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.*;
@@ -86,7 +86,7 @@ public class GridCachePartitionedLoadCacheSelfTest extends GridCommonAbstractTes
 
             cache.localLoadCache(null, PUT_CNT);
 
-            Cache<Integer, String> cache0 = cache(0);
+            GridCache<Integer, String> cache0 = cache(0);
 
             CacheAffinity aff = cache0.affinity();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java
index f134344..825e612 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java
@@ -120,7 +120,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst
      * @param cache Cache.
      * @return Affinity.
      */
-    private static CacheAffinity<String> affinity(Cache<String, Integer> cache) {
+    private static CacheAffinity<String> affinity(GridCache<String, Integer> cache) {
         return cache.affinity();
     }
 
@@ -306,7 +306,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst
                                 if (DEBUG)
                                     info("***");
 
-                                Cache<String, Integer> c = pri.cache(null);
+                                GridCache<String, Integer> c = pri.cache(null);
 
                                 Integer oldCntr = c.peek(CNTR_KEY);
 
@@ -403,7 +403,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst
                                     if (DEBUG)
                                         info("***");
 
-                                    Cache<String, Integer> c = near.cache(null);
+                                    GridCache<String, Integer> c = near.cache(null);
 
                                     Integer oldCntr = c.peek(CNTR_KEY);
 
@@ -488,7 +488,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst
             dht(g).context().tm().printMemoryStats();
             near(g).context().tm().printMemoryStats();
 
-            Cache<String, Integer> cache = grid(i).cache(null);
+            GridCache<String, Integer> cache = grid(i).cache(null);
 
             int cntr = nearThreads > 0 && nears.contains(g) ? cache.get(CNTR_KEY) : cache.peek(CNTR_KEY);
 
@@ -576,7 +576,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst
         for (int i = 0; i < gridCnt; i++) {
             Ignite g = grid(i);
 
-            Cache<String, Integer> cache = grid(i).cache(null);
+            GridCache<String, Integer> cache = grid(i).cache(null);
 
             int cntr = cache.peek(CNTR_KEY);
 
@@ -640,7 +640,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst
                     if (DEBUG)
                         log.info("***");
 
-                    Cache<String, Integer> c = near.cache(null);
+                    GridCache<String, Integer> c = near.cache(null);
 
                     Integer oldCntr = c.peek(CNTR_KEY);
 
@@ -709,7 +709,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst
                     if (DEBUG)
                         log.info("***");
 
-                    Cache<String, Integer> c = pri.cache(null);
+                    GridCache<String, Integer> c = pri.cache(null);
 
                     Integer oldCntr = c.peek(CNTR_KEY);
 


Mime
View raw message