ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [2/3] incubator-ignite git commit: #ignite-758: Remove GridCacheProjectionEx interface.
Date Thu, 16 Apr 2015 09:00:00 GMT
#ignite-758: Remove GridCacheProjectionEx interface.


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

Branch: refs/heads/ignite-758
Commit: 5c936982b812335a054847234a814d5cf48e36f9
Parents: e01e2b6
Author: ivasilinets <ivasilinets@gridgain.com>
Authored: Thu Apr 16 11:56:07 2015 +0300
Committer: ivasilinets <ivasilinets@gridgain.com>
Committed: Thu Apr 16 11:56:07 2015 +0300

----------------------------------------------------------------------
 .../org/apache/ignite/internal/IgniteEx.java    |   2 +-
 .../apache/ignite/internal/IgniteKernal.java    |   2 +-
 .../processors/cache/CacheLockImpl.java         |   4 +-
 .../processors/cache/CacheProjection.java       | 321 +++++++++++++++++
 .../processors/cache/GridCacheAdapter.java      |   3 +-
 .../processors/cache/GridCacheProjectionEx.java | 351 -------------------
 .../processors/cache/GridCacheProxyImpl.java    |   4 +-
 .../processors/cache/IgniteCacheProxy.java      |   2 +-
 .../datastructures/DataStructuresProcessor.java |   8 +-
 .../processors/igfs/IgfsDataManager.java        |   2 +-
 .../processors/igfs/IgfsMetaManager.java        |   4 +-
 .../handlers/cache/GridCacheCommandHandler.java |  14 +-
 .../service/GridServiceProcessor.java           |   2 +-
 .../processors/igfs/IgfsSizeSelfTest.java       |   2 +-
 .../cache/GridCacheCommandHandlerSelfTest.java  |   8 +-
 .../GridServiceReassignmentSelfTest.java        |   2 +-
 .../hadoop/jobtracker/HadoopJobTracker.java     |  14 +-
 .../HadoopDefaultMapReducePlannerSelfTest.java  |   2 +-
 18 files changed, 358 insertions(+), 389 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5c936982/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java
index 822b929..5b20311 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java
@@ -36,7 +36,7 @@ public interface IgniteEx extends Ignite {
      *
      * @return Utility cache.
      */
-    public <K extends GridCacheUtilityKey, V> GridCacheProjectionEx<K, V> utilityCache();
+    public <K extends GridCacheUtilityKey, V> CacheProjection<K, V> utilityCache();
 
     /**
      * Gets the cache instance for the given name if one is configured or

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5c936982/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 9e7a3d6..62a04eb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -2456,7 +2456,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
     }
 
     /** {@inheritDoc} */
-    @Override public <K extends GridCacheUtilityKey, V> GridCacheProjectionEx<K, V> utilityCache() {
+    @Override public <K extends GridCacheUtilityKey, V> CacheProjection<K, V> utilityCache() {
         guard();
 
         try {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5c936982/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLockImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLockImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLockImpl.java
index 5e9ed70..1441bcf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLockImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLockImpl.java
@@ -35,7 +35,7 @@ class CacheLockImpl<K, V> implements Lock {
     private final GridCacheGateway<K, V> gate;
 
     /** */
-    private final GridCacheProjectionEx<K, V> delegate;
+    private final CacheProjection<K, V> delegate;
 
     /** Projection. */
     private final CacheProjectionContext prj;
@@ -55,7 +55,7 @@ class CacheLockImpl<K, V> implements Lock {
      * @param prj Projection.
      * @param keys Keys.
      */
-    CacheLockImpl(GridCacheGateway<K, V> gate, GridCacheProjectionEx<K, V> delegate, CacheProjectionContext prj,
+    CacheLockImpl(GridCacheGateway<K, V> gate, CacheProjection<K, V> delegate, CacheProjectionContext prj,
         Collection<? extends K> keys) {
         this.gate = gate;
         this.delegate = delegate;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5c936982/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
index 5fb4367..c1c472a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
@@ -23,13 +23,18 @@ import org.apache.ignite.cache.affinity.*;
 import org.apache.ignite.cache.store.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.internal.*;
+import org.apache.ignite.internal.processors.cache.dr.*;
 import org.apache.ignite.internal.processors.cache.query.*;
 import org.apache.ignite.internal.processors.cache.transactions.*;
+import org.apache.ignite.internal.processors.cache.version.*;
+import org.apache.ignite.lang.*;
 import org.apache.ignite.mxbean.*;
 import org.apache.ignite.transactions.*;
 import org.jetbrains.annotations.*;
 
 import javax.cache.*;
+import javax.cache.expiry.*;
+import javax.cache.processor.*;
 import java.sql.*;
 import java.util.*;
 import java.util.Date;
@@ -1501,4 +1506,320 @@ public interface CacheProjection<K, V> extends Iterable<Cache.Entry<K, V>> {
      * @return Future that will be completed when rebalancing is finished.
      */
     public IgniteInternalFuture<?> forceRepartition();
+
+    /**
+     * Creates projection for specified subject ID.
+     *
+     * @param subjId Client ID.
+     * @return Internal projection.
+     */
+    GridCacheProxyImpl<K, V> forSubjectId(UUID subjId);
+    /**
+     * Store DR data.
+     *
+     * @param drMap DR map.
+     * @throws IgniteCheckedException If put operation failed.
+     */
+    public void putAllConflict(Map<KeyCacheObject, GridCacheDrInfo> drMap) throws IgniteCheckedException;
+
+    /**
+     * Store DR data asynchronously.
+     *
+     * @param drMap DR map.
+     * @return Future.
+     * @throws IgniteCheckedException If put operation failed.
+     */
+    public IgniteInternalFuture<?> putAllConflictAsync(Map<KeyCacheObject, GridCacheDrInfo> drMap)
+        throws IgniteCheckedException;
+
+    /**
+     * Removes DR data.
+     *
+     * @param drMap DR map.
+     * @throws IgniteCheckedException If remove failed.
+     */
+    public void removeAllConflict(Map<KeyCacheObject, GridCacheVersion> drMap) throws IgniteCheckedException;
+
+    /**
+     * Removes DR data asynchronously.
+     *
+     * @param drMap DR map.
+     * @return Future.
+     * @throws IgniteCheckedException If remove failed.
+     */
+    public IgniteInternalFuture<?> removeAllConflictAsync(Map<KeyCacheObject, GridCacheVersion> drMap) throws IgniteCheckedException;
+
+    /**
+     * Asynchronously stores given key-value pair in cache only if only if the previous value is equal to the
+     * {@code 'oldVal'} passed in.
+     * <p>
+     * This method will return {@code true} if value is stored in cache and {@code false} otherwise.
+     * <p>
+     * If write-through is enabled, the stored value will be persisted to {@link CacheStore}
+     * via {@link CacheStore#write(javax.cache.Cache.Entry)} method.
+     * <h2 class="header">Transactions</h2>
+     * This method is transactional and will enlist the entry into ongoing transaction
+     * if there is one.
+     *
+     * @param key Key to store in cache.
+     * @param oldVal Old value to match.
+     * @param newVal Value to be associated with the given key.
+     * @return Future for the replace operation. The future will return object containing actual old value and success
+     *      flag.
+     * @throws NullPointerException If either key or value are {@code null}.
+     */
+    public IgniteInternalFuture<GridCacheReturn> replacexAsync(K key, V oldVal, V newVal);
+
+    /**
+     * Stores given key-value pair in cache only if only if the previous value is equal to the
+     * {@code 'oldVal'} passed in.
+     * <p>
+     * This method will return {@code true} if value is stored in cache and {@code false} otherwise.
+     * <p>
+     * If write-through is enabled, the stored value will be persisted to {@link CacheStore}
+     * via {@link CacheStore#write(javax.cache.Cache.Entry)} method.
+     * <h2 class="header">Transactions</h2>
+     * This method is transactional and will enlist the entry into ongoing transaction
+     * if there is one.
+     *
+     * @param key Key to store in cache.
+     * @param oldVal Old value to match.
+     * @param newVal Value to be associated with the given key.
+     * @return Object containing actual old value and success flag.
+     * @throws NullPointerException If either key or value are {@code null}.
+     * @throws IgniteCheckedException If replace operation failed.
+     */
+    public GridCacheReturn replacex(K key, V oldVal, V newVal) throws IgniteCheckedException;
+
+    /**
+     * Removes given key mapping from cache if one exists and value is equal to the passed in value.
+     * <p>
+     * If write-through is enabled, the value will be removed from {@link CacheStore}
+     * via {@link CacheStore#delete(Object)} method.
+     * <h2 class="header">Transactions</h2>
+     * This method is transactional and will enlist the entry into ongoing transaction
+     * if there is one.
+     *
+     * @param key Key whose mapping is to be removed from cache.
+     * @param val Value to match against currently cached value.
+     * @return Object containing actual old value and success flag.
+     * @throws NullPointerException if the key or value is {@code null}.
+     * @throws IgniteCheckedException If remove failed.
+     */
+    public GridCacheReturn removex(K key, V val) throws IgniteCheckedException;
+
+    /**
+     * Asynchronously removes given key mapping from cache if one exists and value is equal to the passed in value.
+     * <p>
+     * This method will return {@code true} if remove did occur, which means that all optionally
+     * provided filters have passed and there was something to remove, {@code false} otherwise.
+     * <p>
+     * If write-through is enabled, the value will be removed from {@link CacheStore}
+     * via {@link CacheStore#delete(Object)} method.
+     * <h2 class="header">Transactions</h2>
+     * This method is transactional and will enlist the entry into ongoing transaction
+     * if there is one.
+     *
+     * @param key Key whose mapping is to be removed from cache.
+     * @param val Value to match against currently cached value.
+     * @return Future for the remove operation. The future will return object containing actual old value and success
+     *      flag.
+     * @throws NullPointerException if the key or value is {@code null}.
+     */
+    public IgniteInternalFuture<GridCacheReturn> removexAsync(K key, V val);
+
+    /**
+     * Gets value from cache. Will go to primary node even if this is a backup.
+     *
+     * @param key Key to get value for.
+     * @return Value.
+     * @throws IgniteCheckedException If failed.
+     */
+    @Nullable public V getForcePrimary(K key) throws IgniteCheckedException;
+
+    /**
+     * Asynchronously gets value from cache. Will go to primary node even if this is a backup.
+     *
+     * @param key Key to get value for.
+     * @return Future with result.
+     */
+    public IgniteInternalFuture<V> getForcePrimaryAsync(K key);
+
+    /**
+     * Gets values from cache. Will bypass started transaction, if any, i.e. will not enlist entries
+     * and will not lock any keys if pessimistic transaction is started by thread.
+     *
+     * @param keys Keys to get values for.
+     * @return Value.
+     * @throws IgniteCheckedException If failed.
+     */
+    @Nullable public Map<K, V> getAllOutTx(List<K> keys) throws IgniteCheckedException;
+
+    /**
+     * Checks whether this cache is IGFS data cache.
+     *
+     * @return {@code True} in case this cache is IGFS data cache.
+     */
+    public boolean isIgfsDataCache();
+
+    /**
+     * Get current amount of used IGFS space in bytes.
+     *
+     * @return Amount of used IGFS space in bytes.
+     */
+    public long igfsDataSpaceUsed();
+
+    /**
+     * Get maximum space available for IGFS.
+     *
+     * @return Amount of space available for IGFS in bytes.
+     */
+    public long igfsDataSpaceMax();
+
+    /**
+     * Checks whether this cache is Mongo data cache.
+     *
+     * @return {@code True} if this cache is mongo data cache.
+     */
+    public boolean isMongoDataCache();
+
+    /**
+     * Checks whether this cache is Mongo meta cache.
+     *
+     * @return {@code True} if this cache is mongo meta cache.
+     */
+    public boolean isMongoMetaCache();
+
+    /**
+     * Gets entry set containing internal entries.
+     *
+     * @param filter Filter.
+     * @return Entry set.
+     */
+    public Set<Cache.Entry<K, V>> entrySetx(CacheEntryPredicate... filter);
+
+    /**
+     * @return {@link javax.cache.expiry.ExpiryPolicy} associated with this projection.
+     */
+    public @Nullable
+    ExpiryPolicy expiry();
+
+    /**
+     * @param plc {@link ExpiryPolicy} to associate with this projection.
+     * @return New projection based on this one, but with the specified expiry policy.
+     */
+    public GridCacheProxyImpl<K, V> withExpiryPolicy(ExpiryPolicy plc);
+
+    /**
+     * @param key Key.
+     * @param entryProcessor Entry processor.
+     * @param args Arguments.
+     * @return Invoke result.
+     * @throws IgniteCheckedException If failed.
+     */
+    @Nullable public <T> EntryProcessorResult<T> invoke(K key,
+                                                        EntryProcessor<K, V, T> entryProcessor,
+                                                        Object... args) throws IgniteCheckedException;
+
+    /**
+     * @param key Key.
+     * @param entryProcessor Entry processor.
+     * @param args Arguments.
+     * @return Future.
+     */
+    public <T> IgniteInternalFuture<EntryProcessorResult<T>> invokeAsync(K key,
+                                                                         EntryProcessor<K, V, T> entryProcessor,
+                                                                         Object... args);
+
+    /**
+     * @param keys Keys.
+     * @param entryProcessor Entry processor.
+     * @param args Arguments.
+     * @return Invoke results.
+     * @throws IgniteCheckedException If failed.
+     */
+    public <T> Map<K, EntryProcessorResult<T>> invokeAll(Set<? extends K> keys,
+                                                         EntryProcessor<K, V, T> entryProcessor,
+                                                         Object... args) throws IgniteCheckedException;
+
+    /**
+     * @param keys Keys.
+     * @param entryProcessor Entry processor.
+     * @param args Arguments.
+     * @return Future.
+     */
+    public <T> IgniteInternalFuture<Map<K, EntryProcessorResult<T>>> invokeAllAsync(Set<? extends K> keys,
+                                                                                    EntryProcessor<K, V, T> entryProcessor,
+                                                                                    Object... args);
+
+    /**
+     * @param map Map containing keys and entry processors to be applied to values.
+     * @param args Arguments.
+     * @return Invoke results.
+     * @throws IgniteCheckedException If failed.
+     */
+    public <T> Map<K, EntryProcessorResult<T>> invokeAll(
+        Map<? extends K, ? extends EntryProcessor<K, V, T>> map,
+        Object... args) throws IgniteCheckedException;
+
+    /**
+     * @param map Map containing keys and entry processors to be applied to values.
+     * @param args Arguments.
+     * @return Future.
+     */
+    public <T> IgniteInternalFuture<Map<K, EntryProcessorResult<T>>> invokeAllAsync(
+        Map<? extends K, ? extends EntryProcessor<K, V, T>> map,
+        Object... args);
+
+    /**
+     * @return Context.
+     */
+    public GridCacheContext<K, V> context();
+
+    /**
+     * Delegates to {@link CacheStore#loadCache(org.apache.ignite.lang.IgniteBiInClosure,Object...)} method
+     * to load state from the underlying persistent storage. The loaded values
+     * will then be given to the optionally passed in predicate, and, if the predicate returns
+     * {@code true}, will be stored in cache. If predicate is {@code null}, then
+     * all loaded values will be stored in cache.
+     * <p>
+     * Note that this method does not receive keys as a parameter, so it is up to
+     * {@link CacheStore} implementation to provide all the data to be loaded.
+     * <p>
+     * This method is not transactional and may end up loading a stale value into
+     * cache if another thread has updated the value immediately after it has been
+     * loaded. It is mostly useful when pre-loading the cache from underlying
+     * data store before start, or for read-only caches.
+     *
+     * @param p Optional predicate (may be {@code null}). If provided, will be used to
+     *      filter values to be put into cache.
+     * @param args Optional user arguments to be passed into
+     *      {@link CacheStore#loadCache(org.apache.ignite.lang.IgniteBiInClosure, Object...)} method.
+     * @throws IgniteCheckedException If loading failed.
+     */
+    public void localLoadCache(@Nullable IgniteBiPredicate<K, V> p, @Nullable Object... args)
+        throws IgniteCheckedException;
+
+    /**
+     * Asynchronously delegates to {@link CacheStore#loadCache(org.apache.ignite.lang.IgniteBiInClosure, Object...)} method
+     * to reload state from the underlying persistent storage. The reloaded values
+     * will then be given to the optionally passed in predicate, and if the predicate returns
+     * {@code true}, will be stored in cache. If predicate is {@code null}, then
+     * all reloaded values will be stored in cache.
+     * <p>
+     * Note that this method does not receive keys as a parameter, so it is up to
+     * {@link CacheStore} implementation to provide all the data to be loaded.
+     * <p>
+     * This method is not transactional and may end up loading a stale value into
+     * cache if another thread has updated the value immediately after it has been
+     * loaded. It is mostly useful when pre-loading the cache from underlying
+     * data store before start, or for read-only caches.
+     *
+     * @param p Optional predicate (may be {@code null}). If provided, will be used to
+     *      filter values to be put into cache.
+     * @param args Optional user arguments to be passed into
+     *      {@link CacheStore#loadCache(org.apache.ignite.lang.IgniteBiInClosure,Object...)} method.
+     * @return Future to be completed whenever loading completes.
+     */
+    public IgniteInternalFuture<?> localLoadCacheAsync(@Nullable IgniteBiPredicate<K, V> p, @Nullable Object... args);
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5c936982/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 247dfc4..38a9660 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -71,8 +71,7 @@ import static org.apache.ignite.transactions.TransactionIsolation.*;
  * Adapter for different cache implementations.
  */
 @SuppressWarnings("unchecked")
-public abstract class GridCacheAdapter<K, V> implements CacheProjection<K, V>,
-    GridCacheProjectionEx<K, V>, Externalizable {
+public abstract class GridCacheAdapter<K, V> implements CacheProjection<K, V>, Externalizable {
     /** */
     private static final long serialVersionUID = 0L;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5c936982/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionEx.java
deleted file mode 100644
index 17e6c37..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionEx.java
+++ /dev/null
@@ -1,351 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache;
-
-import org.apache.ignite.*;
-import org.apache.ignite.cache.store.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.dr.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.*;
-import javax.cache.expiry.*;
-import javax.cache.processor.*;
-import java.util.*;
-
-/**
- * Internal projection interface.
- */
-public interface GridCacheProjectionEx<K, V> extends CacheProjection<K, V> {
-    /**
-     * Creates projection for specified subject ID.
-     *
-     * @param subjId Client ID.
-     * @return Internal projection.
-     */
-    GridCacheProxyImpl<K, V> forSubjectId(UUID subjId);
-    /**
-     * Store DR data.
-     *
-     * @param drMap DR map.
-     * @throws IgniteCheckedException If put operation failed.
-     */
-    public void putAllConflict(Map<KeyCacheObject, GridCacheDrInfo> drMap) throws IgniteCheckedException;
-
-    /**
-     * Store DR data asynchronously.
-     *
-     * @param drMap DR map.
-     * @return Future.
-     * @throws IgniteCheckedException If put operation failed.
-     */
-    public IgniteInternalFuture<?> putAllConflictAsync(Map<KeyCacheObject, GridCacheDrInfo> drMap)
-        throws IgniteCheckedException;
-
-    /**
-     * Removes DR data.
-     *
-     * @param drMap DR map.
-     * @throws IgniteCheckedException If remove failed.
-     */
-    public void removeAllConflict(Map<KeyCacheObject, GridCacheVersion> drMap) throws IgniteCheckedException;
-
-    /**
-     * Removes DR data asynchronously.
-     *
-     * @param drMap DR map.
-     * @return Future.
-     * @throws IgniteCheckedException If remove failed.
-     */
-    public IgniteInternalFuture<?> removeAllConflictAsync(Map<KeyCacheObject, GridCacheVersion> drMap) throws IgniteCheckedException;
-
-    /**
-     * Asynchronously stores given key-value pair in cache only if only if the previous value is equal to the
-     * {@code 'oldVal'} passed in.
-     * <p>
-     * This method will return {@code true} if value is stored in cache and {@code false} otherwise.
-     * <p>
-     * If write-through is enabled, the stored value will be persisted to {@link CacheStore}
-     * via {@link CacheStore#write(javax.cache.Cache.Entry)} method.
-     * <h2 class="header">Transactions</h2>
-     * This method is transactional and will enlist the entry into ongoing transaction
-     * if there is one.
-     *
-     * @param key Key to store in cache.
-     * @param oldVal Old value to match.
-     * @param newVal Value to be associated with the given key.
-     * @return Future for the replace operation. The future will return object containing actual old value and success
-     *      flag.
-     * @throws NullPointerException If either key or value are {@code null}.
-     */
-    public IgniteInternalFuture<GridCacheReturn> replacexAsync(K key, V oldVal, V newVal);
-
-    /**
-     * Stores given key-value pair in cache only if only if the previous value is equal to the
-     * {@code 'oldVal'} passed in.
-     * <p>
-     * This method will return {@code true} if value is stored in cache and {@code false} otherwise.
-     * <p>
-     * If write-through is enabled, the stored value will be persisted to {@link CacheStore}
-     * via {@link CacheStore#write(javax.cache.Cache.Entry)} method.
-     * <h2 class="header">Transactions</h2>
-     * This method is transactional and will enlist the entry into ongoing transaction
-     * if there is one.
-     *
-     * @param key Key to store in cache.
-     * @param oldVal Old value to match.
-     * @param newVal Value to be associated with the given key.
-     * @return Object containing actual old value and success flag.
-     * @throws NullPointerException If either key or value are {@code null}.
-     * @throws IgniteCheckedException If replace operation failed.
-     */
-    public GridCacheReturn replacex(K key, V oldVal, V newVal) throws IgniteCheckedException;
-
-    /**
-     * Removes given key mapping from cache if one exists and value is equal to the passed in value.
-     * <p>
-     * If write-through is enabled, the value will be removed from {@link CacheStore}
-     * via {@link CacheStore#delete(Object)} method.
-     * <h2 class="header">Transactions</h2>
-     * This method is transactional and will enlist the entry into ongoing transaction
-     * if there is one.
-     *
-     * @param key Key whose mapping is to be removed from cache.
-     * @param val Value to match against currently cached value.
-     * @return Object containing actual old value and success flag.
-     * @throws NullPointerException if the key or value is {@code null}.
-     * @throws IgniteCheckedException If remove failed.
-     */
-    public GridCacheReturn removex(K key, V val) throws IgniteCheckedException;
-
-    /**
-     * Asynchronously removes given key mapping from cache if one exists and value is equal to the passed in value.
-     * <p>
-     * This method will return {@code true} if remove did occur, which means that all optionally
-     * provided filters have passed and there was something to remove, {@code false} otherwise.
-     * <p>
-     * If write-through is enabled, the value will be removed from {@link CacheStore}
-     * via {@link CacheStore#delete(Object)} method.
-     * <h2 class="header">Transactions</h2>
-     * This method is transactional and will enlist the entry into ongoing transaction
-     * if there is one.
-     *
-     * @param key Key whose mapping is to be removed from cache.
-     * @param val Value to match against currently cached value.
-     * @return Future for the remove operation. The future will return object containing actual old value and success
-     *      flag.
-     * @throws NullPointerException if the key or value is {@code null}.
-     */
-    public IgniteInternalFuture<GridCacheReturn> removexAsync(K key, V val);
-
-    /**
-     * Gets value from cache. Will go to primary node even if this is a backup.
-     *
-     * @param key Key to get value for.
-     * @return Value.
-     * @throws IgniteCheckedException If failed.
-     */
-    @Nullable public V getForcePrimary(K key) throws IgniteCheckedException;
-
-    /**
-     * Asynchronously gets value from cache. Will go to primary node even if this is a backup.
-     *
-     * @param key Key to get value for.
-     * @return Future with result.
-     */
-    public IgniteInternalFuture<V> getForcePrimaryAsync(K key);
-
-    /**
-     * Gets values from cache. Will bypass started transaction, if any, i.e. will not enlist entries
-     * and will not lock any keys if pessimistic transaction is started by thread.
-     *
-     * @param keys Keys to get values for.
-     * @return Value.
-     * @throws IgniteCheckedException If failed.
-     */
-    @Nullable public Map<K, V> getAllOutTx(List<K> keys) throws IgniteCheckedException;
-
-    /**
-     * Checks whether this cache is IGFS data cache.
-     *
-     * @return {@code True} in case this cache is IGFS data cache.
-     */
-    public boolean isIgfsDataCache();
-
-    /**
-     * Get current amount of used IGFS space in bytes.
-     *
-     * @return Amount of used IGFS space in bytes.
-     */
-    public long igfsDataSpaceUsed();
-
-    /**
-     * Get maximum space available for IGFS.
-     *
-     * @return Amount of space available for IGFS in bytes.
-     */
-    public long igfsDataSpaceMax();
-
-    /**
-     * Checks whether this cache is Mongo data cache.
-     *
-     * @return {@code True} if this cache is mongo data cache.
-     */
-    public boolean isMongoDataCache();
-
-    /**
-     * Checks whether this cache is Mongo meta cache.
-     *
-     * @return {@code True} if this cache is mongo meta cache.
-     */
-    public boolean isMongoMetaCache();
-
-    /**
-     * Gets entry set containing internal entries.
-     *
-     * @param filter Filter.
-     * @return Entry set.
-     */
-    public Set<Cache.Entry<K, V>> entrySetx(CacheEntryPredicate... filter);
-
-    /**
-     * @return {@link ExpiryPolicy} associated with this projection.
-     */
-    public @Nullable ExpiryPolicy expiry();
-
-    /**
-     * @param plc {@link ExpiryPolicy} to associate with this projection.
-     * @return New projection based on this one, but with the specified expiry policy.
-     */
-    public GridCacheProxyImpl<K, V> withExpiryPolicy(ExpiryPolicy plc);
-
-    /**
-     * @param key Key.
-     * @param entryProcessor Entry processor.
-     * @param args Arguments.
-     * @return Invoke result.
-     * @throws IgniteCheckedException If failed.
-     */
-    @Nullable public <T> EntryProcessorResult<T> invoke(K key,
-         EntryProcessor<K, V, T> entryProcessor,
-         Object... args) throws IgniteCheckedException;
-
-    /**
-     * @param key Key.
-     * @param entryProcessor Entry processor.
-     * @param args Arguments.
-     * @return Future.
-     */
-    public <T> IgniteInternalFuture<EntryProcessorResult<T>> invokeAsync(K key,
-        EntryProcessor<K, V, T> entryProcessor,
-        Object... args);
-
-    /**
-     * @param keys Keys.
-     * @param entryProcessor Entry processor.
-     * @param args Arguments.
-     * @return Invoke results.
-     * @throws IgniteCheckedException If failed.
-     */
-    public <T> Map<K, EntryProcessorResult<T>> invokeAll(Set<? extends K> keys,
-        EntryProcessor<K, V, T> entryProcessor,
-        Object... args) throws IgniteCheckedException;
-
-    /**
-     * @param keys Keys.
-     * @param entryProcessor Entry processor.
-     * @param args Arguments.
-     * @return Future.
-     */
-    public <T> IgniteInternalFuture<Map<K, EntryProcessorResult<T>>> invokeAllAsync(Set<? extends K> keys,
-        EntryProcessor<K, V, T> entryProcessor,
-        Object... args);
-
-    /**
-     * @param map Map containing keys and entry processors to be applied to values.
-     * @param args Arguments.
-     * @return Invoke results.
-     * @throws IgniteCheckedException If failed.
-     */
-    public <T> Map<K, EntryProcessorResult<T>> invokeAll(
-        Map<? extends K, ? extends EntryProcessor<K, V, T>> map,
-        Object... args) throws IgniteCheckedException;
-
-    /**
-     * @param map Map containing keys and entry processors to be applied to values.
-     * @param args Arguments.
-     * @return Future.
-     */
-    public <T> IgniteInternalFuture<Map<K, EntryProcessorResult<T>>> invokeAllAsync(
-        Map<? extends K, ? extends EntryProcessor<K, V, T>> map,
-        Object... args);
-
-    /**
-     * @return Context.
-     */
-    public GridCacheContext<K, V> context();
-
-    /**
-     * Delegates to {@link CacheStore#loadCache(org.apache.ignite.lang.IgniteBiInClosure,Object...)} method
-     * to load state from the underlying persistent storage. The loaded values
-     * will then be given to the optionally passed in predicate, and, if the predicate returns
-     * {@code true}, will be stored in cache. If predicate is {@code null}, then
-     * all loaded values will be stored in cache.
-     * <p>
-     * Note that this method does not receive keys as a parameter, so it is up to
-     * {@link CacheStore} implementation to provide all the data to be loaded.
-     * <p>
-     * This method is not transactional and may end up loading a stale value into
-     * cache if another thread has updated the value immediately after it has been
-     * loaded. It is mostly useful when pre-loading the cache from underlying
-     * data store before start, or for read-only caches.
-     *
-     * @param p Optional predicate (may be {@code null}). If provided, will be used to
-     *      filter values to be put into cache.
-     * @param args Optional user arguments to be passed into
-     *      {@link CacheStore#loadCache(org.apache.ignite.lang.IgniteBiInClosure, Object...)} method.
-     * @throws IgniteCheckedException If loading failed.
-     */
-    public void localLoadCache(@Nullable IgniteBiPredicate<K, V> p, @Nullable Object... args)
-        throws IgniteCheckedException;
-
-    /**
-     * Asynchronously delegates to {@link CacheStore#loadCache(org.apache.ignite.lang.IgniteBiInClosure, Object...)} method
-     * to reload state from the underlying persistent storage. The reloaded values
-     * will then be given to the optionally passed in predicate, and if the predicate returns
-     * {@code true}, will be stored in cache. If predicate is {@code null}, then
-     * all reloaded values will be stored in cache.
-     * <p>
-     * Note that this method does not receive keys as a parameter, so it is up to
-     * {@link CacheStore} implementation to provide all the data to be loaded.
-     * <p>
-     * This method is not transactional and may end up loading a stale value into
-     * cache if another thread has updated the value immediately after it has been
-     * loaded. It is mostly useful when pre-loading the cache from underlying
-     * data store before start, or for read-only caches.
-     *
-     * @param p Optional predicate (may be {@code null}). If provided, will be used to
-     *      filter values to be put into cache.
-     * @param args Optional user arguments to be passed into
-     *      {@link CacheStore#loadCache(org.apache.ignite.lang.IgniteBiInClosure,Object...)} method.
-     * @return Future to be completed whenever loading completes.
-     */
-    public IgniteInternalFuture<?> localLoadCacheAsync(@Nullable IgniteBiPredicate<K, V> p, @Nullable Object... args);
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5c936982/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
index 6c211b6..3c4a3c5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
@@ -43,7 +43,7 @@ import java.util.*;
 /**
  * Cache proxy.
  */
-public class GridCacheProxyImpl<K, V> implements CacheProjection<K, V>, GridCacheProjectionEx<K, V>, Externalizable {
+public class GridCacheProxyImpl<K, V> implements CacheProjection<K, V>, Externalizable {
     /** */
     private static final long serialVersionUID = 0L;
 
@@ -109,7 +109,7 @@ public class GridCacheProxyImpl<K, V> implements CacheProjection<K, V>, GridCach
     /**
      * @return Proxy delegate.
      */
-    public GridCacheProjectionEx<K, V> delegate() {
+    public CacheProjection<K, V> delegate() {
         return delegate;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5c936982/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
index 408f7f1..40afa26 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
@@ -1319,7 +1319,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
     /**
      *
      */
-    public GridCacheProjectionEx delegate() {
+    public CacheProjection delegate() {
         return delegate;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5c936982/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
index 38d0e3f..fc54ba7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
@@ -94,10 +94,10 @@ public final class DataStructuresProcessor extends GridProcessorAdapter {
     private final AtomicConfiguration atomicCfg;
 
     /** */
-    private GridCacheProjectionEx<CacheDataStructuresConfigurationKey, Map<String, DataStructureInfo>> utilityCache;
+    private CacheProjection<CacheDataStructuresConfigurationKey, Map<String, DataStructureInfo>> utilityCache;
 
     /** */
-    private GridCacheProjectionEx<CacheDataStructuresCacheKey, List<CacheCollectionInfo>> utilityDataCache;
+    private CacheProjection<CacheDataStructuresCacheKey, List<CacheCollectionInfo>> utilityDataCache;
 
     /**
      * @param ctx Context.
@@ -116,9 +116,9 @@ public final class DataStructuresProcessor extends GridProcessorAdapter {
         if (ctx.config().isDaemon())
             return;
 
-        utilityCache = (GridCacheProjectionEx)ctx.cache().utilityCache();
+        utilityCache = (CacheProjection)ctx.cache().utilityCache();
 
-        utilityDataCache = (GridCacheProjectionEx)ctx.cache().utilityCache();
+        utilityDataCache = (CacheProjection)ctx.cache().utilityCache();
 
         assert utilityCache != null;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5c936982/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java
index 006fc4b..1c2d7d3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java
@@ -65,7 +65,7 @@ public class IgfsDataManager extends IgfsManager {
     private IgfsEx igfs;
 
     /** Data cache projection. */
-    private GridCacheProjectionEx<IgfsBlockKey, byte[]> dataCachePrj;
+    private CacheProjection<IgfsBlockKey, byte[]> dataCachePrj;
 
     /** Data cache. */
     private CacheProjection<Object, Object> dataCache;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5c936982/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java
index 82b5fd8..61bc5a5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java
@@ -61,7 +61,7 @@ public class IgfsMetaManager extends IgfsManager {
     private CountDownLatch metaCacheStartLatch;
 
     /** File ID to file info projection. */
-    private GridCacheProjectionEx<IgniteUuid, IgfsFileInfo> id2InfoPrj;
+    private CacheProjection<IgniteUuid, IgfsFileInfo> id2InfoPrj;
 
     /** Predefined key for sampling mode value. */
     private GridCacheInternal sampling;
@@ -119,7 +119,7 @@ public class IgfsMetaManager extends IgfsManager {
                 }
             });
 
-        id2InfoPrj = (GridCacheProjectionEx<IgniteUuid, IgfsFileInfo>)metaCache.<IgniteUuid, IgfsFileInfo>cache();
+        id2InfoPrj = (CacheProjection<IgniteUuid, IgfsFileInfo>)metaCache.<IgniteUuid, IgfsFileInfo>cache();
 
         locNode = igfsCtx.kernalContext().discovery().localNode();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5c936982/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 ee49eb2..b9c55fb 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
@@ -522,8 +522,8 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
      * @return Instance on the named cache.
      * @throws IgniteCheckedException If cache not found.
      */
-    protected GridCacheProjectionEx<Object, Object> localCache(String cacheName) throws IgniteCheckedException {
-        GridCacheProjectionEx<Object, Object> cache = (GridCacheProjectionEx<Object, Object>)ctx.cache().cache(cacheName);
+    protected CacheProjection<Object, Object> localCache(String cacheName) throws IgniteCheckedException {
+        CacheProjection<Object, Object> cache = (CacheProjection<Object, Object>)ctx.cache().cache(cacheName);
 
         if (cache == null)
             throw new IgniteCheckedException(
@@ -538,14 +538,14 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
      * @return Instance on the named cache.
      * @throws IgniteCheckedException If cache not found.
      */
-    private static GridCacheProjectionEx<Object, Object> cache(Ignite ignite, String cacheName) throws IgniteCheckedException {
+    private static CacheProjection<Object, Object> cache(Ignite ignite, String cacheName) throws IgniteCheckedException {
         CacheProjection<Object, Object> cache = ((IgniteKernal)ignite).getCache(cacheName);
 
         if (cache == null)
             throw new IgniteCheckedException(
                 "Failed to find cache for given cache name (null for default cache): " + cacheName);
 
-        return (GridCacheProjectionEx<Object, Object>)cache;
+        return (CacheProjection<Object, Object>)cache;
     }
 
     /**
@@ -871,7 +871,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
             if (ttl != null && ttl > 0) {
                 Duration duration = new Duration(MILLISECONDS, ttl);
 
-                c = ((GridCacheProjectionEx<Object, Object>)c).withExpiryPolicy(new ModifiedExpiryPolicy(duration));
+                c = ((CacheProjection<Object, Object>)c).withExpiryPolicy(new ModifiedExpiryPolicy(duration));
             }
 
             return c.putAsync(key, val);
@@ -908,7 +908,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
             if (ttl != null && ttl > 0) {
                 Duration duration = new Duration(MILLISECONDS, ttl);
 
-                c = ((GridCacheProjectionEx<Object, Object>)c).withExpiryPolicy(new ModifiedExpiryPolicy(duration));
+                c = ((CacheProjection<Object, Object>)c).withExpiryPolicy(new ModifiedExpiryPolicy(duration));
             }
 
             return c.putIfAbsentAsync(key, val);
@@ -945,7 +945,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
             if (ttl != null && ttl > 0) {
                 Duration duration = new Duration(MILLISECONDS, ttl);
 
-                c = ((GridCacheProjectionEx<Object, Object>)c).withExpiryPolicy(new ModifiedExpiryPolicy(duration));
+                c = ((CacheProjection<Object, Object>)c).withExpiryPolicy(new ModifiedExpiryPolicy(duration));
             }
 
             return c.replaceAsync(key, val);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5c936982/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 f4898fa..7bb09e4 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
@@ -81,7 +81,7 @@ public class GridServiceProcessor extends GridProcessorAdapter {
     private ThreadLocal<String> svcName = new ThreadLocal<>();
 
     /** Service cache. */
-    private GridCacheProjectionEx<Object, Object> cache;
+    private CacheProjection<Object, Object> cache;
 
     /** Topology listener. */
     private GridLocalEventListener topLsnr = new TopologyListener();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5c936982/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java
index 2b6c62a..4e8d2f1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java
@@ -309,7 +309,7 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest {
         for (int i = 0; i < GRID_CNT; i++) {
             IgniteEx g = grid(i);
 
-            GridCacheProjectionEx cache = (GridCacheProjectionEx)g.cachex(DATA_CACHE_NAME).cache();
+            CacheProjection cache = (CacheProjection)g.cachex(DATA_CACHE_NAME).cache();
 
             assert cache.isIgfsDataCache();
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5c936982/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
index 2a6ae9d..41bdd28 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
@@ -204,11 +204,11 @@ public class GridCacheCommandHandlerSelfTest extends GridCommonAbstractTest {
          *
          * @return Instance of a Cache proxy.
          */
-        @Override protected GridCacheProjectionEx<Object, Object> localCache(String cacheName) throws IgniteCheckedException {
-            final GridCacheProjectionEx<Object, Object> cache = super.localCache(cacheName);
+        @Override protected CacheProjection<Object, Object> localCache(String cacheName) throws IgniteCheckedException {
+            final CacheProjection<Object, Object> cache = super.localCache(cacheName);
 
-            return (GridCacheProjectionEx<Object, Object>)Proxy.newProxyInstance(getClass().getClassLoader(),
-                new Class[] {GridCacheProjectionEx.class},
+            return (CacheProjection<Object, Object>)Proxy.newProxyInstance(getClass().getClassLoader(),
+                new Class[] {CacheProjection.class},
                 new InvocationHandler() {
                     @Override public Object invoke(Object proxy, Method mtd, Object[] args) throws Throwable {
                         if (failMtd.equals(mtd.getName())) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5c936982/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceReassignmentSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceReassignmentSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceReassignmentSelfTest.java
index 4448153..1c7f0a0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceReassignmentSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceReassignmentSelfTest.java
@@ -152,7 +152,7 @@ public class GridServiceReassignmentSelfTest extends GridServiceProcessorAbstrac
     private boolean checkServices(int total, int maxPerNode, int gridIdx, boolean lastTry) throws Exception {
         IgniteEx grid = grid(gridIdx);
 
-        GridCacheProjectionEx<GridServiceAssignmentsKey, GridServiceAssignments> cache = grid.utilityCache();
+        CacheProjection<GridServiceAssignmentsKey, GridServiceAssignments> cache = grid.utilityCache();
 
         GridServiceAssignments assignments = cache.get(new GridServiceAssignmentsKey("testService"));
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5c936982/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/HadoopJobTracker.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/HadoopJobTracker.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/HadoopJobTracker.java
index 49e5121..f07f56b 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/HadoopJobTracker.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/HadoopJobTracker.java
@@ -57,10 +57,10 @@ public class HadoopJobTracker extends HadoopComponent {
     private final GridMutex mux = new GridMutex();
 
     /** */
-    private volatile GridCacheProjectionEx<HadoopJobId, HadoopJobMetadata> jobMetaPrj;
+    private volatile CacheProjection<HadoopJobId, HadoopJobMetadata> jobMetaPrj;
 
     /** Projection with expiry policy for finished job updates. */
-    private volatile GridCacheProjectionEx<HadoopJobId, HadoopJobMetadata> finishedJobMetaPrj;
+    private volatile CacheProjection<HadoopJobId, HadoopJobMetadata> finishedJobMetaPrj;
 
     /** Map-reduce execution planner. */
     @SuppressWarnings("FieldAccessedSynchronizedAndUnsynchronized")
@@ -107,8 +107,8 @@ public class HadoopJobTracker extends HadoopComponent {
      * @return Job meta projection.
      */
     @SuppressWarnings("NonPrivateFieldAccessedInSynchronizedContext")
-    private GridCacheProjectionEx<HadoopJobId, HadoopJobMetadata> jobMetaCache() {
-        GridCacheProjectionEx<HadoopJobId, HadoopJobMetadata> prj = jobMetaPrj;
+    private CacheProjection<HadoopJobId, HadoopJobMetadata> jobMetaCache() {
+        CacheProjection<HadoopJobId, HadoopJobMetadata> prj = jobMetaPrj;
 
         if (prj == null) {
             synchronized (mux) {
@@ -149,8 +149,8 @@ public class HadoopJobTracker extends HadoopComponent {
     /**
      * @return Projection with expiry policy for finished job updates.
      */
-    private GridCacheProjectionEx<HadoopJobId, HadoopJobMetadata> finishedJobMetaCache() {
-        GridCacheProjectionEx<HadoopJobId, HadoopJobMetadata> prj = finishedJobMetaPrj;
+    private CacheProjection<HadoopJobId, HadoopJobMetadata> finishedJobMetaCache() {
+        CacheProjection<HadoopJobId, HadoopJobMetadata> prj = finishedJobMetaPrj;
 
         if (prj == null) {
             jobMetaCache();
@@ -470,7 +470,7 @@ public class HadoopJobTracker extends HadoopComponent {
 
                 case COMMIT:
                 case ABORT: {
-                    GridCacheProjectionEx<HadoopJobId, HadoopJobMetadata> cache = finishedJobMetaCache();
+                    CacheProjection<HadoopJobId, HadoopJobMetadata> cache = finishedJobMetaCache();
 
                     cache.invokeAsync(info.jobId(), new UpdatePhaseProcessor(incrCntrs, PHASE_COMPLETE)).
                         listen(failsLog);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5c936982/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopDefaultMapReducePlannerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopDefaultMapReducePlannerSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopDefaultMapReducePlannerSelfTest.java
index ca5ea94..9a45d72 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopDefaultMapReducePlannerSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopDefaultMapReducePlannerSelfTest.java
@@ -946,7 +946,7 @@ public class HadoopDefaultMapReducePlannerSelfTest extends HadoopAbstractSelfTes
         }
 
         /** {@inheritDoc} */
-        @Override public <K extends GridCacheUtilityKey, V> GridCacheProjectionEx<K, V> utilityCache() {
+        @Override public <K extends GridCacheUtilityKey, V> CacheProjection<K, V> utilityCache() {
             return null;
         }
 


Mime
View raw message