ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [19/54] [abbrv] incubator-ignite git commit: # ignite-63
Date Fri, 23 Jan 2015 12:27:59 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java
index 37f6c90..925e829 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java
@@ -33,7 +33,7 @@ import java.util.*;
 import java.util.concurrent.atomic.*;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
-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.transactions.IgniteTxConcurrency.*;
 import static org.apache.ignite.transactions.IgniteTxIsolation.*;
@@ -83,10 +83,10 @@ public class GridCacheDistributedEvictionsSelfTest extends GridCommonAbstractTes
 
         cc.setSwapEnabled(false);
 
-        cc.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC);
+        cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
 
         // Set only DHT policy, leave default near policy.
-        cc.setEvictionPolicy(new GridCacheFifoEvictionPolicy<>(10));
+        cc.setEvictionPolicy(new CacheFifoEvictionPolicy<>(10));
         cc.setEvictSynchronized(evictSync);
         cc.setEvictNearSynchronized(evictNearSync);
         cc.setEvictSynchronizedKeyBufferSize(1);
@@ -167,7 +167,7 @@ public class GridCacheDistributedEvictionsSelfTest extends GridCommonAbstractTes
 
         Ignite g = startGrid(0);
 
-        final GridCache<Integer, Integer> cache = g.cache(null);
+        final Cache<Integer, Integer> cache = g.cache(null);
 
         for (int i = 1; i < 20; i++) {
             cache.putx(i * gridCnt, i * gridCnt);
@@ -183,7 +183,7 @@ public class GridCacheDistributedEvictionsSelfTest extends GridCommonAbstractTes
 
             Ignite ignite = grid(0);
 
-            final GridCache<Integer, Integer> cache = ignite.cache(null);
+            final Cache<Integer, Integer> cache = ignite.cache(null);
 
             // Put 1 entry to primary node.
             cache.putx(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/eviction/GridCacheEmptyEntriesAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java
index 25bfc7a..66e7cce 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java
@@ -19,11 +19,12 @@ 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.store.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.transactions.*;
-import org.apache.ignite.cache.eviction.GridCacheEvictionPolicy;
-import org.apache.ignite.cache.eviction.fifo.GridCacheFifoEvictionPolicy;
+import org.apache.ignite.cache.eviction.CacheEvictionPolicy;
+import org.apache.ignite.cache.eviction.fifo.CacheFifoEvictionPolicy;
 import org.apache.ignite.cache.store.CacheStore;
 import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
@@ -32,7 +33,6 @@ import org.apache.ignite.internal.util.typedef.*;
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 
-import javax.cache.*;
 import javax.cache.configuration.*;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
@@ -45,10 +45,10 @@ public abstract class GridCacheEmptyEntriesAbstractSelfTest extends GridCommonAb
     private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
 
     /** */
-    private GridCacheEvictionPolicy<?, ?> plc;
+    private CacheEvictionPolicy<?, ?> plc;
 
     /** */
-    private GridCacheEvictionPolicy<?, ?> nearPlc;
+    private CacheEvictionPolicy<?, ?> nearPlc;
 
     /** Test store. */
     private CacheStore<String, String> testStore;
@@ -77,8 +77,8 @@ public abstract class GridCacheEmptyEntriesAbstractSelfTest extends GridCommonAb
 
         cc.setSwapEnabled(false);
 
-        cc.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC);
-        cc.setDistributionMode(GridCacheDistributionMode.PARTITIONED_ONLY);
+        cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
+        cc.setDistributionMode(CacheDistributionMode.PARTITIONED_ONLY);
 
         cc.setEvictionPolicy(plc);
         cc.setNearEvictionPolicy(nearPlc);
@@ -124,8 +124,8 @@ public abstract class GridCacheEmptyEntriesAbstractSelfTest extends GridCommonAb
      * @throws Exception If failed.
      */
     public void testFifo() throws Exception {
-        plc = new GridCacheFifoEvictionPolicy(50);
-        nearPlc = new GridCacheFifoEvictionPolicy(50);
+        plc = new CacheFifoEvictionPolicy(50);
+        nearPlc = new CacheFifoEvictionPolicy(50);
 
         checkPolicy();
     }
@@ -145,7 +145,7 @@ public abstract class GridCacheEmptyEntriesAbstractSelfTest extends GridCommonAb
                 return null;
             }
 
-            @Override public void write(Cache.Entry<? extends String, ? extends String> e) {
+            @Override public void write(javax.cache.Cache.Entry<? extends String, ? extends String> e) {
                 // No-op.
             }
 
@@ -171,7 +171,7 @@ public abstract class GridCacheEmptyEntriesAbstractSelfTest extends GridCommonAb
 
                 Ignite g = startGrids();
 
-                GridCache<String, String> cache = g.cache(null);
+                Cache<String, String> cache = g.cache(null);
 
                 try {
                     info(">>> Checking policy [txConcurrency=" + txConcurrency + ", txIsolation=" + txIsolation +
@@ -194,7 +194,7 @@ public abstract class GridCacheEmptyEntriesAbstractSelfTest extends GridCommonAb
      * @param cache Cache to test.
      * @throws Exception If failed.
      */
-    private void checkImplicitTx(GridCache<String, String> cache) throws Exception {
+    private void checkImplicitTx(Cache<String, String> cache) throws Exception {
         assertNull(cache.get("key1"));
         assertNull(cache.getAsync("key2").get());
 
@@ -214,7 +214,7 @@ public abstract class GridCacheEmptyEntriesAbstractSelfTest extends GridCommonAb
      * @param cache Cache to test.
      * @throws Exception If failed.
      */
-    private void checkExplicitTx(GridCache<String, String> cache) throws Exception {
+    private void checkExplicitTx(Cache<String, String> cache) throws Exception {
         IgniteTx tx = cache.txStart();
 
         try {
@@ -284,7 +284,7 @@ public abstract class GridCacheEmptyEntriesAbstractSelfTest extends GridCommonAb
      * @throws org.apache.ignite.IgniteInterruptedException If interrupted while sleeping.
      */
     @SuppressWarnings({"ErrorNotRethrown", "TypeMayBeWeakened"})
-    private void checkEmpty(GridCache<String, String> cache) throws IgniteInterruptedException {
+    private void checkEmpty(Cache<String, String> cache) throws IgniteInterruptedException {
         for (int i = 0; i < 3; i++) {
             try {
                 assertTrue(cache.entrySet().toString(), cache.entrySet().isEmpty());

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionAbstractTest.java
index 37dbe14..2baf7a6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionAbstractTest.java
@@ -35,15 +35,15 @@ import java.util.concurrent.atomic.*;
 import static org.apache.ignite.events.IgniteEventType.*;
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
 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.*;
 
 /**
  * Base class for eviction tests.
  */
-public abstract class GridCacheEvictionAbstractTest<T extends GridCacheEvictionPolicy<?, ?>>
+public abstract class GridCacheEvictionAbstractTest<T extends CacheEvictionPolicy<?, ?>>
     extends GridCommonAbstractTest {
     /** IP finder. */
     protected static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
@@ -73,7 +73,7 @@ public abstract class GridCacheEvictionAbstractTest<T extends GridCacheEvictionP
     protected int gridCnt = 2;
 
     /** */
-    protected GridCacheEvictionFilter<?, ?> filter;
+    protected CacheEvictionFilter<?, ?> filter;
 
     /** {@inheritDoc} */
     @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
@@ -138,12 +138,12 @@ public abstract class GridCacheEvictionAbstractTest<T extends GridCacheEvictionP
      * @param prefix Prefix.
      * @param p Policy.
      */
-    protected void info(String prefix, GridCacheEvictionPolicy<?, ?> p) {
+    protected void info(String prefix, CacheEvictionPolicy<?, ?> p) {
         info(prefix + ": " + p.toString());
     }
 
     /** @param p Policy. */
-    protected void info(GridCacheEvictionPolicy<?, ?> p) {
+    protected void info(CacheEvictionPolicy<?, ?> p) {
         info(p.toString());
     }
 
@@ -151,7 +151,7 @@ public abstract class GridCacheEvictionAbstractTest<T extends GridCacheEvictionP
      * @param c1 Policy collection.
      * @param c2 Expected list.
      */
-    protected void check(Collection<GridCacheEntry<String, String>> c1, MockEntry... c2) {
+    protected void check(Collection<CacheEntry<String, String>> c1, MockEntry... c2) {
         check(c1, F.asList(c2));
     }
 
@@ -183,7 +183,7 @@ public abstract class GridCacheEvictionAbstractTest<T extends GridCacheEvictionP
      * @param c1 Policy collection.
      * @param c2 Expected list.
      */
-    protected void check(Collection<GridCacheEntry<String, String>> c1, List<MockEntry> c2) {
+    protected void check(Collection<CacheEntry<String, String>> c1, List<MockEntry> c2) {
         assert c1.size() == c2.size() : "Mismatch [actual=" + string(c1) + ", expected=" + string(c2) + ']';
 
         assert c1.containsAll(c2) : "Mismatch [actual=" + string(c1) + ", expected=" + string(c2) + ']';
@@ -191,7 +191,7 @@ public abstract class GridCacheEvictionAbstractTest<T extends GridCacheEvictionP
         int i = 0;
 
         // Check order.
-        for (GridCacheEntry<String, String> e : c1)
+        for (CacheEntry<String, String> e : c1)
             assertEquals(e, c2.get(i++));
     }
 
@@ -199,9 +199,9 @@ public abstract class GridCacheEvictionAbstractTest<T extends GridCacheEvictionP
      * @param c Collection.
      * @return String.
      */
-    protected String string(Iterable<? extends GridCacheEntry> c) {
-        return "[" + F.fold(c, "", new C2<GridCacheEntry, String, String>() {
-            @Override public String apply(GridCacheEntry e, String b) {
+    protected String string(Iterable<? extends CacheEntry> c) {
+        return "[" + F.fold(c, "", new C2<CacheEntry, String, String>() {
+            @Override public String apply(CacheEntry e, String b) {
                 return b.isEmpty() ? e.getKey().toString() : b + ", " + e.getKey();
             }
         }) + "]]";
@@ -295,7 +295,7 @@ public abstract class GridCacheEvictionAbstractTest<T extends GridCacheEvictionP
             int cnt = 500;
 
             for (int i = 0; i < cnt; i++) {
-                GridCache<Integer, String> cache = grid(rand.nextInt(2)).cache(null);
+                Cache<Integer, String> cache = grid(rand.nextInt(2)).cache(null);
 
                 int key = rand.nextInt(100);
                 String val = Integer.toString(key);
@@ -346,7 +346,7 @@ public abstract class GridCacheEvictionAbstractTest<T extends GridCacheEvictionP
                     int cnt = 100;
 
                     for (int i = 0; i < cnt && !Thread.currentThread().isInterrupted(); i++) {
-                        GridCache<Integer, String> cache = grid(rand.nextInt(2)).cache(null);
+                        Cache<Integer, String> cache = grid(rand.nextInt(2)).cache(null);
 
                         int key = rand.nextInt(1000);
                         String val = Integer.toString(key);
@@ -407,7 +407,7 @@ public abstract class GridCacheEvictionAbstractTest<T extends GridCacheEvictionP
     @SuppressWarnings({"PublicConstructorInNonPublicClass"})
     protected static class MockEntry extends GridCacheMockEntry<String, String> {
         /** */
-        private final GridCacheProjection<String, String> parent;
+        private final CacheProjection<String, String> parent;
 
         /** Entry value. */
         private String val;
@@ -434,7 +434,7 @@ public abstract class GridCacheEvictionAbstractTest<T extends GridCacheEvictionP
          * @param key Key.
          * @param parent Parent.
          */
-        public MockEntry(String key, @Nullable GridCacheProjection<String, String> parent) {
+        public MockEntry(String key, @Nullable CacheProjection<String, String> parent) {
             super(key);
 
             this.parent = parent;
@@ -455,7 +455,7 @@ public abstract class GridCacheEvictionAbstractTest<T extends GridCacheEvictionP
         }
 
         /** {@inheritDoc} */
-        @Override public GridCacheProjection<String, String> projection() {
+        @Override public CacheProjection<String, String> projection() {
             return parent;
         }
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java
index a32cf98..9a339b3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java
@@ -33,8 +33,8 @@ import java.util.concurrent.atomic.*;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.GridCacheDistributionMode.*;
-import static org.apache.ignite.cache.GridCachePreloadMode.*;
+import static org.apache.ignite.cache.CacheDistributionMode.*;
+import static org.apache.ignite.cache.CachePreloadMode.*;
 
 /**
  * Base class for eviction tests.
@@ -53,8 +53,8 @@ public class GridCacheEvictionFilterSelfTest extends GridCommonAbstractTest {
     private EvictionFilter filter;
 
     /** Policy. */
-    private GridCacheEvictionPolicy<Object, Object> plc = new GridCacheEvictionPolicy<Object, Object>() {
-        @Override public void onEntryAccessed(boolean rmv, GridCacheEntry entry) {
+    private CacheEvictionPolicy<Object, Object> plc = new CacheEvictionPolicy<Object, Object>() {
+        @Override public void onEntryAccessed(boolean rmv, CacheEntry entry) {
             assert !(entry.peek() instanceof Integer);
         }
     };
@@ -72,7 +72,7 @@ public class GridCacheEvictionFilterSelfTest extends GridCommonAbstractTest {
         cc.setEvictSynchronized(false);
         cc.setEvictNearSynchronized(false);
         cc.setSwapEnabled(false);
-        cc.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC);
+        cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
         cc.setEvictionFilter(filter);
         cc.setPreloadMode(SYNC);
         cc.setAtomicityMode(TRANSACTIONAL);
@@ -131,7 +131,7 @@ public class GridCacheEvictionFilterSelfTest extends GridCommonAbstractTest {
         try {
             Ignite g = grid(0);
 
-            GridCache<Object, Object> c = g.cache(null);
+            Cache<Object, Object> c = g.cache(null);
 
             int cnt = 1;
 
@@ -186,7 +186,7 @@ public class GridCacheEvictionFilterSelfTest extends GridCommonAbstractTest {
 
         Ignite g = startGrid();
 
-        GridCache<Object, Object> cache = g.cache(null);
+        Cache<Object, Object> cache = g.cache(null);
 
         try {
             int id = 1;
@@ -212,12 +212,12 @@ public class GridCacheEvictionFilterSelfTest extends GridCommonAbstractTest {
     /**
      *
      */
-    private final class EvictionFilter implements GridCacheEvictionFilter<Object, Object> {
+    private final class EvictionFilter implements CacheEvictionFilter<Object, Object> {
         /** */
         private final ConcurrentMap<Object, AtomicInteger> cnts = new ConcurrentHashMap<>();
 
         /** {@inheritDoc} */
-        @Override public boolean evictAllowed(GridCacheEntry<Object, Object> entry) {
+        @Override public boolean evictAllowed(CacheEntry<Object, Object> entry) {
             AtomicInteger i = cnts.get(entry.getKey());
 
             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/eviction/GridCacheEvictionLockUnlockSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionLockUnlockSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionLockUnlockSelfTest.java
index 929bf75..27cae19 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionLockUnlockSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionLockUnlockSelfTest.java
@@ -34,7 +34,7 @@ import java.util.concurrent.atomic.*;
 import static java.util.concurrent.TimeUnit.*;
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
 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.events.IgniteEventType.*;
 
 /**
@@ -66,7 +66,7 @@ public class GridCacheEvictionLockUnlockSelfTest extends GridCommonAbstractTest
         CacheConfiguration cc = defaultCacheConfiguration();
 
         cc.setCacheMode(mode);
-        cc.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC);
+        cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
         cc.setEvictionPolicy(new EvictionPolicy());
         cc.setNearEvictionPolicy(new EvictionPolicy());
         cc.setEvictNearSynchronized(false);
@@ -164,9 +164,9 @@ public class GridCacheEvictionLockUnlockSelfTest extends GridCommonAbstractTest
     }
 
     /** Eviction policy. */
-    private static class EvictionPolicy implements GridCacheEvictionPolicy<Object, Object> {
+    private static class EvictionPolicy implements CacheEvictionPolicy<Object, Object> {
         /** {@inheritDoc} */
-        @Override public void onEntryAccessed(boolean rmv, GridCacheEntry<Object, Object> entry) {
+        @Override public void onEntryAccessed(boolean rmv, CacheEntry<Object, Object> entry) {
             touchCnt.incrementAndGet();
 
             entry.evict();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java
index 65d4b61..ac8f141 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java
@@ -38,7 +38,7 @@ import java.util.*;
 import static org.apache.ignite.cache.CacheMode.*;
 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.*;
 
 /**
  *
@@ -48,7 +48,7 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest {
     private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
 
     /** */
-    private GridCacheEvictionPolicy<?, ?> plc;
+    private CacheEvictionPolicy<?, ?> plc;
 
     /** {@inheritDoc} */
     @SuppressWarnings("unchecked")
@@ -112,12 +112,12 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testPolicyConsistency() throws Exception {
-        plc = new GridCacheFifoEvictionPolicy<Object, Object>(500);
+        plc = new CacheFifoEvictionPolicy<Object, Object>(500);
 
         try {
             Ignite ignite = startGrid(1);
 
-            final GridCache<Integer, Integer> cache = ignite.cache(null);
+            final Cache<Integer, Integer> cache = ignite.cache(null);
 
             final Random rnd = new Random();
 
@@ -138,10 +138,10 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest {
                         info("Stats [iterCnt=" + i + ", size=" + cache.size() + ']');
                 }
 
-                GridCacheFifoEvictionPolicy<Integer, Integer> plc0 = (GridCacheFifoEvictionPolicy<Integer, Integer>) plc;
+                CacheFifoEvictionPolicy<Integer, Integer> plc0 = (CacheFifoEvictionPolicy<Integer, Integer>) plc;
 
                 if (!plc0.queue().isEmpty()) {
-                    for (GridCacheEntry<Integer, Integer> e : plc0.queue())
+                    for (CacheEntry<Integer, Integer> e : plc0.queue())
                         U.warn(log, "Policy queue item: " + e);
 
                     fail("Test failed, see logs for details.");
@@ -164,22 +164,22 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testEvictSingle() throws Exception {
-        plc = new GridCacheFifoEvictionPolicy<Object, Object>(500);
+        plc = new CacheFifoEvictionPolicy<Object, Object>(500);
 
         try {
             Ignite ignite = startGrid(1);
 
-            final GridCache<Integer, Integer> cache = ignite.cache(null);
+            final Cache<Integer, Integer> cache = ignite.cache(null);
 
             for (int i = 0; i < 100; i++)
                 cache.put(i, i);
 
-            assertEquals(100, ((GridCacheFifoEvictionPolicy)plc).queue().size());
+            assertEquals(100, ((CacheFifoEvictionPolicy)plc).queue().size());
 
             for (int i = 0; i < 100; i++)
                 cache.evict(i);
 
-            assertEquals(0, ((GridCacheFifoEvictionPolicy)plc).queue().size());
+            assertEquals(0, ((CacheFifoEvictionPolicy)plc).queue().size());
             assertEquals(0, cache.size());
         }
         finally {
@@ -191,12 +191,12 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testEvictAll() throws Exception {
-        plc = new GridCacheFifoEvictionPolicy<Object, Object>(500);
+        plc = new CacheFifoEvictionPolicy<Object, Object>(500);
 
         try {
             Ignite ignite = startGrid(1);
 
-            final GridCache<Integer, Integer> cache = ignite.cache(null);
+            final Cache<Integer, Integer> cache = ignite.cache(null);
 
             Collection<Integer> keys = new ArrayList<>(100);
 
@@ -206,11 +206,11 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest {
                 keys.add(i);
             }
 
-            assertEquals(100, ((GridCacheFifoEvictionPolicy)plc).queue().size());
+            assertEquals(100, ((CacheFifoEvictionPolicy)plc).queue().size());
 
             cache.evictAll(keys);
 
-            assertEquals(0, ((GridCacheFifoEvictionPolicy)plc).queue().size());
+            assertEquals(0, ((CacheFifoEvictionPolicy)plc).queue().size());
             assertEquals(0, cache.size());
         }
         finally {
@@ -222,20 +222,20 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testGroupLock() throws Exception {
-        plc = new GridCacheFifoEvictionPolicy<>(100);
+        plc = new CacheFifoEvictionPolicy<>(100);
 
         try {
             Ignite g = startGrid(1);
 
             Integer affKey = 1;
 
-            GridCache<GridCacheAffinityKey<Object>, Integer> cache = g.cache(null);
+            Cache<CacheAffinityKey<Object>, Integer> cache = g.cache(null);
 
             IgniteTx tx = cache.txStartAffinity(affKey, PESSIMISTIC, REPEATABLE_READ, 0, 5);
 
             try {
                 for (int i = 0; i < 5; i++)
-                    cache.put(new GridCacheAffinityKey<Object>(i, affKey), i);
+                    cache.put(new CacheAffinityKey<Object>(i, affKey), i);
 
                 tx.commit();
             }
@@ -243,13 +243,13 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest {
                 tx.close();
             }
 
-            assertEquals(5, ((GridCacheFifoEvictionPolicy)plc).queue().size());
+            assertEquals(5, ((CacheFifoEvictionPolicy)plc).queue().size());
 
             tx = cache.txStartAffinity(affKey, PESSIMISTIC, REPEATABLE_READ, 0, 5);
 
             try {
                 for (int i = 0; i < 5; i++)
-                    cache.remove(new GridCacheAffinityKey<Object>(i, affKey));
+                    cache.remove(new CacheAffinityKey<Object>(i, affKey));
 
                 tx.commit();
             }
@@ -257,7 +257,7 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest {
                 tx.close();
             }
 
-            assertEquals(0, ((GridCacheFifoEvictionPolicy)plc).queue().size());
+            assertEquals(0, ((CacheFifoEvictionPolicy)plc).queue().size());
         }
         finally {
             stopAllGrids();
@@ -268,21 +268,21 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testPartitionGroupLock() throws Exception {
-        plc = new GridCacheFifoEvictionPolicy<>(100);
+        plc = new CacheFifoEvictionPolicy<>(100);
 
         try {
             Ignite g = startGrid(1);
 
             Integer affKey = 1;
 
-            GridCache<Object, Integer> cache = g.cache(null);
+            Cache<Object, Integer> cache = g.cache(null);
 
             IgniteTx tx = cache.txStartPartition(cache.affinity().partition(affKey), PESSIMISTIC, REPEATABLE_READ,
                 0, 5);
 
             try {
                 for (int i = 0; i < 5; i++)
-                    cache.put(new GridCacheAffinityKey<Object>(i, affKey), i);
+                    cache.put(new CacheAffinityKey<Object>(i, affKey), i);
 
                 tx.commit();
             }
@@ -290,13 +290,13 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest {
                 tx.close();
             }
 
-            assertEquals(5, ((GridCacheFifoEvictionPolicy)plc).queue().size());
+            assertEquals(5, ((CacheFifoEvictionPolicy)plc).queue().size());
 
             tx = cache.txStartPartition(cache.affinity().partition(affKey), PESSIMISTIC, REPEATABLE_READ, 0, 5);
 
             try {
                 for (int i = 0; i < 5; i++)
-                    cache.remove(new GridCacheAffinityKey<Object>(i, affKey));
+                    cache.remove(new CacheAffinityKey<Object>(i, affKey));
 
                 tx.commit();
             }
@@ -304,7 +304,7 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest {
                 tx.close();
             }
 
-            assertEquals(0, ((GridCacheFifoEvictionPolicy)plc).queue().size());
+            assertEquals(0, ((CacheFifoEvictionPolicy)plc).queue().size());
         }
         finally {
             stopAllGrids();
@@ -315,19 +315,19 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testReload() throws Exception {
-        plc = new GridCacheFifoEvictionPolicy<Object, Object>(100);
+        plc = new CacheFifoEvictionPolicy<Object, Object>(100);
 
         try {
             Ignite ignite = startGrid(1);
 
-            final GridCache<Integer, Integer> cache = ignite.cache(null);
+            final Cache<Integer, Integer> cache = ignite.cache(null);
 
             for (int i = 0; i < 10000; i++)
                 cache.reload(i);
 
             assertEquals(100, cache.size());
             assertEquals(100, cache.size());
-            assertEquals(100, ((GridCacheFifoEvictionPolicy)plc).queue().size());
+            assertEquals(100, ((CacheFifoEvictionPolicy)plc).queue().size());
 
             Collection<Integer> keys = new ArrayList<>(10000);
 
@@ -338,7 +338,7 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest {
 
             assertEquals(100, cache.size());
             assertEquals(100, cache.size());
-            assertEquals(100, ((GridCacheFifoEvictionPolicy)plc).queue().size());
+            assertEquals(100, ((CacheFifoEvictionPolicy)plc).queue().size());
         }
         finally {
             stopAllGrids();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheMockEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheMockEntry.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheMockEntry.java
index 372feab..171573b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheMockEntry.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheMockEntry.java
@@ -31,7 +31,7 @@ import java.util.*;
 /**
  * Mock cache entry.
  */
-public class GridCacheMockEntry<K, V> extends GridMetadataAwareAdapter implements GridCacheEntry<K, V> {
+public class GridCacheMockEntry<K, V> extends GridMetadataAwareAdapter implements CacheEntry<K, V> {
     /** */
     @GridToStringInclude
     private K key;
@@ -158,14 +158,14 @@ public class GridCacheMockEntry<K, V> extends GridMetadataAwareAdapter implement
 
     /** {@inheritDoc} */
     @Nullable @Override public V set(V val,
-        @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException {
+        @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException {
         // No-op.
         return null;
     }
 
     /** {@inheritDoc} */
     @Nullable @Override public IgniteFuture<V> setAsync(V val,
-        @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) {
+        @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) {
         // No-op.
         return null;
     }
@@ -184,14 +184,14 @@ public class GridCacheMockEntry<K, V> extends GridMetadataAwareAdapter implement
 
     /** {@inheritDoc} */
     @Override public boolean setx(V val,
-        @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException {
+        @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException {
         // No-op.
         return false;
     }
 
     /** {@inheritDoc} */
     @Nullable @Override public IgniteFuture<Boolean> setxAsync(V val,
-        @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) {
+        @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) {
         // No-op.
         return null;
     }
@@ -246,27 +246,27 @@ public class GridCacheMockEntry<K, V> extends GridMetadataAwareAdapter implement
 
     /** {@inheritDoc} */
     @Nullable @Override public V remove(
-        @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException {
+        @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException {
         // No-op.
         return null;
     }
 
     /** {@inheritDoc} */
     @Nullable @Override public IgniteFuture<V> removeAsync(
-        @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) {
+        @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) {
         // No-op.
         return null;
     }
 
     /** {@inheritDoc} */
-    @Override public boolean removex(@Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException {
+    @Override public boolean removex(@Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException {
         // No-op.
         return false;
     }
 
     /** {@inheritDoc} */
     @Nullable @Override public IgniteFuture<Boolean> removexAsync(
-        @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) {
+        @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) {
         // No-op.
         return null;
     }
@@ -290,18 +290,18 @@ public class GridCacheMockEntry<K, V> extends GridMetadataAwareAdapter implement
 
     /** {@inheritDoc} */
     @Override public boolean lock(long timeout,
-        @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException {
+        @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException {
         return false;
     }
 
     /** {@inheritDoc} */
     @Override public IgniteFuture<Boolean> lockAsync(long timeout,
-        @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) {
+        @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) {
         return new GridFinishedFuture<>(null, false);
     }
 
     /** {@inheritDoc} */
-    @Override public void unlock(IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException {
+    @Override public void unlock(IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException {
         // No-op.
     }
 
@@ -316,7 +316,7 @@ public class GridCacheMockEntry<K, V> extends GridMetadataAwareAdapter implement
     }
 
     /** {@inheritDoc} */
-    @Override public GridCacheProjection<K, V> projection() {
+    @Override public CacheProjection<K, V> projection() {
         return null;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheSynchronousEvictionsFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheSynchronousEvictionsFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheSynchronousEvictionsFailoverSelfTest.java
index 8c4ba45..2e1b97f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheSynchronousEvictionsFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheSynchronousEvictionsFailoverSelfTest.java
@@ -31,7 +31,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 
-import static org.apache.ignite.cache.GridCacheDistributionMode.*;
+import static org.apache.ignite.cache.CacheDistributionMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
 
 /**
@@ -49,7 +49,7 @@ public class GridCacheSynchronousEvictionsFailoverSelfTest extends GridCacheAbst
     }
 
     /** {@inheritDoc} */
-    @Override protected GridCacheDistributionMode distributionMode() {
+    @Override protected CacheDistributionMode distributionMode() {
         return PARTITIONED_ONLY;
     }
 
@@ -63,7 +63,7 @@ public class GridCacheSynchronousEvictionsFailoverSelfTest extends GridCacheAbst
 
         ccfg.setBackups(2);
 
-        ccfg.setAffinity(new GridCacheConsistentHashAffinityFunction(false, 500));
+        ccfg.setAffinity(new CacheConsistentHashAffinityFunction(false, 500));
 
         return ccfg;
     }
@@ -77,7 +77,7 @@ public class GridCacheSynchronousEvictionsFailoverSelfTest extends GridCacheAbst
      * @throws Exception If failed.
      */
     public void testSynchronousEvictions() throws Exception {
-        GridCache<String, Integer> cache = cache(0);
+        Cache<String, Integer> cache = cache(0);
 
         final AtomicBoolean stop = new AtomicBoolean();
 
@@ -139,7 +139,7 @@ public class GridCacheSynchronousEvictionsFailoverSelfTest extends GridCacheAbst
      * @param node Primary node for keys.
      * @param data Map where keys/values should be put to.
      */
-    private void addKeysForNode(GridCacheAffinity<String> aff, ClusterNode node, Map<String, Integer> data) {
+    private void addKeysForNode(CacheAffinity<String> aff, ClusterNode node, Map<String, Integer> data) {
         int cntr = 0;
 
         for (int i = 0; i < 100_000; i++) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/fifo/GridCacheFifoEvictionPolicySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/fifo/GridCacheFifoEvictionPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/fifo/GridCacheFifoEvictionPolicySelfTest.java
index 56c125d..b6d9560 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/fifo/GridCacheFifoEvictionPolicySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/fifo/GridCacheFifoEvictionPolicySelfTest.java
@@ -31,7 +31,7 @@ import static org.apache.ignite.cache.CacheMode.*;
  */
 @SuppressWarnings({"TypeMayBeWeakened"})
 public class GridCacheFifoEvictionPolicySelfTest extends
-    GridCacheEvictionAbstractTest<GridCacheFifoEvictionPolicy<String, String>> {
+    GridCacheEvictionAbstractTest<CacheFifoEvictionPolicy<String, String>> {
     /**
      * @throws Exception If failed.
      */
@@ -45,7 +45,7 @@ public class GridCacheFifoEvictionPolicySelfTest extends
             MockEntry e4 = new MockEntry("4", "4");
             MockEntry e5 = new MockEntry("5", "5");
 
-            GridCacheFifoEvictionPolicy<String, String> p = policy();
+            CacheFifoEvictionPolicy<String, String> p = policy();
 
             p.setMaxSize(3);
 
@@ -163,7 +163,7 @@ public class GridCacheFifoEvictionPolicySelfTest extends
         try {
             startGrid();
 
-            GridCacheFifoEvictionPolicy<String, String> p = policy();
+            CacheFifoEvictionPolicy<String, String> p = policy();
 
             int max = 10;
 
@@ -190,7 +190,7 @@ public class GridCacheFifoEvictionPolicySelfTest extends
         try {
             startGrid();
 
-            GridCacheFifoEvictionPolicy<String, String> p = policy();
+            CacheFifoEvictionPolicy<String, String> p = policy();
 
             int max = 10;
 
@@ -254,7 +254,7 @@ public class GridCacheFifoEvictionPolicySelfTest extends
 
             e5.setValue("val");
 
-            GridCacheFifoEvictionPolicy<String, String> p = policy();
+            CacheFifoEvictionPolicy<String, String> p = policy();
 
             p.setMaxSize(10);
 
@@ -300,7 +300,7 @@ public class GridCacheFifoEvictionPolicySelfTest extends
         Ignite ignite = startGrid();
 
         try {
-            GridCache<Integer, Integer> cache = ignite.cache(null);
+            Cache<Integer, Integer> cache = ignite.cache(null);
 
             int cnt = 500;
 
@@ -356,19 +356,19 @@ public class GridCacheFifoEvictionPolicySelfTest extends
     }
 
     /** {@inheritDoc} */
-    @Override protected GridCacheFifoEvictionPolicy<String, String> createPolicy(int plcMax) {
-        return new GridCacheFifoEvictionPolicy<>(plcMax);
+    @Override protected CacheFifoEvictionPolicy<String, String> createPolicy(int plcMax) {
+        return new CacheFifoEvictionPolicy<>(plcMax);
     }
 
     /** {@inheritDoc} */
-    @Override protected GridCacheFifoEvictionPolicy<String, String> createNearPolicy(int nearMax) {
-        return new GridCacheFifoEvictionPolicy<>(nearMax);
+    @Override protected CacheFifoEvictionPolicy<String, String> createNearPolicy(int nearMax) {
+        return new CacheFifoEvictionPolicy<>(nearMax);
     }
 
     /** {@inheritDoc} */
     @Override protected void checkNearPolicies(int endNearPlcSize) {
         for (int i = 0; i < gridCnt; i++)
-            for (GridCacheEntry<String, String> e : nearPolicy(i).queue())
+            for (CacheEntry<String, String> e : nearPolicy(i).queue())
                 assert !e.isCached() : "Invalid near policy size: " + nearPolicy(i).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/lru/GridCacheLruEvictionPolicySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruEvictionPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruEvictionPolicySelfTest.java
index 690a226..dbbed6c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruEvictionPolicySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruEvictionPolicySelfTest.java
@@ -29,7 +29,7 @@ import java.util.*;
  */
 @SuppressWarnings( {"TypeMayBeWeakened"})
 public class GridCacheLruEvictionPolicySelfTest extends
-    GridCacheEvictionAbstractTest<GridCacheLruEvictionPolicy<String, String>> {
+    GridCacheEvictionAbstractTest<CacheLruEvictionPolicy<String, String>> {
     /**
      * @throws Exception If failed.
      */
@@ -43,7 +43,7 @@ public class GridCacheLruEvictionPolicySelfTest extends
             MockEntry e4 = new MockEntry("4", "4");
             MockEntry e5 = new MockEntry("5", "5");
 
-            GridCacheLruEvictionPolicy<String, String> p = policy();
+            CacheLruEvictionPolicy<String, String> p = policy();
 
             p.setMaxSize(3);
 
@@ -163,7 +163,7 @@ public class GridCacheLruEvictionPolicySelfTest extends
         startGrid();
 
         try {
-            GridCacheLruEvictionPolicy<String, String> p = policy();
+            CacheLruEvictionPolicy<String, String> p = policy();
 
             int max = 10;
 
@@ -190,7 +190,7 @@ public class GridCacheLruEvictionPolicySelfTest extends
         startGrid();
 
         try {
-            GridCacheLruEvictionPolicy<String, String> p = policy();
+            CacheLruEvictionPolicy<String, String> p = policy();
 
             int max = 8;
 
@@ -239,7 +239,7 @@ public class GridCacheLruEvictionPolicySelfTest extends
         startGrid();
 
         try {
-            GridCacheLruEvictionPolicy<String, String> p = policy();
+            CacheLruEvictionPolicy<String, String> p = policy();
 
             int max = 10;
 
@@ -301,7 +301,7 @@ public class GridCacheLruEvictionPolicySelfTest extends
 
             e5.setValue("val");
 
-            GridCacheLruEvictionPolicy<String, String> p = policy();
+            CacheLruEvictionPolicy<String, String> p = policy();
 
             p.setMaxSize(10);
 
@@ -347,7 +347,7 @@ public class GridCacheLruEvictionPolicySelfTest extends
         Ignite ignite = startGrid();
 
         try {
-            GridCache<Integer, Integer> cache = ignite.cache(null);
+            Cache<Integer, Integer> cache = ignite.cache(null);
 
             int cnt = 500;
 
@@ -403,18 +403,18 @@ public class GridCacheLruEvictionPolicySelfTest extends
     }
 
     /** {@inheritDoc} */
-    @Override protected GridCacheLruEvictionPolicy<String, String> createPolicy(int plcMax) {
-        return new GridCacheLruEvictionPolicy<>(plcMax);
+    @Override protected CacheLruEvictionPolicy<String, String> createPolicy(int plcMax) {
+        return new CacheLruEvictionPolicy<>(plcMax);
     }
 
-    @Override protected GridCacheLruEvictionPolicy<String, String> createNearPolicy(int nearMax) {
-        return new GridCacheLruEvictionPolicy<>(nearMax);
+    @Override protected CacheLruEvictionPolicy<String, String> createNearPolicy(int nearMax) {
+        return new CacheLruEvictionPolicy<>(nearMax);
     }
 
     /** {@inheritDoc} */
     @Override protected void checkNearPolicies(int endNearPlcSize) {
         for (int i = 0; i < gridCnt; i++)
-            for (GridCacheEntry<String, String> e : nearPolicy(i).queue())
+            for (CacheEntry<String, String> e : nearPolicy(i).queue())
                 assert !e.isCached() : "Invalid near policy size: " + nearPolicy(i).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/lru/GridCacheLruNearEvictionPolicySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java
index d34e3d6..3fae32e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java
@@ -29,10 +29,10 @@ import org.apache.ignite.testframework.junits.common.*;
 import java.util.*;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
-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.*;
 
 /**
  * LRU near eviction tests (GG-8884).
@@ -61,7 +61,7 @@ public class GridCacheLruNearEvictionPolicySelfTest extends GridCommonAbstractTe
         cc.setWriteSynchronizationMode(PRIMARY_SYNC);
         cc.setDistributionMode(NEAR_PARTITIONED);
         cc.setPreloadMode(SYNC);
-        cc.setNearEvictionPolicy(new GridCacheLruEvictionPolicy(EVICTION_MAX_SIZE));
+        cc.setNearEvictionPolicy(new CacheLruEvictionPolicy(EVICTION_MAX_SIZE));
         cc.setStartSize(100);
         cc.setQueryIndexEnabled(true);
         cc.setBackups(0);
@@ -120,7 +120,7 @@ public class GridCacheLruNearEvictionPolicySelfTest extends GridCommonAbstractTe
             info("Getting " + cnt + " keys from cache.");
 
             for (int i = 0; i < cnt; i++) {
-                GridCache<Integer, String> cache = grid(rand.nextInt(GRID_COUNT)).cache(null);
+                Cache<Integer, String> cache = grid(rand.nextInt(GRID_COUNT)).cache(null);
 
                 assertTrue(cache.get(i).equals(Integer.toString(i)));
             }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java
index 3321267..a71e163 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java
@@ -27,10 +27,10 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
 import org.apache.ignite.testframework.junits.common.*;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
-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.*;
 
 /**
  * LRU near eviction tests for NEAR_ONLY distribution mode (GG-8884).
@@ -72,7 +72,7 @@ public class GridCacheNearOnlyLruNearEvictionPolicySelfTest extends GridCommonAb
         cc.setWriteSynchronizationMode(PRIMARY_SYNC);
         cc.setDistributionMode(cnt == 0 ? NEAR_ONLY : PARTITIONED_ONLY);
         cc.setPreloadMode(SYNC);
-        cc.setNearEvictionPolicy(new GridCacheLruEvictionPolicy(EVICTION_MAX_SIZE));
+        cc.setNearEvictionPolicy(new CacheLruEvictionPolicy(EVICTION_MAX_SIZE));
         cc.setStartSize(100);
         cc.setQueryIndexEnabled(true);
         cc.setBackups(0);
@@ -152,7 +152,7 @@ public class GridCacheNearOnlyLruNearEvictionPolicySelfTest extends GridCommonAb
             info("Getting " + cnt + " keys from cache.");
 
             for (int i = 0; i < cnt; i++) {
-                GridCache<Integer, String> cache = grid(0).cache(null);
+                Cache<Integer, String> cache = grid(0).cache(null);
 
                 assertTrue(cache.get(i).equals(Integer.toString(i)));
             }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/random/GridCacheRandomEvictionPolicySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/random/GridCacheRandomEvictionPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/random/GridCacheRandomEvictionPolicySelfTest.java
index 3764260..46f930f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/random/GridCacheRandomEvictionPolicySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/random/GridCacheRandomEvictionPolicySelfTest.java
@@ -30,7 +30,7 @@ import java.util.concurrent.*;
  * Random eviction policy test.
  */
 public class GridCacheRandomEvictionPolicySelfTest extends
-    GridCacheEvictionAbstractTest<GridCacheRandomEvictionPolicy<String, String>> {
+    GridCacheEvictionAbstractTest<CacheRandomEvictionPolicy<String, String>> {
     /**
      * @throws Exception If failed.
      */
@@ -109,7 +109,7 @@ public class GridCacheRandomEvictionPolicySelfTest extends
         try {
             startGrid();
 
-            GridCache<String, String> c = cache();
+            Cache<String, String> c = cache();
 
             MockEntry e1 = new MockEntry("1", c);
 
@@ -127,7 +127,7 @@ public class GridCacheRandomEvictionPolicySelfTest extends
 
             e5.setValue("val");
 
-            GridCacheRandomEvictionPolicy<String, String> p = policy();
+            CacheRandomEvictionPolicy<String, String> p = policy();
 
             p.setMaxSize(10);
 
@@ -244,13 +244,13 @@ public class GridCacheRandomEvictionPolicySelfTest extends
     }
 
     /** {@inheritDoc} */
-    @Override protected GridCacheRandomEvictionPolicy<String, String> createPolicy(int plcMax) {
-        return new GridCacheRandomEvictionPolicy<>(plcMax);
+    @Override protected CacheRandomEvictionPolicy<String, String> createPolicy(int plcMax) {
+        return new CacheRandomEvictionPolicy<>(plcMax);
     }
 
     /** {@inheritDoc} */
-    @Override protected GridCacheRandomEvictionPolicy<String, String> createNearPolicy(int nearMax) {
-        return new GridCacheRandomEvictionPolicy<>(plcMax);
+    @Override protected CacheRandomEvictionPolicy<String, String> createNearPolicy(int nearMax) {
+        return new CacheRandomEvictionPolicy<>(plcMax);
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicExpiryPolicyTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicExpiryPolicyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicExpiryPolicyTest.java
index d35a1bc..d097062 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicExpiryPolicyTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicExpiryPolicyTest.java
@@ -21,7 +21,7 @@ import org.apache.ignite.cache.*;
 
 import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*;
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.GridCacheDistributionMode.*;
+import static org.apache.ignite.cache.CacheDistributionMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
 
 /**
@@ -49,7 +49,7 @@ public class IgniteCacheAtomicExpiryPolicyTest extends IgniteCacheExpiryPolicyAb
     }
 
     /** {@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/expiry/IgniteCacheAtomicLocalExpiryPolicyTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicLocalExpiryPolicyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicLocalExpiryPolicyTest.java
index 883e6c2..adaae89 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicLocalExpiryPolicyTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicLocalExpiryPolicyTest.java
@@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache.expiry;
 import org.apache.ignite.cache.*;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.GridCacheDistributionMode.*;
+import static org.apache.ignite.cache.CacheDistributionMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
 
 /**
@@ -43,7 +43,7 @@ public class IgniteCacheAtomicLocalExpiryPolicyTest extends IgniteCacheExpiryPol
     }
 
     /** {@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/expiry/IgniteCacheExpiryPolicyAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
index 3852460..f12bb5a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
@@ -38,7 +38,7 @@ import static org.apache.ignite.transactions.IgniteTxConcurrency.*;
 import static org.apache.ignite.transactions.IgniteTxIsolation.*;
 import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*;
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.GridCacheDistributionMode.*;
+import static org.apache.ignite.cache.CacheDistributionMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
 
 /**
@@ -760,7 +760,7 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs
      * @throws Exception If failed.
      */
     private Collection<Integer> keys() throws Exception {
-        GridCache<Integer, Object> cache = cache(0);
+        Cache<Integer, Object> cache = cache(0);
 
         ArrayList<Integer> keys = new ArrayList<>();
 
@@ -809,7 +809,7 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs
             }
         }, 3000);
 
-        GridCache<Integer, Object> cache = cache(0);
+        Cache<Integer, Object> cache = cache(0);
 
         for (int i = 0; i < gridCount(); i++) {
             ClusterNode node = grid(i).cluster().localNode();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheTxExpiryPolicyTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheTxExpiryPolicyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheTxExpiryPolicyTest.java
index 4524064..3f68666 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheTxExpiryPolicyTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheTxExpiryPolicyTest.java
@@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache.expiry;
 import org.apache.ignite.cache.*;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.GridCacheDistributionMode.*;
+import static org.apache.ignite.cache.CacheDistributionMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
 
 /**
@@ -43,7 +43,7 @@ public class IgniteCacheTxExpiryPolicyTest extends IgniteCacheExpiryPolicyAbstra
     }
 
     /** {@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/expiry/IgniteCacheTxLocalExpiryPolicyTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheTxLocalExpiryPolicyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheTxLocalExpiryPolicyTest.java
index ccaf809..628f6ae 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheTxLocalExpiryPolicyTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheTxLocalExpiryPolicyTest.java
@@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache.expiry;
 import org.apache.ignite.cache.*;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.GridCacheDistributionMode.*;
+import static org.apache.ignite.cache.CacheDistributionMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
 
 /**
@@ -43,7 +43,7 @@ public class IgniteCacheTxLocalExpiryPolicyTest extends IgniteCacheExpiryPolicyA
     }
 
     /** {@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/integration/IgniteCacheAtomicLoadAllTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLoadAllTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLoadAllTest.java
index 608308b..6934aa4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLoadAllTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLoadAllTest.java
@@ -21,7 +21,7 @@ import org.apache.ignite.cache.*;
 
 import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*;
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.GridCacheDistributionMode.*;
+import static org.apache.ignite.cache.CacheDistributionMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
 
 /**
@@ -44,7 +44,7 @@ public class IgniteCacheAtomicLoadAllTest extends IgniteCacheLoadAllAbstractTest
     }
 
     /** {@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/integration/IgniteCacheAtomicLoaderWriterTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLoaderWriterTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLoaderWriterTest.java
index 88fd929..a2cb517 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLoaderWriterTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLoaderWriterTest.java
@@ -21,7 +21,7 @@ import org.apache.ignite.cache.*;
 
 import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*;
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.GridCacheDistributionMode.*;
+import static org.apache.ignite.cache.CacheDistributionMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
 
 /**
@@ -49,7 +49,7 @@ public class IgniteCacheAtomicLoaderWriterTest extends IgniteCacheLoaderWriterAb
     }
 
     /** {@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/integration/IgniteCacheAtomicLocalLoadAllTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLocalLoadAllTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLocalLoadAllTest.java
index d2302af..5b28ee9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLocalLoadAllTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLocalLoadAllTest.java
@@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache.integration;
 import org.apache.ignite.cache.*;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.GridCacheDistributionMode.*;
+import static org.apache.ignite.cache.CacheDistributionMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
 
 /**
@@ -43,7 +43,7 @@ public class IgniteCacheAtomicLocalLoadAllTest extends IgniteCacheLoadAllAbstrac
     }
 
     /** {@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/integration/IgniteCacheAtomicLocalNoLoadPreviousValueTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLocalNoLoadPreviousValueTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLocalNoLoadPreviousValueTest.java
index b0806f1..f54da3c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLocalNoLoadPreviousValueTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLocalNoLoadPreviousValueTest.java
@@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache.integration;
 import org.apache.ignite.cache.*;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.GridCacheDistributionMode.*;
+import static org.apache.ignite.cache.CacheDistributionMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
 
 /**
@@ -43,7 +43,7 @@ public class IgniteCacheAtomicLocalNoLoadPreviousValueTest extends IgniteCacheNo
     }
 
     /** {@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/integration/IgniteCacheAtomicLocalNoReadThroughTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLocalNoReadThroughTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLocalNoReadThroughTest.java
index 84c74ff..bc1e783 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLocalNoReadThroughTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLocalNoReadThroughTest.java
@@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache.integration;
 import org.apache.ignite.cache.*;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.GridCacheDistributionMode.*;
+import static org.apache.ignite.cache.CacheDistributionMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
 
 /**
@@ -43,7 +43,7 @@ public class IgniteCacheAtomicLocalNoReadThroughTest extends IgniteCacheNoReadTh
     }
 
     /** {@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/integration/IgniteCacheAtomicLocalNoWriteThroughTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLocalNoWriteThroughTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLocalNoWriteThroughTest.java
index 34bef7d..4af899e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLocalNoWriteThroughTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLocalNoWriteThroughTest.java
@@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache.integration;
 import org.apache.ignite.cache.*;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.GridCacheDistributionMode.*;
+import static org.apache.ignite.cache.CacheDistributionMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
 
 /**
@@ -43,7 +43,7 @@ public class IgniteCacheAtomicLocalNoWriteThroughTest extends IgniteCacheNoWrite
     }
 
     /** {@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/integration/IgniteCacheAtomicNearEnabledNoLoadPreviousValueTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNearEnabledNoLoadPreviousValueTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNearEnabledNoLoadPreviousValueTest.java
index 768cd72..8984a4a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNearEnabledNoLoadPreviousValueTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNearEnabledNoLoadPreviousValueTest.java
@@ -19,14 +19,14 @@ package org.apache.ignite.internal.processors.cache.integration;
 
 import org.apache.ignite.cache.*;
 
-import static org.apache.ignite.cache.GridCacheDistributionMode.*;
+import static org.apache.ignite.cache.CacheDistributionMode.*;
 
 /**
  *
  */
 public class IgniteCacheAtomicNearEnabledNoLoadPreviousValueTest extends IgniteCacheAtomicNoLoadPreviousValueTest {
     /** {@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/integration/IgniteCacheAtomicNearEnabledNoReadThroughTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNearEnabledNoReadThroughTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNearEnabledNoReadThroughTest.java
index ae6f9bd..8beb5f4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNearEnabledNoReadThroughTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNearEnabledNoReadThroughTest.java
@@ -19,14 +19,14 @@ package org.apache.ignite.internal.processors.cache.integration;
 
 import org.apache.ignite.cache.*;
 
-import static org.apache.ignite.cache.GridCacheDistributionMode.*;
+import static org.apache.ignite.cache.CacheDistributionMode.*;
 
 /**
  *
  */
 public class IgniteCacheAtomicNearEnabledNoReadThroughTest extends IgniteCacheAtomicNoReadThroughTest {
     /** {@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/integration/IgniteCacheAtomicNearEnabledNoWriteThroughTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNearEnabledNoWriteThroughTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNearEnabledNoWriteThroughTest.java
index 2922c37..524107d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNearEnabledNoWriteThroughTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNearEnabledNoWriteThroughTest.java
@@ -19,14 +19,14 @@ package org.apache.ignite.internal.processors.cache.integration;
 
 import org.apache.ignite.cache.*;
 
-import static org.apache.ignite.cache.GridCacheDistributionMode.*;
+import static org.apache.ignite.cache.CacheDistributionMode.*;
 
 /**
  *
  */
 public class IgniteCacheAtomicNearEnabledNoWriteThroughTest extends IgniteCacheAtomicNoWriteThroughTest {
     /** {@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/integration/IgniteCacheAtomicNoLoadPreviousValueTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNoLoadPreviousValueTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNoLoadPreviousValueTest.java
index 429348d..398d73f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNoLoadPreviousValueTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNoLoadPreviousValueTest.java
@@ -21,7 +21,7 @@ import org.apache.ignite.cache.*;
 
 import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*;
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.GridCacheDistributionMode.*;
+import static org.apache.ignite.cache.CacheDistributionMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
 
 /**
@@ -44,7 +44,7 @@ public class IgniteCacheAtomicNoLoadPreviousValueTest extends IgniteCacheNoLoadP
     }
 
     /** {@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/integration/IgniteCacheAtomicNoReadThroughTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNoReadThroughTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNoReadThroughTest.java
index fc05c33..3d9992c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNoReadThroughTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNoReadThroughTest.java
@@ -21,7 +21,7 @@ import org.apache.ignite.cache.*;
 
 import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*;
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.GridCacheDistributionMode.*;
+import static org.apache.ignite.cache.CacheDistributionMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
 
 /**
@@ -44,7 +44,7 @@ public class IgniteCacheAtomicNoReadThroughTest extends IgniteCacheNoReadThrough
     }
 
     /** {@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/integration/IgniteCacheAtomicNoWriteThroughTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNoWriteThroughTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNoWriteThroughTest.java
index ba25849..092be79 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNoWriteThroughTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNoWriteThroughTest.java
@@ -21,7 +21,7 @@ import org.apache.ignite.cache.*;
 
 import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*;
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.GridCacheDistributionMode.*;
+import static org.apache.ignite.cache.CacheDistributionMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
 
 /**
@@ -44,7 +44,7 @@ public class IgniteCacheAtomicNoWriteThroughTest extends IgniteCacheNoWriteThrou
     }
 
     /** {@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/integration/IgniteCacheAtomicStoreSessionTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicStoreSessionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicStoreSessionTest.java
index 03af75f..bc4e405 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicStoreSessionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicStoreSessionTest.java
@@ -21,7 +21,7 @@ import org.apache.ignite.cache.*;
 
 import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*;
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.GridCacheDistributionMode.*;
+import static org.apache.ignite.cache.CacheDistributionMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
 
 /**
@@ -44,7 +44,7 @@ public class IgniteCacheAtomicStoreSessionTest extends IgniteCacheStoreSessionAb
     }
 
     /** {@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/integration/IgniteCacheLoadAllAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheLoadAllAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheLoadAllAbstractTest.java
index 24814cd..435b488 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheLoadAllAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheLoadAllAbstractTest.java
@@ -203,7 +203,7 @@ public abstract class IgniteCacheLoadAllAbstractTest extends IgniteCacheAbstract
      * @param expVals Expected values.
      */
     private void checkValues(int keys, Map<Integer, String> expVals) {
-        GridCacheAffinity<Object> aff = cache(0).affinity();
+        CacheAffinity<Object> aff = cache(0).affinity();
 
         for (int i = 0; i < gridCount(); i++) {
             ClusterNode node = ignite(i).cluster().localNode();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoLoadPreviousValueAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoLoadPreviousValueAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoLoadPreviousValueAbstractTest.java
index 5beb191..a2fd5a1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoLoadPreviousValueAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoLoadPreviousValueAbstractTest.java
@@ -191,7 +191,7 @@ public abstract class IgniteCacheNoLoadPreviousValueAbstractTest extends IgniteC
      * @throws Exception If failed.
      */
     protected Collection<Integer> keys() throws Exception {
-        GridCache<Integer, Object> cache = cache(0);
+        Cache<Integer, Object> cache = cache(0);
 
         ArrayList<Integer> keys = new ArrayList<>();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoReadThroughAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoReadThroughAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoReadThroughAbstractTest.java
index 02fecb8..400e60d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoReadThroughAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoReadThroughAbstractTest.java
@@ -301,7 +301,7 @@ public abstract class IgniteCacheNoReadThroughAbstractTest extends IgniteCacheAb
      * @throws Exception If failed.
      */
     protected Collection<Integer> keys() throws Exception {
-        GridCache<Integer, Object> cache = cache(0);
+        Cache<Integer, Object> cache = cache(0);
 
         ArrayList<Integer> keys = new ArrayList<>();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoWriteThroughAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoWriteThroughAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoWriteThroughAbstractTest.java
index 96d1e3f..93fdb9d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoWriteThroughAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoWriteThroughAbstractTest.java
@@ -325,7 +325,7 @@ public abstract class IgniteCacheNoWriteThroughAbstractTest extends IgniteCacheA
      * @throws Exception If failed.
      */
     protected Collection<Integer> keys() throws Exception {
-        GridCache<Integer, Object> cache = cache(0);
+        Cache<Integer, Object> cache = cache(0);
 
         ArrayList<Integer> keys = new ArrayList<>();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLoadAllTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLoadAllTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLoadAllTest.java
index 602aea0..f084520 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLoadAllTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLoadAllTest.java
@@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache.integration;
 import org.apache.ignite.cache.*;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.GridCacheDistributionMode.*;
+import static org.apache.ignite.cache.CacheDistributionMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
 
 /**
@@ -43,7 +43,7 @@ public class IgniteCacheTxLoadAllTest extends IgniteCacheLoadAllAbstractTest {
     }
 
     /** {@inheritDoc} */
-    @Override protected GridCacheDistributionMode distributionMode() {
+    @Override protected CacheDistributionMode distributionMode() {
         return PARTITIONED_ONLY;
     }
 }


Mime
View raw message