ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [14/53] [abbrv] incubator-ignite git commit: # ignite-63
Date Fri, 23 Jan 2015 13:28:10 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicLongApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicLongApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicLongApiSelfTest.java
index 37bc281..3cf6f32 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicLongApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicLongApiSelfTest.java
@@ -30,10 +30,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.*;
 
 /**
  * Cache atomic long api test.
@@ -125,7 +125,7 @@ public class GridCacheAtomicLongApiSelfTest extends GridCommonAbstractTest {
     private void createRemove(String cacheName) throws Exception {
         info("Running test [name=" + getName() + ", cache=" + cacheName + ']');
 
-        GridCache cache = grid().cache(cacheName);
+        Cache cache = grid().cache(cacheName);
 
         assertNotNull(cache);
         assertEquals(0, cache.primarySize());
@@ -134,9 +134,9 @@ public class GridCacheAtomicLongApiSelfTest extends GridCommonAbstractTest {
 
         String atomicName2 = "SECOND";
 
-        GridCacheAtomicLong atomic1 = cache.dataStructures().atomicLong(atomicName1, 0, true);
-        GridCacheAtomicLong atomic2 = cache.dataStructures().atomicLong(atomicName2, 0, true);
-        GridCacheAtomicLong atomic3 = cache.dataStructures().atomicLong(atomicName1, 0, true);
+        CacheAtomicLong atomic1 = cache.dataStructures().atomicLong(atomicName1, 0, true);
+        CacheAtomicLong atomic2 = cache.dataStructures().atomicLong(atomicName2, 0, true);
+        CacheAtomicLong atomic3 = cache.dataStructures().atomicLong(atomicName1, 0, true);
 
         assertNotNull(atomic1);
         assertNotNull(atomic2);
@@ -183,12 +183,12 @@ public class GridCacheAtomicLongApiSelfTest extends GridCommonAbstractTest {
     private void incrementAndGet(String cacheName) throws Exception {
         info("Running test [name=" + getName() + ", cache=" + cacheName + ']');
 
-        GridCache cache = grid().cache(cacheName);
+        Cache cache = grid().cache(cacheName);
 
         assertNotNull(cache);
         assertEquals(0, cache.primarySize());
 
-        GridCacheAtomicLong atomic = cache.dataStructures().atomicLong("atomic", 0, true);
+        CacheAtomicLong atomic = cache.dataStructures().atomicLong("atomic", 0, true);
 
         assertEquals(0, cache.primarySize());
 
@@ -216,12 +216,12 @@ public class GridCacheAtomicLongApiSelfTest extends GridCommonAbstractTest {
     private void getAndIncrement(String cacheName) throws Exception {
         info("Running test [name=" + getName() + ", cache=" + cacheName + ']');
 
-        GridCache cache = grid().cache(cacheName);
+        Cache cache = grid().cache(cacheName);
 
         assertNotNull(cache);
         assertEquals(0, cache.primarySize());
 
-        GridCacheAtomicLong atomic = cache.dataStructures().atomicLong("atomic", 0, true);
+        CacheAtomicLong atomic = cache.dataStructures().atomicLong("atomic", 0, true);
 
         assertEquals(0, cache.primarySize());
 
@@ -249,12 +249,12 @@ public class GridCacheAtomicLongApiSelfTest extends GridCommonAbstractTest {
     private void decrementAndGet(String cacheName) throws Exception {
         info("Running test [name=" + getName() + ", cache=" + cacheName + ']');
 
-        GridCache cache = grid().cache(cacheName);
+        Cache cache = grid().cache(cacheName);
 
         assertNotNull(cache);
         assertEquals(0, cache.primarySize());
 
-        GridCacheAtomicLong atomic = cache.dataStructures().atomicLong("atomic", 0, true);
+        CacheAtomicLong atomic = cache.dataStructures().atomicLong("atomic", 0, true);
 
         assertEquals(0, cache.primarySize());
 
@@ -282,12 +282,12 @@ public class GridCacheAtomicLongApiSelfTest extends GridCommonAbstractTest {
     private void getAndDecrement(String cacheName) throws Exception {
         info("Running test [name=" + getName() + ", cache=" + cacheName + ']');
 
-        GridCache cache = grid().cache(cacheName);
+        Cache cache = grid().cache(cacheName);
 
         assertNotNull(cache);
         assertEquals(0, cache.primarySize());
 
-        GridCacheAtomicLong atomic = cache.dataStructures().atomicLong("atomic", 0, true);
+        CacheAtomicLong atomic = cache.dataStructures().atomicLong("atomic", 0, true);
 
         assertEquals(0, cache.primarySize());
 
@@ -315,12 +315,12 @@ public class GridCacheAtomicLongApiSelfTest extends GridCommonAbstractTest {
     private void getAndAdd(String cacheName) throws Exception {
         info("Running test [name=" + getName() + ", cache=" + cacheName + ']');
 
-        GridCache cache = grid().cache(cacheName);
+        Cache cache = grid().cache(cacheName);
 
         assertNotNull(cache);
         assertEquals(0, cache.primarySize());
 
-        GridCacheAtomicLong atomic = cache.dataStructures().atomicLong("atomic", 0, true);
+        CacheAtomicLong atomic = cache.dataStructures().atomicLong("atomic", 0, true);
 
         assertEquals(0, cache.primarySize());
 
@@ -350,12 +350,12 @@ public class GridCacheAtomicLongApiSelfTest extends GridCommonAbstractTest {
     private void addAndGet(String cacheName) throws Exception {
         info("Running test [name=" + getName() + ", cache=" + cacheName + ']');
 
-        GridCache cache = grid().cache(cacheName);
+        Cache cache = grid().cache(cacheName);
 
         assertNotNull(cache);
         assertEquals(0, cache.primarySize());
 
-        GridCacheAtomicLong atomic = cache.dataStructures().atomicLong("atomic", 0, true);
+        CacheAtomicLong atomic = cache.dataStructures().atomicLong("atomic", 0, true);
 
         assertEquals(0, cache.primarySize());
 
@@ -385,12 +385,12 @@ public class GridCacheAtomicLongApiSelfTest extends GridCommonAbstractTest {
     private void getAndSet(String cacheName) throws Exception {
         info("Running test [name=" + getName() + ", cache=" + cacheName + ']');
 
-        GridCache cache = grid().cache(cacheName);
+        Cache cache = grid().cache(cacheName);
 
         assertNotNull(cache);
         assertEquals(0, cache.primarySize());
 
-        GridCacheAtomicLong atomic = cache.dataStructures().atomicLong("atomic", 0, true);
+        CacheAtomicLong atomic = cache.dataStructures().atomicLong("atomic", 0, true);
 
         assertEquals(0, cache.primarySize());
 
@@ -421,12 +421,12 @@ public class GridCacheAtomicLongApiSelfTest extends GridCommonAbstractTest {
     private void compareAndSet(String cacheName) throws Exception {
         info("Running test [name=" + getName() + ", cache=" + cacheName + ']');
 
-        GridCache cache = grid().cache(cacheName);
+        Cache cache = grid().cache(cacheName);
 
         assertNotNull(cache);
         assertEquals(0, cache.primarySize());
 
-        GridCacheAtomicLong atomic = cache.dataStructures().atomicLong("atomic", 0, true);
+        CacheAtomicLong atomic = cache.dataStructures().atomicLong("atomic", 0, true);
 
         assertEquals(0, cache.primarySize());
 
@@ -463,12 +463,12 @@ public class GridCacheAtomicLongApiSelfTest extends GridCommonAbstractTest {
     private void getAndSetInTx(String cacheName) throws Exception {
         info("Running test [name=" + getName() + ", cache=" + cacheName + ']');
 
-        GridCache cache = grid().cache(cacheName);
+        Cache cache = grid().cache(cacheName);
 
         assertNotNull(cache);
         assertEquals(0, cache.primarySize());
 
-        GridCacheAtomicLong atomic = cache.dataStructures().atomicLong("atomic", 0, true);
+        CacheAtomicLong atomic = cache.dataStructures().atomicLong("atomic", 0, true);
 
         assertEquals(0, cache.primarySize());
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceApiSelfAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceApiSelfAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceApiSelfAbstractTest.java
index 9d24e6f..1bc9d5f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceApiSelfAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceApiSelfAbstractTest.java
@@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache.datastructures;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.Cache;
 import org.apache.ignite.cache.datastructures.*;
 import org.apache.ignite.cache.store.*;
 import org.apache.ignite.configuration.*;
@@ -28,14 +29,13 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
 import org.apache.ignite.testframework.junits.common.*;
 import org.mockito.*;
 
-import javax.cache.*;
 import javax.cache.configuration.*;
 import javax.cache.integration.*;
 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.*;
 
 /**
  * Basic tests for atomic reference.
@@ -89,7 +89,7 @@ public abstract class GridCacheAtomicReferenceApiSelfAbstractTest extends GridCo
                 return null;
             }
 
-            @Override public void write(Cache.Entry entry) throws CacheWriterException {
+            @Override public void write(javax.cache.Cache.Entry entry) throws CacheWriterException {
                 storeCalled.set(true);
             }
 
@@ -123,9 +123,9 @@ public abstract class GridCacheAtomicReferenceApiSelfAbstractTest extends GridCo
         String atomicName2 = UUID.randomUUID().toString();
 
         String initVal = "1";
-        GridCacheAtomicReference<String> atomic1 = grid().cache(null).dataStructures()
+        CacheAtomicReference<String> atomic1 = grid().cache(null).dataStructures()
             .atomicReference(atomicName1, initVal, true);
-        GridCacheAtomicReference<String> atomic2 = grid().cache(null).dataStructures()
+        CacheAtomicReference<String> atomic2 = grid().cache(null).dataStructures()
             .atomicReference(atomicName2, null, true);
 
         assertNotNull(atomic1);
@@ -155,7 +155,7 @@ public abstract class GridCacheAtomicReferenceApiSelfAbstractTest extends GridCo
 
         String initVal = "qwerty";
 
-        GridCacheAtomicReference<String> atomic = grid().cache(null).dataStructures()
+        CacheAtomicReference<String> atomic = grid().cache(null).dataStructures()
             .atomicReference(atomicName, initVal, true);
 
         assertEquals(initVal, atomic.get());
@@ -175,7 +175,7 @@ public abstract class GridCacheAtomicReferenceApiSelfAbstractTest extends GridCo
 
         String initVal = "qwerty";
 
-        GridCacheAtomicReference<String> atomic = grid().cache(null).dataStructures()
+        CacheAtomicReference<String> atomic = grid().cache(null).dataStructures()
             .atomicReference(atomicName, initVal, true);
 
         assertEquals(initVal, atomic.get());
@@ -198,11 +198,11 @@ public abstract class GridCacheAtomicReferenceApiSelfAbstractTest extends GridCo
     public void testNonPersistentMode() throws IgniteCheckedException {
         String atomicName = UUID.randomUUID().toString();
 
-        GridCache<Object, Object> cache = grid().cache(null);
+        Cache<Object, Object> cache = grid().cache(null);
 
         assertNotNull(cache);
 
-        GridCacheAtomicReference<Boolean> atomic = cache.dataStructures().atomicReference(atomicName, false, true);
+        CacheAtomicReference<Boolean> atomic = cache.dataStructures().atomicReference(atomicName, false, true);
 
         atomic.set(true);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceMultiNodeAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceMultiNodeAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceMultiNodeAbstractTest.java
index 299256f..74b5b4d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceMultiNodeAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceMultiNodeAbstractTest.java
@@ -90,14 +90,14 @@ public abstract class GridCacheAtomicReferenceMultiNodeAbstractTest extends Grid
         final String newVal = UUID.randomUUID().toString();
 
         // Initialize atomicReference in cache.
-        GridCacheAtomicReference<String> ref = grid(0).cache(null).dataStructures().atomicReference(refName, val, true);
+        CacheAtomicReference<String> ref = grid(0).cache(null).dataStructures().atomicReference(refName, val, true);
 
         final Ignite ignite = grid(0);
 
         // Execute task on all grid nodes.
         ignite.compute().call(new IgniteCallable<Object>() {
             @Override public String call() throws IgniteCheckedException {
-                GridCacheAtomicReference<String> ref = ignite.cache(null).dataStructures().atomicReference(refName, val, true);
+                CacheAtomicReference<String> ref = ignite.cache(null).dataStructures().atomicReference(refName, val, true);
 
                 assertEquals(val, ref.get());
 
@@ -110,7 +110,7 @@ public abstract class GridCacheAtomicReferenceMultiNodeAbstractTest extends Grid
         // Execute task on all grid nodes.
         ignite.compute().call(new IgniteCallable<String>() {
             @Override public String call() throws IgniteCheckedException {
-                GridCacheAtomicReference<String> ref = ignite.cache(null).dataStructures().atomicReference(refName, val, true);
+                CacheAtomicReference<String> ref = ignite.cache(null).dataStructures().atomicReference(refName, val, true);
 
                 assertEquals(val, ref.get());
 
@@ -123,7 +123,7 @@ public abstract class GridCacheAtomicReferenceMultiNodeAbstractTest extends Grid
         // Execute task on all grid nodes.
         ignite.compute().call(new IgniteCallable<String>() {
             @Override public String call() throws IgniteCheckedException {
-                GridCacheAtomicReference<String> ref = ignite.cache(null).dataStructures().atomicReference(refName, val, true);
+                CacheAtomicReference<String> ref = ignite.cache(null).dataStructures().atomicReference(refName, val, true);
 
                 assertEquals(newVal, ref.get());
 
@@ -150,7 +150,7 @@ public abstract class GridCacheAtomicReferenceMultiNodeAbstractTest extends Grid
         final String newStamp = UUID.randomUUID().toString();
 
         // Initialize atomicStamped in cache.
-        GridCacheAtomicStamped<String, String> stamped = grid(0).cache(null).dataStructures()
+        CacheAtomicStamped<String, String> stamped = grid(0).cache(null).dataStructures()
             .atomicStamped(stampedName, val, stamp, true);
 
         final Ignite ignite = grid(0);
@@ -158,7 +158,7 @@ public abstract class GridCacheAtomicReferenceMultiNodeAbstractTest extends Grid
         // Execute task on all grid nodes.
         ignite.compute().call(new IgniteCallable<String>() {
             @Override public String call() throws IgniteCheckedException {
-                GridCacheAtomicStamped<String, String> stamped = ignite.cache(null).dataStructures()
+                CacheAtomicStamped<String, String> stamped = ignite.cache(null).dataStructures()
                     .atomicStamped(stampedName, val, stamp, true);
 
                 assertEquals(val, stamped.value());
@@ -173,7 +173,7 @@ public abstract class GridCacheAtomicReferenceMultiNodeAbstractTest extends Grid
         // Execute task on all grid nodes.
         ignite.compute().call(new IgniteCallable<String>() {
             @Override public String call() throws IgniteCheckedException {
-                GridCacheAtomicStamped<String, String> stamped = ignite.cache(null).dataStructures()
+                CacheAtomicStamped<String, String> stamped = ignite.cache(null).dataStructures()
                     .atomicStamped(stampedName, val, stamp, true);
 
                 assertEquals(val, stamped.value());
@@ -188,7 +188,7 @@ public abstract class GridCacheAtomicReferenceMultiNodeAbstractTest extends Grid
         // Execute task on all grid nodes.
         ignite.compute().call(new IgniteCallable<String>() {
             @Override public String call() throws IgniteCheckedException {
-                GridCacheAtomicStamped<String, String> stamped = ignite.cache(null).dataStructures()
+                CacheAtomicStamped<String, String> stamped = ignite.cache(null).dataStructures()
                     .atomicStamped(stampedName, val, stamp, true);
 
                 assertEquals(newVal, stamped.value());

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicStampedApiSelfAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicStampedApiSelfAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicStampedApiSelfAbstractTest.java
index b32e436..d6051f7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicStampedApiSelfAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicStampedApiSelfAbstractTest.java
@@ -71,9 +71,9 @@ public abstract class GridCacheAtomicStampedApiSelfAbstractTest extends GridComm
         String initVal = "1";
         String initStamp = "2";
 
-        GridCacheAtomicStamped<String, String> atomic1 = grid().cache(null).dataStructures()
+        CacheAtomicStamped<String, String> atomic1 = grid().cache(null).dataStructures()
             .atomicStamped(atomicName1, initVal, initStamp, true);
-        GridCacheAtomicStamped<String, String> atomic2 = grid().cache(null).dataStructures()
+        CacheAtomicStamped<String, String> atomic2 = grid().cache(null).dataStructures()
             .atomicStamped(atomicName1, null, null, true);
 
         assertNotNull(atomic1);
@@ -107,7 +107,7 @@ public abstract class GridCacheAtomicStampedApiSelfAbstractTest extends GridComm
         String initVal = "qwerty";
         String initStamp = "asdfgh";
 
-        GridCacheAtomicStamped<String, String> atomic = grid().cache(null).dataStructures()
+        CacheAtomicStamped<String, String> atomic = grid().cache(null).dataStructures()
             .atomicStamped(atomicName, initVal, initStamp, true);
 
         assertEquals(initVal, atomic.value());
@@ -132,7 +132,7 @@ public abstract class GridCacheAtomicStampedApiSelfAbstractTest extends GridComm
         String initVal = "qwerty";
         String initStamp = "asdfgh";
 
-        GridCacheAtomicStamped<String, String> atomic = grid().cache(null).dataStructures()
+        CacheAtomicStamped<String, String> atomic = grid().cache(null).dataStructures()
             .atomicStamped(atomicName, initVal, initStamp, true);
 
         assertEquals(initVal, atomic.value());

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheCountDownLatchSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheCountDownLatchSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheCountDownLatchSelfTest.java
index 3b37783..ea1d2ed 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheCountDownLatchSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheCountDownLatchSelfTest.java
@@ -39,9 +39,9 @@ import java.util.concurrent.*;
 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.GridCachePreloadMode.*;
-import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*;
+import static org.apache.ignite.cache.CacheDistributionMode.*;
+import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
 
 /**
  * Cache count down latch self test.
@@ -147,7 +147,7 @@ public class GridCacheCountDownLatchSelfTest extends GridCommonAbstractTest impl
      */
     public void testLatchLocal() throws Exception {
         // Test main functionality.
-        GridCacheCountDownLatch latch = grid(0).cache("local").dataStructures().countDownLatch("latch", 2, false,
+        CacheCountDownLatch latch = grid(0).cache("local").dataStructures().countDownLatch("latch", 2, false,
             true);
 
         assert latch.count() == 2;
@@ -155,7 +155,7 @@ public class GridCacheCountDownLatchSelfTest extends GridCommonAbstractTest impl
         IgniteFuture<?> fut = GridTestUtils.runMultiThreadedAsync(
             new Callable<Object>() {
                 @Nullable @Override public Object call() throws Exception {
-                    GridCacheCountDownLatch latch = grid(0).cache("local").dataStructures()
+                    CacheCountDownLatch latch = grid(0).cache("local").dataStructures()
                         .countDownLatch("latch", 2, false, true);
 
                     assert latch != null && latch.count() == 2;
@@ -203,7 +203,7 @@ public class GridCacheCountDownLatchSelfTest extends GridCommonAbstractTest impl
         checkCountDown(cacheName);
 
         // Test main functionality.
-        GridCacheCountDownLatch latch1 = grid(0).cache(cacheName).dataStructures().countDownLatch("latch", 2, false,
+        CacheCountDownLatch latch1 = grid(0).cache(cacheName).dataStructures().countDownLatch("latch", 2, false,
             true);
 
         assert latch1.count() == 2;
@@ -222,7 +222,7 @@ public class GridCacheCountDownLatchSelfTest extends GridCommonAbstractTest impl
                 IgniteFuture<?> fut = GridTestUtils.runMultiThreadedAsync(
                     new Callable<Object>() {
                         @Nullable @Override public Object call() throws Exception {
-                            GridCacheCountDownLatch latch = ignite.cache(cacheName).dataStructures()
+                            CacheCountDownLatch latch = ignite.cache(cacheName).dataStructures()
                                 .countDownLatch("latch", 2, false, true);
 
                             assert latch != null && latch.count() == 2;
@@ -268,7 +268,7 @@ public class GridCacheCountDownLatchSelfTest extends GridCommonAbstractTest impl
      *
      * @throws Exception If failed.
      */
-    private void checkRemovedLatch(GridCacheCountDownLatch latch) throws Exception {
+    private void checkRemovedLatch(CacheCountDownLatch latch) throws Exception {
         assert latch.removed();
 
         assert latch.count() == 0;
@@ -291,14 +291,14 @@ public class GridCacheCountDownLatchSelfTest extends GridCommonAbstractTest impl
      * @throws Exception Exception.
      */
     private void checkAutoDelete(String cacheName) throws Exception {
-        GridCacheCountDownLatch latch = createLatch(cacheName, "rmv", 5, true);
+        CacheCountDownLatch latch = createLatch(cacheName, "rmv", 5, true);
 
         latch.countDownAll();
 
         // Latch should be removed since autoDelete = true
         checkRemovedLatch(latch);
 
-        GridCacheCountDownLatch latch1 = createLatch(cacheName, "rmv1", 5, false);
+        CacheCountDownLatch latch1 = createLatch(cacheName, "rmv1", 5, false);
 
         latch1.countDownAll();
 
@@ -314,7 +314,7 @@ public class GridCacheCountDownLatchSelfTest extends GridCommonAbstractTest impl
      */
     private void checkAwait(String cacheName) throws Exception {
         // Check only 'false' cases here. Successful await is tested over the grid.
-        GridCacheCountDownLatch latch = createLatch(cacheName, "await", 5, true);
+        CacheCountDownLatch latch = createLatch(cacheName, "await", 5, true);
 
         assert !latch.await(10);
         assert !latch.await(10, MILLISECONDS);
@@ -327,7 +327,7 @@ public class GridCacheCountDownLatchSelfTest extends GridCommonAbstractTest impl
      * @throws Exception Exception.
      */
     private void checkCountDown(String cacheName) throws Exception {
-        GridCacheCountDownLatch latch = createLatch(cacheName, "cnt", 10, true);
+        CacheCountDownLatch latch = createLatch(cacheName, "cnt", 10, true);
 
         assert latch.countDown() == 9;
         assert latch.countDown(2) == 7;
@@ -338,7 +338,7 @@ public class GridCacheCountDownLatchSelfTest extends GridCommonAbstractTest impl
 
         checkRemovedLatch(latch);
 
-        GridCacheCountDownLatch latch1 = createLatch(cacheName, "cnt1", 10, true);
+        CacheCountDownLatch latch1 = createLatch(cacheName, "cnt1", 10, true);
 
         assert latch1.countDown() == 9;
         assert latch1.countDown(2) == 7;
@@ -358,9 +358,9 @@ public class GridCacheCountDownLatchSelfTest extends GridCommonAbstractTest impl
      * @throws Exception If failed.
      * @return New latch.
      */
-    private GridCacheCountDownLatch createLatch(String cacheName, String latchName, int cnt, boolean autoDel)
+    private CacheCountDownLatch createLatch(String cacheName, String latchName, int cnt, boolean autoDel)
         throws Exception {
-        GridCacheCountDownLatch latch = grid(RND.nextInt(NODES_CNT)).cache(cacheName).dataStructures()
+        CacheCountDownLatch latch = grid(RND.nextInt(NODES_CNT)).cache(cacheName).dataStructures()
             .countDownLatch(latchName, cnt, autoDel, true);
 
         // Test initialization.
@@ -379,7 +379,7 @@ public class GridCacheCountDownLatchSelfTest extends GridCommonAbstractTest impl
      */
     private void removeLatch(String cacheName, String latchName)
         throws Exception {
-        GridCacheCountDownLatch latch = grid(RND.nextInt(NODES_CNT)).cache(cacheName).dataStructures()
+        CacheCountDownLatch latch = grid(RND.nextInt(NODES_CNT)).cache(cacheName).dataStructures()
             .countDownLatch(latchName, 10, false, true);
 
         assert latch != null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheMultiNodeDataStructureTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheMultiNodeDataStructureTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheMultiNodeDataStructureTest.java
index 3d4b9b6..8c743f6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheMultiNodeDataStructureTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheMultiNodeDataStructureTest.java
@@ -57,11 +57,11 @@ public class GridCacheMultiNodeDataStructureTest {
      * @throws IgniteCheckedException If failed.
      */
     private static void sample(Ignite g, String cacheName) throws IgniteCheckedException {
-        GridCache<Long, Object> cache = g.cache(cacheName);
+        Cache<Long, Object> cache = g.cache(cacheName);
 
-        GridCacheAtomicLong atomicLong = cache.dataStructures().atomicLong("keygen", 0, true);
+        CacheAtomicLong atomicLong = cache.dataStructures().atomicLong("keygen", 0, true);
 
-        GridCacheAtomicSequence seq = cache.dataStructures().atomicSequence("keygen", 0, true);
+        CacheAtomicSequence seq = cache.dataStructures().atomicSequence("keygen", 0, true);
 
         seq.incrementAndGet();
         seq.incrementAndGet();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueApiSelfAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueApiSelfAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueApiSelfAbstractTest.java
index 2cfc570..88b9991 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueApiSelfAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueApiSelfAbstractTest.java
@@ -80,9 +80,9 @@ public abstract class GridCacheQueueApiSelfAbstractTest extends GridCommonAbstra
         String queueName1 = UUID.randomUUID().toString();
         String queueName2 = UUID.randomUUID().toString();
 
-        GridCacheQueue queue1 = grid().cache(null).dataStructures().queue(queueName1, 0, false, true);
-        GridCacheQueue queue2 = grid().cache(null).dataStructures().queue(queueName2, 0, false, true);
-        GridCacheQueue queue3 = grid().cache(null).dataStructures().queue(queueName1, 0, false, true);
+        CacheQueue queue1 = grid().cache(null).dataStructures().queue(queueName1, 0, false, true);
+        CacheQueue queue2 = grid().cache(null).dataStructures().queue(queueName2, 0, false, true);
+        CacheQueue queue3 = grid().cache(null).dataStructures().queue(queueName1, 0, false, true);
 
         assertNotNull(queue1);
         assertNotNull(queue2);
@@ -108,7 +108,7 @@ public abstract class GridCacheQueueApiSelfAbstractTest extends GridCommonAbstra
 
         String val = UUID.randomUUID().toString();
 
-        GridCacheQueue<String> queue = grid().cache(null).dataStructures().queue(queueName, 0, false, true);
+        CacheQueue<String> queue = grid().cache(null).dataStructures().queue(queueName, 0, false, true);
 
         assert queue.add(val);
 
@@ -126,7 +126,7 @@ public abstract class GridCacheQueueApiSelfAbstractTest extends GridCommonAbstra
 
         String val = UUID.randomUUID().toString();
 
-        GridCacheQueue<String> queue = grid().cache(null).dataStructures().queue(queueName, 0, false, true);
+        CacheQueue<String> queue = grid().cache(null).dataStructures().queue(queueName, 0, false, true);
 
         assert queue.add(val);
 
@@ -145,7 +145,7 @@ public abstract class GridCacheQueueApiSelfAbstractTest extends GridCommonAbstra
         String queueName = UUID.randomUUID().toString();
 
         // TODO was LIFO
-        GridCacheQueue<SameHashItem> queue = grid().cache(null).dataStructures().queue(queueName, 0, false, true);
+        CacheQueue<SameHashItem> queue = grid().cache(null).dataStructures().queue(queueName, 0, false, true);
 
         int retries = 100;
 
@@ -221,7 +221,7 @@ public abstract class GridCacheQueueApiSelfAbstractTest extends GridCommonAbstra
         // Random queue name.
         String queueName = UUID.randomUUID().toString();
 
-        GridCacheQueue<String> queue = grid().cache(null).dataStructures().queue(queueName, 0, false, true);
+        CacheQueue<String> queue = grid().cache(null).dataStructures().queue(queueName, 0, false, true);
 
         assert queue.add("1");
 
@@ -243,7 +243,7 @@ public abstract class GridCacheQueueApiSelfAbstractTest extends GridCommonAbstra
         // Random queue name.
         String queueName = UUID.randomUUID().toString();
 
-        GridCacheQueue<String> queue = grid().cache(null).dataStructures().queue(queueName, 0, true, true);
+        CacheQueue<String> queue = grid().cache(null).dataStructures().queue(queueName, 0, true, true);
 
         String item1 = "1";
         assert queue.add(item1);
@@ -268,7 +268,7 @@ public abstract class GridCacheQueueApiSelfAbstractTest extends GridCommonAbstra
         // Random queue name.
         String queueName = UUID.randomUUID().toString();
 
-        GridCacheQueue<String> queue = grid().cache(null).dataStructures().queue(queueName, 0, false, true);
+        CacheQueue<String> queue = grid().cache(null).dataStructures().queue(queueName, 0, false, true);
 
         for (int i = 0; i < 100; i++)
             assert queue.add(Integer.toString(i));
@@ -324,7 +324,7 @@ public abstract class GridCacheQueueApiSelfAbstractTest extends GridCommonAbstra
         // Random queue name.
         String queueName = UUID.randomUUID().toString();
 
-        GridCacheQueue<String> queue = grid().cache(null).dataStructures()
+        CacheQueue<String> queue = grid().cache(null).dataStructures()
             .queue(queueName, QUEUE_CAPACITY, false, true);
 
         String thName = Thread.currentThread().getName();
@@ -347,7 +347,7 @@ public abstract class GridCacheQueueApiSelfAbstractTest extends GridCommonAbstra
         // Random queue name.
         String queueName = UUID.randomUUID().toString();
 
-        final GridCacheQueue<String> queue = grid().cache(null).dataStructures()
+        final CacheQueue<String> queue = grid().cache(null).dataStructures()
             .queue(queueName, QUEUE_CAPACITY, false, true);
 
         multithreaded(new Callable<String>() {
@@ -376,7 +376,7 @@ public abstract class GridCacheQueueApiSelfAbstractTest extends GridCommonAbstra
         // Random queue name.
         String queueName = UUID.randomUUID().toString();
 
-        final GridCacheQueue<String> queue = grid().cache(null).dataStructures()
+        final CacheQueue<String> queue = grid().cache(null).dataStructures()
             .queue(queueName, QUEUE_CAPACITY, false, true);
 
         multithreaded(new Callable<String>() {
@@ -406,7 +406,7 @@ public abstract class GridCacheQueueApiSelfAbstractTest extends GridCommonAbstra
 
         final AtomicInteger rmvNum = new AtomicInteger(0);
 
-        final GridCacheQueue<String> queue = grid().cache(null).dataStructures()
+        final CacheQueue<String> queue = grid().cache(null).dataStructures()
             .queue(queueName, QUEUE_CAPACITY, false, true);
 
         final CountDownLatch putLatch = new CountDownLatch(THREAD_NUM);
@@ -494,7 +494,7 @@ public abstract class GridCacheQueueApiSelfAbstractTest extends GridCommonAbstra
 
         final AtomicInteger rmvNum = new AtomicInteger(0);
 
-        final GridCacheQueue<String> queue = grid().cache(null).dataStructures()
+        final CacheQueue<String> queue = grid().cache(null).dataStructures()
             .queue(queueName, QUEUE_CAPACITY, false, true);
 
         final CountDownLatch takeLatch = new CountDownLatch(THREAD_NUM);
@@ -615,7 +615,7 @@ public abstract class GridCacheQueueApiSelfAbstractTest extends GridCommonAbstra
         // Random queue name.
         String queueName = UUID.randomUUID().toString();
 
-        GridCacheQueue<String> queue = grid().cache(null).dataStructures()
+        CacheQueue<String> queue = grid().cache(null).dataStructures()
             .queue(queueName, 0, false, true);
 
         String thread = Thread.currentThread().getName();
@@ -641,7 +641,7 @@ public abstract class GridCacheQueueApiSelfAbstractTest extends GridCommonAbstra
         // Random queue name.
         String queueName = UUID.randomUUID().toString();
 
-        final GridCacheQueue<String> queue = grid().cache(null).dataStructures()
+        final CacheQueue<String> queue = grid().cache(null).dataStructures()
             .queue(queueName, 0, false, true);
 
         multithreaded(

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java
index 53dcf59..b123402 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.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.*;
 
 /**
@@ -64,7 +64,7 @@ public class GridCacheQueueCleanupSelfTest extends GridCacheAbstractSelfTest {
     }
 
     /** {@inheritDoc} */
-    @Override protected GridCacheDistributionMode distributionMode() {
+    @Override protected CacheDistributionMode distributionMode() {
         return PARTITIONED_ONLY;
     }
 
@@ -77,7 +77,7 @@ public class GridCacheQueueCleanupSelfTest extends GridCacheAbstractSelfTest {
      * @throws Exception If failed.
      */
     public void testCleanup() throws Exception {
-        GridCacheQueue<Integer> queue = cache().dataStructures().queue(QUEUE_NAME1, 0, false, true);
+        CacheQueue<Integer> queue = cache().dataStructures().queue(QUEUE_NAME1, 0, false, true);
 
         ClusterNode node = grid(0).cache(null).affinity().mapKeyToNode(new GridCacheQueueHeaderKey(QUEUE_NAME1));
 
@@ -211,7 +211,7 @@ public class GridCacheQueueCleanupSelfTest extends GridCacheAbstractSelfTest {
     private IgniteFuture<?> startAddPollThread(final Ignite ignite, final AtomicBoolean stop, final String queueName) {
         return GridTestUtils.runAsync(new Callable<Void>() {
             @Override public Void call() throws Exception {
-                GridCacheQueue<Integer> queue = ignite.cache(null).dataStructures().queue(queueName, 0, false, true);
+                CacheQueue<Integer> queue = ignite.cache(null).dataStructures().queue(queueName, 0, false, true);
 
                 assertEquals(0, queue.size());
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueJoinedNodeSelfAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueJoinedNodeSelfAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueJoinedNodeSelfAbstractTest.java
index 86f2e83..36ecfe1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueJoinedNodeSelfAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueJoinedNodeSelfAbstractTest.java
@@ -76,7 +76,7 @@ public abstract class GridCacheQueueJoinedNodeSelfAbstractTest extends GridCommo
     public void testTakeFromJoined() throws Exception {
         String queueName = UUID.randomUUID().toString();
 
-        GridCacheQueue<Integer> queue = grid(0).cache(null).dataStructures()
+        CacheQueue<Integer> queue = grid(0).cache(null).dataStructures()
             .queue(queueName, 0, true, true);
 
         assertNotNull(queue);
@@ -175,7 +175,7 @@ public abstract class GridCacheQueueJoinedNodeSelfAbstractTest extends GridCommo
                 ", job=" + getClass().getSimpleName() + "]");
 
             try {
-                GridCacheQueue<Integer> queue = ignite.cache(null).dataStructures().queue(queueName, 0, true, false);
+                CacheQueue<Integer> queue = ignite.cache(null).dataStructures().queue(queueName, 0, true, false);
 
                 assertNotNull(queue);
 
@@ -269,7 +269,7 @@ public abstract class GridCacheQueueJoinedNodeSelfAbstractTest extends GridCommo
             Integer lastPolled = null;
 
             try {
-                GridCacheQueue<Integer> queue = ignite.cache(null).dataStructures().queue(queueName, 0, true, false);
+                CacheQueue<Integer> queue = ignite.cache(null).dataStructures().queue(queueName, 0, true, false);
 
                 assertNotNull(queue);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java
index 342d27a..2b8b06e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java
@@ -138,7 +138,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon
     public void testPut() throws Exception {
         String queueName = UUID.randomUUID().toString();
 
-        GridCacheQueue<Integer> queue = grid(0).cache(null).dataStructures().queue(queueName, QUEUE_CAPACITY,
+        CacheQueue<Integer> queue = grid(0).cache(null).dataStructures().queue(queueName, QUEUE_CAPACITY,
             false, true);
 
         assertTrue(queue.isEmpty());
@@ -184,7 +184,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon
                         F.nodeId8s(g.cache(null).affinity().mapKeyToPrimaryAndBackups(
                             new GridCacheInternalKeyImpl(queueName))) + ']');
 
-                    GridCacheQueue<Integer> q = g.cache(null).dataStructures().queue(queueName, 5, true, true);
+                    CacheQueue<Integer> q = g.cache(null).dataStructures().queue(queueName, 5, true, true);
 
                     assert q.isEmpty();
 
@@ -217,7 +217,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon
                             F.nodeId8s(g1.cache(null).affinity().mapKeyToPrimaryAndBackups(
                                 new GridCacheInternalKeyImpl(queueName))) + ']');
 
-                        GridCacheQueue<Integer> q = g1.cache(null).dataStructures().queue(queueName, 5, true, true);
+                        CacheQueue<Integer> q = g1.cache(null).dataStructures().queue(queueName, 5, true, true);
 
                         int cnt = 0;
                         int nullCnt = 0;
@@ -278,9 +278,9 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon
 
             info("Queue name: " + queueName);
 
-            GridCache c = grid(0).cache(null);
+            Cache c = grid(0).cache(null);
 
-            GridCacheQueue<Integer> queue = c.dataStructures().queue(queueName, QUEUE_CAPACITY, false, true);
+            CacheQueue<Integer> queue = c.dataStructures().queue(queueName, QUEUE_CAPACITY, false, true);
 
             assertTrue(queue.isEmpty());
 
@@ -307,7 +307,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon
 
         info("Queue name: " + queueName);
 
-        GridCacheQueue<String> queue = grid(0).cache(null).dataStructures().queue(queueName, QUEUE_CAPACITY,
+        CacheQueue<String> queue = grid(0).cache(null).dataStructures().queue(queueName, QUEUE_CAPACITY,
             false, true);
 
         assertTrue(queue.isEmpty());
@@ -331,7 +331,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon
 
         info("Queue name: " + queueName);
 
-        GridCacheQueue<Integer> queue = grid(0).cache(null).dataStructures().queue(queueName, QUEUE_CAPACITY,
+        CacheQueue<Integer> queue = grid(0).cache(null).dataStructures().queue(queueName, QUEUE_CAPACITY,
             false, true);
 
         assertTrue(queue.isEmpty());
@@ -372,9 +372,9 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon
 
                 futs.add(GridTestUtils.runMultiThreadedAsync(new Callable<Void>() {
                     @Override public Void call() throws Exception {
-                        GridCache cache = grid(idx).cache(null);
+                        Cache cache = grid(idx).cache(null);
 
-                        GridCacheQueue<Integer> queue = cache.dataStructures().queue(queueName, 0, collocated, true);
+                        CacheQueue<Integer> queue = cache.dataStructures().queue(queueName, 0, collocated, true);
 
                         for (int i = 0; i < ITEMS_PER_THREAD; i++)
                             assertTrue(queue.add(i));
@@ -387,9 +387,9 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon
             for (IgniteFuture fut : futs)
                 fut.get();
 
-            GridCache cache = grid(0).cache(null);
+            Cache cache = grid(0).cache(null);
 
-            GridCacheQueue<Integer> queue = cache.dataStructures().queue(queueName, 0, collocated, true);
+            CacheQueue<Integer> queue = cache.dataStructures().queue(queueName, 0, collocated, true);
 
             assertEquals(THREADS_PER_NODE * ITEMS_PER_THREAD * GRID_CNT, queue.size());
 
@@ -443,9 +443,9 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon
 
                 putFuts.add(GridTestUtils.runMultiThreadedAsync(new Callable<Void>() {
                     @Override public Void call() throws Exception {
-                        GridCache cache = grid(idx).cache(null);
+                        Cache cache = grid(idx).cache(null);
 
-                        GridCacheQueue<Integer> queue = cache.dataStructures().queue(queueName, 0, collocated, true);
+                        CacheQueue<Integer> queue = cache.dataStructures().queue(queueName, 0, collocated, true);
 
                         for (int i = 0; i < ITEMS_PER_THREAD; i++)
                             assertTrue(queue.add(i));
@@ -461,9 +461,9 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon
 
                     pollFuts.add(GridTestUtils.runAsync(new Callable<Void>() {
                         @Override public Void call() throws Exception {
-                            GridCache cache = grid(idx).cache(null);
+                            Cache cache = grid(idx).cache(null);
 
-                            GridCacheQueue<Integer> queue = cache.dataStructures().queue(queueName, 0,
+                            CacheQueue<Integer> queue = cache.dataStructures().queue(queueName, 0,
                                 collocated, true);
 
                             while (!stopPoll.get()) {
@@ -487,9 +487,9 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon
             for (IgniteFuture fut : pollFuts)
                 fut.get();
 
-            GridCache cache = grid(0).cache(null);
+            Cache cache = grid(0).cache(null);
 
-            GridCacheQueue<Integer> queue = cache.dataStructures().queue(queueName, 0, collocated, true);
+            CacheQueue<Integer> queue = cache.dataStructures().queue(queueName, 0, collocated, true);
 
             int[] resItems = new int[ITEMS_PER_THREAD];
 
@@ -522,7 +522,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon
 
         info("Queue name: " + queueName);
 
-        GridCacheQueue<Integer> queue = grid(0).cache(null).dataStructures().queue(queueName, QUEUE_CAPACITY, false, true);
+        CacheQueue<Integer> queue = grid(0).cache(null).dataStructures().queue(queueName, QUEUE_CAPACITY, false, true);
 
         assertTrue(queue.isEmpty());
 
@@ -543,7 +543,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon
 
                     grid.log().info("Running job [node=" + grid.cluster().localNode().id() + ", job=" + this + "]");
 
-                    GridCacheQueue<Integer> locQueue = grid.cache(null).dataStructures().queue(queueName,
+                    CacheQueue<Integer> locQueue = grid.cache(null).dataStructures().queue(queueName,
                         QUEUE_CAPACITY, false, true);
 
                     grid.log().info("Queue size " + locQueue.size());
@@ -570,7 +570,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon
         // Random queue name.
         String queueName = UUID.randomUUID().toString();
 
-        final GridCacheQueue<Integer> queue = grid(0).cache(null).dataStructures().queue(queueName, 0, false, true);
+        final CacheQueue<Integer> queue = grid(0).cache(null).dataStructures().queue(queueName, 0, false, true);
 
         assertNotNull(queue);
 
@@ -594,7 +594,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon
      * @param q Queue.
      * @param v Value.
      */
-    private static <T> void put(GridCacheQueue<T> q, T v) {
+    private static <T> void put(CacheQueue<T> q, T v) {
         X.println("Putting value: " + v);
 
         q.put(v);
@@ -607,12 +607,12 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon
      */
     private static class QueueJob implements Callable<Integer>, Serializable {
         /** */
-        private GridCacheQueue<Integer> queue;
+        private CacheQueue<Integer> queue;
 
         /**
          * @param queue Queue.
          */
-        private QueueJob(GridCacheQueue<Integer> queue) {
+        private QueueJob(CacheQueue<Integer> queue) {
             this.queue = queue;
         }
 
@@ -654,7 +654,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon
 
             ignite.log().info("Running job [node=" + ignite.cluster().localNode().id() + ", job=" + this + "]");
 
-            GridCacheQueue<Integer> queue = ignite.cache(null).dataStructures().queue(queueName, QUEUE_CAPACITY,
+            CacheQueue<Integer> queue = ignite.cache(null).dataStructures().queue(queueName, QUEUE_CAPACITY,
                 false, true);
 
             assertNotNull(queue);
@@ -701,7 +701,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon
 
             ignite.log().info("Running job [node=" + ignite.cluster().localNode().id() + ", job=" + this + "]");
 
-            GridCacheQueue<Integer> queue = ignite.cache(null).dataStructures().queue(queueName, QUEUE_CAPACITY,
+            CacheQueue<Integer> queue = ignite.cache(null).dataStructures().queue(queueName, QUEUE_CAPACITY,
                 false, true);
 
             assertNotNull(queue);
@@ -757,7 +757,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon
 
             ignite.log().info("Running job [node=" + ignite.cluster().localNode().id() + ", job=" + this + "]");
 
-            GridCacheQueue<String> queue = ignite.cache(null).dataStructures().queue(queueName, QUEUE_CAPACITY,
+            CacheQueue<String> queue = ignite.cache(null).dataStructures().queue(queueName, QUEUE_CAPACITY,
                 false, true);
 
             assertNotNull(queue);
@@ -809,7 +809,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon
 
             ignite.log().info("Running job [node=" + ignite.cluster().localNode().id() + ", job=" + this + ']');
 
-            GridCacheQueue<Integer> queue = ignite.cache(null).dataStructures().queue(queueName, QUEUE_CAPACITY,
+            CacheQueue<Integer> queue = ignite.cache(null).dataStructures().queue(queueName, QUEUE_CAPACITY,
                 false, true);
 
             assertNotNull(queue);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeConsistencySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeConsistencySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeConsistencySelfTest.java
index e446337..d76f29e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeConsistencySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeConsistencySelfTest.java
@@ -89,7 +89,7 @@ public class GridCacheQueueMultiNodeConsistencySelfTest extends GridCommonAbstra
     public void testIteratorIfNoPreloadingAndBackupDisabled() throws Exception {
         cc.setBackups(0);
         cc.setPreloadPartitionedDelay(-1);
-        cc.setPreloadMode(GridCachePreloadMode.NONE);
+        cc.setPreloadMode(CachePreloadMode.NONE);
 
         checkCacheQueue();
     }
@@ -100,7 +100,7 @@ public class GridCacheQueueMultiNodeConsistencySelfTest extends GridCommonAbstra
     public void testIteratorIfNoPreloadingAndBackupDisabledAndRepartitionForced() throws Exception {
         cc.setBackups(0);
         cc.setPreloadPartitionedDelay(-1);
-        cc.setPreloadMode(GridCachePreloadMode.NONE);
+        cc.setPreloadMode(CachePreloadMode.NONE);
 
         forceRepartition = true;
 
@@ -112,7 +112,7 @@ public class GridCacheQueueMultiNodeConsistencySelfTest extends GridCommonAbstra
      */
     public void testIteratorIfPreloadingIsSyncAndBackupDisabled() throws Exception {
         cc.setBackups(0);
-        cc.setPreloadMode(GridCachePreloadMode.SYNC);
+        cc.setPreloadMode(CachePreloadMode.SYNC);
 
         checkCacheQueue();
     }
@@ -122,7 +122,7 @@ public class GridCacheQueueMultiNodeConsistencySelfTest extends GridCommonAbstra
      */
     public void testIteratorIfPreloadingIsAsyncAndBackupDisabled() throws Exception {
         cc.setBackups(0);
-        cc.setPreloadMode(GridCachePreloadMode.ASYNC);
+        cc.setPreloadMode(CachePreloadMode.ASYNC);
 
         checkCacheQueue();
     }
@@ -133,7 +133,7 @@ public class GridCacheQueueMultiNodeConsistencySelfTest extends GridCommonAbstra
     public void testIteratorIfPreloadingIsSyncAndPartitionedDelayAndBackupDisabled() throws Exception {
         cc.setBackups(0);
         cc.setPreloadPartitionedDelay(PRELOAD_DELAY);
-        cc.setPreloadMode(GridCachePreloadMode.SYNC);
+        cc.setPreloadMode(CachePreloadMode.SYNC);
 
         checkCacheQueue();
     }
@@ -144,7 +144,7 @@ public class GridCacheQueueMultiNodeConsistencySelfTest extends GridCommonAbstra
     public void testIteratorIfPreloadingIsAsyncAndPartitionedDelayAndBackupDisabled() throws Exception {
         cc.setBackups(0);
         cc.setPreloadPartitionedDelay(PRELOAD_DELAY);
-        cc.setPreloadMode(GridCachePreloadMode.ASYNC);
+        cc.setPreloadMode(CachePreloadMode.ASYNC);
 
         checkCacheQueue();
     }
@@ -154,7 +154,7 @@ public class GridCacheQueueMultiNodeConsistencySelfTest extends GridCommonAbstra
      */
     public void testIteratorIfPreloadingIsSyncAndBackupEnabled() throws Exception {
         cc.setBackups(1);
-        cc.setPreloadMode(GridCachePreloadMode.SYNC);
+        cc.setPreloadMode(CachePreloadMode.SYNC);
 
         checkCacheQueue();
     }
@@ -164,7 +164,7 @@ public class GridCacheQueueMultiNodeConsistencySelfTest extends GridCommonAbstra
      */
     public void testIteratorIfPreloadingIsAsyncAndBackupEnabled() throws Exception {
         cc.setBackups(1);
-        cc.setPreloadMode(GridCachePreloadMode.ASYNC);
+        cc.setPreloadMode(CachePreloadMode.ASYNC);
 
         checkCacheQueue();
     }
@@ -174,7 +174,7 @@ public class GridCacheQueueMultiNodeConsistencySelfTest extends GridCommonAbstra
      */
     public void testIteratorIfPreloadingIsSyncAndBackupEnabledAndOneNodeIsKilled() throws Exception {
         cc.setBackups(1);
-        cc.setPreloadMode(GridCachePreloadMode.SYNC);
+        cc.setPreloadMode(CachePreloadMode.SYNC);
 
         stopRandomGrid = true;
 
@@ -186,7 +186,7 @@ public class GridCacheQueueMultiNodeConsistencySelfTest extends GridCommonAbstra
      */
     public void testIteratorIfPreloadingIsAsyncAndBackupEnabledAndOneNodeIsKilled() throws Exception {
         cc.setBackups(1);
-        cc.setPreloadMode(GridCachePreloadMode.ASYNC);
+        cc.setPreloadMode(CachePreloadMode.ASYNC);
 
         stopRandomGrid = true;
 
@@ -204,7 +204,7 @@ public class GridCacheQueueMultiNodeConsistencySelfTest extends GridCommonAbstra
 
         final String queueName = UUID.randomUUID().toString();
 
-        GridCacheQueue<Integer> queue0 = grid(0).cache(null).dataStructures().queue(queueName, QUEUE_CAPACITY,
+        CacheQueue<Integer> queue0 = grid(0).cache(null).dataStructures().queue(queueName, QUEUE_CAPACITY,
             false, true);
 
         assertTrue(queue0.isEmpty());
@@ -223,7 +223,7 @@ public class GridCacheQueueMultiNodeConsistencySelfTest extends GridCommonAbstra
         Ignite newIgnite = startGrid(GRID_CNT + 1);
 
         // Intentionally commented code cause in this way inconsistent queue problem doesn't appear.
-        // GridCacheQueue<Integer> newQueue = newGrid.cache().queue(queueName);
+        // CacheQueue<Integer> newQueue = newGrid.cache().queue(queueName);
         // assertTrue(CollectionUtils.isEqualCollection(queue0, newQueue));
 
         Collection<Integer> locQueueContent = compute(newIgnite.cluster().forLocal()).call(new IgniteCallable<Collection<Integer>>() {
@@ -236,7 +236,7 @@ public class GridCacheQueueMultiNodeConsistencySelfTest extends GridCommonAbstra
 
                 grid.log().info("Running job [node=" + grid.cluster().localNode().id() + ", job=" + this + "]");
 
-                GridCacheQueue<Integer> locQueue = grid.cache(null).dataStructures().queue(queueName, QUEUE_CAPACITY,
+                CacheQueue<Integer> locQueue = grid.cache(null).dataStructures().queue(queueName, QUEUE_CAPACITY,
                     false, true);
 
                 grid.log().info("Queue size " + locQueue.size());

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueRotativeMultiNodeAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueRotativeMultiNodeAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueRotativeMultiNodeAbstractTest.java
index f78a66c..bbed86f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueRotativeMultiNodeAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueRotativeMultiNodeAbstractTest.java
@@ -96,7 +96,7 @@ public abstract class GridCacheQueueRotativeMultiNodeAbstractTest extends GridCo
     public void testPutRotativeNodes() throws Exception {
         String queueName = UUID.randomUUID().toString();
 
-        GridCacheQueue<Integer> queue = grid(0).cache(null).dataStructures().queue(queueName, QUEUE_CAPACITY,
+        CacheQueue<Integer> queue = grid(0).cache(null).dataStructures().queue(queueName, QUEUE_CAPACITY,
             true, true);
 
         assertTrue(queue.isEmpty());
@@ -125,7 +125,7 @@ public abstract class GridCacheQueueRotativeMultiNodeAbstractTest extends GridCo
     public void testPutTakeRotativeNodes() throws Exception {
         String queueName = UUID.randomUUID().toString();
 
-        GridCacheQueue<Integer> queue = grid(0).cache(null).dataStructures().queue(queueName, QUEUE_CAPACITY,
+        CacheQueue<Integer> queue = grid(0).cache(null).dataStructures().queue(queueName, QUEUE_CAPACITY,
             true, true);
 
         assertTrue(queue.isEmpty());
@@ -156,7 +156,7 @@ public abstract class GridCacheQueueRotativeMultiNodeAbstractTest extends GridCo
 
         final String queueName = UUID.randomUUID().toString();
 
-        final GridCacheQueue<Integer> queue = grid(0).cache(null).dataStructures()
+        final CacheQueue<Integer> queue = grid(0).cache(null).dataStructures()
             .queue(queueName, QUEUE_CAPACITY, true, true);
 
         assertTrue(queue.isEmpty());
@@ -184,7 +184,7 @@ public abstract class GridCacheQueueRotativeMultiNodeAbstractTest extends GridCo
 
                 return null;
             }
-        }, GridCacheDataStructureRemovedRuntimeException.class, null);
+        }, CacheDataStructureRemovedRuntimeException.class, null);
 
         info("Queue was removed: " + queue);
 
@@ -221,7 +221,7 @@ public abstract class GridCacheQueueRotativeMultiNodeAbstractTest extends GridCo
 
             ignite.log().info("Running job [node=" + ignite.cluster().localNode().id() + ", job=" + this + "]");
 
-            GridCacheQueue<Integer> queue = ignite.cache(null).dataStructures()
+            CacheQueue<Integer> queue = ignite.cache(null).dataStructures()
                 .queue(queueName, QUEUE_CAPACITY, true, true);
 
             assertNotNull(queue);
@@ -273,7 +273,7 @@ public abstract class GridCacheQueueRotativeMultiNodeAbstractTest extends GridCo
 
             ignite.log().info("Running job [node=" + ignite.cluster().localNode().id() + ", job=" + this + "]");
 
-            GridCacheQueue<String> queue = ignite.cache(null).dataStructures()
+            CacheQueue<String> queue = ignite.cache(null).dataStructures()
                 .queue(queueName, QUEUE_CAPACITY, true, true);
 
             assertNotNull(queue);
@@ -325,7 +325,7 @@ public abstract class GridCacheQueueRotativeMultiNodeAbstractTest extends GridCo
 
             ignite.log().info("Running job [node=" + ignite.cluster().localNode().id() + ", job=" + this + ']');
 
-            GridCacheQueue<Integer> queue = ignite.cache(null).dataStructures()
+            CacheQueue<Integer> queue = ignite.cache(null).dataStructures()
                 .queue(queueName, QUEUE_CAPACITY, true, true);
 
             assertNotNull(queue);
@@ -373,7 +373,7 @@ public abstract class GridCacheQueueRotativeMultiNodeAbstractTest extends GridCo
 
             ignite.log().info("Running job [node=" + ignite.cluster().localNode().id() + ", job=" + this + ']');
 
-            GridCacheQueue<Integer> queue = ignite.cache(null).dataStructures()
+            CacheQueue<Integer> queue = ignite.cache(null).dataStructures()
                 .queue(queueName, QUEUE_CAPACITY, true, true);
 
             assertNotNull(queue);
@@ -421,7 +421,7 @@ public abstract class GridCacheQueueRotativeMultiNodeAbstractTest extends GridCo
 
             ignite.log().info("Running job [node=" + ignite.cluster().localNode().id() + ", job=" + this + "]");
 
-            GridCacheQueue<Integer> queue = ignite.cache(null).dataStructures()
+            CacheQueue<Integer> queue = ignite.cache(null).dataStructures()
                 .queue(queueName, QUEUE_CAPACITY, true, false);
 
             assert queue != null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceApiSelfAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceApiSelfAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceApiSelfAbstractTest.java
index 0d2854f..cee2004 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceApiSelfAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceApiSelfAbstractTest.java
@@ -58,7 +58,7 @@ public abstract class GridCacheSequenceApiSelfAbstractTest extends GridCommonAbs
     private static String[] seqNames = new String[SEQ_NUM];
 
     /** Mandatory sequences. */
-    private static GridCacheAtomicSequence[] seqArr = new GridCacheAtomicSequence[SEQ_NUM];
+    private static CacheAtomicSequence[] seqArr = new CacheAtomicSequence[SEQ_NUM];
 
     /** */
     private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
@@ -99,7 +99,7 @@ public abstract class GridCacheSequenceApiSelfAbstractTest extends GridCommonAbs
         seqArr[2] = grid().cache(null).dataStructures().atomicSequence(seqNames[2], -1 * RND.nextLong(), true);
 
         // Check and change batch size.
-        for (GridCacheAtomicSequence seq : seqArr) {
+        for (CacheAtomicSequence seq : seqArr) {
             assert seq != null;
 
             // Compare with default batch size.
@@ -129,9 +129,9 @@ public abstract class GridCacheSequenceApiSelfAbstractTest extends GridCommonAbs
         String locSeqName1 = UUID.randomUUID().toString();
         String locSeqName2 = UUID.randomUUID().toString();
 
-        GridCacheAtomicSequence locSeq1 = grid().cache(null).dataStructures().atomicSequence(locSeqName1, 0, true);
-        GridCacheAtomicSequence locSeq2 = grid().cache(null).dataStructures().atomicSequence(locSeqName2, 0, true);
-        GridCacheAtomicSequence locSeq3 = grid().cache(null).dataStructures().atomicSequence(locSeqName1, 0, true);
+        CacheAtomicSequence locSeq1 = grid().cache(null).dataStructures().atomicSequence(locSeqName1, 0, true);
+        CacheAtomicSequence locSeq2 = grid().cache(null).dataStructures().atomicSequence(locSeqName2, 0, true);
+        CacheAtomicSequence locSeq3 = grid().cache(null).dataStructures().atomicSequence(locSeqName1, 0, true);
 
         assertNotNull(locSeq1);
         assertNotNull(locSeq2);
@@ -151,7 +151,7 @@ public abstract class GridCacheSequenceApiSelfAbstractTest extends GridCommonAbs
      * @throws Exception If failed.
      */
     public void testAddWrongValue() throws Exception {
-        for (GridCacheAtomicSequence seq : seqArr) {
+        for (CacheAtomicSequence seq : seqArr) {
             try {
                 seq.getAndAdd(-15);
 
@@ -177,7 +177,7 @@ public abstract class GridCacheSequenceApiSelfAbstractTest extends GridCommonAbs
      */
     public void testGetAndIncrement() throws Exception {
         for (int i = 0; i < MAX_LOOPS_NUM; i++) {
-            for (GridCacheAtomicSequence seq : seqArr)
+            for (CacheAtomicSequence seq : seqArr)
                 getAndIncrement(seq);
 
             if (i % 100 == 0)
@@ -190,7 +190,7 @@ public abstract class GridCacheSequenceApiSelfAbstractTest extends GridCommonAbs
      */
     public void testIncrementAndGet() throws Exception {
         for (int i = 0; i < MAX_LOOPS_NUM; i++) {
-            for (GridCacheAtomicSequence seq : seqArr)
+            for (CacheAtomicSequence seq : seqArr)
                 incrementAndGet(seq);
 
             if (i % 100 == 0)
@@ -203,7 +203,7 @@ public abstract class GridCacheSequenceApiSelfAbstractTest extends GridCommonAbs
      */
     public void testAddAndGet() throws Exception {
         for (int i = 1; i < MAX_LOOPS_NUM; i++) {
-            for (GridCacheAtomicSequence seq : seqArr)
+            for (CacheAtomicSequence seq : seqArr)
                 addAndGet(seq, i);
 
             if (i % 100 == 0)
@@ -216,7 +216,7 @@ public abstract class GridCacheSequenceApiSelfAbstractTest extends GridCommonAbs
      */
     public void testGetAndAdd() throws Exception {
         for (int i = 1; i < MAX_LOOPS_NUM; i++) {
-            for (GridCacheAtomicSequence seq : seqArr)
+            for (CacheAtomicSequence seq : seqArr)
                 getAndAdd(seq, i);
 
             if (i % 100 == 0)
@@ -230,7 +230,7 @@ public abstract class GridCacheSequenceApiSelfAbstractTest extends GridCommonAbs
     public void testGetAndAddInTx() throws Exception {
         try (IgniteTx tx = grid().cache(null).txStart(PESSIMISTIC, REPEATABLE_READ)) {
             for (int i = 1; i < MAX_LOOPS_NUM; i++) {
-                for (GridCacheAtomicSequence seq : seqArr)
+                for (CacheAtomicSequence seq : seqArr)
                     getAndAdd(seq, i);
 
                 if (i % 100 == 0)
@@ -248,14 +248,14 @@ public abstract class GridCacheSequenceApiSelfAbstractTest extends GridCommonAbs
         String locSeqName2 = UUID.randomUUID().toString();
 
         // Sequence.
-        GridCacheAtomicSequence locSeq1 = grid().cache(null).dataStructures().atomicSequence(locSeqName1, 0, true);
+        CacheAtomicSequence locSeq1 = grid().cache(null).dataStructures().atomicSequence(locSeqName1, 0, true);
 
         locSeq1.batchSize(1);
 
         // Sequence.
         long initVal = -1500;
 
-        GridCacheAtomicSequence locSeq2 = grid().cache(null).dataStructures().atomicSequence(locSeqName2, initVal, true);
+        CacheAtomicSequence locSeq2 = grid().cache(null).dataStructures().atomicSequence(locSeqName2, initVal, true);
 
         locSeq2.batchSize(7);
 
@@ -298,7 +298,7 @@ public abstract class GridCacheSequenceApiSelfAbstractTest extends GridCommonAbs
     public void testEviction() throws Exception {
         String locSeqName = UUID.randomUUID().toString();
 
-        GridCacheAtomicSequence locSeq = grid().cache(null).dataStructures().atomicSequence(locSeqName, 0, true);
+        CacheAtomicSequence locSeq = grid().cache(null).dataStructures().atomicSequence(locSeqName, 0, true);
 
         locSeq.addAndGet(153);
 
@@ -313,7 +313,7 @@ public abstract class GridCacheSequenceApiSelfAbstractTest extends GridCommonAbs
     public void testRemove() throws Exception {
         String locSeqName = UUID.randomUUID().toString();
 
-        GridCacheAtomicSequence seq = grid().cache(null).dataStructures().atomicSequence(locSeqName, 0, true);
+        CacheAtomicSequence seq = grid().cache(null).dataStructures().atomicSequence(locSeqName, 0, true);
 
         seq.addAndGet(153);
 
@@ -334,7 +334,7 @@ public abstract class GridCacheSequenceApiSelfAbstractTest extends GridCommonAbs
      */
     public void testCacheSets() throws Exception {
         // Make new atomic sequence in cache.
-        GridCacheAtomicSequence seq = grid().cache(null).dataStructures()
+        CacheAtomicSequence seq = grid().cache(null).dataStructures()
             .atomicSequence(UUID.randomUUID().toString(), 0, true);
 
         seq.incrementAndGet();
@@ -370,7 +370,7 @@ public abstract class GridCacheSequenceApiSelfAbstractTest extends GridCommonAbs
      * @throws Exception If failed.
      * @return Result of operation.
      */
-    private long getAndIncrement(GridCacheAtomicSequence seq) throws Exception {
+    private long getAndIncrement(CacheAtomicSequence seq) throws Exception {
         long locSeqVal = seq.get();
 
         assertEquals(locSeqVal, seq.getAndIncrement());
@@ -387,7 +387,7 @@ public abstract class GridCacheSequenceApiSelfAbstractTest extends GridCommonAbs
      * @throws Exception If failed.
      * @return Result of operation.
      */
-    private long incrementAndGet(GridCacheAtomicSequence seq) throws Exception {
+    private long incrementAndGet(CacheAtomicSequence seq) throws Exception {
         long locSeqVal = seq.get();
 
         assertEquals(locSeqVal + 1, seq.incrementAndGet());
@@ -405,7 +405,7 @@ public abstract class GridCacheSequenceApiSelfAbstractTest extends GridCommonAbs
      * @throws Exception If failed.
      * @return Result of operation.
      */
-    private long addAndGet(GridCacheAtomicSequence seq, long l) throws Exception {
+    private long addAndGet(CacheAtomicSequence seq, long l) throws Exception {
         long locSeqVal = seq.get();
 
         assertEquals(locSeqVal + l, seq.addAndGet(l));
@@ -423,7 +423,7 @@ public abstract class GridCacheSequenceApiSelfAbstractTest extends GridCommonAbs
      * @throws Exception If failed.
      * @return Result of operation.
      */
-    private long getAndAdd(GridCacheAtomicSequence seq, long l) throws Exception {
+    private long getAndAdd(CacheAtomicSequence seq, long l) throws Exception {
         long locSeqVal = seq.get();
 
         assertEquals(locSeqVal, seq.getAndAdd(l));
@@ -445,7 +445,7 @@ public abstract class GridCacheSequenceApiSelfAbstractTest extends GridCommonAbs
         String locSeqName = UUID.randomUUID().toString();
 
         // Sequence.
-        GridCacheAtomicSequence locSeq = grid().cache(null).dataStructures().atomicSequence(locSeqName, initVal, true);
+        CacheAtomicSequence locSeq = grid().cache(null).dataStructures().atomicSequence(locSeqName, initVal, true);
 
         locSeq.batchSize(batchSize);
 
@@ -480,7 +480,7 @@ public abstract class GridCacheSequenceApiSelfAbstractTest extends GridCommonAbs
         String locSeqName = UUID.randomUUID().toString();
 
         // Sequence.
-        final GridCacheAtomicSequence locSeq = grid().cache(null).dataStructures().atomicSequence(locSeqName, initVal,
+        final CacheAtomicSequence locSeq = grid().cache(null).dataStructures().atomicSequence(locSeqName, initVal,
             true);
 
         locSeq.batchSize(batchSize);
@@ -550,7 +550,7 @@ public abstract class GridCacheSequenceApiSelfAbstractTest extends GridCommonAbs
      * @param calcVal Manually calculated value.
      * @throws Exception If failed.
      */
-    private void integrity(GridCacheAtomicSequence seq, long calcVal) throws Exception {
+    private void integrity(CacheAtomicSequence seq, long calcVal) throws Exception {
         assert calcVal == seq.get();
 
         getAndAdd(seq, 1);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceMultiNodeAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceMultiNodeAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceMultiNodeAbstractSelfTest.java
index 0c7567e..b63e1a1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceMultiNodeAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceMultiNodeAbstractSelfTest.java
@@ -152,7 +152,7 @@ public abstract class GridCacheSequenceMultiNodeAbstractSelfTest extends GridCom
     public void testMarshalling() throws Exception {
         String seqName = UUID.randomUUID().toString();
 
-        final GridCacheAtomicSequence seq = grid(0).cache(null).dataStructures().atomicSequence(seqName, 0, true);
+        final CacheAtomicSequence seq = grid(0).cache(null).dataStructures().atomicSequence(seqName, 0, true);
 
         grid(1).compute().run(new CAX() {
             @Override public void applyx() throws IgniteCheckedException {
@@ -208,7 +208,7 @@ public abstract class GridCacheSequenceMultiNodeAbstractSelfTest extends GridCom
             if (log.isInfoEnabled())
                 log.info("Running IncrementAndGetJob on node: " + ignite.cluster().localNode().id());
 
-            GridCacheAtomicSequence seq = ignite.cache(null).dataStructures().atomicSequence(seqName, 0, true);
+            CacheAtomicSequence seq = ignite.cache(null).dataStructures().atomicSequence(seqName, 0, true);
 
             assert seq != null;
 
@@ -262,7 +262,7 @@ public abstract class GridCacheSequenceMultiNodeAbstractSelfTest extends GridCom
             if (log.isInfoEnabled())
                 log.info("Running GetAndIncrementJob on node: " + ignite.cluster().localNode().id());
 
-            GridCacheAtomicSequence seq = ignite.cache(null).dataStructures().atomicSequence(seqName, 0, true);
+            CacheAtomicSequence seq = ignite.cache(null).dataStructures().atomicSequence(seqName, 0, true);
 
             assert seq != null;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java
index 302d7ee..b1751d5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java
@@ -33,10 +33,10 @@ 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.*;
-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.*;
 
 /**
  * Cache set tests.
@@ -153,7 +153,7 @@ public abstract class GridCacheSetAbstractSelfTest extends GridCacheAbstractSelf
     }
 
     /** {@inheritDoc} */
-    @Override protected GridCacheDistributionMode distributionMode() {
+    @Override protected CacheDistributionMode distributionMode() {
         return PARTITIONED_ONLY;
     }
 
@@ -184,12 +184,12 @@ public abstract class GridCacheSetAbstractSelfTest extends GridCacheAbstractSelf
         for (int i = 0; i < gridCount(); i++)
             assertNull(cache(i).dataStructures().set(SET_NAME, collocated, false));
 
-        GridCacheSet<Integer> set0 = cache().dataStructures().set(SET_NAME, collocated, true);
+        CacheSet<Integer> set0 = cache().dataStructures().set(SET_NAME, collocated, true);
 
         assertNotNull(set0);
 
         for (int i = 0; i < gridCount(); i++) {
-            GridCacheSet<Integer> set = cache().dataStructures().set(SET_NAME, collocated, true);
+            CacheSet<Integer> set = cache().dataStructures().set(SET_NAME, collocated, true);
 
             assertNotNull(set);
             assertTrue(set.isEmpty());
@@ -392,10 +392,10 @@ public abstract class GridCacheSetAbstractSelfTest extends GridCacheAbstractSelf
      */
     @SuppressWarnings("deprecation")
     private void testIterator(boolean collocated) throws Exception {
-        final GridCacheSet<Integer> set0 = cache().dataStructures().set(SET_NAME, collocated, true);
+        final CacheSet<Integer> set0 = cache().dataStructures().set(SET_NAME, collocated, true);
 
         for (int i = 0; i < gridCount(); i++) {
-            GridCacheSet<Integer> set = cache(i).dataStructures().set(SET_NAME, collocated, false);
+            CacheSet<Integer> set = cache(i).dataStructures().set(SET_NAME, collocated, false);
 
             assertFalse(set.iterator().hasNext());
         }
@@ -410,7 +410,7 @@ public abstract class GridCacheSetAbstractSelfTest extends GridCacheAbstractSelf
         }
 
         for (int i = 0; i < gridCount(); i++) {
-            GridCacheSet<Integer> set = cache(i).dataStructures().set(SET_NAME, collocated, false);
+            CacheSet<Integer> set = cache(i).dataStructures().set(SET_NAME, collocated, false);
 
             assertSetContent(set, cnt);
         }
@@ -436,7 +436,7 @@ public abstract class GridCacheSetAbstractSelfTest extends GridCacheAbstractSelf
         set0.clear();
 
         for (int i = 0; i < gridCount(); i++) {
-            GridCacheSet<Integer> set = cache(i).dataStructures().set(SET_NAME, collocated, false);
+            CacheSet<Integer> set = cache(i).dataStructures().set(SET_NAME, collocated, false);
 
             assertFalse(set.iterator().hasNext());
         }
@@ -482,7 +482,7 @@ public abstract class GridCacheSetAbstractSelfTest extends GridCacheAbstractSelf
      */
     @SuppressWarnings({"BusyWait", "ErrorNotRethrown"})
     private void testIteratorClose(boolean collocated) throws Exception {
-        GridCacheSet<Integer> set0 = cache().dataStructures().set(SET_NAME, collocated, true);
+        CacheSet<Integer> set0 = cache().dataStructures().set(SET_NAME, collocated, true);
 
         for (int i = 0; i < 5000; i++)
             assertTrue(set0.add(i));
@@ -533,7 +533,7 @@ public abstract class GridCacheSetAbstractSelfTest extends GridCacheAbstractSelf
     /**
      * @param set Set.
      */
-    private void createIterators(GridCacheSet<Integer> set) {
+    private void createIterators(CacheSet<Integer> set) {
         for (int i = 0; i < 10; i++) {
             Iterator<Integer> iter = set.iterator();
 
@@ -581,12 +581,12 @@ public abstract class GridCacheSetAbstractSelfTest extends GridCacheAbstractSelf
         startGrid(gridCount());
 
         try {
-            GridCacheSet<Integer> set1 = cache().dataStructures().set(SET_NAME, collocated, false);
+            CacheSet<Integer> set1 = cache().dataStructures().set(SET_NAME, collocated, false);
 
             assertNotNull(set1);
 
             for (int i = 0; i < gridCount() + 1; i++) {
-                GridCacheSet<Integer> set = cache(i).dataStructures().set(SET_NAME, collocated, false);
+                CacheSet<Integer> set = cache(i).dataStructures().set(SET_NAME, collocated, false);
 
                 assertEquals(ITEMS, set.size());
 
@@ -598,7 +598,7 @@ public abstract class GridCacheSetAbstractSelfTest extends GridCacheAbstractSelf
         }
 
         for (int i = 0; i < gridCount(); i++) {
-            GridCacheSet<Integer> set = cache(i).dataStructures().set(SET_NAME, collocated, false);
+            CacheSet<Integer> set = cache(i).dataStructures().set(SET_NAME, collocated, false);
 
             assertSetContent(set, ITEMS);
         }
@@ -679,9 +679,9 @@ public abstract class GridCacheSetAbstractSelfTest extends GridCacheAbstractSelf
 
             futs.add(GridTestUtils.runMultiThreadedAsync(new Callable<Void>() {
                 @Override public Void call() throws Exception {
-                    GridCache cache = grid(idx).cache(null);
+                    Cache cache = grid(idx).cache(null);
 
-                    GridCacheSet<Integer> set = cache.dataStructures().set(SET_NAME, collocated, false);
+                    CacheSet<Integer> set = cache.dataStructures().set(SET_NAME, collocated, false);
 
                     assertNotNull(set);
 
@@ -755,7 +755,7 @@ public abstract class GridCacheSetAbstractSelfTest extends GridCacheAbstractSelf
         final Collection<Set<Integer>> sets = new ArrayList<>();
 
         for (int i = 0; i < gridCount(); i++) {
-            GridCacheSet<Integer> set = cache(i).dataStructures().set(SET_NAME, collocated, false);
+            CacheSet<Integer> set = cache(i).dataStructures().set(SET_NAME, collocated, false);
 
             assertNotNull(set);
 
@@ -786,7 +786,7 @@ public abstract class GridCacheSetAbstractSelfTest extends GridCacheAbstractSelf
                                 set.add(val.incrementAndGet());
                         }
                     }
-                    catch (GridCacheDataStructureRemovedRuntimeException e) {
+                    catch (CacheDataStructureRemovedRuntimeException e) {
                         log.info("Set removed: " + e);
                     }
 
@@ -828,7 +828,7 @@ public abstract class GridCacheSetAbstractSelfTest extends GridCacheAbstractSelf
 
                     return null;
                 }
-            }, GridCacheDataStructureRemovedRuntimeException.class, null);
+            }, CacheDataStructureRemovedRuntimeException.class, null);
         }
     }
 
@@ -836,7 +836,7 @@ public abstract class GridCacheSetAbstractSelfTest extends GridCacheAbstractSelf
      * @throws Exception If failed.
      */
     public void testSerialization() throws Exception {
-        final GridCacheSet<Integer> set = cache().dataStructures().set(SET_NAME, false, true);
+        final CacheSet<Integer> set = cache().dataStructures().set(SET_NAME, false, true);
 
         assertNotNull(set);
 
@@ -861,7 +861,7 @@ public abstract class GridCacheSetAbstractSelfTest extends GridCacheAbstractSelf
      * @param set Set.
      * @param size Expected size.
      */
-    private void assertSetContent(GridCacheSet<Integer> set, int size) {
+    private void assertSetContent(CacheSet<Integer> set, int size) {
         Collection<Integer> data = new HashSet<>(size);
 
         for (Integer val : set)

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetFailoverAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetFailoverAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetFailoverAbstractSelfTest.java
index 2e41619..67d8300 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetFailoverAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetFailoverAbstractSelfTest.java
@@ -32,7 +32,7 @@ import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 
 import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*;
-import static org.apache.ignite.cache.GridCacheDistributionMode.*;
+import static org.apache.ignite.cache.CacheDistributionMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
 
 /**
@@ -98,7 +98,7 @@ public class GridCacheSetFailoverAbstractSelfTest extends GridCacheAbstractSelfT
      */
     @SuppressWarnings("WhileLoopReplaceableByForEach")
     public void testNodeRestart() throws Exception {
-        GridCacheSet<Integer> set = cache().dataStructures().set(SET_NAME, false, true);
+        CacheSet<Integer> set = cache().dataStructures().set(SET_NAME, false, true);
 
         final int ITEMS = 10_000;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalQueueApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalQueueApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalQueueApiSelfTest.java
index 93ecb5c..4e563d5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalQueueApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalQueueApiSelfTest.java
@@ -22,7 +22,7 @@ import org.apache.ignite.configuration.*;
 import org.apache.ignite.internal.processors.cache.datastructures.*;
 
 import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
 
 /**
  * Queue tests with local cache.


Mime
View raw message