ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [20/74] [abbrv] incubator-ignite git commit: # ignite-63
Date Mon, 26 Jan 2015 02:58:40 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheCompactTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheCompactTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheCompactTask.java
index 6a28a73..70216b2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheCompactTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheCompactTask.java
@@ -58,7 +58,7 @@ public class VisorCacheCompactTask extends VisorOneNodeTask<Set<String>, Map<Str
         @Override protected Map<String, IgniteBiTuple<Integer, Integer>> run(Set<String> names) throws IgniteCheckedException {
             final Map<String, IgniteBiTuple<Integer, Integer>> res = new HashMap<>();
 
-            for(GridCache cache : g.cachesx()) {
+            for(Cache cache : g.cachesx()) {
                 String cacheName = cache.name();
 
                 if (names.contains(cacheName)) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
index 3071178..3e3fd08 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
@@ -40,7 +40,7 @@ public class VisorCacheConfiguration implements Serializable {
     private CacheMode mode;
 
     /** Distribution mode. */
-    private GridCacheDistributionMode distributionMode;
+    private CacheDistributionMode distributionMode;
 
     /** Cache atomicity mode */
     private CacheAtomicityMode atomicityMode;
@@ -55,7 +55,7 @@ public class VisorCacheConfiguration implements Serializable {
     private boolean eagerTtl;
 
     /** Write synchronization mode. */
-    private GridCacheWriteSynchronizationMode writeSynchronizationMode;
+    private CacheWriteSynchronizationMode writeSynchronizationMode;
 
     /** Sequence reserve size. */
     private int seqReserveSize;
@@ -100,7 +100,7 @@ public class VisorCacheConfiguration implements Serializable {
     private int pessimisticTxLogLinger;
 
     /** Memory mode. */
-    private GridCacheMemoryMode memoryMode;
+    private CacheMemoryMode memoryMode;
 
     /** Name of SPI to use for indexing. */
     private String indexingSpiName;
@@ -225,14 +225,14 @@ public class VisorCacheConfiguration implements Serializable {
     /**
      * @return Distribution mode.
      */
-    public GridCacheDistributionMode distributionMode() {
+    public CacheDistributionMode distributionMode() {
         return distributionMode;
     }
 
     /**
      * @param distributionMode New distribution mode.
      */
-    public void distributionMode(GridCacheDistributionMode distributionMode) {
+    public void distributionMode(CacheDistributionMode distributionMode) {
         this.distributionMode = distributionMode;
     }
 
@@ -295,14 +295,14 @@ public class VisorCacheConfiguration implements Serializable {
     /**
      * @return Write synchronization mode.
      */
-    public GridCacheWriteSynchronizationMode writeSynchronizationMode() {
+    public CacheWriteSynchronizationMode writeSynchronizationMode() {
         return writeSynchronizationMode;
     }
 
     /**
      * @param writeSynchronizationMode New write synchronization mode.
      */
-    public void writeSynchronizationMode(GridCacheWriteSynchronizationMode writeSynchronizationMode) {
+    public void writeSynchronizationMode(CacheWriteSynchronizationMode writeSynchronizationMode) {
         this.writeSynchronizationMode = writeSynchronizationMode;
     }
 
@@ -506,14 +506,14 @@ public class VisorCacheConfiguration implements Serializable {
     /**
      * @return Memory mode.
      */
-    public GridCacheMemoryMode memoryMode() {
+    public CacheMemoryMode memoryMode() {
         return memoryMode;
     }
 
     /**
      * @param memoryMode New memory mode.
      */
-    public void memoryMode(GridCacheMemoryMode memoryMode) {
+    public void memoryMode(CacheMemoryMode memoryMode) {
         this.memoryMode = memoryMode;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheEvictionConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheEvictionConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheEvictionConfiguration.java
index fba7aa2..6b9caf4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheEvictionConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheEvictionConfiguration.java
@@ -67,7 +67,7 @@ public class VisorCacheEvictionConfiguration implements Serializable {
     public static VisorCacheEvictionConfiguration from(CacheConfiguration ccfg) {
         VisorCacheEvictionConfiguration cfg = new VisorCacheEvictionConfiguration();
 
-        final GridCacheEvictionPolicy plc = ccfg.getEvictionPolicy();
+        final CacheEvictionPolicy plc = ccfg.getEvictionPolicy();
 
         cfg.policy(compactClass(plc));
         cfg.policyMaxSize(evictionPolicyMaxSize(plc));

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheLoadTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheLoadTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheLoadTask.java
index e946d06..37adb5d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheLoadTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheLoadTask.java
@@ -63,7 +63,7 @@ public class VisorCacheLoadTask extends
 
             Map<String, Integer> res = new HashMap<>();
 
-            for (GridCache c: g.cachesx()) {
+            for (Cache c: g.cachesx()) {
                 String cacheName = c.name();
 
                 if (cacheNames.contains(cacheName)) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetadataTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetadataTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetadataTask.java
index 489e225..9abb55d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetadataTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetadataTask.java
@@ -57,7 +57,7 @@ public class VisorCacheMetadataTask extends VisorOneNodeTask<String, GridCacheSq
 
         /** {@inheritDoc} */
         @Override protected GridCacheSqlMetadata run(String cacheName) throws IgniteCheckedException {
-            GridCache<Object, Object> cache = g.cachex(cacheName);
+            Cache<Object, Object> cache = g.cachex(cacheName);
 
             if (cache != null) {
                 GridCacheQueriesEx<Object, Object> queries = (GridCacheQueriesEx<Object, Object>) cache.queries();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetrics.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetrics.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetrics.java
index 8c903ad..fdf7826 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetrics.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetrics.java
@@ -23,7 +23,7 @@ import org.apache.ignite.internal.util.typedef.internal.*;
 import java.io.*;
 
 /**
- * Data transfer object for {@link GridCacheMetrics}.
+ * Data transfer object for {@link org.apache.ignite.cache.CacheMetrics}.
  */
 public class VisorCacheMetrics implements Serializable {
     /** */
@@ -97,10 +97,10 @@ public class VisorCacheMetrics implements Serializable {
      * @param c Cache.
      * @return Data transfer object for given cache metrics.
      */
-    public static VisorCacheMetrics from(GridCache c) {
+    public static VisorCacheMetrics from(Cache c) {
         VisorCacheMetrics cm = new VisorCacheMetrics();
 
-        GridCacheMetrics m = c.metrics();
+        CacheMetrics m = c.metrics();
 
         cm.size = c.size();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java
index 273a61c..63270d4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java
@@ -90,12 +90,12 @@ public class VisorCacheMetricsCollectorTask extends VisorMultiNodeTask<IgniteBiT
         /** {@inheritDoc} */
         @Override protected Map<String, VisorCacheMetrics>
             run(IgniteBiTuple<Boolean, String> arg) throws IgniteCheckedException {
-            Collection<? extends GridCache<?, ?>> caches = arg.get1() ? g.cachesx() : F.asList(g.cachex(arg.get2()));
+            Collection<? extends Cache<?, ?>> caches = arg.get1() ? g.cachesx() : F.asList(g.cachex(arg.get2()));
 
             if (caches != null) {
                 Map<String, VisorCacheMetrics> res = U.newHashMap(caches.size());
 
-                for (GridCache<?, ?> c : caches)
+                for (Cache<?, ?> c : caches)
                     res.put(c.name(), VisorCacheMetrics.from(c));
 
                 return res;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCachePreloadConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCachePreloadConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCachePreloadConfiguration.java
index cd2e2d4..135c144 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCachePreloadConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCachePreloadConfiguration.java
@@ -30,7 +30,7 @@ public class VisorCachePreloadConfiguration implements Serializable {
     private static final long serialVersionUID = 0L;
 
     /** Cache preload mode. */
-    private GridCachePreloadMode mode;
+    private CachePreloadMode mode;
 
     /** Preload thread pool size. */
     private int threadPoolSize;
@@ -67,14 +67,14 @@ public class VisorCachePreloadConfiguration implements Serializable {
     /**
      * @return Cache preload mode.
      */
-    public GridCachePreloadMode mode() {
+    public CachePreloadMode mode() {
         return mode;
     }
 
     /**
      * @param mode New cache preload mode.
      */
-    public void mode(GridCachePreloadMode mode) {
+    public void mode(CachePreloadMode mode) {
         this.mode = mode;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCachePreloadTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCachePreloadTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCachePreloadTask.java
index 4d4b8ce..9de92fc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCachePreloadTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCachePreloadTask.java
@@ -58,7 +58,7 @@ public class VisorCachePreloadTask extends VisorOneNodeTask<Set<String>, Void> {
         @Override protected Void run(Set<String> cacheNames) throws IgniteCheckedException {
             Collection<IgniteFuture<?>> futs = new ArrayList<>();
 
-            for(GridCache c : g.cachesx()) {
+            for(Cache c : g.cachesx()) {
                 if (cacheNames.contains(c.name()))
                     futs.add(c.forceRepartition());
             }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryMetrics.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryMetrics.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryMetrics.java
index e839074..0d22320 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryMetrics.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryMetrics.java
@@ -48,7 +48,7 @@ public class VisorCacheQueryMetrics implements Serializable {
      * @param m Cache query metrics.
      * @return Data transfer object for given cache metrics.
      */
-    public static VisorCacheQueryMetrics from(GridCacheQueryMetrics m) {
+    public static VisorCacheQueryMetrics from(CacheQueryMetrics m) {
         VisorCacheQueryMetrics qm = new VisorCacheQueryMetrics();
 
         qm.minTime = m.minimumTime();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheResetMetricsTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheResetMetricsTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheResetMetricsTask.java
index 3b0a695..7cfd085 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheResetMetricsTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheResetMetricsTask.java
@@ -53,7 +53,7 @@ public class VisorCacheResetMetricsTask extends VisorOneNodeTask<String, Void> {
 
         /** {@inheritDoc} */
         @Override protected Void run(String cacheName) throws IgniteCheckedException {
-            GridCache cache = g.cachex(cacheName);
+            Cache cache = g.cachex(cacheName);
 
             if (cache != null)
                 cache.resetMetrics();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheSwapBackupsTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheSwapBackupsTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheSwapBackupsTask.java
index 4186aa2..39877e0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheSwapBackupsTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheSwapBackupsTask.java
@@ -62,15 +62,15 @@ public class VisorCacheSwapBackupsTask extends VisorOneNodeTask<Set<String>, Map
         @Override protected Map<String, IgniteBiTuple<Integer, Integer>> run(Set<String> names) throws IgniteCheckedException {
             Map<String, IgniteBiTuple<Integer, Integer>> total = new HashMap<>();
 
-            for (GridCache c: g.cachesx()) {
+            for (Cache c: g.cachesx()) {
                 String cacheName = c.name();
 
                 if (names.contains(cacheName)) {
-                    Set<GridCacheEntry> entries = c.entrySet();
+                    Set<CacheEntry> entries = c.entrySet();
 
                     int before = entries.size(), after = before;
 
-                    for (GridCacheEntry entry: entries) {
+                    for (CacheEntry entry: entries) {
                         if (entry.backup() && entry.evict())
                             after--;
                     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
index f00f47b..639f201 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
@@ -99,7 +99,7 @@ public class VisorNodeDataCollectorJob extends VisorJob<VisorNodeDataCollectorTa
         try {
             IgniteConfiguration cfg = g.configuration();
 
-            for (GridCache cache : g.cachesx()) {
+            for (Cache cache : g.cachesx()) {
                 String cacheName = cache.name();
 
                 if (arg.systemCaches() || !(isSystemCache(cacheName) || isGgfsCache(cfg, cacheName))) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java
index 78851bc..d0deaea 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java
@@ -121,7 +121,7 @@ public class VisorQueryTask extends VisorOneNodeTask<VisorQueryTask.VisorQueryAr
         private static final long serialVersionUID = 0L;
 
         /** Future with query results. */
-        private final GridCacheQueryFuture<R> fut;
+        private final CacheQueryFuture<R> fut;
 
         /** Next record from future. */
         private final R next;
@@ -134,7 +134,7 @@ public class VisorQueryTask extends VisorOneNodeTask<VisorQueryTask.VisorQueryAr
          * @param next Next value.
          * @param accessed {@code true} if query was accessed before remove timeout expired.
          */
-        public VisorFutureResultSetHolder(GridCacheQueryFuture<R> fut, R next, Boolean accessed) {
+        public VisorFutureResultSetHolder(CacheQueryFuture<R> fut, R next, Boolean accessed) {
             this.fut = fut;
             this.next = next;
             this.accessed = accessed;
@@ -143,7 +143,7 @@ public class VisorQueryTask extends VisorOneNodeTask<VisorQueryTask.VisorQueryAr
         /**
          * @return Future with query results.
          */
-        public GridCacheQueryFuture<R> future() {
+        public CacheQueryFuture<R> future() {
             return fut;
         }
 
@@ -196,16 +196,16 @@ public class VisorQueryTask extends VisorOneNodeTask<VisorQueryTask.VisorQueryAr
                 String qryId = (scan ? VisorQueryUtils.SCAN_QRY_NAME : VisorQueryUtils.SQL_QRY_NAME) + "-" +
                     UUID.randomUUID();
 
-                GridCache<Object, Object> c = g.cachex(arg.cacheName());
+                Cache<Object, Object> c = g.cachex(arg.cacheName());
 
                 if (c == null)
                     return new IgniteBiTuple<>(new IgniteCheckedException("Cache not found: " +
                         escapeName(arg.cacheName())), null);
 
-                GridCacheProjection<Object, Object> cp = c.keepPortable();
+                CacheProjection<Object, Object> cp = c.keepPortable();
 
                 if (scan) {
-                    GridCacheQueryFuture<Map.Entry<Object, Object>> fut = cp.queries().createScanQuery(null)
+                    CacheQueryFuture<Map.Entry<Object, Object>> fut = cp.queries().createScanQuery(null)
                         .pageSize(arg.pageSize())
                         .projection(g.forNodeIds(arg.proj()))
                         .execute();
@@ -230,7 +230,7 @@ public class VisorQueryTask extends VisorOneNodeTask<VisorQueryTask.VisorQueryAr
                         VisorQueryUtils.SCAN_COL_NAMES, rows.get1(), next != null, duration));
                 }
                 else {
-                    GridCacheQueryFuture<List<?>> fut = ((GridCacheQueriesEx<?, ?>)cp.queries())
+                    CacheQueryFuture<List<?>> fut = ((GridCacheQueriesEx<?, ?>)cp.queries())
                         .createSqlFieldsQuery(arg.queryTxt(), true)
                         .pageSize(arg.pageSize())
                         .projection(g.forNodeIds(arg.proj()))

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryUtils.java
index f403403..95bb434 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryUtils.java
@@ -121,7 +121,7 @@ public class VisorQueryUtils {
      * @return Fetched rows and last processed element.
      */
     public static IgniteBiTuple<List<Object[]>, Map.Entry<Object, Object>> fetchScanQueryRows(
-        GridCacheQueryFuture<Map.Entry<Object, Object>> fut, Map.Entry<Object, Object> savedNext, int pageSize)
+        CacheQueryFuture<Map.Entry<Object, Object>> fut, Map.Entry<Object, Object> savedNext, int pageSize)
         throws IgniteCheckedException {
         List<Object[]> rows = new ArrayList<>();
 
@@ -171,7 +171,7 @@ public class VisorQueryUtils {
      * @param pageSize Number of rows to fetch.
      * @return Fetched rows and last processed element.
      */
-    public static IgniteBiTuple<List<Object[]>, List<?>> fetchSqlQueryRows(GridCacheQueryFuture<List<?>> fut,
+    public static IgniteBiTuple<List<Object[]>, List<?>> fetchSqlQueryRows(CacheQueryFuture<List<?>> fut,
         List<?> savedNext, int pageSize) throws IgniteCheckedException {
         List<Object[]> rows = new ArrayList<>();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
index dfca428..0b6b479 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
@@ -634,15 +634,15 @@ public class VisorTaskUtils {
      * @param policy Eviction policy.
      * @return Extracted max size.
      */
-    public static Integer evictionPolicyMaxSize(GridCacheEvictionPolicy policy) {
-        if (policy instanceof GridCacheLruEvictionPolicyMBean)
-            return ((GridCacheLruEvictionPolicyMBean)policy).getMaxSize();
+    public static Integer evictionPolicyMaxSize(CacheEvictionPolicy policy) {
+        if (policy instanceof CacheLruEvictionPolicyMBean)
+            return ((CacheLruEvictionPolicyMBean)policy).getMaxSize();
 
-        if (policy instanceof GridCacheRandomEvictionPolicyMBean)
-            return ((GridCacheRandomEvictionPolicyMBean)policy).getMaxSize();
+        if (policy instanceof CacheRandomEvictionPolicyMBean)
+            return ((CacheRandomEvictionPolicyMBean)policy).getMaxSize();
 
-        if (policy instanceof GridCacheFifoEvictionPolicyMBean)
-            return ((GridCacheFifoEvictionPolicyMBean)policy).getMaxSize();
+        if (policy instanceof CacheFifoEvictionPolicyMBean)
+            return ((CacheFifoEvictionPolicyMBean)policy).getMaxSize();
 
         return null;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/jdbc/IgniteJdbcDriver.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/jdbc/IgniteJdbcDriver.java b/modules/core/src/main/java/org/apache/ignite/jdbc/IgniteJdbcDriver.java
index 5233a58..e89c119 100644
--- a/modules/core/src/main/java/org/apache/ignite/jdbc/IgniteJdbcDriver.java
+++ b/modules/core/src/main/java/org/apache/ignite/jdbc/IgniteJdbcDriver.java
@@ -48,7 +48,7 @@ import java.util.logging.*;
  *     <li>
  *         Joins will work correctly only if joined objects are stored in
  *         collocated mode. Refer to
- *         {@link org.apache.ignite.cache.affinity.GridCacheAffinityKey}
+ *         {@link org.apache.ignite.cache.affinity.CacheAffinityKey}
  *         javadoc for more details.
  *     </li>
  *     <li>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/lang/IgnitePredicate.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgnitePredicate.java b/modules/core/src/main/java/org/apache/ignite/lang/IgnitePredicate.java
index 929d335..ac4dd49 100644
--- a/modules/core/src/main/java/org/apache/ignite/lang/IgnitePredicate.java
+++ b/modules/core/src/main/java/org/apache/ignite/lang/IgnitePredicate.java
@@ -23,7 +23,7 @@ import java.io.*;
  * Defines a predicate which accepts a parameter and returns {@code true} or {@code false}. In
  * GridGain, predicates are generally used for filtering nodes within grid projections, or for
  * providing atomic filters when performing cache operation, like in
- * {@link org.apache.ignite.cache.GridCache#put(Object, Object, IgnitePredicate[])} method.
+ * {@link org.apache.ignite.cache.Cache#put(Object, Object, IgnitePredicate[])} method.
  *
  * @param <E> Type of predicate parameter.
  */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/portables/PortableObject.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/portables/PortableObject.java b/modules/core/src/main/java/org/apache/ignite/portables/PortableObject.java
index 1d1afcd..84ebffb 100644
--- a/modules/core/src/main/java/org/apache/ignite/portables/PortableObject.java
+++ b/modules/core/src/main/java/org/apache/ignite/portables/PortableObject.java
@@ -33,7 +33,7 @@ import java.util.*;
  * To work with the portable format directly, user should create a cache projection
  * over {@code GridPortableObject} class and then retrieve individual fields as needed:
  * <pre name=code class=java>
- * GridCacheProjection&lt;GridPortableObject.class, GridPortableObject.class&gt; prj =
+ * CacheProjection&lt;GridPortableObject.class, GridPortableObject.class&gt; prj =
  *     cache.projection(GridPortableObject.class, GridPortableObject.class);
  *
  * // Convert instance of MyKey to portable format.
@@ -49,7 +49,7 @@ import java.util.*;
  * the keys are concrete deserialized objects and the values are returned in portable
  * format, like so:
  * <pre name=code class=java>
- * GridCacheProjection&lt;MyKey.class, GridPortableObject.class&gt; prj =
+ * CacheProjection&lt;MyKey.class, GridPortableObject.class&gt; prj =
  *     cache.projection(MyKey.class, GridPortableObject.class);
  *
  * GridPortableObject val = prj.get(new MyKey());
@@ -65,7 +65,7 @@ import java.util.*;
  * GridGain will only deserialize on the first access and will cache the deserialized object,
  * so it does not have to be deserialized again:
  * <pre name=code class=java>
- * GridCacheProjection&lt;MyKey.class, MyValue.class&gt; prj =
+ * CacheProjection&lt;MyKey.class, MyValue.class&gt; prj =
  *     cache.projection(MyKey.class, MyValue.class);
  *
  * MyValue val = prj.get(new MyKey());

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/streamer/router/StreamerCacheAffinityEventRouter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/streamer/router/StreamerCacheAffinityEventRouter.java b/modules/core/src/main/java/org/apache/ignite/streamer/router/StreamerCacheAffinityEventRouter.java
index e0bd722..28579ff 100644
--- a/modules/core/src/main/java/org/apache/ignite/streamer/router/StreamerCacheAffinityEventRouter.java
+++ b/modules/core/src/main/java/org/apache/ignite/streamer/router/StreamerCacheAffinityEventRouter.java
@@ -58,7 +58,7 @@ public class StreamerCacheAffinityEventRouter extends StreamerEventRouterAdapter
         if (evt instanceof CacheAffinityEvent) {
             CacheAffinityEvent e = (CacheAffinityEvent)evt;
 
-            GridCache<Object, Object> c = ((GridEx) ignite).cachex(e.cacheName());
+            Cache<Object, Object> c = ((GridEx) ignite).cachex(e.cacheName());
 
             assert c != null;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTx.java b/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTx.java
index 79ce67e..289d91a 100644
--- a/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTx.java
+++ b/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTx.java
@@ -29,8 +29,8 @@ import java.util.*;
  * Grid cache transaction. Cache transactions have a default 2PC (two-phase-commit) behavior and
  * can be plugged into ongoing {@code JTA} transaction by properly implementing
  * {@gglink org.gridgain.grid.cache.jta.GridCacheTmLookup}
- * interface. Cache transactions can also be started explicitly directly from {@link org.apache.ignite.cache.GridCacheProjection} API
- * via any of the {@code 'GridCacheProjection.txStart(..)'} methods.
+ * interface. Cache transactions can also be started explicitly directly from {@link org.apache.ignite.cache.CacheProjection} API
+ * via any of the {@code 'CacheProjection.txStart(..)'} methods.
  * <p>
  * Cache transactions support the following isolation levels:
  * <ul>
@@ -69,7 +69,7 @@ import java.util.*;
  *  message is sent without waiting for reply. If it is necessary to know whenever remote nodes have committed
  *  as well, synchronous commit or synchronous rollback should be enabled via
  *  {@link CacheConfiguration#setWriteSynchronizationMode}
- *  or by setting proper flags on cache projection, such as {@link org.apache.ignite.cache.GridCacheFlag#SYNC_COMMIT}.
+ *  or by setting proper flags on cache projection, such as {@link org.apache.ignite.cache.CacheFlag#SYNC_COMMIT}.
  *  <p>
  *  Note that in this mode, optimistic failures are only possible in conjunction with
  *  {@link IgniteTxIsolation#SERIALIZABLE} isolation level. In all other cases, optimistic
@@ -98,7 +98,7 @@ import java.util.*;
  * <h1 class="header">Usage</h1>
  * You can use cache transactions as follows:
  * <pre name="code" class="java">
- * GridCache&lt;String, Integer&gt; cache = GridGain.grid().cache();
+ * Cache&lt;String, Integer&gt; cache = GridGain.grid().cache();
  *
  * try (GridCacheTx tx = cache.txStart()) {
  *     // Perform transactional operations.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxSynchronization.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxSynchronization.java b/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxSynchronization.java
index 756e23e..8553d02 100644
--- a/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxSynchronization.java
+++ b/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxSynchronization.java
@@ -22,7 +22,7 @@ import org.jetbrains.annotations.*;
 /**
  * Synchronization callback for transaction. You can subscribe to receive transaction
  * state change callbacks by registering transaction synchronization via
- * {@link org.apache.ignite.cache.GridCache#txSynchronize(IgniteTxSynchronization)} method.
+ * {@link org.apache.ignite.cache.Cache#txSynchronize(IgniteTxSynchronization)} method.
  */
 public interface IgniteTxSynchronization {
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/config/discovery-stress.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/discovery-stress.xml b/modules/core/src/test/config/discovery-stress.xml
index f6c0a3d..3189792 100644
--- a/modules/core/src/test/config/discovery-stress.xml
+++ b/modules/core/src/test/config/discovery-stress.xml
@@ -35,7 +35,7 @@
                 <property name="writeSynchronizationMode" value="FULL_ASYNC"/>
 
                 <property name="evictionPolicy">
-                    <bean class="org.apache.ignite.cache.eviction.fifo.GridCacheFifoEvictionPolicy">
+                    <bean class="org.apache.ignite.cache.eviction.fifo.CacheFifoEvictionPolicy">
                         <property name="maxSize" value="20000000"/>
                     </bean>
                 </property>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/config/load/dsi-49-server-production.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/load/dsi-49-server-production.xml b/modules/core/src/test/config/load/dsi-49-server-production.xml
index 9bed5ee..28deb23 100644
--- a/modules/core/src/test/config/load/dsi-49-server-production.xml
+++ b/modules/core/src/test/config/load/dsi-49-server-production.xml
@@ -45,14 +45,14 @@
                     <property name="writeSynchronizationMode" value="FULL_SYNC"/>
                     <property name="evictionPolicy">
                         <bean
-                                class="org.apache.ignite.cache.eviction.lru.GridCacheLruEvictionPolicy">
+                                class="org.apache.ignite.cache.eviction.lru.CacheLruEvictionPolicy">
                             <property name="maxSize" value="500000"/>
                         </bean>
                     </property>
                     <!-- 1 backup -->
                     <property name="backups" value="1"/>
                     <property name="affinity">
-                        <bean class="org.apache.ignite.cache.affinity.consistenthash.GridCacheConsistentHashAffinityFunction">
+                        <bean class="org.apache.ignite.cache.affinity.consistenthash.CacheConsistentHashAffinityFunction">
                             <property name="excludeNeighbors" value="true"/>
                         </bean>
                     </property>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/config/load/dsi-load-server.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/load/dsi-load-server.xml b/modules/core/src/test/config/load/dsi-load-server.xml
index ad03f19..f6bcb8e 100644
--- a/modules/core/src/test/config/load/dsi-load-server.xml
+++ b/modules/core/src/test/config/load/dsi-load-server.xml
@@ -60,7 +60,7 @@
                     <property name="evictNearSynchronized" value="false"/>
 
                     <property name="evictionPolicy">
-                        <bean class="org.apache.ignite.cache.eviction.fifo.GridCacheFifoEvictionPolicy">
+                        <bean class="org.apache.ignite.cache.eviction.fifo.CacheFifoEvictionPolicy">
                             <property name="maxSize" value="5000"/>
                         </bean>
                     </property>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/config/spring-cache-swap.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/spring-cache-swap.xml b/modules/core/src/test/config/spring-cache-swap.xml
index c76d990..a18083f 100644
--- a/modules/core/src/test/config/spring-cache-swap.xml
+++ b/modules/core/src/test/config/spring-cache-swap.xml
@@ -35,7 +35,7 @@
                 <property name="swapEnabled" value="true"/>
 
                 <property name="evictionPolicy">
-                    <bean class="org.apache.ignite.cache.eviction.fifo.GridCacheFifoEvictionPolicy">
+                    <bean class="org.apache.ignite.cache.eviction.fifo.CacheFifoEvictionPolicy">
                         <property name="maxSize" value="10000"/>
                     </bean>
                 </property>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/config/spring-cache-teststore.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/spring-cache-teststore.xml b/modules/core/src/test/config/spring-cache-teststore.xml
index 5c7f4d4..7eee096 100644
--- a/modules/core/src/test/config/spring-cache-teststore.xml
+++ b/modules/core/src/test/config/spring-cache-teststore.xml
@@ -35,7 +35,7 @@
                 <property name="swapEnabled" value="false"/>
 
                 <property name="evictionPolicy">
-                    <bean class="org.apache.ignite.cache.eviction.fifo.GridCacheFifoEvictionPolicy">
+                    <bean class="org.apache.ignite.cache.eviction.fifo.CacheFifoEvictionPolicy">
                         <property name="maxSize" value="10000"/>
                     </bean>
                 </property>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/config/spring-multicache.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/spring-multicache.xml b/modules/core/src/test/config/spring-multicache.xml
index e5383de..f6e3dd8 100644
--- a/modules/core/src/test/config/spring-multicache.xml
+++ b/modules/core/src/test/config/spring-multicache.xml
@@ -73,7 +73,7 @@
                     <property name="preloadMode" value="SYNC"/>
 
                     <property name="evictionPolicy">
-                        <bean class="org.apache.ignite.cache.eviction.lru.GridCacheLruEvictionPolicy">
+                        <bean class="org.apache.ignite.cache.eviction.lru.CacheLruEvictionPolicy">
                             <property name="maxSize" value="100"/>
                         </bean>
                     </property>
@@ -95,7 +95,7 @@
                     <property name="preloadMode" value="SYNC"/>
 
                     <property name="evictionPolicy">
-                        <bean class="org.apache.ignite.cache.eviction.lru.GridCacheLruEvictionPolicy">
+                        <bean class="org.apache.ignite.cache.eviction.lru.CacheLruEvictionPolicy">
                             <property name="maxSize" value="100"/>
                         </bean>
                     </property>
@@ -117,7 +117,7 @@
                     <property name="preloadMode" value="SYNC"/>
 
                     <property name="evictionPolicy">
-                        <bean class="org.apache.ignite.cache.eviction.lru.GridCacheLruEvictionPolicy">
+                        <bean class="org.apache.ignite.cache.eviction.lru.CacheLruEvictionPolicy">
                             <property name="maxSize" value="100"/>
                         </bean>
                     </property>
@@ -139,7 +139,7 @@
                     <property name="preloadMode" value="SYNC"/>
 
                     <property name="evictionPolicy">
-                        <bean class="org.apache.ignite.cache.eviction.lru.GridCacheLruEvictionPolicy">
+                        <bean class="org.apache.ignite.cache.eviction.lru.CacheLruEvictionPolicy">
                             <property name="maxSize" value="100"/>
                         </bean>
                     </property>
@@ -162,7 +162,7 @@
                     <property name="preloadMode" value="SYNC"/>
 
                     <property name="evictionPolicy">
-                        <bean class="org.apache.ignite.cache.eviction.lru.GridCacheLruEvictionPolicy">
+                        <bean class="org.apache.ignite.cache.eviction.lru.CacheLruEvictionPolicy">
                             <property name="maxSize" value="100"/>
                         </bean>
                     </property>
@@ -184,7 +184,7 @@
                     <property name="preloadMode" value="SYNC"/>
 
                     <property name="evictionPolicy">
-                        <bean class="org.apache.ignite.cache.eviction.lru.GridCacheLruEvictionPolicy">
+                        <bean class="org.apache.ignite.cache.eviction.lru.CacheLruEvictionPolicy">
                             <property name="maxSize" value="100"/>
                         </bean>
                     </property>
@@ -206,7 +206,7 @@
                     <property name="preloadMode" value="SYNC"/>
 
                     <property name="evictionPolicy">
-                        <bean class="org.apache.ignite.cache.eviction.lru.GridCacheLruEvictionPolicy">
+                        <bean class="org.apache.ignite.cache.eviction.lru.CacheLruEvictionPolicy">
                             <property name="maxSize" value="100"/>
                         </bean>
                     </property>
@@ -228,7 +228,7 @@
                     <property name="preloadMode" value="SYNC"/>
 
                     <property name="evictionPolicy">
-                        <bean class="org.apache.ignite.cache.eviction.lru.GridCacheLruEvictionPolicy">
+                        <bean class="org.apache.ignite.cache.eviction.lru.CacheLruEvictionPolicy">
                             <property name="maxSize" value="100"/>
                         </bean>
                     </property>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/GridCacheAffinityBackupsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/GridCacheAffinityBackupsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/GridCacheAffinityBackupsSelfTest.java
index 35b07b2..0a4729c 100644
--- a/modules/core/src/test/java/org/apache/ignite/GridCacheAffinityBackupsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/GridCacheAffinityBackupsSelfTest.java
@@ -36,7 +36,7 @@ public class GridCacheAffinityBackupsSelfTest extends GridCommonAbstractTest {
     private int backups;
 
     /** Affinity function. */
-    private GridCacheAffinityFunction func;
+    private CacheAffinityFunction func;
 
     /** */
     private int nodesCnt = 5;
@@ -61,7 +61,7 @@ public class GridCacheAffinityBackupsSelfTest extends GridCommonAbstractTest {
      */
     public void testConsistentHashBackups() throws Exception {
         for (int i = 0; i < nodesCnt; i++)
-            checkBackups(i, new GridCacheConsistentHashAffinityFunction());
+            checkBackups(i, new CacheConsistentHashAffinityFunction());
     }
 
     /**
@@ -69,7 +69,7 @@ public class GridCacheAffinityBackupsSelfTest extends GridCommonAbstractTest {
      */
     public void testRendezvousBackups() throws Exception {
         for (int i = 0; i < nodesCnt; i++)
-            checkBackups(i, new GridCacheRendezvousAffinityFunction());
+            checkBackups(i, new CacheRendezvousAffinityFunction());
     }
 
     /**
@@ -77,20 +77,20 @@ public class GridCacheAffinityBackupsSelfTest extends GridCommonAbstractTest {
      */
     public void testFairBackups() throws Exception {
         for (int i = 0; i < nodesCnt; i++)
-            checkBackups(i, new GridCachePartitionFairAffinity());
+            checkBackups(i, new CachePartitionFairAffinity());
     }
 
     /**
      * @throws Exception If failed.
      */
-    private void checkBackups(int backups, GridCacheAffinityFunction func) throws Exception {
+    private void checkBackups(int backups, CacheAffinityFunction func) throws Exception {
         this.backups = backups;
         this.func = func;
 
         startGrids(nodesCnt);
 
         try {
-            GridCache<Object, Object> cache = grid(0).cache(null);
+            Cache<Object, Object> cache = grid(0).cache(null);
 
             Collection<UUID> members = new HashSet<>();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/GridCachePartitionFairAffinityNodesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/GridCachePartitionFairAffinityNodesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/GridCachePartitionFairAffinityNodesSelfTest.java
index f12e54e..92a8598 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/GridCachePartitionFairAffinityNodesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/GridCachePartitionFairAffinityNodesSelfTest.java
@@ -101,9 +101,9 @@ public class GridCachePartitionFairAffinityNodesSelfTest extends GridCommonAbstr
 
         cfg.setCacheMode(CacheMode.PARTITIONED);
 
-        cfg.setDistributionMode(GridCacheDistributionMode.PARTITIONED_ONLY);
+        cfg.setDistributionMode(CacheDistributionMode.PARTITIONED_ONLY);
 
-        cfg.setAffinity(new GridCachePartitionFairAffinity(parts));
+        cfg.setAffinity(new CachePartitionFairAffinity(parts));
 
         return cfg;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/GridCachePartitionFairAffinitySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/GridCachePartitionFairAffinitySelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/GridCachePartitionFairAffinitySelfTest.java
index 98e03bd..1792641 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/GridCachePartitionFairAffinitySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/GridCachePartitionFairAffinitySelfTest.java
@@ -18,7 +18,6 @@
 package org.apache.ignite.cache.affinity.fair;
 
 import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cache.affinity.fair.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.internal.processors.affinity.*;
@@ -93,7 +92,7 @@ public class GridCachePartitionFairAffinitySelfTest extends GridCommonAbstractTe
     private void checkNodeRemoved(int backups) throws Exception {
         int parts = 256;
 
-        GridCacheAffinityFunction aff = new GridCachePartitionFairAffinity(parts);
+        CacheAffinityFunction aff = new CachePartitionFairAffinity(parts);
 
         int nodesCnt = 50;
 
@@ -151,7 +150,7 @@ public class GridCachePartitionFairAffinitySelfTest extends GridCommonAbstractTe
     private void checkRandomReassignment(int backups) {
         int parts = 256;
 
-        GridCacheAffinityFunction aff = new GridCachePartitionFairAffinity(parts);
+        CacheAffinityFunction aff = new CachePartitionFairAffinity(parts);
 
         Random rnd = new Random();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/GridCacheJdbcBlobStoreMultithreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/GridCacheJdbcBlobStoreMultithreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/GridCacheJdbcBlobStoreMultithreadedSelfTest.java
index d622fc0..8337f7c 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/GridCacheJdbcBlobStoreMultithreadedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/GridCacheJdbcBlobStoreMultithreadedSelfTest.java
@@ -39,8 +39,8 @@ import java.util.concurrent.*;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.GridCacheDistributionMode.*;
-import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*;
+import static org.apache.ignite.cache.CacheDistributionMode.*;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
 import static org.apache.ignite.testframework.GridTestUtils.*;
 
 /**
@@ -57,7 +57,7 @@ public class GridCacheJdbcBlobStoreMultithreadedSelfTest extends GridCommonAbstr
     private static final int TX_CNT = 1000;
 
     /** Distribution mode. */
-    private GridCacheDistributionMode mode;
+    private CacheDistributionMode mode;
 
     /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
@@ -118,7 +118,7 @@ public class GridCacheJdbcBlobStoreMultithreadedSelfTest extends GridCommonAbstr
 
             @Override public Object call() throws Exception {
                 for (int i = 0; i < TX_CNT; i++) {
-                    GridCache<Integer, String> cache = cache(rnd.nextInt(GRID_CNT));
+                    Cache<Integer, String> cache = cache(rnd.nextInt(GRID_CNT));
 
                     cache.put(rnd.nextInt(1000), "value");
                 }
@@ -132,7 +132,7 @@ public class GridCacheJdbcBlobStoreMultithreadedSelfTest extends GridCommonAbstr
 
             @Override public Object call() throws Exception {
                 for (int i = 0; i < TX_CNT; i++) {
-                    GridCache<Integer, String> cache = cache(rnd.nextInt(GRID_CNT));
+                    Cache<Integer, String> cache = cache(rnd.nextInt(GRID_CNT));
 
                     cache.putIfAbsent(rnd.nextInt(1000), "value");
                 }
@@ -161,7 +161,7 @@ public class GridCacheJdbcBlobStoreMultithreadedSelfTest extends GridCommonAbstr
                     for (int j = 0; j < 10; j++)
                         map.put(rnd.nextInt(1000), "value");
 
-                    GridCache<Integer, String> cache = cache(rnd.nextInt(GRID_CNT));
+                    Cache<Integer, String> cache = cache(rnd.nextInt(GRID_CNT));
 
                     cache.putAll(map);
                 }
@@ -182,7 +182,7 @@ public class GridCacheJdbcBlobStoreMultithreadedSelfTest extends GridCommonAbstr
 
             @Override public Object call() throws Exception {
                 for (int i = 0; i < TX_CNT; i++) {
-                    GridCache<Integer, String> cache = cache(rnd.nextInt(GRID_CNT));
+                    Cache<Integer, String> cache = cache(rnd.nextInt(GRID_CNT));
 
                     try (IgniteTx tx = cache.txStart()) {
                         cache.put(1, "value");

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/fs/GridGgfsEventsAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/fs/GridGgfsEventsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/fs/GridGgfsEventsAbstractSelfTest.java
index 6082a6d..a72b151 100644
--- a/modules/core/src/test/java/org/apache/ignite/fs/GridGgfsEventsAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/fs/GridGgfsEventsAbstractSelfTest.java
@@ -34,9 +34,9 @@ import java.util.*;
 import java.util.concurrent.*;
 
 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.GridCacheWriteSynchronizationMode.*;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
 import static org.apache.ignite.events.IgniteEventType.*;
 import static org.apache.ignite.testframework.GridTestUtils.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/fs/GridGgfsFragmentizerAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/fs/GridGgfsFragmentizerAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/fs/GridGgfsFragmentizerAbstractSelfTest.java
index 8becba6..21b6a81 100644
--- a/modules/core/src/test/java/org/apache/ignite/fs/GridGgfsFragmentizerAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/fs/GridGgfsFragmentizerAbstractSelfTest.java
@@ -92,7 +92,7 @@ public class GridGgfsFragmentizerAbstractSelfTest extends GridGgfsCommonAbstract
         cfg.setName(META_CACHE_NAME);
 
         cfg.setCacheMode(REPLICATED);
-        cfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC);
+        cfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
         cfg.setQueryIndexEnabled(false);
         cfg.setAtomicityMode(TRANSACTIONAL);
 
@@ -112,8 +112,8 @@ public class GridGgfsFragmentizerAbstractSelfTest extends GridGgfsCommonAbstract
         cfg.setCacheMode(PARTITIONED);
         cfg.setBackups(0);
         cfg.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(GGFS_GROUP_SIZE));
-        cfg.setDistributionMode(GridCacheDistributionMode.PARTITIONED_ONLY);
-        cfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC);
+        cfg.setDistributionMode(CacheDistributionMode.PARTITIONED_ONLY);
+        cfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
         cfg.setQueryIndexEnabled(false);
         cfg.setAtomicityMode(TRANSACTIONAL);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/fs/GridGgfsFragmentizerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/fs/GridGgfsFragmentizerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/fs/GridGgfsFragmentizerSelfTest.java
index dacb3c8..e6b6c0b 100644
--- a/modules/core/src/test/java/org/apache/ignite/fs/GridGgfsFragmentizerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/fs/GridGgfsFragmentizerSelfTest.java
@@ -245,7 +245,7 @@ public class GridGgfsFragmentizerSelfTest extends GridGgfsFragmentizerAbstractSe
                 for (int i = 0; i < NODE_CNT; i++) {
                     GridEx g = grid(i);
 
-                    GridCache<Object, Object> cache = g.cachex(DATA_CACHE_NAME);
+                    Cache<Object, Object> cache = g.cachex(DATA_CACHE_NAME);
 
                     assertTrue("Data cache is not empty [keys=" + cache.keySet() +
                         ", node=" + g.localNode().id() + ']', cache.isEmpty());

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityMappedTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityMappedTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityMappedTest.java
index 6ad768a..102f2c8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityMappedTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityMappedTest.java
@@ -34,7 +34,7 @@ import java.util.*;
 import static org.apache.ignite.cache.CacheMode.*;
 
 /**
- * Tests affinity mapping when {@link org.apache.ignite.cache.affinity.GridCacheAffinityKeyMapper} is used.
+ * Tests affinity mapping when {@link org.apache.ignite.cache.affinity.CacheAffinityKeyMapper} is used.
  */
 public class GridAffinityMappedTest extends GridCommonAbstractTest {
     /** VM ip finder for TCP discovery. */
@@ -150,7 +150,7 @@ public class GridAffinityMappedTest extends GridCommonAbstractTest {
     /**
      * Mock affinity mapper implementation that substitutes values other than 0 and 1 with 0.
      */
-    private static class MockCacheAffinityKeyMapper implements GridCacheAffinityKeyMapper {
+    private static class MockCacheAffinityKeyMapper implements CacheAffinityKeyMapper {
         /** {@inheritDoc} */
         @Override public Object affinityKey(Object key) {
             return key instanceof Integer ? 1 == (Integer)key ? key : 0 : key;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityP2PSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityP2PSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityP2PSelfTest.java
index 1a51300..9fdc71b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityP2PSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityP2PSelfTest.java
@@ -99,8 +99,8 @@ public class GridAffinityP2PSelfTest extends GridCommonAbstractTest {
 
             GridTestExternalClassLoader ldr = new GridTestExternalClassLoader(URLS);
 
-            cc.setAffinity((GridCacheAffinityFunction)ldr.loadClass(EXT_AFFINITY_CLS_NAME).newInstance());
-            cc.setAffinityMapper((GridCacheAffinityKeyMapper)ldr.loadClass(EXT_AFFINITY_MAPPER_CLS_NAME)
+            cc.setAffinity((CacheAffinityFunction)ldr.loadClass(EXT_AFFINITY_CLS_NAME).newInstance());
+            cc.setAffinityMapper((CacheAffinityKeyMapper)ldr.loadClass(EXT_AFFINITY_MAPPER_CLS_NAME)
                 .newInstance());
 
             c.setCacheConfiguration(cc);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/GridJobMasterLeaveAwareSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridJobMasterLeaveAwareSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridJobMasterLeaveAwareSelfTest.java
index 942aeda..aff0eaf 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridJobMasterLeaveAwareSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridJobMasterLeaveAwareSelfTest.java
@@ -442,7 +442,7 @@ public class GridJobMasterLeaveAwareSelfTest extends GridCommonAbstractTest {
             @Override public IgniteFuture<?> applyx(ClusterGroup prj) throws IgniteCheckedException {
                 IgniteCompute comp = compute(prj).enableAsync();
 
-                GridCacheAffinity<Object> aff = prj.ignite().cache(null).affinity();
+                CacheAffinity<Object> aff = prj.ignite().cache(null).affinity();
 
                 ClusterNode node = F.first(prj.nodes());
 
@@ -461,7 +461,7 @@ public class GridJobMasterLeaveAwareSelfTest extends GridCommonAbstractTest {
             @Override public IgniteFuture<?> applyx(ClusterGroup prj) throws IgniteCheckedException {
                 IgniteCompute comp = compute(prj).enableAsync();
 
-                GridCacheAffinity<Object> aff = prj.ignite().cache(null).affinity();
+                CacheAffinity<Object> aff = prj.ignite().cache(null).affinity();
 
                 ClusterNode node = F.first(prj.nodes());
 
@@ -477,7 +477,7 @@ public class GridJobMasterLeaveAwareSelfTest extends GridCommonAbstractTest {
      * @param node Node.
      * @return Finds some cache key for which given node is primary.
      */
-    private Object keyForNode(GridCacheAffinity<Object> aff, ClusterNode node) {
+    private Object keyForNode(CacheAffinity<Object> aff, ClusterNode node) {
         assertNotNull(node);
 
         Object key = null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleJobsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleJobsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleJobsSelfTest.java
index 2fc5be7..49635de 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleJobsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleJobsSelfTest.java
@@ -223,7 +223,7 @@ public class GridMultipleJobsSelfTest extends GridCommonAbstractTest {
         /**
          * @return Affinity key.
          */
-        @GridCacheAffinityKeyMapped
+        @CacheAffinityKeyMapped
         public String affinityKey() {
             return "key";
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java
index bddb573..6d4fbbd 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java
@@ -45,7 +45,7 @@ import java.util.concurrent.atomic.*;
 
 import static org.apache.ignite.events.IgniteEventType.*;
 import static org.apache.ignite.compute.ComputeTaskSessionScope.*;
-import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
 
 /**
  *

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointTaskSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointTaskSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointTaskSelfTest.java
index e279087..21d0660 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointTaskSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointTaskSelfTest.java
@@ -36,7 +36,7 @@ import org.jetbrains.annotations.*;
 import java.util.*;
 
 import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
 
 /**
  * Checkpoint tests.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentMessageCountSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentMessageCountSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentMessageCountSelfTest.java
index e445742..9a20c2a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentMessageCountSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentMessageCountSelfTest.java
@@ -35,7 +35,7 @@ import java.util.*;
 import java.util.concurrent.atomic.*;
 
 import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
 
 /**
  * Tests message count for different deployment scenarios.
@@ -130,7 +130,7 @@ public class GridDeploymentMessageCountSelfTest extends GridCommonAbstractTest {
         try {
             startGrids(2);
 
-            GridCache<Object, Object> cache = grid(0).cache(null);
+            Cache<Object, Object> cache = grid(0).cache(null);
 
             cache.put("key", valCls.newInstance());
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
index a6983e9..761809b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
@@ -35,9 +35,9 @@ import java.util.*;
 import java.util.concurrent.*;
 
 import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.GridCacheDistributionMode.*;
-import static org.apache.ignite.cache.GridCachePreloadMode.*;
-import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*;
+import static org.apache.ignite.cache.CacheDistributionMode.*;
+import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
 
 /**
  *

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerSelfTest.java
index b98823a..3c07eb4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerSelfTest.java
@@ -26,7 +26,7 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
 import org.apache.ignite.testframework.junits.common.*;
 
 import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.GridCacheDistributionMode.*;
+import static org.apache.ignite.cache.CacheDistributionMode.*;
 
 /**
  *
@@ -62,7 +62,7 @@ public class GridDiscoveryManagerSelfTest extends GridCommonAbstractTest {
 
         ccfg2.setName(null);
 
-        GridCacheDistributionMode distrMode;
+        CacheDistributionMode distrMode;
 
         if (gridName.equals(getTestGridName(1)))
             distrMode = NEAR_ONLY;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java
index 2334b25..5e17965 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java
@@ -79,7 +79,7 @@ public abstract class GridAffinityProcessorAbstractSelfTest extends GridCommonAb
      *
      * @return Affinity function.
      */
-    protected abstract GridCacheAffinityFunction affinityFunction();
+    protected abstract CacheAffinityFunction affinityFunction();
 
     /** {@inheritDoc} */
     @SuppressWarnings({"ConstantConditions"})
@@ -125,7 +125,7 @@ public abstract class GridAffinityProcessorAbstractSelfTest extends GridCommonAb
             }
         }, IllegalArgumentException.class, null);
 
-        GridCache<Integer, Integer> cache = grid2.cache(CACHE_NAME);
+        Cache<Integer, Integer> cache = grid2.cache(CACHE_NAME);
 
         assertNotNull(cache);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorConsistentHashSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorConsistentHashSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorConsistentHashSelfTest.java
index 0f8a49e..f1a2cde 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorConsistentHashSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorConsistentHashSelfTest.java
@@ -25,7 +25,7 @@ import org.apache.ignite.cache.affinity.consistenthash.*;
  */
 public class GridAffinityProcessorConsistentHashSelfTest extends GridAffinityProcessorAbstractSelfTest {
     /** {@inheritDoc} */
-    @Override protected GridCacheAffinityFunction affinityFunction() {
-        return new GridCacheConsistentHashAffinityFunction();
+    @Override protected CacheAffinityFunction affinityFunction() {
+        return new CacheConsistentHashAffinityFunction();
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorRendezvousSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorRendezvousSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorRendezvousSelfTest.java
index fc1831e..028948f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorRendezvousSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorRendezvousSelfTest.java
@@ -25,7 +25,7 @@ import org.apache.ignite.cache.affinity.rendezvous.*;
  */
 public class GridAffinityProcessorRendezvousSelfTest extends GridAffinityProcessorAbstractSelfTest {
     /** {@inheritDoc} */
-    @Override protected GridCacheAffinityFunction affinityFunction() {
-        return new GridCacheRendezvousAffinityFunction();
+    @Override protected CacheAffinityFunction affinityFunction() {
+        return new CacheRendezvousAffinityFunction();
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java
index de72c4a..f2dcb6d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java
@@ -32,7 +32,7 @@ import org.jetbrains.annotations.*;
 import java.util.*;
 
 import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.GridCachePreloadMode.*;
+import static org.apache.ignite.cache.CachePreloadMode.*;
 import static org.apache.ignite.transactions.IgniteTxConcurrency.*;
 import static org.apache.ignite.transactions.IgniteTxIsolation.*;
 
@@ -301,7 +301,7 @@ public abstract class GridCacheAbstractFailoverSelfTest extends GridCacheAbstrac
      * @param cnt Entry count.
      * @throws IgniteCheckedException If failed.
      */
-    private void put(GridCacheProjection<String, Integer> cache, int cnt) throws Exception {
+    private void put(CacheProjection<String, Integer> cache, int cnt) throws Exception {
         try {
             for (int i = 0; i < cnt; i++)
                 assertTrue("Failed to put key: 'key" + i + "'",  cache.putx("key" + i, i));
@@ -320,13 +320,13 @@ public abstract class GridCacheAbstractFailoverSelfTest extends GridCacheAbstrac
      * @param isolation Isolation level.
      * @throws IgniteCheckedException If failed.
      */
-    private void put(GridCacheProjection<String, Integer> cache, final int cnt,
+    private void put(CacheProjection<String, Integer> cache, final int cnt,
         IgniteTxConcurrency concurrency, IgniteTxIsolation isolation) throws Exception {
         try {
             info("Putting values to cache [0," + cnt + ')');
 
-            CU.inTx(cache, concurrency, isolation, new CIX1<GridCacheProjection<String, Integer>>() {
-                @Override public void applyx(GridCacheProjection<String, Integer> cache)
+            CU.inTx(cache, concurrency, isolation, new CIX1<CacheProjection<String, Integer>>() {
+                @Override public void applyx(CacheProjection<String, Integer> cache)
                     throws IgniteCheckedException {
                     for (int i = 0; i < cnt; i++)
                         assertTrue("Failed to put key: 'key" + i + "'", cache.putx("key" + i, i));
@@ -347,7 +347,7 @@ public abstract class GridCacheAbstractFailoverSelfTest extends GridCacheAbstrac
      * @param cnt Entry count.
      * @throws IgniteCheckedException If failed.
      */
-    private void remove(GridCacheProjection<String, Integer> cache, int cnt) throws Exception {
+    private void remove(CacheProjection<String, Integer> cache, int cnt) throws Exception {
         try {
             for (int i = 0; i < cnt; i++)
                 cache.removex("key" + i);
@@ -366,13 +366,13 @@ public abstract class GridCacheAbstractFailoverSelfTest extends GridCacheAbstrac
      * @param isolation Isolation level.
      * @throws IgniteCheckedException If failed.
      */
-    private void remove(GridCacheProjection<String, Integer> cache, final int cnt,
+    private void remove(CacheProjection<String, Integer> cache, final int cnt,
         IgniteTxConcurrency concurrency, IgniteTxIsolation isolation) throws Exception {
         try {
             info("Removing values form cache [0," + cnt + ')');
 
-            CU.inTx(cache, concurrency, isolation, new CIX1<GridCacheProjection<String, Integer>>() {
-                @Override public void applyx(GridCacheProjection<String, Integer> cache)
+            CU.inTx(cache, concurrency, isolation, new CIX1<CacheProjection<String, Integer>>() {
+                @Override public void applyx(CacheProjection<String, Integer> cache)
                     throws IgniteCheckedException {
                     for (int i = 0; i < cnt; i++)
                         cache.removex("key" + i);
@@ -393,7 +393,7 @@ public abstract class GridCacheAbstractFailoverSelfTest extends GridCacheAbstrac
      * @param expSize Minimum expected cache size.
      * @throws IgniteCheckedException If failed.
      */
-    private void check(GridCacheProjection<String,Integer> cache, int expSize) throws IgniteCheckedException {
+    private void check(CacheProjection<String,Integer> cache, int expSize) throws IgniteCheckedException {
         int size;
 
         if (cacheMode() == PARTITIONED) {
@@ -425,7 +425,7 @@ public abstract class GridCacheAbstractFailoverSelfTest extends GridCacheAbstrac
      * @param g Grid.
      * @return Cache.
      */
-    private GridCacheProjection<String,Integer> cache(Ignite g) {
+    private CacheProjection<String,Integer> cache(Ignite g) {
         return g.cache(null);
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFlagsTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFlagsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFlagsTest.java
index 3344ba0..9a396f7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFlagsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFlagsTest.java
@@ -24,7 +24,7 @@ import org.apache.ignite.lang.*;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 
-import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
 
 /**
  * Tests cache flags.
@@ -36,7 +36,7 @@ public abstract class GridCacheAbstractFlagsTest extends GridCacheAbstractSelfTe
     }
 
     /** {@inheritDoc} */
-    @Override protected GridCacheWriteSynchronizationMode writeSynchronization() {
+    @Override protected CacheWriteSynchronizationMode writeSynchronization() {
         return FULL_ASYNC;
     }
 
@@ -78,7 +78,7 @@ public abstract class GridCacheAbstractFlagsTest extends GridCacheAbstractSelfTe
                 @Override public Object call() throws Exception {
                     int idx = cntr.getAndIncrement() % gridCount();
 
-                    GridCache<String, Integer> c = cache(idx);
+                    Cache<String, Integer> c = cache(idx);
 
                     l.await();
 
@@ -88,7 +88,7 @@ public abstract class GridCacheAbstractFlagsTest extends GridCacheAbstractSelfTe
                 }
             }, gridCount() * 3);
 
-            cache(0).flagsOn(GridCacheFlag.SYNC_COMMIT).put(key, val);
+            cache(0).flagsOn(CacheFlag.SYNC_COMMIT).put(key, val);
 
             l.countDown();
 


Mime
View raw message