ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sevdoki...@apache.org
Subject [04/35] incubator-ignite git commit: IGNITE-96 Changed tests on client module to JCache API.
Date Tue, 10 Feb 2015 16:15:48 GMT
IGNITE-96 Changed tests on client module to JCache API.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7e9b0c1c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7e9b0c1c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7e9b0c1c

Branch: refs/heads/ignite-96
Commit: 7e9b0c1cdba37db20a09c2a2c1f6e89bd9b6df48
Parents: bf7d876
Author: nikolay_tikhonov <ntikhonov@gridgain.com>
Authored: Mon Feb 9 15:59:20 2015 +0300
Committer: nikolay_tikhonov <ntikhonov@gridgain.com>
Committed: Mon Feb 9 15:59:38 2015 +0300

----------------------------------------------------------------------
 .../ClientAbstractMultiThreadedSelfTest.java    |  28 +--
 .../ClientTestPortableAffinityKeyTask.java      |   4 +-
 .../ClientAbstractMultiNodeSelfTest.java        |  12 +-
 .../integration/ClientAbstractSelfTest.java     | 195 ++++++++---------
 .../rest/AbstractRestProcessorSelfTest.java     |   1 +
 .../rest/RestBinaryProtocolSelfTest.java        | 211 ++++++++++---------
 .../rest/RestMemcacheProtocolSelfTest.java      |  80 +++----
 .../processors/rest/RestProcessorTest.java      |   2 +-
 .../ignite/jdbc/JdbcComplexQuerySelfTest.java   |   5 +-
 .../ignite/jdbc/JdbcLocalCachesSelfTest.java    |  14 +-
 .../ignite/jdbc/JdbcMetadataSelfTest.java       |   5 +-
 .../jdbc/JdbcPreparedStatementSelfTest.java     |   4 +-
 .../ignite/jdbc/JdbcResultSetSelfTest.java      |   3 +-
 .../ignite/jdbc/JdbcStatementSelfTest.java      |   3 +-
 .../loadtests/client/ClientTcpSslLoadTest.java  |   6 +-
 15 files changed, 294 insertions(+), 279 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e9b0c1c/modules/clients/src/test/java/org/apache/ignite/client/ClientAbstractMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/client/ClientAbstractMultiThreadedSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/ClientAbstractMultiThreadedSelfTest.java
index 4552547..8bded32 100644
--- a/modules/clients/src/test/java/org/apache/ignite/client/ClientAbstractMultiThreadedSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/client/ClientAbstractMultiThreadedSelfTest.java
@@ -18,7 +18,6 @@
 package org.apache.ignite.client;
 
 import org.apache.ignite.*;
-import org.apache.ignite.cache.affinity.*;
 import org.apache.ignite.client.balancer.*;
 import org.apache.ignite.client.impl.*;
 import org.apache.ignite.client.ssl.*;
@@ -26,7 +25,6 @@ import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.affinity.*;
 import org.apache.ignite.internal.util.typedef.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.lang.*;
@@ -46,7 +44,6 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*;
 import static org.apache.ignite.cache.CacheDistributionMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
 import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
-import static org.apache.ignite.testframework.GridTestUtils.*;
 
 /**
  *
@@ -281,7 +278,7 @@ public abstract class ClientAbstractMultiThreadedSelfTest extends GridCommonAbst
         final String key = "k0";
 
         Collection<UUID> affNodesIds = F.viewReadOnly(
-            grid(0).cache(data.cacheName()).affinity().mapKeyToPrimaryAndBackups(key),
+            affinity(grid(0).jcache(data.cacheName())).mapKeyToPrimaryAndBackups(key),
             F.node2id());
 
         final GridClientData dataFirst = data.pinNodes(F.first(client.compute().nodes()));
@@ -467,11 +464,11 @@ public abstract class ClientAbstractMultiThreadedSelfTest extends GridCommonAbst
 
             ClusterNode node = ignite.cluster().mapKeyToNode(PARTITIONED_CACHE_NAME, key);
 
-            if (!puts.get(key).get2().equals(gridMap.get(node.id()).cache(PARTITIONED_CACHE_NAME).peek(key))) {
+            if (!puts.get(key).get2().equals(gridMap.get(node.id()).jcache(PARTITIONED_CACHE_NAME).peek(key))) {
                 // printAffinityState(gridMap.values());
 
                 failNotEquals("Node don't have value for key [nodeId=" + node.id() + ", key=" + key + "]",
-                    puts.get(key).get2(), gridMap.get(node.id()).cache(PARTITIONED_CACHE_NAME).peek(key));
+                    puts.get(key).get2(), gridMap.get(node.id()).jcache(PARTITIONED_CACHE_NAME).peek(key));
             }
 
             // Assert that client has properly determined affinity node.
@@ -492,26 +489,11 @@ public abstract class ClientAbstractMultiThreadedSelfTest extends GridCommonAbst
 
             // Check that no other nodes see this key.
             for (UUID id : F.view(gridMap.keySet(), F.notEqualTo(node.id())))
-                assertNull("Got value in near cache.", gridMap.get(id).cache(PARTITIONED_CACHE_NAME).peek(key));
+                assertNull("Got value in near cache.", gridMap.get(id).jcache(PARTITIONED_CACHE_NAME).peek(key));
         }
 
         for (Ignite g : gridMap.values())
-            g.cache(PARTITIONED_CACHE_NAME).clear();
-    }
-
-    /**
-     * @param grids Collection for Grids to print affinity info.
-     */
-    private void printAffinityState(Iterable<Ignite> grids) {
-        for (Ignite g : grids) {
-            GridAffinityAssignmentCache affCache = getFieldValue(
-                ((IgniteKernal)g).internalCache(PARTITIONED_CACHE_NAME).context().affinity(),
-                "aff");
-
-            CacheAffinityFunction aff = getFieldValue(affCache, "aff");
-
-            info("Affinity [nodeId=" + g.cluster().localNode().id() + ", affinity=" + aff + "]");
-        }
+            g.jcache(PARTITIONED_CACHE_NAME).clear();
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e9b0c1c/modules/clients/src/test/java/org/apache/ignite/client/ClientTestPortableAffinityKeyTask.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/client/ClientTestPortableAffinityKeyTask.java b/modules/clients/src/test/java/org/apache/ignite/client/ClientTestPortableAffinityKeyTask.java
index cde3a0d..84ce7e1 100644
--- a/modules/clients/src/test/java/org/apache/ignite/client/ClientTestPortableAffinityKeyTask.java
+++ b/modules/clients/src/test/java/org/apache/ignite/client/ClientTestPortableAffinityKeyTask.java
@@ -72,12 +72,12 @@ public class ClientTestPortableAffinityKeyTask extends ComputeTaskAdapter<Object
 
         String expAffKey = (String)it.next();
 
-        Object affKey = ignite.cache(cacheName).affinity().affinityKey(obj);
+        Object affKey = ignite.affinity(cacheName).affinityKey(obj);
 
         if (!expAffKey.equals(affKey))
             throw new IgniteException("Unexpected affinity key: " + affKey);
 
-        if (!ignite.cache(cacheName).affinity().mapKeyToNode(obj).isLocal())
+        if (!ignite.affinity(cacheName).mapKeyToNode(obj).isLocal())
             throw new IgniteException("Job is not run on primary node.");
 
         return true;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e9b0c1c/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractMultiNodeSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractMultiNodeSelfTest.java
index cfa0cc6..34a74d3 100644
--- a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractMultiNodeSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractMultiNodeSelfTest.java
@@ -401,12 +401,12 @@ public abstract class ClientAbstractMultiNodeSelfTest extends GridCommonAbstract
     public void testInvalidateFlag() throws Exception {
         IgniteEx g0 = grid(0);
 
-        GridCache<String, String> cache = g0.cache(PARTITIONED_CACHE_NAME);
+        IgniteCache<String, String> cache = g0.jcache(PARTITIONED_CACHE_NAME);
 
         String key = null;
 
         for (int i = 0; i < 10_000; i++) {
-            if (!cache.affinity().isPrimaryOrBackup(g0.localNode(), String.valueOf(i))) {
+            if (!affinity(cache).isPrimaryOrBackup(g0.localNode(), String.valueOf(i))) {
                 key = String.valueOf(i);
 
                 break;
@@ -424,9 +424,9 @@ public abstract class ClientAbstractMultiNodeSelfTest extends GridCommonAbstract
         d.flagsOn(GridClientCacheFlag.INVALIDATE).put(key, "zzz");
 
         for (Ignite g : G.allGrids()) {
-            cache = g.cache(PARTITIONED_CACHE_NAME);
+            cache = g.jcache(PARTITIONED_CACHE_NAME);
 
-            if (cache.affinity().isPrimaryOrBackup(g.cluster().localNode(), key))
+            if (affinity(cache).isPrimaryOrBackup(g.cluster().localNode(), key))
                 assertEquals("zzz", cache.peek(key));
             else
                 assertNull(cache.peek(key));
@@ -619,7 +619,7 @@ public abstract class ClientAbstractMultiNodeSelfTest extends GridCommonAbstract
             partitioned.put(key, "val" + key);
 
             for (Map.Entry<UUID, Ignite> entry : gridsByLocNode.entrySet()) {
-                Object val = entry.getValue().cache(PARTITIONED_CACHE_NAME).peek(key);
+                Object val = entry.getValue().jcache(PARTITIONED_CACHE_NAME).peek(key);
 
                 if (primaryNodeId.equals(entry.getKey()))
                     assertEquals("val" + key, val);
@@ -641,7 +641,7 @@ public abstract class ClientAbstractMultiNodeSelfTest extends GridCommonAbstract
             partitioned.pinNodes(node).put(pinnedKey, "val" + pinnedKey);
 
             for (Map.Entry<UUID, Ignite> entry : gridsByLocNode.entrySet()) {
-                Object val = entry.getValue().cache(PARTITIONED_CACHE_NAME).peek(pinnedKey);
+                Object val = entry.getValue().jcache(PARTITIONED_CACHE_NAME).peek(pinnedKey);
 
                 if (primaryNodeId.equals(entry.getKey()) || pinnedNodeId.equals(entry.getKey()))
                     assertEquals("val" + pinnedKey, val);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e9b0c1c/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java
index de5b0e9..1dfb3dc 100644
--- a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java
@@ -19,6 +19,7 @@ package org.apache.ignite.client.integration;
 
 import junit.framework.*;
 import net.sf.json.*;
+import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
 import org.apache.ignite.cache.affinity.consistenthash.*;
 import org.apache.ignite.cache.store.*;
@@ -130,8 +131,8 @@ public abstract class ClientAbstractSelfTest extends GridCommonAbstractTest {
         for (HashMapStore cacheStore : cacheStores.values())
             cacheStore.map.clear();
 
-        grid().cache(null).clear();
-        grid().cache(CACHE_NAME).clear();
+        grid().jcache(null).clear();
+        grid().jcache(CACHE_NAME).clear();
 
         INTERCEPTED_OBJECTS.clear();
     }
@@ -462,8 +463,8 @@ public abstract class ClientAbstractSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testPut() throws Exception {
-        GridCache<String, String> dfltCache = grid().cache(null);
-        GridCache<Object, Object> namedCache = grid().cache(CACHE_NAME);
+        IgniteCache<String, String> dfltCache = grid().jcache(null);
+        IgniteCache<Object, Object> namedCache = grid().jcache(CACHE_NAME);
 
         GridClientData dfltData = client.data();
 
@@ -543,7 +544,7 @@ public abstract class ClientAbstractSelfTest extends GridCommonAbstractTest {
 
         dfltData.putAll(F.asMap("key1", "val1", "key2", "val2"));
 
-        Map<String, String> map = grid().<String, String>cache(null).getAll(F.asList("key1", "key2"));
+        Map<String, String> map = grid().<String, String>jcache(null).getAll(F.asSet("key1", "key2"));
 
         assertEquals(2, map.size());
         assertEquals("val1", map.get("key1"));
@@ -551,7 +552,7 @@ public abstract class ClientAbstractSelfTest extends GridCommonAbstractTest {
 
         dfltData.putAllAsync(F.asMap("key3", "val3", "key4", "val4")).get();
 
-        map = grid().<String, String>cache(null).getAll(F.asList("key3", "key4"));
+        map = grid().<String, String>jcache(null).getAll(F.asSet("key3", "key4"));
 
         assertEquals(2, map.size());
         assertEquals("val3", map.get("key3"));
@@ -559,7 +560,7 @@ public abstract class ClientAbstractSelfTest extends GridCommonAbstractTest {
 
         namedData.putAll(F.asMap("key1", "val1", "key2", "val2"));
 
-        map = grid().<String, String>cache(CACHE_NAME).getAll(F.asList("key1", "key2"));
+        map = grid().<String, String>jcache(CACHE_NAME).getAll(F.asSet("key1", "key2"));
 
         assertEquals(2, map.size());
         assertEquals("val1", map.get("key1"));
@@ -567,7 +568,7 @@ public abstract class ClientAbstractSelfTest extends GridCommonAbstractTest {
 
         namedData.putAllAsync(F.asMap("key3", "val3", "key4", "val4")).get();
 
-        map = grid().<String, String>cache(CACHE_NAME).getAll(F.asList("key3", "key4"));
+        map = grid().<String, String>jcache(CACHE_NAME).getAll(F.asSet("key3", "key4"));
 
         assertEquals(2, map.size());
         assertEquals("val3", map.get("key3"));
@@ -588,7 +589,7 @@ public abstract class ClientAbstractSelfTest extends GridCommonAbstractTest {
 
         dfltData.putAll(F.asMap("", "val1"));
 
-        assertEquals(F.asMap("", "val1"), grid().<String, String>cache(null).getAll(F.asList("")));
+        assertEquals(F.asMap("", "val1"), grid().<String, String>jcache(null).getAll(F.asSet("")));
 
         GridClientProtocol proto = clientConfiguration().getProtocol();
 
@@ -629,12 +630,12 @@ public abstract class ClientAbstractSelfTest extends GridCommonAbstractTest {
 
         assertNotNull(namedData);
 
-        assertTrue(grid().cache(null).putx("key", "val"));
+        grid().jcache(null).put("key", "val");
 
         Assert.assertEquals("val", dfltData.get("key"));
         Assert.assertEquals("val", dfltData.getAsync("key").get());
 
-        assertTrue(grid().cache(CACHE_NAME).putx("key", "val"));
+        grid().jcache(CACHE_NAME).put("key", "val");
 
         Assert.assertEquals("val", namedData.get("key"));
         Assert.assertEquals("val", namedData.getAsync("key").get());
@@ -652,8 +653,8 @@ public abstract class ClientAbstractSelfTest extends GridCommonAbstractTest {
 
         assertNotNull(namedData);
 
-        assertTrue(grid().cache(null).putx("key1", "val1"));
-        assertTrue(grid().cache(null).putx("key2", "val2"));
+        grid().jcache(null).put("key1", "val1");
+        grid().jcache(null).put("key2", "val2");
 
         Map<String, String> map = dfltData.getAll(F.asList("key1", "key2"));
 
@@ -661,8 +662,8 @@ public abstract class ClientAbstractSelfTest extends GridCommonAbstractTest {
         assertEquals("val1", map.get("key1"));
         assertEquals("val2", map.get("key2"));
 
-        assertTrue(grid().cache(null).putx("key3", "val3"));
-        assertTrue(grid().cache(null).putx("key4", "val4"));
+        grid().jcache(null).put("key3", "val3");
+        grid().jcache(null).put("key4", "val4");
 
         map = dfltData.getAll(F.asList("key3", "key4"));
 
@@ -675,8 +676,8 @@ public abstract class ClientAbstractSelfTest extends GridCommonAbstractTest {
         assertEquals(1, map.size());
         assertEquals("val1", map.get("key1"));
 
-        assertTrue(grid().cache(CACHE_NAME).putx("key1", "val1"));
-        assertTrue(grid().cache(CACHE_NAME).putx("key2", "val2"));
+        grid().jcache(CACHE_NAME).put("key1", "val1");
+        grid().jcache(CACHE_NAME).put("key2", "val2");
 
         map = namedData.getAll(F.asList("key1", "key2"));
 
@@ -684,8 +685,8 @@ public abstract class ClientAbstractSelfTest extends GridCommonAbstractTest {
         assertEquals("val1", map.get("key1"));
         assertEquals("val2", map.get("key2"));
 
-        assertTrue(grid().cache(CACHE_NAME).putx("key3", "val3"));
-        assertTrue(grid().cache(CACHE_NAME).putx("key4", "val4"));
+        grid().jcache(CACHE_NAME).put("key3", "val3");
+        grid().jcache(CACHE_NAME).put("key4", "val4");
 
         map = namedData.getAll(F.asList("key3", "key4"));
 
@@ -712,27 +713,27 @@ public abstract class ClientAbstractSelfTest extends GridCommonAbstractTest {
 
         assertNotNull(namedData);
 
-        assertTrue(grid().cache(null).putx("key1", "val1"));
-        assertTrue(grid().cache(null).putx("key2", "val2"));
+        grid().jcache(null).put("key1", "val1");
+        grid().jcache(null).put("key2", "val2");
 
         assertTrue(dfltData.remove("key1"));
         assertTrue(dfltData.removeAsync("key2").get());
         assertFalse(dfltData.remove("wrongKey"));
         assertFalse(dfltData.removeAsync("wrongKey").get());
 
-        assertNull(grid().cache(null).get("key1"));
-        assertNull(grid().cache(null).get("key2"));
+        assertNull(grid().jcache(null).get("key1"));
+        assertNull(grid().jcache(null).get("key2"));
 
-        assertTrue(grid().cache(CACHE_NAME).putx("key1", "val1"));
-        assertTrue(grid().cache(CACHE_NAME).putx("key2", "val2"));
+        grid().jcache(CACHE_NAME).put("key1", "val1");
+        grid().jcache(CACHE_NAME).put("key2", "val2");
 
         assertTrue(namedData.remove("key1"));
         assertTrue(namedData.removeAsync("key2").get());
         assertFalse(namedData.remove("wrongKey"));
         assertFalse(namedData.removeAsync("wrongKey").get());
 
-        assertNull(grid().cache(CACHE_NAME).get("key1"));
-        assertNull(grid().cache(CACHE_NAME).get("key2"));
+        assertNull(grid().jcache(CACHE_NAME).get("key1"));
+        assertNull(grid().jcache(CACHE_NAME).get("key2"));
     }
 
     /**
@@ -742,7 +743,7 @@ public abstract class ClientAbstractSelfTest extends GridCommonAbstractTest {
         GridClientData namedData = client.data(CACHE_NAME).flagsOn(GridClientCacheFlag.SKIP_STORE);
 
         // test keyA
-        assertTrue(grid().cache(CACHE_NAME).putx("keyA", "valA"));
+        grid().jcache(CACHE_NAME).put("keyA", "valA");
         assertTrue(namedData.remove("keyA"));
         assertEquals("valA", cacheStores.get(CACHE_NAME).map.get("keyA"));
         assertNull(namedData.get("keyA"));
@@ -761,7 +762,7 @@ public abstract class ClientAbstractSelfTest extends GridCommonAbstractTest {
 
         assertTrue(namedData.put("k", "v"));
 
-        assertTrue(grid().cache(CACHE_NAME).evict("k"));
+        grid().jcache(CACHE_NAME).evict("k");
 
         assertNull(namedData.flagsOn(GridClientCacheFlag.SKIP_SWAP, GridClientCacheFlag.SKIP_STORE).get("k"));
         assertEquals("v", namedData.flagsOn(GridClientCacheFlag.SKIP_STORE).get("k"));
@@ -779,31 +780,31 @@ public abstract class ClientAbstractSelfTest extends GridCommonAbstractTest {
 
         assertNotNull(namedData);
 
-        assertTrue(grid().cache(null).putx("key1", "val1"));
-        assertTrue(grid().cache(null).putx("key2", "val2"));
-        assertTrue(grid().cache(null).putx("key3", "val3"));
-        assertTrue(grid().cache(null).putx("key4", "val4"));
+        grid().jcache(null).put("key1", "val1");
+        grid().jcache(null).put("key2", "val2");
+        grid().jcache(null).put("key3", "val3");
+        grid().jcache(null).put("key4", "val4");
 
         dfltData.removeAll(F.asList("key1", "key2"));
         dfltData.removeAllAsync(F.asList("key3", "key4")).get();
 
-        assertNull(grid().cache(null).get("key1"));
-        assertNull(grid().cache(null).get("key2"));
-        assertNull(grid().cache(null).get("key3"));
-        assertNull(grid().cache(null).get("key4"));
+        assertNull(grid().jcache(null).get("key1"));
+        assertNull(grid().jcache(null).get("key2"));
+        assertNull(grid().jcache(null).get("key3"));
+        assertNull(grid().jcache(null).get("key4"));
 
-        assertTrue(grid().cache(CACHE_NAME).putx("key1", "val1"));
-        assertTrue(grid().cache(CACHE_NAME).putx("key2", "val2"));
-        assertTrue(grid().cache(CACHE_NAME).putx("key3", "val3"));
-        assertTrue(grid().cache(CACHE_NAME).putx("key4", "val4"));
+        grid().jcache(CACHE_NAME).put("key1", "val1");
+        grid().jcache(CACHE_NAME).put("key2", "val2");
+        grid().jcache(CACHE_NAME).put("key3", "val3");
+        grid().jcache(CACHE_NAME).put("key4", "val4");
 
         namedData.removeAll(F.asList("key1", "key2"));
         namedData.removeAllAsync(F.asList("key3", "key4")).get();
 
-        assertNull(grid().cache(CACHE_NAME).get("key1"));
-        assertNull(grid().cache(CACHE_NAME).get("key2"));
-        assertNull(grid().cache(CACHE_NAME).get("key3"));
-        assertNull(grid().cache(CACHE_NAME).get("key4"));
+        assertNull(grid().jcache(CACHE_NAME).get("key1"));
+        assertNull(grid().jcache(CACHE_NAME).get("key2"));
+        assertNull(grid().jcache(CACHE_NAME).get("key3"));
+        assertNull(grid().jcache(CACHE_NAME).get("key4"));
     }
 
     /**
@@ -819,46 +820,48 @@ public abstract class ClientAbstractSelfTest extends GridCommonAbstractTest {
         assertNotNull(namedData);
 
         assertFalse(dfltData.replace("key1", "val1"));
-        assertTrue(grid().cache(null).putx("key1", "val1"));
+        grid().jcache(null).put("key1", "val1");
         assertTrue(dfltData.replace("key1", "val2"));
-        assertEquals("val2", grid().cache(null).get("key1"));
+        assertEquals("val2", grid().jcache(null).get("key1"));
 
         assertFalse(dfltData.replace("key2", "val1"));
-        assertTrue(grid().cache(null).putx("key2", "val1"));
+        grid().jcache(null).put("key2", "val1");
         assertTrue(dfltData.replace("key2", "val2"));
-        assertEquals("val2", grid().cache(null).get("key2"));
+        assertEquals("val2", grid().jcache(null).get("key2"));
 
-        grid().cache(null).removeAll(F.asList("key1", "key2"));
+        grid().jcache(null).removeAll(F.asSet("key1", "key2"));
 
         assertFalse(dfltData.replaceAsync("key1", "val1").get());
-        assertTrue(grid().cache(null).putx("key1", "val1"));
+        grid().jcache(null).put("key1", "val1");
         assertTrue(dfltData.replaceAsync("key1", "val2").get());
-        assertEquals("val2", grid().cache(null).get("key1"));
+        assertEquals("val2", grid().jcache(null).get("key1"));
 
         assertFalse(dfltData.replaceAsync("key2", "val1").get());
-        assertTrue(grid().cache(null).putx("key2", "val1"));
+        grid().jcache(null).put("key2", "val1");
         assertTrue(dfltData.replaceAsync("key2", "val2").get());
-        assertEquals("val2", grid().cache(null).get("key2"));
+        assertEquals("val2", grid().jcache(null).get("key2"));
 
         assertFalse(namedData.replace("key1", "val1"));
-        assertTrue(grid().cache(CACHE_NAME).putx("key1", "val1"));
+        IgniteCache<Object, Object> cache = grid().jcache(CACHE_NAME);
+
+        cache.put("key1", "val1");
         assertTrue(namedData.replace("key1", "val2"));
-        assertEquals("val2", grid().cache(CACHE_NAME).get("key1"));
+        assertEquals("val2", cache.get("key1"));
 
         assertFalse(namedData.replaceAsync("key2", "val1").get());
-        assertTrue(grid().cache(CACHE_NAME).putx("key2", "val1"));
+        cache.put("key2", "val1");
         assertTrue(namedData.replaceAsync("key2", "val2").get());
-        assertEquals("val2", grid().cache(CACHE_NAME).get("key2"));
+        assertEquals("val2", cache.get("key2"));
 
-        grid().cache(CACHE_NAME).removeAll(F.asList("key1", "key2"));
+        cache.removeAll(F.asSet("key1", "key2"));
 
         assertFalse(namedData.replaceAsync("key1", "val1").get());
-        assertTrue(grid().cache(CACHE_NAME).putx("key1", "val1"));
+        cache.put("key1", "val1");
         assertTrue(namedData.replaceAsync("key1", "val2").get());
-        assertEquals("val2", grid().cache(CACHE_NAME).get("key1"));
+        assertEquals("val2", cache.get("key1"));
 
         assertFalse(namedData.replaceAsync("key2", "val1").get());
-        assertTrue(grid().cache(CACHE_NAME).putx("key2", "val1"));
+        cache.put("key2", "val1");
         assertTrue(namedData.replaceAsync("key2", "val2").get());
     }
 
@@ -875,22 +878,22 @@ public abstract class ClientAbstractSelfTest extends GridCommonAbstractTest {
         assertNotNull(datas[0]);
         assertNotNull(datas[1]);
 
-        GridCache[] caches = new GridCache[] {
-            grid().cache(null),
-            grid().cache(CACHE_NAME)
+        IgniteCache[] caches = new IgniteCache[] {
+            grid().jcache(null),
+            grid().jcache(CACHE_NAME)
         };
 
         for (int i = 0; i < datas.length; i++) {
             GridClientData data = datas[i];
-            GridCache<String, String> cache = (GridCache<String, String>)caches[i];
+            IgniteCache<String, String> cache = (IgniteCache<String, String>)caches[i];
 
             assertFalse(data.cas("key", null, null));
-            assertTrue(cache.putx("key", "val"));
+            cache.put("key", "val");
             assertTrue(data.cas("key", null, null));
             assertNull(cache.get("key"));
 
             assertFalse(data.cas("key", null, "val"));
-            assertTrue(cache.putx("key", "val"));
+            cache.put("key", "val");
             assertFalse(data.cas("key", null, "wrongVal"));
             assertEquals("val", cache.get("key"));
             assertTrue(data.cas("key", null, "val"));
@@ -900,23 +903,23 @@ public abstract class ClientAbstractSelfTest extends GridCommonAbstractTest {
             assertEquals("val", cache.get("key"));
             assertFalse(data.cas("key", "newVal", null));
             assertEquals("val", cache.get("key"));
-            assertTrue(cache.removex("key"));
+            cache.remove("key");
 
             assertFalse(data.cas("key", "val1", "val2"));
-            assertTrue(cache.putx("key", "val2"));
+            cache.put("key", "val2");
             assertFalse(data.cas("key", "val1", "wrongVal"));
             assertEquals("val2", cache.get("key"));
             assertTrue(data.cas("key", "val1", "val2"));
             assertEquals("val1", cache.get("key"));
-            assertTrue(cache.removex("key"));
+            cache.remove("key");
 
             assertFalse(data.casAsync("key", null, null).get());
-            assertTrue(cache.putx("key", "val"));
+            cache.put("key", "val");
             assertTrue(data.casAsync("key", null, null).get());
             assertNull(cache.get("key"));
 
             assertFalse(data.casAsync("key", null, "val").get());
-            assertTrue(cache.putx("key", "val"));
+            cache.put("key", "val");
             assertFalse(data.casAsync("key", null, "wrongVal").get());
             assertEquals("val", cache.get("key"));
             assertTrue(data.casAsync("key", null, "val").get());
@@ -926,15 +929,15 @@ public abstract class ClientAbstractSelfTest extends GridCommonAbstractTest {
             assertEquals("val", cache.get("key"));
             assertFalse(data.casAsync("key", "newVal", null).get());
             assertEquals("val", cache.get("key"));
-            assertTrue(cache.removex("key"));
+            cache.remove("key");
 
             assertFalse(data.casAsync("key", "val1", "val2").get());
-            assertTrue(cache.putx("key", "val2"));
+            cache.put("key", "val2");
             assertFalse(data.casAsync("key", "val1", "wrongVal").get());
             assertEquals("val2", cache.get("key"));
             assertTrue(data.casAsync("key", "val1", "val2").get());
             assertEquals("val1", cache.get("key"));
-            assertTrue(cache.removex("key"));
+            cache.remove("key");
         }
     }
 
@@ -945,28 +948,28 @@ public abstract class ClientAbstractSelfTest extends GridCommonAbstractTest {
         GridClientData dfltData = client.data();
         GridClientData namedData = client.data(CACHE_NAME);
 
-        grid().cache(null).mxBean().clear();
-        grid().cache(CACHE_NAME).mxBean().clear();
+        grid().jcache(null).mxBean().clear();
+        grid().jcache(CACHE_NAME).mxBean().clear();
 
-        grid().cache(null).putx("key1", "val1");
-        grid().cache(null).putx("key2", "val2");
-        grid().cache(null).putx("key2", "val3");
+        grid().jcache(null).put("key1", "val1");
+        grid().jcache(null).put("key2", "val2");
+        grid().jcache(null).put("key2", "val3");
 
-        assertEquals("val1", grid().cache(null).get("key1"));
-        assertEquals("val3", grid().cache(null).get("key2"));
-        assertEquals("val3", grid().cache(null).get("key2"));
+        assertEquals("val1", grid().jcache(null).get("key1"));
+        assertEquals("val3", grid().jcache(null).get("key2"));
+        assertEquals("val3", grid().jcache(null).get("key2"));
 
-        grid().cache(CACHE_NAME).putx("key1", "val1");
-        grid().cache(CACHE_NAME).putx("key2", "val2");
-        grid().cache(CACHE_NAME).putx("key2", "val3");
+        grid().jcache(CACHE_NAME).put("key1", "val1");
+        grid().jcache(CACHE_NAME).put("key2", "val2");
+        grid().jcache(CACHE_NAME).put("key2", "val3");
 
-        assertEquals("val1", grid().cache(CACHE_NAME).get("key1"));
-        assertEquals("val3", grid().cache(CACHE_NAME).get("key2"));
-        assertEquals("val3", grid().cache(CACHE_NAME).get("key2"));
+        assertEquals("val1", grid().jcache(CACHE_NAME).get("key1"));
+        assertEquals("val3", grid().jcache(CACHE_NAME).get("key2"));
+        assertEquals("val3", grid().jcache(CACHE_NAME).get("key2"));
 
         GridClientDataMetrics m = dfltData.metrics();
 
-        CacheMetrics metrics = grid().cache(null).metrics();
+        CacheMetrics metrics = grid().jcache(null).metrics();
 
         assertNotNull(m);
         assertEquals(metrics.getCacheGets(), m.reads());
@@ -980,7 +983,7 @@ public abstract class ClientAbstractSelfTest extends GridCommonAbstractTest {
 
         m = namedData.metrics();
 
-        metrics = grid().cache(CACHE_NAME).metrics();
+        metrics = grid().jcache(CACHE_NAME).metrics();
 
         assertNotNull(m);
         assertEquals(metrics.getCacheGets(), m.reads());
@@ -1418,7 +1421,7 @@ public abstract class ClientAbstractSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testInterception() throws Exception {
-        grid().cache(null).put("rem1", "rem1");
+        grid().jcache(null).put("rem1", "rem1");
 
         GridClientData data = client.data();
 
@@ -1440,9 +1443,9 @@ public abstract class ClientAbstractSelfTest extends GridCommonAbstractTest {
             assert INTERCEPTED_OBJECTS.containsKey(obj);
         }
 
-        assert ("nval1" + INTERCEPTED_SUF).equals(grid().cache(null).get("key1" + INTERCEPTED_SUF));
-        assert ("val2" + INTERCEPTED_SUF).equals(grid().cache(null).get("key2" + INTERCEPTED_SUF));
-        assert "rem1".equals(grid().cache(null).get("rem1"));
+        assert ("nval1" + INTERCEPTED_SUF).equals(grid().jcache(null).get("key1" + INTERCEPTED_SUF));
+        assert ("val2" + INTERCEPTED_SUF).equals(grid().jcache(null).get("key2" + INTERCEPTED_SUF));
+        assert "rem1".equals(grid().jcache(null).get("rem1"));
 
         overwriteIntercepted = false;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e9b0c1c/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java
index 4ef80c3..17c2c88 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java
@@ -92,6 +92,7 @@ abstract class AbstractRestProcessorSelfTest extends GridCommonAbstractTest {
     /**
      * @return Cache.
      */
+    @Deprecated
     @Override protected <K, V> GridCache<K, V> cache() {
         return grid(0).cache(null);
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e9b0c1c/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java
index 12f3147..8fcea6c 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java
@@ -78,8 +78,8 @@ public class RestBinaryProtocolSelfTest extends GridCommonAbstractTest {
     @Override protected void afterTest() throws Exception {
         client.shutdown();
 
-        grid().cache(null).clear();
-        grid().cache(CACHE_NAME).clear();
+        grid().jcache(null).clear();
+        grid().jcache(CACHE_NAME).clear();
     }
 
     /** {@inheritDoc} */
@@ -136,10 +136,10 @@ public class RestBinaryProtocolSelfTest extends GridCommonAbstractTest {
      */
     public void testPut() throws Exception {
         assertTrue(client.cachePut(null, "key1", "val1"));
-        assertEquals("val1", grid().cache(null).get("key1"));
+        assertEquals("val1", grid().jcache(null).get("key1"));
 
         assertTrue(client.cachePut(CACHE_NAME, "key1", "val1"));
-        assertEquals("val1", grid().cache(CACHE_NAME).get("key1"));
+        assertEquals("val1", grid().jcache(CACHE_NAME).get("key1"));
     }
 
     /**
@@ -148,7 +148,7 @@ public class RestBinaryProtocolSelfTest extends GridCommonAbstractTest {
     public void testPutAll() throws Exception {
         client.cachePutAll(null, F.asMap("key1", "val1", "key2", "val2"));
 
-        Map<String, String> map = grid().<String, String>cache(null).getAll(Arrays.asList("key1", "key2"));
+        Map<String, String> map = grid().<String, String>jcache(null).getAll(F.asSet("key1", "key2"));
 
         assertEquals(2, map.size());
         assertEquals("val1", map.get("key1"));
@@ -156,7 +156,7 @@ public class RestBinaryProtocolSelfTest extends GridCommonAbstractTest {
 
         client.cachePutAll(CACHE_NAME, F.asMap("key1", "val1", "key2", "val2"));
 
-        map = grid().<String, String>cache(CACHE_NAME).getAll(Arrays.asList("key1", "key2"));
+        map = grid().<String, String>jcache(CACHE_NAME).getAll(F.asSet("key1", "key2"));
 
         assertEquals(2, map.size());
         assertEquals("val1", map.get("key1"));
@@ -167,11 +167,11 @@ public class RestBinaryProtocolSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testGet() throws Exception {
-        assertTrue(grid().cache(null).putx("key", "val"));
+        grid().jcache(null).put("key", "val");
 
         assertEquals("val", client.cacheGet(null, "key"));
 
-        assertTrue(grid().cache(CACHE_NAME).putx("key", "val"));
+        grid().jcache(CACHE_NAME).put("key", "val");
 
         assertEquals("val", client.cacheGet(CACHE_NAME, "key"));
     }
@@ -215,8 +215,11 @@ public class RestBinaryProtocolSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testGetAll() throws Exception {
-        assertTrue(grid().cache(null).putx("key1", "val1"));
-        assertTrue(grid().cache(null).putx("key2", "val2"));
+        IgniteCache<Object, Object> jcacheDflt = grid().jcache(null);
+        IgniteCache<Object, Object> jcacheName = grid().jcache(CACHE_NAME);
+
+        jcacheDflt.put("key1", "val1");
+        jcacheDflt.put("key2", "val2");
 
         Map<String, String> map = client.cacheGetAll(null, "key1", "key2");
 
@@ -224,8 +227,8 @@ public class RestBinaryProtocolSelfTest extends GridCommonAbstractTest {
         assertEquals("val1", map.get("key1"));
         assertEquals("val2", map.get("key2"));
 
-        assertTrue(grid().cache(null).putx("key3", "val3"));
-        assertTrue(grid().cache(null).putx("key4", "val4"));
+        jcacheDflt.put("key3", "val3");
+        jcacheDflt.put("key4", "val4");
 
         map = client.cacheGetAll(null, "key3", "key4");
 
@@ -233,8 +236,8 @@ public class RestBinaryProtocolSelfTest extends GridCommonAbstractTest {
         assertEquals("val3", map.get("key3"));
         assertEquals("val4", map.get("key4"));
 
-        assertTrue(grid().cache(CACHE_NAME).putx("key1", "val1"));
-        assertTrue(grid().cache(CACHE_NAME).putx("key2", "val2"));
+        jcacheName.put("key1", "val1");
+        jcacheName.put("key2", "val2");
 
         map = client.cacheGetAll(CACHE_NAME, "key1", "key2");
 
@@ -242,8 +245,8 @@ public class RestBinaryProtocolSelfTest extends GridCommonAbstractTest {
         assertEquals("val1", map.get("key1"));
         assertEquals("val2", map.get("key2"));
 
-        assertTrue(grid().cache(CACHE_NAME).putx("key3", "val3"));
-        assertTrue(grid().cache(CACHE_NAME).putx("key4", "val4"));
+        jcacheName.put("key3", "val3");
+        jcacheName.put("key4", "val4");
 
         map = client.cacheGetAll(CACHE_NAME, "key3", "key4");
 
@@ -256,48 +259,56 @@ public class RestBinaryProtocolSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testRemove() throws Exception {
-        assertTrue(grid().cache(null).putx("key", "val"));
+        IgniteCache<Object, Object> jcacheDflt = grid().jcache(null);
+        IgniteCache<Object, Object> jcacheName = grid().jcache(CACHE_NAME);
+
+        jcacheDflt.put("key", "val");
 
         assertTrue(client.cacheRemove(null, "key"));
         assertFalse(client.cacheRemove(null, "wrongKey"));
 
-        assertNull(grid().cache(null).get("key"));
+        assertNull(jcacheDflt.get("key"));
+
 
-        assertTrue(grid().cache(CACHE_NAME).putx("key", "val"));
+        jcacheName.put("key", "val");
 
         assertTrue(client.cacheRemove(CACHE_NAME, "key"));
         assertFalse(client.cacheRemove(CACHE_NAME, "wrongKey"));
 
-        assertNull(grid().cache(CACHE_NAME).get("key"));
+        assertNull(jcacheName.get("key"));
     }
 
     /**
      * @throws Exception If failed.
      */
     public void testRemoveAll() throws Exception {
-        assertTrue(grid().cache(null).putx("key1", "val1"));
-        assertTrue(grid().cache(null).putx("key2", "val2"));
-        assertTrue(grid().cache(null).putx("key3", "val3"));
-        assertTrue(grid().cache(null).putx("key4", "val4"));
+        IgniteCache<Object, Object> jcacheDflt = grid().jcache(null);
+
+        jcacheDflt.put("key1", "val1");
+        jcacheDflt.put("key2", "val2");
+        jcacheDflt.put("key3", "val3");
+        jcacheDflt.put("key4", "val4");
 
         client.cacheRemoveAll(null, "key1", "key2");
 
-        assertNull(grid().cache(null).get("key1"));
-        assertNull(grid().cache(null).get("key2"));
-        assertNotNull(grid().cache(null).get("key3"));
-        assertNotNull(grid().cache(null).get("key4"));
+        assertNull(jcacheDflt.get("key1"));
+        assertNull(jcacheDflt.get("key2"));
+        assertNotNull(jcacheDflt.get("key3"));
+        assertNotNull(jcacheDflt.get("key4"));
+
+        IgniteCache<Object, Object> jcacheName = grid().jcache(CACHE_NAME);
 
-        assertTrue(grid().cache(CACHE_NAME).putx("key1", "val1"));
-        assertTrue(grid().cache(CACHE_NAME).putx("key2", "val2"));
-        assertTrue(grid().cache(CACHE_NAME).putx("key3", "val3"));
-        assertTrue(grid().cache(CACHE_NAME).putx("key4", "val4"));
+        jcacheName.put("key1", "val1");
+        jcacheName.put("key2", "val2");
+        jcacheName.put("key3", "val3");
+        jcacheName.put("key4", "val4");
 
         client.cacheRemoveAll(CACHE_NAME, "key1", "key2");
 
-        assertNull(grid().cache(CACHE_NAME).get("key1"));
-        assertNull(grid().cache(CACHE_NAME).get("key2"));
-        assertNotNull(grid().cache(CACHE_NAME).get("key3"));
-        assertNotNull(grid().cache(CACHE_NAME).get("key4"));
+        assertNull(jcacheName.get("key1"));
+        assertNull(jcacheName.get("key2"));
+        assertNotNull(jcacheName.get("key3"));
+        assertNotNull(jcacheName.get("key4"));
     }
 
     /**
@@ -305,17 +316,20 @@ public class RestBinaryProtocolSelfTest extends GridCommonAbstractTest {
      */
     public void testReplace() throws Exception {
         assertFalse(client.cacheReplace(null, "key1", "val1"));
-        assertTrue(grid().cache(null).putx("key1", "val1"));
+
+        IgniteCache<Object, Object> jcacheDflt = grid().jcache(null);
+
+        jcacheDflt.put("key1", "val1");
         assertTrue(client.cacheReplace(null, "key1", "val2"));
 
         assertFalse(client.cacheReplace(null, "key2", "val1"));
-        assertTrue(grid().cache(null).putx("key2", "val1"));
+        jcacheDflt.put("key2", "val1");
         assertTrue(client.cacheReplace(null, "key2", "val2"));
 
-        grid().cache(null).clear();
+        jcacheDflt.clear();
 
         assertFalse(client.cacheReplace(CACHE_NAME, "key1", "val1"));
-        assertTrue(grid().cache(CACHE_NAME).putx("key1", "val1"));
+        grid().jcache(CACHE_NAME).put("key1", "val1");
         assertTrue(client.cacheReplace(CACHE_NAME, "key1", "val2"));
     }
 
@@ -324,80 +338,89 @@ public class RestBinaryProtocolSelfTest extends GridCommonAbstractTest {
      */
     public void testCompareAndSet() throws Exception {
         assertFalse(client.cacheCompareAndSet(null, "key", null, null));
-        assertTrue(grid().cache(null).putx("key", "val"));
+
+        IgniteCache<Object, Object> jcache = grid().jcache(null);
+
+        jcache.put("key", "val");
         assertTrue(client.cacheCompareAndSet(null, "key", null, null));
-        assertNull(grid().cache(null).get("key"));
+        assertNull(jcache.get("key"));
 
         assertFalse(client.cacheCompareAndSet(null, "key", null, "val"));
-        assertTrue(grid().cache(null).putx("key", "val"));
+        jcache.put("key", "val");
         assertFalse(client.cacheCompareAndSet(null, "key", null, "wrongVal"));
-        assertEquals("val", grid().cache(null).get("key"));
+        assertEquals("val", jcache.get("key"));
         assertTrue(client.cacheCompareAndSet(null, "key", null, "val"));
-        assertNull(grid().cache(null).get("key"));
+        assertNull(jcache.get("key"));
 
         assertTrue(client.cacheCompareAndSet(null, "key", "val", null));
-        assertEquals("val", grid().cache(null).get("key"));
+        assertEquals("val", jcache.get("key"));
         assertFalse(client.cacheCompareAndSet(null, "key", "newVal", null));
-        assertEquals("val", grid().cache(null).get("key"));
-        assertTrue(grid().cache(null).removex("key"));
+        assertEquals("val", jcache.get("key"));
+        jcache.remove("key");
 
         assertFalse(client.cacheCompareAndSet(null, "key", "val1", "val2"));
-        assertTrue(grid().cache(null).putx("key", "val2"));
+        jcache.put("key", "val2");
         assertFalse(client.cacheCompareAndSet(null, "key", "val1", "wrongVal"));
-        assertEquals("val2", grid().cache(null).get("key"));
+        assertEquals("val2", jcache.get("key"));
         assertTrue(client.cacheCompareAndSet(null, "key", "val1", "val2"));
-        assertEquals("val1", grid().cache(null).get("key"));
-        assertTrue(grid().cache(null).removex("key"));
+        assertEquals("val1", jcache.get("key"));
+        jcache.remove("key");
 
         assertFalse(client.cacheCompareAndSet(CACHE_NAME, "key", null, null));
-        assertTrue(grid().cache(CACHE_NAME).putx("key", "val"));
+        IgniteCache<Object, Object> jcacheName = grid().jcache(CACHE_NAME);
+
+        jcacheName.put("key", "val");
         assertTrue(client.cacheCompareAndSet(CACHE_NAME, "key", null, null));
-        assertNull(grid().cache(CACHE_NAME).get("key"));
+        assertNull(jcacheName.get("key"));
 
         assertFalse(client.cacheCompareAndSet(CACHE_NAME, "key", null, "val"));
-        assertTrue(grid().cache(CACHE_NAME).putx("key", "val"));
+        jcacheName.put("key", "val");
         assertFalse(client.cacheCompareAndSet(CACHE_NAME, "key", null, "wrongVal"));
-        assertEquals("val", grid().cache(CACHE_NAME).get("key"));
+        assertEquals("val", jcacheName.get("key"));
         assertTrue(client.cacheCompareAndSet(CACHE_NAME, "key", null, "val"));
-        assertNull(grid().cache(CACHE_NAME).get("key"));
+        assertNull(jcacheName.get("key"));
 
         assertTrue(client.cacheCompareAndSet(CACHE_NAME, "key", "val", null));
-        assertEquals("val", grid().cache(CACHE_NAME).get("key"));
+        assertEquals("val", jcacheName.get("key"));
         assertFalse(client.cacheCompareAndSet(CACHE_NAME, "key", "newVal", null));
-        assertEquals("val", grid().cache(CACHE_NAME).get("key"));
-        assertTrue(grid().cache(CACHE_NAME).removex("key"));
+        assertEquals("val", jcacheName.get("key"));
+        jcacheName.remove("key");
 
         assertFalse(client.cacheCompareAndSet(CACHE_NAME, "key", "val1", "val2"));
-        assertTrue(grid().cache(CACHE_NAME).putx("key", "val2"));
+        jcacheName.put("key", "val2");
         assertFalse(client.cacheCompareAndSet(CACHE_NAME, "key", "val1", "wrongVal"));
-        assertEquals("val2", grid().cache(CACHE_NAME).get("key"));
+        assertEquals("val2", jcacheName.get("key"));
         assertTrue(client.cacheCompareAndSet(CACHE_NAME, "key", "val1", "val2"));
-        assertEquals("val1", grid().cache(CACHE_NAME).get("key"));
-        assertTrue(grid().cache(CACHE_NAME).removex("key"));
+        assertEquals("val1", jcacheName.get("key"));
+        jcacheName.remove("key");
     }
 
     /**
      * @throws Exception If failed.
      */
     public void testMetrics() throws Exception {
-        grid().cache(null).mxBean().clear();
-        grid().cache(CACHE_NAME).mxBean().clear();
+        IgniteCache<Object, Object> jcacheDft = grid().jcache(null);
+        IgniteCache<Object, Object> jcacheName = grid().jcache(CACHE_NAME);
+
+        jcacheDft.mxBean().clear();
+
+        jcacheName.mxBean().clear();
 
-        grid().cache(null).putx("key1", "val");
-        grid().cache(null).putx("key2", "val");
-        grid().cache(null).putx("key2", "val");
+        jcacheDft.put("key1", "val");
+        jcacheDft.put("key2", "val");
+        jcacheDft.put("key2", "val");
 
-        grid().cache(null).get("key1");
-        grid().cache(null).get("key2");
-        grid().cache(null).get("key2");
+        jcacheDft.get("key1");
+        jcacheDft.get("key2");
+        jcacheDft.get("key2");
 
-        grid().cache(CACHE_NAME).putx("key1", "val");
-        grid().cache(CACHE_NAME).putx("key2", "val");
-        grid().cache(CACHE_NAME).putx("key2", "val");
+        jcacheName.put("key1", "val");
+        jcacheName.put("key2", "val");
+        jcacheName.put("key2", "val");
 
-        grid().cache(CACHE_NAME).get("key1");
-        grid().cache(CACHE_NAME).get("key2");
-        grid().cache(CACHE_NAME).get("key2");
+        jcacheName.get("key1");
+        jcacheName.get("key2");
+        jcacheName.get("key2");
 
         Map<String, Long> m = client.cacheMetrics(null);
 
@@ -418,48 +441,48 @@ public class RestBinaryProtocolSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testAppend() throws Exception {
-        grid().cache(null).remove("key");
-        grid().cache(CACHE_NAME).remove("key");
+        grid().jcache(null).remove("key");
+        grid().jcache(CACHE_NAME).remove("key");
 
         assertFalse(client.cacheAppend(null, "key", ".val"));
         assertFalse(client.cacheAppend(CACHE_NAME, "key", ".val"));
 
-        grid().cache(null).put("key", "orig");
-        grid().cache(CACHE_NAME).put("key", "orig");
+        grid().jcache(null).put("key", "orig");
+        grid().jcache(CACHE_NAME).put("key", "orig");
 
         assertTrue(client.cacheAppend(null, "key", ".val"));
-        assertEquals("orig.val", grid().cache(null).get("key"));
+        assertEquals("orig.val", grid().jcache(null).get("key"));
         assertTrue(client.cacheAppend(null, "key", ".newVal"));
-        assertEquals("orig.val.newVal", grid().cache(null).get("key"));
+        assertEquals("orig.val.newVal", grid().jcache(null).get("key"));
 
         assertTrue(client.cacheAppend(CACHE_NAME, "key", ".val"));
-        assertEquals("orig.val", grid().cache(CACHE_NAME).get("key"));
+        assertEquals("orig.val", grid().jcache(CACHE_NAME).get("key"));
         assertTrue(client.cacheAppend(CACHE_NAME, "key", ".newVal"));
-        assertEquals("orig.val.newVal", grid().cache(CACHE_NAME).get("key"));
+        assertEquals("orig.val.newVal", grid().jcache(CACHE_NAME).get("key"));
     }
 
     /**
      * @throws Exception If failed.
      */
     public void testPrepend() throws Exception {
-        grid().cache(null).remove("key");
-        grid().cache(CACHE_NAME).remove("key");
+        grid().jcache(null).remove("key");
+        grid().jcache(CACHE_NAME).remove("key");
 
         assertFalse(client.cachePrepend(null, "key", ".val"));
         assertFalse(client.cachePrepend(CACHE_NAME, "key", ".val"));
 
-        grid().cache(null).put("key", "orig");
-        grid().cache(CACHE_NAME).put("key", "orig");
+        grid().jcache(null).put("key", "orig");
+        grid().jcache(CACHE_NAME).put("key", "orig");
 
         assertTrue(client.cachePrepend(null, "key", "val."));
-        assertEquals("val.orig", grid().cache(null).get("key"));
+        assertEquals("val.orig", grid().jcache(null).get("key"));
         assertTrue(client.cachePrepend(null, "key", "newVal."));
-        assertEquals("newVal.val.orig", grid().cache(null).get("key"));
+        assertEquals("newVal.val.orig", grid().jcache(null).get("key"));
 
         assertTrue(client.cachePrepend(CACHE_NAME, "key", "val."));
-        assertEquals("val.orig", grid().cache(CACHE_NAME).get("key"));
+        assertEquals("val.orig", grid().jcache(CACHE_NAME).get("key"));
         assertTrue(client.cachePrepend(CACHE_NAME, "key", "newVal."));
-        assertEquals("newVal.val.orig", grid().cache(CACHE_NAME).get("key"));
+        assertEquals("newVal.val.orig", grid().jcache(CACHE_NAME).get("key"));
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e9b0c1c/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java
index 53c8156..0125459 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java
@@ -70,8 +70,8 @@ public class RestMemcacheProtocolSelfTest extends GridCommonAbstractTest {
     @Override protected void afterTest() throws Exception {
         client.shutdown();
 
-        grid().cache(null).clear();
-        grid().cache(CACHE_NAME).clear();
+        grid().jcache(null).clear();
+        grid().jcache(CACHE_NAME).clear();
     }
 
     /** {@inheritDoc} */
@@ -128,21 +128,21 @@ public class RestMemcacheProtocolSelfTest extends GridCommonAbstractTest {
      */
     public void testPut() throws Exception {
         assertTrue(client.cachePut(null, "key1", "val1"));
-        assertEquals("val1", grid().cache(null).get("key1"));
+        assertEquals("val1", grid().jcache(null).get("key1"));
 
         assertTrue(client.cachePut(CACHE_NAME, "key1", "val1"));
-        assertEquals("val1", grid().cache(CACHE_NAME).get("key1"));
+        assertEquals("val1", grid().jcache(CACHE_NAME).get("key1"));
     }
 
     /**
      * @throws Exception If failed.
      */
     public void testGet() throws Exception {
-        assertTrue(grid().cache(null).putx("key", "val"));
+        grid().jcache(null).put("key", "val");
 
         Assert.assertEquals("val", client.cacheGet(null, "key"));
 
-        assertTrue(grid().cache(CACHE_NAME).putx("key", "val"));
+        grid().jcache(CACHE_NAME).put("key", "val");
 
         Assert.assertEquals("val", client.cacheGet(CACHE_NAME, "key"));
     }
@@ -151,19 +151,19 @@ public class RestMemcacheProtocolSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testRemove() throws Exception {
-        assertTrue(grid().cache(null).putx("key", "val"));
+        grid().jcache(null).put("key", "val");
 
         assertTrue(client.cacheRemove(null, "key"));
         assertFalse(client.cacheRemove(null, "wrongKey"));
 
-        assertNull(grid().cache(null).get("key"));
+        assertNull(grid().jcache(null).get("key"));
 
-        assertTrue(grid().cache(CACHE_NAME).putx("key", "val"));
+        grid().jcache(CACHE_NAME).put("key", "val");
 
         assertTrue(client.cacheRemove(CACHE_NAME, "key"));
         assertFalse(client.cacheRemove(CACHE_NAME, "wrongKey"));
 
-        assertNull(grid().cache(CACHE_NAME).get("key"));
+        assertNull(grid().jcache(CACHE_NAME).get("key"));
     }
 
     /**
@@ -171,14 +171,14 @@ public class RestMemcacheProtocolSelfTest extends GridCommonAbstractTest {
      */
     public void testAdd() throws Exception {
         assertTrue(client.cacheAdd(null, "key", "val"));
-        assertEquals("val", grid().cache(null).get("key"));
+        assertEquals("val", grid().jcache(null).get("key"));
         assertFalse(client.cacheAdd(null, "key", "newVal"));
-        assertEquals("val", grid().cache(null).get("key"));
+        assertEquals("val", grid().jcache(null).get("key"));
 
         assertTrue(client.cacheAdd(CACHE_NAME, "key", "val"));
-        assertEquals("val", grid().cache(CACHE_NAME).get("key"));
+        assertEquals("val", grid().jcache(CACHE_NAME).get("key"));
         assertFalse(client.cacheAdd(CACHE_NAME, "key", "newVal"));
-        assertEquals("val", grid().cache(CACHE_NAME).get("key"));
+        assertEquals("val", grid().jcache(CACHE_NAME).get("key"));
     }
 
     /**
@@ -186,17 +186,17 @@ public class RestMemcacheProtocolSelfTest extends GridCommonAbstractTest {
      */
     public void testReplace() throws Exception {
         assertFalse(client.cacheReplace(null, "key1", "val1"));
-        assertTrue(grid().cache(null).putx("key1", "val1"));
+        grid().jcache(null).put("key1", "val1");
         assertTrue(client.cacheReplace(null, "key1", "val2"));
 
         assertFalse(client.cacheReplace(null, "key2", "val1"));
-        assertTrue(grid().cache(null).putx("key2", "val1"));
+        grid().jcache(null).put("key2", "val1");
         assertTrue(client.cacheReplace(null, "key2", "val2"));
 
-        grid().cache(null).clear();
+        grid().jcache(null).clear();
 
         assertFalse(client.cacheReplace(CACHE_NAME, "key1", "val1"));
-        assertTrue(grid().cache(CACHE_NAME).putx("key1", "val1"));
+        grid().jcache(CACHE_NAME).put("key1", "val1");
         assertTrue(client.cacheReplace(CACHE_NAME, "key1", "val2"));
     }
 
@@ -204,24 +204,24 @@ public class RestMemcacheProtocolSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testMetrics() throws Exception {
-        grid().cache(null).mxBean().clear();
-        grid().cache(CACHE_NAME).mxBean().clear();
+        grid().jcache(null).mxBean().clear();
+        grid().jcache(CACHE_NAME).mxBean().clear();
 
-        grid().cache(null).putx("key1", "val");
-        grid().cache(null).putx("key2", "val");
-        grid().cache(null).putx("key2", "val");
+        grid().jcache(null).put("key1", "val");
+        grid().jcache(null).put("key2", "val");
+        grid().jcache(null).put("key2", "val");
 
-        grid().cache(null).get("key1");
-        grid().cache(null).get("key2");
-        grid().cache(null).get("key2");
+        grid().jcache(null).get("key1");
+        grid().jcache(null).get("key2");
+        grid().jcache(null).get("key2");
 
-        grid().cache(CACHE_NAME).putx("key1", "val");
-        grid().cache(CACHE_NAME).putx("key2", "val");
-        grid().cache(CACHE_NAME).putx("key2", "val");
+        grid().jcache(CACHE_NAME).put("key1", "val");
+        grid().jcache(CACHE_NAME).put("key2", "val");
+        grid().jcache(CACHE_NAME).put("key2", "val");
 
-        grid().cache(CACHE_NAME).get("key1");
-        grid().cache(CACHE_NAME).get("key2");
-        grid().cache(CACHE_NAME).get("key2");
+        grid().jcache(CACHE_NAME).get("key1");
+        grid().jcache(CACHE_NAME).get("key2");
+        grid().jcache(CACHE_NAME).get("key2");
 
         Map<String, Long> m = client.cacheMetrics(null);
 
@@ -291,13 +291,13 @@ public class RestMemcacheProtocolSelfTest extends GridCommonAbstractTest {
         assertFalse(client.cacheAppend(null, "wrongKey", "_suffix"));
         assertFalse(client.cacheAppend(CACHE_NAME, "wrongKey", "_suffix"));
 
-        assertTrue(grid().cache(null).putx("key", "val"));
+        grid().jcache(null).put("key", "val");
         assertTrue(client.cacheAppend(null, "key", "_suffix"));
-        assertEquals("val_suffix", grid().cache(null).get("key"));
+        assertEquals("val_suffix", grid().jcache(null).get("key"));
 
-        assertTrue(grid().cache(CACHE_NAME).putx("key", "val"));
+        grid().jcache(CACHE_NAME).put("key", "val");
         assertTrue(client.cacheAppend(CACHE_NAME, "key", "_suffix"));
-        assertEquals("val_suffix", grid().cache(CACHE_NAME).get("key"));
+        assertEquals("val_suffix", grid().jcache(CACHE_NAME).get("key"));
     }
 
     /**
@@ -307,13 +307,13 @@ public class RestMemcacheProtocolSelfTest extends GridCommonAbstractTest {
         assertFalse(client.cachePrepend(null, "wrongKey", "prefix_"));
         assertFalse(client.cachePrepend(CACHE_NAME, "wrongKey", "prefix_"));
 
-        assertTrue(grid().cache(null).putx("key", "val"));
+        grid().jcache(null).put("key", "val");
         assertTrue(client.cachePrepend(null, "key", "prefix_"));
-        assertEquals("prefix_val", grid().cache(null).get("key"));
+        assertEquals("prefix_val", grid().jcache(null).get("key"));
 
-        assertTrue(grid().cache(CACHE_NAME).putx("key", "val"));
+        grid().jcache(CACHE_NAME).put("key", "val");
         assertTrue(client.cachePrepend(CACHE_NAME, "key", "prefix_"));
-        assertEquals("prefix_val", grid().cache(CACHE_NAME).get("key"));
+        assertEquals("prefix_val", grid().jcache(CACHE_NAME).get("key"));
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e9b0c1c/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorTest.java
index 7c82a2f..eb2c4c2 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorTest.java
@@ -135,7 +135,7 @@ public class RestProcessorTest extends GridCommonAbstractTest {
      * @throws IgniteCheckedException If failed.
      */
     private void populateCache() throws IgniteCheckedException {
-        GridCache<String, Object> cache = G.ignite().cache(null);
+        IgniteCache<String, Object> cache = G.ignite().jcache(null);
 
         cache.put("int", intValue());
         cache.put("string", "cacheString");

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e9b0c1c/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java
index 5d9cdb1..9dc051b 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java
@@ -17,6 +17,7 @@
 
 package org.apache.ignite.jdbc;
 
+import org.apache.ignite.IgniteCache;
 import org.apache.ignite.cache.*;
 import org.apache.ignite.cache.affinity.*;
 import org.apache.ignite.cache.query.*;
@@ -77,14 +78,14 @@ public class JdbcComplexQuerySelfTest extends GridCommonAbstractTest {
     @Override protected void beforeTestsStarted() throws Exception {
         startGrids(3);
 
-        GridCache<String, Organization> orgCache = grid(0).cache(null);
+        IgniteCache<String, Organization> orgCache = grid(0).jcache(null);
 
         assert orgCache != null;
 
         orgCache.put("o1", new Organization(1, "A"));
         orgCache.put("o2", new Organization(2, "B"));
 
-        GridCache<CacheAffinityKey<String>, Person> personCache = grid(0).cache(null);
+        IgniteCache<CacheAffinityKey<String>, Person> personCache = grid(0).jcache(null);
 
         assert personCache != null;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e9b0c1c/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcLocalCachesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcLocalCachesSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcLocalCachesSelfTest.java
index 25c045e..84d0e1a 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcLocalCachesSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcLocalCachesSelfTest.java
@@ -17,6 +17,8 @@
 
 package org.apache.ignite.jdbc;
 
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
 import org.apache.ignite.cache.*;
 import org.apache.ignite.cache.query.*;
 import org.apache.ignite.configuration.*;
@@ -78,19 +80,19 @@ public class JdbcLocalCachesSelfTest extends GridCommonAbstractTest {
     @Override protected void beforeTestsStarted() throws Exception {
         startGridsMultiThreaded(2);
 
-        GridCache<Object, Object> cache1 = grid(0).cache(CACHE_NAME);
+        IgniteCache<Object, Object> cache1 = grid(0).jcache(CACHE_NAME);
 
         assert cache1 != null;
 
-        assert cache1.putx("key1", 1);
-        assert cache1.putx("key2", 2);
+        cache1.put("key1", 1);
+        cache1.put("key2", 2);
 
-        GridCache<Object, Object> cache2 = grid(1).cache(CACHE_NAME);
+        IgniteCache<Object, Object> cache2 = grid(1).jcache(CACHE_NAME);
 
         assert cache2 != null;
 
-        assert cache2.putx("key1", 3);
-        assert cache2.putx("key2", 4);
+        cache2.put("key1", 3);
+        cache2.put("key2", 4);
 
         Class.forName("org.apache.ignite.IgniteJdbcDriver");
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e9b0c1c/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java
index f394e5b..4d7f9b7 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java
@@ -17,6 +17,7 @@
 
 package org.apache.ignite.jdbc;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
 import org.apache.ignite.cache.affinity.*;
 import org.apache.ignite.cache.query.*;
@@ -72,14 +73,14 @@ public class JdbcMetadataSelfTest extends GridCommonAbstractTest {
     @Override protected void beforeTestsStarted() throws Exception {
         startGridsMultiThreaded(3);
 
-        GridCache<String, Organization> orgCache = grid(0).cache(null);
+        IgniteCache<String, Organization> orgCache = grid(0).jcache(null);
 
         assert orgCache != null;
 
         orgCache.put("o1", new Organization(1, "A"));
         orgCache.put("o2", new Organization(2, "B"));
 
-        GridCache<CacheAffinityKey<String>, Person> personCache = grid(0).cache(null);
+        IgniteCache<CacheAffinityKey<String>, Person> personCache = grid(0).jcache(null);
 
         assert personCache != null;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e9b0c1c/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java
index b891e1e..6b71ddb 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.jdbc;
 
-import org.apache.ignite.cache.*;
+import org.apache.ignite.*;
 import org.apache.ignite.cache.query.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.spi.discovery.tcp.*;
@@ -78,7 +78,7 @@ public class JdbcPreparedStatementSelfTest extends GridCommonAbstractTest {
     @Override protected void beforeTestsStarted() throws Exception {
         startGridsMultiThreaded(3);
 
-        GridCache<Integer, TestObject> cache = grid(0).cache(null);
+        IgniteCache<Integer, TestObject> cache = grid(0).jcache(null);
 
         assert cache != null;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e9b0c1c/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java
index 7b891da..ec8a358 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java
@@ -17,6 +17,7 @@
 
 package org.apache.ignite.jdbc;
 
+import org.apache.ignite.IgniteCache;
 import org.apache.ignite.cache.*;
 import org.apache.ignite.cache.query.*;
 import org.apache.ignite.configuration.*;
@@ -85,7 +86,7 @@ public class JdbcResultSetSelfTest extends GridCommonAbstractTest {
     @Override protected void beforeTestsStarted() throws Exception {
         startGridsMultiThreaded(3);
 
-        GridCache<Integer, TestObject> cache = grid(0).cache(null);
+        IgniteCache<Integer, TestObject> cache = grid(0).jcache(null);
 
         assert cache != null;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e9b0c1c/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java
index 5607784..c391e39 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java
@@ -17,6 +17,7 @@
 
 package org.apache.ignite.jdbc;
 
+import org.apache.ignite.IgniteCache;
 import org.apache.ignite.cache.*;
 import org.apache.ignite.cache.query.*;
 import org.apache.ignite.configuration.*;
@@ -78,7 +79,7 @@ public class JdbcStatementSelfTest extends GridCommonAbstractTest {
     @Override protected void beforeTestsStarted() throws Exception {
         startGridsMultiThreaded(3);
 
-        GridCache<String, Person> cache = grid(0).cache(null);
+        IgniteCache<String, Person> cache = grid(0).jcache(null);
 
         assert cache != null;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e9b0c1c/modules/clients/src/test/java/org/apache/ignite/loadtests/client/ClientTcpSslLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/loadtests/client/ClientTcpSslLoadTest.java b/modules/clients/src/test/java/org/apache/ignite/loadtests/client/ClientTcpSslLoadTest.java
index 80776bb..5ca8c77 100644
--- a/modules/clients/src/test/java/org/apache/ignite/loadtests/client/ClientTcpSslLoadTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/loadtests/client/ClientTcpSslLoadTest.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.loadtests.client;
 
-import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.*;
 import org.apache.ignite.client.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
 
@@ -80,8 +80,8 @@ public class ClientTcpSslLoadTest extends ClientTcpSslMultiThreadedSelfTest {
     private void clearCaches() {
         for (int i = 0; i < NODES_CNT; i++)
             try {
-                grid(i).cache(PARTITIONED_CACHE_NAME).clear();
-            } catch (IgniteCheckedException e) {
+                grid(i).jcache(PARTITIONED_CACHE_NAME).clear();
+            } catch (IgniteException e) {
                 log.error("Cache clear failed.", e);
             }
     }


Mime
View raw message