ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [03/79] [abbrv] incubator-ignite git commit: # ignite-63
Date Fri, 23 Jan 2015 16:06:02 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateReadOnlyAccessStrategy.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateReadOnlyAccessStrategy.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateReadOnlyAccessStrategy.java
index 930bd7c..f778e4f 100644
--- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateReadOnlyAccessStrategy.java
+++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateReadOnlyAccessStrategy.java
@@ -58,7 +58,7 @@ public class GridHibernateReadOnlyAccessStrategy extends GridHibernateAccessStra
      * @param ignite Grid.
      * @param cache Cache.
      */
-    public GridHibernateReadOnlyAccessStrategy(Ignite ignite, GridCache<Object, Object> cache) {
+    public GridHibernateReadOnlyAccessStrategy(Ignite ignite, Cache<Object, Object> cache) {
         super(ignite, cache);
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateReadWriteAccessStrategy.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateReadWriteAccessStrategy.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateReadWriteAccessStrategy.java
index 848dac4..89f0a81 100644
--- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateReadWriteAccessStrategy.java
+++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateReadWriteAccessStrategy.java
@@ -66,7 +66,7 @@ public class GridHibernateReadWriteAccessStrategy extends GridHibernateAccessStr
      * @param cache Cache.
      * @param txCtx Thread local instance used to track updates done during one Hibernate transaction.
      */
-    protected GridHibernateReadWriteAccessStrategy(Ignite ignite, GridCache<Object, Object> cache, ThreadLocal txCtx) {
+    protected GridHibernateReadWriteAccessStrategy(Ignite ignite, Cache<Object, Object> cache, ThreadLocal txCtx) {
         super(ignite, cache);
 
         this.txCtx = (ThreadLocal<TxContext>)txCtx;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateRegion.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateRegion.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateRegion.java
index b30799f..1038758 100644
--- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateRegion.java
+++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateRegion.java
@@ -35,7 +35,7 @@ public class GridHibernateRegion implements Region {
     private final String name;
 
     /** Cache instance. */
-    protected final GridCache<Object, Object> cache;
+    protected final Cache<Object, Object> cache;
 
     /** Grid instance. */
     protected Ignite ignite;
@@ -47,7 +47,7 @@ public class GridHibernateRegion implements Region {
      * @param cache Region cache.
      */
     public GridHibernateRegion(GridHibernateRegionFactory factory, String name, Ignite ignite,
-        GridCache<Object, Object> cache) {
+        Cache<Object, Object> cache) {
         this.factory = factory;
         this.name = name;
         this.ignite = ignite;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateRegionFactory.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateRegionFactory.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateRegionFactory.java
index 751785d..30a2a43 100644
--- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateRegionFactory.java
+++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateRegionFactory.java
@@ -46,8 +46,8 @@ import static org.hibernate.cache.spi.access.AccessType.*;
  * <pre name="code" class="brush: xml; gutter: false;">
  * org.gridgain.hibernate.grid_name=&lt;grid name&gt;
  * </pre>
- * Each Hibernate cache region must be associated with some {@link org.apache.ignite.cache.GridCache}, by default it is assumed that
- * for each cache region there is a {@link org.apache.ignite.cache.GridCache} with the same name. Also it is possible to define
+ * Each Hibernate cache region must be associated with some {@link org.apache.ignite.cache.Cache}, by default it is assumed that
+ * for each cache region there is a {@link org.apache.ignite.cache.Cache} with the same name. Also it is possible to define
  * region to cache mapping using properties with prefix {@code org.gridgain.hibernate.region_cache}.
  * For example if for region with name "region1" cache with name "cache1" should be used then following
  * Hibernate property should be specified:
@@ -78,7 +78,7 @@ public class GridHibernateRegionFactory implements RegionFactory {
     private Ignite ignite;
 
     /** Default cache. */
-    private GridCache<Object, Object> dfltCache;
+    private Cache<Object, Object> dfltCache;
 
     /** Default region access type. */
     private AccessType dfltAccessType;
@@ -210,7 +210,7 @@ public class GridHibernateRegionFactory implements RegionFactory {
      * @return Cache for given region.
      * @throws CacheException If cache for given region is not configured.
      */
-    private GridCache<Object, Object> regionCache(String regionName) throws CacheException {
+    private Cache<Object, Object> regionCache(String regionName) throws CacheException {
         String cacheName = regionCaches.get(regionName);
 
         if (cacheName == null) {
@@ -220,7 +220,7 @@ public class GridHibernateRegionFactory implements RegionFactory {
             cacheName = regionName;
         }
 
-        GridCache<Object, Object> cache = ignite.cache(cacheName);
+        Cache<Object, Object> cache = ignite.cache(cacheName);
 
         if (cache == null)
             throw new CacheException("Cache '" + cacheName + "' for region '" + regionName + "' is not configured.");

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateTimestampsRegion.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateTimestampsRegion.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateTimestampsRegion.java
index 5f7a9cb..1658d40 100644
--- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateTimestampsRegion.java
+++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateTimestampsRegion.java
@@ -34,7 +34,7 @@ public class GridHibernateTimestampsRegion extends GridHibernateGeneralDataRegio
      * @param cache Region cache.
      */
     public GridHibernateTimestampsRegion(GridHibernateRegionFactory factory, String name,
-        Ignite ignite, GridCache<Object, Object> cache) {
+        Ignite ignite, Cache<Object, Object> cache) {
         super(factory, name, ignite, cache);
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateTransactionalAccessStrategy.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateTransactionalAccessStrategy.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateTransactionalAccessStrategy.java
index a498db9..bce4ab6 100644
--- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateTransactionalAccessStrategy.java
+++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateTransactionalAccessStrategy.java
@@ -27,7 +27,7 @@ import org.jetbrains.annotations.*;
  * Implementation of {@link AccessType#TRANSACTIONAL} cache access strategy.
  * <p>
  * It is supposed that this strategy is used in JTA environment and Hibernate and
- * {@link org.apache.ignite.cache.GridCache} corresponding to the L2 cache region are configured to use the same transaction manager.
+ * {@link org.apache.ignite.cache.Cache} corresponding to the L2 cache region are configured to use the same transaction manager.
  * <p>
  * Configuration of L2 cache and per-entity cache access strategy can be set in the
  * Hibernate configuration file:
@@ -59,7 +59,7 @@ public class GridHibernateTransactionalAccessStrategy extends GridHibernateAcces
      * @param ignite Grid.
      * @param cache Cache.
      */
-    public GridHibernateTransactionalAccessStrategy(Ignite ignite, GridCache<Object, Object> cache) {
+    public GridHibernateTransactionalAccessStrategy(Ignite ignite, Cache<Object, Object> cache) {
         super(ignite, cache);
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateTransactionalDataRegion.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateTransactionalDataRegion.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateTransactionalDataRegion.java
index 04fd877..b1b0531 100644
--- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateTransactionalDataRegion.java
+++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateTransactionalDataRegion.java
@@ -43,7 +43,7 @@ public class GridHibernateTransactionalDataRegion extends GridHibernateRegion im
      * @param dataDesc Region data description.
      */
     public GridHibernateTransactionalDataRegion(GridHibernateRegionFactory factory, String name,
-        Ignite ignite, GridCache<Object, Object> cache, CacheDataDescription dataDesc) {
+        Ignite ignite, Cache<Object, Object> cache, CacheDataDescription dataDesc) {
         super(factory, name, ignite, cache);
 
         this.dataDesc = dataDesc;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/GridHibernateL2CacheConfigurationSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/GridHibernateL2CacheConfigurationSelfTest.java b/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/GridHibernateL2CacheConfigurationSelfTest.java
index 8f53771..6557393 100644
--- a/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/GridHibernateL2CacheConfigurationSelfTest.java
+++ b/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/GridHibernateL2CacheConfigurationSelfTest.java
@@ -18,6 +18,7 @@
 package org.apache.ignite.cache.hibernate;
 
 import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.Cache;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.spi.discovery.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
@@ -77,7 +78,7 @@ public class GridHibernateL2CacheConfigurationSelfTest extends GridCommonAbstrac
 
     /** {@inheritDoc} */
     @Override protected void afterTest() throws Exception {
-        for (GridCache<?, ?> cache : grid(0).caches())
+        for (Cache<?, ?> cache : grid(0).caches())
             cache.clearAll();
     }
 
@@ -233,11 +234,11 @@ public class GridHibernateL2CacheConfigurationSelfTest extends GridCommonAbstrac
                 ses.close();
             }
 
-            GridCache<Object, Object> cache1 = grid(0).cache("cache1");
-            GridCache<Object, Object> cache2 = grid(0).cache("cache2");
-            GridCache<Object, Object> cache3 = grid(0).cache("cache3");
-            GridCache<Object, Object> cacheE3 = grid(0).cache(ENTITY3_NAME);
-            GridCache<Object, Object> cacheE4 = grid(0).cache(ENTITY4_NAME);
+            Cache<Object, Object> cache1 = grid(0).cache("cache1");
+            Cache<Object, Object> cache2 = grid(0).cache("cache2");
+            Cache<Object, Object> cache3 = grid(0).cache("cache3");
+            Cache<Object, Object> cacheE3 = grid(0).cache(ENTITY3_NAME);
+            Cache<Object, Object> cacheE4 = grid(0).cache(ENTITY4_NAME);
 
             assertEquals("Unexpected entries: " + cache1.entrySet(), expCache1, cache1.size());
             assertEquals("Unexpected entries: " + cache2.entrySet(), expCache2, cache2.size());

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/GridHibernateL2CacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/GridHibernateL2CacheSelfTest.java b/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/GridHibernateL2CacheSelfTest.java
index ef4fd32..16e7df3 100644
--- a/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/GridHibernateL2CacheSelfTest.java
+++ b/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/GridHibernateL2CacheSelfTest.java
@@ -18,6 +18,7 @@
 package org.apache.ignite.cache.hibernate;
 
 import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.Cache;
 import org.apache.ignite.cache.affinity.consistenthash.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.spi.discovery.tcp.*;
@@ -41,7 +42,7 @@ import java.util.concurrent.*;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
 import static org.apache.ignite.cache.hibernate.GridHibernateRegionFactory.*;
 import static org.hibernate.cfg.Environment.*;
 
@@ -422,7 +423,7 @@ public class GridHibernateL2CacheSelfTest extends GridCommonAbstractTest {
 
         cfg.setBackups(1);
 
-        cfg.setAffinity(new GridCacheConsistentHashAffinityFunction(false, 10));
+        cfg.setAffinity(new CacheConsistentHashAffinityFunction(false, 10));
 
         return cfg;
     }
@@ -444,7 +445,7 @@ public class GridHibernateL2CacheSelfTest extends GridCommonAbstractTest {
 
         cfg.setBackups(1);
 
-        cfg.setAffinity(new GridCacheConsistentHashAffinityFunction(false, 10));
+        cfg.setAffinity(new CacheConsistentHashAffinityFunction(false, 10));
 
         return cfg;
     }
@@ -1916,7 +1917,7 @@ public class GridHibernateL2CacheSelfTest extends GridCommonAbstractTest {
 
         sesFactory2 = null;
 
-        for (GridCache<?, ?> cache : grid(0).caches())
+        for (Cache<?, ?> cache : grid(0).caches())
             cache.globalClearAll();
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/GridHibernateL2CacheTransactionalSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/GridHibernateL2CacheTransactionalSelfTest.java b/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/GridHibernateL2CacheTransactionalSelfTest.java
index d34652d..83606e9 100644
--- a/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/GridHibernateL2CacheTransactionalSelfTest.java
+++ b/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/GridHibernateL2CacheTransactionalSelfTest.java
@@ -38,7 +38,7 @@ import java.util.*;
 
 /**
  *
- * Tests Hibernate L2 cache with TRANSACTIONAL access mode (Hibernate and GridCache are configured
+ * Tests Hibernate L2 cache with TRANSACTIONAL access mode (Hibernate and Cache are configured
  * to used the same TransactionManager).
  */
 public class GridHibernateL2CacheTransactionalSelfTest extends GridHibernateL2CacheSelfTest {
@@ -92,7 +92,7 @@ public class GridHibernateL2CacheTransactionalSelfTest extends GridHibernateL2Ca
 
         cfg.setTransactionManagerLookupClassName(TestTmLookup.class.getName());
 
-        cfg.setDistributionMode(GridCacheDistributionMode.PARTITIONED_ONLY);
+        cfg.setDistributionMode(CacheDistributionMode.PARTITIONED_ONLY);
 
         return cfg;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
index 9256a36..5772f74 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
@@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.query.h2;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.Cache;
 import org.apache.ignite.cache.query.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.internal.*;
@@ -1232,7 +1233,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
 
         for (Class<?> cls : idxCustomFuncClss) {
             for (Method m : cls.getDeclaredMethods()) {
-                GridCacheQuerySqlFunction ann = m.getAnnotation(GridCacheQuerySqlFunction.class);
+                CacheQuerySqlFunction ann = m.getAnnotation(CacheQuerySqlFunction.class);
 
                 if (ann != null) {
                     int modifiers = m.getModifiers();
@@ -1315,7 +1316,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
      * @return {@code true} If primitive keys must be indexed.
      */
     public boolean isIndexPrimitiveKey(@Nullable String spaceName) {
-        GridCacheQueryConfiguration cfg = cacheQueryConfiguration(spaceName);
+        CacheQueryConfiguration cfg = cacheQueryConfiguration(spaceName);
 
         return cfg != null && cfg.isIndexPrimitiveKey();
     }
@@ -1325,21 +1326,21 @@ public class IgniteH2Indexing implements GridQueryIndexing {
      * @return {@code true} If primitive values must be indexed.
      */
     public boolean isIndexPrimitiveValue(String spaceName) {
-        GridCacheQueryConfiguration cfg = cacheQueryConfiguration(spaceName);
+        CacheQueryConfiguration cfg = cacheQueryConfiguration(spaceName);
 
         return cfg != null && cfg.isIndexPrimitiveValue();
     }
 
     /** {@inheritDoc} */
     public boolean isIndexFixedTyping(String spaceName) {
-        GridCacheQueryConfiguration cfg = cacheQueryConfiguration(spaceName);
+        CacheQueryConfiguration cfg = cacheQueryConfiguration(spaceName);
 
         return cfg != null && cfg.isIndexFixedTyping();
     }
 
     /** {@inheritDoc} */
     public boolean isEscapeAll(String spaceName) {
-        GridCacheQueryConfiguration cfg = cacheQueryConfiguration(spaceName);
+        CacheQueryConfiguration cfg = cacheQueryConfiguration(spaceName);
 
         return cfg != null && cfg.isEscapeAll();
     }
@@ -1348,7 +1349,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
      * @param spaceName Space name.
      * @return Cache query configuration.
      */
-    @Nullable private GridCacheQueryConfiguration cacheQueryConfiguration(String spaceName) {
+    @Nullable private CacheQueryConfiguration cacheQueryConfiguration(String spaceName) {
         return ctx == null ? null : ctx.cache().internalCache(spaceName).configuration().getQueryConfiguration();
     }
 
@@ -1940,7 +1941,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
         /** {@inheritDoc} */
         @SuppressWarnings("unchecked")
         @Override public Object readFromSwap(Object key) throws IgniteCheckedException {
-            GridCache<Object, ?> cache = ctx.cache().cache(schema.spaceName);
+            Cache<Object, ?> cache = ctx.cache().cache(schema.spaceName);
 
             GridCacheContext cctx = ((GridCacheProxyImpl)cache).context();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java
index bb8bea9..85cde58 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java
@@ -39,7 +39,7 @@ import java.util.*;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.GridCachePreloadMode.*;
+import static org.apache.ignite.cache.CachePreloadMode.*;
 
 /**
  * Tests for fields queries.
@@ -90,10 +90,10 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs
         cache.setName(name);
         cache.setCacheMode(cacheMode());
         cache.setAtomicityMode(atomicityMode());
-        cache.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC);
+        cache.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
         cache.setPreloadMode(SYNC);
 
-        GridCacheQueryConfiguration qcfg = new GridCacheQueryConfiguration();
+        CacheQueryConfiguration qcfg = new CacheQueryConfiguration();
 
         qcfg.setIndexPrimitiveKey(true);
         qcfg.setIndexPrimitiveValue(true);
@@ -126,35 +126,35 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs
 
         startGrid(gridCount());
 
-        GridCache<String, Organization> orgCache = grid(0).cache(null);
+        Cache<String, Organization> orgCache = grid(0).cache(null);
 
         assert orgCache != null;
 
         assert orgCache.putx("o1", new Organization(1, "A"));
         assert orgCache.putx("o2", new Organization(2, "B"));
 
-        GridCache<GridCacheAffinityKey<String>, Person> personCache = grid(0).cache(null);
+        Cache<CacheAffinityKey<String>, Person> personCache = grid(0).cache(null);
 
         assert personCache != null;
 
-        assert personCache.putx(new GridCacheAffinityKey<>("p1", "o1"), new Person("John White", 25, 1));
-        assert personCache.putx(new GridCacheAffinityKey<>("p2", "o1"), new Person("Joe Black", 35, 1));
-        assert personCache.putx(new GridCacheAffinityKey<>("p3", "o2"), new Person("Mike Green", 40, 2));
+        assert personCache.putx(new CacheAffinityKey<>("p1", "o1"), new Person("John White", 25, 1));
+        assert personCache.putx(new CacheAffinityKey<>("p2", "o1"), new Person("Joe Black", 35, 1));
+        assert personCache.putx(new CacheAffinityKey<>("p3", "o2"), new Person("Mike Green", 40, 2));
 
-        GridCache<String, String> strCache = grid(0).cache(null);
+        Cache<String, String> strCache = grid(0).cache(null);
 
         assert strCache != null;
 
         assert strCache.putx("key", "val");
 
-        GridCache<Integer, Integer> intCache = grid(0).cache(null);
+        Cache<Integer, Integer> intCache = grid(0).cache(null);
 
         assert intCache != null;
 
         for (int i = 0; i < 200; i++)
             assert intCache.putx(i, i);
 
-        GridCache<Integer, Integer> namedCache = grid(0).cache(CACHE);
+        Cache<Integer, Integer> namedCache = grid(0).cache(CACHE);
 
         for (int i = 0; i < 200; i++)
             assert namedCache.putx(i, i);
@@ -202,7 +202,7 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs
                 assert types.contains("String");
                 assert types.contains("Integer");
 
-                assert GridCacheAffinityKey.class.getName().equals(meta.keyClass("Person"));
+                assert CacheAffinityKey.class.getName().equals(meta.keyClass("Person"));
                 assert String.class.getName().equals(meta.keyClass("Organization"));
                 assert String.class.getName().equals(meta.keyClass("String"));
 
@@ -214,7 +214,7 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs
 
                 assert fields != null;
                 assert fields.size() == 5;
-                assert GridCacheAffinityKey.class.getName().equals(fields.get("_KEY"));
+                assert CacheAffinityKey.class.getName().equals(fields.get("_KEY"));
                 assert Person.class.getName().equals(fields.get("_VAL"));
                 assert String.class.getName().equals(fields.get("NAME"));
                 assert int.class.getName().equals(fields.get("AGE"));
@@ -265,10 +265,10 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs
 
     /** @throws Exception If failed. */
     public void testExecute() throws Exception {
-        GridCacheQuery<List<?>> qry = grid(0).cache(null).queries().createSqlFieldsQuery(
+        CacheQuery<List<?>> qry = grid(0).cache(null).queries().createSqlFieldsQuery(
             "select _KEY, name, age from Person");
 
-        GridCacheQueryFuture<List<?>> fut = qry.execute();
+        CacheQueryFuture<List<?>> fut = qry.execute();
 
         assert metadata(fut) == null;
 
@@ -292,17 +292,17 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs
             assert row.size() == 3;
 
             if (cnt == 0) {
-                assert new GridCacheAffinityKey<>("p1", "o1").equals(row.get(0));
+                assert new CacheAffinityKey<>("p1", "o1").equals(row.get(0));
                 assert "John White".equals(row.get(1));
                 assert row.get(2).equals(25);
             }
             else if (cnt == 1) {
-                assert new GridCacheAffinityKey<>("p2", "o1").equals(row.get(0));
+                assert new CacheAffinityKey<>("p2", "o1").equals(row.get(0));
                 assert "Joe Black".equals(row.get(1));
                 assert row.get(2).equals(35);
             }
             if (cnt == 2) {
-                assert new GridCacheAffinityKey<>("p3", "o2").equals(row.get(0));
+                assert new CacheAffinityKey<>("p3", "o2").equals(row.get(0));
                 assert "Mike Green".equals(row.get(1));
                 assert row.get(2).equals(40);
             }
@@ -315,10 +315,10 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs
 
     /** @throws Exception If failed. */
     public void testExecuteWithArguments() throws Exception {
-        GridCacheQuery<List<?>> qry = grid(0).cache(null).queries().createSqlFieldsQuery(
+        CacheQuery<List<?>> qry = grid(0).cache(null).queries().createSqlFieldsQuery(
             "select _KEY, name, age from Person where age > ?");
 
-        GridCacheQueryFuture<List<?>> fut = qry.execute(30);
+        CacheQueryFuture<List<?>> fut = qry.execute(30);
 
         assert metadata(fut) == null;
 
@@ -342,12 +342,12 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs
             assert row.size() == 3;
 
             if (cnt == 0) {
-                assert new GridCacheAffinityKey<>("p2", "o1").equals(row.get(0));
+                assert new CacheAffinityKey<>("p2", "o1").equals(row.get(0));
                 assert "Joe Black".equals(row.get(1));
                 assert row.get(2).equals(35);
             }
             else if (cnt == 1) {
-                assert new GridCacheAffinityKey<>("p3", "o2").equals(row.get(0));
+                assert new CacheAffinityKey<>("p3", "o2").equals(row.get(0));
                 assert "Mike Green".equals(row.get(1));
                 assert row.get(2).equals(40);
             }
@@ -360,12 +360,12 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs
 
     /** @throws Exception If failed. */
     public void testExecuteWithMetaData() throws Exception {
-        GridCacheQuery<List<?>> qry = ((GridCacheQueriesEx<?, ?>)grid(0).cache(null).queries()).createSqlFieldsQuery(
+        CacheQuery<List<?>> qry = ((GridCacheQueriesEx<?, ?>)grid(0).cache(null).queries()).createSqlFieldsQuery(
             "select p._KEY, p.name, p.age, o.name " +
                 "from Person p, Organization o where p.orgId = o.id",
             true);
 
-        GridCacheQueryFuture<List<?>> fut = qry.execute();
+        CacheQueryFuture<List<?>> fut = qry.execute();
 
         List<GridQueryFieldMetadata> meta = metadata(fut);
 
@@ -435,19 +435,19 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs
             assert row.size() == 4;
 
             if (cnt == 0) {
-                assert new GridCacheAffinityKey<>("p1", "o1").equals(row.get(0));
+                assert new CacheAffinityKey<>("p1", "o1").equals(row.get(0));
                 assert "John White".equals(row.get(1));
                 assert row.get(2).equals(25);
                 assert "A".equals(row.get(3));
             }
             else if (cnt == 1) {
-                assert new GridCacheAffinityKey<>("p2", "o1").equals(row.get(0));
+                assert new CacheAffinityKey<>("p2", "o1").equals(row.get(0));
                 assert "Joe Black".equals(row.get(1));
                 assert row.get(2).equals(35);
                 assert "A".equals(row.get(3));
             }
             if (cnt == 2) {
-                assert new GridCacheAffinityKey<>("p3", "o2").equals(row.get(0));
+                assert new CacheAffinityKey<>("p3", "o2").equals(row.get(0));
                 assert "Mike Green".equals(row.get(1));
                 assert row.get(2).equals(40);
                 assert "B".equals(row.get(3));
@@ -461,11 +461,11 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs
 
     /** @throws Exception If failed. */
     public void testSelectAllJoined() throws Exception {
-        GridCacheQuery<List<?>> qry = ((GridCacheQueriesEx<?, ?>)grid(0).cache(null).queries()).createSqlFieldsQuery(
+        CacheQuery<List<?>> qry = ((GridCacheQueriesEx<?, ?>)grid(0).cache(null).queries()).createSqlFieldsQuery(
             "select * from Person p, Organization o where p.orgId = o.id",
             true);
 
-        GridCacheQueryFuture<List<?>> fut = qry.execute();
+        CacheQueryFuture<List<?>> fut = qry.execute();
 
         List<GridQueryFieldMetadata> meta = metadata(fut);
 
@@ -585,7 +585,7 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs
             assert row.size() == 9;
 
             if (cnt == 0) {
-                assert new GridCacheAffinityKey<>("p1", "o1").equals(row.get(0));
+                assert new CacheAffinityKey<>("p1", "o1").equals(row.get(0));
                 assert Person.class.getName().equals(row.get(1).getClass().getName());
                 assert "John White".equals(row.get(2));
                 assert row.get(3).equals(25);
@@ -596,7 +596,7 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs
                 assert "A".equals(row.get(8));
             }
             else if (cnt == 1) {
-                assert new GridCacheAffinityKey<>("p2", "o1").equals(row.get(0));
+                assert new CacheAffinityKey<>("p2", "o1").equals(row.get(0));
                 assert Person.class.getName().equals(row.get(1).getClass().getName());
                 assert "Joe Black".equals(row.get(2));
                 assert row.get(3).equals(35);
@@ -607,7 +607,7 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs
                 assert "A".equals(row.get(8));
             }
             if (cnt == 2) {
-                assert new GridCacheAffinityKey<>("p3", "o2").equals(row.get(0));
+                assert new CacheAffinityKey<>("p3", "o2").equals(row.get(0));
                 assert Person.class.getName().equals(row.get(1).getClass().getName());
                 assert "Mike Green".equals(row.get(2));
                 assert row.get(3).equals(40);
@@ -626,10 +626,10 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs
 
     /** @throws Exception If failed. */
     public void testEmptyResult() throws Exception {
-        GridCacheQuery<List<?>> qry = ((GridCacheQueriesEx<?, ?>)grid(0).cache(null).queries()).createSqlFieldsQuery(
+        CacheQuery<List<?>> qry = ((GridCacheQueriesEx<?, ?>)grid(0).cache(null).queries()).createSqlFieldsQuery(
             "select name from Person where age = 0", true);
 
-        GridCacheQueryFuture<List<?>> fut = qry.execute();
+        CacheQueryFuture<List<?>> fut = qry.execute();
 
         assert fut != null;
 
@@ -654,7 +654,7 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs
 
     /** @throws Exception If failed. */
     public void testQueryString() throws Exception {
-        GridCacheQuery<List<?>> qry = grid(0).cache(null).queries().createSqlFieldsQuery("select * from String");
+        CacheQuery<List<?>> qry = grid(0).cache(null).queries().createSqlFieldsQuery("select * from String");
 
         Collection<List<?>> res = qry.execute().get();
 
@@ -671,11 +671,11 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs
 
     /** @throws Exception If failed. */
     public void testQueryIntegersWithJoin() throws Exception {
-        GridCacheQuery<List<?>> qry = ((GridCacheQueriesEx<?, ?>)grid(0).cache(null).queries()).createSqlFieldsQuery(
+        CacheQuery<List<?>> qry = ((GridCacheQueriesEx<?, ?>)grid(0).cache(null).queries()).createSqlFieldsQuery(
             "select i._KEY, i._VAL, j._KEY, j._VAL from Integer i join Integer j where i._VAL >= 100", true)
             .projection(grid(0));
 
-        GridCacheQueryFuture<List<?>> fut = qry.execute();
+        CacheQueryFuture<List<?>> fut = qry.execute();
 
         List<GridQueryFieldMetadata> meta = metadata(fut);
 
@@ -739,7 +739,7 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs
 
     /** @throws Exception If failed. */
     public void testPagination() throws Exception {
-        GridCacheQuery<List<?>> qry = grid(0).cache(null).queries().createSqlFieldsQuery("select * from Integer");
+        CacheQuery<List<?>> qry = grid(0).cache(null).queries().createSqlFieldsQuery("select * from Integer");
 
         qry.pageSize(20);
 
@@ -761,12 +761,12 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs
 
     /** @throws Exception If failed. */
     public void testNamedCache() throws Exception {
-        GridCache<Integer, Integer> cache = grid(0).cache(CACHE);
+        Cache<Integer, Integer> cache = grid(0).cache(CACHE);
 
         for (int i = 0; i < 200; i++)
             assert cache.putx(i, i);
 
-        GridCacheQuery<List<?>> qry = cache.queries().createSqlFieldsQuery("select * from Integer").projection(grid(0));
+        CacheQuery<List<?>> qry = cache.queries().createSqlFieldsQuery("select * from Integer").projection(grid(0));
 
         Collection<List<?>> res = qry.execute().get();
 
@@ -776,7 +776,7 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs
 
     /** @throws Exception If failed. */
     public void _testNoPrimitives() throws Exception { // TODO
-        GridCache<Object, Object> cache = grid(0).cache(CACHE_NO_PRIMITIVES);
+        Cache<Object, Object> cache = grid(0).cache(CACHE_NO_PRIMITIVES);
 
         assert cache.putx("key", "val");
 
@@ -786,16 +786,16 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs
 
         assert F.first(metas).types().isEmpty() : "Non empty types: " + F.first(metas).types();
 
-        GridCacheQuery<List<?>> qry = cache.queries().createSqlFieldsQuery("select * from String");
+        CacheQuery<List<?>> qry = cache.queries().createSqlFieldsQuery("select * from String");
 
         assert qry.execute().get().isEmpty();
 
-        cache.removeAll(F.<GridCacheEntry<Object, Object>>alwaysTrue());
+        cache.removeAll(F.<CacheEntry<Object, Object>>alwaysTrue());
     }
 
     /** @throws Exception If failed. */
     public void _testComplexKeys() throws Exception { // TODO
-        GridCache<PersonKey, Person> cache = grid(0).cache(CACHE_COMPLEX_KEYS);
+        Cache<PersonKey, Person> cache = grid(0).cache(CACHE_COMPLEX_KEYS);
 
         UUID id = UUID.randomUUID();
 
@@ -880,7 +880,7 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs
             }
         }
 
-        cache.removeAll(F.<GridCacheEntry<PersonKey, Person>>alwaysTrue());
+        cache.removeAll(F.<CacheEntry<PersonKey, Person>>alwaysTrue());
     }
 
     /** @throws Exception If failed. */
@@ -898,14 +898,14 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs
      * @throws Exception If failed.
      */
     private void testPaginationIterator(@Nullable String cacheName) throws Exception {
-        GridCacheQuery<List<?>> q = grid(0).cache(cacheName).queries().createSqlFieldsQuery("select _key, _val from " +
+        CacheQuery<List<?>> q = grid(0).cache(cacheName).queries().createSqlFieldsQuery("select _key, _val from " +
             "Integer")
             .projection(grid(0));
 
         q.pageSize(10);
         q.keepAll(false);
 
-        GridCacheQueryFuture<List<?>> f = q.execute();
+        CacheQueryFuture<List<?>> f = q.execute();
 
         int cnt = 0;
 
@@ -931,13 +931,13 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs
 
     /** @throws Exception If failed. */
     public void testPaginationIteratorKeepAll() throws Exception {
-        GridCacheQuery<List<?>> q = grid(0).cache(null).queries().createSqlFieldsQuery(
+        CacheQuery<List<?>> q = grid(0).cache(null).queries().createSqlFieldsQuery(
             "select _key, _val from Integer");
 
         q.pageSize(10);
         q.keepAll(true);
 
-        GridCacheQueryFuture<List<?>> f = q.execute();
+        CacheQueryFuture<List<?>> f = q.execute();
 
         int cnt = 0;
 
@@ -990,13 +990,13 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs
      * @throws Exception If failed.
      */
     private void testPaginationGet(@Nullable String cacheName) throws Exception {
-        GridCacheQuery<List<?>> q = grid(0).cache(cacheName).queries().createSqlFieldsQuery("select _key, _val from " +
+        CacheQuery<List<?>> q = grid(0).cache(cacheName).queries().createSqlFieldsQuery("select _key, _val from " +
             "Integer");
 
         q.pageSize(10);
         q.keepAll(true);
 
-        GridCacheQueryFuture<List<?>> f = q.execute();
+        CacheQueryFuture<List<?>> f = q.execute();
 
         List<List<?>> list = new ArrayList<>(f.get());
 
@@ -1018,7 +1018,7 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs
 
     /** @throws Exception If failed. */
     public void testEmptyGrid() throws Exception {
-        GridCacheQuery<List<?>> qry = grid(0).cache(null).queries().createSqlFieldsQuery("select name, " +
+        CacheQuery<List<?>> qry = grid(0).cache(null).queries().createSqlFieldsQuery("select name, " +
             "age from Person where age = 25");
 
         List<?> res = F.first(qry.execute().get());
@@ -1037,9 +1037,9 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs
             }
         };
 
-        GridCacheProjection<Integer, Integer> cachePrj = grid(0).<Integer, Integer>cache(null).projection(p);
+        CacheProjection<Integer, Integer> cachePrj = grid(0).<Integer, Integer>cache(null).projection(p);
 
-        GridCacheQuery<List<?>> q = cachePrj.queries()
+        CacheQuery<List<?>> q = cachePrj.queries()
             .createSqlFieldsQuery("select _key, _val from Integer where _key >= 20 and _val < 40");
 
         List<List<?>> list = new ArrayList<>(q.execute().get());
@@ -1097,7 +1097,7 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs
      * @return Metadata.
      * @throws IgniteCheckedException In case of error.
      */
-    private List<GridQueryFieldMetadata> metadata(GridCacheQueryFuture<List<?>> fut) throws IgniteCheckedException {
+    private List<GridQueryFieldMetadata> metadata(CacheQueryFuture<List<?>> fut) throws IgniteCheckedException {
         assert fut != null;
 
         return ((GridCacheQueryMetadataAware)fut).metadata().get();
@@ -1167,7 +1167,7 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs
     @SuppressWarnings("UnusedDeclaration")
     private static class PersonKey implements Serializable {
         /** ID. */
-        @GridCacheQuerySqlField
+        @CacheQuerySqlField
         private final UUID id;
 
         /** @param id ID. */
@@ -1203,15 +1203,15 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs
     @SuppressWarnings("UnusedDeclaration")
     private static class Person implements Serializable {
         /** Name. */
-        @GridCacheQuerySqlField(index = false)
+        @CacheQuerySqlField(index = false)
         private final String name;
 
         /** Age. */
-        @GridCacheQuerySqlField(index = true)
+        @CacheQuerySqlField(index = true)
         private final int age;
 
         /** Organization ID. */
-        @GridCacheQuerySqlField(index = true)
+        @CacheQuerySqlField(index = true)
         private final int orgId;
 
         /**
@@ -1260,11 +1260,11 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs
     @SuppressWarnings("UnusedDeclaration")
     private static class Organization implements Serializable {
         /** ID. */
-        @GridCacheQuerySqlField
+        @CacheQuerySqlField
         private final int id;
 
         /** Name. */
-        @GridCacheQuerySqlField(index = false)
+        @CacheQuerySqlField(index = false)
         private final String name;
 
         /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java
index c0b872f..54a7629 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java
@@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.Cache;
 import org.apache.ignite.cache.query.*;
 import org.apache.ignite.cache.store.*;
 import org.apache.ignite.configuration.*;
@@ -39,7 +40,6 @@ import org.apache.ignite.testframework.junits.common.*;
 import org.jdk8.backport.*;
 import org.jetbrains.annotations.*;
 
-import javax.cache.*;
 import javax.cache.configuration.*;
 import javax.cache.expiry.*;
 import java.io.*;
@@ -47,13 +47,13 @@ import java.util.*;
 import java.util.concurrent.*;
 
 import static java.util.concurrent.TimeUnit.*;
-import static org.apache.ignite.cache.query.GridCacheQueryType.*;
+import static org.apache.ignite.cache.query.CacheQueryType.*;
 import static org.apache.ignite.events.IgniteEventType.*;
 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.*;
 import static org.junit.Assert.*;
 
 /**
@@ -92,7 +92,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
     /**
      * @return Distribution.
      */
-    protected GridCacheDistributionMode distributionMode() {
+    protected CacheDistributionMode distributionMode() {
         return NEAR_PARTITIONED;
     }
 
@@ -138,7 +138,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
             cc.setSwapEnabled(true);
             cc.setEvictNearSynchronized(false);
 
-            GridCacheQueryConfiguration qcfg = new GridCacheQueryConfiguration();
+            CacheQueryConfiguration qcfg = new CacheQueryConfiguration();
 
             qcfg.setIndexPrimitiveKey(true);
             qcfg.setIndexFixedTyping(true);
@@ -177,7 +177,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      * @throws Exception In case of error.
      */
     public void testDifferentKeyTypes() throws Exception {
-        GridCache<Object, Object> cache = ignite.cache(null);
+        Cache<Object, Object> cache = ignite.cache(null);
 
         cache.putx("key", "value");
 
@@ -192,7 +192,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      * @throws Exception In case of error.
      */
     public void testDifferentValueTypes() throws Exception {
-        GridCache<Object, Object> cache = ignite.cache(null);
+        Cache<Object, Object> cache = ignite.cache(null);
 
         cache.putx("key", "value");
 
@@ -207,11 +207,11 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      * @throws Exception In case of error.
      */
     public void testStringType() throws Exception {
-        GridCache<String, String> cache = ignite.cache(null);
+        Cache<String, String> cache = ignite.cache(null);
 
         cache.putx("tst", "test");
 
-        GridCacheQuery<Map.Entry<String, String>> qry = cache.queries().createSqlQuery(String.class, "_val='test'");
+        CacheQuery<Map.Entry<String, String>> qry = cache.queries().createSqlQuery(String.class, "_val='test'");
 
         Map.Entry<String, String> entry = F.first(qry.execute().get());
 
@@ -224,7 +224,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      * @throws Exception In case of error.
      */
     public void testIntegerType() throws Exception {
-        GridCache<String, Integer> cache = ignite.cache(null);
+        Cache<String, Integer> cache = ignite.cache(null);
 
         String key = "k";
 
@@ -232,7 +232,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
 
         cache.putx(key, val);
 
-        GridCacheQuery<Map.Entry<String, Integer>> qry = cache.queries().createSqlQuery(Integer.class,
+        CacheQuery<Map.Entry<String, Integer>> qry = cache.queries().createSqlQuery(Integer.class,
             "select * from Integer where _key = 'k' and _val > 1");
 
         Map.Entry<String, Integer> entry = F.first(qry.execute().get());
@@ -249,10 +249,10 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      */
     public void testUserDefinedFunction() throws IgniteCheckedException {
         // Without alias.
-        GridCacheQuery<List<?>> qry = ignite.cache(null).queries().createSqlFieldsQuery("select square(1), square(2)").
+        CacheQuery<List<?>> qry = ignite.cache(null).queries().createSqlFieldsQuery("select square(1), square(2)").
             projection(ignite.cluster());
 
-        GridCacheQueryFuture<List<?>> fut = qry.execute();
+        CacheQueryFuture<List<?>> fut = qry.execute();
 
         Collection<List<?>> res = fut.get();
 
@@ -278,7 +278,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
         assertEquals(8, row.get(1));
 
         // Not registered.
-        final GridCacheQuery<List<?>> qry3 = ignite.cache(null).queries().createSqlFieldsQuery("select no()");
+        final CacheQuery<List<?>> qry3 = ignite.cache(null).queries().createSqlFieldsQuery("select no()");
 
         GridTestUtils.assertThrows(
             log,
@@ -303,9 +303,9 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
         ignite.jcache(null).
             withExpiryPolicy(new TouchedExpiryPolicy(new Duration(MILLISECONDS, 1000))).put("key1", 1);
 
-        GridCache<String, Integer> cache = ignite.cache(null);
+        Cache<String, Integer> cache = ignite.cache(null);
 
-        GridCacheQuery<Map.Entry<String, Integer>> qry = cache.queries().createSqlQuery(Integer.class, "1=1");
+        CacheQuery<Map.Entry<String, Integer>> qry = cache.queries().createSqlQuery(Integer.class, "1=1");
 
         Map.Entry<String, Integer> res = F.first(qry.execute().get());
 
@@ -322,12 +322,12 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      * @throws Exception If failed.
      */
     public void testIllegalBounds() throws Exception {
-        GridCache<Integer, Integer> cache = ignite.cache(null);
+        Cache<Integer, Integer> cache = ignite.cache(null);
 
         cache.put(1, 1);
         cache.put(2, 2);
 
-        GridCacheQuery<Map.Entry<Integer, Integer>> qry = cache.queries().createSqlQuery(Integer.class,
+        CacheQuery<Map.Entry<Integer, Integer>> qry = cache.queries().createSqlQuery(Integer.class,
             "_key between 2 and 1");
 
         assertTrue(qry.execute().get().isEmpty());
@@ -339,7 +339,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      * @throws Exception In case of error.
      */
     public void testComplexType() throws Exception {
-        GridCache<Key, GridCacheQueryTestValue> cache = ignite.cache(null);
+        Cache<Key, GridCacheQueryTestValue> cache = ignite.cache(null);
 
         GridCacheQueryTestValue val1 = new GridCacheQueryTestValue();
 
@@ -357,7 +357,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
         cache.putx(new Key(100500), val1);
         cache.putx(new Key(100501), val2);
 
-        GridCacheQuery<Map.Entry<Key, GridCacheQueryTestValue>> qry =
+        CacheQuery<Map.Entry<Key, GridCacheQueryTestValue>> qry =
             cache.queries().createSqlQuery(GridCacheQueryTestValue.class,
                 "fieldName='field1' and field2=1 and field3=1 and id=100500 and embeddedField2=11 and x=3");
 
@@ -373,7 +373,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      */
     private static class Key {
         /** */
-        @GridCacheQuerySqlField
+        @CacheQuerySqlField
         private final long id;
 
         /**
@@ -409,14 +409,14 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      * @throws Exception In case of error.
      */
     public void testSelectQuery() throws Exception {
-        GridCache<String, String> cache = ignite.cache(null);
+        Cache<String, String> cache = ignite.cache(null);
 
         cache.putx("key", "value");
 
-        GridCacheQuery<Map.Entry<String, String>> qry = cache.queries().createSqlQuery(String.class,
+        CacheQuery<Map.Entry<String, String>> qry = cache.queries().createSqlQuery(String.class,
             "select * from String");
 
-        GridCacheQueryFuture<Map.Entry<String, String>> iter = qry.execute();
+        CacheQueryFuture<Map.Entry<String, String>> iter = qry.execute();
 
         assert iter != null;
         assert iter.next() != null;
@@ -428,16 +428,16 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      * @throws Exception In case of error.
      */
     public void testObjectQuery() throws Exception {
-        GridCache<Integer, ObjectValue> cache = ignite.cache(null);
+        Cache<Integer, ObjectValue> cache = ignite.cache(null);
 
         ObjectValue val = new ObjectValue("test", 0);
 
         cache.putx(1, val);
 
-        GridCacheQuery<Map.Entry<Integer, ObjectValue>> qry =
+        CacheQuery<Map.Entry<Integer, ObjectValue>> qry =
             cache.queries().createSqlQuery(ObjectValue.class, "_val=?");
 
-        GridCacheQueryFuture<Map.Entry<Integer, ObjectValue>> iter = qry.execute(val);
+        CacheQueryFuture<Map.Entry<Integer, ObjectValue>> iter = qry.execute(val);
 
         assert iter != null;
 
@@ -466,7 +466,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      * @throws Exception In case of error.
      */
     public void testTextQueryOnProjection() throws Exception {
-        GridCache<Integer, ObjectValue> cache = ignite.cache(null);
+        Cache<Integer, ObjectValue> cache = ignite.cache(null);
 
         cache.putx(1, new ObjectValue("test", 1));
         cache.putx(2, new ObjectValue("test", 2));
@@ -477,12 +477,12 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
             }
         };
 
-        GridCacheProjection<Integer, ObjectValue> cachePrj = grid(0).<Integer, ObjectValue>cache(null).projection(p);
+        CacheProjection<Integer, ObjectValue> cachePrj = grid(0).<Integer, ObjectValue>cache(null).projection(p);
 
-        GridCacheQuery<Map.Entry<Integer, ObjectValue>> qry =
+        CacheQuery<Map.Entry<Integer, ObjectValue>> qry =
             cachePrj.queries().createFullTextQuery(ObjectValue.class, "test");
 
-        GridCacheQueryFuture<Map.Entry<Integer, ObjectValue>> iter = qry.execute();
+        CacheQueryFuture<Map.Entry<Integer, ObjectValue>> iter = qry.execute();
 
         assert iter != null;
 
@@ -500,7 +500,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      * @throws Exception In case of error.
      */
     public void testObjectQueryWithSwap() throws Exception {
-        GridCache<Integer, ObjectValue> cache = ignite.cache(null);
+        Cache<Integer, ObjectValue> cache = ignite.cache(null);
 
         boolean partitioned = cache.configuration().getCacheMode() == PARTITIONED;
 
@@ -510,7 +510,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
             cache.putx(i, new ObjectValue("test" + i, i));
 
         for (Ignite g : G.allGrids()) {
-            GridCache<Integer, ObjectValue> c = g.cache(null);
+            Cache<Integer, ObjectValue> c = g.cache(null);
 
             for (int i = 0; i < cnt; i++) {
                 if (i % 2 == 0) {
@@ -527,12 +527,12 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
             }
         }
 
-        GridCacheQuery<Map.Entry<Integer, ObjectValue>> qry =
+        CacheQuery<Map.Entry<Integer, ObjectValue>> qry =
             cache.queries().createSqlQuery(ObjectValue.class, "intVal >= ? order by intVal");
 
         qry.enableDedup(true);
 
-        GridCacheQueryFuture<Map.Entry<Integer, ObjectValue>> iter = qry.execute(0);
+        CacheQueryFuture<Map.Entry<Integer, ObjectValue>> iter = qry.execute(0);
 
         assert iter != null;
 
@@ -590,10 +590,10 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      * @throws Exception In case of error.
      */
     public void testFullTextSearch() throws Exception {
-        GridCache<Integer, ObjectValue> cache = ignite.cache(null);
+        Cache<Integer, ObjectValue> cache = ignite.cache(null);
 
         // Try to execute on empty cache first.
-        GridCacheQuery<Map.Entry<Integer, ObjectValue>> qry = cache.queries().createFullTextQuery(ObjectValue.class,
+        CacheQuery<Map.Entry<Integer, ObjectValue>> qry = cache.queries().createFullTextQuery(ObjectValue.class,
             "full");
 
         assert qry.execute().get().isEmpty();
@@ -637,8 +637,8 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      * @throws Exception In case of error.
      */
     public void testRemoveIndex() throws Exception {
-        GridCache<Integer, ObjectValue> cache = ignite.cache(null);
-        GridCache<Integer, ObjectValue> cache1 = ignite.cache("c1");
+        Cache<Integer, ObjectValue> cache = ignite.cache(null);
+        Cache<Integer, ObjectValue> cache1 = ignite.cache("c1");
 
         ObjectValue val = new ObjectValue("test full text", 0);
 
@@ -673,13 +673,13 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      * @throws Exception In case of error.
      */
     public void testScanQuery() throws Exception {
-        GridCache<String, String> c1 = ignite.cache(null);
+        Cache<String, String> c1 = ignite.cache(null);
 
         c1.putx("key", "value");
 
-        GridCacheQuery<Map.Entry<String, String>> qry1 = c1.queries().createScanQuery(null);
+        CacheQuery<Map.Entry<String, String>> qry1 = c1.queries().createScanQuery(null);
 
-        GridCacheQueryFuture<Map.Entry<String, String>> iter = qry1.execute();
+        CacheQueryFuture<Map.Entry<String, String>> iter = qry1.execute();
 
         assert iter != null;
 
@@ -701,7 +701,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      * @throws Exception In case of error.
      */
     public void testTwoObjectsTextSearch() throws Exception {
-        GridCache<Object, Object> c = ignite.cache(null);
+        Cache<Object, Object> c = ignite.cache(null);
 
         c.put(1, new ObjectValue("ObjectValue str", 1));
         c.put("key", new ObjectValueOther("ObjectValueOther str"));
@@ -738,7 +738,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      * @throws Exception In case of error.
      */
     public void testTransformQuery() throws Exception {
-        GridCache<UUID, Person> c = ignite.cache(null);
+        Cache<UUID, Person> c = ignite.cache(null);
 
         final Person p1 = new Person("Bob", 100);
         final Person p2 = new Person("Tom", 200);
@@ -746,7 +746,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
         c.put(p1.id, p1);
         c.put(p2.id, p2);
 
-        GridCacheQuery<Map.Entry<UUID, Person>> q = c.queries().createScanQuery(null);
+        CacheQuery<Map.Entry<UUID, Person>> q = c.queries().createScanQuery(null);
 
         Collection<Map.Entry<UUID, String>> res = q.execute(new C1<Map.Entry<UUID, Person>, Map.Entry<UUID, String>>() {
             @Override public Map.Entry<UUID, String> apply(Map.Entry<UUID, Person> p) {
@@ -828,7 +828,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      * @throws Exception If failed.
      */
     public void testReduceQuery() throws Exception {
-        GridCache<String, Integer> c = ignite.cache(null);
+        Cache<String, Integer> c = ignite.cache(null);
 
         assert c.putx("key1", 1);
         assert c.putx("key2", 2);
@@ -836,7 +836,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
         assert c.putx("key4", 4);
         assert c.putx("key5", 5);
 
-        GridCacheQuery<Map.Entry<String, Integer>> qry = c.queries().createSqlQuery(Integer.class, "_val > 2");
+        CacheQuery<Map.Entry<String, Integer>> qry = c.queries().createSqlQuery(Integer.class, "_val > 2");
 
         Collection<Integer> res1 = qry.execute(new SumRemoteReducer()).get();
 
@@ -849,7 +849,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      * @throws Exception If failed.
      */
     public void testReduceQueryOnProjection() throws Exception {
-        GridCacheProjection<String, Integer> c = ignite.cache(null);
+        CacheProjection<String, Integer> c = ignite.cache(null);
 
         assert c.putx("key1", 1);
         assert c.putx("key2", 2);
@@ -864,9 +864,9 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
             }
         };
 
-        GridCacheProjection<String, Integer> cachePrj = ignite.<String, Integer>cache(null).projection(p);
+        CacheProjection<String, Integer> cachePrj = ignite.<String, Integer>cache(null).projection(p);
 
-        GridCacheQuery<Map.Entry<String, Integer>> q = cachePrj.queries().createSqlQuery(Integer.class, "_val > 2");
+        CacheQuery<Map.Entry<String, Integer>> q = cachePrj.queries().createSqlQuery(Integer.class, "_val > 2");
 
         Collection<Integer> res = q.execute(new SumRemoteReducer()).get();
 
@@ -877,7 +877,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      * @throws Exception If failed.
      */
     public void testEmptyObject() throws Exception {
-        GridCache<EmptyObject, EmptyObject> cache = ignite.cache(null);
+        Cache<EmptyObject, EmptyObject> cache = ignite.cache(null);
 
         cache.putx(new EmptyObject(1), new EmptyObject(2));
 
@@ -893,12 +893,12 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      * @throws Exception If failed.
      */
     public void testPrimitiveType() throws Exception {
-        GridCache<Integer, Integer> cache = ignite.cache(null);
+        Cache<Integer, Integer> cache = ignite.cache(null);
 
         assert cache.putx(1, 1);
         assert cache.putx(2, 2);
 
-        GridCacheQuery<Map.Entry<Integer, Integer>> q = cache.queries().createSqlQuery(int.class, "_val > 1");
+        CacheQuery<Map.Entry<Integer, Integer>> q = cache.queries().createSqlQuery(int.class, "_val > 1");
 
         Collection<Map.Entry<Integer, Integer>> res = q.execute().get();
 
@@ -929,19 +929,19 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      * @throws Exception If failed.
      */
     private void testPaginationIterator(@Nullable String cacheName) throws Exception {
-        GridCache<Integer, Integer> cache = ignite.cache(cacheName);
+        Cache<Integer, Integer> cache = ignite.cache(cacheName);
 
         for (int i = 0; i < 50; i++)
             assertTrue(cache.putx(i, i));
 
-        GridCacheQuery<Map.Entry<Integer, Integer>> q = cache.queries().createSqlQuery(Integer.class,
+        CacheQuery<Map.Entry<Integer, Integer>> q = cache.queries().createSqlQuery(Integer.class,
             "_key >= 0").projection(ignite.cluster());
 
         q.pageSize(10);
         q.enableDedup(true);
         q.keepAll(false);
 
-        GridCacheQueryFuture<Map.Entry<Integer, Integer>> f = q.execute();
+        CacheQueryFuture<Map.Entry<Integer, Integer>> f = q.execute();
 
         int cnt = 0;
 
@@ -966,18 +966,18 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      * @throws Exception If failed.
      */
     public void testPaginationIteratorKeepAll() throws Exception {
-        GridCache<Integer, Integer> cache = ignite.cache(null);
+        Cache<Integer, Integer> cache = ignite.cache(null);
 
         for (int i = 0; i < 50; i++)
             assertTrue(cache.putx(i, i));
 
-        GridCacheQuery<Map.Entry<Integer, Integer>> q = cache.queries().createSqlQuery(Integer.class, "_key >= 0");
+        CacheQuery<Map.Entry<Integer, Integer>> q = cache.queries().createSqlQuery(Integer.class, "_key >= 0");
 
         q.pageSize(10);
         q.enableDedup(true);
         q.keepAll(true);
 
-        GridCacheQueryFuture<Map.Entry<Integer, Integer>> f = q.execute();
+        CacheQueryFuture<Map.Entry<Integer, Integer>> f = q.execute();
 
         int cnt = 0;
 
@@ -1029,12 +1029,12 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      * @throws Exception If failed.
      */
     private void testPaginationGet(@Nullable String cacheName) throws Exception {
-        GridCache<Integer, Integer> cache = ignite.cache(cacheName);
+        Cache<Integer, Integer> cache = ignite.cache(cacheName);
 
         for (int i = 0; i < 50; i++)
             assertTrue(cache.putx(i, i));
 
-        GridCacheQuery<Map.Entry<Integer, Integer>> q = cache.queries().createSqlQuery(Integer.class, "_key >= 0");
+        CacheQuery<Map.Entry<Integer, Integer>> q = cache.queries().createSqlQuery(Integer.class, "_key >= 0");
 
         q.pageSize(10);
         q.enableDedup(true);
@@ -1059,12 +1059,12 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      * @throws Exception If failed.
      */
     public void testScanFilters() throws Exception {
-        GridCache<Integer, Integer> cache = ignite.cache(null);
+        Cache<Integer, Integer> cache = ignite.cache(null);
 
         for (int i = 0; i < 50; i++)
             assertTrue(cache.putx(i, i));
 
-        GridCacheQuery<Map.Entry<Integer, Integer>> q = cache.queries().createScanQuery(
+        CacheQuery<Map.Entry<Integer, Integer>> q = cache.queries().createScanQuery(
             new P2<Integer, Integer>() {
                 @Override public boolean apply(Integer k, Integer v) {
                     assertNotNull(k);
@@ -1098,7 +1098,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      * @throws Exception If failed.
      */
     public void testEmptyGrid() throws Exception {
-        GridCache<String, Integer> cache = ignite.cache(null);
+        Cache<String, Integer> cache = ignite.cache(null);
 
         String key = "k";
 
@@ -1106,7 +1106,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
 
         cache.putx(key, val);
 
-        GridCacheQuery<Map.Entry<String, Integer>> qry = cache.queries().createSqlQuery(Integer.class,
+        CacheQuery<Map.Entry<String, Integer>> qry = cache.queries().createSqlQuery(Integer.class,
             "select * from Integer where _key = 'k' and _val > 1");
 
         Map.Entry<String, Integer> entry = F.first(qry.execute().get());
@@ -1120,7 +1120,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      * @throws IgniteCheckedException if failed.
      */
     public void testBadHashObjectKey() throws IgniteCheckedException {
-        GridCache<BadHashKeyObject, Integer> cache = ignite.cache(null);
+        Cache<BadHashKeyObject, Integer> cache = ignite.cache(null);
 
         cache.put(new BadHashKeyObject("test_key1"), 9);
         cache.put(new BadHashKeyObject("test_key0"), 1005001);
@@ -1134,7 +1134,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      * @throws IgniteCheckedException if failed.
      */
     public void testTextIndexedKey() throws IgniteCheckedException {
-        GridCache<ObjectValue, Integer> cache = ignite.cache(null);
+        Cache<ObjectValue, Integer> cache = ignite.cache(null);
 
         cache.put(new ObjectValue("test_key1", 10), 19);
         cache.put(new ObjectValue("test_key0", 11), 11005);
@@ -1149,10 +1149,10 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      * @throws Exception If failed.
      */
     public void testAnonymousClasses() throws Exception {
-        GridCache<Integer, Object> cache = ignite.cache(null);
+        Cache<Integer, Object> cache = ignite.cache(null);
 
         Object val = new Object() {
-            @GridCacheQuerySqlField
+            @CacheQuerySqlField
             private int field1 = 10;
 
             @Override public String toString() {
@@ -1164,7 +1164,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
 
         assertTrue(cache.putx(1, val));
 
-        GridCacheQuery<Map.Entry<Integer, Object>> q = cache.queries().createSqlQuery(val.getClass(), "_key >= 0");
+        CacheQuery<Map.Entry<Integer, Object>> q = cache.queries().createSqlQuery(val.getClass(), "_key >= 0");
 
         q.enableDedup(true);
 
@@ -1172,7 +1172,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
 
         assertEquals(1, res.size());
 
-        GridCacheQuery<List<?>> fieldsQry = cache.queries().createSqlFieldsQuery(
+        CacheQuery<List<?>> fieldsQry = cache.queries().createSqlFieldsQuery(
             "select field1 from GridCacheAbstractQuerySelfTest_16");
 
         fieldsQry.enableDedup(true);
@@ -1191,7 +1191,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      * @throws Exception If failed.
      */
     public void testTwoAnonymousClasses() throws Exception {
-        GridCache<Integer, Object> cache = ignite.cache(null);
+        Cache<Integer, Object> cache = ignite.cache(null);
 
         Object val1 = new Object() {
             @Override public String toString() {
@@ -1208,7 +1208,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
         assertTrue(cache.putx(1, val1));
         assertTrue(cache.putx(2, val2));
 
-        GridCacheQuery<Map.Entry<Integer, Object>> q = cache.queries().createSqlQuery(val1.getClass(), "_key >= 0");
+        CacheQuery<Map.Entry<Integer, Object>> q = cache.queries().createSqlQuery(val1.getClass(), "_key >= 0");
 
         q.enableDedup(true);
 
@@ -1221,12 +1221,12 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      * @throws Exception If failed.
      */
     public void testOrderByOnly() throws Exception {
-        GridCache<Integer, Integer> cache = ignite.cache(null);
+        Cache<Integer, Integer> cache = ignite.cache(null);
 
         for (int i = 0; i < 10; i++)
             assertTrue(cache.putx(i, i));
 
-        GridCacheQuery<Map.Entry<Integer, Integer>> q = cache.queries().createSqlQuery(Integer.class, "order by _val");
+        CacheQuery<Map.Entry<Integer, Integer>> q = cache.queries().createSqlQuery(Integer.class, "order by _val");
 
         q.enableDedup(true);
 
@@ -1252,12 +1252,12 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      * @throws Exception If failed.
      */
     public void testLimitOnly() throws Exception {
-        GridCache<Integer, Integer> cache = ignite.cache(null);
+        Cache<Integer, Integer> cache = ignite.cache(null);
 
         for (int i = 0; i < 10; i++)
             assertTrue(cache.putx(i, i));
 
-        GridCacheQuery<Map.Entry<Integer, Integer>> q = cache.queries().createSqlQuery(Integer.class, "limit 5");
+        CacheQuery<Map.Entry<Integer, Integer>> q = cache.queries().createSqlQuery(Integer.class, "limit 5");
 
         q.enableDedup(true);
 
@@ -1283,12 +1283,12 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      * @throws Exception If failed.
      */
     public void testArray() throws Exception {
-        GridCache<Integer, ArrayObject> cache = ignite.cache(null);
+        Cache<Integer, ArrayObject> cache = ignite.cache(null);
 
         assertTrue(cache.putx(1, new ArrayObject(new Long[] {1L, null, 3L})));
         assertTrue(cache.putx(2, new ArrayObject(new Long[] {4L, 5L, 6L})));
 
-        GridCacheQuery<Map.Entry<Integer, ArrayObject>> q =
+        CacheQuery<Map.Entry<Integer, ArrayObject>> q =
             cache.queries().createSqlQuery(ArrayObject.class, "array_contains(arr, cast(4 as long))");
 
         q.enableDedup(true);
@@ -1376,12 +1376,12 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
             }, EVT_CACHE_QUERY_EXECUTED);
         }
 
-        GridCache<Integer, Integer> cache = ignite.cache(null);
+        Cache<Integer, Integer> cache = ignite.cache(null);
 
         for (int i = 0; i < 20; i++)
             assertTrue(cache.putx(i, i));
 
-        GridCacheQuery<Map.Entry<Integer, Integer>> q = cache.queries().createSqlQuery(Integer.class, "_key >= ?");
+        CacheQuery<Map.Entry<Integer, Integer>> q = cache.queries().createSqlQuery(Integer.class, "_key >= ?");
 
         if (customSubjId)
             ((GridCacheQueryAdapter)q).subjectId(subjId);
@@ -1470,12 +1470,12 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
             }, EVT_CACHE_QUERY_EXECUTED);
         }
 
-        GridCache<Integer, Integer> cache = ignite.cache(null);
+        Cache<Integer, Integer> cache = ignite.cache(null);
 
         for (int i = 0; i < 20; i++)
             assertTrue(cache.putx(i, i));
 
-        GridCacheQuery<Map.Entry<Integer, Integer>> q = cache.queries().createScanQuery(
+        CacheQuery<Map.Entry<Integer, Integer>> q = cache.queries().createScanQuery(
             new IgniteBiPredicate<Integer, Integer>() {
                 @Override public boolean apply(Integer key, Integer val) {
                     return key >= 10;
@@ -1568,13 +1568,13 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
             }, EVT_CACHE_QUERY_EXECUTED);
         }
 
-        GridCache<Integer, Person> cache = ignite.cache(null);
+        Cache<Integer, Person> cache = ignite.cache(null);
 
         assertTrue(cache.putx(1, new Person("Bob White", 1000)));
         assertTrue(cache.putx(2, new Person("Tom White", 1000)));
         assertTrue(cache.putx(3, new Person("Mike Green", 1000)));
 
-        GridCacheQuery<Map.Entry<Integer, Person>> q = cache.queries().createFullTextQuery(Person.class, "White");
+        CacheQuery<Map.Entry<Integer, Person>> q = cache.queries().createFullTextQuery(Person.class, "White");
 
         if (customSubjId)
             ((GridCacheQueryAdapter)q).subjectId(subjId);
@@ -1664,12 +1664,12 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
             }, EVT_CACHE_QUERY_EXECUTED);
         }
 
-        GridCache<Integer, Person> cache = ignite.cache(null);
+        Cache<Integer, Person> cache = ignite.cache(null);
 
         for (int i = 1; i <= 20; i++)
             assertTrue(cache.putx(i, new Person("Person " + i, i)));
 
-        GridCacheQuery<List<?>> q = cache.queries().createSqlFieldsQuery(
+        CacheQuery<List<?>> q = cache.queries().createSqlFieldsQuery(
             "select _key, name from Person where salary > ?");
 
         if (customSubjId)
@@ -1701,7 +1701,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      */
     private static class ArrayObject implements Serializable {
         /** */
-        @GridCacheQuerySqlField
+        @CacheQuerySqlField
         private Long[] arr;
 
         /**
@@ -1718,20 +1718,20 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
     public static class Person implements Externalizable {
         /** */
         @GridToStringExclude
-        @GridCacheQuerySqlField
+        @CacheQuerySqlField
         private UUID id = UUID.randomUUID();
 
         /** */
-        @GridCacheQuerySqlField
-        @GridCacheQueryTextField
+        @CacheQuerySqlField
+        @CacheQueryTextField
         private String name;
 
         /** */
-        @GridCacheQuerySqlField
+        @CacheQuerySqlField
         private int salary;
 
         /** */
-        @GridCacheQuerySqlField(index = true)
+        @CacheQuerySqlField(index = true)
         private int fake$Field;
 
         /**
@@ -1818,11 +1818,11 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
     @SuppressWarnings("PublicInnerClass")
     public static class ObjectValue implements Serializable {
         /** String value. */
-        @GridCacheQueryTextField
+        @CacheQueryTextField
         private String strVal;
 
         /** Integer value. */
-        @GridCacheQuerySqlField
+        @CacheQuerySqlField
         private int intVal;
 
         /**
@@ -1882,7 +1882,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      */
     private static class ObjectValueOther {
         /** Value. */
-        @GridCacheQueryTextField
+        @CacheQueryTextField
         private String val;
 
         /**
@@ -1965,7 +1965,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
      */
     private static class BadHashKeyObject implements Serializable {
         /** */
-        @GridCacheQuerySqlField(index = false)
+        @CacheQuerySqlField(index = false)
         private final String str;
 
         /**
@@ -2014,7 +2014,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
         }
 
         /** {@inheritDoc} */
-        @Override public void write(Cache.Entry<? extends Object, ? extends Object> e) {
+        @Override public void write(javax.cache.Cache.Entry<? extends Object, ? extends Object> e) {
             map.put(e.getKey(), e.getValue());
         }
 
@@ -2033,7 +2033,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
          * @param x Argument.
          * @return Square of given value.
          */
-        @GridCacheQuerySqlFunction
+        @CacheQuerySqlFunction
         public static int square(int x) {
             return x * x;
         }
@@ -2042,7 +2042,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
          * @param x Argument.
          * @return Cube of given value.
          */
-        @GridCacheQuerySqlFunction(alias = "_cube_")
+        @CacheQuerySqlFunction(alias = "_cube_")
         public static int cube(int x) {
             return x * x * x;
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java
index 41b28a7..23effe7 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java
@@ -31,8 +31,8 @@ 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.GridCachePreloadMode.*;
+import static org.apache.ignite.cache.CacheDistributionMode.*;
+import static org.apache.ignite.cache.CachePreloadMode.*;
 
 /**
  * Tests cross cache queries.
@@ -86,7 +86,7 @@ public class GridCacheCrossCacheQuerySelfTest extends GridCommonAbstractTest {
 
         cc.setName(name);
         cc.setCacheMode(mode);
-        cc.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC);
+        cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
         cc.setPreloadMode(SYNC);
         cc.setSwapEnabled(true);
         cc.setEvictNearSynchronized(false);
@@ -98,9 +98,9 @@ public class GridCacheCrossCacheQuerySelfTest extends GridCommonAbstractTest {
 
     /** @throws Exception If failed. */
     public void testOnProjection() throws Exception {
-        GridCacheProjection<Integer, FactPurchase> prj = ignite.<Integer, FactPurchase>cache("partitioned").projection(
-            new IgnitePredicate<GridCacheEntry<Integer, FactPurchase>>() {
-                @Override public boolean apply(GridCacheEntry<Integer, FactPurchase> e) {
+        CacheProjection<Integer, FactPurchase> prj = ignite.<Integer, FactPurchase>cache("partitioned").projection(
+            new IgnitePredicate<CacheEntry<Integer, FactPurchase>>() {
+                @Override public boolean apply(CacheEntry<Integer, FactPurchase> e) {
                     return e.getKey() > 12;
                 }
             });
@@ -117,11 +117,11 @@ public class GridCacheCrossCacheQuerySelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      * @return Result.
      */
-    private List<Map.Entry<Integer, FactPurchase>> body(GridCacheProjection<Integer, FactPurchase> prj)
+    private List<Map.Entry<Integer, FactPurchase>> body(CacheProjection<Integer, FactPurchase> prj)
         throws Exception {
         int idGen = 0;
 
-        GridCache<Integer, Object> dimCache = ignite.cache("replicated");
+        Cache<Integer, Object> dimCache = ignite.cache("replicated");
 
         for (int i = 0; i < 2; i++) {
             int id = idGen++;
@@ -135,10 +135,10 @@ public class GridCacheCrossCacheQuerySelfTest extends GridCommonAbstractTest {
             dimCache.put(id, new DimProduct(id, "Product" + id));
         }
 
-        GridCacheProjection<Integer, DimStore> stores = dimCache.projection(Integer.class, DimStore.class);
-        GridCacheProjection<Integer, DimProduct> prods = dimCache.projection(Integer.class, DimProduct.class);
+        CacheProjection<Integer, DimStore> stores = dimCache.projection(Integer.class, DimStore.class);
+        CacheProjection<Integer, DimProduct> prods = dimCache.projection(Integer.class, DimProduct.class);
 
-        GridCache<Integer, FactPurchase> factCache = ignite.cache("partitioned");
+        Cache<Integer, FactPurchase> factCache = ignite.cache("partitioned");
 
         List<DimStore> dimStores = new ArrayList<>(stores.values());
         Collections.sort(dimStores, new Comparator<DimStore>() {
@@ -164,7 +164,7 @@ public class GridCacheCrossCacheQuerySelfTest extends GridCommonAbstractTest {
             factCache.put(id, new FactPurchase(id, prod.getId(), store.getId()));
         }
 
-        GridCacheQuery<Map.Entry<Integer, FactPurchase>> qry = (prj == null ? factCache : prj).queries().createSqlQuery(
+        CacheQuery<Map.Entry<Integer, FactPurchase>> qry = (prj == null ? factCache : prj).queries().createSqlQuery(
             FactPurchase.class,
             "from \"replicated\".DimStore, \"partitioned\".FactPurchase where DimStore.id = FactPurchase.storeId");
 
@@ -213,7 +213,7 @@ public class GridCacheCrossCacheQuerySelfTest extends GridCommonAbstractTest {
      */
     private static class DimProduct {
         /** Primary key. */
-        @GridCacheQuerySqlField(unique = true)
+        @CacheQuerySqlField(unique = true)
         private int id;
 
         /** Product name. */
@@ -255,11 +255,11 @@ public class GridCacheCrossCacheQuerySelfTest extends GridCommonAbstractTest {
      */
     private static class DimStore {
         /** Primary key. */
-        @GridCacheQuerySqlField(unique = true)
+        @CacheQuerySqlField(unique = true)
         private int id;
 
         /** Store name. */
-        @GridCacheQuerySqlField
+        @CacheQuerySqlField
         private String name;
 
         /**
@@ -298,15 +298,15 @@ public class GridCacheCrossCacheQuerySelfTest extends GridCommonAbstractTest {
      */
     private static class FactPurchase {
         /** Primary key. */
-        @GridCacheQuerySqlField(unique = true)
+        @CacheQuerySqlField(unique = true)
         private int id;
 
         /** Foreign key to store at which purchase occurred. */
-        @GridCacheQuerySqlField
+        @CacheQuerySqlField
         private int storeId;
 
         /** Foreign key to purchased product. */
-        @GridCacheQuerySqlField
+        @CacheQuerySqlField
         private int productId;
 
         /**


Mime
View raw message