ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [15/50] [abbrv] incubator-ignite git commit: IGNITE-575 - Renaimings
Date Wed, 25 Mar 2015 12:06:01 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java
index ae25908..89fb561 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java
@@ -119,7 +119,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst
      * @param cache Cache.
      * @return Affinity.
      */
-    private static CacheAffinity<String> affinity(GridCache<String, Integer> cache) {
+    private static Affinity<String> affinity(GridCache<String, Integer> cache) {
         return cache.affinity();
     }
 
@@ -240,7 +240,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst
         X.println("*** Retries: " + RETRIES);
         X.println("*** Log frequency: " + LOG_FREQ);
 
-        CacheAffinity<String> aff = affinity(grid(0).<String, Integer>cache(null));
+        Affinity<String> aff = affinity(grid(0).<String, Integer>cache(null));
 
         Collection<ClusterNode> affNodes = aff.mapKeyToPrimaryAndBackups(CNTR_KEY);
 
@@ -542,7 +542,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst
      * @throws Exception If failed.
      */
     private void checkNearAndPrimaryMultiNode(int gridCnt) throws Exception {
-        CacheAffinity<String> aff = affinity(grid(0).<String, Integer>cache(null));
+        Affinity<String> aff = affinity(grid(0).<String, Integer>cache(null));
 
         Collection<ClusterNode> affNodes = aff.mapKeyToPrimaryAndBackups(CNTR_KEY);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java
index efd2f45..2502942 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java
@@ -239,7 +239,7 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti
 
             Integer nearPeekVal = nearEnabled ? 1 : null;
 
-            CacheAffinity<Object> aff = ignite(i).affinity(null);
+            Affinity<Object> aff = ignite(i).affinity(null);
 
             info("Affinity nodes [nodes=" + F.nodeIds(aff.mapKeyToPrimaryAndBackups("key")) +
                 ", locNode=" + ignite(i).cluster().localNode().id() + ']');
@@ -376,7 +376,7 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti
         Object key = new Object() {
             /** */
             @SuppressWarnings("UnusedDeclaration")
-            @CacheAffinityKeyMapped
+            @AffinityKeyMapped
             private final Object key0 = affKey;
 
             @Override public boolean equals(Object obj) {
@@ -394,7 +394,7 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti
 
         info("Cache affinity nodes: " + affinity(cache).mapKeyToPrimaryAndBackups(key));
 
-        CacheAffinity<Object> aff = affinity(cache);
+        Affinity<Object> aff = affinity(cache);
 
         Collection<ClusterNode> nodes = aff.mapKeyToPrimaryAndBackups(key);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java
index 58c89b6..db66b1d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java
@@ -66,7 +66,7 @@ public class GridCachePartitionedMultiThreadedPutGetSelfTest extends GridCommonA
         cc.setCacheMode(PARTITIONED);
         cc.setBackups(1);
         cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
-        cc.setEvictionPolicy(new CacheFifoEvictionPolicy<>(1000));
+        cc.setEvictionPolicy(new FifoEvictionPolicy<>(1000));
         cc.setSwapEnabled(false);
         cc.setAtomicityMode(TRANSACTIONAL);
         cc.setEvictSynchronized(false);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNodeRestartTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNodeRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNodeRestartTest.java
index 2ef5d15..8faf657 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNodeRestartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNodeRestartTest.java
@@ -44,7 +44,7 @@ public class GridCachePartitionedNodeRestartTest extends GridCacheAbstractNodeRe
         cc.setStartSize(20);
         cc.setRebalanceMode(preloadMode);
         cc.setRebalanceBatchSize(preloadBatchSize);
-        cc.setAffinity(new CacheRendezvousAffinityFunction(false, partitions));
+        cc.setAffinity(new RendezvousAffinityFunction(false, partitions));
         cc.setBackups(backups);
 
         c.setCacheConfiguration(cc);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java
index 0986eaf..62dfaa9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java
@@ -44,7 +44,7 @@ public class GridCachePartitionedOptimisticTxNodeRestartTest extends GridCacheAb
         cc.setStartSize(20);
         cc.setRebalanceMode(preloadMode);
         cc.setRebalanceBatchSize(preloadBatchSize);
-        cc.setAffinity(new CacheRendezvousAffinityFunction(false, partitions));
+        cc.setAffinity(new RendezvousAffinityFunction(false, partitions));
         cc.setBackups(backups);
 
         c.setCacheConfiguration(cc);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/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 212ea38..45eefa4 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,7 +77,7 @@ public class GridCachePartitionedTxSalvageSelfTest extends GridCommonAbstractTes
         CacheConfiguration cc = defaultCacheConfiguration();
 
         cc.setCacheMode(CacheMode.PARTITIONED);
-        cc.setAffinity(new CacheRendezvousAffinityFunction(false, 18));
+        cc.setAffinity(new RendezvousAffinityFunction(false, 18));
         cc.setBackups(1);
         cc.setRebalanceMode(CacheRebalanceMode.SYNC);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/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 38e612c..80651bf 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
@@ -42,7 +42,7 @@ public class GridCacheRendezvousAffinityClientSelfTest extends GridCommonAbstrac
 
         ccfg.setCacheMode(CacheMode.PARTITIONED);
         ccfg.setBackups(1);
-        ccfg.setAffinity(new CacheRendezvousAffinityFunction());
+        ccfg.setAffinity(new RendezvousAffinityFunction());
 
         if (client)
             cfg.setClientMode(true);
@@ -72,7 +72,7 @@ public class GridCacheRendezvousAffinityClientSelfTest extends GridCommonAbstrac
             for (int i = 0; i < 4; i++) {
                 IgniteCache<Object, Object> cache = grid(i).cache(null);
 
-                CacheAffinity<Object> aff = affinity(cache);
+                Affinity<Object> aff = affinity(cache);
 
                 int parts = aff.partitions();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/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 8a61152..8f0ebf8 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 CacheAffinityFunction affinityFunction() {
-        return new CacheRendezvousAffinityFunction(true);
+    @Override protected AffinityFunction affinityFunction() {
+        return new RendezvousAffinityFunction(true);
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/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 5b619e9..941991c 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.affinity.rendezvous.*;
 import org.apache.ignite.configuration.*;
 
 /**
- * Multi-node tests for replicated cache with {@link org.apache.ignite.cache.affinity.rendezvous.CacheRendezvousAffinityFunction}.
+ * Multi-node tests for replicated cache with {@link RendezvousAffinityFunction}.
  */
 public class GridCacheReplicatedRendezvousAffinityMultiNodeFullApiSelfTest extends GridCacheReplicatedMultiNodeFullApiSelfTest {
     /** {@inheritDoc} */
     @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception {
         CacheConfiguration cfg = super.cacheConfiguration(gridName);
 
-        cfg.setAffinity(new CacheRendezvousAffinityFunction());
+        cfg.setAffinity(new RendezvousAffinityFunction());
 
         return cfg;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/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 d60d7d2..302b687 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
@@ -528,7 +528,7 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest {
      * Test affinity.
      */
     @SuppressWarnings({"PublicInnerClass"})
-    private static class TestAffinityFunction implements CacheAffinityFunction {
+    private static class TestAffinityFunction implements AffinityFunction {
         /** {@inheritDoc} */
         @Override public int partitions() {
             return 2;
@@ -543,7 +543,7 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override public List<List<ClusterNode>> assignPartitions(CacheAffinityFunctionContext affCtx) {
+        @Override public List<List<ClusterNode>> assignPartitions(AffinityFunctionContext 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/4ba0b01a/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 0c56fc4..36598fd 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
@@ -90,7 +90,7 @@ public class GridCacheBatchEvictUnswapSelfTest extends GridCacheAbstractSelfTest
         cacheCfg.setWriteThrough(true);
         cacheCfg.setLoadPreviousValue(true);
 
-        cacheCfg.setEvictionPolicy(new CacheFifoEvictionPolicy(EVICT_PLC_SIZE));
+        cacheCfg.setEvictionPolicy(new FifoEvictionPolicy(EVICT_PLC_SIZE));
         cacheCfg.setSwapEnabled(true);
         cacheCfg.setEvictSynchronized(false);
         cacheCfg.setNearConfiguration(null);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/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 a774ed6..4daa908 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
@@ -53,7 +53,7 @@ public class GridCacheConcurrentEvictionConsistencySelfTest extends GridCommonAb
     private static final int POLICY_QUEUE_SIZE = 50;
 
     /** Tested policy. */
-    private CacheEvictionPolicy<?, ?> plc;
+    private EvictionPolicy<?, ?> plc;
 
     /** Key count to put into the cache. */
     private int keyCnt;
@@ -100,7 +100,7 @@ public class GridCacheConcurrentEvictionConsistencySelfTest extends GridCommonAb
      * @throws Exception If failed.
      */
     public void testPolicyConsistencyFifoLocalTwoKeys() throws Exception {
-        plc = new CacheFifoEvictionPolicy<Object, Object>(1);
+        plc = new FifoEvictionPolicy<Object, Object>(1);
 
         keyCnt = 2;
         threadCnt = Runtime.getRuntime().availableProcessors() / 2;
@@ -112,7 +112,7 @@ public class GridCacheConcurrentEvictionConsistencySelfTest extends GridCommonAb
      * @throws Exception If failed.
      */
     public void testPolicyConsistencyLruLocalTwoKeys() throws Exception {
-        plc = new CacheLruEvictionPolicy<Object, Object>(1);
+        plc = new LruEvictionPolicy<Object, Object>(1);
 
         keyCnt = 2;
         threadCnt = Runtime.getRuntime().availableProcessors() / 2;
@@ -124,7 +124,7 @@ public class GridCacheConcurrentEvictionConsistencySelfTest extends GridCommonAb
      * @throws Exception If failed.
      */
     public void testPolicyConsistencyFifoLocalFewKeys() throws Exception {
-        plc = new CacheFifoEvictionPolicy<Object, Object>(POLICY_QUEUE_SIZE);
+        plc = new FifoEvictionPolicy<Object, Object>(POLICY_QUEUE_SIZE);
 
         keyCnt = POLICY_QUEUE_SIZE + 5;
 
@@ -135,7 +135,7 @@ public class GridCacheConcurrentEvictionConsistencySelfTest extends GridCommonAb
      * @throws Exception If failed.
      */
     public void testPolicyConsistencyLruLocalFewKeys() throws Exception {
-        plc = new CacheLruEvictionPolicy<Object, Object>(POLICY_QUEUE_SIZE);
+        plc = new LruEvictionPolicy<Object, Object>(POLICY_QUEUE_SIZE);
 
         keyCnt = POLICY_QUEUE_SIZE + 5;
 
@@ -146,7 +146,7 @@ public class GridCacheConcurrentEvictionConsistencySelfTest extends GridCommonAb
      * @throws Exception If failed.
      */
     public void testPolicyConsistencyFifoLocal() throws Exception {
-        plc = new CacheFifoEvictionPolicy<Object, Object>(POLICY_QUEUE_SIZE);
+        plc = new FifoEvictionPolicy<Object, Object>(POLICY_QUEUE_SIZE);
 
         keyCnt = POLICY_QUEUE_SIZE * 10;
 
@@ -157,7 +157,7 @@ public class GridCacheConcurrentEvictionConsistencySelfTest extends GridCommonAb
      * @throws Exception If failed.
      */
     public void testPolicyConsistencyLruLocal() throws Exception {
-        plc = new CacheLruEvictionPolicy<Object, Object>(POLICY_QUEUE_SIZE);
+        plc = new LruEvictionPolicy<Object, Object>(POLICY_QUEUE_SIZE);
 
         keyCnt = POLICY_QUEUE_SIZE * 10;
 
@@ -207,7 +207,7 @@ public class GridCacheConcurrentEvictionConsistencySelfTest extends GridCommonAb
 
             fut.get();
 
-            Collection<CacheEvictableEntry<Integer, Integer>> queue = internalQueue(plc);
+            Collection<EvictableEntry<Integer, Integer>> queue = internalQueue(plc);
 
             info("Test results [threadCnt=" + threadCnt + ", iterCnt=" + ITERATION_CNT + ", cacheSize=" + cache.size() +
                 ", internalQueueSize" + queue.size() + ", duration=" + (System.currentTimeMillis() - start) + ']');
@@ -247,14 +247,14 @@ public class GridCacheConcurrentEvictionConsistencySelfTest extends GridCommonAb
      * @param plc Policy to get queue from.
      * @return Internal entries collection.
      */
-    private Collection<CacheEvictableEntry<Integer, Integer>> internalQueue(CacheEvictionPolicy<?, ?> plc) {
-        if (plc instanceof CacheFifoEvictionPolicy) {
-            CacheFifoEvictionPolicy<Integer, Integer> plc0 = (CacheFifoEvictionPolicy<Integer, Integer>)plc;
+    private Collection<EvictableEntry<Integer, Integer>> internalQueue(EvictionPolicy<?, ?> plc) {
+        if (plc instanceof FifoEvictionPolicy) {
+            FifoEvictionPolicy<Integer, Integer> plc0 = (FifoEvictionPolicy<Integer, Integer>)plc;
 
             return plc0.queue();
         }
-        else if (plc instanceof CacheLruEvictionPolicy) {
-            CacheLruEvictionPolicy<Integer, Integer> plc0 = (CacheLruEvictionPolicy<Integer, Integer>)plc;
+        else if (plc instanceof LruEvictionPolicy) {
+            LruEvictionPolicy<Integer, Integer> plc0 = (LruEvictionPolicy<Integer, Integer>)plc;
 
             return plc0.queue();
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/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 2fdd902..3cadc45 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
@@ -48,7 +48,7 @@ public class GridCacheConcurrentEvictionsSelfTest extends GridCommonAbstractTest
     private CacheMode mode = REPLICATED;
 
     /** */
-    private CacheEvictionPolicy<?, ?> plc;
+    private EvictionPolicy<?, ?> plc;
 
     /** */
     private int warmUpPutsCnt;
@@ -98,7 +98,7 @@ public class GridCacheConcurrentEvictionsSelfTest extends GridCommonAbstractTest
      */
     public void testConcurrentPutsFifoLocal() throws Exception {
         mode = LOCAL;
-        plc = new CacheFifoEvictionPolicy<Object, Object>(1000);
+        plc = new FifoEvictionPolicy<Object, Object>(1000);
         warmUpPutsCnt = 100000;
         iterCnt = 100000;
 
@@ -110,7 +110,7 @@ public class GridCacheConcurrentEvictionsSelfTest extends GridCommonAbstractTest
      */
     public void testConcurrentPutsLruLocal() throws Exception {
         mode = LOCAL;
-        plc = new CacheLruEvictionPolicy<Object, Object>(1000);
+        plc = new LruEvictionPolicy<Object, Object>(1000);
         warmUpPutsCnt = 100000;
         iterCnt = 100000;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/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 3dbac92..396f360 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
@@ -86,7 +86,7 @@ public class GridCacheDistributedEvictionsSelfTest extends GridCommonAbstractTes
         cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
 
         // Set only DHT policy, leave default near policy.
-        cc.setEvictionPolicy(new CacheFifoEvictionPolicy<>(10));
+        cc.setEvictionPolicy(new FifoEvictionPolicy<>(10));
         cc.setEvictSynchronized(evictSync);
         cc.setEvictSynchronizedKeyBufferSize(1);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/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 298d233..768bced 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
@@ -44,10 +44,10 @@ public abstract class GridCacheEmptyEntriesAbstractSelfTest extends GridCommonAb
     private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
 
     /** */
-    private CacheEvictionPolicy<?, ?> plc;
+    private EvictionPolicy<?, ?> plc;
 
     /** */
-    private CacheEvictionPolicy<?, ?> nearPlc;
+    private EvictionPolicy<?, ?> nearPlc;
 
     /** Test store. */
     private CacheStore<String, String> testStore;
@@ -120,8 +120,8 @@ public abstract class GridCacheEmptyEntriesAbstractSelfTest extends GridCommonAb
      * @throws Exception If failed.
      */
     public void testFifo() throws Exception {
-        plc = new CacheFifoEvictionPolicy(50);
-        nearPlc = new CacheFifoEvictionPolicy(50);
+        plc = new FifoEvictionPolicy(50);
+        nearPlc = new FifoEvictionPolicy(50);
 
         checkPolicy();
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/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 aabaeeb..71921c9 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
@@ -46,7 +46,7 @@ import static org.apache.ignite.transactions.TransactionIsolation.*;
 /**
  * Base class for eviction tests.
  */
-public abstract class GridCacheEvictionAbstractTest<T extends CacheEvictionPolicy<?, ?>>
+public abstract class GridCacheEvictionAbstractTest<T extends EvictionPolicy<?, ?>>
     extends GridCommonAbstractTest {
     /** IP finder. */
     protected static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
@@ -76,7 +76,7 @@ public abstract class GridCacheEvictionAbstractTest<T extends CacheEvictionPolic
     protected int gridCnt = 2;
 
     /** */
-    protected CacheEvictionFilter<?, ?> filter;
+    protected EvictionFilter<?, ?> filter;
 
     /** {@inheritDoc} */
     @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
@@ -148,12 +148,12 @@ public abstract class GridCacheEvictionAbstractTest<T extends CacheEvictionPolic
      * @param prefix Prefix.
      * @param p Policy.
      */
-    protected void info(String prefix, CacheEvictionPolicy<?, ?> p) {
+    protected void info(String prefix, EvictionPolicy<?, ?> p) {
         info(prefix + ": " + p.toString());
     }
 
     /** @param p Policy. */
-    protected void info(CacheEvictionPolicy<?, ?> p) {
+    protected void info(EvictionPolicy<?, ?> p) {
         info(p.toString());
     }
 
@@ -161,7 +161,7 @@ public abstract class GridCacheEvictionAbstractTest<T extends CacheEvictionPolic
      * @param c1 Policy collection.
      * @param c2 Expected list.
      */
-    protected void check(Collection<CacheEvictableEntry<String, String>> c1, MockEntry... c2) {
+    protected void check(Collection<EvictableEntry<String, String>> c1, MockEntry... c2) {
         check(c1, F.asList(c2));
     }
 
@@ -197,7 +197,7 @@ public abstract class GridCacheEvictionAbstractTest<T extends CacheEvictionPolic
      * @param c1 Policy collection.
      * @param c2 Expected list.
      */
-    protected void check(Collection<CacheEvictableEntry<String, String>> c1, List<MockEntry> c2) {
+    protected void check(Collection<EvictableEntry<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) + ']';

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/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 35929d1..6847c67 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
@@ -53,8 +53,8 @@ public class GridCacheEvictionFilterSelfTest extends GridCommonAbstractTest {
     private EvictionFilter filter;
 
     /** Policy. */
-    private CacheEvictionPolicy<Object, Object> plc = new CacheEvictionPolicy<Object, Object>() {
-        @Override public void onEntryAccessed(boolean rmv, CacheEvictableEntry entry) {
+    private EvictionPolicy<Object, Object> plc = new EvictionPolicy<Object, Object>() {
+        @Override public void onEntryAccessed(boolean rmv, EvictableEntry entry) {
             assert !(entry.getValue() instanceof Integer);
         }
     };
@@ -66,17 +66,17 @@ public class GridCacheEvictionFilterSelfTest extends GridCommonAbstractTest {
         CacheConfiguration cc = defaultCacheConfiguration();
 
         cc.setCacheMode(mode);
-        cc.setEvictionPolicy(notSerializableProxy(plc, CacheEvictionPolicy.class));
+        cc.setEvictionPolicy(notSerializableProxy(plc, EvictionPolicy.class));
         cc.setEvictSynchronized(false);
         cc.setSwapEnabled(false);
         cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
-        cc.setEvictionFilter(notSerializableProxy(filter, CacheEvictionFilter.class));
+        cc.setEvictionFilter(notSerializableProxy(filter, org.apache.ignite.cache.eviction.EvictionFilter.class));
         cc.setRebalanceMode(SYNC);
         cc.setAtomicityMode(TRANSACTIONAL);
 
         if (nearEnabled) {
             NearCacheConfiguration nearCfg = new NearCacheConfiguration();
-            nearCfg.setNearEvictionPolicy(notSerializableProxy(plc, CacheEvictionPolicy.class));
+            nearCfg.setNearEvictionPolicy(notSerializableProxy(plc, EvictionPolicy.class));
 
             cc.setNearConfiguration(nearCfg);
         }
@@ -218,7 +218,7 @@ public class GridCacheEvictionFilterSelfTest extends GridCommonAbstractTest {
     /**
      *
      */
-    private final class EvictionFilter implements CacheEvictionFilter<Object, Object> {
+    private final class EvictionFilter implements org.apache.ignite.cache.eviction.EvictionFilter<Object, Object> {
         /** */
         private final ConcurrentMap<Object, AtomicInteger> cnts = new ConcurrentHashMap<>();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/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 db90baf..93b348b 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
@@ -169,9 +169,9 @@ public class GridCacheEvictionLockUnlockSelfTest extends GridCommonAbstractTest
     }
 
     /** Eviction policy. */
-    private static class EvictionPolicy implements CacheEvictionPolicy<Object, Object>, Serializable {
+    private static class EvictionPolicy implements org.apache.ignite.cache.eviction.EvictionPolicy<Object, Object>, Serializable {
         /** {@inheritDoc} */
-        @Override public void onEntryAccessed(boolean rmv, CacheEvictableEntry<Object, Object> entry) {
+        @Override public void onEntryAccessed(boolean rmv, EvictableEntry<Object, Object> entry) {
             touchCnt.incrementAndGet();
 
             entry.evict();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/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 b21f217..9873ce6 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
@@ -46,7 +46,7 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest {
     private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
 
     /** */
-    private CacheEvictionPolicy<?, ?> plc;
+    private EvictionPolicy<?, ?> plc;
 
     /** {@inheritDoc} */
     @SuppressWarnings("unchecked")
@@ -110,7 +110,7 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testPolicyConsistency() throws Exception {
-        plc = new CacheFifoEvictionPolicy<Object, Object>(500);
+        plc = new FifoEvictionPolicy<Object, Object>(500);
 
         try {
             Ignite ignite = startGrid(1);
@@ -136,7 +136,7 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest {
                         info("Stats [iterCnt=" + i + ", size=" + cache.size() + ']');
                 }
 
-                CacheFifoEvictionPolicy<Integer, Integer> plc0 = (CacheFifoEvictionPolicy<Integer, Integer>) plc;
+                FifoEvictionPolicy<Integer, Integer> plc0 = (FifoEvictionPolicy<Integer, Integer>) plc;
 
                 if (!plc0.queue().isEmpty()) {
                     for (Cache.Entry<Integer, Integer> e : plc0.queue())
@@ -162,7 +162,7 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testEvictSingle() throws Exception {
-        plc = new CacheFifoEvictionPolicy<Object, Object>(500);
+        plc = new FifoEvictionPolicy<Object, Object>(500);
 
         try {
             Ignite ignite = startGrid(1);
@@ -172,12 +172,12 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest {
             for (int i = 0; i < 100; i++)
                 cache.put(i, i);
 
-            assertEquals(100, ((CacheFifoEvictionPolicy)plc).queue().size());
+            assertEquals(100, ((FifoEvictionPolicy)plc).queue().size());
 
             for (int i = 0; i < 100; i++)
                 cache.localEvict(Collections.singleton(i));
 
-            assertEquals(0, ((CacheFifoEvictionPolicy)plc).queue().size());
+            assertEquals(0, ((FifoEvictionPolicy)plc).queue().size());
             assertEquals(0, cache.size());
         }
         finally {
@@ -189,7 +189,7 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testEvictAll() throws Exception {
-        plc = new CacheFifoEvictionPolicy<Object, Object>(500);
+        plc = new FifoEvictionPolicy<Object, Object>(500);
 
         try {
             Ignite ignite = startGrid(1);
@@ -204,12 +204,12 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest {
                 keys.add(i);
             }
 
-            assertEquals(100, ((CacheFifoEvictionPolicy)plc).queue().size());
+            assertEquals(100, ((FifoEvictionPolicy)plc).queue().size());
 
             for (Integer key : keys)
                 cache.localEvict(Collections.singleton(key));
 
-            assertEquals(0, ((CacheFifoEvictionPolicy)plc).queue().size());
+            assertEquals(0, ((FifoEvictionPolicy)plc).queue().size());
             assertEquals(0, cache.size());
         }
         finally {
@@ -221,7 +221,7 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testReload() throws Exception {
-        plc = new CacheFifoEvictionPolicy<Object, Object>(100);
+        plc = new FifoEvictionPolicy<Object, Object>(100);
 
         try {
             Ignite ignite = startGrid(1);
@@ -233,7 +233,7 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest {
 
             assertEquals(100, cache.size());
             assertEquals(100, cache.size());
-            assertEquals(100, ((CacheFifoEvictionPolicy)plc).queue().size());
+            assertEquals(100, ((FifoEvictionPolicy)plc).queue().size());
 
             Set<Integer> keys = new TreeSet<>();
 
@@ -244,7 +244,7 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest {
 
             assertEquals(100, cache.size());
             assertEquals(100, cache.size());
-            assertEquals(100, ((CacheFifoEvictionPolicy)plc).queue().size());
+            assertEquals(100, ((FifoEvictionPolicy)plc).queue().size());
         }
         finally {
             stopAllGrids();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/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 856a2e6..5898ed9 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
@@ -30,8 +30,7 @@ import java.util.*;
 /**
  * Mock cache entry.
  */
-public class GridCacheMockEntry<K, V> extends GridMetadataAwareAdapter implements Cache.Entry<K, V>,
-    CacheEvictableEntry<K, V> {
+public class GridCacheMockEntry<K, V> extends GridMetadataAwareAdapter implements Cache.Entry<K, V>, EvictableEntry<K, V> {
     /** */
     private static final UUID META_KEY = UUID.randomUUID();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/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 a86e675..d6df80a 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
@@ -63,7 +63,7 @@ public class GridCacheSynchronousEvictionsFailoverSelfTest extends GridCacheAbst
 
         ccfg.setBackups(2);
 
-        ccfg.setAffinity(new CacheRendezvousAffinityFunction(false, 500));
+        ccfg.setAffinity(new RendezvousAffinityFunction(false, 500));
 
         return ccfg;
     }
@@ -138,7 +138,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(CacheAffinity<String> aff, ClusterNode node, Map<String, Integer> data) {
+    private void addKeysForNode(Affinity<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/4ba0b01a/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 db48635..64d3831 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<CacheFifoEvictionPolicy<String, String>> {
+    GridCacheEvictionAbstractTest<FifoEvictionPolicy<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");
 
-            CacheFifoEvictionPolicy<String, String> p = policy();
+            FifoEvictionPolicy<String, String> p = policy();
 
             p.setMaxSize(3);
 
@@ -163,7 +163,7 @@ public class GridCacheFifoEvictionPolicySelfTest extends
         try {
             startGrid();
 
-            CacheFifoEvictionPolicy<String, String> p = policy();
+            FifoEvictionPolicy<String, String> p = policy();
 
             int max = 10;
 
@@ -190,7 +190,7 @@ public class GridCacheFifoEvictionPolicySelfTest extends
         try {
             startGrid();
 
-            CacheFifoEvictionPolicy<String, String> p = policy();
+            FifoEvictionPolicy<String, String> p = policy();
 
             int max = 10;
 
@@ -248,7 +248,7 @@ public class GridCacheFifoEvictionPolicySelfTest extends
 
             MockEntry e5 = new MockEntry("5");
 
-            CacheFifoEvictionPolicy<String, String> p = policy();
+            FifoEvictionPolicy<String, String> p = policy();
 
             p.setMaxSize(10);
 
@@ -348,19 +348,19 @@ public class GridCacheFifoEvictionPolicySelfTest extends
     }
 
     /** {@inheritDoc} */
-    @Override protected CacheFifoEvictionPolicy<String, String> createPolicy(int plcMax) {
-        return new CacheFifoEvictionPolicy<>(plcMax);
+    @Override protected FifoEvictionPolicy<String, String> createPolicy(int plcMax) {
+        return new FifoEvictionPolicy<>(plcMax);
     }
 
     /** {@inheritDoc} */
-    @Override protected CacheFifoEvictionPolicy<String, String> createNearPolicy(int nearMax) {
-        return new CacheFifoEvictionPolicy<>(nearMax);
+    @Override protected FifoEvictionPolicy<String, String> createNearPolicy(int nearMax) {
+        return new FifoEvictionPolicy<>(nearMax);
     }
 
     /** {@inheritDoc} */
     @Override protected void checkNearPolicies(int endNearPlcSize) {
         for (int i = 0; i < gridCnt; i++)
-            for (CacheEvictableEntry<String, String> e : nearPolicy(i).queue())
+            for (EvictableEntry<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/4ba0b01a/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 fe8520f..c623b38 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
@@ -30,7 +30,7 @@ import java.util.*;
  */
 @SuppressWarnings( {"TypeMayBeWeakened"})
 public class GridCacheLruEvictionPolicySelfTest extends
-    GridCacheEvictionAbstractTest<CacheLruEvictionPolicy<String, String>> {
+    GridCacheEvictionAbstractTest<LruEvictionPolicy<String, String>> {
     /**
      * @throws Exception If failed.
      */
@@ -44,7 +44,7 @@ public class GridCacheLruEvictionPolicySelfTest extends
             MockEntry e4 = new MockEntry("4", "4");
             MockEntry e5 = new MockEntry("5", "5");
 
-            CacheLruEvictionPolicy<String, String> p = policy();
+            LruEvictionPolicy<String, String> p = policy();
 
             p.setMaxSize(3);
 
@@ -164,7 +164,7 @@ public class GridCacheLruEvictionPolicySelfTest extends
         startGrid();
 
         try {
-            CacheLruEvictionPolicy<String, String> p = policy();
+            LruEvictionPolicy<String, String> p = policy();
 
             int max = 10;
 
@@ -191,7 +191,7 @@ public class GridCacheLruEvictionPolicySelfTest extends
         startGrid();
 
         try {
-            CacheLruEvictionPolicy<String, String> p = policy();
+            LruEvictionPolicy<String, String> p = policy();
 
             int max = 8;
 
@@ -240,7 +240,7 @@ public class GridCacheLruEvictionPolicySelfTest extends
         startGrid();
 
         try {
-            CacheLruEvictionPolicy<String, String> p = policy();
+            LruEvictionPolicy<String, String> p = policy();
 
             int max = 10;
 
@@ -296,7 +296,7 @@ public class GridCacheLruEvictionPolicySelfTest extends
 
             MockEntry e5 = new MockEntry("5");
 
-            CacheLruEvictionPolicy<String, String> p = policy();
+            LruEvictionPolicy<String, String> p = policy();
 
             p.setMaxSize(10);
 
@@ -394,18 +394,18 @@ public class GridCacheLruEvictionPolicySelfTest extends
     }
 
     /** {@inheritDoc} */
-    @Override protected CacheLruEvictionPolicy<String, String> createPolicy(int plcMax) {
-        return new CacheLruEvictionPolicy<>(plcMax);
+    @Override protected LruEvictionPolicy<String, String> createPolicy(int plcMax) {
+        return new LruEvictionPolicy<>(plcMax);
     }
 
-    @Override protected CacheLruEvictionPolicy<String, String> createNearPolicy(int nearMax) {
-        return new CacheLruEvictionPolicy<>(nearMax);
+    @Override protected LruEvictionPolicy<String, String> createNearPolicy(int nearMax) {
+        return new LruEvictionPolicy<>(nearMax);
     }
 
     /** {@inheritDoc} */
     @Override protected void checkNearPolicies(int endNearPlcSize) {
         for (int i = 0; i < gridCnt; i++)
-            for (CacheEvictableEntry<String, String> e : nearPolicy(i).queue())
+            for (EvictableEntry<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/4ba0b01a/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 3fc0605..e0606a7 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
@@ -63,7 +63,7 @@ public class GridCacheLruNearEvictionPolicySelfTest extends GridCommonAbstractTe
         cc.setBackups(0);
 
         NearCacheConfiguration nearCfg = new NearCacheConfiguration();
-        nearCfg.setNearEvictionPolicy(new CacheLruEvictionPolicy(EVICTION_MAX_SIZE));
+        nearCfg.setNearEvictionPolicy(new LruEvictionPolicy(EVICTION_MAX_SIZE));
         cc.setNearConfiguration(nearCfg);
 
         c.setCacheConfiguration(cc);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/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 7ec2c07..5d4ff85 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
@@ -137,7 +137,7 @@ public class GridCacheNearOnlyLruNearEvictionPolicySelfTest extends GridCommonAb
 
         try {
             NearCacheConfiguration nearCfg = new NearCacheConfiguration();
-            nearCfg.setNearEvictionPolicy(new CacheLruEvictionPolicy(EVICTION_MAX_SIZE));
+            nearCfg.setNearEvictionPolicy(new LruEvictionPolicy(EVICTION_MAX_SIZE));
 
             grid(0).createNearCache(null, nearCfg);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/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 ccc2fe0..7088714 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
@@ -29,7 +29,7 @@ import java.util.concurrent.*;
  * Random eviction policy test.
  */
 public class GridCacheRandomEvictionPolicySelfTest extends
-    GridCacheEvictionAbstractTest<CacheRandomEvictionPolicy<String, String>> {
+    GridCacheEvictionAbstractTest<RandomEvictionPolicy<String, String>> {
     /**
      * @throws Exception If failed.
      */
@@ -120,7 +120,7 @@ public class GridCacheRandomEvictionPolicySelfTest extends
 
             MockEntry e5 = new MockEntry("5", c);
 
-            CacheRandomEvictionPolicy<String, String> p = policy();
+            RandomEvictionPolicy<String, String> p = policy();
 
             p.setMaxSize(10);
 
@@ -237,13 +237,13 @@ public class GridCacheRandomEvictionPolicySelfTest extends
     }
 
     /** {@inheritDoc} */
-    @Override protected CacheRandomEvictionPolicy<String, String> createPolicy(int plcMax) {
-        return new CacheRandomEvictionPolicy<>(plcMax);
+    @Override protected RandomEvictionPolicy<String, String> createPolicy(int plcMax) {
+        return new RandomEvictionPolicy<>(plcMax);
     }
 
     /** {@inheritDoc} */
-    @Override protected CacheRandomEvictionPolicy<String, String> createNearPolicy(int nearMax) {
-        return new CacheRandomEvictionPolicy<>(plcMax);
+    @Override protected RandomEvictionPolicy<String, String> createNearPolicy(int nearMax) {
+        return new RandomEvictionPolicy<>(plcMax);
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/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 866dbd6..078d63a 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
@@ -168,7 +168,7 @@ public abstract class IgniteCacheLoadAllAbstractTest extends IgniteCacheAbstract
      * @param expVals Expected values.
      */
     private void checkValues(int keys, Map<Integer, String> expVals) {
-        CacheAffinity<Object> aff = grid(0).affinity(null);
+        Affinity<Object> aff = grid(0).affinity(null);
 
         for (int i = 0; i < gridCount(); i++) {
             ClusterNode node = ignite(i).cluster().localNode();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
index df9f201..d04556a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
@@ -331,7 +331,7 @@ public class DataStreamProcessorSelfTest extends GridCommonAbstractTest {
                 if (cache0.isNear())
                     cache0 = ((GridNearCacheAdapter<Integer, Integer>)cache0).dht();
 
-                CacheAffinity<Integer> aff = cache0.affinity();
+                Affinity<Integer> aff = cache0.affinity();
 
                 for (int key = 0; key < cnt * threads; key++) {
                     if (aff.isPrimary(locNode, key) || aff.isBackup(locNode, key)) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCachePerBlockLruEvictionPolicySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCachePerBlockLruEvictionPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCachePerBlockLruEvictionPolicySelfTest.java
index 5f58800..b3eae80 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCachePerBlockLruEvictionPolicySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCachePerBlockLruEvictionPolicySelfTest.java
@@ -68,7 +68,7 @@ public class IgfsCachePerBlockLruEvictionPolicySelfTest extends IgfsCommonAbstra
     private static GridCacheAdapter<IgfsBlockKey, byte[]> dataCache;
 
     /** Eviction policy */
-    private static CacheIgfsPerBlockLruEvictionPolicy evictPlc;
+    private static IgfsPerBlockLruEvictionPolicy evictPlc;
 
     static {
         SECONDARY_REST_CFG = new IgfsIpcEndpointConfiguration();
@@ -108,7 +108,7 @@ public class IgfsCachePerBlockLruEvictionPolicySelfTest extends IgfsCommonAbstra
         dataCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
         dataCacheCfg.setAtomicityMode(TRANSACTIONAL);
 
-        evictPlc = new CacheIgfsPerBlockLruEvictionPolicy();
+        evictPlc = new IgfsPerBlockLruEvictionPolicy();
 
         dataCacheCfg.setEvictionPolicy(evictPlc);
         dataCacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(128));

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMapAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMapAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMapAbstractSelfTest.java
index 50801be..265beda 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMapAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMapAbstractSelfTest.java
@@ -245,7 +245,7 @@ public abstract class GridOffHeapPartitionedMapAbstractSelfTest extends GridComm
     public void testPutRandomKeys() throws Exception {
         map = newMap();
 
-        CacheAffinityFunction aff = new CacheRendezvousAffinityFunction(parts, null);
+        AffinityFunction aff = new RendezvousAffinityFunction(parts, null);
 
         getTestResources().inject(aff);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java
index ecc0eea..d370a58 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java
@@ -76,7 +76,7 @@ public abstract class GridOffHeapPartitionedMapPerformanceAbstractTest extends G
             keys = new T3[LOAD_CNT];
             wrappers = new GridByteArrayWrapper[LOAD_CNT];
 
-            CacheAffinityFunction aff = new CacheRendezvousAffinityFunction();
+            AffinityFunction aff = new RendezvousAffinityFunction();
 
             Random rnd = new Random();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafePartitionedMapPerformanceTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafePartitionedMapPerformanceTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafePartitionedMapPerformanceTest.java
index 2385526..7e8a3e7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafePartitionedMapPerformanceTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafePartitionedMapPerformanceTest.java
@@ -26,7 +26,7 @@ import org.apache.ignite.internal.util.offheap.*;
 public class GridUnsafePartitionedMapPerformanceTest extends GridOffHeapPartitionedMapPerformanceAbstractTest {
     /** {@inheritDoc} */
     @Override protected GridOffHeapPartitionedMap newMap() {
-        return GridOffHeapMapFactory.unsafePartitionedMap(CacheRendezvousAffinityFunction.DFLT_PARTITION_COUNT,
+        return GridOffHeapMapFactory.unsafePartitionedMap(RendezvousAffinityFunction.DFLT_PARTITION_COUNT,
             Runtime.getRuntime().availableProcessors(), load, LOAD_CNT, mem, lruStripes, null);
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/test/java/org/apache/ignite/loadtests/GridCacheMultiNodeLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/GridCacheMultiNodeLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/GridCacheMultiNodeLoadTest.java
index 91994f5..d106f5b 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/GridCacheMultiNodeLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/GridCacheMultiNodeLoadTest.java
@@ -65,7 +65,7 @@ public class GridCacheMultiNodeLoadTest extends GridCommonAbstractTest {
         cacheCfg.setStartSize(10);
         cacheCfg.setWriteSynchronizationMode(FULL_SYNC);
 
-        cacheCfg.setEvictionPolicy(new CacheLruEvictionPolicy(100000));
+        cacheCfg.setEvictionPolicy(new LruEvictionPolicy(100000));
         cacheCfg.setBackups(1);
 
         cacheCfg.setRebalanceMode(SYNC);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/test/java/org/apache/ignite/loadtests/capacity/spring-capacity-cache.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/capacity/spring-capacity-cache.xml b/modules/core/src/test/java/org/apache/ignite/loadtests/capacity/spring-capacity-cache.xml
index 600ac7a..5519d0e 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/capacity/spring-capacity-cache.xml
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/capacity/spring-capacity-cache.xml
@@ -75,7 +75,7 @@
                         sets the number of backups to 0 to ensure maximum capacity..
                     -->
                     <property name="affinity">
-                        <bean class="org.apache.ignite.cache.affinity.rendezvous.CacheRendezvousAffinityFunction">
+                        <bean class="org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction">
                             <property name="keyBackups" value="0"/> <!-- No backups. -->
                         </bean>
                     </property>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestKey.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestKey.java b/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestKey.java
index 9286119..264896a 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestKey.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestKey.java
@@ -42,7 +42,7 @@ public class GridTestKey implements Externalizable {
         return id;
     }
 
-    @CacheAffinityKeyMapped
+    @AffinityKeyMapped
     public int affinityKey() {
         return affinityKey(id);
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/spring-colocation.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/spring-colocation.xml b/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/spring-colocation.xml
index 662c4f8..2383249 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/spring-colocation.xml
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/spring-colocation.xml
@@ -105,7 +105,7 @@
                         sets the number of backups to 1 (which is default).
                     -->
                     <property name="affinity">
-                        <bean class="org.apache.ignite.cache.affinity.rendezvous.CacheRendezvousAffinityFunction">
+                        <bean class="org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction">
                             <property name="keyBackups" value="0"/> <!-- Disable backups. -->
                         </bean>
                     </property>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java
index dd25e95..6960fa1 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java
@@ -70,9 +70,9 @@ public class GridCachePartitionedAtomicLongLoadTest extends GridCommonAbstractTe
         cc.setStartSize(200);
         cc.setRebalanceMode(CacheRebalanceMode.SYNC);
         cc.setWriteSynchronizationMode(FULL_SYNC);
-        cc.setEvictionPolicy(new CacheLruEvictionPolicy<>(1000));
+        cc.setEvictionPolicy(new LruEvictionPolicy<>(1000));
         cc.setBackups(1);
-        cc.setAffinity(new CacheRendezvousAffinityFunction(true));
+        cc.setAffinity(new RendezvousAffinityFunction(true));
         cc.setEvictSynchronized(true);
 
         c.setCacheConfiguration(cc);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiPerfJob.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiPerfJob.java b/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiPerfJob.java
index dd9a3f0..eea1b19 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiPerfJob.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiPerfJob.java
@@ -77,7 +77,7 @@ public class GridDsiPerfJob extends ComputeJobAdapter {
     /**
      * @return Terminal ID.
      */
-    @CacheAffinityKeyMapped
+    @AffinityKeyMapped
     @Nullable public String terminalId() {
         GridDsiMessage msg = message();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiRequest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiRequest.java
index 83c067a..26071c7 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiRequest.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiRequest.java
@@ -68,7 +68,7 @@ public class GridDsiRequest implements Serializable {
 
         /** */
         @SuppressWarnings("UnusedDeclaration")
-        @CacheAffinityKeyMapped
+        @AffinityKeyMapped
         private String terminalId;
 
         /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiResponse.java b/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiResponse.java
index e4562af..d0a3c01 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiResponse.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiResponse.java
@@ -48,7 +48,7 @@ public class GridDsiResponse implements Serializable {
      * @return Cache key.
      */
     public Object getCacheKey(String terminalId){
-        //return new CacheAffinityKey<String>("RESPONSE:" + id.toString(), terminalId);
+        //return new AffinityKey<String>("RESPONSE:" + id.toString(), terminalId);
         return new ResponseKey(id, terminalId);
     }
 
@@ -62,7 +62,7 @@ public class GridDsiResponse implements Serializable {
 
         /** */
         @SuppressWarnings("UnusedDeclaration")
-        @CacheAffinityKeyMapped
+        @AffinityKeyMapped
         private String terminalId;
 
         /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiSession.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiSession.java b/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiSession.java
index c0f4a42..6ab6f73 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiSession.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiSession.java
@@ -59,7 +59,7 @@ public class GridDsiSession implements Serializable{
 
         /** */
         @SuppressWarnings("UnusedDeclaration")
-        @CacheAffinityKeyMapped
+        @AffinityKeyMapped
         private String terminalId;
 
         /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/test/java/org/apache/ignite/loadtests/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java
index c82e2b1..c1b98f0 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java
@@ -77,7 +77,7 @@ public abstract class GridOffHeapPartitionedMapPerformanceAbstractTest extends G
             keys = new T3[LOAD_CNT];
             wrappers = new GridByteArrayWrapper[LOAD_CNT];
 
-            CacheAffinityFunction aff = new CacheRendezvousAffinityFunction();
+            AffinityFunction aff = new RendezvousAffinityFunction();
 
             Random rnd = new Random();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/test/java/org/apache/ignite/loadtests/offheap/unsafe/GridUnsafePartitionedMapPerformanceTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/offheap/unsafe/GridUnsafePartitionedMapPerformanceTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/offheap/unsafe/GridUnsafePartitionedMapPerformanceTest.java
index a9a7b5b..717b108 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/offheap/unsafe/GridUnsafePartitionedMapPerformanceTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/offheap/unsafe/GridUnsafePartitionedMapPerformanceTest.java
@@ -26,7 +26,7 @@ import org.apache.ignite.internal.util.offheap.*;
 public class GridUnsafePartitionedMapPerformanceTest extends GridOffHeapPartitionedMapPerformanceAbstractTest {
     /** {@inheritDoc} */
     @Override protected GridOffHeapPartitionedMap newMap() {
-        return GridOffHeapMapFactory.unsafePartitionedMap(CacheRendezvousAffinityFunction.DFLT_PARTITION_COUNT,
+        return GridOffHeapMapFactory.unsafePartitionedMap(RendezvousAffinityFunction.DFLT_PARTITION_COUNT,
             Runtime.getRuntime().availableProcessors(), load, LOAD_CNT, mem, lruStripes, null);
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/test/java/org/apache/ignite/loadtests/swap/GridSwapEvictAllBenchmark.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/swap/GridSwapEvictAllBenchmark.java b/modules/core/src/test/java/org/apache/ignite/loadtests/swap/GridSwapEvictAllBenchmark.java
index d484e30..1561b77 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/swap/GridSwapEvictAllBenchmark.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/swap/GridSwapEvictAllBenchmark.java
@@ -266,7 +266,7 @@ public class GridSwapEvictAllBenchmark {
 
         ccfg.setSwapEnabled(true);
         ccfg.setEvictSynchronized(false);
-        ccfg.setEvictionPolicy(new CacheFifoEvictionPolicy(EVICT_PLC_SIZE));
+        ccfg.setEvictionPolicy(new FifoEvictionPolicy(EVICT_PLC_SIZE));
 
         if (store != null) {
             ccfg.setCacheStoreFactory(new FactoryBuilder.SingletonFactory(store));

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java
index 295d385..71f36cd 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java
@@ -280,7 +280,7 @@ public class IgniteMock implements Ignite {
     }
 
     /** {@inheritDoc} */
-    @Override public <K> CacheAffinity<K> affinity(String cacheName) {
+    @Override public <K> Affinity<K> affinity(String cacheName) {
         return null;
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
index 143a3b7..3939465 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
@@ -366,7 +366,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest {
                 CacheConfiguration cfg = c.configuration();
 
                 if (cfg.getCacheMode() == PARTITIONED && cfg.getRebalanceMode() != NONE && g.cluster().nodes().size() > 1) {
-                    CacheAffinityFunction aff = cfg.getAffinity();
+                    AffinityFunction aff = cfg.getAffinity();
 
                     GridDhtCacheAdapter<?, ?> dht = dht(c);
 
@@ -415,7 +415,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest {
      * @param cache Cache.
      * @return Affinity.
      */
-    public static <K> CacheAffinity<K> affinity(IgniteCache<K, ?> cache) {
+    public static <K> Affinity<K> affinity(IgniteCache<K, ?> cache) {
         return cache.unwrap(Ignite.class).affinity(cache.getName());
     }
 
@@ -440,7 +440,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest {
 
         ClusterNode locNode = localNode(cache);
 
-        CacheAffinity<Integer> aff = (CacheAffinity<Integer>)affinity(cache);
+        Affinity<Integer> aff = (Affinity<Integer>)affinity(cache);
 
         for (int i = startFrom; i < startFrom + 100_000; i++) {
             Integer key = i;
@@ -491,7 +491,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest {
 
         ClusterNode locNode = localNode(cache);
 
-        CacheAffinity<Integer> aff = affinity((IgniteCache<Integer, ?>)cache);
+        Affinity<Integer> aff = affinity((IgniteCache<Integer, ?>)cache);
 
         for (int i = startFrom; i < startFrom + 100_000; i++) {
             Integer key = i;
@@ -522,7 +522,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest {
 
         ClusterNode locNode = localNode(cache);
 
-        CacheAffinity<Integer> aff = affinity((IgniteCache<Integer, ?>)cache);
+        Affinity<Integer> aff = affinity((IgniteCache<Integer, ?>)cache);
 
         for (int i = startFrom; i < startFrom + 100_000; i++) {
             Integer key = i;
@@ -741,7 +741,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest {
 
         assertFalse("There are no alive nodes.", F.isEmpty(allGrids));
 
-        CacheAffinity<Integer> aff = allGrids.get(0).affinity(null);
+        Affinity<Integer> aff = allGrids.get(0).affinity(null);
 
         Collection<ClusterNode> nodes = aff.mapKeyToPrimaryAndBackups(key);
 
@@ -776,7 +776,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest {
 
         Ignite ignite = allGrids.get(0);
 
-        CacheAffinity<Object> aff = ignite.affinity(cacheName);
+        Affinity<Object> aff = ignite.affinity(cacheName);
 
         ClusterNode node = aff.mapKeyToNode(key);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
index 2476484..84cbcc4 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
@@ -82,7 +82,7 @@ public class IgniteCacheTestSuite extends TestSuite {
         suite.addTestSuite(IgniteCacheSharedExecutionContextTest.class);
 
         // Affinity tests.
-        suite.addTestSuite(GridCachePartitionFairAffinityNodesSelfTest.class);
+        suite.addTestSuite(GridFairAffinityFunctionNodesSelfTest.class);
         suite.addTestSuite(GridCacheAffinityBackupsSelfTest.class);
         suite.addTestSuite(IgniteCacheAffinitySelfTest.class);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridExternalAffinityFunction.java
----------------------------------------------------------------------
diff --git a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridExternalAffinityFunction.java b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridExternalAffinityFunction.java
index dbb93b9..18fa8d5 100644
--- a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridExternalAffinityFunction.java
+++ b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridExternalAffinityFunction.java
@@ -28,7 +28,7 @@ import java.util.*;
  * Mock affinity implementation that ensures constant key-to-node mapping based on {@code GridCacheModuloAffinity} The
  * partition selection is as follows: 0 maps to partition 1 and any other value maps to partition 1.
  */
-public class GridExternalAffinityFunction implements CacheAffinityFunction {
+public class GridExternalAffinityFunction implements AffinityFunction {
     /** Node attribute for index. */
     public static final String IDX_ATTR = "nodeIndex";
 
@@ -57,7 +57,7 @@ public class GridExternalAffinityFunction implements CacheAffinityFunction {
 
     /** {@inheritDoc} */
     @SuppressWarnings("unchecked")
-    @Override public List<List<ClusterNode>> assignPartitions(CacheAffinityFunctionContext ctx) {
+    @Override public List<List<ClusterNode>> assignPartitions(AffinityFunctionContext ctx) {
         List<List<ClusterNode>> res = new ArrayList<>(partitions());
 
         List<ClusterNode> topSnapshot = ctx.currentTopologySnapshot();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridExternalAffinityKeyMapper.java
----------------------------------------------------------------------
diff --git a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridExternalAffinityKeyMapper.java b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridExternalAffinityKeyMapper.java
index d05e680..20361f4 100644
--- a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridExternalAffinityKeyMapper.java
+++ b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridExternalAffinityKeyMapper.java
@@ -22,7 +22,7 @@ import org.apache.ignite.cache.affinity.*;
 /**
  * Test mapper for P2P class loading tests.
  */
-public class GridExternalAffinityKeyMapper implements CacheAffinityKeyMapper {
+public class GridExternalAffinityKeyMapper implements AffinityKeyMapper {
     /** {@inheritDoc} */
     @Override public Object affinityKey(Object key) {
         if (key instanceof Integer)

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java b/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java
index fbfd16b..1c86d85 100644
--- a/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java
+++ b/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java
@@ -46,8 +46,6 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
 import static org.apache.ignite.cache.hibernate.HibernateRegionFactory.*;
 import static org.hibernate.cfg.Environment.*;
 
-import org.apache.ignite.cache.hibernate.HibernateL2CacheSelfTest.Entity;
-
 /**
  *
  * Tests Hibernate L2 cache.
@@ -425,7 +423,7 @@ public class HibernateL2CacheSelfTest extends GridCommonAbstractTest {
 
         cfg.setBackups(1);
 
-        cfg.setAffinity(new CacheRendezvousAffinityFunction(false, 10));
+        cfg.setAffinity(new RendezvousAffinityFunction(false, 10));
 
         return cfg;
     }
@@ -447,7 +445,7 @@ public class HibernateL2CacheSelfTest extends GridCommonAbstractTest {
 
         cfg.setBackups(1);
 
-        cfg.setAffinity(new CacheRendezvousAffinityFunction(false, 10));
+        cfg.setAffinity(new RendezvousAffinityFunction(false, 10));
 
         return cfg;
     }


Mime
View raw message