ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [08/55] [abbrv] incubator-ignite git commit: # ignite-63
Date Fri, 23 Jan 2015 15:07:23 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedStorePutSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedStorePutSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedStorePutSelfTest.java
index 76745fe..e8f6dad 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedStorePutSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedStorePutSelfTest.java
@@ -18,6 +18,7 @@
 package org.apache.ignite.internal.processors.cache.distributed.near;
 
 import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.Cache;
 import org.apache.ignite.cache.store.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.internal.processors.cache.distributed.*;
@@ -28,12 +29,11 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
 import org.apache.ignite.internal.util.typedef.*;
 import org.apache.ignite.testframework.junits.common.*;
 
-import javax.cache.*;
 import javax.cache.configuration.*;
 import java.util.concurrent.atomic.*;
 
 import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
 import static org.apache.ignite.internal.processors.cache.distributed.GridCacheModuloAffinityFunction.*;
 
 /**
@@ -47,13 +47,13 @@ public class GridCachePartitionedStorePutSelfTest extends GridCommonAbstractTest
     private static final AtomicInteger CNT = new AtomicInteger(0);
 
     /** */
-    private GridCache<Integer, Integer> cache1;
+    private Cache<Integer, Integer> cache1;
 
     /** */
-    private GridCache<Integer, Integer> cache2;
+    private Cache<Integer, Integer> cache2;
 
     /** */
-    private GridCache<Integer, Integer> cache3;
+    private Cache<Integer, Integer> cache3;
 
     /** {@inheritDoc} */
     @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
@@ -136,7 +136,7 @@ public class GridCachePartitionedStorePutSelfTest extends GridCommonAbstractTest
         }
 
         /** {@inheritDoc} */
-        @Override public void write(Cache.Entry<? extends Object, ? extends Object> e) {
+        @Override public void write(javax.cache.Cache.Entry<? extends Object, ? extends Object> e) {
             // No-op
         }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxConcurrentGetTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxConcurrentGetTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxConcurrentGetTest.java
index 0223cd7..fb2fe79 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxConcurrentGetTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxConcurrentGetTest.java
@@ -22,7 +22,7 @@ import org.apache.ignite.configuration.*;
 import org.apache.ignite.internal.processors.cache.*;
 
 import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
 
 /**
  * Checks multithreaded put/get partitioned cache operations on one node.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxMultiNodeSelfTest.java
index ce92d57..4b653f8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxMultiNodeSelfTest.java
@@ -22,7 +22,7 @@ import org.apache.ignite.configuration.*;
 import org.apache.ignite.internal.processors.cache.*;
 
 import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
 
 /**
  * Test basic cache operations in transactions.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxMultiThreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxMultiThreadedSelfTest.java
index 062128e..d9b264d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxMultiThreadedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxMultiThreadedSelfTest.java
@@ -26,7 +26,7 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
 
 import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
 
 /**
  * Tests for partitioned cache transactions.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java
index f89d690..c891ab3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java
@@ -77,9 +77,9 @@ public class GridCachePartitionedTxSalvageSelfTest extends GridCommonAbstractTes
         CacheConfiguration cc = defaultCacheConfiguration();
 
         cc.setCacheMode(CacheMode.PARTITIONED);
-        cc.setAffinity(new GridCacheConsistentHashAffinityFunction(false, 18));
+        cc.setAffinity(new CacheConsistentHashAffinityFunction(false, 18));
         cc.setBackups(1);
-        cc.setPreloadMode(GridCachePreloadMode.SYNC);
+        cc.setPreloadMode(CachePreloadMode.SYNC);
 
         c.setCacheConfiguration(cc);
 
@@ -198,7 +198,7 @@ public class GridCachePartitionedTxSalvageSelfTest extends GridCommonAbstractTes
 
         IgniteFuture<?> fut = multithreadedAsync(new Runnable() {
             @Override public void run() {
-                GridCache<Object, Object> c = cache(0);
+                Cache<Object, Object> c = cache(0);
 
                 try {
                     IgniteTx tx = c.txStart(mode, REPEATABLE_READ);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSingleThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSingleThreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSingleThreadedSelfTest.java
index 13e3331..ce07622 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSingleThreadedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSingleThreadedSelfTest.java
@@ -27,7 +27,7 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.GridCachePreloadMode.*;
+import static org.apache.ignite.cache.CachePreloadMode.*;
 
 /**
  * Tests for partitioned cache transactions.
@@ -50,12 +50,12 @@ public class GridCachePartitionedTxSingleThreadedSelfTest extends IgniteTxSingle
 
         cc.setCacheMode(PARTITIONED);
         cc.setBackups(1);
-        cc.setDistributionMode(GridCacheDistributionMode.NEAR_PARTITIONED);
+        cc.setDistributionMode(CacheDistributionMode.NEAR_PARTITIONED);
         cc.setAtomicityMode(TRANSACTIONAL);
 
         cc.setEvictionPolicy(null);
 
-        cc.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_ASYNC);
+        cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_ASYNC);
 
         cc.setPreloadMode(NONE);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePutArrayValueSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePutArrayValueSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePutArrayValueSelfTest.java
index c1f2d10..84ec8ab 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePutArrayValueSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePutArrayValueSelfTest.java
@@ -50,7 +50,7 @@ public class GridCachePutArrayValueSelfTest extends GridCacheAbstractSelfTest {
     public void testInternalKeys() throws Exception {
         assert gridCount() >= 2;
 
-        GridCache<InternalKey, Object> prj = grid(0).cache(null);
+        Cache<InternalKey, Object> prj = grid(0).cache(null);
 
         final InternalKey key = new InternalKey(0); // Hangs on the first remote put.
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheRendezvousAffinityClientSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheRendezvousAffinityClientSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheRendezvousAffinityClientSelfTest.java
index b7f26c8..281a6d4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheRendezvousAffinityClientSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheRendezvousAffinityClientSelfTest.java
@@ -27,7 +27,7 @@ import org.apache.ignite.testframework.junits.common.*;
 
 import java.util.*;
 
-import static org.apache.ignite.cache.GridCacheDistributionMode.*;
+import static org.apache.ignite.cache.CacheDistributionMode.*;
 
 /**
  * Tests rendezvous affinity function with CLIENT_ONLY node (GG-8768).
@@ -43,7 +43,7 @@ public class GridCacheRendezvousAffinityClientSelfTest extends GridCommonAbstrac
 
         ccfg.setCacheMode(CacheMode.PARTITIONED);
         ccfg.setBackups(1);
-        ccfg.setAffinity(new GridCacheRendezvousAffinityFunction());
+        ccfg.setAffinity(new CacheRendezvousAffinityFunction());
 
         if (client)
             ccfg.setDistributionMode(CLIENT_ONLY);
@@ -71,9 +71,9 @@ public class GridCacheRendezvousAffinityClientSelfTest extends GridCommonAbstrac
             Map<Integer, Collection<UUID>> mapping = new HashMap<>();
 
             for (int i = 0; i < 4; i++) {
-                GridCache<Object, Object> cache = grid(i).cache(null);
+                Cache<Object, Object> cache = grid(i).cache(null);
 
-                GridCacheAffinity<Object> aff = cache.affinity();
+                CacheAffinity<Object> aff = cache.affinity();
 
                 int parts = aff.partitions();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheRendezvousAffinityFunctionExcludeNeighborsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheRendezvousAffinityFunctionExcludeNeighborsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheRendezvousAffinityFunctionExcludeNeighborsSelfTest.java
index c0b91cc..8a61152 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheRendezvousAffinityFunctionExcludeNeighborsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheRendezvousAffinityFunctionExcludeNeighborsSelfTest.java
@@ -26,7 +26,7 @@ import org.apache.ignite.cache.affinity.rendezvous.*;
 public class GridCacheRendezvousAffinityFunctionExcludeNeighborsSelfTest extends
     GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest {
     /** {@inheritDoc} */
-    @Override protected GridCacheAffinityFunction affinityFunction() {
-        return new GridCacheRendezvousAffinityFunction(true);
+    @Override protected CacheAffinityFunction affinityFunction() {
+        return new CacheRendezvousAffinityFunction(true);
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridPartitionedBackupLoadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridPartitionedBackupLoadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridPartitionedBackupLoadSelfTest.java
index 0aafffa..9f3a512 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridPartitionedBackupLoadSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridPartitionedBackupLoadSelfTest.java
@@ -18,6 +18,7 @@
 package org.apache.ignite.internal.processors.cache.distributed.near;
 
 import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.Cache;
 import org.apache.ignite.cache.store.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.spi.discovery.*;
@@ -26,14 +27,13 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
 import org.apache.ignite.testframework.junits.common.*;
 
-import javax.cache.*;
 import javax.cache.configuration.*;
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 
 import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
 
 /**
  * Test that persistent store is not used when loading invalidated entry from backup node.
@@ -109,9 +109,9 @@ public class GridPartitionedBackupLoadSelfTest extends GridCommonAbstractTest {
         assert store.get(1) == 1;
 
         for (int i = 0; i < GRID_CNT; i++) {
-            GridCache<Integer, Integer> cache = cache(i);
+            Cache<Integer, Integer> cache = cache(i);
 
-            GridCacheEntry<Integer, Integer> entry = cache.entry(1);
+            CacheEntry<Integer, Integer> entry = cache.entry(1);
 
             if (entry.backup()) {
                 assert entry.peek() == 1;
@@ -145,7 +145,7 @@ public class GridPartitionedBackupLoadSelfTest extends GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override public void write(Cache.Entry<? extends Integer, ? extends Integer> e) {
+        @Override public void write(javax.cache.Cache.Entry<? extends Integer, ? extends Integer> e) {
             map.put(e.getKey(), e.getValue());
         }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteTxReentryNearSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteTxReentryNearSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteTxReentryNearSelfTest.java
index 8c42fbe..657fe22 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteTxReentryNearSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteTxReentryNearSelfTest.java
@@ -43,7 +43,7 @@ public class IgniteTxReentryNearSelfTest extends IgniteTxReentryAbstractSelfTest
     @Override protected int testKey() {
         int key = 0;
 
-        GridCache<Object, Object> cache = grid(0).cache(null);
+        Cache<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/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheAbstractReplicatedByteArrayValuesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheAbstractReplicatedByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheAbstractReplicatedByteArrayValuesSelfTest.java
index 84e99d1..a2d39dd 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheAbstractReplicatedByteArrayValuesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheAbstractReplicatedByteArrayValuesSelfTest.java
@@ -22,9 +22,9 @@ import org.apache.ignite.configuration.*;
 import org.apache.ignite.internal.processors.cache.distributed.*;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.GridCacheMemoryMode.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
 
 /**
  * Tests for byte array values in REPLICATED caches.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedEvictionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedEvictionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedEvictionSelfTest.java
index 858ffc4..5a23839 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedEvictionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedEvictionSelfTest.java
@@ -26,7 +26,7 @@ import org.apache.ignite.testframework.*;
 
 import java.util.*;
 
-import static org.apache.ignite.cache.GridCacheDistributionMode.*;
+import static org.apache.ignite.cache.CacheDistributionMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
 import static org.apache.ignite.events.IgniteEventType.*;
 
@@ -55,7 +55,7 @@ public class GridCacheReplicatedEvictionSelfTest extends GridCacheAbstractSelfTe
     }
 
     /** {@inheritDoc} */
-    @Override protected GridCacheDistributionMode distributionMode() {
+    @Override protected CacheDistributionMode distributionMode() {
         return PARTITIONED_ONLY;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFullApiMultithreadedSelfTest1.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFullApiMultithreadedSelfTest1.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFullApiMultithreadedSelfTest1.java
index b610445..edb20fb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFullApiMultithreadedSelfTest1.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFullApiMultithreadedSelfTest1.java
@@ -79,7 +79,7 @@ public class GridCacheReplicatedFullApiMultithreadedSelfTest1 extends GridCacheA
 //     */
 //    public void testA() throws Exception {
 //        runMultiThreadedTest(new GridTestCacheRunnable() {
-//            @Override public void run(GridCache<String, Integer> cache, int idx) throws Exception {
+//            @Override public void run(Cache<String, Integer> cache, int idx) throws Exception {
 //                int size = 8;
 //
 //                Map<String, Integer> pairs = threadPairs(size, idx);
@@ -168,7 +168,7 @@ public class GridCacheReplicatedFullApiMultithreadedSelfTest1 extends GridCacheA
 //     */
 //    public void testB() throws Exception {
 //        runMultiThreadedTest(new GridTestCacheRunnable() {
-//            @Override public void run(GridCache<String, Integer> cache, int idx) throws Exception {
+//            @Override public void run(Cache<String, Integer> cache, int idx) throws Exception {
 //                int size = 8;
 //
 //                Map<String, Integer> pairs = commonPairs(size);
@@ -266,13 +266,13 @@ public class GridCacheReplicatedFullApiMultithreadedSelfTest1 extends GridCacheA
 //     */
 //    public void testC() throws Exception {
 //        runMultiThreadedTest(new GridTestCacheRunnable() {
-//            @Override public void run(GridCache<String, Integer> cache, int idx) throws Exception {
+//            @Override public void run(Cache<String, Integer> cache, int idx) throws Exception {
 //                int size = 4;
 //
 //                Map<String, Integer> pairs = threadPairs(size, idx);
 //
-//                GridPredicate<GridCacheEntry<String, Integer>> noPrd = F.cacheNoPeekValue();
-//                GridPredicate<GridCacheEntry<String, Integer>> hasPrd = F.cacheHasPeekValue();
+//                GridPredicate<CacheEntry<String, Integer>> noPrd = F.cacheNoPeekValue();
+//                GridPredicate<CacheEntry<String, Integer>> hasPrd = F.cacheHasPeekValue();
 //
 //                for (Map.Entry<String, Integer> pair : pairs.entrySet()) {
 //                    assert !cache.containsKey(pair.getKey(), hasPrd);
@@ -328,15 +328,15 @@ public class GridCacheReplicatedFullApiMultithreadedSelfTest1 extends GridCacheA
 //     */
 //    public void testD() throws Exception {
 //        runMultiThreadedTest(new GridTestCacheRunnable() {
-//            @Override public void run(GridCache<String, Integer> cache, int idx) throws Exception {
+//            @Override public void run(Cache<String, Integer> cache, int idx) throws Exception {
 //                int size = 4;
 //
 //                Map<String, Integer> pairs = commonPairs(size);
 //
 //                GridCacheTx tx = cache.txStart();
 //
-//                GridPredicate<GridCacheEntry<String, Integer>> noPrd = F.cacheNoPeekValue();
-//                GridPredicate<GridCacheEntry<String, Integer>> hasPrd = F.cacheHasPeekValue();
+//                GridPredicate<CacheEntry<String, Integer>> noPrd = F.cacheNoPeekValue();
+//                GridPredicate<CacheEntry<String, Integer>> hasPrd = F.cacheHasPeekValue();
 //
 //                for (Map.Entry<String, Integer> pair : pairs.entrySet()) {
 //                    assert !cache.containsKey(pair.getKey(), hasPrd);
@@ -399,13 +399,13 @@ public class GridCacheReplicatedFullApiMultithreadedSelfTest1 extends GridCacheA
 //     */
 //    public void testE() throws Exception {
 //        runMultiThreadedTest(new GridTestCacheRunnable() {
-//            @Override public void run(GridCache<String, Integer> cache, int idx) throws Exception {
+//            @Override public void run(Cache<String, Integer> cache, int idx) throws Exception {
 //                int size = 5;
 //
 //                final Map<String, Integer> pairs = threadPairs(size, idx);
 //
-//                P1<GridCacheEntry<String, Integer>> p = new P1<GridCacheEntry<String, Integer>>() {
-//                    @Override public boolean apply(GridCacheEntry<String, Integer> e) {
+//                P1<CacheEntry<String, Integer>> p = new P1<CacheEntry<String, Integer>>() {
+//                    @Override public boolean apply(CacheEntry<String, Integer> e) {
 //                        String key = e.getKey();
 //
 //                        Integer val = pairs.get(key);
@@ -471,13 +471,13 @@ public class GridCacheReplicatedFullApiMultithreadedSelfTest1 extends GridCacheA
 //     */
 //    public void testF() throws Exception {
 //        runMultiThreadedTest(new GridTestCacheRunnable() {
-//            @Override public void run(GridCache<String, Integer> cache, int idx) throws Exception {
+//            @Override public void run(Cache<String, Integer> cache, int idx) throws Exception {
 //                int size = 5;
 //
 //                final Map<String, Integer> pairs = commonPairs(size);
 //
-//                P1<GridCacheEntry<String, Integer>> p = new P1<GridCacheEntry<String, Integer>>() {
-//                    @Override public boolean apply(GridCacheEntry<String, Integer> e) {
+//                P1<CacheEntry<String, Integer>> p = new P1<CacheEntry<String, Integer>>() {
+//                    @Override public boolean apply(CacheEntry<String, Integer> e) {
 //                        return pairs.get(e.getKey()).equals(e.peek());
 //                    }
 //                };
@@ -545,13 +545,13 @@ public class GridCacheReplicatedFullApiMultithreadedSelfTest1 extends GridCacheA
 //     */
 //    public void testG() throws Exception {
 //        runMultiThreadedTest(new GridTestCacheRunnable() {
-//            @Override public void run(GridCache<String, Integer> cache, int idx) throws Exception {
+//            @Override public void run(Cache<String, Integer> cache, int idx) throws Exception {
 //                int size = 5;
 //
 //                Map<String, Integer> pairs = threadPairs(size, idx);
 //
-//                GridPredicate<GridCacheEntry<String, Integer>> noPrd = F.cacheNoPeekValue();
-//                GridPredicate<GridCacheEntry<String, Integer>> hasPrd = F.cacheHasPeekValue();
+//                GridPredicate<CacheEntry<String, Integer>> noPrd = F.cacheNoPeekValue();
+//                GridPredicate<CacheEntry<String, Integer>> hasPrd = F.cacheHasPeekValue();
 //
 //                Collection<String> keys = pairs.keySet();
 //                Collection<Integer> vals = pairs.values();
@@ -630,13 +630,13 @@ public class GridCacheReplicatedFullApiMultithreadedSelfTest1 extends GridCacheA
 //    public void testH() throws Exception {
 //        // Tests put.
 //        runMultiThreadedTest(new GridTestCacheRunnable() {
-//            @Override public void run(GridCache<String, Integer> cache, int idx) throws Exception {
+//            @Override public void run(Cache<String, Integer> cache, int idx) throws Exception {
 //                int size = 5;
 //
 //                Map<String, Integer> pairs = commonPairs(size);
 //
-//                GridPredicate<GridCacheEntry<String, Integer>> noPrd = F.cacheNoPeekValue();
-//                GridPredicate<GridCacheEntry<String, Integer>> hasPrd = F.cacheHasPeekValue();
+//                GridPredicate<CacheEntry<String, Integer>> noPrd = F.cacheNoPeekValue();
+//                GridPredicate<CacheEntry<String, Integer>> hasPrd = F.cacheHasPeekValue();
 //
 //                Collection<String> keys = pairs.keySet();
 //                Collection<Integer> vals = pairs.values();
@@ -720,7 +720,7 @@ public class GridCacheReplicatedFullApiMultithreadedSelfTest1 extends GridCacheA
 //     */
 //    public void testI() throws Exception {
 //        runMultiThreadedTest(new GridTestCacheRunnable() {
-//            @Override public void run(GridCache<String, Integer> cache, int idx) throws Exception {
+//            @Override public void run(Cache<String, Integer> cache, int idx) throws Exception {
 //                int size = 6;
 //
 //                Map<String, Integer> pairs = threadPairs(size, idx);
@@ -783,7 +783,7 @@ public class GridCacheReplicatedFullApiMultithreadedSelfTest1 extends GridCacheA
 //     */
 //    public void testJ() throws Exception {
 //        runMultiThreadedTest(new GridTestCacheRunnable() {
-//            @Override public void run(GridCache<String, Integer> cache, int idx) throws Exception {
+//            @Override public void run(Cache<String, Integer> cache, int idx) throws Exception {
 //                int size = 6;
 //
 //                Map<String, Integer> pairs = commonPairs(size);
@@ -852,7 +852,7 @@ public class GridCacheReplicatedFullApiMultithreadedSelfTest1 extends GridCacheA
 //     */
 //    public void testK() throws Exception {
 //        runMultiThreadedTest(new GridTestCacheRunnable() {
-//            @Override public void run(GridCache<String, Integer> cache, int idx) throws Exception {
+//            @Override public void run(Cache<String, Integer> cache, int idx) throws Exception {
 //                int size = 6;
 //
 //                Map<String, Integer> pairs = threadPairs(size, idx);
@@ -929,7 +929,7 @@ public class GridCacheReplicatedFullApiMultithreadedSelfTest1 extends GridCacheA
 //     */
 //    public void testL() throws Exception {
 //        runMultiThreadedTest(new GridTestCacheRunnable() {
-//            @Override public void run(GridCache<String, Integer> cache, int idx) throws Exception {
+//            @Override public void run(Cache<String, Integer> cache, int idx) throws Exception {
 //                int size = 6;
 //
 //                Map<String, Integer> pairs = commonPairs(size);
@@ -1009,7 +1009,7 @@ public class GridCacheReplicatedFullApiMultithreadedSelfTest1 extends GridCacheA
 //     * @throws Exception If test failed.
 //     */
 //    public void testM() throws Exception {
-//        GridCache<String, Integer> cache = cache();
+//        Cache<String, Integer> cache = cache();
 //
 //        int size = 10;
 //
@@ -1020,8 +1020,8 @@ public class GridCacheReplicatedFullApiMultithreadedSelfTest1 extends GridCacheA
 //
 //        final int min = Collections.min(vals);
 //
-//        final GridPredicate<GridCacheEntry<String, Integer>> p = new P1<GridCacheEntry<String, Integer>>() {
-//            @Override public boolean apply(GridCacheEntry<String, Integer> e) {
+//        final GridPredicate<CacheEntry<String, Integer>> p = new P1<CacheEntry<String, Integer>>() {
+//            @Override public boolean apply(CacheEntry<String, Integer> e) {
 //                Integer val = e.peek();
 //
 //                return val != null && val >= min;
@@ -1035,7 +1035,7 @@ public class GridCacheReplicatedFullApiMultithreadedSelfTest1 extends GridCacheA
 //        waitForEventCount(F.t(EVT_CACHE_OBJECT_PUT, size));
 //
 //        runMultiThreadedTest(new GridTestCacheRunnable() {
-//            @Override public void run(GridCache<String, Integer> cache, int idx) throws Exception {
+//            @Override public void run(Cache<String, Integer> cache, int idx) throws Exception {
 //                assert cache.forAll(p);
 //                assert cache.forAllAsync(p).get();
 //
@@ -1055,7 +1055,7 @@ public class GridCacheReplicatedFullApiMultithreadedSelfTest1 extends GridCacheA
 //     */
 //    public void testN() throws Exception {
 //        runMultiThreadedTest(new GridTestCacheRunnable() {
-//            @Override public void run(GridCache<String, Integer> cache, int idx) throws Exception {
+//            @Override public void run(Cache<String, Integer> cache, int idx) throws Exception {
 //                int size = 10;
 //
 //                Map<String, Integer> pairs = threadPairs(size, idx);
@@ -1065,8 +1065,8 @@ public class GridCacheReplicatedFullApiMultithreadedSelfTest1 extends GridCacheA
 //
 //                final int min = Collections.min(vals);
 //
-//                GridPredicate<GridCacheEntry<String, Integer>> p = new P1<GridCacheEntry<String, Integer>>() {
-//                    @Override public boolean apply(GridCacheEntry<String, Integer> e) {
+//                GridPredicate<CacheEntry<String, Integer>> p = new P1<CacheEntry<String, Integer>>() {
+//                    @Override public boolean apply(CacheEntry<String, Integer> e) {
 //                        Integer val = e.peek();
 //
 //                        return val != null && val >= min;
@@ -1099,7 +1099,7 @@ public class GridCacheReplicatedFullApiMultithreadedSelfTest1 extends GridCacheA
 //     * @throws Exception If test failed.
 //     */
 //    public void testO() throws Exception {
-//        GridCache<String, Integer> cache = cache();
+//        Cache<String, Integer> cache = cache();
 //
 //        GridCacheClosure c = new GridCacheClosure();
 //
@@ -1120,7 +1120,7 @@ public class GridCacheReplicatedFullApiMultithreadedSelfTest1 extends GridCacheA
 //        waitForEventCount(F.t(EVT_CACHE_OBJECT_PUT, size));
 //
 //        runMultiThreadedTest(new GridTestCacheRunnable() {
-//            @Override public void run(GridCache<String, Integer> cache, int idx) throws Exception {
+//            @Override public void run(Cache<String, Integer> cache, int idx) throws Exception {
 //                GridCacheClosure c = new GridCacheClosure();
 //
 //                cache.forEach(c);
@@ -1167,7 +1167,7 @@ public class GridCacheReplicatedFullApiMultithreadedSelfTest1 extends GridCacheA
 //     */
 //    public void testP() throws Exception {
 //        runMultiThreadedTest(new GridTestCacheRunnable() {
-//            @Override public void run(GridCache<String, Integer> cache, int idx) throws Exception {
+//            @Override public void run(Cache<String, Integer> cache, int idx) throws Exception {
 //                int size = 10;
 //
 //                Map<String, Integer> pairs = threadPairs(size, idx);
@@ -1233,7 +1233,7 @@ public class GridCacheReplicatedFullApiMultithreadedSelfTest1 extends GridCacheA
 //     * @throws Exception If test failed.
 //     */
 //    public void testQ() throws Exception {
-//        GridCache<String, Integer> cache = cache();
+//        Cache<String, Integer> cache = cache();
 //
 //        int size = 3;
 //
@@ -1253,7 +1253,7 @@ public class GridCacheReplicatedFullApiMultithreadedSelfTest1 extends GridCacheA
 //
 //        runMultiThreadedTest(new GridTestCacheRunnable() {
 //            @SuppressWarnings({"TooBroadScope"})
-//            @Override public void run(GridCache<String, Integer> cache, int idx) throws Exception {
+//            @Override public void run(Cache<String, Integer> cache, int idx) throws Exception {
 //                long timeout = 10;
 //
 //                String key = keys[0];
@@ -1371,7 +1371,7 @@ public class GridCacheReplicatedFullApiMultithreadedSelfTest1 extends GridCacheA
 //     * @throws Exception If test failed.
 //     */
 //    public void testR() throws Exception {
-//        GridCache<String, Integer> cache = cache();
+//        Cache<String, Integer> cache = cache();
 //
 //        int size = 3;
 //
@@ -1391,7 +1391,7 @@ public class GridCacheReplicatedFullApiMultithreadedSelfTest1 extends GridCacheA
 //
 //        runMultiThreadedTest(new GridTestCacheRunnable() {
 //            @SuppressWarnings({"TooBroadScope"})
-//            @Override public void run(GridCache<String, Integer> cache, int idx) throws Exception {
+//            @Override public void run(Cache<String, Integer> cache, int idx) throws Exception {
 //                GridCacheTx tx = cache.txStart();
 //
 //                long timeout = 10;
@@ -1603,12 +1603,12 @@ public class GridCacheReplicatedFullApiMultithreadedSelfTest1 extends GridCacheA
 //     * Checks caches.
 //     */
 //    private void checkCaches() {
-//        GridCache<String, Integer> c0 = cache(0);
+//        Cache<String, Integer> c0 = cache(0);
 //
 //        int gridCnt = gridCount();
 //
 //        for (int i = 1; i < gridCnt; i++) {
-//            GridCache<String, Integer> ci = cache(i);
+//            Cache<String, Integer> ci = cache(i);
 //
 //            assert ci.size() == c0.size();
 //
@@ -1626,7 +1626,7 @@ public class GridCacheReplicatedFullApiMultithreadedSelfTest1 extends GridCacheA
 //        int gridCnt = gridCount();
 //
 //        for(int i = 0; i < gridCnt; i++) {
-//            GridCache cache = cache(i);
+//            Cache cache = cache(i);
 //
 //            cache.clearAll();
 //
@@ -1739,7 +1739,7 @@ public class GridCacheReplicatedFullApiMultithreadedSelfTest1 extends GridCacheA
 //         * @param idx Index.
 //         * @throws Exception If any exception occurs.
 //         */
-//        void run(GridCache<String, Integer> cache, int idx) throws Exception;
+//        void run(Cache<String, Integer> cache, int idx) throws Exception;
 //    }
 //
 //    /**
@@ -1883,7 +1883,7 @@ public class GridCacheReplicatedFullApiMultithreadedSelfTest1 extends GridCacheA
 //    /**
 //     * Closure for this test.
 //     */
-//    private static class GridCacheClosure extends GridInClosure<GridCacheEntry<String, Integer>> {
+//    private static class GridCacheClosure extends GridInClosure<CacheEntry<String, Integer>> {
 //        /** 0 - calculates minimum, 1 - maximum, 2 - sum. */
 //        private int type;
 //
@@ -1907,7 +1907,7 @@ public class GridCacheReplicatedFullApiMultithreadedSelfTest1 extends GridCacheA
 //        }
 //
 //        /** {@inheritDoc} */
-//        @Override public void apply(GridCacheEntry<String, Integer> e) {
+//        @Override public void apply(CacheEntry<String, Integer> e) {
 //            Integer i = e.peek();
 //
 //            if (i != null) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFullApiSelfTest.java
index 811e12d..6dd859b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFullApiSelfTest.java
@@ -22,7 +22,7 @@ import org.apache.ignite.configuration.*;
 import org.apache.ignite.internal.processors.cache.*;
 
 import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.GridCacheDistributionMode.*;
+import static org.apache.ignite.cache.CacheDistributionMode.*;
 
 /**
  * Tests for replicated cache.
@@ -34,7 +34,7 @@ public class GridCacheReplicatedFullApiSelfTest extends GridCacheAbstractFullApi
     }
 
     /** {@inheritDoc} */
-    @Override protected GridCacheDistributionMode distributionMode() {
+    @Override protected CacheDistributionMode distributionMode() {
         return PARTITIONED_ONLY;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java
index 1a31167..9debdbe 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java
@@ -35,10 +35,10 @@ import org.apache.ignite.testframework.junits.common.*;
 import java.util.*;
 
 import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.GridCachePreloadMode.*;
+import static org.apache.ignite.cache.CachePreloadMode.*;
 import static org.apache.ignite.transactions.IgniteTxConcurrency.*;
 import static org.apache.ignite.transactions.IgniteTxIsolation.*;
-import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
 
 /**
  *
@@ -152,7 +152,7 @@ public class GridCacheReplicatedInvalidateSelfTest extends GridCommonAbstractTes
         IgniteTxIsolation isolation) throws Throwable {
         int idx = RAND.nextInt(GRID_CNT);
 
-        GridCache<Integer, String> cache = cache(idx);
+        Cache<Integer, String> cache = cache(idx);
 
         IgniteTx tx = cache.txStart(concurrency, isolation, 0, 0);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedJobExecutionTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedJobExecutionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedJobExecutionTest.java
index fd56f26..998a5ec 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedJobExecutionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedJobExecutionTest.java
@@ -21,7 +21,7 @@ import org.apache.ignite.cache.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.internal.processors.cache.distributed.*;
 
-import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
 
 /**
  * Tests cache access from within jobs.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedMarshallerTxTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedMarshallerTxTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedMarshallerTxTest.java
index fea544a..37218c9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedMarshallerTxTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedMarshallerTxTest.java
@@ -22,7 +22,7 @@ import org.apache.ignite.configuration.*;
 import org.apache.ignite.internal.processors.cache.*;
 
 import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
 
 /**
  * Test transaction with wrong marshalling.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedNodeFailureSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedNodeFailureSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedNodeFailureSelfTest.java
index 3974b93..c2eec94 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedNodeFailureSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedNodeFailureSelfTest.java
@@ -22,7 +22,7 @@ import org.apache.ignite.configuration.*;
 import org.apache.ignite.internal.processors.cache.distributed.*;
 
 import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
 
 /**
  * Tests for node failure in transactions.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedNodeRestartSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedNodeRestartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedNodeRestartSelfTest.java
index de6371b..2a1eaec 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedNodeRestartSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedNodeRestartSelfTest.java
@@ -22,8 +22,8 @@ import org.apache.ignite.configuration.*;
 import org.apache.ignite.internal.processors.cache.distributed.*;
 
 import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.GridCachePreloadMode.*;
-import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*;
+import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
 
 /**
  * Tests node restart.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedProjectionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedProjectionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedProjectionSelfTest.java
index 9659498..93057f0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedProjectionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedProjectionSelfTest.java
@@ -21,7 +21,7 @@ import org.apache.ignite.cache.*;
 import org.apache.ignite.internal.processors.cache.*;
 
 import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.GridCacheFlag.*;
+import static org.apache.ignite.cache.CacheFlag.*;
 
 /**
  * Projection tests for replicated cache.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedRendezvousAffinityMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedRendezvousAffinityMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedRendezvousAffinityMultiNodeFullApiSelfTest.java
index 0961e76..b9060c9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedRendezvousAffinityMultiNodeFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedRendezvousAffinityMultiNodeFullApiSelfTest.java
@@ -21,14 +21,14 @@ import org.apache.ignite.cache.*;
 import org.apache.ignite.cache.affinity.rendezvous.*;
 
 /**
- * Multi-node tests for replicated cache with {@link org.apache.ignite.cache.affinity.rendezvous.GridCacheRendezvousAffinityFunction}.
+ * Multi-node tests for replicated cache with {@link org.apache.ignite.cache.affinity.rendezvous.CacheRendezvousAffinityFunction}.
  */
 public class GridCacheReplicatedRendezvousAffinityMultiNodeFullApiSelfTest extends GridCacheReplicatedMultiNodeFullApiSelfTest {
     /** {@inheritDoc} */
     @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception {
         CacheConfiguration cfg = super.cacheConfiguration(gridName);
 
-        cfg.setAffinity(new GridCacheRendezvousAffinityFunction());
+        cfg.setAffinity(new CacheRendezvousAffinityFunction());
 
         return cfg;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxConcurrentGetTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxConcurrentGetTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxConcurrentGetTest.java
index a063fd0..45e8a3e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxConcurrentGetTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxConcurrentGetTest.java
@@ -22,7 +22,7 @@ import org.apache.ignite.configuration.*;
 import org.apache.ignite.internal.processors.cache.*;
 
 import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
 
 /**
  * Checks multithreaded put/get replicated cache operations on one node.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxExceptionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxExceptionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxExceptionSelfTest.java
index 2c1e00e..8f038ce 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxExceptionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxExceptionSelfTest.java
@@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache.distributed.replicated;
 import org.apache.ignite.cache.*;
 import org.apache.ignite.internal.processors.cache.*;
 
-import static org.apache.ignite.cache.GridCacheDistributionMode.*;
+import static org.apache.ignite.cache.CacheDistributionMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
 
 /**
@@ -33,7 +33,7 @@ public class GridCacheReplicatedTxExceptionSelfTest extends IgniteTxExceptionAbs
     }
 
     /** {@inheritDoc} */
-    @Override protected GridCacheDistributionMode distributionMode() {
+    @Override protected CacheDistributionMode distributionMode() {
         return PARTITIONED_ONLY;
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxMultiNodeBasicTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxMultiNodeBasicTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxMultiNodeBasicTest.java
index ae1ed59..cbfd33d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxMultiNodeBasicTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxMultiNodeBasicTest.java
@@ -22,7 +22,7 @@ import org.apache.ignite.configuration.*;
 import org.apache.ignite.internal.processors.cache.*;
 
 import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
 
 /**
  * Test basic cache operations in transactions.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxMultiThreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxMultiThreadedSelfTest.java
index 8e65582..ccfa2d1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxMultiThreadedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxMultiThreadedSelfTest.java
@@ -26,7 +26,7 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
 
 import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
 
 /**
  * Tests for replicated transactions.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxPessimisticOriginatingNodeFailureSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxPessimisticOriginatingNodeFailureSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxPessimisticOriginatingNodeFailureSelfTest.java
index 1e22ce4..b24b5fd 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxPessimisticOriginatingNodeFailureSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxPessimisticOriginatingNodeFailureSelfTest.java
@@ -23,7 +23,7 @@ import org.apache.ignite.internal.processors.cache.distributed.*;
 import java.util.*;
 
 import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.GridCacheDistributionMode.*;
+import static org.apache.ignite.cache.CacheDistributionMode.*;
 
 /**
  *
@@ -41,7 +41,7 @@ public class GridCacheReplicatedTxPessimisticOriginatingNodeFailureSelfTest exte
     }
 
     /** {@inheritDoc} */
-    @Override protected GridCacheDistributionMode distributionMode() {
+    @Override protected CacheDistributionMode distributionMode() {
         return NEAR_PARTITIONED;
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxSingleThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxSingleThreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxSingleThreadedSelfTest.java
index e37cdaf..561f97e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxSingleThreadedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxSingleThreadedSelfTest.java
@@ -26,7 +26,7 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
 
 import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
 
 /**
  * Tests for replicated transactions.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedUnswapAdvancedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedUnswapAdvancedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedUnswapAdvancedSelfTest.java
index 73a99cf..1b75428 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedUnswapAdvancedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedUnswapAdvancedSelfTest.java
@@ -78,8 +78,8 @@ public class GridCacheReplicatedUnswapAdvancedSelfTest extends GridCommonAbstrac
 
         assert g1.cluster().nodes().size() > 1 : "This test needs at least two grid nodes started.";
 
-        GridCache<Object, Object> cache1 = g1.cache(null);
-        GridCache<Object, Object> cache2 = g2.cache(null);
+        Cache<Object, Object> cache1 = g1.cache(null);
+        Cache<Object, Object> cache2 = g2.cache(null);
 
         try {
             ClassLoader ldr = new GridTestClassLoader(

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheSyncReplicatedPreloadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheSyncReplicatedPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheSyncReplicatedPreloadSelfTest.java
index aa06230..7cd698d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheSyncReplicatedPreloadSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheSyncReplicatedPreloadSelfTest.java
@@ -30,10 +30,10 @@ import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 
 import static org.apache.ignite.configuration.IgniteDeploymentMode.*;
-import static org.apache.ignite.cache.GridCacheDistributionMode.*;
+import static org.apache.ignite.cache.CacheDistributionMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.GridCachePreloadMode.*;
-import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*;
+import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
 
 /**
  * Multithreaded tests for replicated cache preloader.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java
index cb226d9..d440094 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java
@@ -30,10 +30,10 @@ import org.apache.ignite.internal.util.typedef.*;
 import java.util.*;
 
 import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.GridCachePreloadMode.*;
+import static org.apache.ignite.cache.CachePreloadMode.*;
 import static org.apache.ignite.transactions.IgniteTxConcurrency.*;
 import static org.apache.ignite.transactions.IgniteTxIsolation.*;
-import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
 
 /**
  * Tests for replicated cache preloader.
@@ -85,8 +85,8 @@ public class GridCacheReplicatedPreloadLifecycleSelfTest extends GridCachePreloa
             @Override public void onLifecycleEvent(LifecycleEventType evt) throws IgniteCheckedException {
                 switch (evt) {
                     case AFTER_GRID_START: {
-                        GridCache<Object, MyValue> c1 = ignite.cache("one");
-                        GridCache<Object, MyValue> c2 = ignite.cache("two");
+                        Cache<Object, MyValue> c1 = ignite.cache("one");
+                        Cache<Object, MyValue> c2 = ignite.cache("two");
 
                         if (!ignite.name().contains("Test0")) {
                             if (!quiet) {
@@ -148,8 +148,8 @@ public class GridCacheReplicatedPreloadLifecycleSelfTest extends GridCachePreloa
             info("Checking '" + (i + 1) + "' nodes...");
 
             for (int j = 0; j < G.allGrids().size(); j++) {
-                GridCache<String, MyValue> c1 = grid(j).cache("one");
-                GridCache<String, MyValue> c2 = grid(j).cache("two");
+                Cache<String, MyValue> c1 = grid(j).cache("one");
+                Cache<String, MyValue> c2 = grid(j).cache("two");
 
                 int size1 = c1.size();
                 int size2 = c2.size();
@@ -178,9 +178,9 @@ public class GridCacheReplicatedPreloadLifecycleSelfTest extends GridCachePreloa
             info("Checking '" + (i + 1) + "' nodes...");
 
             for (int j = 0; j < G.allGrids().size(); j++) {
-                GridCache<Object, MyValue> c2 = grid(j).cache("two");
+                Cache<Object, MyValue> c2 = grid(j).cache("two");
 
-                GridCacheQuery<Map.Entry<Object, MyValue>> qry = c2.queries().createScanQuery(null);
+                CacheQuery<Map.Entry<Object, MyValue>> qry = c2.queries().createScanQuery(null);
 
                 final int i0 = j;
                 final int j0 = i;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadOffHeapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadOffHeapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadOffHeapSelfTest.java
index f361b63..f709e34 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadOffHeapSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadOffHeapSelfTest.java
@@ -19,7 +19,7 @@ package org.apache.ignite.internal.processors.cache.distributed.replicated.prelo
 
 import org.apache.ignite.cache.*;
 
-import static org.apache.ignite.cache.GridCacheMemoryMode.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
 
 /**
  * Tests for replicated cache {@link GridReplicatedPreloader preloader}.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java
index f6f3a96..e98f352 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java
@@ -37,8 +37,8 @@ import java.util.*;
 
 import static org.apache.ignite.configuration.IgniteDeploymentMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.GridCachePreloadMode.*;
-import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*;
+import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
 import static org.apache.ignite.events.IgniteEventType.*;
 
 /**
@@ -46,7 +46,7 @@ import static org.apache.ignite.events.IgniteEventType.*;
  */
 public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest {
     /** */
-    private GridCachePreloadMode preloadMode = ASYNC;
+    private CachePreloadMode preloadMode = ASYNC;
 
     /** */
     private int batchSize = 4096;
@@ -153,12 +153,12 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest {
         try {
             Ignite g1 = startGrid(1);
 
-            GridCache<Integer, String> cache1 = g1.cache(null);
+            Cache<Integer, String> cache1 = g1.cache(null);
 
             cache1.put(1, "val1");
             cache1.put(2, "val2");
 
-            GridCacheEntry<Integer, String> e1 = cache1.entry(1);
+            CacheEntry<Integer, String> e1 = cache1.entry(1);
 
             assert e1 != null;
 
@@ -186,12 +186,12 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest {
             assertEquals(EVT_CACHE_PRELOAD_STARTED, iter.next().type());
             assertEquals(EVT_CACHE_PRELOAD_STOPPED, iter.next().type());
 
-            GridCache<Integer, String> cache2 = g2.cache(null);
+            Cache<Integer, String> cache2 = g2.cache(null);
 
             assertEquals("val1", cache2.peek(1));
             assertEquals("val2", cache2.peek(2));
 
-            GridCacheEntry<Integer, String> e2 = cache2.entry(1);
+            CacheEntry<Integer, String> e2 = cache2.entry(1);
 
             assert e2 != null;
             assert e2 != e1;
@@ -214,8 +214,8 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest {
             Ignite g1 = startGrid(1);
             Ignite g2 = startGrid(2);
 
-            GridCache<Integer, Object> cache1 = g1.cache(null);
-            GridCache<Integer, Object> cache2 = g2.cache(null);
+            Cache<Integer, Object> cache1 = g1.cache(null);
+            Cache<Integer, Object> cache2 = g2.cache(null);
 
             ClassLoader ldr = new GridTestClassLoader(
                 GridCacheReplicatedPreloadSelfTest.class.getName(),
@@ -241,7 +241,7 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest {
 
             Ignite g3 = startGrid(3);
 
-            GridCache<Integer, Object> cache3 = g3.cache(null);
+            Cache<Integer, Object> cache3 = g3.cache(null);
 
             Object v3 = cache3.peek(1);
 
@@ -267,14 +267,14 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest {
         batchSize = 512;
 
         try {
-            GridCache<Integer, String> cache1 = startGrid(1).cache(null);
+            Cache<Integer, String> cache1 = startGrid(1).cache(null);
 
             int keyCnt = 1000;
 
             for (int i = 0; i < keyCnt; i++)
                 cache1.put(i, "val" + i);
 
-            GridCache<Integer, String> cache2 = startGrid(2).cache(null);
+            Cache<Integer, String> cache2 = startGrid(2).cache(null);
 
             assertEquals(keyCnt, cache2.size());
         }
@@ -291,14 +291,14 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest {
         batchSize = 256;
 
         try {
-            GridCache<Integer, String> cache1 = startGrid(1).cache(null);
+            Cache<Integer, String> cache1 = startGrid(1).cache(null);
 
             int keyCnt = 2000;
 
             for (int i = 0; i < keyCnt; i++)
                 cache1.put(i, "val" + i);
 
-            GridCache<Integer, String> cache2 = startGrid(2).cache(null);
+            Cache<Integer, String> cache2 = startGrid(2).cache(null);
 
             int size = cache2.size();
 
@@ -319,7 +319,7 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest {
      * @throws InterruptedException If thread was interrupted.
      */
     @SuppressWarnings({"BusyWait"})
-    private boolean waitCacheSize(GridCacheProjection<Integer, String> cache, int expSize, long timeout)
+    private boolean waitCacheSize(CacheProjection<Integer, String> cache, int expSize, long timeout)
         throws InterruptedException {
         assert cache != null;
         assert expSize > 0;
@@ -345,14 +345,14 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest {
         batchSize = 1; // 1 byte but one entry should be in batch anyway.
 
         try {
-            GridCache<Integer, String> cache1 = startGrid(1).cache(null);
+            Cache<Integer, String> cache1 = startGrid(1).cache(null);
 
             int cnt = 100;
 
             for (int i = 0; i < cnt; i++)
                 cache1.put(i, "val" + i);
 
-            GridCache<Integer, String> cache2 = startGrid(2).cache(null);
+            Cache<Integer, String> cache2 = startGrid(2).cache(null);
 
             assertEquals(cnt, cache2.size());
         }
@@ -369,14 +369,14 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest {
         batchSize = 1000; // 1000 bytes.
 
         try {
-            GridCache<Integer, String> cache1 = startGrid(1).cache(null);
+            Cache<Integer, String> cache1 = startGrid(1).cache(null);
 
             int cnt = 100;
 
             for (int i = 0; i < cnt; i++)
                 cache1.put(i, "val" + i);
 
-            GridCache<Integer, String> cache2 = startGrid(2).cache(null);
+            Cache<Integer, String> cache2 = startGrid(2).cache(null);
 
             assertEquals(cnt, cache2.size());
         }
@@ -393,14 +393,14 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest {
         batchSize = 10000; // 10000 bytes.
 
         try {
-            GridCache<Integer, String> cache1 = startGrid(1).cache(null);
+            Cache<Integer, String> cache1 = startGrid(1).cache(null);
 
             int cnt = 100;
 
             for (int i = 0; i < cnt; i++)
                 cache1.put(i, "val" + i);
 
-            GridCache<Integer, String> cache2 = startGrid(2).cache(null);
+            Cache<Integer, String> cache2 = startGrid(2).cache(null);
 
             assertEquals(cnt, cache2.size());
         }
@@ -451,7 +451,7 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest {
                 info("Cache size is OK for grid index: " + gridIdx);
             }
 
-            GridCache<Integer, String> lastCache = startGrid(gridCnt).cache(null);
+            Cache<Integer, String> lastCache = startGrid(gridCnt).cache(null);
 
             // Let preloading start.
             Thread.sleep(1000);
@@ -525,7 +525,7 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest {
      * Test affinity.
      */
     @SuppressWarnings({"PublicInnerClass"})
-    private static class TestAffinityFunction implements GridCacheAffinityFunction {
+    private static class TestAffinityFunction implements CacheAffinityFunction {
         /** {@inheritDoc} */
         @Override public int partitions() {
             return 2;
@@ -540,7 +540,7 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override public List<List<ClusterNode>> assignPartitions(GridCacheAffinityFunctionContext affCtx) {
+        @Override public List<List<ClusterNode>> assignPartitions(CacheAffinityFunctionContext affCtx) {
             List<List<ClusterNode>> res = new ArrayList<>(partitions());
 
             for (int part = 0; part < partitions(); part++)

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheBatchEvictUnswapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheBatchEvictUnswapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheBatchEvictUnswapSelfTest.java
index 74af307..9afbf84 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheBatchEvictUnswapSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheBatchEvictUnswapSelfTest.java
@@ -19,18 +19,18 @@ package org.apache.ignite.internal.processors.cache.eviction;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.Cache;
 import org.apache.ignite.cache.eviction.fifo.*;
 import org.apache.ignite.cache.store.*;
 import org.apache.ignite.internal.processors.cache.*;
 import org.apache.ignite.lang.*;
 import org.jetbrains.annotations.*;
 
-import javax.cache.*;
 import javax.cache.configuration.*;
 import java.util.*;
 import java.util.concurrent.atomic.*;
 
-import static org.apache.ignite.cache.GridCacheDistributionMode.*;
+import static org.apache.ignite.cache.CacheDistributionMode.*;
 
 /**
  * Swap benchmark.
@@ -78,7 +78,7 @@ public class GridCacheBatchEvictUnswapSelfTest extends GridCacheAbstractSelfTest
                     c.apply((long)i, String.valueOf(i));
             }
 
-            @Override public void write(Cache.Entry<? extends Long, ? extends String> val) {
+            @Override public void write(javax.cache.Cache.Entry<? extends Long, ? extends String> val) {
                 // No-op.
             }
 
@@ -92,7 +92,7 @@ public class GridCacheBatchEvictUnswapSelfTest extends GridCacheAbstractSelfTest
         cacheCfg.setWriteThrough(true);
         cacheCfg.setLoadPreviousValue(true);
 
-        cacheCfg.setEvictionPolicy(new GridCacheFifoEvictionPolicy(EVICT_PLC_SIZE));
+        cacheCfg.setEvictionPolicy(new CacheFifoEvictionPolicy(EVICT_PLC_SIZE));
         cacheCfg.setSwapEnabled(true);
         cacheCfg.setEvictSynchronized(false);
         cacheCfg.setDistributionMode(PARTITIONED_ONLY);
@@ -118,7 +118,7 @@ public class GridCacheBatchEvictUnswapSelfTest extends GridCacheAbstractSelfTest
 
         final AtomicInteger evictedKeysCnt = new AtomicInteger();
 
-        final GridCache<Object, Object> cache = g.cache(null);
+        final Cache<Object, Object> cache = g.cache(null);
 
         cache.loadCache(null, 0);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java
index e72fec8..07335b3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java
@@ -35,10 +35,10 @@ import java.util.*;
 import java.util.concurrent.*;
 
 import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.GridCacheDistributionMode.*;
+import static org.apache.ignite.cache.CacheDistributionMode.*;
 import static org.apache.ignite.transactions.IgniteTxConcurrency.*;
 import static org.apache.ignite.transactions.IgniteTxIsolation.*;
-import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
 
 /**
  *
@@ -54,7 +54,7 @@ public class GridCacheConcurrentEvictionConsistencySelfTest extends GridCommonAb
     private static final int POLICY_QUEUE_SIZE = 50;
 
     /** Tested policy. */
-    private GridCacheEvictionPolicy<?, ?> plc;
+    private CacheEvictionPolicy<?, ?> plc;
 
     /** Key count to put into the cache. */
     private int keyCnt;
@@ -101,7 +101,7 @@ public class GridCacheConcurrentEvictionConsistencySelfTest extends GridCommonAb
      * @throws Exception If failed.
      */
     public void testPolicyConsistencyFifoLocalTwoKeys() throws Exception {
-        plc = new GridCacheFifoEvictionPolicy<Object, Object>(1);
+        plc = new CacheFifoEvictionPolicy<Object, Object>(1);
 
         keyCnt = 2;
         threadCnt = 10;
@@ -113,7 +113,7 @@ public class GridCacheConcurrentEvictionConsistencySelfTest extends GridCommonAb
      * @throws Exception If failed.
      */
     public void testPolicyConsistencyLruLocalTwoKeys() throws Exception {
-        plc = new GridCacheLruEvictionPolicy<Object, Object>(1);
+        plc = new CacheLruEvictionPolicy<Object, Object>(1);
 
         keyCnt = 2;
         threadCnt = 10;
@@ -125,7 +125,7 @@ public class GridCacheConcurrentEvictionConsistencySelfTest extends GridCommonAb
      * @throws Exception If failed.
      */
     public void testPolicyConsistencyFifoLocalFewKeys() throws Exception {
-        plc = new GridCacheFifoEvictionPolicy<Object, Object>(POLICY_QUEUE_SIZE);
+        plc = new CacheFifoEvictionPolicy<Object, Object>(POLICY_QUEUE_SIZE);
 
         keyCnt = POLICY_QUEUE_SIZE + 5;
 
@@ -136,7 +136,7 @@ public class GridCacheConcurrentEvictionConsistencySelfTest extends GridCommonAb
      * @throws Exception If failed.
      */
     public void testPolicyConsistencyLruLocalFewKeys() throws Exception {
-        plc = new GridCacheLruEvictionPolicy<Object, Object>(POLICY_QUEUE_SIZE);
+        plc = new CacheLruEvictionPolicy<Object, Object>(POLICY_QUEUE_SIZE);
 
         keyCnt = POLICY_QUEUE_SIZE + 5;
 
@@ -147,7 +147,7 @@ public class GridCacheConcurrentEvictionConsistencySelfTest extends GridCommonAb
      * @throws Exception If failed.
      */
     public void testPolicyConsistencyFifoLocal() throws Exception {
-        plc = new GridCacheFifoEvictionPolicy<Object, Object>(POLICY_QUEUE_SIZE);
+        plc = new CacheFifoEvictionPolicy<Object, Object>(POLICY_QUEUE_SIZE);
 
         keyCnt = POLICY_QUEUE_SIZE * 10;
 
@@ -158,7 +158,7 @@ public class GridCacheConcurrentEvictionConsistencySelfTest extends GridCommonAb
      * @throws Exception If failed.
      */
     public void testPolicyConsistencyLruLocal() throws Exception {
-        plc = new GridCacheLruEvictionPolicy<Object, Object>(POLICY_QUEUE_SIZE);
+        plc = new CacheLruEvictionPolicy<Object, Object>(POLICY_QUEUE_SIZE);
 
         keyCnt = POLICY_QUEUE_SIZE * 10;
 
@@ -172,7 +172,7 @@ public class GridCacheConcurrentEvictionConsistencySelfTest extends GridCommonAb
         try {
             Ignite ignite = startGrid(1);
 
-            final GridCache<Integer, Integer> cache = ignite.cache(null);
+            final Cache<Integer, Integer> cache = ignite.cache(null);
 
             long start = System.currentTimeMillis();
 
@@ -208,12 +208,12 @@ public class GridCacheConcurrentEvictionConsistencySelfTest extends GridCommonAb
 
             fut.get();
 
-            Collection<GridCacheEntry<Integer, Integer>> queue = internalQueue(plc);
+            Collection<CacheEntry<Integer, Integer>> queue = internalQueue(plc);
 
             info("Test results [threadCnt=" + threadCnt + ", iterCnt=" + ITERATION_CNT + ", cacheSize=" + cache.size() +
                 ", internalQueueSize" + queue.size() + ", duration=" + (System.currentTimeMillis() - start) + ']');
 
-            for (GridCacheEntry<Integer, Integer> e : queue) {
+            for (CacheEntry<Integer, Integer> e : queue) {
                 Integer rmv = cache.remove(e.getKey());
 
                 if (rmv == null)
@@ -225,7 +225,7 @@ public class GridCacheConcurrentEvictionConsistencySelfTest extends GridCommonAb
             if (!cache.isEmpty()) {
                 boolean zombies = false;
 
-                for (GridCacheEntry<Integer, Integer> e : cache) {
+                for (CacheEntry<Integer, Integer> e : cache) {
                     U.warn(log, "Zombie entry: " + e);
 
                     zombies = true;
@@ -248,14 +248,14 @@ public class GridCacheConcurrentEvictionConsistencySelfTest extends GridCommonAb
      * @param plc Policy to get queue from.
      * @return Internal entries collection.
      */
-    private Collection<GridCacheEntry<Integer, Integer>> internalQueue(GridCacheEvictionPolicy<?, ?> plc) {
-        if (plc instanceof GridCacheFifoEvictionPolicy) {
-            GridCacheFifoEvictionPolicy<Integer, Integer> plc0 = (GridCacheFifoEvictionPolicy<Integer, Integer>)plc;
+    private Collection<CacheEntry<Integer, Integer>> internalQueue(CacheEvictionPolicy<?, ?> plc) {
+        if (plc instanceof CacheFifoEvictionPolicy) {
+            CacheFifoEvictionPolicy<Integer, Integer> plc0 = (CacheFifoEvictionPolicy<Integer, Integer>)plc;
 
             return plc0.queue();
         }
-        else if (plc instanceof GridCacheLruEvictionPolicy) {
-            GridCacheLruEvictionPolicy<Integer, Integer> plc0 = (GridCacheLruEvictionPolicy<Integer, Integer>)plc;
+        else if (plc instanceof CacheLruEvictionPolicy) {
+            CacheLruEvictionPolicy<Integer, Integer> plc0 = (CacheLruEvictionPolicy<Integer, Integer>)plc;
 
             return plc0.queue();
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionsSelfTest.java
index 56c4ca7..429c229 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionsSelfTest.java
@@ -33,10 +33,10 @@ import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 
 import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.GridCacheDistributionMode.*;
+import static org.apache.ignite.cache.CacheDistributionMode.*;
 import static org.apache.ignite.transactions.IgniteTxConcurrency.*;
 import static org.apache.ignite.transactions.IgniteTxIsolation.*;
-import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
 
 /**
  *
@@ -49,10 +49,10 @@ public class GridCacheConcurrentEvictionsSelfTest extends GridCommonAbstractTest
     private CacheMode mode = REPLICATED;
 
     /** */
-    private GridCacheEvictionPolicy<?, ?> plc;
+    private CacheEvictionPolicy<?, ?> plc;
 
     /** */
-    private GridCacheEvictionPolicy<?, ?> nearPlc;
+    private CacheEvictionPolicy<?, ?> nearPlc;
 
     /** */
     private int warmUpPutsCnt;
@@ -104,7 +104,7 @@ public class GridCacheConcurrentEvictionsSelfTest extends GridCommonAbstractTest
      */
     public void testConcurrentPutsFifoLocal() throws Exception {
         mode = LOCAL;
-        plc = new GridCacheFifoEvictionPolicy<Object, Object>(1000);
+        plc = new CacheFifoEvictionPolicy<Object, Object>(1000);
         nearPlc = null;
         warmUpPutsCnt = 100000;
         iterCnt = 100000;
@@ -117,7 +117,7 @@ public class GridCacheConcurrentEvictionsSelfTest extends GridCommonAbstractTest
      */
     public void testConcurrentPutsLruLocal() throws Exception {
         mode = LOCAL;
-        plc = new GridCacheLruEvictionPolicy<Object, Object>(1000);
+        plc = new CacheLruEvictionPolicy<Object, Object>(1000);
         nearPlc = null;
         warmUpPutsCnt = 100000;
         iterCnt = 100000;
@@ -132,7 +132,7 @@ public class GridCacheConcurrentEvictionsSelfTest extends GridCommonAbstractTest
         try {
             Ignite ignite = startGrid(1);
 
-            final GridCache<Integer, Integer> cache = ignite.cache(null);
+            final Cache<Integer, Integer> cache = ignite.cache(null);
 
             // Warm up.
             for (int i = 0; i < warmUpPutsCnt; i++) {


Mime
View raw message