ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [21/56] [abbrv] incubator-ignite git commit: # ignite-63
Date Fri, 23 Jan 2015 14:42:02 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManager.java
index f912f47..ce7b3fc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManager.java
@@ -68,7 +68,7 @@ public class GridGgfsDataManager extends GridGgfsManager {
     private GridCacheProjectionEx<GridGgfsBlockKey, byte[]> dataCachePrj;
 
     /** Data cache. */
-    private GridCache<Object, Object> dataCache;
+    private Cache<Object, Object> dataCache;
 
     /** */
     private IgniteFuture<?> dataCacheStartFut;
@@ -163,7 +163,7 @@ public class GridGgfsDataManager extends GridGgfsManager {
 
         assert dataCachePrj != null;
 
-        GridCacheAffinityKeyMapper mapper = ggfsCtx.kernalContext().cache()
+        CacheAffinityKeyMapper mapper = ggfsCtx.kernalContext().cache()
             .internalCache(ggfsCtx.configuration().getDataCacheName()).configuration().getAffinityMapper();
 
         grpSize = mapper instanceof IgniteFsGroupDataBlocksKeyMapper ?
@@ -391,7 +391,7 @@ public class GridGgfsDataManager extends GridGgfsManager {
         final GridGgfsBlockKey key = blockKey(blockIdx, fileInfo);
 
         if (log.isDebugEnabled()) {
-            GridCacheEntry<GridGgfsBlockKey, byte[]> entry = dataCachePrj.entry(key);
+            CacheEntry<GridGgfsBlockKey, byte[]> entry = dataCachePrj.entry(key);
 
             assert entry != null;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsImpl.java
index f70ff32..4fb77bc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsImpl.java
@@ -115,7 +115,7 @@ public final class GridGgfsImpl implements GridGgfsEx {
     private Object topic;
 
     /** Eviction policy (if set). */
-    private GridCacheGgfsPerBlockLruEvictionPolicy evictPlc;
+    private CacheGgfsPerBlockLruEvictionPolicy evictPlc;
 
     /**
      * Creates GGFS instance with given context.
@@ -197,10 +197,10 @@ public final class GridGgfsImpl implements GridGgfsEx {
 
         for (CacheConfiguration cacheCfg : ggfsCtx.kernalContext().config().getCacheConfiguration()) {
             if (F.eq(dataCacheName, cacheCfg.getName())) {
-                GridCacheEvictionPolicy evictPlc = cacheCfg.getEvictionPolicy();
+                CacheEvictionPolicy evictPlc = cacheCfg.getEvictionPolicy();
 
-                if (evictPlc != null & evictPlc instanceof GridCacheGgfsPerBlockLruEvictionPolicy)
-                    this.evictPlc = (GridCacheGgfsPerBlockLruEvictionPolicy)evictPlc;
+                if (evictPlc != null & evictPlc instanceof CacheGgfsPerBlockLruEvictionPolicy)
+                    this.evictPlc = (CacheGgfsPerBlockLruEvictionPolicy)evictPlc;
 
                 break;
             }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsMetaManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsMetaManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsMetaManager.java
index ffcefd8..868eb95 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsMetaManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsMetaManager.java
@@ -52,7 +52,7 @@ public class GridGgfsMetaManager extends GridGgfsManager {
     private IgniteFsConfiguration cfg;
 
     /** Metadata cache. */
-    private GridCache<Object, Object> metaCache;
+    private Cache<Object, Object> metaCache;
 
     /** */
     private IgniteFuture<?> metaCacheStartFut;
@@ -2540,7 +2540,7 @@ public class GridGgfsMetaManager extends GridGgfsManager {
      * @return {@code True} if value was stored in cache, {@code false} otherwise.
      * @throws IgniteCheckedException If operation failed.
      */
-    private <K, V> boolean putx(GridCacheProjection<K, V> cache, K key, IgniteClosure<V, V> c) throws IgniteCheckedException {
+    private <K, V> boolean putx(CacheProjection<K, V> cache, K key, IgniteClosure<V, V> c) throws IgniteCheckedException {
         assert validTxState(true);
 
         V oldVal = cache.get(key);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgniteFsHelperImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgniteFsHelperImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgniteFsHelperImpl.java
index 7f95036..b71d97b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgniteFsHelperImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgniteFsHelperImpl.java
@@ -28,22 +28,22 @@ import org.apache.ignite.cache.eviction.ggfs.*;
 public class IgniteFsHelperImpl implements IgniteFsHelper {
     /** {@inheritDoc} */
     @Override public void preProcessCacheConfiguration(CacheConfiguration cfg) {
-        GridCacheEvictionPolicy evictPlc = cfg.getEvictionPolicy();
+        CacheEvictionPolicy evictPlc = cfg.getEvictionPolicy();
 
-        if (evictPlc instanceof GridCacheGgfsPerBlockLruEvictionPolicy && cfg.getEvictionFilter() == null)
-            cfg.setEvictionFilter(new GridCacheGgfsEvictionFilter());
+        if (evictPlc instanceof CacheGgfsPerBlockLruEvictionPolicy && cfg.getEvictionFilter() == null)
+            cfg.setEvictionFilter(new CacheGgfsEvictionFilter());
     }
 
     /** {@inheritDoc} */
     @Override public void validateCacheConfiguration(CacheConfiguration cfg) throws IgniteCheckedException {
-        GridCacheEvictionPolicy evictPlc =  cfg.getEvictionPolicy();
+        CacheEvictionPolicy evictPlc =  cfg.getEvictionPolicy();
 
-        if (evictPlc != null && evictPlc instanceof GridCacheGgfsPerBlockLruEvictionPolicy) {
-            GridCacheEvictionFilter evictFilter = cfg.getEvictionFilter();
+        if (evictPlc != null && evictPlc instanceof CacheGgfsPerBlockLruEvictionPolicy) {
+            CacheEvictionFilter evictFilter = cfg.getEvictionFilter();
 
-            if (evictFilter != null && !(evictFilter instanceof GridCacheGgfsEvictionFilter))
+            if (evictFilter != null && !(evictFilter instanceof CacheGgfsEvictionFilter))
                 throw new IgniteCheckedException("Eviction filter cannot be set explicitly when using " +
-                    "GridCacheGgfsPerBlockLruEvictionPolicy:" + cfg.getName());
+                    "CacheGgfsPerBlockLruEvictionPolicy:" + cfg.getName());
         }
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgniteFsProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgniteFsProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgniteFsProcessor.java
index d99b3f0..3ed8569 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgniteFsProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgniteFsProcessor.java
@@ -40,7 +40,7 @@ import java.util.*;
 import java.util.concurrent.*;
 
 import static org.apache.ignite.IgniteSystemProperties.*;
-import static org.apache.ignite.cache.GridCacheMemoryMode.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
 import static org.apache.ignite.fs.IgniteFsMode.*;
 import static org.apache.ignite.internal.GridNodeAttributes.*;
@@ -267,7 +267,7 @@ public class IgniteFsProcessor extends IgniteFsProcessorAdapter {
             if (cacheCfg == null)
                 continue; // No cache for the given GGFS configuration.
 
-            GridCacheAffinityKeyMapper affMapper = cacheCfg.getAffinityMapper();
+            CacheAffinityKeyMapper affMapper = cacheCfg.getAffinityMapper();
 
             if (!(affMapper instanceof IgniteFsGroupDataBlocksKeyMapper))
                 // Do not create GGFS attributes for such a node nor throw error about invalid configuration.
@@ -319,7 +319,7 @@ public class IgniteFsProcessor extends IgniteFsProcessorAdapter {
             if (dataCache.configuration().isQueryIndexEnabled())
                 throw new IgniteCheckedException("GGFS data cache cannot start with enabled query indexing.");
 
-            GridCache<Object, Object> metaCache = ctx.cache().cache(cfg.getMetaCacheName());
+            Cache<Object, Object> metaCache = ctx.cache().cache(cfg.getMetaCacheName());
 
             if (metaCache == null)
                 throw new IgniteCheckedException("Metadata cache is not configured locally for GGFS: " + cfg);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
index 39536b6..0ac2edf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
@@ -65,16 +65,16 @@ public class GridQueryProcessor extends GridProcessorAdapter {
     private final GridQueryIndexing idx;
 
     /** Configuration-declared types. */
-    private final Map<TypeName, GridCacheQueryTypeMetadata> declaredTypesByName = new HashMap<>();
+    private final Map<TypeName, CacheQueryTypeMetadata> declaredTypesByName = new HashMap<>();
 
     /** Configuration-declared types. */
-    private Map<TypeId, GridCacheQueryTypeMetadata> declaredTypesById;
+    private Map<TypeId, CacheQueryTypeMetadata> declaredTypesById;
 
     /** Portable IDs. */
     private Map<Integer, String> portableIds;
 
     /** Type resolvers per space name. */
-    private Map<String, GridCacheQueryTypeResolver> typeResolvers = new HashMap<>();
+    private Map<String, CacheQueryTypeResolver> typeResolvers = new HashMap<>();
 
     /**
      * @param ctx Kernal context.
@@ -101,11 +101,11 @@ public class GridQueryProcessor extends GridProcessorAdapter {
             idx.start(ctx);
 
             for (CacheConfiguration ccfg : ctx.config().getCacheConfiguration()){
-                GridCacheQueryConfiguration qryCfg = ccfg.getQueryConfiguration();
+                CacheQueryConfiguration qryCfg = ccfg.getQueryConfiguration();
 
                 if (qryCfg != null) {
                     if (!F.isEmpty(qryCfg.getTypeMetadata())) {
-                        for (GridCacheQueryTypeMetadata meta : qryCfg.getTypeMetadata())
+                        for (CacheQueryTypeMetadata meta : qryCfg.getTypeMetadata())
                             declaredTypesByName.put(new TypeName(ccfg.getName(), meta.getType()), meta);
                     }
 
@@ -278,7 +278,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
 
             TypeId id = null;
 
-            GridCacheQueryTypeResolver rslvr = typeResolvers.get(space);
+            CacheQueryTypeResolver rslvr = typeResolvers.get(space);
 
             if (rslvr != null) {
                 String typeName = rslvr.resolveTypeName(key, val);
@@ -329,14 +329,14 @@ public class GridQueryProcessor extends GridProcessorAdapter {
                             String typeName = portableName(portableKey.typeId());
 
                             if (typeName != null) {
-                                GridCacheQueryTypeMetadata keyMeta = declaredType(space, portableKey.typeId());
+                                CacheQueryTypeMetadata keyMeta = declaredType(space, portableKey.typeId());
 
                                 if (keyMeta != null)
                                     processPortableMeta(true, keyMeta, d);
                             }
                         }
                         else {
-                            GridCacheQueryTypeMetadata keyMeta = declaredType(space, keyCls.getName());
+                            CacheQueryTypeMetadata keyMeta = declaredType(space, keyCls.getName());
 
                             if (keyMeta == null)
                                 processAnnotationsInClass(true, d.keyCls, d, null);
@@ -350,7 +350,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
                             String typeName = portableName(portableVal.typeId());
 
                             if (typeName != null) {
-                                GridCacheQueryTypeMetadata valMeta = declaredType(space, portableVal.typeId());
+                                CacheQueryTypeMetadata valMeta = declaredType(space, portableVal.typeId());
 
                                 d.name(typeName);
 
@@ -363,7 +363,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
 
                             d.name(valTypeName);
 
-                            GridCacheQueryTypeMetadata typeMeta = declaredType(space, valCls.getName());
+                            CacheQueryTypeMetadata typeMeta = declaredType(space, valCls.getName());
 
                             if (typeMeta == null)
                                 processAnnotationsInClass(false, d.valCls, d, null);
@@ -497,10 +497,10 @@ public class GridQueryProcessor extends GridProcessorAdapter {
             portableIds = new HashMap<>();
 
             for (CacheConfiguration ccfg : ctx.config().getCacheConfiguration()){
-                GridCacheQueryConfiguration qryCfg = ccfg.getQueryConfiguration();
+                CacheQueryConfiguration qryCfg = ccfg.getQueryConfiguration();
 
                 if (qryCfg != null) {
-                    for (GridCacheQueryTypeMetadata meta : qryCfg.getTypeMetadata())
+                    for (CacheQueryTypeMetadata meta : qryCfg.getTypeMetadata())
                         portableIds.put(ctx.portable().typeId(meta.getType()), meta.getType());
                 }
             }
@@ -516,17 +516,17 @@ public class GridQueryProcessor extends GridProcessorAdapter {
      * @param typeId Type ID.
      * @return Type meta data if it was declared in configuration.
      */
-    @Nullable private GridCacheQueryTypeMetadata declaredType(String space, int typeId) {
-        Map<TypeId, GridCacheQueryTypeMetadata> declaredTypesById = this.declaredTypesById;
+    @Nullable private CacheQueryTypeMetadata declaredType(String space, int typeId) {
+        Map<TypeId, CacheQueryTypeMetadata> declaredTypesById = this.declaredTypesById;
 
         if (declaredTypesById == null) {
             declaredTypesById = new HashMap<>();
 
             for (CacheConfiguration ccfg : ctx.config().getCacheConfiguration()){
-                GridCacheQueryConfiguration qryCfg = ccfg.getQueryConfiguration();
+                CacheQueryConfiguration qryCfg = ccfg.getQueryConfiguration();
 
                 if (qryCfg != null) {
-                    for (GridCacheQueryTypeMetadata meta : qryCfg.getTypeMetadata())
+                    for (CacheQueryTypeMetadata meta : qryCfg.getTypeMetadata())
                         declaredTypesById.put(new TypeId(ccfg.getName(), ctx.portable().typeId(meta.getType())), meta);
                 }
             }
@@ -542,7 +542,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
      * @param typeName Type name.
      * @return Type meta data if it was declared in configuration.
      */
-    @Nullable private GridCacheQueryTypeMetadata declaredType(String space, String typeName) {
+    @Nullable private CacheQueryTypeMetadata declaredType(String space, String typeName) {
         return declaredTypesByName.get(new TypeName(space, typeName));
     }
 
@@ -706,28 +706,28 @@ public class GridQueryProcessor extends GridProcessorAdapter {
             throw new IgniteCheckedException("Recursive reference found in type: " + cls.getName());
 
         if (parent == null) { // Check class annotation at top level only.
-            GridCacheQueryTextField txtAnnCls = cls.getAnnotation(GridCacheQueryTextField.class);
+            CacheQueryTextField txtAnnCls = cls.getAnnotation(CacheQueryTextField.class);
 
             if (txtAnnCls != null)
                 type.valueTextIndex(true);
 
-            GridCacheQueryGroupIndex grpIdx = cls.getAnnotation(GridCacheQueryGroupIndex.class);
+            CacheQueryGroupIndex grpIdx = cls.getAnnotation(CacheQueryGroupIndex.class);
 
             if (grpIdx != null)
                 type.addIndex(grpIdx.name(), SORTED);
 
-            GridCacheQueryGroupIndex.List grpIdxList = cls.getAnnotation(GridCacheQueryGroupIndex.List.class);
+            CacheQueryGroupIndex.List grpIdxList = cls.getAnnotation(CacheQueryGroupIndex.List.class);
 
             if (grpIdxList != null && !F.isEmpty(grpIdxList.value())) {
-                for (GridCacheQueryGroupIndex idx : grpIdxList.value())
+                for (CacheQueryGroupIndex idx : grpIdxList.value())
                     type.addIndex(idx.name(), SORTED);
             }
         }
 
         for (Class<?> c = cls; c != null && !c.equals(Object.class); c = c.getSuperclass()) {
             for (Field field : c.getDeclaredFields()) {
-                GridCacheQuerySqlField sqlAnn = field.getAnnotation(GridCacheQuerySqlField.class);
-                GridCacheQueryTextField txtAnn = field.getAnnotation(GridCacheQueryTextField.class);
+                CacheQuerySqlField sqlAnn = field.getAnnotation(CacheQuerySqlField.class);
+                CacheQueryTextField txtAnn = field.getAnnotation(CacheQueryTextField.class);
 
                 if (sqlAnn != null || txtAnn != null) {
                     ClassProperty prop = new ClassProperty(field);
@@ -741,12 +741,12 @@ public class GridQueryProcessor extends GridProcessorAdapter {
             }
 
             for (Method mtd : c.getDeclaredMethods()) {
-                GridCacheQuerySqlField sqlAnn = mtd.getAnnotation(GridCacheQuerySqlField.class);
-                GridCacheQueryTextField txtAnn = mtd.getAnnotation(GridCacheQueryTextField.class);
+                CacheQuerySqlField sqlAnn = mtd.getAnnotation(CacheQuerySqlField.class);
+                CacheQueryTextField txtAnn = mtd.getAnnotation(CacheQueryTextField.class);
 
                 if (sqlAnn != null || txtAnn != null) {
                     if (mtd.getParameterTypes().length != 0)
-                        throw new IgniteCheckedException("Getter with GridCacheQuerySqlField " +
+                        throw new IgniteCheckedException("Getter with CacheQuerySqlField " +
                             "annotation cannot have parameters: " + mtd);
 
                     ClassProperty prop = new ClassProperty(mtd);
@@ -772,7 +772,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
      * @param desc Class description.
      * @throws IgniteCheckedException In case of error.
      */
-    static void processAnnotation(boolean key, GridCacheQuerySqlField sqlAnn, GridCacheQueryTextField txtAnn,
+    static void processAnnotation(boolean key, CacheQuerySqlField sqlAnn, CacheQueryTextField txtAnn,
         Class<?> cls, ClassProperty prop, TypeDescriptor desc) throws IgniteCheckedException {
         if (sqlAnn != null) {
             processAnnotationsInClass(key, cls, desc, prop);
@@ -794,7 +794,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
             }
 
             if (!F.isEmpty(sqlAnn.orderedGroups())) {
-                for (GridCacheQuerySqlField.Group idx : sqlAnn.orderedGroups())
+                for (CacheQuerySqlField.Group idx : sqlAnn.orderedGroups())
                     desc.addFieldToIndex(idx.name(), prop.name(), idx.order(), idx.descending());
             }
         }
@@ -812,7 +812,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
      * @param d Type descriptor.
      * @throws IgniteCheckedException If failed.
      */
-    static void processClassMeta(boolean key, Class<?> cls, GridCacheQueryTypeMetadata meta, TypeDescriptor d)
+    static void processClassMeta(boolean key, Class<?> cls, CacheQueryTypeMetadata meta, TypeDescriptor d)
         throws IgniteCheckedException {
         for (Map.Entry<String, Class<?>> entry : meta.getAscendingFields().entrySet()) {
             ClassProperty prop = buildClassProperty(cls, entry.getKey(), entry.getValue());
@@ -885,7 +885,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
      * @param d Type descriptor.
      * @throws IgniteCheckedException If failed.
      */
-    static void processPortableMeta(boolean key, GridCacheQueryTypeMetadata meta, TypeDescriptor d)
+    static void processPortableMeta(boolean key, CacheQueryTypeMetadata meta, TypeDescriptor d)
         throws IgniteCheckedException {
         for (Map.Entry<String, Class<?>> entry : meta.getAscendingFields().entrySet()) {
             PortableProperty prop = buildPortableProperty(entry.getKey(), entry.getValue());

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
index 542504d..6929833 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
@@ -85,7 +85,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
     );
 
     /** */
-    private static final GridCacheFlag[] EMPTY_FLAGS = new GridCacheFlag[0];
+    private static final CacheFlag[] EMPTY_FLAGS = new CacheFlag[0];
 
     /**
      * @param ctx Context.
@@ -105,25 +105,25 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
      * @param cacheFlagsBits Integer representation of cache flags bit set.
      * @return Array of cache flags.
      */
-    public static GridCacheFlag[] parseCacheFlags(int cacheFlagsBits) {
+    public static CacheFlag[] parseCacheFlags(int cacheFlagsBits) {
         if (cacheFlagsBits == 0)
             return EMPTY_FLAGS;
 
-        EnumSet<GridCacheFlag> flagSet = EnumSet.noneOf(GridCacheFlag.class);
+        EnumSet<CacheFlag> flagSet = EnumSet.noneOf(CacheFlag.class);
 
         if ((cacheFlagsBits & 1) != 0)
-            flagSet.add(GridCacheFlag.SKIP_STORE);
+            flagSet.add(CacheFlag.SKIP_STORE);
 
         if ((cacheFlagsBits & (1 << 1)) != 0)
-            flagSet.add(GridCacheFlag.SKIP_SWAP);
+            flagSet.add(CacheFlag.SKIP_SWAP);
 
         if ((cacheFlagsBits & (1 << 2)) != 0)
-            flagSet.add(GridCacheFlag.SYNC_COMMIT);
+            flagSet.add(CacheFlag.SYNC_COMMIT);
 
         if ((cacheFlagsBits & (1 << 4)) != 0)
-            flagSet.add(GridCacheFlag.INVALIDATE);
+            flagSet.add(CacheFlag.INVALIDATE);
 
-        return flagSet.toArray(new GridCacheFlag[flagSet.size()]);
+        return flagSet.toArray(new CacheFlag[flagSet.size()]);
     }
 
     /** {@inheritDoc} */
@@ -143,7 +143,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
 
         final Object key = req0.key();
 
-        final GridCacheFlag[] flags = parseCacheFlags(req0.cacheFlags());
+        final CacheFlag[] flags = parseCacheFlags(req0.cacheFlags());
 
         try {
             GridRestCommand cmd = req0.command();
@@ -341,7 +341,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
         @Nullable UUID destId,
         UUID clientId,
         final String cacheName,
-        final GridCacheFlag[] flags,
+        final CacheFlag[] flags,
         final Object key,
         final CacheProjectionCommand op,
         final boolean keepPortable) throws IgniteCheckedException {
@@ -350,13 +350,13 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
             destId == null || destId.equals(ctx.localNodeId()) || replicatedCacheAvailable(cacheName);
 
         if (locExec) {
-            GridCacheProjection<?,?> prj = localCache(cacheName).forSubjectId(clientId).flagsOn(flags);
+            CacheProjection<?,?> prj = localCache(cacheName).forSubjectId(clientId).flagsOn(flags);
 
             if (keepPortable)
                 prj = prj.keepPortable();
 
-            return op.apply((GridCacheProjection<Object, Object>)prj, ctx).
-                chain(resultWrapper((GridCacheProjection<Object, Object>)prj, key));
+            return op.apply((CacheProjection<Object, Object>)prj, ctx).
+                chain(resultWrapper((CacheProjection<Object, Object>)prj, key));
         }
         else {
             ClusterGroup prj = ctx.grid().forPredicate(F.nodeForNodeId(destId));
@@ -392,7 +392,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
             ctx.cache().cache(cacheName) != null;
 
         if (locExec) {
-            final GridCacheProjection<Object, Object> cache = localCache(cacheName).forSubjectId(clientId);
+            final CacheProjection<Object, Object> cache = localCache(cacheName).forSubjectId(clientId);
 
             return op.apply(cache, ctx).chain(resultWrapper(cache, key));
         }
@@ -417,7 +417,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
      * @return Future of operation result.
      * @throws IgniteCheckedException In case of error.
      */
-    private static IgniteFuture<?> incrementOrDecrement(GridCacheProjection<Object, Object> cache, String key,
+    private static IgniteFuture<?> incrementOrDecrement(CacheProjection<Object, Object> cache, String key,
         GridRestCacheRequest req, final boolean decr) throws IgniteCheckedException {
         assert cache != null;
         assert key != null;
@@ -429,7 +429,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
         if (delta == null)
             throw new IgniteCheckedException(GridRestCommandHandlerAdapter.missingParameter("delta"));
 
-        final GridCacheAtomicLong l = cache.cache().dataStructures().atomicLong(key, init != null ? init : 0, true);
+        final CacheAtomicLong l = cache.cache().dataStructures().atomicLong(key, init != null ? init : 0, true);
 
         final Long d = delta;
 
@@ -453,7 +453,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
      */
     private static IgniteFuture<?> appendOrPrepend(
         final GridKernalContext ctx,
-        final GridCacheProjection<Object, Object> cache,
+        final CacheProjection<Object, Object> cache,
         final Object key, GridRestCacheRequest req, final boolean prepend) throws IgniteCheckedException {
         assert cache != null;
         assert key != null;
@@ -556,7 +556,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
      * @return Rest response.
      */
     private static IgniteClosure<IgniteFuture<?>, GridRestResponse> resultWrapper(
-        final GridCacheProjection<Object, Object> c, @Nullable final Object key) {
+        final CacheProjection<Object, Object> c, @Nullable final Object key) {
         return new CX1<IgniteFuture<?>, GridRestResponse>() {
             @Override public GridRestResponse applyx(IgniteFuture<?> f) throws IgniteCheckedException {
                 GridCacheRestResponse resp = new GridCacheRestResponse();
@@ -605,7 +605,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
      * @throws IgniteCheckedException If cache not found.
      */
     private static GridCacheProjectionEx<Object, Object> cache(Ignite ignite, String cacheName) throws IgniteCheckedException {
-        GridCache<Object, Object> cache = ignite.cache(cacheName);
+        Cache<Object, Object> cache = ignite.cache(cacheName);
 
         if (cache == null)
             throw new IgniteCheckedException(
@@ -643,7 +643,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
      * Type alias.
      */
     private abstract static class CacheCommand
-        extends IgniteClosure2X<GridCacheProjection<Object, Object>, GridKernalContext, IgniteFuture<?>> {
+        extends IgniteClosure2X<CacheProjection<Object, Object>, GridKernalContext, IgniteFuture<?>> {
         /** */
         private static final long serialVersionUID = 0L;
 
@@ -654,7 +654,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
      * Type alias.
      */
     private abstract static class CacheProjectionCommand
-        extends IgniteClosure2X<GridCacheProjection<Object, Object>, GridKernalContext, IgniteFuture<?>> {
+        extends IgniteClosure2X<CacheProjection<Object, Object>, GridKernalContext, IgniteFuture<?>> {
         /** */
         private static final long serialVersionUID = 0L;
 
@@ -676,7 +676,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
         private final String cacheName;
 
         /** */
-        private final GridCacheFlag[] flags;
+        private final CacheFlag[] flags;
 
         /** */
         private final CacheProjectionCommand op;
@@ -699,7 +699,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
          * @param key Key.
          * @param keepPortable Keep portable flag.
          */
-        private FlaggedCacheOperationCallable(UUID clientId, String cacheName, GridCacheFlag[] flags,
+        private FlaggedCacheOperationCallable(UUID clientId, String cacheName, CacheFlag[] flags,
             CacheProjectionCommand op, Object key, boolean keepPortable) {
             this.clientId = clientId;
             this.cacheName = cacheName;
@@ -711,7 +711,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
 
         /** {@inheritDoc} */
         @Override public GridRestResponse call() throws Exception {
-            GridCacheProjection<?, ?> prj = cache(g, cacheName).forSubjectId(clientId).flagsOn(flags);
+            CacheProjection<?, ?> prj = cache(g, cacheName).forSubjectId(clientId).flagsOn(flags);
 
             if (keepPortable)
                 prj = prj.keepPortable();
@@ -719,8 +719,8 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
             // Need to apply both operation and response transformation remotely
             // as cache could be inaccessible on local node and
             // exception processing should be consistent with local execution.
-            return op.apply((GridCacheProjection<Object, Object>)prj, ((GridKernal)g).context()).
-                chain(resultWrapper((GridCacheProjection<Object, Object>)prj, key)).get();
+            return op.apply((CacheProjection<Object, Object>)prj, ((GridKernal)g).context()).
+                chain(resultWrapper((CacheProjection<Object, Object>)prj, key)).get();
         }
     }
 
@@ -763,7 +763,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
 
         /** {@inheritDoc} */
         @Override public GridRestResponse call() throws Exception {
-            final GridCacheProjection<Object, Object> cache = cache(g, cacheName).forSubjectId(clientId);
+            final CacheProjection<Object, Object> cache = cache(g, cacheName).forSubjectId(clientId);
 
             // Need to apply both operation and response transformation remotely
             // as cache could be inaccessible on local node and
@@ -788,7 +788,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
         }
 
         /** {@inheritDoc} */
-        @Override public IgniteFuture<?> applyx(GridCacheProjection<Object, Object> c, GridKernalContext ctx) {
+        @Override public IgniteFuture<?> applyx(CacheProjection<Object, Object> c, GridKernalContext ctx) {
             return c.getAsync(key);
         }
     }
@@ -809,7 +809,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
         }
 
         /** {@inheritDoc} */
-        @Override public IgniteFuture<?> applyx(GridCacheProjection<Object, Object> c, GridKernalContext ctx) {
+        @Override public IgniteFuture<?> applyx(CacheProjection<Object, Object> c, GridKernalContext ctx) {
             return c.getAllAsync(keys);
         }
     }
@@ -830,7 +830,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
         }
 
         /** {@inheritDoc} */
-        @Override public IgniteFuture<?> applyx(GridCacheProjection<Object, Object> c, GridKernalContext ctx) {
+        @Override public IgniteFuture<?> applyx(CacheProjection<Object, Object> c, GridKernalContext ctx) {
             return c.putAllAsync(map).chain(new FixedResult(true));
         }
     }
@@ -851,7 +851,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
         }
 
         /** {@inheritDoc} */
-        @Override public IgniteFuture<?> applyx(GridCacheProjection<Object, Object> c, GridKernalContext ctx) {
+        @Override public IgniteFuture<?> applyx(CacheProjection<Object, Object> c, GridKernalContext ctx) {
             return c.removexAsync(key);
         }
     }
@@ -872,7 +872,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
         }
 
         /** {@inheritDoc} */
-        @Override public IgniteFuture<?> applyx(GridCacheProjection<Object, Object> c, GridKernalContext ctx) {
+        @Override public IgniteFuture<?> applyx(CacheProjection<Object, Object> c, GridKernalContext ctx) {
             return (F.isEmpty(keys) ? c.removeAllAsync() : c.removeAllAsync(keys))
                 .chain(new FixedResult(true));
         }
@@ -904,7 +904,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
         }
 
         /** {@inheritDoc} */
-        @Override public IgniteFuture<?> applyx(GridCacheProjection<Object, Object> c, GridKernalContext ctx) {
+        @Override public IgniteFuture<?> applyx(CacheProjection<Object, Object> c, GridKernalContext ctx) {
             return exp == null && val == null ? c.removexAsync(key) :
                 exp == null ? c.putxIfAbsentAsync(key, val) :
                     val == null ? c.removeAsync(key, exp) :
@@ -938,7 +938,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
         }
 
         /** {@inheritDoc} */
-        @Override public IgniteFuture<?> applyx(GridCacheProjection<Object, Object> c, GridKernalContext ctx) {
+        @Override public IgniteFuture<?> applyx(CacheProjection<Object, Object> c, GridKernalContext ctx) {
             if (ttl != null && ttl > 0) {
                 Duration duration = new Duration(MILLISECONDS, ttl);
 
@@ -975,7 +975,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
         }
 
         /** {@inheritDoc} */
-        @Override public IgniteFuture<?> applyx(GridCacheProjection<Object, Object> c, GridKernalContext ctx) {
+        @Override public IgniteFuture<?> applyx(CacheProjection<Object, Object> c, GridKernalContext ctx) {
             if (ttl != null && ttl > 0) {
                 Duration duration = new Duration(MILLISECONDS, ttl);
 
@@ -1012,7 +1012,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
         }
 
         /** {@inheritDoc} */
-        @Override public IgniteFuture<?> applyx(GridCacheProjection<Object, Object> c, GridKernalContext ctx) {
+        @Override public IgniteFuture<?> applyx(CacheProjection<Object, Object> c, GridKernalContext ctx) {
             if (ttl != null && ttl > 0) {
                 Duration duration = new Duration(MILLISECONDS, ttl);
 
@@ -1044,7 +1044,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
         }
 
         /** {@inheritDoc} */
-        @Override public IgniteFuture<?> applyx(GridCacheProjection<Object, Object> c, GridKernalContext ctx)
+        @Override public IgniteFuture<?> applyx(CacheProjection<Object, Object> c, GridKernalContext ctx)
             throws IgniteCheckedException {
             return incrementOrDecrement(c, (String)key, req, false);
         }
@@ -1071,7 +1071,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
         }
 
         /** {@inheritDoc} */
-        @Override public IgniteFuture<?> applyx(GridCacheProjection<Object, Object> c, GridKernalContext ctx) throws IgniteCheckedException {
+        @Override public IgniteFuture<?> applyx(CacheProjection<Object, Object> c, GridKernalContext ctx) throws IgniteCheckedException {
             return incrementOrDecrement(c, (String)key, req, true);
         }
     }
@@ -1097,7 +1097,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
         }
 
         /** {@inheritDoc} */
-        @Override public IgniteFuture<?> applyx(GridCacheProjection<Object, Object> c, GridKernalContext ctx)
+        @Override public IgniteFuture<?> applyx(CacheProjection<Object, Object> c, GridKernalContext ctx)
             throws IgniteCheckedException {
             return appendOrPrepend(ctx, c, key, req, false);
         }
@@ -1124,7 +1124,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
         }
 
         /** {@inheritDoc} */
-        @Override public IgniteFuture<?> applyx(GridCacheProjection<Object, Object> c, GridKernalContext ctx)
+        @Override public IgniteFuture<?> applyx(CacheProjection<Object, Object> c, GridKernalContext ctx)
             throws IgniteCheckedException {
             return appendOrPrepend(ctx, c, key, req, true);
         }
@@ -1136,8 +1136,8 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
         private static final long serialVersionUID = 0L;
 
         /** {@inheritDoc} */
-        @Override public IgniteFuture<?> applyx(GridCacheProjection<Object, Object> c, GridKernalContext ctx) {
-            GridCacheMetrics metrics = c.cache().metrics();
+        @Override public IgniteFuture<?> applyx(CacheProjection<Object, Object> c, GridKernalContext ctx) {
+            CacheMetrics metrics = c.cache().metrics();
 
             assert metrics != null;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheQueryCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheQueryCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheQueryCommandHandler.java
index 4cd5694..71292e9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheQueryCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheQueryCommandHandler.java
@@ -279,9 +279,9 @@ public class GridCacheQueryCommandHandler extends GridRestCommandHandlerAdapter
         @Override public GridRestResponse call() throws Exception {
             long qryId = qryIdGen.getAndIncrement();
 
-            GridCacheQueries<Object,Object> queries = g.cache(req.cacheName()).queries();
+            CacheQueries<Object,Object> queries = g.cache(req.cacheName()).queries();
 
-            GridCacheQuery<?> qry;
+            CacheQuery<?> qry;
 
             switch (req.type()) {
                 case SQL:

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/top/GridTopologyCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/top/GridTopologyCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/top/GridTopologyCommandHandler.java
index a1d5eb6..5d954eb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/top/GridTopologyCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/top/GridTopologyCommandHandler.java
@@ -175,10 +175,10 @@ public class GridTopologyCommandHandler extends GridRestCommandHandlerAdapter {
         nodeBean.setTcpAddresses(nonEmptyList(node.<Collection<String>>attribute(ATTR_REST_TCP_ADDRS)));
         nodeBean.setTcpHostNames(nonEmptyList(node.<Collection<String>>attribute(ATTR_REST_TCP_HOST_NAMES)));
 
-        Integer dfltReplicaCnt = node.attribute(GridCacheConsistentHashAffinityFunction.DFLT_REPLICA_COUNT_ATTR_NAME);
+        Integer dfltReplicaCnt = node.attribute(CacheConsistentHashAffinityFunction.DFLT_REPLICA_COUNT_ATTR_NAME);
 
         if (dfltReplicaCnt == null)
-            dfltReplicaCnt = GridCacheConsistentHashAffinityFunction.DFLT_REPLICA_COUNT;
+            dfltReplicaCnt = CacheConsistentHashAffinityFunction.DFLT_REPLICA_COUNT;
 
         nodeBean.setReplicaCount(dfltReplicaCnt);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
index cc5cf90..4d2ece7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
@@ -31,7 +31,7 @@ import org.apache.ignite.managed.*;
 import org.apache.ignite.marshaller.*;
 import org.apache.ignite.thread.*;
 import org.apache.ignite.transactions.*;
-import org.apache.ignite.cache.query.GridCacheContinuousQueryEntry;
+import org.apache.ignite.cache.query.CacheContinuousQueryEntry;
 import org.apache.ignite.internal.managers.eventstorage.*;
 import org.apache.ignite.internal.processors.cache.query.continuous.*;
 import org.apache.ignite.internal.processors.timeout.*;
@@ -361,7 +361,7 @@ public class GridServiceProcessor extends GridProcessorAdapter {
                                 "different configuration) [deployed=" + dep.configuration() + ", new=" + cfg + ']'));
                         }
                         else {
-                            for (GridCacheEntry<Object, Object> e : cache.entrySetx()) {
+                            for (CacheEntry<Object, Object> e : cache.entrySetx()) {
                                 if (e.getKey() instanceof GridServiceAssignmentsKey) {
                                     GridServiceAssignments assigns = (GridServiceAssignments)e.getValue();
 
@@ -453,7 +453,7 @@ public class GridServiceProcessor extends GridProcessorAdapter {
     public IgniteFuture<?> cancelAll() {
         Collection<IgniteFuture<?>> futs = new ArrayList<>();
 
-        for (GridCacheEntry<Object, Object> e : cache.entrySetx()) {
+        for (CacheEntry<Object, Object> e : cache.entrySetx()) {
             if (!(e.getKey() instanceof GridServiceDeploymentKey))
                 continue;
 
@@ -472,7 +472,7 @@ public class GridServiceProcessor extends GridProcessorAdapter {
     public Collection<ManagedServiceDescriptor> deployedServices() {
         Collection<ManagedServiceDescriptor> descs = new ArrayList<>();
 
-        for (GridCacheEntry<Object, Object> e : cache.entrySetx()) {
+        for (CacheEntry<Object, Object> e : cache.entrySetx()) {
             if (!(e.getKey() instanceof GridServiceDeploymentKey))
                 continue;
 
@@ -481,7 +481,7 @@ public class GridServiceProcessor extends GridProcessorAdapter {
             ManagedServiceDescriptorImpl desc = new ManagedServiceDescriptorImpl(dep);
 
             try {
-                GridServiceAssignments assigns = (GridServiceAssignments)cache.//flagsOn(GridCacheFlag.GET_PRIMARY).
+                GridServiceAssignments assigns = (GridServiceAssignments)cache.//flagsOn(CacheFlag.GET_PRIMARY).
                     get(new GridServiceAssignmentsKey(dep.configuration().getName()));
 
                 if (assigns != null) {
@@ -916,14 +916,14 @@ public class GridServiceProcessor extends GridProcessorAdapter {
      * Service deployment listener.
      */
     private class DeploymentListener
-        implements IgniteBiPredicate<UUID, Collection<GridCacheContinuousQueryEntry<Object, Object>>> {
+        implements IgniteBiPredicate<UUID, Collection<CacheContinuousQueryEntry<Object, Object>>> {
         /** Serial version ID. */
         private static final long serialVersionUID = 0L;
 
         /** {@inheritDoc} */
         @Override public boolean apply(
             UUID nodeId,
-            final Collection<GridCacheContinuousQueryEntry<Object, Object>> deps) {
+            final Collection<CacheContinuousQueryEntry<Object, Object>> deps) {
             depExe.submit(new BusyRunnable() {
                 @Override public void run0() {
                     for (Entry<Object, Object> e : deps) {
@@ -1073,7 +1073,7 @@ public class GridServiceProcessor extends GridProcessorAdapter {
                                 ctx.cache().context().deploy().ignoreOwnership(true);
 
                             try {
-                                for (GridCacheEntry<Object, Object> e : cache.entrySetx()) {
+                                for (CacheEntry<Object, Object> e : cache.entrySetx()) {
                                     if (!(e.getKey() instanceof GridServiceDeploymentKey))
                                         continue;
 
@@ -1106,7 +1106,7 @@ public class GridServiceProcessor extends GridProcessorAdapter {
                         }
 
                         // Clean up zombie assignments.
-                        for (GridCacheEntry<Object, Object> e : cache.primaryEntrySetx()) {
+                        for (CacheEntry<Object, Object> e : cache.primaryEntrySetx()) {
                             if (!(e.getKey() instanceof GridServiceAssignmentsKey))
                                 continue;
 
@@ -1194,14 +1194,14 @@ public class GridServiceProcessor extends GridProcessorAdapter {
      * Assignment listener.
      */
     private class AssignmentListener
-        implements IgniteBiPredicate<UUID, Collection<GridCacheContinuousQueryEntry<Object, Object>>> {
+        implements IgniteBiPredicate<UUID, Collection<CacheContinuousQueryEntry<Object, Object>>> {
         /** Serial version ID. */
         private static final long serialVersionUID = 0L;
 
         /** {@inheritDoc} */
         @Override public boolean apply(
             UUID nodeId,
-            final Collection<GridCacheContinuousQueryEntry<Object, Object>> assignCol) {
+            final Collection<CacheContinuousQueryEntry<Object, Object>> assignCol) {
             depExe.submit(new BusyRunnable() {
                 @Override public void run0() {
                     for (Entry<Object, Object> e : assignCol) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
index 3e4fd5c..9ecc329 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
@@ -82,7 +82,7 @@ public class GridTaskProcessor extends GridProcessorAdapter {
     private final GridSpinReadWriteLock lock = new GridSpinReadWriteLock();
 
     /** Internal metadata cache. */
-    private GridCache<GridTaskNameHashKey, String> tasksMetaCache;
+    private Cache<GridTaskNameHashKey, String> tasksMetaCache;
 
     /**
      * @param ctx Kernal context.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/util/GridUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridUtils.java
index 9c051c0..851f62d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridUtils.java
@@ -1196,17 +1196,17 @@ public abstract class GridUtils {
      * @throws ClassNotFoundException If class not found.
      */
     @SuppressWarnings("unchecked")
-    @Nullable public static <K, V> IgnitePredicate<GridCacheEntry<K, V>>[] readEntryFilterArray(ObjectInput in)
+    @Nullable public static <K, V> IgnitePredicate<CacheEntry<K, V>>[] readEntryFilterArray(ObjectInput in)
         throws IOException, ClassNotFoundException {
         int len = in.readInt();
 
-        IgnitePredicate<GridCacheEntry<K, V>>[] arr = null;
+        IgnitePredicate<CacheEntry<K, V>>[] arr = null;
 
         if (len > 0) {
             arr = new IgnitePredicate[len];
 
             for (int i = 0; i < len; i++)
-                arr[i] = (IgnitePredicate<GridCacheEntry<K, V>>)in.readObject();
+                arr[i] = (IgnitePredicate<CacheEntry<K, V>>)in.readObject();
         }
 
         return arr;
@@ -7253,7 +7253,7 @@ public abstract class GridUtils {
      * @param cacheName Cache to check.
      * @return Cache distribution mode or {@code null} if cache is not found.
      */
-    @Nullable public static GridCacheDistributionMode distributionMode(ClusterNode n, String cacheName) {
+    @Nullable public static CacheDistributionMode distributionMode(ClusterNode n, String cacheName) {
         GridCacheAttributes[] caches = n.attribute(ATTR_CACHE);
 
         if (caches != null)

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
index 3aa0b2b..ced12e0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
@@ -359,7 +359,7 @@ public class GridFunc {
         @SuppressWarnings({"unchecked"})
         @Nullable @Override public Object apply(Object o) {
             try {
-                return ((GridCacheEntry)o).get();
+                return ((CacheEntry)o).get();
             }
             catch (IgniteCheckedException e) {
                 throw new GridClosureException(e);
@@ -375,7 +375,7 @@ public class GridFunc {
     private static final IgniteClosure CACHE_ENTRY_VAL_PEEK = new IgniteClosure() {
         @SuppressWarnings({"unchecked"})
         @Nullable @Override public Object apply(Object o) {
-            return ((GridCacheEntry<?, ?>)o).peek();
+            return ((CacheEntry<?, ?>)o).peek();
         }
 
         @Override public String toString() {
@@ -388,7 +388,7 @@ public class GridFunc {
         @SuppressWarnings({"unchecked"})
         @Override public boolean apply(Object o) {
             try {
-                return ((GridCacheEntry)o).get() != null;
+                return ((CacheEntry)o).get() != null;
             }
             catch (IgniteCheckedException e) {
                 throw new GridClosureException(e);
@@ -405,7 +405,7 @@ public class GridFunc {
         @SuppressWarnings({"unchecked"})
         @Override public boolean apply(Object o) {
             try {
-                return ((GridCacheEntry)o).get() == null;
+                return ((CacheEntry)o).get() == null;
             }
             catch (IgniteCheckedException e) {
                 throw new GridClosureException(e);
@@ -421,7 +421,7 @@ public class GridFunc {
     private static final IgnitePredicate CACHE_ENTRY_HAS_PEEK_VAL = new IgnitePredicate() {
         @SuppressWarnings({"unchecked"})
         @Override public boolean apply(Object o) {
-            return ((GridCacheEntry)o).peek() != null;
+            return ((CacheEntry)o).peek() != null;
         }
 
         @Override public String toString() {
@@ -433,7 +433,7 @@ public class GridFunc {
     private static final IgnitePredicate CACHE_ENTRY_NO_PEEK_VAL = new IgnitePredicate() {
         @SuppressWarnings({"unchecked"})
         @Override public boolean apply(Object o) {
-            return ((GridCacheEntry)o).peek() == null;
+            return ((CacheEntry)o).peek() == null;
         }
 
         @Override public String toString() {
@@ -445,7 +445,7 @@ public class GridFunc {
     private static final IgnitePredicate CACHE_ENTRY_PRIMARY = new IgnitePredicate() {
         @SuppressWarnings({"unchecked"})
         @Override public boolean apply(Object o) {
-            return ((GridCacheEntry)o).primary();
+            return ((CacheEntry)o).primary();
         }
 
         @Override public String toString() {
@@ -457,7 +457,7 @@ public class GridFunc {
     private static final IgnitePredicate CACHE_ENTRY_BACKUP = new IgnitePredicate() {
         @SuppressWarnings({"unchecked"})
         @Override public boolean apply(Object o) {
-            return ((GridCacheEntry)o).backup();
+            return ((CacheEntry)o).backup();
         }
 
         @Override public String toString() {
@@ -7708,8 +7708,8 @@ public class GridFunc {
      * @return Closure that returns key for an entry.
      */
     @SuppressWarnings({"unchecked"})
-    public static <K, V> IgniteClosure<GridCacheEntry<K, V>, K> cacheEntry2Key() {
-        return (IgniteClosure<GridCacheEntry<K, V>, K>)MAP_ENTRY_KEY;
+    public static <K, V> IgniteClosure<CacheEntry<K, V>, K> cacheEntry2Key() {
+        return (IgniteClosure<CacheEntry<K, V>, K>)MAP_ENTRY_KEY;
     }
 
     /**
@@ -7726,29 +7726,29 @@ public class GridFunc {
 
     /**
      * Gets closure that returns value for an entry. The closure internally
-     * delegates to {@link GridCacheEntry#get()} method.
+     * delegates to {@link org.apache.ignite.cache.CacheEntry#get()} method.
      *
      * @param <K> Key type.
      * @param <V> Value type.
      * @return Closure that returns value for an entry.
      */
     @SuppressWarnings({"unchecked"})
-    public static <K, V> IgniteClosure<GridCacheEntry<K, V>, V> cacheEntry2Get() {
-        return (IgniteClosure<GridCacheEntry<K, V>, V>)CACHE_ENTRY_VAL_GET;
+    public static <K, V> IgniteClosure<CacheEntry<K, V>, V> cacheEntry2Get() {
+        return (IgniteClosure<CacheEntry<K, V>, V>)CACHE_ENTRY_VAL_GET;
     }
 
     /**
      * Gets closure that returns result of
-     * {@link GridCacheEntry#peek()} method.
+     * {@link org.apache.ignite.cache.CacheEntry#peek()} method.
      *
      * @param <K> Cache key type.
      * @param <V> Cache value type.
      * @return Closure that returns result of
-     *      {@link GridCacheEntry#peek()} method.
+     *      {@link org.apache.ignite.cache.CacheEntry#peek()} method.
      */
     @SuppressWarnings({"unchecked"})
-    public static <K, V> IgniteClosure<GridCacheEntry<K, V>, V> cacheEntry2Peek() {
-        return (IgniteClosure<GridCacheEntry<K, V>, V>)CACHE_ENTRY_VAL_PEEK;
+    public static <K, V> IgniteClosure<CacheEntry<K, V>, V> cacheEntry2Peek() {
+        return (IgniteClosure<CacheEntry<K, V>, V>)CACHE_ENTRY_VAL_PEEK;
     }
 
     /**
@@ -7761,11 +7761,11 @@ public class GridFunc {
      * @param <V> Cache value type.
      * @return Predicate which returns {@code true} if entry's key is contained in given collection.
      */
-    public static <K, V> IgnitePredicate<GridCacheEntry<K, V>> cacheHasKeys(
+    public static <K, V> IgnitePredicate<CacheEntry<K, V>> cacheHasKeys(
         @Nullable final Collection<? extends K> keys) {
-        return isEmpty(keys) ? F.<GridCacheEntry<K, V>>alwaysFalse() :
-            new IgnitePredicate<GridCacheEntry<K, V>>() {
-                @Override public boolean apply(GridCacheEntry<K, V> e) {
+        return isEmpty(keys) ? F.<CacheEntry<K, V>>alwaysFalse() :
+            new IgnitePredicate<CacheEntry<K, V>>() {
+                @Override public boolean apply(CacheEntry<K, V> e) {
                     return keys != null && keys.contains(e.getKey());
                 }
             };
@@ -7782,7 +7782,7 @@ public class GridFunc {
      * @return Predicate which returns {@code true} if entry's key
      *      is equal to any of provided keys.
      */
-    public static <K, V> IgnitePredicate<GridCacheEntry<K, V>> cacheHasKeys(@Nullable K... keys) {
+    public static <K, V> IgnitePredicate<CacheEntry<K, V>> cacheHasKeys(@Nullable K... keys) {
         if (isEmpty(keys))
             return alwaysFalse();
 
@@ -7799,11 +7799,11 @@ public class GridFunc {
      * @return Predicate which returns {@code true} if entry
      *      expires on or before given time.
      */
-    public static <K, V> IgnitePredicate<GridCacheEntry<K, V>> cacheExpireBefore(final long msec) {
+    public static <K, V> IgnitePredicate<CacheEntry<K, V>> cacheExpireBefore(final long msec) {
         A.ensure(msec >= 0, "msec >= 0");
 
-        return new IgnitePredicate<GridCacheEntry<K, V>>() {
-            @Override public boolean apply(GridCacheEntry<K, V> e) {
+        return new IgnitePredicate<CacheEntry<K, V>>() {
+            @Override public boolean apply(CacheEntry<K, V> e) {
                 return e.expirationTime() <= msec;
             }
         };
@@ -7819,106 +7819,106 @@ public class GridFunc {
      * @return Predicate which returns {@code true} if entry
      *      expires on or after given time.
      */
-    public static <K, V> IgnitePredicate<GridCacheEntry<K, V>> cacheExpireAfter(final long msec) {
+    public static <K, V> IgnitePredicate<CacheEntry<K, V>> cacheExpireAfter(final long msec) {
         A.ensure(msec >= 0, "msec >= 0");
 
-        return new IgnitePredicate<GridCacheEntry<K, V>>() {
-            @Override public boolean apply(GridCacheEntry<K, V> e) {
+        return new IgnitePredicate<CacheEntry<K, V>>() {
+            @Override public boolean apply(CacheEntry<K, V> e) {
                 return e.expirationTime() >= msec;
             }
         };
     }
 
     /**
-     * Gets predicate which returns {@code true} if {@link GridCacheEntry#get()}
+     * Gets predicate which returns {@code true} if {@link org.apache.ignite.cache.CacheEntry#get()}
      * method returns {@code non-null} value.
      *
      * @param <K> Cache key type.
      * @param <V> Cache value type.
-     * @return Predicate which returns {@code true} if {@link GridCacheEntry#get()}
+     * @return Predicate which returns {@code true} if {@link org.apache.ignite.cache.CacheEntry#get()}
      *      method returns {@code non-null} value.
      */
     @SuppressWarnings({"unchecked"})
-    public static <K, V> IgnitePredicate<GridCacheEntry<K, V>> cacheHasGetValue() {
-        return (IgnitePredicate<GridCacheEntry<K, V>>)CACHE_ENTRY_HAS_GET_VAL;
+    public static <K, V> IgnitePredicate<CacheEntry<K, V>> cacheHasGetValue() {
+        return (IgnitePredicate<CacheEntry<K, V>>)CACHE_ENTRY_HAS_GET_VAL;
     }
 
     /**
-     * Gets predicate which returns {@code true} if {@link GridCacheEntry#get()}
+     * Gets predicate which returns {@code true} if {@link org.apache.ignite.cache.CacheEntry#get()}
      * method returns {@code null} value.
      *
      * @param <K> Cache key type.
      * @param <V> Cache value type.
-     * @return Predicate which returns {@code true} if {@link GridCacheEntry#get()}
+     * @return Predicate which returns {@code true} if {@link org.apache.ignite.cache.CacheEntry#get()}
      *      method returns {@code null} value.
      */
     @SuppressWarnings({"unchecked"})
-    public static <K, V> IgnitePredicate<GridCacheEntry<K, V>> cacheNoGetValue() {
-        return (IgnitePredicate<GridCacheEntry<K, V>>)CACHE_ENTRY_NO_GET_VAL;
+    public static <K, V> IgnitePredicate<CacheEntry<K, V>> cacheNoGetValue() {
+        return (IgnitePredicate<CacheEntry<K, V>>)CACHE_ENTRY_NO_GET_VAL;
     }
 
     /**
      * Gets predicate which returns {@code true} if
-     * {@link GridCacheEntry#peek() GridCacheEntry.peek()} method
+     * {@link org.apache.ignite.cache.CacheEntry#peek() CacheEntry.peek()} method
      * returns {@code non-null} value.
      *
      * @param <K> Cache key type.
      * @param <V> Cache value type.
      * @return Predicate which returns {@code true} if
-     *      {@link GridCacheEntry#peek() GridCacheEntry.peek()}
+     *      {@link org.apache.ignite.cache.CacheEntry#peek() CacheEntry.peek()}
      *      method returns {@code non-null} value.
      */
     @SuppressWarnings({"unchecked"})
-    public static <K, V> IgnitePredicate<GridCacheEntry<K, V>> cacheHasPeekValue() {
-        return (IgnitePredicate<GridCacheEntry<K, V>>)CACHE_ENTRY_HAS_PEEK_VAL;
+    public static <K, V> IgnitePredicate<CacheEntry<K, V>> cacheHasPeekValue() {
+        return (IgnitePredicate<CacheEntry<K, V>>)CACHE_ENTRY_HAS_PEEK_VAL;
     }
 
     /**
      * Gets predicate which returns {@code true} if
-     * {@link GridCacheEntry#peek() GridCacheEntry.peek()}
+     * {@link org.apache.ignite.cache.CacheEntry#peek() CacheEntry.peek()}
      * method returns {@code null} value.
      *
      * @param <K> Cache key type.
      * @param <V> Cache value type.
      * @return Predicate which returns {@code true} if
-     *      {@link GridCacheEntry#peek() GridCacheEntry.peek()}
+     *      {@link org.apache.ignite.cache.CacheEntry#peek() CacheEntry.peek()}
      *      method returns {@code null} value.
      */
     @SuppressWarnings({"unchecked"})
-    public static <K, V> IgnitePredicate<GridCacheEntry<K, V>> cacheNoPeekValue() {
-        return (IgnitePredicate<GridCacheEntry<K, V>>)CACHE_ENTRY_NO_PEEK_VAL;
+    public static <K, V> IgnitePredicate<CacheEntry<K, V>> cacheNoPeekValue() {
+        return (IgnitePredicate<CacheEntry<K, V>>)CACHE_ENTRY_NO_PEEK_VAL;
     }
 
     /**
-     * Gets predicate which returns {@code true} if {@link GridCacheEntry#primary()}
+     * Gets predicate which returns {@code true} if {@link org.apache.ignite.cache.CacheEntry#primary()}
      * method returns {@code true}.
      *
      * @param <K> Cache key type.
      * @param <V> Cache value type.
-     * @return Predicate which returns {@code true} if {@link GridCacheEntry#primary()}
+     * @return Predicate which returns {@code true} if {@link org.apache.ignite.cache.CacheEntry#primary()}
      *      method returns {@code true}.
      */
     @SuppressWarnings({"unchecked"})
-    public static <K, V> IgnitePredicate<GridCacheEntry<K, V>> cachePrimary() {
-        return (IgnitePredicate<GridCacheEntry<K, V>>)CACHE_ENTRY_PRIMARY;
+    public static <K, V> IgnitePredicate<CacheEntry<K, V>> cachePrimary() {
+        return (IgnitePredicate<CacheEntry<K, V>>)CACHE_ENTRY_PRIMARY;
     }
 
     /**
-     * Gets predicate which returns {@code true} if {@link GridCacheEntry#primary()}
+     * Gets predicate which returns {@code true} if {@link org.apache.ignite.cache.CacheEntry#primary()}
      * method returns {@code false}.
      *
      * @param <K> Cache key type.
      * @param <V> Cache value type.
-     * @return Predicate which returns {@code true} if {@link GridCacheEntry#primary()}
+     * @return Predicate which returns {@code true} if {@link org.apache.ignite.cache.CacheEntry#primary()}
      *      method returns {@code false}.
      */
     @SuppressWarnings({"unchecked"})
-    public static <K, V> IgnitePredicate<GridCacheEntry<K, V>> cacheBackup() {
-        return (IgnitePredicate<GridCacheEntry<K, V>>)CACHE_ENTRY_BACKUP;
+    public static <K, V> IgnitePredicate<CacheEntry<K, V>> cacheBackup() {
+        return (IgnitePredicate<CacheEntry<K, V>>)CACHE_ENTRY_BACKUP;
     }
 
     /**
-     * Gets predicate which returns true if {@link GridCacheEntry#get()}
+     * Gets predicate which returns true if {@link org.apache.ignite.cache.CacheEntry#get()}
      * method returns value that is contained in given collection. Note that if collection
      * of provided values is empty this method returns predicate that evaluates to {@code false}
      * when applying.
@@ -7926,14 +7926,14 @@ public class GridFunc {
      * @param vals Values to check in predicate.
      * @param <K> Cache key type.
      * @param <V> Cache value type.
-     * @return Predicate which returns true if {@link GridCacheEntry#get()} methods returns
+     * @return Predicate which returns true if {@link org.apache.ignite.cache.CacheEntry#get()} methods returns
      *      value that is contained in given collection.
      */
-    public static <K, V> IgnitePredicate<GridCacheEntry<K, V>> cacheContainsGet(
+    public static <K, V> IgnitePredicate<CacheEntry<K, V>> cacheContainsGet(
         @Nullable final Collection<? extends V> vals) {
-        return isEmpty(vals) ? F.<GridCacheEntry<K, V>>alwaysFalse() :
-            new IgnitePredicate<GridCacheEntry<K, V>>() {
-                @Override public boolean apply(GridCacheEntry<K, V> e) {
+        return isEmpty(vals) ? F.<CacheEntry<K, V>>alwaysFalse() :
+            new IgnitePredicate<CacheEntry<K, V>>() {
+                @Override public boolean apply(CacheEntry<K, V> e) {
                     try {
                         V v = e.get();
 
@@ -7949,7 +7949,7 @@ public class GridFunc {
     }
 
     /**
-     * Gets predicate which returns true if {@link GridCacheEntry#get()} method returns
+     * Gets predicate which returns true if {@link org.apache.ignite.cache.CacheEntry#get()} method returns
      * value that is contained among given values. Note that if array of provided values
      * is {@code null} or empty this method returns predicate that evaluates to
      * {@code false} when applying.
@@ -7957,10 +7957,10 @@ public class GridFunc {
      * @param vals Values to check in predicate.
      * @param <K> Cache key type.
      * @param <V> Cache value type.
-     * @return Predicate which returns true if {@link GridCacheEntry#get()} methods returns
+     * @return Predicate which returns true if {@link org.apache.ignite.cache.CacheEntry#get()} methods returns
      *      value that is contained among given values.
      */
-    public static <K, V> IgnitePredicate<GridCacheEntry<K, V>> cacheContainsGet(@Nullable V... vals) {
+    public static <K, V> IgnitePredicate<CacheEntry<K, V>> cacheContainsGet(@Nullable V... vals) {
         if (isEmpty(vals))
             return alwaysFalse();
 
@@ -7968,7 +7968,7 @@ public class GridFunc {
     }
 
     /**
-     * Gets predicate which returns true if {@link GridCacheEntry#peek()} methods returns
+     * Gets predicate which returns true if {@link org.apache.ignite.cache.CacheEntry#peek()} methods returns
      * value that is contained in given collection. Note that if collection of provided values
      * is empty this method returns predicate that evaluates to {@code false}
      * when applying.
@@ -7976,14 +7976,14 @@ public class GridFunc {
      * @param vals Values to check in predicate.
      * @param <K> Cache key type.
      * @param <V> Cache value type.
-     * @return Predicate which returns true if {@link GridCacheEntry#peek()} methods returns
+     * @return Predicate which returns true if {@link org.apache.ignite.cache.CacheEntry#peek()} methods returns
      *      value that is contained in given collection.
      */
-    public static <K, V> IgnitePredicate<GridCacheEntry<K, V>> cacheContainsPeek(
+    public static <K, V> IgnitePredicate<CacheEntry<K, V>> cacheContainsPeek(
         @Nullable final Collection<? extends V> vals) {
-        return isEmpty(vals) ? F.<GridCacheEntry<K, V>>alwaysFalse() :
-            new IgnitePredicate<GridCacheEntry<K, V>>() {
-                @Override public boolean apply(GridCacheEntry<K, V> e) {
+        return isEmpty(vals) ? F.<CacheEntry<K, V>>alwaysFalse() :
+            new IgnitePredicate<CacheEntry<K, V>>() {
+                @Override public boolean apply(CacheEntry<K, V> e) {
                     V v = e.peek();
 
                     assert vals != null;
@@ -7998,7 +7998,7 @@ public class GridFunc {
     }
 
     /**
-     * Gets predicate which returns true if {@link GridCacheEntry#peek()} methods returns
+     * Gets predicate which returns true if {@link org.apache.ignite.cache.CacheEntry#peek()} methods returns
      * value that is contained among given values. Note that if array of provided values
      * is {@code null} or empty this method returns predicate that evaluates to {@code false}
      * when applying.
@@ -8006,10 +8006,10 @@ public class GridFunc {
      * @param vals Values to check in predicate.
      * @param <K> Cache key type.
      * @param <V> Cache value type.
-     * @return Predicate which returns true if {@link GridCacheEntry#peek()} methods returns
+     * @return Predicate which returns true if {@link org.apache.ignite.cache.CacheEntry#peek()} methods returns
      *      value that is contained among given values.
      */
-    public static <K, V> IgnitePredicate<GridCacheEntry<K, V>> cacheContainsPeek(@Nullable V... vals) {
+    public static <K, V> IgnitePredicate<CacheEntry<K, V>> cacheContainsPeek(@Nullable V... vals) {
         if (isEmpty(vals))
             return alwaysFalse();
 
@@ -8026,10 +8026,10 @@ public class GridFunc {
      * @param <V> Cache value type.
      * @return Predicate which returns {@code true} if cache contains all given key-value pairs.
      */
-    public static <K, V> IgnitePredicate<GridCacheEntry<K, V>> cacheContainsGet(@Nullable final Map<K, V> map) {
-        return isEmpty(map) ? F.<GridCacheEntry<K, V>>alwaysFalse() :
-            new IgnitePredicate<GridCacheEntry<K, V>>() {
-                @Override public boolean apply(GridCacheEntry<K, V> e) {
+    public static <K, V> IgnitePredicate<CacheEntry<K, V>> cacheContainsGet(@Nullable final Map<K, V> map) {
+        return isEmpty(map) ? F.<CacheEntry<K, V>>alwaysFalse() :
+            new IgnitePredicate<CacheEntry<K, V>>() {
+                @Override public boolean apply(CacheEntry<K, V> e) {
                     assert map != null;
 
                     try {
@@ -8052,11 +8052,11 @@ public class GridFunc {
      * @param <V> Cache value type.
      * @return Predicate which returns {@code true} if cache entry matches any given key-value pair.
      */
-    public static <K, V> IgnitePredicate<GridCacheEntry<K, V>> cacheContainsPeek(
+    public static <K, V> IgnitePredicate<CacheEntry<K, V>> cacheContainsPeek(
         @Nullable final Map<K, V> map) {
-        return isEmpty(map) ? F.<GridCacheEntry<K, V>>alwaysFalse() :
-            new IgnitePredicate<GridCacheEntry<K, V>>() {
-                @Override public boolean apply(GridCacheEntry<K, V> e) {
+        return isEmpty(map) ? F.<CacheEntry<K, V>>alwaysFalse() :
+            new IgnitePredicate<CacheEntry<K, V>>() {
+                @Override public boolean apply(CacheEntry<K, V> e) {
                     assert map != null;
 
                     return eq(e.peek(), map.get(e.getKey()));
@@ -8067,7 +8067,7 @@ public class GridFunc {
     /**
      * Gets predicate which returns {@code true} if cache entry matches any given key-value pair.
      * Both, key and value will be checked for containment. Value will be retrieved using
-     * {@link GridCacheEntry#get()} method. Note that if collection of
+     * {@link org.apache.ignite.cache.CacheEntry#get()} method. Note that if collection of
      * provided entries is empty this method returns predicate that evaluates to {@code false} when
      * applying.
      *
@@ -8078,11 +8078,11 @@ public class GridFunc {
      */
     // cacheEntryPredicateForContainsEntriesGet
     // ptCacheContainsEntriesGet
-    public static <K, V> IgnitePredicate<GridCacheEntry<K, V>> cacheContainsEntriesGet(
+    public static <K, V> IgnitePredicate<CacheEntry<K, V>> cacheContainsEntriesGet(
         @Nullable final Collection<? extends Map.Entry<K, V>> entries) {
-        return isEmpty(entries) ? F.<GridCacheEntry<K, V>>alwaysFalse() :
-            new IgnitePredicate<GridCacheEntry<K, V>>() {
-                @Override public boolean apply(GridCacheEntry<K, V> e) {
+        return isEmpty(entries) ? F.<CacheEntry<K, V>>alwaysFalse() :
+            new IgnitePredicate<CacheEntry<K, V>>() {
+                @Override public boolean apply(CacheEntry<K, V> e) {
                     try {
                         K k = e.getKey();
                         V v = e.get();
@@ -8106,7 +8106,7 @@ public class GridFunc {
     /**
      * Gets predicate which returns {@code true} if cache entry matches any given key-value pair.
      * Both, key and value will be checked for containment. Value will be retrieved using
-     * {@link GridCacheEntry#peek()} method. Note that if collection
+     * {@link org.apache.ignite.cache.CacheEntry#peek()} method. Note that if collection
      * of provided entries is empty this method returns predicate that evaluates to {@code false}
      * when applying.
      *
@@ -8115,11 +8115,11 @@ public class GridFunc {
      * @param <V> Cache value type.
      * @return Predicate which returns {@code true} if cache entry matches any given key-value pair.
      */
-    public static <K, V> IgnitePredicate<GridCacheEntry<K, V>> cacheContainsEntriesPeek(
+    public static <K, V> IgnitePredicate<CacheEntry<K, V>> cacheContainsEntriesPeek(
         @Nullable final Collection<? extends Map.Entry<K, V>> entries) {
-        return isEmpty(entries) ? F.<GridCacheEntry<K, V>>alwaysFalse() :
-            new IgnitePredicate<GridCacheEntry<K, V>>() {
-                @Override public boolean apply(GridCacheEntry<K, V> e) {
+        return isEmpty(entries) ? F.<CacheEntry<K, V>>alwaysFalse() :
+            new IgnitePredicate<CacheEntry<K, V>>() {
+                @Override public boolean apply(CacheEntry<K, V> e) {
                     K k = e.getKey();
                     V v = e.peek();
 
@@ -8138,7 +8138,7 @@ public class GridFunc {
     /**
      * Gets predicate which returns {@code true} if cache entry matches any given key-value pair.
      * Both, key and value will be checked for containment. Value will be retrieved using
-     * {@link GridCacheEntry#get()} method. Note that if array of provided
+     * {@link org.apache.ignite.cache.CacheEntry#get()} method. Note that if array of provided
      * entries is {@code null} or empty this method returns predicate that evaluates to {@code false}
      * when applying.
      *
@@ -8147,7 +8147,7 @@ public class GridFunc {
      * @param <V> Cache value type.
      * @return Predicate which returns {@code true} if cache entry matches any given key-value pair.
      */
-    public static <K, V> IgnitePredicate<GridCacheEntry<K, V>> cacheContainsEntriesGet(
+    public static <K, V> IgnitePredicate<CacheEntry<K, V>> cacheContainsEntriesGet(
         @Nullable Map.Entry<K, V>... entries) {
         if (isEmpty(entries))
             return alwaysFalse();
@@ -8158,7 +8158,7 @@ public class GridFunc {
     /**
      * Gets predicate which returns {@code true} if cache entry matches any given key-value pair.
      * Both, key and value will be checked for containment. Value will be retrieved using
-     * {@link GridCacheEntry#peek()} method. Note that if array of
+     * {@link org.apache.ignite.cache.CacheEntry#peek()} method. Note that if array of
      * provided entries is {@code null} or empty this method returns predicate that evaluates
      * to {@code false} when applying.
      *
@@ -8167,7 +8167,7 @@ public class GridFunc {
      * @param <V> Cache value type.
      * @return Predicate which returns {@code true} if cache entry matches any given key-value pair.
      */
-    public static <K, V> IgnitePredicate<GridCacheEntry<K, V>> cacheContainsEntriesPeek(
+    public static <K, V> IgnitePredicate<CacheEntry<K, V>> cacheContainsEntriesPeek(
         @Nullable Map.Entry<K, V>... entries) {
         if (isEmpty(entries))
             return alwaysFalse();
@@ -8176,38 +8176,38 @@ public class GridFunc {
     }
 
     /**
-     * Converts key filter to entry filter using {@link GridCacheEntry#getKey()}
+     * Converts key filter to entry filter using {@link org.apache.ignite.cache.CacheEntry#getKey()}
      * to get value. Note that if array of provided filters is {@code null} or empty this
      * method returns predicate that evaluates to {@code true} when applying.
      *
      * @param ps Key filter(s) to convert.
      * @return Entry filter.
      */
-    public static <K, V> IgnitePredicate<GridCacheEntry<K, V>> cacheKeys(
+    public static <K, V> IgnitePredicate<CacheEntry<K, V>> cacheKeys(
         @Nullable final IgnitePredicate<? super K>... ps) {
-        return isEmpty(ps) || isAlwaysTrue(ps) ? F.<GridCacheEntry<K, V>>alwaysTrue() :
-            isAlwaysFalse(ps) ? F.<GridCacheEntry<K, V>>alwaysFalse() :
-            new IgnitePredicate<GridCacheEntry<K, V>>() {
-                @Override public boolean apply(GridCacheEntry<K, V> e) {
+        return isEmpty(ps) || isAlwaysTrue(ps) ? F.<CacheEntry<K, V>>alwaysTrue() :
+            isAlwaysFalse(ps) ? F.<CacheEntry<K, V>>alwaysFalse() :
+            new IgnitePredicate<CacheEntry<K, V>>() {
+                @Override public boolean apply(CacheEntry<K, V> e) {
                     return F.isAll(e.getKey(), ps);
                 }
             };
     }
 
     /**
-     * Converts value filter to entry filter using {@link GridCacheEntry#get()} to get value.
+     * Converts value filter to entry filter using {@link org.apache.ignite.cache.CacheEntry#get()} to get value.
      * Note that if array of provided filters is {@code null} or empty this method returns
      * predicate that evaluates to {@code true} when applying.
      *
      * @param ps Value filter(s) to convert.
      * @return Entry filter.
      */
-    public static <K, V> IgnitePredicate<GridCacheEntry<K, V>> cacheValuesGet(
+    public static <K, V> IgnitePredicate<CacheEntry<K, V>> cacheValuesGet(
         @Nullable final IgnitePredicate<? super V>... ps) {
-        return isEmpty(ps) || isAlwaysTrue(ps) ? F.<GridCacheEntry<K, V>>alwaysTrue() :
-            isAlwaysFalse(ps) ? F.<GridCacheEntry<K, V>>alwaysFalse() :
-            new IgnitePredicate<GridCacheEntry<K, V>>() {
-                @Override public boolean apply(GridCacheEntry<K, V> e) {
+        return isEmpty(ps) || isAlwaysTrue(ps) ? F.<CacheEntry<K, V>>alwaysTrue() :
+            isAlwaysFalse(ps) ? F.<CacheEntry<K, V>>alwaysFalse() :
+            new IgnitePredicate<CacheEntry<K, V>>() {
+                @Override public boolean apply(CacheEntry<K, V> e) {
                     try {
                         V v = e.get();
 
@@ -8221,19 +8221,19 @@ public class GridFunc {
     }
 
     /**
-     * Converts value filter to entry filter using {@link GridCacheEntry#peek()}
+     * Converts value filter to entry filter using {@link org.apache.ignite.cache.CacheEntry#peek()}
      * to get value. Note that if array of provided filters is {@code null} or empty this method returns
      * predicate that evaluates to {@code true} when applying.
      *
      * @param ps Value filter(s) to convert.
      * @return Entry filter.
      */
-    public static <K, V> IgnitePredicate<GridCacheEntry<K, V>> cacheValuesPeek(
+    public static <K, V> IgnitePredicate<CacheEntry<K, V>> cacheValuesPeek(
         @Nullable final IgnitePredicate<? super V>... ps) {
-        return isEmpty(ps) || isAlwaysTrue(ps) ? F.<GridCacheEntry<K, V>>alwaysTrue() :
-            isAlwaysFalse(ps) ? F.<GridCacheEntry<K, V>>alwaysFalse() :
-            new IgnitePredicate<GridCacheEntry<K, V>>() {
-                @Override public boolean apply(GridCacheEntry<K, V> e) {
+        return isEmpty(ps) || isAlwaysTrue(ps) ? F.<CacheEntry<K, V>>alwaysTrue() :
+            isAlwaysFalse(ps) ? F.<CacheEntry<K, V>>alwaysFalse() :
+            new IgnitePredicate<CacheEntry<K, V>>() {
+                @Override public boolean apply(CacheEntry<K, V> e) {
                     V v = e.peek();
 
                     return v != null && F.isAll(v, ps);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PCE.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PCE.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PCE.java
index 1a2fe04..5542c43 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PCE.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PCE.java
@@ -22,12 +22,12 @@ import org.apache.ignite.lang.*;
 import org.apache.ignite.internal.util.lang.*;
 
 /**
- * Defines {@code alias} for <tt>GridPredicate&lt;GridCacheEntry&lt;K, V&gt;&gt;</tt> by extending
+ * Defines {@code alias} for <tt>GridPredicate&lt;CacheEntry&lt;K, V&gt;&gt;</tt> by extending
  * {@link org.apache.ignite.lang.IgnitePredicate}. Since Java doesn't provide type aliases (like Scala, for example) we resort
  * to these types of measures. This is intended to provide for more concise code without sacrificing
- * readability. For more information see {@link org.apache.ignite.lang.IgnitePredicate} and {@link org.apache.ignite.cache.GridCacheEntry}.
+ * readability. For more information see {@link org.apache.ignite.lang.IgnitePredicate} and {@link org.apache.ignite.cache.CacheEntry}.
  * @see org.apache.ignite.lang.IgnitePredicate
  * @see GridFunc
- * @see org.apache.ignite.cache.GridCacheEntry
+ * @see org.apache.ignite.cache.CacheEntry
  */
-public interface PCE<K, V> extends IgnitePredicate<GridCacheEntry<K, V>> { /* No-op. */ }
+public interface PCE<K, V> extends IgnitePredicate<CacheEntry<K, V>> { /* No-op. */ }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java
index d05aaee..98a039f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java
@@ -33,7 +33,7 @@ import java.io.*;
 import java.util.*;
 
 /**
- * Data transfer object for {@link org.apache.ignite.cache.GridCache}.
+ * Data transfer object for {@link org.apache.ignite.cache.Cache}.
  */
 public class VisorCache implements Serializable {
     /** */
@@ -97,7 +97,7 @@ public class VisorCache implements Serializable {
      * @return Data transfer object for given cache.
      * @throws IgniteCheckedException
      */
-    public static VisorCache from(Ignite g, GridCache c, int sample) throws IgniteCheckedException {
+    public static VisorCache from(Ignite g, Cache c, int sample) throws IgniteCheckedException {
         assert g != null;
         assert c != null;
 
@@ -126,7 +126,7 @@ public class VisorCache implements Serializable {
         CacheMode mode = cfg.getCacheMode();
 
         boolean partitioned = (mode == CacheMode.PARTITIONED || mode == CacheMode.REPLICATED)
-            && cfg.getDistributionMode() != GridCacheDistributionMode.CLIENT_ONLY;
+            && cfg.getDistributionMode() != CacheDistributionMode.CLIENT_ONLY;
 
         if (partitioned) {
             GridDhtCacheAdapter dca = null;
@@ -187,11 +187,11 @@ public class VisorCache implements Serializable {
         int size = ca.size();
         int near = ca.nearSize();
 
-        Set<GridCacheEntry> set = ca.entrySet();
+        Set<CacheEntry> set = ca.entrySet();
 
         long memSz = 0;
 
-        Iterator<GridCacheEntry> it = set.iterator();
+        Iterator<CacheEntry> it = set.iterator();
 
         int sz = sample > 0 ? sample : DFLT_CACHE_SIZE_SAMPLING;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAffinityConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAffinityConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAffinityConfiguration.java
index a64a9ce..e778b26 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAffinityConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAffinityConfiguration.java
@@ -57,13 +57,13 @@ public class VisorCacheAffinityConfiguration implements Serializable {
      * @return Data transfer object for affinity configuration properties.
      */
     public static VisorCacheAffinityConfiguration from(CacheConfiguration ccfg) {
-        GridCacheAffinityFunction aff = ccfg.getAffinity();
+        CacheAffinityFunction aff = ccfg.getAffinity();
 
         Integer dfltReplicas = null;
         Boolean excludeNeighbors = null;
 
-        if (aff instanceof GridCacheConsistentHashAffinityFunction) {
-            GridCacheConsistentHashAffinityFunction hashAffFunc = (GridCacheConsistentHashAffinityFunction)aff;
+        if (aff instanceof CacheConsistentHashAffinityFunction) {
+            CacheConsistentHashAffinityFunction hashAffFunc = (CacheConsistentHashAffinityFunction)aff;
 
             dfltReplicas = hashAffFunc.getDefaultReplicas();
             excludeNeighbors = hashAffFunc.isExcludeNeighbors();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheClearTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheClearTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheClearTask.java
index b59a3ff..4753cb7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheClearTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheClearTask.java
@@ -60,7 +60,7 @@ public class VisorCacheClearTask extends VisorOneNodeTask<Set<String>, Map<Strin
         @Override protected Map<String, IgniteBiTuple<Integer, Integer>> run(Set<String> arg) throws IgniteCheckedException {
             Map<String, IgniteBiTuple<Integer, Integer>> res = new HashMap<>();
 
-            for(GridCache cache : g.cachesx()) {
+            for(Cache cache : g.cachesx()) {
                 String cacheName = cache.name();
 
                 if (arg.contains(cacheName)) {


Mime
View raw message